@mstar-harness/opencode 1.8.0 → 1.8.1

package/harness-skills/mstar-iteration/references/phase-3-iteration-close.md

@@ -0,0 +1,95 @@
+# Phase 3: iteration-close（收口迭代）
+
+> Loaded by `mstar-iteration` SKILL.md when entering Phase 3. **Read `mstar-harness-core` first.** Phase 2 全部 plan `Done` 后按 **Phase transition gates** 进入本 Phase。
+
+PM 在迭代内全部 plan Done 后执行。**本 Phase 在 integration 分支上运行**，产出物 commit 到 integration 分支，随迭代 PR 合入 root `metadata.target_branch`。入口：Phase 2 全部 plan `Done` 后按 **Phase transition gates** 进入。
+
+**Close Done 定义**：§3.1→§3.5 全部完成；compass frontmatter 写入 `status: completed` + `end_date`；每篇新增 knowledge doc 已登记 `{KNOWLEDGE_DIR}/README.md`。只在 final plan 中写了 compound / roadmap / PR 说明，不算 iteration-close 完成。
+
+## 3.0 Phase boundary（HARD）
+
+- Phase 3 是 iteration 级收口，不是任一 plan 的子任务。
+- final plan closure、plan notes、plan compaction 可作为输入，但不能替代 §3.1→§3.5。
+- 读过 `mstar-iteration` / `mstar-compound` 不等于执行 gate；必须打印 checklist 并写入产物。
+
+## 3.0.5 Compass shape normalization（legacy 漂移修复）
+
+进入 §3.1 前，先确认 compass 具有 close 可写入的结构。若缺失，PM 在本 thread 做最小规范化，不委派、不重写无关内容。
+
+| 检查 | 缺则补齐 |
+|------|----------|
+| YAML frontmatter：`iteration_id`, `start_date`, `status` | 从文件名 / 正文提取；收口前 `status` 保持 `active` 或 `locked` |
+| `## Roadmap Position` | 从 general context / roadmap prose 迁移为本节 |
+| `## Quality Gate Summary` | 按模板补占位，§3.4 填写 |
+| `## Compound Round Summary` | 按模板补占位，§3.4 填写 |
+| `## Iteration Retrospective (minimal)` | 按模板补占位，§3.4 填写 |
+
+正文 completion status 只能作为历史注释；最终状态必须写入 frontmatter `status: completed` + `end_date`。
+
+## 3.1 Close entry checklist（HARD GATE）
+
+**STOP**: 打印下方 checklist，且全部为 `[x]` 后，才可进入 §3.2 Compound。
+
+- [ ] 所有 compass 中登记的 plan 在 `{HARNESS_DIR}/status.json` 均为 `Done`
+- [ ] 所有 plan 的 residual findings 已收口：优先 empty open 列表；若仍有 open R#，须均为 Phase 2 `zero-residual` 允许的 blocker-defer + roadmap，或已 closed/accepted/waived 归档（见 `mstar-plan-artifacts` Findings cleanup modes）
+- [ ] compass `## Plans` 表状态列已与 `status.json` 同步
+- [ ] 迭代 `## Acceptance Criteria` 已达成或显式豁免（compass 或对话记录原因）
+- [ ] compass shape 已满足（frontmatter + `## Roadmap Position` + close 占位节）
+
+PM **必须**在对话中打印本 checklist；不得默认同过。
+
+## 3.2 知识结晶（Compound）—— 迭代级核心收口
+
+**Compound 在此执行，不在 per-plan Done 后独立执行。** 工作流 SSOT → **`mstar-compound`**（Q1–Q8 自检、Phase 1–7、Phase 6 索引登记强制）。
+
+PM 批量触发后须：
+
+1. 收集本迭代 plan 实现 / debug / review 素材，筛候选知识
+2. **盘点** `{ITERATION_DIR}/<iteration-id>/**` package（`guides/`、`specs/`；默认排除 `delivery-compass.md`）— **`mstar-compound`**「Iteration package promotion」；提升值得保留者进 `{KNOWLEDGE_DIR}/`
+3. 逐条过 `mstar-compound` 自检；跳过项记入 compass `## Compound Round Summary`
+4. 写入或更新 `{KNOWLEDGE_DIR}/<category>/<slug>.md`；新领域词更新 `CONCEPTS.md`
+5. **每篇**新 doc 完成 Phase 6（`{KNOWLEDGE_DIR}/README.md` 登记）
+
+若无结晶且无 package 提升，仍在 `## Compound Round Summary` 写明 `无可结晶知识` / package 盘点结论及原因。
+
+## 3.3 更新 roadmap
+
+1. 更新 compass **`## Roadmap Position`**（§3.0.5 已确保本节存在）：
+   - current iteration 行标记为 **`delivered`**（或等价明确措辞）
+   - next iteration 更新为即将开始的内容、触发条件、owner
+2. 若 `status.json` 中有 `plans[].metadata.roadmap` 字段，同步更新
+3. 若存在 deferred-features / roadmap tracker 类文档，按项目惯例刷新
+4. 若 `STRATEGY.md` 存在，可更新 `## Decision Log`（重大架构决策时）
+
+## 3.4 标记迭代完成
+
+1. compass **YAML frontmatter**：`status: completed`，`end_date: YYYY-MM-DD`（必须；见 §3.0.5）
+2. 更新 `{ITERATION_DIR}/README.md` 索引中该迭代行 Status 为 `completed`
+3. 填充 compass `## Quality Gate Summary`、`## Compound Round Summary` 与 `## Iteration Retrospective (minimal)`（见模板）
+
+## 3.5 Close exit checklist + commit
+
+**Precondition**: §3.1 checklist `[x]`；§3.4 frontmatter `completed` + `end_date` 已写。
+
+PM 打印 **iteration-close exit checklist**；全部为 `[x]` 后方可 `git commit`；然后进入 **Phase 4**（见 `references/phase-4-5-pr-delivery.md`）：
+
+- [ ] §3.1 前置 gate 已打印并满足
+- [ ] §3.2 compound 完成；**`<iteration-id>/` package 已盘点**（提升 / 保留 / 跳过已记入 Compound Summary）；新增 knowledge doc 均已登记 `{KNOWLEDGE_DIR}/README.md`（或已记录无可结晶原因）
+- [ ] §3.3 `## Roadmap Position` current iteration 已标 `delivered`；tracker / STRATEGY 已按需更新
+- [ ] §3.4 frontmatter `status: completed` + `end_date`；Quality Gate Summary + Compound Summary + Retrospective 已填
+- [ ] 当前分支是 `spec_integration_branch`
+- [ ] PR base = `metadata.target_branch`（与 compass frontmatter 一致）；**不是**未记录的 `main`
+
+**Commit 到 integration 分支**：
+
+```bash
+git add {ITERATION_DIR}/<id>/ {ITERATION_DIR}/README.md {KNOWLEDGE_DIR}/ CONCEPTS.md
+git commit -m "chore(iteration): close <iteration-id> — compound round, roadmap update"
+git push origin <spec_integration_branch>
+```
+
+PR 目标使用 root `metadata.target_branch`；缺失时停止并补齐，不得默认 `main`。
+
+## 3.6 可选：触发 compound-refresh
+
+若本轮 compound 新增了较多知识文档，或 compass 标记了可能过时的旧知识，触发 `mstar-compound-refresh` 对有重叠的知识文档做维护。

package/harness-skills/mstar-iteration/references/phase-4-5-pr-delivery.md

@@ -0,0 +1,81 @@
+# Phase 4 & 5: PR delivery + merge-ready loop
+
+> Loaded by `mstar-iteration` SKILL.md when entering Phase 4/5. **Read `mstar-harness-core` first.** 进入前置：Phase 3 §3.5 exit 全 `[x]`（Phase 4）；Phase 4 PR 已创建（Phase 5）。
+
+## Phase 4: PR delivery（开 PR）
+
+**Precondition**: Phase 3 §3.5 exit 全 `[x]`；close commit 已 push 到 `spec_integration_branch`。
+
+1. 打印 **`## Phase 4: PR delivery`**
+2. Resolve target：`metadata.target_branch`（compass frontmatter 镜像）；缺失 → **STOP**，问用户
+3. 创建 PR：`spec_integration_branch` → `target_branch`
+4. 记录 PR URL / number（Phase 5 会话 SSOT）
+5. **Immediately** 进入 **Phase 5** — **Phase 4 exit ≠ 迭代交付完成**
+
+---
+
+## Phase 5: PR merge-ready loop
+
+**Precondition**: Phase 4 PR 已创建且 head = `spec_integration_branch`。
+
+**Loop 理念**（mstar SSOT）：PR 开完后进入 **验证—修复—再验证** 循环，直至 PR 可合并。与 Phase 2 per-plan loop 类似，但对象是 **PR 级** merge 门禁（CI、review、冲突），不是 plan 实现。
+
+### 5.0 Phase boundary
+
+- Phase 5 在 PR head（`spec_integration_branch`）上 push 修复；**禁止**另开替代分支
+- 产品代码修复 → PM **dispatch** dev/ops（`mstar-dispatch-gates`）；PM 线程不代写实现
+- 禁止为「让 CI 变绿」而改 workflow，除非用户明确授权
+- **Push cadence** → **§5.1a**（本地可提前修；**禁止**在 CI / AI review 波次未结束时 push）
+
+### 5.1a Push cadence（HARD — 防打断 CI / AI review）
+
+发现 CI 失败或 review 问题时，**允许本地提前修**（含 dispatch implement/ops、落盘 commit），但 **`git push`（更新 PR head）必须等上一波次跑完**。
+
+| 允许 | 禁止 |
+|------|------|
+| CI/review **进行中**就开始本地诊断与修复 | 当前 head 上仍有 **CI queued/in_progress**，或 **AI review 波次**（Bugbot / Greptile / 等价 bot）未结束时 **push** |
+| CI **全部结束后**出现新的 review 评论 → 继续本地修，批完再 push | 为「抢时间」在 CI 仍在跑时 push（会取消/孤儿化进行中的 CI 与 **AI reviews**，浪费 token 且无完整结果） |
+| 一批本地修复 **合并为一次 push**（本 head 波次 settled 后） | 同一波次未 settled 就连续多次 push |
+
+**Push gate（每次 push 前必须核对）**：
+
+1. 当前 PR head 的 **required CI**（及已启动的检查）均已 **completed**（success / failure / cancelled — 不得仍为 queued / in_progress）
+2. 附着在该 head 的 **AI / bot review 波次**已跑完（无进行中的 review job；若宿主无法探测 job，则至少等 CI settled **且** review 评论不再增长一小段稳定窗口后再 push）
+3. 仅当 **1–2 满足** 且本地仍有未推送修复时，才 **push 一次**
+4. Push 后：等 **新 head** 的 CI + reviews 全部跑完 → 再决定下一轮本地修 / push
+
+**顺序记忆**：`observe findings → fix locally early → wait until CI + review wave idle → push batch → wait new wave → repeat`。
+
+### 5.1 Loop（repeat until §5.5 exit）
+
+1. **Status** — PR mergeable？required CI？unresolved review threads？**任一 CI/AI review 是否仍在跑？**
+2. **Merge conflicts** — blocking 则在 integration 分支**本地**解决；**仅当 §5.1a push gate 满足时**再 push（意图冲突 → **Blocked**）
+3. **Reviews** — fetch unresolved threads；triage；dispatch **本地**修复（可在上一波次仍在跑时开工）
+4. **CI** — 失败项在 PR 范围内**本地**修复（可提前开工）；**不**在 CI 仍在跑时 push
+5. **Push** — 仅当 §5.1a 满足：无 in-flight CI，上一波 CI **与** reviews 均已跑完 → **一次** push 本批修复
+6. **Review fix hygiene**（每次因 review 而 push 后）：
+   - 在同 thread **comment**（改动 + 验证）
+   - **Resolve** when addressed
+7. Return to step 1（CI 结束后若出现 **新** reviews → 继续本地修，再等 idle 后 push）
+
+**Optional host helpers（command 层发现；非 `mstar-*` load order）**：
+
+| Priority | Helper | When |
+|----------|--------|------|
+| 1 | `babysit` or any `*-babysit` skill（first readable `SKILL.md`） | **Default prefer** — CI green + reviews resolved loop |
+| 2 | `greploop` | **Optional** — only when the **repo** uses Greptile / has `greploop` available; then run for Greptile **5/5** in addition to babysit/`*-babysit` (or fallback) gates |
+| 3 | neither | Command fallback = babysit-equivalent CI + reviews gates |
+
+When both babysit/`*-babysit` and `greploop` apply: **babysit/`*-babysit` first**（CI + reviews），then optional greploop for Greptile score. Discovery paths → host `commands/iteration-drive` / `iteration-loop` Phase 5.
+
+### 5.2 Phase 5 exit checklist（迭代交付完成）
+
+打印 **`## Phase 5 exit checklist`**；全 `[x]` 后方可宣称 **迭代交付完成**：
+
+- [ ] PR mergeable（无 blocking merge conflicts）
+- [ ] All **required** CI checks green on latest head
+- [ ] All review threads **resolved**（或用户书面 waive 特定 thread）
+- [ ] §5.1 review comment + resolve 已覆盖本轮所有 addressed feedback
+- [ ] Host todo `phase-5-pr-merge-ready` 可勾选
+
+PR **merge** 本身可仍由用户手动执行，除非 Assignment 明确授权 auto-merge。

package/harness-skills/mstar-iteration/references/phase5-helper-discovery.md

@@ -0,0 +1,24 @@
+# Phase 5 helper skill discovery（babysit / greploop）
+
+> Loaded by host `commands/iteration-drive` / `iteration-loop`（Phase 5 §5.0）before the first merge-ready loop pass. Search for optional **non-`mstar-*`** helper skills；first readable `SKILL.md` wins per name. Does **not** enter `mstar-*` load order.
+
+## Search paths（示例，按宿主扩展）
+
+| Skill | Search paths |
+|-------|--------------|
+| `babysit` / `*-babysit` | `skills/babysit/SKILL.md`；`skills/*-babysit/SKILL.md`；`~/.cursor/skills-cursor/babysit/SKILL.md`；`~/.cursor/skills-cursor/*-babysit/SKILL.md`；`~/.agents/skills/babysit/SKILL.md`；`~/.agents/skills/*-babysit/SKILL.md` |
+| `greploop`（optional） | `skills/greploop/SKILL.md`；`~/.cursor/skills-cursor/greploop/SKILL.md`；`~/.agents/skills/greploop/SKILL.md`；Codex plugin `skills/greploop/` — **only adopt when the repo uses Greptile / has greploop** |
+
+## Mode selection（babysit-first）
+
+| Priority | Condition | Read before loop | Primary done signal |
+|----------|-----------|------------------|---------------------|
+| 1 | `babysit` **or** any `*-babysit` found | that skill’s `SKILL.md`（prefer exact `babysit`, else first matching `*-babysit`） | Required CI **all green** + **all** review threads **resolved** |
+| 2 | `greploop` found **and** repo has Greptile/greploop | `greploop` SKILL.md | Greptile score **5/5** on this PR（**additive** — does not replace priority-1 gates） |
+| 3 | else neither babysit/`*-babysit` | —（command fallback = babysit 同级 CI + reviews 门禁） | Required CI **all green** + **all** review threads **resolved** |
+
+**Both babysit/`*-babysit` and greploop apply**: run **babysit/`*-babysit` first**（CI + reviews），then optional greploop until Greptile **5/5**（串行）。Do **not** prefer greploop over babysit。
+
+**No greploop / repo without Greptile**: skip greploop entirely — babysit/`*-babysit` or fallback only。
+
+**All modes** share the §5.2 exit checklist（CI + reviews + mergeable；Greptile 5/5 only when greploop mode ran or repo shows a Greptile score）。

package/harness-skills/mstar-phase-gates/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: mstar-phase-gates
-description: "Morning Star (启明星) Spec-Driven 双阶段门禁 —— Prepare（`specify → clarify → plan`）、Execute（`plan(locked) → tasks → implement`；多 task 默认 **`Execution mode: sdd`**）、意图门禁、长期目标优先、分批 roadmap 强制落盘、clarify 核心纪律、hotfix 压缩路径、可验证编辑、Phase Gate 最小证据。**必须**在 PM 判定 gate、首次 implement 派单前、产品/架构参与 Prepare、或解释为何不能跳过 plan/clarify 时 Read；`@project-manager` 每轮编排非 hotfix 任务必读；`@product-manager` / `@architect` 写规格与锁 plan 时必读 Prepare 节；实现角色 Read Execute 与 hotfix 例外即可。Task category 与 `quick` 禁豁免规则仍在 `mstar-harness-core`。实现行为见 `mstar-coding-behavior`；SDD 见 `mstar-sdd`；迭代级活动见 `mstar-iteration`。"
+description: "Morning Star Spec-Driven 双阶段门禁：Prepare（`specify → clarify → plan`）、Execute（`plan(locked) → tasks → implement`；多 task 默认 `Execution mode: sdd`）。覆盖意图门禁、长期目标优先、分批 roadmap 强制落盘、clarify 纪律、hotfix 压缩路径、可验证编辑、Phase Gate 最小证据。Read when judging Prepare/Execute gates, before first implement dispatch, when product/architect enter Prepare, or to justify not skipping plan/clarify. `@project-manager` 每轮非 hotfix 必读；`@product-manager`/`@architect` 锁规格/plan 必读 Prepare；实现角色读 Execute + hotfix 例外。`quick` 禁豁免规则在 `mstar-harness-core`。"
 ---
 
 ## Load order（必读顺序）

package/harness-skills/mstar-roles/references/_shared/leaf-executor-core.md

@@ -0,0 +1,46 @@
+# Leaf Executor Core (shared blocks)
+
+> Shared by all leaf-executor role references in `mstar-roles/references/`. Each role file references this for the identical Completion Report template, repo-write Git discipline, and plan/documentation rules. **Read `mstar-harness-core` first.** Role-specific NEVER rules, mission, and responsibilities stay in each role file — this file holds only the uniform blocks.
+
+## Completion Report
+
+Every leaf executor returns this template (only `**Agent**` and content fields change per role):
+
+```markdown
+## Completion Report
+
+**Agent**: {role_id}
+**Task**: ...
+**Status**: Done | Blocked | Partial
+**Scope Delivered**: ...
+**Artifacts**: ...
+**Validation**: ...
+**Issues/Risks**: ...
+**Plan Update**: ...
+**Handoff**: ...
+**Git**: ...
+```
+
+`{role_id}` = the role's own id (e.g. `fullstack-dev`, `frontend-dev`, `ops-engineer`, `qa-engineer`, `architect`, `product-manager`, `prompt-engineer`, `writing-specialist`, `qc-specialist*`).
+
+## Git NEVER (repo writes)
+
+Apply when the assignment writes tracked repo files:
+
+- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files — Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
+- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+
+## Plan & Documentation Rules
+
+- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` conventions from `mstar-plan-conventions`.
+- Update assigned task checkboxes and plan notes for your scope.
+- Do not mark full plan `Done` (only `project-manager` or `qa-engineer` per `mstar-harness-core`).
+
+## Non-Recursive Dispatch Rule (shared shape)
+
+All leaf executors share this hard rule (role-specific sibling lists stay in each role file):
+
+- Complete assigned work in this session.
+- Do not recursively dispatch sibling roles unless explicitly authorized via `Delegation: allowed (...)`.
+- `Execute as: {role_id}` is identity lock, not orchestration permission.
+- If required inputs are missing or prerequisites unmet, return `Blocked` to PM rather than inventing delegation.

package/harness-skills/mstar-roles/references/architect.md

@@ -105,30 +105,10 @@ Do not create your own branch strategy.
 ## Effort (agent-oriented)
 ```
 
-## Completion Report v2
+## Completion Report
 
-```markdown
-## Completion Report v2
-
-**Agent**: architect
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+Template (`{role_id}` = `architect`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
 ## Plan & Documentation Rules
 
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` conventions from `mstar-plan-conventions`.
-- Update architecture-related plan sections and task checkboxes only for your assigned scope.
-- Do not mark overall plan `Done`; that authority belongs to `project-manager` or `qa-engineer` only (`mstar-harness-core`).
-
-### Git NEVER (when you touched tracked repo files)
-
-- **NEVER** finish a task ID / coverage unit with saves but **no** `git commit` on the authorized `Working branch` when repo writes were required—Completion Report **Git** must show a real `git log -1 --oneline` (not `N/A`) unless the assignment declared read-only or user-exclusive commits.
-- **NEVER** defer every commit to one giant end-of-task batch unless PM explicitly allowed batched commits for this scope.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。**Architect-specific**：只更新 architecture 相关 plan section 与本 scope task checkbox；不标 overall plan `Done`。

package/harness-skills/mstar-roles/references/frontend-dev.md

@@ -61,30 +61,10 @@ If plan drift appears during implementation, request plan write-back before cont
 - Same-repo concurrent writes require worktree isolation
 - Do not self-decide branch pivots to default branch
 
-## Completion Report v2
-
-```markdown
-## Completion Report v2
-
-**Agent**: frontend-dev
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+## Completion Report
 
-## Plan & Documentation Rules
-
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` conventions from `mstar-plan-conventions`.
-- Update assigned task checkboxes and related plan sections.
-- Do not mark full plan `Done` (only `project-manager` or `qa-engineer` per `mstar-harness-core`).
+Template (`{role_id}` = `frontend-dev`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
-### Git NEVER (repo writes)
+## Plan & Documentation Rules
 
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。

package/harness-skills/mstar-roles/references/fullstack-dev-shared.md

@@ -80,30 +80,10 @@ If plan drift appears, request plan update before continuing.
 3. Test implementation for assigned scope
 4. Self-verification and evidence generation
 
-## Completion Report v2
-
-```markdown
-## Completion Report v2
-
-**Agent**: {role_id}
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+## Completion Report
 
-## Plan & Documentation Rules
-
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` conventions from `mstar-plan-conventions`.
-- Update assigned task checkboxes and plan notes for your scope.
-- Do not mark full plan `Done` (only `project-manager` or `qa-engineer` per `mstar-harness-core`).
+Template (fill `{role_id}` = `{role_id}`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
-### Git NEVER (repo writes)
+## Plan & Documentation Rules
 
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。

package/harness-skills/mstar-roles/references/ops-engineer.md

@@ -69,30 +69,10 @@ When assignment is marked `high-risk`:
 ## Monitoring Checks
 ```
 
-## Completion Report v2
+## Completion Report
 
-```markdown
-## Completion Report v2
-
-**Agent**: ops-engineer
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+Template (`{role_id}` = `ops-engineer`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
 ## Plan & Documentation Rules
 
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` from `mstar-plan-conventions`.
-- Update assigned plan tasks and notes.
-- Do not mark full plan `Done`.
-
-### Git NEVER (repo writes)
-
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。

package/harness-skills/mstar-roles/references/product-manager.md

@@ -98,30 +98,10 @@ If writing files to business repo, use only PM-assigned `Working branch` / `Bran
 
 - **NEVER** embed human calendar estimates (person-days, FTE, “waiting for review X days”) inside **Effort (agent-oriented)** fields; keep agent-only sizing per `mstar-plan-conventions` `references/effort-estimation.md`.
 
-## Completion Report v2
+## Completion Report
 
-```markdown
-## Completion Report v2
-
-**Agent**: product-manager
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+Template (`{role_id}` = `product-manager`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
 ## Plan & Documentation Rules
 
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` from `mstar-plan-conventions`.
-- Update assigned plan sections and task checkboxes.
-- Do not set full plan to `Done`.
-
-### Git NEVER (repo writes)
-
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。**Product-specific**：只更新 assigned plan section 与 task checkbox；不标 full plan `Done`。

package/harness-skills/mstar-roles/references/project-manager/dispatch-and-assignment.md

@@ -27,7 +27,7 @@ For assignees (non-PM):
 - **NEVER** assume exposed `Task` / subagent menus imply you may call them; **tool availability ≠ delegation authorization**.
 - **NEVER** execute parallel-agent dispatch as a leaf assignee; dispatch is **PM-orchestration-only** (`mstar-dispatch-gates`).
 - **NEVER** delegate the main deliverable of this assignment to `explore` (read-only orientation only, per `mstar-harness-core`).
-- **NEVER** claim `Done` / pass in **Completion Report v2** without the commands, logs, or artifacts explicitly required by the assignment’s **Evidence Required** section (see `mstar-harness-core` evidence gates).
+- **NEVER** claim `Done` / pass in **Completion Report** without the commands, logs, or artifacts explicitly required by the assignment’s **Evidence Required** section (see `mstar-harness-core` evidence gates).
 
 ## Assignment Template (Canonical)
 
@@ -103,7 +103,7 @@ The **`**You are a leaf executor. You MUST NOT:**`** section (previously just pr
 **PM Task Board coverage**: <task ids>
 **Roadmap / deferred scope**: <required when staged, partial, or temporary; otherwise N/A>
 **Task**: <concrete work aligned with coverage>
-**Checkpoint Comment Rule**: commit -> Completion Report v2 -> PM Status Update -> next batch
+**Checkpoint Comment Rule**: commit -> Completion Report -> PM Status Update -> next batch
 **Why batching is safe**: <required when batching >=3 IDs>
 **Scope**:
 - In: ...
@@ -124,7 +124,7 @@ The **`**You are a leaf executor. You MUST NOT:**`** section (previously just pr
 - `explore` is read-only orientation only
 - Tool availability ≠ delegation authorization
 **Plan Path**: absolute `<control_worktree_path>/{PLAN_DIR}/...` when L1 lease gate active | `{PLAN_DIR}/...` when waived / single checkout | N/A
-**Report Format**: Completion Report v2
+**Report Format**: Completion Report
 **Execution evidence**: <RCA/test-first/review feedback/evidence expectations for the assignee, if applicable>
 ```
 
@@ -140,10 +140,10 @@ When `metadata.control_worktree_path` is set and worktree mode is **not** waived
 | **`SDD dir`** | Absolute under control harness; run `sdd-workspace` with `MSTAR_CONTROL_ROOT=<control_worktree_path>` when cwd is the feature tree |
 
 Do **not** waive worktree because default-gitignored `plans/` are missing under the feature checkout — see `mstar-branch-worktree` 「Harness path SSOT under default gitignore」.
-## Completion Report v2 Template
+## Completion Report Template
 
 ```markdown
-## Completion Report v2
+## Completion Report
 
 **Agent**: <role-id>
 **Task**: ...

package/harness-skills/mstar-roles/references/project-manager.md

@@ -138,18 +138,9 @@ If any item below matches, fix the dispatch/plan state or mark `Blocked`—do **
 
 ---
 
-## Phase Gates (Minimal Tree)
+## Phase Gates
 
-Before first implement dispatch (non-hotfix):
-
-1. `specify` done
-2. `clarify` done (no unresolved high-impact ambiguity)
-3. `plan` done and referenceable
-4. `tasks` + PM Task Board ready for non-trivial plan
-5. Roadmap written when delivery is split, deferred, or temporary
-6. New constraints discovered are written back to plan first
-
-If any fail -> do not dispatch implement.
+完整 Prepare/Execute 门禁树（`specify → clarify → plan` → `plan(locked) → tasks → implement`）、意图门禁、hotfix 压缩路径、Phase Gate 最小证据 → **`mstar-phase-gates`**。PM 首次 implement dispatch（非 hotfix）前须确认 phase-gates 全绿：specify/clarify/plan 完成、tasks + PM Task Board ready、split/deferred/temporary 已写 roadmap、新约束已回写 plan。任一未过 → 不 dispatch implement。
 
 ### PM entry sessions
 
@@ -252,7 +243,7 @@ Before first implement dispatch:
 - If delivery spans batches, include the full roadmap: batch order, deferred scope, dependencies, owner/trigger, and final Done definition
 - Every implement Assignment declares `PM Task Board coverage`
 - Default batch size 1-2 IDs; `>=3` requires `Why batching is safe`
-- Completion rhythm: commit -> Completion Report v2 -> PM Status Update -> next dispatch
+- Completion rhythm: commit -> Completion Report -> PM Status Update -> next dispatch
 
 ---
 
@@ -281,7 +272,7 @@ Use canonical templates from:
 `references/project-manager/dispatch-and-assignment.md`
 
 - `## Assignment`
-- `## Completion Report v2`
+- `## Completion Report`
 - `## Status Update`
 
 Minimum invariants:

package/harness-skills/mstar-roles/references/prompt-engineer.md

@@ -62,29 +62,10 @@ When creating a new skill, making a major skill rewrite, changing frontmatter `d
 - Redundancy removed before adding new constraints
 - At least one replayable scenario exists for regression check
 
-## Completion Report v2
-
-```markdown
-## Completion Report v2
-
-**Agent**: prompt-engineer
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: ...
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+## Completion Report
 
-## Plan & Documentation Rules
-
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` conventions from `mstar-plan-conventions`.
-- Keep role text concise; move reusable long-form guidance into shared `mstar-*` skills.
+Template (`{role_id}` = `prompt-engineer`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
-### Git NEVER (repo writes)
+## Plan & Documentation Rules
 
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must list real commits unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。**Prompt-engineer-specific**：role text 保持精简；可复用长文 guidance 移入 shared `mstar-*` skills。

package/harness-skills/mstar-roles/references/qa-engineer.md

@@ -65,32 +65,13 @@ When Assignment provides a report path, write report-only output under `{SDD_DIR
 ## Recommended owners
 ```
 
-## Completion Report v2
+## Completion Report
 
-```markdown
-## Completion Report v2
-
-**Agent**: qa-engineer
-**Task**: ...
-**Status**: Done | Blocked | Partial
-**Scope Delivered**: ...
-**Artifacts**: ...
-**Validation**: <AC mapping; reused L1/CI/prior-QA evidence vs new runs; QC findings addressed>
-**Issues/Risks**: ...
-**Plan Update**: ...
-**Handoff**: ...
-**Git**: ...
-```
+Template (`{role_id}` = `qa-engineer`) → **`references/_shared/leaf-executor-core.md`**「Completion Report」。
 
 ## Plan & Residual Rules
 
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` from `mstar-plan-conventions`; residual lifecycle from `mstar-plan-artifacts`.
-- QA and PM are the only roles allowed to finalize plan `Done`.
-
-### Git NEVER (repo writes)
-
-- **NEVER** skip per–task-ID commits on the authorized `Working branch` when you wrote tracked files—Completion Report **Git** must be a real `git log -1 --oneline` unless read-only was assigned.
-- **NEVER** batch everything into a single closing commit unless PM explicitly allowed it.
+Repo-write Git discipline + plan/documentation rules → **`references/_shared/leaf-executor-core.md`**（「Git NEVER (repo writes)」+「Plan & Documentation Rules」）。**QA-specific**：QA 和 PM 是唯一可终结 plan `Done` 的角色；residual lifecycle 来自 `mstar-plan-artifacts`。
 
 ## Detailed References Index