@boyingliu01/xp-gate 0.14.2 → 0.14.3

package/mock-policy/AGENTS.md

@@ -1,9 +1,9 @@
 # SRC/MOCK-POLICY KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Mock layering policy enforcement — Gate M3 of pre-push hook. Ensures integration tests use real implementations for internal dependencies, mock external dependencies, and annotate pending mocks with removal plans. Combines project scope scanning, mock decision engine, and per-file validation into a single pipeline.

package/mutation/AGENTS.md

@@ -1,9 +1,9 @@
 # SRC/MUTATION KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 **Gate M** (incremental mutation testing) + **Gate M2** helpers (test-layer detection used by `src/mock-policy/`). Pre-push quality gate. TypeScript-only; uses Stryker.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boyingliu01/xp-gate",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "AI-driven development workflow: 6 quality gates + Delphi review + Sprint Flow",
   "bin": {
     "xp-gate": "./bin/xp-gate.js"

package/plugins/claude-code/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "xp-gate",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "displayName": "XP-Gate",
   "description": "Extreme Programming quality gates + AI workflow skills for Claude Code. Includes 10 quality gates (Gate 0-9), Sprint Flow (11 phases), and Delphi multi-expert review (>=90% consensus).",
   "author": {

package/plugins/claude-code/skills/delphi-review/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/DELPHI-REVIEW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Delphi Consensus Review — multi-round anonymous expert review (≥90% threshold, 3 experts from ≥2 providers, domestic models only). Supports design + code-walkthrough modes.

package/plugins/claude-code/skills/sprint-flow/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/SPRINT-FLOW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 **6-phase** development pipeline (v2.0 compact redesign, Issue #290): PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE. Phase 3/6 BUILD default build mode is **ralph-loop** (REQ-level iteration, 40-67% token savings vs parallel). HARD-GATE between DESIGN (2/6) and BUILD (3/6): design must pass Delphi review (≥90% consensus) before any coding.

package/plugins/claude-code/skills/sprint-flow/SKILL.md

@@ -193,8 +193,8 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 - **Phase 2/6 DESIGN**: brainstorming 设计未 APPROVED (HARD-GATE) → 用户修改 → APPROVED 后继续；autoplan taste_decisions → 用户确认；delphi-review 未 APPROVED → 修复 → APPROVED → specification.yaml
 - **Phase 3/6 BUILD**: DELPHI-GATE 未通过 → BLOCK；验证失败 > max3 → 用户决策修复/放弃；成本超阈值 → 用户确认
 - **Phase 4/6 VERIFY**: delphi code-walkthrough REQUEST_CHANGES → 用户处理 → 重新评审；browse 发现问题 → 回退 Phase 3（不暂停）
-- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认
-- **Phase 6/6 CLOSE**: USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
+- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认；⚠️ SHIP must complete merge to main + release before Phase 6
+- **Phase 6/6 CLOSE**: SHIP→CLOSE GATE (校验 merge 已完成 + git status clean + 当前在 main) → Backup sprint-state → USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
 
 ---
 
@@ -206,18 +206,21 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 | 2 | **2/6** | **DESIGN** | brainstorming → autoplan → delphi-review (HARD-GATE ≥90% consensus) → to-issues → specification.yaml | specification.yaml + slices-manifest.json |
 | 3 | **3/6** | **BUILD** | GITHOOKS-GATE → DELPHI-GATE → ralph-loop (default) or parallel → TDD → freeze → blind review → verification | MVP code |
 | 4 | **4/6** | **VERIFY** | delphi-review --mode code-walkthrough → test-specification-alignment → browse QA → benchmark (optional) → learn + retro | Review report + feedback-log.md |
-| 5 | **5/6** | **SHIP** | finishing-a-development-branch → ship (create PR) → land-and-deploy → merge + CI + canary | PR URL + deploy status |
-| 6 | **6/6** | **CLOSE** | USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
+| 5 | **5/6** | **SHIP** | VERSION-GATE → finishing-a-development-branch → ship (create PR) → land-and-deploy → merge to main + CI + canary → release | PR URL + deploy status + merge confirmation |
+| 6 | **6/6** | **CLOSE** | SHIP→CLOSE GATE (merge + release verified) → Backup sprint-state → USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
 
 **Phase Flow**:
 ```
-PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
+PREP → DESIGN → BUILD → VERIFY → SHIP (merge to main + release) → CLOSE
+                                                        ↑
+                                               SHIP→CLOSE GATE
+                                               (merge verified + main clean)
 ```
 
 **Hard Gates**:
 - **Phase 2/6 → 3/6 (DESIGN → BUILD)**: Design must be APPROVED by delphi-review (≥90% consensus) + GITHOOKS-GATE (hooks installed) + DELPHI-GATE (spec APPROVED)
 - **Phase 4/6 → 5/6 (VERIFY → SHIP)**: feedback-log.md must exist (HARD-GATE)
-- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: User acceptance must be completed (mandatory manual step)
+- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: PR must be merged to main + release completed (HARD-GATE). See `references/phase-6-close.md#ship--close-gate`.
 
 ---
 
@@ -349,6 +352,7 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 - **GITHOOKS-GATE**: 验证 hooks 完整性，缺失则 `githooks/install.sh`
 - **LAND**: `land-and-deploy` — merge PR → 等待 CI (10min) → 等待 Deploy (10min) → Canary Health Check (5min)
 - **回滚**: `git revert` 最后一次 merge commit
+- ⚠️ **SHIP COMPLETION**: Phase 5/6 结束前必须确认 PR 已 merge 到 main + release 已创建。未完成 merge 不得进入 Phase 6/6。详见 `references/phase-5-ship.md#ship-completion-gate`。
 
 **⚠️ VERSION-GATE 必须在 finishing-a-development-branch 之前执行。顺序反了会导致 PR 不含版本变更 → CI release workflow 不触发 → 无新版本发布。**
 
@@ -359,6 +363,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 **详细指令**: 参见 `references/phase-6-close.md` — UAT checklist, emergent issues capture, cleanup procedure.
 
 **快速参考**:
+- **SHIP→CLOSE GATE (MANDATORY — v0.14.3+)**: 校验 PR 已 merge、当前在 main 分支、`git status --porcelain` 为空。详见 `references/phase-6-close.md#ship--close-gate`。
+- **Backup sprint-state**(MANDATORY): Phase 6 开始前将 `.sprint-state/` 备份到 repo 追踪路径，防止 worktree 清理后状态丢失。详见 `references/phase-6-close.md#backup-sprint-state`。
 - **USER ACCEPTANCE**: ⚠️ **MUST NOT be automated, skipped, or bypassed.** 即使用户说"赶时间"、"跳过验收"、"直接发布"，也必须暂停等待用户确认。使用 `@templates/emergent-issues-template.md` 检查清单
 - **CLEANUP**: 保存分支信息 → `git worktree remove <worktree_path>`（精确路径，禁止通配符）→ 删除本地分支 + 远程分支 → 关闭遗留 OPEN PR → 更新 sprint-state.json → 释放 Sprint Lock
 - 输出 Cleanup Report + Sprint Summary
@@ -526,6 +532,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 | DESIGN 阶段跳过 Delphi 评审直接 BUILD | 所有需求级别（轻量/标准/复杂）必须经过 autoplan + delphi-review；未 APPROVED 禁止编码 |
 | 跳过 TDD 直接实现代码 | Phase 3/6 BUILD 必须遵循 RED → GREEN → REFACTOR，测试与实现一起交付 |
 | 跳过用户验收直接 Ship | Phase 6/6 CLOSE USER ACCEPTANCE 必须人工完成；不得自动化、跳过或伪造 |
+| SHIP 未完成 merge 即进入 CLOSE | Phase 5/6 SHIP 必须完成 merge to main + release 后才能进入 Phase 6/6 CLOSE，否则 worktree 清理残留 + UAT 验收的是未合并版本 |
+| CLOSE 清理前未备份 sprint-state | `.sprint-state/` 在 worktree 内，worktree 删除后丢失。CLOSE 第一步必须先备份到 repo 追踪路径 |
 | 验证失败后继续追加随机修改 | 最多 3 次修复循环；仍失败则 BLOCK 并请求用户决策 |
 | 未生成 Phase Summary 就进入下一阶段 | 每个 Phase 必须写入 `.sprint-state/phase-outputs/phase-{N}-summary.md` 并通过 transition gate |
 

package/plugins/claude-code/skills/sprint-flow/references/phase-5-ship.md

@@ -93,3 +93,45 @@
 **条件跳过**: 无部署配置时仅 merge + CI
 
 **输出**: 部署状态 (success/failure/skipped), Canary 报告
+
+---
+
+## SHIP COMPLETION GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Ensure merge to main + release is complete before Phase 6/6 CLOSE. Without this gate, worktree cleanup fails (uncommitted changes + unmerged branch) and UAT happens on the wrong version (PR branch, not main).
+
+**Execution** (BEFORE transitioning to Phase 6/6):
+
+```
+1. Verify PR is merged:
+   gh pr list --head <sprint-branch> --state merged --json number
+   → If no merged PR: BLOCK. Do NOT proceed to Phase 6/6.
+
+2. Verify current branch is main:
+   CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+   → If not main/master: BLOCK. Switch to main first.
+
+3. Verify git status is clean:
+   git status --porcelain
+   → If not empty: BLOCK. Stash or commit changes first.
+
+4. Verify release exists:
+   gh release view v<X.Y.Z> --json tagName
+   → If not found: WARNING (manual release may have failed). Ask user.
+
+5. Pull latest main:
+   git checkout main && git pull
+```
+
+**GATE CHECK** (BEFORE Phase 6/6 CLOSE):
+```
+[SHIP→CLOSE GATE] PR merged ✓        # PR is in merged state
+[SHIP→CLOSE GATE] on main branch ✓   # Current branch is main/master
+[SHIP→CLOSE GATE] clean status ✓     # No uncommitted changes
+[SHIP→CLOSE GATE] release exists ✓   # GitHub Release created
+[SHIP→CLOSE GATE] main up-to-date ✓  # Pulled latest
+```
+
+**IF GATE FAILS**: Orchestrator MUST complete the merge/release steps BEFORE proceeding to Phase 6/6. Do NOT skip to CLOSE.
+
+**Output**: SHIP completion confirmation, ready for Phase 6/6.

package/plugins/claude-code/skills/sprint-flow/references/phase-6-close.md

@@ -1,12 +1,53 @@
 # Phase 6/6: CLOSE（收尾 — ⚠️ 人工验收 + 清理）
 
-**执行时机**: Phase 5/6 SHIP 完成后。
+**执行时机**: Phase 5/6 SHIP 完成后（merge to main + release 已完成）。
 **对应旧模型**: Phase 7 USER ACCEPTANCE + Phase 8 CLEANUP
 
 **NETWORK-RESILIENCE**: 与 Phase 5/6 相同，GitHub API 在大中华区存在间歇性超时。CLEANUP 中的 `gh pr list` 和 `git push --delete` 需容忍重试。详见 `phase-5-ship.md` NETWORK-RESILIENCE 指南。
 
 ---
 
+## ⚠️ HARD-GATE: SHIP→CLOSE GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Verify that Phase 5/6 SHIP fully completed (merge to main + release) before entering Phase 6/6 CLOSE. This gate prevents:
+- Worktree cleanup failure (uncommitted changes prevent `git worktree remove`)
+- UAT on wrong version (PR branch instead of merged main)
+
+**Execution**: Before ANY Phase 6/6 step, run the SHIP→CLOSE GATE checks defined in `phase-5-ship.md#ship-completion-gate`.
+
+**If gate fails**: Return to Phase 5/6 SHIP to complete merge/release. Do NOT proceed with CLOSE.
+
+---
+
+## Backup Sprint State (MANDATORY — v0.14.3+)
+
+**Purpose**: `.sprint-state/` is gitignored and lives inside the worktree. When the worktree is removed during CLEANUP, all sprint state is lost. This step copies it into the main repository before cleanup.
+
+**Execution** (immediately after SHIP→CLOSE GATE passes):
+
+```bash
+# 1. Read sprint ID
+SPRINT_ID=$(cat .sprint-state/sprint-state.json | grep '"id"' | head -1 | sed 's/.*"id": *"\([^"]*\)".*/\1/')
+
+# 2. Backup to repo-tracked path (.sprint-history is NOT in .gitignore)
+BACKUP_DIR=".sprint-history/${SPRINT_ID}"
+mkdir -p "$BACKUP_DIR"
+cp -r .sprint-state/* "$BACKUP_DIR/"
+
+# 3. Verify backup
+ls "$BACKUP_DIR/sprint-state.json" && echo "✅ Sprint state backed up to $BACKUP_DIR"
+```
+
+**GATE CHECK**:
+```
+[BACKUP] sprint-state.json copied ✓
+[BACKUP] phase-outputs/ preserved ✓
+```
+
+**Output**: `.sprint-history/<sprint-id>/` contains full sprint state, safely outside the worktree.
+
+---
+
 ## Part A: USER ACCEPTANCE（⚠️ 人工验收）
 
 ### 目标

package/plugins/claude-code/skills/test-specification-alignment/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/TEST-SPECIFICATION-ALIGNMENT KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Test-Specification Alignment Engine — two-stage validation ensuring tests accurately reflect requirements and design specs.

package/plugins/opencode/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boyingliu01/opencode-plugin",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "type": "module",
   "main": "index.ts",
   "description": "XP-Gate quality gates + AI workflow skills + Sprint Flow TUI sidebar for OpenCode",

package/plugins/opencode/skills/delphi-review/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/DELPHI-REVIEW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Delphi Consensus Review — multi-round anonymous expert review (≥90% threshold, 3 experts from ≥2 providers, domestic models only). Supports design + code-walkthrough modes.

package/plugins/opencode/skills/sprint-flow/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/SPRINT-FLOW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 **6-phase** development pipeline (v2.0 compact redesign, Issue #290): PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE. Phase 3/6 BUILD default build mode is **ralph-loop** (REQ-level iteration, 40-67% token savings vs parallel). HARD-GATE between DESIGN (2/6) and BUILD (3/6): design must pass Delphi review (≥90% consensus) before any coding.

package/plugins/opencode/skills/sprint-flow/SKILL.md

@@ -193,8 +193,8 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 - **Phase 2/6 DESIGN**: brainstorming 设计未 APPROVED (HARD-GATE) → 用户修改 → APPROVED 后继续；autoplan taste_decisions → 用户确认；delphi-review 未 APPROVED → 修复 → APPROVED → specification.yaml
 - **Phase 3/6 BUILD**: DELPHI-GATE 未通过 → BLOCK；验证失败 > max3 → 用户决策修复/放弃；成本超阈值 → 用户确认
 - **Phase 4/6 VERIFY**: delphi code-walkthrough REQUEST_CHANGES → 用户处理 → 重新评审；browse 发现问题 → 回退 Phase 3（不暂停）
-- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认
-- **Phase 6/6 CLOSE**: USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
+- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认；⚠️ SHIP must complete merge to main + release before Phase 6
+- **Phase 6/6 CLOSE**: SHIP→CLOSE GATE (校验 merge 已完成 + git status clean + 当前在 main) → Backup sprint-state → USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
 
 ---
 
@@ -206,18 +206,21 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 | 2 | **2/6** | **DESIGN** | brainstorming → autoplan → delphi-review (HARD-GATE ≥90% consensus) → to-issues → specification.yaml | specification.yaml + slices-manifest.json |
 | 3 | **3/6** | **BUILD** | GITHOOKS-GATE → DELPHI-GATE → ralph-loop (default) or parallel → TDD → freeze → blind review → verification | MVP code |
 | 4 | **4/6** | **VERIFY** | delphi-review --mode code-walkthrough → test-specification-alignment → browse QA → benchmark (optional) → learn + retro | Review report + feedback-log.md |
-| 5 | **5/6** | **SHIP** | finishing-a-development-branch → ship (create PR) → land-and-deploy → merge + CI + canary | PR URL + deploy status |
-| 6 | **6/6** | **CLOSE** | USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
+| 5 | **5/6** | **SHIP** | VERSION-GATE → finishing-a-development-branch → ship (create PR) → land-and-deploy → merge to main + CI + canary → release | PR URL + deploy status + merge confirmation |
+| 6 | **6/6** | **CLOSE** | SHIP→CLOSE GATE (merge + release verified) → Backup sprint-state → USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
 
 **Phase Flow**:
 ```
-PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
+PREP → DESIGN → BUILD → VERIFY → SHIP (merge to main + release) → CLOSE
+                                                        ↑
+                                               SHIP→CLOSE GATE
+                                               (merge verified + main clean)
 ```
 
 **Hard Gates**:
 - **Phase 2/6 → 3/6 (DESIGN → BUILD)**: Design must be APPROVED by delphi-review (≥90% consensus) + GITHOOKS-GATE (hooks installed) + DELPHI-GATE (spec APPROVED)
 - **Phase 4/6 → 5/6 (VERIFY → SHIP)**: feedback-log.md must exist (HARD-GATE)
-- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: User acceptance must be completed (mandatory manual step)
+- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: PR must be merged to main + release completed (HARD-GATE). See `references/phase-6-close.md#ship--close-gate`.
 
 ---
 
@@ -349,6 +352,7 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 - **GITHOOKS-GATE**: 验证 hooks 完整性，缺失则 `githooks/install.sh`
 - **LAND**: `land-and-deploy` — merge PR → 等待 CI (10min) → 等待 Deploy (10min) → Canary Health Check (5min)
 - **回滚**: `git revert` 最后一次 merge commit
+- ⚠️ **SHIP COMPLETION**: Phase 5/6 结束前必须确认 PR 已 merge 到 main + release 已创建。未完成 merge 不得进入 Phase 6/6。详见 `references/phase-5-ship.md#ship-completion-gate`。
 
 **⚠️ VERSION-GATE 必须在 finishing-a-development-branch 之前执行。顺序反了会导致 PR 不含版本变更 → CI release workflow 不触发 → 无新版本发布。**
 
@@ -359,6 +363,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 **详细指令**: 参见 `references/phase-6-close.md` — UAT checklist, emergent issues capture, cleanup procedure.
 
 **快速参考**:
+- **SHIP→CLOSE GATE (MANDATORY — v0.14.3+)**: 校验 PR 已 merge、当前在 main 分支、`git status --porcelain` 为空。详见 `references/phase-6-close.md#ship--close-gate`。
+- **Backup sprint-state**(MANDATORY): Phase 6 开始前将 `.sprint-state/` 备份到 repo 追踪路径，防止 worktree 清理后状态丢失。详见 `references/phase-6-close.md#backup-sprint-state`。
 - **USER ACCEPTANCE**: ⚠️ **MUST NOT be automated, skipped, or bypassed.** 即使用户说"赶时间"、"跳过验收"、"直接发布"，也必须暂停等待用户确认。使用 `@templates/emergent-issues-template.md` 检查清单
 - **CLEANUP**: 保存分支信息 → `git worktree remove <worktree_path>`（精确路径，禁止通配符）→ 删除本地分支 + 远程分支 → 关闭遗留 OPEN PR → 更新 sprint-state.json → 释放 Sprint Lock
 - 输出 Cleanup Report + Sprint Summary
@@ -526,6 +532,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 | DESIGN 阶段跳过 Delphi 评审直接 BUILD | 所有需求级别（轻量/标准/复杂）必须经过 autoplan + delphi-review；未 APPROVED 禁止编码 |
 | 跳过 TDD 直接实现代码 | Phase 3/6 BUILD 必须遵循 RED → GREEN → REFACTOR，测试与实现一起交付 |
 | 跳过用户验收直接 Ship | Phase 6/6 CLOSE USER ACCEPTANCE 必须人工完成；不得自动化、跳过或伪造 |
+| SHIP 未完成 merge 即进入 CLOSE | Phase 5/6 SHIP 必须完成 merge to main + release 后才能进入 Phase 6/6 CLOSE，否则 worktree 清理残留 + UAT 验收的是未合并版本 |
+| CLOSE 清理前未备份 sprint-state | `.sprint-state/` 在 worktree 内，worktree 删除后丢失。CLOSE 第一步必须先备份到 repo 追踪路径 |
 | 验证失败后继续追加随机修改 | 最多 3 次修复循环；仍失败则 BLOCK 并请求用户决策 |
 | 未生成 Phase Summary 就进入下一阶段 | 每个 Phase 必须写入 `.sprint-state/phase-outputs/phase-{N}-summary.md` 并通过 transition gate |
 

package/plugins/opencode/skills/sprint-flow/references/phase-5-ship.md

@@ -93,3 +93,45 @@
 **条件跳过**: 无部署配置时仅 merge + CI
 
 **输出**: 部署状态 (success/failure/skipped), Canary 报告
+
+---
+
+## SHIP COMPLETION GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Ensure merge to main + release is complete before Phase 6/6 CLOSE. Without this gate, worktree cleanup fails (uncommitted changes + unmerged branch) and UAT happens on the wrong version (PR branch, not main).
+
+**Execution** (BEFORE transitioning to Phase 6/6):
+
+```
+1. Verify PR is merged:
+   gh pr list --head <sprint-branch> --state merged --json number
+   → If no merged PR: BLOCK. Do NOT proceed to Phase 6/6.
+
+2. Verify current branch is main:
+   CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+   → If not main/master: BLOCK. Switch to main first.
+
+3. Verify git status is clean:
+   git status --porcelain
+   → If not empty: BLOCK. Stash or commit changes first.
+
+4. Verify release exists:
+   gh release view v<X.Y.Z> --json tagName
+   → If not found: WARNING (manual release may have failed). Ask user.
+
+5. Pull latest main:
+   git checkout main && git pull
+```
+
+**GATE CHECK** (BEFORE Phase 6/6 CLOSE):
+```
+[SHIP→CLOSE GATE] PR merged ✓        # PR is in merged state
+[SHIP→CLOSE GATE] on main branch ✓   # Current branch is main/master
+[SHIP→CLOSE GATE] clean status ✓     # No uncommitted changes
+[SHIP→CLOSE GATE] release exists ✓   # GitHub Release created
+[SHIP→CLOSE GATE] main up-to-date ✓  # Pulled latest
+```
+
+**IF GATE FAILS**: Orchestrator MUST complete the merge/release steps BEFORE proceeding to Phase 6/6. Do NOT skip to CLOSE.
+
+**Output**: SHIP completion confirmation, ready for Phase 6/6.

package/plugins/opencode/skills/sprint-flow/references/phase-6-close.md

@@ -1,12 +1,53 @@
 # Phase 6/6: CLOSE（收尾 — ⚠️ 人工验收 + 清理）
 
-**执行时机**: Phase 5/6 SHIP 完成后。
+**执行时机**: Phase 5/6 SHIP 完成后（merge to main + release 已完成）。
 **对应旧模型**: Phase 7 USER ACCEPTANCE + Phase 8 CLEANUP
 
 **NETWORK-RESILIENCE**: 与 Phase 5/6 相同，GitHub API 在大中华区存在间歇性超时。CLEANUP 中的 `gh pr list` 和 `git push --delete` 需容忍重试。详见 `phase-5-ship.md` NETWORK-RESILIENCE 指南。
 
 ---
 
+## ⚠️ HARD-GATE: SHIP→CLOSE GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Verify that Phase 5/6 SHIP fully completed (merge to main + release) before entering Phase 6/6 CLOSE. This gate prevents:
+- Worktree cleanup failure (uncommitted changes prevent `git worktree remove`)
+- UAT on wrong version (PR branch instead of merged main)
+
+**Execution**: Before ANY Phase 6/6 step, run the SHIP→CLOSE GATE checks defined in `phase-5-ship.md#ship-completion-gate`.
+
+**If gate fails**: Return to Phase 5/6 SHIP to complete merge/release. Do NOT proceed with CLOSE.
+
+---
+
+## Backup Sprint State (MANDATORY — v0.14.3+)
+
+**Purpose**: `.sprint-state/` is gitignored and lives inside the worktree. When the worktree is removed during CLEANUP, all sprint state is lost. This step copies it into the main repository before cleanup.
+
+**Execution** (immediately after SHIP→CLOSE GATE passes):
+
+```bash
+# 1. Read sprint ID
+SPRINT_ID=$(cat .sprint-state/sprint-state.json | grep '"id"' | head -1 | sed 's/.*"id": *"\([^"]*\)".*/\1/')
+
+# 2. Backup to repo-tracked path (.sprint-history is NOT in .gitignore)
+BACKUP_DIR=".sprint-history/${SPRINT_ID}"
+mkdir -p "$BACKUP_DIR"
+cp -r .sprint-state/* "$BACKUP_DIR/"
+
+# 3. Verify backup
+ls "$BACKUP_DIR/sprint-state.json" && echo "✅ Sprint state backed up to $BACKUP_DIR"
+```
+
+**GATE CHECK**:
+```
+[BACKUP] sprint-state.json copied ✓
+[BACKUP] phase-outputs/ preserved ✓
+```
+
+**Output**: `.sprint-history/<sprint-id>/` contains full sprint state, safely outside the worktree.
+
+---
+
 ## Part A: USER ACCEPTANCE（⚠️ 人工验收）
 
 ### 目标

package/plugins/opencode/skills/test-specification-alignment/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/TEST-SPECIFICATION-ALIGNMENT KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Test-Specification Alignment Engine — two-stage validation ensuring tests accurately reflect requirements and design specs.

package/plugins/qoder/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "xp-gate",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "displayName": "XP-Gate",
   "description": "Extreme Programming quality gates + AI workflow skills for Qoder. Includes 10 quality gates (Gate 0-9), Sprint Flow (11 phases), and Delphi multi-expert review (>=90% consensus).",
   "author": {

package/plugins/qoder/skills/delphi-review/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/DELPHI-REVIEW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Delphi Consensus Review — multi-round anonymous expert review (≥90% threshold, 3 experts from ≥2 providers, domestic models only). Supports design + code-walkthrough modes.

package/plugins/qoder/skills/sprint-flow/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/SPRINT-FLOW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 **6-phase** development pipeline (v2.0 compact redesign, Issue #290): PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE. Phase 3/6 BUILD default build mode is **ralph-loop** (REQ-level iteration, 40-67% token savings vs parallel). HARD-GATE between DESIGN (2/6) and BUILD (3/6): design must pass Delphi review (≥90% consensus) before any coding.

package/plugins/qoder/skills/test-specification-alignment/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/TEST-SPECIFICATION-ALIGNMENT KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Test-Specification Alignment Engine — two-stage validation ensuring tests accurately reflect requirements and design specs.

package/principles/AGENTS.md

@@ -1,9 +1,9 @@
 # PRINCIPLES CHECKER MODULE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Clean Code & SOLID principles checker — **Gate 4** of pre-commit. 14 rules × 9 language adapters, SARIF 2.1.0 output. Houses the **Boy Scout Rule** enforcement engine (Gate 6) and warning-baseline storage.

package/skills/delphi-review/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/DELPHI-REVIEW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Delphi Consensus Review — multi-round anonymous expert review (≥90% threshold, 3 experts from ≥2 providers, domestic models only). Supports design + code-walkthrough modes.

package/skills/sprint-flow/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/SPRINT-FLOW KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 **6-phase** development pipeline (v2.0 compact redesign, Issue #290): PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE. Phase 3/6 BUILD default build mode is **ralph-loop** (REQ-level iteration, 40-67% token savings vs parallel). HARD-GATE between DESIGN (2/6) and BUILD (3/6): design must pass Delphi review (≥90% consensus) before any coding.

package/skills/sprint-flow/SKILL.md

@@ -193,8 +193,8 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 - **Phase 2/6 DESIGN**: brainstorming 设计未 APPROVED (HARD-GATE) → 用户修改 → APPROVED 后继续；autoplan taste_decisions → 用户确认；delphi-review 未 APPROVED → 修复 → APPROVED → specification.yaml
 - **Phase 3/6 BUILD**: DELPHI-GATE 未通过 → BLOCK；验证失败 > max3 → 用户决策修复/放弃；成本超阈值 → 用户确认
 - **Phase 4/6 VERIFY**: delphi code-walkthrough REQUEST_CHANGES → 用户处理 → 重新评审；browse 发现问题 → 回退 Phase 3（不暂停）
-- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认
-- **Phase 6/6 CLOSE**: USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
+- **Phase 5/6 SHIP**: finishing-a-development-branch (4选项) → 确认；ship PR → 用户确认合并；land-and-deploy 完成/失败 → 用户确认；⚠️ SHIP must complete merge to main + release before Phase 6
+- **Phase 6/6 CLOSE**: SHIP→CLOSE GATE (校验 merge 已完成 + git status clean + 当前在 main) → Backup sprint-state → USER ACCEPTANCE ⚠️ 必须人工验收 → 用户确认后继续；cleanup 完成/失败 → 用户确认 → 结束流程
 
 ---
 
@@ -206,18 +206,21 @@ Phase 6/6: CLOSE → USER ACCEPTANCE (⚠️ 人工) → emergent issues → cle
 | 2 | **2/6** | **DESIGN** | brainstorming → autoplan → delphi-review (HARD-GATE ≥90% consensus) → to-issues → specification.yaml | specification.yaml + slices-manifest.json |
 | 3 | **3/6** | **BUILD** | GITHOOKS-GATE → DELPHI-GATE → ralph-loop (default) or parallel → TDD → freeze → blind review → verification | MVP code |
 | 4 | **4/6** | **VERIFY** | delphi-review --mode code-walkthrough → test-specification-alignment → browse QA → benchmark (optional) → learn + retro | Review report + feedback-log.md |
-| 5 | **5/6** | **SHIP** | finishing-a-development-branch → ship (create PR) → land-and-deploy → merge + CI + canary | PR URL + deploy status |
-| 6 | **6/6** | **CLOSE** | USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
+| 5 | **5/6** | **SHIP** | VERSION-GATE → finishing-a-development-branch → ship (create PR) → land-and-deploy → merge to main + CI + canary → release | PR URL + deploy status + merge confirmation |
+| 6 | **6/6** | **CLOSE** | SHIP→CLOSE GATE (merge + release verified) → Backup sprint-state → USER ACCEPTANCE (⚠️ mandatory manual) → Capture emergent issues → Cleanup worktree + branch → Sprint summary | Emergent issues list + cleanup report |
 
 **Phase Flow**:
 ```
-PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
+PREP → DESIGN → BUILD → VERIFY → SHIP (merge to main + release) → CLOSE
+                                                        ↑
+                                               SHIP→CLOSE GATE
+                                               (merge verified + main clean)
 ```
 
 **Hard Gates**:
 - **Phase 2/6 → 3/6 (DESIGN → BUILD)**: Design must be APPROVED by delphi-review (≥90% consensus) + GITHOOKS-GATE (hooks installed) + DELPHI-GATE (spec APPROVED)
 - **Phase 4/6 → 5/6 (VERIFY → SHIP)**: feedback-log.md must exist (HARD-GATE)
-- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: User acceptance must be completed (mandatory manual step)
+- **Phase 5/6 → 6/6 (SHIP → CLOSE)**: PR must be merged to main + release completed (HARD-GATE). See `references/phase-6-close.md#ship--close-gate`.
 
 ---
 
@@ -349,6 +352,7 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 - **GITHOOKS-GATE**: 验证 hooks 完整性，缺失则 `githooks/install.sh`
 - **LAND**: `land-and-deploy` — merge PR → 等待 CI (10min) → 等待 Deploy (10min) → Canary Health Check (5min)
 - **回滚**: `git revert` 最后一次 merge commit
+- ⚠️ **SHIP COMPLETION**: Phase 5/6 结束前必须确认 PR 已 merge 到 main + release 已创建。未完成 merge 不得进入 Phase 6/6。详见 `references/phase-5-ship.md#ship-completion-gate`。
 
 **⚠️ VERSION-GATE 必须在 finishing-a-development-branch 之前执行。顺序反了会导致 PR 不含版本变更 → CI release workflow 不触发 → 无新版本发布。**
 
@@ -359,6 +363,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 **详细指令**: 参见 `references/phase-6-close.md` — UAT checklist, emergent issues capture, cleanup procedure.
 
 **快速参考**:
+- **SHIP→CLOSE GATE (MANDATORY — v0.14.3+)**: 校验 PR 已 merge、当前在 main 分支、`git status --porcelain` 为空。详见 `references/phase-6-close.md#ship--close-gate`。
+- **Backup sprint-state**(MANDATORY): Phase 6 开始前将 `.sprint-state/` 备份到 repo 追踪路径，防止 worktree 清理后状态丢失。详见 `references/phase-6-close.md#backup-sprint-state`。
 - **USER ACCEPTANCE**: ⚠️ **MUST NOT be automated, skipped, or bypassed.** 即使用户说"赶时间"、"跳过验收"、"直接发布"，也必须暂停等待用户确认。使用 `@templates/emergent-issues-template.md` 检查清单
 - **CLEANUP**: 保存分支信息 → `git worktree remove <worktree_path>`（精确路径，禁止通配符）→ 删除本地分支 + 远程分支 → 关闭遗留 OPEN PR → 更新 sprint-state.json → 释放 Sprint Lock
 - 输出 Cleanup Report + Sprint Summary
@@ -526,6 +532,8 @@ Sprint Flow: PREP → DESIGN → BUILD → VERIFY → SHIP → CLOSE
 | DESIGN 阶段跳过 Delphi 评审直接 BUILD | 所有需求级别（轻量/标准/复杂）必须经过 autoplan + delphi-review；未 APPROVED 禁止编码 |
 | 跳过 TDD 直接实现代码 | Phase 3/6 BUILD 必须遵循 RED → GREEN → REFACTOR，测试与实现一起交付 |
 | 跳过用户验收直接 Ship | Phase 6/6 CLOSE USER ACCEPTANCE 必须人工完成；不得自动化、跳过或伪造 |
+| SHIP 未完成 merge 即进入 CLOSE | Phase 5/6 SHIP 必须完成 merge to main + release 后才能进入 Phase 6/6 CLOSE，否则 worktree 清理残留 + UAT 验收的是未合并版本 |
+| CLOSE 清理前未备份 sprint-state | `.sprint-state/` 在 worktree 内，worktree 删除后丢失。CLOSE 第一步必须先备份到 repo 追踪路径 |
 | 验证失败后继续追加随机修改 | 最多 3 次修复循环；仍失败则 BLOCK 并请求用户决策 |
 | 未生成 Phase Summary 就进入下一阶段 | 每个 Phase 必须写入 `.sprint-state/phase-outputs/phase-{N}-summary.md` 并通过 transition gate |
 

package/skills/sprint-flow/references/phase-5-ship.md

@@ -93,3 +93,45 @@
 **条件跳过**: 无部署配置时仅 merge + CI
 
 **输出**: 部署状态 (success/failure/skipped), Canary 报告
+
+---
+
+## SHIP COMPLETION GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Ensure merge to main + release is complete before Phase 6/6 CLOSE. Without this gate, worktree cleanup fails (uncommitted changes + unmerged branch) and UAT happens on the wrong version (PR branch, not main).
+
+**Execution** (BEFORE transitioning to Phase 6/6):
+
+```
+1. Verify PR is merged:
+   gh pr list --head <sprint-branch> --state merged --json number
+   → If no merged PR: BLOCK. Do NOT proceed to Phase 6/6.
+
+2. Verify current branch is main:
+   CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+   → If not main/master: BLOCK. Switch to main first.
+
+3. Verify git status is clean:
+   git status --porcelain
+   → If not empty: BLOCK. Stash or commit changes first.
+
+4. Verify release exists:
+   gh release view v<X.Y.Z> --json tagName
+   → If not found: WARNING (manual release may have failed). Ask user.
+
+5. Pull latest main:
+   git checkout main && git pull
+```
+
+**GATE CHECK** (BEFORE Phase 6/6 CLOSE):
+```
+[SHIP→CLOSE GATE] PR merged ✓        # PR is in merged state
+[SHIP→CLOSE GATE] on main branch ✓   # Current branch is main/master
+[SHIP→CLOSE GATE] clean status ✓     # No uncommitted changes
+[SHIP→CLOSE GATE] release exists ✓   # GitHub Release created
+[SHIP→CLOSE GATE] main up-to-date ✓  # Pulled latest
+```
+
+**IF GATE FAILS**: Orchestrator MUST complete the merge/release steps BEFORE proceeding to Phase 6/6. Do NOT skip to CLOSE.
+
+**Output**: SHIP completion confirmation, ready for Phase 6/6.

package/skills/sprint-flow/references/phase-6-close.md

@@ -1,12 +1,53 @@
 # Phase 6/6: CLOSE（收尾 — ⚠️ 人工验收 + 清理）
 
-**执行时机**: Phase 5/6 SHIP 完成后。
+**执行时机**: Phase 5/6 SHIP 完成后（merge to main + release 已完成）。
 **对应旧模型**: Phase 7 USER ACCEPTANCE + Phase 8 CLEANUP
 
 **NETWORK-RESILIENCE**: 与 Phase 5/6 相同，GitHub API 在大中华区存在间歇性超时。CLEANUP 中的 `gh pr list` 和 `git push --delete` 需容忍重试。详见 `phase-5-ship.md` NETWORK-RESILIENCE 指南。
 
 ---
 
+## ⚠️ HARD-GATE: SHIP→CLOSE GATE (MANDATORY — v0.14.3+)
+
+**Purpose**: Verify that Phase 5/6 SHIP fully completed (merge to main + release) before entering Phase 6/6 CLOSE. This gate prevents:
+- Worktree cleanup failure (uncommitted changes prevent `git worktree remove`)
+- UAT on wrong version (PR branch instead of merged main)
+
+**Execution**: Before ANY Phase 6/6 step, run the SHIP→CLOSE GATE checks defined in `phase-5-ship.md#ship-completion-gate`.
+
+**If gate fails**: Return to Phase 5/6 SHIP to complete merge/release. Do NOT proceed with CLOSE.
+
+---
+
+## Backup Sprint State (MANDATORY — v0.14.3+)
+
+**Purpose**: `.sprint-state/` is gitignored and lives inside the worktree. When the worktree is removed during CLEANUP, all sprint state is lost. This step copies it into the main repository before cleanup.
+
+**Execution** (immediately after SHIP→CLOSE GATE passes):
+
+```bash
+# 1. Read sprint ID
+SPRINT_ID=$(cat .sprint-state/sprint-state.json | grep '"id"' | head -1 | sed 's/.*"id": *"\([^"]*\)".*/\1/')
+
+# 2. Backup to repo-tracked path (.sprint-history is NOT in .gitignore)
+BACKUP_DIR=".sprint-history/${SPRINT_ID}"
+mkdir -p "$BACKUP_DIR"
+cp -r .sprint-state/* "$BACKUP_DIR/"
+
+# 3. Verify backup
+ls "$BACKUP_DIR/sprint-state.json" && echo "✅ Sprint state backed up to $BACKUP_DIR"
+```
+
+**GATE CHECK**:
+```
+[BACKUP] sprint-state.json copied ✓
+[BACKUP] phase-outputs/ preserved ✓
+```
+
+**Output**: `.sprint-history/<sprint-id>/` contains full sprint state, safely outside the worktree.
+
+---
+
 ## Part A: USER ACCEPTANCE（⚠️ 人工验收）
 
 ### 目标

package/skills/test-specification-alignment/AGENTS.md

@@ -1,9 +1,9 @@
 # SKILLS/TEST-SPECIFICATION-ALIGNMENT KNOWLEDGE BASE
 
 **Generated:** 2026-07-09
-**Commit:** 744def0
+**Commit:** a09c009
 **Branch:** main
-**Version:** 0.14.2.0
+**Version:** 0.14.3.0
 
 ## OVERVIEW
 Test-Specification Alignment Engine — two-stage validation ensuring tests accurately reflect requirements and design specs.