@mstar-harness/opencode 0.3.2 → 0.4.0

package/harness-skills/mstar-review-qc/SKILL.md

@@ -5,7 +5,7 @@ description: Morning Star (启明星) QC 审查基线与 QA 验证契约 ——
 
 ## Load order（必读顺序）
 
-**在同一会话或任务中首次 Read 本 skill 时：必须先 Read `mstar-harness-core` skill（SKILL.md，以及 `mstar-harness-core/references/branch-and-worktree.md` 中与 `Review cwd` / `Working branch` / `Review range` 相关的章节）。** 本 skill 只定义 QC/QA **工作流与报告形态**；**谁可派 subagent**、**三审字段逐字对齐**、**同仓 worktree 与单一待审 `HEAD`** 等不变量以 **`mstar-harness-core`** 为准。冲突时 **以 `mstar-harness-core` 为准**。
+**在同一会话或任务中首次 Read 本 skill 时：必须先 Read `mstar-harness-core` skill（SKILL.md），并按需 Read **`mstar-branch-worktree`**（`Review cwd` / `Working branch` / `Review range`）。** 本 skill 只定义 QC/QA **工作流与报告形态**；派发与三审同消息规则见 **`mstar-dispatch-gates`**；**同仓 worktree 与单一待审 `HEAD`** 以 **`mstar-branch-worktree`** 为准。冲突时 **以 `mstar-harness-core` 为准**。
 
 **摘要**：`mstar-harness-core` — QC-QA 检出与并行门禁；本 skill — 审查清单、报告模板、verdict 与 residual 留档契约。
 
@@ -16,7 +16,7 @@ description: Morning Star (启明星) QC 审查基线与 QA 验证契约 ——
 ## 分派时机（与 plan / batch 对齐）
 
 - **默认**：`@project-manager` 在 **该 plan 的实现范围已由 dev team 全部交付**、准备进入预合并门禁时，分派完整 QC 三审。**同一 `plan_id` 下多 batch 滚动实现时，不默认每 batch 跑一轮全套三审**（避免 `reports/<plan-id>/` 多套报告与范围串线）；中间阶段靠自检与 PM 协调，**显式增量三审**须在 Assignment 写明（见 `mstar-plan-conventions` `references/plan-files-and-reports.md`「QC 三审触发时机」）。
-- **同仓多 worktree 并行开发**：一轮 QC 三审仍只对应 **一套** `Review cwd` + `Working branch` + `Review range` / `Diff basis`（三票逐字相同）。若成果曾分布在 **未合并** 的多条分支或多个 `HEAD`，PM **须先**完成 Git 归并到 **单一**待审分支再派 QC；**不得**指望 reviewer 自行在多个开发 worktree 之间拼凑审查范围。**推荐** PM 在并行开发开始前已建立 **plan 集成分支** 作为各轨 merge 靶（见 `mstar-harness-core` `references/branch-and-worktree.md` 同节 **「推荐默认编排：先建 plan 集成分支，再挂各 worktree」**）。细则见 `mstar-harness-core` `references/branch-and-worktree.md` **「多 worktree 并行开发与 QC / QA 的门禁衔接」**。
+- **同仓多 worktree 并行开发**：一轮 QC 三审仍只对应 **一套** `Review cwd` + `Working branch` + `Review range` / `Diff basis`（三票逐字相同）。若成果曾分布在 **未合并** 的多条分支或多个 `HEAD`，PM **须先**完成 Git 归并到 **单一**待审分支再派 QC；**不得**指望 reviewer 自行在多个开发 worktree 之间拼凑审查范围。**推荐** PM 在并行开发开始前已建立 **plan 集成分支** 作为各轨 merge 靶（见 `mstar-branch-worktree` 同节 **「推荐默认编排：先建 plan 集成分支，再挂各 worktree」**）。细则见 `mstar-branch-worktree` **「多 worktree 并行开发与 QC / QA 的门禁衔接」**。
 - **Request Changes 后**：再审为**新波次**，落盘用新文件名（如 `-rev2` / `wave2-`），PM 汇总时标明有效波次。
 
 ## 三审身份与模型独立性门禁（PM 强制）
@@ -35,17 +35,17 @@ description: Morning Star (启明星) QC 审查基线与 QA 验证契约 ——
 - 行为回归是否已被显式确认
 - 阻塞级安全或数据一致性风险是否已被识别
 - 变更行为的测试覆盖是否充分
-- 若启用功能分支策略：变更分支与 Assignment 的 **`Working branch` / `Branch policy`** 是否一致；且审查在 Assignment 写明的 **`Review cwd` / `Worktree path`**（feature 检出上下文）上执行，而非未核对的默认 cwd；若曾同仓多流并行开发，还须核对 **`HEAD` 是否已含本 scope 全部待审提交**（见 `mstar-harness-core` `references/branch-and-worktree.md` **「多 worktree 并行开发与 QC / QA 的门禁衔接」**）
+- 若启用功能分支策略：变更分支与 Assignment 的 **`Working branch` / `Branch policy`** 是否一致；且审查在 Assignment 写明的 **`Review cwd` / `Worktree path`**（feature 检出上下文）上执行，而非未核对的默认 cwd；若曾同仓多流并行开发，还须核对 **`HEAD` 是否已含本 scope 全部待审提交**（见 `mstar-branch-worktree` **「多 worktree 并行开发与 QC / QA 的门禁衔接」**）
 - **三审对齐**：Assignment 已写明 **`plan_id`**（或 `N/A` + **Feature / scope label**）与 **`Review range` / `Diff basis`**；报告 **Scope** 须 **逐字回写** PM 下发的这两字段，**禁止**与同伴 reviewer 使用不同范围或不同 plan 锚点
 
 ## 标准审查工作流
 
-1. **对齐待审检出（feature 上下文）**：在动手审查前，按 Assignment 进入 **`Review cwd` / `Worktree path`**（若已写明）；执行 `git rev-parse --show-toplevel`、`git branch --show-current`（或等价）确认 **当前目录即待审 feature 的检出**，且分支与 **`Working branch`** 一致。核对 Assignment 中的 **`plan_id`**（或 `N/A` + **Feature / scope label**）与 **`Review range` / `Diff basis`** 已填写；缺任一项应向 `@project-manager` 申请补全，**禁止**自行假设审查范围。后续 **`git diff` / `git log`** 必须 **按 `Review range` / `Diff basis` 可复现地覆盖待审变更**（若与本地 `HEAD` 不一致，先回报 `Blocked`）。若 Assignment 未写 `Review cwd` / `Worktree path` 但开发回报了实现用 worktree，应先向 `@project-manager` 申请补全 Assignment，**禁止**在未核对路径与分支的情况下假设在审 `main` 或其它提交。细则见 `mstar-harness-core` `references/branch-and-worktree.md`「QC 三审、QA 验证与 feature 检出上下文」。**`@qa-engineer`** 对同一 feature 做验证时须使用 Assignment 中 **同一 `Review cwd` / `Worktree path`** 及 **同一 `plan_id` + `Review range` / `Diff basis`**（见该节 QA 条款）。
+1. **对齐待审检出（feature 上下文）**：在动手审查前，按 Assignment 进入 **`Review cwd` / `Worktree path`**（若已写明）；执行 `git rev-parse --show-toplevel`、`git branch --show-current`（或等价）确认 **当前目录即待审 feature 的检出**，且分支与 **`Working branch`** 一致。核对 Assignment 中的 **`plan_id`**（或 `N/A` + **Feature / scope label**）与 **`Review range` / `Diff basis`** 已填写；缺任一项应向 `@project-manager` 申请补全，**禁止**自行假设审查范围。后续 **`git diff` / `git log`** 必须 **按 `Review range` / `Diff basis` 可复现地覆盖待审变更**（若与本地 `HEAD` 不一致，先回报 `Blocked`）。若 Assignment 未写 `Review cwd` / `Worktree path` 但开发回报了实现用 worktree，应先向 `@project-manager` 申请补全 Assignment，**禁止**在未核对路径与分支的情况下假设在审 `main` 或其它提交。细则见 `mstar-branch-worktree`「QC 三审、QA 验证与 feature 检出上下文」。**`@qa-engineer`** 对同一 feature 做验证时须使用 Assignment 中 **同一 `Review cwd` / `Worktree path`** 及 **同一 `plan_id` + `Review range` / `Diff basis`**（见该节 QA 条款）。
 2. 用 `git diff` / `git show` 与内置 `glob` / `grep` / `read` 构建变更上下文；仅在跨模块或陌生路径需要快速导航时**可选**短调用 `@explore`。**禁止**把审查步骤、结论或清单执行外包给 `@explore`（见 `mstar-harness-core` SKILL.md「内置 `@explore` 能力边界」）。
 3. 检查 `git diff` 及相关历史；若 Assignment 启用功能分支策略，再次核对当前分支与 **`Working branch` / `Branch policy`** 一致（无授权则不应在默认分支上堆功能改动）。
 4. 运行对应语言的 lint 和静态分析。
 5. 按本 skill 审查清单进行人工审查。
-6. 产出带严重等级和证据的结构化发现。PM 将条目写入 **`{HARNESS_DIR}/status.json`** 根级 **`residual_findings[<plan-id>][]`**（canonical 见 `mstar-plan-conventions` **SKILL.md** 开篇）时，其 **`severity`** **仅允许** `mstar-plan-conventions` `references/status-and-residuals.md` 中 **「Residual findings：severity（SSOT，机器字段）」** 的枚举与映射表（报告小节 **Critical / Warning / Suggestion** → JSON 档位）；**不要**把报告标题字符串直接当作 `severity`。
+6. 产出带严重等级和证据的结构化发现。PM 将条目写入 **`{HARNESS_DIR}/status.json`** 根级 **`residual_findings[<plan-id>][]`**（canonical 见 `mstar-plan-artifacts` **SKILL.md** 开篇）时，其 **`severity`** **仅允许** `mstar-plan-artifacts` `references/status-and-residuals.md` 中 **「Residual findings：severity（SSOT，机器字段）」** 的枚举与映射表（报告小节 **Critical / Warning / Suggestion** → JSON 档位）；**不要**把报告标题字符串直接当作 `severity`。
 7. **报告入库（Git）**：将 QC 报告 **`.md`** 写入 `{PLAN_DIR}/reports/<plan-id>/` 后，在业务仓根执行 **`git add`**（**仅**本次报告路径）与 **`git commit`**，并在 Completion Report 给出 **真实** `git log -1 --oneline`。**禁止**仅完成 Write/Edit 而不提交（权限与例外见各 `agents/qc-specialist*.md`）。
 8. **禁止收尾套话**：报告与 commit 成功后，**不得**向终端用户追问「是否要交付报告」「下一步是否通知 PM」等；须在同一轮内输出完整 **Completion Report v2** 结束（见各 `agents/qc-specialist*.md` **「回合结束方式」**）。
 
@@ -82,7 +82,7 @@ description: Morning Star (启明星) QC 审查基线与 QA 验证契约 ——
 
 ## 标准输出模板
 
-落盘到 **`{PLAN_DIR}/reports/<plan-id>/<plan-id>-qc#.md`** 时：文件**最上方**须为 YAML frontmatter（`report_kind`、`reviewer`、`reviewer_index`、`plan_id`、`verdict`、`generated_at` 等，见 `agents/qc-specialist*.md`），**紧接着**再写下列 Markdown 正文（可将 **Reviewer Metadata** 与 frontmatter 对齐，避免矛盾）。**Findings 下三节标题**（Critical / Warning / Suggestion）为**人类可读分类**；PM 将条目写入根级 **`residual_findings`**（见 `mstar-plan-conventions` **SKILL.md** 开篇）时的 **`severity` 机器字段**以 `mstar-plan-conventions` `references/status-and-residuals.md` **「Residual findings：severity（SSOT，机器字段）」** 为准。
+落盘到 **`{PLAN_DIR}/reports/<plan-id>/<plan-id>-qc#.md`** 时：文件**最上方**须为 YAML frontmatter（`report_kind`、`reviewer`、`reviewer_index`、`plan_id`、`verdict`、`generated_at` 等，见 `agents/qc-specialist*.md`），**紧接着**再写下列 Markdown 正文（可将 **Reviewer Metadata** 与 frontmatter 对齐，避免矛盾）。**Findings 下三节标题**（Critical / Warning / Suggestion）为**人类可读分类**；PM 将条目写入根级 **`residual_findings`**（见 `mstar-plan-artifacts` **SKILL.md** 开篇）时的 **`severity` 机器字段**以 `mstar-plan-artifacts/references/status-and-residuals.md` **「Residual findings：severity（SSOT，机器字段）」** 为准。
 
 ```markdown
 # Code Review Report
@@ -155,8 +155,8 @@ description: Morning Star (启明星) QC 审查基线与 QA 验证契约 ——
 
 ## Residual Findings 留档门禁
 
-- 当阻断项（`Critical`）修复后仍有未关闭 **Warning / Suggestion** 类问题或技术债，不得仅在对话中口头说明，必须留档；登记 **`severity`** 时遵守 `mstar-plan-conventions` `references/status-and-residuals.md` **「Residual findings：severity（SSOT，机器字段）」**。
-- **启用 plan 管理且存在 `plan-id` 时**：**待跟踪（open）** residual 的 **SSOT** 为 **`{HARNESS_DIR}/status.json`** 根级 **`residual_findings[<plan-id>]`**（与 `plans` 平级；canonical 见 `mstar-plan-conventions` **SKILL.md** 开篇）；PM 在 consolidated 决策中分配 **稳定 `id`（R1…）** 后须**写入该数组**（`source` 指回 `-qc*.md` 等）。**已关闭**条目归档至 **`{HARNESS_DIR}/archived/residuals/<plan-id>.json`**（字段与严重等级见 `mstar-plan-conventions`），与 **`{PLAN_DIR}/reports/<plan-id>/`** 交叉引用。
+- 当阻断项（`Critical`）修复后仍有未关闭 **Warning / Suggestion** 类问题或技术债，不得仅在对话中口头说明，必须留档；登记 **`severity`** 时遵守 `mstar-plan-artifacts` `references/status-and-residuals.md` **「Residual findings：severity（SSOT，机器字段）」**。
+- **启用 plan 管理且存在 `plan-id` 时**：**待跟踪（open）** residual 的 **SSOT** 为 **`{HARNESS_DIR}/status.json`** 根级 **`residual_findings[<plan-id>]`**（与 `plans` 平级；canonical 见 `mstar-plan-artifacts` **SKILL.md** 开篇）；PM 在 consolidated 决策中分配 **稳定 `id`（R1…）** 后须**写入该数组**（`source` 指回 `-qc*.md` 等）。**已关闭**条目归档至 **`{HARNESS_DIR}/archived/residuals/<plan-id>.json`**（字段与严重等级见 `mstar-plan-conventions`），与 **`{PLAN_DIR}/reports/<plan-id>/`** 交叉引用。
 - **主 plan**：仅作**人类可读索引**（可选）——复述 `id` 与摘要并指向 **`{HARNESS_DIR}/status.json`**；**不得**作为与 SSOT 脱钩的唯一登记处（见 `mstar-plan-conventions` `references/plan-files-and-reports.md`「Residual findings：权威在哪」）。
 - 可选：`@project-manager` 维护 **`metadata.tech_debt_summary`** 作为跨 plan 聚合视图（与 `residual_findings` 互补，见 `mstar-plan-conventions`）。
 - 若无 `{PLAN_DIR}`：写入项目认可的进度载体或根级 `notes`（结构化条目），仍须含 `id` 与跟踪字段。

package/harness-skills/mstar-roles/SKILL.md

@@ -1,19 +1,19 @@
 ---
 name: mstar-roles
-description: Morning Star role prompt hub. This skill is the single entry for role-specific behavior text: `agents/*.md` remain lightweight shells (frontmatter + role parameters), while full role behavior lives in `references/*.md`. Always load this skill for any Morning Star role (`project-manager`, `product-manager`, `architect`, `fullstack-dev`, `fullstack-dev-2`, `frontend-dev`, `qa-engineer`, `qc-specialist*`, `ops-engineer`, `writing-specialist`, `prompt-engineer`) before execution.
+description: Morning Star role prompt hub — `agents/*.md` shells plus full behavior in `references/*.md`, each with a **Required Skill Dependencies** list (which `mstar-*` topic skills to load after `mstar-harness-core`). Always load for any Morning Star role (`project-manager`, `product-manager`, `architect`, `fullstack-dev`, `fullstack-dev-2`, `frontend-dev`, `qa-engineer`, `qc-specialist*`, `ops-engineer`, `writing-specialist`, `prompt-engineer`). Cross-role summary table in this SKILL.md; per-role lists are authoritative for that role's session.
 ---
 
 ## Load Order (Required)
 
 When a Morning Star role starts work in a session:
 
-1. Read `mstar-harness-core` first (SKILL.md + task-relevant references).
+1. Read `mstar-harness-core` first (SKILL.md), then **only** the topic `mstar-*` skills required for this role/task (see matrix below — do not read all topic skills by default).
 2. Read this `mstar-roles` skill.
 3. Resolve role mapping and parameter table below.
-4. Read the corresponding `references/<role>.md` file.
+4. Read the corresponding `references/<role>.md` file — each role file lists **Required Skill Dependencies** for that role (canonical per-role load list).
 5. Expand placeholders from role parameters before execution.
 
-If any conflict appears, `mstar-harness-core` remains the authoritative source for lifecycle, gates, routing, and invariants.
+If any conflict appears, `mstar-harness-core` remains the authoritative source for lifecycle, gates, routing, and invariants. The table below is the cross-role summary; when a role file lists different **on-demand** skills, follow the role file for that session.
 
 ## Role Reference Mapping
 
@@ -35,16 +35,32 @@ If any conflict appears, `mstar-harness-core` remains the authoritative source f
 
 ## Shared Skill Dependencies
 
-Treat these as baseline dependencies **where the role touches implementation, review, verification, or ops execution** (see `mstar-harness-core` load contract).
+Treat these as baseline dependencies **where the role touches implementation, review, verification, or ops execution** (see `mstar-harness-core` load contract). Load **on demand**, not as a fixed bundle.
 
 | Skill | Use when task involves |
 | --- | --- |
-| `mstar-harness-core` | State machine, phase gates, task category, branch/worktree policy, dispatch anti-recursion |
-| `mstar-plan-conventions` | `{HARNESS_DIR}` / `{PLAN_DIR}`, `status.json`, residual lifecycle, plan metadata |
-| `mstar-review-qc` | QC workflow, review template, verdict rules, high-risk checks |
-| `mstar-coding-behavior` | Think-before-coding, simplicity, surgical changes, goal-driven execution (**not** required for `project-manager` orchestration-only work) |
-| `mstar-superpowers-align` | Superpowers alignment, dispatching/worktree constraints, delegation compatibility |
-| `mstar-host-opencode` / `mstar-host-cursor` | Host-specific behavior and capabilities (match the active host) |
+| `mstar-harness-core` | **Always** (non-trivial work): entry, state machine, Task category, explore boundary, skill index |
+| `mstar-phase-gates` | Prepare/Execute gates, clarify, hotfix path, intention gate |
+| `mstar-dispatch-gates` | PM dispatch; **all leaf executors** before any Task/subagent call |
+| `mstar-branch-worktree` | Git write, parallel worktrees, QC/QA checkout fields |
+| `mstar-plan-conventions` | `{HARNESS_DIR}` discovery, init, Spec branch naming, `writing-plans` path |
+| `mstar-plan-artifacts` | Main plan, `reports/`, `status.json`, residual, knowledge/iteration, Done compaction |
+| `mstar-review-qc` | QC workflow, template, verdict, high-risk checks |
+| `mstar-coding-behavior` | Implementation/debug/refactor (**not** PM orchestration-only) |
+| `mstar-superpowers-align` | Superpowers plugin on; Assignment `Superpowers` lines |
+| `mstar-host-opencode` / `mstar-host-cursor` | Host-specific behavior (match active host) |
+
+### Role → typical topic skills (after `mstar-harness-core`)
+
+| Role | Typical adds |
+| --- | --- |
+| `project-manager` | `mstar-dispatch-gates`, `mstar-phase-gates`, `mstar-plan-conventions`, `mstar-superpowers-align`, `mstar-roles` ref; + `mstar-review-qc` before QC; + `mstar-branch-worktree` / `mstar-plan-artifacts` as the round requires |
+| `fullstack-dev*`, `frontend-dev` | `mstar-coding-behavior`, `mstar-dispatch-gates`, `mstar-branch-worktree` (if repo writes); plan path symbols from `mstar-plan-conventions` (minimal) |
+| `qc-specialist*` | `mstar-review-qc`, `mstar-branch-worktree`, `mstar-plan-artifacts` (report paths) |
+| `qa-engineer` | `mstar-review-qc`, `mstar-branch-worktree`, `mstar-plan-artifacts` (closing R#) |
+| `architect`, `product-manager` | `mstar-phase-gates` (Prepare), `mstar-plan-artifacts` (knowledge/specs) |
+| `ops-engineer` | `mstar-coding-behavior`, `mstar-branch-worktree` |
+| `prompt-engineer` | All topic skills when editing harness text |
 
 Use skill names (not absolute filesystem paths) in role references.
 

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

@@ -1,12 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `architect`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-dispatch-gates`, `mstar-phase-gates` (Prepare: specify/clarify/plan), `mstar-plan-conventions` (`{PLAN_DIR}`, `writing-plans` path).
+
+**Typically:** `mstar-plan-artifacts` (knowledge/specs/ADR placement); `mstar-coding-behavior` (surgical doc edits); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-branch-worktree` (when committing architecture docs to the business repo).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -1,12 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `frontend-dev`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-coding-behavior`, `mstar-dispatch-gates`.
+
+**Typically:** `mstar-plan-conventions` (paths + spec metadata); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-branch-worktree` (repo writes); `mstar-phase-gates` (Execute / hotfix when referenced in assignment).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -10,11 +10,15 @@ Behavior is shared; track identity is parameterized.
 
 ## Required Skill Dependencies
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Hub matrix:** `mstar-roles` SKILL.md.
+
+**Always:** `mstar-harness-core`, `mstar-coding-behavior`, `mstar-dispatch-gates` (leaf anti-recursion before any Task/subagent).
+
+**Typically:** `mstar-plan-conventions` (path symbols + `metadata.primary_spec` / `spec_refs`); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-branch-worktree` (repo writes, `Working branch`); `mstar-phase-gates` (Execute / hotfix sections when gate fields are in the assignment).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -1,12 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `ops-engineer`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-review-qc` (especially high-risk operations checklist)
-- `mstar-coding-behavior`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-coding-behavior`, `mstar-dispatch-gates`, `mstar-review-qc` (high-risk ops checklist), `mstar-branch-worktree` (repo writes, production-touching branches).
+
+**Typically:** `mstar-plan-conventions` (paths); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-phase-gates` (hotfix compressed path when assignment says hotfix).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -1,12 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `product-manager`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-dispatch-gates`, `mstar-phase-gates` (Prepare / clarify), `mstar-plan-conventions` (`{PLAN_DIR}`, `writing-plans` path).
+
+**Typically:** `mstar-plan-artifacts` (specs, knowledge index); `mstar-coding-behavior` (surgical doc edits); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-branch-worktree` (when committing product docs to the business repo).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -19,7 +19,7 @@ Use this reference when PM is dispatching QC, consolidating review verdicts, or
 ## QC / Residual NEVER (PM)
 
 - **NEVER** consolidate tri-review into `Approve` when any QC report’s `plan_id`, `Review range / Diff basis`, `Review cwd / Worktree path`, or `Working branch` **differs** from the PM Assignment text (character-level mismatch).
-- **NEVER** register or rewrite residual `severity` values outside the machine enum in `mstar-plan-conventions`.
+- **NEVER** register or rewrite residual `severity` values outside the machine enum in `mstar-plan-artifacts`.
 - **NEVER** drop residual tracking to chat-only when `Approve with residuals` applies—canonical open list lives under `{HARNESS_DIR}/status.json` `residual_findings[<plan-id>]`.
 - **NEVER** archive or delete open residual rows from `status.json` without the documented close + `{HARNESS_DIR}/archived/residuals/` workflow.
 - **NEVER** treat “two of three QC reports arrived” as sufficient for a parallel tri-review wave—missing reviewer => `Blocked` or explicit PM decision, not silent `Approve`.
@@ -47,7 +47,7 @@ Use this reference when PM is dispatching QC, consolidating review verdicts, or
 When blocking issues are fixed but non-blocking warnings/suggestions remain:
 
 - Must register residual findings (do not leave as chat-only).
-- Severity enum must follow `mstar-plan-conventions` SSOT.
+- Severity enum must follow `mstar-plan-artifacts` SSOT.
 - Canonical store: `{HARNESS_DIR}/status.json` -> root `residual_findings[<plan-id>]`.
 - Optional mirrored index in main plan is allowed, but never replace canonical entry.
 

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

@@ -2,11 +2,17 @@
 
 Before any non-trivial PM action, read in order:
 
-1. `mstar-harness-core` skill (state machine + phase gates, SSOT)
-2. Current host adapter skill (OpenCode: `mstar-host-opencode`; Cursor: `mstar-host-cursor`)
-3. `mstar-plan-conventions` skill
-4. `mstar-superpowers-align` skill (when Superpowers enabled)
-5. `mstar-review-qc` skill (before QC dispatch)
+1. `mstar-harness-core` (entry, state machine, Task category, skill index)
+2. `mstar-dispatch-gates` + `mstar-phase-gates` (dispatch + Prepare/Execute gates)
+3. Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor)
+4. `mstar-plan-conventions` (path discovery, init, Spec branch summary)
+5. `mstar-superpowers-align` (when Superpowers plugin is enabled)
+6. `mstar-review-qc` (same coordination round, **before** any QC dispatch)
+7. **On demand:** `mstar-branch-worktree` (parallel implement, QC/QA checkout); `mstar-plan-artifacts` (`status.json`, R#); `mstar-plan-artifacts` (InReview waves, reports naming)
+
+**Not required:** `mstar-coding-behavior` (orchestration-only PM work).
+
+Full cross-role matrix: `mstar-roles` SKILL.md.
 
 This file is a compact PM orchestrator shell.
 Detailed procedures are moved to `references/project-manager/*.md`.
@@ -102,10 +108,10 @@ If any item below matches, fix the dispatch/plan state or mark `Blocked`—do **
 - **NEVER** finish a dispatch turn with Assignment Markdown visible but **without** the matching host invokes when assignments were meant to start work (`dispatch incomplete` / paste-only failure).
 - **NEVER** split a required **parallel batch** of `N >= 2` invokes across multiple assistant messages when the host requires a single dispatch turn with all `N` calls.
 - **NEVER** register residuals only inside the plan narrative while skipping root `{HARNESS_DIR}/status.json` `residual_findings[<plan_id>]` when plan conventions require the SSOT field.
-- **NEVER** write non-canonical residual `severity` strings—use only the machine enum from `mstar-plan-conventions`.
+- **NEVER** write non-canonical residual `severity` strings—use only the machine enum from `mstar-plan-artifacts`.
 - **NEVER** use `Task category: quick` to skip mandatory Prepare (`specify → clarify → plan`) for substantive work (`mstar-harness-core` hard rule).
 - **NEVER** omit `Superpowers` hooks when the plugin is enabled and the batch truly requires parallel dev (`dispatching-parallel-agents`) or same-repo multi-writer concurrency (`using-git-worktrees`) per `mstar-superpowers-align`.
-- **NEVER** point QC at a single dev worktree/`Review cwd` that cannot contain **all** claimed changes from parallel tracks until Git integration lands on one `Working branch` `HEAD` (`mstar-harness-core` QC/QA alignment).
+- **NEVER** point QC at a single dev worktree/`Review cwd` that cannot contain **all** claimed changes from parallel tracks until Git integration lands on one `Working branch` `HEAD` (`mstar-branch-worktree` QC/QA alignment).
 - **NEVER** label `QA: skipped` for report-only QA—still dispatch `@qa-engineer` with report-only mode; QC skip rules are separate and explicit.
 - **NEVER** let non-PM/non-QA roles mark plan `Done`.
 

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

@@ -1,12 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `prompt-engineer`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-dispatch-gates`.
+
+**When editing harness text:** read **all** topic skills you touch — at minimum `mstar-phase-gates`, `mstar-plan-conventions`, `mstar-plan-artifacts`, `mstar-plan-artifacts`, `mstar-branch-worktree`, `mstar-review-qc`, `mstar-coding-behavior`, `mstar-superpowers-align`, plus host adapters — so prompts stay aligned with SSOT and do not re-duplicate rules.
+
+**Typically:** `mstar-plan-conventions` (path symbols in examples).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

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

@@ -1,13 +1,14 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `qa-engineer`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-review-qc`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-review-qc`, `mstar-coding-behavior`, `mstar-dispatch-gates`, `mstar-branch-worktree` (same checkout fields as QC for the feature).
+
+**Typically:** `mstar-plan-conventions` (paths); `mstar-superpowers-align` (when plugin on).
+
+**On demand:** `mstar-plan-artifacts` (closing R# after verified fix); `mstar-phase-gates` (gate checklist when assignment references verification phase).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 
@@ -26,7 +27,7 @@ If any item below matches, **stop** and return `Blocked` to `project-manager` in
 
 - **NEVER** invoke another `qa-engineer` or dev/QC roles for **this** QA assignment unless `Delegation: allowed (...)` lists them.
 - **NEVER** sign off while `Review cwd` / `Worktree path`, `Working branch`, `plan_id`, and `Review range / Diff basis` disagree with the assignment or (when applicable) differ from the locked QC tri-review pack—**text-identical** metadata is mandatory for the same scope.
-- **NEVER** switch to an unprescribed worktree/branch to “pick up the other half” of parallel development; if the current `HEAD` cannot contain the claimed diff scope, **Blocked** and ask PM for Git integration or a corrected assignment (`mstar-harness-core` multi-worktree ↔ QC/QA section).
+- **NEVER** switch to an unprescribed worktree/branch to “pick up the other half” of parallel development; if the current `HEAD` cannot contain the claimed diff scope, **Blocked** and ask PM for Git integration or a corrected assignment (`mstar-branch-worktree`).
 - **NEVER** treat `Handoff` / template role lists / route arrows as invoke instructions; only `Delegation: allowed` authorizes callees.
 - **NEVER** infer tool exposure implies authorization; **tool availability ≠ delegation**.
 - **NEVER** run Superpowers `dispatching-parallel-agents` yourself; **PM-only** (`mstar-superpowers-align`).
@@ -90,7 +91,7 @@ Report-only mode may skip QC tri-review only when no test/config/code artifacts
 
 ## Plan & Residual Rules
 
-- Follow `{HARNESS_DIR}` / `{PLAN_DIR}` and residual lifecycle from `mstar-plan-conventions`.
+- 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)

package/harness-skills/mstar-roles/references/qc-specialist-shared.md

@@ -12,11 +12,15 @@ Behavior is shared; reviewer identity is parameterized.
 
 ## Required Skill Dependencies
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-review-qc`
-- `mstar-coding-behavior`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Hub matrix:** `mstar-roles` SKILL.md.
+
+**Always:** `mstar-harness-core`, `mstar-review-qc`, `mstar-dispatch-gates`, `mstar-branch-worktree` (checkout alignment before review), `mstar-plan-artifacts` (report paths and naming).
+
+**Typically:** `mstar-plan-conventions` (path symbols only).
+
+**On demand:** `mstar-plan-artifacts` (when PM asks you to cite severity enum for residual registration — QC does not own `status.json` writes).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 
@@ -37,7 +41,7 @@ If any item below matches, **stop** and return `Blocked` to `project-manager` in
 - **NEVER** ask the user for permission to submit a report, present “notify PM?” choosers, or stall after a completed review—when requirements are met, emit **Completion Report v2** in the **same** assistant turn (with a real **Git** line when commits are required).
 - **NEVER** modify business implementation/tests, `{HARNESS_DIR}/status.json` residual lifecycle fields, `{HARNESS_DIR}/archived/`, or any path outside the host write whitelist for QC (typically `{PLAN_DIR}/reports/**/*.md` only).
 - **NEVER** `git add .` or stage unrelated paths when committing QC reports—stage **only** the report files you changed.
-- **NEVER** close, delete, or archive residual entries in `status.json` from QC; PM/QA own residual lifecycle per `mstar-plan-conventions`.
+- **NEVER** close, delete, or archive residual entries in `status.json` from QC; PM/QA own residual lifecycle per `mstar-plan-artifacts`.
 - **NEVER** treat `Handoff` lines, template role lists, or routing prose as invoke instructions; only `Delegation: allowed` authorizes callees.
 - **NEVER** infer tool exposure implies authorization; **tool availability ≠ delegation**.
 - **NEVER** run Superpowers `dispatching-parallel-agents` yourself; **PM-only** (`mstar-superpowers-align`).
@@ -70,7 +74,7 @@ Still cover shared baseline:
 - High-impact unresolved warning with disagreement => `Needs Discussion`
 - Otherwise => `Approve`
 
-Use severity and formatting standards from `mstar-review-qc` and `mstar-plan-conventions`.
+Use severity and formatting standards from `mstar-review-qc`; machine `severity` enum from `mstar-plan-artifacts`.
 
 ### Verdict NEVER (`{role_id}`)
 

package/harness-skills/mstar-roles/references/writing-specialist.md

@@ -1,12 +1,12 @@
-## Morning Star Skills (Required Reading)
+## Required Skill Dependencies
 
-Before acting as `writing-specialist`, read:
+**Hub matrix:** `mstar-roles` SKILL.md.
 
-- `mstar-harness-core`
-- `mstar-plan-conventions`
-- `mstar-coding-behavior`
-- `mstar-superpowers-align`
-- Host adapter: `mstar-host-opencode` (OpenCode) or `mstar-host-cursor` (Cursor), whichever matches the session
+**Always:** `mstar-harness-core`, `mstar-dispatch-gates`, `mstar-coding-behavior` (surgical edits).
+
+**Typically:** `mstar-plan-conventions` (where deliverables land under `{HARNESS_DIR}` / `docs/`); `mstar-plan-artifacts` (when writing under knowledge or plan trees); `mstar-superpowers-align` (when plugin on).
+
+**Host:** `mstar-host-opencode` | `mstar-host-cursor`.
 
 ## Role Mission
 

package/harness-skills/mstar-superpowers-align/SKILL.md

@@ -119,7 +119,7 @@ Superpowers:
 Superpowers 插件内该技能附带 **`implementer-prompt.md`**、**`spec-reviewer-prompt.md`**、**`code-quality-reviewer-prompt.md`** 等模板（部分宿主以 `/implementer-prompt` 等名称暴露）。正文还描述「每任务后 spec 审 + code quality 审」与示例路径 **`docs/superpowers/plans/`**。在本仓库中须按下述方式 **降权为可选技巧**，**不得覆盖 harness**。
 
 - **权威上下文**：实现与审查的 **分支、检出路径、plan、状态机** 以 **`mstar-harness-core`**、**`mstar-plan-conventions`**、**`mstar-review-qc`** 及 **`@project-manager` 的 Assignment** 为准；**不要用上游模板替代 Assignment 结构**（`Execute as` / `Delegation` 写法见 `agents/project-manager.md` §1.3；另含 `Working branch`、`Review cwd` / `Worktree path`、`plan_id`、`Review range` / `Diff basis` 等）。
-- **谁可以派 subagent**：仅 `@project-manager` 可增加或并行 subagent；Assignment 未写 **`Delegation: allowed (...)`** 时，承接方 **不得** 依该技能自行连续派发「implementer / reviewer」子代理（见 `mstar-harness-core` SKILL.md「调度防串扰」）。
+- **谁可以派 subagent**：仅 `@project-manager` 可增加或并行 subagent；Assignment 未写 **`Delegation: allowed (...)`** 时，承接方 **不得** 依该技能自行连续派发「implementer / reviewer」子代理（见 **`mstar-dispatch-gates`** SKILL.md「调度防串扰」）。
 - **per-task 双审（spec + code quality）用谁**：这是**任务级、会话内快速自检**，**禁止**把 `@qc-specialist` / `@qc-specialist-2` / `@qc-specialist-3` 当作这两步子代理的承接方——QC 角色绑定 **`mstar-review-qc`** 与 **`{PLAN_DIR}/reports/<plan-id>/`** 正式产出，与「每任务后快速过一遍」冲突，易造成误派与多余文档。**推荐**用 **`@general`**（OpenCode 等宿主内置）或宿主并行 Task 的 **`generalPurpose`** subagent，仅借用上游 `spec-reviewer-prompt` / `code-quality-reviewer-prompt` 的检查思路；回报限本会话内简短结论（要点 / 阻塞项），不写 QC Completion Report、不落 `reports/<plan-id>/`。可选用 **`@qa-engineer`** 做同一类 informal pass（侧重可测性、验收对齐、smoke 建议）时，PM 须在 Assignment 写明 **`Informal per-task review only`**（本轮**不**套用正式 QC/QA 的 `plan_id` + `Review range` 三审门禁、**不向** `reports/` 落盘）；**feature 完成后的正式验证**仍按 harness 另派，字段与 QC 对齐。
 - **正式审查门禁**：**QC 三审 + @qa-engineer 验证** 在 **feature / 整 plan 开发完成后**按默认节奏执行（多 batch 默认不每 batch 全套三审）；上游技能的 **per-task 双 reviewer 子代理** 若使用，**最多视为作者侧或会话内自检**，**不可替代** `{PLAN_DIR}/reports/<plan-id>/` 下按 **`mstar-review-qc`** 产出的 QC 报告，也不得绕过 **`plan_id` / `Review range` 三份逐字相同** 的约定。
 - **完成态**：实现方将工作置 **`InReview`**；**`Done`** 仅 `@project-manager` 或 `@qa-engineer` 设定（`mstar-harness-core`）。上游模板中的「任务完成」**不等于** harness 的 **Done / sign-off**。
@@ -142,7 +142,7 @@ PM 在 Assignment 的 `Superpowers` 中引用 `subagent-driven-development` 时
 - `QC: skipped` 只用于已定义例外（product-docs only / tech-spec only）；否则默认进入 QC 路径。
 - **`Delegation: forbidden`** 与 Superpowers 里的 `subagent-driven-development` **互斥**（除非已 `allowed` 且范围覆盖）——见上文专节。
 - `Working branch` 与 `Branch policy` 只能二选一；两者同写时，以 PM 明确改写为准后再执行。
-- **`QC 三审`**：三份 Assignment 的 **`plan_id`** 与 **`Review range` / `Diff basis`** 必须 **完全一致**（可复制粘贴）；缺一项则 **不得**将 gate 汇总为 `Approve`，须 `Blocked` 后补 Assignment 或补报告（见 `mstar-harness-core` `references/branch-and-worktree.md`）。
+- **`QC 三审`**：三份 Assignment 的 **`plan_id`** 与 **`Review range` / `Diff basis`** 必须 **完全一致**（可复制粘贴）；缺一项则 **不得**将 gate 汇总为 `Approve`，须 `Blocked` 后补 Assignment 或补报告（见 `mstar-branch-worktree`）。
 
 ## References
 

package/harness-skills/mstar-superpowers-align/references/per-role-matrix.md

@@ -22,14 +22,14 @@
 - 当任务进入 **gate / sign-off / merge decision**，若未出现 `verification-before-completion` 或等价证据要求，视为门禁不完整。
 - 当任务声明 **并行分派**，`Superpowers` 中应显式包含 `dispatching-parallel-agents`（或同义触发短语），并为每个可写承接方写清 `Working branch`。
 - 当 **并行分派** 且 **≥2 个可写承接方** 针对 **同一 Git 仓库** 可能并发落盘时，`Superpowers` 中还 **必须** 显式包含 **`using-git-worktrees`**（或同义触发短语），并在 Assignment 中写清各流 **检出路径约定**（或要求 Completion Report 回报实际 worktree 路径）；**禁止**依赖「多 subagent 共享同一工作目录」完成并发写入。
-- **QC 三审**：三份 Assignment 除 `Review cwd`、`Working branch` 外，**必须**含 **相同**的 **`plan_id`** 与 **`Review range` / `Diff basis`**（可复制粘贴）；**@qa-engineer** 同 feature 验证时 **照抄**同一组字符串。缺任一项视为 PM 分派不完整（`mstar-harness-core` `references/branch-and-worktree.md`）。**同仓、同一 plan、多 worktree 并行**：PM **推荐**先建 **plan 集成分支** 再挂各轨 worktree，QC 前再归并到单一 `HEAD`（见同 reference **「推荐默认编排：先建 plan 集成分支，再挂各 worktree」**）。**同一 plan 多 batch**：**默认仅在整 plan dev 完成后**派一轮完整三审；复验波次用新文件名；增量例外须 Assignment 写明（`mstar-plan-conventions`）。
+- **QC 三审**：三份 Assignment 除 `Review cwd`、`Working branch` 外，**必须**含 **相同**的 **`plan_id`** 与 **`Review range` / `Diff basis`**（可复制粘贴）；**@qa-engineer** 同 feature 验证时 **照抄**同一组字符串。缺任一项视为 PM 分派不完整（`mstar-branch-worktree`）。**同仓、同一 plan、多 worktree 并行**：PM **推荐**先建 **plan 集成分支** 再挂各轨 worktree，QC 前再归并到单一 `HEAD`（见同 reference **「推荐默认编排：先建 plan 集成分支，再挂各 worktree」**）。**同一 plan 多 batch**：**默认仅在整 plan dev 完成后**派一轮完整三审；复验波次用新文件名；增量例外须 Assignment 写明（`mstar-plan-conventions`）。
 
 ## @product-manager
 
 | 场景 | 技能 |
 |------|------|
 | 必用 | `brainstorming`（新产品/大范围需求澄清） |
-| 必用（与同仓其他可写 subagent 并发落盘项目仓库时） | `using-git-worktrees`（独立 worktree + Assignment 已批准分支；见 `mstar-harness-core`） |
+| 必用（与同仓其他可写 subagent 并发落盘项目仓库时） | `using-git-worktrees`（独立 worktree + Assignment 已批准分支；见 **`mstar-branch-worktree`**） |
 | 宜用 | `writing-plans`（把 PRD/验收拆成可执行里程碑，与 `mstar-plan-conventions` 对齐） |
 
 ## @architect
@@ -37,7 +37,7 @@
 | 场景 | 技能 |
 |------|------|
 | 必用 | `brainstorming`（重大架构取舍、多方案比选） |
-| 必用（与同仓其他可写 subagent 并发落盘项目仓库时） | `using-git-worktrees`（见 `mstar-harness-core`） |
+| 必用（与同仓其他可写 subagent 并发落盘项目仓库时） | `using-git-worktrees`（见 **`mstar-branch-worktree`**） |
 | 宜用 | `writing-plans`（技术方案、迁移、分阶段落地计划） |
 
 ## @fullstack-dev / @fullstack-dev-2 / @frontend-dev
@@ -57,7 +57,7 @@
 | 场景 | 技能 |
 |------|------|
 | 必用 | `verification-before-completion`（报告通过/阻塞、Done sign-off 前须有可复现命令与输出） |
-| 必用（验证 feature / 跑业务仓测试或提交测试工件时） | 在 PM 写明的 **`Review cwd` / `Worktree path`**、**`Working branch`**、**`plan_id`**、**`Review range` / `Diff basis`** 下执行（与 QC **逐字相同**）；先核对路径、分支与审查范围（见 `mstar-harness-core` `references/branch-and-worktree.md`「QC 三审、QA 验证与 feature 检出上下文」） |
+| 必用（验证 feature / 跑业务仓测试或提交测试工件时） | 在 PM 写明的 **`Review cwd` / `Worktree path`**、**`Working branch`**、**`plan_id`**、**`Review range` / `Diff basis`** 下执行（与 QC **逐字相同**）；先核对路径、分支与审查范围（见 `mstar-branch-worktree`「QC 三审、QA 验证与 feature 检出上下文」） |
 | 必用（与同仓其他可写 subagent 并发写仓库时） | `using-git-worktrees` |
 | 宜用 | `using-git-worktrees`（需与既有目录分离、但在**同一 `Working branch`** 上另开检出专供 QA 写入时） |
 | 宜用 | `systematic-debugging`（flaky、环境、不可稳定复现） |
@@ -68,7 +68,7 @@
 | 场景 | 技能 |
 |------|------|
 | 必用 | `verification-before-completion`（审查结论须指向证据：diff、lint、日志） |
-| 必用（审查 feature 实现时） | 在 PM 写明的 **`Review cwd` / `Worktree path`**、**`Working branch`**、**`plan_id`**、**`Review range` / `Diff basis`** 下执行审查（**`plan_id` 与 `Review range` 三份 QC Assignment 须一致**）；先核对再按 **`Review range` / `Diff basis`** 跑 diff/lint（见 `mstar-harness-core` `references/branch-and-worktree.md`、`mstar-review-qc`） |
+| 必用（审查 feature 实现时） | 在 PM 写明的 **`Review cwd` / `Worktree path`**、**`Working branch`**、**`plan_id`**、**`Review range` / `Diff basis`** 下执行审查（**`plan_id` 与 `Review range` 三份 QC Assignment 须一致**）；先核对再按 **`Review range` / `Diff basis`** 跑 diff/lint（见 `mstar-branch-worktree`、`mstar-review-qc`） |
 | 宜用 | `using-git-worktrees`（需与开发目录分离、但在**同一待审分支**上另开检出专供审查时） |
 | 宜用 | `systematic-debugging`（对"疑似缺陷但证据不足"的条目追根） |
 

package/harness-skills/mstar-superpowers-align/references/tension-table.md

@@ -10,10 +10,10 @@
 | 热修 | 热修以恢复服务为先，可事后补 RCA；Assignment 须标明 Hotfix / `Branch policy` | `systematic-debugging` 可能强调「查透再改」 | **消解**：热修路径以 **Assignment + `mstar-harness-core`** 为准；技能用于**最小变更**与**事后根因**，不要求在长调查完成前强行停改。 |
 | 完成与证据 | `mstar-harness-core` 反模式：无测试或行为证据即宣称完成 | `verification-before-completion` | **一致**：表述不同，目标相同（gate 前可核对证据）。 |
 | Plan 形态 | `mstar-plan-conventions`：**`{PLAN_DIR}`**、**`{HARNESS_DIR}/status.json`**（open residual）、**`{HARNESS_DIR}/archived/residuals/<plan-id>.json`**、`{PLAN_DIR}/reports/<plan-id>/` | `writing-plans` | **互补**：convention 管**存放位置与结构**；writing-plans 管**多步任务如何写成可执行计划**；PM 维护时两者同时满足。**路径门限**：提示词 + `mstar-plan-conventions` 约束 **`{PLAN_DIR}`** 优先于技能默认的 `docs/superpowers/plans/`（无本地同名技能覆盖）。 |
-| 并行开发 | `mstar-harness-core`：独立模块可并行；**先锁接口契约**再并行编码；**同仓多可写并发须 `git worktree` 隔离检出目录** | `dispatching-parallel-agents`、`subagent-driven-development`、**`using-git-worktrees`**（同仓并发写入时） | **叠加约束**：并行**不免除** `mstar-harness-core` `references/branch-and-worktree.md` 分支门禁——每个**可写**承接方 Assignment 仍须含 PM 批准的 **`Working branch`** / **`Branch policy`**，禁止多人各自假设 base；**且** ≥2 可写流同仓并发时 **禁止**共用同一 cwd，**必须** worktree（或等价独立检出）+ Assignment 写明检出约定。 |
+| 并行开发 | `mstar-harness-core`：独立模块可并行；**先锁接口契约**再并行编码；**同仓多可写并发须 `git worktree` 隔离检出目录** | `dispatching-parallel-agents`、`subagent-driven-development`、**`using-git-worktrees`**（同仓并发写入时） | **叠加约束**：并行**不免除** `mstar-branch-worktree` 分支门禁——每个**可写**承接方 Assignment 仍须含 PM 批准的 **`Working branch`** / **`Branch policy`**，禁止多人各自假设 base；**且** ≥2 可写流同仓并发时 **禁止**共用同一 cwd，**必须** worktree（或等价独立检出）+ Assignment 写明检出约定。 |
 | `subagent-driven-development` 与 `implementer-prompt` | **PM Assignment**、具名角色 **`Execute as: role-id`**（无 `@`）、仅 PM 可派 subagent；QC 三审 + QA 在 feature / plan 完成后，**`plan_id` + `Review range` 三审与 QA 逐字对齐**；**`{PLAN_DIR}`**；**`InReview` / `Done` 权限** | 上游：**每任务**后 **spec + code-quality 子代理审**；**泛化 implementer** 模板；示例 **`docs/superpowers/plans/`**；默认不并行多个 implementer | **以 harness 为准**：上游模板与 per-task 双审**不替代** Assignment 与 **QC/`mstar-review-qc`**；per-task 双审用 **`@general` / `generalPurpose` 或 informal `@qa-engineer`**，**勿**用 **`@qc-specialist*`**；per-task 审查**仅可作非正式自检**（若 PM 未另授权 `Delegation`）；并行以 **PM + worktree** 为准。细则见 SKILL.md **「`subagent-driven-development` 与上游 implementer-prompt / reviewer 模板」**。 |
 | TDD | 全局流程**未**强制 TDD | `test-driven-development` | **项目/用户优先**：项目或用户禁止 TDD 时，不得因技能强行 TDD。 |
-| `git worktree` / 多工作目录 | `mstar-harness-core` `references/branch-and-worktree.md`：**开发**阶段同仓多可写 **并发**须独立 worktree；**QC / QA** 须在 **该 feature 的检出上下文**（通常 `Review cwd` = 开发所用 worktree，或同分支另开检出）上审查与验证，且 **三份 QC + QA** 共用 **`plan_id`** 与 **`Review range` / `Diff basis`**（逐字相同）；仅 `@project-manager` 决定分支策略、`Assignment` 须写明 **`Working branch`** / **`Branch policy`** 与 **检出路径约定**（含 **`Review cwd` / `Worktree path`**） | `using-git-worktrees` | **不冲突，但须叠同一门禁**：worktree 是「同一仓库多个检出目录」；**分支授权**仍须与 PM 一致。开发并发写入若不用 worktree 易导致互相覆盖；QC/QA 若错用 cwd/分支/**diff 范围**会审错、验错对象——见 `mstar-harness-core` `references/branch-and-worktree.md` **「QC 三审、QA 验证与 feature 检出上下文」**。若在 worktree 里擅自 `checkout -b` 或未授权切换分支，即违规。 |
+| `git worktree` / 多工作目录 | `mstar-branch-worktree`：**开发**阶段同仓多可写 **并发**须独立 worktree；**QC / QA** 须在 **该 feature 的检出上下文**（通常 `Review cwd` = 开发所用 worktree，或同分支另开检出）上审查与验证，且 **三份 QC + QA** 共用 **`plan_id`** 与 **`Review range` / `Diff basis`**（逐字相同）；仅 `@project-manager` 决定分支策略、`Assignment` 须写明 **`Working branch`** / **`Branch policy`** 与 **检出路径约定**（含 **`Review cwd` / `Worktree path`**） | `using-git-worktrees` | **不冲突，但须叠同一门禁**：worktree 是「同一仓库多个检出目录」；**分支授权**仍须与 PM 一致。开发并发写入若不用 worktree 易导致互相覆盖；QC/QA 若错用 cwd/分支/**diff 范围**会审错、验错对象——见 `mstar-branch-worktree` **「QC 三审、QA 验证与 feature 检出上下文」**。若在 worktree 里擅自 `checkout -b` 或未授权切换分支，即违规。 |
 | 升级与重复失败 | `mstar-harness-core` skill：多次失败升级人工等 | `systematic-debugging`、`verification-before-completion` | **一致**：技能减少「无根因重复改」；**达不到 harness 升级条件**时仍以文档为准。 |
 
 **小结**：Superpowers 主要填充各阶段**如何做**的细节；**阶段顺序、Done 权限、QC/QA 路由、分支唯一决策人**仍以 `mstar-*` skills 与 `@project-manager` 路由表为准。

package/harness-skills/pm/SKILL.md

@@ -17,7 +17,7 @@ Use `/pm` as a hard switch for the current session: enter Morning Star PM mode u
 
 ## Operating baseline
 
-- Prefer **`specify → clarify → plan → tasks → delegate`** (align with `mstar-harness-core` / `references/phase-gate-playbook.md`; do not skip `specify`).
+- Prefer **`specify → clarify → plan → tasks → delegate`** (align with `mstar-phase-gates`; do not skip `specify`).
 - Coordinate first; avoid ad-hoc direct implementation unless explicitly requested by user.
 - Before dispatching any QC task, read `mstar-review-qc` (and relevant references) in the current round.
 - Require evidence before completion claims.
@@ -27,5 +27,5 @@ Use `/pm` as a hard switch for the current session: enter Morning Star PM mode u
 
 1. User explicit instructions
 2. Project `AGENTS.md` / `CLAUDE.md`
-3. `mstar-harness-core` and related runtime `mstar-*` skills under `skills/` (`mstar-roles`, `mstar-plan-conventions`, `mstar-review-qc`, `mstar-coding-behavior`, `mstar-superpowers-align`). Routing regression is **maint-only**: `.cursor/skills/mstar-routing-eval/` (not part of `/pm` runtime load).
+3. `mstar-harness-core` and related runtime `mstar-*` skills under `skills/` (`mstar-roles`, `mstar-phase-gates`, `mstar-dispatch-gates`, `mstar-plan-conventions`, `mstar-review-qc`, `mstar-superpowers-align`; plus `mstar-branch-worktree`, `mstar-plan-artifacts` when the round needs them). Routing regression is **maint-only**: `.cursor/skills/mstar-routing-eval/` (not part of `/pm` runtime load).
 4. This `/pm` command skill

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstar-harness/opencode",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Morning Star harness OpenCode plugin (skills bootstrap and agent loading).",
   "license": "MIT",
   "repository": {

package/skills/mstar-host/SKILL.md

@@ -87,7 +87,8 @@ Routing in `mstar-roles` **project-manager** may read `@explore → @product-man
 - `question` availability is host-config dependent; if unavailable, fall back to structured Markdown clarify flow.
 - Printing an Assignment in the main thread is not dispatch; PM must actually invoke the target role.
 - Built-in `@explore` remains read-only orientation, not a substitute for role-owned implementation or review deliverables.
-- More MCPs does not fix process gaps; follow phase-gate and evidence rules first.
+- More MCPs does not fix process gaps; follow `mstar-phase-gates` and evidence rules first.
+- Topic skills load **on demand** per `mstar-roles` (see hub matrix): `mstar-dispatch-gates`, `mstar-phase-gates`, `mstar-branch-worktree`, `mstar-plan-conventions`, `mstar-plan-artifacts`, `mstar-plan-artifacts`, etc.
 
 ## Shared protocol: library documentation retrieval (Context7)