@mstar-harness/opencode 1.3.2 → 1.5.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to the `@mstar-harness/opencode` package are documented in t
 
 The monorepo root [CHANGELOG.md](../../CHANGELOG.md) summarizes cross-surface releases.
 
+## 1.5.0
+
+- Version alignment with harness **1.5.0** (bundled skills/commands: iteration Phase 2 worktree/lease + Phase 5 babysit-first helpers).
+
+See root [CHANGELOG.md](../../CHANGELOG.md) **1.5.0**.
+
+## 1.4.0
+
+- Version alignment with harness **1.4.0** (Kimi Code host support lives in shared skills / `.kimi-plugin`; OpenCode package unchanged beyond version bump).
+
+See root [CHANGELOG.md](../../CHANGELOG.md) **1.4.0**.
+
 ## 1.3.2
 
 - Bundled commands: `/iteration-start` Cursor Plan path — feedback-driven plan updates; deferred grill after feedback-close; single CreatePlan URI (in-place edits only).

package/harness-commands/iteration-drive.md

@@ -1,6 +1,6 @@
 ---
 name: iteration-drive
-description: Drive the active iteration to completion — Phase 2 Autonomous Execute, Phase 3 iteration-close, Phase 4 Create PR, Phase 5 PR merge-ready loop (greploop / babysit / CI fallback) until mergeable. Not Done until Phase 5 exit checklist passes.
+description: Drive the active iteration to completion — Phase 2 Autonomous Execute, Phase 3 iteration-close, Phase 4 Create PR, Phase 5 PR merge-ready loop (prefer babysit/*-babysit; optional greploop when repo has it; else CI fallback) until mergeable. Not Done until Phase 5 exit checklist passes.
 agent: project-manager
 ---
 
@@ -32,9 +32,9 @@ Phase 2: Autonomous Execute  →  Phase 3: iteration-close  →  Phase 4: Create
 | 禁止 | 必须 |
 |------|------|
 | plan / task / phase 边界问用户「是否继续」「要不要现在启动」「是否开 PR」等例行 yes/no | 进度摘要后**下一条动作** = **dispatch**（`Task`）或下一 phase 步骤（打印 checklist → 执行） |
-| 用完整 Phase 2 汇报收束 turn 后等待用户 | 同 plan 内 task 间 → **`mstar-sdd` Continuous execution**；当前 plan Done 后 → **立刻**下一 plan dispatch |
+| 用完整 Phase 2 汇报收束 turn 后等待用户 | 同 plan 内 task 间 → **`mstar-sdd` Continuous execution**；其他 plan 可 **lease 门控并行** implement；merge 仍串行 |
 | 把 `## Phase 3/4/5` 标题当作可停下协商点（除合法 STOP） | Phase 3 checklist `[x]` → **立刻** Phase 4；PR 创建后 → **立刻** Phase 5 loop |
-| 跨 plan **并行** implement dispatch（多 plan 同时跑 implementer） | Per-plan **串行**：plan A implement→QC→QA→Done 后再 plan B（除非用户书面 override） |
+| 跨 plan **无 lease** 并行 implement | **默认 lease 门控并行**（distinct `execution_lease` + feature worktree）；显式 `Plan parallelism: serial` 可恢复逐 plan 串行 |
 
 **合法 STOP（仅此升级用户）**：
 
@@ -79,12 +79,13 @@ SSOT 细化：`mstar-sdd`（task 级）· `mstar-iteration` §2.6（push 纪律
 6. **`mstar-sdd`** — **before first implement dispatch** in Phase 2（per-task loop SSOT；多 task plan 默认 `Execution mode: sdd`）
 7. `mstar-review-qc` — before first QC dispatch in Phase 2
 8. `mstar-plan-artifacts`, `mstar-plan-conventions`, `mstar-branch-worktree`
+9. **`mstar-iteration/references/phase-2-worktree-lease.md`** — Phase 2 control worktree、`execution_lease`、serial `integration_merge_lease`（§2.0 #5 未 waive）
 
 ## Phase 2: Autonomous Execute
 
 **Continuous execution applies** — 本节全程遵守上节 **Continuous execution（HARD）**；Completion Report / 进度同步后不得 check-in，下一条必须是 dispatch 或下一 plan。
 
-**Branch policy first** — before any plan dispatch（`mstar-iteration` §2.3）:
+**Branch policy + control worktree first** — before any plan dispatch（`mstar-iteration` §2.3 + **`references/phase-2-worktree-lease.md`**）:
 
 | Field | SSOT | If missing |
 |-------|------|------------|
@@ -94,12 +95,13 @@ SSOT 细化：`mstar-sdd`（task 级）· `mstar-iteration` §2.6（push 纪律
 
 Execute **`mstar-iteration` § Phase 2** exactly. Summary:
 
-1. **Precondition gate** (§ 2.0) — **four** checks（含 branch metadata #4）
+1. **Precondition gate** (§ 2.0) — **five** checks（含 branch metadata #4 + control-worktree/lease #5）
 2. **Session todos** (§ 2.1) — set host todos per plan wave
 3. **Read backlog** (§ 2.2) — `status.json` + branch metadata
-4. **Integration branch** (§ 2.3) — `git checkout -b <spec_integration_branch> <iteration_base_branch>` when creating（**not** implicit `main`）
-5. **Per-plan loop** (§ 2.4) — for each non-`Done` plan:
-   - Create plan feature branch from integration
+4. **Integration branch + control worktree** (§ 2.3) — establish control worktree on `spec_integration_branch`; record `metadata.control_worktree_path`; status/SDD via control path
+5. **Per-plan loop** (§ 2.4) — for each active plan（**lease-gated parallel** across plan IDs unless `Plan parallelism: serial`）:
+   - Claim or resume `execution_lease`（same `holder` → verify-held-lease; different holder → Blocked）
+   - Create/verify plan feature worktree + branch（`Worktree path` in Assignment）
    - **SDD implement**（默认 `Execution mode: sdd`；`mstar-sdd` 已载入）— per task **串行**：
      1. `sdd-workspace <plan-id>` → `{SDD_DIR}`
      2. `task-brief <plan> N` → `{SDD_DIR}/task-N-brief.md`
@@ -111,9 +113,9 @@ Execute **`mstar-iteration` § Phase 2** exactly. Summary:
    - **禁止**：把整份 plan 或 T1–Tn 全文贴进 implement dispatch；文件交接 SSOT → `mstar-sdd/references/file-handoffs.md`
    - Update `status.json` + main plan after each Completion Report v2
    - QC **full tri-review** (`QC mode: full tri-review`, **N=3**, `mstar-review-qc`) + branch `review-package` + QA per plan
-   - Merge plan branch → integration branch
+   - **Serial merge** plan branch → integration（`metadata.integration_merge_lease` from control worktree）
    - Cross-plan progress sync → compass
-   - Next plan
+   - Next plan / parallel wave
 6. Repeat until **all** plans `Done` → **STOP**（见 Phase state machine）→ 打印 `## Phase 3: iteration-close` → 执行 **`mstar-iteration` §3**；**不得**进入 Phase 4
 
 派发回合纪律 → **`mstar-dispatch-gates`** + **`mstar-iteration` §2.5**。
@@ -170,20 +172,22 @@ Before the first loop pass, search for bundled/host skills（first readable `SKI
 
 | Skill | Search paths（示例，按宿主扩展） |
 |-------|----------------------------------|
-| `greploop` | `skills/greploop/SKILL.md`；`~/.cursor/skills-cursor/greploop/SKILL.md`；`~/.agents/skills/greploop/SKILL.md`；Codex plugin `skills/greploop/` |
-| `babysit` | `skills/babysit/SKILL.md`；`~/.cursor/skills-cursor/babysit/SKILL.md`；`~/.agents/skills/babysit/SKILL.md` |
+| `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**:
+**Mode selection**（**babysit-first**）:
 
 | Priority | Condition | Read before loop | Primary done signal |
 |----------|-----------|------------------|---------------------|
-| 1 | `greploop` found | `greploop` SKILL.md | Greptile score **5/5** on this PR |
-| 2 | else `babysit` found | `babysit` SKILL.md | Required CI **all green** + **all** review threads **resolved** |
-| 3 | else neither | —（本 command §5.2–§5.4） | Required CI **all green** + **all** review threads **resolved** |
+| 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 §5.2–§5.4） | Required CI **all green** + **all** review threads **resolved** |
 
-**Both greploop and babysit present**: run greploop until **5/5**, then babysit until CI green + reviews resolved（串行；§5.5 仍须满足全部 exit 项）.
+**Both babysit/`*-babysit` and greploop apply**: run **babysit/`*-babysit` first**（CI + reviews），then optional greploop until Greptile **5/5**（串行；§5.5 仍须满足全部 exit 项）. Do **not** prefer greploop over babysit.
 
-**All modes** share §5.5 exit checklist（CI + reviews + mergeable；Greptile 5/5 按 mode / repo 条件）.
+**No greploop / repo without Greptile**: skip greploop entirely — babysit/`*-babysit` or fallback only.
+
+**All modes** share §5.5 exit checklist（CI + reviews + mergeable；Greptile 5/5 only when greploop mode ran or repo shows a Greptile score）.
 
 ### 5.1 PM invariants（Phase 5）
 
@@ -204,12 +208,12 @@ Repeat until §5.5 exit checklist passes:
 3. **Active reviews** — fetch **unresolved** review threads only；triage valid change requests
 4. **CI** — list failing required checks；dispatch or fix in-scope → push
 5. **Mode-specific pass**:
-   - **greploop**: follow greploop SKILL until Greptile **5/5**
-   - **babysit**: follow babysit SKILL（comments + CI loop）
-   - **fallback**: triage unresolved review threads（§5.3）+ poll CI until all required checks green（no skill Read；**与 babysit 同级的 CI + reviews 门禁**）
+   - **babysit / `*-babysit`**: follow that SKILL（comments + CI loop）— **primary**
+   - **greploop**（optional, repo has it）: follow greploop SKILL until Greptile **5/5** — **after** babysit/`*-babysit` gates when both apply
+   - **fallback**（no babysit/`*-babysit`）: triage unresolved review threads（§5.3）+ poll CI until all required checks green（no skill Read；**与 babysit 同级的 CI + reviews 门禁**）
 6. After each push → §5.3 → return to step 1
 
-**Stop looping only when** §5.5 全 `[x]`。若多轮仍 blocked → 升级用户（列出 failing checks / unresolved threads / Greptile score）。
+**Stop looping only when** §5.5 全 `[x]`。若多轮仍 blocked → 升级用户（列出 failing checks / unresolved threads / Greptile score if greploop mode）。
 
 ### 5.3 Review fix hygiene（HARD — all modes）
 
@@ -221,9 +225,9 @@ Whenever a push addresses PR review feedback（human or bot, including Bugbot /
 
 Do not bulk-resolve without a per-thread reply. Disagree or uncertain → reply explaining why; leave unresolved and escalate.
 
-### 5.4 Fallback mode detail（no greploop / babysit）
+### 5.4 Fallback mode detail（no babysit / `*-babysit`）
 
-When neither skill is found, **本 command 承担 babysit 同级职责**（无外部 SKILL，但 exit 标准相同）:
+When no `babysit` / `*-babysit` skill is found, **本 command 承担 babysit 同级职责**（无外部 SKILL，但 exit 标准相同）。`greploop` alone does **not** replace babysit — if only greploop is present and the repo has Greptile, still run §5.4 for CI + reviews, and optionally greploop for score:
 
 1. Fetch **unresolved** review threads；triage valid change requests → dispatch fix → push → §5.3 comment + resolve
 2. Poll PR required checks until **all green**（reasonable backoff between polls）
@@ -238,7 +242,7 @@ When neither skill is found, **本 command 承担 babysit 同级职责**（无
 - [ ] PR mergeable（无 blocking merge conflicts）
 - [ ] All **required** CI checks green on latest head
 - [ ] All review threads **resolved**（或用户书面 waive 特定 thread）
-- [ ] Greptile **5/5**（若运行了 greploop mode，或 repo 启用 Greptile 且 PR 上可见分数）
+- [ ] Greptile **5/5**（**仅当**采用了可选 greploop mode，或 repo 启用 Greptile 且 PR 上可见分数；无 Greptile 则本项 N/A）
 - [ ] §5.3 comment + resolve 已完成于本轮所有 addressed reviews
 - [ ] Host todo `phase-5-pr-merge-ready` 可勾选
 

package/harness-commands/iteration-loop.md

@@ -62,8 +62,8 @@ Phase 1: Autonomous start  →  Phase 2: Autonomous Execute  →  Phase 3: close
 | 禁止 | 必须 |
 |------|------|
 | 方向 / plan / phase 边界例行 yes/no（「是否同意该方向」「要不要继续」「是否开 PR」） | 进度摘要后**下一条** = dispatch 或下一 phase 步骤 |
-| 用 Phase 汇报收束 turn 后等待用户 | Phase 1 lock → **立刻** Phase 2；plan Done → 下一 plan 或 Phase 3 |
-| 跨 plan 并行 implement | Per-plan **串行** |
+| 用 Phase 汇报收束 turn 后等待用户 | Phase 1 lock → **立刻** Phase 2；plan 可 lease 门控并行 implement；merge 串行 |
+| 跨 plan 无 lease 并行 implement | **默认 lease 门控并行**；`Plan parallelism: serial` 恢复逐 plan 串行 |
 
 **合法 STOP（仅此升级用户）**：
 
@@ -119,6 +119,7 @@ Phase 1: Autonomous start  →  Phase 2: Autonomous Execute  →  Phase 3: close
 9. **`mstar-sdd`** — before first implement dispatch in Phase 2
 10. `mstar-review-qc` — before first QC dispatch in Phase 2
 11. `mstar-branch-worktree` — when Git/write or QC checkout
+12. **`mstar-iteration/references/phase-2-worktree-lease.md`** — Phase 2 control worktree + lease（§2.0 #5 未 waive）
 
 **Do not** Read `skills/grill-me/SKILL.md` for this command.
 
@@ -218,15 +219,15 @@ Register branch fields in compass + `status.json`. Commit docs; push.
 
 ## Phase 2: Autonomous Execute
 
-**Continuous execution applies.** Branch policy first（`mstar-iteration` §2.3）.
+**Continuous execution applies.** Branch policy + control worktree first（`mstar-iteration` §2.3 + **`references/phase-2-worktree-lease.md`**）.
 
 Execute **`mstar-iteration` § Phase 2** exactly. Summary:
 
-1. Precondition gate §2.0（four checks）
+1. Precondition gate §2.0（five checks；含 control-worktree + lease defaults）
 2. Session todos §2.1
 3. Read backlog §2.2
-4. Integration branch §2.3
-5. Per-plan loop §2.4 — **SDD** default; serial implementer → task reviewer; QC **full tri-review** N=3; QA gate; merge to integration; next plan
+4. Integration branch + control worktree §2.3
+5. Per-plan loop §2.4 — **lease-gated parallel** across plan IDs（unless `Plan parallelism: serial`）；claim/resume `execution_lease`；feature worktree；**SDD** default；serial merge via `integration_merge_lease`
 6. All plans `Done` → print `## Phase 3: iteration-close` → **`mstar-iteration` §3**（不得开 PR）
 
 派发纪律 → **`mstar-dispatch-gates`** + **`mstar-iteration` §2.5**。
@@ -264,16 +265,16 @@ Execute **`mstar-iteration` § Phase 5**。**§5.5 exit 全 `[x]` = iteration-lo
 
 | Skill | Search paths（示例） |
 |-------|----------------------|
-| `greploop` | `skills/greploop/SKILL.md`；`~/.cursor/skills-cursor/greploop/SKILL.md`；`~/.agents/skills/greploop/SKILL.md` |
-| `babysit` | `skills/babysit/SKILL.md`；`~/.cursor/skills-cursor/babysit/SKILL.md`；`~/.agents/skills/babysit/SKILL.md` |
+| `babysit` / `*-babysit` | `skills/babysit/SKILL.md`；`skills/*-babysit/SKILL.md`；`~/.cursor/skills-cursor/babysit/`；`~/.agents/skills/babysit/`（及 `*-babysit`） |
+| `greploop`（optional） | `skills/greploop/…`；host skill dirs — **only when repo has Greptile/greploop** |
 
 | Priority | Condition | Primary done signal |
 |----------|-----------|---------------------|
-| 1 | `greploop` found | Greptile **5/5** |
-| 2 | else `babysit` | Required CI green + reviews resolved |
-| 3 | else neither | Same as babysit（本 command fallback） |
+| 1 | `babysit` or any `*-babysit` | Required CI green + reviews resolved |
+| 2 | `greploop` **and** repo has Greptile | Greptile **5/5**（additive） |
+| 3 | else neither babysit/`*-babysit` | Same as babysit（本 command fallback） |
 
-Both present: greploop to 5/5, then babysit（串行）.
+Both apply: **babysit/`*-babysit` first**, then optional greploop（串行）. Do not prefer greploop over babysit.
 
 ### 5.1–5.4 Loop
 
@@ -288,7 +289,7 @@ Fixes push to `spec_integration_branch` only. PM does not rewrite product code i
 - [ ] PR mergeable
 - [ ] All **required** CI checks green on latest head
 - [ ] All review threads **resolved**（或用户书面 waive）
-- [ ] Greptile **5/5**（若 greploop mode / repo 可见分数）
+- [ ] Greptile **5/5**（**仅当**可选 greploop mode / repo 可见分数；否则 N/A）
 - [ ] Review comment + resolve 已覆盖本轮 addressed feedback
 - [ ] Host todo `phase-5-pr-merge-ready` 可勾选
 

package/harness-commands/iteration-start.md

@@ -280,4 +280,6 @@ git checkout -b <spec_integration_branch> <iteration_base_branch>
 - Register `iteration_base_branch`, `spec_integration_branch`, and `target_branch` in compass frontmatter **and** `{HARNESS_DIR}/status.json` root `metadata`
 - Commit all documents to the integration branch and push to remote
 
+**Phase 2 note**：integration 分支在此创建；**control worktree + `execution_lease` 门控在 Phase 2 入口**（`iteration-drive` / `iteration-loop`）——见 **`mstar-iteration/references/phase-2-worktree-lease.md`**。
+
 **STOP** if `iteration_base_branch` or `target_branch` is missing. Ask the user or derive only from an already documented project/iteration policy; never silently substitute `main`.

package/harness-skills/mstar-branch-worktree/SKILL.md

@@ -1,19 +1,20 @@
 ---
 name: mstar-branch-worktree
-description: Morning Star business-repo Git feature branches, same-repo concurrent `git worktree` isolation (N parallel Task invokes do NOT satisfy isolation — worktrees must exist before writable dispatch), plan/Spec integration branches, and QC/QA checkout alignment (`Review cwd`, `Working branch`, `plan_id`, `Review range` / `Diff basis` must match verbatim across three QC reviewers and QA). Read when PM writes `Working branch` / `Branch policy`, dispatches ≥2 concurrent writable implement tracks on one repo, `Worktree isolation: required`, two or more writable streams touch one repo, dispatching QC tri-review or QA after merging to a single `HEAD`, dev/QA/ops before first `git commit`, or explaining worktree paths. Required for `project-manager` parallel implement or pre-QC orchestration; `fullstack-dev*` / `frontend-dev` / `qa-engineer` / `ops-engineer` on repo writes; `qc-specialist*` before review. Does not replace the state machine (`mstar-harness-core`).
+description: Morning Star business-repo Git feature branches, worktree isolation layers **L1** (iteration cross-plan — control worktree + per-plan feature worktrees + `execution_lease`) and **L2** (within-plan — `references/parallel-writable-pre-dispatch.md`; N parallel Task invokes do NOT satisfy isolation), plan/Spec integration branches, and QC/QA checkout alignment (`Review cwd`, `Working branch`, `plan_id`, `Review range` / `Diff basis` must match verbatim across three QC reviewers and QA). Read when PM writes `Working branch` / `Branch policy`, iteration Phase 2 control vs feature worktree paths, dispatches ≥2 concurrent writable implement tracks on one repo, `Worktree isolation: required`, two or more writable streams touch one repo, dispatching QC tri-review or QA after merging to a single `HEAD`, dev/QA/ops before first `git commit`, or explaining worktree paths. Required for `project-manager` parallel implement or pre-QC orchestration; `fullstack-dev*` / `frontend-dev` / `qa-engineer` / `ops-engineer` on repo writes; `qc-specialist*` before review. Does not replace the state machine (`mstar-harness-core`).
 ---
 
 ## Load order（必读顺序）
 
 **首次 Read 本 skill 前：必须先 Read `mstar-harness-core`（SKILL.md）。** 冲突时 **以 `mstar-harness-core` 为准**。
 
-**Spec 多 plan 命名**（`iteration_base_branch`、`spec_integration_branch`、`target_branch` PR 门禁）→ **`mstar-plan-conventions`**。同仓并行可写派发前清单 → **`references/parallel-writable-pre-dispatch.md`**；下文为分支与 QC/QA 检出对齐主文。
+**Spec 多 plan 命名**（`iteration_base_branch`、`spec_integration_branch`、`target_branch` PR 门禁）→ **`mstar-plan-conventions`**。**L1/L2 worktree 分层**（迭代 control vs feature、plan 内并行轨）→ 下文 **「Worktree isolation layers」**；**L2** 同仓并行可写派发前清单 → **`references/parallel-writable-pre-dispatch.md`**；迭代 lease claim/merge 细则 → **`mstar-iteration`** `references/phase-2-worktree-lease.md`（勿在本 skill 重复完整协议表）。下文为分支与 QC/QA 检出对齐主文。
 
 ## Scope（摘要）
 
 - **仅 PM 决定分支**；其他可写角色不得自行新开分支或切回 `main`。
 - **Assignment 须含其一**：`Working branch: <existing>` | `create <new> from <base>` | `Branch policy: direct on <branch> — <reason>`。
-- **同仓 ≥2 可写并发**：派发 **前** 完成 **`references/parallel-writable-pre-dispatch.md`**（含 `git worktree`、绝对 **`Worktree path`**；**N 次并行 invoke ≠ 已隔离**）。
+- **L1（跨 plan / 迭代 Phase 2）**：control worktree（`metadata.control_worktree_path`，检出 `spec_integration_branch`）+ 每 plan 独立 feature worktree（`execution_lease.worktree_path` **≠** control 路径）+ lease；见 **「Worktree isolation layers」**。
+- **L2（同 plan 内 ≥2 可写并发）**：派发 **前** 完成 **`references/parallel-writable-pre-dispatch.md`**（含 `git worktree`、绝对 **`Worktree path`**；**N 次并行 invoke ≠ 已隔离**）。单 plan 多轨时 **L1 不替代 L2**。
 - **QC/QA 前**：待审提交归并到 **单一 `Working branch` `HEAD`**；三审 + QA 共用一套 **`Review cwd` + `plan_id` + `Review range` / `Diff basis`**（逐字相同）。
 
 ## Git 功能分支、同仓并发与 Worktree 对齐
@@ -99,9 +100,46 @@ description: Morning Star business-repo Git feature branches, same-repo concurre
 
 - `Working branch used: <branch-name>`
 
+## Worktree isolation layers (L1 vs L2)
+
+Two complementary **worktree** isolation layers coexist. Do **not** conflate them with SDD **review** layers (L1–L4 in `mstar-review-qc/references/review-responsibility-boundaries.md`).
+
+| Layer | Scope | When | Mechanism |
+|-------|-------|------|-----------|
+| **L1** | Cross-plan (iteration Phase 2) | Multiple plans may implement concurrently in one iteration | **Control worktree** + per-plan **feature worktrees** + `plans[].execution_lease` |
+| **L2** | Within-plan | Same `plan_id`, same business repo, **≥2 concurrent writable implement tracks** | **`references/parallel-writable-pre-dispatch.md`** — distinct absolute **`Worktree path`** per track |
+
+**Stacking rules**
+
+- Default **L1** capacity is **one writable track per plan**. If one plan runs **≥2** concurrent writable tracks, each track **also** satisfies **L2**; L1 does **not** replace L2.
+- **L1** applies under iteration commands with Phase 2 control-worktree defaults (unless explicit `Worktree mode: waived` this turn). Single-plan waves without iteration leases still require **L2** when **≥2** parallel writable tracks share one repo.
+- Cross-plan **integration merge** into `spec_integration_branch` remains **serial** (`metadata.integration_merge_lease`) even when L1 feature implementation runs in parallel.
+
+### Control worktree vs feature worktree (iteration / L1)
+
+Established at iteration **Phase 2 entry** (Phase 1 Review & Edit may stay on the primary checkout). Normative field names and claim/release/merge protocol → **`mstar-iteration`** `references/phase-2-worktree-lease.md` and maintenance ADR `2026-07-22-iteration-worktree-plan-lease.md`. **Do not invent alternate lease field names in this skill.**
+
+| Worktree role | Checked-out branch | Path recorded in `status.json` | Writable product edits |
+|---------------|-------------------|-------------------------------|------------------------|
+| **Control worktree** | Resolved `spec_integration_branch` (same across active plans) | `metadata.control_worktree_path` — canonical **repository root** (not `{HARNESS_DIR}`) | **Forbidden** — coordination, status/SDD SSOT, serial integration merge only |
+| **Feature worktree** (per plan) | Plan `Working branch` / feature branch from integration | `plans[].execution_lease.worktree_path` | **Required cwd** for that plan's product/source edits |
+
+**Hard rules**
+
+- `execution_lease.worktree_path` **MUST** differ from `metadata.control_worktree_path`.
+- Status SSOT: `<control_worktree_path>/{HARNESS_DIR}/status.json`. SDD SSOT: `<control_worktree_path>/{HARNESS_DIR}/sdd/<plan-id>/`. A feature worktree's same-looking `{HARNESS_DIR}` path is **not** the SSOT.
+- Absolute **`Worktree path`** MUST appear in the writable Assignment and in `execution_lease.worktree_path` before first writable implement dispatch for that plan.
+- Writable dispatch for a plan requires a **verified** `execution_lease` (same read-check-replace-verify discipline as the iteration reference). Full claim tables are **not** duplicated here.
+
+**Naming conventions (PM / ops; examples only — paths MUST be canonical absolute)**
+
+1. **Control worktree** — usually the primary checkout or a PM-designated path on `spec_integration_branch`; record once in `metadata.control_worktree_path`.
+2. **Feature worktree (per plan)** — one distinct sibling directory per active `plan_id`, e.g. `<repo-parent>/worktrees/<plan-id>` or team `.worktrees/<plan-id>`; Assignment **`Worktree path`** must match lease `worktree_path`.
+3. **L2 track worktrees (within-plan)** — additional distinct directories per parallel implement track under the **same** plan (see **`references/parallel-writable-pre-dispatch.md`**), each with its own PM-approved **`Working branch`**.
+
 ## 同仓并发写入与 Git worktree（强制）
 
-**首要场景是开发阶段**：多条可写流 **并发** 改 **同一仓库** 时，用 worktree 做 **写入侧目录隔离**。派发前清单 → **`references/parallel-writable-pre-dispatch.md`**。下列规则针对该类开发并发；**QC / QA 阶段的检出约定**见下一小节。
+**首要场景是开发阶段（L2；迭代多 plan 时另见上文 L1）**：多条可写流 **并发** 改 **同一仓库** 时，用 worktree 做 **写入侧目录隔离**。派发前清单 → **`references/parallel-writable-pre-dispatch.md`**。下列规则针对该类开发并发；**QC / QA 阶段的检出约定**见下一小节。
 
 当 **`project-manager` 在同一调度轮次内并发启动多个** subagent（含宿主侧「并行 Task / 并行 subagent」），且 **≥2 个承接方**可能对 **同一 Git 仓库的同一工作区（同一 cwd 检出目录）**产生写文件或 `git commit` 级改动时：
 

package/harness-skills/mstar-branch-worktree/references/parallel-writable-pre-dispatch.md

@@ -1,5 +1,17 @@
 # Parallel writable pre-dispatch gate (PM)
 
+## Layer: L2 (within-plan)
+
+This reference is **L2** worktree isolation: **same `plan_id`**, **same business repo**, **≥2 concurrent writable implement tracks**.
+
+**L1 (cross-plan)** is separate and stacks on top when iteration Phase 2 defaults apply:
+
+- A **control worktree** on `spec_integration_branch` (`metadata.control_worktree_path`) holds status/SDD SSOT and serial integration merge.
+- Each concurrently active plan uses a **distinct feature worktree** (`execution_lease.worktree_path` **≠** `control_worktree_path`) with verified `plans[].execution_lease` before writable dispatch.
+- Claim/hold/release/merge rules → **`mstar-iteration`** `references/phase-2-worktree-lease.md` (not repeated here).
+
+When **one plan** runs **≥2** concurrent writable tracks, **L2 still applies** inside that plan even if L1 leases already isolate plans from each other. Run this checklist **per plan** that has multiple parallel implement tracks.
+
 ## Why this exists
 
 Host dispatch can satisfy **「N Assignments ⇒ N invokes in one message」** while every writer still shares **one checkout directory**. That may satisfy `mstar-dispatch-gates` tool concurrency but **violates** same-repo write isolation.
@@ -8,9 +20,9 @@ Host dispatch can satisfy **「N Assignments ⇒ N invokes in one message」** w
 
 ## Mode switch (do not carry single-track habits)
 
-Serial single-plan waves (one feature branch, one checkout, PM on integration) do **not** authorize multi-writer parallel tracks without re-running this gate.
+Serial single-plan waves (one feature branch, one checkout, PM on integration) do **not** authorize multi-writer parallel tracks without re-running this **L2** gate.
 
-When the round adds a second **concurrent** writable implement track on the **same business repo**, treat it as a **mode switch** — even if earlier plans in the iteration were serial.
+When the round adds a second **concurrent** writable implement track on the **same business repo** within one plan, treat it as a **mode switch** — even if earlier plans in the iteration were serial or L1 already assigned each plan its own feature worktree.
 
 ## Pre-dispatch checklist (HARD)
 

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

@@ -84,8 +84,11 @@ When **`Execution mode: sdd`** (`mstar-sdd`):
 | **工具并发** | 同条消息发满 N 次 invoke | 已发 2 个 Task ⇒ 误以为「并行合规」 |
 | **同仓写隔离** | 派发 **前** 每轨独立 `Worktree path` | 只写了 `Working branch` / `checkout -b` |
 
-- 独立模块可并行 **implement 轨道**（不同 dev Assignment）；**同仓 ≥2 可写并发** → **`mstar-branch-worktree`** **`references/parallel-writable-pre-dispatch.md`**（先于 invoke）。
-- **SDD 单 plan 内 task** 仍串行（`mstar-sdd`）；plan 间默认串行（`mstar-iteration` §2.6）— 用户书面 override 时仍须 worktree 隔离。
+- 独立模块可并行 **implement 轨道**（不同 dev Assignment）；**同仓 ≥2 可写并发** → **`mstar-branch-worktree`** **`references/parallel-writable-pre-dispatch.md`**（先于 invoke；同 plan 多轨 = L2）。
+- **SDD 单 plan 内**：task / implementer **仍串行**（`mstar-sdd`）；**禁止**同一 plan 内并行 SDD implementer（写冲突）。
+- **跨 plan（迭代 Phase 2）≠ 单 plan 内并行**：不同 `plan_id` 的 feature implement **允许** lease 门控并行（每 plan 独立 verified `plans[].execution_lease` + feature worktree，L1）**仅当** coordination 路径 same-host 独占写锁可用且每次协调变更持锁 → **`mstar-iteration`** §2.0 #5 · **`mstar-plan-artifacts`**。**跨主机 / 无共享 flock** → 默认 **`Plan parallelism: serial`** 或 Assignment 仍写并行 → **Blocked**（用户本轮 `Cross-host lease race: accepted` + audit `notes` 除外）。**`Worktree mode: waived` 不豁免**跨 plan 并行安全闸。**禁止**无 lease 的跨 plan 可写派发（lease 闸未 waive 时）。
+- **`integration_merge_lease`**：`spec_integration_branch` 上的 merge **始终串行**（一次仅一 holder）→ **`mstar-iteration`** · **`mstar-plan-artifacts`**。
+- **`Plan parallelism: serial`**：仅强制跨 plan implement **调度串行**；**不** waive control worktree / `execution_lease` / `integration_merge_lease`（`Worktree mode: waived` 才是 lease/worktree 豁免）→ **`mstar-iteration`** §2.0 #5。
 - **Plan QC tri** after SDD task loop（`Execution mode: sdd`）；**单席**仅 `inline` / hotfix。共用 `Review cwd` / `Working branch` / `plan_id` / `Review range`（**`mstar-branch-worktree`**）。
 - **Tri 同消息规则**：plan QC tri（SDD 或 Assignment 显式 `QC mode: full tri-review`）时三席 **同一条消息**、**同一套** scope 字段。
 
@@ -104,8 +107,12 @@ When **`Execution mode: sdd`** (`mstar-sdd`):
 
 - QC 三审拆在多条消息（tri 模式）或单席却未附 review-package 路径。
 - 仅 1 次 invoke 却声称「tri-review 已并行启动」（tri 模式 N=3）。
-- SDD 并行 implementer dispatch（**同一 plan 内**多 task）。
-- 同仓多轨 writable implement：**N invoke ≠ worktree 隔离** → **`mstar-branch-worktree`** **`references/parallel-writable-pre-dispatch.md`**。
+- SDD 并行 implementer dispatch（**同一 plan 内**多 task）— **不同于**跨 plan lease 门控并行（后者见上节 L1）。
+- 跨 plan 可写派发无 verified `execution_lease`；steal / 覆盖活跃 `execution_lease` 或 `integration_merge_lease`；并行 integration merge。
+- 跨 plan **并行**可写派发在 **无** same-host 独占写锁（跨主机 / 无共享 flock）且 **无** 用户本轮 `Cross-host lease race: accepted` + audit `notes` — **无论** `Worktree mode: waived`。
+- 将 **`Worktree mode: waived`** 当作跨 plan 无锁并行授权（须 serial 或 race-accepted + audit）。
+- `InProgress` 无 `execution_lease` 未走 orphan recovery 即 writable-dispatch。
+- 同仓多轨 writable implement：**N invoke ≠ worktree 隔离**（L2）→ **`mstar-branch-worktree`** **`references/parallel-writable-pre-dispatch.md`**。
 - 递归同角色 subagent；把 Handoff / 多轨编排措辞当 invoke。
 - Review-and-edit 链未完成即 commit integration 分支；PM 代做专业角色编辑而不 invoke。
 - Phase 1 review-and-edit 链三角色并行派发，或未等上一角色返回即派发下一角色。

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

@@ -101,7 +101,7 @@ PM 在 Assignment 写 **`Task category`**（主类 + 可选 `secondary`）：
 | `mstar-strategy` | `STRATEGY.md` 全局战略方向 —— 产品愿景、技术方向、决策原则 |
 | `mstar-skill-authoring` | mstar-native skill authoring: trigger contracts, progressive disclosure, pressure scenarios, behavior-change evidence |
 | `mstar-roles` | 角色正文 hub |
-| `mstar-host` | 宿主适配（自动识别；`references/opencode.md` / `cursor.md` / `codex.md` / `parallel-dispatch.md`） |
+| `mstar-host` | 宿主适配（自动识别；`references/opencode.md` / `cursor.md` / `codex.md` / `kimi.md` / `parallel-dispatch.md`） |
 
 ## 宿主 `mstar-host`
 
@@ -112,6 +112,7 @@ Read **`mstar-host`** after this skill; detect host per its table, then Read the
 | OpenCode | `question`、**task tool**（**subagent** 参数）→ `references/opencode.md` |
 | Cursor | Task 并行 QC；Plan 双写 → `references/cursor.md` · `cursor-plan-mode-bridge.md` |
 | Codex | plugin skills、sandbox/apply_patch/tool discovery；无 invoke 工具时不声称 subagent dispatch → `references/codex.md` |
+| Kimi | `Agent`/`AgentSwarm`（仅 `coder`/`explore`/`plan`）；角色绑定在 prompt（C5b）；Plan 双写 → `references/kimi.md` · `kimi-plan-mode-bridge.md` |
 | 其它 | 同 `mstar-host` skill；按工具信号选 reference |
 
 ## 护栏（不变量）
@@ -142,7 +143,10 @@ Read **`mstar-host`** after this skill; detect host per its table, then Read the
 | 递归误派 / 误读 Handoff | `mstar-dispatch-gates` |
 | `quick` 跳过 Prepare | 上表 + `mstar-phase-gates` |
 | 多 worktree 未归并就 QC | `mstar-branch-worktree` |
-| 并行 implement：N invoke 无 worktree | `mstar-branch-worktree` → `references/parallel-writable-pre-dispatch.md` |
+| 并行 writable implement 无隔离（L2 同 plan 多轨：N invoke ≠ worktree；L1 跨 plan：无 verified `execution_lease` + feature worktree） | `mstar-branch-worktree` L1/L2 · `mstar-iteration` §2.6 · `references/parallel-writable-pre-dispatch.md` |
+| 跨 plan 可写派发无 verified `execution_lease` / steal 活跃 lease / 并行 merge 入 `spec_integration_branch` | `mstar-iteration` · `mstar-plan-artifacts`（leases）· `mstar-branch-worktree` L1 |
+| `InProgress` 无 `execution_lease` 未恢复即可写派发 | `mstar-plan-artifacts` — orphan recovery |
+| 混淆跨 plan lease 门控并行与单 plan 内 SDD 并行 implementer | `mstar-dispatch-gates` · `mstar-sdd` |
 | residual 只写 plan 不写 SSOT | `mstar-plan-artifacts` |
 | 角色文件塞流程长文 | 用专题 skill |
 | 无证据宣称完成 | `mstar-coding-behavior` / verification |

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

@@ -1,6 +1,6 @@
 ---
 name: mstar-host
-description: Morning Star host adapter (OpenCode, Cursor, Codex). Use after mstar-harness-core whenever host entry, clarify, dispatch, or plan UX differs by platform - OpenCode question/task-tool subagent invoke, Cursor /pm and CreatePlan/SwitchMode dual-write and Task parallel QC, Codex plugin skills plus Plan/Goal Mode, sandboxed tools, and tool discovery. Auto-detect host from session tools; then Read references/<host>.md. Always load after mstar-harness-core.
+description: Morning Star host adapter (OpenCode, Cursor, Codex, Kimi). Use after mstar-harness-core whenever host entry, clarify, dispatch, or plan UX differs by platform - OpenCode question/task-tool subagent invoke, Cursor /pm and CreatePlan/SwitchMode dual-write and Task parallel QC, Codex plugin skills plus Plan/Goal Mode, Kimi Agent/AgentSwarm with built-in subagent types only (coder/explore/plan) and role-in-prompt binding, sandboxed tools, and tool discovery. Auto-detect host from session tools; then Read references/<host>.md. Always load after mstar-harness-core.
 ---
 
 # Morning Star Host Adapter
@@ -31,7 +31,8 @@ Use **capability signals** (not filesystem paths):
 | **`question`** tool or **`task`** tool (**subagent** invoke) | `opencode` | `references/opencode.md` |
 | **Task** + `subagent_type`, no CreatePlan | `cursor` | `references/cursor.md` |
 | **Codex app/CLI/plugin context**, `/plan`, `/goal`, Goal tools, `functions.*`, `codex_app.*`, `tool_search`, Browser plugin tools | `codex` | `references/codex.md`; Plan/Goal mode also `references/codex-plan-goal-mode-bridge.md` |
-| Still ambiguous | - | Read sections in **`cursor.md`**, **`opencode.md`**, and **`codex.md`** that match tools you have; **`mstar-harness-core` wins** on conflict |
+| **`Agent`** / **`AgentSwarm`** / **`AskUserQuestion`** / **`EnterPlanMode`**, Kimi plugin (`.kimi-plugin/plugin.json`), `/morning-star-harness:*` commands | `kimi` | `references/kimi.md`; Plan mode also `references/kimi-plan-mode-bridge.md` |
+| Still ambiguous | - | Read sections in **`cursor.md`**, **`opencode.md`**, **`codex.md`**, and **`kimi.md`** that match tools you have; **`mstar-harness-core` wins** on conflict |
 
 ## Parallel dispatch (invoke-capable hosts)
 

package/harness-skills/mstar-host/references/kimi-plan-mode-bridge.md

@@ -0,0 +1,55 @@
+# Kimi Plan Mode × Harness Dual-Write Bridge
+
+> **Load order**: Read **`mstar-harness-core`** first, then **`mstar-plan-conventions`** and **`mstar-plan-artifacts`** when Plan mode is active. Path symbols `{HARNESS_DIR}`, `{PLAN_DIR}`, `{SPECS_DIR}` are defined in `mstar-plan-conventions`. On conflict, **`mstar-harness-core`** wins.
+
+## Purpose
+
+Kimi **Plan mode** (`EnterPlanMode` / `ExitPlanMode`, `/plan`, or `Shift-Tab`) uses a session plan file and read-only exploration for design. Morning Star **SSOT** lives on disk under **`{HARNESS_DIR}`** (default `.mstar/`, legacy `.agents/`). This reference defines **dual-write**: mirror durable plan artifacts to the repo; never treat the Kimi session plan file alone as the handoff surface.
+
+## Priority (hard)
+
+1. User explicit instructions (this turn)
+2. Project `AGENTS.md` / `CLAUDE.md`
+3. **`{HARNESS_DIR}` / `{PLAN_DIR}` / `status.json`** (harness SSOT)
+4. Kimi plan file and `TodoList` UI (session UX mirror)
+
+**NEVER** cite only a Kimi plan file path in Assignment **Plan Path**, **Context Loaded**, or Completion Report when `{PLAN_DIR}/<plan-id>-<name>.md` should exist.
+
+## When this applies
+
+- Kimi **Plan mode** is active (`EnterPlanMode` succeeded, `/plan on`, or `kimi --plan`).
+- Morning Star plugin is installed (`.kimi-plugin/plugin.json` skills loaded) or **`/skill:pm`** / **`pm` skill** is in use.
+
+## Before entering Plan mode
+
+1. **Read** (minimum): `mstar-plan-conventions`, `mstar-plan-artifacts` (SKILL.md); Prepare gates from `mstar-phase-gates` if not hotfix.
+2. **Discover** `{HARNESS_DIR}` / `{PLAN_DIR}` per `mstar-plan-conventions`.
+3. **Initialize** if absent: `{HARNESS_DIR}/`, `{PLAN_DIR}/`, `status.json` from `mstar-plan-artifacts/templates/status.empty.json`, `archived/residuals/`, gitignored `sdd/`.
+
+## Plan mode workflow (dual-write)
+
+| Step | Kimi session | Harness SSOT |
+|------|--------------|--------------|
+| Enter | `EnterPlanMode` or `/plan on` — explore read-only | Ensure `{HARNESS_DIR}` exists; register `plan_id` in `status.json` when known |
+| Design | Edit Kimi plan file with `Write` / `Edit` (when Plan mode allows writes) | Mirror main plan to `{PLAN_DIR}/<plan-id>-<name>.md` with task checkboxes |
+| Clarify | `AskUserQuestion` for blocking ambiguity only | Record decisions in plan / spec when durable |
+| Exit | `ExitPlanMode` — user approves plan to implement | SSOT plan locked; `status.json` row updated |
+| Implement | Agent mode resumes | Per-task commits, Working branch, dispatch per `mstar-dispatch-gates` |
+
+`TodoList` and Kimi UI todos are **session progress only** — sync meaningful state to SSOT plan checkboxes and `status.json` when coordination requires it.
+
+## ExitPlanMode gate
+
+Do **not** treat ExitPlanMode approval as Morning Star **Done**. Implementation still follows phase gates, per-task commits, QC, and QA per the SSOT plan.
+
+## `mstar-iteration` Phase 1
+
+When iteration Phase 1 runs in Plan mode:
+
+- Use **one** plan session; iterate the **same** Kimi plan file and SSOT mirror in place (feedback-driven edits).
+- Do **not** run Review & Edit, commit integration branch, or dispatch implementers until the user approves via `ExitPlanMode` (or explicit go-ahead after plan lock).
+- After approval: reload `mstar-harness-core` + `kimi.md`; resume as `project-manager` orchestration.
+
+## Enforcement
+
+Conflict with harness invariants → **`mstar-harness-core`** wins. Full Cursor CreatePlan bridge detail lives in `cursor-plan-mode-bridge.md` when hosts differ; Kimi uses this lighter Enter/Exit bridge only.