diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a56758..843fdeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,8 @@ jobs:
     name: Lint & Build
     runs-on: ubuntu-latest
     steps:
-      - uses: pnpm/action-setup@v6
       - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -37,8 +37,8 @@ jobs:
         os: ${{ (github.event_name == 'pull_request') && fromJson('["ubuntu-latest"]') || fromJson('["ubuntu-latest", "macos-latest", "windows-latest"]') }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: pnpm/action-setup@v6
       - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -60,8 +60,8 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-      - uses: pnpm/action-setup@v6
       - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -83,6 +83,8 @@ jobs:
     permissions:
       contents: write
     steps:
+      # 检出仓库：使 body_path 指向的 Release Note 文件可见
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v8
         with:
           name: vsix
@@ -91,10 +93,11 @@ jobs:
         with:
           files: '*.vsix'
           prerelease: ${{ contains(github.ref_name, 'rc') }}
-          generate_release_notes: true
+          # Release 正文取自版本控制的 Release Note（单一事实源，按 tag 名取对应文件）
+          body_path: docs/releases/${{ github.ref_name }}.md
           fail_on_unmatched_files: true
 
-  # 发布：仅 tag 触发，双市场（Marketplace + OpenVSX），生产环境审批门
+  # 发布：仅 tag 触发；OpenVSX 默认发布，VS Code Marketplace 由 ENABLE_MARKETPLACE_PUBLISH 变量门控（默认关闭）；生产环境审批门
   publish:
     name: Publish
     needs: package
@@ -102,8 +105,8 @@ jobs:
     runs-on: ubuntu-latest
     environment: production
     steps:
-      - uses: pnpm/action-setup@v6
       - uses: actions/checkout@v7
+      - uses: pnpm/action-setup@v6
       - uses: actions/setup-node@v6
         with:
           node-version: 22
@@ -112,13 +115,20 @@ jobs:
       - uses: actions/download-artifact@v8
         with:
           name: vsix
+      # VS Code Marketplace 发布：默认关闭（未配置 VSCE_PAT）。
+      # 配好 VSCE_PAT 后，在仓库 Settings → Secrets and variables → Actions → Variables
+      # 新增 ENABLE_MARKETPLACE_PUBLISH=true 即恢复，无需改代码或发 PR。
       - name: 发布到 VS Code Marketplace
+        if: ${{ vars.ENABLE_MARKETPLACE_PUBLISH == 'true' }}
         run: |
           PRE_FLAG=$([[ "${GITHUB_REF_NAME}" == *rc* ]] && echo "--pre-release" || echo "")
           pnpm dlx @vscode/vsce publish --packagePath *.vsix $PRE_FLAG
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
+      # OpenVSX 不支持覆盖已存在版本：若该版本号已发布则此步报错。
+      # 以 continue-on-error 隔离——不阻断 GitHub Release 产出，亦不让首发 workflow 标红。
       - name: 发布到 OpenVSX（覆盖 Cursor / Windsurf 等 AI IDE）
+        continue-on-error: true
         run: |
           PRE_FLAG=$([[ "${GITHUB_REF_NAME}" == *rc* ]] && echo "--pre-release" || echo "")
           pnpm dlx ovsx publish *.vsix $PRE_FLAG
diff --git a/.gitignore b/.gitignore
index 034a9f5..053535e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ out/
 
 # VS Code Test 临时
 .vscode-test/
+.idea/
 
 # 临时产物（执行计划等，一律收敛至此并即时清理）
 .temp/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d75998..2bc88f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,172 +2,74 @@
 
 本项目的所有重要变更均记录于此文件。格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，版本号遵循 [SemVer](https://semver.org/lang/zh-CN/)。
 
-## [Unreleased]
+> 面向用户的发布说明（含完整特性叙述与安装指引）见 [`docs/releases/`](./docs/releases/README.md)。
 
-## [0.0.1-rc.4] - 2026-06-29 — 第四个预发布候选
-
-> 修复用户截图反馈的两处工具窗口缺陷：活动栏图标缺失「未提交文件数」角标、Branches「Push」对无上游分支失败。
->
-> 版本号遵循 VS Code Marketplace 约定（`major.minor.patch` = `0.0.4`），预发布语义由 `--pre-release` 标记 + git tag `v0.0.1-rc.4` 体现。
+## [0.0.7] - 未发布
 
 ### Fixed
+- 修复 `vsce package` 打包因 ESLint `no-useless-assignment` 阻断：`engine/ci/remote-parser.ts` 中 `host`/`path` 的空串初值为 dead store（`hasScheme` 真假两分支均无条件重赋、解析失败处先 `return null`），改为带类型标注的纯声明消除，由 TS 确定赋值分析接管，运行时行为不变。
 
-- **活动栏未提交角标（#17）**：`hyperGit.changes` 原经 `registerTreeDataProvider` 注册，仅得 `Disposable` 无法承载 `.badge`；改用 `createTreeView` 获取 `TreeView` 句柄并新增 `updateChangesBadge()`，计数复用 `GitRepositoryService.getChanges()`（index+工作区+未跟踪去重），接入既有 `refreshAll` 防抖链路与首帧保险，计数为 0 时清空。活动栏容器图标角标为容器内各视图 `badge.value` 之和，故 Hyper Git 图标自此实时显示未提交文件数，对齐原生 SCM。
-- **Branches Push 对无上游分支失败（#17）**：`hyperGit.push` 原以零参数调 `repo.push()`，当前分支无上游时 `git push`（`push.default=simple`）必然失败，vscode.git 包装为 `GitError`、其 `.message` 恰为通用串「Failed to execute git」而真实 stderr 被吞没。改为以 `HEAD.upstream` 是否存在分流：有上游沿用 `repo.push()`；无上游则选定 remote（单 remote 直用、多 remote 弹选）并以 `repo.push(remote, branch, true)` 建立 `-u` 追踪。同时增强 `errMsg` 优先暴露 `GitError.stderr`，使「无上游」「non-fast-forward」等失败可读（push/pull/fetch 等同享）。
-
-## [0.0.1-rc.3] - 2026-06-29 — 第三个预发布候选
-
-> 包含 rc.2 后的全部 Parity Recovery（Batch 5-12），完成 IDEA Git 工具窗口全量对齐；并修复发布流水线，使 GitHub Release 自此自动附带「可本地安装的 `.vsix`」资产。
->
-> 版本号遵循 VS Code Marketplace 约定（`major.minor.patch` = `0.0.3`），预发布语义由 `--pre-release` 标记 + git tag `v0.0.1-rc.3` 体现。
-
-### CI / 发布
-
-- **GitHub Release 自动附带 `.vsix`**：CI 新增独立 `github-release` job（`softprops/action-gh-release`），对每个 `v*` tag 复用 `package` job 产出的 vsix artifact，自动创建 Release（`*rc*` tag 自动标记 prerelease）并上传 `.vsix` 资产，用户可直接「`Extensions: Install from VSIX`」本地安装。该 job 与市场 `publish` 解耦（`needs: package`、不挂 `production` 环境），即便市场发布待审批/失败亦不影响 Release 资产产出；`fail_on_unmatched_files` 杜绝「空资产 Release」。
-
-### Added — Parity Recovery（Batch 5-12，IDEA 全量对齐）
-
-> 基于「IDEA Git 功能复刻全量对齐」评审（用户截图反馈 Branches 空白/工具栏缺失），经 3 路代码审计确认「功能多数已实现但被视图 bug + 工具栏未浮现掩盖」，本批次先解除可见痛感再全量补齐。共新增 **13 个 engine 纯逻辑模块 + 21 个命令**，单测 64 → 166。
-
-- **Branches 视图渲染修复（Batch5）**：`engine/ref/for-each-ref`（NUL 分隔 + upstream/HEAD/ahead-behind track）+ async getChildren + `repo.state.refs` 为空时 `git for-each-ref` CLI 兜底 + 首帧刷新（修复初始 `_onDidChange.fire` 早于订阅挂载而丢失的根因）。
-- **工具栏 Action 组补齐 + 命令 bug（Batch5）**：Changes 加 fetch/pull/push/commit；Branches 加 fetch；Log 加 cherry-pick/revert/reset；cherry-pick/revert 成功后刷新；resetHead 重写（修 `HEAD~0` 致 mixed/keep 失效）；branchDelete 加 `--merged` 检查；merge/rebase 加确认。
-- **冲突兜底引导（Batch5）**：`engine/git-state/conflict-detector` + `adapter/conflict-ui`；merge/rebase/pull/cherry-pick/revert/stash-pop/unshelve 失败检测冲突弹「解决/中止」。
-- **Branches 对齐 IDEA（Batch6）**：Favorites/Local/Remote/Tags 四段分组 + ahead/behind/upstream 展示 + `engine/ref/favorites`/`cleanup`（提取复用）+ toggleFavorite/checkoutAsNew/compareWithCurrent/tagCreate/tagDelete/tagCheckout。
-- **交互式 Rebase webview 1:1 复刻（Batch7）**：补 reword/edit + 拖拽重排序；reword 经 `process.execPath` 跑 Node editor helper + state 文件非交互写入新 message（已功能性验证）；`engine/rebase/todo`。
-- **Log 提交详情面板 + 高级过滤（Batch8）**：commit 展开显示变更文件（`engine/log/commit-files`）+ 单文件 diff（commit^ vs commit）+ `engine/log/log-filter`（合并模式/日期/正则）+ per-commit 操作（resetToHere/createBranchFromCommit/createTagFromCommit/showContainingBranches）。
-- **真实 SVG 提交拓扑图（Batch9）**：解析 `git log --graph` 字符粒度渲染（`*` 圆点可点击 / `|` 竖线 / `/ \` 斜线，多色 lane）+ 实时刷新 + 节点点击 QuickPick；`engine/log/graph-parser`。
-- **Push/Update/Merge 对话框（Batch10）**：force/force-with-lease/push tags、pull --rebase/--no-rebase、merge ff-only/no-ff/squash + message；fetch --prune；`engine/commit/trailer`（Co-authored-by）。
-- **自绘 3-way Merge Editor（Batch11）**：自实现 `engine/merge/diff3`（基于 LCS，双方同改动自动消解）+ WebviewPanel 三栏（OURS/RESULT 可编辑/THEIRS）+ Accept 按钮 + 写回 `git add`；handleGitConflict「解决冲突」直接调起。
-- **Phase 4/5 收尾（Batch12）**：Stash 高级（keep-index/clear/branch）、Patch create/apply、Reflog 视图、编辑器内 Blame 行内注解（`engine/blame/blame-parser` + `adapter/editor/blame-annotation`）。
-
-### 架构与质量
-- 新增 engine 模块（零 vscode 依赖、可单测）：`ref/{for-each-ref,favorites,cleanup}`、`rebase/todo`、`log/{log-filter,commit-files,graph-parser}`、`merge/diff3`、`commit/trailer`、`git-state/conflict-detector`、`blame/blame-parser`。
-- 命令 56 → 77；单测 64 → 166（+21 文件）；集成 3/3；lint/类型/构建全程 GREEN。
-- 关键算法（reword helper / graph 解析 / diff3 / blame 解析）均做真实 git 数据功能性验证。
-- git 底座：稳定 API 能做的用 `Repository.*`；缺口用 `GitRepositoryService.execGit`（复用 `api.git.path` 同一二进制）。
-
-### 待补（后续）
-- Commit webview 的 Co-authored-by / author 覆盖（`--author`）/ undo-last-commit 按钮 UI 接线（engine trailer 已就绪）。
-- Partial 多文件选择 UX、行级 split chunks（IDEA "Include Selected Lines"）。
-- 目录/folder diff（虚拟文档）、Submodules 管理。
-- M5 AI Agent（5 个接缝已预埋 Null 实现，本轮未启动）。
-
-
-
-## [0.0.1-rc.2] - 2026-06-28 — 第二个预发布候选
-
-包含 rc.1 后的全部 Parity Recovery（Batch 1-4 + Editor Inline Commit），大幅补齐 IDEA Git 功能复刻。
-
-### 核心新增（自 rc.1）
-- **Editor Inline Commit**（#13）：CodeLens「✓ 提交此 Hunk」→ 仅暂存该 hunk → 提交。
-- **Cherry-pick / Revert / Reset / Branch rename / Compare / Ignore / Reword**（经 `api.git.path` CLI 通道）。
-- **Git 提交图**（Webview `git log --graph` 着色拓扑）+ **Console**（git 命令输出面板）。
-- **partial/hunk 级提交**（hunk 解析引擎 + 选择暂存 + 光标处暂存）+ undo/drop/fixup + cleanup branches + 3-way diff。
-- **忠实 Shelf**（patch 存储 + unshelve 三方合并）+ **交互式 Rebase UI**（pick/squash/fixup/drop Webview）+ **Move Hunk to Changelist**（#25）。
-- **Stash 多栈列表** + Discard + Pull/Push/Fetch + PNG 图标 + Dependabot。
-
-### Added — Parity Batch 4（忠实 Shelf + 交互式 Rebase + Line→CL，0.0.6）
-
-- **忠实 Shelf**（IDEA patch-based，#27-28）：Shelve（`git diff` → patch 存扩展存储 → `git checkout --` 移除工作区）+ Unshelve silently / with 3-way merge + Delete + Shelf TreeView。与 Stash 独立并存。
-- **交互式 Rebase UI**（Webview，#44）：commit 列表 + pick/squash/fixup/drop 动作 → 非交互 rebase（`GIT_SEQUENCE_EDITOR=cp <tempfile>` + `GIT_EDITOR=:`）。
-- **Move Hunk to Changelist**（#25）：编辑器内光标处 hunk → QuickPick changelist → ChangelistRegistry 持久化 hunk→CL 归属。
-
-### Added — Editor Inline Commit（#13，0.0.5）
-
-> IDEA editor inline commit 的 VS Code 等价（补齐最后一块主要拼图）。
-
-- **行内提交 CodeLens**：编辑器中每个未暂存 hunk 上方渲染可点击 CodeLens「✓ 提交此 Hunk (+N -M)」→ 仅暂存该 hunk（patch 重建 + `git apply --cached`）→ 输入 message → `git commit`。
-- 新增 `engine/diff/editor-mapping`（hunk → 编辑器行区域映射，纯逻辑 + 5 单测）；gutter 行标记（绿/红/蓝）由原生 git quickDiff 提供。
-- 其他已暂存内容会一并提交时给出二次确认提示。
-
-### Added — Parity Batch 3（partial commit + 高级操作，0.0.4）
-
-- **partial / 行级提交**（IDEA PartialChangesUtil 等价）：`engine/diff/hunk-parser`（unified diff 解析，7 单测）+ hunk 选择暂存/取消暂存（QuickPick 勾选）+ 光标处 hunk 暂存——经 patch 重建 + `git apply --cached`。
-- **undo commit**（soft reset，保留改动到暂存区）、**drop commit**（`git rebase --onto`，重写历史二次确认）、**fixup**（autosquash rebase，经 env 注入 `GIT_SEQUENCE_EDITOR`）。
-- **cleanup branches**（`git branch --merged` 批量删除）、**copy branch ref**、**3-way diff 概览**（HEAD↔Staged↔Working）。
-- `execGit` 支持 env 注入（为 autosquash 等 rebase 自动化铺路）。
-
-### Added — Parity Batch 2（UI 丰富度，0.0.3）
-
-- **Git 提交图（WebviewPanel）**：`git log --graph --oneline --decorate --all`（CLI）获取拓扑，语义着色渲染（graph 连线 / refs / hash）——补齐 IDEA Log 提交图的可视化拓扑。命令面板 + Log 视图标题按钮。
-- **Console**：Hyper Git Console（OutputChannel）记录所有 `execGit` 命令与输出（对齐 IDEA Console 标签页）。
-
-### Added — Parity Batch 1（CLI 功能补齐，0.0.2）
-
-> 关键转向：引入 `GitRepositoryService.execGit`（复用 vscode.git 的同一 git 二进制 `api.git.path`），补齐稳定 API 未暴露的操作——修正此前"API 限制延后"的过度自我设限。
-
-- Cherry-pick（Log 右键）、Revert commit（Log 右键）——经 `git cherry-pick` / `git revert`。
-- Reset HEAD（soft/mixed/hard/keep，命令面板，hard 二次确认）。
-- 分支重命名（Branches 右键 `git branch -m`）、比较分支（`git diff --stat a...b`）。
-- Ignore（写 .gitignore）、改写最新提交（amend）。
-- **Stash 多栈列表**：用 `git stash list`（CLI）修复——apply/pop/drop 按真实 `stash@{n}` 索引（此前 `log({refNames:['stash']})` 仅返回最新 stash 内部提交、语义错误，已弃用）。
-
-## [0.0.1-rc.1] - 2026-06-27 — 首发候选（Pre-release）
+## [0.0.6] - 2026-06-30 — 首个 MVP 正式版
 
-首个公开预发布候选，整合 M0-M4 里程碑交付 + 两轮独立 code review 修复。
-版本号遵循 VS Code Marketplace 约定（仅 `major.minor.patch` = `0.0.1`），预发布语义由 `--pre-release` 标记 + git tag `v0.0.1-rc.1` 体现。
+首个对外正式版本，在 VS Code Marketplace / OpenVSX 上以 **「Hyper Git - Agentic Git」** 之名发布。为 VS Code 提供统一的 Git 变更管理与提交工作流（多变更分组、自绘提交面板、可视化提交图、Shelf、行级提交）。采用**路径 B**（消费 `vscode.git` 稳定 `Repository` API 为底座；稳定 API 未覆盖的能力经 `GitRepositoryService.execGit` 复用同一 git 二进制 `api.git.path` 的受控 CLI 通道实现），与原生 Source Control 平行共存、零冲突。规模：**7 视图 / 93 命令 / 6 配置项**，**280 单元测试** + 集成测试，CI 三平台矩阵全程 GREEN。完整特性见 [Release Note v0.0.6](./docs/releases/v0.0.6.md)。
 
-**核心能力**：多 changelist Changes 视图、Commit 提交窗口（Conventional Commits 校验 + Amend/sign-off/skipHooks + Checkin hook 链）、Log/Branches/Blame/Show History、Stash（create/apply/pop/drop）、Discard 改动、Pull/Push/Fetch。架构路径 B（消费 vscode.git 稳定 API），5 个 AI 接缝已预埋（M5 实现）。
+### Added
 
-**已知限制**（vscode.git 稳定 API 边界）：cherry-pick / revert / reset / 分支重命名 / 行级 hunk 暂存 / 多 stash 列表枚举 / Author 覆盖暂不可用，详见 [实施状态 §3](./docs/milestones/implementation-status.md#3-api-限制汇总vscodegit-稳定-api-边界)。
+#### 变更与 Changelist
+- 按 Changelist 分组的 Changes 树视图：新建 / 重命名 / 删除 / 设活动列表 / 跨列表移动文件，`workspaceState` 持久化（重启恢复）；文件状态色复用 `gitDecoration.*` 主题色；单击打开原生 Diff（HEAD ↔ Working）。
+- 文件级操作：丢弃改动、加入 `.gitignore`、显示文件历史。
 
-### Added — M4 Stash/Shelf（0.5.0）
+#### Commit 提交窗口
+- 自绘提交面板（WebviewView）：活动 Changelist 文件勾选 + 多行消息编辑器 + Amend / Signed-off-by / 跳过 Git Hooks + **提交** / **提交并推送**；勾选集即提交权威范围（仅提交选中的文件集合）；最近消息一键复用。
+- Conventional Commits 实时校验（可配置）+ 内置 `ConventionalCommitCheck` Checkin Hook；`CommitPipeline` 责任链设计参考 JetBrains `CheckinHandler`（校验 → 暂存 → Hook 链 → 提交 → 可选推送）。
 
-- **Stash 视图**：`StashTreeProvider` 经 `Repository.log({ refNames: ['stash'] })` 枚举 stash（API 不暴露 `git stash list`，以此近似）。
-- **Stash 操作**：`createStash` / `applyStash` / `popStash` / `dropStash`（经 vscode.git 稳定 API），配视图标题按钮与右键菜单 + viewsWelcome。
-- **Shelf（MVP）**：以 stash 近似 IDEA shelve（工程方案 §4 P2 约定）；忠实 patch Shelf 受 API 限制延后。
-- **API 限制（文档化延后）**：行级 partial commit（vscode.git `add` 仅整文件，无 hunk 暂存）、忠实 patch Shelf、Staging Area 模式开关、cherry-pick/revert/reset/分支重命名——均无稳定 API 对应，未来可经 git CLI 兜底或 proposed API 评估。
+#### Log 提交图与历史
+- 自绘 **Graph DAG** webview：基于父子关系自计算 lane 布局，彩色泳道 / 节点 / 分叉·合并连线 / HEAD·分支·标签徽标，`--topo-order` 保拓扑序，行宽随实际 lane 自适应；虚拟化滚动增量加载、↑↓ 键导航；选中提交内联展开变更文件并打开单文件 Diff。
+- **提交图 × CI 状态**：每条提交行最右侧显示 GitHub CI 最终状态（绿勾/红叉/运行中），悬停 Tooltip 展示各项检查 + 未通过原因 + 跳转链接；复用 VS Code 内置 GitHub 认证（`vscode.authentication`，凭证不经 chat/日志/webview），仅取可见行懒加载、批量 GraphQL（≤100 oid）+ 限流冷却、终态缓存；非 GitHub 远程零图标零请求，支持 github.com 与 GitHub Enterprise；配置 `hyperGit.log.ci.{enabled,remote,provider}`。
+- **Checkpointer 过滤**：Log 视图新增 Checkpointer 选项，默认剔除 AI 编码工具产生的自动快照（checkpoint）提交，提交图更干净，可按需开启。
+- **7 个可组合过滤器**：作者、路径、message（grep）、message（正则）、合并模式、日期、一键清除；复制 commit hash、刷新。
+- per-commit 操作：Reset 到此（soft/mixed/hard/keep）、从此新建分支 / 标签、查看包含此提交的分支、Cherry-Pick、Revert。
 
-### Added — M3 Log/Branches/Diff·Blame（0.4.0）
+#### Branches 与 Tags
+- 四段分组（收藏 / 本地 / 远程 / 标签）+ ahead·behind·upstream 跟踪展示；新建 / 检出 / 删除 / 重命名 / 合并 / 变基 / 从选中新建并检出；收藏切换、与当前分支比较、任意两分支比较、复制引用、清理已合并分支。
+- **多选批量操作**：`createTreeView({ canSelectMany: true })` 支持框选，批量删除分支/标签、批量复制引用、批量收藏；删除前 `git branch --merged` 分类已合并/未合并并诚实分栏确认强制删除风险；仅单目标语义的操作经 `!listMultiSelection` 在多选时隐藏。
+- 标签：新建（轻量/附注）、删除（多选）、检出（detached HEAD）。
 
-- **Log TreeView**：消费 `Repository.log()`，按 author/path 过滤（清除过滤）、复制 commit hash、显示文件历史。完整提交图（SVG 拓扑连线）作为后续增强（M3.x）。
-- **Branches TreeView**：消费 `Repository.state.refs`（Local/Remote 分组），活动分支高亮；支持新建/检出/删除/合并/变基（rebase）。
-- **Blame**：`Show Blame` 命令对当前文件执行 `repo.blame` 并以只读文档展示。
-- **Show History**：从 Changes 文件右键跳转 Log 并按该文件路径过滤。
-- **API 限制（文档化延后）**：vscode.git 稳定 API 不含 cherry-pick / revert / reset / 分支重命名，这些 IDEA 功能暂不可用（未来可 CLI 兜底）。
+#### Stash 与 Shelf
+- Stash：创建、保留已暂存创建、应用、Pop、删除、从 Stash 创建分支、清空全部，按真实 `stash@{n}` 索引操作。
+- Shelf（基于 patch、独立于 git stash 的改动搁置机制）：Shelve 暂存、静默 Unshelve、带 3-way 合并 Unshelve、删除；独立 TreeView。
 
-### Fixed — M0/M1/M2 审查修复（0.3.1）
+#### 远程与冲突
+- Pull / Push / Fetch（无上游分支自动选定 remote 并建立 `-u` 跟踪；`GitError.stderr` 优先暴露使失败可读）。
+- 对话框：**Push…**（normal / force-with-lease / force + 推送标签）、**Update Project…**（merge / rebase）、**Merge…**（ff-only / no-ff / squash + 自定义消息）。
+- 冲突兜底引导：merge/rebase/pull/cherry-pick/revert/stash-pop/unshelve 失败时检测冲突并弹「解决/中止」；自绘 **3-way Merge Editor**（OURS / RESULT 可编辑 / THEIRS + 写回 `git add`）；冲突文件「采用 Ours / Theirs」。
 
-经 3 路独立 code review（正确性 / 架构 / 完整性）交叉复核后修复：
+#### 历史编辑与高级操作
+- Cherry-Pick、Revert、Reset HEAD（soft/mixed/hard/keep）、交互式 Rebase（webview：pick/squash/fixup/drop + reword + 拖拽重排，经 `GIT_SEQUENCE_EDITOR` 非交互写入）、撤销最近提交（soft）、删除提交（rebase）、Fixup（autosquash）、改写最新提交信息。
 
-- **GitRepositoryService**：仓库切换时 `onDidChange` 订阅累积泄漏 → 改用单 `repoSub`，切换/卸载时 dispose。
-- **pickRepository**：`startsWith` 误匹配（无路径边界）→ 改用 `api.getRepository(folder.uri)` 精确匹配。
-- **getChanges**：缺失 `indexChanges`（已暂存文件不可见）→ 合并 index/working/untracked 按相对路径去重（index 优先）。
-- **commit 语义**：未勾选的已暂存文件先 `restore --staged`，让勾选集成为提交权威范围（对齐 IDEA「提交该集合」）。
-- **push 失败**：commit 成功后 push 失败误报「提交失败」→ 返回 `ok:true` + `warning`。
-- **extension.ts**：三个 `onDidChange` 订阅入 `subscriptions`（修复卸载泄漏）。
-- **refresh**：`await repo.status()` 后再刷新（避免陈旧数据）。
-- **conventional-linter**：Windows `\r\n` 行尾 + 中文/Unicode scope 支持。
-- **commit-webview**：`onDidReceiveMessage` 绑定 `view.onDidDispose`（修复重载泄漏）；nonce 改用 `crypto.randomBytes`；选中态 `setState` 持久化。
-- **changes-tree**：tooltip 显示状态全称（Modified 而非 M）；清理 `CommitFileItem` 冗余 `status/statusName` 字段。
-- **测试补齐**：`ConventionalCommitCheck`、`CommitService.executeCommit`（mock Repository，覆盖 CC 阻断/无文件/amend 透传/unstage/push 警告）、`git-status-map` 全量、`amend` 真实集成。
+#### 编辑器内能力
+- 行内提交：每个未暂存 Hunk 上方渲染 CodeLens「提交此 Hunk」→ patch 重建 + `git apply --cached` 仅暂存该 Hunk → 提交（含他处已暂存内容的二次确认）。
+- 部分暂存 / 取消暂存、光标处暂存、Hunk 归属 Changelist（持久化 hunk→CL 映射）。
+- Blame 行内注解：逐行作者 / 日期 / hash 显示于编辑器内，悬浮展示提交详情，文档编辑时自动清除。
 
-### Added — M2 Commit 提交窗口（0.3.0）
+#### Worktrees
+- 全生命周期管理：新建（新分支 / 检出已有 / detached）、在新窗口打开、锁定 / 解锁、移动、复制路径、删除（安全 / 强制）、清理失效 Worktree、刷新。
 
-- Commit 提交窗口（WebviewView 自绘 IDEA 风格）：活动 changelist 文件勾选 + 多行 Commit Message 编辑器 + Amend / Signed-off-by / 跳过 Git hooks 选项 + Commit / Commit and Push 按钮。
-- Conventional Commits 实时校验：`engine/commit/conventional-linter` 纯函数 + webview 指示器（ok/warning/error）+ 内置 `ConventionalCommitCheck` Checkin hook（pipeline 内阻断不合规提交）。
-- `CommitPipeline` 责任链接入提交流程（对齐 IDEA `CheckinHandler`：校验 → stage → hook 链 → commit → 可选 push）。
-- AI 接缝 5 接口 + Null 实现注入 CommitService（`ILlmProvider` / `ICommitMessageProvider` / `IPreCommitInspector` / `IChangelistGrouper` / `IConflictResolver`），M5 替换为真实实现。
-- 最近提交消息复用（`workspaceState` 持久化，webview 一键填入）。
-- 真实 git 提交闭环集成测试（fixture 仓库 + `vscode.git` add/commit + git log 校验）。
+#### 工具与配置
+- 导出 / 应用 Patch、查看 Reflog、3-way Diff 概览（HEAD ↔ Staged ↔ Working）、Console 命令输出面板。
+- 配置项：`hyperGit.commit.template`、`hyperGit.commit.conventional`、`hyperGit.ai.enabled`（M5 预留，暂不生效）、`hyperGit.log.ci.{enabled,remote,provider}`（提交图 CI 状态）。
 
-### Added — M1 Git Adapter + 多 changelist Changes（0.2.0）
+#### 架构与质量
+- 正交分层：`engine/`（纯逻辑，零 vscode 依赖、Vitest 可测）、`adapter/`（唯一接触 vscode API）、`agent/`（AI 接缝）、`ui/`、`shared/protocol.ts`（Webview ↔ Host 契约单一事实源）、`infra/`。
+- AI 接缝预埋 5 接口 + Null 实现（`ILlmProvider` / `ICommitMessageProvider` / `IPreCommitInspector` / `IChangelistGrouper` / `IConflictResolver`），设计参考 JetBrains `CheckinHandler` 提交生命周期，M5 替换为真实实现。
+- 品牌图标统一为「Git Pull Request」造型（活动栏 SVG + Marketplace 徽标 + README 头图，字形改编自 Tabler Icons，MIT）；活动栏图标实时显示未提交文件数角标。
+- CI 流水线：lint → 类型 → 构建 → 三平台测试矩阵（Ubuntu/macOS/Windows，Linux 经 xvfb）→ 打包 vsix；`v*` 标签触发 GitHub Release（附带可本地安装的 `.vsix`，正文取自 `docs/releases/`）+ OpenVSX 发布；VS Code Marketplace 由 `ENABLE_MARKETPLACE_PUBLISH` 变量门控。
 
-- Git Adapter：`GitRepositoryService` 封装内置 vscode.git 稳定 `Repository` API（读取 workingTreeChanges/untrackedChanges、状态变更事件、diff/toGitUri 委托）。
-- 多 changelist：`ChangelistRegistry`（active 列表、新建/重命名/删除/移动 + `workspaceState` 持久化，重启恢复）+ 引擎纯分组逻辑 `groupByChangelist`。
-- Changes TreeView：changelist 一级节点 + 文件叶子，状态色复用 `gitDecoration.*` 主题色（ThemeIcon + ThemeColor），文件单击打开原生 `vscode.diff`。
-- 命令：`refresh` / `newChangelist` / `setActiveChangelist` / `renameChangelist` / `deleteChangelist` / `moveChangelist` / `openDiff`，配视图标题与右键菜单（`viewItem` 上下文键）。
-- 测试：新增 `changelist-grouper`（5）+ `git-status-map`（9）单元测试；集成测试覆盖全部 M1 命令注册。
-- 工程修复：eslint flat config 忽略 `.vscode-test/**`（规避本地 test-electron 下载的 VS Code 导致 lint OOM）。
+### 已知限制
 
-### Added — M0 脚手架 + CI
+- Commit 窗口的 Co-authored-by / Author 覆盖（`--author`）/ 撤销最近提交按钮 UI 接线（engine `trailer` 已就绪，仅缺 webview 交互）。
+- Partial 多文件选择 UX、行级 split chunks（按选定行拆分提交）。
+- 目录 / folder diff（虚拟文档）、Submodules 管理。
+- M5 AI Agent（5 个接缝已预埋 Null 实现，本版未启动）。
 
-- 初始化 pnpm + esbuild + TypeScript（strict）工程骨架，对齐官方 `esbuild-sample`。
-- 正交分层目录：`engine/`（纯逻辑，零 vscode 依赖）、`adapter/`、`agent/`（AI 接缝预留）、`ui/`、`shared/`、`infra/`。
-- 质量基础设施：ESLint 9 flat config + typescript-eslint + @stylistic、Prettier、Vitest（engine 单测）、@vscode/test-electron + Mocha（集成测试）。
-- 工程约束：`.npmrc`（`node-linker=hoisted` 规避 vsce/pnpm hoisting）、`.vscodeignore`、`engines.vscode ^1.85.0` 与 `@types/vscode 1.85.0` 严格对齐。
-- 扩展贡献点：活动栏视图容器 `hyper-git` + `hyperGit.changes` 树视图（M0 占位，M1 接入真实 changelist）+ `hyperGit.showVersion` 命令 + 配置项（commit 模板 / Conventional Commits 开关 / AI 开关预留）。
-- 引擎层纯逻辑：`engine/scm-mapping`（FileStatus → gitDecoration.* 主题色映射）、`engine/commit/pipeline`（Checkin hook 责任链，对齐 IDEA `CheckinHandler.ReturnResult`）。
-- AI 接缝接口 + Null 实现：`agent/llm-provider.ts`（`ILlmProvider`）、`agent/pre-commit.ts`（`IPreCommitInspector`）。
-- Webview ↔ Host 消息契约单一事实源：`shared/protocol.ts`。
-- CI 流水线 `.github/workflows/ci.yml`：lint → build → test 矩阵（ubuntu/mac/win + Linux xvfb）→ package vsix → artifact；`tag v*` → 双市场发布（Marketplace + OpenVSX）。
+[0.0.6]: https://github.com/ThreeFish-AI/hyper-git/releases/tag/v0.0.6
diff --git a/README.md b/README.md
index 460c09e..e5e091d 100644
--- a/README.md
+++ b/README.md
@@ -1,61 +1,67 @@
-# Hyper Git
+<p align="center">
+  <img src="media/icon.png" alt="Hyper Git" width="112" height="112" />
+</p>
 
-> 在 VS Code 上完整复刻 IntelliJ IDEA 的 **Git 工具窗口** 与 **Commit 提交窗口**，并为未来 git 管理的 AI Agent 自主代理能力预留架构接缝。
+<h1 align="center">Hyper Git</h1>
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](./LICENSE)
+<p align="center">为 VS Code 带来统一的 <b>Git 变更管理</b> 与 <b>提交工作流</b>——多变更分组、自绘提交面板、可视化提交图、Shelf、行级提交，并为未来 git 管理的 AI Agent 自主代理能力预留架构接缝。</p>
 
-## 为什么需要 Hyper Git
+<p align="center">
+  <a href="https://github.com/ThreeFish-AI/hyper-git/actions/workflows/ci.yml"><img src="https://github.com/ThreeFish-AI/hyper-git/actions/workflows/ci.yml/badge.svg" alt="CI" /></a>
+  <a href="https://github.com/ThreeFish-AI/hyper-git/blob/HEAD/LICENSE"><img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="License: MIT" /></a>
+  <img src="https://img.shields.io/badge/VS%20Code-%E2%89%A5%201.85-007ACC.svg" alt="VS Code >= 1.85" />
+</p>
 
-IntelliJ IDEA 的统一 Git 工具窗口（顶部 `Commit / Shelf / Stash` 标签页 + Changes 变更树 + Commit Message 编辑区 + 提交前 Inspection）是开发者高频依赖的工作流。迁移到 VS Code 后，原生 Source Control 视图**缺少**：多 changelist、忠实的 Commit 窗口、提交前检查流水线、Shelf/行级提交等能力。Hyper Git 旨在 1:1 补齐这一体验。
+## 核心能力
 
-## 架构（路径 B：消费 + 自绘）
+- **多 Changelist Changes 视图**：将改动分组到命名列表，设活动列表为提交目标，新建/重命名/删除/移动，`workspaceState` 持久化（重启恢复）；状态色复用 `gitDecoration.*` 主题色。
+- **Commit 提交窗口**：自绘提交面板 + Conventional Commits 实时校验 + Amend / Sign-off / 跳过 Hook + 提交 / 提交并推送；勾选集即提交权威范围；最近消息复用。
+- **Log 提交图（自绘 DAG）**：彩色泳道、分叉·合并连线、HEAD/分支/标签徽标，虚拟滚动增量加载；7 个可组合过滤器（作者/路径/grep/正则/合并模式/日期/清除）；per-commit 操作（Reset、新建分支·标签、Cherry-Pick、Revert、查看包含分支）。
+- **Branches 分支管理**：收藏/本地/远程/标签四段分组 + ahead·behind·upstream 跟踪；新建/检出/删除/重命名/合并/变基/比较/收藏；**多选批量**删除、复制引用、收藏（已合并/未合并诚实分栏确认）。
+- **Stash & Shelf**：Stash 全操作（含 keep-index / clear / 从 Stash 建分支）；独立 **Shelf**（基于 patch、独立于 stash，含 3-way 合并 Unshelve）。
+- **Worktrees**：全生命周期管理——新建（新分支/检出/detached）、在新窗口打开、锁定/解锁、移动、删除、清理失效。
+- **行级与 Hunk 提交**：编辑器内 CodeLens「提交此 Hunk」、部分暂存/取消暂存、光标处暂存、Hunk 归属 Changelist。
+- **远程与冲突**：Pull/Push/Fetch + Push…/Update…/Merge… 对话框（force-with-lease / rebase / squash 等）+ 自绘 **3-way Merge Editor** 与冲突兜底引导。
+- **历史编辑**：Cherry-Pick、Revert、Reset、交互式 Rebase、Undo/Drop/Fixup/Reword。
+- **其他**：Blame 行内注解、Patch 导出/应用、Reflog、3-way Diff 概览、Discard、Diff（HEAD ↔ Working）。
 
-- **消费** 内置 `vscode.git` 扩展导出的稳定 `Repository` API 作为 git 操作底座（不重造 git 状态机）。
-- **自建** changelist registry（IDEA 的 active 列表 / 跨列表行级归属无法用原生 SCM group 表达）。
-- **自绘** 独立视图容器承载 IDEA 风格 UI，与原生 Source Control 视图零冲突、平行共存。
-- **AI**：现仅预留接口接缝（`ILlmProvider` / `IPreCommitInspector` 等，对齐 IDEA `CheckinHandler` 生命周期），实现延后至 M5。
+## 架构（路径 B：消费 + 自绘）
 
-## 功能（v0.0.1-rc.1）
+- **消费** 内置 `vscode.git` 导出的稳定 `Repository` API 作为 git 底座，不重造 git 状态机。
+- **受控 CLI 通道**：稳定 API 未覆盖的能力（cherry-pick / revert / reset / 分支重命名 / hunk 暂存 / stash 列表 / graph 拓扑 / shelf 等）经 `GitRepositoryService.execGit` 复用同一 git 二进制（`api.git.path`）实现。
+- **自绘视图** 承载完整的变更管理 UI；纯逻辑沉淀于 `engine/`（零 vscode 依赖、可单测）。
+- **AI 接缝**：预留 `ILlmProvider` / `IPreCommitInspector` 等 5 个接口（设计参考 JetBrains `CheckinHandler` 提交生命周期），实现延后至 M5。
 
-- **多 changelist Changes 视图**：active 列表、新建/删除/重命名/移动，`workspaceState` 持久化（重启恢复）；文件状态色复用 `gitDecoration.*` 主题色。
-- **Commit 提交窗口**：多行编辑器 + Conventional Commits 实时校验 + Amend / Signed-off-by / 跳过 Git hooks + Commit / Commit and Push；勾选集为提交权威范围；最近消息复用。
-- **Log 提交历史**：按作者/路径过滤、清除过滤、复制 commit hash、显示文件历史。
-- **Branches**：本地/远程分组、活动分支高亮；新建/检出/删除/合并/变基（rebase）。
-- **Stash**：create / apply / pop / drop（作用于 stash@{0} 最新）。
-- **其他**：Discard 改动、Pull / Push / Fetch、Blame、Diff（HEAD ↔ Working）。
+<p align="center">
+  <img src="media/framework.png" alt="Framework"/>
+</p>
 
 ## 安装
 
-- **VS Code Marketplace**：搜索 `Hyper Git`（发布后）。
-- **OpenVSX**（Cursor / Windsurf / Gitpod / VSCodium）：同 `Hyper Git`。
-- **手动**：从 [Releases](https://github.com/ThreeFish-AI/hyper-git/releases) 下载 `.vsix`（形如 `hyper-git-0.0.4.vsix`）→ 命令面板 `Extensions: Install from VSIX`。
-- **要求**：VS Code ≥ 1.85.0 + 启用内置 Git 扩展（`vscode.git`，默认随附）。
+- **手动（当前推荐）**：从 [Releases](https://github.com/ThreeFish-AI/hyper-git/releases) 下载 `hyper-git-agentic-git-x.x.x.vsix` → 命令面板 `Extensions: Install from VSIX`。
+- **OpenVSX**（Cursor / Windsurf / Gitpod / VSCodium）：搜索 `Hyper Git - Agentic Git`。
+- **VS Code Marketplace**：搜索 `Hyper Git - Agentic Git`（发布上线后可用）。
+- **要求**：VS Code ≥ 1.85.0 + 启用内置 Git 扩展（`vscode.git`，默认随附）。仅支持本地 git 仓库，不支持虚拟 / Web 工作区。
 
 ## 已知限制
 
-> vscode.git 稳定 API 不含 cherry-pick / revert / reset / 分支重命名 / hunk 暂存 / stash list / graph topology / shelf / author 覆盖等；**这些均已通过 `GitRepositoryService.execGit`（复用 `api.git.path` 同一 git 二进制）的受控 CLI 通道实现**（Batch 5-12 全量对齐，详见 [CHANGELOG](./CHANGELOG.md) [Unreleased]）。
-
-当前仍待补：
-
-- Commit 窗口的 Co-authored-by / Author 覆盖（`--author`）/ undo-last-commit **按钮 UI 接线**（engine `trailer` 已就绪，仅缺 webview 交互）。
-- Partial 多文件选择 UX、行级 split chunks（IDEA "Include Selected Lines"）。
+- Commit 窗口的 Co-authored-by / Author 覆盖（`--author`）/ 撤销最近提交的**按钮 UI 接线**（engine `trailer` 已就绪，仅缺 webview 交互）。
+- Partial 多文件选择 UX、行级 split chunks（按选定行拆分提交）。
 - 目录 / folder diff（虚拟文档）、Submodules 管理。
-- M5 AI Agent（5 个接缝已预埋 Null 实现，本轮未启动）。
+- M5 AI Agent（5 个接缝已预埋 Null 实现，本版未启动）。
 
-详见[工程实施方案](./docs/architecture/engineering-plan.md)、[实施状态总览](./docs/milestones/implementation-status.md)与[知识索引](./.agents/knowledge-map.md)。
+详见[工程实施方案](./docs/architecture/engineering-plan.md)、[实施状态总览](./docs/milestones/implementation-status.md)与[知识索引](./docs/.agents/knowledge-map.md)。
 
 ## 路线图
 
-| 里程碑 | 主题 | 状态 |
-|---|---|---|
-| M0 | 脚手架 + CI | ✅ |
-| M1 | Git Adapter + Changes TreeView（多 changelist） | ✅ |
-| M2 | Commit 提交窗口（模板 / Amend / CC 校验 / hook 链） | ✅ |
-| M3 | Log + Branches + Diff/Blame | ✅ |
-| M4 | Stash / Shelf MVP | ✅ |
-| M5 | AI Agent（实现接缝） | ⏳ 留存设计，暂不实施 |
-
-> ⚠️ vscode.git 稳定 API 不含 cherry-pick / revert / reset / 分支重命名 / 行级 hunk 暂存；这些 IDEA 功能暂不可用（详见[实施状态 §3](./docs/milestones/implementation-status.md#3-api-限制汇总vscodegit-稳定-api-边界)）。
+| 里程碑 | 主题                                                | 状态 |
+| ------ | --------------------------------------------------- | ---- |
+| M0     | 脚手架 + CI                                         | ✅    |
+| M1     | Git Adapter + Changes TreeView（多 Changelist）     | ✅    |
+| M2     | Commit 提交窗口（模板 / Amend / CC 校验 / Hook 链） | ✅    |
+| M3     | Log（Graph DAG） + Branches + Diff/Blame            | ✅    |
+| M4     | Stash / Shelf / 行级提交 / Worktrees                | ✅    |
+| M5     | AI Agent（接缝已预留，实现待启动）                  | ⏳    |
 
 ## 开发
 
@@ -63,14 +69,16 @@ IntelliJ IDEA 的统一 Git 工具窗口（顶部 `Commit / Shelf / Stash` 标
 pnpm install                  # 安装依赖
 pnpm run compile              # 类型检查 + lint + 构建
 pnpm run watch                # 监听构建（F5 启动 Extension Host 调试）
-pnpm run test:unit            # 单元测试（engine 纯逻辑，Vitest）
+pnpm run test:unit            # 单元测试（engine 纯逻辑，Vitest，280 例）
 pnpm run test:integration     # 集成测试（@vscode/test-electron）
 pnpm run package              # 生产构建
 pnpm dlx @vscode/vsce package # 打包 .vsix
 ```
 
-> 包管理与脚本统一使用 `pnpm`（遵循 [AGENTS.md](./AGENTS.md) 工程规范）。
+- **分层**：`engine/`（纯逻辑）→ `adapter/`（唯一接触 vscode API）→ `ui/`；`agent/` 以接口注入 `engine`，不反向依赖 UI；`shared/protocol.ts` 为 Webview ↔ Host 契约单一事实源。
+- **发布**：`v*` 标签触发 CI 产出 GitHub Release（附 `.vsix`，正文取自 [`docs/releases/`](./docs/releases/README.md)）+ OpenVSX；VS Code Marketplace 由 `ENABLE_MARKETPLACE_PUBLISH` 变量门控。
+- 包管理与脚本统一使用 `pnpm`（遵循 [AGENTS.md](./AGENTS.md) 工程规范）。完整文档见[文档中心](./docs/README.md)。
 
 ## 许可证
 
-[MIT](./LICENSE)
+[MIT](./LICENSE)。
diff --git a/.agents/browser-validation.md b/docs/.agents/browser-validation.md
similarity index 100%
rename from .agents/browser-validation.md
rename to docs/.agents/browser-validation.md
diff --git a/.agents/issue.md b/docs/.agents/issue.md
similarity index 58%
rename from .agents/issue.md
rename to docs/.agents/issue.md
index 6bd7b75..4cadad8 100644
--- a/.agents/issue.md
+++ b/docs/.agents/issue.md
@@ -62,4 +62,20 @@
 - **后续防范**：该 job 与市场 `publish` **解耦**（不 `needs: publish`、不挂 `environment: production`），保证「Release 带 `.vsix`」不被市场审批门/密钥缺失阻塞；「仅出 Release、暂不发市场」时不审批 production 即可，无需改 publish job；最小权限仅本 job 提权 `contents: write`。
 - **同类问题影响**：所有「CI 只上传 artifact + 发市场、却在 README 承诺 Release 手动下载」的 VS Code 扩展；artifact ≠ Release 资产，二者可见性/留存期差异易被忽视。
 
+## #8 Branches 视图无法多选（批量删除等批量操作缺失）
+
+- **表因**：用户截图反馈 Branches 视图中一组功能/工作分支无法框选多个、无法批量删除。
+- **根因**：`hyperGit.branches` 经 `vscode.window.registerTreeDataProvider` 注册——该 API **不支持** `canSelectMany`，故视图天然单选；所有分支命令处理器亦只接收单个 `BranchNode`。多选能力（`canSelectMany: true`）仅 `createTreeView` 的 `TreeViewOptions` 支持。
+- **处理方式**：改用 `createTreeView('hyperGit.branches', { treeDataProvider, canSelectMany: true })`（句柄入 subscriptions）。批量命令处理器签名扩展为 `(clickedNode, selectedNodes[])`——VS Code 多选树的 `view/item/context` 命令第 2 实参即完整选区数组。新增纯逻辑 `engine/ref/selection.collectBranchRefs`（谓词过滤 + shortName 去重 + 「点击在选区之外则以点击项为准」）与 `engine/ref/cleanup.partitionByMerged`/`formatBranchDeleteConfirm`，使 `branchDelete`/`tagDelete`/`copyBranchRef`/`toggleFavorite` 批量化（删除仅一次 `git branch --merged` 分类、汇总成功/失败、末尾单次刷新）。`package.json` 对仅单目标命令（检出/合并/变基/重命名/比较等）追加 `&& !listMultiSelection` 在多选时隐藏。
+- **后续防范**：① 需要承载 `.badge` 或 `canSelectMany` 等 `TreeViewOptions` 能力的视图，一律用 `createTreeView` 而非 `registerTreeDataProvider`（本仓 `hyperGit.changes` 已有先例）。② 多选命令正确性**只依赖处理器读取实参**（`clickedNode` + `selectedNodes[]`），不得依赖 `listMultiSelection` 上下文键——其对**自定义贡献视图**的可靠性无法确证，仅作菜单整洁的视觉优化；单目标命令因只读 `clickedNode` 即便该键失效仍安全。③ 「右键点击选区之外」须以点击项为准（手势目标优先），由归一化助手统一兜底。
+- **同类问题影响**：所有以 `registerTreeDataProvider` 注册却后续需要多选/角标的自定义 TreeView；以及误把单目标命令在多选下直接作用于「点击项」造成的隐性误操作。
+
+## #9 LOG 视图残留「已删分支」提交（实为工具注入的内部引用污染 `git log --all`）
+
+- **表因**：用户截图反馈 LOG 的 All 范围下，一批本应随分支删除而消失的提交仍以游离泳道残留；运行「清理已删远程分支」（#44，`git fetch --prune`）后**依旧存在**。
+- **根因**：`engine/log/log-query.ts` 的 `buildLogArgs` 对 `all`/`checkpointer` 范围下 `git log --all`。`--all` 遍历 `refs/` 下**全部**引用，不止 heads/remotes/tags——还包括宿主工具（如 Conductor）注入的 `refs/conductor-checkpoints/*`（会话快照）、`refs/conductor-archive-heads/*`（已删/被取代分支头的归档）。这些归档头让**真实的游离提交**（被 amend/rebase 取代、或分支删除后仅靠归档存活者）仍可达，画成游离泳道。而既有的客户端 `CHECKPOINT_SUBJECT_RE=/^checkpoint:/i` 过滤**只能拦住 checkpoint 元数据提交本身**，拦不住作为其祖先的游离业务提交——故泄漏。`git fetch --prune` 仅清理 `refs/remotes/*`，对上述非远端跟踪引用**完全无效**，这正是「prune 后依旧存在」的根因。实证：本仓 `--all` 取 241 提交、`--branches --tags --remotes` 仅 70；refs 命名空间 135 conductor-checkpoints + 17 conductor-archive-heads，远多于 3 heads/3 remotes/2 tags。
+- **处理方式**：`all` 范围由 `--all` 改为 `--branches --tags --remotes`（仅三大标准命名空间，排除一切工具注入的内部引用），根治游离泳道；`checkpointer` 范围**保留 `--all`**——该 Tab 的职责即「原始完整视图，含内部 checkpoint 快照」，需触达 `refs/conductor-checkpoints/*`。客户端 `keepCheckpoint` 过滤作为双保险保留。更新 `tests/unit/log-query.test.ts` 断言（`all` 含三件套、不含 `--all`；`checkpointer` 含 `--all`、不叠三件套）作回归护栏。
+- **后续防范**：① 「全分支视图」语义应映射到 `--branches --tags --remotes` 而非 `--all`——`--all` 是「全部引用」而非「全部分支」，二者差异恰是工具注入引用的污染面。② 客户端按提交 message 正则过滤是**漏的抽象**（拦不住作为祖先被带入的游离提交）；根治应在 ref 选取层（服务端参数）而非 subject 过滤层。③ **诊断 git 引用类问题时务必先 `git for-each-ref` 列出全部命名空间**——本案最初误判为「远端已删、本地未 prune」（#44 与一度推进的 prune-on-fetch 方案均为此误判），直到列出 refs 才发现真凶是 conductor-* 引用；「prune 无效」本身就是关键反证，应据其反向收敛而非强行加 prune。④ 修正「错漏逻辑」前先用 `git log --all` vs `--branches --tags --remotes` 的差集实证根因，避免再次基于关键字匹配机械式修改。
+- **同类问题影响**：所有在带「工具注入内部引用」环境（IDE/Agent checkpoint、`refs/stash`、`refs/replace/*`、`refs/notes/*` 等）下展示 `git log --all` 图的 Git GUI；凡把「范围 = 引用集合」与「范围 = message 过滤」混为一谈的实现均可能漏过游离提交。
+
 
diff --git a/.agents/knowledge-map.md b/docs/.agents/knowledge-map.md
similarity index 82%
rename from .agents/knowledge-map.md
rename to docs/.agents/knowledge-map.md
index 00aff2a..dff7a5c 100644
--- a/.agents/knowledge-map.md
+++ b/docs/.agents/knowledge-map.md
@@ -16,10 +16,12 @@
 
 ## 项目文档（docs/）
 - [文档中心](../docs/README.md) — 文档与调研资产总索引。
+- [Log 视图 CI 状态](../docs/features/log-ci-status.md) — 按提交显示 GitHub CI 最终状态（绿勾/红叉 + Tooltip 明细）：认证、限流、懒加载、边界与配置。
 - [实施状态总览](../docs/milestones/implementation-status.md) — M0-M5 交付记录 + API 限制 + M5 AI 设计 + 验证/发布（**实施看板**）。
 - [工程实施方案](../docs/architecture/engineering-plan.md) — 路径 B 架构 + M0-M5 里程碑（**开发蓝图**）。
-- [IDEA 功能复刻矩阵](../docs/requirements/idea-feature-matrix.md) — 56 功能点 / 8 组（**验收基线**）。
+- [Git 功能矩阵](../docs/requirements/idea-feature-matrix.md) — 56 功能点 / 8 组（**验收基线**，参考 IDEA 等成熟实现）。
 - [调研报告](../docs/research/README.md) — SCM 集成 / 工程蓝图 / 发布 CI / AI 接缝四路循证报告。
+- [发布说明](../releases/README.md) — 各正式版 Release Notes（GitHub Release 正文单一事实源；最新 [v0.0.6](../releases/v0.0.6.md)）。
 
 ## 架构分层（src/）
 > 依赖方向单向：`UI → Adapter → Engine`；`Agent` 以接口注入 `Engine`/`CommitPipeline`，不反向依赖 UI。
diff --git a/.agents/reference-specifications.md b/docs/.agents/reference-specifications.md
similarity index 100%
rename from .agents/reference-specifications.md
rename to docs/.agents/reference-specifications.md
diff --git a/docs/README.md b/docs/README.md
index 4f7e7b0..b32bb9f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -5,14 +5,20 @@
 ## 工程方案与需求基线（高频引用）
 - [实施状态总览（M0-M5）](./milestones/implementation-status.md) — 里程碑交付记录、P0/P1 达成矩阵、API 限制、M5 AI 设计、验证与发布状态（**实施看板**）。
 - [工程实施方案](./architecture/engineering-plan.md) — 全链路调研结论 + 路径 B 架构 + M0-M5 里程碑路线图 + 风险与验证（**开发蓝图**）。
-- [IDEA 功能复刻矩阵](./requirements/idea-feature-matrix.md) — 56 个原子功能点 / 8 组 + CheckinHandler 生命周期（**验收基线**）。
+- [Git 功能完备性矩阵](./requirements/idea-feature-matrix.md) — 56 个原子功能点 / 8 组 + CheckinHandler 生命周期（**验收基线**）。
+
+## 功能文档
+- [Log 视图 CI 状态](./features/log-ci-status.md) — 按提交显示 GitHub CI 最终状态（绿勾/红叉 + 悬停 Tooltip 明细）：认证、限流、懒加载、边界与配置。
+
+## 发布说明
+- [Release Notes 目录](./releases/README.md) — 各正式版发布说明（GitHub Release 正文单一事实源）；最新：[v0.0.6 首个 MVP](./releases/v0.0.6.md)。
 
 ## 调研报告（循证依据）
 - [02 · VS Code SCM API 与 vscode.git 集成路径](./research/02-vscode-scm-integration.md) — 路径 B 决策依据、SCM 稳定/proposed API 边界、changelist 模型映射。
 - [03 · VS Code 扩展工程蓝图](./research/03-extension-blueprint.md) — 技术栈决策、工程骨架、IDEA→VS Code UI 表面映射表。
 - [04 · 发布策略 + CI/CD](./research/04-publishing-cicd.md) — 双市场（Marketplace + OpenVSX）、CI 矩阵、版本治理、安全。
-- [05 · AI Agent 架构预留](./research/05-ai-agent-seams.md) — AI 接缝（ILlmProvider 等）+ IDEA CheckinHandler 对齐 + 渐进式引入路线。
+- [05 · AI Agent 架构预留](./research/05-ai-agent-seams.md) — AI 接缝（ILlmProvider 等）+ 借鉴 JetBrains CheckinHandler 责任链设计 + 渐进式引入路线。
 
 ## 协作与规范
 - [AGENTS.md](../AGENTS.md) — 协作协议与工程行为准则。
-- [知识索引](../.agents/knowledge-map.md) · [Issue 记录](../.agents/issue.md) · [引用规范 IEEE](../.agents/reference-specifications.md)。
+- [知识索引](./.agents/knowledge-map.md) · [Issue 记录](./.agents/issue.md) · [引用规范 IEEE](./.agents/reference-specifications.md)。
diff --git a/docs/architecture/engineering-plan.md b/docs/architecture/engineering-plan.md
index 61c8683..a00565b 100644
--- a/docs/architecture/engineering-plan.md
+++ b/docs/architecture/engineering-plan.md
@@ -1,13 +1,13 @@
 # Hyper Git — VS Code 扩展工程实施方案
 
-> 复刻 IntelliJ IDEA 社区版「Git 工具窗口 + Commit 提交窗口」全功能，并为未来 AI Agent 自主代理预留架构接缝。
+> 提供完整的「Git 变更管理 + Commit 提交工作流」（功能完备性参考 IntelliJ IDEA 等成熟实现），并为未来 AI Agent 自主代理预留架构接缝。
 > 决策已与用户确认：**路径 B**（消费 `vscode.git` API + 自建 changelist registry + 独立视图容器）、扩展命名 **Hyper Git**、**双市场发布**、**AI 现仅预留接缝 + Null 实现、延后至 M5**。
 
 ---
 
 ## 0. Context（背景与目标）
 
-**为什么做**：IntelliJ IDEA 的统一 Git 工具窗口（顶部 `Commit/Shelf/Stash` 标签页 + Changes 变更树 + Commit Message 编辑区 + 提交前 Inspection）是 Java/全栈开发者高频依赖的工作流，但迁移到 VS Code 后只能用原生 Source Control 视图（无多 changelist、无忠实 Commit 窗口、无提交前检查流水线）。本项目目标是**在 VS Code 上 1:1 复刻该体验**，并在未来为 git 管理引入 AI Agent（提交信息生成 / 提交前代码审查 / 变更语义分组 / 冲突解决）。
+**为什么做**：IntelliJ IDEA 的统一 Git 工具窗口（顶部 `Commit/Shelf/Stash` 标签页 + Changes 变更树 + Commit Message 编辑区 + 提交前 Inspection）是 Java/全栈开发者高频依赖的工作流，但迁移到 VS Code 后只能用原生 Source Control 视图（无多 changelist、无独立 Commit 窗口、无提交前检查流水线）。本项目目标是**在 VS Code 上提供同等完备的 Git 变更管理与提交工作流**，并在未来为 git 管理引入 AI Agent（提交信息生成 / 提交前代码审查 / 变更语义分组 / 冲突解决）。
 
 **当前状态**：仓库为全新 greenfield 工程（仅有 `.agents/` 文档脚手架与 AGENTS.md 协议，无源码 / 无 package.json / 无 README）。本方案从零搭建。
 
@@ -23,13 +23,13 @@
 | 决策项 | 结论 | 循证依据 |
 |---|---|---|
 | **git 操作底座** | 消费内置 `vscode.git` 扩展导出的 `API`（`getAPI(1)` → `Repository`），**不自调 git CLI、不重造状态机** | `git.d.ts` 已暴露 commit/add/revert/diff/blame/log/stash/branch/merge/rebase 全套；GitHub PR 扩展即此模式 |
-| **changelist 表达** | **自建 changelist registry**（仿 IDEA `ChangeListManager`），以 TreeView 渲染；**不**注册竞争性 SCM Provider | Track1：IDEA active 列表 + 跨列表行级归属，原生 SCM group 无法表达 |
+| **changelist 表达** | **自建 changelist registry**（借鉴 JetBrains `ChangeListManager` 设计），以 TreeView 渲染；**不**注册竞争性 SCM Provider | Track1：IDEA active 列表 + 跨列表行级归属，原生 SCM group 无法表达 |
 | **视图容器** | 活动栏新建独立视图容器 `hyper-git`，承载 Changes/Commit/Log/Branches/Shelf/Stash；**不接管/不替代原生 Source Control 视图**（避免双胞胎冲突） | Track2：注册独立 SCM 会与原生 git 视图并列混淆 |
 | **Commit 编辑器** | WebviewView 自绘（多行 / 模板 / Conventional Commits 校验 / Amend / Author / sign-off） | 原生 `SourceControlInputBox` 仅 `value` 字段，Provider 已删除 |
 | **Log 提交图** | Webview 自绘 SVG graph + 消费 `Repository.log()` | `scmHistoryProvider` 为 proposed，上架不可用 |
 | **Diff 预览** | 复用 `vscode.diff` + `api.toGitUri(uri,'HEAD')`（零成本） | Track2 §5.5 |
 | **发布** | 双市场（Marketplace + OpenVSX） | Cursor/Windsurf 走 OpenVSX；AI 受众主战场 |
-| **AI** | 现仅定义接缝 + Null 实现，实现延后 M5 | YAGNI + 复用 IDEA `CheckinHandler` 语义 |
+| **AI** | 现仅定义接缝 + Null 实现，实现延后 M5 | YAGNI + 借鉴 JetBrains `CheckinHandler` 责任链语义 |
 
 **架构总览（Mermaid，深色模式高对比）**：
 
@@ -105,7 +105,7 @@ hyper-git/
     ├── engine/               # 【引擎层】纯领域逻辑，零 vscode 依赖
     │   ├── model/            #   FileChange / Changelist / Commit / Branch / StashEntry / ConflictHunk
     │   ├── diff/             #   diff 解析 + 行级 patch（partial commit 基础）
-    │   ├── commit/           #   CommitPipeline（Checkin hook 责任链，仿 IDEA CheckinHandler）
+    │   ├── commit/           #   CommitPipeline（Checkin hook 责任链，借鉴 JetBrains CheckinHandler 设计）
     │   └── scm-mapping/      #   Status(M/A/D/U/R/C) → decorations 映射（纯函数）
     ├── adapter/              # 【适配层】唯一接触 vscode API
     │   ├── git-repository.ts #   GitRepositoryAdapter：封装 vscode.git Repository（add/commit/diff/log/stash/branch…）
@@ -118,7 +118,7 @@ hyper-git/
     ├── agent/                # 【代理层】AI 接缝（预留，Null 实现）
     │   ├── llm-provider.ts   #   ILlmProvider（模型来源抽象：vscodeLM/byok/openaiCompatible）
     │   ├── commit-message.ts #   ICommitMessageProvider（生成 + Conventional Commits 校验）
-    │   ├── pre-commit.ts     #   IPreCommitInspector（对齐 IDEA beforeCheckin/CommitCheck）
+    │   ├── pre-commit.ts     #   IPreCommitInspector（借鉴 JetBrains beforeCheckin/CommitCheck 机制）
     │   ├── grouper.ts        #   IChangelistGrouper（语义分组）
     │   ├── conflict.ts       #   IConflictResolver（三方合并建议）
     │   └── chat-tools.ts     #   IChatToolRegistrar（M5 暴露 git 能力给 Agent）
@@ -157,9 +157,9 @@ hyper-git/
 
 ---
 
-## 4. IDEA 功能复刻优先级矩阵
+## 4. 功能优先级矩阵
 
-> 基于 Track1 的 56 功能点，按价值×依赖×难度分入 P0(MVP)/P1(核心对齐)/P2(高级对齐)/P3(AI 增强)。完整 56 项明细见 [IDEA 功能复刻矩阵](../requirements/idea-feature-matrix.md)（后续验收的需求基线）。
+> 基于 Track1 的 56 功能点，按价值×依赖×难度分入 P0(MVP)/P1(核心功能)/P2(高级功能)/P3(AI 增强)。完整 56 项明细见 [功能矩阵](../requirements/idea-feature-matrix.md)（后续验收的需求基线）。
 
 | 优先级 | 功能域 | 代表功能（来源 Track1 编号） |
 |---|---|---|
@@ -168,9 +168,9 @@ hyper-git/
 | **P1 核心** | Commit 检查流水线 | 提交前 Inspection 框架(#10，对接 VS Code Diagnostics)、Commit Checks 顺序闸门(#11)、CRLF/大文件预检(#12)、Conventional Commits 校验(#4，IDEA 无内置需自建 linter) |
 | **P1 核心** | Branches | 创建/检出/删除/重命名(#45/#46)、Merge/Rebase/Pull/Push/Fetch(#48)、Compare(#47) |
 | **P1 核心** | Stash + Diff | Stash apply/pop/drop(#29/#30)、Annotate(blame)(#37)、Show History(#38) |
-| **P2 高级** | Partial / 行级提交 | 按代码块提交(#23)、按行提交(#24)、Move Lines to Changelist(#25)——最难，仿 `PartialChangesUtil` |
+| **P2 高级** | Partial / 行级提交 | 按代码块提交(#23)、按行提交(#24)、Move Lines to Changelist(#25)——最难，参考 `PartialChangesUtil` 实现 |
 | **P2 高级** | Log 提交图 | graph 自绘(#39)、filter(#40)、cherry-pick/revert from log(#41/#42)、Undo Commit(#43) |
-| **P2 高级** | Shelf | 忠实 shelve/unshelve with conflict(#27/#28，patch 存储+三方合并)；MVP 先用 stash 近似 |
+| **P2 高级** | Shelf | 完整 shelve/unshelve with conflict(#27/#28，patch 存储+三方合并)；MVP 先用 stash 近似 |
 | **P3 AI 增强** | （M5，接缝现已埋） | AI 提交信息生成、AI 提交前审查、AI 语义分组、AI 冲突解决、AI release notes、Chat Tools 暴露 git 能力 |
 
 ---
@@ -199,8 +199,8 @@ hyper-git/
 - 验收：Log 图正确渲染拓扑；分支操作经真实 git 验证；blame 行级显示作者。
 - 依赖：M1、M2。
 
-**M4 — Shelf + Partial/行级提交 + Stash UI（Parity 收口，0.6.0）**
-- 交付：忠实 Shelf（patch 存储 + unshelve 三方合并）、行级 partial commit（仿 `PartialChangesUtil` + 行级 hunk staging）、Stash 完整 UI（apply/pop/drop/clear/keep-index）、Git Staging Area 模式开关。
+**M4 — Shelf + Partial/行级提交 + Stash UI（功能收口，0.6.0）**
+- 交付：完整 Shelf（patch 存储 + unshelve 三方合并）、行级 partial commit（参考 `PartialChangesUtil` 实现 + 行级 hunk staging）、Stash 完整 UI（apply/pop/drop/clear/keep-index）、Git Staging Area 模式开关。
 - 验收：shelve/unshelve with conflict 可解；单文件部分行可单独提交。
 - 依赖：M2、M3。
 
@@ -213,13 +213,13 @@ hyper-git/
 
 ## 6. AI 集成架构预留点（现建接缝，M5 实现）
 
-> 对齐 IDEA `CheckinHandler` 生命周期（Track1 D 节：`beforeCheckin`/`CommitCheck.runCheck`/`includedChangesChanged`/`checkinSuccessful`/`checkinFailed`）。**只定义契约 + Null 实现，不引入 Copilot 依赖**（未启用 AI 用户零负担）。
+> 借鉴 JetBrains `CheckinHandler` 生命周期设计（Track1 D 节：`beforeCheckin`/`CommitCheck.runCheck`/`includedChangesChanged`/`checkinSuccessful`/`checkinFailed`）。**只定义契约 + Null 实现，不引入 Copilot 依赖**（未启用 AI 用户零负担）。
 
-| 接缝（Agent 层） | 对齐 IDEA | 为何现在抽 |
+| 接缝（Agent 层） | 借鉴 JetBrains 机制 | 为何现在抽 |
 |---|---|---|
 | `ILlmProvider`（模型来源抽象） | — | **最关键**：未来切换 vscodeLM/byok/自带 key 的命脉；晚抽则所有 AI 调用散落、迁移成本爆炸 |
 | `ICommitMessageProvider` | （IDEA 无内置，插件有） | 提交信息是 commit 流水线核心产物，留接缝让"无 AI→LM→自带 key"平滑切换 |
-| `IPreCommitInspector` | `beforeCheckin`/`CommitCheck.runCheck`（返回 COMMIT/CANCEL/DEFER，对齐 `ReturnResult`） | 复用 IDEA 20+ 年验证的 hook 闸门机制；AI 审查最佳挂载点 |
+| `IPreCommitInspector` | `beforeCheckin`/`CommitCheck.runCheck`（返回 COMMIT/CANCEL/DEFER，参考 `ReturnResult`） | 借鉴 JetBrains 20+ 年验证的 hook 闸门机制设计；AI 审查最佳挂载点 |
 | `IChangelistGrouper` | （IDEA 无内置） | 写回 changelist 模型（回写工作流，差异化于内置 Copilot） |
 | `IConflictResolver` | （IDEA 无内置） | 必须 `prepareInvocation` 用户确认（VS Code 工具确认机制，安全红线） |
 
@@ -259,7 +259,7 @@ hyper-git/
 - **单元测试（Vitest，< 30s）**：`engine/model`、`engine/diff`（行级 patch）、`engine/scm-mapping`（Status→decorations）、`engine/commit`（hook 责任链顺序/阻断）、Conventional Commits linter 纯函数。
 - **集成测试（@vscode/test-electron + Mocha，< 2min）**：`adapter/git-repository`（真实 fixture 仓库读 changes/commit/stash）、`adapter/changelist-registry`（持久化往返）、`adapter/webview`（postMessage 协议契约）、Commit 全链路（勾选→message→commit→验证 `git log`）。
 - **手动回归清单**：多 changelist 新建/移动/删除/重启持久化；Amend；Commit and Push；Conventional Commits 拦截；Log 图过滤；分支 merge/rebase；shelve/unshelve with conflict；行级 partial commit。
-- **浏览器/编辑器验证**：按 AGENTS.md 浏览器验证协议——用户已认证 Chrome 主 profile 打开真实仓库，截图验证 UI 还原度（Commit 窗口 vs 图1/图2 对齐）。
+- **浏览器/编辑器验证**：按 AGENTS.md 浏览器验证协议——用户已认证 Chrome 主 profile 打开真实仓库，截图验证 Commit 窗口的 UI 渲染与交互完整性（对照设计参考图1/图2）。
 - **发布前自证**：Diff 分析、测试覆盖、三平台 CI 绿、`.vsix` 在干净 VS Code + Cursor 实机安装回归。
 
 ---
diff --git a/docs/features/log-ci-status.md b/docs/features/log-ci-status.md
new file mode 100644
index 0000000..f976421
--- /dev/null
+++ b/docs/features/log-ci-status.md
@@ -0,0 +1,77 @@
+# Log 视图 CI 状态（GitHub Actions / Commit Status）
+
+> 在 Log 视图（`hyperGit.log`，可视化提交图）每条提交上显示其 **CI 最终状态**：绿勾=通过、红叉=失败、
+> 运行中=黄色旋转；悬停图标以浮层 Tooltip 展示「各项检查 + 未通过原因 + 运行链接」。
+> 数据源为 GitHub（Checks API + Commit Status），按 origin 远程主机自动判定 github.com / GitHub Enterprise。
+
+## 数据流
+
+```mermaid
+flowchart LR
+  subgraph Git["本地"]
+    A["git log → GraphRowVM"] --> B["图先渲染（CI 不阻塞）"]
+  end
+  subgraph WV["Webview（可见行懒加载）"]
+    B --> C["滚动收集未知 hash"]
+    C -->|"防抖 200ms"| D["log/requestCi"]
+  end
+  subgraph Host["Extension Host"]
+    D --> E["解析 origin 远程\nowner/repo/host"]
+    E --> F["vscode.authentication\n取 token（repo 范围）"]
+    F --> G["GraphQL 批量 ≤100 oid\nstatusCheckRollup"]
+    G --> H["按 oid 缓存\n终态永久 / pending 30s"]
+  end
+  H -->|"log/ciData"| I["webview 就地重绘图标"]
+  I --> J["悬停 → Tooltip 明细"]
+  J -->|"log/openExternal"| K["host 校验主机后\nopenExternal"]
+  style A fill:#1f6feb,color:#fff
+  style G fill:#238636,color:#fff
+  style H fill:#8957e5,color:#fff
+  style J fill:#d29922,color:#fff
+```
+
+## 认证与安全
+
+- 复用 **VS Code 内置 GitHub 认证**（`vscode.authentication`），凭证由编辑器托管，**绝不经过 chat / 日志 / webview**。
+- 范围 `repo`：覆盖私有仓库的 Checks（Actions）+ Commit Status 读取（`repo:status` 不覆盖 Checks API）。
+- **静默优先**：加载时 `getSession({createIfNone:false})` 仅复用已有会话，**绝不自动弹窗**；仅当用户点击工具栏「登录 GitHub」
+  按钮时才以 `{createIfNone:true}` 触发原生授权 UI。未登录 → 显示登录提示、不渲染图标、不发请求。
+- **反 SSRF**：Tooltip 的跳转链接（`detailsUrl` / `targetUrl`，属「观察内容」）由 host 校验 `https` 且主机 ∈ {仓库主机、`*.github.com`} 后才 `openExternal`。
+
+## 限流与性能
+
+- **懒加载、仅取可见行**：webview 虚拟滚动只渲染 ~50 行，滚动时收集未知 hash（防抖 200ms）批量请求。1000 条提交永不触发 1000 次请求。
+- **批量 GraphQL**：单次最多 100 个 oid 的 `statusCheckRollup`（别名批量），并发上限 2。
+- **缓存**：终态（success/failure）整会话缓存（提交 CI 结果不可变）；pending/unknown 30s TTL，运行中构建会逐步刷新为终态。
+- **限流冷却**：读取响应 `rateLimit{remaining,resetAt}` 与 `Retry-After`；剩余点数 <100 或 403 时进入冷却，期间只走缓存并给出一次性提示。
+- **降级**：未推送提交（远程无此 object）/ 无 CI 配置 → 不渲染图标；网络错误不缓存、下次滚动重试；断网/限流不崩溃、建图正常。
+
+## 边界行为
+
+| 场景 | 表现 |
+|---|---|
+| 未推送 / 本地提交 | 无图标（远程无对应 object → unknown） |
+| 仓库无 CI 配置 | 无图标（rollup 为 null → unknown） |
+| 非 GitHub 远程（GitLab 等） | 功能隐藏（零图标、零请求） |
+| GitHub Enterprise | 按 origin 主机自动判定，使用 `github-enterprise` provider（需用户已配置 `github-enterprise.uri`） |
+| 窄屏（.narrow 隐藏 author/date） | CI 图标例外保留可见 |
+
+## 配置
+
+| 键 | 默认 | 说明 |
+|---|---|---|
+| `hyperGit.log.ci.enabled` | `true` | 总开关。关闭后零图标、零请求。 |
+| `hyperGit.log.ci.remote` | `""` | 查询用的远程名；留空=自动（优先 `origin`），多远程可指定如 `upstream`。 |
+| `hyperGit.log.ci.provider` | `auto` | `auto`（按主机判定）/ `github.com` / `github-enterprise`。 |
+
+## 实现
+
+- 引擎层（纯逻辑，Vitest 可测）：[`engine/ci/`](../../src/engine/ci) — `remote-parser.ts`（URL→坐标/端点）、`graphql-query.ts`（批量查询构造）、`rollup.ts`（状态归一化/聚合）、`model.ts`（响应解析）、`types.ts`。
+- 适配层（唯一触碰 vscode/网络）：[`adapter/ci/`](../../src/adapter/ci) — `github-auth.ts`（认证）、`github-ci-service.ts`（缓存/批量/限流/降级/openExternal）。
+- 协议：[`shared/protocol.ts`](../../src/shared/protocol.ts) — `log/requestCi`、`log/ciData`、`log/ciMeta`、`log/openExternal`、`log/ciSignIn`。
+- 渲染：[`adapter/webview/log-webview.ts`](../../src/adapter/webview/log-webview.ts) — 内联 JS 的懒加载、图标槽位（提交行最右侧）、自定义 Tooltip 浮层。
+
+## 验证
+
+1. `pnpm run check-types` + `pnpm run lint` + `pnpm run test:unit`（含 `tests/unit/ci-*.test.ts`）全绿。
+2. Extension Development Host（F5）在 GitHub 仓库：未登录见「登录 GitHub」提示 → 点击原生授权 → 可见行右侧渐次出现图标；悬停红叉见明细 + 链接；点击打开 run；未推送/非 GitHub → 无图标；断网/限流不崩溃。
diff --git a/docs/milestones/implementation-status.md b/docs/milestones/implementation-status.md
index df0cdb1..d31d0df 100644
--- a/docs/milestones/implementation-status.md
+++ b/docs/milestones/implementation-status.md
@@ -2,16 +2,16 @@
 
 > Hyper Git VS Code 扩展的里程碑实施记录、API 限制发现、功能达成矩阵与 M5 AI 设计（留存）。
 > 本文档随里程碑推进即时更新；调研与原始方案见 [工程实施方案](../architecture/engineering-plan.md) 与 [调研报告](../research/README.md)。
-> 最后更新：2026-06-29（Parity Recovery Batch 5-12 全量对齐 IDEA 完成）。
+> 最后更新：2026-06-29（Parity Recovery Batch 5-12 全量功能对齐完成）。
 >
-> **⚠️ 重大更新（2026-06-29，Batch 5-12）**：经 IDEA Git 功能复刻评审，发现「功能多数已实现，但被 Branches 视图渲染 bug + 工具栏未浮现 + 命令 bug 掩盖」。本批 Recovery **先解除可见痛感，再全量补齐**：新增 13 个 engine 纯逻辑模块 + 21 个命令，单测 64 → 166、命令 56 → 77。**§3 所列 vscode.git 稳定 API 限制（cherry-pick/revert/reset/branch rename/hunk 暂存/stash list/graph topology/shelf/author 等）现均已通过 `GitRepositoryService.execGit`（复用 `api.git.path` 同一 git 二进制）受控 CLI 通道解决**。详见 [CHANGELOG](../../CHANGELOG.md) [Unreleased]。
-> AI M5 暂不启动（5 个接缝保留 Null 实现，本轮专注 IDE 对齐）。
+> **⚠️ 重大更新（2026-06-29，Batch 5-12）**：经 Git 功能完备性评审，发现「功能多数已实现，但被 Branches 视图渲染 bug + 工具栏未浮现 + 命令 bug 掩盖」。本批 Recovery **先解除可见痛感，再全量补齐**：新增 13 个 engine 纯逻辑模块 + 21 个命令，单测 64 → 166、命令 56 → 77。**§3 所列 vscode.git 稳定 API 限制（cherry-pick/revert/reset/branch rename/hunk 暂存/stash list/graph topology/shelf/author 等）现均已通过 `GitRepositoryService.execGit`（复用 `api.git.path` 同一 git 二进制）受控 CLI 通道解决**。详见 [CHANGELOG](../../CHANGELOG.md) [Unreleased]。
+> AI M5 暂不启动（5 个接缝保留 Null 实现，本轮专注功能完备性）。
 
 ---
 
 ## 0. 概览
 
-- **架构**：路径 B —— 消费内置 `vscode.git` 稳定 `Repository` API + 自建 changelist registry + 独立视图容器自绘 IDEA 风格 UI，不接管原生 Source Control 视图。
+- **架构**：路径 B —— 消费内置 `vscode.git` 稳定 `Repository` API + 自建 changelist registry + 独立视图容器自绘 UI，不接管原生 Source Control 视图。
 - **分层**：`engine/`（纯逻辑，零 vscode 依赖）/ `adapter/`（唯一接触 vscode API）/ `agent/`（AI 接缝）/ `shared/`（契约）/ `infra/`。
 - **质量基线**：TypeScript strict + ESLint9 + Vitest（engine 单测）+ @vscode/test-electron（adapter 集成）+ esbuild + 三平台 CI（Linux xvfb）。
 - **验证**：单测 45/45、集成 3/3（含真实 git 提交闭环 + amend）、`vsce package` 产 vsix。
@@ -27,7 +27,7 @@
 | M0-M2 审查修复 | 0.3.1 | [#5](https://github.com/ThreeFish-AI/hyper-git/pull/5) | 11 类正确性修复（订阅泄漏/仓库选取/indexChanges/commit 语义/push 警告/linter 等）+ 16 项测试补齐 | 单测 45/45 + 集成 3/3 |
 | M3 Log/Branches/Blame | 0.4.0 | [#6](https://github.com/ThreeFish-AI/hyper-git/pull/6) | Log TreeView（过滤+copy hash+Show History）、Branches TreeView（create/checkout/delete/merge/rebase）、Blame | 命令注册集成 |
 | M4 Stash/Shelf | 0.5.0 | [#7](https://github.com/ThreeFish-AI/hyper-git/pull/7) | Stash 视图（log refnames 枚举）+ create/apply/pop/drop；Shelf MVP（stash 近似） | 命令注册集成 |
-| **Parity Recovery Batch 5-7** | — | commit `00b5ba7`/`2105445`/`9699ee9` | Branches 渲染修复 + 工具栏 Action 组 + 冲突兜底；Branches 对齐 IDEA（Favorites/Tags/ahead-behind）；Rebase webview reword/edit/拖拽 1:1 复刻 | 单测 166/166 + 集成 3/3 |
+| **Parity Recovery Batch 5-7** | — | commit `00b5ba7`/`2105445`/`9699ee9` | Branches 渲染修复 + 工具栏 Action 组 + 冲突兜底；Branches 视图增强（Favorites/Tags/ahead-behind）；Rebase webview 支持 reword/edit/拖拽交互式编排 | 单测 166/166 + 集成 3/3 |
 | **Parity Recovery Batch 8-9** | — | commit `efd888c`/`ed01883` | Log 提交详情面板 + 高级过滤 + per-commit 操作；真实 SVG 提交拓扑图（解析 git --graph 字符粒度渲染 + 可点击 + 实时刷新） | 同上 |
 | **Parity Recovery Batch 10-12** | — | commit `2274d8a`/`fcb6ffa`/`acdf53c` | Push/Update/Merge 对话框 + fetch prune + Co-authored-by trailer；自绘 3-way Merge Editor（自实现 diff3）；Stash 高级 + Patch + Reflog + Blame 行内注解 | 同上 |
 
@@ -79,7 +79,7 @@
 **5 个 AI 接缝**（agent/，依赖 engine 不依赖 adapter）：
 - `ILlmProvider`：模型来源抽象（vscodeLM / byok-Ollama / openaiCompatible）。**最关键**——未来切换模型来源的命脉。
 - `ICommitMessageProvider`：AI 提交信息生成（staged diff + 团队规范 → 流式 CC 合规 message）。
-- `IPreCommitInspector`：提交前 AI 代码审查（对齐 IDEA `CheckinHandler.beforeCheckin`，可阻断）。
+- `IPreCommitInspector`：提交前 AI 代码审查（参考 JetBrains `CheckinHandler.beforeCheckin` 责任链设计，可阻断）。
 - `IChangelistGrouper`：变更语义分组（回写 changelist）。
 - `IConflictResolver`：冲突解决（用户逐块确认）。
 
@@ -104,6 +104,6 @@
 
 ## 7. 发布状态
 
-- **当前版本**：0.5.0（preview，内部里程碑）。
-- **首发候选**：v0.0.1-rc.1（package 版本 `0.0.1` + `--pre-release` + git tag `v0.0.1-rc.1`）。Marketplace 仅支持 `major.minor.patch`，预发布语义由 `--pre-release` 标记 + tag 体现。
+- **当前版本**：0.0.6（首个 MVP 正式版，对外首发；以「Hyper Git - Agentic Git」之名上架 Marketplace / OpenVSX）。
+- **首发历程**：经若干内部迭代与 `v0.0.1-rc.*` 预发布打磨后，以 `v0.0.5` 完成内部首发；因 Marketplace 上「Hyper Git」名称被误删不可用，遂将扩展更名为 **Hyper Git - Agentic Git**（`package.json` `name=hyper-git-agentic-git`），以 `v0.0.6`（git tag `v0.0.6`）重新上架。Marketplace 仅支持 `major.minor.patch`，预发布语义由 `--pre-release` 标记 + tag 体现。
 - **发布前置**：publisher 账号（`threefish-ai`）、VSCE_PAT / OVSX_PAT secrets、PNG 图标。
diff --git a/docs/releases/README.md b/docs/releases/README.md
new file mode 100644
index 0000000..df9ac29
--- /dev/null
+++ b/docs/releases/README.md
@@ -0,0 +1,17 @@
+# 发布说明（Release Notes）
+
+> 各正式版本的发布说明，面向用户、覆盖该版本的全部特性。
+
+本目录是 GitHub Release 正文的**单一事实源**：CI 在推送 `v*` 标签时，由 `github-release` job 经 `body_path: docs/releases/${tag}.md` 取对应文件作为 Release 正文（详见 [`.github/workflows/ci.yml`](../../.github/workflows/ci.yml)）。因此**每个 `v*` 标签都必须先有同名 Release Note 文件**，否则发布会失败——这是有意的发布纪律闸门。
+
+## 版本索引
+
+| 版本 | 说明 | 日期 |
+|---|---|---|
+| [v0.0.6](./v0.0.6.md) | 首个 MVP 正式版（以「Hyper Git - Agentic Git」之名上架） | 2026-06-30 |
+
+## 相关文档
+
+- [CHANGELOG](../../CHANGELOG.md) — 工程视角的逐版本变更记录（Added / Changed / Fixed）。
+- [README](../../README.md) — 项目说明、能力总览与开发指南。
+- [文档中心](../README.md) — 全部文档与调研资产索引。
diff --git a/docs/releases/v0.0.6.md b/docs/releases/v0.0.6.md
new file mode 100644
index 0000000..801d835
--- /dev/null
+++ b/docs/releases/v0.0.6.md
@@ -0,0 +1,106 @@
+# Hyper Git - Agentic Git v0.0.6 — 首个 MVP 正式版
+
+> 为 VS Code 带来统一的 **Git 变更管理** 与 **提交工作流**，并为未来 AI Agent 自主代理预留架构接缝。
+
+这是本扩展的**首个对外正式版本**，在 VS Code Marketplace / OpenVSX 上以 **「Hyper Git - Agentic Git」** 之名发布。它把开发者高频依赖、却在 VS Code 原生 Source Control 中长期缺失的 Git 工作流**一次性补齐**：多 Changelist 变更组织、自绘提交面板、可视化提交图、Shelf、行级提交，并与原生 Source Control **平行共存、零冲突**。
+
+---
+
+## ✨ 亮点速览
+
+- **多 Changelist 变更组织**：把工作区改动分组到命名列表，设活动列表为提交目标，重启自动恢复。
+- **自绘 Commit 提交面板**：勾选式提交面板，Conventional Commits 实时校验，Amend / Sign-off / 跳过 Hook，提交或提交并推送。
+- **可视化提交图（自绘 DAG）× CI 状态**：彩色泳道、分叉·合并连线、HEAD/分支/标签徽标；每条提交行右侧实时显示 **GitHub CI 最终状态**（绿勾/红叉/运行中），悬停查看各项检查、失败原因与跳转链接——告别 `git log --graph` 的粗糙 ASCII，也无需切到浏览器查构建结果。
+- **Branches 多选批量操作**：框选多个分支/标签，一次性删除、复制引用、收藏；已合并/未合并诚实分栏确认。
+- **独立 Shelf + 全量 Worktree**：基于 patch 的 Shelf（独立于 stash）与 Worktree 全生命周期管理（新建/打开/锁定/移动/删除）。
+- **行级与 Hunk 提交**：编辑器内 CodeLens「提交此 Hunk」、部分暂存、光标处暂存、Hunk 归属 Changelist。
+- **3-way Merge Editor**：自绘三栏冲突编辑器（OURS / RESULT / THEIRS），冲突时一键调起。
+
+---
+
+## 🧩 完整能力
+
+### 变更与 Changelist
+按 Changelist 分组的 Changes 树（状态色复用 `gitDecoration.*` 主题色）；新建 / 重命名 / 删除 / 设活动 / 跨列表移动文件，`workspaceState` 持久化；单击打开原生 Diff（HEAD ↔ Working）；丢弃改动、加入 `.gitignore`、显示文件历史。
+
+### Commit 提交窗口
+多行消息编辑器 + Conventional Commits 实时校验（可配置开关）；Amend、Signed-off-by、跳过 Git Hooks；勾选集即提交权威范围（仅提交选中的文件集合）；最近消息一键复用；**提交** 与 **提交并推送** 双动作；提交流水线采用责任链设计（参考 JetBrains `CheckinHandler`：校验 → 暂存 → Hook 链 → 提交 → 可选推送）。
+
+### Log 提交图与历史
+自绘 **Graph DAG** webview（彩色泳道 / 节点 / 连线 / 引用徽标，拓扑保序，虚拟化滚动，↑↓ 键导航）；选中提交内联展开变更文件并打开单文件 Diff；**7 个可组合过滤器**——作者、路径、message（grep）、message（正则）、合并模式、日期、一键清除；per-commit 操作——复制 hash、Reset 到此、从此新建分支/标签、查看包含此提交的分支、Cherry-Pick、Revert。
+
+#### 提交图 × CI 状态（GitHub Actions / Commit Status）
+每条提交行最右侧显示其 **CI 最终状态**：绿勾=通过、红叉=失败、运行中=黄色旋转。悬停图标以浮层 Tooltip 展示「各项检查 + 未通过原因 + 运行链接」，让你**在提交图里一眼看出哪次提交挂了 CI**，无需跳转浏览器。
+- 复用 **VS Code 内置 GitHub 认证**（`vscode.authentication`），凭证由编辑器托管，**绝不经过 chat / 日志 / webview**；范围 `repo`，静默优先、仅点击「登录 GitHub」时才触发原生授权。
+- **性能与限流**：仅取可见行懒加载（虚拟滚动 ~50 行）、批量 GraphQL（单次 ≤100 oid）+ 限流冷却；终态整会话缓存、pending 30s 刷新。
+- **零打扰降级**：非 GitHub 远程（GitLab 等）零图标零请求；未推送/无 CI 配置 → 不渲染图标；断网/限流不崩溃、建图正常。支持 github.com 与 GitHub Enterprise（按 origin 主机自动判定）。
+
+#### Checkpointer 过滤
+Log 视图新增 **Checkpointer 选项**，**默认剔除** AI 编码工具产生的自动快照（checkpoint）提交，让提交图回归「人写的人类提交」，避免被海量自动提交淹没；可在过滤器面板按需开启查看。
+
+### Branches 分支管理
+四段分组（收藏 / 本地 / 远程 / 标签）+ ahead·behind·upstream 跟踪展示；新建 / 检出 / 删除 / 重命名 / 合并 / 变基 / 从选中新建并检出；收藏切换、与当前分支比较、任意两分支比较、复制引用、清理已合并分支；**多选批量**：批量删除分支/标签、批量复制引用、批量收藏（已合并/未合并风险诚实分栏确认）。
+
+### 标签 Tags
+新建（轻量/附注）、删除（支持多选）、检出（进入 detached HEAD）、从提交新建标签。
+
+### Stash 与 Shelf
+**Stash**：创建、保留已暂存创建、应用、Pop、删除、从 Stash 创建分支、清空全部，按真实 `stash@{n}` 索引操作。**Shelf**（基于 patch、独立于 git stash 的改动搁置机制）：Shelve 暂存、静默 Unshelve、带 3-way 合并 Unshelve、删除。
+
+### 远程操作
+Pull / Push / Fetch（无上游分支自动建立 `-u` 跟踪）；**Push…**（normal / force-with-lease / force + 推送标签）、**Update Project…**（merge / rebase）、**Merge…**（ff-only / no-ff / squash + 自定义消息）三类对话框；冲突兜底引导与 **3-way Merge Editor**，以及冲突文件「采用 Ours / Theirs」。
+
+### 历史编辑与高级操作
+Cherry-Pick、Revert、Reset HEAD（soft / mixed / hard / keep）、交互式 Rebase（webview：pick/squash/fixup/drop + reword + 拖拽重排）、撤销最近提交（soft）、删除提交（rebase）、Fixup（autosquash）、改写最新提交信息。
+
+### 编辑器内能力
+**行内提交**（每个未暂存 Hunk 上方 CodeLens「提交此 Hunk」）；部分暂存 / 取消暂存、光标处暂存、Hunk 归属 Changelist；**Blame 行内注解**（逐行作者/日期/hash + 悬浮详情）。
+
+### 工具
+导出 / 应用 Patch、查看 Reflog、3-way Diff 概览（HEAD ↔ Staged ↔ Working）、Console 命令输出面板。
+
+### 配置项
+- `hyperGit.commit.template`（提交模板）、`hyperGit.commit.conventional`（CC 校验开关）、`hyperGit.ai.enabled`（AI 能力开关，M5 预留）。
+- `hyperGit.log.ci.enabled` / `hyperGit.log.ci.remote` / `hyperGit.log.ci.provider`（提交图 CI 状态：总开关 / 查询远程 / 提供者 auto·github.com·github-enterprise）。
+
+> 规模实证：**7 个视图 / 93 个命令 / 6 个配置项 / 280 个单元测试**，覆盖 Git 变更管理主线工作流。
+
+---
+
+## 🏗️ 架构
+
+采用 **路径 B（消费 + 自绘）**，与原生 Source Control 平行共存、零冲突：
+
+- **消费** 内置 `vscode.git` 扩展导出的稳定 `Repository` API 作为 git 底座，不重造 git 状态机。
+- **受控 CLI 通道**：稳定 API 未覆盖的能力（cherry-pick / revert / reset / 分支重命名 / hunk 暂存 / stash 列表 / graph 拓扑 / shelf 等）经 `GitRepositoryService.execGit` 复用同一 git 二进制（`api.git.path`）实现。
+- **自绘视图** 承载完整的变更管理 UI；纯逻辑沉淀于 `engine/`（零 vscode 依赖、可单测）。
+- **AI 接缝**：预埋 5 个接口（`ILlmProvider` / `ICommitMessageProvider` / `IPreCommitInspector` / `IChangelistGrouper` / `IConflictResolver`，设计参考 JetBrains `CheckinHandler` 提交生命周期），M5 替换为真实实现，本版未启动。
+
+质量基线：**280 个单元测试**（engine 纯逻辑）+ 集成测试（`@vscode/test-electron` + fixture 仓库），CI 三平台（Ubuntu / macOS / Windows）矩阵校验，lint / 类型 / 构建全程 GREEN。
+
+---
+
+## 📦 安装
+
+- **手动安装（当前推荐）**：从 [Releases](https://github.com/ThreeFish-AI/hyper-git/releases) 下载 `hyper-git-agentic-git-0.0.6.vsix` → 命令面板执行 `Extensions: Install from VSIX`。
+- **OpenVSX**（Cursor / Windsurf / Gitpod / VSCodium）：搜索 `Hyper Git - Agentic Git`。
+- **VS Code Marketplace**：搜索 `Hyper Git - Agentic Git`（发布上线后可用）。
+
+**系统要求**：VS Code ≥ 1.85.0，且启用内置 Git 扩展（`vscode.git`，默认随附）。仅支持本地 git 仓库，不支持虚拟 / Web 工作区。
+
+---
+
+## ⚠️ 已知限制
+
+- Commit 窗口的 Co-authored-by / Author 覆盖（`--author`）/ 撤销最近提交的**按钮 UI 接线**仍待补（engine `trailer` 已就绪，仅缺 webview 交互）。
+- Partial 多文件选择 UX、行级 split chunks（按选定行拆分提交）。
+- 目录 / folder diff（虚拟文档）、Submodules 管理。
+- M5 AI Agent：5 个接缝已预埋 Null 实现，本版未启动。
+
+---
+
+## 🙏 致谢与许可
+
+图标字形改编自 [Tabler Icons](https://github.com/tabler/tabler-icons)（MIT）。完整工程变更见 [CHANGELOG](https://github.com/ThreeFish-AI/hyper-git/blob/master/CHANGELOG.md)。
+
+许可证：[MIT](https://github.com/ThreeFish-AI/hyper-git/blob/master/LICENSE)。
diff --git a/docs/requirements/idea-feature-matrix.md b/docs/requirements/idea-feature-matrix.md
index 462b269..3d6fb94 100644
--- a/docs/requirements/idea-feature-matrix.md
+++ b/docs/requirements/idea-feature-matrix.md
@@ -1,6 +1,6 @@
 # IntelliJ IDEA 社区版 Git/Commit 模块 调研报告
 
-> 调研目标：产出 IDEA「Git 工具窗口 + Commit 提交窗口」的【完整功能清单 + 关键源码锚点】，作为 VS Code 插件复刻的需求规约（Spec）基线。
+> 调研目标：产出 IDEA「Git 工具窗口 + Commit 提交窗口」的【完整功能清单 + 关键源码锚点】，作为本扩展 Git 变更管理与提交工作流的功能需求规约（Spec）基线（参考 IDEA 等成熟实现）。
 > 仓库：[JetBrains/intellij-community](https://github.com/JetBrains/intellij-community)（master 分支，2025–2026 年版本）
 > 官方文档：[IntelliJ IDEA Help 2026.1](https://www.jetbrains.com/help/idea/)
 > 调研时间：2026-06-27
@@ -44,7 +44,7 @@
 
 ### 组 1：Commit 窗口（Commit / Shelf / Stash 标签页 + 提交流水线）
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层 git/IDEA 机制 | 源码锚点（类路径） | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层 git/IDEA 机制 | 源码锚点（类路径） | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 1 | Commit 工具窗口（竖向，Alt+0） | 左侧竖向变更列表 + 提交信息区 + Diff 预览；非模态 | `Alt+0` / `Ctrl+K` | 平台 `CommitDialog/CommitToolWindow`，git4idea `GitCheckinEnvironment` | `vcs-impl/.../changes/ui/CommitChangeListDialog.java`、`DefaultCommitChangeListDialog.kt`；git4idea `checkin/GitCheckinEnvironment.kt` | 高 | 部分（SCM 面板，无竖向 commit 工具窗口形态） |
 | 2 | Commit Message 模板 | 默认填充 commit message（来自 `.git/COMMIT_TEMPLATE` / `commit.template` / merge message） | 打开 commit 窗口自动填充 | `git config commit.template`；EP `com.intellij.vcs.commitMessageProvider` | `commit/GitTemplateCommitMessageProvider.kt`；`vcs-api/.../changes/ui/CommitMessageProvider.java`；`checkin/GitCheckinEnvironment.getDefaultMessageFor`（merge message） | 低 | 无原生（需插件/git config） |
@@ -63,7 +63,7 @@
 
 ### 组 2：Local Changes 变更列表（多 changelist 模型）
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 15 | 多 changelist | 同时维护多个命名变更列表 | Commit 窗口左侧树 | `ChangeListManager` + `LocalChangeList` 模型 | `vcs-api/.../changes/ChangeListManager.java`、`LocalChangeList`（接口）；`vcs-impl/.../changes/ChangeListManagerImpl.java`、`ChangeListWorker.java` | 高 | **无**（VS Code SCM 仅多 group，非命名 changelist） |
 | 16 | Active changelist | 设置默认活动列表；新改动落入此列表 | `Ctrl+Space` / 右键 Set Active | `getDefaultChangeList/setDefaultChangeList`；命令 `SetDefault` | `ChangeListManager`；`changes/local/SetDefault.java` | 中 | **无**（无 active 概念） |
@@ -75,7 +75,7 @@
 
 ### 组 3：Partial / Selective / 按行（line-level）提交
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 22 | 选择性勾选文件提交 | 勾选/取消文件，未勾选保留 | 复选框 | changelist 内子集提交 | `vcs-impl/.../changes/ui/CommitDialogChangesBrowser.java`；`GitCheckinEnvironment.commit(changes)` 接受子集 | 低 | 是（SCM 文件勾选） |
 | 23 | 按代码块（chunk）提交 | Diff 中勾选 chunk 提交，其余保留 | Diff 区勾选 | `PartialLocalLineStatusTracker` + `PartialCommitHelper` | `vcs-impl/.../impl/PartialChangesUtil.kt`（`getPartialTracker`/`processPartialChanges`）；`vcs-api/.../vcs/ex/PartialCommitHelper`；`GitCheckinEnvironment.addPartialChangesToIndex` | **高** | 部分（git staging + chunk staging，VS Code 1.70+ 支持 staging selected lines） |
@@ -85,7 +85,7 @@
 
 ### 组 4：Shelf 与 Stash
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 27 | Shelve changes（IDEA patch） | 暂存选定改动为 IDEA patch；可选择部分文件 | 右键 Shelve Changes / Shelve Silently（`Ctrl+Shift+H`） | `ShelveChangesManager`（patch 文件存储） | `vcs-impl/.../changes/shelf/ShelveChangesManager.java`、`ShelveChangesAction.kt`、`ShelveChangesCommitExecutor.java` | 中 | **无**（需 git stash 替代） |
 | 28 | Unshelve silently / with conflict | 还原 shelf；静默或弹冲突解决 | `Ctrl+Shift+U` / Unshelve Silently（`Ctrl+Alt+U`）/ 拖拽 | `ShelvedChangesViewManager` + 3-way merge（冲突） | `shelf/UnshelveWithDialogAction.java`、`ShelvedChangesViewManager.java`、`RestoreShelvedChange.java` | 中 | 无 |
@@ -98,7 +98,7 @@
 
 ### 组 5：Diff（对比）
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 35 | 与 HEAD/分支/本地对比 | Diff Viewer 对比本地 vs HEAD / 任意分支 / 本地版本 | Diff 按钮（`Ctrl+D`）/ Compare HEAD, Staged and Local | `DiffProvider`/`GitDiffProvider` | `git4idea/diff/`；`ui/GitShowDiffWithBranchPanel.kt`；`branch/GitCompareBranchesUi.kt` | 中 | 是（editor diff） |
 | 36 | Compare HEAD/Staged/Local 三方 | 三窗 Diff（repo / 中央可编辑 staging / local） | 右键 Compare HEAD, Staged and Local Versions | staging area interactive staging | 官方文档「Stage changes interactively」；`checkin/GitIndexUtil`（`listStaged`/`listTree`） | 中 | 部分 |
@@ -107,7 +107,7 @@
 
 ### 组 6：Log 提交图
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 39 | 提交图（graph） | 分支拓扑图、彩色节点 | Git 工具窗口 Log tab（`Alt+9`） | `platform/vcs-log`（VcsLog data + UI） | `platform/vcs-log/`（`VcsLogUi`、graph 渲染）；git4idea `log/` | **高** | 无原生（需 GitGraph 等插件） |
 | 40 | Search / filter（author/path/date/branch/regex） | 按 author、path、date、branch、正则过滤 | Log toolbar 过滤 | VcsLog filter 体系 | `platform/vcs-log/`（filter providers）；官方文档 [Log Tab](https://www.jetbrains.com/help/idea/log-tab.html) | 中 | 部分（无原生图形 log 过滤） |
@@ -118,7 +118,7 @@
 
 ### 组 7：Branches
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 45 | Create / Checkout branch | 新建并检出 / 检出现有 / checkout-as-new | VCS widget / Branches pane | `git checkout -b/-` | `branch/GitCreateBranchOperation.kt`、`GitCheckoutOperation.java`、`GitCheckoutNewBranchOperation.java`；`actions/branch/GitCheckoutAsNewBranch.kt` | 低 | 是（命令面板） |
 | 46 | Delete / Rename branch | 删除本地/远程分支/标签、重命名 | 右键 Delete/Rename | `git branch -d/-D`/`-m`；`git push origin --delete` | `branch/GitDeleteBranchOperation.java`、`GitDeleteRemoteBranchOperation.java`、`GitRenameBranchOperation.java`、`GitDeleteTagOperation.java` | 低 | 部分 |
@@ -129,7 +129,7 @@
 
 ### 组 8：右键 / 内联操作
 
-| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 复刻难度 | VS Code 原生 |
+| # | 功能名 | 用户可见行为 | 触发入口 | 底层机制 | 源码锚点 | 实现难度 | VS Code 原生 |
 |---|---|---|---|---|---|---|---|
 | 51 | Revert / Rollback | 回滚未提交改动（`RollbackEnvironment`） | 右键 Rollback / `RollbackChangesDialog` | `git checkout --` / reset | `rollback/GitRollbackEnvironment.java`；`vcs-impl/.../changes/ui/RollbackChangesDialog.kt`、`RollbackWorker.java` | 中 | 是（Discard Changes） |
 | 52 | Reset HEAD（mixed/soft/hard/keep） | Git Reset 对话框选择模式 | 右键 / `GitResetHead` action | `git reset --soft/--mixed/--hard/--keep` | `actions/GitResetHead.java`；`ui/GitResetDialog.java` | 低 | 无原生（命令式） |
@@ -153,7 +153,7 @@
 | 提交范围 | 提交所选 changelist（或其中勾选子集） | 提交整个 Staged group |
 | 自动绑定分支 | **无原生 changelist↔branch 自动绑定**；需 Tasks 上下文（`ActiveChangeListTracker`） | 无 |
 
-> **复刻映射建议**：VS Code SCM 的 `ResourceGroup` 难以 1:1 表达「active + 跨文件行级归属」，建议在插件层自建「changelist registry」（仿 `ChangeListManager` + `ChangeListChange`），将 SCM group 作为渲染层，并通过 `LineStatusTracker`-like 行级 tracker 支撑 partial commit。这是 IDEA 模型对 VS Code 最大的差异与复刻难点。
+> **实现映射建议**：VS Code SCM 的 `ResourceGroup` 难以直接表达「active + 跨文件行级归属」，建议在插件层自建「changelist registry」（参考 `ChangeListManager` + `ChangeListChange` 设计），将 SCM group 作为渲染层，并通过 `LineStatusTracker`-like 行级 tracker 支撑 partial commit。这是 IDEA 模型与 VS Code 原生 SCM 模型最大的差异点与实现难点。
 
 ---
 
@@ -169,7 +169,7 @@
 | Before-Commit 设置项（Settings 页） | `UnnamedConfigurable getBeforeCheckinSettings()` | `Settings \| VCS \| Commit` 配置页 | 持久化设置 | 中：AI 规则配置 |
 | After-Commit 配置面板 | `RefreshableOnComponent getAfterCheckinConfigurationPanel(Disposable)` | 构建 After Commit 选项面板 | 注入部署等选项 | 低 |
 | **Before check-in（核心闸门）** | `ReturnResult beforeCheckin(CommitExecutor, PairConsumer)` / `beforeCheckin()` | 提交按钮按下后、真正 commit 前 | `COMMIT`/`CANCEL`/`CLOSE_WINDOW` 可阻断提交 | **高**：AI 代码审查/质量闸门，可阻断不良提交 |
-| **CommitCheck（现代协程闸门）** | `suspend CommitProblem? runCheck(CommitInfo)` / `runGitCheck(commitInfo, changes)` | beforeCheckin 的协程演进版；`commitInfo.isVcsCommit` 时执行 | 返回 `CommitProblem`（含 `showModalSolution`） | **高**：AI 异步审查最佳挂载点（仿 `GitCheckinHandler`） |
+| **CommitCheck（现代协程闸门）** | `suspend CommitProblem? runCheck(CommitInfo)` / `runGitCheck(commitInfo, changes)` | beforeCheckin 的协程演进版；`commitInfo.isVcsCommit` 时执行 | 返回 `CommitProblem`（含 `showModalSolution`） | **高**：AI 异步审查最佳挂载点（参考 JetBrains `GitCheckinHandler` 设计） |
 | CommitCheck 执行顺序 | `CommitCheck.ExecutionOrder getExecutionOrder()` | 排序多个 CommitCheck | `EARLY`/`DEFAULT`/`LATE` | 中：控制 AI 检查与其他检查顺序 |
 | CommitCheck 启用开关 | `boolean isEnabled()` | 决定是否运行 | 布尔 | 中 |
 | **Successful 回调** | `void checkinSuccessful()`（`@RequiresEdt`） | 提交成功后 | 通知/后续动作 | 高：AI 提交摘要、自动生成 PR 描述 |
@@ -180,7 +180,7 @@
 
 > **CommitContext 关键字段**（贯穿整个流水线，承载 commit 选项）：`commitToAmend`、`isSkipHooks`、`commitAuthor`、`commitAuthorDate`、`isSignOffCommit`、`isPushAfterCommit`、`isCommitRenamesSeparately`、`commitWithoutChangesRoots`。源码：`GitCheckinEnvironment.updateState()` / `doCommit()`。
 >
-> **AI 接入建议**：实现一个 `CommitCheck`（EARLY 顺序）挂载 AI 审查 + 实现 `includedChangesChanged()` 动态生成 commit message + 实现 `checkinSuccessful()` 触发 AI 后处理，可完整复用 IDEA 提交流水线的「设计-实现-验证」闭环，无需重写 commit 引擎。
+> **AI 接入建议**：实现一个 `CommitCheck`（EARLY 顺序）挂载 AI 审查 + 实现 `includedChangesChanged()` 动态生成 commit message + 实现 `checkinSuccessful()` 触发 AI 后处理，可借鉴 JetBrains CheckinHandler 责任链的「设计-实现-验证」闭环，无需重写 commit 引擎。
 
 ---
 
@@ -209,7 +209,7 @@
 ---
 
 ## F. 待核实 / 不确定项
-1. **LocalChangeList 接口/实现类的精确文件路径**：zread 多次返回「文件不存在」（API 类可能位于非直觉路径或为生成/移动类），但其方法语义已通过 `ChangeListManager.java`（大量引用）+ `PartialChangesUtil.kt`（`LocalChangeList` import）+ `ChangeListWorker.java`（实现侧）交叉证实存在。**建议**复刻阶段直接以 `ChangeListManager` API 为契约蓝本。
-2. **Conventional Commits 内置校验**：WebSearch 与文档检索均未发现 IDEA 内置 CC 强校验类；结论为「IDEA 无原生 CC 校验，依赖 commit message 规则/第三方插件」，需在复刻时自行实现 CC linter。
+1. **LocalChangeList 接口/实现类的精确文件路径**：zread 多次返回「文件不存在」（API 类可能位于非直觉路径或为生成/移动类），但其方法语义已通过 `ChangeListManager.java`（大量引用）+ `PartialChangesUtil.kt`（`LocalChangeList` import）+ `ChangeListWorker.java`（实现侧）交叉证实存在。**建议**实现阶段直接以 `ChangeListManager` API 为契约蓝本。
+2. **Conventional Commits 内置校验**：WebSearch 与文档检索均未发现 IDEA 内置 CC 强校验类；结论为「IDEA 无原生 CC 校验，依赖 commit message 规则/第三方插件」，需在实现时自行构建 CC linter。
 3. **Changelist 自动绑定分支的具体类**：`ActiveChangeListTracker.kt` 存在，但「changelist↔branch」自动绑定疑似走 Tasks 上下文模块（非 git4idea），未定位到确切绑定类。
 4. **分支级 Pull/Push/Fetch 的精确 action 类**：`actions/branch/GitPullBranchAction.kt` 等结构已确认存在，但内部委托链（→ `GitBranchWorker`/`GitFetch`）未逐行核实。
diff --git a/docs/research/02-vscode-scm-integration.md b/docs/research/02-vscode-scm-integration.md
index cf738cd..851ce34 100644
--- a/docs/research/02-vscode-scm-integration.md
+++ b/docs/research/02-vscode-scm-integration.md
@@ -1,6 +1,6 @@
 # Track2 调研报告:VS Code SCM API 与 vscode.git 导出 API 集成路径
 
-> 调研对象:在 VS Code 中复刻 IDEA 风格 Git 工具窗口(多 changelist + Commit 窗口)的最佳集成路径。
+> 调研对象:在 VS Code 中实现统一 Git 变更管理面板(多分组列表 + 自绘 Commit 提交面板)的最佳集成路径。
 > 证据基线:microsoft/vscode 源码(`extensions/git/src/api/git.d.ts`、`api1.ts`、`vscode.d.ts`)、官方 SCM provider 指南、GitHub Issue 追踪记录、同类扩展(GitLens、vscode-pull-request-github)实践。
 > 检索时间:2026 年 6 月。所有关键事实附 GitHub 文件路径或官方文档 URL;存疑项标注「待核实」。
 
@@ -10,7 +10,7 @@
 
 | 决策项 | 结论 |
 |---|---|
-| **推荐路径** | **路径 B(纯消费 vscode.git 导出 API + 自建 TreeView/WebviewView 渲染 IDEA UI),原生 Source Control 视图保持不动** |
+| **推荐路径** | **路径 B(纯消费 vscode.git 导出 API + 自建 TreeView/WebviewView 渲染自绘 UI),原生 Source Control 视图保持不动** |
 | **changelist 模型** | VS Code SCM 是「分组(group)」模型,不是 IDEA 的「多 changelist」。多 changelist 用**自建 TreeView** 表达最忠实;若想借用原生视图,可用「每个 changelist 一个 `SourceControlResourceGroup`」近似但语义有损 |
 | **Commit 窗口 UI** | 放在 **Secondary Side Bar 的 WebviewView**(自建视图容器),自带 Commit/Shelf/Stash 标签页 + Commit Message 编辑器;**不依赖也不替代**原生 `SourceControlInputBox`(稳定字段太弱,且 `SourceControlInputBoxValueProvider` 已被官方删除) |
 | **提交图(Log)** | 原生 Source Control Graph 的 `scmHistoryProvider` **仍是 proposed API**(截至 2025-05 无 stable 时间表),不能稳定复用。Log 提交图须自建 TreeView + 消费 `Repository.log()` |
@@ -86,7 +86,7 @@ createResourceGroup(id, label) → { id, label, resourceStates, hideWhenEmpty, .
 | `iconPath?: string \| Uri \| {light, dark}` | 自定义图标 |
 | `source?: string` | 来源标注 |
 
-> IDEA 的 M/A/D/U/Renamed/Copied 完全可由 `letter` + `color` 组合复刻(git 扩展就是这么做的,见其 `Resource` 类的 decorations 计算)。
+> M/A/D/U/Renamed/Copied 等文件状态色完全可由 `letter` + `color` 组合实现(git 扩展就是这么做的,见其 `Resource` 类的 decorations 计算)。
 
 ### 1.5 QuickDiff(编辑器 gutter 内联 diff)
 
@@ -105,7 +105,7 @@ quickDiffProvider?: QuickDiffProvider  // provideOriginalResource(uri) → 原
 
 ### 1.7 SCM 菜单贡献点(自定义二级菜单/inline 按钮)
 
-来源:[官方指南](https://code.visualstudio.com/api/extension-guides/scm-provider#source-control-view)。**全部稳定**,且能力足够复刻 IDEA 文件右键菜单:
+来源:[官方指南](https://code.visualstudio.com/api/extension-guides/scm-provider#source-control-view)。**全部稳定**,且能力足够支撑文件右键菜单:
 
 | 菜单 id | 作用位置 | 可放 `inline`(行内按钮) |
 |---|---|---|
@@ -125,11 +125,11 @@ quickDiffProvider?: QuickDiffProvider  // provideOriginalResource(uri) → 原
 
 `SourceControlHistoryItem` / `SourceControlHistoryItemChange` / `scmHistoryProvider` **至今仍是 proposed API**。VS Code 团队成员 lszomoru 2025-05-13 在 issue [#185269](https://github.com/microsoft/vscode/issues/185269) 明确:「计划 finalize 但无时间表」。定义文件:[vscode.proposed.scmHistoryProvider.d.ts](https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts)。
 
-> 第三方扩展在 Marketplace 发布时使用 proposed API 受限(需特批)。因此 **IDEA 的 Log 提交图不能依赖原生 Source Control Graph,必须自建 TreeView**。
+> 第三方扩展在 Marketplace 发布时使用 proposed API 受限(需特批)。因此 **Log 可视化提交图不能依赖原生 Source Control Graph,必须自建 TreeView**。
 
 ### 1.9 Multi-Diff 编辑器 — proposed
 
-`scmMultiDiffSource`(多文件并排 diff 审查)是 proposed,跟踪 issue [#179000](https://github.com/microsoft/vscode/issues/179000),`vscode.changes` 命令标注「experimental, subject to change」。IDEA 风格的「提交前多文件 diff 预览」短期须自建 Webview 或逐文件 diff。
+`scmMultiDiffSource`(多文件并排 diff 审查)是 proposed,跟踪 issue [#179000](https://github.com/microsoft/vscode/issues/179000),`vscode.changes` 命令标注「experimental, subject to change」。「提交前多文件 diff 预览」短期须自建 Webview 或逐文件 diff。
 
 ---
 
@@ -272,7 +272,7 @@ git 本身**没有 changelist** 概念,只有 stage(index)。IDEA 的 changelist
 
 - **物理层**:所有变更仍来自 `Repository.state.workingTreeChanges`(单一事实源)。
 - **逻辑层**:Adapter 维护一个**本地 changelist 分配表**(`Map<filePath, changelistId>`),持久化到 workspace state(`context.workspaceState`)或 `.idea` 风格本地文件。
-- **提交语义**:「Commit 某 changelist」= `add(该 changelist 的 paths)` + `commit(msg)` + (可选)保留其余未 stage。这正向复刻 IDEA「selective commit」。
+- **提交语义**:「Commit 某 changelist」= `add(该 changelist 的 paths)` + `commit(msg)` + (可选)保留其余未 stage。这即对应「selective commit(选择性提交)」语义。
 - **Default changelist**:即 active changelist,未显式分配的变更自动落入。
 
 > 注意:此设计下,changelist 是**纯客户端逻辑分组**,不写 git 元数据(IDEA 的 changelist 也仅存于 `.idea/workspace.xml`,同理)。这与 git 的 stage 是两套正交机制,需在 UI 上明确区分(可提供「stage = 临时索引」「changelist = 持久分组」的认知锚点)。
@@ -309,17 +309,17 @@ git 本身**没有 changelist** 概念,只有 stage(index)。IDEA 的 changelist
 
 > GitLens 正是此模式:在 Source Control 活动栏挂自定义视图(来源:[gitkraken/vscode-gitlens issue #213](https://github.com/gitkraken/vscode-gitlens/issues/213) 讨论其视图置于 SCM 面板)。
 
-### 5.2 IDEA 顶部 Commit/Shelf/Stash 标签页 → VS Code 表达
+### 5.2 顶部 Commit/Shelf/Stash 标签页 → VS Code 表达
 
 两种实现,择一:
 
 - **方案 1(推荐):平铺视图节点**。上图 `sofia-git` 容器下并列 Changes/Commit/Log/Shelf/Stash 五个 view,用户点击切换(等价标签页)。
-- **方案 2:单 WebviewView 内自绘 Tabs**。一个 `sofia.main` webview 内用前端框架渲染 IDEA 风格 Tab 栏 + 各面板内容。自由度最高但失去原生 a11y/快捷键集成。
+- **方案 2:单 WebviewView 内自绘 Tabs**。一个 `sofia.main` webview 内用前端框架渲染自绘 Tab 栏 + 各面板内容。自由度最高但失去原生 a11y/快捷键集成。
 
 ### 5.3 Commit Message 编辑器(替代原生 inputBox)
 
 - 用 `WebviewView` 渲染一个**多行 Monaco-like 编辑器**(可用 `<textarea>` + 自绘,或内嵌 Monaco via webview)。
-- 能力复刻:模板注入、Conventional Commits 实时校验(前端逻辑)、Amend 开关、Author 覆盖、sign-off/fixup 选项。
+- 能力覆盖:模板注入、Conventional Commits 实时校验(前端逻辑)、Amend 开关、Author 覆盖、sign-off/fixup 选项。
 - 提交动作:webview 通过 `acquireVsCodeApi().postMessage` 把 message + opts 发回扩展,扩展调 `repository.commit(message, opts)`(opts 映射 `amend/signoff/signCommit/noVerify`)。
 - **与原生 inputBox 的协同**:可选「单向同步」——把自建编辑器的 value 回写 `repository.inputBox.value`,让原生视图也能看到(反之亦然,监听 inputBox 变化)。但因 inputBox 单行且无校验,这只是兼容性糖,主交互在自建编辑器。
 
@@ -339,8 +339,8 @@ WebviewView 底部固定区:
 
 git 的 stash ≠ IDEA 的 shelve。IDEA shelve 是 patch 存储于 `.idea/shelf/`。落地:
 - **近似用 stash**:`createStash({message, includeUntracked, staged})` 存、`applyStash/popStash` 取、`dropStash` 删。语义接近「shelve silently / unshelve」。
-- **忠实复刻 IDEA shelve**:自实现 patch 序列化(`git diff > patch` via `repository.diffBetweenPatch`),存到扩展 storage;apply 用 `repository.apply(patch, {threeWay})` 处理冲突(unshelve with conflict)。来源:git.d.ts `apply(patch, {allowEmpty, reverse, threeWay})` + `diffBetweenPatch`。
-- 推荐 MVP 用 stash 近似,v2 再做忠实 shelve。
+- **完整 Shelf 实现(patch 持久化)**:自实现 patch 序列化(`git diff > patch` via `repository.diffBetweenPatch`),存到扩展 storage;apply 用 `repository.apply(patch, {threeWay})` 处理冲突(unshelve with conflict)。来源:git.d.ts `apply(patch, {allowEmpty, reverse, threeWay})` + `diffBetweenPatch`。
+- 推荐 MVP 用 stash 近似,v2 再做完整 Shelf。
 
 ---
 
@@ -398,7 +398,7 @@ git 的 stash ≠ IDEA 的 shelve。IDEA shelve 是 patch 存储于 `.idea/shelf
 2. **产出 Adapter 层接口设计**:基于 git.d.ts 的 `Repository`/`RepositoryState`/`Change`/`Status`,定义 `GitRepositoryAdapter`(领域模型 Changelist/FileChange/Commit),作为 Engine 与 UI/Agent 的正交边界。
 3. **PoC 验证关键风险点**:(a) `extensionDependencies: ["vscode.git"]` + `getAPI(1)` 拿到 `Repository` 并读取 `workingTreeChanges`;(b) 自建 TreeView 渲染 changelist;(c) WebviewView Commit 编辑器 postMessage → `repository.commit()`。三项跑通即可消除主要技术不确定性。
 4. **v1 范围裁剪(YAGNI)**:Shelf 先用 stash 近似;Log 先用 `Repository.log()` 自建 TreeView;多文件 diff 先单文件 `vscode.diff`。复杂项排入 v2。
-5. **并行 Track**:本报告聚焦集成路径;建议并行启动「IDEA Git 工具窗口 UI 细节调研」(各面板交互/快捷键/状态机)与「AI Agent 提交信息生成/代码审查」调研,三者可在 Adapter 层汇合。
+5. **并行 Track**:本报告聚焦集成路径;建议并行启动「Git 变更管理面板 UI 细节调研」(各面板交互/快捷键/状态机,参考 IDEA 等成熟实现)与「AI Agent 提交信息生成/代码审查」调研,三者可在 Adapter 层汇合。
 
 
 ############################################################
diff --git a/docs/research/03-extension-blueprint.md b/docs/research/03-extension-blueprint.md
index 0201938..bad8b55 100644
--- a/docs/research/03-extension-blueprint.md
+++ b/docs/research/03-extension-blueprint.md
@@ -231,7 +231,7 @@ sofia-git/
 - **陷阱**:VS Code 自带 Git 扩展已注册 `id: 'git'` 的 `SourceControl`。若本项目也提供 SCM provider,会出现两个并列的「源代码管理」条目,用户困惑;`gitDecoration.*` 主题色与 `scmProvider`/`scmResourceGroup` context key 易串。
 - **规避**:
   1. 本项目 SCM 用**独立 `id`(如 `sofia-git`)**,通过 `when: scmProvider == sofia-git` 隔离菜单项,绝不硬绑 `git`。
-  2. 产品定位上明确:本项目是「IDEA 风格增强层」,**默认不接管原生 Git**,而是作为并列的增强 SCM provider;若要替代,需提供 `configuration` 开关 `sofiaGit.replaceNativeGit`(关闭原生 git 扩展需 `extensions.json`,影响大,默认关闭)。
+  2. 产品定位上明确:本项目是「Git 变更管理增强层」,**默认不接管原生 Git**,而是作为并列的增强 SCM provider;若要替代,需提供 `configuration` 开关 `sofiaGit.replaceNativeGit`(关闭原生 git 扩展需 `extensions.json`,影响大,默认关闭)。
   3. 文件状态色复用 `ThemeColor('gitDecoration.modified')` 等**已存在的主题 token**,而非新造,保证深色模式一致。[Source Control API](https://code.visualstudio.com/api/extension-guides/scm-provider)
 
 ### 4.2 Webview 性能与内存
diff --git a/docs/research/04-publishing-cicd.md b/docs/research/04-publishing-cicd.md
index 76030df..7ff51b5 100644
--- a/docs/research/04-publishing-cicd.md
+++ b/docs/research/04-publishing-cicd.md
@@ -1,6 +1,6 @@
 # Track4: VS Code 扩展发布策略 + CI/CD 流水线蓝图
 
-> 复刻目标:把"IDEA Git 工具窗口 + Commit 窗口"的 VS Code 扩展,从源码可靠、安全、自动化地交付到所有目标编辑器用户(原生 VS Code、Cursor、Windsurf、Gitpod、VSCodium/Code-OSS)。
+> 交付目标:把"提供统一 Git 变更管理与提交工作流"的 VS Code 扩展,从源码可靠、安全、自动化地交付到所有目标编辑器用户(原生 VS Code、Cursor、Windsurf、Gitpod、VSCodium/Code-OSS)。
 > 所有事实论断均附 GitHub 路径或官方文档 URL;不确定项标注"待核实"。
 
 ---
@@ -188,6 +188,28 @@ jobs:
 - **最小权限**:仅 `github-release` 提权 `contents: write`,顶层 `permissions: contents: read` 不动;
 - **复用**:消费 `package` job 既有的 `vsix` artifact,零重复打包。
 
+### 3.2.2 VS Code Marketplace 发布门控（特性开关，本仓 `ci.yml` 现状）
+
+在尚未配置 `VSCE_PAT` 凭证期间,`publish` job 的「发布到 VS Code Marketplace」步骤(`vsce publish`)会因鉴权失败而中断整个 job;因该 job 挂 `environment: production`,会在仓库 `/deployments` 页持续产生 **error** 状态的 deployment 记录。为此,本仓用**仓库级特性开关变量** `ENABLE_MARKETPLACE_PUBLISH` 对该步骤做门控:
+
+```yaml
+      - name: 发布到 VS Code Marketplace
+        if: ${{ vars.ENABLE_MARKETPLACE_PUBLISH == 'true' }}   # 默认未设=跳过,零报错
+        run: |
+          PRE_FLAG=$([[ "${GITHUB_REF_NAME}" == *rc* ]] && echo "--pre-release" || echo "")
+          pnpm dlx @vscode/vsce publish --packagePath *.vsix $PRE_FLAG
+        env:
+          VSCE_PAT: ${{ secrets.VSCE_PAT }}
+```
+
+设计要点(契合 AGENTS.md「最小干预 / 演进式设计」):
+
+- **默认关闭**:变量未设置时其值为空串,`'' == 'true'` 为假 → 步骤显示 **skipped**(非 failed),不致 job 失败;job 继续执行其后的 OpenVSX 步骤。
+- **OpenVSX 不受影响**:`ovsx publish` 步骤保持无条件发布,Cursor/Windsurf 等 AI IDE 用户的安装来源不中断(前提:`OVSX_PAT` 已配置)。
+- **零代码恢复**:取得 Azure DevOps PAT 后,在仓库 `Settings → Secrets and variables → Actions` 配置 `VSCE_PAT`(Secret)并新增 `ENABLE_MARKETPLACE_PUBLISH=true`(Variable)即恢复 Marketplace 自动发布,无需改动 workflow 或再发 PR——这是特性开关相较「注释/删除步骤」的核心优势。
+
+> 注:本门控仅阻止「未来」的失败 deployment;`/deployments` 上已有的历史失败记录不会自动消失,如需清空可在 `Settings → Environments → production` 删除该环境(会一并清除其 deployment 历史,下次发布时按 `environment: production` 自动重建),或经 REST API 逐条删除。
+
 ### 3.3 关键 Action 版本
 - `actions/checkout@v4`、`actions/setup-node@v4`、`actions/upload-artifact@v4`、`actions/download-artifact@v4`;
 - `@vscode/test-electron`(或新版 VS Code Test CLI)驱动集成测试;
diff --git a/docs/research/05-ai-agent-seams.md b/docs/research/05-ai-agent-seams.md
index 728f0be..629f4a6 100644
--- a/docs/research/05-ai-agent-seams.md
+++ b/docs/research/05-ai-agent-seams.md
@@ -1,7 +1,7 @@
 # Track5:AI Agent 架构预留设计报告(Hyper Git)
 
 > 调研截至 2026/06/27。所有事实论断附来源(GitHub 路径/官方文档 URL)。不确定处标注"待核实"。
-> 核心立场:本扩展定位为 **IDEA Git 工具窗口的完整复刻**。VS Code 内置 Copilot **已有**提交信息生成能力([VS Code 官方介绍](https://code.visualstudio.com/docs/sourcecontrol/overview)),因此我们的 AI 层必须做"差异化与可组合性",而非重复造轮子——这契合 AGENTS.md 的"复用驱动"与"正交分解"。
+> 核心立场:本扩展提供 **完整的 Git 变更管理与提交工作流**。VS Code 内置 Copilot **已有**提交信息生成能力([VS Code 官方介绍](https://code.visualstudio.com/docs/sourcecontrol/overview)),因此我们的 AI 层必须做"差异化与可组合性",而非重复造轮子——这契合 AGENTS.md 的"复用驱动"与"正交分解"。
 
 ---
 
@@ -11,8 +11,8 @@
 
 | # | 场景 | 输入 | 输出 | 价值 | 难度 | 推荐落地机制 |
 |---|------|------|------|------|------|------|
-| 1 | **AI 提交信息生成** | staged diff(可含历史 commit 风格、团队 Conventional Commits 规范、本次 changelist 分组意图) | 符合规范的单行 subject + 多行 body,流式输出 | 高 | 低 | Language Model API(`vscode.lm`)+ prompt-tsx;触发位为 SCM `inputBox` 旁按钮(复刻 IDEA 的 ✨ 图标) |
-| 2 | **提交前 AI 代码审查(本地 PR review)** | staged 文件 + diff + 仓库上下文(相关符号/调用方) | 问题列表(严重度、文件:行、建议修复),可阻断或放行 commit | 极高 | 中 | Language Model API + Chat Tools(供 Agent 调用 `read_file`/`grep_symbols`);**对接 IDEA 的 `beforeCheckin` hook 语义** |
+| 1 | **AI 提交信息生成** | staged diff(可含历史 commit 风格、团队 Conventional Commits 规范、本次 changelist 分组意图) | 符合规范的单行 subject + 多行 body,流式输出 | 高 | 低 | Language Model API(`vscode.lm`)+ prompt-tsx;触发位为 SCM `inputBox` 旁的 ✨ 生成按钮 |
+| 2 | **提交前 AI 代码审查(本地 PR review)** | staged 文件 + diff + 仓库上下文(相关符号/调用方) | 问题列表(严重度、文件:行、建议修复),可阻断或放行 commit | 极高 | 中 | Language Model API + Chat Tools(供 Agent 调用 `read_file`/`grep_symbols`);**借鉴 JetBrains `CheckinHandler.beforeCheckin` 提交前检查语义** |
 | 3 | **AI 变更语义分组(自动 changelist 归类)** | Local Changes 全部变更文件 + diff 摘要 | 建议的 changelist 分组(如 "feature-A 相关"、"重构"、"配置"),支持一键应用 | 高 | 中 | Language Model API(聚类式 prompt);结果写回 changelist 模型(本扩展自管的分组数据结构) |
 | 4 | **AI 冲突解决助手** | merge conflict 文件(ours/theirs/base 三方) | 建议的合并结果 + 解释,可逐块采纳 | 高 | 高 | Language Model API(三方 diff prompt)+ inline diff 预览;**注意:需用户确认,不可自动写入**(参考 VS Code 工具确认机制 [`prepareInvocation`](https://code.visualstudio.com/api/extension-guides/ai/tools)) |
 | 5 | **AI Release Notes / Changelog** | 区间内的 commit 列表 + tag 范围 | 面向用户的 release notes(markdown) | 中 | 低 | Language Model API + prompt-tsx;接入 Log 视图的"生成 changelog"动作 |
@@ -44,7 +44,7 @@
 ### 2.3 Language Model Tools API(Chat Tools)——**让 AI 调用我们的 git 能力**
 - 在 `package.json` 的 `contributes.languageModelTools` 声明工具,代码中 `vscode.lm.registerTool(name, instance)`,实现 `prepareInvocation`(确认)+ `invoke`(执行)([Tools 官方文档](https://code.visualstudio.com/api/extension-guides/ai/tools))。
 - **适用场景**:场景 2(审查需读文件/查符号)、6(blame 需调 git)。例如注册 `sofia_git_blame`、`sofia_get_staged_diff`、`sofia_read_file` 工具,让 Agent 自主调用。
-- **关键价值**:把本扩展的 git 能力(Engine 层)**暴露给任意 Agent**(内置 Copilot Agent、MCP Agent、第三方),实现"可组合性"——这是复刻 IDEA 之外的核心增值点。
+- **关键价值**:把本扩展的 git 能力(Engine 层)**暴露给任意 Agent**(内置 Copilot Agent、MCP Agent、第三方),实现"可组合性"——这是 Git 变更管理主线工作流之外的核心增值点。
 - 工具名规范 `{verb}_{noun}`,参数名 `{noun}`;`canBeReferencedInPrompt: true` 让用户用 `#` 引用([同上](https://code.visualstudio.com/api/extension-guides/ai/tools))。
 - 官方建议:工具会执行有副作用操作时,`prepareInvocation` 必须给用户**确认消息**([同上](https://code.visualstudio.com/api/extension-guides/ai/tools))——**这是 AI 冲突解决不可自动写入的安全依据**。
 
@@ -102,14 +102,14 @@
 - 默认实现:`NullCommitMessageProvider`(返回空,UI 显示"AI 未启用")+ `LmCommitMessageProvider`(走 ILlmProvider + prompt-tsx)。
 - **为何现在抽**:提交信息是 commit 流水线的核心产物,留接缝让未来可"无 AI → 内置 LM → 自带 key"平滑切换。
 
-**接缝 3:IPreCommitInspector(Agent 层)——对齐 IDEA CheckinHandler 的 beforeCheckin 语义**
+**接缝 3:IPreCommitInspector(Agent 层)——借鉴 JetBrains CheckinHandler 的 beforeCheckin 责任链设计**
 ```
-接口 IPreCommitInspector:   // 直接对齐 IDEA CheckinHandler.beforeCheckin / CommitCheck
+接口 IPreCommitInspector:   // 借鉴 JetBrains CheckinHandler.beforeCheckin / CommitCheck 责任链设计
   方法 inspect(输入: { staged文件, diff, 仓库上下文 }): Promise<检查结果>
     // 检查结果 = { 通过: bool, 问题列表: [{文件, 行, 严重度, 说明, 建议修复}], 阻断提交: bool }
-  方法 getBeforeCheckinPanel(): 配置面板描述   // 对齐 IDEA getBeforeCheckinConfigurationPanel
+  方法 getBeforeCheckinPanel(): 配置面板描述   // 参考 JetBrains getBeforeCheckinConfigurationPanel
 ```
-- **对齐证据**:IDEA 的 `CheckinHandler` 提供 `beforeCheckin()`(提交前处理,返回 COMMIT/CANCEL)、`checkinSuccessful()`、`checkinFailed()`、`includedChangesChanged()`、`getBeforeCheckinConfigurationPanel()`(返回插入"Before Commit"面板的配置组件)([CheckinHandler.java 源码](https://github.com/JetBrains/intellij-community/blob/master/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java))。我们的 `IPreCommitInspector` 是其在 VS Code 侧的等价物。
+- **设计佐证**:JetBrains 的 `CheckinHandler` 提供 `beforeCheckin()`(提交前处理,返回 COMMIT/CANCEL)、`checkinSuccessful()`、`checkinFailed()`、`includedChangesChanged()`、`getBeforeCheckinConfigurationPanel()`(返回插入"Before Commit"面板的配置组件)([CheckinHandler.java 源码](https://github.com/JetBrains/intellij-community/blob/master/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java))。我们的 `IPreCommitInspector` 是其在 VS Code 侧的等价物。
 - 默认实现:`BuiltInInspector`(TODO 检查、reformat、optimize imports 等非 AI 检查)+ `AiCodeReviewInspector`(可选)。
 
 **接缝 4:IChangelistGrouper(Agent 层)**
@@ -140,7 +140,7 @@
 
 > YAGNI 反对的是"为不存在的需求写实现"。这里我们**不写 AI 实现**,只写**接口契约 + Null 实现**,这是"开闭原则的接缝预留",成本极低(几个接口 + 空实现),收益是未来 AI 层**零重构**接入。具体:
 1. **接缝只定义契约,不引入 AI 依赖**——当前 `package.json` 不依赖 Copilot,未启用 AI 的用户无负担([LM API 官方发布建议](https://code.visualstudio.com/api/extension-guides/ai/language-model):非 AI 功能不应强依赖 Copilot)。
-2. **IDEA 的 CheckinHandler 模式已被验证为成熟的 hook 机制**(20+ 年生产验证),复刻其语义是"复用驱动",不是臆测设计。
+2. **JetBrains 的 CheckinHandler 模式已被验证为成熟的 hook 机制**(20+ 年生产验证),借鉴其责任链语义是"复用驱动",不是臆测设计。
 3. **关键:ILlmProvider 必须现在抽**——因为它是"未来支持本地/自带 key/不强依赖云端"的唯一命脉,若晚抽,所有 AI 调用散落各处,迁移成本爆炸。
 
 ---
@@ -188,14 +188,14 @@ flowchart TD
 | F 冲突解决 | IConflictResolver | (IDEA 无内置) | 手动解决 | AI 三方合并建议 |
 
 **实现要点**:
-- Hook 链采用**有序责任链**,每个 Hook 返回 `COMMIT | CANCEL | DEFER`(直接对齐 IDEA `CheckinHandler.ReturnResult` 枚举,见 [CheckinHandler.java](https://github.com/JetBrains/intellij-community/blob/master/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java))。
-- `includedChangesChanged()` 等价物:当用户在 commit 对话框勾选/取消文件时,通知 Hook 链刷新(对齐 IDEA 同名方法)——这对 AI 分组/审查的增量更新至关重要。
+- Hook 链采用**有序责任链**,每个 Hook 返回 `COMMIT | CANCEL | DEFER`(借鉴 JetBrains `CheckinHandler.ReturnResult` 枚举设计,见 [CheckinHandler.java](https://github.com/JetBrains/intellij-community/blob/master/platform/vcs-api/src/com/intellij/openapi/vcs/checkin/CheckinHandler.java))。
+- `includedChangesChanged()` 等价物:当用户在 commit 对话框勾选/取消文件时,通知 Hook 链刷新(参考 JetBrains 同名方法)——这对 AI 分组/审查的增量更新至关重要。
 
 ---
 
 ## 5. 渐进式 AI 引入路线(从"无 AI"到"可选 AI")
 
-### 阶段 0:纯复刻期(当前)——**接缝已埋,AI 未启用**
+### 阶段 0:基础功能期(当前)——**接缝已埋,AI 未启用**
 - 所有 AI 接缝提供 **Null 实现**(Null Object 模式)。
 - `ILlmProvider.selectModel` 恒返回"无可用模型",UI 不显示 AI 按钮。
 - **`package.json` 不声明 Copilot 依赖**(遵循[官方发布建议](https://code.visualstudio.com/api/extension-guides/ai/language-model)),未启用 AI 的用户零负担。
diff --git a/docs/research/README.md b/docs/research/README.md
index dd102d7..e1279ab 100644
--- a/docs/research/README.md
+++ b/docs/research/README.md
@@ -1,15 +1,15 @@
 # 调研报告索引（循证依据）
 
-> 五路并行调研（IDEA 源码 / VS Code SCM API / 开发实践 / 发布 CI / AI Agent）的完整报告。
+> 五路并行调研（JetBrains 源码借鉴 / VS Code SCM API / 开发实践 / 发布 CI / AI Agent）的完整报告。
 > 所有事实论断附 GitHub 源码路径或官方文档 URL；不确定项标注「待核实」。
 > 调研日期：2026-06-27。
 
 | # | 报告 | 核心结论 |
 |---|---|---|
-| 01 | [IDEA 功能复刻矩阵](../requirements/idea-feature-matrix.md) | 56 功能点 / 8 组；多 changelist + 行级跨列表归属是 VS Code 复刻最大差异 |
+| 01 | [Git 功能完备性矩阵](../requirements/idea-feature-matrix.md) | 56 功能点 / 8 组；多 changelist + 行级跨列表归属是 VS Code 原生模型与成熟实现的最大差异 |
 | 02 | [VS Code SCM 集成路径](./02-vscode-scm-integration.md) | **路径 B**：消费 vscode.git API + 自建 changelist registry + 自绘视图；scmHistoryProvider 等仍 proposed |
 | 03 | [扩展工程蓝图](./03-extension-blueprint.md) | TS+esbuild+Vitest+test-electron；engine/adapter/agent/ui 正交分层 |
 | 04 | [发布 + CI/CD](./04-publishing-cicd.md) | 双市场（Cursor/Windsurf 走 OpenVSX）；CI 三平台 + xvfb；版本不可撤销 |
-| 05 | [AI Agent 接缝](./05-ai-agent-seams.md) | ILlmProvider/IPreCommitInspector 现在抽（对齐 IDEA CheckinHandler），实现延后 M5 |
+| 05 | [AI Agent 接缝](./05-ai-agent-seams.md) | ILlmProvider/IPreCommitInspector 现在抽（借鉴 JetBrains CheckinHandler 责任链设计），实现延后 M5 |
 
 > 综合方案见 [工程实施方案](../architecture/engineering-plan.md)。
diff --git a/media-src/icon.svg b/media-src/icon.svg
new file mode 100644
index 0000000..7be8a64
--- /dev/null
+++ b/media-src/icon.svg
@@ -0,0 +1,18 @@
+<!-- Hyper Git marketplace logo source (256x256). Rasterized to ../media/icon.png. Glyph adapted from Tabler Icons (MIT). -->
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="hg-bg" x1="0" y1="0" x2="256" y2="256" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#3B82F6" />
+      <stop offset="1" stop-color="#7C5CFC" />
+    </linearGradient>
+  </defs>
+  <rect x="0" y="0" width="256" height="256" rx="58" fill="url(#hg-bg)" />
+  <g transform="translate(26 26) scale(8.5)" fill="none" stroke="#ffffff" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round">
+    <circle cx="6" cy="6" r="2" />
+    <circle cx="6" cy="18" r="2" />
+    <path d="M6 8v8" />
+    <circle cx="18" cy="18" r="2" />
+    <path d="M11 6h5a2 2 0 0 1 2 2v8" />
+    <path d="M14 9l-3-3 3-3" />
+  </g>
+</svg>
diff --git a/media/framework.png b/media/framework.png
new file mode 100644
index 0000000..4dc2d7a
Binary files /dev/null and b/media/framework.png differ
diff --git a/media/hyper-git-icon.svg b/media/hyper-git-icon.svg
index feef6ba..d68ce61 100644
--- a/media/hyper-git-icon.svg
+++ b/media/hyper-git-icon.svg
@@ -1,7 +1,9 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M7 3v11" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
-  <circle cx="7" cy="5" r="2.4" stroke="currentColor" stroke-width="2" fill="none"/>
-  <circle cx="7" cy="17" r="2.4" stroke="currentColor" stroke-width="2" fill="none"/>
-  <path d="M7 7.4c0 4 3.6 5.4 8 5.4" stroke="currentColor" stroke-width="2" stroke-linecap="round" fill="none"/>
-  <circle cx="17" cy="13" r="2.4" stroke="currentColor" stroke-width="2" fill="none"/>
+<!-- Hyper Git activity-bar icon. Single-color (currentColor); VS Code recolors via alpha mask. Glyph adapted from Tabler Icons (MIT). -->
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="6" cy="6" r="2" />
+  <circle cx="6" cy="18" r="2" />
+  <path d="M6 8v8" />
+  <circle cx="18" cy="18" r="2" />
+  <path d="M11 6h5a2 2 0 0 1 2 2v8" />
+  <path d="M14 9l-3-3 3-3" />
 </svg>
diff --git a/media/icon.png b/media/icon.png
index 73a23fa..66c89f4 100644
Binary files a/media/icon.png and b/media/icon.png differ
diff --git a/package.json b/package.json
index c0b2d0b..141ea08 100644
--- a/package.json
+++ b/package.json
@@ -1,391 +1,1306 @@
 {
-  "name": "hyper-git",
-  "displayName": "Hyper Git",
-  "icon": "media/icon.png",
-  "description": "在 VS Code 上完整复刻 IntelliJ IDEA 的 Git 工具窗口与 Commit 提交窗口，并为未来 AI Agent 自主代理预留架构接缝。",
-  "version": "0.0.4",
-  "publisher": "threefish-ai",
-  "license": "MIT",
-  "preview": true,
-  "private": true,
-  "packageManager": "pnpm@11.9.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ThreeFish-AI/hyper-git.git"
-  },
-  "engines": {
-    "vscode": "^1.85.0"
-  },
-  "categories": [
-    "SCM Providers",
-    "Other"
-  ],
-  "keywords": [
-    "git",
-    "intellij",
-    "idea",
-    "commit",
-    "changelist",
-    "scm",
-    "version control",
-    "shelf",
-    "stash"
-  ],
-  "capabilities": {
-    "virtualWorkspaces": {
-      "supported": false,
-      "description": "Hyper Git 依赖本地 git，不支持虚拟/web 工作区。"
-    }
-  },
-  "extensionDependencies": [
-    "vscode.git"
-  ],
-  "activationEvents": [],
-  "main": "./dist/extension.js",
-  "contributes": {
-    "viewsContainers": {
-      "activitybar": [
-        {
-          "id": "hyper-git",
-          "title": "Hyper Git",
-          "icon": "media/hyper-git-icon.svg"
-        }
-      ]
-    },
-    "views": {
-      "hyper-git": [
-        {
-          "id": "hyperGit.changes",
-          "name": "Changes",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.commit",
-          "name": "Commit",
-          "type": "webview",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.log",
-          "name": "Log",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.branches",
-          "name": "Branches",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.stash",
-          "name": "Stash",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.shelf",
-          "name": "Shelf",
-          "visibility": "visible"
-        },
-        {
-          "id": "hyperGit.worktrees",
-          "name": "Worktrees",
-          "visibility": "visible"
-        }
-      ]
-    },
-    "viewsWelcome": [
-      {
-        "view": "hyperGit.changes",
-        "contents": "未检测到 Git 变更或仓库。\n在 Git 仓库中打开工作区，变更将按 Changelist 分组显示。\n[新建 Changelist](command:hyperGit.newChangelist)"
-      },
-      {
-        "view": "hyperGit.stash",
-        "contents": "暂无 Stash。\n[Stash 当前变更](command:hyperGit.stashCreate)"
-      },
-      {
-        "view": "hyperGit.worktrees",
-        "contents": "暂无 Worktree。\n[新建 Worktree](command:hyperGit.worktreeAdd)"
-      }
-    ],
-    "commands": [
-      { "command": "hyperGit.showVersion", "title": "显示版本", "category": "Hyper Git" },
-      { "command": "hyperGit.refresh", "title": "刷新", "category": "Hyper Git", "icon": "$(refresh)" },
-      { "command": "hyperGit.newChangelist", "title": "新建 Changelist", "category": "Hyper Git", "icon": "$(add)" },
-      { "command": "hyperGit.setActiveChangelist", "title": "设为活动 Changelist", "category": "Hyper Git" },
-      { "command": "hyperGit.renameChangelist", "title": "重命名 Changelist", "category": "Hyper Git" },
-      { "command": "hyperGit.deleteChangelist", "title": "删除 Changelist", "category": "Hyper Git" },
-      { "command": "hyperGit.moveChangelist", "title": "移至 Changelist…", "category": "Hyper Git" },
-      { "command": "hyperGit.openDiff", "title": "打开 Diff", "category": "Hyper Git" },
-      { "command": "hyperGit.commit", "title": "提交", "category": "Hyper Git", "icon": "$(check)" },
-      { "command": "hyperGit.commitAndPush", "title": "提交并推送", "category": "Hyper Git", "icon": "$(cloud-upload)" },
-      { "command": "hyperGit.refreshLog", "title": "刷新 Log", "category": "Hyper Git", "icon": "$(refresh)" },
-      { "command": "hyperGit.refreshBranches", "title": "刷新 Branches", "category": "Hyper Git", "icon": "$(refresh)" },
-      { "command": "hyperGit.logFilterAuthor", "title": "按作者过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.logFilterPath", "title": "按路径过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.logClearFilter", "title": "清除 Log 过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.copyCommitHash", "title": "复制 Commit Hash", "category": "Hyper Git" },
-      { "command": "hyperGit.showHistory", "title": "显示文件历史", "category": "Hyper Git" },
-      { "command": "hyperGit.branchCreate", "title": "新建分支", "category": "Hyper Git", "icon": "$(add)" },
-      { "command": "hyperGit.branchCheckout", "title": "检出分支", "category": "Hyper Git" },
-      { "command": "hyperGit.branchDelete", "title": "删除分支", "category": "Hyper Git" },
-      { "command": "hyperGit.mergeBranch", "title": "合并到当前分支", "category": "Hyper Git" },
-      { "command": "hyperGit.rebaseBranch", "title": "变基当前分支到…", "category": "Hyper Git" },
-      { "command": "hyperGit.showBlame", "title": "显示 Blame", "category": "Hyper Git" },
-      { "command": "hyperGit.stashCreate", "title": "Stash 变更", "category": "Hyper Git", "icon": "$(archive)" },
-      { "command": "hyperGit.stashApply", "title": "应用 Stash", "category": "Hyper Git" },
-      { "command": "hyperGit.stashPop", "title": "Pop Stash", "category": "Hyper Git" },
-      { "command": "hyperGit.stashDrop", "title": "删除 Stash", "category": "Hyper Git" },
-      { "command": "hyperGit.discardChanges", "title": "丢弃改动", "category": "Hyper Git" },
-      { "command": "hyperGit.pull", "title": "Pull", "category": "Hyper Git", "icon": "$(arrow-down)" },
-      { "command": "hyperGit.push", "title": "Push", "category": "Hyper Git", "icon": "$(arrow-up)" },
-      { "command": "hyperGit.fetch", "title": "Fetch", "category": "Hyper Git", "icon": "$(repo-fetch)" },
-      { "command": "hyperGit.cherryPick", "title": "Cherry-Pick", "category": "Hyper Git", "icon": "$(repo-pull)" },
-      { "command": "hyperGit.revertCommit", "title": "Revert Commit", "category": "Hyper Git", "icon": "$(discard)" },
-      { "command": "hyperGit.resetHead", "title": "Reset HEAD…", "category": "Hyper Git", "icon": "$(history)" },
-      { "command": "hyperGit.branchRename", "title": "重命名分支", "category": "Hyper Git" },
-      { "command": "hyperGit.ignorePath", "title": "添加到 .gitignore", "category": "Hyper Git" },
-      { "command": "hyperGit.compareBranches", "title": "比较分支", "category": "Hyper Git" },
-      { "command": "hyperGit.toggleFavorite", "title": "收藏/取消收藏", "category": "Hyper Git", "icon": "$(star-full)" },
-      { "command": "hyperGit.checkoutAsNew", "title": "从选中分支新建并检出", "category": "Hyper Git" },
-      { "command": "hyperGit.compareWithCurrent", "title": "与当前分支比较", "category": "Hyper Git", "icon": "$(compare)" },
-      { "command": "hyperGit.tagCreate", "title": "新建标签", "category": "Hyper Git", "icon": "$(tag)" },
-      { "command": "hyperGit.tagDelete", "title": "删除标签", "category": "Hyper Git" },
-      { "command": "hyperGit.tagCheckout", "title": "检出标签", "category": "Hyper Git" },
-      { "command": "hyperGit.openCommitFileDiff", "title": "打开提交文件 Diff", "category": "Hyper Git" },
-      { "command": "hyperGit.resetToHere", "title": "Reset 当前分支到此提交…", "category": "Hyper Git", "icon": "$(history)" },
-      { "command": "hyperGit.createBranchFromCommit", "title": "从此提交新建分支", "category": "Hyper Git", "icon": "$(git-branch)" },
-      { "command": "hyperGit.createTagFromCommit", "title": "从此提交新建标签", "category": "Hyper Git", "icon": "$(tag)" },
-      { "command": "hyperGit.showContainingBranches", "title": "查看包含此提交的分支", "category": "Hyper Git" },
-      { "command": "hyperGit.logFilterGrep", "title": "按 message 过滤（grep）", "category": "Hyper Git" },
-      { "command": "hyperGit.logFilterMergeMode", "title": "合并提交过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.logFilterDate", "title": "按日期过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.logFilterRegex", "title": "按 message 正则过滤", "category": "Hyper Git" },
-      { "command": "hyperGit.rewordCommit", "title": "改写最新提交信息", "category": "Hyper Git" },
-      { "command": "hyperGit.showGraph", "title": "查看提交图（Graph）", "category": "Hyper Git", "icon": "$(git-commit)" },
-      { "command": "hyperGit.showConsole", "title": "打开 Console", "category": "Hyper Git" },
-      { "command": "hyperGit.partialStage", "title": "部分暂存（Hunk）…", "category": "Hyper Git" },
-      { "command": "hyperGit.partialUnstage", "title": "部分取消暂存（Hunk）…", "category": "Hyper Git" },
-      { "command": "hyperGit.stageHunkAtCursor", "title": "暂存光标处 Hunk", "category": "Hyper Git" },
-      { "command": "hyperGit.undoLastCommit", "title": "撤销最近提交（soft）", "category": "Hyper Git" },
-      { "command": "hyperGit.dropCommit", "title": "删除提交（rebase）", "category": "Hyper Git" },
-      { "command": "hyperGit.fixupCommit", "title": "Fixup 到提交（autosquash）", "category": "Hyper Git" },
-      { "command": "hyperGit.cleanupBranches", "title": "清理已合并分支", "category": "Hyper Git" },
-      { "command": "hyperGit.pushDialog", "title": "Push…", "category": "Hyper Git", "icon": "$(repo-push)" },
-      { "command": "hyperGit.updateProject", "title": "Update Project…", "category": "Hyper Git", "icon": "$(sync)" },
-      { "command": "hyperGit.mergeDialog", "title": "Merge…", "category": "Hyper Git", "icon": "$(git-merge)" },
-      { "command": "hyperGit.resolveConflicts", "title": "解决冲突（3-way Merge Editor）…", "category": "Hyper Git", "icon": "$(git-merge)" },
-      { "command": "hyperGit.acceptOurs", "title": "冲突文件：采用 Ours", "category": "Hyper Git" },
-      { "command": "hyperGit.acceptTheirs", "title": "冲突文件：采用 Theirs", "category": "Hyper Git" },
-      { "command": "hyperGit.copyBranchRef", "title": "复制分支引用", "category": "Hyper Git" },
-      { "command": "hyperGit.threeWayDiff", "title": "3-way Diff 概览", "category": "Hyper Git" },
-      { "command": "hyperGit.inlineCommitHunk", "title": "行内提交 Hunk", "category": "Hyper Git" },
-      { "command": "hyperGit.shelveChanges", "title": "Shelve Changes…", "category": "Hyper Git", "icon": "$(inbox)" },
-      { "command": "hyperGit.unshelveSilently", "title": "Unshelve Silently", "category": "Hyper Git" },
-      { "command": "hyperGit.unshelveWithMerge", "title": "Unshelve with Merge", "category": "Hyper Git" },
-      { "command": "hyperGit.deleteShelf", "title": "Delete Shelf", "category": "Hyper Git" },
-      { "command": "hyperGit.startRebase", "title": "Interactive Rebase…", "category": "Hyper Git" },
-      { "command": "hyperGit.moveHunkToChangelist", "title": "Move Hunk to Changelist", "category": "Hyper Git" },
-      { "command": "hyperGit.stashKeepIndex", "title": "Stash（保留已暂存）", "category": "Hyper Git" },
-      { "command": "hyperGit.stashClear", "title": "清空所有 Stash", "category": "Hyper Git" },
-      { "command": "hyperGit.stashBranch", "title": "从 Stash 创建分支", "category": "Hyper Git" },
-      { "command": "hyperGit.createPatch", "title": "导出 Patch…", "category": "Hyper Git", "icon": "$(diff)" },
-      { "command": "hyperGit.applyPatch", "title": "应用 Patch…", "category": "Hyper Git", "icon": "$(diff)" },
-      { "command": "hyperGit.showReflog", "title": "查看 Reflog", "category": "Hyper Git", "icon": "$(history)" },
-      { "command": "hyperGit.toggleBlameAnnotation", "title": "切换 Blame 注解", "category": "Hyper Git", "icon": "$(eye)" },
-      { "command": "hyperGit.worktreeRefresh", "title": "刷新 Worktrees", "category": "Hyper Git", "icon": "$(refresh)" },
-      { "command": "hyperGit.worktreeAdd", "title": "新建 Worktree", "category": "Hyper Git", "icon": "$(add)" },
-      { "command": "hyperGit.worktreeOpen", "title": "打开 Worktree", "category": "Hyper Git", "icon": "$(folder-opened)" },
-      { "command": "hyperGit.worktreeRemove", "title": "删除 Worktree", "category": "Hyper Git", "icon": "$(trash)" },
-      { "command": "hyperGit.worktreeCopyPath", "title": "复制 Worktree 路径", "category": "Hyper Git" },
-      { "command": "hyperGit.worktreeLock", "title": "锁定 Worktree", "category": "Hyper Git", "icon": "$(lock)" },
-      { "command": "hyperGit.worktreeUnlock", "title": "解锁 Worktree", "category": "Hyper Git" },
-      { "command": "hyperGit.worktreeMove", "title": "移动 Worktree…", "category": "Hyper Git" },
-      { "command": "hyperGit.worktreePrune", "title": "清理失效 Worktree", "category": "Hyper Git", "icon": "$(clear-all)" }
-    ],
-    "menus": {
-      "view/title": [
-        { "command": "hyperGit.refresh", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.newChangelist", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.commit", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.commitAndPush", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.fetch", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.pull", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.push", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.pushDialog", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.updateProject", "when": "view == hyperGit.changes", "group": "navigation" },
-        { "command": "hyperGit.createPatch", "when": "view == hyperGit.changes" },
-        { "command": "hyperGit.applyPatch", "when": "view == hyperGit.changes" },
-        { "command": "hyperGit.refreshLog", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.showGraph", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.cherryPick", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.revertCommit", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.resetHead", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.logFilterAuthor", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logFilterPath", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logClearFilter", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logFilterGrep", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logFilterMergeMode", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logFilterDate", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.logFilterRegex", "when": "view == hyperGit.log" },
-        { "command": "hyperGit.showReflog", "when": "view == hyperGit.log", "group": "navigation" },
-        { "command": "hyperGit.refreshBranches", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.branchCreate", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.pull", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.push", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.fetch", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.mergeDialog", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.updateProject", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.tagCreate", "when": "view == hyperGit.branches", "group": "navigation" },
-        { "command": "hyperGit.stashCreate", "when": "view == hyperGit.stash", "group": "navigation" },
-        { "command": "hyperGit.stashKeepIndex", "when": "view == hyperGit.stash", "group": "navigation" },
-        { "command": "hyperGit.stashClear", "when": "view == hyperGit.stash" },
-        { "command": "hyperGit.shelveChanges", "when": "view == hyperGit.shelf", "group": "navigation" },
-        { "command": "hyperGit.worktreeRefresh", "when": "view == hyperGit.worktrees", "group": "navigation" },
-        { "command": "hyperGit.worktreeAdd", "when": "view == hyperGit.worktrees", "group": "navigation" },
-        { "command": "hyperGit.worktreePrune", "when": "view == hyperGit.worktrees", "group": "navigation" }
-      ],
-      "view/item/context": [
-        { "command": "hyperGit.setActiveChangelist", "when": "view == hyperGit.changes && viewItem == hyperGit.changelist", "group": "1_changelist@1" },
-        { "command": "hyperGit.renameChangelist", "when": "view == hyperGit.changes && viewItem == hyperGit.changelist", "group": "1_changelist@2" },
-        { "command": "hyperGit.deleteChangelist", "when": "view == hyperGit.changes && viewItem == hyperGit.changelist", "group": "1_changelist@3" },
-        { "command": "hyperGit.moveChangelist", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "inline" },
-        { "command": "hyperGit.moveChangelist", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@1" },
-        { "command": "hyperGit.showHistory", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@2" },
-        { "command": "hyperGit.discardChanges", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@3" },
-        { "command": "hyperGit.copyCommitHash", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@1" },
-        { "command": "hyperGit.branchCheckout", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@1" },
-        { "command": "hyperGit.branchDelete", "when": "view == hyperGit.branches && viewItem == hyperGit.branch", "group": "1_branch@2" },
-        { "command": "hyperGit.mergeBranch", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@3" },
-        { "command": "hyperGit.rebaseBranch", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@4" },
-        { "command": "hyperGit.branchRename", "when": "view == hyperGit.branches && viewItem == hyperGit.branch", "group": "1_branch@5" },
-        { "command": "hyperGit.compareBranches", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@6" },
-        { "command": "hyperGit.copyBranchRef", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@7" },
-        { "command": "hyperGit.toggleFavorite", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "inline" },
-        { "command": "hyperGit.toggleFavorite", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@0" },
-        { "command": "hyperGit.checkoutAsNew", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/", "group": "1_branch@1.5" },
-        { "command": "hyperGit.compareWithCurrent", "when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch|hyperGit.tag/", "group": "1_branch@8" },
-        { "command": "hyperGit.tagCheckout", "when": "view == hyperGit.branches && viewItem == hyperGit.tag", "group": "1_tag@1" },
-        { "command": "hyperGit.tagDelete", "when": "view == hyperGit.branches && viewItem == hyperGit.tag", "group": "1_tag@2" },
-        { "command": "hyperGit.cherryPick", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@1" },
-        { "command": "hyperGit.revertCommit", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@2" },
-        { "command": "hyperGit.dropCommit", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@3" },
-        { "command": "hyperGit.fixupCommit", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@4" },
-        { "command": "hyperGit.createBranchFromCommit", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@5" },
-        { "command": "hyperGit.createTagFromCommit", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@6" },
-        { "command": "hyperGit.showContainingBranches", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@7" },
-        { "command": "hyperGit.resetToHere", "when": "view == hyperGit.log && viewItem == hyperGit.commit", "group": "1_commit@8" },
-        { "command": "hyperGit.ignorePath", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@4" },
-        { "command": "hyperGit.partialStage", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@5" },
-        { "command": "hyperGit.partialUnstage", "when": "view == hyperGit.changes && viewItem == hyperGit.fileChange", "group": "1_file@6" },
-        { "command": "hyperGit.stashApply", "when": "view == hyperGit.stash && viewItem == hyperGit.stash", "group": "1_stash@1" },
-        { "command": "hyperGit.stashPop", "when": "view == hyperGit.stash && viewItem == hyperGit.stash", "group": "1_stash@2" },
-        { "command": "hyperGit.stashDrop", "when": "view == hyperGit.stash && viewItem == hyperGit.stash", "group": "1_stash@3" },
-        { "command": "hyperGit.stashBranch", "when": "view == hyperGit.stash && viewItem == hyperGit.stash", "group": "1_stash@4" },
-        { "command": "hyperGit.unshelveSilently", "when": "view == hyperGit.shelf && viewItem == hyperGit.shelf", "group": "1_shelf@1" },
-        { "command": "hyperGit.unshelveWithMerge", "when": "view == hyperGit.shelf && viewItem == hyperGit.shelf", "group": "1_shelf@2" },
-        { "command": "hyperGit.deleteShelf", "when": "view == hyperGit.shelf && viewItem == hyperGit.shelf", "group": "1_shelf@3" },
-        { "command": "hyperGit.worktreeOpen", "when": "view == hyperGit.worktrees && viewItem =~ /hyperGit.worktree|hyperGit.worktreeMain/", "group": "1_wt@1" },
-        { "command": "hyperGit.worktreeMove", "when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree", "group": "1_wt@2" },
-        { "command": "hyperGit.worktreeLock", "when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree", "group": "1_wt@3" },
-        { "command": "hyperGit.worktreeUnlock", "when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree", "group": "1_wt@4" },
-        { "command": "hyperGit.worktreeCopyPath", "when": "view == hyperGit.worktrees && viewItem =~ /hyperGit.worktree|hyperGit.worktreeMain/", "group": "1_wt@5" },
-        { "command": "hyperGit.worktreeRemove", "when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree", "group": "1_wt@6" }
-      ],
-      "editor/context": [
-        { "command": "hyperGit.toggleBlameAnnotation", "when": "resourceScheme == file", "group": "hyperGit@1" }
-      ],
-      "commandPalette": [
-        { "command": "hyperGit.openDiff", "when": "false" },
-        { "command": "hyperGit.setActiveChangelist", "when": "false" },
-        { "command": "hyperGit.renameChangelist", "when": "false" },
-        { "command": "hyperGit.deleteChangelist", "when": "false" },
-        { "command": "hyperGit.moveChangelist", "when": "false" },
-        { "command": "hyperGit.copyCommitHash", "when": "false" },
-        { "command": "hyperGit.showHistory", "when": "false" },
-        { "command": "hyperGit.branchCheckout", "when": "false" },
-        { "command": "hyperGit.branchDelete", "when": "false" },
-        { "command": "hyperGit.mergeBranch", "when": "false" },
-        { "command": "hyperGit.rebaseBranch", "when": "false" },
-        { "command": "hyperGit.stashApply", "when": "false" },
-        { "command": "hyperGit.stashPop", "when": "false" },
-        { "command": "hyperGit.stashDrop", "when": "false" },
-        { "command": "hyperGit.discardChanges", "when": "false" },
-        { "command": "hyperGit.cherryPick", "when": "false" },
-        { "command": "hyperGit.revertCommit", "when": "false" },
-        { "command": "hyperGit.branchRename", "when": "false" },
-        { "command": "hyperGit.compareBranches", "when": "false" },
-        { "command": "hyperGit.ignorePath", "when": "false" },
-        { "command": "hyperGit.copyBranchRef", "when": "false" },
-        { "command": "hyperGit.inlineCommitHunk", "when": "false" },
-        { "command": "hyperGit.unshelveSilently", "when": "false" },
-        { "command": "hyperGit.unshelveWithMerge", "when": "false" },
-        { "command": "hyperGit.deleteShelf", "when": "false" },
-        { "command": "hyperGit.moveHunkToChangelist", "when": "false" },
-        { "command": "hyperGit.toggleFavorite", "when": "false" },
-        { "command": "hyperGit.checkoutAsNew", "when": "false" },
-        { "command": "hyperGit.compareWithCurrent", "when": "false" },
-        { "command": "hyperGit.tagDelete", "when": "false" },
-        { "command": "hyperGit.tagCheckout", "when": "false" },
-        { "command": "hyperGit.openCommitFileDiff", "when": "false" },
-        { "command": "hyperGit.resetToHere", "when": "false" },
-        { "command": "hyperGit.createBranchFromCommit", "when": "false" },
-        { "command": "hyperGit.createTagFromCommit", "when": "false" },
-        { "command": "hyperGit.showContainingBranches", "when": "false" },
-        { "command": "hyperGit.worktreeOpen", "when": "false" },
-        { "command": "hyperGit.worktreeRemove", "when": "false" },
-        { "command": "hyperGit.worktreeCopyPath", "when": "false" },
-        { "command": "hyperGit.worktreeLock", "when": "false" },
-        { "command": "hyperGit.worktreeUnlock", "when": "false" },
-        { "command": "hyperGit.worktreeMove", "when": "false" },
-        { "command": "hyperGit.worktreeRefresh", "when": "false" }
-      ]
-    },
-    "configuration": {
-      "title": "Hyper Git",
-      "properties": {
-        "hyperGit.commit.template": {
-          "type": "string",
-          "default": "",
-          "markdownDescription": "Commit message 模板（注入到 Commit 窗口编辑器）。"
-        },
-        "hyperGit.commit.conventional": {
-          "type": "boolean",
-          "default": true,
-          "markdownDescription": "对提交信息执行 Conventional Commits 实时校验。"
-        },
-        "hyperGit.ai.enabled": {
-          "type": "boolean",
-          "default": false,
-          "markdownDescription": "启用 AI 代理能力（M5，当前仅预留接缝，暂不生效）。"
-        }
-      }
-    }
-  },
-  "scripts": {
-    "vscode:prepublish": "pnpm run package",
-    "compile": "pnpm run check-types && pnpm run lint && node esbuild.js",
-    "package": "pnpm run check-types && pnpm run lint && node esbuild.js --production",
-    "check-types": "tsc --noEmit",
-    "lint": "eslint",
-    "watch": "node esbuild.js --watch",
-    "test:unit": "vitest run",
-    "test:integration": "node tests/run-integration.js",
-    "test": "pnpm run test:unit && pnpm run test:integration",
-    "clean": "rimraf dist out *.vsix"
-  },
-  "devDependencies": {
-    "@eslint/js": "^10.0.1",
-    "@stylistic/eslint-plugin": "^2.9.0",
-    "@types/node": "^26.0.1",
-    "@types/vscode": "~1.85.0",
-    "@vscode/test-electron": "^2.4.1",
-    "@vscode/vsce": "^3.2.1",
-    "esbuild": "^0.28.1",
-    "eslint": "^10.6.0",
-    "mocha": "^11.0.1",
-    "prettier": "^3.9.3",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.39.0",
-    "vitest": "^2.1.8"
-  }
+	"name": "hyper-git-agentic-git",
+	"displayName": "Hyper Git - Agentic Git",
+	"icon": "media/icon.png",
+	"description": "Hyper Git brings IntelliJ IDEA's powerful Git & Commit modules to VS Code, enhanced with AI-powered autonomous agents for intelligent repository management. Experience Git in a higher dimension.",
+	"version": "0.0.8",
+	"publisher": "ThreeFish-AI",
+	"license": "MIT",
+	"preview": true,
+	"private": true,
+	"packageManager": "pnpm@11.9.0",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/ThreeFish-AI/hyper-git.git"
+	},
+	"engines": {
+		"vscode": "^1.85.0"
+	},
+	"categories": [
+		"SCM Providers",
+		"Other"
+	],
+	"keywords": [
+		"git",
+		"intellij",
+		"idea",
+		"commit",
+		"changelist",
+		"scm",
+		"version control",
+		"shelf",
+		"stash"
+	],
+	"capabilities": {
+		"virtualWorkspaces": {
+			"supported": false,
+			"description": "Hyper Git 依赖本地 git，不支持虚拟/web 工作区。"
+		}
+	},
+	"extensionDependencies": [
+		"vscode.git"
+	],
+	"activationEvents": [],
+	"main": "./dist/extension.js",
+	"contributes": {
+		"viewsContainers": {
+			"activitybar": [
+				{
+					"id": "hyper-git",
+					"title": "Hyper Git",
+					"icon": "media/hyper-git-icon.svg"
+				}
+			]
+		},
+		"views": {
+			"hyper-git": [
+				{
+					"id": "hyperGit.changes",
+					"name": "Changes",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.commit",
+					"name": "Commit",
+					"type": "webview",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.log",
+					"name": "Log",
+					"type": "webview",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.branches",
+					"name": "Branches",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.stash",
+					"name": "Stash",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.shelf",
+					"name": "Shelf",
+					"visibility": "visible"
+				},
+				{
+					"id": "hyperGit.worktrees",
+					"name": "Worktrees",
+					"visibility": "visible"
+				}
+			]
+		},
+		"viewsWelcome": [
+			{
+				"view": "hyperGit.changes",
+				"contents": "No Git changes or repository detected.\nOpen a workspace inside a Git repository and changes will be grouped by changelist.\n[New Changelist…](command:hyperGit.newChangelist)"
+			},
+			{
+				"view": "hyperGit.branches",
+				"contents": "No Git repository or branches detected.\n[New Branch…](command:hyperGit.branchCreate)"
+			},
+			{
+				"view": "hyperGit.stash",
+				"contents": "No stashes yet.\n[Stash Current Changes](command:hyperGit.stashCreate)"
+			},
+			{
+				"view": "hyperGit.shelf",
+				"contents": "No shelves yet. Shelves store patches independently of stash.\n[Shelve Changes…](command:hyperGit.shelveChanges)"
+			},
+			{
+				"view": "hyperGit.worktrees",
+				"contents": "No worktrees.\n[New Worktree…](command:hyperGit.worktreeAdd)"
+			}
+		],
+		"commands": [
+			{
+				"command": "hyperGit.showVersion",
+				"title": "Show Version",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.refresh",
+				"title": "Refresh",
+				"category": "Hyper Git",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "hyperGit.newChangelist",
+				"title": "New Changelist…",
+				"category": "Hyper Git",
+				"icon": "$(add)"
+			},
+			{
+				"command": "hyperGit.setActiveChangelist",
+				"title": "Set Active Changelist",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.renameChangelist",
+				"title": "Rename Changelist",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.deleteChangelist",
+				"title": "Delete Changelist",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.moveChangelist",
+				"title": "Move to Changelist…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.openDiff",
+				"title": "Open Diff",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.commit",
+				"title": "Commit",
+				"category": "Hyper Git",
+				"icon": "$(check)"
+			},
+			{
+				"command": "hyperGit.commitAndPush",
+				"title": "Commit & Push",
+				"category": "Hyper Git",
+				"icon": "$(cloud-upload)"
+			},
+			{
+				"command": "hyperGit.refreshLog",
+				"title": "Refresh Log",
+				"category": "Hyper Git",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "hyperGit.ci.signIn",
+				"title": "Sign In to GitHub for CI Status",
+				"category": "Hyper Git",
+				"icon": "$(sign-in)"
+			},
+			{
+				"command": "hyperGit.refreshBranches",
+				"title": "Refresh Branches",
+				"category": "Hyper Git",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "hyperGit.logFilter",
+				"title": "Filter Log…",
+				"category": "Hyper Git",
+				"icon": "$(filter)"
+			},
+			{
+				"command": "hyperGit.logFilterAuthor",
+				"title": "Filter by Author…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logFilterPath",
+				"title": "Filter by Path…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logClearFilter",
+				"title": "Clear Log Filter",
+				"category": "Hyper Git",
+				"icon": "$(clear-all)"
+			},
+			{
+				"command": "hyperGit.copyCommitHash",
+				"title": "Copy Commit Hash",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.showHistory",
+				"title": "Show File History",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.branchCreate",
+				"title": "New Branch…",
+				"category": "Hyper Git",
+				"icon": "$(add)"
+			},
+			{
+				"command": "hyperGit.branchCheckout",
+				"title": "Checkout Branch",
+				"category": "Hyper Git",
+				"icon": "$(check)"
+			},
+			{
+				"command": "hyperGit.branchDelete",
+				"title": "Delete Branch",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.deleteRemoteBranch",
+				"title": "Delete Remote Branch",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.mergeBranch",
+				"title": "Merge into Current Branch",
+				"category": "Hyper Git",
+				"icon": "$(git-merge)"
+			},
+			{
+				"command": "hyperGit.rebaseBranch",
+				"title": "Rebase Current Branch onto…",
+				"category": "Hyper Git",
+				"icon": "$(call-out)"
+			},
+			{
+				"command": "hyperGit.showBlame",
+				"title": "Show Blame",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.stashCreate",
+				"title": "Stash Changes",
+				"category": "Hyper Git",
+				"icon": "$(archive)"
+			},
+			{
+				"command": "hyperGit.stashApply",
+				"title": "Apply Stash",
+				"category": "Hyper Git",
+				"icon": "$(archive)"
+			},
+			{
+				"command": "hyperGit.stashPop",
+				"title": "Pop Stash",
+				"category": "Hyper Git",
+				"icon": "$(arrow-down)"
+			},
+			{
+				"command": "hyperGit.stashDrop",
+				"title": "Drop Stash",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.stashView",
+				"title": "View Stash Diff",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.discardChanges",
+				"title": "Discard Changes",
+				"category": "Hyper Git",
+				"icon": "$(discard)"
+			},
+			{
+				"command": "hyperGit.pull",
+				"title": "Pull",
+				"category": "Hyper Git",
+				"icon": "$(arrow-down)"
+			},
+			{
+				"command": "hyperGit.push",
+				"title": "Push",
+				"category": "Hyper Git",
+				"icon": "$(arrow-up)"
+			},
+			{
+				"command": "hyperGit.fetch",
+				"title": "Fetch",
+				"category": "Hyper Git",
+				"icon": "$(repo-fetch)"
+			},
+			{
+				"command": "hyperGit.pruneRemotes",
+				"title": "Prune Deleted Remote Branches",
+				"category": "Hyper Git",
+				"icon": "$(clear-all)"
+			},
+			{
+				"command": "hyperGit.cherryPick",
+				"title": "Cherry-Pick",
+				"category": "Hyper Git",
+				"icon": "$(repo-pull)"
+			},
+			{
+				"command": "hyperGit.revertCommit",
+				"title": "Revert Commit",
+				"category": "Hyper Git",
+				"icon": "$(discard)"
+			},
+			{
+				"command": "hyperGit.resetHead",
+				"title": "Reset HEAD…",
+				"category": "Hyper Git",
+				"icon": "$(history)"
+			},
+			{
+				"command": "hyperGit.branchRename",
+				"title": "Rename Branch",
+				"category": "Hyper Git",
+				"icon": "$(edit)"
+			},
+			{
+				"command": "hyperGit.ignorePath",
+				"title": "Add to .gitignore",
+				"category": "Hyper Git",
+				"icon": "$(eye-closed)"
+			},
+			{
+				"command": "hyperGit.compareBranches",
+				"title": "Compare Branches",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.toggleFavorite",
+				"title": "Toggle Favorite",
+				"category": "Hyper Git",
+				"icon": "$(star-full)"
+			},
+			{
+				"command": "hyperGit.checkoutAsNew",
+				"title": "Checkout as New Branch…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.compareWithCurrent",
+				"title": "Compare with Current Branch",
+				"category": "Hyper Git",
+				"icon": "$(compare)"
+			},
+			{
+				"command": "hyperGit.tagCreate",
+				"title": "New Tag…",
+				"category": "Hyper Git",
+				"icon": "$(tag)"
+			},
+			{
+				"command": "hyperGit.tagDelete",
+				"title": "Delete Tag",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.tagCheckout",
+				"title": "Checkout Tag",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.openCommitFileDiff",
+				"title": "Open Commit File Diff",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.resetToHere",
+				"title": "Reset Current Branch to Here…",
+				"category": "Hyper Git",
+				"icon": "$(history)"
+			},
+			{
+				"command": "hyperGit.createBranchFromCommit",
+				"title": "Create Branch from Commit",
+				"category": "Hyper Git",
+				"icon": "$(git-branch)"
+			},
+			{
+				"command": "hyperGit.createTagFromCommit",
+				"title": "Create Tag from Commit",
+				"category": "Hyper Git",
+				"icon": "$(tag)"
+			},
+			{
+				"command": "hyperGit.showContainingBranches",
+				"title": "Show Branches Containing Commit",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logFilterGrep",
+				"title": "Filter by Message (grep)…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logFilterMergeMode",
+				"title": "Filter Merge Commits…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logFilterDate",
+				"title": "Filter by Date…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.logFilterRegex",
+				"title": "Filter by Message (regex)…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.rewordCommit",
+				"title": "Reword Latest Commit",
+				"category": "Hyper Git",
+				"icon": "$(edit)"
+			},
+			{
+				"command": "hyperGit.showConsole",
+				"title": "Open Console",
+				"category": "Hyper Git",
+				"icon": "$(output)"
+			},
+			{
+				"command": "hyperGit.partialStage",
+				"title": "Stage Hunk…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.partialUnstage",
+				"title": "Unstage Hunk…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.stageHunkAtCursor",
+				"title": "Stage Hunk at Cursor",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.undoLastCommit",
+				"title": "Undo Last Commit (soft)",
+				"category": "Hyper Git",
+				"icon": "$(discard)"
+			},
+			{
+				"command": "hyperGit.dropCommit",
+				"title": "Drop Commit (rebase)",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.fixupCommit",
+				"title": "Fixup Commit (autosquash)",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.cleanupBranches",
+				"title": "Cleanup Merged Branches",
+				"category": "Hyper Git",
+				"icon": "$(clear-all)"
+			},
+			{
+				"command": "hyperGit.pushDialog",
+				"title": "Push…",
+				"category": "Hyper Git",
+				"icon": "$(repo-push)"
+			},
+			{
+				"command": "hyperGit.updateProject",
+				"title": "Update Project…",
+				"category": "Hyper Git",
+				"icon": "$(sync)"
+			},
+			{
+				"command": "hyperGit.mergeDialog",
+				"title": "Merge…",
+				"category": "Hyper Git",
+				"icon": "$(git-merge)"
+			},
+			{
+				"command": "hyperGit.resolveConflicts",
+				"title": "Resolve Conflicts (3-way Merge Editor)…",
+				"category": "Hyper Git",
+				"icon": "$(git-merge)"
+			},
+			{
+				"command": "hyperGit.acceptOurs",
+				"title": "Accept Ours (Conflict)",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.acceptTheirs",
+				"title": "Accept Theirs (Conflict)",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.copyBranchRef",
+				"title": "Copy Branch Reference",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.threeWayDiff",
+				"title": "3-way Diff Overview",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.inlineCommitHunk",
+				"title": "Inline Commit Hunk",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.shelveChanges",
+				"title": "Shelve Changes…",
+				"category": "Hyper Git",
+				"icon": "$(inbox)"
+			},
+			{
+				"command": "hyperGit.unshelveSilently",
+				"title": "Unshelve Silently",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.unshelveWithMerge",
+				"title": "Unshelve with Merge",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.deleteShelf",
+				"title": "Delete Shelf",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.startRebase",
+				"title": "Interactive Rebase…",
+				"category": "Hyper Git",
+				"icon": "$(call-out)"
+			},
+			{
+				"command": "hyperGit.moveHunkToChangelist",
+				"title": "Move Hunk to Changelist",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.stashKeepIndex",
+				"title": "Stash (Keep Index)",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.stashClear",
+				"title": "Clear All Stashes",
+				"category": "Hyper Git",
+				"icon": "$(clear-all)"
+			},
+			{
+				"command": "hyperGit.stashBranch",
+				"title": "Create Branch from Stash",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.createPatch",
+				"title": "Create Patch…",
+				"category": "Hyper Git",
+				"icon": "$(diff)"
+			},
+			{
+				"command": "hyperGit.applyPatch",
+				"title": "Apply Patch…",
+				"category": "Hyper Git",
+				"icon": "$(diff)"
+			},
+			{
+				"command": "hyperGit.showReflog",
+				"title": "Show Reflog",
+				"category": "Hyper Git",
+				"icon": "$(clock)"
+			},
+			{
+				"command": "hyperGit.toggleBlameAnnotation",
+				"title": "Toggle Blame Annotation",
+				"category": "Hyper Git",
+				"icon": "$(eye)"
+			},
+			{
+				"command": "hyperGit.worktreeRefresh",
+				"title": "Refresh Worktrees",
+				"category": "Hyper Git",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "hyperGit.worktreeAdd",
+				"title": "New Worktree…",
+				"category": "Hyper Git",
+				"icon": "$(add)"
+			},
+			{
+				"command": "hyperGit.worktreeOpen",
+				"title": "Open Worktree",
+				"category": "Hyper Git",
+				"icon": "$(folder-opened)"
+			},
+			{
+				"command": "hyperGit.worktreeRemove",
+				"title": "Remove Worktree",
+				"category": "Hyper Git",
+				"icon": "$(trash)"
+			},
+			{
+				"command": "hyperGit.worktreeCopyPath",
+				"title": "Copy Worktree Path",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.worktreeLock",
+				"title": "Lock Worktree",
+				"category": "Hyper Git",
+				"icon": "$(lock)"
+			},
+			{
+				"command": "hyperGit.worktreeUnlock",
+				"title": "Unlock Worktree",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.worktreeMove",
+				"title": "Move Worktree…",
+				"category": "Hyper Git"
+			},
+			{
+				"command": "hyperGit.worktreePrune",
+				"title": "Prune Stale Worktrees",
+				"category": "Hyper Git",
+				"icon": "$(clear-all)"
+			}
+		],
+		"menus": {
+			"view/title": [
+				{
+					"command": "hyperGit.refresh",
+					"when": "view == hyperGit.changes",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.newChangelist",
+					"when": "view == hyperGit.changes",
+					"group": "navigation@2"
+				},
+				{
+					"command": "hyperGit.commit",
+					"when": "view == hyperGit.changes",
+					"group": "navigation@3"
+				},
+				{
+					"command": "hyperGit.commitAndPush",
+					"when": "view == hyperGit.changes",
+					"group": "navigation@4"
+				},
+				{
+					"command": "hyperGit.push",
+					"when": "view == hyperGit.changes",
+					"group": "navigation@5"
+				},
+				{
+					"command": "hyperGit.pull",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@1"
+				},
+				{
+					"command": "hyperGit.fetch",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@2"
+				},
+				{
+					"command": "hyperGit.pushDialog",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@3"
+				},
+				{
+					"command": "hyperGit.updateProject",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@4"
+				},
+				{
+					"command": "hyperGit.createPatch",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@5"
+				},
+				{
+					"command": "hyperGit.applyPatch",
+					"when": "view == hyperGit.changes",
+					"group": "1_sync@6"
+				},
+				{
+					"command": "hyperGit.refreshLog",
+					"when": "view == hyperGit.log",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.logFilter",
+					"when": "view == hyperGit.log",
+					"group": "navigation@2"
+				},
+				{
+					"command": "hyperGit.logClearFilter",
+					"when": "view == hyperGit.log",
+					"group": "navigation@3"
+				},
+				{
+					"command": "hyperGit.showReflog",
+					"when": "view == hyperGit.log",
+					"group": "navigation@4"
+				},
+				{
+					"command": "hyperGit.resetHead",
+					"when": "view == hyperGit.log",
+					"group": "1_sync@1"
+				},
+				{
+					"command": "hyperGit.refreshBranches",
+					"when": "view == hyperGit.branches",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.branchCreate",
+					"when": "view == hyperGit.branches",
+					"group": "navigation@2"
+				},
+				{
+					"command": "hyperGit.pull",
+					"when": "view == hyperGit.branches",
+					"group": "navigation@3"
+				},
+				{
+					"command": "hyperGit.push",
+					"when": "view == hyperGit.branches",
+					"group": "navigation@4"
+				},
+				{
+					"command": "hyperGit.mergeDialog",
+					"when": "view == hyperGit.branches",
+					"group": "navigation@5"
+				},
+				{
+					"command": "hyperGit.fetch",
+					"when": "view == hyperGit.branches",
+					"group": "1_sync@1"
+				},
+				{
+					"command": "hyperGit.pruneRemotes",
+					"when": "view == hyperGit.branches",
+					"group": "1_sync@1.5"
+				},
+				{
+					"command": "hyperGit.updateProject",
+					"when": "view == hyperGit.branches",
+					"group": "1_sync@2"
+				},
+				{
+					"command": "hyperGit.tagCreate",
+					"when": "view == hyperGit.branches",
+					"group": "1_sync@3"
+				},
+				{
+					"command": "hyperGit.stashCreate",
+					"when": "view == hyperGit.stash",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.stashKeepIndex",
+					"when": "view == hyperGit.stash",
+					"group": "navigation@2"
+				},
+				{
+					"command": "hyperGit.stashClear",
+					"when": "view == hyperGit.stash",
+					"group": "1_sync@1"
+				},
+				{
+					"command": "hyperGit.shelveChanges",
+					"when": "view == hyperGit.shelf",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.worktreeRefresh",
+					"when": "view == hyperGit.worktrees",
+					"group": "navigation@1"
+				},
+				{
+					"command": "hyperGit.worktreeAdd",
+					"when": "view == hyperGit.worktrees",
+					"group": "navigation@2"
+				},
+				{
+					"command": "hyperGit.worktreePrune",
+					"when": "view == hyperGit.worktrees",
+					"group": "navigation@3"
+				}
+			],
+			"view/item/context": [
+				{
+					"command": "hyperGit.setActiveChangelist",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.changelist",
+					"group": "1_changelist@1"
+				},
+				{
+					"command": "hyperGit.renameChangelist",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.changelist",
+					"group": "1_changelist@2"
+				},
+				{
+					"command": "hyperGit.deleteChangelist",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.changelist",
+					"group": "1_changelist@3"
+				},
+				{
+					"command": "hyperGit.moveChangelist",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "inline"
+				},
+				{
+					"command": "hyperGit.moveChangelist",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "1_file@1"
+				},
+				{
+					"command": "hyperGit.showHistory",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "1_file@2"
+				},
+				{
+					"command": "hyperGit.discardChanges",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "9_dangerous@1"
+				},
+				{
+					"command": "hyperGit.branchCheckout",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/ && !listMultiSelection",
+					"group": "1_branch@1"
+				},
+				{
+					"command": "hyperGit.branchDelete",
+					"when": "view == hyperGit.branches && viewItem == hyperGit.branch",
+					"group": "9_dangerous@1"
+				},
+				{
+					"command": "hyperGit.deleteRemoteBranch",
+					"when": "view == hyperGit.branches && viewItem == hyperGit.remoteBranch",
+					"group": "9_dangerous@2"
+				},
+				{
+					"command": "hyperGit.mergeBranch",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/ && !listMultiSelection",
+					"group": "1_branch@3"
+				},
+				{
+					"command": "hyperGit.rebaseBranch",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/ && !listMultiSelection",
+					"group": "1_branch@4"
+				},
+				{
+					"command": "hyperGit.branchRename",
+					"when": "view == hyperGit.branches && viewItem == hyperGit.branch && !listMultiSelection",
+					"group": "1_branch@5"
+				},
+				{
+					"command": "hyperGit.compareBranches",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/ && !listMultiSelection",
+					"group": "1_branch@6"
+				},
+				{
+					"command": "hyperGit.copyBranchRef",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/",
+					"group": "1_branch@7"
+				},
+				{
+					"command": "hyperGit.toggleFavorite",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/",
+					"group": "inline"
+				},
+				{
+					"command": "hyperGit.toggleFavorite",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/",
+					"group": "1_branch@0"
+				},
+				{
+					"command": "hyperGit.checkoutAsNew",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch/ && !listMultiSelection",
+					"group": "1_branch@1.5"
+				},
+				{
+					"command": "hyperGit.compareWithCurrent",
+					"when": "view == hyperGit.branches && viewItem =~ /hyperGit.branch|hyperGit.remoteBranch|hyperGit.tag/ && !listMultiSelection",
+					"group": "1_branch@8"
+				},
+				{
+					"command": "hyperGit.tagCheckout",
+					"when": "view == hyperGit.branches && viewItem == hyperGit.tag && !listMultiSelection",
+					"group": "1_tag@1"
+				},
+				{
+					"command": "hyperGit.tagDelete",
+					"when": "view == hyperGit.branches && viewItem == hyperGit.tag",
+					"group": "9_dangerous@1"
+				},
+				{
+					"command": "hyperGit.ignorePath",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "1_file@4"
+				},
+				{
+					"command": "hyperGit.partialStage",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "1_file@5"
+				},
+				{
+					"command": "hyperGit.partialUnstage",
+					"when": "view == hyperGit.changes && viewItem == hyperGit.fileChange",
+					"group": "1_file@6"
+				},
+				{
+					"command": "hyperGit.stashApply",
+					"when": "view == hyperGit.stash && viewItem == hyperGit.stash",
+					"group": "1_stash@1"
+				},
+				{
+					"command": "hyperGit.stashPop",
+					"when": "view == hyperGit.stash && viewItem == hyperGit.stash",
+					"group": "1_stash@2"
+				},
+				{
+					"command": "hyperGit.stashDrop",
+					"when": "view == hyperGit.stash && viewItem == hyperGit.stash",
+					"group": "9_dangerous@1"
+				},
+				{
+					"command": "hyperGit.stashBranch",
+					"when": "view == hyperGit.stash && viewItem == hyperGit.stash",
+					"group": "1_stash@4"
+				},
+				{
+					"command": "hyperGit.unshelveSilently",
+					"when": "view == hyperGit.shelf && viewItem == hyperGit.shelf",
+					"group": "1_shelf@1"
+				},
+				{
+					"command": "hyperGit.unshelveWithMerge",
+					"when": "view == hyperGit.shelf && viewItem == hyperGit.shelf",
+					"group": "1_shelf@2"
+				},
+				{
+					"command": "hyperGit.deleteShelf",
+					"when": "view == hyperGit.shelf && viewItem == hyperGit.shelf",
+					"group": "9_dangerous@1"
+				},
+				{
+					"command": "hyperGit.worktreeOpen",
+					"when": "view == hyperGit.worktrees && viewItem =~ /hyperGit.worktree|hyperGit.worktreeMain/",
+					"group": "1_wt@1"
+				},
+				{
+					"command": "hyperGit.worktreeMove",
+					"when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree",
+					"group": "1_wt@2"
+				},
+				{
+					"command": "hyperGit.worktreeLock",
+					"when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree",
+					"group": "1_wt@3"
+				},
+				{
+					"command": "hyperGit.worktreeUnlock",
+					"when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree",
+					"group": "1_wt@4"
+				},
+				{
+					"command": "hyperGit.worktreeCopyPath",
+					"when": "view == hyperGit.worktrees && viewItem =~ /hyperGit.worktree|hyperGit.worktreeMain/",
+					"group": "1_wt@5"
+				},
+				{
+					"command": "hyperGit.worktreeRemove",
+					"when": "view == hyperGit.worktrees && viewItem == hyperGit.worktree",
+					"group": "9_dangerous@1"
+				}
+			],
+			"editor/context": [
+				{
+					"command": "hyperGit.toggleBlameAnnotation",
+					"when": "resourceScheme == file",
+					"group": "hyperGit@1"
+				}
+			],
+			"commandPalette": [
+				{
+					"command": "hyperGit.openDiff",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.setActiveChangelist",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.renameChangelist",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.deleteChangelist",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.moveChangelist",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.copyCommitHash",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.showHistory",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.branchCheckout",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.branchDelete",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.deleteRemoteBranch",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.mergeBranch",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.rebaseBranch",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.stashApply",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.stashPop",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.stashDrop",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.discardChanges",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.cherryPick",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.revertCommit",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.branchRename",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.compareBranches",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.ignorePath",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.copyBranchRef",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.inlineCommitHunk",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.unshelveSilently",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.unshelveWithMerge",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.deleteShelf",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.moveHunkToChangelist",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.toggleFavorite",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.checkoutAsNew",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.compareWithCurrent",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.tagDelete",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.tagCheckout",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.openCommitFileDiff",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.resetToHere",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.createBranchFromCommit",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.createTagFromCommit",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.showContainingBranches",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeOpen",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeRemove",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeCopyPath",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeLock",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeUnlock",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeMove",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.worktreeRefresh",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.stashView",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.stageHunkAtCursor",
+					"when": "false"
+				},
+				{
+					"command": "hyperGit.logFilterAuthor",
+					"when": "view == hyperGit.log"
+				},
+				{
+					"command": "hyperGit.logFilterPath",
+					"when": "view == hyperGit.log"
+				},
+				{
+					"command": "hyperGit.logFilterGrep",
+					"when": "view == hyperGit.log"
+				},
+				{
+					"command": "hyperGit.logFilterRegex",
+					"when": "view == hyperGit.log"
+				},
+				{
+					"command": "hyperGit.logFilterMergeMode",
+					"when": "view == hyperGit.log"
+				},
+				{
+					"command": "hyperGit.logFilterDate",
+					"when": "view == hyperGit.log"
+				}
+			]
+		},
+		"configuration": {
+			"title": "Hyper Git",
+			"properties": {
+				"hyperGit.commit.template": {
+					"type": "string",
+					"default": "",
+					"markdownDescription": "Commit message template (injected into the Commit view editor)."
+				},
+				"hyperGit.commit.conventional": {
+					"type": "boolean",
+					"default": true,
+					"markdownDescription": "Run real-time Conventional Commits validation on commit messages."
+				},
+				"hyperGit.ai.enabled": {
+					"type": "boolean",
+					"default": false,
+					"markdownDescription": "Enable AI agent capabilities (currently reserved as an architectural seam; not yet active)."
+				},
+				"hyperGit.log.ci.enabled": {
+					"type": "boolean",
+					"default": true,
+					"markdownDescription": "Show the final CI status on each commit in the Log view (GitHub Actions + Commit Statuses). Green check = passed, red cross = failed; hover to see each check and any failure reasons. Requires a GitHub remote."
+				},
+				"hyperGit.log.ci.remote": {
+					"type": "string",
+					"default": "",
+					"markdownDescription": "Remote name used to query CI status (empty = auto, prefers `origin`). For multi-remote repos, specify e.g. `upstream`."
+				},
+				"hyperGit.log.ci.provider": {
+					"type": "string",
+					"enum": [
+						"auto",
+						"github.com",
+						"github-enterprise"
+					],
+					"enumDescriptions": [
+						"Auto-detect by origin host",
+						"GitHub.com (public cloud)",
+						"GitHub Enterprise (self-hosted)"
+					],
+					"default": "auto",
+					"markdownDescription": "CI data source. `auto` is resolved by the origin host (github.com → github.com, otherwise GitHub Enterprise)."
+				}
+			}
+		}
+	},
+	"scripts": {
+		"vscode:prepublish": "pnpm run package",
+		"compile": "pnpm run check-types && pnpm run lint && node esbuild.js",
+		"package": "pnpm run check-types && pnpm run lint && node esbuild.js --production",
+		"check-types": "tsc --noEmit",
+		"lint": "eslint",
+		"watch": "node esbuild.js --watch",
+		"test:unit": "vitest run",
+		"test:integration": "node tests/run-integration.js",
+		"test": "pnpm run test:unit && pnpm run test:integration",
+		"clean": "rimraf dist out *.vsix"
+	},
+	"devDependencies": {
+		"@eslint/js": "^10.0.1",
+		"@stylistic/eslint-plugin": "^2.9.0",
+		"@types/node": "^26.0.1",
+		"@types/vscode": "~1.85.0",
+		"@vscode/test-electron": "^2.4.1",
+		"@vscode/vsce": "^3.2.1",
+		"esbuild": "^0.28.1",
+		"eslint": "^10.6.0",
+		"mocha": "^11.0.1",
+		"prettier": "^3.9.3",
+		"rimraf": "^6.0.1",
+		"typescript": "^5.9.2",
+		"typescript-eslint": "^8.39.0",
+		"vitest": "^2.1.8"
+	}
 }
diff --git a/src/adapter/advanced-commands.ts b/src/adapter/advanced-commands.ts
index 38995ec..8139164 100644
--- a/src/adapter/advanced-commands.ts
+++ b/src/adapter/advanced-commands.ts
@@ -1,13 +1,14 @@
 import * as vscode from 'vscode';
 import type { BranchNode, BranchesTreeProvider } from './tree/branches-tree';
 import type { GitRepositoryService } from './git-repository-service';
-import type { LogNode } from './tree/log-tree';
+import type { LogNode } from './webview/log-webview';
 import { filterMergeable } from '../engine/ref/cleanup';
+import { selectedBranchRefs } from './branch-selection';
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
 /**
- * 注册高级 git 操作（Batch 3）—— 补齐 IDEA Log/Branches 的高级动作。
+ * 注册高级 git 操作（Batch 3）—— Log/Branches 的高级动作。
  * undo commit（soft reset）/ drop commit（rebase --onto）/ fixup（autosquash，经 env 注入 GIT_SEQUENCE_EDITOR）
  * / cleanup branches（--merged 批量删）/ copy branch ref / 3-way diff 概览。
  */
@@ -20,16 +21,16 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 			if (!repo) {
 				return;
 			}
-			const ok = await vscode.window.showWarningMessage('撤销最近一次提交（soft reset，保留改动到暂存区）？', { modal: true }, '撤销');
-			if (ok !== '撤销') {
+			const ok = await vscode.window.showWarningMessage('Undo the last commit (soft reset, keeps changes in the index)?', { modal: true }, 'Undo');
+			if (ok !== 'Undo') {
 				return;
 			}
 			try {
 				await service.execGit(['reset', '--soft', 'HEAD~1']);
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage('已撤销最近提交（soft）');
+				void vscode.window.showInformationMessage('Undo last commit complete (soft)');
 			} catch (e) {
-				void vscode.window.showErrorMessage(`撤销失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to undo: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -45,19 +46,19 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 				return;
 			}
 			const ok = await vscode.window.showWarningMessage(
-				`删除提交 ${hash.slice(0, 7)}？将用 rebase 重写历史（可能冲突；已推送的提交勿用）。`,
+				`Drop commit ${hash.slice(0, 7)}? This rewrites history via rebase (may conflict; do not use on pushed commits).`,
 				{ modal: true },
-				'删除提交',
+				'Drop commit',
 			);
-			if (ok !== '删除提交') {
+			if (ok !== 'Drop commit') {
 				return;
 			}
 			try {
 				await service.execGit(['rebase', '--onto', `${hash}^`, hash]);
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已删除提交 ${hash.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Dropped commit ${hash.slice(0, 7)}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`删除失败（可能需手动解冲突）：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to drop (may need manual conflict resolution): ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -73,7 +74,7 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 				return;
 			}
 			const ok = await vscode.window.showWarningMessage(
-				`将当前已暂存改动 fixup 到 ${hash.slice(0, 7)}？将重写历史（autosquash rebase）。`,
+				`Fixup the currently staged changes into ${hash.slice(0, 7)}? This rewrites history (autosquash rebase).`,
 				{ modal: true },
 				'Fixup',
 			);
@@ -86,9 +87,9 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 					env: { ...process.env, GIT_SEQUENCE_EDITOR: ':' },
 				});
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已 fixup 到 ${hash.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Fixup into ${hash.slice(0, 7)} complete`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Fixup 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Fixup failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -106,16 +107,16 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 				const out = await service.execGit(['branch', '--merged', base]);
 				merged = filterMergeable(out, base, headName ? [headName] : []);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`查询已合并分支失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to query merged branches: ${errMsg(e)}`);
 				return;
 			}
 			if (merged.length === 0) {
-				void vscode.window.showInformationMessage('无可清理的已合并分支');
+				void vscode.window.showInformationMessage('No merged branches to clean up');
 				return;
 			}
 			const picks = await vscode.window.showQuickPick(
 				merged.map((b) => ({ label: b, picked: true })),
-				{ canPickMany: true, title: `已合并到 ${base} 的本地分支（勾选删除）` },
+				{ canPickMany: true, title: `Local branches merged into ${base} (check to delete)` },
 			);
 			if (!picks || picks.length === 0) {
 				return;
@@ -130,20 +131,21 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 				}
 			}
 			branchesTree.refresh();
-			void vscode.window.showInformationMessage(`已删除 ${deleted} 个已合并分支`);
+			void vscode.window.showInformationMessage(`Deleted ${deleted} merged branch(es)`);
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.copyBranchRef', async (node?: BranchNode) => {
-			if (node?.kind !== 'branch') {
+		vscode.commands.registerCommand('hyperGit.copyBranchRef', async (node?: BranchNode, nodes?: BranchNode[]) => {
+			// 支持多选：复制全部选中引用（按行连接）。
+			const names = selectedBranchRefs(node, nodes, () => true)
+				.map((r) => r.shortName)
+				.filter((n) => n.length > 0);
+			if (names.length === 0) {
 				return;
 			}
-			const ref = node.ref.shortName;
-			if (ref) {
-				await vscode.env.clipboard.writeText(ref);
-				void vscode.window.showInformationMessage(`已复制 ${ref}`);
-			}
+			await vscode.env.clipboard.writeText(names.join('\n'));
+			void vscode.window.showInformationMessage(names.length === 1 ? `Copied ${names[0]}` : `Copied ${names.length} refs`);
 		}),
 	);
 
@@ -157,21 +159,21 @@ export function registerAdvancedCommands(service: GitRepositoryService, branches
 				const staged = await service.execGit(['diff', '--cached', '--stat']);
 				const working = await service.execGit(['diff', '--stat']);
 				const content = [
-					'# 3-way Diff 概览（HEAD ↔ Staged ↔ Working）',
+					'# 3-way Diff Overview (HEAD ↔ Staged ↔ Working)',
 					'',
-					'## 已暂存改动（HEAD ↔ Staged）',
+					'## Staged Changes (HEAD ↔ Staged)',
 					'',
-					staged.trim() || '_(无)_)',
+					staged.trim() || '_(none)_)',
 					'',
-					'## 未暂存改动（Staged ↔ Working）',
+					'## Unstaged Changes (Staged ↔ Working)',
 					'',
-					working.trim() || '_(无)_',
+					working.trim() || '_(none)_',
 					'',
 				].join('\n');
 				const doc = await vscode.workspace.openTextDocument({ content, language: 'markdown' });
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`3-way diff 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`3-way diff failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -190,6 +192,6 @@ async function pickCommitHash(service: GitRepositoryService): Promise<string | u
 		description: `${c.authorName ?? ''} · ${c.hash.slice(0, 7)}`,
 		hash: c.hash,
 	}));
-	const pick = await vscode.window.showQuickPick(items, { placeHolder: '选择 commit' });
+	const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Select a commit' });
 	return pick?.hash;
 }
diff --git a/src/adapter/branch-favorites.ts b/src/adapter/branch-favorites.ts
index 42367ba..a5c10c9 100644
--- a/src/adapter/branch-favorites.ts
+++ b/src/adapter/branch-favorites.ts
@@ -4,7 +4,7 @@ import { toggleFavorite } from '../engine/ref/favorites';
 /**
  * BranchFavorites：分支收藏持久化（仿 {@link ChangelistRegistry}）。
  *
- * IDEA「Set Favorite」能力：把常用分支标星置顶。收藏名列表存于 workspaceState（按仓库根隔离），
+ * 分支收藏（Set Favorite）能力：把常用分支标星置顶。收藏名列表存于 workspaceState（按仓库根隔离），
  * 重启后恢复。集合运算复用纯逻辑 {@link toggleFavorite}，便于单测。
  */
 export class BranchFavorites implements vscode.Disposable {
diff --git a/src/adapter/branch-selection.ts b/src/adapter/branch-selection.ts
new file mode 100644
index 0000000..6593efb
--- /dev/null
+++ b/src/adapter/branch-selection.ts
@@ -0,0 +1,29 @@
+/**
+ * Branches 多选命令的适配层归一化（薄包装）。
+ *
+ * 把 VS Code `view/item/context` 命令的 `(clickedNode, selectedNodes[])` 实参抽取为 RawRef，
+ * 再委托纯逻辑 {@link collectBranchRefs} 完成谓词过滤 / 去重 / 「点击在选区之外」归一化。
+ * 维持「UI → Adapter → Engine」单向依赖：BranchNode 类型仅在本适配层出现。
+ */
+
+import type { RawRef } from '../engine/ref/for-each-ref';
+import { collectBranchRefs } from '../engine/ref/selection';
+import type { BranchNode } from './tree/branches-tree';
+
+/**
+ * 解析多选命令的作用目标 ref 列表。
+ * @param clicked 右键点击节点（第 1 实参）
+ * @param selection VS Code 传入的选区节点（第 2 实参，仅多选时存在）
+ * @param predicate ref 谓词（如本地可删 / 标签）
+ */
+export function selectedBranchRefs(
+	clicked: BranchNode | undefined,
+	selection: BranchNode[] | undefined,
+	predicate: (ref: RawRef) => boolean,
+): RawRef[] {
+	const clickedRef = clicked?.kind === 'branch' ? clicked.ref : undefined;
+	const selRefs = (selection ?? [])
+		.filter((n): n is Extract<BranchNode, { kind: 'branch' }> => n.kind === 'branch')
+		.map((n) => n.ref);
+	return collectBranchRefs(clickedRef, selRefs, predicate);
+}
diff --git a/src/adapter/changelist-registry.ts b/src/adapter/changelist-registry.ts
index f383b82..56983b4 100644
--- a/src/adapter/changelist-registry.ts
+++ b/src/adapter/changelist-registry.ts
@@ -12,7 +12,7 @@ interface PersistedState {
 }
 
 /**
- * ChangelistRegistry：仿 IDEA ChangeListManager 的多 changelist 管理。
+ * ChangelistRegistry：参考 JetBrains ChangeListManager 设计的多 changelist 管理。
  * 维护命名 changelist 列表 + fileKey→changelist 分配表 + active changelist；
  * 持久化于 workspaceState（按仓库根隔离），重启后恢复。
  */
diff --git a/src/adapter/ci/github-auth.ts b/src/adapter/ci/github-auth.ts
new file mode 100644
index 0000000..5489a88
--- /dev/null
+++ b/src/adapter/ci/github-auth.ts
@@ -0,0 +1,58 @@
+/**
+ * GitHub 认证（adapter 层，唯一触碰 vscode.authentication）。
+ *
+ * 复用 VS Code 内置 GitHub 认证 provider，凭证由编辑器托管，绝不经过 chat/日志。
+ * - `repo` 范围：覆盖私有仓库的 Checks（Actions）+ Commit Status 读取（`repo:status` 不覆盖 Checks）。
+ * - 静默 `peek`（createIfNone:false）：仅复用已存在会话，绝不弹窗；`signIn`（createIfNone:true）仅在
+ *   用户显式点击「登录」时由命令触发。provider id 随主机定（github.com→`github`，GHE→`github-enterprise`）。
+ */
+
+import * as vscode from 'vscode';
+
+export type GitHubAuthProviderId = 'github' | 'github-enterprise';
+
+/** 读 CI（私有仓库的 Checks + Statuses）所需范围。 */
+const GITHUB_SCOPES = ['repo'] as const;
+
+export class GitHubAuth {
+	/** 已缓存的会话（undefined 表示「已探测且无会话」；has() 区分「未探测」与「无会话」避免重复 getSession）。 */
+	private readonly cached = new Map<GitHubAuthProviderId, vscode.AuthenticationSession | undefined>();
+
+	constructor(disposables: vscode.Disposable[]) {
+		disposables.push(
+			vscode.authentication.onDidChangeSessions((e) => {
+				const id = e.provider.id;
+				if (id === 'github' || id === 'github-enterprise') {
+					this.cached.delete(id as GitHubAuthProviderId);
+				}
+			}),
+		);
+	}
+
+	/** 静默探测：仅返回已存在会话，永不弹窗。provider 未注册（GHE 未配置）时抛错，由调用方捕获。 */
+	async peek(provider: GitHubAuthProviderId): Promise<vscode.AuthenticationSession | undefined> {
+		if (this.cached.has(provider)) {
+			return this.cached.get(provider);
+		}
+		const session = await vscode.authentication.getSession(provider, [...GITHUB_SCOPES], { createIfNone: false });
+		this.cached.set(provider, session);
+		return session;
+	}
+
+	/** 交互式登录：显示原生授权 UI。仅在用户显式手势触发时调用。 */
+	async signIn(provider: GitHubAuthProviderId): Promise<vscode.AuthenticationSession | undefined> {
+		try {
+			const session = await vscode.authentication.getSession(provider, [...GITHUB_SCOPES], { createIfNone: true });
+			this.cached.set(provider, session);
+			return session;
+		} catch {
+			// 用户取消授权：保持未登录，不抛错。
+			return undefined;
+		}
+	}
+
+	/** 失效缓存（401 时调用，强制下次重新解析会话）。 */
+	invalidate(provider: GitHubAuthProviderId): void {
+		this.cached.delete(provider);
+	}
+}
diff --git a/src/adapter/ci/github-ci-service.ts b/src/adapter/ci/github-ci-service.ts
new file mode 100644
index 0000000..7222bf3
--- /dev/null
+++ b/src/adapter/ci/github-ci-service.ts
@@ -0,0 +1,416 @@
+/**
+ * GitHub CI 服务（adapter 层，唯一触碰 vscode/网络）。
+ *
+ * 编排：解析 origin 远程 → GitHub 坐标 → 取 token → GraphQL 批量取 `statusCheckRollup` →
+ * 按 oid 缓存（终态永久 / pending 30s TTL）→ 回填 webview。CI 懒加载、仅取可见行、终态整会话缓存，
+ * 从根本上规避 1000 提交触发 1000 请求的限流风暴。失败一律降级为「无图标 / 走缓存」，绝不阻塞建图。
+ *
+ * 安全：token 仅用于 Authorization 头，不入日志/webview；`openExternal` 校验主机属 GitHub（反 SSRF，
+ * detailsUrl 属观察内容不盲信）。
+ */
+
+import * as vscode from 'vscode';
+import type { GitRepositoryService } from '../git-repository-service';
+import type { Logger } from '../../infra/logger';
+import { GitHubAuth, type GitHubAuthProviderId } from './github-auth';
+import { buildCiQuery } from '../../engine/ci/graphql-query';
+import { extractRateLimit, parseCiResponse } from '../../engine/ci/model';
+import { authProviderId, graphqlEndpoint, parseGitHubRemote, type GitHubRemote } from '../../engine/ci/remote-parser';
+import type { CiStatusVM } from '../../engine/ci/types';
+
+/** 单次 GraphQL 拉取的 oid 上限（与可见窗口粒度对齐，文档体积与单点成本均衡）。 */
+const MAX_OIDS_PER_QUERY = 100;
+/** GraphQL 并发上限（滚动连发时保护 GitHub）。 */
+const MAX_CONCURRENT = 2;
+/** 单请求超时（ms）。 */
+const REQUEST_TIMEOUT_MS = 15_000;
+/** pending / unknown 缓存 TTL（ms）—— 运行中或未推送的提交短时刷新。 */
+const PENDING_TTL_MS = 30_000;
+/** 剩余点数低于此阈值进入限流冷却（直到 resetAt）。 */
+const RATE_FLOOR = 100;
+
+export interface CiServiceStatus {
+	/** 远程为 GitHub 且功能启用：可显示图标/发请求。 */
+	readonly available: boolean;
+	/** 远程是 GitHub 但未授权：webview 显示「登录」提示。 */
+	readonly needsAuth: boolean;
+	/** 软错误摘要（限流/运行时无 fetch）。 */
+	readonly error?: string;
+}
+
+interface RemoteCacheEntry {
+	readonly repoRoot: string;
+	readonly remote: GitHubRemote | null;
+}
+
+interface CacheEntry {
+	readonly vm: CiStatusVM;
+	readonly expires: number; // Infinity 表示整会话
+}
+
+/** 简易异步信号量（控制并发请求数）。 */
+class Semaphore {
+	private active = 0;
+	private readonly waiters: Array<() => void> = [];
+	constructor(private readonly max: number) {}
+	async acquire(): Promise<void> {
+		if (this.active < this.max) {
+			this.active++;
+			return;
+		}
+		await new Promise<void>((resolve) => this.waiters.push(resolve));
+	}
+	release(): void {
+		if (this.waiters.length > 0) {
+			this.waiters.shift()!(); // 直接把槽位移交给等待者，active 不变
+		} else {
+			this.active--;
+		}
+	}
+}
+
+export class GitHubCiService implements vscode.Disposable {
+	private remoteCache: RemoteCacheEntry | null = null;
+	private readonly cache = new Map<string, CacheEntry>();
+	private readonly inflight = new Map<string, Promise<CiStatusVM | undefined>>();
+	private cooldownUntil = 0;
+	private readonly semaphore = new Semaphore(MAX_CONCURRENT);
+	private readonly abortController = new AbortController();
+	private readonly disposables: vscode.Disposable[] = [];
+
+	constructor(
+		private readonly service: GitRepositoryService,
+		private readonly auth: GitHubAuth,
+		private readonly logger: Logger,
+	) {
+		this.disposables.push(
+			// 配置变更（开关/provider/远程）后重算可用性。
+			vscode.workspace.onDidChangeConfiguration((e) => {
+				if (e.affectsConfiguration('hyperGit.log.ci')) {
+					this.remoteCache = null;
+				}
+			}),
+		);
+	}
+
+	// ─── 对外能力 ────────────────────────────────────────────────────────────
+
+	/** 当前仓库的 CI 能力 + 授权态（廉价：复用缓存会话，不阻塞建图）。 */
+	async status(): Promise<CiServiceStatus> {
+		if (!this.enabled()) {
+			return { available: false, needsAuth: false };
+		}
+		const remote = this.resolveRemote();
+		const provider = remote ? this.providerIdFor(remote) : null;
+		if (!remote || !provider) {
+			return { available: false, needsAuth: false };
+		}
+		if (typeof globalThis.fetch !== 'function') {
+			return { available: false, needsAuth: false, error: 'No global fetch in current runtime' };
+		}
+		try {
+			const session = await this.auth.peek(provider);
+			return { available: true, needsAuth: !session, error: this.cooldownError() };
+		} catch {
+			// provider 未注册（GHE 未配置 github-enterprise.uri）→ 功能休眠，不报错。
+			return { available: false, needsAuth: false };
+		}
+	}
+
+	/** 批量取 CI 状态（缓存优先 + in-flight 去重 + 批量 GraphQL）。 */
+	async getStatuses(hashes: readonly string[]): Promise<Map<string, CiStatusVM>> {
+		const result = new Map<string, CiStatusVM>();
+		if (hashes.length === 0 || !this.enabled()) {
+			return result;
+		}
+		const remote = this.resolveRemote();
+		const provider = remote ? this.providerIdFor(remote) : null;
+		if (!remote || !provider) {
+			return result;
+		}
+
+		const uniq = [...new Set(hashes)];
+		const toAwait: Array<[string, Promise<CiStatusVM | undefined>]> = [];
+		const toFetch: string[] = [];
+		for (const h of uniq) {
+			const cached = this.readCache(h);
+			if (cached) {
+				result.set(h, cached);
+				continue;
+			}
+			const existing = this.inflight.get(h);
+			if (existing) {
+				toAwait.push([h, existing]);
+			} else {
+				toFetch.push(h);
+			}
+		}
+
+		if (toFetch.length > 0 && !this.inCooldown()) {
+			for (const batch of this.chunk(toFetch, MAX_OIDS_PER_QUERY)) {
+				const batchPromise = this.runBatch(remote, provider, batch);
+				for (const h of batch) {
+					const p = batchPromise.then((m) => m.get(h));
+					this.inflight.set(h, p);
+					toAwait.push([h, p]);
+				}
+			}
+		}
+
+		if (toAwait.length === 0) {
+			return result;
+		}
+		const settled = await Promise.all(toAwait.map(async ([h, p]) => [h, (await p) as CiStatusVM | undefined] as const));
+		for (const [h, vm] of settled) {
+			this.inflight.delete(h);
+			if (vm) {
+				this.writeCache(h, vm);
+				result.set(h, vm);
+			}
+		}
+		return result;
+	}
+
+	/** 交互式登录（命令触发）。 */
+	async signIn(): Promise<boolean> {
+		const remote = this.resolveRemote();
+		const provider = remote ? this.providerIdFor(remote) : null;
+		if (!remote || !provider) {
+			return false;
+		}
+		try {
+			const session = await this.auth.signIn(provider);
+			return !!session;
+		} catch {
+			return false;
+		}
+	}
+
+	/** 校验后打开外部链接（反 SSRF：仅放行 GitHub 主机）。 */
+	async openExternal(rawUrl: string): Promise<void> {
+		let uri: vscode.Uri;
+		try {
+			uri = vscode.Uri.parse(rawUrl, true);
+		} catch {
+			return;
+		}
+		if (uri.scheme !== 'https') {
+			return;
+		}
+		const host = uri.authority.toLowerCase();
+		const remote = this.resolveRemote();
+		const allowed =
+			host === 'github.com' ||
+			host.endsWith('.github.com') ||
+			(!!remote && (host === remote.host || host === `api.${remote.host}`));
+		if (!allowed) {
+			this.logger.warn(`拒绝打开非 GitHub 链接：${rawUrl}`);
+			return;
+		}
+		await vscode.env.openExternal(uri);
+	}
+
+	dispose(): void {
+		this.abortController.abort();
+		this.inflight.clear();
+		this.disposables.forEach((d) => d.dispose());
+	}
+
+	// ─── 配置 / 远程解析 ──────────────────────────────────────────────────────
+
+	private enabled(): boolean {
+		return vscode.workspace.getConfiguration('hyperGit').get<boolean>('log.ci.enabled', true);
+	}
+
+	private providerConfig(): 'auto' | 'github.com' | 'github-enterprise' {
+		return vscode.workspace.getConfiguration('hyperGit').get<'auto' | 'github.com' | 'github-enterprise'>(
+			'log.ci.provider',
+			'auto',
+		);
+	}
+
+	private remoteNameConfig(): string {
+		return vscode.workspace.getConfiguration('hyperGit').get<string>('log.ci.remote', '') ?? '';
+	}
+
+	/** 远程 → 认证 provider（依据配置与主机；不匹配返回 null → 功能休眠）。 */
+	private providerIdFor(remote: GitHubRemote): GitHubAuthProviderId | null {
+		const cfg = this.providerConfig();
+		if (cfg === 'github.com') {
+			return remote.isGitHubDotCom ? 'github' : null;
+		}
+		if (cfg === 'github-enterprise') {
+			return remote.isGitHubDotCom ? null : 'github-enterprise';
+		}
+		// auto：信任远程主机探测（github.com → github，其余 → github-enterprise）。
+		return authProviderId(remote);
+	}
+
+	/** 解析当前仓库远程为 GitHub 坐标（按 repoRoot 缓存；优先配置名 → origin → 首个可解析）。 */
+	private resolveRemote(): GitHubRemote | null {
+		const repoRoot = this.service.repoRoot ?? '';
+		if (this.remoteCache && this.remoteCache.repoRoot === repoRoot) {
+			return this.remoteCache.remote;
+		}
+		let remote: GitHubRemote | null = null;
+		const remotes = this.service.repo?.state.remotes ?? [];
+		if (remotes.length > 0) {
+			const preferred = this.remoteNameConfig().trim();
+			const pick = (r: { fetchUrl?: string; pushUrl?: string }): string => r.pushUrl ?? r.fetchUrl ?? '';
+			const ordered: Array<{ fetchUrl?: string; pushUrl?: string }> = [];
+			if (preferred) {
+				const hit = remotes.find((r) => r.name === preferred);
+				if (hit) {
+					ordered.push(hit);
+				}
+			}
+			const origin = remotes.find((r) => r.name === 'origin');
+			if (origin) {
+				ordered.push(origin);
+			}
+			ordered.push(...remotes);
+			for (const cand of ordered) {
+				remote = parseGitHubRemote(pick(cand));
+				if (remote) {
+					break;
+				}
+			}
+		}
+		this.remoteCache = { repoRoot, remote };
+		return remote;
+	}
+
+	// ─── 缓存 / 限流 ─────────────────────────────────────────────────────────
+
+	private readCache(hash: string): CiStatusVM | undefined {
+		const entry = this.cache.get(hash);
+		if (!entry) {
+			return undefined;
+		}
+		if (entry.expires !== Infinity && Date.now() > entry.expires) {
+			this.cache.delete(hash);
+			return undefined;
+		}
+		return entry.vm;
+	}
+
+	private writeCache(hash: string, vm: CiStatusVM): void {
+		const terminal = vm.state === 'success' || vm.state === 'failure';
+		this.cache.set(hash, { vm, expires: terminal ? Infinity : Date.now() + PENDING_TTL_MS });
+	}
+
+	private inCooldown(): boolean {
+		return Date.now() < this.cooldownUntil;
+	}
+
+	private cooldownError(): string | undefined {
+		if (!this.inCooldown()) {
+			return undefined;
+		}
+		const secs = Math.ceil((this.cooldownUntil - Date.now()) / 1000);
+		return `GitHub rate limited, resumes in ~${secs}s`;
+	}
+
+	// ─── 取数 ────────────────────────────────────────────────────────────────
+
+	private chunk<T>(arr: readonly T[], size: number): T[][] {
+		const out: T[][] = [];
+		for (let i = 0; i < arr.length; i += size) {
+			out.push(arr.slice(i, i + size));
+		}
+		return out;
+	}
+
+	/** 单批 GraphQL 取数（带并发闸、超时、401/403/限流处理）。失败返回空 Map（不缓存，留待重试）。 */
+	private async runBatch(remote: GitHubRemote, provider: GitHubAuthProviderId, oids: string[]): Promise<Map<string, CiStatusVM>> {
+		const map = new Map<string, CiStatusVM>();
+		if (oids.length === 0) {
+			return map;
+		}
+		const fetchImpl = globalThis.fetch;
+		if (typeof fetchImpl !== 'function') {
+			this.logger.warn('当前运行时无全局 fetch，CI 功能不可用');
+			return map;
+		}
+		const token = await this.acquireToken(provider);
+		if (!token) {
+			return map; // 未授权：不缓存，待登录后重试
+		}
+
+		const { query } = buildCiQuery({ owner: remote.owner, name: remote.repo, oids });
+		const endpoint = graphqlEndpoint(remote);
+		const body = JSON.stringify({ query, variables: { owner: remote.owner, name: remote.repo } });
+
+		await this.semaphore.acquire();
+		try {
+			const res = await this.fetchWithTimeout(fetchImpl, endpoint, {
+				method: 'POST',
+				headers: { Authorization: `bearer ${token}`, 'Content-Type': 'application/json', 'User-Agent': 'hyper-git-vscode' },
+				body,
+			});
+			if (res.status === 401) {
+				this.auth.invalidate(provider); // token 失效，强制下次重解析会话
+				return map;
+			}
+			if (res.status === 403) {
+				const retryAfter = res.headers.get('retry-after');
+				if (retryAfter) {
+					this.cooldownUntil = Math.max(this.cooldownUntil, Date.now() + Number(retryAfter) * 1000);
+				}
+				return map;
+			}
+			let json: unknown;
+			try {
+				json = await res.json();
+			} catch {
+				return map;
+			}
+			const errors = (json as { errors?: unknown[] })?.errors;
+			if (Array.isArray(errors) && errors.length > 0) {
+				this.logger.warn(`CI 查询返回错误：${JSON.stringify(errors[0])}`);
+			}
+			const rl = extractRateLimit(json);
+			if (rl && rl.remaining !== null && rl.remaining < RATE_FLOOR) {
+				const until = rl.resetAt ? Date.parse(rl.resetAt) : NaN;
+				this.cooldownUntil = Math.max(this.cooldownUntil, Number.isNaN(until) ? Date.now() + 60_000 : until);
+			}
+			for (const [h, vm] of parseCiResponse(json, oids)) {
+				map.set(h, vm);
+			}
+		} catch (e) {
+			if ((e as Error)?.name !== 'AbortError') {
+				this.logger.warn(`CI 请求失败：${(e as Error).message ?? e}`);
+			}
+		} finally {
+			this.semaphore.release();
+		}
+		return map;
+	}
+
+	/** fetch + 超时/销毁可中止（每个请求独立 AbortController，挂到全局 dispose 信号）。 */
+	private async fetchWithTimeout(
+		fetchImpl: typeof globalThis.fetch,
+		url: string,
+		init: RequestInit,
+	): Promise<Response> {
+		const reqAc = new AbortController();
+		const onDispose = (): void => reqAc.abort();
+		this.abortController.signal.addEventListener('abort', onDispose, { once: true });
+		const timer = setTimeout(() => reqAc.abort(), REQUEST_TIMEOUT_MS);
+		try {
+			return await fetchImpl(url, { ...init, signal: reqAc.signal });
+		} finally {
+			clearTimeout(timer);
+			this.abortController.signal.removeEventListener('abort', onDispose);
+		}
+	}
+
+	private async acquireToken(provider: GitHubAuthProviderId): Promise<string | null> {
+		try {
+			const session = await this.auth.peek(provider);
+			return session?.accessToken ?? null;
+		} catch {
+			return null;
+		}
+	}
+}
diff --git a/src/adapter/commands.ts b/src/adapter/commands.ts
index 434a613..d8a1162 100644
--- a/src/adapter/commands.ts
+++ b/src/adapter/commands.ts
@@ -22,7 +22,7 @@ export function registerChangesCommands(
 
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.newChangelist', async () => {
-			const name = await vscode.window.showInputBox({ prompt: '新建 Changelist 名称', placeHolder: '例如 feature-x' });
+			const name = await vscode.window.showInputBox({ prompt: 'New Changelist name', placeHolder: 'e.g. feature-x' });
 			if (name && name.trim()) {
 				registry.create(name.trim());
 			}
@@ -43,7 +43,7 @@ export function registerChangesCommands(
 				return;
 			}
 			const def = registry.getDef(node.id);
-			const name = await vscode.window.showInputBox({ prompt: '重命名 Changelist', value: def?.name });
+			const name = await vscode.window.showInputBox({ prompt: 'Rename Changelist', value: def?.name });
 			if (name && name.trim()) {
 				registry.rename(node.id, name.trim());
 			}
@@ -56,11 +56,11 @@ export function registerChangesCommands(
 				return;
 			}
 			const choice = await vscode.window.showWarningMessage(
-				`删除 Changelist「${node.name}」？其下文件将归入默认列表。`,
+				`Delete Changelist "${node.name}"? Files under it will be moved to the default list.`,
 				{ modal: true },
-				'删除',
+				'Delete',
 			);
-			if (choice === '删除') {
+			if (choice === 'Delete') {
 				registry.remove(node.id);
 			}
 		}),
@@ -75,7 +75,7 @@ export function registerChangesCommands(
 			const picks = registry
 				.listDefs()
 				.map((d) => ({ label: d.name, id: d.id, description: d.id === active ? 'active' : undefined, picked: d.id === node.changelistId }));
-			const pick = await vscode.window.showQuickPick(picks, { placeHolder: '将文件移至 Changelist' });
+			const pick = await vscode.window.showQuickPick(picks, { placeHolder: 'Move file to Changelist' });
 			if (pick) {
 				registry.move(node.item.relativePath, pick.id);
 			}
@@ -103,11 +103,11 @@ export function registerChangesCommands(
 				return;
 			}
 			const choice = await vscode.window.showWarningMessage(
-				`丢弃「${change.relativePath}」的改动？此操作不可撤销。`,
+				`Discard changes to "${change.relativePath}"? This action cannot be undone.`,
 				{ modal: true },
-				'丢弃',
+				'Discard',
 			);
-			if (choice !== '丢弃') {
+			if (choice !== 'Discard') {
 				return;
 			}
 			try {
@@ -119,7 +119,7 @@ export function registerChangesCommands(
 				}
 				tree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`丢弃失败：${e instanceof Error ? e.message : String(e)}`);
+				void vscode.window.showErrorMessage(`Failed to discard: ${e instanceof Error ? e.message : String(e)}`);
 			}
 		}),
 	);
diff --git a/src/adapter/commit/commit-service.ts b/src/adapter/commit/commit-service.ts
index eaa2ce1..a88731b 100644
--- a/src/adapter/commit/commit-service.ts
+++ b/src/adapter/commit/commit-service.ts
@@ -44,7 +44,7 @@ const RECENT_KEY = 'hyperGit.recentCommitMessages';
 const RECENT_MAX = 10;
 
 /**
- * CommitService：编排提交流水线（对齐 IDEA checkin 流程）。
+ * CommitService：编排提交流水线（参考 JetBrains checkin 流程设计）。
  *
  * 流程：校验信息 → 解析选中文件 → stage → CommitPipeline 责任链（Checkin hook）→ commit → 可选 push。
  * 注入 5 个 AI 接缝（Null 实现），为 M5 即插即用预留。
@@ -103,18 +103,18 @@ export class CommitService implements vscode.Disposable {
 	async executeCommit(req: CommitRequest): Promise<CommitOutcome> {
 		const repo = this.service.repo;
 		if (!repo) {
-			return { ok: false, error: '未找到 Git 仓库' };
+			return { ok: false, error: 'No Git repository found' };
 		}
 		const message = req.message.trim();
 		if (!message) {
-			return { ok: false, error: '提交信息不能为空' };
+			return { ok: false, error: 'Commit message cannot be empty' };
 		}
 
 		// CC 即时校验（pipeline 内的 hook 亦会拦截，此处给出明确原因）
 		if (this.conventionalEnabled()) {
 			const v = validateConventional(message);
 			if (v.severity === 'error') {
-				return { ok: false, error: v.reason ?? '提交信息不符合 Conventional Commits 规范' };
+				return { ok: false, error: v.reason ?? 'Commit message does not conform to Conventional Commits' };
 			}
 		}
 
@@ -123,17 +123,17 @@ export class CommitService implements vscode.Disposable {
 		const checkedSet = new Set(req.selectedPaths);
 		const absPaths = this.resolveAbsolute(req.selectedPaths, changes);
 		if (absPaths.length === 0) {
-			return { ok: false, error: '未选择任何待提交文件' };
+			return { ok: false, error: 'No files selected to commit' };
 		}
 
 		// Checkin hook 责任链（传绝对路径，供未来 AI hook 读取文件内容）
 		const hookResult = await this.pipeline.run({ message, filePaths: absPaths });
 		if (hookResult === CheckinResult.Cancel) {
-			return { ok: false, error: '提交被检查拦截（Checkin hook）' };
+			return { ok: false, error: 'Commit blocked by check (Checkin hook)' };
 		}
 
 		try {
-			// 让勾选集成为提交的权威范围：未勾选的已暂存文件先 unstage（对齐 IDEA「提交该集合」语义）
+			// 让勾选集成为提交的权威范围：未勾选的已暂存文件先 unstage（参考 JetBrains「提交该集合」语义）
 			const toUnstage = changes.filter((c) => c.staged && !checkedSet.has(c.relativePath)).map((c) => c.uri.fsPath);
 			if (toUnstage.length > 0) {
 				await repo.restore(toUnstage, { staged: true });
@@ -146,7 +146,7 @@ export class CommitService implements vscode.Disposable {
 				try {
 					await repo.push();
 				} catch (e) {
-					return { ok: true, warning: `提交已成功，但推送失败：${this.normalizeError(e)}` };
+					return { ok: true, warning: `Commit succeeded, but push failed: ${this.normalizeError(e)}` };
 				}
 			}
 			return { ok: true };
diff --git a/src/adapter/commit/conventional-check.ts b/src/adapter/commit/conventional-check.ts
index 58f276b..8a131eb 100644
--- a/src/adapter/commit/conventional-check.ts
+++ b/src/adapter/commit/conventional-check.ts
@@ -3,7 +3,7 @@ import type { CheckinHook, CommitInfo } from '../../engine/commit/pipeline';
 import { validateConventional } from '../../engine/commit/conventional-linter';
 
 /**
- * 内置非 AI 提交检查：Conventional Commits 校验（对齐 IDEA CheckinHandler 闸门语义）。
+ * 内置非 AI 提交检查：Conventional Commits 校验（参考 JetBrains CheckinHandler 闸门语义）。
  *
  * 当配置 `hyperGit.commit.conventional` 开启时，校验失败（severity=error）阻断提交，
  * 用以证明 CommitPipeline 责任链可注入并阻断（M5 的 AI 审查 hook 将以同样方式接入）。
diff --git a/src/adapter/conflict-ui.ts b/src/adapter/conflict-ui.ts
index 1a9d7eb..ad54121 100644
--- a/src/adapter/conflict-ui.ts
+++ b/src/adapter/conflict-ui.ts
@@ -39,18 +39,18 @@ export async function handleGitConflict(service: GitRepositoryService, opName: s
 		const op = state.ongoingOperation;
 		const canAbort = op !== 'none';
 		const choice = await vscode.window.showWarningMessage(
-			`${opName} 遇到 ${state.conflictedPaths.length} 个冲突文件。`,
-			{ modal: true, detail: canAbort ? `正在进行：${op}。可解决冲突后继续，或中止恢复工作区。` : '请手动解决冲突后提交。' },
-			...(canAbort ? ['解决冲突', '中止操作'] : ['知道了']),
+			`${opName} encountered ${state.conflictedPaths.length} conflicted file(s).`,
+			{ modal: true, detail: canAbort ? `In progress: ${op}. Resolve the conflicts to continue, or abort to restore the working tree.` : 'Please resolve the conflicts manually and commit.' },
+			...(canAbort ? ['Resolve conflicts', 'Abort'] : ['Got it']),
 		);
-		if (choice === '中止操作' && op !== 'none') {
+		if (choice === 'Abort' && op !== 'none') {
 			try {
 				await service.execGit(ABORT_ARGS[op]);
-				void vscode.window.showInformationMessage(`已中止 ${op}，工作区已恢复`);
+				void vscode.window.showInformationMessage(`${op} aborted, working tree restored`);
 			} catch {
-				void vscode.window.showErrorMessage('中止操作失败，请手动处理');
+				void vscode.window.showErrorMessage('Failed to abort, please handle manually');
 			}
-		} else if (choice === '解决冲突') {
+		} else if (choice === 'Resolve conflicts') {
 			// 打开自绘 3-way merge editor（resolveConflicts 列出冲突文件供选择）
 			void vscode.commands.executeCommand('hyperGit.resolveConflicts');
 		}
diff --git a/src/adapter/editor/blame-annotation.ts b/src/adapter/editor/blame-annotation.ts
index 343c348..b2639f3 100644
--- a/src/adapter/editor/blame-annotation.ts
+++ b/src/adapter/editor/blame-annotation.ts
@@ -6,7 +6,7 @@ import { formatAnnotation, parseBlamePorcelain } from '../../engine/blame/blame-
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
 /**
- * 编辑器内 Blame 注解（IDEA Annotate 等价）。
+ * 编辑器内 Blame 注解（逐行作者 / 日期 / 提交注解）。
  *
  * Toggle：对当前文件执行 `git blame --line-porcelain`，解析每行作者/日期，用行内
  * before 装饰渲染在每行行首（gutter 风格）。再次 toggle 关闭。切换编辑器/文档变更时清理。
@@ -37,7 +37,7 @@ export class BlameAnnotationController implements vscode.Disposable {
 		const editor = vscode.window.activeTextEditor;
 		const repo = this.service.repo;
 		if (!editor || !repo) {
-			void vscode.window.showWarningMessage('请先打开一个文件');
+			void vscode.window.showWarningMessage('Please open a file first');
 			return;
 		}
 		const key = editor.document.uri.toString();
@@ -47,7 +47,7 @@ export class BlameAnnotationController implements vscode.Disposable {
 		}
 		const rel = path.relative(repo.rootUri.fsPath, editor.document.uri.fsPath).split(path.sep).join('/');
 		if (rel.startsWith('..') || path.isAbsolute(rel)) {
-			void vscode.window.showWarningMessage('该文件不在当前仓库内');
+			void vscode.window.showWarningMessage('This file is outside the current repository');
 			return;
 		}
 		let blame: BlameLineMap;
@@ -55,7 +55,7 @@ export class BlameAnnotationController implements vscode.Disposable {
 			const out = await this.service.execGit(['blame', '--line-porcelain', '--', rel]);
 			blame = new Map(parseBlamePorcelain(out).map((b) => [b.line, b]));
 		} catch (e) {
-			void vscode.window.showErrorMessage(`Blame 失败：${errMsg(e)}`);
+			void vscode.window.showErrorMessage(`Blame failed: ${errMsg(e)}`);
 			return;
 		}
 		const options: vscode.DecorationOptions[] = [];
diff --git a/src/adapter/editor/inline-commit-codelens.ts b/src/adapter/editor/inline-commit-codelens.ts
index dd96b86..d557b84 100644
--- a/src/adapter/editor/inline-commit-codelens.ts
+++ b/src/adapter/editor/inline-commit-codelens.ts
@@ -14,7 +14,7 @@ function repoRelative(root: string, fsPath: string): string | null {
 }
 
 /**
- * 行内提交 CodeLensProvider（IDEA editor inline commit 的 VS Code 等价）。
+ * 行内提交 CodeLensProvider（编辑器内逐 Hunk 提交）。
  *
  * 对当前文件每个未暂存 hunk，在其起始行上方渲染可点击 CodeLens「✓ 提交此 Hunk (+N -M)」。
  * 点击 → 仅暂存该 hunk（patch 重建 + `git apply --cached`）→ 输入 message → `git commit`。
@@ -53,7 +53,7 @@ export class InlineCommitCodeLensProvider implements vscode.CodeLensProvider {
 				const line = Math.max(0, r.startLine - 1);
 				return new vscode.CodeLens(new vscode.Range(line, 0, line, 0), {
 					command: 'hyperGit.inlineCommitHunk',
-					title: `✓ 提交此 Hunk (+${r.addedCount} -${r.removedCount})`,
+					title: `✓ Commit this Hunk (+${r.addedCount} -${r.removedCount})`,
 					arguments: [rel, r.hunkIndex],
 				});
 			});
@@ -70,20 +70,20 @@ export function registerInlineCommitCommand(service: GitRepositoryService, provi
 		if (!repo || !rel || hunkIndex === undefined) {
 			return;
 		}
-		// 其他已暂存内容会一并提交——给出提示（IDEA changelist 隔离在本工具由 stage 语义承载）
+		// 其他已暂存内容会一并提交——给出提示（changelist 隔离在本工具由 stage 语义承载）
 		const otherStaged = service.getChanges().filter((c) => c.staged && c.relativePath !== rel);
 		if (otherStaged.length > 0) {
 			const ok = await vscode.window.showWarningMessage(
-				`当前已有其他 ${otherStaged.length} 个已暂存文件，将一并提交。继续？`,
+				`${otherStaged.length} other staged file(s) will be committed together. Continue?`,
 				{ modal: true },
-				'继续提交',
+				'Continue Commit',
 			);
-			if (ok !== '继续提交') {
+			if (ok !== 'Continue Commit') {
 				return;
 			}
 		}
 		const message = await vscode.window.showInputBox({
-			prompt: `提交 Hunk（${rel} #${hunkIndex + 1}）的 commit message`,
+			prompt: `Commit message for Hunk (${rel} #${hunkIndex + 1})`,
 			placeHolder: 'feat(scope): description',
 		});
 		if (!message || !message.trim()) {
@@ -109,9 +109,9 @@ export function registerInlineCommitCommand(service: GitRepositoryService, provi
 			}
 			await service.execGit(['commit', '-m', message.trim()]);
 			provider.refresh();
-			void vscode.window.showInformationMessage('已提交该 Hunk');
+			void vscode.window.showInformationMessage('Hunk committed');
 		} catch (e) {
-			void vscode.window.showErrorMessage(`Inline commit 失败：${errMsg(e)}`);
+			void vscode.window.showErrorMessage(`Inline commit failed: ${errMsg(e)}`);
 		}
 	});
 }
diff --git a/src/adapter/git-cli-commands.ts b/src/adapter/git-cli-commands.ts
index 4bb6f9d..f45ca9a 100644
--- a/src/adapter/git-cli-commands.ts
+++ b/src/adapter/git-cli-commands.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import type { BranchNode, BranchesTreeProvider } from './tree/branches-tree';
 import type { ChangeItem, GitRepositoryService } from './git-repository-service';
-import type { LogNode, LogTreeProvider } from './tree/log-tree';
+import type { LogFilterControl, LogNode } from './webview/log-webview';
 import { handleGitConflict } from './conflict-ui';
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
@@ -12,7 +12,7 @@ const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(
  * 注册经 git CLI 补齐的操作（M5' batch 1）：cherry-pick / revert / reset / branch rename /
  * ignore / compare branches / reword。均经 `service.execGit`（复用 vscode.git 的同一 git 二进制）。
  */
-export function registerGitCliCommands(service: GitRepositoryService, branchesTree: BranchesTreeProvider, logTree: LogTreeProvider): vscode.Disposable[] {
+export function registerGitCliCommands(service: GitRepositoryService, branchesTree: BranchesTreeProvider, logTree: LogFilterControl): vscode.Disposable[] {
 	const subs: vscode.Disposable[] = [];
 
 	subs.push(
@@ -29,10 +29,10 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				await service.execGit(['cherry-pick', hash]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`Cherry-pick ${hash.slice(0, 7)} 完成`);
+				void vscode.window.showInformationMessage(`Cherry-pick ${hash.slice(0, 7)} complete`);
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Cherry-pick'))) {
-					void vscode.window.showErrorMessage(`Cherry-pick 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Cherry-pick failed: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -52,10 +52,10 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				await service.execGit(['revert', '--no-edit', hash]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`Revert ${hash.slice(0, 7)} 完成`);
+				void vscode.window.showInformationMessage(`Revert ${hash.slice(0, 7)} complete`);
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Revert'))) {
-					void vscode.window.showErrorMessage(`Revert 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Revert failed: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -75,17 +75,17 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 			}
 			// 2) 选择 reset 模式
 			const items = [
-				{ label: 'soft', description: '仅移动 HEAD，保留暂存区与工作区改动' },
-				{ label: 'mixed', description: '移动 HEAD + 取消暂存（默认），保留工作区改动' },
-				{ label: 'hard', description: '⚠ 移动 HEAD + 丢弃暂存区与工作区所有改动（不可撤销）' },
-				{ label: 'keep', description: '移动 HEAD + 保留已修改文件（遇冲突中止）' },
+				{ label: 'soft', description: 'Move HEAD only, keep staged and working changes' },
+				{ label: 'mixed', description: 'Move HEAD + unstage (default), keep working changes' },
+				{ label: 'hard', description: '⚠ Move HEAD + discard all staged and working changes (irreversible)' },
+				{ label: 'keep', description: 'Move HEAD + keep modified files (aborts on conflict)' },
 			];
-			const pick = await vscode.window.showQuickPick(items, { placeHolder: `选择 reset 模式（目标 ${target.slice(0, 7)}）` });
+			const pick = await vscode.window.showQuickPick(items, { placeHolder: `Select reset mode (target ${target.slice(0, 7)})` });
 			if (!pick) {
 				return;
 			}
 			if (pick.label === 'hard') {
-				const ok = await vscode.window.showWarningMessage('hard reset 将丢弃所有改动，确认？', { modal: true }, '确认 hard reset');
+				const ok = await vscode.window.showWarningMessage('hard reset will discard all changes. Confirm?', { modal: true }, 'Confirm hard reset');
 				if (!ok) {
 					return;
 				}
@@ -94,9 +94,9 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				await service.execGit(['reset', `--${pick.label}`, target]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`Reset (--${pick.label} ${target.slice(0, 7)}) 完成`);
+				void vscode.window.showInformationMessage(`Reset (--${pick.label} ${target.slice(0, 7)}) complete`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Reset 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Reset failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -108,7 +108,7 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				return;
 			}
 			const oldName = node.ref.shortName;
-			const newName = await vscode.window.showInputBox({ prompt: `重命名分支「${oldName}」`, value: oldName });
+			const newName = await vscode.window.showInputBox({ prompt: `Rename branch "${oldName}"`, value: oldName });
 			if (!newName || !newName.trim() || newName === oldName) {
 				return;
 			}
@@ -116,7 +116,7 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				await service.execGit(['branch', '-m', oldName, newName.trim()]);
 				branchesTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`重命名失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Rename failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -136,9 +136,9 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				await new Promise<void>((resolve, reject) => {
 					fs.appendFile(ignoreFile, `${rel}\n`, (err) => (err ? reject(err) : resolve()));
 				});
-				void vscode.window.showInformationMessage(`已添加到 .gitignore：${rel}`);
+				void vscode.window.showInformationMessage(`Added to .gitignore: ${rel}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Ignore 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Ignore failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -150,13 +150,13 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				return;
 			}
 			const refs = repo.state.refs.filter((r) => r.name && (r.type === 0 || r.type === 1));
-			const base = node?.kind === 'branch' ? node.ref.shortName : await vscode.window.showQuickPick(refs.map((r) => r.name!), { placeHolder: '选择 base 分支' });
+			const base = node?.kind === 'branch' ? node.ref.shortName : await vscode.window.showQuickPick(refs.map((r) => r.name!), { placeHolder: 'Select base branch' });
 			if (!base) {
 				return;
 			}
 			const target = await vscode.window.showQuickPick(
 				refs.filter((r) => r.name !== base).map((r) => r.name!),
-				{ placeHolder: `比较 ${base} 与...` },
+				{ placeHolder: `Compare ${base} with...` },
 			);
 			if (!target) {
 				return;
@@ -166,7 +166,7 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 				const doc = await vscode.workspace.openTextDocument({ content: `$ git diff --stat ${base}...${target}\n\n${out}`, language: 'plaintext' });
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`比较失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Compare failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -177,15 +177,15 @@ export function registerGitCliCommands(service: GitRepositoryService, branchesTr
 			if (!repo) {
 				return;
 			}
-			const message = await vscode.window.showInputBox({ prompt: '改写最新提交信息（amend）', value: (await repo.log({ maxEntries: 1 }))[0]?.message ?? '' });
+			const message = await vscode.window.showInputBox({ prompt: 'Rewrite latest commit message (amend)', value: (await repo.log({ maxEntries: 1 }))[0]?.message ?? '' });
 			if (!message || !message.trim()) {
 				return;
 			}
 			try {
 				await repo.commit(message.trim(), { amend: true });
-				void vscode.window.showInformationMessage('已改写最新提交');
+				void vscode.window.showInformationMessage('Rewrote latest commit');
 			} catch (e) {
-				void vscode.window.showErrorMessage(`改写失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Rewrite failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -204,7 +204,7 @@ async function pickCommitHash(service: GitRepositoryService): Promise<string | u
 		description: `${c.authorName ?? ''} · ${c.hash.slice(0, 7)}`,
 		hash: c.hash,
 	}));
-	const pick = await vscode.window.showQuickPick(items, { placeHolder: '选择 commit' });
+	const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Select a commit' });
 	return pick?.hash;
 }
 
@@ -213,7 +213,7 @@ async function pickRelativePath(service: GitRepositoryService): Promise<string |
 	if (changes.length === 0) {
 		return undefined;
 	}
-	const pick = await vscode.window.showQuickPick(changes.map((c) => ({ label: c.relativePath })), { placeHolder: '选择要忽略的文件' });
+	const pick = await vscode.window.showQuickPick(changes.map((c) => ({ label: c.relativePath })), { placeHolder: 'Select file to ignore' });
 	return pick?.label;
 }
 
@@ -229,6 +229,6 @@ async function pickResetTarget(service: GitRepositoryService): Promise<string |
 		description: `${c.hash.slice(0, 7)}${i === 0 ? ' · HEAD' : ''}`,
 		hash: c.hash,
 	}));
-	const pick = await vscode.window.showQuickPick(items, { placeHolder: '选择 reset 目标 commit' });
+	const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Select reset target commit' });
 	return pick?.hash;
 }
diff --git a/src/adapter/history-commands.ts b/src/adapter/history-commands.ts
index f93db5c..902bdea 100644
--- a/src/adapter/history-commands.ts
+++ b/src/adapter/history-commands.ts
@@ -4,14 +4,16 @@ import type { BranchNode } from './tree/branches-tree';
 import type { BranchesTreeProvider } from './tree/branches-tree';
 import type { BranchFavorites } from './branch-favorites';
 import type { ChangeItem, GitRepositoryService } from './git-repository-service';
-import type { LogNode, LogTreeProvider } from './tree/log-tree';
+import type { LogFilterControl, LogNode } from './webview/log-webview';
 import { handleGitConflict } from './conflict-ui';
 import type { MergeMode } from '../engine/log/log-filter';
+import { selectedBranchRefs } from './branch-selection';
+import { diffPrunedRefs, formatBranchDeleteConfirm, partitionByMerged, truncateNames } from '../engine/ref/cleanup';
 
 /** 注册 Log/Branches/Blame/History/Tags 相关命令。 */
 export function registerHistoryCommands(
 	service: GitRepositoryService,
-	logTree: LogTreeProvider,
+	logTree: LogFilterControl,
 	branchesTree: BranchesTreeProvider,
 	favorites: BranchFavorites,
 ): vscode.Disposable[] {
@@ -36,7 +38,7 @@ export function registerHistoryCommands(
 
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.logFilterAuthor', async () => {
-			const author = await vscode.window.showInputBox({ prompt: '按作者过滤（Author）', placeHolder: '例如 John' });
+			const author = await vscode.window.showInputBox({ prompt: 'Filter by Author', placeHolder: 'e.g. John' });
 			const f = logTree.getFilter();
 			logTree.setFilter({ ...f, author: author && author.trim() ? author.trim() : undefined });
 		}),
@@ -56,11 +58,30 @@ export function registerHistoryCommands(
 
 	subs.push(vscode.commands.registerCommand('hyperGit.logClearFilter', () => logTree.clearFilter()));
 
+	subs.push(
+		vscode.commands.registerCommand('hyperGit.logFilter', async () => {
+			// 过滤器聚合入口：QuickPick 分发到既有 6 个过滤命令（复用 handler，零重复实现）。
+			const items = [
+				{ label: 'Filter by Author…', description: 'commits by author', action: 'hyperGit.logFilterAuthor' },
+				{ label: 'Filter by Path…', description: 'commits touching a path', action: 'hyperGit.logFilterPath' },
+				{ label: 'Filter by Message (grep)…', description: 'substring match', action: 'hyperGit.logFilterGrep' },
+				{ label: 'Filter by Message (regex)…', description: 'regular expression', action: 'hyperGit.logFilterRegex' },
+				{ label: 'Filter Merge Commits…', description: 'show or hide merge commits', action: 'hyperGit.logFilterMergeMode' },
+				{ label: 'Filter by Date…', description: 'commits within recent days', action: 'hyperGit.logFilterDate' },
+				{ label: 'Clear Filter', description: 'remove all active filters', action: 'hyperGit.logClearFilter' },
+			];
+			const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Filter commit log' });
+			if (pick) {
+				await vscode.commands.executeCommand(pick.action);
+			}
+		}),
+	);
+
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.copyCommitHash', (node: LogNode) => {
 			if (node?.kind === 'commit') {
 				void vscode.env.clipboard.writeText(node.commit.hash);
-				void vscode.window.showInformationMessage(`已复制 ${node.commit.hash.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Copied ${node.commit.hash.slice(0, 7)}`);
 			}
 		}),
 	);
@@ -80,13 +101,13 @@ export function registerHistoryCommands(
 			if (!repo) {
 				return;
 			}
-			const name = await vscode.window.showInputBox({ prompt: '新分支名称' });
+			const name = await vscode.window.showInputBox({ prompt: 'New branch name' });
 			if (name && name.trim()) {
 				try {
 					await repo.createBranch(name.trim(), true);
 					branchesTree.refresh();
 				} catch (e) {
-					void vscode.window.showErrorMessage(`创建分支失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to create branch: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -102,33 +123,57 @@ export function registerHistoryCommands(
 				await repo.checkout(node.ref.shortName);
 				branchesTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`检出失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to checkout: ${errMsg(e)}`);
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.branchDelete', async (node: BranchNode) => {
+		vscode.commands.registerCommand('hyperGit.branchDelete', async (node: BranchNode, nodes?: BranchNode[]) => {
 			const repo = service.repo;
-			if (!repo || node?.kind !== 'branch' || node.remote) {
+			if (!repo) {
 				return;
 			}
-			const name = node.ref.shortName;
-			// 查询是否已合并：已合并用安全删除（-d / force=false），未合并需二次确认强制删除（-D / force=true）
-			const merged = await isBranchMerged(service, name);
-			const detail = merged
-				? `分支「${name}」已合并，可安全删除。`
-				: `分支「${name}」未合并，强制删除将丢失其独有提交！`;
-			const confirmText = merged ? '删除' : '强制删除';
-			const choice = await vscode.window.showWarningMessage(detail, { modal: true }, confirmText);
-			if (choice === confirmText) {
+			// 仅本地、非当前 HEAD 可删（ref.head 直接排除当前分支，无需解析名字）；支持多选批量。
+			const refs = selectedBranchRefs(node, nodes, (r) => !r.isRemote && !r.isTag && !r.head);
+			const names = refs.map((r) => r.shortName);
+			if (names.length === 0) {
+				if (node?.kind === 'branch' && node.ref.head) {
+					void vscode.window.showWarningMessage('Cannot delete the current branch');
+				}
+				return;
+			}
+			// 一次查询已合并集合（避免逐个 git branch --merged）：已合并安全删除（-d），未合并强制删除（-D）。
+			const base = repo.state.HEAD?.name ?? 'main';
+			let mergedOut = '';
+			try {
+				mergedOut = await service.execGit(['branch', '--merged', base]);
+			} catch {
+				/* 查询失败则视为全部未合并，确认弹窗会以强制删除提示 */
+			}
+			const { merged, unmerged } = partitionByMerged(mergedOut, names);
+			const mergedSet = new Set(merged);
+			const { detail, confirmLabel } = formatBranchDeleteConfirm(merged, unmerged);
+			const choice = await vscode.window.showWarningMessage(detail, { modal: true }, confirmLabel);
+			if (choice !== confirmLabel) {
+				return;
+			}
+			const failures: string[] = [];
+			let deleted = 0;
+			for (const name of names) {
 				try {
-					await repo.deleteBranch(name, !merged);
-					branchesTree.refresh();
-				} catch (e) {
-					void vscode.window.showErrorMessage(`删除失败：${errMsg(e)}`);
+					await repo.deleteBranch(name, !mergedSet.has(name));
+					deleted++;
+				} catch {
+					failures.push(name);
 				}
 			}
+			branchesTree.refresh();
+			if (failures.length === 0) {
+				void vscode.window.showInformationMessage(deleted === 1 ? `Deleted branch ${names[0]}` : `Deleted ${deleted} branches`);
+			} else {
+				void vscode.window.showWarningMessage(`Deleted ${deleted} branches, ${failures.length} failed: ${truncateNames(failures)}`);
+			}
 		}),
 	);
 
@@ -139,16 +184,16 @@ export function registerHistoryCommands(
 				return;
 			}
 			const name = node.ref.shortName;
-			const ok = await vscode.window.showWarningMessage(`将「${name}」合并到当前分支？`, { modal: true }, '合并');
-			if (ok !== '合并') {
+			const ok = await vscode.window.showWarningMessage(`Merge "${name}" into current branch?`, { modal: true }, 'Merge');
+			if (ok !== 'Merge') {
 				return;
 			}
 			try {
 				await repo.merge(name);
 				branchesTree.refresh();
 			} catch (e) {
-				if (!(await handleGitConflict(service, '合并'))) {
-					void vscode.window.showErrorMessage(`合并失败：${errMsg(e)}`);
+				if (!(await handleGitConflict(service, 'Merge'))) {
+					void vscode.window.showErrorMessage(`Failed to merge: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -161,16 +206,16 @@ export function registerHistoryCommands(
 				return;
 			}
 			const name = node.ref.shortName;
-			const ok = await vscode.window.showWarningMessage(`将当前分支变基到「${name}」？（重写历史，可能冲突）`, { modal: true }, '变基');
-			if (ok !== '变基') {
+			const ok = await vscode.window.showWarningMessage(`Rebase current branch onto "${name}"? (this rewrites history and may conflict)`, { modal: true }, 'Rebase');
+			if (ok !== 'Rebase') {
 				return;
 			}
 			try {
 				await repo.rebase(name);
 				branchesTree.refresh();
 			} catch (e) {
-				if (!(await handleGitConflict(service, '变基'))) {
-					void vscode.window.showErrorMessage(`变基失败：${errMsg(e)}`);
+				if (!(await handleGitConflict(service, 'Rebase'))) {
+					void vscode.window.showErrorMessage(`Failed to rebase: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -184,12 +229,12 @@ export function registerHistoryCommands(
 			}
 			const editor = vscode.window.activeTextEditor;
 			if (!editor) {
-				void vscode.window.showWarningMessage('请先打开一个文件');
+				void vscode.window.showWarningMessage('Please open a file first');
 				return;
 			}
 			const rel = path.relative(repo.rootUri.fsPath, editor.document.uri.fsPath).split(path.sep).join('/');
 			if (rel.startsWith('..') || path.isAbsolute(rel)) {
-				void vscode.window.showWarningMessage('该文件不在当前仓库内，无法 Blame');
+				void vscode.window.showWarningMessage('This file is outside the current repository; cannot Blame');
 				return;
 			}
 			try {
@@ -197,7 +242,7 @@ export function registerHistoryCommands(
 				const doc = await vscode.workspace.openTextDocument({ content: blame, language: 'plaintext' });
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Blame 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to Blame: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -213,7 +258,7 @@ export function registerHistoryCommands(
 				branchesTree.refresh();
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Pull'))) {
-					void vscode.window.showErrorMessage(`Pull 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to Pull: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -227,7 +272,7 @@ export function registerHistoryCommands(
 			}
 			const head = repo.state.HEAD;
 			if (!head?.name) {
-				void vscode.window.showWarningMessage('当前处于 detached HEAD，无法推送当前分支');
+				void vscode.window.showWarningMessage('Currently in detached HEAD; cannot push the current branch');
 				return;
 			}
 			try {
@@ -238,14 +283,14 @@ export function registerHistoryCommands(
 					// 无上游：选定 remote 并以 -u 建立追踪（修复「Failed to execute git」根因）。
 					const remotes = repo.state.remotes.map((r) => r.name);
 					if (remotes.length === 0) {
-						void vscode.window.showWarningMessage('未配置远程仓库（remote），无法推送');
+						void vscode.window.showWarningMessage('No remote configured; cannot push');
 						return;
 					}
 					const remote =
 						remotes.length === 1
 							? remotes[0]
 							: await vscode.window.showQuickPick(remotes, {
-								placeHolder: `为「${head.name}」选择推送目标 remote（将建立上游追踪 -u）`,
+								placeHolder: `Select a remote to push "${head.name}" to (will set upstream tracking -u)`,
 							});
 					if (!remote) {
 						return;
@@ -253,9 +298,9 @@ export function registerHistoryCommands(
 					await repo.push(remote, head.name, true);
 				}
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已推送 ${head.name}`);
+				void vscode.window.showInformationMessage(`Pushed ${head.name}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Push 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to Push: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -267,8 +312,8 @@ export function registerHistoryCommands(
 				return;
 			}
 			const pick = await vscode.window.showQuickPick(
-				['普通 Fetch', 'Fetch + Prune（清理已删除的远程分支）'],
-				{ placeHolder: 'Fetch 模式' },
+				['Fetch', 'Fetch + Prune (clean up deleted remote branches)'],
+				{ placeHolder: 'Fetch mode' },
 			);
 			if (!pick) {
 				return;
@@ -276,20 +321,61 @@ export function registerHistoryCommands(
 			try {
 				await repo.fetch(pick.includes('Prune') ? { prune: true } : undefined);
 				branchesTree.refresh();
+				logTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Fetch 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to Fetch: ${errMsg(e)}`);
 			}
 		}),
 	);
 
-	// —— IDEA 风格 Branches 高级操作（Phase 1）——
-
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.toggleFavorite', async (node: BranchNode) => {
-			if (node?.kind !== 'branch' || node.ref.isTag) {
+		vscode.commands.registerCommand('hyperGit.pruneRemotes', async () => {
+			const repo = service.repo;
+			if (!repo) {
+				return;
+			}
+			const remotes = repo.state.remotes.map((r) => r.name);
+			if (remotes.length === 0) {
+				void vscode.window.showWarningMessage('No remote repository configured');
 				return;
 			}
-			favorites.toggle(node.ref.shortName);
+			// prune 前后对 refs/remotes 各快照一次，差集即为被清理的陈旧跟踪引用。
+			// `--prune` 的 [deleted] 明细走 stderr，execGit 仅回传 stdout，故用快照差集做循证反馈。
+			const before = await listRemoteTrackingRefs(service);
+			const failed: string[] = [];
+			// 逐 remote 执行 fetch --prune：API 的 FetchOptions 仅接受单 remote，遍历以覆盖多远程场景。
+			for (const remote of remotes) {
+				try {
+					await repo.fetch({ remote, prune: true });
+				} catch {
+					failed.push(remote);
+				}
+			}
+			const after = await listRemoteTrackingRefs(service);
+			const pruned = diffPrunedRefs(before, after);
+			branchesTree.refresh();
+			logTree.refresh();
+			if (pruned.length === 0) {
+				void vscode.window.showInformationMessage(
+					failed.length > 0 ? `Prune failed for: ${truncateNames(failed)}` : 'No stale remote branches to prune',
+				);
+			} else {
+				void vscode.window.showInformationMessage(
+					`Pruned ${pruned.length} stale remote branch(es): ${truncateNames(pruned)}`,
+				);
+			}
+		}),
+	);
+
+	// —— Branches 高级操作（Phase 1）——
+
+	subs.push(
+		vscode.commands.registerCommand('hyperGit.toggleFavorite', async (node: BranchNode, nodes?: BranchNode[]) => {
+			// 支持多选批量切换收藏（标签无收藏语义，谓词排除）。
+			const refs = selectedBranchRefs(node, nodes, (r) => !r.isTag);
+			for (const r of refs) {
+				favorites.toggle(r.shortName);
+			}
 			// favorites.onDidChange 会触发 branchesTree.refresh()
 		}),
 	);
@@ -301,7 +387,7 @@ export function registerHistoryCommands(
 				return;
 			}
 			const source = node.ref.shortName;
-			const name = await vscode.window.showInputBox({ prompt: `从「${source}」新建并检出本地分支`, placeHolder: '新分支名' });
+			const name = await vscode.window.showInputBox({ prompt: `Create and checkout a new local branch from "${source}"`, placeHolder: 'New branch name' });
 			if (!name || !name.trim()) {
 				return;
 			}
@@ -309,7 +395,7 @@ export function registerHistoryCommands(
 				await repo.createBranch(name.trim(), true, source);
 				branchesTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`新建分支失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create branch: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -326,7 +412,7 @@ export function registerHistoryCommands(
 				const doc = await vscode.workspace.openTextDocument({ content: `$ git diff --stat HEAD...${selected}\n\n${out}`, language: 'plaintext' });
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`比较失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to compare: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -337,48 +423,60 @@ export function registerHistoryCommands(
 			if (!repo) {
 				return;
 			}
-			const name = await vscode.window.showInputBox({ prompt: '标签名（如 v1.0.0）' });
+			const name = await vscode.window.showInputBox({ prompt: 'Tag name (e.g. v1.0.0)' });
 			if (!name || !name.trim()) {
 				return;
 			}
 			const commits = await repo.log({ maxEntries: 20 });
 			const items = [
-				{ label: 'HEAD', description: '当前提交', target: 'HEAD' },
+				{ label: 'HEAD', description: 'Current commit', target: 'HEAD' },
 				...commits.map((c) => ({
 					label: (c.message.split('\n', 1)[0] ?? c.hash).slice(0, 50),
 					description: c.hash.slice(0, 7),
 					target: c.hash,
 				})),
 			];
-			const pick = await vscode.window.showQuickPick(items, { placeHolder: '在哪个 commit 上打标签' });
+			const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Choose a commit to tag' });
 			if (!pick) {
 				return;
 			}
 			try {
 				await service.execGit(['tag', name.trim(), pick.target]);
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已创建标签 ${name.trim()} @ ${pick.target === 'HEAD' ? 'HEAD' : pick.target.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Created tag ${name.trim()} @ ${pick.target === 'HEAD' ? 'HEAD' : pick.target.slice(0, 7)}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`创建标签失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create tag: ${errMsg(e)}`);
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.tagDelete', async (node: BranchNode) => {
-			if (node?.kind !== 'branch' || !node.ref.isTag) {
+		vscode.commands.registerCommand('hyperGit.tagDelete', async (node: BranchNode, nodes?: BranchNode[]) => {
+			// 支持多选批量删除标签。
+			const names = selectedBranchRefs(node, nodes, (r) => r.isTag).map((r) => r.shortName);
+			if (names.length === 0) {
 				return;
 			}
-			const name = node.ref.shortName;
-			const ok = await vscode.window.showWarningMessage(`删除标签「${name}」？`, { modal: true }, '删除');
-			if (ok !== '删除') {
+			const detail = names.length === 1 ? `Delete tag "${names[0]}"?` : `Will delete ${names.length} tags: ${truncateNames(names)}`;
+			const ok = await vscode.window.showWarningMessage(detail, { modal: true }, 'Delete');
+			if (ok !== 'Delete') {
 				return;
 			}
-			try {
-				await service.execGit(['tag', '-d', name]);
-				branchesTree.refresh();
-			} catch (e) {
-				void vscode.window.showErrorMessage(`删除标签失败：${errMsg(e)}`);
+			const failures: string[] = [];
+			let deleted = 0;
+			for (const name of names) {
+				try {
+					await service.execGit(['tag', '-d', name]);
+					deleted++;
+				} catch {
+					failures.push(name);
+				}
+			}
+			branchesTree.refresh();
+			if (failures.length === 0) {
+				void vscode.window.showInformationMessage(deleted === 1 ? `Deleted tag ${names[0]}` : `Deleted ${deleted} tags`);
+			} else {
+				void vscode.window.showWarningMessage(`Deleted ${deleted} tags, ${failures.length} failed: ${truncateNames(failures)}`);
 			}
 		}),
 	);
@@ -390,20 +488,20 @@ export function registerHistoryCommands(
 				return;
 			}
 			const name = node.ref.shortName;
-			const ok = await vscode.window.showWarningMessage(`检出标签「${name}」（进入 detached HEAD）？`, { modal: true }, '检出');
-			if (ok !== '检出') {
+			const ok = await vscode.window.showWarningMessage(`Checkout tag "${name}" (entering detached HEAD)?`, { modal: true }, 'Checkout');
+			if (ok !== 'Checkout') {
 				return;
 			}
 			try {
 				await repo.checkout(name);
 				branchesTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`检出标签失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to checkout tag: ${errMsg(e)}`);
 			}
 		}),
 	);
 
-	// —— IDEA Log 增强（Phase 2）：高级过滤 + 提交详情 diff + per-commit 操作 ——
+	// —— Log 增强（Phase 2）：高级过滤 + 提交详情 diff + per-commit 操作 ——
 
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.openCommitFileDiff', async (hash: string, filePath: string, hasParent: boolean) => {
@@ -421,7 +519,7 @@ export function registerHistoryCommands(
 					await vscode.commands.executeCommand('vscode.open', right);
 				}
 			} catch (e) {
-				void vscode.window.showErrorMessage(`打开 diff 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to open diff: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -433,17 +531,17 @@ export function registerHistoryCommands(
 			}
 			const hash = node.commit.hash;
 			const items = [
-				{ label: 'soft', description: '仅移动 HEAD，保留暂存区与工作区改动' },
-				{ label: 'mixed', description: '移动 HEAD + 取消暂存（默认），保留工作区改动' },
-				{ label: 'hard', description: '⚠ 移动 HEAD + 丢弃暂存区与工作区所有改动（不可撤销）' },
-				{ label: 'keep', description: '移动 HEAD + 保留已修改文件（遇冲突中止）' },
+				{ label: 'soft', description: 'Move HEAD only; keep staged and working changes' },
+				{ label: 'mixed', description: 'Move HEAD + unstage (default); keep working changes' },
+				{ label: 'hard', description: '⚠ Move HEAD + discard all staged and working changes (cannot be undone)' },
+				{ label: 'keep', description: 'Move HEAD + keep modified files (aborts on conflict)' },
 			];
-			const pick = await vscode.window.showQuickPick(items, { placeHolder: `Reset 当前分支到 ${hash.slice(0, 7)} 的模式` });
+			const pick = await vscode.window.showQuickPick(items, { placeHolder: `Reset mode for current branch to ${hash.slice(0, 7)}` });
 			if (!pick) {
 				return;
 			}
 			if (pick.label === 'hard') {
-				const ok = await vscode.window.showWarningMessage(`hard reset 到 ${hash.slice(0, 7)} 将丢弃所有改动，确认？`, { modal: true }, '确认 hard reset');
+				const ok = await vscode.window.showWarningMessage(`Hard reset to ${hash.slice(0, 7)} will discard all changes. Confirm?`, { modal: true }, 'Confirm Hard Reset');
 				if (!ok) {
 					return;
 				}
@@ -452,10 +550,10 @@ export function registerHistoryCommands(
 				await service.execGit(['reset', `--${pick.label}`, hash]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`Reset (--${pick.label} ${hash.slice(0, 7)}) 完成`);
+				void vscode.window.showInformationMessage(`Reset (--${pick.label} ${hash.slice(0, 7)}) complete`);
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Reset'))) {
-					void vscode.window.showErrorMessage(`Reset 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to Reset: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -467,16 +565,16 @@ export function registerHistoryCommands(
 			if (!repo || node?.kind !== 'commit') {
 				return;
 			}
-			const name = await vscode.window.showInputBox({ prompt: `从 ${node.commit.hash.slice(0, 7)} 新建并检出分支`, placeHolder: '新分支名' });
+			const name = await vscode.window.showInputBox({ prompt: `Create and checkout a new branch from ${node.commit.hash.slice(0, 7)}`, placeHolder: 'New branch name' });
 			if (!name || !name.trim()) {
 				return;
 			}
 			try {
 				await repo.createBranch(name.trim(), true, node.commit.hash);
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已新建并检出 ${name.trim()} @ ${node.commit.hash.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Created and checked out ${name.trim()} @ ${node.commit.hash.slice(0, 7)}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`新建分支失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create branch: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -486,16 +584,16 @@ export function registerHistoryCommands(
 			if (node?.kind !== 'commit') {
 				return;
 			}
-			const name = await vscode.window.showInputBox({ prompt: `在 ${node.commit.hash.slice(0, 7)} 上新建标签`, placeHolder: '如 v1.0.0' });
+			const name = await vscode.window.showInputBox({ prompt: `Create a new tag at ${node.commit.hash.slice(0, 7)}`, placeHolder: 'e.g. v1.0.0' });
 			if (!name || !name.trim()) {
 				return;
 			}
 			try {
 				await service.execGit(['tag', name.trim(), node.commit.hash]);
 				branchesTree.refresh();
-				void vscode.window.showInformationMessage(`已创建标签 ${name.trim()} @ ${node.commit.hash.slice(0, 7)}`);
+				void vscode.window.showInformationMessage(`Created tag ${name.trim()} @ ${node.commit.hash.slice(0, 7)}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`创建标签失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create tag: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -513,14 +611,14 @@ export function registerHistoryCommands(
 				});
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`查询失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to query: ${errMsg(e)}`);
 			}
 		}),
 	);
 
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.logFilterGrep', async () => {
-			const grep = await vscode.window.showInputBox({ prompt: '按 message 文本/正则过滤（--grep）', placeHolder: '例如 fix|bug' });
+			const grep = await vscode.window.showInputBox({ prompt: 'Filter by message text/regex (--grep)', placeHolder: 'e.g. fix|bug' });
 			const f = logTree.getFilter();
 			logTree.setFilter({ ...f, grep: grep && grep.trim() ? grep.trim() : undefined });
 		}),
@@ -530,11 +628,11 @@ export function registerHistoryCommands(
 		vscode.commands.registerCommand('hyperGit.logFilterMergeMode', async () => {
 			const pick = await vscode.window.showQuickPick(
 				[
-					{ label: '全部提交', mode: 'all' as MergeMode },
-					{ label: '仅合并提交（merge）', mode: 'merge-only' as MergeMode },
-					{ label: '仅非合并提交', mode: 'no-merge' as MergeMode },
+					{ label: 'All Commits', mode: 'all' as MergeMode },
+					{ label: 'Merge Commits Only', mode: 'merge-only' as MergeMode },
+					{ label: 'Non-Merge Commits Only', mode: 'no-merge' as MergeMode },
 				],
-				{ placeHolder: '合并提交过滤模式' },
+				{ placeHolder: 'Merge commit filter mode' },
 			);
 			if (!pick) {
 				return;
@@ -549,12 +647,12 @@ export function registerHistoryCommands(
 			const now = Date.now();
 			const pick = await vscode.window.showQuickPick(
 				[
-					{ label: '最近 7 天', days: 7 },
-					{ label: '最近 30 天', days: 30 },
-					{ label: '最近 90 天', days: 90 },
-					{ label: '清除日期过滤', days: 0 },
+					{ label: 'Last 7 Days', days: 7 },
+					{ label: 'Last 30 Days', days: 30 },
+					{ label: 'Last 90 Days', days: 90 },
+					{ label: 'Clear Date Filter', days: 0 },
 				],
-				{ placeHolder: '提交日期范围' },
+				{ placeHolder: 'Commit date range' },
 			);
 			if (!pick) {
 				return;
@@ -566,7 +664,7 @@ export function registerHistoryCommands(
 
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.logFilterRegex', async () => {
-			const re = await vscode.window.showInputBox({ prompt: '按 message 正则过滤（客户端）', placeHolder: '例如 ^feat:' });
+			const re = await vscode.window.showInputBox({ prompt: 'Filter by message regex (client-side)', placeHolder: 'e.g. ^feat:' });
 			const f = logTree.getFilter();
 			logTree.setFilter({ ...f, messageRegex: re && re.trim() ? re.trim() : undefined });
 		}),
@@ -575,17 +673,19 @@ export function registerHistoryCommands(
 	return subs;
 }
 
-/** 查询本地分支是否已合并到当前 HEAD（或 main）：经 `git branch --merged <base>`。 */
-async function isBranchMerged(service: GitRepositoryService, branch: string): Promise<boolean> {
-	const repo = service.repo;
-	if (!repo) {
-		return false;
-	}
-	const base = repo.state.HEAD?.name ?? 'main';
+/**
+ * 列出当前 `refs/remotes/*` 短名（如 `origin/master`），供 prune 前后做差集。
+ * 解析 `git for-each-ref --format=%(refname:short) refs/remotes`：逐行去空白、去空行。
+ * 失败返回空数组（非关键路径，调用方据此跳过差集）。
+ */
+async function listRemoteTrackingRefs(service: GitRepositoryService): Promise<string[]> {
 	try {
-		const out = await service.execGit(['branch', '--merged', base]);
-		return out.split('\n').some((line) => line.replace(/^\*\s*/, '').trim() === branch);
+		const out = await service.execGit(['for-each-ref', '--format=%(refname:short)', 'refs/remotes']);
+		return out
+			.split('\n')
+			.map((line) => line.trim())
+			.filter((line) => line.length > 0);
 	} catch {
-		return false;
+		return [];
 	}
 }
diff --git a/src/adapter/misc-commands.ts b/src/adapter/misc-commands.ts
index 9a638e9..7a04a61 100644
--- a/src/adapter/misc-commands.ts
+++ b/src/adapter/misc-commands.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as vscode from 'vscode';
 import type { GitRepositoryService } from './git-repository-service';
-import type { LogTreeProvider } from './tree/log-tree';
+import type { LogFilterControl } from './webview/log-webview';
 import type { BranchesTreeProvider } from './tree/branches-tree';
 import { handleGitConflict } from './conflict-ui';
 
@@ -12,12 +12,12 @@ const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(
  *
  * - Create Patch：将工作区或已暂存改动导出为 .patch 文件（git diff [--cached]）。
  * - Apply Patch：选择 .patch 文件应用到工作区（git apply）。
- * - Show Reflog：git reflog 渲染为只读文档（IDEA Git → Show Reflog 等价）。
+ * - Show Reflog：git reflog 渲染为只读文档（等价于 Git Reflog 查看）。
  */
 export function registerMiscCommands(
 	service: GitRepositoryService,
 	branchesTree: BranchesTreeProvider,
-	logTree: LogTreeProvider,
+	logTree: LogFilterControl,
 ): vscode.Disposable[] {
 	const subs: vscode.Disposable[] = [];
 
@@ -29,11 +29,11 @@ export function registerMiscCommands(
 			}
 			const scope = await vscode.window.showQuickPick(
 				[
-					{ label: '未暂存改动', args: ['diff'] },
-					{ label: '已暂存改动', args: ['diff', '--cached'] },
-					{ label: '全部改动（HEAD↔工作区）', args: ['diff', 'HEAD'] },
+					{ label: 'Unstaged changes', args: ['diff'] },
+					{ label: 'Staged changes', args: ['diff', '--cached'] },
+					{ label: 'All changes (HEAD ↔ Working tree)', args: ['diff', 'HEAD'] },
 				],
-				{ placeHolder: '导出哪部分改动为 patch' },
+				{ placeHolder: 'Which changes to export as patch' },
 			);
 			if (!scope) {
 				return;
@@ -42,11 +42,11 @@ export function registerMiscCommands(
 			try {
 				patch = await service.execGit(scope.args);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`生成 patch 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to generate patch: ${errMsg(e)}`);
 				return;
 			}
 			if (!patch.trim()) {
-				void vscode.window.showInformationMessage('无改动可导出');
+				void vscode.window.showInformationMessage('No changes to export');
 				return;
 			}
 			const target = await vscode.window.showSaveDialog({
@@ -58,9 +58,9 @@ export function registerMiscCommands(
 			}
 			try {
 				await fs.promises.writeFile(target.fsPath, patch, 'utf8');
-				void vscode.window.showInformationMessage(`已导出 patch：${target.fsPath}`);
+				void vscode.window.showInformationMessage(`Patch exported: ${target.fsPath}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`写入 patch 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to write patch: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -74,18 +74,18 @@ export function registerMiscCommands(
 			const sel = await vscode.window.showOpenDialog({
 				canSelectMany: false,
 				filters: { Patch: ['patch', 'diff'], All: ['*'] },
-				title: '选择要应用的 patch 文件',
+				title: 'Select a patch file to apply',
 			});
 			if (!sel?.[0]) {
 				return;
 			}
 			const mode = await vscode.window.showQuickPick(
 				[
-					{ label: '应用到工作区', args: [] as string[] },
-					{ label: '应用并暂存（--index）', args: ['--index'] },
-					{ label: '3-way 应用（冲突可解）', args: ['--3way'] },
+					{ label: 'Apply to working tree', args: [] as string[] },
+					{ label: 'Apply and stage (--index)', args: ['--index'] },
+					{ label: '3-way apply (resolves conflicts)', args: ['--3way'] },
 				],
-				{ placeHolder: 'Apply 模式' },
+				{ placeHolder: 'Apply mode' },
 			);
 			if (!mode) {
 				return;
@@ -94,10 +94,10 @@ export function registerMiscCommands(
 				await service.execGit(['apply', ...mode.args, sel[0].fsPath]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage('已应用 patch');
+				void vscode.window.showInformationMessage('Patch applied');
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Apply Patch'))) {
-					void vscode.window.showErrorMessage(`应用 patch 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to apply patch: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -111,10 +111,10 @@ export function registerMiscCommands(
 			}
 			try {
 				const out = await service.execGit(['reflog', '-n', '200', '--date=relative']);
-				const doc = await vscode.workspace.openTextDocument({ content: `# git reflog（最近 200 条）\n\n${out}`, language: 'plaintext' });
+				const doc = await vscode.workspace.openTextDocument({ content: `# git reflog (latest 200 entries)\n\n${out}`, language: 'plaintext' });
 				await vscode.window.showTextDocument(doc, { preview: true });
 			} catch (e) {
-				void vscode.window.showErrorMessage(`读取 reflog 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to read reflog: ${errMsg(e)}`);
 			}
 		}),
 	);
diff --git a/src/adapter/partial-commands.ts b/src/adapter/partial-commands.ts
index 6792c86..39134b1 100644
--- a/src/adapter/partial-commands.ts
+++ b/src/adapter/partial-commands.ts
@@ -9,7 +9,7 @@ import type { ChangeItem, GitRepositoryService } from './git-repository-service'
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
 /**
- * 注册 partial / 行级提交命令（Batch 3）—— IDEA PartialChangesUtil 等价物。
+ * 注册 partial / 行级提交命令（Batch 3）—— 行级暂存与提交（设计参考 JetBrains PartialChangesUtil）。
  *
  * hunk 选择暂存：解析 `git diff` 为 hunks，QuickPick 勾选 → 重建 patch → `git apply --cached`。
  * 光标处 hunk 暂存：定位光标所在 hunk → 暂存该 hunk。
@@ -40,7 +40,7 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 	const pickHunks = async (diff: string, title: string): Promise<{ indices: number[] } | undefined> => {
 		const files = parseUnifiedDiff(diff);
 		if (files.length === 0) {
-			void vscode.window.showInformationMessage('无改动');
+			void vscode.window.showInformationMessage('No changes');
 			return undefined;
 		}
 		const file = files[0];
@@ -50,7 +50,7 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 			detail: h.body.slice(0, 6).join('\n'),
 			index: i,
 		}));
-		const sel = await vscode.window.showQuickPick(picks, { canPickMany: true, title, placeHolder: '勾选 hunk（详见 detail）' });
+		const sel = await vscode.window.showQuickPick(picks, { canPickMany: true, title, placeHolder: 'Select hunks (see detail)' });
 		if (!sel || sel.length === 0) {
 			return undefined;
 		}
@@ -70,18 +70,18 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 			try {
 				const diff = await service.execGit(['diff', '--', rel]);
 				if (!diff.trim()) {
-					void vscode.window.showInformationMessage('该文件无未暂存改动');
+					void vscode.window.showInformationMessage('No unstaged changes for this file');
 					return;
 				}
-				const sel = await pickHunks(diff, `暂存 hunk：${rel}`);
+				const sel = await pickHunks(diff, `Stage hunks: ${rel}`);
 				if (!sel) {
 					return;
 				}
 				const file = parseUnifiedDiff(diff)[0];
 				await applyToIndex(buildPatch(file, sel.indices), false);
-				void vscode.window.showInformationMessage(`已暂存 ${sel.indices.length} 个 hunk`);
+				void vscode.window.showInformationMessage(`Staged ${sel.indices.length} hunk(s)`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`暂存失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to stage: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -99,18 +99,18 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 			try {
 				const diff = await service.execGit(['diff', '--cached', '--', rel]);
 				if (!diff.trim()) {
-					void vscode.window.showInformationMessage('该文件无已暂存改动');
+					void vscode.window.showInformationMessage('No staged changes for this file');
 					return;
 				}
-				const sel = await pickHunks(diff, `取消暂存 hunk：${rel}`);
+				const sel = await pickHunks(diff, `Unstage hunks: ${rel}`);
 				if (!sel) {
 					return;
 				}
 				const file = parseUnifiedDiff(diff)[0];
 				await applyToIndex(buildPatch(file, sel.indices), true);
-				void vscode.window.showInformationMessage(`已取消暂存 ${sel.indices.length} 个 hunk`);
+				void vscode.window.showInformationMessage(`Unstaged ${sel.indices.length} hunk(s)`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`取消暂存失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to unstage: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -124,7 +124,7 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 			}
 			const rel = repoRelative(repo.rootUri.fsPath, editor.document.uri.fsPath);
 			if (!rel) {
-				void vscode.window.showWarningMessage('文件不在当前仓库内');
+				void vscode.window.showWarningMessage('File is not inside the current repository');
 				return;
 			}
 			const cursorLine = editor.selection.active.line + 1;
@@ -132,7 +132,7 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 				const diff = await service.execGit(['diff', '--', rel]);
 				const files = parseUnifiedDiff(diff);
 				if (files.length === 0) {
-					void vscode.window.showInformationMessage('无未暂存改动');
+					void vscode.window.showInformationMessage('No unstaged changes');
 					return;
 				}
 				const file = files[0];
@@ -140,13 +140,13 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 					.map((h, i) => ({ h, i }))
 					.filter(({ h }) => cursorLine >= h.newStart && cursorLine < h.newStart + Math.max(h.newCount, 1));
 				if (overlapping.length === 0) {
-					void vscode.window.showInformationMessage('光标不在改动 hunk 内');
+					void vscode.window.showInformationMessage('Cursor is not within a changed hunk');
 					return;
 				}
 				await applyToIndex(buildPatch(file, overlapping.map((o) => o.i)), false);
-				void vscode.window.showInformationMessage('已暂存光标处 hunk');
+				void vscode.window.showInformationMessage('Staged hunk at cursor');
 			} catch (e) {
-				void vscode.window.showErrorMessage(`暂存失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to stage: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -160,7 +160,7 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 			}
 			const rel = repoRelative(repo.rootUri.fsPath, editor.document.uri.fsPath);
 			if (!rel) {
-				void vscode.window.showWarningMessage('文件不在当前仓库内');
+				void vscode.window.showWarningMessage('File is not inside the current repository');
 				return;
 			}
 			const cursorLine = editor.selection.active.line + 1;
@@ -175,20 +175,20 @@ export function registerPartialCommands(service: GitRepositoryService, registry:
 					.map((h, i) => ({ h, i }))
 					.filter(({ h }) => cursorLine >= h.newStart && cursorLine < h.newStart + Math.max(h.newCount, 1));
 				if (overlapping.length === 0) {
-					void vscode.window.showInformationMessage('光标不在改动 hunk 内');
+					void vscode.window.showInformationMessage('Cursor is not within a changed hunk');
 					return;
 				}
 				const hunkIdx = overlapping[0].i;
 				const defs = registry.listDefs();
 				const active = registry.activeChangelistId;
 				const picks = defs.map((d) => ({ label: d.name, id: d.id, description: d.id === active ? 'active' : undefined }));
-				const pick = await vscode.window.showQuickPick(picks, { placeHolder: `将 Hunk ${hunkIdx + 1} 移至 Changelist` });
+				const pick = await vscode.window.showQuickPick(picks, { placeHolder: `Move Hunk ${hunkIdx + 1} to Changelist` });
 				if (pick) {
 					registry.moveHunk(rel, hunkIdx, pick.id);
-					void vscode.window.showInformationMessage(`已将 Hunk ${hunkIdx + 1}（${rel}）分配到「${pick.label}」`);
+					void vscode.window.showInformationMessage(`Assigned Hunk ${hunkIdx + 1} (${rel}) to "${pick.label}"`);
 				}
 			} catch (e) {
-				void vscode.window.showErrorMessage(`分配失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to assign: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -206,7 +206,7 @@ async function pickUnstagedFile(service: GitRepositoryService): Promise<string |
 	if (items.length === 0) {
 		return undefined;
 	}
-	const pick = await vscode.window.showQuickPick(items.map((c) => ({ label: c.relativePath })), { placeHolder: '选择文件' });
+	const pick = await vscode.window.showQuickPick(items.map((c) => ({ label: c.relativePath })), { placeHolder: 'Select a file' });
 	return pick?.label;
 }
 
@@ -215,6 +215,6 @@ async function pickStagedFile(service: GitRepositoryService): Promise<string | u
 	if (items.length === 0) {
 		return undefined;
 	}
-	const pick = await vscode.window.showQuickPick(items.map((c) => ({ label: c.relativePath })), { placeHolder: '选择已暂存文件' });
+	const pick = await vscode.window.showQuickPick(items.map((c) => ({ label: c.relativePath })), { placeHolder: 'Select a staged file' });
 	return pick?.label;
 }
diff --git a/src/adapter/remote-commands.ts b/src/adapter/remote-commands.ts
index 0293191..8a7318f 100644
--- a/src/adapter/remote-commands.ts
+++ b/src/adapter/remote-commands.ts
@@ -1,8 +1,16 @@
 import * as vscode from 'vscode';
-import type { GitRepositoryService } from './git-repository-service';
-import type { BranchesTreeProvider } from './tree/branches-tree';
-import type { LogTreeProvider } from './tree/log-tree';
+import { selectedBranchRefs } from './branch-selection';
 import { handleGitConflict } from './conflict-ui';
+import type { BranchNode, BranchesTreeProvider } from './tree/branches-tree';
+import type { LogFilterControl } from './webview/log-webview';
+import { truncateNames } from '../engine/ref/cleanup';
+import {
+	formatRemoteDeleteConfirm,
+	partitionRemoteByProtected,
+	resolveRemoteBranch,
+	type RemoteBranchTarget,
+} from '../engine/ref/remote-ref';
+import type { GitRepositoryService } from './git-repository-service';
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
@@ -17,7 +25,7 @@ const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(
 export function registerRemoteCommands(
 	service: GitRepositoryService,
 	branchesTree: BranchesTreeProvider,
-	logTree: LogTreeProvider,
+	logTree: LogFilterControl,
 ): vscode.Disposable[] {
 	const subs: vscode.Disposable[] = [];
 
@@ -29,7 +37,7 @@ export function registerRemoteCommands(
 			}
 			const remotes = repo.state.remotes.map((r) => r.name);
 			if (remotes.length === 0) {
-				void vscode.window.showWarningMessage('未配置远程仓库（remote）');
+				void vscode.window.showWarningMessage('No remote repository configured');
 				return;
 			}
 			// 待推送提交预览（best-effort，无 upstream 时忽略）
@@ -37,41 +45,41 @@ export function registerRemoteCommands(
 			try {
 				const out = (await service.execGit(['log', '@{u}..HEAD', '--oneline'])).trim();
 				if (out) {
-					previewCount = `（${out.split('\n').length} 个待推送提交）`;
+					previewCount = ` (${out.split('\n').length} commit(s) to push)`;
 				}
 			} catch {
 				/* 无上游，忽略 */
 			}
-			const remote = await vscode.window.showQuickPick(remotes, { placeHolder: `选择目标 remote ${previewCount}` });
+			const remote = await vscode.window.showQuickPick(remotes, { placeHolder: `Select target remote ${previewCount}` });
 			if (!remote) {
 				return;
 			}
 			const mode = await vscode.window.showQuickPick(
 				[
-					{ label: 'Normal', description: '普通推送', force: undefined as 0 | 1 | undefined },
-					{ label: 'Force-with-lease', description: '安全强推（推荐）', force: 1 as const },
-					{ label: 'Force', description: '⚠ 强制覆盖远程（危险）', force: 0 as const },
+					{ label: 'Normal', description: 'Normal push', force: undefined as 0 | 1 | undefined },
+					{ label: 'Force-with-lease', description: 'Safe force push (recommended)', force: 1 as const },
+					{ label: 'Force', description: '⚠ Force overwrite remote (dangerous)', force: 0 as const },
 				],
-				{ placeHolder: '推送模式' },
+				{ placeHolder: 'Push mode' },
 			);
 			if (!mode) {
 				return;
 			}
-			const tags = await vscode.window.showQuickPick(['否', '是'], { placeHolder: '同时推送 tags？' });
+			const tags = await vscode.window.showQuickPick(['No', 'Yes'], { placeHolder: 'Push tags as well?' });
 			if (!tags) {
 				return;
 			}
 			try {
 				await repo.push(remote, undefined, false, mode.force);
-				if (tags === '是') {
+				if (tags === 'Yes') {
 					await service.execGit(['push', remote, '--tags']);
 				}
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`已推送到 ${remote} ${previewCount}`.trim());
+				void vscode.window.showInformationMessage(`Pushed to ${remote} ${previewCount}`.trim());
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Push'))) {
-					void vscode.window.showErrorMessage(`Push 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Push failed: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -85,10 +93,10 @@ export function registerRemoteCommands(
 			}
 			const pick = await vscode.window.showQuickPick(
 				[
-					{ label: 'Merge 策略（默认）', description: 'pull --no-rebase', args: ['pull', '--no-rebase'] },
-					{ label: 'Rebase 策略', description: 'pull --rebase（线性历史）', args: ['pull', '--rebase'] },
+					{ label: 'Merge strategy (default)', description: 'pull --no-rebase', args: ['pull', '--no-rebase'] },
+					{ label: 'Rebase strategy', description: 'pull --rebase (linear history)', args: ['pull', '--rebase'] },
 				],
-				{ placeHolder: 'Update Project：拉取并整合远程变更' },
+				{ placeHolder: 'Update Project: pull and integrate remote changes' },
 			);
 			if (!pick) {
 				return;
@@ -97,10 +105,10 @@ export function registerRemoteCommands(
 				await service.execGit(pick.args);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage('Update Project 完成');
+				void vscode.window.showInformationMessage('Update Project complete');
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Update'))) {
-					void vscode.window.showErrorMessage(`Update 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Update failed: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -113,24 +121,24 @@ export function registerRemoteCommands(
 				return;
 			}
 			const refs = repo.state.refs.filter((r) => r.name && (r.type === 0 || r.type === 1));
-			const target = await vscode.window.showQuickPick(refs.map((r) => r.name!), { placeHolder: '合并哪个分支到当前分支' });
+			const target = await vscode.window.showQuickPick(refs.map((r) => r.name!), { placeHolder: 'Merge which branch into the current branch' });
 			if (!target) {
 				return;
 			}
 			const mode = await vscode.window.showQuickPick(
 				[
-					{ label: 'Fast-forward only', description: '仅当可快进时合并', args: ['--ff-only'] },
-					{ label: 'No fast-forward', description: '始终创建合并提交', args: ['--no-ff'] },
-					{ label: 'Squash', description: '压缩为单个提交（不产生合并提交）', args: ['--squash'] },
+					{ label: 'Fast-forward only', description: 'Merge only when fast-forward is possible', args: ['--ff-only'] },
+					{ label: 'No fast-forward', description: 'Always create a merge commit', args: ['--no-ff'] },
+					{ label: 'Squash', description: 'Squash into a single commit (no merge commit)', args: ['--squash'] },
 				],
-				{ placeHolder: `合并模式（${target} → 当前分支）` },
+				{ placeHolder: `Merge mode (${target} → current branch)` },
 			);
 			if (!mode) {
 				return;
 			}
 			const msgArgs: string[] = [];
 			if (mode.args[0] !== '--ff-only') {
-				const msg = await vscode.window.showInputBox({ prompt: '合并提交信息', value: `Merge ${target}` });
+				const msg = await vscode.window.showInputBox({ prompt: 'Merge commit message', value: `Merge ${target}` });
 				if (msg && msg.trim()) {
 					msgArgs.push('-m', msg.trim());
 				}
@@ -139,14 +147,90 @@ export function registerRemoteCommands(
 				await service.execGit(['merge', ...mode.args, ...msgArgs, target]);
 				branchesTree.refresh();
 				logTree.refresh();
-				void vscode.window.showInformationMessage(`已合并 ${target}`);
+				void vscode.window.showInformationMessage(`Merged ${target}`);
 			} catch (e) {
-				if (!(await handleGitConflict(service, '合并'))) {
-					void vscode.window.showErrorMessage(`合并失败：${errMsg(e)}`);
+				if (!(await handleGitConflict(service, 'Merge'))) {
+					void vscode.window.showErrorMessage(`Merge failed: ${errMsg(e)}`);
 				}
 			}
 		}),
 	);
 
+	subs.push(
+		vscode.commands.registerCommand('hyperGit.deleteRemoteBranch', async (node: BranchNode, nodes?: BranchNode[]) => {
+			const repo = service.repo;
+			if (!repo) {
+				return;
+			}
+			// 仅远程、非 tag（多选时自动过滤本地/标签节点）。
+			const refs = selectedBranchRefs(node, nodes, (r) => r.isRemote && !r.isTag);
+			if (refs.length === 0) {
+				return;
+			}
+			const remotes = repo.state.remotes.map((r) => r.name);
+			if (remotes.length === 0) {
+				void vscode.window.showWarningMessage('No remote repository configured');
+				return;
+			}
+			// 用已知 remotes 做最长前缀匹配解析 {remote, branch}；丢弃无法归属的脏数据。
+			const targets = refs
+				.map((r) => resolveRemoteBranch(r.shortName, remotes))
+				.filter((t): t is RemoteBranchTarget => t !== null);
+			if (targets.length === 0) {
+				void vscode.window.showWarningMessage('Could not resolve the owning remote of the selected remote branches');
+				return;
+			}
+			// 受保护主干（main/master）硬阻断——与本地删除硬阻断当前 HEAD 对称。
+			const { deletable, protectedTargets } = partitionRemoteByProtected(targets);
+			if (deletable.length === 0) {
+				void vscode.window.showWarningMessage(`Skipped protected branches: ${truncateNames(protectedTargets.map((t) => t.shortName))}`);
+				return;
+			}
+			// 软警示：待删集合是否含当前分支上游（删之不致命，但令当前分支失远程追踪）。
+			const headUpstream = repo.state.HEAD?.upstream?.name;
+			const hasUpstreamOfHead = !!headUpstream && deletable.some((t) => t.shortName === headUpstream);
+			const { detail, confirmLabel } = formatRemoteDeleteConfirm(deletable, { hasUpstreamOfHead });
+			// 受保护跳过项透明并入文案。
+			const fullDetail =
+				protectedTargets.length > 0
+					? `${detail}\n\nAutomatically skipped protected branches: ${truncateNames(protectedTargets.map((t) => t.shortName))}`
+					: detail;
+			const choice = await vscode.window.showWarningMessage(fullDetail, { modal: true }, confirmLabel);
+			if (choice !== confirmLabel) {
+				return;
+			}
+			// 逐分支推删，收集失败（不调用 handleGitConflict——删除不产生合并冲突）。
+			const failures: string[] = [];
+			const succeeded: RemoteBranchTarget[] = [];
+			for (const t of deletable) {
+				try {
+					await service.execGit(['push', t.remote, '--delete', t.branch]);
+					succeeded.push(t);
+				} catch {
+					failures.push(t.shortName);
+				}
+			}
+			// 仅对服务端删除成功项清理本地 remote-tracking ref（失败项保留，待重试或下次 fetch --prune）。
+			for (const t of succeeded) {
+				try {
+					await service.execGit(['branch', '-D', '-r', `${t.remote}/${t.branch}`]);
+				} catch {
+					/* 非关键：服务端已删为权威态，本地清理失败不影响正确性 */
+				}
+			}
+			branchesTree.refresh();
+			logTree.refresh();
+			if (failures.length === 0) {
+				void vscode.window.showInformationMessage(
+					succeeded.length === 1 ? `Deleted remote branch ${succeeded[0].shortName}` : `Deleted ${succeeded.length} remote branches`,
+				);
+			} else {
+				void vscode.window.showWarningMessage(
+					`Deleted ${succeeded.length} remote branches, ${failures.length} failed: ${truncateNames(failures)}`,
+				);
+			}
+		}),
+	);
+
 	return subs;
 }
diff --git a/src/adapter/shelf.ts b/src/adapter/shelf.ts
index 0fb17b9..77302b5 100644
--- a/src/adapter/shelf.ts
+++ b/src/adapter/shelf.ts
@@ -4,6 +4,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import type { GitRepositoryService } from './git-repository-service';
 import { handleGitConflict } from './conflict-ui';
+import { mdTooltip, relativeDate } from './tree/tree-tooltip';
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
@@ -26,8 +27,16 @@ export interface ShelfNode {
 	readonly timestamp: string;
 }
 
+/** Shelf 内单文件叶子（展开 shelf 节点暴露其包含的文件路径）。 */
+export interface ShelfFileNode {
+	readonly kind: 'file';
+	readonly path: string;
+}
+
+export type ShelfTreeNode = ShelfNode | ShelfFileNode;
+
 /**
- * ShelfService：IDEA 忠实 Shelf 实现。
+ * ShelfService：基于 patch 的 Shelf 实现（独立于 git stash）。
  *
  * - Shelve：`git diff -- <paths>` → 存 patch 到扩展存储 → `git checkout --` 移除工作区改动（变更保留在 patch）。
  * - Unshelve：读取 patch → `git apply`（静默）或 `git apply --3way`（三方合并冲突解决）。
@@ -45,11 +54,11 @@ export class ShelfService {
 	async shelve(name: string, paths: readonly string[], timestamp: string): Promise<void> {
 		const repo = this.service.repo;
 		if (!repo) {
-			throw new Error('未找到 Git 仓库');
+			throw new Error('No Git repository found');
 		}
 		const patch = await this.service.execGit(['diff', '--', ...paths]);
 		if (!patch.trim()) {
-			throw new Error('所选文件无改动（或为未跟踪文件）');
+			throw new Error('Selected files have no changes (or are untracked)');
 		}
 		fs.mkdirSync(this.shelvesDir, { recursive: true });
 		const entry: ShelfEntry = { name, paths, timestamp, patch };
@@ -61,7 +70,7 @@ export class ShelfService {
 	async unshelve(name: string, threeWay: boolean): Promise<void> {
 		const entry = this.readEntry(name);
 		if (!entry) {
-			throw new Error(`Shelf「${name}」不存在`);
+			throw new Error(`Shelf "${name}" does not exist`);
 		}
 		const tmp = path.join(os.tmpdir(), `hg-unshelve-${Date.now()}.patch`);
 		fs.writeFileSync(tmp, entry.patch);
@@ -124,9 +133,9 @@ export class ShelfService {
 	}
 }
 
-/** Shelf TreeView：显示已存储的 shelf 条目。 */
-export class ShelfTreeProvider implements vscode.TreeDataProvider<ShelfNode>, vscode.Disposable {
-	private readonly _onDidChange = new vscode.EventEmitter<ShelfNode | undefined>();
+/** Shelf TreeView：显示已存储的 shelf 条目，展开可见其包含的文件。 */
+export class ShelfTreeProvider implements vscode.TreeDataProvider<ShelfTreeNode>, vscode.Disposable {
+	private readonly _onDidChange = new vscode.EventEmitter<ShelfTreeNode | undefined>();
 	readonly onDidChangeTreeData = this._onDidChange.event;
 
 	constructor(private readonly shelfService: ShelfService) {}
@@ -135,17 +144,38 @@ export class ShelfTreeProvider implements vscode.TreeDataProvider<ShelfNode>, vs
 		this._onDidChange.fire(undefined);
 	}
 
-	getChildren(): ShelfNode[] {
-		return this.shelfService.listShelves();
+	getChildren(element?: ShelfTreeNode): ShelfTreeNode[] {
+		if (!element) {
+			return this.shelfService.listShelves();
+		}
+		if (element.kind === 'shelf') {
+			return element.paths.map((p): ShelfFileNode => ({ kind: 'file', path: p }));
+		}
+		return [];
 	}
 
-	getTreeItem(node: ShelfNode): vscode.TreeItem {
-		const item = new vscode.TreeItem(node.name, vscode.TreeItemCollapsibleState.None);
+	getTreeItem(node: ShelfTreeNode): vscode.TreeItem {
+		if (node.kind === 'file') {
+			const item = new vscode.TreeItem(node.path, vscode.TreeItemCollapsibleState.None);
+			item.id = `shelf-file:${node.path}`;
+			item.contextValue = 'hyperGit.shelfFile';
+			item.tooltip = mdTooltip([['Path', node.path]]);
+			return item;
+		}
+		const count = node.paths.length;
+		const item = new vscode.TreeItem(node.name, vscode.TreeItemCollapsibleState.Collapsed);
 		item.id = `shelf:${node.name}`;
-		item.description = `${node.paths.length} files · ${node.timestamp}`;
-		item.tooltip = `${node.name}\n${node.paths.length} files\nShelved: ${node.timestamp}`;
+		item.description = `${count} ${count === 1 ? 'file' : 'files'} · ${relativeDate(node.timestamp)}`;
 		item.contextValue = 'hyperGit.shelf';
-		item.iconPath = new vscode.ThemeIcon('inbox');
+		item.iconPath = new vscode.ThemeIcon('library');
+		item.tooltip = mdTooltip(
+			[
+				['Files', String(count)],
+				['Shelved', relativeDate(node.timestamp)],
+				['Timestamp', node.timestamp],
+			],
+			{ title: node.name },
+		);
 		return item;
 	}
 
@@ -166,16 +196,16 @@ export function registerShelfCommands(service: GitRepositoryService, shelfServic
 			}
 			const changes = service.getChanges().filter((c) => !c.staged);
 			if (changes.length === 0) {
-				void vscode.window.showInformationMessage('无未暂存改动可 shelve');
+				void vscode.window.showInformationMessage('No unstaged changes to shelve');
 				return;
 			}
-			const name = await vscode.window.showInputBox({ prompt: 'Shelf 名称', placeHolder: '例如 feature-x-wip' });
+			const name = await vscode.window.showInputBox({ prompt: 'Shelf name', placeHolder: 'e.g. feature-x-wip' });
 			if (!name || !name.trim()) {
 				return;
 			}
 			const picks = await vscode.window.showQuickPick(
 				changes.map((c) => ({ label: c.relativePath, picked: true })),
-				{ canPickMany: true, title: '选择要 shelve 的文件' },
+				{ canPickMany: true, title: 'Select files to shelve' },
 			);
 			if (!picks || picks.length === 0) {
 				return;
@@ -183,9 +213,9 @@ export function registerShelfCommands(service: GitRepositoryService, shelfServic
 			try {
 				await shelfService.shelve(name.trim(), picks.map((p) => p.label), new Date().toISOString());
 				shelfTree.refresh();
-				void vscode.window.showInformationMessage(`已 shelve「${name.trim()}」(${picks.length} files)`);
+				void vscode.window.showInformationMessage(`Shelved "${name.trim()}" (${picks.length} files)`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Shelve 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to shelve: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -198,9 +228,9 @@ export function registerShelfCommands(service: GitRepositoryService, shelfServic
 			try {
 				await shelfService.unshelveAndDrop(node.name, false);
 				shelfTree.refresh();
-				void vscode.window.showInformationMessage(`已 unshelve「${node.name}」`);
+				void vscode.window.showInformationMessage(`Unshelved "${node.name}"`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Unshelve 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to unshelve: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -213,10 +243,10 @@ export function registerShelfCommands(service: GitRepositoryService, shelfServic
 			try {
 				await shelfService.unshelveAndDrop(node.name, true);
 				shelfTree.refresh();
-				void vscode.window.showInformationMessage(`已 unshelve（3-way）「${node.name}」`);
+				void vscode.window.showInformationMessage(`Unshelved "${node.name}" (3-way)`);
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Unshelve'))) {
-					void vscode.window.showErrorMessage(`Unshelve 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to unshelve: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -227,8 +257,8 @@ export function registerShelfCommands(service: GitRepositoryService, shelfServic
 			if (!node) {
 				return;
 			}
-			const ok = await vscode.window.showWarningMessage(`删除 Shelf「${node.name}」？`, { modal: true }, '删除');
-			if (ok === '删除') {
+			const ok = await vscode.window.showWarningMessage(`Delete shelf "${node.name}"?`, { modal: true }, 'Delete');
+			if (ok === 'Delete') {
 				shelfService.drop(node.name);
 				shelfTree.refresh();
 			}
diff --git a/src/adapter/stash-commands.ts b/src/adapter/stash-commands.ts
index 8addbf3..5ba9930 100644
--- a/src/adapter/stash-commands.ts
+++ b/src/adapter/stash-commands.ts
@@ -13,18 +13,40 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 	const subs: vscode.Disposable[] = [];
 	const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
+	subs.push(
+		vscode.commands.registerCommand('hyperGit.stashView', async (node?: StashNode) => {
+			// 只读查看 stash diff（单击叶子触发；比 apply 更安全，apply/pop/drop 仍在右键菜单）。
+			const repo = service.repo;
+			if (!repo) {
+				return;
+			}
+			const index = node?.kind === 'stash' ? node.index : 0;
+			try {
+				const patch = await service.execGit(['stash', 'show', '-p', '--no-color', `stash@{${index}}`]);
+				if (!patch.trim()) {
+					void vscode.window.showInformationMessage(`stash@{${index}} has no changes to show`);
+					return;
+				}
+				const doc = await vscode.workspace.openTextDocument({ content: patch, language: 'diff' });
+				await vscode.window.showTextDocument(doc, { preview: true });
+			} catch (e) {
+				void vscode.window.showErrorMessage(`Failed to show stash: ${errMsg(e)}`);
+			}
+		}),
+	);
+
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.stashCreate', async () => {
 			const repo = service.repo;
 			if (!repo) {
 				return;
 			}
-			const message = await vscode.window.showInputBox({ prompt: 'Stash 信息（可空）', placeHolder: 'WIP' });
+			const message = await vscode.window.showInputBox({ prompt: 'Stash message (optional)', placeHolder: 'WIP' });
 			try {
 				await repo.createStash({ message: message && message.trim() ? message.trim() : undefined, includeUntracked: true });
 				stashTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Stash 创建失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create stash: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -40,7 +62,7 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 				await repo.applyStash(index);
 				stashTree.refresh();
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Stash 应用失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to apply stash: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -57,7 +79,7 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 				stashTree.refresh();
 			} catch (e) {
 				if (!(await handleGitConflict(service, 'Stash pop'))) {
-					void vscode.window.showErrorMessage(`Stash pop 失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to pop stash: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -70,13 +92,13 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 				return;
 			}
 			const index = node?.kind === 'stash' ? node.index : 0;
-			const choice = await vscode.window.showWarningMessage(`删除 stash@{${index}}？`, { modal: true }, '删除');
-			if (choice === '删除') {
+			const choice = await vscode.window.showWarningMessage(`Drop stash@{${index}}?`, { modal: true }, 'Drop');
+			if (choice === 'Drop') {
 				try {
 					await repo.dropStash(index);
 					stashTree.refresh();
 				} catch (e) {
-					void vscode.window.showErrorMessage(`Stash 删除失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to drop stash: ${errMsg(e)}`);
 				}
 			}
 		}),
@@ -90,7 +112,7 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 			if (!repo) {
 				return;
 			}
-			const message = await vscode.window.showInputBox({ prompt: 'Stash 信息（保留已暂存改动在工作区）', placeHolder: 'WIP' });
+			const message = await vscode.window.showInputBox({ prompt: 'Stash message (keep staged changes in the working tree)', placeHolder: 'WIP' });
 			try {
 				const args = ['stash', 'push', '--keep-index'];
 				if (message && message.trim()) {
@@ -98,9 +120,9 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 				}
 				await service.execGit(args);
 				stashTree.refresh();
-				void vscode.window.showInformationMessage('已 Stash（保留已暂存）');
+				void vscode.window.showInformationMessage('Stashed (index kept)');
 			} catch (e) {
-				void vscode.window.showErrorMessage(`Stash 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to stash: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -111,16 +133,16 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 			if (!repo) {
 				return;
 			}
-			const ok = await vscode.window.showWarningMessage('清空所有 stash（不可撤销）？', { modal: true }, '清空');
-			if (ok !== '清空') {
+			const ok = await vscode.window.showWarningMessage('Clear ALL stashes (irreversible)?', { modal: true }, 'Clear All');
+			if (ok !== 'Clear All') {
 				return;
 			}
 			try {
 				await service.execGit(['stash', 'clear']);
 				stashTree.refresh();
-				void vscode.window.showInformationMessage('已清空所有 stash');
+				void vscode.window.showInformationMessage('Cleared all stashes');
 			} catch (e) {
-				void vscode.window.showErrorMessage(`清空失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to clear stashes: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -145,29 +167,29 @@ export function registerStashCommands(service: GitRepositoryService, stashTree:
 						})
 						.filter((x): x is { label: string; description: string; index: number } => x !== null);
 					if (items.length === 0) {
-						void vscode.window.showInformationMessage('无 stash');
+						void vscode.window.showInformationMessage('No stashes');
 						return;
 					}
-					const pick = await vscode.window.showQuickPick(items, { placeHolder: '选择要转为分支的 stash' });
+					const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Select a stash to turn into a branch' });
 					if (!pick) {
 						return;
 					}
 					index = pick.index;
 				} catch (e) {
-					void vscode.window.showErrorMessage(`读取 stash 列表失败：${errMsg(e)}`);
+					void vscode.window.showErrorMessage(`Failed to read stash list: ${errMsg(e)}`);
 					return;
 				}
 			}
-			const name = await vscode.window.showInputBox({ prompt: `从 stash@{${index}} 创建并检出新分支`, placeHolder: '新分支名' });
+			const name = await vscode.window.showInputBox({ prompt: `Create and checkout a new branch from stash@{${index}}`, placeHolder: 'New branch name' });
 			if (!name || !name.trim()) {
 				return;
 			}
 			try {
 				await service.execGit(['stash', 'branch', name.trim(), `stash@{${index}}`]);
 				stashTree.refresh();
-				void vscode.window.showInformationMessage(`已从 stash@{${index}} 创建分支 ${name.trim()}`);
+				void vscode.window.showInformationMessage(`Created branch ${name.trim()} from stash@{${index}}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`创建分支失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create branch: ${errMsg(e)}`);
 			}
 		}),
 	);
diff --git a/src/adapter/tree/branches-tree.ts b/src/adapter/tree/branches-tree.ts
index 7816d0e..4168b38 100644
--- a/src/adapter/tree/branches-tree.ts
+++ b/src/adapter/tree/branches-tree.ts
@@ -3,6 +3,7 @@ import type { Ref } from '../../types/git';
 import type { GitRepositoryService } from '../git-repository-service';
 import type { BranchFavorites } from '../branch-favorites';
 import { FOR_EACH_REF_FORMAT, type RawRef, parseForEachRef } from '../../engine/ref/for-each-ref';
+import { mdTooltip } from './tree-tooltip';
 
 export type BranchGroupId = 'favorites' | 'local' | 'remote' | 'tags';
 
@@ -10,6 +11,8 @@ export interface BranchGroupNode {
 	readonly kind: 'group';
 	readonly id: BranchGroupId;
 	readonly label: string;
+	/** 分组内条目数（标题栏描述显示计数徽标）。 */
+	readonly count: number;
 }
 
 export interface BranchRefNode {
@@ -25,7 +28,7 @@ export type BranchNode = BranchGroupNode | BranchRefNode;
  *
  * 数据源策略（解除「视图空白」根因）：主路径读 `Repository.state.refs`（API，零成本）；
  * 为空（首帧未填充 / 仓库初始化竞态）时经 CLI 通道 `git for-each-ref` 兜底（含 ahead/behind track）。
- * 四段分组：Favorites（收藏置顶，仿 IDEA）/ Local / Remote / Tags。
+ * 四段分组：Favorites（收藏置顶，参考 JetBrains 分组设计）/ Local / Remote / Tags。
  * 构造函数自订阅 service.onDidChange + favorites.onDidChange 做即时刷新。
  */
 export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>, vscode.Disposable {
@@ -55,16 +58,21 @@ export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>
 		}
 		if (!element) {
 			const refs = await this.loadRefs();
+			const byName = new Map(refs.map((r) => [r.shortName, r] as const));
+			const favCount = this.favorites.list().filter((n) => byName.has(n)).length;
+			const localCount = refs.filter((r) => !r.isRemote && !r.isTag).length;
+			const remoteCount = refs.filter((r) => r.isRemote).length;
+			const tagCount = refs.filter((r) => r.isTag).length;
 			const groups: BranchGroupNode[] = [];
-			if (this.favorites.list().length > 0) {
-				groups.push({ kind: 'group', id: 'favorites', label: 'Favorites' });
+			if (favCount > 0) {
+				groups.push({ kind: 'group', id: 'favorites', label: 'Favorites', count: favCount });
 			}
 			groups.push(
-				{ kind: 'group', id: 'local', label: 'Local Branches' },
-				{ kind: 'group', id: 'remote', label: 'Remote Branches' },
+				{ kind: 'group', id: 'local', label: 'Local Branches', count: localCount },
+				{ kind: 'group', id: 'remote', label: 'Remote Branches', count: remoteCount },
 			);
-			if (refs.some((r) => r.isTag)) {
-				groups.push({ kind: 'group', id: 'tags', label: 'Tags' });
+			if (tagCount > 0) {
+				groups.push({ kind: 'group', id: 'tags', label: 'Tags', count: tagCount });
 			}
 			return groups;
 		}
@@ -165,6 +173,7 @@ export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>
 		if (element.kind === 'group') {
 			const item = new vscode.TreeItem(element.label, vscode.TreeItemCollapsibleState.Expanded);
 			item.contextValue = 'hyperGit.branchGroup';
+			item.description = String(element.count);
 			const icon =
 				element.id === 'remote' ? 'repo' : element.id === 'tags' ? 'tag' : element.id === 'favorites' ? 'star-full' : 'git-branch';
 			item.iconPath = new vscode.ThemeIcon(icon);
@@ -175,18 +184,21 @@ export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>
 		const fav = this.favorites.isFavorite(ref.shortName);
 		const isTag = ref.isTag;
 		const item = new vscode.TreeItem(ref.shortName, vscode.TreeItemCollapsibleState.None);
-		item.description = this.describe(ref, active, fav);
+		item.description = this.describe(ref, active);
 		item.contextValue = isTag ? 'hyperGit.tag' : element.remote ? 'hyperGit.remoteBranch' : 'hyperGit.branch';
 		item.tooltip = this.tooltip(ref, active, fav);
 		const icon = isTag ? 'tag' : element.remote ? 'cloud' : 'git-branch';
-		item.iconPath = new vscode.ThemeIcon(
-			icon,
-			active ? new vscode.ThemeColor('gitDecoration.modifiedResourceForeground') : undefined,
-		);
+		// 活动分支 = charts.blue（与 Log 本地分支 chip 同语义，全局一致）；收藏（非活动）= charts.yellow。
+		const color = active
+			? new vscode.ThemeColor('charts.blue')
+			: fav
+				? new vscode.ThemeColor('charts.yellow')
+				: undefined;
+		item.iconPath = new vscode.ThemeIcon(icon, color);
 		return item;
 	}
 
-	private describe(ref: RawRef, active: boolean, fav: boolean): string {
+	private describe(ref: RawRef, active: boolean): string {
 		const parts: string[] = [];
 		if (active) {
 			parts.push('active');
@@ -197,17 +209,20 @@ export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>
 			if (ref.behind) {
 				parts.push(`↓${ref.behind}`);
 			}
-		} else if (ref.objectname) {
-			parts.push(ref.objectname);
-		}
-		if (fav) {
-			parts.push('★');
 		}
 		return parts.join(' ');
 	}
 
-	private tooltip(ref: RawRef, active: boolean, fav: boolean): string {
-		const lines = [ref.shortName + (active ? ' (active)' : '') + (fav ? ' ★' : '')];
+	private tooltip(ref: RawRef, active: boolean, fav: boolean): vscode.MarkdownString {
+		const rows: Array<[string, string]> = [];
+		if (active) {
+			rows.push(['State', 'Current branch (HEAD)']);
+		} else if (fav) {
+			rows.push(['State', 'Favorite']);
+		}
+		if (ref.objectname) {
+			rows.push([ref.isTag ? 'Tag' : 'Commit', ref.objectname]);
+		}
 		if (ref.upstream) {
 			const track: string[] = [];
 			if (ref.ahead) {
@@ -216,12 +231,9 @@ export class BranchesTreeProvider implements vscode.TreeDataProvider<BranchNode>
 			if (ref.behind) {
 				track.push(`behind ${ref.behind}`);
 			}
-			lines.push(`← ${ref.upstream}${track.length ? ` (${track.join(', ')})` : ''}`);
-		}
-		if (ref.isTag) {
-			lines.push(`tag @ ${ref.objectname}`);
+			rows.push(['Upstream', `${ref.upstream}${track.length ? ` (${track.join(', ')})` : ''}`]);
 		}
-		return lines.join('\n');
+		return mdTooltip(rows, { title: ref.shortName });
 	}
 
 	/** 判定分支是否当前 HEAD：CLI 解析的 head 标记优先，API 路径回退与 state.HEAD.name 比较。 */
diff --git a/src/adapter/tree/changes-tree.ts b/src/adapter/tree/changes-tree.ts
index ed2ac41..11ba4c4 100644
--- a/src/adapter/tree/changes-tree.ts
+++ b/src/adapter/tree/changes-tree.ts
@@ -4,6 +4,7 @@ import { fileStatusLabel } from '../../engine/model';
 import { getDecoration } from '../../engine/scm-mapping/status-decoration';
 import type { ChangelistRegistry } from '../changelist-registry';
 import type { ChangeItem, GitRepositoryService } from '../git-repository-service';
+import { mdTooltip } from './tree-tooltip';
 
 export interface ChangesChangelistNode {
 	readonly kind: 'changelist';
@@ -73,9 +74,16 @@ export class ChangesTreeProvider implements vscode.TreeDataProvider<ChangesNode>
 		const item = new vscode.TreeItem(node.name, state);
 		item.contextValue = 'hyperGit.changelist';
 		item.id = `cl:${node.id}`;
-		item.iconPath = new vscode.ThemeIcon('folder');
+		// 活动 changelist 用 folder-opened 区分（视觉锚定提交目标）。
+		item.iconPath = new vscode.ThemeIcon(node.active ? 'folder-opened' : 'folder');
 		item.description = `${count} ${count === 1 ? 'file' : 'files'}${node.active ? ' · active' : ''}`;
-		item.tooltip = `${node.name}${node.active ? ' (active)' : ''}\n${count} changes`;
+		item.tooltip = mdTooltip(
+			[
+				['Status', node.active ? 'Active changelist' : 'Changelist'],
+				['Changes', String(count)],
+			],
+			{ title: node.name },
+		);
 		return item;
 	}
 
@@ -88,9 +96,15 @@ export class ChangesTreeProvider implements vscode.TreeDataProvider<ChangesNode>
 		treeItem.id = `file:${change.relativePath}`;
 		treeItem.resourceUri = change.uri;
 		treeItem.description = `${decoration.letter}${dir && dir !== '.' ? ' · ' + dir : ''}`;
-		treeItem.tooltip = `${change.relativePath}\n状态：${fileStatusLabel(change.status)}${change.staged ? '（已暂存）' : ''}`;
+		// Deleted → tooltip 路径以删除线呈现（消费 strikeThrough 语义位；TreeItem 稳定 API 无行删除线字段）。
+		const pathMd = decoration.strikeThrough ? `~~${change.relativePath}~~` : `\`${change.relativePath}\``;
+		const md = new vscode.MarkdownString('', true);
+		md.isTrusted = false;
+		md.appendMarkdown(`${pathMd}  \n`);
+		md.appendMarkdown(`**Status:** ${fileStatusLabel(change.status)}${change.staged ? ' (staged)' : ''}  \n`);
+		treeItem.tooltip = md;
 		treeItem.iconPath = new vscode.ThemeIcon('circle-filled', new vscode.ThemeColor(decoration.themeColor));
-		treeItem.command = { command: 'hyperGit.openDiff', title: '打开 Diff', arguments: [change] };
+		treeItem.command = { command: 'hyperGit.openDiff', title: 'Open Diff', arguments: [change] };
 		return treeItem;
 	}
 }
diff --git a/src/adapter/tree/log-tree.ts b/src/adapter/tree/log-tree.ts
deleted file mode 100644
index 3166c9e..0000000
--- a/src/adapter/tree/log-tree.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import * as vscode from 'vscode';
-import type { Commit } from '../../types/git';
-import type { GitRepositoryService } from '../git-repository-service';
-import { applyClientFilters, safeRegex, type LogClientFilter, type MergeMode } from '../../engine/log/log-filter';
-import { parseNameStatus, statusLabel, type CommitFileChange } from '../../engine/log/commit-files';
-
-export interface LogCommitNode {
-	readonly kind: 'commit';
-	readonly commit: Commit;
-}
-
-export interface LogFileNode {
-	readonly kind: 'file';
-	readonly hash: string;
-	readonly change: CommitFileChange;
-	readonly hasParent: boolean;
-}
-
-export type LogNode = LogCommitNode | LogFileNode;
-
-/** Log 过滤器：author/path/grep 交 git log 服务端；mergeMode/dateFrom/dateTo/messageRegex 客户端。 */
-export interface LogFilter {
-	readonly author?: string;
-	readonly path?: string;
-	readonly grep?: string;
-	readonly mergeMode?: MergeMode;
-	readonly dateFrom?: Date;
-	readonly dateTo?: Date;
-	/** message 正则模式串（运行时经 safeRegex 编译）。 */
-	readonly messageRegex?: string;
-}
-
-/**
- * Log 视图 TreeDataProvider：消费 `Repository.log()`，支持多维过滤；commit 节点可展开显示
- * 该提交的变更文件（`git diff-tree --name-status`），单文件点击打开 diff（commit^ vs commit）。
- */
-export class LogTreeProvider implements vscode.TreeDataProvider<LogNode>, vscode.Disposable {
-	private readonly _onDidChange = new vscode.EventEmitter<LogNode | undefined>();
-	readonly onDidChangeTreeData = this._onDidChange.event;
-	private filter: LogFilter = {};
-
-	constructor(private readonly service: GitRepositoryService) {}
-
-	setFilter(filter: LogFilter): void {
-		this.filter = filter;
-		this._onDidChange.fire(undefined);
-	}
-
-	clearFilter(): void {
-		this.filter = {};
-		this._onDidChange.fire(undefined);
-	}
-
-	getFilter(): LogFilter {
-		return this.filter;
-	}
-
-	refresh(): void {
-		this._onDidChange.fire(undefined);
-	}
-
-	async getChildren(element?: LogNode): Promise<LogNode[]> {
-		const repo = this.service.repo;
-		if (!repo) {
-			return [];
-		}
-		if (element) {
-			return element.kind === 'commit' ? this.commitFiles(element.commit) : [];
-		}
-		try {
-			const commits = await repo.log({
-				maxEntries: 200,
-				author: this.filter.author,
-				path: this.filter.path,
-				grep: this.filter.grep,
-			});
-			const clientFilter: LogClientFilter = {
-				mergeMode: this.filter.mergeMode,
-				dateFrom: this.filter.dateFrom,
-				dateTo: this.filter.dateTo,
-				messageRegex: this.filter.messageRegex ? safeRegex(this.filter.messageRegex) : undefined,
-			};
-			return applyClientFilters(commits, clientFilter).map((c): LogCommitNode => ({ kind: 'commit', commit: c }));
-		} catch {
-			return [];
-		}
-	}
-
-	/** 展开 commit：经 diff-tree 取变更文件列表。 */
-	private async commitFiles(commit: Commit): Promise<LogFileNode[]> {
-		try {
-			const out = await this.service.execGit([
-				'diff-tree',
-				'--no-commit-id',
-				'--name-status',
-				'-r',
-				'--root',
-				commit.hash,
-			]);
-			const hasParent = commit.parents.length > 0;
-			return parseNameStatus(out).map((change): LogFileNode => ({ kind: 'file', hash: commit.hash, change, hasParent }));
-		} catch {
-			return [];
-		}
-	}
-
-	getTreeItem(node: LogNode): vscode.TreeItem {
-		if (node.kind === 'file') {
-			return this.createFileItem(node);
-		}
-		return this.createCommitItem(node.commit);
-	}
-
-	private createCommitItem(c: Commit): vscode.TreeItem {
-		const subject = (c.message.split('\n', 1)[0] ?? c.message).slice(0, 80);
-		const date = c.authorDate ? formatDate(c.authorDate) : '';
-		const isMerge = c.parents.length > 1;
-		const item = new vscode.TreeItem(subject, vscode.TreeItemCollapsibleState.Collapsed);
-		item.id = c.hash;
-		item.description = `${c.authorName ?? '?'} · ${date} · ${c.hash.slice(0, 7)}${isMerge ? ' · merge' : ''}`;
-		item.tooltip = `${c.hash}\n${c.authorName ?? ''} <${c.authorEmail ?? ''}> · ${date}\n\n${c.message}`;
-		item.contextValue = 'hyperGit.commit';
-		item.iconPath = new vscode.ThemeIcon(isMerge ? 'git-merge' : 'git-commit');
-		return item;
-	}
-
-	private createFileItem(node: LogFileNode): vscode.TreeItem {
-		const { change, hash, hasParent } = node;
-		const label = change.oldPath ? `${change.oldPath} → ${change.path}` : change.path;
-		const item = new vscode.TreeItem(label, vscode.TreeItemCollapsibleState.None);
-		item.description = statusLabel(change.status);
-		item.contextValue = 'hyperGit.commitFile';
-		item.tooltip = `${statusLabel(change.status)} · ${change.path}\n@ ${hash.slice(0, 7)}`;
-		item.iconPath = new vscode.ThemeIcon('circle-filled', new vscode.ThemeColor(fileIconColor(change.status)));
-		item.command = {
-			command: 'hyperGit.openCommitFileDiff',
-			title: '打开 Diff',
-			arguments: [hash, change.path, hasParent],
-		};
-		return item;
-	}
-
-	dispose(): void {
-		this._onDidChange.dispose();
-	}
-}
-
-function formatDate(d: Date): string {
-	const m = String(d.getMonth() + 1).padStart(2, '0');
-	const day = String(d.getDate()).padStart(2, '0');
-	return `${d.getFullYear()}-${m}-${day}`;
-}
-
-function fileIconColor(status: string): string {
-	if (status.startsWith('A')) {
-		return 'gitDecoration.addedResourceForeground';
-	}
-	if (status.startsWith('D')) {
-		return 'gitDecoration.deletedResourceForeground';
-	}
-	if (status.startsWith('R') || status.startsWith('C')) {
-		return 'gitDecoration.renamedResourceForeground';
-	}
-	return 'gitDecoration.modifiedResourceForeground';
-}
diff --git a/src/adapter/tree/stash-tree.ts b/src/adapter/tree/stash-tree.ts
index 2543bb7..f2045dc 100644
--- a/src/adapter/tree/stash-tree.ts
+++ b/src/adapter/tree/stash-tree.ts
@@ -1,10 +1,13 @@
 import * as vscode from 'vscode';
 import type { GitRepositoryService } from '../git-repository-service';
+import { mdTooltip } from './tree-tooltip';
 
 export interface StashEntryNode {
 	readonly kind: 'stash';
 	readonly index: number;
 	readonly message: string;
+	/** 相对时间（来自 git stash list --date=relative），可能缺失。 */
+	readonly date?: string;
 }
 
 export type StashNode = StashEntryNode;
@@ -32,13 +35,22 @@ export class StashTreeProvider implements vscode.TreeDataProvider<StashNode>, vs
 			return [];
 		}
 		try {
-			const out = await this.service.execGit(['stash', 'list']);
+			const out = await this.service.execGit(['stash', 'list', '--date=relative']);
 			return out
 				.split('\n')
 				.filter((line) => line.trim().length > 0)
 				.map((line): StashEntryNode => {
 					const m = line.match(/^stash@\{(\d+)\}:\s*(.*)$/);
-					return { kind: 'stash', index: m ? Number(m[1]) : 0, message: m ? m[2] : line };
+					const index = m ? Number(m[1]) : 0;
+					let rest = m ? m[2] : line;
+					let date: string | undefined;
+					// --date=relative 追加形如 "(2 days ago)" 的尾缀：拆出日期，其余留作 message。
+					const dm = rest.match(/\s*\(([^)]+)\)\s*$/);
+					if (dm && dm.index !== undefined) {
+						date = dm[1];
+						rest = rest.slice(0, dm.index);
+					}
+					return { kind: 'stash', index, message: rest, date };
 				});
 		} catch {
 			return [];
@@ -47,12 +59,20 @@ export class StashTreeProvider implements vscode.TreeDataProvider<StashNode>, vs
 
 	getTreeItem(node: StashNode): vscode.TreeItem {
 		const subject = node.message.split(':').slice(1).join(':').trim() || node.message;
-		const item = new vscode.TreeItem(subject.slice(0, 60), vscode.TreeItemCollapsibleState.None);
+		const trimmed = subject.length > 60 ? `${subject.slice(0, 60)}…` : subject;
+		const item = new vscode.TreeItem(trimmed, vscode.TreeItemCollapsibleState.None);
 		item.id = `stash:${node.index}`;
-		item.description = `stash@{${node.index}}`;
-		item.tooltip = `stash@{${node.index}}\n${node.message}`;
+		item.description = node.date || `stash@{${node.index}}`;
 		item.contextValue = 'hyperGit.stash';
 		item.iconPath = new vscode.ThemeIcon('archive');
+		const rows: Array<[string, string]> = [['Ref', `stash@{${node.index}}`]];
+		if (node.date) {
+			rows.push(['Date', node.date]);
+		}
+		rows.push(['Message', subject]);
+		item.tooltip = mdTooltip(rows);
+		// 单击查看 stash diff（只读，比 apply 更安全；apply/pop/drop 仍在右键菜单）。
+		item.command = { command: 'hyperGit.stashView', title: 'View Stash Diff', arguments: [node] };
 		return item;
 	}
 
diff --git a/src/adapter/tree/tree-tooltip.ts b/src/adapter/tree/tree-tooltip.ts
new file mode 100644
index 0000000..5de255b
--- /dev/null
+++ b/src/adapter/tree/tree-tooltip.ts
@@ -0,0 +1,59 @@
+import * as vscode from 'vscode';
+
+/**
+ * 树 Tooltip 共享构造器（MarkdownString，单一下沉入口）。
+ *
+ * 设计：可选标题行 + 一组 `**label:** value` 行；value 按是否含路径/分隔符自动 code-fence（提升 ref/路径可读性）。
+ * 取代各树 `\n` 拼接的纯文本 tooltip，统一粗体标签 + code 样式，深/浅主题自适应。
+ */
+export function mdTooltip(rows: ReadonlyArray<readonly [string, string]>, opts?: { title?: string }): vscode.MarkdownString {
+	const md = new vscode.MarkdownString('', true);
+	md.isTrusted = false;
+	md.supportThemeIcons = true;
+	if (opts?.title) {
+		md.appendMarkdown(`**${escapeMd(opts.title)}**\n\n`);
+	}
+	for (const [label, value] of rows) {
+		if (!value) {
+			continue;
+		}
+		const isPathLike = /[/.]/.test(value); // 路径或 ref → code 包裹
+		md.appendMarkdown(`**${escapeMd(label)}:** ${isPathLike ? '`' + escapeMd(value) + '`' : escapeMd(value)}  \n`);
+	}
+	return md;
+}
+
+/** MarkdownString 转义：避免反引号/管道/反斜杠破坏 code-fence 或表格语义。 */
+function escapeMd(s: string): string {
+	return s.replace(/([\\`|])/g, '\\$1');
+}
+
+/**
+ * ISO 时间 → 相对人可读描述（"just now" / "N min ago" / "N hr ago" / "N days ago" / "Mon D"）。
+ * 用于 stash/shelf 行内描述；技术标识（stash@{n} / 原始 ISO）保留在 Tooltip。
+ * 解析失败时原样返回，不阻断渲染。
+ */
+export function relativeDate(iso: string): string {
+	const t = new Date(iso).getTime();
+	if (Number.isNaN(t)) {
+		return iso;
+	}
+	const diff = Date.now() - t;
+	const min = 60_000;
+	const hr = 3_600_000;
+	const day = 86_400_000;
+	if (diff < min) {
+		return 'just now';
+	}
+	if (diff < hr) {
+		return `${Math.floor(diff / min)} min ago`;
+	}
+	if (diff < day) {
+		return `${Math.floor(diff / hr)} hr ago`;
+	}
+	const days = Math.floor(diff / day);
+	if (days < 30) {
+		return `${days} day${days === 1 ? '' : 's'} ago`;
+	}
+	return new Date(t).toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+}
diff --git a/src/adapter/tree/worktree-tree.ts b/src/adapter/tree/worktree-tree.ts
index 0803d95..778b773 100644
--- a/src/adapter/tree/worktree-tree.ts
+++ b/src/adapter/tree/worktree-tree.ts
@@ -3,6 +3,7 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import type { GitRepositoryService } from '../git-repository-service';
 import { parseWorktreeList, type ParsedWorktree } from '../../engine/worktree/worktree-list';
+import { mdTooltip } from './tree-tooltip';
 
 /** Worktrees 视图节点：单个工作树（扁平，无分组——工作树数量通常 ≤ 个位数）。 */
 export interface WorktreeNode {
@@ -92,12 +93,13 @@ export class WorktreeTreeProvider implements vscode.TreeDataProvider<WorktreeNod
 		item.tooltip = this.tooltip(node, isCurrent);
 		item.contextValue = node.isMain ? 'hyperGit.worktreeMain' : 'hyperGit.worktree';
 
-		const icon = node.isMain ? 'home' : node.detached ? 'git-commit' : 'git-branch';
-		// prunable 警示色优先（红色 > 高亮），其次当前打开高亮，对齐 branches-tree 的 ThemeIcon 高亮范式。
+		// 锁定优先用 lock 图标（替代原 🔒 emoji）；main 用 root-folder-opened。
+		const icon = node.locked ? 'lock' : node.isMain ? 'root-folder-opened' : node.detached ? 'git-commit' : 'git-branch';
+		// prunable 警示色优先（红 > 蓝），当前打开高亮用 charts.blue（与 branches-tree 活动色全局一致）。
 		const color = node.prunable
 			? new vscode.ThemeColor('gitDecoration.deletedResourceForeground')
 			: isCurrent
-				? new vscode.ThemeColor('gitDecoration.modifiedResourceForeground')
+				? new vscode.ThemeColor('charts.blue')
 				: undefined;
 		item.iconPath = new vscode.ThemeIcon(icon, color);
 		return item;
@@ -106,33 +108,36 @@ export class WorktreeTreeProvider implements vscode.TreeDataProvider<WorktreeNod
 	private describe(node: WorktreeNode, isCurrent: boolean): string {
 		const parts: string[] = [];
 		if (node.isMain) {
-			parts.push('主');
+			parts.push('Main');
 		}
 		if (isCurrent) {
-			parts.push('当前');
-		}
-		if (node.locked) {
-			parts.push('🔒');
+			parts.push('Current');
 		}
 		if (node.prunable) {
-			parts.push('⚠ 可清理');
+			parts.push('Prunable');
 		}
 		parts.push(node.ref);
 		return parts.join(' · ');
 	}
 
-	private tooltip(node: WorktreeNode, isCurrent: boolean): string {
-		const lines: string[] = [];
-		lines.push(`${node.name}${node.isMain ? '（主工作树）' : ''}${isCurrent ? '（当前打开）' : ''}`);
-		lines.push(`路径：${node.path}`);
-		lines.push(`HEAD：${node.ref}${node.detached ? '（detached）' : ''}`);
+	private tooltip(node: WorktreeNode, isCurrent: boolean): vscode.MarkdownString {
+		const rows: Array<[string, string]> = [
+			['Path', node.path],
+			['HEAD', `${node.ref}${node.detached ? ' (detached)' : ''}`],
+		];
+		if (node.isMain) {
+			rows.push(['Type', 'Main worktree']);
+		}
+		if (isCurrent) {
+			rows.push(['State', 'Current']);
+		}
 		if (node.locked) {
-			lines.push('已锁定（防止自动清理）');
+			rows.push(['Lock', 'Locked (excluded from prune)']);
 		}
 		if (node.prunable) {
-			lines.push('⚠ 可清理（目录已失效）');
+			rows.push(['Status', 'Prunable (directory is stale)']);
 		}
-		return lines.join('\n');
+		return mdTooltip(rows, { title: `${node.name}${isCurrent ? ' (current)' : ''}` });
 	}
 
 	/** 该节点是否当前打开的 worktree（供命令层删除/移动守护复用）。 */
diff --git a/src/adapter/webview/commit-webview.ts b/src/adapter/webview/commit-webview.ts
index 45f3f9b..2f81809 100644
--- a/src/adapter/webview/commit-webview.ts
+++ b/src/adapter/webview/commit-webview.ts
@@ -7,9 +7,10 @@ import type { ChangelistRegistry } from '../changelist-registry';
 import type { ChangeItem, GitRepositoryService } from '../git-repository-service';
 import type { CommitFileItem, CommitViewState, HostToWebviewMessage, WebviewToHostMessage } from '../../shared/protocol';
 import type { CommitService } from '../commit/commit-service';
+import { getBaseStyles } from './shared-styles';
 
 /**
- * Commit 提交窗口（WebviewView，自绘 IDEA 风格）。
+ * Commit 提交窗口（WebviewView，自绘提交面板）。
  *
  * 文件勾选 + 多行 Commit Message 编辑器 + Amend/sign-off/skip-hooks 选项 + Commit/Commit and Push 按钮 +
  * Conventional Commits 实时校验 + 最近消息复用。选中态由 webview 端管理（host 不回写，避免覆盖用户操作）。
@@ -112,52 +113,63 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 		].join('; ');
 
 		return `<!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="Content-Security-Policy" content="${csp}">
 <style>
-body { margin: 0; padding: 8px; font-family: var(--vscode-font-family); color: var(--vscode-foreground); font-size: var(--vscode-font-size); }
-.cl-header { font-weight: 600; margin-bottom: 6px; opacity: 0.9; }
-.files { max-height: 220px; overflow-y: auto; border: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.3)); border-radius: 3px; margin-bottom: 8px; }
+${getBaseStyles()}
+body { margin: 0; padding: var(--hg-space-2); font-family: var(--vscode-font-family); color: var(--vscode-foreground); font-size: var(--vscode-font-size); }
+.cl-header { font-weight: 600; margin-bottom: var(--hg-space-1); }
+.files { max-height: 220px; overflow-y: auto; border: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.3)); border-radius: var(--hg-radius-control); margin-bottom: var(--hg-space-2); }
 .file { display: flex; align-items: center; gap: 6px; padding: 2px 6px; cursor: pointer; }
 .file:hover { background: var(--vscode-list-hoverBackground); }
 .file .dot { font-size: 14px; line-height: 1; }
 .file .name { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-.file .dir { margin-left: auto; opacity: 0.6; font-size: 11px; white-space: nowrap; }
-textarea { width: 100%; box-sizing: border-box; resize: vertical; background: var(--vscode-input-background); color: var(--vscode-input-foreground); border: 1px solid var(--vscode-input-border, transparent); border-radius: 2px; padding: 6px; font-family: var(--vscode-editor-font-family); font-size: var(--vscode-font-size); }
+.file .dir { margin-left: auto; color: var(--vscode-descriptionForeground); font-size: 11px; white-space: nowrap; }
+textarea { width: 100%; box-sizing: border-box; resize: vertical; }
 .validation { font-size: 11px; min-height: 16px; margin: 4px 2px; }
 .validation.ok { color: var(--vscode-testing-iconPassed, #3fb950); }
 .validation.warning { color: var(--vscode-editorWarning-foreground, #d29922); }
 .validation.error { color: var(--vscode-errorForeground, #f85149); }
-.recent { margin: 4px 0 8px; display: flex; flex-wrap: wrap; gap: 4px; align-items: center; }
-.recent-label { opacity: 0.6; font-size: 11px; }
+.recent { margin: 4px 0 var(--hg-space-2); display: flex; flex-wrap: wrap; gap: 4px; align-items: center; }
+.recent-label { color: var(--vscode-descriptionForeground); font-size: 11px; }
 .chip { background: var(--vscode-button-secondaryBackground); color: var(--vscode-button-secondaryForeground); border: none; border-radius: 9px; padding: 1px 8px; font-size: 11px; cursor: pointer; max-width: 160px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .chip:hover { opacity: 0.85; }
-.opt { display: block; font-size: 12px; margin: 3px 2px; opacity: 0.95; }
-.buttons { display: flex; gap: 6px; margin-top: 10px; }
-button.primary, .buttons button { flex: 1; padding: 6px 10px; border: none; border-radius: 2px; cursor: pointer; background: var(--vscode-button-background); color: var(--vscode-button-foreground); font-size: 13px; }
-.buttons button:last-child { background: var(--vscode-button-secondaryBackground); color: var(--vscode-button-secondaryForeground); }
-button:disabled { opacity: 0.5; cursor: default; }
-.toast { font-size: 12px; margin-top: 8px; min-height: 16px; }
+.opt { display: block; font-size: 12px; margin: 3px 2px; }
+.buttons { display: flex; gap: 6px; margin-top: var(--hg-space-2); }
+.buttons .hg-btn { flex: 1; }
+.files-header { display: flex; align-items: center; justify-content: flex-end; min-height: 18px; padding: 0 6px; color: var(--vscode-descriptionForeground); }
+.files-empty { padding: 14px 8px; text-align: center; color: var(--vscode-descriptionForeground); font-size: 12px; }
+.spinner { display: inline-block; width: 12px; height: 12px; border: 1.5px solid currentColor; border-top-color: transparent; border-radius: 50%; animation: hg-spin 0.8s linear infinite; vertical-align: -2px; margin-right: 5px; }
+@keyframes hg-spin { to { transform: rotate(360deg); } }
+details.advanced { margin: 6px 0 var(--hg-space-2); }
+details.advanced summary { cursor: pointer; font-size: 12px; color: var(--vscode-descriptionForeground); }
+details.advanced summary:focus-visible { outline: 2px solid var(--vscode-focusBorder); outline-offset: 1px; border-radius: 2px; }
+details.advanced[open] summary { margin-bottom: 4px; }
+.toast { font-size: 12px; margin-top: var(--hg-space-2); min-height: 16px; }
 .toast.ok { color: var(--vscode-testing-iconPassed, #3fb950); }
 .toast.err { color: var(--vscode-errorForeground, #f85149); }
 </style>
 </head>
 <body>
-<div class="cl-header">活动 Changelist：<span id="cl-name">—</span></div>
+<div class="cl-header">Active Changelist: <span id="cl-name">—</span></div>
+<div class="files-header" id="files-header" style="display:none"><label class="opt" style="margin:0"><input type="checkbox" id="select-all"> Select All</label></div>
 <div class="files" id="files"></div>
-<textarea id="message" rows="4" placeholder="提交信息（Conventional Commits：type(scope): description）" spellcheck="false"></textarea>
-<div id="validation" class="validation"></div>
+<textarea id="message" class="hg-input" rows="4" placeholder="Commit message (Conventional Commits: type(scope): description)" spellcheck="false"></textarea>
+<div id="validation" class="validation" role="status" aria-live="polite"></div>
 <div class="recent" id="recent"></div>
-<label class="opt"><input type="checkbox" id="amend"> Amend 上次提交</label>
-<label class="opt"><input type="checkbox" id="signoff"> 追加 Signed-off-by</label>
-<label class="opt"><input type="checkbox" id="skipHooks"> 跳过 Git hooks（--no-verify）</label>
+<details class="advanced">
+  <summary>Advanced Options</summary>
+  <label class="opt"><input type="checkbox" id="amend"> Amend Last Commit</label>
+  <label class="opt"><input type="checkbox" id="signoff"> Append Signed-off-by</label>
+  <label class="opt"><input type="checkbox" id="skipHooks"> Skip Git Hooks (--no-verify)</label>
+</details>
 <div class="buttons">
-<button id="commit-btn" class="primary">Commit</button>
-<button id="commit-push-btn">Commit and Push</button>
+<button id="commit-btn" class="hg-btn">Commit</button>
+<button id="commit-push-btn" class="hg-btn hg-btn--secondary">Commit &amp; Push</button>
 </div>
-<div id="toast" class="toast"></div>
+<div id="toast" class="toast" role="status" aria-live="polite"></div>
 
 <script nonce="${nonce}">
 const vscode = acquireVsCodeApi();
@@ -177,6 +189,8 @@ const amendEl = document.getElementById('amend');
 const signoffEl = document.getElementById('signoff');
 const skipHooksEl = document.getElementById('skipHooks');
 const toastEl = document.getElementById('toast');
+const selectAllEl = document.getElementById('select-all');
+const filesHeaderEl = document.getElementById('files-header');
 
 let msgTimer = null;
 msgEl.addEventListener('input', function () {
@@ -186,7 +200,18 @@ msgEl.addEventListener('input', function () {
   }, 200);
 });
 
-function setBusy(b) { commitBtn.disabled = b; commitPushBtn.disabled = b; }
+// Ctrl/Cmd+Enter 提交（业界通用快捷键：VS Code/GitHub/JetBrains 一致）。
+msgEl.addEventListener('keydown', function (e) {
+  if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
+    e.preventDefault();
+    doCommit(false);
+  }
+});
+
+function setBusy(b) {
+  commitBtn.disabled = b; commitPushBtn.disabled = b;
+  commitBtn.innerHTML = b ? '<span class="spinner" aria-hidden="true"></span>Committing…' : 'Commit';
+}
 
 function doCommit(push) {
   setBusy(true);
@@ -205,8 +230,20 @@ function doCommit(push) {
 commitBtn.addEventListener('click', function () { doCommit(false); });
 commitPushBtn.addEventListener('click', function () { doCommit(true); });
 
+function syncSelectAll() {
+  const boxes = document.querySelectorAll('#files input[type=checkbox]');
+  if (boxes.length === 0) { selectAllEl.checked = false; return; }
+  selectAllEl.checked = Array.from(boxes).every(function (cb) { return cb.checked; });
+}
+
 function renderFiles(files) {
   filesEl.innerHTML = '';
+  if (!files || files.length === 0) {
+    filesHeaderEl.style.display = 'none';
+    filesEl.innerHTML = '<div class="files-empty">No changes in this changelist.<br>Stage files from the Changes view to commit them.</div>';
+    return;
+  }
+  filesHeaderEl.style.display = '';
   const present = new Set();
   files.forEach(function (f) {
     present.add(f.path);
@@ -215,8 +252,9 @@ function renderFiles(files) {
     row.className = 'file';
     const cb = document.createElement('input');
     cb.type = 'checkbox';
+    cb.dataset.path = f.path;
     cb.checked = checked.has(f.path);
-    cb.addEventListener('change', function () { if (cb.checked) checked.add(f.path); else checked.delete(f.path); saveChecked(); });
+    cb.addEventListener('change', function () { if (cb.checked) checked.add(f.path); else checked.delete(f.path); saveChecked(); syncSelectAll(); });
     const dot = document.createElement('span');
     dot.className = 'dot';
     dot.style.color = 'var(--vscode-' + f.themeColor.replace(/\\./g, '-') + ')';
@@ -233,14 +271,25 @@ function renderFiles(files) {
   });
   Array.from(checked).forEach(function (p) { if (!present.has(p)) checked.delete(p); });
   saveChecked();
+  syncSelectAll();
 }
 
+selectAllEl.addEventListener('change', function () {
+  const want = selectAllEl.checked;
+  document.querySelectorAll('#files input[type=checkbox]').forEach(function (cb) {
+    cb.checked = want;
+    const p = cb.dataset.path;
+    if (p) { if (want) { checked.add(p); } else { checked.delete(p); } }
+  });
+  saveChecked();
+});
+
 function renderRecent(messages) {
   recentEl.innerHTML = '';
   if (!messages || !messages.length) return;
   const label = document.createElement('span');
   label.className = 'recent-label';
-  label.textContent = '最近：';
+  label.textContent = 'Recent: ';
   recentEl.appendChild(label);
   messages.slice(0, 5).forEach(function (m) {
     const chip = document.createElement('button');
@@ -258,7 +307,7 @@ function renderRecent(messages) {
 function showValidation(v) {
   valEl.className = 'validation ' + v.severity;
   if (v.severity === 'ok') {
-    valEl.textContent = conventionalEnabled ? '\\u2713 符合 Conventional Commits' : '';
+    valEl.textContent = conventionalEnabled ? '\\u2713 Valid Conventional Commits' : '';
   } else {
     valEl.textContent = (v.severity === 'error' ? '\\u26A0 ' : '\\u2139 ') + (v.reason || '');
   }
@@ -288,12 +337,12 @@ window.addEventListener('message', function (e) {
   } else if (m.type === 'commitResult') {
     setBusy(false);
     if (m.payload.ok) {
-      toast(m.payload.warning || '提交成功', Boolean(m.payload.warning));
+      toast(m.payload.warning || 'Commit succeeded', Boolean(m.payload.warning));
       msgEl.value = '';
       amendEl.checked = false; signoffEl.checked = false; skipHooksEl.checked = false;
       vscode.postMessage({ type: 'messageChanged', payload: { message: '' } });
     } else {
-      toast(m.payload.error || '提交失败', true);
+      toast(m.payload.error || 'Commit failed', true);
     }
   }
 });
diff --git a/src/adapter/webview/graph-webview.ts b/src/adapter/webview/graph-webview.ts
deleted file mode 100644
index 23b1fb4..0000000
--- a/src/adapter/webview/graph-webview.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import * as crypto from 'crypto';
-import * as vscode from 'vscode';
-import type { GitRepositoryService } from '../git-repository-service';
-import { classifyGraphChar, normalizeGraphWidth, parseGraphLog, type GraphRow } from '../../engine/log/graph-parser';
-
-const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
-
-/** 按列着色的 lane 调色板（类 IDEA 多色 lane）。 */
-const LANE_COLORS = ['#f85149', '#58a6ff', '#3fb950', '#d29922', '#bc8cff', '#ff7b72', '#56d4dd', '#ffa657'];
-const CHAR_W = 10;
-const ROW_H = 22;
-const NODE_R = 4.5;
-
-/**
- * Git 提交图（WebviewPanel）—— 真实 SVG 拓扑渲染。
- *
- * 解析 `git log --graph --format=%x00%H%x00%d%x00%s`（git 已完成 lane 分配），按字符粒度渲染为 SVG：
- * `*`→可点击圆点、`|`→竖线、`/ \`→斜线、`_`→横线，按列 floor(col/2) 多色着色（类 IDEA）。
- * 点节点 → host QuickPick 提供 per-commit 操作；订阅 service.onDidChange 实时刷新。
- */
-export class GraphWebview {
-	private static readonly viewType = 'hyperGit.graph';
-
-	static async open(service: GitRepositoryService): Promise<void> {
-		const repo = service.repo;
-		if (!repo) {
-			void vscode.window.showWarningMessage('未找到 Git 仓库');
-			return;
-		}
-		const initial = await GraphWebview.fetchGraph(service);
-		if (!initial) {
-			return;
-		}
-		const panel = vscode.window.createWebviewPanel(GraphWebview.viewType, 'Git Graph — Hyper Git', vscode.ViewColumn.Active, {
-			enableScripts: true,
-			retainContextWhenHidden: true,
-		});
-		panel.webview.html = GraphWebview.renderHtml(initial, repo.rootUri.fsPath);
-		panel.webview.onDidReceiveMessage((msg) => {
-			if (msg?.type === 'commit' && typeof msg.hash === 'string') {
-				void GraphWebview.handleCommitClick(service, msg.hash);
-			}
-		});
-		// 实时刷新（防抖）
-		let timer: ReturnType<typeof setTimeout> | undefined;
-		const sub = service.onDidChange(() => {
-			clearTimeout(timer);
-			timer = setTimeout(() => {
-				void GraphWebview.fetchGraph(service).then((g) => {
-					if (g && panel.visible) {
-						panel.webview.html = GraphWebview.renderHtml(g, repo.rootUri.fsPath);
-					}
-				});
-			}, 400);
-		});
-		panel.onDidDispose(() => {
-			clearTimeout(timer);
-			sub.dispose();
-		});
-	}
-
-	private static async fetchGraph(service: GitRepositoryService): Promise<string | undefined> {
-		try {
-			return await service.execGit(['log', '--graph', '-n', '300', '--all', '--format=%x00%H%x00%d%x00%s']);
-		} catch (e) {
-			void vscode.window.showErrorMessage(`获取提交图失败：${errMsg(e)}`);
-			return undefined;
-		}
-	}
-
-	private static async handleCommitClick(service: GitRepositoryService, hash: string): Promise<void> {
-		const repo = service.repo;
-		if (!repo) {
-			return;
-		}
-		const pick = await vscode.window.showQuickPick(
-			[
-				{ label: 'Cherry-Pick 此提交', op: 'cp' },
-				{ label: 'Revert 此提交', op: 'rv' },
-				{ label: 'Reset 当前分支到此提交…', op: 'rs' },
-				{ label: '从此提交新建分支…', op: 'nb' },
-				{ label: '从此提交新建标签…', op: 'nt' },
-				{ label: '查看包含此提交的分支', op: 'cb' },
-				{ label: '复制 Hash', op: 'copy' },
-			],
-			{ placeHolder: `提交 ${hash.slice(0, 7)}` },
-		);
-		if (!pick) {
-			return;
-		}
-		try {
-			switch (pick.op) {
-				case 'cp':
-					await service.execGit(['cherry-pick', hash]);
-					break;
-				case 'rv':
-					await service.execGit(['revert', '--no-edit', hash]);
-					break;
-				case 'rs':
-					await vscode.commands.executeCommand('hyperGit.resetToHere', { kind: 'commit', commit: { hash, message: '', parents: [] } });
-					return;
-				case 'nb': {
-					const name = await vscode.window.showInputBox({ prompt: `从 ${hash.slice(0, 7)} 新建并检出分支`, placeHolder: '新分支名' });
-					if (name?.trim()) {
-						await repo.createBranch(name.trim(), true, hash);
-					}
-					break;
-				}
-				case 'nt': {
-					const name = await vscode.window.showInputBox({ prompt: '标签名', placeHolder: '如 v1.0.0' });
-					if (name?.trim()) {
-						await service.execGit(['tag', name.trim(), hash]);
-					}
-					break;
-				}
-				case 'cb': {
-					const out = await service.execGit(['branch', '--contains', hash]);
-					const doc = await vscode.workspace.openTextDocument({ content: `$ git branch --contains ${hash.slice(0, 7)}\n\n${out}`, language: 'plaintext' });
-					await vscode.window.showTextDocument(doc, { preview: true });
-					return;
-				}
-				case 'copy':
-					await vscode.env.clipboard.writeText(hash);
-					void vscode.window.showInformationMessage(`已复制 ${hash.slice(0, 7)}`);
-					return;
-			}
-			void vscode.window.showInformationMessage(`已完成：${pick.label}`);
-		} catch (e) {
-			void vscode.window.showErrorMessage(`操作失败：${errMsg(e)}`);
-		}
-	}
-
-	private static renderHtml(graphOutput: string, repoRoot: string): string {
-		const nonce = crypto.randomBytes(16).toString('base64');
-		const rows = parseGraphLog(graphOutput);
-		const padded = normalizeGraphWidth(rows);
-		const graphWidth = (padded[0]?.length ?? 0) * CHAR_W;
-		const height = rows.length * ROW_H + 8;
-		const body = GraphWebview.renderSvg(rows, padded, graphWidth, height);
-		return `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${nonce}'">
-<style>
-body { margin: 0; padding: 12px 16px; font-family: var(--vscode-editor-font-family), ui-monospace, Menlo, Consolas, monospace; font-size: 12px; color: var(--vscode-foreground); background: var(--vscode-editor-background); }
-h3 { margin: 0 0 4px; font-weight: 600; font-size: 13px; }
-.repo { opacity: 0.6; font-size: 11px; margin-bottom: 8px; word-break: break-all; }
-svg { display: block; }
-.graph-svg { background: transparent; }
-.node { cursor: pointer; fill: var(--vscode-gitDecoration-modifiedResourceForeground, #58a6ff); stroke: var(--vscode-editor-background); stroke-width: 1.5; }
-.node:hover { stroke: var(--vscode-focusBorder, #007fd4); stroke-width: 2.5; }
-.txt-hash { fill: var(--vscode-editorWarning-foreground, #d29922); }
-.txt-ref { fill: var(--vscode-textLink-foreground, #4dabf7); font-weight: 600; }
-.txt-subject { fill: var(--vscode-foreground); }
-</style>
-</head>
-<body>
-<h3>Git 提交图（最近 300 条 · 点击节点查看操作）</h3>
-<div class="repo">${escapeHtml(repoRoot)}</div>
-${body}
-<script nonce="${nonce}">
-document.querySelectorAll('.node').forEach(function(n){
-  n.addEventListener('click', function(){ acquireVsCodeApi().postMessage({ type: 'commit', hash: n.getAttribute('data-hash') }); });
-});
-</script>
-</body>
-</html>`;
-	}
-
-	private static renderSvg(rows: readonly GraphRow[], padded: readonly string[], graphWidth: number, height: number): string {
-		const parts: string[] = [];
-		parts.push(`<svg class="graph-svg" width="${graphWidth + 600}" height="${height}" viewBox="0 0 ${graphWidth + 600} ${height}" xmlns="http://www.w3.org/2000/svg">`);
-		for (let r = 0; r < rows.length; r++) {
-			const y = r * ROW_H;
-			const graph = padded[r] ?? '';
-			for (let c = 0; c < graph.length; c++) {
-				const ch = graph[c];
-				const kind = classifyGraphChar(ch);
-				if (kind === 'blank') {
-					continue;
-				}
-				const x = c * CHAR_W;
-				const cx = x + CHAR_W / 2;
-				const color = LANE_COLORS[Math.floor(c / 2) % LANE_COLORS.length];
-				switch (kind) {
-					case 'node': {
-						const row = rows[r];
-						const dataHash = row?.hash ? ` data-hash="${escapeHtml(row.hash)}"` : '';
-						parts.push(`<circle class="node" cx="${cx}" cy="${y + ROW_H / 2}" r="${NODE_R}"${dataHash} style="fill:${color}"/>`);
-						break;
-					}
-					case 'vert':
-						parts.push(`<line x1="${cx}" y1="${y}" x2="${cx}" y2="${y + ROW_H}" stroke="${color}" stroke-width="1.6"/>`);
-						break;
-					case 'slash':
-						parts.push(`<line x1="${x}" y1="${y + ROW_H}" x2="${x + CHAR_W}" y2="${y}" stroke="${color}" stroke-width="1.6"/>`);
-						break;
-					case 'backslash':
-						parts.push(`<line x1="${x}" y1="${y}" x2="${x + CHAR_W}" y2="${y + ROW_H}" stroke="${color}" stroke-width="1.6"/>`);
-						break;
-					case 'underscore':
-						parts.push(`<line x1="${x}" y1="${y + ROW_H / 2}" x2="${x + CHAR_W}" y2="${y + ROW_H / 2}" stroke="${color}" stroke-width="1.6"/>`);
-						break;
-				}
-			}
-			// 文本（hash + refs + subject）
-			const row = rows[r];
-			if (row?.hash) {
-				const tx = graphWidth + 8;
-				const ty = y + ROW_H * 0.68;
-				const shortHash = escapeHtml(row.hash.slice(0, 7));
-				const refSpan = row.decorate ? `<tspan class="txt-ref" dx="6">${escapeHtml(row.decorate)}</tspan>` : '';
-				const subj = row.subject ? `<tspan class="txt-subject" dx="6">${escapeHtml(row.subject.slice(0, 80))}</tspan>` : '';
-				parts.push(`<text x="${tx}" y="${ty}" xml:space="preserve"><tspan class="txt-hash">${shortHash}</tspan>${refSpan}${subj}</text>`);
-			}
-		}
-		parts.push('</svg>');
-		return parts.join('\n');
-	}
-}
-
-function escapeHtml(s: string): string {
-	return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}
diff --git a/src/adapter/webview/log-webview.ts b/src/adapter/webview/log-webview.ts
new file mode 100644
index 0000000..9b6fcb9
--- /dev/null
+++ b/src/adapter/webview/log-webview.ts
@@ -0,0 +1,979 @@
+import * as crypto from 'crypto';
+import * as vscode from 'vscode';
+import type { GitRepositoryService } from '../git-repository-service';
+import { parseNameStatus, statusLabel } from '../../engine/log/commit-files';
+import { applyClientFilters, toClientFilter, type LogFilter } from '../../engine/log/log-filter';
+import { DEFAULT_LANE_PALETTE } from '../../engine/log/graph-color';
+import { computeGraphLayout, maxLanes } from '../../engine/log/graph-layout';
+import { getBaseStyles } from './shared-styles';
+import { parseLogLines } from '../../engine/log/log-line';
+import { buildLogArgs, type LogScope } from '../../engine/log/log-query';
+import type { GitHubCiService } from '../ci/github-ci-service';
+import type {
+	CiMetaVM,
+	CiStatusVM,
+	GraphRowVM,
+	LogCommitFileItem,
+	LogGraphState,
+	LogHostToWebviewMessage,
+	LogWebviewToHostMessage,
+	RefChip,
+} from '../../shared/protocol';
+
+const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
+
+/** 单页拉取的 commit 数（滚动触底增量加载下一页）。 */
+const PAGE = 1000;
+
+/** per-commit 操作 → 既有命令 id（webview 右键菜单 → host 重调用，handler 仅需 hash）。 */
+const COMMIT_MENU: ReadonlyArray<{ readonly label: string; readonly command: string }> = [
+	{ label: 'Copy Hash', command: 'hyperGit.copyCommitHash' },
+	{ label: 'Cherry-Pick Commit', command: 'hyperGit.cherryPick' },
+	{ label: 'Revert Commit', command: 'hyperGit.revertCommit' },
+	{ label: 'Drop Commit', command: 'hyperGit.dropCommit' },
+	{ label: 'Fixup Commit', command: 'hyperGit.fixupCommit' },
+	{ label: 'Create Branch from Commit…', command: 'hyperGit.createBranchFromCommit' },
+	{ label: 'Create Tag from Commit…', command: 'hyperGit.createTagFromCommit' },
+	{ label: 'Show Branches Containing Commit', command: 'hyperGit.showContainingBranches' },
+	{ label: 'Reset Current Branch to Here…', command: 'hyperGit.resetToHere' },
+];
+
+/** 引用标签查询的 for-each-ref 格式（full objectname 供精确匹配；与 parseChips 字段顺序对应）。 */
+const CHIP_REF_FORMAT = '%(objectname)%00%(refname)%00%(refname:short)%00%(HEAD)';
+
+// ─── 命令参数类型（webview 迁移后，命令仍以 LogNode 为参数类型）──────────────────
+
+export interface LogCommitNode {
+	readonly kind: 'commit';
+	readonly commit: { readonly hash: string; readonly message: string; readonly parents: readonly string[] };
+}
+export interface LogFileNode {
+	readonly kind: 'file';
+	readonly hash: string;
+}
+export type LogNode = LogCommitNode | LogFileNode;
+
+/**
+ * Log 视图控制契约：4 个命令注册器按此接口（而非具体 Provider 类）引用，
+ * 使 TreeView→Webview 迁移对注册器零行为改动，并便于未来替换实现。
+ */
+export interface LogFilterControl extends vscode.Disposable {
+	setFilter(filter: LogFilter): void;
+	clearFilter(): void;
+	getFilter(): LogFilter;
+	refresh(): void;
+}
+
+/** 一页图数据。 */
+interface GraphPage {
+	readonly rows: readonly GraphRowVM[];
+	readonly maxLanes: number;
+	readonly hasMore: boolean;
+}
+
+/**
+ * Log 视图（WebviewView）：可视化提交图（DAG）。
+ *
+ * 自计算 lane 布局（engine/log/graph-layout）→ 渲染彩色泳道；host 侧单次 `git log --topo-order`
+ * 取数 + `for-each-ref` 取引用标签；webview 端虚拟化 SVG 行 + 文本列。保留全部既有交互：
+ * 7 个过滤命令（经 {@link LogFilterControl}）、9 个 per-commit 操作（右键 → host 重调用）、
+ * 选中提交查看变更文件、All/Current 范围切换、滚动增量加载、实时刷新。
+ */
+export class LogWebviewProvider implements vscode.WebviewViewProvider, LogFilterControl {
+	public static readonly viewType = 'hyperGit.log';
+
+	private view?: vscode.WebviewView;
+	private filter: LogFilter = {};
+	private scope: LogScope = 'all';
+	private refreshTimer: ReturnType<typeof setTimeout> | undefined;
+	private readonly disposables: vscode.Disposable[] = [];
+
+	constructor(private readonly service: GitRepositoryService, private readonly ciService: GitHubCiService) {
+		// 兜底实时刷新：git 状态变化（commit/checkout 等）防抖重拉首页。
+		let t: ReturnType<typeof setTimeout> | undefined;
+		this.disposables.push(
+			this.service.onDidChange(() => {
+				clearTimeout(t);
+				t = setTimeout(() => this.refresh(), 400);
+			}),
+		);
+	}
+
+	setFilter(filter: LogFilter): void {
+		this.filter = filter;
+		this.refresh();
+	}
+
+	clearFilter(): void {
+		this.filter = {};
+		this.refresh();
+	}
+
+	getFilter(): LogFilter {
+		return this.filter;
+	}
+
+	refresh(): void {
+		clearTimeout(this.refreshTimer);
+		this.refreshTimer = setTimeout(() => {
+			void this.pushState();
+		}, 300);
+	}
+
+	resolveWebviewView(view: vscode.WebviewView): void {
+		this.view = view;
+		view.webview.options = { enableScripts: true, localResourceRoots: [] };
+		view.webview.html = this.renderHtml();
+		const msgSub = view.webview.onDidReceiveMessage((msg) => this.onMessage(msg as LogWebviewToHostMessage));
+		view.onDidDispose(() => {
+			msgSub.dispose();
+			this.view = undefined;
+		});
+	}
+
+	dispose(): void {
+		clearTimeout(this.refreshTimer);
+		this.disposables.forEach((d) => d.dispose());
+	}
+
+	// ─── Host ↔ Webview 消息 ────────────────────────────────────────────────────
+
+	private onMessage(msg: LogWebviewToHostMessage): void {
+		switch (msg.type) {
+			case 'log/requestState':
+				void this.pushState();
+				break;
+			case 'log/retry':
+				void this.pushState();
+				break;
+			case 'log/loadMore':
+				void this.loadMore(msg.payload.cursor);
+				break;
+			case 'log/selectCommit':
+				void this.sendCommitFiles(msg.payload.hash);
+				break;
+			case 'log/openFile':
+				void vscode.commands.executeCommand(
+					'hyperGit.openCommitFileDiff',
+					msg.payload.hash,
+					msg.payload.path,
+					msg.payload.hasParent,
+				);
+				break;
+			case 'log/setScope':
+				this.scope = msg.payload.scope;
+				void this.pushState();
+				break;
+			case 'log/commitAction':
+				if (msg.payload.op === 'menu') {
+					void this.handleCommitMenu(msg.payload.hash);
+				}
+				break;
+			case 'log/requestCi':
+				void this.handleRequestCi(msg.payload.hashes);
+				break;
+			case 'log/openExternal':
+				void this.ciService.openExternal(msg.payload.url);
+				break;
+			case 'log/ciSignIn':
+				void this.handleCiSignIn();
+				break;
+		}
+	}
+
+	private post(message: LogHostToWebviewMessage): void {
+		this.view?.webview.postMessage(message);
+	}
+
+	// ─── 数据拉取 ───────────────────────────────────────────────────────────────
+
+	private async pushState(): Promise<void> {
+		if (!this.view) {
+			return;
+		}
+		this.post({ type: 'log/busy', payload: { busy: true } });
+		const page = await this.fetchPage(0);
+		if (!page) {
+			this.post({ type: 'log/busy', payload: { busy: false } });
+			return;
+		}
+		const state: LogGraphState = {
+			rows: page.rows,
+			maxLanes: page.maxLanes,
+			hasMore: page.hasMore,
+			scope: this.scope,
+			repoRoot: this.service.repoRoot ?? '',
+		};
+		this.post({ type: 'log/graphData', payload: state });
+		// CI 元信息异步随附（不阻塞建图）：远程为 GitHub 才启用，未授权则提示登录。
+		void this.pushCiMeta();
+	}
+
+	/** 推送 CI 能力/授权态（status() 廉价：复用缓存会话）。失败静默回退为不可用。 */
+	private async pushCiMeta(): Promise<void> {
+		if (!this.view) {
+			return;
+		}
+		let meta: CiMetaVM;
+		try {
+			const s = await this.ciService.status();
+			meta = { available: s.available, needsSignIn: s.needsAuth, error: s.error };
+		} catch {
+			meta = { available: false, needsSignIn: false };
+		}
+		if (this.view) {
+			this.post({ type: 'log/ciMeta', payload: meta });
+		}
+	}
+
+	/** 懒加载可见行 CI（webview 滚动按需请求），取数后守卫 view 仍存在再回填。 */
+	private async handleRequestCi(hashes: readonly string[]): Promise<void> {
+		if (hashes.length === 0) {
+			return;
+		}
+		const map = await this.ciService.getStatuses(hashes);
+		if (!this.view || map.size === 0) {
+			return;
+		}
+		const rec: Record<string, CiStatusVM> = {};
+		for (const [hash, vm] of map) {
+			rec[hash] = vm;
+		}
+		this.post({ type: 'log/ciData', payload: { map: rec } });
+	}
+
+	/** 用户点击「登录 GitHub 查看 CI」：走原生授权，完成后刷新 CI 元信息。 */
+	private async handleCiSignIn(): Promise<void> {
+		await this.ciService.signIn();
+		await this.pushCiMeta();
+	}
+
+	private async loadMore(cursor: number): Promise<void> {
+		const page = await this.fetchPage(cursor);
+		if (!page || page.rows.length === 0) {
+			this.post({ type: 'log/busy', payload: { busy: false } });
+			return;
+		}
+		this.post({
+			type: 'log/appendData',
+			payload: { rows: page.rows, maxLanes: page.maxLanes, hasMore: page.hasMore },
+		});
+	}
+
+	private async fetchPage(skip: number): Promise<GraphPage | undefined> {
+		const repo = this.service.repo;
+		if (!repo) {
+			return undefined;
+		}
+		try {
+			const out = await this.service.execGit(['log', ...buildLogArgs(this.filter, this.scope, { maxCount: PAGE, skip })]);
+			const raws = parseLogLines(out);
+			if (raws.length === 0) {
+				return { rows: [], maxLanes: 0, hasMore: false };
+			}
+			// 客户端过滤（mergeMode / date / regex / checkpoint），message 近似取 subject。
+			// keepCheckpoint 由 scope 驱动：仅 Checkpointer 视图保留 checkpoint 自动提交，All/Current 剔除。
+			const filterable = raws.map((r) => ({
+				message: r.subject,
+				authorDate: r.authorDate ? new Date(r.authorDate) : undefined,
+				parents: r.parents,
+				hash: r.hash,
+				raw: r,
+			}));
+			const survived = applyClientFilters(filterable, { ...toClientFilter(this.filter), keepCheckpoint: this.scope === 'checkpointer' });
+			const layout = computeGraphLayout(survived.map((s) => ({ hash: s.hash, parents: s.parents })));
+			const hashSet = new Set(survived.map((s) => s.hash));
+			const chips = await this.fetchChips(hashSet);
+			const rows: GraphRowVM[] = survived.map((s, i) => ({
+				hash: s.raw.hash,
+				shortHash: s.raw.hash.slice(0, 7),
+				parents: s.raw.parents,
+				isMerge: s.raw.parents.length > 1,
+				subject: s.raw.subject,
+				authorName: s.raw.authorName,
+				authorDate: s.raw.authorDate,
+				chips: chips.get(s.raw.hash) ?? [],
+				layout: layout[i],
+			}));
+			return { rows, maxLanes: maxLanes(layout), hasMore: raws.length === PAGE };
+		} catch (e) {
+			// 失败时以 webview 内错误态呈现（带 Retry），而非模态弹窗——用户可即时重试。
+			this.post({ type: 'log/error', payload: { message: errMsg(e) } });
+			return undefined;
+		}
+	}
+
+	/** 取引用标签：for-each-ref（full hash 精确匹配）+ repo.state.HEAD 标注当前分支 / detached HEAD。 */
+	private async fetchChips(hashes: Set<string>): Promise<Map<string, RefChip[]>> {
+		const map = new Map<string, RefChip[]>();
+		const headCommit = this.service.repo?.state.HEAD?.commit;
+		const detached = headCommit && !this.service.repo?.state.HEAD?.name;
+		try {
+			const out = await this.service.execGit(['for-each-ref', `--format=${CHIP_REF_FORMAT}`, 'refs/heads', 'refs/remotes', 'refs/tags']);
+			for (const line of out.split('\n')) {
+				if (line.length === 0) {
+					continue;
+				}
+				const [hash, refname, shortName, headMark] = line.split('\x00');
+				if (!hash || !refname || !hashes.has(hash)) {
+					continue;
+				}
+				const kind: RefChip['kind'] = refname.startsWith('refs/tags/')
+					? 'tag'
+					: refname.startsWith('refs/remotes/')
+						? 'remoteBranch'
+						: 'localBranch';
+				const isHeadTarget = headMark === '*' || hash === headCommit;
+				this.pushChip(map, hash, { name: shortName, kind, isHeadTarget });
+			}
+		} catch {
+			// 引用标签为增强信息，失败不影响图主体。
+		}
+		if (detached && headCommit && hashes.has(headCommit)) {
+			this.pushChip(map, headCommit, { name: 'HEAD', kind: 'head' });
+		}
+		// 排序：head → local → remote → tag（稳定）。
+		const order: Record<RefChip['kind'], number> = { head: 0, localBranch: 1, remoteBranch: 2, tag: 3 };
+		for (const list of map.values()) {
+			list.sort((a, b) => order[a.kind] - order[b.kind]);
+		}
+		return map;
+	}
+
+	private pushChip(map: Map<string, RefChip[]>, hash: string, chip: RefChip): void {
+		const list = map.get(hash);
+		if (list) {
+			list.push(chip);
+		} else {
+			map.set(hash, [chip]);
+		}
+	}
+
+	private async sendCommitFiles(hash: string): Promise<void> {
+		const repo = this.service.repo;
+		if (!repo) {
+			return;
+		}
+		try {
+			// 复用 Log 既有逻辑：diff-tree 取变更文件。
+			const out = await this.service.execGit(['diff-tree', '--no-commit-id', '--name-status', '-r', '--root', hash]);
+			const changes = parseNameStatus(out);
+			const files: LogCommitFileItem[] = changes.map((c) => ({
+				status: c.status,
+				statusLabel: statusLabel(c.status),
+				path: c.oldPath ? `${c.oldPath} → ${c.path}` : c.path,
+				oldPath: c.oldPath,
+				themeColor: fileIconColor(c.status),
+			}));
+			this.post({ type: 'log/commitFiles', payload: { hash, files } });
+		} catch {
+			this.post({ type: 'log/commitFiles', payload: { hash, files: [] } });
+		}
+	}
+
+	private async handleCommitMenu(hash: string): Promise<void> {
+		const nodeLike: LogCommitNode = { kind: 'commit', commit: { hash, message: '', parents: [] } };
+		const items = COMMIT_MENU.map((m) => ({ label: m.label, command: m.command }));
+		const pick = await vscode.window.showQuickPick(items, { placeHolder: `Commit ${hash.slice(0, 7)}` });
+		if (!pick) {
+			return;
+		}
+		await vscode.commands.executeCommand(pick.command, nodeLike);
+	}
+
+	// ─── HTML 渲染 ──────────────────────────────────────────────────────────────
+
+	private renderHtml(): string {
+		const nonce = crypto.randomBytes(16).toString('base64');
+		const laneFallback = JSON.stringify(DEFAULT_LANE_PALETTE);
+		const csp = ['default-src \'none\'', 'style-src \'unsafe-inline\'', `script-src 'nonce-${nonce}'`].join('; ');
+		return `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="Content-Security-Policy" content="${csp}">
+<style>
+${getBaseStyles()}
+:root { --hg-row: 24px; --hg-lane: 14px; }
+* { box-sizing: border-box; }
+body { margin: 0; font-family: var(--vscode-font-family); font-size: var(--vscode-font-size); color: var(--vscode-foreground); background: var(--vscode-sideBar-background); display: flex; flex-direction: column; height: 100vh; overflow: hidden; }
+.toolbar { display: flex; align-items: center; gap: 4px; padding: 6px 8px; border-bottom: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.25)); }
+.seg { display: inline-flex; border: 1px solid var(--vscode-input-border, transparent); border-radius: 3px; overflow: hidden; }
+.seg button { background: transparent; color: var(--vscode-foreground); border: none; padding: 2px 8px; font-size: 11px; cursor: pointer; opacity: 0.7; }
+.seg button.active { background: var(--vscode-button-background); color: var(--vscode-button-foreground); opacity: 1; }
+.repo { margin-left: auto; font-size: 10px; opacity: 0.55; max-width: 45%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+#viewport { flex: 1; overflow-y: auto; overflow-x: hidden; position: relative; outline: none; }
+#spacer { position: relative; }
+#rows { position: absolute; left: 0; right: 0; }
+.row { display: flex; align-items: center; height: var(--hg-row); padding-right: 8px; cursor: pointer; white-space: nowrap; }
+.row:hover { background: var(--vscode-list-hoverBackground); }
+.row.selected { background: var(--vscode-list-activeSelectionBackground, var(--vscode-list-inactiveSelectionBackground)); }
+.row svg.graph { flex: 0 0 auto; display: block; }
+.row svg.graph .node { stroke: var(--vscode-sideBar-background); stroke-width: 1.5; }
+.row.selected svg.graph .node { stroke: var(--vscode-focusBorder); stroke-width: 2.2; }
+.subject { flex: 1 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; display: flex; align-items: center; gap: 4px; }
+.msg { overflow: hidden; text-overflow: ellipsis; }
+.merge { opacity: 0.6; font-size: 10px; padding: 0 2px; }
+.chips { display: inline-flex; gap: 3px; flex: 0 1 auto; min-width: 0; overflow: hidden; }
+.chip { font-size: 10px; padding: 0 5px; border-radius: 8px; border: 1px solid transparent; white-space: nowrap; max-width: 120px; overflow: hidden; text-overflow: ellipsis; }
+.chip.head { background: var(--vscode-statusBarItem-prominentBackground, var(--vscode-button-background)); color: var(--vscode-statusBarItem-prominentForeground, var(--vscode-button-foreground)); font-weight: 600; }
+.chip.localBranch { color: var(--vscode-charts-blue, #58a6ff); border-color: var(--vscode-charts-blue, #58a6ff); }
+.chip.head-target { font-weight: 700; }
+.chip.remoteBranch { color: var(--vscode-descriptionForeground, #8b949e); border-color: var(--vscode-descriptionForeground, #8b949e); }
+.chip.tag { color: var(--vscode-charts-yellow, #d29922); border-color: var(--vscode-charts-yellow, #d29922); }
+.author { flex: 0 0 auto; font-size: 11px; opacity: 0.7; max-width: 110px; overflow: hidden; text-overflow: ellipsis; padding-left: 8px; }
+.date { flex: 0 0 auto; font-size: 11px; opacity: 0.55; padding-left: 8px; }
+#viewport.narrow .author, #viewport.narrow .date { display: none; }
+#details { flex: 0 0 auto; max-height: 38%; overflow-y: auto; border-top: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.25)); display: none; }
+#details.show { display: block; }
+#details .dh { position: sticky; top: 0; display: flex; align-items: center; gap: 6px; background: var(--vscode-sideBar-background); padding: 4px 8px; font-size: 11px; color: var(--vscode-descriptionForeground); border-bottom: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.15)); }
+#details .dh #details-title { flex: 1 1 auto; }
+.dh-close { flex: 0 0 auto; background: transparent; border: none; color: var(--vscode-descriptionForeground); cursor: pointer; font-size: 16px; line-height: 1; padding: 0 4px; border-radius: var(--hg-radius-control); }
+.dh-close:hover { color: var(--vscode-foreground); background: var(--vscode-list-hoverBackground); }
+.dh-close:focus-visible { outline: 2px solid var(--vscode-focusBorder); outline-offset: 1px; }
+#details .file { display: flex; align-items: center; gap: 6px; padding: 2px 10px; font-size: 12px; cursor: pointer; }
+#details .file:hover { background: var(--vscode-list-hoverBackground); }
+#details .file .dot { font-size: 13px; line-height: 1; }
+#details .file .nm { overflow: hidden; text-overflow: ellipsis; }
+#empty, #error { padding: 28px 16px; text-align: center; color: var(--vscode-descriptionForeground); font-size: 12px; }
+#empty .empty-icon { font-size: 30px; opacity: 0.4; margin-bottom: 8px; }
+.empty-title { font-size: 13px; color: var(--vscode-foreground); margin-bottom: 3px; }
+.empty-hint { font-size: 11px; }
+#spinner { position: absolute; bottom: 6px; right: 8px; font-size: 11px; opacity: 0.6; display: none; }
+/* ── CI 状态图标（提交行最右侧，固定 16px 槽位，保证 author/date 列对齐）── */
+.ci { flex: 0 0 16px; width: 16px; display: inline-flex; align-items: center; justify-content: center; }
+.ci svg { display: block; shape-rendering: geometricPrecision; pointer-events: none; }
+.ci-success { color: var(--vscode-testing-iconPassed, #3fb950); }
+.ci-failure { color: var(--vscode-testing-iconFailed, var(--vscode-errorForeground, #f85149)); }
+.ci-pending { color: var(--vscode-testing-iconQueued, var(--vscode-editorWarning-foreground, #d29922)); }
+.ci:not(.ci-empty):hover { filter: brightness(1.15); }
+.ci:not(.ci-empty):focus-visible { outline: 1px solid var(--vscode-focusBorder); outline-offset: 1px; border-radius: 3px; }
+/* narrow 模式隐藏 author/date，但 CI 图标例外保留（核心信号）。 */
+#viewport.narrow .ci { display: inline-flex; }
+@keyframes ci-rot { to { transform: rotate(360deg); } }
+.ci-spin { transform-origin: 50% 50%; animation: ci-rot 1s linear infinite; }
+@media (prefers-reduced-motion: reduce) { .ci-spin { animation: none; } }
+.ci-signin { display: none; background: transparent; border: 1px solid var(--vscode-button-border, var(--vscode-input-border, transparent)); color: var(--vscode-textLink-foreground); font-size: 10px; padding: 1px 6px; border-radius: 3px; cursor: pointer; opacity: 0.85; }
+.ci-signin:hover { opacity: 1; background: var(--vscode-list-hoverBackground); }
+/* ── CI Tooltip（自定义浮层，置于 #rows 之外，虚拟滚动重写不销毁）── */
+#ci-tip { position: fixed; z-index: 50; display: none; max-width: 360px; min-width: 220px; max-height: 320px; overflow: hidden; background: var(--vscode-editorHoverWidget-background, var(--vscode-editorWidget-background)); color: var(--vscode-editorHoverWidget-foreground, var(--vscode-foreground)); border: 1px solid var(--vscode-editorHoverWidget-border, var(--vscode-editorWidget-border, rgba(128,128,128,.3))); border-radius: 4px; box-shadow: 0 2px 8px rgba(0,0,0,.35); font-size: 12px; }
+#ci-tip.show { display: flex; flex-direction: column; }
+#ci-tip .tip-h { padding: 7px 10px; font-weight: 600; border-bottom: 1px solid var(--vscode-editorHoverWidget-border, rgba(128,128,128,.2)); display: flex; align-items: center; gap: 6px; }
+#ci-tip .tip-h .g { flex: 0 0 14px; display: inline-flex; }
+#ci-tip .tip-list { overflow-y: auto; max-height: 240px; padding: 2px 0; }
+#ci-tip .tip-row { display: flex; align-items: flex-start; gap: 7px; padding: 4px 10px; cursor: pointer; }
+#ci-tip .tip-row:hover { background: var(--vscode-list-hoverBackground); }
+#ci-tip .tip-row .g { flex: 0 0 14px; display: inline-flex; margin-top: 1px; }
+#ci-tip .tip-row .nm { flex: 1 1 auto; min-width: 0; overflow: hidden; }
+#ci-tip .tip-row .nm .desc { display: block; font-size: 11px; opacity: 0.7; white-space: normal; word-break: break-word; margin-top: 1px; }
+#ci-tip .tip-foot { padding: 6px 10px; border-top: 1px solid var(--vscode-editorHoverWidget-border, rgba(128,128,128,.2)); }
+#ci-tip .tip-foot a { color: var(--vscode-textLink-foreground); cursor: pointer; text-decoration: none; }
+#ci-tip .tip-foot a:hover { text-decoration: underline; }
+#ci-tip .g-success { color: var(--vscode-testing-iconPassed, #3fb950); }
+#ci-tip .g-failure { color: var(--vscode-testing-iconFailed, var(--vscode-errorForeground, #f85149)); }
+#ci-tip .g-pending { color: var(--vscode-testing-iconQueued, var(--vscode-editorWarning-foreground, #d29922)); }
+#ci-tip .g-skipped, #ci-tip .g-unknown { color: var(--vscode-descriptionForeground, #8b949e); }
+</style>
+</head>
+<body>
+<div class="toolbar">
+  <span class="seg" role="group" aria-label="Commit scope">
+    <button id="scope-all" class="active" aria-pressed="true">All</button>
+    <button id="scope-current" aria-pressed="false">Current</button>
+    <button id="scope-checkpointer" aria-pressed="false" title="Show internal checkpoint (auto-snapshot) commits">Checkpoints</button>
+  </span>
+  <span class="repo" id="repo"></span>
+  <button id="ci-signin" class="ci-signin" title="Sign in to GitHub to view CI status">Sign In to GitHub</button>
+</div>
+<div id="viewport" tabindex="0" role="tree" aria-label="Commit history">
+  <div id="spacer"><div id="rows"></div></div>
+  <div id="empty"><div class="empty-icon" aria-hidden="true">⌥</div><div class="empty-title">No Commits</div><div class="empty-hint">No commits match the current scope or filter.</div></div>
+  <div id="error" style="display:none"><div class="empty-title">Failed to Load Commits</div><div class="empty-hint" id="error-msg"></div><button class="hg-btn hg-btn--sm" id="retry-btn" style="margin-top:8px">Retry</button></div>
+  <div id="spinner">Loading…</div>
+</div>
+<div id="details"><div class="dh" id="details-head"><span id="details-title"></span><button class="dh-close" id="details-close" title="Close" aria-label="Close details">×</button></div><div id="details-list"></div></div>
+<div id="ci-tip" role="dialog" aria-label="CI check details"></div>
+<script nonce="${nonce}">
+const vscode = acquireVsCodeApi();
+const LANE_FALLBACK = ${laneFallback};
+// 启动期解析泳道色：优先主题 --vscode-charts-* 令牌（深/浅主题自适应），缺失或与其它 lane 撞色时
+// 回落 DEFAULT_LANE_PALETTE 原始 distinct hex，保底相邻 lane 可区分（对齐 graph-color 设计注释）。
+const PALETTE = (function () {
+	const cs = getComputedStyle(document.body);
+	const hues = ['red', 'blue', 'green', 'yellow', 'purple', 'orange', 'cyan', 'orange'];
+	const resolved = hues.map(function (hue, i) {
+		const v = cs.getPropertyValue('--vscode-charts-' + hue).trim();
+		return v || LANE_FALLBACK[i];
+	});
+	const seen = Object.create(null);
+	return resolved.map(function (c, i) {
+		const key = String(c).toLowerCase();
+		if (seen[key] === undefined) { seen[key] = true; return c; }
+		return LANE_FALLBACK[i];
+	});
+})();
+const ROW_H = 24, LANE_W = 14, NODE_R = 4, GUTTER = 10, OVERSCAN = 8, LOAD_THRESHOLD = 40;
+/** scope 白名单兜底：仅接受三态，否则回退默认 'all'（兼容未来废弃的持久化值）。 */
+function normalizeScope(v) { return v === 'all' || v === 'current' || v === 'checkpointer' ? v : 'all'; }
+const persisted = vscode.getState() || {};
+let selectedHash = persisted.selectedHash || null;
+let scope = normalizeScope(persisted.scope);
+let model = { rows: [], maxLanes: 0, hasMore: false, repoRoot: '' };
+let renderedFirst = -1, renderedLast = -1, fetching = false;
+// ── CI 状态（懒加载、仅取可见行；ciByHash 稳定缓存、ciRequested 去重、ciPending 防抖批量）──
+// ciByHash 跨 graphData 刷新保留（CI 状态以不可变 hash 为键），杜绝每次 git 状态变化引发的重拉闪烁。
+const ciByHash = Object.create(null);
+const ciRequested = new Set();
+const ciPending = new Set();
+let ciMeta = { available: false, needsSignIn: false, error: '' };
+let ciReqTimer = null;
+// 准实时刷新：仅对可见行中 pending（运行中）状态定时复拉（host 侧 30s TTL 网络门控），终态不再变。
+let ciPendingRefreshTimer = null;
+let ciRefreshing = false;
+const ciTipEl = document.getElementById('ci-tip');
+const ciSignInEl = document.getElementById('ci-signin');
+let tipHash = null, tipShowT = null, tipHideT = null, overIcon = false, overTip = false;
+const viewport = document.getElementById('viewport');
+const spacer = document.getElementById('spacer');
+const rowsEl = document.getElementById('rows');
+const repoEl = document.getElementById('repo');
+const emptyEl = document.getElementById('empty');
+const spinnerEl = document.getElementById('spinner');
+const detailsEl = document.getElementById('details');
+const detailsList = document.getElementById('details-list');
+const detailsTitleEl = document.getElementById('details-title');
+const detailsCloseEl = document.getElementById('details-close');
+const errorEl = document.getElementById('error');
+const errorMsgEl = document.getElementById('error-msg');
+const retryBtnEl = document.getElementById('retry-btn');
+
+function esc(s) { return String(s == null ? '' : s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;'); }
+function laneColor(i) { return PALETTE[((i % PALETTE.length) + PALETTE.length) % PALETTE.length]; }
+function colX(c) { return c * LANE_W + LANE_W / 2; }
+/** 本行实际绘制的最右列号（node + 各边 from/to 的最大值）——行宽据此自适应，消除「全局 maxLanes 撑宽」的留白。 */
+function rowMaxCol(row) { const L = row.layout; let m = L.node.col; for (const e of L.incoming) { if (e.fromCol > m) m = e.fromCol; if (e.toCol > m) m = e.toCol; } for (const e of L.outgoing) { if (e.fromCol > m) m = e.fromCol; if (e.toCol > m) m = e.toCol; } for (const e of L.passThrough) { if (e.fromCol > m) m = e.fromCol; if (e.toCol > m) m = e.toCol; } return m; }
+function fmtDate(iso) { if (!iso) return ''; const d = new Date(iso); if (isNaN(d)) return ''; const m = String(d.getMonth() + 1).padStart(2, '0'); const da = String(d.getDate()).padStart(2, '0'); return d.getFullYear() + '-' + m + '-' + da; }
+
+function rowSvg(row) {
+  const L = row.layout;
+  const cy = ROW_H / 2;
+  const W = (rowMaxCol(row) + 1) * LANE_W + GUTTER;
+  const p = ['<svg class="graph" width="', W, '" height="', ROW_H, '" viewBox="0 0 ', W, ' ', ROW_H, '" xmlns="http://www.w3.org/2000/svg">'];
+  const seg = (e) => 'stroke="' + laneColor(e.colorIdx) + '" stroke-width="1.6" stroke-linecap="round"';
+  for (const e of L.passThrough) p.push('<line x1="', colX(e.fromCol), '" y1="0" x2="', colX(e.toCol), '" y2="', ROW_H, '" ', seg(e), '/>');
+  for (const e of L.incoming) p.push('<line x1="', colX(e.fromCol), '" y1="0" x2="', colX(e.toCol), '" y2="', cy, '" ', seg(e), '/>');
+  for (const e of L.outgoing) {
+    const y2 = e.kind === 'dangling' ? ROW_H * 0.78 : ROW_H;
+    const op = e.kind === 'dangling' ? ' opacity="0.45"' : '';
+    p.push('<line x1="', colX(e.fromCol), '" y1="', cy, '" x2="', colX(e.toCol), '" y2="', y2, '"', op, ' ', seg(e), '/>');
+  }
+  p.push('<circle class="node" cx="', colX(L.node.col), '" cy="', cy, '" r="', NODE_R, '" fill="', laneColor(L.node.colorIdx), '"/>');
+  p.push('</svg>');
+  return p.join('');
+}
+
+function chipsHtml(row) {
+  if (!row.chips || row.chips.length === 0) return '';
+  const parts = ['<span class="chips">'];
+  for (const c of row.chips) {
+    const cls = 'chip ' + c.kind + (c.isHeadTarget ? ' head-target' : '');
+    parts.push('<span class="', cls, '" title="', esc(c.name), '">', esc(c.name), '</span>');
+  }
+  parts.push('</span>');
+  return parts.join('');
+}
+
+function ciGlyph(state) {
+  if (state === 'success') return '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"><circle cx="8" cy="8" r="6.6" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M4.8 8.2l2.1 2.1 4.3-4.5" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/></svg>';
+  if (state === 'failure') return '<svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"><circle cx="8" cy="8" r="6.6" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M5.6 5.6l4.8 4.8M10.4 5.6l-4.8 4.8" stroke="currentColor" stroke-width="1.7" stroke-linecap="round"/></svg>';
+  if (state === 'pending') return '<svg class="ci-spin" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true"><circle cx="8" cy="8" r="6.4" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-dasharray="10 30"/></svg>';
+  return '';
+}
+
+/** 提交行最右侧的 CI 槽位（固定 16px 保列对齐；available=false 零宽；无数据=空槽不交互）。 */
+function ciSlotHtml(row) {
+  if (!ciMeta.available) return '';
+  const ci = ciByHash[row.hash];
+  if (!ci || ci.state === 'unknown') {
+    return '<span class="ci ci-empty" aria-hidden="true"></span>';
+  }
+  const failed = ci.total - ci.passed;
+  const a11y = ci.state === 'success' ? 'CI passed ' + ci.passed + '/' + ci.total
+    : ci.state === 'failure' ? 'CI failed, ' + failed + '/' + ci.total + ' checks failing'
+    : 'CI running ' + ci.passed + '/' + ci.total;
+  return '<span class="ci ci-' + ci.state + '" data-ci="' + esc(row.hash) + '" tabindex="0" role="button" aria-label="' + esc(a11y) + '">' + ciGlyph(ci.state) + '</span>';
+}
+
+function rowHtml(row, idx) {
+  const sel = row.hash === selectedHash ? ' selected' : '';
+  const merge = row.isMerge ? '<span class="merge" title="Merge commit">⇠</span>' : '';
+  return '<div class="row' + sel + '" data-i="' + idx + '" data-hash="' + esc(row.hash) + '" role="treeitem" aria-selected="' + (sel !== '') + '">'
+    + rowSvg(row)
+    + '<span class="subject">' + chipsHtml(row) + '<span class="msg">' + esc(row.subject) + '</span>' + merge + '</span>'
+    + '<span class="author">' + esc(row.authorName) + '</span>'
+    + '<span class="date">' + fmtDate(row.authorDate) + '</span>'
+    + ciSlotHtml(row)
+    + '</div>';
+}
+
+function render() {
+  const total = model.rows.length;
+  const sh = viewport.scrollTop;
+  const ch = viewport.clientHeight;
+  const f = Math.max(0, Math.floor(sh / ROW_H) - OVERSCAN);
+  const n = Math.ceil(ch / ROW_H) + OVERSCAN * 2;
+  const l = Math.min(total, f + n);
+  if (f !== renderedFirst || l !== renderedLast) {
+    renderedFirst = f; renderedLast = l;
+    const html = [];
+    for (let i = f; i < l; i++) html.push(rowHtml(model.rows[i], i));
+    rowsEl.innerHTML = html.join('');
+    rowsEl.style.transform = 'translateY(' + (f * ROW_H) + 'px)';
+  }
+  collectCiRequests(f, l);
+  spacer.style.height = (total * ROW_H) + 'px';
+  emptyEl.style.display = total === 0 ? 'block' : 'none';
+  errorEl.style.display = 'none';
+  document.getElementById('scope-all').classList.toggle('active', scope === 'all');
+  document.getElementById('scope-current').classList.toggle('active', scope === 'current');
+  document.getElementById('scope-checkpointer').classList.toggle('active', scope === 'checkpointer');
+  document.getElementById('scope-all').setAttribute('aria-pressed', String(scope === 'all'));
+  document.getElementById('scope-current').setAttribute('aria-pressed', String(scope === 'current'));
+  document.getElementById('scope-checkpointer').setAttribute('aria-pressed', String(scope === 'checkpointer'));
+  if (model.hasMore && !fetching && l >= total - LOAD_THRESHOLD) {
+    fetching = true; spinnerEl.style.display = 'block';
+    vscode.postMessage({ type: 'log/loadMore', payload: { cursor: total } });
+  }
+}
+
+function scheduleRender() { requestAnimationFrame(render); }
+
+/** 收集可见行中尚未取数的 hash（O(可见行)，幂等），防抖后批量请求，绝不重复请求已知项。 */
+function collectCiRequests(f, l) {
+  if (!ciMeta.available) return;
+  for (let i = f; i < l; i++) {
+    const h = model.rows[i] && model.rows[i].hash;
+    if (!h || (h in ciByHash) || ciRequested.has(h) || ciPending.has(h)) continue;
+    ciRequested.add(h);
+    ciPending.add(h);
+  }
+  if (ciPending.size === 0 || ciReqTimer) return;
+  ciReqTimer = setTimeout(flushCiRequests, 200);
+}
+function flushCiRequests() {
+  ciReqTimer = null;
+  if (ciPending.size === 0) return;
+  const hashes = Array.from(ciPending);
+  ciPending.clear();
+  vscode.postMessage({ type: 'log/requestCi', payload: { hashes: hashes } });
+}
+
+/**
+ * CI 数据到达后**就地**更新可见行图标：只改受影响行的 .ci 槽位（replaceChild/appendChild），
+ * 绝不重建整行/整页（reduce-reflows），从根源消除「每次 ciData 触发 innerHTML 重写」的全列闪烁。
+ * 状态类未变（如 pending 复拉、计数更新）时保留原元素，旋转动画不重启、零重绘。
+ */
+function applyCiData(map) {
+  const changed = Object.keys(map);
+  if (changed.length === 0) return;
+  for (const h of changed) {
+    ciByHash[h] = map[h];
+    ciRequested.add(h);
+  }
+  // 只遍历已渲染的可见行，命中受影响 hash 即就地标定其 .ci 槽位。
+  const kids = rowsEl.children;
+  for (let i = 0; i < kids.length; i++) {
+    const rowEl = kids[i];
+    const h = rowEl.getAttribute('data-hash');
+    if (!(h in map)) continue;
+    const slot = rowEl.querySelector('.ci');
+    const ci = ciByHash[h];
+    const wantCls = ci && ci.state !== 'unknown' ? 'ci-' + ci.state : 'ci-empty';
+    // 状态类未变（如 pending 复拉、计数更新）：保留元素，旋转动画不重启、零重绘。
+    if (slot && slot.classList.contains(wantCls)) continue;
+    const fresh = ciSlotHtml({ hash: h });
+    if (slot && slot.outerHTML === fresh) continue;
+    const tmp = document.createElement('div');
+    tmp.innerHTML = fresh;
+    const newSlot = tmp.firstElementChild;
+    if (slot) {
+      if (newSlot) rowEl.replaceChild(newSlot, slot);
+      else rowEl.removeChild(slot);
+    } else if (newSlot) {
+      rowEl.appendChild(newSlot);
+    }
+  }
+}
+
+/** 准实时刷新：仅对可见行中 pending（运行中）状态的提交定时复拉，转终态后停拉。host 30s TTL 网络门控。 */
+function ensurePendingRefresh() {
+  if (ciPendingRefreshTimer) return;
+  ciPendingRefreshTimer = setInterval(schedulePendingRefresh, 20000);
+}
+function stopPendingRefresh() {
+  if (ciPendingRefreshTimer) { clearInterval(ciPendingRefreshTimer); ciPendingRefreshTimer = null; }
+}
+function schedulePendingRefresh() {
+  if (!ciMeta.available || ciRefreshing) return;
+  const total = model.rows.length;
+  if (total === 0 || renderedFirst < 0) return;
+  const pending = [];
+  for (let i = renderedFirst; i < renderedLast && i < total; i++) {
+    const h = model.rows[i] && model.rows[i].hash;
+    const ci = h && ciByHash[h];
+    if (ci && ci.state === 'pending') pending.push(h);
+  }
+  if (pending.length === 0) return;
+  ciRefreshing = true;
+  vscode.postMessage({ type: 'log/requestCi', payload: { hashes: pending } });
+}
+
+// ── CI Tooltip（自定义浮层：列明细 + 失败原因 + 跳转链接，仿 IDEA / GitHub）──
+function tipGlyph(state) {
+  const svg = (state === 'unknown' || state === 'skipped')
+    ? '<svg viewBox="0 0 16 16" width="13" height="13" aria-hidden="true"><path d="M4 8h8" stroke="currentColor" stroke-width="1.7" stroke-linecap="round"/></svg>'
+    : ciGlyph(state);
+  // 必须包裹 .g-{state} 才能上色（绿=通过/红=失败/黄=运行中/灰=未知），否则继承前景色呈单色。
+  return '<span class="g g-' + state + '">' + svg + '</span>';
+}
+function buildTip(ci) {
+  const headState = ci.state === 'success' ? 'success' : ci.state === 'failure' ? 'failure' : 'pending';
+  const headTxt = ci.state === 'success' ? ('All ' + ci.total + ' checks passed')
+    : ci.state === 'failure' ? ((ci.total - ci.passed) + ' / ' + ci.total + ' checks failed')
+    : ci.state === 'pending' ? ('Checks running ' + ci.passed + ' / ' + ci.total) : 'CI status unknown';
+  // 失败项前置，悬停即可见未通过原因。
+  const ordered = ci.checks.slice().sort(function (a, b) {
+    return (a.state === 'failure' ? 0 : 1) - (b.state === 'failure' ? 0 : 1);
+  });
+  const parts = ['<div class="tip-h"><span class="g g-', headState, '">', ciGlyph(headState), '</span>', esc(headTxt), '</div><div class="tip-list">'];
+  if (ordered.length === 0) parts.push('<div class="tip-row" style="opacity:.6;cursor:default">No check details</div>');
+  for (const c of ordered) {
+    const desc = (c.state === 'failure' && c.description) ? '<span class="desc">' + esc(c.description) + '</span>' : '';
+    parts.push('<div class="tip-row" data-url="', esc(c.url || ''), '" role="link" tabindex="0">', tipGlyph(c.state), '<span class="nm">', esc(c.name), desc, '</span></div>');
+  }
+  parts.push('</div>');
+  if (ci.url) parts.push('<div class="tip-foot"><a data-url="', esc(ci.url), '" role="link" tabindex="0">View on GitHub</a></div>');
+  ciTipEl.innerHTML = parts.join('');
+}
+function positionTip(rect) {
+  ciTipEl.style.display = 'flex';
+  const tw = ciTipEl.offsetWidth, th = ciTipEl.offsetHeight;
+  const vw = window.innerWidth, vh = window.innerHeight, pad = 6;
+  let left = rect.left;
+  if (left + tw > vw - pad) left = vw - pad - tw;
+  if (left < pad) left = pad;
+  let top = rect.bottom + 4;
+  if (top + th > vh - pad) top = rect.top - th - 4;
+  if (top < pad) top = pad;
+  ciTipEl.style.left = left + 'px';
+  ciTipEl.style.top = top + 'px';
+}
+function scheduleShow(hash, iconEl) {
+  clearTimeout(tipHideT);
+  if (tipHash === hash && ciTipEl.classList.contains('show')) return;
+  clearTimeout(tipShowT);
+  tipShowT = setTimeout(function () {
+    const ci = ciByHash[hash];
+    if (!ci || ci.state === 'unknown') return;
+    tipHash = hash;
+    buildTip(ci);
+    positionTip(iconEl.getBoundingClientRect());
+    ciTipEl.classList.add('show');
+  }, 350);
+}
+function scheduleHide() {
+  clearTimeout(tipShowT);
+  clearTimeout(tipHideT);
+  tipHideT = setTimeout(function () { if (!overIcon && !overTip) hideTip(); }, 220);
+}
+function hideTip() {
+  ciTipEl.classList.remove('show');
+  ciTipEl.style.display = 'none';
+  tipHash = null;
+}
+function openCiUrl(url) { if (url) vscode.postMessage({ type: 'log/openExternal', payload: { url: url } }); }
+function renderCiMeta() { ciSignInEl.style.display = ciMeta.needsSignIn ? 'inline-block' : 'none'; }
+
+function selectRow(hash) {
+  selectedHash = hash;
+  vscode.setState({ selectedHash: hash, scope: scope });
+  renderedFirst = -1; scheduleRender();
+  vscode.postMessage({ type: 'log/selectCommit', payload: { hash: hash } });
+}
+
+function indexOfHash(hash) { for (let i = 0; i < model.rows.length; i++) if (model.rows[i].hash === hash) return i; return -1; }
+
+function moveSel(delta) {
+  if (model.rows.length === 0) return;
+  let i = indexOfHash(selectedHash);
+  if (i < 0) i = delta > 0 ? -1 : 0;
+  i = Math.max(0, Math.min(model.rows.length - 1, i + delta));
+  const h = model.rows[i].hash;
+  selectRow(h);
+  const top = i * ROW_H;
+  if (top < viewport.scrollTop || top + ROW_H > viewport.scrollTop + viewport.clientHeight) {
+    viewport.scrollTop = top - ROW_H;
+  }
+}
+
+rowsEl.addEventListener('click', function (e) {
+  if (e.target.closest('.ci')) return; // 点击 CI 图标不选中提交行
+  const r = e.target.closest('.row'); if (!r) return;
+  selectRow(r.getAttribute('data-hash'));
+});
+rowsEl.addEventListener('mouseover', function (e) {
+  const icon = e.target.closest && e.target.closest('.ci');
+  if (!icon || icon.classList.contains('ci-empty')) return;
+  overIcon = true;
+  scheduleShow(icon.getAttribute('data-ci'), icon);
+});
+rowsEl.addEventListener('mouseout', function (e) {
+  const icon = e.target.closest && e.target.closest('.ci');
+  if (!icon) return;
+  overIcon = false;
+  scheduleHide();
+});
+rowsEl.addEventListener('keydown', function (e) {
+  const icon = e.target.closest && e.target.closest('.ci');
+  if (!icon || icon.classList.contains('ci-empty')) return;
+  if (e.key === 'Enter' || e.key === ' ') {
+    e.preventDefault(); e.stopPropagation(); // 阻止冒泡到 viewport 的 Enter→菜单
+    const ci = ciByHash[icon.getAttribute('data-ci')];
+    if (!ci || ci.state === 'unknown') return;
+    tipHash = icon.getAttribute('data-ci');
+    buildTip(ci);
+    positionTip(icon.getBoundingClientRect());
+    ciTipEl.classList.add('show');
+    const first = ciTipEl.querySelector('[data-url]'); if (first) first.focus();
+  }
+});
+ciTipEl.addEventListener('mouseenter', function () { overTip = true; clearTimeout(tipHideT); });
+ciTipEl.addEventListener('mouseleave', function () { overTip = false; scheduleHide(); });
+ciTipEl.addEventListener('click', function (e) {
+  const t = e.target.closest('[data-url]'); if (!t) return;
+  openCiUrl(t.getAttribute('data-url'));
+});
+ciTipEl.addEventListener('keydown', function (e) {
+  if (e.key === 'Escape') { hideTip(); }
+  else if (e.key === 'Enter') { const t = e.target.closest('[data-url]'); if (t) openCiUrl(t.getAttribute('data-url')); }
+});
+ciSignInEl.addEventListener('click', function () { vscode.postMessage({ type: 'log/ciSignIn' }); });
+rowsEl.addEventListener('dblclick', function (e) {
+  // 双击 = 打开提交（选中 + 展开详情），与 VS Code「双击即打开」一致；提交操作菜单保留在右键与 Enter。
+  const r = e.target.closest('.row'); if (!r) return;
+  selectRow(r.getAttribute('data-hash'));
+});
+rowsEl.addEventListener('contextmenu', function (e) {
+  const r = e.target.closest('.row'); if (!r) return;
+  e.preventDefault();
+  vscode.postMessage({ type: 'log/commitAction', payload: { op: 'menu', hash: r.getAttribute('data-hash') } });
+});
+function setScope(next) { if (scope !== next) { scope = next; vscode.setState({ selectedHash: selectedHash, scope: scope }); vscode.postMessage({ type: 'log/setScope', payload: { scope: next } }); } }
+document.getElementById('scope-all').addEventListener('click', function () { setScope('all'); });
+document.getElementById('scope-current').addEventListener('click', function () { setScope('current'); });
+document.getElementById('scope-checkpointer').addEventListener('click', function () { setScope('checkpointer'); });
+detailsCloseEl.addEventListener('click', function () { detailsEl.classList.remove('show'); });
+retryBtnEl.addEventListener('click', function () { errorEl.style.display = 'none'; spinnerEl.style.display = 'block'; vscode.postMessage({ type: 'log/retry' }); });
+viewport.addEventListener('scroll', scheduleRender, { passive: true });
+viewport.addEventListener('scroll', function () { if (tipHash) hideTip(); }, { passive: true });
+viewport.addEventListener('keydown', function (e) {
+  if (e.key === 'ArrowDown') { e.preventDefault(); moveSel(1); }
+  else if (e.key === 'ArrowUp') { e.preventDefault(); moveSel(-1); }
+  else if (e.key === 'Home') { e.preventDefault(); if (model.rows.length) selectRow(model.rows[0].hash); }
+  else if (e.key === 'End') { e.preventDefault(); if (model.rows.length) selectRow(model.rows[model.rows.length - 1].hash); }
+  else if (e.key === 'Enter') { e.preventDefault(); if (selectedHash) vscode.postMessage({ type: 'log/commitAction', payload: { op: 'menu', hash: selectedHash } }); }
+});
+detailsList.addEventListener('click', function (e) {
+  const f = e.target.closest('.file'); if (!f) return;
+  vscode.postMessage({ type: 'log/openFile', payload: { hash: f.getAttribute('data-hash'), path: f.getAttribute('data-path'), hasParent: f.getAttribute('data-hasparent') === '1' } });
+});
+
+function renderDetails(hash, files) {
+  if (!hash) { detailsEl.classList.remove('show'); return; }
+  const row = model.rows.find(function (r) { return r.hash === hash; });
+  const hasParent = row && row.parents && row.parents.length > 0 ? '1' : '0';
+  detailsTitleEl.textContent = 'Changed Files (' + files.length + ') · ' + hash.slice(0, 7);
+  if (files.length === 0) { detailsList.innerHTML = '<div class="file" style="opacity:.6">No changed files (may be a root or merge commit)</div>'; detailsEl.classList.add('show'); return; }
+  const html = [];
+  for (const f of files) {
+    html.push('<div class="file" data-hash="', esc(hash), '" data-path="', esc(f.path), '" data-hasparent="', hasParent, '"><span class="dot" style="color:var(--vscode-', f.themeColor.replace(/\\./g, '-'), ')">', esc(f.statusLabel), '</span><span class="nm">', esc(f.path), '</span></div>');
+  }
+  detailsList.innerHTML = html.join('');
+  detailsEl.classList.add('show');
+}
+
+window.addEventListener('message', function (e) {
+  const m = e.data;
+  if (m.type === 'log/graphData') {
+    model = { rows: m.payload.rows, maxLanes: m.payload.maxLanes, hasMore: m.payload.hasMore, repoRoot: m.payload.repoRoot };
+    scope = m.payload.scope; repoEl.textContent = m.payload.repoRoot; repoEl.title = m.payload.repoRoot;
+    // 保留 ciByHash 稳定缓存（CI 状态以不可变 hash 为键）：图重置只清请求去重集合，
+    // 已缓存的提交重绘时立即可见图标，避免「清缓存→重拉→整行重建」的闪烁。
+    ciRequested.clear(); ciPending.clear();
+    if (ciReqTimer) { clearTimeout(ciReqTimer); ciReqTimer = null; }
+    hideTip();
+    renderedFirst = -1; renderedLast = -1; viewport.scrollTop = 0; fetching = false; spinnerEl.style.display = 'none';
+    if (!model.rows.some(function (r) { return r.hash === selectedHash; })) selectedHash = null;
+    scheduleRender();
+  } else if (m.type === 'log/appendData') {
+    model.rows = model.rows.concat(m.payload.rows);
+    model.maxLanes = Math.max(model.maxLanes, m.payload.maxLanes);
+    model.hasMore = m.payload.hasMore; fetching = false; spinnerEl.style.display = 'none';
+    renderedFirst = -1; scheduleRender();
+  } else if (m.type === 'log/commitFiles') {
+    renderDetails(m.payload.hash, m.payload.files);
+  } else if (m.type === 'log/busy') {
+    spinnerEl.style.display = m.payload.busy ? 'block' : 'none';
+  } else if (m.type === 'log/error') {
+    spinnerEl.style.display = 'none'; emptyEl.style.display = 'none';
+    errorMsgEl.textContent = m.payload.message || 'Unexpected error';
+    errorEl.style.display = 'block';
+  } else if (m.type === 'log/ciMeta') {
+    ciMeta = { available: !!m.payload.available, needsSignIn: !!m.payload.needsSignIn, error: m.payload.error || '' };
+    renderCiMeta();
+    if (ciMeta.available) ensurePendingRefresh(); else stopPendingRefresh();
+    renderedFirst = -1; // 强制重绘可见行（CI 槽位/登录提示出现或消失）
+    scheduleRender();
+  } else if (m.type === 'log/ciData') {
+    const map = m.payload.map;
+    ciRefreshing = false;
+    if (Object.keys(map).length === 0) return;
+    applyCiData(map); // 就地补丁可见行图标，杜绝整行重建闪烁
+    // 数据到达后重锚开启中的 Tooltip（图标新增/pending→终态变化）。
+    if (tipHash && (tipHash in map) && ciTipEl.classList.contains('show')) {
+      requestAnimationFrame(function () {
+        const el = rowsEl.querySelector('[data-ci="' + tipHash.replace(/[^a-f0-9]/gi, '') + '"]');
+        if (el) { buildTip(ciByHash[tipHash]); positionTip(el.getBoundingClientRect()); }
+        else hideTip();
+      });
+    }
+  }
+});
+
+function updateWidthClass() {
+  const w = viewport.clientWidth;
+  viewport.classList.toggle('narrow', w < 360);
+}
+new ResizeObserver(updateWidthClass).observe(viewport);
+updateWidthClass();
+
+vscode.postMessage({ type: 'log/requestState' });
+</script>
+</body>
+</html>`;
+	}
+}
+
+/** 变更文件状态 → gitDecoration 主题色 id（与原 log-tree 的 fileIconColor 语义一致）。 */
+function fileIconColor(status: string): string {
+	if (status.startsWith('A')) {
+		return 'gitDecoration.addedResourceForeground';
+	}
+	if (status.startsWith('D')) {
+		return 'gitDecoration.deletedResourceForeground';
+	}
+	if (status.startsWith('R') || status.startsWith('C')) {
+		return 'gitDecoration.renamedResourceForeground';
+	}
+	return 'gitDecoration.modifiedResourceForeground';
+}
diff --git a/src/adapter/webview/merge-editor.ts b/src/adapter/webview/merge-editor.ts
index 5c3d0bd..9eff82c 100644
--- a/src/adapter/webview/merge-editor.ts
+++ b/src/adapter/webview/merge-editor.ts
@@ -5,11 +5,12 @@ import * as vscode from 'vscode';
 import type { GitRepositoryService } from '../git-repository-service';
 import { diff3, type MergeHunk } from '../../engine/merge/diff3';
 import { parseConflictState } from '../../engine/git-state/conflict-detector';
+import { getBaseStyles } from './shared-styles';
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
 /**
- * 自绘 3-way Merge Editor（WebviewPanel）—— 复刻 IDEA 冲突解决编辑器。
+ * 自绘 3-way Merge Editor（WebviewPanel）—— 自绘 3-way 冲突解决编辑器。
  *
  * 数据：经 `git show :1/:2/:3:<path>` 取 base/ours/theirs，diff3 产出 hunks。
  * UI：stable 段只读展示；conflict 段三栏（OURS | RESULT 可编辑 | THEIRS），Accept 按钮填 RESULT。
@@ -19,7 +20,7 @@ export class MergeEditorWebview {
 	static async openForFile(service: GitRepositoryService, filePath: string): Promise<void> {
 		const repo = service.repo;
 		if (!repo) {
-			void vscode.window.showWarningMessage('未找到 Git 仓库');
+			void vscode.window.showWarningMessage('No Git repository found');
 			return;
 		}
 		let base: string;
@@ -33,7 +34,7 @@ export class MergeEditorWebview {
 				service.execGit(['show', `:3:${filePath}`]),
 			]);
 		} catch (e) {
-			void vscode.window.showErrorMessage(`读取冲突阶段失败（文件可能无冲突）：${errMsg(e)}`);
+			void vscode.window.showErrorMessage(`Failed to read conflict stages (file may have no conflicts): ${errMsg(e)}`);
 			return;
 		}
 		const hunks = diff3(splitLines(base), splitLines(ours), splitLines(theirs));
@@ -42,7 +43,7 @@ export class MergeEditorWebview {
 			// 无冲突：直接取合并结果写回 + add
 			const merged = hunks.flatMap((h) => (h.kind === 'stable' ? h.content : []));
 			await MergeEditorWebview.saveResult(service, filePath, merged.join('\n') + '\n');
-			void vscode.window.showInformationMessage(`「${filePath}」无冲突，已自动合并并标记已解决`);
+			void vscode.window.showInformationMessage(`"${filePath}" has no conflicts; auto-merged and marked resolved`);
 			return;
 		}
 
@@ -70,11 +71,11 @@ export class MergeEditorWebview {
 		}
 		if (/^<<<<<<< /m.test(content) || /^======= *$/m.test(content) || /^>>>>>>> /m.test(content)) {
 			const ok = await vscode.window.showWarningMessage(
-				'结果仍含冲突标记（<<<<<<< / ======= / >>>>>>>），强制保存将把带标记的内容标记为已解决。继续？',
+				'The result still contains conflict markers (<<<<<<< / ======= / >>>>>>>). Force-saving will mark the file as resolved with the markers still in it. Continue?',
 				{ modal: true },
-				'强制保存',
+				'Force Save',
 			);
-			if (ok !== '强制保存') {
+			if (ok !== 'Force Save') {
 				return;
 			}
 		}
@@ -82,38 +83,47 @@ export class MergeEditorWebview {
 		try {
 			await fs.promises.writeFile(abs, content, 'utf8');
 			await service.execGit(['add', '--', filePath]);
-			void vscode.window.showInformationMessage(`「${filePath}」已保存并标记为已解决`);
+			void vscode.window.showInformationMessage(`"${filePath}" saved and marked resolved`);
 		} catch (e) {
-			void vscode.window.showErrorMessage(`保存失败：${errMsg(e)}`);
+			void vscode.window.showErrorMessage(`Failed to save: ${errMsg(e)}`);
 		}
 	}
 
 	private static renderHtml(filePath: string, hunks: readonly MergeHunk[], conflicts: number): string {
 		const nonce = crypto.randomBytes(16).toString('base64');
-		const dataJson = escapeHtml(JSON.stringify(hunks));
+		// JSON 注入 <script> 内的 JS 字符串上下文：按 JS-string 转义（反斜杠/引号）+ < → < 防 </script> 破出。
+		// 不可用 escapeHtml——其产出 &quot; 在 <script> raw-text 中不被解码，会令 JSON.parse 失败。
+		const dataJson = JSON.stringify(hunks)
+			.replace(/\\/g, '\\\\')
+			.replace(/"/g, '\\"')
+			.replace(/</g, '\\u003c');
 		return `<!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${nonce}'">
 <style>
+${getBaseStyles()}
 body { margin: 0; padding: 10px 14px; font-family: var(--vscode-font-family); font-size: 12px; color: var(--vscode-foreground); background: var(--vscode-editor-background); }
 .bar { display: flex; align-items: center; gap: 10px; margin-bottom: 10px; flex-wrap: wrap; }
 .bar .path { font-weight: 600; }
 .bar .count { color: var(--vscode-editorWarning-foreground, #d29922); }
 .bar .spacer { flex: 1; }
-button { padding: 5px 14px; background: var(--vscode-button-background); color: var(--vscode-button-foreground); border: none; border-radius: 2px; cursor: pointer; font-size: 12px; }
-button:hover { opacity: 0.9; }
-button.secondary { background: var(--vscode-button-secondaryBackground, transparent); color: var(--vscode-button-secondaryForeground, var(--vscode-foreground)); border: 1px solid var(--vscode-button-border, rgba(128,128,128,.4)); }
-button.sm { padding: 2px 8px; font-size: 11px; }
+.bar .nav { display: inline-flex; align-items: center; gap: 2px; }
+.bar .nav #conflict-pos { font-size: 11px; min-width: 46px; text-align: center; color: var(--vscode-descriptionForeground); }
+.remaining { font-size: 11px; opacity: 0.75; margin-left: 6px; }
+.remaining.has-unresolved { color: var(--vscode-editorWarning-foreground, #d29922); opacity: 1; }
 .hunk { margin-bottom: 10px; }
 .stable { background: var(--vscode-editor-inactiveSelectionBackground, rgba(128,128,128,.12)); border-left: 3px solid transparent; padding: 2px 8px; white-space: pre-wrap; font-family: var(--vscode-editor-font-family); }
 .conflict { border: 1px solid var(--vscode-inputOption-activeBorder, #d29922); border-radius: 3px; }
-.conflict-head { background: var(--vscode-editorWarning-background, rgba(210,153,34,.15)); padding: 3px 8px; font-weight: 600; }
+.conflict-head { display: flex; align-items: center; gap: 8px; background: var(--vscode-editorWarning-background, rgba(210,153,34,.15)); padding: 3px 8px; font-weight: 600; }
+.c-badge { margin-left: auto; font-size: 10px; font-weight: 600; padding: 1px 7px; border-radius: 9px; border: 1px solid transparent; }
+.c-badge.unresolved { color: var(--vscode-editorWarning-foreground, #d29922); border-color: var(--vscode-editorWarning-foreground, #d29922); }
+.c-badge.resolved { color: var(--vscode-testing-iconPassed, #3fb950); border-color: var(--vscode-testing-iconPassed, #3fb950); }
 .c3 { display: grid; grid-template-columns: 1fr 1.3fr 1fr; gap: 1px; background: var(--vscode-editorWidget-border, rgba(128,128,128,.3)); }
 .col { background: var(--vscode-editor-background); padding: 4px 8px; }
 .col-label { font-size: 10px; opacity: 0.7; margin-bottom: 3px; text-transform: uppercase; }
-.col pre { white-space: pre-wrap; font-family: var(--vscode-editor-font-family); margin: 0; min-height: 14px; }
+.col pre { white-space: pre; overflow-x: auto; font-family: var(--vscode-editor-font-family); margin: 0; min-height: 14px; }
 .col textarea { width: 100%; min-height: 60px; resize: vertical; background: var(--vscode-input-background); color: var(--vscode-input-foreground); border: 1px solid var(--vscode-input-border, transparent); font-family: var(--vscode-editor-font-family); font-size: 12px; padding: 4px; box-sizing: border-box; }
 .col-actions { margin-top: 4px; display: flex; gap: 4px; }
 </style>
@@ -121,10 +131,15 @@ button.sm { padding: 2px 8px; font-size: 11px; }
 <body>
 <div class="bar">
   <span class="path">${escapeHtml(filePath)}</span>
-  <span class="count">${conflicts} 个冲突</span>
+  <span class="count">${conflicts} conflict${conflicts === 1 ? '' : 's'}</span>
   <span class="spacer"></span>
-  <button class="secondary" id="cancel">取消</button>
-  <button id="save">保存并标记已解决</button>
+  <span class="nav" id="conflict-nav" role="group" aria-label="Conflict navigation">
+    <button class="hg-btn hg-btn--sm" id="prev-conflict" title="Previous conflict" aria-label="Previous conflict">‹</button>
+    <span id="conflict-pos" aria-live="polite">—</span>
+    <button class="hg-btn hg-btn--sm" id="next-conflict" title="Next conflict" aria-label="Next conflict">›</button>
+  </span>
+  <button class="hg-btn hg-btn--secondary" id="cancel">Cancel</button>
+  <button class="hg-btn" id="save">Save &amp; Mark Resolved<span class="remaining" id="remaining"></span></button>
 </div>
 <div id="hunks"></div>
 <script nonce="${nonce}">
@@ -134,50 +149,99 @@ function markerText(h){
   return "<<<<<<< ours\\n" + lines(h.ours).join("\\n") + "\\n=======\\n" + lines(h.theirs).join("\\n") + "\\n>>>>>>> theirs";
 }
 function escapeHtml(s){ return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
+var MARKER_RE = /^<<<<<<< |^=======$|^>>>>>>> /m;
+function isResolved(ta){ return !!ta && !MARKER_RE.test(ta.value || ''); }
 var container = document.getElementById('hunks');
-HUNKS.forEach(function(h, idx){
+var conflicts = []; // { wrap, ta, badge } —— 仅 conflict hunk，顺序编号 1..N
+var cIdx = 0;
+HUNKS.forEach(function(h){
   if (h.kind === 'stable') {
     var d = document.createElement('div'); d.className = 'hunk';
     var s = document.createElement('div'); s.className = 'stable';
     s.textContent = (h.content||[]).join('\\n');
     d.appendChild(s); container.appendChild(d);
   } else {
+    cIdx += 1; // 顺序编号：仅 conflict 自增（与 save 端收集一致）
     var d = document.createElement('div'); d.className = 'hunk';
-    var c = document.createElement('div'); c.className = 'conflict';
-    var head = document.createElement('div'); head.className = 'conflict-head'; head.textContent = '冲突 #' + (idx);
+    var c = document.createElement('div'); c.className = 'conflict'; c.setAttribute('role','group'); c.setAttribute('aria-label','Conflict #' + cIdx);
+    var head = document.createElement('div'); head.className = 'conflict-head';
+    var num = document.createElement('span'); num.textContent = 'Conflict #' + cIdx;
+    var badge = document.createElement('span'); badge.className = 'c-badge unresolved'; badge.textContent = 'Unresolved';
+    head.appendChild(num); head.appendChild(badge);
     c.appendChild(head);
     var grid = document.createElement('div'); grid.className = 'c3';
     // OURS
     var oc = document.createElement('div'); oc.className = 'col';
     oc.innerHTML = '<div class="col-label">Ours</div><pre>' + escapeHtml(lines(h.ours).join('\\n')) + '</pre>';
     var ob = document.createElement('div'); ob.className='col-actions';
-    var obtn = document.createElement('button'); obtn.className='sm'; obtn.textContent='← 采用 Ours';
-    obtn.onclick = function(){ ta.value = lines(h.ours).join('\\n'); ta.focus(); };
+    var obtn = document.createElement('button'); obtn.className='hg-btn hg-btn--sm'; obtn.textContent='← Accept Ours';
+    obtn.onclick = function(){ ta.value = lines(h.ours).join('\\n'); ta.focus(); refreshConflict(entry); };
     ob.appendChild(obtn); oc.appendChild(ob); grid.appendChild(oc);
     // RESULT
     var rc = document.createElement('div'); rc.className = 'col';
-    rc.innerHTML = '<div class="col-label">Result（可编辑）</div>';
-    var ta = document.createElement('textarea'); ta.value = markerText(h); ta.id = 'result-' + idx;
+    rc.innerHTML = '<div class="col-label">Result (editable)</div>';
+    var ta = document.createElement('textarea'); ta.className = 'hg-input'; ta.value = markerText(h); ta.id = 'result-' + cIdx; ta.setAttribute('aria-label','Conflict #' + cIdx + ' result');
     rc.appendChild(ta);
     var bb = document.createElement('div'); bb.className='col-actions';
-    var baseb = document.createElement('button'); baseb.className='sm secondary'; baseb.textContent='采用 Base';
-    baseb.onclick = function(){ ta.value = lines(h.base).join('\\n'); };
+    var baseb = document.createElement('button'); baseb.className='hg-btn hg-btn--sm hg-btn--secondary'; baseb.textContent='Accept Base';
+    baseb.onclick = function(){ ta.value = lines(h.base).join('\\n'); refreshConflict(entry); };
     bb.appendChild(baseb); rc.appendChild(bb); grid.appendChild(rc);
     // THEIRS
     var tc = document.createElement('div'); tc.className = 'col';
     tc.innerHTML = '<div class="col-label">Theirs</div><pre>' + escapeHtml(lines(h.theirs).join('\\n')) + '</pre>';
     var tb = document.createElement('div'); tb.className='col-actions';
-    var tbtn = document.createElement('button'); tbtn.className='sm'; tbtn.textContent='采用 Theirs →';
-    tbtn.onclick = function(){ ta.value = lines(h.theirs).join('\\n'); ta.focus(); };
+    var tbtn = document.createElement('button'); tbtn.className='hg-btn hg-btn--sm'; tbtn.textContent='Accept Theirs →';
+    tbtn.onclick = function(){ ta.value = lines(h.theirs).join('\\n'); ta.focus(); refreshConflict(entry); };
     tb.appendChild(tbtn); tc.appendChild(tb); grid.appendChild(tc);
     c.appendChild(grid); d.appendChild(c); container.appendChild(d);
+    var entry = { wrap: d, ta: ta, badge: badge };
+    ta.addEventListener('input', function(){ refreshConflict(entry); });
+    conflicts.push(entry);
   }
 });
+
+function refreshConflict(entry){
+  var resolved = isResolved(entry.ta);
+  entry.badge.className = 'c-badge ' + (resolved ? 'resolved' : 'unresolved');
+  entry.badge.textContent = resolved ? 'Resolved' : 'Unresolved';
+  updateCounters();
+}
+function currentConflictIndex(){
+  for (var i = 0; i < conflicts.length; i++){
+    var rect = conflicts[i].wrap.getBoundingClientRect();
+    if (rect.bottom > 70 && rect.top < window.innerHeight - 50) return i;
+  }
+  return Math.max(0, conflicts.length - 1);
+}
+function gotoConflict(i){
+  if (!conflicts.length) return;
+  i = Math.max(0, Math.min(conflicts.length - 1, i));
+  conflicts[i].wrap.scrollIntoView({ block: 'start' });
+  conflicts[i].ta.focus({ preventScroll: true });
+  updateCounters(i);
+}
+function updateCounters(focusIdx){
+  var posEl = document.getElementById('conflict-pos');
+  var remEl = document.getElementById('remaining');
+  var total = conflicts.length;
+  if (!total) { posEl.textContent = '—'; remEl.textContent = ''; return; }
+  var cur = (typeof focusIdx === 'number') ? focusIdx + 1 : currentConflictIndex() + 1;
+  posEl.textContent = cur + ' / ' + total;
+  var unresolved = conflicts.filter(function(e){ return !isResolved(e.ta); }).length;
+  remEl.textContent = unresolved ? (unresolved + ' unresolved') : ' · all resolved';
+  remEl.className = 'remaining' + (unresolved ? ' has-unresolved' : '');
+}
+document.getElementById('prev-conflict').onclick = function(){ gotoConflict(currentConflictIndex() - 1); };
+document.getElementById('next-conflict').onclick = function(){ gotoConflict(currentConflictIndex() + 1); };
+window.addEventListener('scroll', function(){ updateCounters(); }, { passive: true });
+updateCounters();
+
 document.getElementById('save').onclick = function(){
   var result = [];
-  HUNKS.forEach(function(h, idx){
+  var ci = 0;
+  HUNKS.forEach(function(h){
     if (h.kind === 'stable') { result.push.apply(result, h.content||[]); }
-    else { var v = document.getElementById('result-' + idx).value; result.push(v); }
+    else { ci += 1; result.push(document.getElementById('result-' + ci).value); }
   });
   acquireVsCodeApi().postMessage({ type: 'save', content: result.join('\\n') + '\\n' });
 };
@@ -218,12 +282,12 @@ export function registerMergeCommands(service: GitRepositoryService): vscode.Dis
 				/* ignore */
 			}
 			if (paths.length === 0) {
-				void vscode.window.showInformationMessage('当前无冲突文件');
+				void vscode.window.showInformationMessage('No conflicted files');
 				return;
 			}
 			const pick = await vscode.window.showQuickPick(
-				paths.map((p) => ({ label: p, description: '冲突文件' })),
-				{ placeHolder: '选择要解决的冲突文件', canPickMany: false },
+				paths.map((p) => ({ label: p, description: 'conflicted' })),
+				{ placeHolder: 'Select a conflicted file to resolve', canPickMany: false },
 			);
 			if (!pick) {
 				return;
@@ -245,9 +309,9 @@ export function registerMergeCommands(service: GitRepositoryService): vscode.Dis
 			try {
 				await service.execGit(['checkout', '--ours', '--', file]);
 				await service.execGit(['add', '--', file]);
-				void vscode.window.showInformationMessage(`「${file}」已采用 ours`);
+				void vscode.window.showInformationMessage(`"${file}" resolved with ours`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -265,9 +329,9 @@ export function registerMergeCommands(service: GitRepositoryService): vscode.Dis
 			try {
 				await service.execGit(['checkout', '--theirs', '--', file]);
 				await service.execGit(['add', '--', file]);
-				void vscode.window.showInformationMessage(`「${file}」已采用 theirs`);
+				void vscode.window.showInformationMessage(`"${file}" resolved with theirs`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -284,12 +348,12 @@ async function pickConflicted(service: GitRepositoryService): Promise<string | u
 		/* ignore */
 	}
 	if (paths.length === 0) {
-		void vscode.window.showInformationMessage('当前无冲突文件');
+		void vscode.window.showInformationMessage('No conflicted files');
 		return undefined;
 	}
 	if (paths.length === 1) {
 		return paths[0];
 	}
-	const pick = await vscode.window.showQuickPick(paths.map((p) => ({ label: p })), { placeHolder: '选择冲突文件' });
+	const pick = await vscode.window.showQuickPick(paths.map((p) => ({ label: p })), { placeHolder: 'Select a conflicted file' });
 	return pick?.label;
 }
diff --git a/src/adapter/webview/rebase-webview.ts b/src/adapter/webview/rebase-webview.ts
index de059a0..c8f8566 100644
--- a/src/adapter/webview/rebase-webview.ts
+++ b/src/adapter/webview/rebase-webview.ts
@@ -6,6 +6,7 @@ import * as vscode from 'vscode';
 import type { GitRepositoryService } from '../git-repository-service';
 import { handleGitConflict } from '../conflict-ui';
 import { type RebaseTodoItem, isValidAction, serializeTodo } from '../../engine/rebase/todo';
+import { getBaseStyles } from './shared-styles';
 
 interface RebaseCommit {
 	readonly hash: string;
@@ -37,7 +38,7 @@ if (idx < subjects.length) {
 `;
 
 /**
- * 交互式 Rebase Webview（1:1 复刻 IDEA Git Log → Edit Rebase 编辑器）。
+ * 交互式 Rebase Webview（交互式 Rebase 编辑器）。
  *
  * 展示 base..HEAD 的提交列表，每条可设 pick/reword/edit/squash/fixup/drop 动作；
  * reword 支持行内编辑新 message；行可拖拽重排序。
@@ -49,7 +50,7 @@ export class RebaseWebview {
 	static async open(service: GitRepositoryService): Promise<void> {
 		const repo = service.repo;
 		if (!repo) {
-			void vscode.window.showWarningMessage('未找到 Git 仓库');
+			void vscode.window.showWarningMessage('No Git repository found');
 			return;
 		}
 		// 选择 base
@@ -57,10 +58,10 @@ export class RebaseWebview {
 		const commits = await repo.log({ maxEntries: 30 });
 		const basePick = await vscode.window.showQuickPick(
 			[
-				...baseOptions.map((b) => ({ label: b, description: `从 ${b} 开始 rebase` })),
+				...baseOptions.map((b) => ({ label: b, description: `Rebase from ${b}` })),
 				...commits.slice(1).map((c) => ({ label: c.hash.slice(0, 7), description: (c.message.split('\n', 1)[0] ?? '').slice(0, 60) })),
 			],
-			{ placeHolder: '选择 rebase 起点（base）' },
+			{ placeHolder: 'Select rebase base' },
 		);
 		if (!basePick) {
 			return;
@@ -80,11 +81,11 @@ export class RebaseWebview {
 					return { hash, subject: subj.join('|') };
 				});
 		} catch (e) {
-			void vscode.window.showErrorMessage(`获取提交列表失败：${errMsg(e)}`);
+			void vscode.window.showErrorMessage(`Failed to load commits: ${errMsg(e)}`);
 			return;
 		}
 		if (rebaseCommits.length === 0) {
-			void vscode.window.showInformationMessage(`${base}..HEAD 无提交`);
+			void vscode.window.showInformationMessage(`No commits in ${base}..HEAD`);
 			return;
 		}
 
@@ -102,6 +103,8 @@ export class RebaseWebview {
 					msg.actions as Array<{ hash: string; action: string; subject: string }>,
 					panel,
 				);
+			} else if (msg.type === 'cancel') {
+				panel.dispose();
 			}
 		});
 	}
@@ -117,7 +120,7 @@ export class RebaseWebview {
 		const rewordSubjects: string[] = [];
 		for (const a of actions) {
 			if (!isValidAction(a.action)) {
-				void vscode.window.showErrorMessage(`非法动作：${a.action}`);
+				void vscode.window.showErrorMessage(`Invalid action: ${a.action}`);
 				return;
 			}
 			todoItems.push({ action: a.action, hash: a.hash, subject: a.subject });
@@ -152,15 +155,15 @@ export class RebaseWebview {
 			const gitDir = (await service.execGit(['rev-parse', '--absolute-git-dir'])).trim();
 			if (fs.existsSync(path.join(gitDir, 'rebase-merge'))) {
 				void vscode.window.showWarningMessage(
-					'Rebase 已暂停（遇到 edit 或需处理）。请在终端运行：git rebase --continue / --skip / --abort。',
+					'Rebase paused (an edit or a conflict needs handling). Run in the terminal: git rebase --continue / --skip / --abort.',
 				);
 			} else {
-				void vscode.window.showInformationMessage('Rebase 完成');
+				void vscode.window.showInformationMessage('Rebase complete');
 				panel.dispose();
 			}
 		} catch (e) {
 			if (!(await handleGitConflict(service, 'Rebase'))) {
-				void vscode.window.showErrorMessage(`Rebase 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Rebase failed: ${errMsg(e)}`);
 			}
 		} finally {
 			for (const f of [tmpTodo, tmpEditor, tmpState]) {
@@ -181,7 +184,7 @@ export class RebaseWebview {
 		const rows = commits
 			.map(
 				(c) => `<tr draggable="true" data-hash="${escapeHtml(c.hash)}">
-<td class="drag" title="拖拽以重排序">⠿</td>
+<td class="drag" title="Drag to reorder"><svg class="grip" width="10" height="16" viewBox="0 0 10 16" fill="currentColor" aria-hidden="true"><circle cx="2" cy="3" r="1.3"/><circle cx="2" cy="8" r="1.3"/><circle cx="2" cy="13" r="1.3"/><circle cx="7" cy="3" r="1.3"/><circle cx="7" cy="8" r="1.3"/><circle cx="7" cy="13" r="1.3"/></svg></td>
 <td><select class="action">
 <option value="pick">pick</option>
 <option value="reword">reword</option>
@@ -196,55 +199,96 @@ export class RebaseWebview {
 			)
 			.join('\n');
 		return `<!DOCTYPE html>
-<html lang="zh-CN">
+<html lang="en">
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${nonce}'">
 <style>
+${getBaseStyles()}
 body { margin: 0; padding: 12px 16px; font-family: var(--vscode-font-family); color: var(--vscode-foreground); font-size: var(--vscode-font-size); background: var(--vscode-editor-background); }
 h3 { margin: 0 0 4px; font-weight: 600; }
-.hint { margin: 0 0 10px; font-size: 12px; color: var(--vscode-descriptionForeground); }
+.legend { margin: 0 0 8px; font-size: 11px; color: var(--vscode-descriptionForeground); line-height: 1.6; }
+.legend code { font-family: var(--vscode-editor-font-family); color: var(--vscode-textPreformat-foreground, var(--vscode-foreground)); }
+.summary { margin: 0 0 10px; font-size: 11px; color: var(--vscode-descriptionForeground); font-family: var(--vscode-editor-font-family); }
 table { width: 100%; border-collapse: collapse; }
-th, td { padding: 4px 6px; border-bottom: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.2)); text-align: left; }
+th, td { padding: 4px 6px; border-bottom: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.2)); text-align: left; vertical-align: middle; }
 th { font-weight: 600; font-size: 12px; color: var(--vscode-descriptionForeground); }
 td.drag { color: var(--vscode-descriptionForeground); cursor: grab; user-select: none; width: 18px; }
-td.hash { color: var(--vscode-editorWarning-foreground, #d29922); font-family: var(--vscode-editor-font-family); font-size: 12px; width: 70px; }
+td.drag .grip { display: inline-block; pointer-events: none; }
+td.hash { color: var(--vscode-descriptionForeground); font-family: var(--vscode-editor-font-family); font-size: 12px; width: 70px; }
 tr { background: transparent; }
+tr.action-drop { opacity: 0.5; }
+tr.action-drop input.subject { text-decoration: line-through; }
+tr.action-squash, tr.action-fixup { background: var(--vscode-editor-inactiveSelectionBackground, rgba(128,128,128,.12)); }
 tr.dragging { opacity: 0.4; }
 tr.drop-target { border-top: 2px solid var(--vscode-focusBorder, #007fd4); }
 select, input.subject { background: var(--vscode-input-background); color: var(--vscode-input-foreground); border: 1px solid var(--vscode-input-border, transparent); padding: 2px 4px; font-size: 12px; font-family: var(--vscode-font-family); }
-select { width: 80px; }
+select { width: 92px; }
 input.subject { width: 100%; }
 input.subject:disabled { color: var(--vscode-descriptionForeground); opacity: 0.85; }
 input.subject:not(:disabled) { border-color: var(--vscode-focusBorder, #007fd4); }
-.row-actions { margin-top: 12px; }
-button { padding: 6px 16px; background: var(--vscode-button-background); color: var(--vscode-button-foreground); border: none; border-radius: 2px; cursor: pointer; font-size: 13px; }
-button:hover { opacity: 0.9; }
-button.secondary { background: var(--vscode-button-secondaryBackground, transparent); color: var(--vscode-button-secondaryForeground, var(--vscode-foreground)); border: 1px solid var(--vscode-button-border, rgba(128,128,128,.4)); }
+.row-actions { margin-top: 12px; display: flex; gap: 8px; justify-content: flex-end; }
+.confirm-overlay { display: none; position: fixed; inset: 0; background: rgba(0,0,0,.4); align-items: center; justify-content: center; z-index: 100; }
+.confirm-box { background: var(--vscode-editorWidget-background, var(--vscode-editor-background)); color: var(--vscode-editorWidget-foreground, var(--vscode-foreground)); border: 1px solid var(--vscode-editorWidget-border, rgba(128,128,128,.4)); border-radius: 6px; padding: 16px 20px; max-width: 440px; box-shadow: 0 4px 16px rgba(0,0,0,.4); }
+.confirm-box .confirm-count { font-size: 13px; margin-bottom: 6px; }
+.confirm-box .confirm-summary { font-family: var(--vscode-editor-font-family); font-size: 11px; color: var(--vscode-descriptionForeground); margin-bottom: 14px; }
+.confirm-actions { display: flex; gap: 8px; justify-content: flex-end; }
 </style>
 </head>
 <body>
 <h3>Interactive Rebase</h3>
-<p class="hint">拖拽 ⠿ 重排序 · 选 reword 可行内编辑 message · edit/squash 会暂停（终端 continue） · drop 删除提交</p>
+<p class="legend"><code>reword</code> — edit the message inline &nbsp;·&nbsp; <code>edit</code>/<code>squash</code> — pauses rebase (continue in terminal) &nbsp;·&nbsp; <code>drop</code> — remove the commit &nbsp;·&nbsp; drag the handle to reorder.</p>
+<div class="summary" id="summary"></div>
 <table><thead><tr><th></th><th>Action</th><th>Hash</th><th>Subject</th></tr></thead>
 <tbody>${rows}</tbody></table>
 <div class="row-actions">
-<button id="rebase-btn">Start Rebase</button>
+<button class="hg-btn hg-btn--secondary" id="cancel-btn">Cancel</button>
+<button class="hg-btn" id="rebase-btn">Start Rebase</button>
+</div>
+<div class="confirm-overlay" id="confirm" role="dialog" aria-modal="true" aria-label="Confirm rebase">
+  <div class="confirm-box">
+    <div class="confirm-count" id="confirm-count"></div>
+    <div class="confirm-summary" id="confirm-summary"></div>
+    <div class="confirm-actions">
+      <button class="hg-btn hg-btn--secondary" id="confirm-cancel">Cancel</button>
+      <button class="hg-btn" id="confirm-go">Start Rebase</button>
+    </div>
+  </div>
 </div>
 <script nonce="${nonce}">
 (function () {
   var tbody = document.querySelector('tbody');
   var rows = function () { return Array.from(tbody.querySelectorAll('tr')); };
+  var confirmEl = document.getElementById('confirm');
+
+  function updateRowStates() {
+    rows().forEach(function (row) {
+      var action = row.querySelector('select.action').value;
+      row.classList.remove('action-pick','action-reword','action-edit','action-squash','action-fixup','action-drop');
+      row.classList.add('action-' + action);
+    });
+  }
+  function updateSummary() {
+    var counts = { pick: 0, reword: 0, edit: 0, squash: 0, fixup: 0, drop: 0 };
+    rows().forEach(function (row) { var a = row.querySelector('select.action').value; if (counts[a] !== undefined) counts[a] += 1; });
+    var parts = [];
+    Object.keys(counts).forEach(function (k) { if (counts[k]) parts.push(counts[k] + ' ' + k); });
+    document.getElementById('summary').textContent = parts.length ? parts.join('  ·  ') : '';
+  }
 
-  // action 变化：仅 reword 允许编辑 subject
+  // action 变化：仅 reword 允许编辑 subject；同步行视觉态与摘要。
   tbody.addEventListener('change', function (e) {
     if (e.target.classList.contains('action')) {
       var input = e.target.closest('tr').querySelector('input.subject');
       var isReword = e.target.value === 'reword';
       input.disabled = !isReword;
       if (isReword) { input.focus(); }
+      updateRowStates();
+      updateSummary();
     }
   });
+  updateRowStates();
+  updateSummary();
 
   // 拖拽重排序
   var dragged = null;
@@ -271,17 +315,26 @@ button.secondary { background: var(--vscode-button-secondaryBackground, transpar
     else { tbody.insertBefore(dragged, target); }
   });
 
-  // 提交：按 DOM 顺序收集
-  document.getElementById('rebase-btn').addEventListener('click', function () {
-    var actions = rows().map(function (row) {
-      return {
-        hash: row.dataset.hash,
-        action: row.querySelector('select.action').value,
-        subject: row.querySelector('input.subject').value,
-      };
+  function collectActions() {
+    return rows().map(function (row) {
+      return { hash: row.dataset.hash, action: row.querySelector('select.action').value, subject: row.querySelector('input.subject').value };
     });
-    acquireVsCodeApi().postMessage({ type: 'rebase', actions: actions });
+  }
+
+  // 执行前确认：rebase 改写历史，前置确认防误操作（非阻塞 HTML 覆盖层）。
+  document.getElementById('rebase-btn').addEventListener('click', function () {
+    var n = rows().length;
+    document.getElementById('confirm-count').textContent = 'Rebase ' + n + ' commit' + (n === 1 ? '' : 's') + ' — this rewrites history.';
+    document.getElementById('confirm-summary').textContent = document.getElementById('summary').textContent || (n + ' commits');
+    confirmEl.style.display = 'flex';
+    document.getElementById('confirm-go').focus();
+  });
+  document.getElementById('confirm-go').addEventListener('click', function () {
+    confirmEl.style.display = 'none';
+    acquireVsCodeApi().postMessage({ type: 'rebase', actions: collectActions() });
   });
+  document.getElementById('confirm-cancel').addEventListener('click', function () { confirmEl.style.display = 'none'; });
+  document.getElementById('cancel-btn').addEventListener('click', function () { acquireVsCodeApi().postMessage({ type: 'cancel' }); });
 })();
 </script>
 </body>
diff --git a/src/adapter/webview/shared-styles.ts b/src/adapter/webview/shared-styles.ts
new file mode 100644
index 0000000..aec77dc
--- /dev/null
+++ b/src/adapter/webview/shared-styles.ts
@@ -0,0 +1,85 @@
+/**
+ * Webview 共享设计 Token 与基础组件类（单一事实源）。
+ *
+ * 4 个自绘 Webview（Commit / Log / Merge / Rebase）共享同一套：
+ * - 设计 Token（spacing/radius，对齐 VS Code 语义）；
+ * - 基础组件类（`.hg-btn` / `.hg-btn--secondary` / `.hg-btn--sm` / `.hg-input` / `.hg-row`）
+ *   统一交互态（hover / active / focus-visible / disabled），消除各 Webview 各自硬编码导致的
+ *   「按钮无 hover」「`:last-child` 脆弱选择器」「无 focus ring」等熵增。
+ *
+ * 设计原则：纯字符串、零 vscode 依赖（可单测）；每个 Webview 在 `<style>` 首行注入
+ * {@link getBaseStyles}，再追加本地视图专属规则。本地规则可在必要时覆盖 token 派生值。
+ *
+ * 主题策略：颜色一律走 `--vscode-*` 语义令牌（深/浅主题自适应），不硬编码 hex。
+ */
+
+/** 按钮视觉变体。 */
+export type ButtonVariant = 'primary' | 'secondary' | 'sm';
+
+/**
+ * 基础样式：`:root` Token + 通用组件类 + 统一交互态。
+ * 返回纯 CSS 字符串，供 Webview 在 `<style>` 首行注入。
+ */
+export function getBaseStyles(): string {
+	return `:root {
+	--hg-space-1: 4px;
+	--hg-space-2: 8px;
+	--hg-space-3: 12px;
+	--hg-space-4: 16px;
+	--hg-space-6: 24px;
+	--hg-radius-control: var(--vscode-button-borderRadius, 3px);
+	--hg-radius-panel: 4px;
+}
+.hg-btn {
+	padding: 6px 10px;
+	border: none;
+	border-radius: var(--hg-radius-control);
+	cursor: pointer;
+	background: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+	font-size: 13px;
+	font-family: var(--vscode-font-family);
+	transition: background-color .12s ease, filter .12s ease, opacity .12s ease;
+}
+.hg-btn:hover { background: var(--vscode-button-hoverBackground, var(--vscode-button-background)); }
+.hg-btn:active { filter: brightness(0.92); }
+.hg-btn:focus-visible { outline: 2px solid var(--vscode-focusBorder); outline-offset: 1px; }
+.hg-btn:disabled { opacity: 0.5; cursor: default; }
+.hg-btn--secondary {
+	background: var(--vscode-button-secondaryBackground);
+	color: var(--vscode-button-secondaryForeground);
+	border: 1px solid var(--vscode-button-border, transparent);
+}
+.hg-btn--secondary:hover { background: var(--vscode-button-secondaryHoverBackground, var(--vscode-button-secondaryBackground)); }
+.hg-btn--sm { padding: 2px 8px; font-size: 11px; }
+.hg-input {
+	background: var(--vscode-input-background);
+	color: var(--vscode-input-foreground);
+	border: 1px solid var(--vscode-input-border, transparent);
+	border-radius: var(--hg-radius-control);
+	padding: 6px;
+	font-family: var(--vscode-editor-font-family);
+	font-size: var(--vscode-font-size);
+}
+.hg-input:focus { border-color: var(--vscode-inputOption-activeBorder, var(--vscode-focusBorder)); }
+.hg-input:focus-visible { outline: 2px solid var(--vscode-focusBorder); outline-offset: -1px; }
+.hg-row { display: flex; align-items: center; gap: 6px; padding: 2px 8px; cursor: pointer; }
+.hg-row:hover { background: var(--vscode-list-hoverBackground); }
+@media (prefers-reduced-motion: reduce) {
+	.hg-btn { transition: none; }
+}`;
+}
+
+/**
+ * 便捷拼接按钮 class（用于 TS 模板字符串动态构造按钮）。
+ * `getButtonClass()` → 主按钮；`getButtonClass('secondary')` → 次按钮；`getButtonClass('sm')` → 小按钮。
+ */
+export function getButtonClass(variant?: ButtonVariant): string {
+	if (variant === 'secondary') {
+		return 'hg-btn hg-btn--secondary';
+	}
+	if (variant === 'sm') {
+		return 'hg-btn hg-btn--sm';
+	}
+	return 'hg-btn';
+}
diff --git a/src/adapter/worktree-commands.ts b/src/adapter/worktree-commands.ts
index d18a5b8..6baaa3d 100644
--- a/src/adapter/worktree-commands.ts
+++ b/src/adapter/worktree-commands.ts
@@ -29,11 +29,11 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			// ① 分支模式
 			const modePick = await vscode.window.showQuickPick(
 				[
-					{ label: '新建分支', description: '创建新分支并检出', mode: 'new' as const },
-					{ label: '检出已有分支', description: '检出已存在的本地分支', mode: 'checkout' as const },
-					{ label: 'Detached HEAD', description: '在指定提交/分支上 detached 检出', mode: 'detached' as const },
+					{ label: 'New branch', description: 'Create a new branch and check it out', mode: 'new' as const },
+					{ label: 'Checkout existing branch', description: 'Check out an existing local branch', mode: 'checkout' as const },
+					{ label: 'Detached HEAD', description: 'Check out a commit/branch in detached state', mode: 'detached' as const },
 				],
-				{ placeHolder: 'Worktree 分支模式' },
+				{ placeHolder: 'Worktree branch mode' },
 			);
 			if (!modePick) {
 				return;
@@ -43,11 +43,11 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			let branch: string | undefined;
 			let sourceRef: string | undefined;
 			if (modePick.mode === 'new') {
-				branch = await vscode.window.showInputBox({ prompt: '新分支名', placeHolder: 'feature/y' });
+				branch = await vscode.window.showInputBox({ prompt: 'New branch name', placeHolder: 'feature/y' });
 				if (!branch?.trim()) {
 					return;
 				}
-				const start = await vscode.window.showInputBox({ prompt: '基于（start-point，留空 = HEAD）', placeHolder: 'HEAD / main / abc1234' });
+				const start = await vscode.window.showInputBox({ prompt: 'Start point (leave empty = HEAD)', placeHolder: 'HEAD / main / abc1234' });
 				if (start === undefined) {
 					return; // Esc 取消；空字符串 = HEAD（允许）
 				}
@@ -66,7 +66,7 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 					// 列表读取失败 → 退化为空列表（下方 pick 为空时取消）
 				}
 				const pick = await vscode.window.showQuickPick(items, {
-					placeHolder: modePick.mode === 'detached' ? '选择提交/分支（detached）' : '选择本地分支',
+					placeHolder: modePick.mode === 'detached' ? 'Select commit/branch (detached)' : 'Select a local branch',
 				});
 				if (!pick) {
 					return;
@@ -77,7 +77,7 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			// ③ Worktree 路径
 			const safeName = (branch ?? sourceRef ?? 'worktree').replace(/[^A-Za-z0-9._-]+/g, '-');
 			const wtPath = await vscode.window.showInputBox({
-				prompt: 'Worktree 路径（相对仓库根 / 绝对）',
+				prompt: 'Worktree path (relative to repo root / absolute)',
 				value: `../${safeName}-wt`,
 				placeHolder: '../feature-y-wt',
 			});
@@ -102,9 +102,9 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			try {
 				await service.execGit(args);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已创建 Worktree：${wtPath.trim()}`);
+				void vscode.window.showInformationMessage(`Worktree created: ${wtPath.trim()}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`创建 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to create Worktree: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -127,29 +127,29 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 				return;
 			}
 			if (node.isMain) {
-				void vscode.window.showWarningMessage('主工作树不可删除');
+				void vscode.window.showWarningMessage('The main worktree cannot be deleted');
 				return;
 			}
 			if (worktreeTree.isCurrent(node)) {
-				void vscode.window.showWarningMessage('当前打开的 Worktree 不可删除，请先切换到其他窗口');
+				void vscode.window.showWarningMessage('The currently open Worktree cannot be deleted; please switch to another window first');
 				return;
 			}
 			const forcePick = await vscode.window.showQuickPick(
 				[
-					{ label: '删除', description: '含未提交改动将失败', f: false as const },
-					{ label: '强制删除', description: '忽略未提交改动（不可逆）', f: true as const },
+					{ label: 'Delete', description: 'Fails if there are uncommitted changes', f: false as const },
+					{ label: 'Force delete', description: 'Ignore uncommitted changes (irreversible)', f: true as const },
 				],
-				{ placeHolder: '删除 Worktree' },
+				{ placeHolder: 'Delete Worktree' },
 			);
 			if (!forcePick) {
 				return;
 			}
 			const ok = await vscode.window.showWarningMessage(
-				`删除 Worktree？\n${node.path}\n（${node.ref}）`,
+				`Delete Worktree?\n${node.path}\n(${node.ref})`,
 				{ modal: true },
-				'删除',
+				'Delete',
 			);
-			if (ok !== '删除') {
+			if (ok !== 'Delete') {
 				return;
 			}
 			try {
@@ -160,9 +160,9 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 				args.push(node.path);
 				await service.execGit(args);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已删除 Worktree：${node.name}`);
+				void vscode.window.showInformationMessage(`Worktree deleted: ${node.name}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`删除 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to delete Worktree: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -173,7 +173,7 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 				return;
 			}
 			await vscode.env.clipboard.writeText(node.path);
-			void vscode.window.showInformationMessage('已复制 Worktree 路径');
+			void vscode.window.showInformationMessage('Worktree path copied');
 		}),
 	);
 
@@ -183,7 +183,7 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			if (!repo || !node || node.kind !== 'worktree') {
 				return;
 			}
-			const reason = await vscode.window.showInputBox({ prompt: '锁定原因（可空）', placeHolder: '正在备份' });
+			const reason = await vscode.window.showInputBox({ prompt: 'Lock reason (optional)', placeHolder: 'Backing up' });
 			if (reason === undefined) {
 				return; // Esc 取消；空字符串 = 无原因（允许）
 			}
@@ -195,9 +195,9 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 				args.push(node.path);
 				await service.execGit(args);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已锁定 Worktree：${node.name}`);
+				void vscode.window.showInformationMessage(`Worktree locked: ${node.name}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`锁定 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to lock Worktree: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -211,9 +211,9 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			try {
 				await service.execGit(['worktree', 'unlock', node.path]);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已解锁 Worktree：${node.name}`);
+				void vscode.window.showInformationMessage(`Worktree unlocked: ${node.name}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`解锁 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to unlock Worktree: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -225,11 +225,11 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 				return;
 			}
 			if (node.isMain) {
-				void vscode.window.showWarningMessage('主工作树不可移动');
+				void vscode.window.showWarningMessage('The main worktree cannot be moved');
 				return;
 			}
 			const dest = await vscode.window.showInputBox({
-				prompt: '新路径（相对仓库根 / 绝对）',
+				prompt: 'New path (relative to repo root / absolute)',
 				placeHolder: '../new-location',
 			});
 			if (!dest?.trim()) {
@@ -238,9 +238,9 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 			try {
 				await service.execGit(['worktree', 'move', node.path, dest.trim()]);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已移动 Worktree → ${dest.trim()}`);
+				void vscode.window.showInformationMessage(`Worktree moved → ${dest.trim()}`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`移动 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to move Worktree: ${errMsg(e)}`);
 			}
 		}),
 	);
@@ -259,27 +259,27 @@ export function registerWorktreeCommands(service: GitRepositoryService, worktree
 					.filter((p) => p.prunable)
 					.map((p) => p.path);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`读取 Worktree 列表失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to read Worktree list: ${errMsg(e)}`);
 				return;
 			}
 			if (prunablePaths.length === 0) {
-				void vscode.window.showInformationMessage('无可清理的失效 Worktree');
+				void vscode.window.showInformationMessage('No stale Worktrees to prune');
 				return;
 			}
 			const ok = await vscode.window.showWarningMessage(
-				`清理 ${prunablePaths.length} 个失效 Worktree 元数据？\n${prunablePaths.join('\n')}`,
+				`Prune metadata for ${prunablePaths.length} stale Worktree(s)?\n${prunablePaths.join('\n')}`,
 				{ modal: true },
-				'清理',
+				'Prune',
 			);
-			if (ok !== '清理') {
+			if (ok !== 'Prune') {
 				return;
 			}
 			try {
 				await service.execGit(['worktree', 'prune', '-v']);
 				worktreeTree.refresh();
-				void vscode.window.showInformationMessage(`已清理 ${prunablePaths.length} 个失效 Worktree`);
+				void vscode.window.showInformationMessage(`Pruned ${prunablePaths.length} stale Worktree(s)`);
 			} catch (e) {
-				void vscode.window.showErrorMessage(`清理 Worktree 失败：${errMsg(e)}`);
+				void vscode.window.showErrorMessage(`Failed to prune Worktrees: ${errMsg(e)}`);
 			}
 		}),
 	);
diff --git a/src/agent/pre-commit.ts b/src/agent/pre-commit.ts
index b39451b..53e08a0 100644
--- a/src/agent/pre-commit.ts
+++ b/src/agent/pre-commit.ts
@@ -4,7 +4,7 @@ import type { CheckinHook } from '../engine/commit/pipeline';
 /**
  * AI 接缝（M5 实现）：提交前审查。
  *
- * 对齐 IntelliJ IDEA `CheckinHandler.beforeCheckin()` / `CommitCheck.runCheck()`——
+ * 参考 JetBrains `CheckinHandler.beforeCheckin()` / `CommitCheck.runCheck()` 责任链设计——
  * 挂载到 CommitPipeline 责任链，可返回 COMMIT 放行或 CANCEL 阻断不良提交。
  * 现仅定义契约；M2 起接入内置非 AI 检查（TODO/reformat），M5 起接入 AI 代码审查。
  */
diff --git a/src/engine/blame/blame-parser.ts b/src/engine/blame/blame-parser.ts
index 09ccad1..f57e0fd 100644
--- a/src/engine/blame/blame-parser.ts
+++ b/src/engine/blame/blame-parser.ts
@@ -3,7 +3,7 @@
  *
  * line-porcelain 格式：每行一个 header 块（首行 "<sha> <origLine> <finalLine> [groupCount]"），
  * 随后若干 "key value" 元数据（author / author-time / summary 等），以 "\t<原始行内容>" 结束。
- * 解析为每个最终行号 → BlameLine，供编辑器 gutter 注解（IDEA Annotate 等价）。
+ * 解析为每个最终行号 → BlameLine，供编辑器 gutter 注解（逐行作者 / 日期 / 提交注解）。
  */
 
 export interface BlameLine {
diff --git a/src/engine/changelist/grouper.ts b/src/engine/changelist/grouper.ts
index 26bc503..ae4f684 100644
--- a/src/engine/changelist/grouper.ts
+++ b/src/engine/changelist/grouper.ts
@@ -1,8 +1,8 @@
 /**
  * Changelist 分组纯逻辑（零 vscode 依赖，可单测）。
  *
- * 仿 IntelliJ IDEA `ChangeListManager`：变更项（item）按 key（文件相对路径）
- * 分配到命名 changelist；未显式分配者落入 active changelist（IDEA 默认行为）。
+ * 参考 JetBrains `ChangeListManager` 设计：变更项（item）按 key（文件相对路径）
+ * 分配到命名 changelist；未显式分配者落入 active changelist（默认行为）。
  */
 
 export interface ChangelistDef {
@@ -35,7 +35,7 @@ export function groupByChangelist<T>(
 	assignments: ChangelistAssignment,
 	activeId: string,
 ): GroupedChangelist<T>[] {
-	// 未分配项始终落入 active changelist（IDEA 语义：新改动默认归活动列表）。
+	// 未分配项始终落入 active changelist（新改动默认归活动列表）。
 	const fallbackId = activeId;
 
 	const buckets = new Map<string, T[]>();
diff --git a/src/engine/ci/graphql-query.ts b/src/engine/ci/graphql-query.ts
new file mode 100644
index 0000000..6d0db48
--- /dev/null
+++ b/src/engine/ci/graphql-query.ts
@@ -0,0 +1,80 @@
+/**
+ * CI 批量查询的 GraphQL 构造（纯逻辑，零 vscode/网络依赖）。
+ *
+ * 用别名（`c0: object(oid:…)`）在单次请求内拉取**多个**提交的 `statusCheckRollup`，避免
+ * N 个提交 = N 次 REST 往返（Log 一页可达 1000 提交）。`owner/name` 走 `$variables` 不插值
+ * （防注入）；oid 来自信任源（git log）但仍做 `/^[0-9a-f]{7,40}$/i` 防御性校验后再插值别名。
+ */
+
+/** oid 合法形态（git SHA-1：7~40 位十六进制）。非法 oid 直接抛错，杜绝构造畸形查询。 */
+const OID_RE = /^[0-9a-f]{7,40}$/i;
+
+/** 别名前缀（构造端与解析端共用此单一事实源，按序号映射回 oid）。 */
+export const CI_ALIAS_PREFIX = 'c';
+
+/** 每次查询拉取每个 commit 的 context 上限（极少 commit 超 50 项；超出按 total 已知、明细取首 50）。 */
+export const DEFAULT_CONTEXTS_PER_COMMIT = 50;
+
+/** buildCiQuery 入参。 */
+export interface CiQueryInput {
+	readonly owner: string;
+	readonly name: string;
+	/** 已去重、已切片至 ≤ 单次上限的 oid 列表。 */
+	readonly oids: readonly string[];
+	readonly contextsPerCommit?: number;
+}
+
+/** buildCiQuery 产出：查询串 + alias→oid 映射（解析端据序号回填 hash）。 */
+export interface CiQueryOutput {
+	readonly query: string;
+	/** 第 i 个 alias 对应第 i 个 oid（与入参 oids 同序）。 */
+	readonly aliases: readonly string[];
+}
+
+/**
+ * 构造批量 GraphQL 文档。所有 oid 经 {@link OID_RE} 校验（防御性）；owner/name 不插值，
+ * 经 `$variables` 传递。附带 `rateLimit{cost remaining resetAt}` 供 adapter 自适应限流冷却。
+ */
+export function buildCiQuery(input: CiQueryInput): CiQueryOutput {
+	const first = input.contextsPerCommit ?? DEFAULT_CONTEXTS_PER_COMMIT;
+	if (!Number.isInteger(first) || first <= 0) {
+		throw new Error(`contextsPerCommit 非法：${first}`);
+	}
+	const oids = input.oids;
+	if (oids.length === 0) {
+		throw new Error('oids 为空');
+	}
+	const aliases: string[] = [];
+	const fields: string[] = [];
+	for (let i = 0; i < oids.length; i++) {
+		const oid = oids[i];
+		if (typeof oid !== 'string' || !OID_RE.test(oid)) {
+			throw new Error(`非法 oid：${oid}`);
+		}
+		const alias = CI_ALIAS_PREFIX + i;
+		aliases.push(alias);
+		// oid 已校验为十六进制，安全插值。
+		fields.push(`${alias}: object(oid: "${oid}") { ...CiCommitRollup }`);
+	}
+	const query = `query CiBatch($owner: String!, $name: String!) {
+  rateLimit { cost remaining resetAt }
+  repository(owner: $owner, name: $name) {
+${fields.map((f) => '    ' + f).join('\n')}
+  }
+}
+fragment CiCommitRollup on Commit {
+  oid
+  statusCheckRollup {
+    state
+    contexts(first: ${first}) {
+      totalCount
+      nodes {
+        __typename
+        ... on CheckRun { name status conclusion detailsUrl }
+        ... on StatusContext { context state targetUrl description }
+      }
+    }
+  }
+}`;
+	return { query, aliases };
+}
diff --git a/src/engine/ci/model.ts b/src/engine/ci/model.ts
new file mode 100644
index 0000000..9f7d012
--- /dev/null
+++ b/src/engine/ci/model.ts
@@ -0,0 +1,100 @@
+/**
+ * GraphQL 响应 → {@link CiStatusVM} 解析（纯逻辑，零 vscode/网络依赖）。
+ *
+ * 按构造端约定的别名序号（{@link CI_ALIAS_PREFIX} + i）回填 oid → hash。响应形态宽容：
+ * 别名值为 null（提交未推送到远程，远程无此 object）→ unknown（不渲染图标）；rollup 缺失
+ * （无 CI 配置）→ unknown；缺 `data`/含 `errors` 时整批回退 unknown，不抛错（单次解析不中断）。
+ */
+
+import { CI_ALIAS_PREFIX } from './graphql-query';
+import { aggregateChecks, checkRunState, mapRollupState, statusContextState } from './rollup';
+import type { CiCheckVM, CiStatusVM } from './types';
+
+/** 空响应（无 CI / 未推送 / 解析失败）的统一 VM。 */
+export const UNKNOWN_CI: CiStatusVM = Object.freeze({
+	state: 'unknown',
+	checks: [],
+	passed: 0,
+	total: 0,
+});
+
+/** rateLimit 抽取（供 adapter 自适应限流冷却）。 */
+export interface RateLimitInfo {
+	readonly remaining: number | null;
+	readonly resetAt: string | null;
+}
+
+/** 从响应体抽取 rateLimit（缺失返回 null）。 */
+export function extractRateLimit(json: unknown): RateLimitInfo | null {
+	const rl = (json as { data?: { rateLimit?: { remaining?: unknown; resetAt?: unknown } } })?.data?.rateLimit;
+	if (!rl) {
+		return null;
+	}
+	return {
+		remaining: typeof rl.remaining === 'number' ? rl.remaining : null,
+		resetAt: typeof rl.resetAt === 'string' ? rl.resetAt : null,
+	};
+}
+
+type RawNode = Record<string, unknown> | null | undefined;
+
+/** 单个 context（CheckRun 或 StatusContext）归一为 {@link CiCheckVM}；不可识别返回 null。 */
+function normalizeContext(node: RawNode): CiCheckVM | null {
+	if (!node || typeof node !== 'object') {
+		return null;
+	}
+	const typename = node.__typename;
+	if (typename === 'CheckRun') {
+		const status = (node.status as string | null | undefined) ?? null;
+		const conclusion = (node.conclusion as string | null | undefined) ?? null;
+		return {
+			name: String(node.name ?? 'check'),
+			state: checkRunState(status, conclusion),
+			conclusion: conclusion ?? status ?? undefined,
+			url: (node.detailsUrl as string | undefined) || undefined,
+		};
+	}
+	if (typename === 'StatusContext') {
+		const raw = (node.state as string | null | undefined) ?? null;
+		return {
+			name: String(node.context ?? 'status'),
+			state: statusContextState(raw),
+			conclusion: raw ?? undefined,
+			description: (node.description as string | undefined) || undefined,
+			url: (node.targetUrl as string | undefined) || undefined,
+		};
+	}
+	return null;
+}
+
+/** 单个别名节点 → {@link CiStatusVM}。null/无 rollup/空 contexts 统一回退 {@link UNKNOWN_CI}。 */
+function parseCommitNode(node: RawNode): CiStatusVM {
+	if (!node) {
+		return UNKNOWN_CI;
+	}
+	const rollup = (node as { statusCheckRollup?: RawNode }).statusCheckRollup;
+	if (!rollup) {
+		return UNKNOWN_CI;
+	}
+	const rollupState = mapRollupState((rollup as { state?: unknown }).state as string | undefined);
+	const nodes = (rollup as { contexts?: { nodes?: RawNode[] } }).contexts?.nodes ?? [];
+	const checks = nodes
+		.map((n) => normalizeContext(n))
+		.filter((c): c is CiCheckVM => c !== null);
+	return aggregateChecks(rollupState, checks);
+}
+
+/**
+ * 解析整批响应为 `hash → CiStatusVM`。按别名序号与 `requestedOids` 同序映射；
+ * 缺 `data`/`repository` 时仍为每个 oid 回填 unknown（保序、不抛错）。
+ */
+export function parseCiResponse(json: unknown, requestedOids: readonly string[]): Map<string, CiStatusVM> {
+	const map = new Map<string, CiStatusVM>();
+	const repository = (json as { data?: { repository?: Record<string, RawNode> } })?.data?.repository;
+	for (let i = 0; i < requestedOids.length; i++) {
+		const alias = CI_ALIAS_PREFIX + i;
+		const node = repository ? repository[alias] : undefined;
+		map.set(requestedOids[i], parseCommitNode(node));
+	}
+	return map;
+}
diff --git a/src/engine/ci/remote-parser.ts b/src/engine/ci/remote-parser.ts
new file mode 100644
index 0000000..93cd72d
--- /dev/null
+++ b/src/engine/ci/remote-parser.ts
@@ -0,0 +1,92 @@
+/**
+ * Git 远程 URL → GitHub 坐标解析（纯逻辑，零 vscode/网络依赖）。
+ *
+ * Log 视图的 CI 数据只存在于 GitHub，需先把仓库远程映射为 `{host, owner, repo}` 才能
+ * 调用 GraphQL。本模块只回答「这个 URL 是否长得像 GitHub 坐标」——不硬编码 github.com，
+ * GHE 主机亦接受；「是否真的去访问该主机」是策略，交由 adapter 层（机制/策略分离），
+ * 使 GHE 支持无需改解析器。
+ */
+
+/** 解析出的 GitHub 坐标。 */
+export interface GitHubRemote {
+	/** 主机（小写，github.com 或 GHE 主机，如 ghe.acme.com）。 */
+	readonly host: string;
+	readonly owner: string;
+	/** 仓库名（已去除尾部 `.git`）。 */
+	readonly repo: string;
+	readonly isGitHubDotCom: boolean;
+}
+
+/** scp 式 SSH：`git@github.com:owner/repo`（无 `://` 方案时方按此形态匹配）。 */
+const SCP_RE = /^[^/:]+:([^?#]+)$/;
+
+/** owner / repo 合法字符（GitHub 限制：字母数字 `_` `-` `.`）。 */
+const NAME_RE = /^[\w.-]+$/;
+
+/**
+ * 解析 git 远程 URL 为 GitHub 坐标，非可识别形态返回 null。
+ * 覆盖：https / `git@host:o/r` scp 式 / `ssh://[user@]host[:port]/` / 带/不带 `.git` / GHE 主机。
+ */
+export function parseGitHubRemote(input: string): GitHubRemote | null {
+	const url = input?.trim();
+	if (!url) {
+		return null;
+	}
+	let host: string;
+	let path: string;
+	const hasScheme = /^[a-z][a-z0-9+.-]*:\/\//i.test(url);
+	if (hasScheme) {
+		let parsed: URL;
+		try {
+			parsed = new URL(url);
+		} catch {
+			return null;
+		}
+		host = parsed.hostname.toLowerCase();
+		path = parsed.pathname;
+	} else {
+		// scp 形态：`git@host:path` —— hostname 由 URL 不可靠，手动提取首个 `:` 前的部分。
+		const scp = url.match(SCP_RE);
+		if (!scp) {
+			return null;
+		}
+		const colon = url.indexOf(':');
+		const head = url.slice(0, colon);
+		const at = head.lastIndexOf('@');
+		host = (at >= 0 ? head.slice(at + 1) : head).toLowerCase();
+		path = scp[1];
+	}
+
+	let p = decodeURIComponent(path).replace(/^\/+/, '').replace(/\/+$/, '');
+	if (/\.git$/i.test(p)) {
+		p = p.slice(0, -4);
+	}
+	// 去尾部 query/fragment 残片（防御性）。
+	p = p.split(/[?#]/)[0];
+	const seg = p.split('/');
+	if (seg.length < 2) {
+		return null;
+	}
+	const owner = seg[0];
+	const repo = seg[1];
+	if (!owner || !repo || !NAME_RE.test(owner) || !NAME_RE.test(repo)) {
+		return null;
+	}
+	if (!host) {
+		return null;
+	}
+	return { host, owner, repo, isGitHubDotCom: host === 'github.com' };
+}
+
+/**
+ * 推导 GraphQL 端点。github.com → api.github.com；GHE → `<host>/api/graphql`
+ * （**非** `/api/v3/graphql`，后者是 REST 路径——GHE GraphQL 为 `/api/graphql`）。一律 https。
+ */
+export function graphqlEndpoint(remote: GitHubRemote): string {
+	return remote.isGitHubDotCom ? 'https://api.github.com/graphql' : `https://${remote.host}/api/graphql`;
+}
+
+/** 该主机对应的 VS Code 认证 provider id（github.com→`github`，其余→`github-enterprise`）。 */
+export function authProviderId(remote: GitHubRemote): 'github' | 'github-enterprise' {
+	return remote.isGitHubDotCom ? 'github' : 'github-enterprise';
+}
diff --git a/src/engine/ci/rollup.ts b/src/engine/ci/rollup.ts
new file mode 100644
index 0000000..c502798
--- /dev/null
+++ b/src/engine/ci/rollup.ts
@@ -0,0 +1,100 @@
+/**
+ * CI 状态归一化与聚合（纯逻辑，零 vscode/网络依赖）。
+ *
+ * GitHub 一颗 commit 的 CI 由两类来源混合：**CheckRun**（GitHub Actions 等 Checks API）与
+ * **StatusContext**（旧 Commit Status，外部 CI）。二者字段名不同（conclusion vs state），需归一为
+ * 单一 {@link CiState} 供渲染。rollup 的 `state` 字段是 GitHub 已聚合好的「最终状态」，作为权威
+ * 图标状态优先采用；明细项各自归一用于 Tooltip。
+ */
+
+import type { CiCheckVM, CiState, CiStatusVM } from './types';
+
+/** rollup `state`（StatusState）→ {@link CiState}。EXPECTED 视为 pending（有待报告的检查）。 */
+export function mapRollupState(state: string | null | undefined): CiState {
+	if (!state) {
+		return 'unknown';
+	}
+	switch (state) {
+		case 'SUCCESS':
+			return 'success';
+		case 'FAILURE':
+		case 'ERROR':
+			return 'failure';
+		case 'PENDING':
+		case 'EXPECTED':
+			return 'pending';
+		default:
+			return 'unknown';
+	}
+}
+
+/**
+ * CheckRun → {@link CiState}。未完成一律 pending；非阻塞结论（NEUTRAL/SKIPPED）算通过
+ * （跳过的检查不视为失败）。
+ */
+export function checkRunState(status: string | null | undefined, conclusion: string | null | undefined): CiState {
+	// 未完成（QUEUED/IN_PROGRESS/WAITING/PENDING/REQUESTED/null）一律 pending。
+	if (status !== 'COMPLETED') {
+		return 'pending';
+	}
+	switch (conclusion ?? null) {
+		case 'SUCCESS':
+		case 'NEUTRAL':
+		case 'SKIPPED':
+			return 'success';
+		case 'FAILURE':
+		case 'ERROR':
+		case 'CANCELLED':
+		case 'TIMED_OUT':
+		case 'ACTION_REQUIRED':
+		case 'STARTUP_FAILURE':
+		case 'STALE':
+			return 'failure';
+		default:
+			// COMPLETED 但结论缺失/未知：保守视为运行中。
+			return 'pending';
+	}
+}
+
+/** StatusContext → {@link CiState}（复用 rollup 映射）。 */
+export function statusContextState(state: string | null | undefined): CiState {
+	return mapRollupState(state);
+}
+
+/** 选择 Tooltip 的最佳跳转链接：首个失败项 → 否则首个有链接项 → 否则 undefined。 */
+export function pickPrimaryUrl(checks: readonly CiCheckVM[]): string | undefined {
+	const failed = checks.find((c) => c.state === 'failure' && c.url);
+	if (failed?.url) {
+		return failed.url;
+	}
+	return checks.find((c) => c.url)?.url;
+}
+
+/** 权威状态缺失时据已归一明细兜底重算（任一 failure→failure；任一 pending→pending；全通过→success）。 */
+export function recomputeState(checks: readonly CiCheckVM[]): CiState {
+	if (checks.length === 0) {
+		return 'unknown';
+	}
+	if (checks.some((c) => c.state === 'failure')) {
+		return 'failure';
+	}
+	if (checks.some((c) => c.state === 'pending')) {
+		return 'pending';
+	}
+	return 'success';
+}
+
+/**
+ * 汇总已归一明细为 {@link CiStatusVM}。`rollupState` 为权威图标状态；若为 unknown 但存在明细，
+ * 则用 {@link recomputeState} 兜底（防御性，应对个别 rollup 缺失）。
+ */
+export function aggregateChecks(rollupState: CiState, checks: readonly CiCheckVM[]): CiStatusVM {
+	const state = rollupState !== 'unknown' ? rollupState : recomputeState(checks);
+	return {
+		state,
+		checks,
+		passed: checks.filter((c) => c.state === 'success').length,
+		total: checks.length,
+		url: pickPrimaryUrl(checks),
+	};
+}
diff --git a/src/engine/ci/types.ts b/src/engine/ci/types.ts
new file mode 100644
index 0000000..e4aebfc
--- /dev/null
+++ b/src/engine/ci/types.ts
@@ -0,0 +1,42 @@
+/**
+ * CI 状态视图模型（纯逻辑，零 vscode/网络依赖）。
+ *
+ * 汇总 GitHub「Commit Status（旧）+ Check Runs（GitHub Actions）」为单一语义状态，
+ * 供 Log 视图按提交渲染绿勾/红叉/运行中图标与悬停明细。状态语义（{@link CiState}）与展示
+ * 解耦：引擎只产出归一化状态 + 原始 conclusion 文案，渲染器（webview）据 state 决定图标与主题色。
+ */
+
+/**
+ * 提交的 CI 归一化状态：
+ * - `success` 全部检查通过（含 NEUTRAL/SKIPPED 等非阻塞结论）；
+ * - `failure` 至少一项失败（FAILURE/ERROR/TIMED_OUT/CANCELLED/ACTION_REQUIRED…）；
+ * - `pending` 至少一项进行中且无失败（PENDING/EXPECTED/QUEUED/IN_PROGRESS…）；
+ * - `unknown` 无 CI 配置 / 提交未推送到远程 / 非 Commit 对象（不渲染图标）。
+ */
+export type CiState = 'success' | 'failure' | 'pending' | 'unknown';
+
+/** 单条检查项（一个 CheckRun 或一个 StatusContext）的视图模型。 */
+export interface CiCheckVM {
+	/** 检查名（CheckRun.name 或 StatusContext.context）。 */
+	readonly name: string;
+	/** 归一化状态 → 决定 Tooltip 内的图标。 */
+	readonly state: CiState;
+	/** 原始结论/状态文案（如 `TIMED_OUT` / `FAILURE`），供 Tooltip 直显，便于定位「未通过原因」。 */
+	readonly conclusion?: string;
+	/** 描述（StatusContext.description，外部 CI 常在此给出失败摘要）。 */
+	readonly description?: string;
+	/** 该检查的运行详情链接（CheckRun.detailsUrl / StatusContext.targetUrl）。 */
+	readonly url?: string;
+}
+
+/** 单个提交的 CI 汇总。`state` 为权威图标状态（直接取自 GitHub rollup，覆盖全部 context）。 */
+export interface CiStatusVM {
+	readonly state: CiState;
+	readonly checks: readonly CiCheckVM[];
+	/** 已通过检查数（基于已取回的 checks 统计）。 */
+	readonly passed: number;
+	/** 检查总数（基于已取回的 checks 统计）。 */
+	readonly total: number;
+	/** 最佳跳转链接（优先首个失败项，其次首个有链接项）—— Tooltip「在 GitHub 查看」。 */
+	readonly url?: string;
+}
diff --git a/src/engine/commit/pipeline.ts b/src/engine/commit/pipeline.ts
index b68d632..d8a7a31 100644
--- a/src/engine/commit/pipeline.ts
+++ b/src/engine/commit/pipeline.ts
@@ -1,10 +1,10 @@
 /**
  * 提交前检查流水线（有序责任链）。
  *
- * 对齐 IntelliJ IDEA `CheckinHandler` 生命周期（platform/vcs-api/.../checkin/CheckinHandler.java）：
- * - `CheckinResult` 对齐 `CheckinHandler.ReturnResult`（COMMIT / CANCEL / CLOSE_WINDOW→映射为 DEFER）；
- * - `CheckinHook.beforeCheckin` 对齐 `beforeCheckin()` 闸门；
- * - `executionOrder` 对齐 `CommitCheck.ExecutionOrder`（越小越早，默认 100）。
+ * 参考 JetBrains `CheckinHandler.beforeCheckin()` 责任链设计（platform/vcs-api/.../checkin/CheckinHandler.java）：
+ * - `CheckinResult` 对应 `CheckinHandler.ReturnResult`（COMMIT / CANCEL / CLOSE_WINDOW→映射为 DEFER）；
+ * - `CheckinHook.beforeCheckin` 对应 `beforeCheckin()` 闸门；
+ * - `executionOrder` 对应 `CommitCheck.ExecutionOrder`（越小越早，默认 100）。
  *
  * 任一 hook 返回 CANCEL 即阻断提交。M2 起注入内置检查与（M5）AI 审查。
  */
diff --git a/src/engine/commit/trailer.ts b/src/engine/commit/trailer.ts
index fb75f2a..17cae7c 100644
--- a/src/engine/commit/trailer.ts
+++ b/src/engine/commit/trailer.ts
@@ -1,7 +1,7 @@
 /**
  * Commit trailer 构造（纯逻辑，零 vscode 依赖）。
  *
- * 对齐 IDEA/Conventional Commits 的 Co-authored-by trailer 追加，以及 --author 参数值格式化。
+ * Co-authored-by trailer 追加（遵循 Conventional Commits），以及 --author 参数值格式化。
  * trailer 与 message body 之间需空行分隔；重复 trailer 不重复追加。
  */
 
diff --git a/src/engine/diff/editor-mapping.ts b/src/engine/diff/editor-mapping.ts
index f8cdfcb..72d445b 100644
--- a/src/engine/diff/editor-mapping.ts
+++ b/src/engine/diff/editor-mapping.ts
@@ -16,7 +16,7 @@ export interface EditorRegion {
 }
 
 /**
- * 把 DiffFile 的每个 hunk 映射为编辑器区域（IDEA LineStatusTracker 的纯逻辑等价）。
+ * 把 DiffFile 的每个 hunk 映射为编辑器区域（设计参考 JetBrains LineStatusTracker 的纯逻辑实现）。
  */
 export function mapFileToEditorRegions(file: DiffFile): EditorRegion[] {
 	return file.hunks.map((h, i) => mapHunkToRegion(h, i));
diff --git a/src/engine/diff/hunk-parser.ts b/src/engine/diff/hunk-parser.ts
index a7337c8..7a9973a 100644
--- a/src/engine/diff/hunk-parser.ts
+++ b/src/engine/diff/hunk-parser.ts
@@ -2,7 +2,7 @@
  * Unified Diff hunk 解析器（纯逻辑，零 vscode 依赖）。
  *
  * 这是 partial / 行级提交的命脉：解析 `git diff` 的 unified diff，切分为文件与 hunk，
- * 并能从「选中的 hunk 子集」重建一个合法 patch 供 `git apply --cached` 暂存（IDEA PartialChangesUtil 等价物）。
+ * 并能从「选中的 hunk 子集」重建一个合法 patch 供 `git apply --cached` 暂存（设计参考 JetBrains PartialChangesUtil）。
  */
 
 /** 一个 hunk：对应 `@@ -oldStart,oldCount +newStart,newCount @@ context`。 */
diff --git a/src/engine/log/commit-files.ts b/src/engine/log/commit-files.ts
index 0b11d7a..c7e9f0d 100644
--- a/src/engine/log/commit-files.ts
+++ b/src/engine/log/commit-files.ts
@@ -2,7 +2,7 @@
  * 单个 commit 变更文件解析（纯逻辑，零 vscode 依赖）。
  *
  * 解析 `git diff-tree --no-commit-id --name-status -r [--root] <hash>` 输出为结构化变更列表，
- * 供 Log 提交详情面板展开显示该 commit 改动的文件（IDEA Log → commit → changed files 等价）。
+ * 供 Log 提交详情面板展开显示该 commit 改动的文件（提交 → 变更文件列表）。
  * status 列含相似度时形如 R100/C90（rename/copy），路径列对 rename/copy 为 "old -> new"。
  */
 
diff --git a/src/engine/log/graph-color.ts b/src/engine/log/graph-color.ts
new file mode 100644
index 0000000..8d9b104
--- /dev/null
+++ b/src/engine/log/graph-color.ts
@@ -0,0 +1,54 @@
+/**
+ * 提交图 lane 着色（纯逻辑，零 vscode 依赖）。
+ *
+ * 设计目标：实现「同一分支首父链同色、分叉点向次分支复用、相邻 lane 色相区分」着色语义。
+ * 引擎只产出稳定的调色板索引（`colorIdx`），渲染器（webview）按主题将其映射为实际颜色
+ * （优先 `--vscode-charts-*` 主题令牌，缺失时回退到 {@link DEFAULT_LANE_PALETTE}），
+ * 从而实现深浅 / 高对比自适应。调色板 hex 作为单一事实源由 engine 导出，供 renderer 复用。
+ */
+
+/**
+ * 默认 lane 调色板（GitHub-dark 风高饱和色，深浅主题均清晰可辨，相邻 lane 可区分）。
+ * 渲染器按 `colorIdx % DEFAULT_LANE_PALETTE.length` 取色。
+ */
+export const DEFAULT_LANE_PALETTE: readonly string[] = [
+	'#f85149', '#58a6ff', '#3fb950', '#d29922', '#bc8cff', '#ff7b72', '#56d4dd', '#ffa657',
+];
+
+/** 调色板大小。 */
+export const LANE_PALETTE_SIZE = DEFAULT_LANE_PALETTE.length;
+
+/**
+ * 为新开 / 复用的 lane 槽选取一个与左右邻槽色相区分的调色板索引。
+ * 无法完全区分时回退到按槽位轮转（最坏情况偶有同色，但不崩溃）。
+ */
+export function pickDistinctColor(slotColors: ReadonlyArray<number | null>, slot: number): number {
+	const neighbor = new Set<number>();
+	for (const n of [slotColors[slot - 1], slotColors[slot + 1]]) {
+		if (typeof n === 'number') {
+			neighbor.add(n);
+		}
+	}
+	for (let i = 0; i < LANE_PALETTE_SIZE; i++) {
+		if (!neighbor.has(i)) {
+			return i;
+		}
+	}
+	return slot % LANE_PALETTE_SIZE;
+}
+
+/**
+ * 解析本 commit 节点的调色板索引：
+ * - `hit >= 0`（闭合既有下行边）：沿用该槽色（首父链继承）；
+ * - 否则若槽位有旧色（复用 nil 空洞）：继承旧色（分叉点颜色复用语义）；
+ * - 否则（全新追加槽）：{@link pickDistinctColor} 另起新色。
+ */
+export function resolveNodeColor(slotColors: ReadonlyArray<number | null>, col: number, hit: number): number {
+	if (hit >= 0 && typeof slotColors[hit] === 'number') {
+		return slotColors[hit] as number;
+	}
+	if (typeof slotColors[col] === 'number') {
+		return slotColors[col] as number;
+	}
+	return pickDistinctColor(slotColors, col);
+}
diff --git a/src/engine/log/graph-layout.ts b/src/engine/log/graph-layout.ts
new file mode 100644
index 0000000..e61976d
--- /dev/null
+++ b/src/engine/log/graph-layout.ts
@@ -0,0 +1,163 @@
+/**
+ * 提交图 DAG lane 布局算法（纯逻辑，零 vscode 依赖）。
+ *
+ * 单遍、自顶向底（newest-first）增量算法：维护一张活跃 lane 表 `lanes: (parentHash|null)[]`
+ * —— 槽值 = 该列「待下行抵达的父 hash」（一条尚未闭合的下行边），或 `null`（可复用的空洞）。
+ * 「移除」= 置 `null`（不清色，保留分叉复用语义）；「插入」= 复用首个 `null` 槽或追加，
+ * 这两种操作都不引起其他 lane 的左右位移，故分支「直顺」（参考 gitamine [1]）。
+ *
+ * 每个 commit 处理为：定位等待它的 lane（闭合其下行边）→ 着色 → 为其父开放下行边
+ * （首父直行复用同槽；次父 fan-out 开新槽或收敛入既有槽）→ 导出本行的入边 / 出边 / 贯穿边。
+ *
+ * [1] P. Vigier, "Commit graph drawing algorithms," pvigier's blog, 2019.
+ */
+
+import type { GraphCommit, GraphEdge, GraphLayoutRow } from './graph-types';
+import { pickDistinctColor, resolveNodeColor } from './graph-color';
+
+/** 返回数组中首个 `null` 槽的索引；无则 -1。 */
+function firstNull(arr: ReadonlyArray<string | null>): number {
+	for (let i = 0; i < arr.length; i++) {
+		if (arr[i] === null) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+/**
+ * 计算提交图布局。`commits` 须按 `--topo-order`（newest-first）排序。
+ * 复杂度 O(n·L)，L = 瞬时并发 lane 数（现实 <10），1000 commit < 5ms。
+ */
+export function computeGraphLayout(commits: readonly GraphCommit[]): readonly GraphLayoutRow[] {
+	// 加载窗口内的 hash 集合：O(n) 预扫，O(1) 查询「parent 是否在窗口」（截断边界判定）。
+	const windowSet = new Set<string>();
+	for (const c of commits) {
+		windowSet.add(c.hash);
+	}
+
+	const lanes: (string | null)[] = []; // 活跃 lane 表：槽值 = 待达父 hash 或 null 空洞
+	const laneColor: (number | null)[] = []; // 每槽调色板索引（nil 槽保留旧色，分叉复用）
+	const rows: GraphLayoutRow[] = [];
+
+	for (const c of commits) {
+		// 本行处理前的 lane 快照（入边 / 贯穿边的来源）。
+		const prevLanes = lanes.slice();
+		const prevColor = laneColor.slice();
+
+		// 步骤 A：定位等待 c.hash 的 lane（闭合其下行边）。
+		const hit = prevLanes.indexOf(c.hash);
+		let col: number;
+		if (hit >= 0) {
+			col = hit; // 复用既有 lane
+		} else {
+			// 新分支尖：复用首个 nil 槽或追加（不引起位移）。
+			const ni = firstNull(lanes);
+			col = ni >= 0 ? ni : lanes.length;
+			if (col === lanes.length) {
+				lanes.push(null);
+				laneColor.push(null);
+			}
+		}
+
+		const nodeColor = resolveNodeColor(laneColor, col, hit);
+		const isMerge = c.parents.length > 1;
+
+		// 步骤 B：入边 —— 所有 prevLanes 中等待 c.hash 的槽，其下行边抵达 node（收敛）。
+		const incoming: GraphEdge[] = [];
+		for (let k = 0; k < prevLanes.length; k++) {
+			if (prevLanes[k] === c.hash) {
+				incoming.push({
+					fromCol: k,
+					toCol: col,
+					colorIdx: prevColor[k] ?? nodeColor,
+					kind: k === col ? 'straight' : 'merge-in',
+				});
+			}
+		}
+
+		// 步骤 C：闭合 —— node 已抵达，释放所有等待 c.hash 的槽（置 nil，保留旧色）。
+		for (let k = 0; k < lanes.length; k++) {
+			if (lanes[k] === c.hash) {
+				lanes[k] = null;
+			}
+		}
+
+		// 步骤 D：出边 —— 为 c 的父开放下行边。
+		const outgoing: GraphEdge[] = [];
+		let hasDanglingParent = false;
+		if (c.parents.length > 0) {
+			const p0 = c.parents[0];
+			if (windowSet.has(p0)) {
+				lanes[col] = p0; // 首父直行：复用同槽，色沿首父链继承。
+				laneColor[col] = nodeColor;
+				outgoing.push({ fromCol: col, toCol: col, colorIdx: nodeColor, kind: 'straight' });
+			} else {
+				hasDanglingParent = true; // 截断边界：首父不在窗口，边悬空终止。
+				outgoing.push({ fromCol: col, toCol: col, colorIdx: nodeColor, kind: 'dangling' });
+			}
+			// 次父 / octopus 父：fan-out 开新槽，或收敛入既有槽。
+			for (let i = 1; i < c.parents.length; i++) {
+				const pi = c.parents[i];
+				if (!windowSet.has(pi)) {
+					hasDanglingParent = true;
+					outgoing.push({ fromCol: col, toCol: col, colorIdx: nodeColor, kind: 'dangling' });
+					continue;
+				}
+				const existing = lanes.indexOf(pi);
+				if (existing >= 0 && existing !== col) {
+					// 收敛（CONVERGENCE）：pi 已被另一 lane 等待 → 连接，不开新槽。
+					outgoing.push({ fromCol: col, toCol: existing, colorIdx: laneColor[existing] ?? nodeColor, kind: 'merge-in' });
+				} else {
+					const ni = firstNull(lanes);
+					const slot = ni >= 0 ? ni : lanes.length;
+					if (slot === lanes.length) {
+						lanes.push(null);
+						laneColor.push(null);
+					}
+					lanes[slot] = pi;
+					laneColor[slot] = pickDistinctColor(laneColor, slot);
+					outgoing.push({ fromCol: col, toCol: slot, colorIdx: laneColor[slot], kind: 'merge-in' });
+				}
+			}
+		}
+
+		// 步骤 E：贯穿边 —— prevLanes 中未被 node 消费的活跃 lane，全高竖线穿过本行。
+		const passThrough: GraphEdge[] = [];
+		for (let k = 0; k < prevLanes.length; k++) {
+			if (prevLanes[k] !== null && prevLanes[k] !== c.hash) {
+				passThrough.push({ fromCol: k, toCol: k, colorIdx: prevColor[k] ?? 0, kind: 'straight' });
+			}
+		}
+
+		rows.push({
+			hash: c.hash,
+			node: { col, colorIdx: nodeColor },
+			incoming,
+			outgoing,
+			passThrough,
+			isMerge,
+			hasDanglingParent,
+		});
+	}
+
+	return rows;
+}
+
+/** 布局用到的最大瞬时并发 lane 数（= 最大列号 + 1），供渲染器预算图列总宽。 */
+export function maxLanes(layout: readonly GraphLayoutRow[]): number {
+	let m = 0;
+	for (const row of layout) {
+		m = Math.max(m, row.node.col);
+		for (const e of row.incoming) {
+			m = Math.max(m, e.fromCol, e.toCol);
+		}
+		for (const e of row.outgoing) {
+			m = Math.max(m, e.fromCol, e.toCol);
+		}
+		for (const e of row.passThrough) {
+			m = Math.max(m, e.fromCol, e.toCol);
+		}
+	}
+	return m + 1;
+}
diff --git a/src/engine/log/graph-parser.ts b/src/engine/log/graph-parser.ts
deleted file mode 100644
index 9690101..0000000
--- a/src/engine/log/graph-parser.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * `git log --graph` 解析器（纯逻辑，零 vscode 依赖）。
- *
- * 解析 `git log --graph --format=%x00%H%x00%d%x00%s` 输出：每行 = graph ASCII 前缀 + NUL 分隔的
- * [hash, decorate, subject]。graph 续行（分叉/合并的 `|\` 等连线，无 commit）不含 NUL。
- * git 已完成 lane 分配（`* | / \ _` 的列布局），解析器只做行级拆分，渲染层按字符粒度还原拓扑。
- */
-
-export interface GraphRow {
-	/** graph ASCII（已去尾空白）；续行可能为空串。 */
-	readonly graph: string;
-	/** 完整 hash（仅 commit 行有）。 */
-	readonly hash?: string;
-	/** refs 装饰（%d，如 " (HEAD -> main, origin/main)"）；已 trim。 */
-	readonly decorate?: string;
-	readonly subject?: string;
-}
-
-const NUL = '\x00';
-
-/**
- * 解析 `git log --graph --format=%x00%H%x00%d%x00%s` 输出为 GraphRow[]。
- * 容错：跳过空行；无 NUL 的行视为 graph 续行。
- */
-export function parseGraphLog(output: string): GraphRow[] {
-	const rows: GraphRow[] = [];
-	for (const line of output.split('\n')) {
-		if (line.length === 0) {
-			continue;
-		}
-		const firstNul = line.indexOf(NUL);
-		if (firstNul < 0) {
-			rows.push({ graph: line.replace(/\s+$/, '') });
-			continue;
-		}
-		const graph = line.slice(0, firstNul).replace(/\s+$/, '');
-		const data = line.slice(firstNul + 1).split(NUL);
-		rows.push({
-			graph,
-			hash: data[0]?.trim() || undefined,
-			decorate: data[1]?.trim() || undefined,
-			subject: data[2] ?? undefined,
-		});
-	}
-	return rows;
-}
-
-/** 将所有行的 graph 右填充到最大长度（保证列对齐）。 */
-export function normalizeGraphWidth(rows: readonly GraphRow[]): string[] {
-	let max = 0;
-	for (const r of rows) {
-		if (r.graph.length > max) {
-			max = r.graph.length;
-		}
-	}
-	return rows.map((r) => r.graph.padEnd(max, ' '));
-}
-
-/** 字符 → 渲染类别。 */
-export type GraphCharKind = 'node' | 'vert' | 'slash' | 'backslash' | 'underscore' | 'blank';
-
-export function classifyGraphChar(ch: string): GraphCharKind {
-	switch (ch) {
-		case '*':
-			return 'node';
-		case '|':
-			return 'vert';
-		case '/':
-			return 'slash';
-		case '\\':
-			return 'backslash';
-		case '_':
-			return 'underscore';
-		default:
-			return 'blank';
-	}
-}
diff --git a/src/engine/log/graph-types.ts b/src/engine/log/graph-types.ts
new file mode 100644
index 0000000..d4030ab
--- /dev/null
+++ b/src/engine/log/graph-types.ts
@@ -0,0 +1,54 @@
+/**
+ * 提交图 DAG 布局的数据契约（纯逻辑，零 vscode 依赖）。
+ *
+ * 引擎消费最小 commit 投影（{@link GraphCommit}，仅需 hash + parents），输出渲染器无关的
+ * 逐行布局（{@link GraphLayoutRow}）。渲染层（adapter webview）据此绘制彩色泳道，自绘可视化
+ * Graph 效果——不再依赖 `git log --graph` 的粗糙 ASCII（lane 由 git 分配、
+ * 不可控、随列号抖动着色）。算法参考 gitamine 的 nil-slot 复用 [1] 与 git-graph 的分支区间装箱 [2]。
+ *
+ * 调用方须保证 commits 按 `--topo-order`（newest-first 且子在父之上）排序——lane 增量算法依赖
+ * 「处理 commit 时其全部在窗口内的子已处理」这一不变量，否则 lane 会断裂。
+ *
+ * [1] P. Vigier, "Commit graph drawing algorithms," pvigier's blog, 2019.
+ * [2] M. Lange, "git-graph: branch assignment & lane layout," 2025.
+ */
+
+/** 引擎所需的最小 commit 投影（adapter 由 `git log` 解析结果映射）。 */
+export interface GraphCommit {
+	readonly hash: string;
+	/** 有序父；`parents[0]` = 首父。root 提交为空数组；>1 个父为 merge（含 octopus）。 */
+	readonly parents: readonly string[];
+}
+
+/** 边段种类，决定渲染器画直线 / 斜线 / 截断淡出。 */
+export type GraphEdgeKind = 'straight' | 'merge-in' | 'dangling';
+
+/**
+ * 单条边段（列号语义，渲染器无关）：
+ * - `incoming`：`fromCol`(上一行底) → `toCol`(= node.col，本行中心)，抵达 node 的下行边；
+ * - `outgoing`：`fromCol`(= node.col) → `toCol`(本行底)，从 node 出发的下行边；
+ * - `passThrough`：`fromCol === toCol`，贯穿本行全高的活跃 lane。
+ */
+export interface GraphEdge {
+	readonly fromCol: number;
+	readonly toCol: number;
+	/** 调色板索引（稳定，渲染器按主题映射为实际颜色）。 */
+	readonly colorIdx: number;
+	readonly kind: GraphEdgeKind;
+}
+
+/** 单行布局结果，与输入 commits 数组按索引一一对应（newest-first 拓扑序）。 */
+export interface GraphLayoutRow {
+	readonly hash: string;
+	/** 本 commit 节点的列号与调色板索引。 */
+	readonly node: { readonly col: number; readonly colorIdx: number };
+	/** 入边（上一行底 → 本行 node 中心）：抵达 node 的下行边，含收敛斜入。 */
+	readonly incoming: readonly GraphEdge[];
+	/** 出边（node 中心 → 本行底）：首父 `straight`、次父 `merge-in`、截断 `dangling`。 */
+	readonly outgoing: readonly GraphEdge[];
+	/** 贯穿全高的竖线：穿过本行但不涉及本 node 的活跃 lane。 */
+	readonly passThrough: readonly GraphEdge[];
+	readonly isMerge: boolean;
+	/** 是否触及截断边界（有 parent 不在加载窗口内）。 */
+	readonly hasDanglingParent: boolean;
+}
diff --git a/src/engine/log/log-filter.ts b/src/engine/log/log-filter.ts
index 0e0f0c5..5d6456d 100644
--- a/src/engine/log/log-filter.ts
+++ b/src/engine/log/log-filter.ts
@@ -16,6 +16,40 @@ export interface LogClientFilter {
 	/** 截止日期（含），按 authorDate 过滤。 */
 	readonly dateTo?: Date;
 	readonly messageRegex?: RegExp;
+	/**
+	 * 是否保留 Conductor 等 Agent 工具自动创建的 checkpoint 提交（subject 以 `checkpoint:` 开头，见
+	 * {@link isCheckpointSubject}）。`false` 时剔除；缺省或 `true` 时保留。由 Log 视图 scope 驱动
+	 * （Checkpointer 视图保留完整历史，All/Current 剔除以呈现干净的人类提交历史）。
+	 */
+	readonly keepCheckpoint?: boolean;
+}
+
+/**
+ * Log 完整过滤器（单一事实源，engine 层）：author/path/grep 交 git log 服务端；
+ * mergeMode/dateFrom/dateTo/messageRegex 客户端（见 {@link toClientFilter}）。
+ */
+export interface LogFilter {
+	readonly author?: string;
+	readonly path?: string;
+	readonly grep?: string;
+	readonly mergeMode?: MergeMode;
+	readonly dateFrom?: Date;
+	readonly dateTo?: Date;
+	/** message 正则模式串（运行时经 {@link safeRegex} 编译）。 */
+	readonly messageRegex?: string;
+}
+
+/** 从完整过滤器抽取客户端维度（服务端维度交 git log，见 {@link buildLogArgs}）。 */
+export function toClientFilter(filter: LogFilter | undefined): LogClientFilter {
+	if (!filter) {
+		return {};
+	}
+	return {
+		mergeMode: filter.mergeMode,
+		dateFrom: filter.dateFrom,
+		dateTo: filter.dateTo,
+		messageRegex: filter.messageRegex ? safeRegex(filter.messageRegex) : undefined,
+	};
 }
 
 /** 过滤所需的最小 commit 投影（adapter 由 vscode.git Commit 映射而来）。 */
@@ -37,9 +71,27 @@ export function safeRegex(pattern: string): RegExp | undefined {
 	}
 }
 
+/**
+ * Conductor 等 Agent 工具自动创建的「状态快照」提交前缀（LangGraph Checkpointer 语义）。
+ * 已知模式：`checkpoint:session-<uuid>-turn-<uuid>-start/end`、`checkpoint:conductor-archive-<uuid>`、
+ * `checkpoint:conductor-getdiff`。锚定 subject 行首、大小写不敏感；集中于此为单一事实源，
+ * adapter / 测试一律引用本常量或谓词，杜绝识别规则分散。
+ */
+export const CHECKPOINT_SUBJECT_RE = /^checkpoint:/i;
+
+/** 判定提交 subject 是否为 checkpoint 自动提交（{@link CHECKPOINT_SUBJECT_RE} 的谓词封装）。 */
+export function isCheckpointSubject(subject: string): boolean {
+	return CHECKPOINT_SUBJECT_RE.test(subject);
+}
+
 /** 对已取回的提交施加客户端过滤（不可变，返回新数组）。 */
 export function applyClientFilters<T extends FilterableCommit>(commits: readonly T[], filter: LogClientFilter): T[] {
 	let result: T[] = [...commits];
+	// checkpoint 剔除置链首：其高密度特性可减少后续 mergeMode/date/regex 的计算量；
+	// 与其他维度同为 AND 语义、可交换，顺序不影响结果正确性。
+	if (filter.keepCheckpoint === false) {
+		result = result.filter((c) => !isCheckpointSubject(c.message));
+	}
 	if (filter.mergeMode === 'merge-only') {
 		result = result.filter((c) => c.parents.length > 1);
 	} else if (filter.mergeMode === 'no-merge') {
diff --git a/src/engine/log/log-line.ts b/src/engine/log/log-line.ts
new file mode 100644
index 0000000..b4c48b7
--- /dev/null
+++ b/src/engine/log/log-line.ts
@@ -0,0 +1,62 @@
+/**
+ * `git log`（Graph 数据源）输出解析器（纯逻辑，零 vscode 依赖）。
+ *
+ * 一次性 NUL/RS 分隔格式取全字段（含 parents），供自计算 DAG lane 布局（{@link ../graph-layout}）
+ * 替代旧 `git log --graph` ASCII 路径。配套 CLI（字段以 NUL `%x00` 分隔、记录以 RS `%x1e` 终止，
+ * 二者均不会出现在 git 文本输出中，规避多行 subject 歧义）：
+ *
+ *   git log --topo-order [--all] --max-count=<N> [--skip=<cursor>] [--author --grep -- <path>]
+ *          --format=<LOG_GRAPH_FORMAT>
+ *
+ * `--topo-order` 为硬性要求：lane 增量算法依赖「子在父之上」严格成立。
+ */
+
+/** for-each commit 的 --format 值（与 {@link parseLogLines} 字段顺序严格对应，勿单独修改）。 */
+export const LOG_GRAPH_FORMAT = '%H%x00%P%x00%an%x00%ae%x00%aI%x00%s%x1e';
+
+/** 一条 commit 的解析结果（字段顺序对应 {@link LOG_GRAPH_FORMAT}）。 */
+export interface RawCommit {
+	readonly hash: string;
+	/** 有序父 hash（`%P` 空格分隔；root 为空数组）。 */
+	readonly parents: readonly string[];
+	readonly authorName: string;
+	readonly authorEmail: string;
+	/** 作者日期 ISO 严格（`%aI`，`new Date()` 可解析）。 */
+	readonly authorDate: string;
+	/** subject（`%s`，首行）。 */
+	readonly subject: string;
+}
+
+const NUL = '\x00';
+const RS = '\x1e';
+
+/**
+ * 解析 `git log --format=<LOG_GRAPH_FORMAT>` 输出为 RawCommit[]。
+ * 容错：跳过空记录与字段不足的记录（避免单条异常中断整个视图）。
+ */
+export function parseLogLines(output: string): RawCommit[] {
+	const commits: RawCommit[] = [];
+	for (let record of output.split(RS)) {
+		record = record.replace(/^\r?\n/, ''); // 去除 git 逐 commit 追加的行首换行
+		if (record.length === 0) {
+			continue;
+		}
+		const f = record.split(NUL);
+		if (f.length < 6) {
+			continue;
+		}
+		const hash = f[0];
+		if (!hash) {
+			continue;
+		}
+		commits.push({
+			hash,
+			parents: f[1].split(' ').filter(Boolean),
+			authorName: f[2] ?? '',
+			authorEmail: f[3] ?? '',
+			authorDate: f[4] ?? '',
+			subject: f[5] ?? '',
+		});
+	}
+	return commits;
+}
diff --git a/src/engine/log/log-query.ts b/src/engine/log/log-query.ts
new file mode 100644
index 0000000..e77ddfa
--- /dev/null
+++ b/src/engine/log/log-query.ts
@@ -0,0 +1,64 @@
+/**
+ * Log 查询构造（纯逻辑，零 vscode 依赖）。
+ *
+ * 把 {@link LogFilter} + 范围 + 分页翻译为 `git log` 参数向量（含 {@link LOG_GRAPH_FORMAT}），
+ * 供 host 侧 `service.execGit(['log', ...buildLogArgs(...)])` 单次取数。服务端维度（author/grep/path）
+ * 走 git 参数；客户端维度（mergeMode/date/regex）由 host 经 {@link toClientFilter} + {@link applyClientFilters}
+ * 处理。`--topo-order` 为硬性要求（lane 算法依赖拓扑序）；pathspec `-- <path>` 必须置于末尾。
+ */
+
+import type { LogFilter } from './log-filter';
+import { LOG_GRAPH_FORMAT } from './log-line';
+
+/**
+ * 提交范围（工具栏互斥单选）：
+ * - `all` = 仅 heads/tags/remotes（`--branches --tags --remotes`），呈现干净的人类历史（默认）。
+ *   关键：不使用 `--all`——`--all` 会遍历 `refs/` 下全部引用，把工具注入的内部引用（如
+ *   `refs/conductor-checkpoints/*`、`refs/conductor-archive-heads/*`）所携带的游离/陈旧提交也画成
+ *   游离泳道污染视图，且 `git fetch --prune` 对这类非 `refs/remotes/*` 引用无效。显式收敛到三大
+ *   标准命名空间即可根治。客户端仍据 {@link LogClientFilter.keepCheckpoint} 剔除 checkpoint 自动提交（双保险）。
+ * - `current` = 当前分支（HEAD），剔除 checkpoint 自动提交；
+ * - `checkpointer` = 全分支（`--all`），保留 checkpoint 自动提交（原始完整视图，含内部 checkpoint 快照）。
+ * checkpoint 的保留/剔除由 adapter 层据 scope 注入 `LogClientFilter.keepCheckpoint`，
+ * engine query 层仅据本类型决定分支范围，对 checkpoint 概念无感知（职责单一）。
+ */
+export type LogScope = 'all' | 'current' | 'checkpointer';
+
+/** 分页参数。 */
+export interface LogQueryOptions {
+	readonly maxCount: number;
+	/** `--skip` 偏移（增量加载下一页）；<=0 表示首页。 */
+	readonly skip?: number;
+}
+
+/**
+ * 构造 `git log` 参数向量（不含 `log` 字面量，host 拼接）。
+ * 顺序：`--topo-order` → 范围 → 分页 → 服务端过滤 → `--format` → pathspec（末尾）。
+ */
+export function buildLogArgs(filter: LogFilter | undefined, scope: LogScope, opts: LogQueryOptions): string[] {
+	const args: string[] = ['--topo-order'];
+	if (scope === 'checkpointer') {
+		// 原始完整视图：遍历 refs/ 全部引用，含 conductor 等工具的 checkpoint 快照与归档头。
+		args.push('--all');
+	} else if (scope === 'all') {
+		// 干净视图：仅 heads/tags/remotes，排除 refs/conductor-* 等工具注入的内部引用，
+		// 以免其携带的游离/陈旧提交以游离泳道污染人类历史（`--all` 无法排除，prune 亦触不及）。
+		args.push('--branches', '--tags', '--remotes');
+	}
+	args.push(`--max-count=${opts.maxCount}`);
+	if (opts.skip && opts.skip > 0) {
+		args.push(`--skip=${opts.skip}`);
+	}
+	if (filter?.author && filter.author.trim()) {
+		args.push(`--author=${filter.author.trim()}`);
+	}
+	if (filter?.grep && filter.grep.trim()) {
+		args.push(`--grep=${filter.grep.trim()}`);
+	}
+	args.push(`--format=${LOG_GRAPH_FORMAT}`);
+	// pathspec 必须置于参数末尾。
+	if (filter?.path && filter.path.trim()) {
+		args.push('--', filter.path.trim());
+	}
+	return args;
+}
diff --git a/src/engine/merge/diff3.ts b/src/engine/merge/diff3.ts
index 5811754..2970198 100644
--- a/src/engine/merge/diff3.ts
+++ b/src/engine/merge/diff3.ts
@@ -1,7 +1,7 @@
 /**
  * 三方合并（diff3）纯逻辑，零 vscode 依赖。
  *
- * 对齐 IDEA 3-way merge editor：给定 base / ours / theirs 三份文本（按行），产出 MergeHunk[]
+ * 3-way 合并算法：给定 base / ours / theirs 三份文本（按行），产出 MergeHunk[]
  * （stable 一致段 / conflict 冲突段）。算法基于 LCS（最长公共子序列）求 base↔ours 与 base↔theirs
  * 的匹配锚点，锚点间的区域按 diff3 规则判定为一致或冲突。
  */
diff --git a/src/engine/model/index.ts b/src/engine/model/index.ts
index 57902f8..9cfcf87 100644
--- a/src/engine/model/index.ts
+++ b/src/engine/model/index.ts
@@ -5,7 +5,7 @@
  * 但作为本扩展自有领域模型独立定义，避免 Engine 层反向依赖 vscode。
  */
 
-/** 文件变更状态。字母值对齐 IDEA / VS Code 文件状态色约定。 */
+/** 文件变更状态。字母值对应 VS Code 文件状态色约定（着色语义参考 JetBrains 文件状态色）。 */
 export enum FileStatus {
 	Modified = 'M',
 	Added = 'A',
@@ -40,7 +40,7 @@ export interface FileChange {
 	readonly oldUri?: string;
 }
 
-/** 命名变更列表（仿 IDEA LocalChangeList）。active 列表为新改动默认落入目标。 */
+/** 命名变更列表（参考 JetBrains LocalChangeList 设计）。active 列表为新改动默认落入目标。 */
 export interface Changelist {
 	readonly id: string;
 	readonly name: string;
diff --git a/src/engine/rebase/todo.ts b/src/engine/rebase/todo.ts
index b9c7fe9..2892e63 100644
--- a/src/engine/rebase/todo.ts
+++ b/src/engine/rebase/todo.ts
@@ -1,7 +1,7 @@
 /**
  * 交互式 rebase todo 序列构造（纯逻辑，零 vscode 依赖）。
  *
- * 对齐 IDEA 交互式 rebase 编辑器：将 {action, hash, subject} 序列化为 git rebase -i 的 todo 文件内容，
+ * 参考 JetBrains 交互式 rebase 编辑器设计：将 {action, hash, subject} 序列化为 git rebase -i 的 todo 文件内容，
  * 供 GIT_SEQUENCE_EDITOR 注入；并支持解析（回填编辑器）与重排序（拖拽）。
  * action 限定 pick / reword / edit / squash / fixup / drop。
  */
diff --git a/src/engine/ref/cleanup.ts b/src/engine/ref/cleanup.ts
index 9e8bad3..0c72ef2 100644
--- a/src/engine/ref/cleanup.ts
+++ b/src/engine/ref/cleanup.ts
@@ -14,24 +14,104 @@ export function isProtectedBranch(name: string, extraExclude: readonly string[]
 }
 
 /**
- * 解析 `git branch --merged <base>` 输出为可安全删除的分支名列表。
- * @param mergedOutput `git branch --merged` 原始输出（当前分支前缀 `*`）
- * @param base 比较基准分支名（排除自身）
- * @param extraExclude 额外排除的分支名（如当前 HEAD 名）
+ * 解析 `git branch --merged/--no-merged` 输出为分支名列表（剥离 `*` 前缀、去空行、去重，保序）。
+ * 不做受保护排除——仅做忠实解析，供 filterMergeable / partitionByMerged 复用。
  */
-export function filterMergeable(mergedOutput: string, base: string, extraExclude: readonly string[] = []): string[] {
+export function parseMergedBranchNames(mergedOutput: string): string[] {
 	const seen = new Set<string>();
-	const result: string[] = [];
+	const names: string[] = [];
 	for (const raw of mergedOutput.split('\n')) {
 		const name = raw.trim().replace(/^\*\s*/, '').trim();
 		if (name.length === 0 || seen.has(name)) {
 			continue;
 		}
 		seen.add(name);
-		if (isProtectedBranch(name, [...extraExclude, base])) {
-			continue;
-		}
-		result.push(name);
+		names.push(name);
+	}
+	return names;
+}
+
+/**
+ * 解析 `git branch --merged <base>` 输出为可安全删除的分支名列表。
+ * @param mergedOutput `git branch --merged` 原始输出（当前分支前缀 `*`）
+ * @param base 比较基准分支名（排除自身）
+ * @param extraExclude 额外排除的分支名（如当前 HEAD 名）
+ */
+export function filterMergeable(mergedOutput: string, base: string, extraExclude: readonly string[] = []): string[] {
+	return parseMergedBranchNames(mergedOutput).filter((name) => !isProtectedBranch(name, [...extraExclude, base]));
+}
+
+/**
+ * 按 `git branch --merged <base>` 输出，把选区分支分桶为「已合并 / 未合并」。
+ * 与 filterMergeable 不同：不套用受保护排除（那是「是否可删」的谓词职责），仅做合并状态分类，
+ * 供批量删除据此决定 force（未合并需 `-D`）与确认文案。
+ * @param mergedOutput `git branch --merged` 原始输出
+ * @param selection 选区分支短名（已由调用方完成本地/HEAD 过滤）
+ */
+export function partitionByMerged(
+	mergedOutput: string,
+	selection: readonly string[],
+): { merged: string[]; unmerged: string[] } {
+	const mergedSet = new Set(parseMergedBranchNames(mergedOutput));
+	const merged: string[] = [];
+	const unmerged: string[] = [];
+	for (const name of selection) {
+		(mergedSet.has(name) ? merged : unmerged).push(name);
+	}
+	return { merged, unmerged };
+}
+
+/**
+ * 计算被 `git fetch --prune` 清理掉的远程跟踪引用：before 有、after 无的差集（保 before 顺序）。
+ *
+ * 用途：`--prune` 的 `[deleted]` 逐行输出走 stderr，{@link GitRepositoryService.execGit} 仅回传 stdout，
+ * 故无法直接解析清理明细；改为 prune 前后对 `refs/remotes` 各快照一次（`for-each-ref`），以此差集
+ * 给出循证反馈。纯逻辑、零 vscode 依赖，便于单测。
+ * @param before prune 前 `refs/remotes/*` 短名列表（如 `['origin/feat-a', 'origin/master']`）
+ * @param after  prune 后 `refs/remotes/*` 短名列表
+ */
+export function diffPrunedRefs(before: readonly string[], after: readonly string[]): string[] {
+	const remaining = new Set(after);
+	return before.filter((name) => !remaining.has(name));
+}
+
+/** 名称列表内联展示：超过 max 个则截断并标注剩余数量，避免确认弹窗过长。 */
+export function truncateNames(names: readonly string[], max = 8): string {
+	if (names.length <= max) {
+		return names.join(', ');
+	}
+	return `${names.slice(0, max).join(', ')} …还有 ${names.length - max} 个`;
+}
+
+/**
+ * 生成批量删除本地分支的确认文案与确认按钮文本（纯逻辑）。
+ * 诚实呈现强制删除风险：混合时分栏列出，确保 force 删除不被隐藏。
+ * 单个目标保留原有针对性文案以维持既有体验。
+ */
+export function formatBranchDeleteConfirm(
+	merged: readonly string[],
+	unmerged: readonly string[],
+): { detail: string; confirmLabel: string } {
+	const total = merged.length + unmerged.length;
+	if (total === 1) {
+		const name = merged[0] ?? unmerged[0] ?? '';
+		return merged.length === 1
+			? { detail: `分支「${name}」已合并，可安全删除。`, confirmLabel: '删除' }
+			: { detail: `分支「${name}」未合并，强制删除将丢失其独有提交！`, confirmLabel: '强制删除' };
+	}
+	if (unmerged.length === 0) {
+		return { detail: `将删除 ${total} 个已合并的本地分支：${truncateNames(merged)}`, confirmLabel: '删除' };
+	}
+	if (merged.length === 0) {
+		return {
+			detail: `将强制删除 ${total} 个未合并的本地分支：${truncateNames(unmerged)}（将丢失它们的独有提交！）`,
+			confirmLabel: '强制删除',
+		};
 	}
-	return result;
+	const detail = [
+		`将删除 ${total} 个本地分支：`,
+		`· 已合并（安全删除）：${truncateNames(merged)}`,
+		`· 未合并（强制删除，丢失提交）：${truncateNames(unmerged)}`,
+	].join('\n');
+	return { detail, confirmLabel: '全部删除' };
 }
diff --git a/src/engine/ref/favorites.ts b/src/engine/ref/favorites.ts
index a4c4acc..9cd373b 100644
--- a/src/engine/ref/favorites.ts
+++ b/src/engine/ref/favorites.ts
@@ -1,7 +1,7 @@
 /**
  * 分支收藏（Favorites）纯逻辑（零 vscode 依赖）。
  *
- * IDEA 的「Set Favorite」能力：把常用分支标星置顶。本模块提供无状态集合运算，
+ * 分支收藏（Set Favorite）能力：把常用分支标星置顶。本模块提供无状态集合运算，
  * 持久化与事件由 adapter 层的 BranchFavorites（workspaceState）承载，便于单测。
  */
 
diff --git a/src/engine/ref/remote-ref.ts b/src/engine/ref/remote-ref.ts
new file mode 100644
index 0000000..8195baa
--- /dev/null
+++ b/src/engine/ref/remote-ref.ts
@@ -0,0 +1,96 @@
+/**
+ * 远程分支删除的纯逻辑（零 vscode 依赖）。
+ *
+ * 远程分支删除是 `git push <remote> --delete <branch>`，与本地 `git branch -d/-D`（见 cleanup.ts）
+ * 正交：作用于远程服务器、影响协作者、不可撤销（无本地 reflog 兜底）。本模块提供其特有的：
+ * - {@link resolveRemoteBranch}：把 `origin/feature/foo` 这类远程短名拆成 {remote, branch}。
+ *   必须用「已知 remotes 列表」做最长前缀匹配——remote 名本身可含 `/`（如 fork 场景 `myorg/repo`），
+ *   朴素 `split('/')[0]` 会把 `myorg/repo/feature` 错切成 `myorg`。
+ * - {@link partitionRemoteByProtected}：复用 {@link isProtectedBranch}，把 main/master 等主干硬排除。
+ * - {@link formatRemoteDeleteConfirm}：生成 modal 确认文案，诚实传达服务器端不可逆 + 协作者影响。
+ *
+ * 与 cleanup.ts 的关系：复用其 `isProtectedBranch` / `truncateNames` 作为单一事实源（轻量指针，不复制定义）。
+ */
+
+import { isProtectedBranch, truncateNames } from './cleanup';
+
+/** 解析后的远程分支定位。 */
+export interface RemoteBranchTarget {
+	/** 远程名，如 origin / upstream / myorg/repo。 */
+	readonly remote: string;
+	/** 远程上的分支名（不含 remote 前缀），如 feature/foo。 */
+	readonly branch: string;
+	/** 规范化短名 remote/branch，用于回显。 */
+	readonly shortName: string;
+}
+
+/**
+ * 用「已知 remotes 列表」做最长前缀匹配，把远程短名拆成 {remote, branch}。
+ *
+ * 为何不用 `shortName.split('/')[0]`：remote 名可含 `/`（GitHub fork/子组场景 `myorg/repo`），
+ * 其分支 `myorg/repo/feature` 的正确切分是 `remote='myorg/repo'`、`branch='feature'`；
+ * 朴素首段切分会得到 `'myorg'` → 推到不存在的 remote 失败，甚至误删。
+ *
+ * @param shortName 远程分支短名，如 `origin/feature/foo`
+ * @param remotes 仓库已配置的 remote 名列表（权威事实源，来自 `repo.state.remotes`）
+ * @returns 匹配成功返回定位；shortName 是纯 remote 名 / 不属任何已知 remote / 分支段为空 时返回 null
+ */
+export function resolveRemoteBranch(shortName: string, remotes: readonly string[]): RemoteBranchTarget | null {
+	// 按长度降序保证最长前缀优先（`myorg/repo` 优先于 `myorg`）。
+	for (const remote of [...remotes].sort((a, b) => b.length - a.length)) {
+		if (shortName === remote) {
+			// 纯 remote 名本身，无分支段。
+			return null;
+		}
+		const prefix = `${remote}/`;
+		// 必须带 '/' 分隔符，避免 `origin` 误匹配 `originx/...`。
+		if (shortName.startsWith(prefix)) {
+			const branch = shortName.slice(prefix.length);
+			if (branch) {
+				return { remote, branch, shortName };
+			}
+		}
+	}
+	return null;
+}
+
+/**
+ * 把选中的远程分支按「可删 / 受保护」分桶。
+ *
+ * 复用 {@link isProtectedBranch}（SSOT）：main/master 等主干一旦在远程删除会摧毁团队共享主干
+ * 并阻断所有协作者的下一次 push，属比「删未合并本地分支」严重一个数量级的灾难，故硬排除。
+ */
+export function partitionRemoteByProtected(
+	targets: readonly RemoteBranchTarget[],
+): { deletable: RemoteBranchTarget[]; protectedTargets: RemoteBranchTarget[] } {
+	const deletable: RemoteBranchTarget[] = [];
+	const protectedTargets: RemoteBranchTarget[] = [];
+	for (const t of targets) {
+		(isProtectedBranch(t.branch) ? protectedTargets : deletable).push(t);
+	}
+	return { deletable, protectedTargets };
+}
+
+/**
+ * 生成远程删除的 modal 确认文案与确认按钮文本（纯逻辑）。
+ *
+ * 远程删除的风险语义与本地本质不同：作用于服务器、影响协作者、不可撤销（无本地 reflog 兜底），
+ * 且 `git push --delete` 无 -d/-D 区分（远端无条件删除）。文案须诚实传达这三点；
+ * 按钮统一为「删除」（区别本地「删除/强制删除/全部删除」三态）。
+ *
+ * @param deletable 经 {@link partitionRemoteByProtected} 过滤后的可删目标
+ * @param opts.hasUpstreamOfHead 待删集合是否包含当前分支的上游（软警示，不硬阻断——本地分支与提交仍在，仅失远程追踪）
+ */
+export function formatRemoteDeleteConfirm(
+	deletable: readonly RemoteBranchTarget[],
+	opts?: { hasUpstreamOfHead?: boolean },
+): { detail: string; confirmLabel: string } {
+	const head = opts?.hasUpstreamOfHead ? '⚠ 其中包含当前分支的上游，删除后当前分支将失去远程追踪。\n' : '';
+	const irreversible = '此操作作用于远程仓库，不可撤销，并可能影响其他协作者。';
+	const n = deletable.length;
+	const body =
+		n === 1
+			? `将删除远程分支「${deletable[0].shortName}」（位于远程 ${deletable[0].remote}）。\n${irreversible}`
+			: `将删除 ${n} 个远程分支：${truncateNames(deletable.map((t) => t.shortName))}。\n${irreversible}`;
+	return { detail: `${head}${body}`, confirmLabel: '删除' };
+}
diff --git a/src/engine/ref/selection.ts b/src/engine/ref/selection.ts
new file mode 100644
index 0000000..6378411
--- /dev/null
+++ b/src/engine/ref/selection.ts
@@ -0,0 +1,50 @@
+/**
+ * Branches 多选归一化的纯逻辑（零 vscode 依赖）。
+ *
+ * VS Code 多选树的 `view/item/context` 命令以 `(clickedNode, selectedNodes[])` 调用：
+ * 第 1 参为右键点击项，第 2 参为完整选区（仅多选时传入）。此处把"点击项 + 选区"
+ * 归一化为一组满足谓词的 RawRef：
+ * - 按谓词过滤并按 shortName 去重；
+ * - 「点击在选区之外」陷阱：若点击项不在过滤后的选区中，则以点击项为准（手势目标优先）。
+ *
+ * 适配层（src/adapter/branch-selection.ts）负责把 BranchNode 抽取为 RawRef 后委托本函数，
+ * 以维持「UI → Adapter → Engine」单向依赖（engine 不反向依赖 adapter 类型）。
+ */
+
+import type { RawRef } from './for-each-ref';
+
+/**
+ * 归一化多选命令的作用目标。
+ * @param clicked 右键点击项对应的 ref（无 / 非分支节点时为 undefined）
+ * @param selection VS Code 传入的选区 ref 列表（单选时由适配层填 `[clicked]` 或空）
+ * @param predicate 目标谓词（如本地可删 / 标签）
+ * @returns 去重且满足谓词的 ref 列表
+ */
+export function collectBranchRefs(
+	clicked: RawRef | undefined,
+	selection: readonly RawRef[],
+	predicate: (ref: RawRef) => boolean,
+): RawRef[] {
+	const filtered = dedupeByShortName(selection.filter(predicate));
+	if (clicked && predicate(clicked)) {
+		const inSelection = filtered.some((r) => r.shortName === clicked.shortName);
+		if (!inSelection) {
+			// 点击在选区之外 → 仅作用于点击项（手势目标优先）
+			return [clicked];
+		}
+	}
+	return filtered;
+}
+
+function dedupeByShortName(refs: readonly RawRef[]): RawRef[] {
+	const seen = new Set<string>();
+	const result: RawRef[] = [];
+	for (const ref of refs) {
+		if (seen.has(ref.shortName)) {
+			continue;
+		}
+		seen.add(ref.shortName);
+		result.push(ref);
+	}
+	return result;
+}
diff --git a/src/engine/scm-mapping/status-decoration.ts b/src/engine/scm-mapping/status-decoration.ts
index fe9e678..5085400 100644
--- a/src/engine/scm-mapping/status-decoration.ts
+++ b/src/engine/scm-mapping/status-decoration.ts
@@ -5,6 +5,12 @@ import { FileStatus } from '../model';
  *
  * 复用 VS Code 内置 git 扩展贡献的 `gitDecoration.*` 主题色 token，
  * 保证与原生 Source Control 视图及深色模式视觉一致（复用驱动，不新造 token）。
+ *
+ * `faded` / `strikeThrough` 为语义提示位（Untracked/Ignored 弱化、Deleted 删除线）。
+ * 诚实约束：VS Code 稳定 `TreeItem` API 不暴露 opacity / strikethrough 字段，行标签无法直接
+ * 删除线或淡化；故这两个位由渲染层（changes-tree）以「语义方式」消费——
+ *  - `themeColor`：Untracked/Ignored 已映射到 muted 的 `untracked/ignored` token（天然弱化）；
+ *  - `strikeThrough`：Deleted 在 MarkdownString tooltip 中以 `~~path~~` 删除线呈现。
  */
 export interface StatusDecoration {
 	readonly letter: string;
diff --git a/src/extension.ts b/src/extension.ts
index 21aa43a..82922c1 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -10,7 +10,7 @@ import { BranchFavorites } from './adapter/branch-favorites';
 import { CommitService } from './adapter/commit/commit-service';
 import { BranchesTreeProvider } from './adapter/tree/branches-tree';
 import { ChangesTreeProvider, EmptyChangesProvider } from './adapter/tree/changes-tree';
-import { LogTreeProvider } from './adapter/tree/log-tree';
+import { LogWebviewProvider } from './adapter/webview/log-webview';
 import { registerHistoryCommands } from './adapter/history-commands';
 import { registerStashCommands } from './adapter/stash-commands';
 import { registerGitCliCommands } from './adapter/git-cli-commands';
@@ -21,7 +21,6 @@ import { StashTreeProvider } from './adapter/tree/stash-tree';
 import { WorktreeTreeProvider } from './adapter/tree/worktree-tree';
 import { registerWorktreeCommands } from './adapter/worktree-commands';
 import { CommitWebviewProvider } from './adapter/webview/commit-webview';
-import { GraphWebview } from './adapter/webview/graph-webview';
 import { showGitConsole } from './infra/git-console';
 import { InlineCommitCodeLensProvider, registerInlineCommitCommand } from './adapter/editor/inline-commit-codelens';
 import { BlameAnnotationController } from './adapter/editor/blame-annotation';
@@ -31,6 +30,8 @@ import { registerMergeCommands } from './adapter/webview/merge-editor';
 import { registerMiscCommands } from './adapter/misc-commands';
 import { getGitApi } from './adapter/git-api';
 import { GitRepositoryService } from './adapter/git-repository-service';
+import { GitHubAuth } from './adapter/ci/github-auth';
+import { GitHubCiService } from './adapter/ci/github-ci-service';
 import { createLogger } from './infra/logger';
 
 /**
@@ -64,6 +65,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	const service = new GitRepositoryService(api);
 	const registry = new ChangelistRegistry(context.workspaceState, service.repoRoot ?? workspaceRoot);
 	const favorites = new BranchFavorites(context.workspaceState, service.repoRoot ?? workspaceRoot);
+	const githubAuth = new GitHubAuth(context.subscriptions);
+	const ciService = new GitHubCiService(service, githubAuth, logger);
 	const tree = new ChangesTreeProvider(service, registry);
 	// createTreeView（registerTreeDataProvider 的超集）以获取 TreeView 句柄承载 .badge；
 	// 活动栏容器图标的数字角标 = 容器内各视图 badge.value 之和，故此处点亮即映射到 Hyper Git 图标。
@@ -78,8 +81,14 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		conflict: new NullConflictResolver(),
 	});
 	const commitView = new CommitWebviewProvider(service, registry, commit);
-	const logTree = new LogTreeProvider(service);
+	const logTree = new LogWebviewProvider(service, ciService);
 	const branchesTree = new BranchesTreeProvider(service, favorites);
+	// Branches 视图启用多选（canSelectMany 仅 createTreeView 支持，registerTreeDataProvider 不支持）；
+	// 多选后批量操作（删除分支/标签、复制引用、收藏）作用于整个选区。
+	const branchesView = vscode.window.createTreeView('hyperGit.branches', {
+		treeDataProvider: branchesTree,
+		canSelectMany: true,
+	});
 	const stashTree = new StashTreeProvider(service);
 	const worktreeTree = new WorktreeTreeProvider(service);
 	const inlineLens = new InlineCommitCodeLensProvider(service);
@@ -95,6 +104,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		registry,
 		favorites,
 		commit,
+		ciService,
 		logTree,
 		branchesTree,
 		stashTree,
@@ -102,11 +112,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		shelfTree,
 		blame,
 		changesView,
+		branchesView,
 		vscode.window.registerWebviewViewProvider(CommitWebviewProvider.viewType, commitView),
-		vscode.window.registerTreeDataProvider('hyperGit.log', logTree),
-		vscode.window.registerTreeDataProvider('hyperGit.branches', branchesTree),
+		vscode.window.registerWebviewViewProvider(LogWebviewProvider.viewType, logTree),
 		vscode.window.registerTreeDataProvider('hyperGit.stash', stashTree),
-		vscode.window.registerTreeDataProvider('hyperGit.shelf', shelfTree),
+		vscode.window.createTreeView('hyperGit.shelf', { treeDataProvider: shelfTree }),
 		vscode.window.registerTreeDataProvider('hyperGit.worktrees', worktreeTree),
 		...registerChangesCommands(service, registry, tree),
 		...registerHistoryCommands(service, logTree, branchesTree, favorites),
@@ -122,7 +132,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		...registerWorktreeCommands(service, worktreeTree),
 		vscode.commands.registerCommand('hyperGit.commit', focusCommitView),
 		vscode.commands.registerCommand('hyperGit.commitAndPush', focusCommitView),
-		vscode.commands.registerCommand('hyperGit.showGraph', () => GraphWebview.open(service)),
+		vscode.commands.registerCommand('hyperGit.ci.signIn', () => ciService.signIn()),
 		vscode.commands.registerCommand('hyperGit.showConsole', () => showGitConsole()),
 		vscode.commands.registerCommand('hyperGit.startRebase', () => RebaseWebview.open(service)),
 		vscode.languages.registerCodeLensProvider({ scheme: 'file' }, inlineLens),
@@ -133,7 +143,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	// 计数为 0 时清空，对齐原生 SCM 行为。
 	const updateChangesBadge = (): void => {
 		const count = service.getChanges().length;
-		changesView.badge = count > 0 ? { value: count, tooltip: `${count} 个未提交变更` } : undefined;
+		changesView.badge = count > 0 ? { value: count, tooltip: `${count} uncommitted change(s)` } : undefined;
 	};
 
 	// git 状态变化频繁（add/checkout/diff 缓存失效均触发），防抖合并避免 log/stash 高频重拉。
diff --git a/src/infra/git-console.ts b/src/infra/git-console.ts
index faeb717..1020b01 100644
--- a/src/infra/git-console.ts
+++ b/src/infra/git-console.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 
 /**
- * Hyper Git Console：对齐 IDEA Console 标签页，记录所有经 execGit 执行的 git 命令及其输出。
+ * Hyper Git Console：记录所有经 execGit 执行的 git 命令及其输出。
  * 复用单一 OutputChannel（懒构造）。
  */
 let channel: vscode.OutputChannel | undefined;
diff --git a/src/shared/protocol.ts b/src/shared/protocol.ts
index bacd29f..f8eeaff 100644
--- a/src/shared/protocol.ts
+++ b/src/shared/protocol.ts
@@ -6,8 +6,13 @@
  */
 
 import type { ConventionalValidation, ConventionalSeverity } from '../engine/commit/conventional-linter';
+import type { CiCheckVM, CiState, CiStatusVM } from '../engine/ci/types';
+import type { GraphLayoutRow } from '../engine/log/graph-types';
+import type { LogScope } from '../engine/log/log-query';
 
 export type { ConventionalValidation, ConventionalSeverity };
+// CI 状态 VM 从 engine 复用并 re-export（指针非副本，单一事实源）。
+export type { CiCheckVM, CiState, CiStatusVM };
 
 /** Commit 视图中的文件条目（选中态由 webview 端管理，host 不回写以避免覆盖用户操作）。 */
 export interface CommitFileItem {
@@ -47,3 +52,99 @@ export type WebviewToHostMessage =
 			readonly push: boolean;
 		};
 	};
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Log Graph 视图（hyperGit.log，Webview）↔ Extension Host 消息契约。
+// 与 Commit 视图的 union 相互独立（两个 disjoint webview，各自一套消息）。
+// 行布局数据（layout: GraphLayoutRow）来自 engine/log/graph-layout 纯逻辑引擎。
+// ─────────────────────────────────────────────────────────────────────────────
+
+export type { LogScope };
+
+/** 提交行的引用标签（HEAD / 本地分支 / 远程分支 / 标签）。 */
+export interface RefChip {
+	readonly name: string;
+	readonly kind: 'head' | 'localBranch' | 'remoteBranch' | 'tag';
+	/** HEAD 当前指向的本地分支（加粗 / 箭头强调）。 */
+	readonly isHeadTarget?: boolean;
+}
+
+/** 单条提交行的视图模型：原始数据 + 计算好的图布局 + 引用标签。 */
+export interface GraphRowVM {
+	readonly hash: string;
+	readonly shortHash: string;
+	readonly parents: readonly string[];
+	readonly isMerge: boolean;
+	readonly subject: string;
+	readonly authorName: string;
+	readonly authorDate: string;
+	readonly chips: readonly RefChip[];
+	readonly layout: GraphLayoutRow;
+}
+
+/** 选中提交的变更文件项（themeColor 为 gitDecoration.* 主题色 id）。 */
+export interface LogCommitFileItem {
+	readonly status: string;
+	readonly statusLabel: string;
+	readonly path: string;
+	readonly oldPath?: string;
+	readonly themeColor: string;
+}
+
+/** Host → Webview：图数据全量重置（首帧 / 刷新 / 过滤 / 范围切换）。 */
+export interface LogGraphState {
+	readonly rows: readonly GraphRowVM[];
+	readonly maxLanes: number;
+	readonly hasMore: boolean;
+	readonly scope: LogScope;
+	readonly repoRoot: string;
+}
+
+/** per-commit 操作枚举（webview 右键菜单 → host 重调用既有命令）。 */
+export type LogCommitOp =
+	| 'copy'
+	| 'cherryPick'
+	| 'revert'
+	| 'drop'
+	| 'fixup'
+	| 'newBranch'
+	| 'newTag'
+	| 'containingBranches'
+	| 'reset'
+	| 'menu';
+
+/** CI 功能元信息（graphData 后即发；登录完成/会话撤销/限流时再发，避免整图重传重置滚动/选中）。 */
+export interface CiMetaVM {
+	/** 远程为 GitHub 且功能启用时为 true；否则整列隐藏、不发起任何请求。 */
+	readonly available: boolean;
+	/** 远程是 GitHub 但尚未授权：webview 显示「登录 GitHub 查看 CI」提示。 */
+	readonly needsSignIn: boolean;
+	/** 软错误（限流/网络）摘要，供 webview 给出一次性提示；为空表示正常。 */
+	readonly error?: string;
+}
+
+/** Host → Webview（Log Graph）。 */
+export type LogHostToWebviewMessage =
+	| { readonly type: 'log/graphData'; readonly payload: LogGraphState }
+	| {
+		readonly type: 'log/appendData';
+		readonly payload: { readonly rows: readonly GraphRowVM[]; readonly maxLanes: number; readonly hasMore: boolean };
+	}
+	| { readonly type: 'log/commitFiles'; readonly payload: { readonly hash: string; readonly files: readonly LogCommitFileItem[] } }
+	| { readonly type: 'log/busy'; readonly payload: { readonly busy: boolean } }
+	| { readonly type: 'log/error'; readonly payload: { readonly message: string } }
+	| { readonly type: 'log/ciMeta'; readonly payload: CiMetaVM }
+	| { readonly type: 'log/ciData'; readonly payload: { readonly map: Readonly<Record<string, CiStatusVM>> } };
+
+/** Webview → Host（Log Graph）。 */
+export type LogWebviewToHostMessage =
+	| { readonly type: 'log/requestState' }
+	| { readonly type: 'log/retry' }
+	| { readonly type: 'log/loadMore'; readonly payload: { readonly cursor: number } }
+	| { readonly type: 'log/selectCommit'; readonly payload: { readonly hash: string } }
+	| { readonly type: 'log/commitAction'; readonly payload: { readonly op: LogCommitOp; readonly hash: string } }
+	| { readonly type: 'log/setScope'; readonly payload: { readonly scope: LogScope } }
+	| { readonly type: 'log/openFile'; readonly payload: { readonly hash: string; readonly path: string; readonly hasParent: boolean } }
+	| { readonly type: 'log/requestCi'; readonly payload: { readonly hashes: readonly string[] } }
+	| { readonly type: 'log/ciSignIn' }
+	| { readonly type: 'log/openExternal'; readonly payload: { readonly url: string } };
diff --git a/tests/suite/extension.test.js b/tests/suite/extension.test.js
index d8d5eff..2699c31 100644
--- a/tests/suite/extension.test.js
+++ b/tests/suite/extension.test.js
@@ -1,7 +1,9 @@
 const assert = require('assert');
 const vscode = require('vscode');
+const pkg = require('../../package.json');
 
-const EXT_ID = 'threefish-ai.hyper-git';
+// 从 package.json 动态推导 extension ID（publisher.name），避免硬编码导致改名后失效。
+const EXT_ID = `${pkg.publisher}.${pkg.name}`;
 
 suite('扩展冒烟测试', function () {
 	this.timeout(30000);
@@ -52,7 +54,6 @@ suite('扩展冒烟测试', function () {
 			'hyperGit.ignorePath',
 			'hyperGit.compareBranches',
 			'hyperGit.rewordCommit',
-			'hyperGit.showGraph',
 			'hyperGit.showConsole',
 			'hyperGit.partialStage',
 			'hyperGit.partialUnstage',
@@ -62,6 +63,12 @@ suite('扩展冒烟测试', function () {
 			'hyperGit.fixupCommit',
 			'hyperGit.cleanupBranches',
 			'hyperGit.copyBranchRef',
+			'hyperGit.toggleFavorite',
+			'hyperGit.checkoutAsNew',
+			'hyperGit.compareWithCurrent',
+			'hyperGit.tagCreate',
+			'hyperGit.tagDelete',
+			'hyperGit.tagCheckout',
 			'hyperGit.threeWayDiff',
 			'hyperGit.inlineCommitHunk',
 			'hyperGit.shelveChanges',
diff --git a/tests/unit/ci-graphql-query.test.ts b/tests/unit/ci-graphql-query.test.ts
new file mode 100644
index 0000000..292e358
--- /dev/null
+++ b/tests/unit/ci-graphql-query.test.ts
@@ -0,0 +1,55 @@
+import { describe, it, expect } from 'vitest';
+import { buildCiQuery, CI_ALIAS_PREFIX, DEFAULT_CONTEXTS_PER_COMMIT } from '../../src/engine/ci/graphql-query';
+
+const OIDS = ['a1b2c3d4e5f6', '0123456789abcdef0123456789abcdef01234567', 'fedcba9876543210'];
+
+describe('buildCiQuery', () => {
+	it('生成与 oid 等量的别名（c0..cN）', () => {
+		const { aliases } = buildCiQuery({ owner: 'o', name: 'r', oids: OIDS });
+		expect(aliases).toEqual(['c0', 'c1', 'c2']);
+		expect(aliases[0]).toBe(CI_ALIAS_PREFIX + 0);
+	});
+
+	it('owner/name 走 $variables，不插值进文档', () => {
+		const { query } = buildCiQuery({ owner: 'Own/er', name: 'r/evil', oids: OIDS });
+		expect(query).toContain('$owner');
+		expect(query).toContain('$name');
+		// 危险字符不应出现在文档里（防注入）。
+		expect(query).not.toContain('Own/er');
+		expect(query).not.toContain('r/evil');
+	});
+
+	it('oid 经校验后插值别名', () => {
+		const { query } = buildCiQuery({ owner: 'o', name: 'r', oids: ['abcdef0', '1234567'] });
+		expect(query).toContain('c0: object(oid: "abcdef0")');
+		expect(query).toContain('c1: object(oid: "1234567")');
+	});
+
+	it('复用 fragment（statusCheckRollup + 两种 inline fragment）', () => {
+		const { query } = buildCiQuery({ owner: 'o', name: 'r', oids: ['abcdef0'] });
+		expect(query).toContain('fragment CiCommitRollup on Commit');
+		expect(query).toContain('statusCheckRollup');
+		expect(query).toContain('... on CheckRun');
+		expect(query).toContain('... on StatusContext');
+		expect(query).toContain('rateLimit { cost remaining resetAt }');
+	});
+
+	it('默认 contexts(first) 取 DEFAULT_CONTEXTS_PER_COMMIT', () => {
+		const { query } = buildCiQuery({ owner: 'o', name: 'r', oids: ['abcdef0'] });
+		expect(query).toContain(`contexts(first: ${DEFAULT_CONTEXTS_PER_COMMIT})`);
+	});
+
+	it('非法 oid 抛错（防构造畸形查询）', () => {
+		expect(() => buildCiQuery({ owner: 'o', name: 'r', oids: ['ZZZZZZ'] })).toThrow();
+		expect(() => buildCiQuery({ owner: 'o', name: 'r', oids: ['"; DROP--'] })).toThrow();
+	});
+
+	it('空 oids 抛错', () => {
+		expect(() => buildCiQuery({ owner: 'o', name: 'r', oids: [] })).toThrow();
+	});
+
+	it('非法 contextsPerCommit 抛错', () => {
+		expect(() => buildCiQuery({ owner: 'o', name: 'r', oids: ['abcdef0'], contextsPerCommit: 0 })).toThrow();
+		expect(() => buildCiQuery({ owner: 'o', name: 'r', oids: ['abcdef0'], contextsPerCommit: -5 })).toThrow();
+	});
+});
diff --git a/tests/unit/ci-model.test.ts b/tests/unit/ci-model.test.ts
new file mode 100644
index 0000000..049fc61
--- /dev/null
+++ b/tests/unit/ci-model.test.ts
@@ -0,0 +1,106 @@
+import { describe, it, expect } from 'vitest';
+import { extractRateLimit, parseCiResponse, UNKNOWN_CI } from '../../src/engine/ci/model';
+
+const repo = (entries: Record<string, unknown>): unknown => ({ data: { repository: entries } });
+const oid = (i: number): string => i.toString(16).padStart(40, '0');
+
+describe('parseCiResponse', () => {
+	it('别名值为 null（未推送本地提交）→ unknown', () => {
+		const map = parseCiResponse(repo({ c0: null }), [oid(0)]);
+		expect(map.get(oid(0))).toEqual(UNKNOWN_CI);
+		expect(map.get(oid(0))?.state).toBe('unknown');
+	});
+
+	it('rollup 缺失（无 CI 配置）→ unknown', () => {
+		const map = parseCiResponse(repo({ c0: { statusCheckRollup: null } }), [oid(0)]);
+		expect(map.get(oid(0))?.state).toBe('unknown');
+	});
+
+	it('rollup.state 权威映射（SUCCESS）', () => {
+		const json = repo({
+			c0: { statusCheckRollup: { state: 'SUCCESS', contexts: { totalCount: 1, nodes: [
+				{ __typename: 'CheckRun', name: 'CI', status: 'COMPLETED', conclusion: 'SUCCESS', detailsUrl: 'https://github.com/o/r/runs/1' },
+			] } } },
+		});
+		const map = parseCiResponse(json, [oid(0)]);
+		const vm = map.get(oid(0))!;
+		expect(vm.state).toBe('success');
+		expect(vm.passed).toBe(1);
+		expect(vm.total).toBe(1);
+		expect(vm.url).toBe('https://github.com/o/r/runs/1');
+	});
+
+	it('混合 CheckRun + StatusContext，rollup=FAILURE → failure，失败项 url 优先', () => {
+		const json = repo({
+			c0: { statusCheckRollup: { state: 'FAILURE', contexts: { totalCount: 3, nodes: [
+				{ __typename: 'CheckRun', name: 'Build', status: 'COMPLETED', conclusion: 'SUCCESS', detailsUrl: 'https://github.com/o/r/runs/2' },
+				{ __typename: 'CheckRun', name: 'Test', status: 'COMPLETED', conclusion: 'FAILURE', detailsUrl: 'https://github.com/o/r/runs/3' },
+				{ __typename: 'StatusContext', context: 'external-ci', state: 'SUCCESS', targetUrl: 'https://ci.example.com/1', description: 'ok' },
+			] } } },
+		});
+		const map = parseCiResponse(json, [oid(0)]);
+		const vm = map.get(oid(0))!;
+		expect(vm.state).toBe('failure');
+		expect(vm.total).toBe(3);
+		expect(vm.checks).toHaveLength(3);
+		// 首个失败项（Test）的 url 优先。
+		expect(vm.url).toBe('https://github.com/o/r/runs/3');
+		// StatusContext 归一与 description 透传。
+		const ext = vm.checks.find((c) => c.name === 'external-ci')!;
+		expect(ext.state).toBe('success');
+		expect(ext.description).toBe('ok');
+	});
+
+	it('rollup=FAILURE 但无任何 context 节点 → 仍 failure（rollup 权威），checks 空', () => {
+		const json = repo({ c0: { statusCheckRollup: { state: 'FAILURE', contexts: { totalCount: 0, nodes: [] } } } });
+		const map = parseCiResponse(json, [oid(0)]);
+		const vm = map.get(oid(0))!;
+		expect(vm.state).toBe('failure');
+		expect(vm.checks).toHaveLength(0);
+		expect(vm.total).toBe(0);
+	});
+
+	it('按别名序号映射多个 oid', () => {
+		const json = repo({
+			c0: { statusCheckRollup: { state: 'SUCCESS', contexts: { totalCount: 0, nodes: [] } } },
+			c1: null,
+			c2: { statusCheckRollup: { state: 'PENDING', contexts: { totalCount: 1, nodes: [
+				{ __typename: 'CheckRun', name: 'X', status: 'IN_PROGRESS', conclusion: null },
+			] } } },
+		});
+		const map = parseCiResponse(json, [oid(0), oid(1), oid(2)]);
+		expect(map.get(oid(0))?.state).toBe('success');
+		expect(map.get(oid(1))?.state).toBe('unknown');
+		expect(map.get(oid(2))?.state).toBe('pending');
+	});
+
+	it('缺 data/repository → 整批回退 unknown（不抛错）', () => {
+		const map = parseCiResponse({ errors: [{ message: 'boom' }] }, [oid(0), oid(1)]);
+		expect(map.get(oid(0))?.state).toBe('unknown');
+		expect(map.get(oid(1))?.state).toBe('unknown');
+	});
+
+	it('不可识别的 __typename 节点被过滤', () => {
+		const json = repo({
+			c0: { statusCheckRollup: { state: 'SUCCESS', contexts: { totalCount: 2, nodes: [
+				{ __typename: 'CheckRun', name: 'A', status: 'COMPLETED', conclusion: 'SUCCESS' },
+				{ __typename: 'SomethingElse', name: 'B' },
+			] } } },
+		});
+		const vm = parseCiResponse(json, [oid(0)]).get(oid(0))!;
+		expect(vm.checks).toHaveLength(1);
+		expect(vm.checks[0].name).toBe('A');
+	});
+});
+
+describe('extractRateLimit', () => {
+	it('抽取 remaining / resetAt', () => {
+		const rl = extractRateLimit({ data: { rateLimit: { cost: 1, remaining: 42, resetAt: '2026-01-01T00:00:00Z' } } });
+		expect(rl?.remaining).toBe(42);
+		expect(rl?.resetAt).toBe('2026-01-01T00:00:00Z');
+	});
+	it('缺失返回 null', () => {
+		expect(extractRateLimit({ data: {} })).toBeNull();
+		expect(extractRateLimit({})).toBeNull();
+	});
+});
diff --git a/tests/unit/ci-remote-parser.test.ts b/tests/unit/ci-remote-parser.test.ts
new file mode 100644
index 0000000..aaf8068
--- /dev/null
+++ b/tests/unit/ci-remote-parser.test.ts
@@ -0,0 +1,77 @@
+import { describe, it, expect } from 'vitest';
+import { authProviderId, graphqlEndpoint, parseGitHubRemote } from '../../src/engine/ci/remote-parser';
+
+describe('parseGitHubRemote — 合法形态', () => {
+	it('https（带 .git）', () => {
+		expect(parseGitHubRemote('https://github.com/owner/repo.git')).toEqual({
+			host: 'github.com',
+			owner: 'owner',
+			repo: 'repo',
+			isGitHubDotCom: true,
+		});
+	});
+	it('https（不带 .git）', () => {
+		const r = parseGitHubRemote('https://github.com/ThreeFish-AI/hyper-git');
+		expect(r).toMatchObject({ owner: 'ThreeFish-AI', repo: 'hyper-git', isGitHubDotCom: true });
+	});
+	it('https 带用户名', () => {
+		expect(parseGitHubRemote('https://user@github.com/o/r.git')).toMatchObject({ owner: 'o', repo: 'r' });
+	});
+	it('scp 式 ssh（git@host:o/r）', () => {
+		expect(parseGitHubRemote('git@github.com:owner/repo.git')).toMatchObject({ host: 'github.com', owner: 'owner', repo: 'repo' });
+	});
+	it('ssh:// 带端口', () => {
+		expect(parseGitHubRemote('ssh://git@github.com:22/o/r.git')).toMatchObject({ host: 'github.com', owner: 'o', repo: 'r' });
+	});
+	it('ssh:// 不带端口', () => {
+		expect(parseGitHubRemote('ssh://git@github.com/o/r')).toMatchObject({ owner: 'o', repo: 'r' });
+	});
+	it('GitHub Enterprise 主机', () => {
+		const r = parseGitHubRemote('https://ghe.acme.com/team/proj.git');
+		expect(r).toMatchObject({ host: 'ghe.acme.com', owner: 'team', repo: 'proj', isGitHubDotCom: false });
+	});
+	it('GHE scp 形态', () => {
+		expect(parseGitHubRemote('git@ghe.acme.com:team/proj.git')).toMatchObject({ host: 'ghe.acme.com', owner: 'team', repo: 'proj' });
+	});
+	it('大小写主机归一', () => {
+		expect(parseGitHubRemote('https://GitHub.Com/O/R.git')?.host).toBe('github.com');
+	});
+});
+
+describe('parseGitHubRemote — 非法形态返回 null', () => {
+	it('空串', () => {
+		expect(parseGitHubRemote('')).toBeNull();
+	});
+	it('只有 owner 无 repo', () => {
+		expect(parseGitHubRemote('https://github.com/owner')).toBeNull();
+	});
+	it('多段 path（wiki 等非仓库路径）', () => {
+		expect(parseGitHubRemote('https://github.com/o/r/wiki')).toMatchObject({ owner: 'o', repo: 'r' });
+	});
+	it('乱码（非 URL）', () => {
+		expect(parseGitHubRemote('not a url at all')).toBeNull();
+	});
+	it('非 GitHub 风格（纯文件路径）', () => {
+		expect(parseGitHubRemote('/usr/local/bin')).toBeNull();
+	});
+});
+
+describe('graphqlEndpoint', () => {
+	it('github.com → api.github.com/graphql', () => {
+		const r = parseGitHubRemote('https://github.com/o/r.git')!;
+		expect(graphqlEndpoint(r)).toBe('https://api.github.com/graphql');
+	});
+	it('GHE → <host>/api/graphql（非 /api/v3/graphql）', () => {
+		const r = parseGitHubRemote('https://ghe.acme.com/o/r.git')!;
+		expect(graphqlEndpoint(r)).toBe('https://ghe.acme.com/api/graphql');
+	});
+});
+
+describe('authProviderId', () => {
+	it('github.com → github', () => {
+		expect(authProviderId(parseGitHubRemote('https://github.com/o/r.git')!)).toBe('github');
+	});
+	it('GHE → github-enterprise', () => {
+		expect(authProviderId(parseGitHubRemote('https://ghe.acme.com/o/r.git')!)).toBe('github-enterprise');
+	});
+});
diff --git a/tests/unit/ci-rollup.test.ts b/tests/unit/ci-rollup.test.ts
new file mode 100644
index 0000000..93eff90
--- /dev/null
+++ b/tests/unit/ci-rollup.test.ts
@@ -0,0 +1,98 @@
+import { describe, it, expect } from 'vitest';
+import {
+	aggregateChecks,
+	checkRunState,
+	mapRollupState,
+	pickPrimaryUrl,
+	recomputeState,
+	statusContextState,
+} from '../../src/engine/ci/rollup';
+import type { CiCheckVM } from '../../src/engine/ci/types';
+
+describe('mapRollupState（rollup StatusState → CiState）', () => {
+	it('SUCCESS → success', () => {
+		expect(mapRollupState('SUCCESS')).toBe('success');
+	});
+	it('FAILURE/ERROR → failure', () => {
+		expect(mapRollupState('FAILURE')).toBe('failure');
+		expect(mapRollupState('ERROR')).toBe('failure');
+	});
+	it('PENDING/EXPECTED → pending', () => {
+		expect(mapRollupState('PENDING')).toBe('pending');
+		expect(mapRollupState('EXPECTED')).toBe('pending');
+	});
+	it('空/未知 → unknown', () => {
+		expect(mapRollupState(null)).toBe('unknown');
+		expect(mapRollupState(undefined)).toBe('unknown');
+		expect(mapRollupState('')).toBe('unknown');
+	});
+});
+
+describe('checkRunState（CheckRun status+conclusion → CiState）', () => {
+	it('未完成一律 pending', () => {
+		expect(checkRunState('IN_PROGRESS', null)).toBe('pending');
+		expect(checkRunState('QUEUED', null)).toBe('pending');
+		expect(checkRunState('WAITING', null)).toBe('pending');
+	});
+	it('COMPLETED + SUCCESS → success', () => {
+		expect(checkRunState('COMPLETED', 'SUCCESS')).toBe('success');
+	});
+	it('COMPLETED + 非阻塞结论 → success', () => {
+		expect(checkRunState('COMPLETED', 'NEUTRAL')).toBe('success');
+		expect(checkRunState('COMPLETED', 'SKIPPED')).toBe('success');
+	});
+	it('COMPLETED + 失败结论 → failure', () => {
+		for (const c of ['FAILURE', 'ERROR', 'CANCELLED', 'TIMED_OUT', 'ACTION_REQUIRED', 'STARTUP_FAILURE', 'STALE']) {
+			expect(checkRunState('COMPLETED', c)).toBe('failure');
+		}
+	});
+	it('COMPLETED + 未知结论 → pending（保守）', () => {
+		expect(checkRunState('COMPLETED', null)).toBe('pending');
+	});
+});
+
+describe('statusContextState（复用 rollup 映射）', () => {
+	it('与 mapRollupState 一致', () => {
+		expect(statusContextState('SUCCESS')).toBe('success');
+		expect(statusContextState('FAILURE')).toBe('failure');
+		expect(statusContextState('PENDING')).toBe('pending');
+	});
+});
+
+describe('pickPrimaryUrl', () => {
+	const ck = (over: Partial<CiCheckVM>): CiCheckVM => ({ name: 'n', state: 'success', ...over });
+	it('优先首个失败项的 url', () => {
+		const checks = [ck({ state: 'success', url: 'a' }), ck({ state: 'failure', url: 'b' }), ck({ state: 'failure', url: 'c' })];
+		expect(pickPrimaryUrl(checks)).toBe('b');
+	});
+	it('无失败项时取首个有 url 项', () => {
+		const checks = [ck({ url: 'a' }), ck({ url: 'b' })];
+		expect(pickPrimaryUrl(checks)).toBe('a');
+	});
+	it('全无 url → undefined', () => {
+		expect(pickPrimaryUrl([ck({})])).toBeUndefined();
+	});
+});
+
+describe('recomputeState / aggregateChecks', () => {
+	const ck = (state: CiCheckVM['state']): CiCheckVM => ({ name: 'n', state });
+	it('recompute：任一 failure→failure；否则任一 pending→pending；否则 success；空→unknown', () => {
+		expect(recomputeState([ck('success'), ck('failure')])).toBe('failure');
+		expect(recomputeState([ck('success'), ck('pending')])).toBe('pending');
+		expect(recomputeState([ck('success'), ck('success')])).toBe('success');
+		expect(recomputeState([])).toBe('unknown');
+	});
+	it('aggregate：rollupState 权威优先', () => {
+		const vm = aggregateChecks('failure', [ck('success'), ck('success')]);
+		expect(vm.state).toBe('failure');
+		expect(vm.passed).toBe(2);
+		expect(vm.total).toBe(2);
+	});
+	it('aggregate：rollupState=unknown 时据 checks 兜底重算', () => {
+		const vm = aggregateChecks('unknown', [ck('success'), ck('pending')]);
+		expect(vm.state).toBe('pending');
+	});
+	it('aggregate：空 checks → unknown', () => {
+		expect(aggregateChecks('unknown', []).state).toBe('unknown');
+	});
+});
diff --git a/tests/unit/commit-service.test.ts b/tests/unit/commit-service.test.ts
index 22b3c91..347421e 100644
--- a/tests/unit/commit-service.test.ts
+++ b/tests/unit/commit-service.test.ts
@@ -73,7 +73,7 @@ describe('CommitService.executeCommit', () => {
 		const cs = makeCommitService(makeRepo(), [change('a.ts')]);
 		const r = await cs.executeCommit(REQ({ message: '   ' }));
 		expect(r.ok).toBe(false);
-		expect(r.error).toContain('不能为空');
+		expect(r.error).toContain('cannot be empty');
 	});
 
 	it('CC 不合规（默认 conventional=true）→ error', async () => {
@@ -87,7 +87,7 @@ describe('CommitService.executeCommit', () => {
 		const cs = makeCommitService(makeRepo(), [change('a.ts')]);
 		const r = await cs.executeCommit(REQ({ selectedPaths: [] }));
 		expect(r.ok).toBe(false);
-		expect(r.error).toContain('未选择');
+		expect(r.error).toContain('No files selected');
 	});
 
 	it('合规 + 勾选 → commit 透传 amend/signoff/noVerify，返回 ok', async () => {
@@ -119,7 +119,7 @@ describe('CommitService.executeCommit', () => {
 		const cs = makeCommitService(repo, [change('a.ts')]);
 		const r = await cs.executeCommit(REQ({ push: true }));
 		expect(r.ok).toBe(true);
-		expect(r.warning).toContain('推送失败');
+		expect(r.warning).toContain('push failed');
 		expect(repo.commit).toHaveBeenCalled();
 	});
 });
diff --git a/tests/unit/conventional-check.test.ts b/tests/unit/conventional-check.test.ts
index b4908c9..8efa6e8 100644
--- a/tests/unit/conventional-check.test.ts
+++ b/tests/unit/conventional-check.test.ts
@@ -28,7 +28,7 @@ describe('ConventionalCommitCheck', () => {
 		expect(r).toBe(CheckinResult.Cancel);
 	});
 
-	it('executionOrder 较小（早执行，对齐 IDEA ExecutionOrder.EARLY）', () => {
+	it('executionOrder 较小（早执行，参考 JetBrains ExecutionOrder.EARLY）', () => {
 		const check = new ConventionalCommitCheck(() => true);
 		expect(check.executionOrder ?? 100).toBeLessThanOrEqual(50);
 	});
diff --git a/tests/unit/log-filter.test.ts b/tests/unit/log-filter.test.ts
index e48ed06..2952075 100644
--- a/tests/unit/log-filter.test.ts
+++ b/tests/unit/log-filter.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { applyClientFilters, safeRegex, type FilterableCommit, type LogClientFilter } from '../../src/engine/log/log-filter';
+import { CHECKPOINT_SUBJECT_RE, applyClientFilters, isCheckpointSubject, safeRegex, type FilterableCommit, type LogClientFilter } from '../../src/engine/log/log-filter';
 
 const D = (iso: string): Date => new Date(iso);
 const C = (message: string, parents: string[], authorDate?: Date): FilterableCommit => ({ message, parents, authorDate });
@@ -11,6 +11,13 @@ const COMMITS: FilterableCommit[] = [
 	C('docs: readme', ['p1', 'p2', 'p3'], D('2026-07-01')),
 ];
 
+/** 含 Conductor 自动 checkpoint 提交的样本（用于 keepCheckpoint 维度测试，与 COMMITS 隔离以保护既有断言）。 */
+const COMMITS_WITH_CKPT: FilterableCommit[] = [
+	...COMMITS,
+	C('checkpoint:session-x-turn-y-start', ['p1'], D('2026-06-05')),
+	C('checkpoint:conductor-archive-uuid', ['p1'], D('2026-06-15')),
+];
+
 describe('log-filter', () => {
 	it('merge-only 仅保留 parents>1', () => {
 		const f: LogClientFilter = { mergeMode: 'merge-only' };
@@ -58,6 +65,44 @@ describe('log-filter', () => {
 	});
 });
 
+describe('isCheckpointSubject / CHECKPOINT_SUBJECT_RE', () => {
+	it('识别 session checkpoint 起/止', () => {
+		expect(isCheckpointSubject('checkpoint:session-abc-turn-def-start')).toBe(true);
+		expect(isCheckpointSubject('checkpoint:session-abc-turn-def-end')).toBe(true);
+	});
+	it('识别 conductor-archive / conductor-getdiff', () => {
+		expect(isCheckpointSubject('checkpoint:conductor-archive-uuid')).toBe(true);
+		expect(isCheckpointSubject('checkpoint:conductor-getdiff')).toBe(true);
+	});
+	it('不误伤非 checkpoint 前缀（含正文出现 checkpoint 字样）', () => {
+		expect(isCheckpointSubject('docs: checkpoint notes')).toBe(false);
+		expect(isCheckpointSubject('feat: add checkpoint api')).toBe(false);
+		expect(isCheckpointSubject('')).toBe(false);
+	});
+	it('大小写不敏感（容错 Agent 工具配置差异）', () => {
+		expect(isCheckpointSubject('Checkpoint:session-x')).toBe(true);
+		expect(CHECKPOINT_SUBJECT_RE.test('CHECKPOINT:foo')).toBe(true);
+	});
+});
+
+describe('applyClientFilters — keepCheckpoint 维度', () => {
+	it('keepCheckpoint=false 剔除 checkpoint 提交（保留正常提交）', () => {
+		const out = applyClientFilters(COMMITS_WITH_CKPT, { keepCheckpoint: false }).map((c) => c.message);
+		expect(out).toEqual(['feat: a', 'merge: branch', 'fix: bug [urgent]', 'docs: readme']);
+	});
+	it('keepCheckpoint=undefined 不过滤 checkpoint（向后兼容）', () => {
+		expect(applyClientFilters(COMMITS_WITH_CKPT, {})).toHaveLength(6);
+	});
+	it('keepCheckpoint=true 保留 checkpoint', () => {
+		expect(applyClientFilters(COMMITS_WITH_CKPT, { keepCheckpoint: true })).toHaveLength(6);
+	});
+	it('组合：keepCheckpoint=false + no-merge + dateFrom（顺序正交）', () => {
+		const f: LogClientFilter = { keepCheckpoint: false, mergeMode: 'no-merge', dateFrom: D('2026-06-15') };
+		// 剔 checkpoint(2 条) + 剔 merge(docs) + 剔早于 06-15(feat:a) → 仅 fix: bug [urgent]
+		expect(applyClientFilters(COMMITS_WITH_CKPT, f).map((c) => c.message)).toEqual(['fix: bug [urgent]']);
+	});
+});
+
 describe('safeRegex', () => {
 	it('合法模式返回 RegExp', () => {
 		expect(safeRegex('feat')).toEqual(/feat/);
diff --git a/tests/unit/log-graph-layout.test.ts b/tests/unit/log-graph-layout.test.ts
new file mode 100644
index 0000000..ab8ecfa
--- /dev/null
+++ b/tests/unit/log-graph-layout.test.ts
@@ -0,0 +1,115 @@
+import { describe, it, expect } from 'vitest';
+import { computeGraphLayout, maxLanes } from '../../src/engine/log/graph-layout';
+import type { GraphCommit } from '../../src/engine/log/graph-types';
+
+const C = (hash: string, parents: readonly string[] = []): GraphCommit => ({ hash, parents });
+
+describe('computeGraphLayout — 线性历史', () => {
+	it('单链：全部 col0，首父链同色，纯 straight 出边', () => {
+		const rows = computeGraphLayout([C('a', ['b']), C('b', ['c']), C('c')]);
+		expect(rows.map((r) => r.node.col)).toEqual([0, 0, 0]);
+		expect(rows.every((r) => r.node.colorIdx === rows[0].node.colorIdx)).toBe(true);
+		expect(rows[0].outgoing.every((e) => e.kind === 'straight')).toBe(true);
+		expect(rows[2].hasDanglingParent).toBe(false); // c 是 root，非截断
+		expect(maxLanes(rows)).toBe(1);
+	});
+});
+
+describe('computeGraphLayout — 分支 + 合并（钻石）', () => {
+	//   a (merge: b,c)
+	//  /|
+	// b |  b@col0  c@col1
+	//  \|
+	//   d (root)
+	const rows = computeGraphLayout([C('a', ['b', 'c']), C('b', ['d']), C('c', ['d']), C('d')]);
+
+	it('merge 节点 col0，次父 fan-out 到 col1', () => {
+		expect(rows[0].node.col).toBe(0);
+		expect(rows[0].isMerge).toBe(true);
+		expect(rows[0].outgoing.some((e) => e.kind === 'merge-in' && e.fromCol === 0 && e.toCol === 1)).toBe(true);
+	});
+
+	it('两条分支分别落在 col0 / col1，且贯穿彼此 lane', () => {
+		expect(rows[1].node.col).toBe(0); // b
+		expect(rows[2].node.col).toBe(1); // c
+		expect(rows[1].passThrough.some((e) => e.fromCol === 1)).toBe(true); // c 的 lane 穿过 b
+	});
+
+	it('汇合点 d：次父以 merge-in 收敛入 col0', () => {
+		expect(rows[3].node.col).toBe(0);
+		expect(rows[3].incoming.some((e) => e.kind === 'merge-in' && e.fromCol === 1 && e.toCol === 0)).toBe(true);
+	});
+
+	it('相邻 lane 着色区分', () => {
+		expect(rows[1].node.colorIdx).not.toBe(rows[2].node.colorIdx);
+	});
+
+	it('maxLanes = 2', () => {
+		expect(maxLanes(rows)).toBe(2);
+	});
+});
+
+describe('computeGraphLayout — Octopus 合并（3 parents）', () => {
+	it('首父 col0，两个次父各 fan-out', () => {
+		const rows = computeGraphLayout([C('m', ['p1', 'p2', 'p3']), C('p1'), C('p2'), C('p3')]);
+		expect(rows[0].node.col).toBe(0);
+		const mergeIns = rows[0].outgoing.filter((e) => e.kind === 'merge-in');
+		expect(mergeIns).toHaveLength(2);
+		expect(new Set(mergeIns.map((e) => e.toCol))).toEqual(new Set([1, 2]));
+	});
+});
+
+describe('computeGraphLayout — 多 root / 不连通历史', () => {
+	it('两条独立链顺序复用 col0，互不干扰', () => {
+		const rows = computeGraphLayout([C('a', ['b']), C('b'), C('x', ['y']), C('y')]);
+		expect(rows[0].node.col).toBe(0); // a
+		expect(rows[2].node.col).toBe(0); // x 复用释放后的 nil 槽
+		expect(maxLanes(rows)).toBe(1);
+	});
+});
+
+describe('computeGraphLayout — 截断边界（dangling parent）', () => {
+	it('首父不在窗口：hasDanglingParent，emit dangling 出边', () => {
+		const rows = computeGraphLayout([C('a', ['UNLOADED'])]);
+		expect(rows[0].hasDanglingParent).toBe(true);
+		expect(rows[0].outgoing.some((e) => e.kind === 'dangling')).toBe(true);
+	});
+
+	it('次父不在窗口：merge + dangling，不为悬空父开活跃槽', () => {
+		const rows = computeGraphLayout([C('m', ['p', 'UNLOADED']), C('p')]);
+		expect(rows[0].hasDanglingParent).toBe(true);
+		expect(rows[0].isMerge).toBe(true);
+		expect(maxLanes(rows)).toBe(1); // UNLOADED 不占槽
+	});
+});
+
+describe('computeGraphLayout — 收敛（convergence）', () => {
+	// a→s, b→s：a 落 col0、b 落 col1，各自首父 s 直行下行；两条 lane 在 s 节点处收敛
+	// （col1 的下行边以 merge-in 收敛入 col0），不会为 s 再开第三条 lane。
+	it('两个子指向同一父：父节点处收敛（incoming merge-in），不开第三条 lane', () => {
+		const rows = computeGraphLayout([C('a', ['s']), C('b', ['s']), C('s')]);
+		expect(rows[0].node.col).toBe(0); // a
+		expect(rows[1].node.col).toBe(1); // b 开新 lane
+		expect(rows[1].outgoing.some((e) => e.kind === 'straight' && e.toCol === 1)).toBe(true); // b 首父直行
+		expect(rows[2].node.col).toBe(0); // s 落在 col0
+		expect(rows[2].incoming.some((e) => e.kind === 'merge-in' && e.fromCol === 1 && e.toCol === 0)).toBe(true);
+		expect(maxLanes(rows)).toBe(2); // 仅两条 lane
+	});
+});
+
+describe('computeGraphLayout — 确定性与边界', () => {
+	it('同一输入两次调用结果深相等', () => {
+		const input = [C('a', ['b', 'c']), C('b'), C('c')];
+		expect(computeGraphLayout(input)).toEqual(computeGraphLayout(input));
+	});
+
+	it('空输入返回空数组', () => {
+		expect(computeGraphLayout([])).toEqual([]);
+	});
+
+	it('全 root：全部 col0 不崩溃', () => {
+		const rows = computeGraphLayout([C('a'), C('b'), C('c')]);
+		expect(rows.map((r) => r.node.col)).toEqual([0, 0, 0]);
+		expect(maxLanes(rows)).toBe(1);
+	});
+});
diff --git a/tests/unit/log-graph-parser.test.ts b/tests/unit/log-graph-parser.test.ts
deleted file mode 100644
index cbfc2ff..0000000
--- a/tests/unit/log-graph-parser.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { parseGraphLog, normalizeGraphWidth, classifyGraphChar } from '../../src/engine/log/graph-parser';
-
-const NUL = '\x00';
-
-describe('parseGraphLog', () => {
-	it('解析 commit 行（graph + hash + decorate + subject）', () => {
-		const out = `*${NUL}aaa1111${NUL} (HEAD -> main)${NUL}first commit`;
-		const rows = parseGraphLog(out);
-		expect(rows).toHaveLength(1);
-		expect(rows[0]).toEqual({ graph: '*', hash: 'aaa1111', decorate: '(HEAD -> main)', subject: 'first commit' });
-	});
-
-	it('graph 续行（无 NUL）只含 graph', () => {
-		const out = ['*' + NUL + 'aaa' + NUL + '' + NUL + 'c1', '|\\', '| *' + NUL + 'bbb' + NUL + '' + NUL + 'c2'].join('\n');
-		const rows = parseGraphLog(out);
-		expect(rows).toHaveLength(3);
-		expect(rows[1].graph).toBe('|\\');
-		expect(rows[1].hash).toBeUndefined();
-		expect(rows[2].hash).toBe('bbb');
-	});
-
-	it('graph 去除尾部空白', () => {
-		const out = '*   ' + NUL + 'aaa' + NUL + '' + NUL + 's';
-		expect(parseGraphLog(out)[0].graph).toBe('*');
-	});
-
-	it('decorate 为空时 trim 为 undefined', () => {
-		const out = '*' + NUL + 'aaa' + NUL + '   ' + NUL + 's';
-		expect(parseGraphLog(out)[0].decorate).toBeUndefined();
-	});
-
-	it('跳过空行', () => {
-		const out = '\n*' + NUL + 'aaa' + NUL + '' + NUL + 's\n\n';
-		expect(parseGraphLog(out)).toHaveLength(1);
-	});
-
-	it('subject 含特殊字符（| / 等）原样保留', () => {
-		const out = '*' + NUL + 'aaa' + NUL + '' + NUL + 'fix: a | b / c';
-		expect(parseGraphLog(out)[0].subject).toBe('fix: a | b / c');
-	});
-});
-
-describe('normalizeGraphWidth', () => {
-	it('右填充到最大 graph 长度，保证列对齐', () => {
-		const rows = parseGraphLog(['*' + NUL + 'a' + NUL + '' + NUL + 's', '| *' + NUL + 'b' + NUL + '' + NUL + 's'].join('\n'));
-		const padded = normalizeGraphWidth(rows);
-		expect(padded[0]).toBe('*  '); // 长度 3（max=3）
-		expect(padded[1]).toBe('| *');
-		expect(padded.every((g) => g.length === 3)).toBe(true);
-	});
-});
-
-describe('classifyGraphChar', () => {
-	it('识别各类 graph 字符', () => {
-		expect(classifyGraphChar('*')).toBe('node');
-		expect(classifyGraphChar('|')).toBe('vert');
-		expect(classifyGraphChar('/')).toBe('slash');
-		expect(classifyGraphChar('\\')).toBe('backslash');
-		expect(classifyGraphChar('_')).toBe('underscore');
-		expect(classifyGraphChar(' ')).toBe('blank');
-		expect(classifyGraphChar('x')).toBe('blank');
-	});
-});
diff --git a/tests/unit/log-line.test.ts b/tests/unit/log-line.test.ts
new file mode 100644
index 0000000..fdf13c4
--- /dev/null
+++ b/tests/unit/log-line.test.ts
@@ -0,0 +1,65 @@
+import { describe, it, expect } from 'vitest';
+import { parseLogLines, LOG_GRAPH_FORMAT } from '../../src/engine/log/log-line';
+
+const NUL = '\x00';
+const RS = '\x1e';
+
+/** 模拟 git 逐 commit 输出：字段 NUL 分隔、记录以 RS 终止、git 追加一个换行。 */
+const rec = (hash: string, parents: string, an: string, ae: string, aI: string, subject: string): string =>
+	`${hash}${NUL}${parents}${NUL}${an}${NUL}${ae}${NUL}${aI}${NUL}${subject}${RS}\n`;
+
+describe('LOG_GRAPH_FORMAT', () => {
+	it('字段顺序：H P an ae aI s，以 NUL 分隔、RS 终止', () => {
+		expect(LOG_GRAPH_FORMAT).toBe('%H%x00%P%x00%an%x00%ae%x00%aI%x00%s%x1e');
+	});
+});
+
+describe('parseLogLines', () => {
+	it('解析单条 commit', () => {
+		const rows = parseLogLines(rec('aaa', 'bbb', 'Jane', 'j@x.io', '2026-06-29T10:00:00+08:00', 'fix: bug'));
+		expect(rows).toHaveLength(1);
+		expect(rows[0]).toEqual({
+			hash: 'aaa',
+			parents: ['bbb'],
+			authorName: 'Jane',
+			authorEmail: 'j@x.io',
+			authorDate: '2026-06-29T10:00:00+08:00',
+			subject: 'fix: bug',
+		});
+	});
+
+	it('解析多条（第二条带 git 行首换行）', () => {
+		const out = rec('aaa', 'bbb', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 's1') + rec('bbb', '', 'B', 'b@x', '2026-06-28T10:00:00+08:00', 's2');
+		const rows = parseLogLines(out);
+		expect(rows).toHaveLength(2);
+		expect(rows[1].hash).toBe('bbb');
+		expect(rows[1].subject).toBe('s2');
+	});
+
+	it('root 提交：parents 为空数组', () => {
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 'init'));
+		expect(rows[0].parents).toEqual([]);
+	});
+
+	it('多父（merge）：parents 按空格拆分', () => {
+		const rows = parseLogLines(rec('m', 'p1 p2 p3', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 'merge'));
+		expect(rows[0].parents).toEqual(['p1', 'p2', 'p3']);
+	});
+
+	it('空输出返回空数组', () => {
+		expect(parseLogLines('')).toEqual([]);
+	});
+
+	it('字段不足的记录被跳过（不中断整体解析）', () => {
+		const bad = `only${NUL}two${RS}\n`;
+		const good = rec('aaa', '', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 's');
+		const rows = parseLogLines(bad + good);
+		expect(rows).toHaveLength(1);
+		expect(rows[0].hash).toBe('aaa');
+	});
+
+	it('subject 含特殊字符（| / \\）原样保留', () => {
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 'fix: a | b / c \\ d'));
+		expect(rows[0].subject).toBe('fix: a | b / c \\ d');
+	});
+});
diff --git a/tests/unit/log-query.test.ts b/tests/unit/log-query.test.ts
new file mode 100644
index 0000000..3c3be5b
--- /dev/null
+++ b/tests/unit/log-query.test.ts
@@ -0,0 +1,61 @@
+import { describe, it, expect } from 'vitest';
+import { buildLogArgs } from '../../src/engine/log/log-query';
+import type { LogFilter } from '../../src/engine/log/log-filter';
+
+const noFilter: LogFilter = {};
+
+describe('buildLogArgs — 顺序与必选项', () => {
+	it('--topo-order 置首（lane 算法依赖拓扑序）', () => {
+		expect(buildLogArgs(noFilter, 'all', { maxCount: 300 })[0]).toBe('--topo-order');
+	});
+
+	it('scope=all 用 --branches --tags --remotes（排除工具注入的内部引用）；不含 --all', () => {
+		const allArgs = buildLogArgs(noFilter, 'all', { maxCount: 300 });
+		expect(allArgs).toContain('--branches');
+		expect(allArgs).toContain('--tags');
+		expect(allArgs).toContain('--remotes');
+		// 关键回归护栏：不得回退到 --all（否则 refs/conductor-* 等内部引用会污染视图）
+		expect(allArgs).not.toContain('--all');
+		expect(buildLogArgs(noFilter, 'current', { maxCount: 300 })).not.toContain('--all');
+	});
+
+	it('scope=checkpointer 用 --all（原始完整视图，含内部 checkpoint 引用）且不叠三件套', () => {
+		const cpArgs = buildLogArgs(noFilter, 'checkpointer', { maxCount: 300 });
+		expect(cpArgs).toContain('--all');
+		expect(cpArgs).not.toContain('--branches');
+	});
+
+	it('max-count 与 skip', () => {
+		expect(buildLogArgs(noFilter, 'all', { maxCount: 500 })).toContain('--max-count=500');
+		expect(buildLogArgs(noFilter, 'all', { maxCount: 500, skip: 500 })).toContain('--skip=500');
+		expect(buildLogArgs(noFilter, 'all', { maxCount: 500, skip: 0 })).not.toContain('--skip=0');
+	});
+});
+
+describe('buildLogArgs — 服务端过滤翻译', () => {
+	it('author / grep 翻译为 flag（去空白）', () => {
+		const args = buildLogArgs({ author: '  Jane  ', grep: 'fix' }, 'all', { maxCount: 300 });
+		expect(args).toContain('--author=Jane');
+		expect(args).toContain('--grep=fix');
+	});
+
+	it('空 author/grep 不产生 flag', () => {
+		const args = buildLogArgs({ author: '   ', grep: '' }, 'all', { maxCount: 300 });
+		expect(args.some((a) => a.startsWith('--author'))).toBe(false);
+		expect(args.some((a) => a.startsWith('--grep'))).toBe(false);
+	});
+
+	it('path 以 pathspec 形式置于参数末尾（--format 之后）', () => {
+		const args = buildLogArgs({ path: 'src/a.ts' }, 'all', { maxCount: 300 });
+		const fmtIdx = args.findIndex((a) => a.startsWith('--format='));
+		const pathspecSep = args.lastIndexOf('--');
+		expect(pathspecSep).toBeGreaterThan(fmtIdx);
+		expect(args[args.length - 1]).toBe('src/a.ts');
+		expect(args[args.length - 2]).toBe('--');
+	});
+
+	it('--format 使用 LOG_GRAPH_FORMAT 契约', () => {
+		const args = buildLogArgs(noFilter, 'all', { maxCount: 300 });
+		expect(args).toContain(`--format=${'%H%x00%P%x00%an%x00%ae%x00%aI%x00%s%x1e'}`);
+	});
+});
diff --git a/tests/unit/ref-cleanup.test.ts b/tests/unit/ref-cleanup.test.ts
index 3bde273..a20d092 100644
--- a/tests/unit/ref-cleanup.test.ts
+++ b/tests/unit/ref-cleanup.test.ts
@@ -1,5 +1,14 @@
 import { describe, it, expect } from 'vitest';
-import { filterMergeable, isProtectedBranch, PROTECTED_BRANCHES } from '../../src/engine/ref/cleanup';
+import {
+	diffPrunedRefs,
+	filterMergeable,
+	formatBranchDeleteConfirm,
+	isProtectedBranch,
+	parseMergedBranchNames,
+	partitionByMerged,
+	PROTECTED_BRANCHES,
+	truncateNames,
+} from '../../src/engine/ref/cleanup';
 
 describe('cleanup', () => {
 	it('PROTECTED_BRANCHES 含 main/master', () => {
@@ -29,4 +38,99 @@ describe('cleanup', () => {
 		const out = '  dup\n  dup\n  ok\n';
 		expect(filterMergeable(out, 'main')).toEqual(['dup', 'ok']);
 	});
+
+	it('parseMergedBranchNames 剥离 * 前缀、去空行、去重保序（不做受保护排除）', () => {
+		const out = '* main\n  feature\n\n  main\n  feature\n';
+		expect(parseMergedBranchNames(out)).toEqual(['main', 'feature']);
+	});
+});
+
+describe('partitionByMerged', () => {
+	it('按 --merged 集合把选区分桶为 merged / unmerged', () => {
+		const mergedOut = '* main\n  feat-a\n  feat-b\n';
+		const { merged, unmerged } = partitionByMerged(mergedOut, ['feat-a', 'feat-c', 'feat-b', 'feat-d']);
+		expect(merged).toEqual(['feat-a', 'feat-b']);
+		expect(unmerged).toEqual(['feat-c', 'feat-d']);
+	});
+
+	it('全部已合并 / 全部未合并 / 空选区', () => {
+		const out = '  a\n  b\n';
+		expect(partitionByMerged(out, ['a', 'b'])).toEqual({ merged: ['a', 'b'], unmerged: [] });
+		expect(partitionByMerged(out, ['x', 'y'])).toEqual({ merged: [], unmerged: ['x', 'y'] });
+		expect(partitionByMerged('', [])).toEqual({ merged: [], unmerged: [] });
+	});
+
+	it('查询失败（空输出）时选区全部归为 unmerged', () => {
+		expect(partitionByMerged('', ['a', 'b'])).toEqual({ merged: [], unmerged: ['a', 'b'] });
+	});
+});
+
+describe('truncateNames', () => {
+	it('不超过上限时全量 join', () => {
+		expect(truncateNames(['a', 'b', 'c'])).toBe('a, b, c');
+	});
+
+	it('超过上限时截断并标注剩余数量', () => {
+		const names = Array.from({ length: 10 }, (_, i) => `b${i}`);
+		expect(truncateNames(names)).toBe('b0, b1, b2, b3, b4, b5, b6, b7 …还有 2 个');
+	});
+});
+
+describe('diffPrunedRefs', () => {
+	it('返回 before 有、after 无的引用（保 before 顺序）', () => {
+		const before = ['origin/feat-a', 'origin/master', 'origin/feat-b'];
+		const after = ['origin/master'];
+		// feat-a / feat-b 被清理，master 保留；顺序跟随 before
+		expect(diffPrunedRefs(before, after)).toEqual(['origin/feat-a', 'origin/feat-b']);
+	});
+
+	it('无可清理时返回空数组', () => {
+		const refs = ['origin/main', 'origin/dev'];
+		expect(diffPrunedRefs(refs, refs)).toEqual([]);
+	});
+
+	it('after 新增引用不影响差集（仅关心被移除项）', () => {
+		const before = ['origin/a'];
+		const after = ['origin/a', 'origin/b'];
+		expect(diffPrunedRefs(before, after)).toEqual([]);
+	});
+
+	it('全部被清理', () => {
+		expect(diffPrunedRefs(['origin/x', 'origin/y'], [])).toEqual(['origin/x', 'origin/y']);
+	});
+
+	it('空 before 永远为空', () => {
+		expect(diffPrunedRefs([], ['origin/a'])).toEqual([]);
+	});
+});
+
+describe('formatBranchDeleteConfirm', () => {
+	it('单个已合并 → 安全删除文案', () => {
+		expect(formatBranchDeleteConfirm(['feat'], [])).toEqual({ detail: '分支「feat」已合并，可安全删除。', confirmLabel: '删除' });
+	});
+
+	it('单个未合并 → 强制删除文案', () => {
+		const r = formatBranchDeleteConfirm([], ['feat']);
+		expect(r.confirmLabel).toBe('强制删除');
+		expect(r.detail).toContain('未合并');
+	});
+
+	it('多个全已合并 → 删除', () => {
+		const r = formatBranchDeleteConfirm(['a', 'b'], []);
+		expect(r.confirmLabel).toBe('删除');
+		expect(r.detail).toContain('将删除 2 个已合并');
+	});
+
+	it('多个全未合并 → 强制删除并警示丢失提交', () => {
+		const r = formatBranchDeleteConfirm([], ['a', 'b']);
+		expect(r.confirmLabel).toBe('强制删除');
+		expect(r.detail).toContain('丢失');
+	});
+
+	it('混合 → 全部删除并分栏诚实呈现', () => {
+		const r = formatBranchDeleteConfirm(['a'], ['b']);
+		expect(r.confirmLabel).toBe('全部删除');
+		expect(r.detail).toContain('已合并');
+		expect(r.detail).toContain('未合并');
+	});
 });
diff --git a/tests/unit/ref-remote.test.ts b/tests/unit/ref-remote.test.ts
new file mode 100644
index 0000000..b2b60e9
--- /dev/null
+++ b/tests/unit/ref-remote.test.ts
@@ -0,0 +1,111 @@
+import { describe, it, expect } from 'vitest';
+import { resolveRemoteBranch, partitionRemoteByProtected, formatRemoteDeleteConfirm } from '../../src/engine/ref/remote-ref';
+
+describe('resolveRemoteBranch', () => {
+	it('普通 remote：origin/foo → {origin, foo}', () => {
+		expect(resolveRemoteBranch('origin/foo', ['origin'])).toEqual({
+			remote: 'origin',
+			branch: 'foo',
+			shortName: 'origin/foo',
+		});
+	});
+
+	it('含斜杠 remote：myorg/repo/feature → {myorg/repo, feature}（最长前缀）', () => {
+		expect(resolveRemoteBranch('myorg/repo/feature', ['origin', 'myorg/repo'])).toEqual({
+			remote: 'myorg/repo',
+			branch: 'feature',
+			shortName: 'myorg/repo/feature',
+		});
+	});
+
+	it('歧义优先最长前缀（同时存在 myorg 与 myorg/repo）', () => {
+		expect(resolveRemoteBranch('myorg/repo/feat', ['myorg', 'myorg/repo'])?.remote).toBe('myorg/repo');
+	});
+
+	it('前缀带分隔符防误配（origin 不应匹配 originx/foo）', () => {
+		expect(resolveRemoteBranch('originx/foo', ['origin'])).toBeNull();
+	});
+
+	it('分支名自身含斜杠：origin/feat/x → {origin, feat/x}', () => {
+		expect(resolveRemoteBranch('origin/feat/x', ['origin'])).toEqual({
+			remote: 'origin',
+			branch: 'feat/x',
+			shortName: 'origin/feat/x',
+		});
+	});
+
+	it('不属于任何已知 remote → null', () => {
+		expect(resolveRemoteBranch('upstream/foo', ['origin'])).toBeNull();
+	});
+
+	it('纯 remote 名（无分支段）→ null', () => {
+		expect(resolveRemoteBranch('origin', ['origin'])).toBeNull();
+	});
+
+	it('空 remotes → null', () => {
+		expect(resolveRemoteBranch('origin/foo', [])).toBeNull();
+	});
+});
+
+describe('partitionRemoteByProtected', () => {
+	const t = (shortName: string, remote: string, branch: string) => ({ remote, branch, shortName });
+
+	it('main/master 归 protected，其余 deletable', () => {
+		const { deletable, protectedTargets } = partitionRemoteByProtected([
+			t('origin/main', 'origin', 'main'),
+			t('origin/master', 'origin', 'master'),
+			t('origin/feat', 'origin', 'feat'),
+		]);
+		expect(deletable.map((x) => x.branch)).toEqual(['feat']);
+		expect(protectedTargets.map((x) => x.branch).sort()).toEqual(['main', 'master']);
+	});
+
+	it('空输入 → 两桶皆空', () => {
+		const r = partitionRemoteByProtected([]);
+		expect(r.deletable).toEqual([]);
+		expect(r.protectedTargets).toEqual([]);
+	});
+
+	it('分支名含斜杠的受保护判定基于末段（feat/main 不受保护）', () => {
+		const { deletable } = partitionRemoteByProtected([t('origin/feat/main', 'origin', 'feat/main')]);
+		expect(deletable.map((x) => x.branch)).toEqual(['feat/main']);
+	});
+});
+
+describe('formatRemoteDeleteConfirm', () => {
+	const t = (shortName: string, remote: string, branch: string) => ({ remote, branch, shortName });
+
+	it('单条 → 删除 + 不可撤销 + 协作者', () => {
+		const r = formatRemoteDeleteConfirm([t('origin/foo', 'origin', 'foo')]);
+		expect(r.confirmLabel).toBe('删除');
+		expect(r.detail).toContain('origin/foo');
+		expect(r.detail).toContain('不可撤销');
+		expect(r.detail).toContain('协作者');
+	});
+
+	it('多条 → 含数量与截断名', () => {
+		const r = formatRemoteDeleteConfirm([
+			t('origin/b0', 'origin', 'b0'),
+			t('origin/b1', 'origin', 'b1'),
+			t('origin/b2', 'origin', 'b2'),
+		]);
+		expect(r.confirmLabel).toBe('删除');
+		expect(r.detail).toContain('3 个');
+	});
+
+	it('多条超上限 → truncateNames 截断（…还有）', () => {
+		const ts = Array.from({ length: 12 }, (_, i) => t(`origin/b${i}`, 'origin', `b${i}`));
+		expect(formatRemoteDeleteConfirm(ts).detail).toContain('…还有');
+	});
+
+	it('含当前 HEAD 上游 → ⚠ 软警示', () => {
+		const r = formatRemoteDeleteConfirm([t('origin/foo', 'origin', 'foo')], { hasUpstreamOfHead: true });
+		expect(r.detail).toContain('上游');
+		expect(r.detail).toContain('⚠');
+	});
+
+	it('非 origin remote 也回显 remote 名', () => {
+		const r = formatRemoteDeleteConfirm([t('upstream/bar', 'upstream', 'bar')]);
+		expect(r.detail).toContain('upstream');
+	});
+});
diff --git a/tests/unit/ref-selection.test.ts b/tests/unit/ref-selection.test.ts
new file mode 100644
index 0000000..34811fa
--- /dev/null
+++ b/tests/unit/ref-selection.test.ts
@@ -0,0 +1,76 @@
+import { describe, it, expect } from 'vitest';
+import { collectBranchRefs } from '../../src/engine/ref/selection';
+import type { RawRef } from '../../src/engine/ref/for-each-ref';
+
+/** 构造测试用 RawRef。 */
+function ref(shortName: string, opts: Partial<RawRef> = {}): RawRef {
+	return {
+		refname: `refs/heads/${shortName}`,
+		shortName,
+		objectname: 'abc1234',
+		head: false,
+		isRemote: false,
+		isTag: false,
+		...opts,
+	};
+}
+
+const localDeletable = (r: RawRef): boolean => !r.isRemote && !r.isTag && !r.head;
+const isTag = (r: RawRef): boolean => r.isTag;
+
+describe('collectBranchRefs', () => {
+	it('点击在选区内：返回过滤后的全集（多选批量）', () => {
+		const a = ref('a');
+		const b = ref('b');
+		const c = ref('c');
+		const result = collectBranchRefs(b, [a, b, c], localDeletable);
+		expect(result.map((r) => r.shortName)).toEqual(['a', 'b', 'c']);
+	});
+
+	it('点击在选区外：仅作用于点击项（手势目标优先）', () => {
+		const a = ref('a');
+		const b = ref('b');
+		const clicked = ref('z');
+		// VS Code 罕见地传入不含点击项的选区 → 以点击项为准
+		const result = collectBranchRefs(clicked, [a, b], localDeletable);
+		expect(result.map((r) => r.shortName)).toEqual(['z']);
+	});
+
+	it('单选（选区为 [clicked]）：返回该项', () => {
+		const a = ref('a');
+		expect(collectBranchRefs(a, [a], localDeletable).map((r) => r.shortName)).toEqual(['a']);
+	});
+
+	it('谓词把混选收敛为本地分支（排除远程/标签/当前 HEAD）', () => {
+		const local = ref('feature');
+		const remote = ref('origin/feature', { isRemote: true });
+		const tag = ref('v1.0', { isTag: true });
+		const head = ref('main', { head: true });
+		const result = collectBranchRefs(local, [local, remote, tag, head], localDeletable);
+		expect(result.map((r) => r.shortName)).toEqual(['feature']);
+	});
+
+	it('isTag 谓词仅保留标签', () => {
+		const tag1 = ref('v1.0', { isTag: true });
+		const tag2 = ref('v2.0', { isTag: true });
+		const local = ref('feature');
+		const result = collectBranchRefs(tag1, [tag1, local, tag2], isTag);
+		expect(result.map((r) => r.shortName)).toEqual(['v1.0', 'v2.0']);
+	});
+
+	it('按 shortName 去重', () => {
+		const a1 = ref('a');
+		const a2 = ref('a');
+		const b = ref('b');
+		expect(collectBranchRefs(a1, [a1, a2, b], localDeletable).map((r) => r.shortName)).toEqual(['a', 'b']);
+	});
+
+	it('点击项未定义（如组节点）且选区为空 → 空数组', () => {
+		expect(collectBranchRefs(undefined, [], localDeletable)).toEqual([]);
+	});
+
+	it('点击项不满足谓词时不被强加（如点击当前 HEAD 删除）', () => {
+		const head = ref('main', { head: true });
+		expect(collectBranchRefs(head, [head], localDeletable)).toEqual([]);
+	});
+});
diff --git a/tests/unit/shared-styles.test.ts b/tests/unit/shared-styles.test.ts
new file mode 100644
index 0000000..41fcdae
--- /dev/null
+++ b/tests/unit/shared-styles.test.ts
@@ -0,0 +1,44 @@
+import { describe, it, expect } from 'vitest';
+import { getBaseStyles, getButtonClass } from '../../src/adapter/webview/shared-styles';
+
+describe('shared-styles', () => {
+	it('getBaseStyles 暴露 spacing/radius token 与全部基础组件类', () => {
+		const css = getBaseStyles();
+		// 设计 Token（4/8 节奏 + 圆角）
+		expect(css).toContain('--hg-space-1: 4px');
+		expect(css).toContain('--hg-space-2: 8px');
+		expect(css).toContain('--hg-radius-control');
+		// 基础组件类（单一事实源）
+		expect(css).toContain('.hg-btn');
+		expect(css).toContain('.hg-btn--secondary');
+		expect(css).toContain('.hg-btn--sm');
+		expect(css).toContain('.hg-input');
+		expect(css).toContain('.hg-row');
+	});
+
+	it('getBaseStyles 统一交互态：hover / focus-visible / disabled / reduced-motion', () => {
+		const css = getBaseStyles();
+		expect(css).toContain(':hover');
+		expect(css).toContain(':focus-visible');
+		expect(css).toContain(':disabled');
+		expect(css).toContain('prefers-reduced-motion');
+	});
+
+	it('getBaseStyles 颜色一律走 --vscode-* 语义令牌（不硬编码裸 hex 作主色）', () => {
+		const css = getBaseStyles();
+		expect(css).toContain('var(--vscode-button-background)');
+		expect(css).toContain('var(--vscode-focusBorder)');
+		expect(css).toContain('var(--vscode-list-hoverBackground)');
+	});
+
+	it('getButtonClass 按变体拼出正确的 class 串', () => {
+		expect(getButtonClass()).toBe('hg-btn');
+		expect(getButtonClass('primary')).toBe('hg-btn');
+		expect(getButtonClass('secondary')).toBe('hg-btn hg-btn--secondary');
+		expect(getButtonClass('sm')).toBe('hg-btn hg-btn--sm');
+	});
+
+	it('getBaseStyles 是纯函数（多次调用返回一致内容）', () => {
+		expect(getBaseStyles()).toBe(getBaseStyles());
+	});
+});