diff --git a/.planning/phases/07-phase-06-mention-upload/07-UAT.md b/.planning/phases/07-phase-06-mention-upload/07-UAT.md
index 89a0b6d6..e466fe9a 100644
--- a/.planning/phases/07-phase-06-mention-upload/07-UAT.md
+++ b/.planning/phases/07-phase-06-mention-upload/07-UAT.md
@@ -1,10 +1,10 @@
 ---
-status: complete
+status: diagnosed
 phase: 07-phase-06-mention-upload
 source:
   - 07-01-SUMMARY.md
 started: 2026-04-17T03:02:59Z
-updated: 2026-04-17T03:28:56Z
+updated: 2026-04-17T03:30:14Z
 ---
 
 ## Current Test
@@ -47,27 +47,45 @@ blocked: 0
   reason: "User reported: pass，但是出现了：右键图片的时候弹出ContextMenu，我还没有点击引用就已经触发了引用且自动关闭了ContextMenu的问题"
   severity: major
   test: 1
-  root_cause: ""
-  artifacts: []
-  missing: []
-  debug_session: ""
+  root_cause: "引用动作绑定在 ContextMenuItem 的 onSelect 上，菜单在右键打开时会在光标落点处初始化高亮，导致 onSelect 在未显式左键点击“引用”时也可能触发并立即关闭菜单。"
+  artifacts:
+    - path: "frontend/src/components/workspace/artifacts/artifact-file-list.tsx"
+      issue: "ContextMenuItem uses onSelect to dispatch mention reference immediately"
+    - path: "frontend/src/components/workspace/messages/message-list-item.tsx"
+      issue: "ContextMenuItem also binds reference action to onSelect in message attachments"
+  missing:
+    - "将引用行为改为显式点击触发（避免仅右键打开菜单就执行）"
+    - "保留菜单打开直到用户完成明确选择或主动关闭"
+  debug_session: ".planning/debug/07-context-menu-reference-autofire.md"
 
 - truth: "同时选附件和 Skill 发送时，拼接格式为“优先使用【附件...】和【Skill...】”，且附件在前、Skill 在后。"
   status: failed
   reason: "User reported: pass。我需要\n优先使用这个拼接提示词部分的标识要更加独特一些，使用\nXClaw优先使用"
   severity: minor
   test: 2
-  root_cause: ""
-  artifacts: []
-  missing: []
-  debug_session: ""
+  root_cause: "拼接前缀在 priority-hint 组装器中写死为“优先使用”，缺少可区分系统标识前缀。"
+  artifacts:
+    - path: "frontend/src/core/threads/priority-hint.ts"
+      issue: "buildPriorityHintText hardcodes prefix as 优先使用"
+    - path: "frontend/src/core/messages/utils.ts"
+      issue: "stripPriorityHintSuffix regex only matches 优先使用 prefix"
+  missing:
+    - "将拼接前缀统一改为“XClaw优先使用”"
+    - "同步更新渲染剥离逻辑与测试断言"
+  debug_session: ".planning/debug/07-priority-hint-prefix-uniqueness.md"
 
 - truth: "点击发送按钮与回车发送遵循同一拼接和展示规则；点击建议词仅填充输入（或触发 skill）且不自动发送。"
   status: failed
   reason: "User reported: pass。但是提示词中不要使用skill的name而使用id"
   severity: major
   test: 3
-  root_cause: ""
-  artifacts: []
-  missing: []
-  debug_session: ""
+  root_cause: "提交文本组装时在 hooks 中取的是 selectedSkills.title（展示名），而非 skill_id，导致 payload 拼接内容无法使用稳定标识。"
+  artifacts:
+    - path: "frontend/src/core/threads/hooks.ts"
+      issue: "selectedSkillTitles maps from message.selectedSkills.title"
+    - path: "frontend/src/components/ai-elements/prompt-input.tsx"
+      issue: "selectedSkills currently carries both skill_id and title but submit path chooses title"
+  missing:
+    - "提交拼接改为使用 selectedSkills.skill_id"
+    - "保留 UI 展示继续使用 title，不影响技能标签显示"
+  debug_session: ".planning/debug/07-skill-id-in-submit-hint.md"