From 9d7005516a85b2bbc2675cf19b8aaac08fe45cda Mon Sep 17 00:00:00 2001
From: ThreeFish <aureliusshu@gmail.com>
Date: Sat, 4 Jul 2026 00:59:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(CommitLog):=20=E7=A7=BB=E9=99=A4=20CHA?=
 =?UTF-8?q?NGES=20=E8=A7=86=E5=9B=BE=EF=BC=8C=E6=95=B4=E5=90=88=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4/=E6=97=A5=E5=BF=97=E8=83=BD=E5=8A=9B=E5=B9=B6?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=AE=E5=BD=95=E6=A0=91=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=8E=E6=82=AC=E6=B5=AE=E8=AF=A6=E6=83=85;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 视图整合：删除 CHANGES 树（changes-tree.ts），文件列表/单文件右键菜单/changelist 切换与管理/标题栏 Git 操作/未提交角标全量平移入 Commit webview；commands.ts 命令实参统一为 ChangeItem|path，由 resolveChange 回落 service.getChanges() 解析（单一事实源）；package.json 视图与菜单迁移至 view==hyperGit.commit，移除 hyperGit.changes。
- 目录树切换：新增 engine/tree/file-tree.ts（compact 折叠、目录优先+数字感知稳定排序、叶子 fileIndex 回指扁平 files[]），Commit 与 Log 文件列表支持平铺↔树形切换，切换/折叠零 host 往返，偏好按视图各自记忆；新增 file-tree.test.ts（15 用例）。
- 提交悬浮详情：Log 行悬停展示本地/远程分支、标签、HEAD、完整消息（subject+body）、作者、（异于作者时的）提交者、绝对+相对时间、完整 SHA；LOG_GRAPH_FORMAT 扩展 %cn/%cI/%b（%b 置末字段，RS/NUL 边界），host 侧 capBody 截断控 1000 行 payload；与 CI 浮层互斥，滚动/重绘自动消隐，i 键开 Esc 关。
- 评审修复：提交浮层 mouseleave 复位 overCtRow，避免「行→浮层→空白」后浮层卡死；capBody 改用 Array.from 按码点截断，避免劈开 Unicode 代理对产生孤立代理位。
- 文档：新增三份特性文档（commit-view-consolidation / file-list-group-by-directory / log-commit-tooltip），更新 CHANGELOG、issue、knowledge-map。

🤖 Generated with [Claude Code](https://github.com/claude), [CodeX](https://openai.com), [Gemini](https://github.com/apps/gemini-code-assist)
Co-Authored-By: Aurelius Huang<threefish.ai@gmail.com>
---
 CHANGELOG.md                                  |  11 +
 docs/.agents/issue.md                         |   2 +-
 docs/.agents/knowledge-map.md                 |   3 +
 docs/features/commit-view-consolidation.md    |  37 ++
 docs/features/file-list-group-by-directory.md |  42 ++
 docs/features/log-commit-tooltip.md           |  41 ++
 package.json                                  |  87 +---
 src/adapter/commands.ts                       |  82 ++--
 src/adapter/tree/changes-tree.ts              | 120 ------
 src/adapter/webview/commit-webview.ts         | 385 +++++++++++++++---
 src/adapter/webview/log-webview.ts            | 221 +++++++++-
 src/engine/log/log-line.ts                    |  22 +-
 src/engine/scm-mapping/status-decoration.ts   |   3 +-
 src/engine/tree/file-tree.ts                  | 106 +++++
 src/extension.ts                              |  34 +-
 src/shared/protocol.ts                        |  56 ++-
 tests/unit/file-tree.test.ts                  | 128 ++++++
 tests/unit/log-line.test.ts                   |  54 ++-
 tests/unit/log-query.test.ts                  |   2 +-
 19 files changed, 1094 insertions(+), 342 deletions(-)
 create mode 100644 docs/features/commit-view-consolidation.md
 create mode 100644 docs/features/file-list-group-by-directory.md
 create mode 100644 docs/features/log-commit-tooltip.md
 delete mode 100644 src/adapter/tree/changes-tree.ts
 create mode 100644 src/engine/tree/file-tree.ts
 create mode 100644 tests/unit/file-tree.test.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc88f3..6e987bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@
 
 ## [0.0.7] - 未发布
 
+### Added
+- **变更文件目录树切换**：Commit 视图活动 Changelist 文件列表、Log 视图选中提交的变更文件列表均支持「平铺 / 按目录分组（Group by Directory）」两态切换（工具栏 List/Tree 段控），偏好按视图 `webview.setState` 记忆。目录树由纯逻辑 [`engine/tree/file-tree.buildFileTree`](./src/engine/tree/file-tree.ts) host 侧构建随 payload 下发（复用 graph-layout「host 算、webview 渲」范式，规避内联脚本无法 import engine 的 Split-Brain），叶子以 `fileIndex` 回指扁平列表；支持单目录子链折叠（对齐 VS Code `explorer.compactFolders`）；Commit 树形附目录级三态复选框。详见 [变更文件目录树](./docs/features/file-list-group-by-directory.md)。
+- **Log 提交悬浮详情**：鼠标悬停 Log 提交行以浮层展示完整信息——所在本地/远程分支、标签、HEAD、完整提交消息（subject + body）、作者 `name <email>`、（与作者不同时）提交者、作者/提交时间（绝对 + 相对）、完整 SHA；复用 CI 状态浮层范式（置于虚拟滚动容器外、与 CI 浮层互斥），`i` 键开、`Esc` 关，滚动/刷新自动消隐。`git log` 取数扩展 `%cn/%cI/%b`（body 置末，NUL/RS 分隔容多行），正文上限截断以控 payload。详见 [Log 提交悬浮详情](./docs/features/log-commit-tooltip.md)。
+
+### Changed
+- **Commit 视图承接全部变更管理能力**（原 Changes 视图平移）：活动 Changelist 文件单击看 Diff、右键（原生 QuickPick）执行 移动到 Changelist / 查看历史 / 暂存·撤销 Hunks / 加入 `.gitignore` / 丢弃改动；头部提供 Changelist 切换下拉 + ⋯ 管理菜单（新建 / 重命名 / 删除）。
+- **Git 操作工具栏与未提交数角标迁至 Commit 视图**：原挂在 Changes 视图标题栏的 refresh / push / pull / fetch / patch 等动作迁到 Commit 视图标题栏（去掉与 webview 内按钮重复的 commit / commitAndPush）；活动栏未提交数角标改由 Commit `WebviewView.badge` 承载，首帧未 resolve 以 `pendingBadge` 兜底。详见 [Commit 视图整合](./docs/features/commit-view-consolidation.md)。
+
+### Removed
+- **移除 CHANGES 树视图**：其展示的活动 Changelist 与 Commit 视图的 Active Changelist 完全重复（同源 `getChanges()` + `getGroups()`）；全部独有能力已零回归平移入 Commit 视图（见 Changed），视图数由 7 降为 6。
+
 ### Fixed
 - 修复 `vsce package` 打包因 ESLint `no-useless-assignment` 阻断：`engine/ci/remote-parser.ts` 中 `host`/`path` 的空串初值为 dead store（`hasScheme` 真假两分支均无条件重赋、解析失败处先 `return null`），改为带类型标注的纯声明消除，由 TS 确定赋值分析接管，运行时行为不变。
 
diff --git a/docs/.agents/issue.md b/docs/.agents/issue.md
index 4cadad8..3f04e62 100644
--- a/docs/.agents/issue.md
+++ b/docs/.agents/issue.md
@@ -67,7 +67,7 @@
 - **表因**：用户截图反馈 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` 即便该键失效仍安全。③ 「右键点击选区之外」须以点击项为准（手势目标优先），由归一化助手统一兜底。
+- **后续防范**：① 需要承载 `canSelectMany` 等 `TreeViewOptions` 能力的 **TreeView**，一律用 `createTreeView` 而非 `registerTreeDataProvider`（本仓 `hyperGit.branches` 即此）；`.badge` 则 `TreeView` 与 `WebviewView` **均支持**——`hyperGit.changes` 视图移除后（其活动 Changelist 与 Commit 视图重复），未提交数角标已迁至 Commit `WebviewView.badge`，注意 `WebviewView` 仅在 `resolveWebviewView` 后可置 badge，需 `pendingBadge` 兜底首帧未 resolve 的时序。② 多选命令正确性**只依赖处理器读取实参**（`clickedNode` + `selectedNodes[]`），不得依赖 `listMultiSelection` 上下文键——其对**自定义贡献视图**的可靠性无法确证，仅作菜单整洁的视觉优化；单目标命令因只读 `clickedNode` 即便该键失效仍安全。③ 「右键点击选区之外」须以点击项为准（手势目标优先），由归一化助手统一兜底。
 - **同类问题影响**：所有以 `registerTreeDataProvider` 注册却后续需要多选/角标的自定义 TreeView；以及误把单目标命令在多选下直接作用于「点击项」造成的隐性误操作。
 
 ## #9 LOG 视图残留「已删分支」提交（实为工具注入的内部引用污染 `git log --all`）
diff --git a/docs/.agents/knowledge-map.md b/docs/.agents/knowledge-map.md
index dff7a5c..17f6384 100644
--- a/docs/.agents/knowledge-map.md
+++ b/docs/.agents/knowledge-map.md
@@ -17,6 +17,9 @@
 ## 项目文档（docs/）
 - [文档中心](../docs/README.md) — 文档与调研资产总索引。
 - [Log 视图 CI 状态](../docs/features/log-ci-status.md) — 按提交显示 GitHub CI 最终状态（绿勾/红叉 + Tooltip 明细）：认证、限流、懒加载、边界与配置。
+- [Commit 视图整合](../docs/features/commit-view-consolidation.md) — 移除 CHANGES 视图，其文件操作/changelist 管理/Git 工具栏/未提交角标零回归平移入 Commit 视图。
+- [变更文件目录树](../docs/features/file-list-group-by-directory.md) — Commit / Log 文件列表「平铺 ⇄ 按目录分组」切换：host 侧 `buildFileTree` 构树下发、compact 折叠、目录三态。
+- [Log 提交悬浮详情](../docs/features/log-commit-tooltip.md) — 悬停提交行浮层展示 分支/标签/HEAD/完整消息/作者·提交者/时间/SHA；复用 CI 浮层范式、与其互斥。
 - [实施状态总览](../docs/milestones/implementation-status.md) — M0-M5 交付记录 + API 限制 + M5 AI 设计 + 验证/发布（**实施看板**）。
 - [工程实施方案](../docs/architecture/engineering-plan.md) — 路径 B 架构 + M0-M5 里程碑（**开发蓝图**）。
 - [Git 功能矩阵](../docs/requirements/idea-feature-matrix.md) — 56 功能点 / 8 组（**验收基线**，参考 IDEA 等成熟实现）。
diff --git a/docs/features/commit-view-consolidation.md b/docs/features/commit-view-consolidation.md
new file mode 100644
index 0000000..e3ec225
--- /dev/null
+++ b/docs/features/commit-view-consolidation.md
@@ -0,0 +1,37 @@
+# Commit 视图整合（移除 CHANGES，能力全量平移）
+
+> CHANGES 树视图与 Commit 视图顶部的「Active Changelist」展示同一份数据（同源 `service.getChanges()` + `registry.getGroups()`），属冗余。现移除 CHANGES 视图，其**全部独有能力零回归**平移入 Commit 视图，侧边栏视图数由 7 降为 6。
+
+## 平移清单（零功能回归）
+
+| 原 CHANGES 能力 | 迁入 Commit 视图后的形态 |
+|---|---|
+| 文件单击看 Diff | 文件行单击（勾选框除外）→ `commit/openFile` → 复用 `hyperGit.openDiff` |
+| 单文件右键菜单 | 文件行右键 → `commit/fileMenu` → 原生 `showQuickPick`：Open Diff / Move to Changelist… / Show History / Stage·Unstage Hunks… / Add to .gitignore / Discard Changes（复用既有命令，含 discard 确认框） |
+| Changelist 管理 | 头部 `<select>` 切换活动列表（`commit/setActive`）+ `⋯` 菜单（`commit/changelistMenu` → 新建 / 重命名 / 删除） |
+| Git 操作工具栏 | 标题栏（`view/title`）承接 refresh / push / pull / fetch / pushDialog / updateProject / createPatch / applyPatch；去掉与 webview 内 Commit·Commit&Push 按钮重复的两项 |
+| 活动栏未提交数角标 | 迁至 Commit `WebviewView.badge`（容器图标角标 = 各视图 badge 之和，总数不变） |
+
+## 关键设计（复用与最小回归）
+
+- **右键菜单复用 Log 范式**：沿用 Log 视图「webview 右键 → `postMessage` → host `showQuickPick` → 复用既有命令」模式（`log-webview.handleCommitMenu`），键盘可达、无 CSP/焦点陷阱、零 in-DOM 浮层成本。
+- **命令实参统一**：文件级命令改为接受 `ChangeItem | 路径字符串`，host 经 `resolveChange` 回落 `service.getChanges()` 解析（[`adapter/commands.ts`](../../src/adapter/commands.ts)，单一事实源）；`showHistory`/`ignorePath`/`partialStage`/`partialUnstage` 本就支持可选 `ChangeItem`，webview 直接传完整对象，故三处命令文件零改。
+- **视图刷新**：删除 `tree.refresh()` 后，changelist/文件变更经 `registry.onDidChange` / `service.onDidChange` → `extension.refreshAll` → `commitView.refresh()` 驱动（原刷新链的自然替代）。
+- **角标时序**：`WebviewView.badge` 仅在 `resolveWebviewView` 后可置，`CommitWebviewProvider.updateBadge` 在 view 未 resolve 时以 `pendingBadge` 暂存，resolve 后回填（见 [issue.md #8](../.agents/issue.md) 后续防范）。
+- **命令面板**：迁移前这些命令即 `commandPalette: when:false`（唯一入口是 CHANGES 树），迁入后由 Commit webview 菜单承接，保持 webview-only，无面板暴露、无回归。
+
+## 交互范围取舍
+
+Commit 视图文件区以**活动 Changelist** 为提交目标（勾选集即提交范围）；非活动 Changelist 通过头部下拉切换查看。相较旧树「同屏并列多 changelist」少了一处低频便利，换取窄侧栏下更聚焦的提交工作流。
+
+## 实现
+
+- 视图与菜单：[`package.json`](../../package.json)（删 `hyperGit.changes` 视图 / viewsWelcome / 全部 `view == hyperGit.changes` 菜单；`view/title` 迁至 `view == hyperGit.commit`）。
+- 视图主体：[`adapter/webview/commit-webview.ts`](../../src/adapter/webview/commit-webview.ts)（groups/switcher/文件交互/菜单/角标/目录树）。
+- 命令：[`adapter/commands.ts`](../../src/adapter/commands.ts)（`resolveChange` + 签名重构）。
+- 装配：[`extension.ts`](../../src/extension.ts)（移除 tree/changesView，角标改由 `commitView.updateBadge`）。
+- 协议：[`shared/protocol.ts`](../../src/shared/protocol.ts)（`CommitChangelistItem`、`commit/openFile|fileMenu|setActive|changelistMenu`）。
+
+## 验证
+
+`pnpm run check-types && pnpm run lint && pnpm run test:unit` 全绿；Extension Development Host（F5）：无 CHANGES 视图；Commit 顶部可切换/管理 changelist；文件单击开 Diff、右键出菜单（含 discard 确认）；标题栏 Git 动作可用；活动栏角标随未提交数增减；无 Git 仓库时降级不崩溃。
diff --git a/docs/features/file-list-group-by-directory.md b/docs/features/file-list-group-by-directory.md
new file mode 100644
index 0000000..6aefeaa
--- /dev/null
+++ b/docs/features/file-list-group-by-directory.md
@@ -0,0 +1,42 @@
+# 变更文件目录树切换（Group by Directory）
+
+> Commit 视图活动 Changelist 的文件列表、Log 视图选中提交的「Changed Files」列表，均支持在**平铺列表**与**按目录分组的树形**之间切换（对齐 IntelliJ / VS Code SCM）。默认平铺，树形为可选切换，偏好按视图各自记忆。
+
+## 设计：host 算树、webview 渲染（单一事实源）
+
+Webview 使用内联 `<script>` 字符串，无法 `import` engine TS。为避免同一「路径→树」逻辑两处实现（Split-Brain），沿用提交图布局的成熟范式（`graph-layout` 于 host 计算、随 `GraphRowVM.layout` 下发）：
+
+```mermaid
+flowchart LR
+  A["扁平文件路径[]<br/>(与 files[] 同序)"] -->|host| B["buildFileTree()<br/>engine/tree/file-tree"]
+  B -->|"随 payload 下发<br/>FileTreeNode[]"| C["webview 渲染"]
+  C --> D{"mode"}
+  D -->|flat| E["平铺：files[] 直接渲染"]
+  D -->|tree| F["树形：递归 FileTreeNode<br/>叶子取 files[fileIndex]"]
+  style B fill:#1f6feb,color:#fff
+  style F fill:#238636,color:#fff
+```
+
+- **视图无关的 `FileTreeNode`**（[`shared/protocol.ts`](../../src/shared/protocol.ts)）：目录带 `name/path/children`，叶子带 `fileIndex` 回指扁平 `files[]`。同一套渲染逻辑服务两视图，且不复制条目数据。
+- **构建算法**（[`engine/tree/file-tree.ts`](../../src/engine/tree/file-tree.ts)，纯逻辑、Vitest 覆盖）：`/` 分段建 trie；每级**目录在前、文件在后**，同类按名称数字感知升序、稳定（相等按插入序）；**compact 折叠**单目录子链（如 `a/b/c` → `a/b`，遇含叶子或多子目录即停，对齐 VS Code `explorer.compactFolders` 默认开启）；根级文件、同名异目录、空输入、重复路径（keep-first）均已覆盖。
+- **切换零 host 往返**：平铺 `files[]` 与树 `tree[]` 同批下发，切换/折叠仅本地重渲。
+
+## 两视图差异
+
+| | Commit 视图 | Log 视图（详情面板） |
+|---|---|---|
+| 数据源 | 活动 Changelist 的 `CommitFileItem[]` | 选中提交 `diff-tree` 的 `LogCommitFileItem[]` |
+| 建树路径 | 条目 `path`（仓库相对） | `CommitFileChange.path`（干净新路径，重命名归位到新目录） |
+| 复选框 | 有：叶子勾选 + **目录三态**级联；Select All 基于全量文件 | 无（只读浏览） |
+| 叶子单击 | 打开 Diff（`commit/openFile`） | 打开单文件 Diff（`log/openFile`，`data-path` 保持展示串不变） |
+| 偏好持久化 | `setState({mode, collapsed, checked})` | `setState({dmode, dcollapsed, ...})` |
+
+## 实现
+
+- 引擎：[`engine/tree/file-tree.ts`](../../src/engine/tree/file-tree.ts)（+ [`tests/unit/file-tree.test.ts`](../../tests/unit/file-tree.test.ts)，15 用例）。
+- 协议：[`shared/protocol.ts`](../../src/shared/protocol.ts)（`FileTreeNode`；`CommitViewState.tree`；`log/commitFiles` payload `tree`）。
+- 渲染：[`commit-webview.ts`](../../src/adapter/webview/commit-webview.ts)（List/Tree 段控、`renderFlat`/`renderTree`、`makeLeafRow`、目录三态 `updateDirStates`）、[`log-webview.ts`](../../src/adapter/webview/log-webview.ts)（`renderDetails` 分派、`renderDetailNode`）。
+
+## 验证
+
+`pnpm run test:unit`（含 `file-tree.test.ts`）全绿；Extension Development Host（F5）：两视图 List/Tree 即时切换、刷新/切换提交后保持模式；树内目录可折叠、compact 生效；Commit 目录三态与 Select All 联动正确；树形叶子单击仍打开对应文件 Diff（含重命名项）。
diff --git a/docs/features/log-commit-tooltip.md b/docs/features/log-commit-tooltip.md
new file mode 100644
index 0000000..62a0eeb
--- /dev/null
+++ b/docs/features/log-commit-tooltip.md
@@ -0,0 +1,41 @@
+# Log 提交悬浮详情（Commit Tooltip）
+
+> 鼠标悬停 Log 视图任一提交行，以浮层快速展示该提交的完整信息：所在**本地/远程分支、标签、HEAD**、**完整提交消息**（subject + body）、**作者**（`name <email>`）、（与作者不同时的）**提交者**、**作者/提交时间**（绝对 + 相对）、**完整 SHA**。
+
+## 数据流与取数
+
+引用标签（分支/标签/HEAD）本就随 `GraphRowVM.chips` 下发；本特性补齐正文与提交者，随首帧一并送达，故悬停**零往返、零延迟**。
+
+```mermaid
+flowchart LR
+  A["git log --format=<br/>…%cn %cI %s %b"] --> B["parseLogLines → RawCommit"]
+  B --> C["GraphRowVM<br/>+authorEmail/committer/body(capBody)"]
+  C -->|"log/graphData（首帧全量）"| D["webview model.rows"]
+  D -->|"悬停行 ~400ms"| E["buildCommitTip → #commit-tip"]
+  style A fill:#1f6feb,color:#fff
+  style E fill:#d29922,color:#fff
+```
+
+- **格式扩展**（[`engine/log/log-line.ts`](../../src/engine/log/log-line.ts)）：`LOG_GRAPH_FORMAT` 增 `%cn`（提交者）、`%cI`（提交时间）、`%b`（正文）。`%b` **置于末字段**：记录以 RS `%x1e` 终止、字段以 NUL `%x00` 分隔，二者不出现于 git 文本，故正文内换行/管道/反斜杠不被误判为边界；解析用 `slice(8).join(NUL)` 稳健重组末字段。
+- **payload 控制**：正文 host 侧 `capBody` 截断至上限（超限省略号、裁尾空白），避免 1000 行图的 `postMessage` 膨胀；浮层内另设滚动区兜底长正文。
+
+## 复用 CI 浮层范式
+
+沿用既有 CI 状态浮层（`#ci-tip`）的自定义浮层设计，新增 `#commit-tip`：
+
+- **置于 `#rows` 之外**：虚拟滚动重写行 DOM 时浮层不被销毁。
+- **与 CI 浮层互斥**：悬停 `.ci` 图标只显 CI 浮层（提交浮层隐藏并取消在途显示）；悬停行其余区域显提交浮层（显示前先 `hideTip()` 关 CI 浮层）。
+- **延迟与消隐**：悬停 ~400ms 显、离开 ~200ms 隐；滚动、`log/graphData`（刷新/切范围）、`log/ciMeta`、`log/appendData`（整体重绘 `#rows`）均即时消隐并取消在途显示（避免对已脱离节点定位）。
+- **键盘可达**：选中行按 `i` 打开、`Esc` 关闭（`stopPropagation` 避与 `Enter`→提交菜单冲突）。
+- **无双重气泡**：移除提交行 chips 的原生 `title`，引用明细统一由本浮层展示。
+- **XSS 安全**：分支名/标签/作者/正文等一切外部内容均经 `esc()` 转义后注入。
+
+## 实现
+
+- 数据：[`engine/log/log-line.ts`](../../src/engine/log/log-line.ts)（格式 + `RawCommit` + 解析；[`tests/unit/log-line.test.ts`](../../tests/unit/log-line.test.ts)/[`log-query.test.ts`](../../tests/unit/log-query.test.ts) 更新含多行/空正文/提交者异于作者用例）。
+- 协议：[`shared/protocol.ts`](../../src/shared/protocol.ts)（`GraphRowVM` 增 `authorEmail/committerName/committerDate/body`）。
+- 浮层：[`adapter/webview/log-webview.ts`](../../src/adapter/webview/log-webview.ts)（`#commit-tip` + `buildCommitTip`/`positionCommitTip`/`scheduleShowCommit`/`hideCommitTip`、行 hover 处理、`fmtAbs`/`fmtRel`）。
+
+## 验证
+
+`pnpm run test:unit` 全绿；Extension Development Host（F5）：悬停提交行 ~400ms 出浮层含各引用组 + 消息（多行保留、超长滚动 + 截断）+ 作者/提交者/时间/完整 SHA；悬停 CI 图标只出 CI 浮层（互斥）；chips 无原生气泡；滚动/切换范围/刷新自动消隐；`i` 开 `Esc` 关且不误触菜单；合并 / 无正文 / detached HEAD / 多引用均正常。
diff --git a/package.json b/package.json
index 141ea08..a8c21a2 100644
--- a/package.json
+++ b/package.json
@@ -54,11 +54,6 @@
 		},
 		"views": {
 			"hyper-git": [
-				{
-					"id": "hyperGit.changes",
-					"name": "Changes",
-					"visibility": "visible"
-				},
 				{
 					"id": "hyperGit.commit",
 					"name": "Commit",
@@ -94,10 +89,6 @@
 			]
 		},
 		"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)"
@@ -665,57 +656,47 @@
 			"view/title": [
 				{
 					"command": "hyperGit.refresh",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "navigation@1"
 				},
 				{
 					"command": "hyperGit.newChangelist",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"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",
+					"when": "view == hyperGit.commit",
 					"group": "navigation@5"
 				},
 				{
 					"command": "hyperGit.pull",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@1"
 				},
 				{
 					"command": "hyperGit.fetch",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@2"
 				},
 				{
 					"command": "hyperGit.pushDialog",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@3"
 				},
 				{
 					"command": "hyperGit.updateProject",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@4"
 				},
 				{
 					"command": "hyperGit.createPatch",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@5"
 				},
 				{
 					"command": "hyperGit.applyPatch",
-					"when": "view == hyperGit.changes",
+					"when": "view == hyperGit.commit",
 					"group": "1_sync@6"
 				},
 				{
@@ -825,41 +806,6 @@
 				}
 			],
 			"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",
@@ -930,21 +876,6 @@
 					"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",
diff --git a/src/adapter/commands.ts b/src/adapter/commands.ts
index d8a1162..4131ef3 100644
--- a/src/adapter/commands.ts
+++ b/src/adapter/commands.ts
@@ -3,20 +3,45 @@ import * as vscode from 'vscode';
 import { FileStatus } from '../engine/model';
 import type { ChangelistRegistry } from './changelist-registry';
 import type { ChangeItem, GitRepositoryService } from './git-repository-service';
-import type { ChangesNode, ChangesTreeProvider } from './tree/changes-tree';
 
-/** 注册 Changes 视图相关命令（M1）。 */
+/** 命令实参可能来自 webview（路径字符串）或旧式节点对象（含 id/item）。 */
+function asId(arg: unknown): string | undefined {
+	if (typeof arg === 'string') {
+		return arg;
+	}
+	if (arg && typeof arg === 'object' && typeof (arg as { id?: unknown }).id === 'string') {
+		return (arg as { id: string }).id;
+	}
+	return undefined;
+}
+
+/**
+ * 注册 Changes / Commit 相关命令（M1；原 Changes 树移除后由 Commit webview 复用）。
+ *
+ * 文件级命令统一接受 `ChangeItem | 路径字符串`：webview 传路径，host 经 {@link resolveChange}
+ * 回落到 `service.getChanges()` 解析为 ChangeItem（单一事实源）。视图刷新由 registry/service
+ * 的 onDidChange → extension.refreshAll → commitView.refresh() 驱动，命令内不再直接刷新视图。
+ */
 export function registerChangesCommands(
 	service: GitRepositoryService,
 	registry: ChangelistRegistry,
-	tree: ChangesTreeProvider,
 ): vscode.Disposable[] {
 	const subs: vscode.Disposable[] = [];
 
+	const resolveChange = (arg?: ChangeItem | string): ChangeItem | undefined => {
+		if (arg && typeof arg !== 'string') {
+			return arg;
+		}
+		if (typeof arg === 'string') {
+			return service.getChanges().find((c) => c.relativePath === arg);
+		}
+		return undefined;
+	};
+
 	subs.push(
 		vscode.commands.registerCommand('hyperGit.refresh', async () => {
+			// 重扫 git 状态；state 变化经 onDidChange → refreshAll 刷新 Commit/Log/Branches 等视图。
 			await service.repo?.status();
-			tree.refresh();
 		}),
 	);
 
@@ -30,62 +55,70 @@ export function registerChangesCommands(
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.setActiveChangelist', (node: ChangesNode) => {
-			if (node?.kind === 'changelist') {
-				registry.setActive(node.id);
+		vscode.commands.registerCommand('hyperGit.setActiveChangelist', (arg: unknown) => {
+			const id = asId(arg);
+			if (id) {
+				registry.setActive(id);
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.renameChangelist', async (node: ChangesNode) => {
-			if (node?.kind !== 'changelist') {
+		vscode.commands.registerCommand('hyperGit.renameChangelist', async (arg: unknown) => {
+			const id = asId(arg);
+			if (!id) {
 				return;
 			}
-			const def = registry.getDef(node.id);
+			const def = registry.getDef(id);
 			const name = await vscode.window.showInputBox({ prompt: 'Rename Changelist', value: def?.name });
 			if (name && name.trim()) {
-				registry.rename(node.id, name.trim());
+				registry.rename(id, name.trim());
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.deleteChangelist', async (node: ChangesNode) => {
-			if (node?.kind !== 'changelist') {
+		vscode.commands.registerCommand('hyperGit.deleteChangelist', async (arg: unknown) => {
+			const id = asId(arg);
+			if (!id) {
 				return;
 			}
+			const name = registry.getDef(id)?.name ?? id;
 			const choice = await vscode.window.showWarningMessage(
-				`Delete Changelist "${node.name}"? Files under it will be moved to the default list.`,
+				`Delete Changelist "${name}"? Files under it will be moved to the default list.`,
 				{ modal: true },
 				'Delete',
 			);
 			if (choice === 'Delete') {
-				registry.remove(node.id);
+				registry.remove(id);
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.moveChangelist', async (node: ChangesNode) => {
-			if (node?.kind !== 'file') {
+		vscode.commands.registerCommand('hyperGit.moveChangelist', async (arg: ChangeItem | string) => {
+			const change = resolveChange(arg);
+			if (!change) {
 				return;
 			}
 			const active = registry.activeChangelistId;
+			const groups = registry.getGroups(service.getChanges(), (c) => c.relativePath);
+			const currentId = groups.find((g) => g.items.some((i) => i.relativePath === change.relativePath))?.id;
 			const picks = registry
 				.listDefs()
-				.map((d) => ({ label: d.name, id: d.id, description: d.id === active ? 'active' : undefined, picked: d.id === node.changelistId }));
+				.map((d) => ({ label: d.name, id: d.id, description: d.id === active ? 'active' : undefined, picked: d.id === currentId }));
 			const pick = await vscode.window.showQuickPick(picks, { placeHolder: 'Move file to Changelist' });
 			if (pick) {
-				registry.move(node.item.relativePath, pick.id);
+				registry.move(change.relativePath, pick.id);
 			}
 		}),
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.openDiff', async (change: ChangeItem) => {
+		vscode.commands.registerCommand('hyperGit.openDiff', async (arg: ChangeItem | string) => {
 			const repo = service.repo;
-			if (!repo) {
+			const change = resolveChange(arg);
+			if (!repo || !change) {
 				return;
 			}
 			// 空仓库（无 HEAD）时用 originalUri 兜底，避免 git scheme 解析失败
@@ -97,8 +130,9 @@ export function registerChangesCommands(
 	);
 
 	subs.push(
-		vscode.commands.registerCommand('hyperGit.discardChanges', async (change: ChangeItem) => {
+		vscode.commands.registerCommand('hyperGit.discardChanges', async (arg: ChangeItem | string) => {
 			const repo = service.repo;
+			const change = resolveChange(arg);
 			if (!repo || !change) {
 				return;
 			}
@@ -111,13 +145,13 @@ export function registerChangesCommands(
 				return;
 			}
 			try {
-				// 未跟踪文件用 clean（删除）；已跟踪的改动用 restore（丢弃工作区改动）
+				// 未跟踪文件用 clean（删除）；已跟踪的改动用 restore（丢弃工作区改动）。
+				// 视图刷新由 service.onDidChange → refreshAll 驱动。
 				if (change.status === FileStatus.Untracked) {
 					await repo.clean([change.uri.fsPath]);
 				} else {
 					await repo.restore([change.uri.fsPath]);
 				}
-				tree.refresh();
 			} catch (e) {
 				void vscode.window.showErrorMessage(`Failed to discard: ${e instanceof Error ? e.message : String(e)}`);
 			}
diff --git a/src/adapter/tree/changes-tree.ts b/src/adapter/tree/changes-tree.ts
deleted file mode 100644
index 11ba4c4..0000000
--- a/src/adapter/tree/changes-tree.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import * as path from 'path';
-import * as vscode from 'vscode';
-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';
-	readonly id: string;
-	readonly name: string;
-	readonly description?: string;
-	readonly active: boolean;
-	readonly items: readonly ChangeItem[];
-}
-
-export interface ChangesFileNode {
-	readonly kind: 'file';
-	readonly item: ChangeItem;
-	readonly changelistId: string;
-}
-
-export type ChangesNode = ChangesChangelistNode | ChangesFileNode;
-
-/**
- * Changes 视图 TreeDataProvider：changelist 一级节点 + 文件叶子。
- * 状态色用 ThemeIcon(circle-filled) + gitDecoration 主题色；文件单击打开原生 diff。
- */
-export class ChangesTreeProvider implements vscode.TreeDataProvider<ChangesNode> {
-	private readonly _onDidChangeTreeData = new vscode.EventEmitter<ChangesNode | undefined>();
-	readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
-
-	constructor(
-		private readonly service: GitRepositoryService,
-		private readonly registry: ChangelistRegistry,
-	) {}
-
-	refresh(): void {
-		this._onDidChangeTreeData.fire(undefined);
-	}
-
-	getChildren(element?: ChangesNode): ChangesNode[] {
-		if (!element) {
-			const items = this.service.getChanges();
-			const groups = this.registry.getGroups(items, (i) => i.relativePath);
-			return groups
-				.filter((g) => g.active || g.items.length > 0)
-				.map((g): ChangesChangelistNode => ({
-					kind: 'changelist',
-					id: g.id,
-					name: g.name,
-					description: g.description,
-					active: g.active,
-					items: g.items,
-				}));
-		}
-		if (element.kind === 'changelist') {
-			return element.items.map((item): ChangesFileNode => ({ kind: 'file', item, changelistId: element.id }));
-		}
-		return [];
-	}
-
-	getTreeItem(element: ChangesNode): vscode.TreeItem {
-		if (element.kind === 'changelist') {
-			return this.createChangelistItem(element);
-		}
-		return this.createFileItem(element);
-	}
-
-	private createChangelistItem(node: ChangesChangelistNode): vscode.TreeItem {
-		const count = node.items.length;
-		const state = count > 0 ? vscode.TreeItemCollapsibleState.Expanded : vscode.TreeItemCollapsibleState.None;
-		const item = new vscode.TreeItem(node.name, state);
-		item.contextValue = 'hyperGit.changelist';
-		item.id = `cl:${node.id}`;
-		// 活动 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 = mdTooltip(
-			[
-				['Status', node.active ? 'Active changelist' : 'Changelist'],
-				['Changes', String(count)],
-			],
-			{ title: node.name },
-		);
-		return item;
-	}
-
-	private createFileItem(node: ChangesFileNode): vscode.TreeItem {
-		const change = node.item;
-		const decoration = getDecoration(change.status);
-		const dir = path.dirname(change.relativePath);
-		const treeItem = new vscode.TreeItem(path.basename(change.relativePath), vscode.TreeItemCollapsibleState.None);
-		treeItem.contextValue = 'hyperGit.fileChange';
-		treeItem.id = `file:${change.relativePath}`;
-		treeItem.resourceUri = change.uri;
-		treeItem.description = `${decoration.letter}${dir && dir !== '.' ? ' · ' + dir : ''}`;
-		// 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: 'Open Diff', arguments: [change] };
-		return treeItem;
-	}
-}
-
-/** 无 git 时的占位 provider（空树，触发 viewsWelcome）。 */
-export class EmptyChangesProvider implements vscode.TreeDataProvider<never> {
-	getTreeItem(): vscode.TreeItem {
-		return new vscode.TreeItem('');
-	}
-	getChildren(): never[] {
-		return [];
-	}
-}
diff --git a/src/adapter/webview/commit-webview.ts b/src/adapter/webview/commit-webview.ts
index 2f81809..5ee7334 100644
--- a/src/adapter/webview/commit-webview.ts
+++ b/src/adapter/webview/commit-webview.ts
@@ -2,23 +2,34 @@ import * as crypto from 'crypto';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { getDecoration } from '../../engine/scm-mapping/status-decoration';
+import { buildFileTree } from '../../engine/tree/file-tree';
 import type { CommitRequest } from '../commit/commit-service';
 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 {
+	CommitChangelistItem,
+	CommitFileItem,
+	CommitViewState,
+	HostToWebviewMessage,
+	WebviewToHostMessage,
+} from '../../shared/protocol';
 import type { CommitService } from '../commit/commit-service';
 import { getBaseStyles } from './shared-styles';
 
 /**
  * Commit 提交窗口（WebviewView，自绘提交面板）。
  *
- * 文件勾选 + 多行 Commit Message 编辑器 + Amend/sign-off/skip-hooks 选项 + Commit/Commit and Push 按钮 +
- * Conventional Commits 实时校验 + 最近消息复用。选中态由 webview 端管理（host 不回写，避免覆盖用户操作）。
+ * 承载活动 changelist 文件列表（平铺 / 目录树两态可切）+ 文件单击看 diff + 单文件右键操作 +
+ * changelist 切换与管理（由原 Changes 视图平移而来）+ 多行 Commit Message 编辑器 +
+ * Amend/sign-off/skip-hooks 选项 + Commit/Commit and Push 按钮 + Conventional Commits 实时校验 +
+ * 最近消息复用 + 活动栏未提交数角标。选中态由 webview 端管理（host 不回写，避免覆盖用户操作）。
  */
 export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 	public static readonly viewType = 'hyperGit.commit';
 	private view?: vscode.WebviewView;
 	private currentMessage = '';
+	/** view 尚未 resolve 时暂存的角标计数，resolve 后回填（活动栏容器角标 = 各视图 badge 之和）。 */
+	private pendingBadge?: number;
 
 	constructor(
 		private readonly service: GitRepositoryService,
@@ -31,7 +42,15 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 		view.webview.options = { enableScripts: true, localResourceRoots: [] };
 		view.webview.html = this.renderHtml();
 		const msgSub = view.webview.onDidReceiveMessage((msg) => this.onMessage(msg as WebviewToHostMessage));
-		view.onDidDispose(() => msgSub.dispose());
+		view.onDidDispose(() => {
+			msgSub.dispose();
+			this.view = undefined;
+		});
+		if (this.pendingBadge !== undefined) {
+			const c = this.pendingBadge;
+			this.pendingBadge = undefined;
+			this.updateBadge(c);
+		}
 		this.pushState();
 	}
 
@@ -39,6 +58,16 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 		this.pushState();
 	}
 
+	/** 未提交数角标（由 extension 的 refreshAll 驱动）：迁自原 Changes 视图，未 resolve 时暂存。 */
+	updateBadge(count: number): void {
+		const badge = count > 0 ? { value: count, tooltip: `${count} uncommitted change(s)` } : undefined;
+		if (this.view) {
+			this.view.badge = badge;
+		} else {
+			this.pendingBadge = count;
+		}
+	}
+
 	private onMessage(msg: WebviewToHostMessage): void {
 		switch (msg.type) {
 			case 'requestState':
@@ -51,6 +80,72 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 			case 'commit':
 				void this.handleCommit(msg.payload);
 				break;
+			case 'commit/openFile': {
+				const change = this.findChange(msg.payload.path);
+				if (change) {
+					void vscode.commands.executeCommand('hyperGit.openDiff', change);
+				}
+				break;
+			}
+			case 'commit/fileMenu':
+				void this.handleFileMenu(msg.payload.path);
+				break;
+			case 'commit/setActive':
+				void vscode.commands.executeCommand('hyperGit.setActiveChangelist', msg.payload.id);
+				break;
+			case 'commit/changelistMenu':
+				void this.handleChangelistMenu(msg.payload.id);
+				break;
+		}
+	}
+
+	private findChange(relativePath: string): ChangeItem | undefined {
+		return this.service.getChanges().find((c) => c.relativePath === relativePath);
+	}
+
+	/** 单文件右键：原生 QuickPick 承载原 Changes 树文件菜单的全部操作，复用既有命令（含 discard 确认框）。 */
+	private async handleFileMenu(relativePath: string): Promise<void> {
+		const change = this.findChange(relativePath);
+		if (!change) {
+			return;
+		}
+		const actions: ReadonlyArray<{ readonly label: string; readonly command: string }> = [
+			{ label: 'Open Diff', command: 'hyperGit.openDiff' },
+			{ label: 'Move to Changelist…', command: 'hyperGit.moveChangelist' },
+			{ label: 'Show History', command: 'hyperGit.showHistory' },
+			{ label: 'Stage Hunks…', command: 'hyperGit.partialStage' },
+			{ label: 'Unstage Hunks…', command: 'hyperGit.partialUnstage' },
+			{ label: 'Add to .gitignore', command: 'hyperGit.ignorePath' },
+			{ label: 'Discard Changes', command: 'hyperGit.discardChanges' },
+		];
+		const pick = await vscode.window.showQuickPick(actions.slice(), { placeHolder: relativePath });
+		if (!pick) {
+			return;
+		}
+		await vscode.commands.executeCommand(pick.command, change);
+	}
+
+	/** changelist 头部 ⋯ 菜单：新建 / 重命名 / 删除（默认列表不可改名删除，复用既有命令）。 */
+	private async handleChangelistMenu(id: string): Promise<void> {
+		const def = this.registry.getDef(id);
+		const canModify = Boolean(def) && id !== 'default';
+		const items: Array<{ label: string; op: 'new' | 'rename' | 'delete' }> = [
+			{ label: '$(add) New Changelist…', op: 'new' },
+		];
+		if (canModify && def) {
+			items.push({ label: `$(edit) Rename "${def.name}"…`, op: 'rename' });
+			items.push({ label: `$(trash) Delete "${def.name}"…`, op: 'delete' });
+		}
+		const pick = await vscode.window.showQuickPick(items, { placeHolder: 'Changelist actions' });
+		if (!pick) {
+			return;
+		}
+		if (pick.op === 'new') {
+			await vscode.commands.executeCommand('hyperGit.newChangelist');
+		} else if (pick.op === 'rename') {
+			await vscode.commands.executeCommand('hyperGit.renameChangelist', id);
+		} else {
+			await vscode.commands.executeCommand('hyperGit.deleteChangelist', id);
 		}
 	}
 
@@ -71,13 +166,6 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 		this.view?.webview.postMessage(message);
 	}
 
-	private buildFiles(): CommitFileItem[] {
-		const changes = this.service.getChanges();
-		const groups = this.registry.getGroups(changes, (c) => c.relativePath);
-		const active = groups.find((g) => g.active) ?? groups[0];
-		return (active?.items ?? []).map((c) => this.toFileItem(c));
-	}
-
 	private toFileItem(c: ChangeItem): CommitFileItem {
 		const decoration = getDecoration(c.status);
 		return {
@@ -92,11 +180,20 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 		if (!this.view) {
 			return;
 		}
+		const changes = this.service.getChanges();
+		const groups = this.registry.getGroups(changes, (c) => c.relativePath);
+		const activeId = this.registry.activeChangelistId;
+		const changelists: CommitChangelistItem[] = groups.map((g) => ({ id: g.id, name: g.name, count: g.items.length }));
+		const activeGroup = groups.find((g) => g.id === activeId) ?? groups.find((g) => g.active) ?? groups[0];
+		const files = (activeGroup?.items ?? []).map((c) => this.toFileItem(c));
 		const state: CommitViewState = {
 			template: this.commit.getTemplate(),
 			recentMessages: this.commit.getRecentMessages(),
-			activeChangelistName: this.registry.getDef(this.registry.activeChangelistId)?.name ?? 'Default',
-			files: this.buildFiles(),
+			activeChangelistName: this.registry.getDef(activeId)?.name ?? 'Default',
+			activeChangelistId: activeId,
+			changelists,
+			files,
+			tree: buildFileTree(files.map((f) => f.path)),
 			conventionalEnabled: this.commit.conventionalEnabled(),
 			busy: false,
 		};
@@ -120,13 +217,23 @@ export class CommitWebviewProvider implements vscode.WebviewViewProvider {
 <style>
 ${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); }
+.cl-bar { display: flex; align-items: center; gap: 6px; margin-bottom: var(--hg-space-1); }
+.cl-bar .cl-label { flex: 0 0 auto; font-weight: 600; }
+#cl-switch { flex: 1 1 auto; min-width: 0; background: var(--vscode-dropdown-background); color: var(--vscode-dropdown-foreground); border: 1px solid var(--vscode-dropdown-border, var(--vscode-input-border, transparent)); border-radius: var(--hg-radius-control); padding: 2px 4px; font-size: 12px; }
+.cl-menu-btn { flex: 0 0 auto; padding: 1px 7px; }
+.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; }
+.files { max-height: 260px; 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 .dot { font-size: 14px; line-height: 1; flex: 0 0 auto; }
 .file .name { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
-.file .dir { margin-left: auto; color: var(--vscode-descriptionForeground); font-size: 11px; white-space: nowrap; }
+.file .dir { margin-left: auto; color: var(--vscode-descriptionForeground); font-size: 11px; white-space: nowrap; padding-left: 8px; }
+.tree-dir { display: flex; align-items: center; gap: 6px; padding: 2px 6px; cursor: pointer; user-select: none; }
+.tree-dir:hover { background: var(--vscode-list-hoverBackground); }
+.tree-twist { flex: 0 0 12px; text-align: center; font-size: 10px; opacity: 0.8; }
+.tree-name { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: var(--vscode-descriptionForeground); }
 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); }
@@ -139,7 +246,7 @@ textarea { width: 100%; box-sizing: border-box; resize: vertical; }
 .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-header { display: flex; align-items: center; justify-content: space-between; gap: 6px; 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); } }
@@ -153,8 +260,18 @@ details.advanced[open] summary { margin-bottom: 4px; }
 </style>
 </head>
 <body>
-<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="cl-bar">
+  <span class="cl-label">Active Changelist:</span>
+  <select id="cl-switch" title="Switch active changelist"></select>
+  <button id="cl-menu" class="hg-btn hg-btn--secondary hg-btn--sm cl-menu-btn" title="Changelist actions" aria-label="Changelist actions">⋯</button>
+</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>
+  <span class="seg" role="group" aria-label="File view mode">
+    <button id="mode-flat" class="active" aria-pressed="true" title="Flat list">List</button>
+    <button id="mode-tree" aria-pressed="false" title="Group by directory">Tree</button>
+  </span>
+</div>
 <div class="files" id="files"></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>
@@ -173,16 +290,21 @@ details.advanced[open] summary { margin-bottom: 4px; }
 
 <script nonce="${nonce}">
 const vscode = acquireVsCodeApi();
-const persisted = vscode.getState();
-const checked = new Set(persisted && persisted.checked ? persisted.checked : []);
-function saveChecked() { vscode.setState({ checked: Array.from(checked) }); }
+const persisted = vscode.getState() || {};
+const checked = new Set(persisted.checked || []);
+let mode = persisted.mode === 'tree' ? 'tree' : 'flat';
+const collapsed = new Set(persisted.collapsed || []);
+function saveState() { vscode.setState({ checked: Array.from(checked), mode: mode, collapsed: Array.from(collapsed) }); }
 let conventionalEnabled = true;
 let templateApplied = false;
+let curFiles = [];
+let curTree = [];
+const INDENT = 14;
+const EMPTY_HTML = '<div class="files-empty">No changes in this changelist.<br>Edit files in your workspace and they will appear here.</div>';
 const filesEl = document.getElementById('files');
 const msgEl = document.getElementById('message');
 const valEl = document.getElementById('validation');
 const recentEl = document.getElementById('recent');
-const clNameEl = document.getElementById('cl-name');
 const commitBtn = document.getElementById('commit-btn');
 const commitPushBtn = document.getElementById('commit-push-btn');
 const amendEl = document.getElementById('amend');
@@ -191,6 +313,10 @@ const skipHooksEl = document.getElementById('skipHooks');
 const toastEl = document.getElementById('toast');
 const selectAllEl = document.getElementById('select-all');
 const filesHeaderEl = document.getElementById('files-header');
+const clSwitchEl = document.getElementById('cl-switch');
+const clMenuEl = document.getElementById('cl-menu');
+const modeFlatEl = document.getElementById('mode-flat');
+const modeTreeEl = document.getElementById('mode-tree');
 
 let msgTimer = null;
 msgEl.addEventListener('input', function () {
@@ -230,60 +356,184 @@ function doCommit(push) {
 commitBtn.addEventListener('click', function () { doCommit(false); });
 commitPushBtn.addEventListener('click', function () { doCommit(true); });
 
+// ── 选中态调和：一次 state 推送做一次（新文件默认勾选、清理不存在项），mode 切换重渲不重复调和 ──
+function reconcileChecked(files) {
+  const present = new Set();
+  files.forEach(function (f) { present.add(f.path); if (!checked.has(f.path)) checked.add(f.path); });
+  Array.from(checked).forEach(function (p) { if (!present.has(p)) checked.delete(p); });
+  saveState();
+}
+
+function pruneCollapsed(tree) {
+  const present = new Set();
+  (function walk(nodes) { (nodes || []).forEach(function (n) { if (n.dir) { present.add(n.path); walk(n.children); } }); })(tree);
+  Array.from(collapsed).forEach(function (p) { if (!present.has(p)) collapsed.delete(p); });
+}
+
 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; });
+  const total = curFiles.length;
+  selectAllEl.checked = total > 0 && curFiles.every(function (f) { return checked.has(f.path); });
 }
 
-function renderFiles(files) {
+// ── 单条文件行（平铺与树形共用；depth 控制缩进，flat 追加右侧目录列）──
+function makeLeafRow(f, depth) {
+  const row = document.createElement('div');
+  row.className = 'file';
+  row.style.paddingLeft = (depth * INDENT + 6) + 'px';
+  const cb = document.createElement('input');
+  cb.type = 'checkbox'; cb.className = 'file-cb'; 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);
+    saveState(); syncSelectAll(); updateDirStates();
+  });
+  const dot = document.createElement('span');
+  dot.className = 'dot';
+  dot.style.color = 'var(--vscode-' + f.themeColor.replace(/\\./g, '-') + ')';
+  dot.textContent = '\\u25CF';
+  const name = document.createElement('span');
+  name.className = 'name';
+  name.textContent = f.label;
+  name.title = f.path;
+  row.appendChild(cb); row.appendChild(dot); row.appendChild(name);
+  if (mode === 'flat') {
+    const dir = document.createElement('span');
+    dir.className = 'dir';
+    dir.textContent = f.dir && f.dir !== '.' ? f.dir : '';
+    row.appendChild(dir);
+  }
+  row.addEventListener('click', function (e) {
+    if (e.target.closest('.file-cb')) return; // 勾选框自行处理，不触发 diff
+    vscode.postMessage({ type: 'commit/openFile', payload: { path: f.path } });
+  });
+  row.addEventListener('contextmenu', function (e) {
+    e.preventDefault();
+    vscode.postMessage({ type: 'commit/fileMenu', payload: { path: f.path } });
+  });
+  return row;
+}
+
+function renderFlat(files) {
+  const frag = document.createDocumentFragment();
+  files.forEach(function (f) { frag.appendChild(makeLeafRow(f, 0)); });
+  filesEl.appendChild(frag);
+}
+
+function renderTree(tree, files) {
+  const frag = document.createDocumentFragment();
+  tree.forEach(function (n) { renderNode(n, 0, frag, files); });
+  filesEl.appendChild(frag);
+  updateDirStates();
+}
+
+function renderNode(node, depth, parent, files) {
+  if (node.dir) {
+    const isCol = collapsed.has(node.path);
+    const dirRow = document.createElement('div');
+    dirRow.className = 'tree-dir';
+    dirRow.style.paddingLeft = (depth * INDENT + 6) + 'px';
+    dirRow.dataset.dir = node.path;
+    const tw = document.createElement('span');
+    tw.className = 'tree-twist';
+    tw.textContent = isCol ? '\\u25B8' : '\\u25BE';
+    const cb = document.createElement('input');
+    cb.type = 'checkbox'; cb.className = 'dir-cb'; cb.dataset.dir = node.path;
+    cb.addEventListener('click', function (e) { e.stopPropagation(); });
+    cb.addEventListener('change', function () { setSubtreeChecked(node, cb.checked); saveState(); syncSelectAll(); });
+    const nm = document.createElement('span');
+    nm.className = 'tree-name';
+    nm.textContent = node.name;
+    dirRow.appendChild(tw); dirRow.appendChild(cb); dirRow.appendChild(nm);
+    dirRow.addEventListener('click', function () { toggleCollapse(node.path); });
+    parent.appendChild(dirRow);
+    if (!isCol) { node.children.forEach(function (c) { renderNode(c, depth + 1, parent, files); }); }
+  } else {
+    parent.appendChild(makeLeafRow(files[node.fileIndex], depth));
+  }
+}
+
+function subtreeLeafPaths(node) {
+  const acc = [];
+  (function collect(n) { if (!n.dir) { acc.push(curFiles[n.fileIndex].path); } else n.children.forEach(collect); })(node);
+  return acc;
+}
+
+function setSubtreeChecked(node, want) {
+  const paths = subtreeLeafPaths(node);
+  paths.forEach(function (p) { if (want) checked.add(p); else checked.delete(p); });
+  filesEl.querySelectorAll('.file-cb').forEach(function (cb) { if (paths.indexOf(cb.dataset.path) >= 0) cb.checked = want; });
+  updateDirStates();
+}
+
+// 依据后代叶子勾选态回填目录复选框三态（全选/未选/部分选）。
+function updateDirStates() {
+  const dirCbs = filesEl.querySelectorAll('.dir-cb');
+  if (dirCbs.length === 0) return;
+  const stat = {};
+  function walk(node) {
+    if (!node.dir) { return { total: 1, on: checked.has(curFiles[node.fileIndex].path) ? 1 : 0 }; }
+    let total = 0, on = 0;
+    node.children.forEach(function (c) { const r = walk(c); total += r.total; on += r.on; });
+    stat[node.path] = { total: total, on: on };
+    return { total: total, on: on };
+  }
+  curTree.forEach(walk);
+  dirCbs.forEach(function (cb) {
+    const s = stat[cb.dataset.dir];
+    if (!s) return;
+    cb.checked = s.total > 0 && s.on === s.total;
+    cb.indeterminate = s.on > 0 && s.on < s.total;
+  });
+}
+
+function toggleCollapse(p) {
+  if (collapsed.has(p)) collapsed.delete(p); else collapsed.add(p);
+  saveState();
+  renderList();
+}
+
+function renderList() {
   filesEl.innerHTML = '';
-  if (!files || files.length === 0) {
+  if (!curFiles || curFiles.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>';
+    filesEl.innerHTML = EMPTY_HTML;
     return;
   }
   filesHeaderEl.style.display = '';
-  const present = new Set();
-  files.forEach(function (f) {
-    present.add(f.path);
-    if (!checked.has(f.path)) checked.add(f.path);
-    const row = document.createElement('label');
-    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(); syncSelectAll(); });
-    const dot = document.createElement('span');
-    dot.className = 'dot';
-    dot.style.color = 'var(--vscode-' + f.themeColor.replace(/\\./g, '-') + ')';
-    dot.textContent = '\\u25CF';
-    const name = document.createElement('span');
-    name.className = 'name';
-    name.textContent = f.label;
-    name.title = f.path;
-    const dir = document.createElement('span');
-    dir.className = 'dir';
-    dir.textContent = f.dir && f.dir !== '.' ? f.dir : '';
-    row.appendChild(cb); row.appendChild(dot); row.appendChild(name); row.appendChild(dir);
-    filesEl.appendChild(row);
-  });
-  Array.from(checked).forEach(function (p) { if (!present.has(p)) checked.delete(p); });
-  saveChecked();
+  if (mode === 'tree') { renderTree(curTree, curFiles); } else { renderFlat(curFiles); }
   syncSelectAll();
 }
 
+function updateModeButtons() {
+  modeFlatEl.classList.toggle('active', mode === 'flat');
+  modeTreeEl.classList.toggle('active', mode === 'tree');
+  modeFlatEl.setAttribute('aria-pressed', String(mode === 'flat'));
+  modeTreeEl.setAttribute('aria-pressed', String(mode === 'tree'));
+}
+function setMode(m) { if (mode === m) return; mode = m; saveState(); updateModeButtons(); renderList(); }
+modeFlatEl.addEventListener('click', function () { setMode('flat'); });
+modeTreeEl.addEventListener('click', function () { setMode('tree'); });
+
 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();
+  curFiles.forEach(function (f) { if (want) checked.add(f.path); else checked.delete(f.path); });
+  filesEl.querySelectorAll('.file-cb').forEach(function (cb) { cb.checked = want; });
+  saveState(); updateDirStates();
 });
 
+function renderChangelists(list, activeId) {
+  clSwitchEl.innerHTML = '';
+  (list || []).forEach(function (c) {
+    const opt = document.createElement('option');
+    opt.value = c.id;
+    opt.textContent = c.name + ' (' + c.count + ')';
+    if (c.id === activeId) opt.selected = true;
+    clSwitchEl.appendChild(opt);
+  });
+}
+clSwitchEl.addEventListener('change', function () { vscode.postMessage({ type: 'commit/setActive', payload: { id: clSwitchEl.value } }); });
+clMenuEl.addEventListener('click', function () { vscode.postMessage({ type: 'commit/changelistMenu', payload: { id: clSwitchEl.value } }); });
+
 function renderRecent(messages) {
   recentEl.innerHTML = '';
   if (!messages || !messages.length) return;
@@ -323,8 +573,13 @@ window.addEventListener('message', function (e) {
   const m = e.data;
   if (m.type === 'state') {
     const p = m.payload;
-    clNameEl.textContent = p.activeChangelistName || '—';
-    renderFiles(p.files);
+    curFiles = p.files || [];
+    curTree = p.tree || [];
+    reconcileChecked(curFiles);
+    pruneCollapsed(curTree);
+    renderChangelists(p.changelists, p.activeChangelistId);
+    updateModeButtons();
+    renderList();
     renderRecent(p.recentMessages);
     conventionalEnabled = p.conventionalEnabled;
     if (!templateApplied && p.template && !msgEl.value) {
diff --git a/src/adapter/webview/log-webview.ts b/src/adapter/webview/log-webview.ts
index 9b6fcb9..3814019 100644
--- a/src/adapter/webview/log-webview.ts
+++ b/src/adapter/webview/log-webview.ts
@@ -8,6 +8,7 @@ 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 { buildFileTree } from '../../engine/tree/file-tree';
 import type { GitHubCiService } from '../ci/github-ci-service';
 import type {
 	CiMetaVM,
@@ -22,6 +23,13 @@ import type {
 
 const errMsg = (e: unknown): string => (e instanceof Error ? e.message : String(e));
 
+/** 悬浮详情正文上限：截断以控 1000 行 payload（超限加省略号，正文另有滚动区兜底展示）。 */
+const BODY_CAP = 2000;
+function capBody(b: string): string {
+	const t = (b ?? '').replace(/\s+$/, '');
+	return t.length > BODY_CAP ? `${Array.from(t).slice(0, BODY_CAP).join('')}…` : t;
+}
+
 /** 单页拉取的 commit 数（滚动触底增量加载下一页）。 */
 const PAGE = 1000;
 
@@ -291,7 +299,11 @@ export class LogWebviewProvider implements vscode.WebviewViewProvider, LogFilter
 				isMerge: s.raw.parents.length > 1,
 				subject: s.raw.subject,
 				authorName: s.raw.authorName,
+				authorEmail: s.raw.authorEmail,
 				authorDate: s.raw.authorDate,
+				committerName: s.raw.committerName,
+				committerDate: s.raw.committerDate,
+				body: capBody(s.raw.body),
 				chips: chips.get(s.raw.hash) ?? [],
 				layout: layout[i],
 			}));
@@ -365,9 +377,11 @@ export class LogWebviewProvider implements vscode.WebviewViewProvider, LogFilter
 				oldPath: c.oldPath,
 				themeColor: fileIconColor(c.status),
 			}));
-			this.post({ type: 'log/commitFiles', payload: { hash, files } });
+			// 用干净新路径建目录树（重命名归位到新目录）；叶子经 fileIndex 回指展示用 files[i]。
+			const tree = buildFileTree(changes.map((c) => c.path));
+			this.post({ type: 'log/commitFiles', payload: { hash, files, tree } });
 		} catch {
-			this.post({ type: 'log/commitFiles', payload: { hash, files: [] } });
+			this.post({ type: 'log/commitFiles', payload: { hash, files: [], tree: [] } });
 		}
 	}
 
@@ -473,6 +487,24 @@ body { margin: 0; font-family: var(--vscode-font-family); font-size: var(--vscod
 #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); }
+/* ── 变更文件目录树（详情面板 Group By Directory 形态）── */
+#details .dh .seg { flex: 0 0 auto; }
+#details .tree-dir { display: flex; align-items: center; gap: 6px; padding: 2px 10px; font-size: 12px; cursor: pointer; user-select: none; }
+#details .tree-dir:hover { background: var(--vscode-list-hoverBackground); }
+#details .tree-dir .tree-twist { flex: 0 0 12px; text-align: center; font-size: 10px; opacity: 0.8; }
+#details .tree-dir .tree-name { color: var(--vscode-descriptionForeground); overflow: hidden; text-overflow: ellipsis; }
+/* ── 提交悬浮详情（自定义浮层，置于 #rows 之外，虚拟滚动重写不销毁；仿 CI Tooltip）── */
+#commit-tip { position: fixed; z-index: 50; display: none; max-width: 420px; min-width: 260px; max-height: 360px; 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; }
+#commit-tip.show { display: flex; flex-direction: column; }
+#commit-tip .ct-scroll { overflow-y: auto; max-height: 360px; padding: 4px 0; }
+#commit-tip .ct-sec { padding: 4px 10px; display: flex; gap: 8px; align-items: baseline; }
+#commit-tip .ct-sec .ct-k { flex: 0 0 62px; color: var(--vscode-descriptionForeground); font-size: 10px; text-transform: uppercase; letter-spacing: .3px; }
+#commit-tip .ct-sec .ct-v { flex: 1 1 auto; min-width: 0; word-break: break-word; }
+#commit-tip .ct-msg .ct-subj { font-weight: 600; display: block; margin-bottom: 3px; }
+#commit-tip .ct-msg .ct-body { white-space: pre-wrap; word-break: break-word; opacity: 0.92; }
+#commit-tip .ct-refs { display: flex; flex-wrap: wrap; gap: 3px; }
+#commit-tip .ct-div { border-top: 1px solid var(--vscode-editorHoverWidget-border, rgba(128,128,128,.2)); margin: 2px 0; }
+#commit-tip .ct-sha { font-family: var(--vscode-editor-font-family, monospace); font-size: 11px; opacity: 0.85; word-break: break-all; }
 </style>
 </head>
 <body>
@@ -491,8 +523,9 @@ body { margin: 0; font-family: var(--vscode-font-family); font-size: var(--vscod
   <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="details"><div class="dh" id="details-head"><span id="details-title"></span><span class="seg" role="group" aria-label="Changed files view mode"><button id="dmode-flat" class="active" aria-pressed="true" title="Flat list">List</button><button id="dmode-tree" aria-pressed="false" title="Group by directory">Tree</button></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>
+<div id="commit-tip" role="tooltip" aria-label="Commit details"></div>
 <script nonce="${nonce}">
 const vscode = acquireVsCodeApi();
 const LANE_FALLBACK = ${laneFallback};
@@ -518,6 +551,9 @@ function normalizeScope(v) { return v === 'all' || v === 'current' || v === 'che
 const persisted = vscode.getState() || {};
 let selectedHash = persisted.selectedHash || null;
 let scope = normalizeScope(persisted.scope);
+let detailsMode = persisted.dmode === 'tree' ? 'tree' : 'flat';
+const dcollapsed = new Set(persisted.dcollapsed || []);
+function persist() { vscode.setState({ selectedHash: selectedHash, scope: scope, dmode: detailsMode, dcollapsed: Array.from(dcollapsed) }); }
 let model = { rows: [], maxLanes: 0, hasMore: false, repoRoot: '' };
 let renderedFirst = -1, renderedLast = -1, fetching = false;
 // ── CI 状态（懒加载、仅取可见行；ciByHash 稳定缓存、ciRequested 去重、ciPending 防抖批量）──
@@ -543,6 +579,11 @@ const detailsEl = document.getElementById('details');
 const detailsList = document.getElementById('details-list');
 const detailsTitleEl = document.getElementById('details-title');
 const detailsCloseEl = document.getElementById('details-close');
+const dmodeFlatEl = document.getElementById('dmode-flat');
+const dmodeTreeEl = document.getElementById('dmode-tree');
+const commitTipEl = document.getElementById('commit-tip');
+let ctHash = null, ctShowT = null, ctHideT = null, overCtRow = false, overCt = false;
+let curDetailHash = null, curDetailFiles = [], curDetailTree = [];
 const errorEl = document.getElementById('error');
 const errorMsgEl = document.getElementById('error-msg');
 const retryBtnEl = document.getElementById('retry-btn');
@@ -553,6 +594,17 @@ 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 fmtAbs(iso) { if (!iso) return ''; const d = new Date(iso); if (isNaN(d)) return ''; return d.toLocaleString(); }
+function fmtRel(iso) {
+  const t = new Date(iso).getTime(); if (isNaN(t)) return '';
+  const diff = Date.now() - t, min = 60000, hr = 3600000, day = 86400000;
+  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 + (days === 1 ? ' day ago' : ' days ago');
+  return new Date(t).toLocaleDateString();
+}
 
 function rowSvg(row) {
   const L = row.layout;
@@ -577,7 +629,8 @@ function chipsHtml(row) {
   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>');
+    // 不加原生 title：引用明细统一由自定义 #commit-tip 浮层展示，避免原生+自定义双重气泡。
+    parts.push('<span class="', cls, '">', esc(c.name), '</span>');
   }
   parts.push('</span>');
   return parts.join('');
@@ -796,7 +849,7 @@ function renderCiMeta() { ciSignInEl.style.display = ciMeta.needsSignIn ? 'inlin
 
 function selectRow(hash) {
   selectedHash = hash;
-  vscode.setState({ selectedHash: hash, scope: scope });
+  persist();
   renderedFirst = -1; scheduleRender();
   vscode.postMessage({ type: 'log/selectCommit', payload: { hash: hash } });
 }
@@ -868,40 +921,172 @@ rowsEl.addEventListener('contextmenu', function (e) {
   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 } }); } }
+function setScope(next) { if (scope !== next) { scope = next; persist(); 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('scroll', function () { if (tipHash) hideTip(); if (ctHash) hideCommitTip(); }, { 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 } }); }
+  else if (e.key === 'i' || e.key === 'I') {
+    e.preventDefault();
+    const el = rowsEl.querySelector('.row.selected');
+    const row = selectedHash ? model.rows.find(function (r) { return r.hash === selectedHash; }) : null;
+    if (el && row) { hideTip(); ctHash = selectedHash; buildCommitTip(row); positionCommitTip(el.getBoundingClientRect()); commitTipEl.classList.add('show'); }
+  }
+  else if (e.key === 'Escape') { hideCommitTip(); }
 });
 detailsList.addEventListener('click', function (e) {
+  const d = e.target.closest('.tree-dir');
+  if (d) { toggleDetailCollapse(d.getAttribute('data-dir')); return; }
   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) {
+const DINDENT = 14;
+function detailLeafHtml(hash, f, hasParent, depth, label) {
+  return '<div class="file" style="padding-left:' + (depth * DINDENT + 10) + 'px" 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(label) + '</span></div>';
+}
+function renderDetailNode(node, depth, hash, hasParent, files, out) {
+  if (node.dir) {
+    const isCol = dcollapsed.has(node.path);
+    out.push('<div class="tree-dir" style="padding-left:' + (depth * DINDENT + 8) + 'px" data-dir="' + esc(node.path) + '"><span class="tree-twist">' + (isCol ? '\\u25B8' : '\\u25BE') + '</span><span class="tree-name">' + esc(node.name) + '</span></div>');
+    if (!isCol) { for (const c of node.children) renderDetailNode(c, depth + 1, hash, hasParent, files, out); }
+  } else {
+    out.push(detailLeafHtml(hash, files[node.fileIndex], hasParent, depth, node.name));
+  }
+}
+function pruneDetailCollapsed(tree) {
+  const present = new Set();
+  (function walk(nodes) { (nodes || []).forEach(function (n) { if (n.dir) { present.add(n.path); walk(n.children); } }); })(tree);
+  Array.from(dcollapsed).forEach(function (p) { if (!present.has(p)) dcollapsed.delete(p); });
+}
+function toggleDetailCollapse(p) {
+  if (dcollapsed.has(p)) dcollapsed.delete(p); else dcollapsed.add(p);
+  persist();
+  renderDetails(curDetailHash, curDetailFiles, curDetailTree);
+}
+function updateDetailModeButtons() {
+  dmodeFlatEl.classList.toggle('active', detailsMode === 'flat');
+  dmodeTreeEl.classList.toggle('active', detailsMode === 'tree');
+  dmodeFlatEl.setAttribute('aria-pressed', String(detailsMode === 'flat'));
+  dmodeTreeEl.setAttribute('aria-pressed', String(detailsMode === 'tree'));
+}
+function setDetailMode(m) { if (detailsMode === m) return; detailsMode = m; persist(); updateDetailModeButtons(); if (curDetailHash) renderDetails(curDetailHash, curDetailFiles, curDetailTree); }
+dmodeFlatEl.addEventListener('click', function () { setDetailMode('flat'); });
+dmodeTreeEl.addEventListener('click', function () { setDetailMode('tree'); });
+
+function renderDetails(hash, files, tree) {
   if (!hash) { detailsEl.classList.remove('show'); return; }
+  curDetailHash = hash; curDetailFiles = files || []; curDetailTree = tree || [];
+  updateDetailModeButtons();
   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('');
+  detailsTitleEl.textContent = 'Changed Files (' + curDetailFiles.length + ') · ' + hash.slice(0, 7);
+  if (curDetailFiles.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; }
+  pruneDetailCollapsed(curDetailTree);
+  const out = [];
+  if (detailsMode === 'tree') { for (const n of curDetailTree) renderDetailNode(n, 0, hash, hasParent, curDetailFiles, out); }
+  else { for (const f of curDetailFiles) out.push(detailLeafHtml(hash, f, hasParent, 0, f.path)); }
+  detailsList.innerHTML = out.join('');
   detailsEl.classList.add('show');
 }
 
+// ── 提交悬浮详情（自定义浮层，仿 CI Tooltip；数据随图上前下发，悬停零往返）──
+function buildCommitTip(row) {
+  const parts = ['<div class="ct-scroll">'];
+  const refGroups = [['head', 'HEAD'], ['localBranch', 'Branches'], ['remoteBranch', 'Remotes'], ['tag', 'Tags']];
+  for (const g of refGroups) {
+    const kind = g[0];
+    const chips = (row.chips || []).filter(function (c) { return c.kind === kind; });
+    if (chips.length === 0) continue;
+    const inner = chips.map(function (c) { return '<span class="chip ' + kind + (c.isHeadTarget ? ' head-target' : '') + '">' + esc(c.name) + '</span>'; }).join('');
+    parts.push('<div class="ct-sec"><span class="ct-k">' + g[1] + '</span><span class="ct-v ct-refs">' + inner + '</span></div>');
+  }
+  let msg = '<div class="ct-msg"><span class="ct-subj">' + esc(row.subject) + '</span>';
+  if (row.body) msg += '<span class="ct-body">' + esc(row.body) + '</span>';
+  msg += '</div>';
+  parts.push('<div class="ct-sec"><span class="ct-k">Message</span><span class="ct-v">' + msg + '</span></div>');
+  parts.push('<div class="ct-div"></div>');
+  const author = esc(row.authorName) + (row.authorEmail ? ' &lt;' + esc(row.authorEmail) + '&gt;' : '');
+  parts.push('<div class="ct-sec"><span class="ct-k">Author</span><span class="ct-v">' + author + '</span></div>');
+  if (row.committerName && (row.committerName !== row.authorName || row.committerDate !== row.authorDate)) {
+    parts.push('<div class="ct-sec"><span class="ct-k">Committer</span><span class="ct-v">' + esc(row.committerName) + '</span></div>');
+  }
+  const authored = fmtAbs(row.authorDate) + (fmtRel(row.authorDate) ? ' (' + fmtRel(row.authorDate) + ')' : '');
+  parts.push('<div class="ct-sec"><span class="ct-k">Authored</span><span class="ct-v">' + esc(authored) + '</span></div>');
+  if (row.committerDate && row.committerDate !== row.authorDate) {
+    const committed = fmtAbs(row.committerDate) + (fmtRel(row.committerDate) ? ' (' + fmtRel(row.committerDate) + ')' : '');
+    parts.push('<div class="ct-sec"><span class="ct-k">Committed</span><span class="ct-v">' + esc(committed) + '</span></div>');
+  }
+  parts.push('<div class="ct-sec"><span class="ct-k">Commit</span><span class="ct-v ct-sha">' + esc(row.hash) + '</span></div>');
+  parts.push('</div>');
+  commitTipEl.innerHTML = parts.join('');
+}
+function positionCommitTip(rect) {
+  commitTipEl.style.display = 'flex';
+  const tw = commitTipEl.offsetWidth, th = commitTipEl.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;
+  commitTipEl.style.left = left + 'px';
+  commitTipEl.style.top = top + 'px';
+}
+function scheduleShowCommit(hash, rowEl) {
+  clearTimeout(ctHideT);
+  if (ctHash === hash && commitTipEl.classList.contains('show')) return;
+  clearTimeout(ctShowT);
+  ctShowT = setTimeout(function () {
+    const row = model.rows.find(function (r) { return r.hash === hash; });
+    if (!row) return;
+    hideTip(); // 与 CI 浮层互斥：二者不同时显示
+    ctHash = hash;
+    buildCommitTip(row);
+    positionCommitTip(rowEl.getBoundingClientRect());
+    commitTipEl.classList.add('show');
+  }, 400);
+}
+function scheduleHideCommit() {
+  clearTimeout(ctShowT);
+  clearTimeout(ctHideT);
+  ctHideT = setTimeout(function () { if (!overCtRow && !overCt) hideCommitTip(); }, 200);
+}
+function hideCommitTip() {
+  clearTimeout(ctShowT); // 取消可能在途的延迟显示，避免移到 CI 图标后仍弹出提交浮层
+  commitTipEl.classList.remove('show');
+  commitTipEl.style.display = 'none';
+  ctHash = null;
+}
+rowsEl.addEventListener('mouseover', function (e) {
+  const ci = e.target.closest && e.target.closest('.ci');
+  if (ci && !ci.classList.contains('ci-empty')) { overCtRow = false; hideCommitTip(); return; } // CI 图标区归 CI 浮层
+  const r = e.target.closest && e.target.closest('.row');
+  if (!r) return;
+  overCtRow = true;
+  scheduleShowCommit(r.getAttribute('data-hash'), r);
+});
+rowsEl.addEventListener('mouseout', function (e) {
+  const r = e.target.closest && e.target.closest('.row');
+  if (!r) return;
+  const to = e.relatedTarget;
+  if (to && (commitTipEl.contains(to) || r.contains(to))) return; // 行内移动或进入浮层不隐藏
+  overCtRow = false;
+  scheduleHideCommit();
+});
+commitTipEl.addEventListener('mouseenter', function () { overCt = true; clearTimeout(ctHideT); });
+commitTipEl.addEventListener('mouseleave', function () { overCt = false; overCtRow = false; scheduleHideCommit(); });
+
 window.addEventListener('message', function (e) {
   const m = e.data;
   if (m.type === 'log/graphData') {
@@ -911,7 +1096,7 @@ window.addEventListener('message', function (e) {
     // 已缓存的提交重绘时立即可见图标，避免「清缓存→重拉→整行重建」的闪烁。
     ciRequested.clear(); ciPending.clear();
     if (ciReqTimer) { clearTimeout(ciReqTimer); ciReqTimer = null; }
-    hideTip();
+    hideTip(); hideCommitTip();
     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();
@@ -919,9 +1104,10 @@ window.addEventListener('message', function (e) {
     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';
+    hideCommitTip(); // #rows 将整体重写，取消可能在途的悬浮显示，避免对已脱离节点定位
     renderedFirst = -1; scheduleRender();
   } else if (m.type === 'log/commitFiles') {
-    renderDetails(m.payload.hash, m.payload.files);
+    renderDetails(m.payload.hash, m.payload.files, m.payload.tree);
   } else if (m.type === 'log/busy') {
     spinnerEl.style.display = m.payload.busy ? 'block' : 'none';
   } else if (m.type === 'log/error') {
@@ -932,6 +1118,7 @@ window.addEventListener('message', function (e) {
     ciMeta = { available: !!m.payload.available, needsSignIn: !!m.payload.needsSignIn, error: m.payload.error || '' };
     renderCiMeta();
     if (ciMeta.available) ensurePendingRefresh(); else stopPendingRefresh();
+    hideCommitTip(); // 可见行将整体重绘，取消在途悬浮显示，避免对已脱离节点定位
     renderedFirst = -1; // 强制重绘可见行（CI 槽位/登录提示出现或消失）
     scheduleRender();
   } else if (m.type === 'log/ciData') {
diff --git a/src/engine/log/log-line.ts b/src/engine/log/log-line.ts
index b4c48b7..ecf1091 100644
--- a/src/engine/log/log-line.ts
+++ b/src/engine/log/log-line.ts
@@ -11,8 +11,12 @@
  * `--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';
+/**
+ * for-each commit 的 --format 值（与 {@link parseLogLines} 字段顺序严格对应，勿单独修改）。
+ * `%b`（正文，多行）置于末字段：记录以 RS `%x1e` 终止、字段以 NUL `%x00` 分隔，二者均不出现于 git
+ * 文本输出，故正文内的换行/管道/反斜杠不会被误判为字段或记录边界；末字段解析用 `slice` 兜底重组更稳健。
+ */
+export const LOG_GRAPH_FORMAT = '%H%x00%P%x00%an%x00%ae%x00%aI%x00%cn%x00%cI%x00%s%x00%b%x1e';
 
 /** 一条 commit 的解析结果（字段顺序对应 {@link LOG_GRAPH_FORMAT}）。 */
 export interface RawCommit {
@@ -23,8 +27,14 @@ export interface RawCommit {
 	readonly authorEmail: string;
 	/** 作者日期 ISO 严格（`%aI`，`new Date()` 可解析）。 */
 	readonly authorDate: string;
+	/** 提交者名（`%cn`）。 */
+	readonly committerName: string;
+	/** 提交者日期 ISO 严格（`%cI`）。 */
+	readonly committerDate: string;
 	/** subject（`%s`，首行）。 */
 	readonly subject: string;
+	/** 完整正文（`%b`，不含 subject，可能多行；末字段，可为空）。 */
+	readonly body: string;
 }
 
 const NUL = '\x00';
@@ -42,7 +52,7 @@ export function parseLogLines(output: string): RawCommit[] {
 			continue;
 		}
 		const f = record.split(NUL);
-		if (f.length < 6) {
+		if (f.length < 9) {
 			continue;
 		}
 		const hash = f[0];
@@ -55,7 +65,11 @@ export function parseLogLines(output: string): RawCommit[] {
 			authorName: f[2] ?? '',
 			authorEmail: f[3] ?? '',
 			authorDate: f[4] ?? '',
-			subject: f[5] ?? '',
+			committerName: f[5] ?? '',
+			committerDate: f[6] ?? '',
+			subject: f[7] ?? '',
+			// body 为末字段：slice 兜底重组，即使出现意外 NUL 也能完整还原；空正文 → ''。
+			body: f.slice(8).join(NUL),
 		});
 	}
 	return commits;
diff --git a/src/engine/scm-mapping/status-decoration.ts b/src/engine/scm-mapping/status-decoration.ts
index 5085400..73c889c 100644
--- a/src/engine/scm-mapping/status-decoration.ts
+++ b/src/engine/scm-mapping/status-decoration.ts
@@ -7,8 +7,7 @@ import { FileStatus } from '../model';
  * 保证与原生 Source Control 视图及深色模式视觉一致（复用驱动，不新造 token）。
  *
  * `faded` / `strikeThrough` 为语义提示位（Untracked/Ignored 弱化、Deleted 删除线）。
- * 诚实约束：VS Code 稳定 `TreeItem` API 不暴露 opacity / strikethrough 字段，行标签无法直接
- * 删除线或淡化；故这两个位由渲染层（changes-tree）以「语义方式」消费——
+ * 诚实约束：渲染层（Commit / Log webview 文件列表、Branches 等 TreeItem）以「语义方式」消费这两个位——
  *  - `themeColor`：Untracked/Ignored 已映射到 muted 的 `untracked/ignored` token（天然弱化）；
  *  - `strikeThrough`：Deleted 在 MarkdownString tooltip 中以 `~~path~~` 删除线呈现。
  */
diff --git a/src/engine/tree/file-tree.ts b/src/engine/tree/file-tree.ts
new file mode 100644
index 0000000..093ac56
--- /dev/null
+++ b/src/engine/tree/file-tree.ts
@@ -0,0 +1,106 @@
+/**
+ * 扁平文件路径 → 目录树构建（纯逻辑，零 vscode 依赖）。
+ *
+ * 供 COMMIT / LOG 两个 webview 的「Group By Directory」形态使用：host 侧据同批扁平文件的路径
+ * 数组构建 {@link FileTreeNode} 树随 payload 下发，webview 仅按 mode 渲染平铺或树形，切换零 host 往返
+ * （复用 {@link ../log/graph-layout} 布局同款「host 算、webview 渲」范式，规避内联 JS 无法 import
+ * engine 造成的 Split-Brain）。
+ *
+ * 叶子以 `fileIndex` 回指入参 `paths` 的下标（与扁平 files[] 同序），故渲染层可 `files[fileIndex]`
+ * 复用既有单条渲染，且不复制条目数据（单一事实源）。排序：目录在前、文件在后，同类按名称
+ * 数字感知升序，稳定（相等按插入序）。compact 折叠单目录子链（如 `a/b/c`）对齐 VS Code SCM
+ * `explorer.compactFolders` 默认行为。
+ */
+
+import type { FileTreeNode } from '../../shared/protocol';
+
+export interface BuildFileTreeOptions {
+	/** 折叠单目录子链（默认 true，对齐 VS Code）。 */
+	readonly compactFolders?: boolean;
+}
+
+interface MutNode {
+	name: string;
+	readonly dir: boolean;
+	path: string;
+	readonly fileIndex?: number;
+	/** 仅目录：子节点（Map 保插入序，供稳定排序的相等兜底）。 */
+	readonly children: Map<string, MutNode>;
+}
+
+/**
+ * 将扁平路径数组构建为目录树。`paths[i]` 与调用方扁平 files[i] 同序，叶子 `fileIndex=i`。
+ * 纯函数、永不抛错：非字符串项跳过，`./`/前导 `/` 归一化，空段过滤，重复路径 keep-first。
+ */
+export function buildFileTree(paths: readonly string[], opts?: BuildFileTreeOptions): readonly FileTreeNode[] {
+	const compact = opts?.compactFolders ?? true;
+	const root = new Map<string, MutNode>();
+	const seen = new Set<string>();
+
+	paths.forEach((raw, index) => {
+		if (typeof raw !== 'string') {
+			return;
+		}
+		const norm = raw.replace(/^\.\//, '').replace(/^\/+/, '');
+		const segs = norm.split('/').filter((s) => s.length > 0);
+		if (segs.length === 0 || seen.has(norm)) {
+			return;
+		}
+		seen.add(norm);
+
+		let level = root;
+		let acc = '';
+		for (let i = 0; i < segs.length - 1; i++) {
+			acc = acc ? `${acc}/${segs[i]}` : segs[i];
+			let node = level.get(segs[i]);
+			if (!node || !node.dir) {
+				node = { name: segs[i], dir: true, path: acc, children: new Map() };
+				level.set(segs[i], node);
+			}
+			level = node.children;
+		}
+		const leafName = segs[segs.length - 1];
+		// 叶子与同名目录冲突时以先到者为准（正常 git 树不会出现 blob 与 tree 同名）。
+		if (!level.has(leafName)) {
+			level.set(leafName, { name: leafName, dir: false, path: norm, fileIndex: index, children: new Map() });
+		}
+	});
+
+	return finalizeLevel(root, compact);
+}
+
+function compare(a: MutNode, b: MutNode): number {
+	if (a.dir !== b.dir) {
+		return a.dir ? -1 : 1;
+	}
+	return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' });
+}
+
+function finalizeLevel(level: Map<string, MutNode>, compact: boolean): FileTreeNode[] {
+	// Array.prototype.sort 稳定（ES2019+）：相等键保持 Map 插入序。排序用折叠前的原名（按顶层段排序，对齐 VS Code）。
+	return Array.from(level.values())
+		.sort(compare)
+		.map((n) => finalizeNode(n, compact));
+}
+
+function finalizeNode(node: MutNode, compact: boolean): FileTreeNode {
+	if (!node.dir) {
+		return { name: node.name, dir: false, path: node.path, fileIndex: node.fileIndex };
+	}
+	let name = node.name;
+	let path = node.path;
+	let childMap = node.children;
+	if (compact) {
+		// 折叠单目录子链，遇含叶子或多子的目录即停。
+		while (childMap.size === 1) {
+			const only = childMap.values().next().value as MutNode;
+			if (!only.dir) {
+				break;
+			}
+			name = `${name}/${only.name}`;
+			path = only.path;
+			childMap = only.children;
+		}
+	}
+	return { name, dir: true, path, children: finalizeLevel(childMap, compact) };
+}
diff --git a/src/extension.ts b/src/extension.ts
index 82922c1..0a07ca2 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -9,7 +9,6 @@ import { ChangelistRegistry } from './adapter/changelist-registry';
 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 { LogWebviewProvider } from './adapter/webview/log-webview';
 import { registerHistoryCommands } from './adapter/history-commands';
 import { registerStashCommands } from './adapter/stash-commands';
@@ -34,6 +33,16 @@ import { GitHubAuth } from './adapter/ci/github-auth';
 import { GitHubCiService } from './adapter/ci/github-ci-service';
 import { createLogger } from './infra/logger';
 
+/** 无 git 时的占位树 provider（空树，触发 viewsWelcome）。原 EmptyChangesProvider 随 Changes 视图移除后内联于此。 */
+class EmptyTreeProvider implements vscode.TreeDataProvider<never> {
+	getTreeItem(): vscode.TreeItem {
+		return new vscode.TreeItem('');
+	}
+	getChildren(): never[] {
+		return [];
+	}
+}
+
 /**
  * 扩展入口。仅做装配（DI 注册），业务逻辑下沉到 engine/adapter 层。
  */
@@ -53,9 +62,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	const api = await getGitApi();
 	if (!api) {
 		logger.warn('vscode.git API 不可用，视图保持空状态');
-		const empty = new EmptyChangesProvider();
+		const empty = new EmptyTreeProvider();
 		context.subscriptions.push(
-			vscode.window.registerTreeDataProvider('hyperGit.changes', empty),
 			vscode.window.registerTreeDataProvider('hyperGit.worktrees', empty),
 		);
 		return;
@@ -67,10 +75,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	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 图标。
-	const changesView = vscode.window.createTreeView('hyperGit.changes', { treeDataProvider: tree });
 
 	// AI 接缝注入（Null 实现，M5 替换为真实 provider）
 	const commit = new CommitService(context, service, context.workspaceState, {
@@ -111,14 +115,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		worktreeTree,
 		shelfTree,
 		blame,
-		changesView,
 		branchesView,
 		vscode.window.registerWebviewViewProvider(CommitWebviewProvider.viewType, commitView),
 		vscode.window.registerWebviewViewProvider(LogWebviewProvider.viewType, logTree),
 		vscode.window.registerTreeDataProvider('hyperGit.stash', stashTree),
 		vscode.window.createTreeView('hyperGit.shelf', { treeDataProvider: shelfTree }),
 		vscode.window.registerTreeDataProvider('hyperGit.worktrees', worktreeTree),
-		...registerChangesCommands(service, registry, tree),
+		...registerChangesCommands(service, registry),
 		...registerHistoryCommands(service, logTree, branchesTree, favorites),
 		...registerGitCliCommands(service, branchesTree, logTree),
 		...registerPartialCommands(service, registry),
@@ -139,11 +142,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		registerInlineCommitCommand(service, inlineLens),
 	);
 
-	// 活动栏角标：复用 service.getChanges() 计数（index+工作区+未跟踪去重），与 Changes 视图内容一致；
+	// 活动栏角标：复用 service.getChanges() 计数（index+工作区+未跟踪去重），承载于 Commit webview；
+	// 活动栏容器图标角标 = 容器内各视图 badge 之和，故点亮 Commit 视图角标即映射到 Hyper Git 图标。
 	// 计数为 0 时清空，对齐原生 SCM 行为。
-	const updateChangesBadge = (): void => {
-		const count = service.getChanges().length;
-		changesView.badge = count > 0 ? { value: count, tooltip: `${count} uncommitted change(s)` } : undefined;
+	const updateCommitBadge = (): void => {
+		commitView.updateBadge(service.getChanges().length);
 	};
 
 	// git 状态变化频繁（add/checkout/diff 缓存失效均触发），防抖合并避免 log/stash 高频重拉。
@@ -151,8 +154,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	const refreshAll = (): void => {
 		clearTimeout(refreshTimer);
 		refreshTimer = setTimeout(() => {
-			tree.refresh();
-			updateChangesBadge();
+			updateCommitBadge();
 			commitView.refresh();
 			logTree.refresh();
 			branchesTree.refresh();
@@ -175,7 +177,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 		branchesTree.refresh();
 		logTree.refresh();
 		worktreeTree.refresh();
-		updateChangesBadge();
+		updateCommitBadge();
 	}, 500);
 }
 
diff --git a/src/shared/protocol.ts b/src/shared/protocol.ts
index f8eeaff..21deb14 100644
--- a/src/shared/protocol.ts
+++ b/src/shared/protocol.ts
@@ -22,11 +22,40 @@ export interface CommitFileItem {
 	readonly themeColor: string; // gitDecoration.* 主题色 id → webview 用 var(--vscode-...)
 }
 
+/**
+ * 视图无关的目录树节点（「Group By Directory」形态）。
+ *
+ * 【复用 graph-layout 先例】树结构由 host 侧 {@link ../engine/tree/file-tree}.buildFileTree 纯逻辑
+ * 计算后随 payload 下发，webview 仅按 mode 渲染平铺或树形，切换不触发 host 往返。叶子以 `fileIndex`
+ * 回指同批扁平 `files[]`（COMMIT 为 {@link CommitFileItem}，LOG 为 {@link LogCommitFileItem}），
+ * 故同一套渲染器可服务两个视图，且不复制条目数据（单一事实源）。
+ */
+export interface FileTreeNode {
+	readonly name: string; // 展示段：目录名 / compact 折叠的 "a/b" / 文件 basename
+	readonly dir: boolean; // true=目录，false=叶子文件
+	readonly path: string; // 目录=完整目录路径（展开/折叠稳定 key）；叶子=对应扁平条目的 path
+	readonly fileIndex?: number; // 仅叶子：回指扁平 files[] 的下标
+	readonly children?: readonly FileTreeNode[]; // 仅目录
+}
+
+/** Commit 头部切换下拉的 changelist 条目（含文件计数，空列表也在内以便切换）。 */
+export interface CommitChangelistItem {
+	readonly id: string;
+	readonly name: string;
+	readonly count: number;
+}
+
 export interface CommitViewState {
 	readonly template: string;
 	readonly recentMessages: readonly string[];
 	readonly activeChangelistName: string;
+	readonly activeChangelistId: string;
+	/** 全部 changelist（含空列表，供头部切换下拉 / 展示计数）。 */
+	readonly changelists: readonly CommitChangelistItem[];
+	/** 活动 changelist 的文件（提交目标；平铺形态直接渲染）。 */
 	readonly files: readonly CommitFileItem[];
+	/** 活动 changelist 文件的目录树（host 侧构建，供 Group By Directory 形态渲染）。 */
+	readonly tree: readonly FileTreeNode[];
 	readonly conventionalEnabled: boolean;
 	readonly busy: boolean;
 }
@@ -35,7 +64,7 @@ export interface CommitViewState {
 export type HostToWebviewMessage =
 	| { readonly type: 'state'; readonly payload: CommitViewState }
 	| { readonly type: 'conventionalValidation'; readonly payload: ConventionalValidation }
-	| { readonly type: 'commitResult'; readonly payload: { readonly ok: boolean; readonly error?: string } };
+	| { readonly type: 'commitResult'; readonly payload: { readonly ok: boolean; readonly error?: string; readonly warning?: string } };
 
 /** Webview → Host */
 export type WebviewToHostMessage =
@@ -51,7 +80,12 @@ export type WebviewToHostMessage =
 			readonly skipHooks: boolean;
 			readonly push: boolean;
 		};
-	};
+	}
+	// ── 由旧 Changes 树平移而来的文件 / changelist 操作（webview 右键/点击 → host 复用既有命令）── //
+	| { readonly type: 'commit/openFile'; readonly payload: { readonly path: string } }
+	| { readonly type: 'commit/fileMenu'; readonly payload: { readonly path: string } }
+	| { readonly type: 'commit/setActive'; readonly payload: { readonly id: string } }
+	| { readonly type: 'commit/changelistMenu'; readonly payload: { readonly id: string } };
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Log Graph 视图（hyperGit.log，Webview）↔ Extension Host 消息契约。
@@ -77,7 +111,15 @@ export interface GraphRowVM {
 	readonly isMerge: boolean;
 	readonly subject: string;
 	readonly authorName: string;
+	/** 作者邮箱（%ae）：供悬浮详情显示 name <email>。 */
+	readonly authorEmail: string;
 	readonly authorDate: string;
+	/** 提交者名（%cn）：仅当与作者不同才在悬浮详情单列。 */
+	readonly committerName: string;
+	/** 提交者日期（%cI，ISO 严格）。 */
+	readonly committerDate: string;
+	/** 完整提交消息正文（%b，不含 subject；host 侧已截断至上限以控 payload）。 */
+	readonly body: string;
 	readonly chips: readonly RefChip[];
 	readonly layout: GraphLayoutRow;
 }
@@ -130,7 +172,15 @@ export type LogHostToWebviewMessage =
 		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/commitFiles';
+		readonly payload: {
+			readonly hash: string;
+			readonly files: readonly LogCommitFileItem[];
+			/** 变更文件的目录树（host 侧构建，供 Group By Directory 形态渲染）。 */
+			readonly tree: readonly FileTreeNode[];
+		};
+	}
 	| { 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 }
diff --git a/tests/unit/file-tree.test.ts b/tests/unit/file-tree.test.ts
new file mode 100644
index 0000000..f47960f
--- /dev/null
+++ b/tests/unit/file-tree.test.ts
@@ -0,0 +1,128 @@
+import { describe, it, expect } from 'vitest';
+import { buildFileTree } from '../../src/engine/tree/file-tree';
+
+describe('file-tree buildFileTree', () => {
+	it('空输入返回空数组', () => {
+		expect(buildFileTree([])).toEqual([]);
+	});
+
+	it('根级文件按名称升序、均为叶子且 fileIndex 正确', () => {
+		const tree = buildFileTree(['b.txt', 'a.txt']);
+		expect(tree).toEqual([
+			{ name: 'a.txt', dir: false, path: 'a.txt', fileIndex: 1 },
+			{ name: 'b.txt', dir: false, path: 'b.txt', fileIndex: 0 },
+		]);
+	});
+
+	it('嵌套路径（compact 关）逐级建目录，叶子回指 fileIndex', () => {
+		const tree = buildFileTree(['a/b/c.txt'], { compactFolders: false });
+		expect(tree).toEqual([
+			{
+				name: 'a',
+				dir: true,
+				path: 'a',
+				children: [
+					{
+						name: 'b',
+						dir: true,
+						path: 'a/b',
+						children: [{ name: 'c.txt', dir: false, path: 'a/b/c.txt', fileIndex: 0 }],
+					},
+				],
+			},
+		]);
+	});
+
+	it('compact 开：单目录子链折叠为 a/b，遇叶子即停', () => {
+		const tree = buildFileTree(['a/b/c.txt'], { compactFolders: true });
+		expect(tree).toEqual([
+			{
+				name: 'a/b',
+				dir: true,
+				path: 'a/b',
+				children: [{ name: 'c.txt', dir: false, path: 'a/b/c.txt', fileIndex: 0 }],
+			},
+		]);
+	});
+
+	it('compact 默认开启（不传 opts 等价 compactFolders:true）', () => {
+		expect(buildFileTree(['x/y/z.txt'])).toEqual(buildFileTree(['x/y/z.txt'], { compactFolders: true }));
+	});
+
+	it('compact 不越过含叶子或多子的目录', () => {
+		// a 直接含叶子 x.txt 与目录 b → 不折叠 a；b 单目录子链 c → 折叠 b/c
+		const tree = buildFileTree(['a/x.txt', 'a/b/c/d.txt'], { compactFolders: true });
+		expect(tree).toEqual([
+			{
+				name: 'a',
+				dir: true,
+				path: 'a',
+				children: [
+					{
+						name: 'b/c',
+						dir: true,
+						path: 'a/b/c',
+						children: [{ name: 'd.txt', dir: false, path: 'a/b/c/d.txt', fileIndex: 1 }],
+					},
+					{ name: 'x.txt', dir: false, path: 'a/x.txt', fileIndex: 0 },
+				],
+			},
+		]);
+	});
+
+	it('目录在前、文件在后', () => {
+		const tree = buildFileTree(['README.md', 'src/a.ts']);
+		expect(tree.map((n) => [n.name, n.dir])).toEqual([
+			['src', true],
+			['README.md', false],
+		]);
+	});
+
+	it('数字感知排序（file2 在 file10 之前）', () => {
+		const tree = buildFileTree(['file10.txt', 'file2.txt']);
+		expect(tree.map((n) => n.name)).toEqual(['file2.txt', 'file10.txt']);
+	});
+
+	it('同名文件位于不同目录 → 两个叶子、各自父目录、fileIndex 各异', () => {
+		const tree = buildFileTree(['a/x.ts', 'b/x.ts'], { compactFolders: false });
+		const dirA = tree.find((n) => n.name === 'a');
+		const dirB = tree.find((n) => n.name === 'b');
+		expect(dirA?.children?.[0]).toMatchObject({ name: 'x.ts', path: 'a/x.ts', fileIndex: 0 });
+		expect(dirB?.children?.[0]).toMatchObject({ name: 'x.ts', path: 'b/x.ts', fileIndex: 1 });
+	});
+
+	it('fileIndex 在排序后仍指向原始扁平下标', () => {
+		// 输入顺序：z.txt(0), a.txt(1)；输出按名排序后 a 在前，但 fileIndex 保留原下标
+		const tree = buildFileTree(['z.txt', 'a.txt']);
+		expect(tree.find((n) => n.name === 'a.txt')?.fileIndex).toBe(1);
+		expect(tree.find((n) => n.name === 'z.txt')?.fileIndex).toBe(0);
+	});
+
+	it('根文件与目录混排：目录在前，各自内部有序', () => {
+		const tree = buildFileTree(['zzz.txt', 'src/b.ts', 'src/a.ts'], { compactFolders: false });
+		expect(tree.map((n) => n.name)).toEqual(['src', 'zzz.txt']);
+		expect(tree[0].children?.map((c) => c.name)).toEqual(['a.ts', 'b.ts']);
+	});
+
+	it('去重：重复路径 keep-first（沿用首个 fileIndex）', () => {
+		const tree = buildFileTree(['dup.txt', 'dup.txt']);
+		expect(tree).toEqual([{ name: 'dup.txt', dir: false, path: 'dup.txt', fileIndex: 0 }]);
+	});
+
+	it('归一化：去除前导 ./ 与 /', () => {
+		const tree = buildFileTree(['./a.txt', '/b.txt']);
+		expect(tree.map((n) => n.path)).toEqual(['a.txt', 'b.txt']);
+	});
+
+	it('跳过空字符串 / 纯分隔路径', () => {
+		expect(buildFileTree(['', '/', './'])).toEqual([]);
+	});
+
+	it('LOG 场景：以干净新路径建树，fileIndex 映射回展示条目', () => {
+		// 传入干净路径（重命名的新路径），下标与 LogCommitFileItem[] 同序
+		const cleanPaths = ['src/new.ts', 'README.md'];
+		const tree = buildFileTree(cleanPaths, { compactFolders: false });
+		expect(tree.map((n) => n.name)).toEqual(['src', 'README.md']);
+		expect(tree.find((n) => n.name === 'src')?.children?.[0]).toMatchObject({ fileIndex: 0, path: 'src/new.ts' });
+	});
+});
diff --git a/tests/unit/log-line.test.ts b/tests/unit/log-line.test.ts
index fdf13c4..d723b14 100644
--- a/tests/unit/log-line.test.ts
+++ b/tests/unit/log-line.test.ts
@@ -5,31 +5,45 @@ 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`;
+const rec = (
+	hash: string,
+	parents: string,
+	an: string,
+	ae: string,
+	aI: string,
+	cn: string,
+	cI: string,
+	subject: string,
+	body: string,
+): string => `${hash}${NUL}${parents}${NUL}${an}${NUL}${ae}${NUL}${aI}${NUL}${cn}${NUL}${cI}${NUL}${subject}${NUL}${body}${RS}\n`;
+
+const AI = '2026-06-29T10:00:00+08:00';
 
 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');
+	it('字段顺序：H P an ae aI cn cI s b（body 置末），以 NUL 分隔、RS 终止', () => {
+		expect(LOG_GRAPH_FORMAT).toBe('%H%x00%P%x00%an%x00%ae%x00%aI%x00%cn%x00%cI%x00%s%x00%b%x1e');
 	});
 });
 
 describe('parseLogLines', () => {
 	it('解析单条 commit', () => {
-		const rows = parseLogLines(rec('aaa', 'bbb', 'Jane', 'j@x.io', '2026-06-29T10:00:00+08:00', 'fix: bug'));
+		const rows = parseLogLines(rec('aaa', 'bbb', 'Jane', 'j@x.io', AI, 'Jane', AI, 'fix: bug', 'detail line'));
 		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',
+			authorDate: AI,
+			committerName: 'Jane',
+			committerDate: AI,
 			subject: 'fix: bug',
+			body: 'detail line',
 		});
 	});
 
 	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 out = rec('aaa', 'bbb', 'A', 'a@x', AI, 'A', AI, 's1', '') + rec('bbb', '', 'B', 'b@x', AI, 'B', AI, 's2', '');
 		const rows = parseLogLines(out);
 		expect(rows).toHaveLength(2);
 		expect(rows[1].hash).toBe('bbb');
@@ -37,12 +51,12 @@ describe('parseLogLines', () => {
 	});
 
 	it('root 提交：parents 为空数组', () => {
-		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 'init'));
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', AI, 'A', AI, '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'));
+		const rows = parseLogLines(rec('m', 'p1 p2 p3', 'A', 'a@x', AI, 'A', AI, 'merge', ''));
 		expect(rows[0].parents).toEqual(['p1', 'p2', 'p3']);
 	});
 
@@ -52,14 +66,32 @@ describe('parseLogLines', () => {
 
 	it('字段不足的记录被跳过（不中断整体解析）', () => {
 		const bad = `only${NUL}two${RS}\n`;
-		const good = rec('aaa', '', 'A', 'a@x', '2026-06-29T10:00:00+08:00', 's');
+		const good = rec('aaa', '', 'A', 'a@x', AI, 'A', AI, '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'));
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', AI, 'A', AI, 'fix: a | b / c \\ d', ''));
 		expect(rows[0].subject).toBe('fix: a | b / c \\ d');
 	});
+
+	it('多行正文原样保留（含空行）', () => {
+		const body = 'line1\n\nline3 with | and \\ chars';
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', AI, 'A', AI, 'feat: x', body));
+		expect(rows[0].body).toBe(body);
+	});
+
+	it('空正文 → body 为空字符串', () => {
+		const rows = parseLogLines(rec('aaa', '', 'A', 'a@x', AI, 'A', AI, 'chore: y', ''));
+		expect(rows[0].body).toBe('');
+	});
+
+	it('提交者与作者不同：分别解析', () => {
+		const rows = parseLogLines(rec('aaa', '', 'Author', 'a@x', AI, 'Committer', '2026-07-01T09:00:00+08:00', 's', ''));
+		expect(rows[0].authorName).toBe('Author');
+		expect(rows[0].committerName).toBe('Committer');
+		expect(rows[0].committerDate).toBe('2026-07-01T09:00:00+08:00');
+	});
 });
diff --git a/tests/unit/log-query.test.ts b/tests/unit/log-query.test.ts
index 3c3be5b..2c95b28 100644
--- a/tests/unit/log-query.test.ts
+++ b/tests/unit/log-query.test.ts
@@ -56,6 +56,6 @@ describe('buildLogArgs — 服务端过滤翻译', () => {
 
 	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'}`);
+		expect(args).toContain(`--format=${'%H%x00%P%x00%an%x00%ae%x00%aI%x00%cn%x00%cI%x00%s%x00%b%x1e'}`);
 	});
 });