From a9e5b1119ac6023065a2095ca2fd72b676b7891c Mon Sep 17 00:00:00 2001
From: MT-Mint <798521692@qq.com>
Date: Tue, 7 Apr 2026 12:30:24 +0800
Subject: [PATCH] =?UTF-8?q?docs(01-01):=20=E5=9B=BA=E5=8C=96=20merge=20?=
 =?UTF-8?q?=E4=B8=8E=20titan=20=E5=AE=A1=E8=AE=A1=E8=AF=81=E6=8D=AE?=
 =?UTF-8?q?=E9=93=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加可复现 Git 命令链

- 记录 merge 与 Titan overlap 证据摘要
---
 .../audit-evidence.md                         | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 .planning/phases/01-conflict-inventory-and-decision-matrix/audit-evidence.md

diff --git a/.planning/phases/01-conflict-inventory-and-decision-matrix/audit-evidence.md b/.planning/phases/01-conflict-inventory-and-decision-matrix/audit-evidence.md
new file mode 100644
index 00000000..463fe923
--- /dev/null
+++ b/.planning/phases/01-conflict-inventory-and-decision-matrix/audit-evidence.md
@@ -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 查询，不改写业务代码。
+- 频次值会随仓库后续提交变化；结构与方法保持稳定，可重复审计。