docs(01-01): 固化 merge 与 titan 审计证据链

- 增加可复现 Git 命令链

- 记录 merge 与 Titan overlap 证据摘要
This commit is contained in:
肖应宇 2026-04-07 12:30:24 +08:00
parent 31bb8db442
commit a9e5b1119a
1 changed files with 90 additions and 0 deletions

View File

@ -0,0 +1,90 @@
# Phase 01 审计证据链(可复现)
- Phase: `01-conflict-inventory-and-decision-matrix`
- Branch: `feat/git-main-frondend-intergretion`
- HEAD: `b7ccdc0f79829ed907a8ab3c27f9a1e846176162`
- Captured (UTC): `2026-04-07T04:28:37Z`
## 1) Merge 覆写热点采集(命令)
```bash
git log --all --merges --oneline --decorate -- frontend
```
用于本阶段盘点的冲突语义 merge 提交(来自研究基线):
- `8a2cac7b` — Merge upstream/experimental: resolve conflicts (keep feat/citations)
- `0fff2880` — Merge upstream/experimental and resolve conflicts; citations + path_utils + mode-hover
- `588673d0` — merge: upstream/experimental with citations feature
- `6a540d84` — Merge upstream/experimental: resolve conflict in lead_agent/prompt.py
- `6335424a` — Merge remote-tracking branch 'origin/feat/originui' into feat/originui
- `49503504` — Merge branch 'main' ... into feat/kexue-ui-v0.1
提取文件证据命令:
```bash
for c in 8a2cac7b 0fff2880 588673d0 6a540d84 6335424a 49503504; do
git show -m --name-status --pretty=format:"" "$c" -- frontend
git show -m --name-only --pretty=format:"" "$c" -- frontend
done
```
热点频次聚合命令:
```bash
for c in 8a2cac7b 0fff2880 588673d0 6a540d84 6335424a 49503504; do
git show -m --name-only --pretty=format:"" "$c" -- frontend
done | sed '/^$/d' | sort | uniq -c | sort -nr
```
结果摘要Top
- `frontend/src/components/workspace/artifacts/artifact-file-detail.tsx` -> 8
- `frontend/src/components/workspace/messages/message-list-item.tsx` -> 7
- `frontend/src/app/workspace/chats/[thread_id]/page.tsx` -> 4
- `frontend/src/core/threads/hooks.ts` -> 3
- `frontend/src/core/skills/api.ts` -> 1
- `frontend/src/components/workspace/chats/use-thread-chat.ts` -> 1
## 2) Titan overlap 采集(命令)
作者轨命令:
```bash
git log --all --author='[Tt]itan' --name-only --pretty=format: -- frontend \
| sed '/^$/d' | sort | uniq -c | sort -nr
```
作者轨结果摘要:
- `frontend/src/app/workspace/chats/[thread_id]/page.tsx` -> 7
- `frontend/src/core/threads/hooks.ts` -> 4
- `frontend/src/core/skills/api.ts` -> 3
- `frontend/src/components/workspace/chats/use-thread-chat.ts` -> 1
- `frontend/src/components/workspace/messages/message-list-item.tsx` -> 1
- `frontend/src/core/uploads/api.ts` -> 1
语义轨命令(移植 Titan main
```bash
git show --name-only --pretty=fuller 7342cc08 -- frontend
```
`7342cc08` 涉及文件:
- `frontend/src/app/workspace/chats/[thread_id]/page.tsx`
- `frontend/src/components/workspace/chats/use-thread-chat.ts`
- `frontend/src/components/workspace/messages/message-list-item.tsx`
- `frontend/src/core/skills/api.ts`
- `frontend/src/core/threads/hooks.ts`
- `frontend/src/core/uploads/api.ts`
## 3) 证据到产物映射
- `conflict-inventory.csv`:使用 merge 热点频次 + Titan 触达频次 + 行为关键度完成 P0/P1/P2 评级。
- `titan-decision-matrix.md`:仅对 Titan overlap 文件给出 keep/replace/hybrid 决策,并标注 Phase 2/Phase 3 执行归属。
## 4) 可复现性说明
- 本文所有命令为只读 Git 查询,不改写业务代码。
- 频次值会随仓库后续提交变化;结构与方法保持稳定,可重复审计。