@xulthekl/team-flow 0.42.0 → 0.43.1

package/.claude/always/phase-guard.md

@@ -1,3 +1,3 @@
-# team-flow v0.42.0 | 阶段: {{state}} | 工作流: {{workflow}}
+# team-flow v0.43.1 | 阶段: {{state}} | 工作流: {{workflow}}
 当前阶段允许的操作由 workflow-start 路由规则定义。
 禁止跨越 DP gate 进入下一阶段。变更范围以 execution-contract.md 的 Intent Lock 为准。

package/.claude-plugin/marketplace.json

@@ -9,7 +9,7 @@
     {
       "name": "team-flow",
       "description": "8-state spec workflow + compound global compounding + architecture-design (4A/DDD) + local HTML prototype + product-level orchestration + bootstrap + e2e + session handoff + workflow feedback. 24 skills + 15 agents with embedded TDD, SDD, code review, debugging, delta spec sync, and design-system-driven prototyping.",
-      "version": "0.42.0",
+      "version": "0.43.1",
       "source": "./",
       "author": {
         "name": "LT",

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "team-flow",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "description": "Unified workflow plugin: team-flow (spec-driven dev: TDD/SDD/code-review/debugging) + compound-engineering core subset (brainstorm/plan/compound/strategy/ideate/proof, global compounding) + architecture-design (4A+DDD incremental design & global compounding) + prototype (local HTML prototype, zero external deps) + e2e (Playwright E2E, AC-driven) + workflow-orchestrator (product-level workflow orchestration) + workflow-bootstrap (existing project onboarding) + session-handoff (context transfer) + workflow-feedback (issue tracking). 24 skills + 15 agents, one install.",
   "source": "./",
   "author": {

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "team-flow",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "description": "Spec-first workflow that bridges OpenSpec-style planning and Superpowers-style execution discipline.",
   "author": {
     "name": "MageByte",

package/.cursor-plugin/marketplace.json

@@ -5,7 +5,7 @@
   },
   "metadata": {
     "description": "Unified workflow plugin marketplace for Cursor (team-flow: team-flow + compound + architecture-design + prototype).",
-    "version": "0.42.0"
+    "version": "0.43.1"
   },
   "plugins": [
     {

package/.cursor-plugin/plugin.json

@@ -2,7 +2,7 @@
   "name": "team-flow",
   "displayName": "team-flow",
   "description": "Unified workflow plugin: team-flow (spec-driven dev: TDD/SDD/code-review/debugging) + compound-engineering core subset (brainstorm/plan/compound/strategy/ideate/proof, global compounding) + architecture-design (4A+DDD incremental design & global compounding) + prototype (local HTML prototype, zero external deps) + e2e (Playwright E2E, AC-driven) + workflow-orchestrator (product-level workflow orchestration) + workflow-bootstrap (existing project onboarding) + session-handoff (context transfer) + workflow-feedback (issue tracking). 24 skills + 15 agents, one install.",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "author": {
     "name": "LT",
     "url": "https://github.com/LT"

package/.github/plugin/marketplace.json

@@ -6,13 +6,13 @@
   },
   "metadata": {
     "description": "Unified workflow plugins and skills for AI coding agents (team-flow: team-flow + compound + architecture-design + prototype).",
-    "version": "0.42.0"
+    "version": "0.43.1"
   },
   "plugins": [
     {
       "name": "team-flow",
       "description": "Unified workflow with planning artifacts, execution contracts, TDD, review gates, systematic debugging, delta spec sync, architecture-design, and local HTML prototyping.",
-      "version": "0.42.0",
+      "version": "0.43.1",
       "source": ".",
       "author": {
         "name": "LT",

package/.zcode/skills/workflow-start/SKILL.md

@@ -30,7 +30,7 @@ Run DP-0 when: change folder doesn't exist, planning artifacts missing/empty, or
 
 ### Upstream Inheritance (v0.9)
 
-若 `change-brief.md` 存在且 `upstream_source == orchestrator`（本 change 由 orchestrator S4 分发），**继承** brief 的 scope/约束/AC 为默认值，DP-0 从"从零问"改为"一次确认继承或修正"，**不**重新问"你想做什么"。否则（手动新建 / hotfix / 单 change 快速通道 / 存量 change 无 brief）照常 DP-0。**主信号 = brief 文件存在**（非 yaml 字段——可天然排除无 brief 的快速通道，且对存量手动 change 零误伤）；双源冲突以 `prd/vN/plan.md` 为准并触发 Brief drift（见「Staleness Detection」）。完整判定伪代码与主信号理由见 `references/routing-rules.md`「DP-0」。
+若 `change-brief.md` 存在且 `upstream_source == orchestrator`（本 change 由 orchestrator S4 分发），**继承** brief 的 scope/约束/AC 为默认值，DP-0 从"从零问"改为"一次确认继承或修正"，**不**重新问"你想做什么"。否则（手动新建 / hotfix / 单 change 快速通道 / 存量 change 无 brief）照常 DP-0。**主信号 = brief 文件存在**（非 yaml 字段——可天然排除无 brief 的快速通道，且对存量手动 change 零误伤）；双源冲突以 `requirement/vN/plan.md` 为准并触发 Brief drift（见「Staleness Detection」）。完整判定伪代码与主信号理由见 `references/routing-rules.md`「DP-0」。
 
 Ask (manual path): change name + one-sentence intent, known constraints, related optimizations (include or stay focused?), communication preference (ask per decision or draft for review).
 
@@ -119,7 +119,7 @@ Use content inspection, not timestamps.
 
 **Stale tasks**: requirement in specs has no corresponding task → stale tasks.
 
-**Brief drift (advisory, v0.9, 不阻断)**: change-brief.md 是上游输入（非 team-flow 产物），**不**混入上述三条产物互查、**不**进入 `artifacts_hash`。当 brief 的 `plan_hash` 与当前 `prd/vN/plan.md` 不一致，或 brief AC 列表与 PRD 功能清单明显出入 → 提示"产品层已变更，brief 可能过期，建议回 orchestrator 重新分发（S4→S3 环路）"，**不**触发产物重审。
+**Brief drift (advisory, v0.9, 不阻断)**: change-brief.md 是上游输入（非 team-flow 产物），**不**混入上述三条产物互查、**不**进入 `artifacts_hash`。当 brief 的 `plan_hash` 与当前 `requirement/vN/plan.md` 不一致，或 brief AC 列表与 PRD 功能清单明显出入 → 提示"产品层已变更，brief 可能过期，建议回 orchestrator 重新分发（S4→S3 环路）"，**不**触发产物重审。
 
 ## Guardrails
 

package/AGENTS.md

@@ -93,7 +93,7 @@ spec 驱动开发过程。8 态变更机：`exploring → specifying → bridgin
   ├── requirements/<req-id>/orchestrator.yaml  # 每需求产品级编排状态
   ├── handoffs/                 # 会话交接文档（v0.16.0 新增，session-handoff 产出，.gitignore）
   └── feedback/                 # 工作流问题记录（v0.16.0 新增，workflow-feedback 产出，git 跟踪）
-prd/                    PRD（有版本 v1→v2→v3，git 分支隔离）
+requirement/            PRD + 台账（有版本 v1→v2→v3，git 分支隔离）
   └── vN/
       ├── prd.md              # 业务要件（ce-brainstorm 产出）
       ├── plan.md             # 实施方案（ce-plan 产出，产品级策略）
@@ -105,7 +105,7 @@ docs/
   ├── architecture/    全局架构三层（v0.36.0）：L1 当前态（ARCHITECTURE.md marker 区 / PHYSICAL-MODEL.md / DATABASE.md / API-INDEX.md / INDEX.md / domains/<bc>.md / diagrams/ / schema-baseline.sql / baseline.md）+ L2 changelog/ + L3 iterations/vN/architecture.md（产品级快照，archived 退役）
   └── solutions/       复利经验库（v0.5 新增，三层索引）
       ├── INDEX.md     # L1 轻量索引（≤150行，每条一行摘要+标签）
-      ├── prd/ plan/ architecture/ prototype/ spec/ build/ review/ cross-phase/  # L2 分阶段目录（v0.36.0 加 architecture）
+      ├── requirement/ plan/ architecture/ prototype/ spec/ build/ review/ cross-phase/  # L2 分阶段目录（v0.36.0 加 architecture）
       └── <file>.md    # L3 经验文件（YAML frontmatter: phase/domain/type/severity）
 changes/<name>/        变更脚手架（S4 创建）：.team-flow.yaml（变更级状态文件）/ change-brief.md（产品级交接物，含 upstream_arch_ref）/ architecture/（变更级三件套 + sql/）
 specs/<cap>/            每变更设计/任务/契约：spec.md / design.md / tasks.md / execution-contract.md / learnings.md（v0.9 起 architecture/ 三件套已迁至 changes/<name>/architecture/）
@@ -244,7 +244,7 @@ STRATEGY.md CONCEPTS.md 产品策略(BA) / 领域词汇
 ```
 docs/solutions/
 ├── INDEX.md                  # L1：轻量索引（≤150行，每条一行摘要+标签，按 severity 降序）
-├── prd/ plan/ prototype/ spec/ build/ review/ cross-phase/  # L2：分阶段目录
+├── requirement/ plan/ prototype/ spec/ build/ review/ cross-phase/  # L2：分阶段目录
 └── <date>-<summary>.md      # L3：经验文件（YAML frontmatter: phase/domain/type/severity/date/source）
 ```
 

package/CHANGELOG.md

@@ -6,7 +6,29 @@ The format loosely follows Keep a Changelog.
 
 ## [Unreleased]
 
-### Added（workflow-bootstrap B5 降级路径设计 + session-start 语言要求，v0.42.0）
+### Added（closing 代码落地 + 文件存在性双层防护 + 测试执行可信度 + spec 路径契约，v0.43.1）
+
+- **`tf deisolate --merge` 健壮性增强**：dirty 阻断（未提交改动默认不合并，`--force` 跳过）/ ahead==0 短路（幂等）/ 冲突报告（unmerged 文件清单 + 非零 exit）
+- **release-archivist Step 5c Code Landing**：closing 增加代码落地检查（检测 worktree → AskUserQuestion 合并时机 → 主分支编译验证 + 依赖链顺序提示 + 冲突处理）；v0.35.0 Worktree Deisolation 段改为引用 Step 5c（MERGED/PENDING/N/A）
+- **references/worktree-merge.md（新建）**：worktree 合并规范（merge commit 不 rebase、多仓库 Case A、依赖链顺序、冲突人工处理、合并后编译验证）
+- **build-executor 任务完成前文件存在性验证**：Create 文件必须存在非空、Modify 必须有 diff，标记完成与文件存在绑定
+- **code-reviewer Step 1b File Existence Check**：tasks.md Create/Modify 清单与 git diff 求交集，缺失标 Critical（missing-file/no-change）
+- **build-executor Wave Verify**：`tf test record` 解析实际执行数量（分母排除 test_tier=e2e），<70% 警告 + 调查
+- **build-executor Test Infrastructure Check**：首 wave 前检测 surefire/JUnit @Nested 兼容性，沉淀 conventions
+- **spec-writer specs/ 路径契约**：`specs/<capability>/spec.md` 子目录结构（禁止 flat 文件）
+
+## [0.43.0] - 2026-08-07
+
+### Added（ce-brainstorm 阶段断点控制 + L1-L3 用户定义 + prd/ → requirement/ 路径收敛，v0.43.0）
+
+- **阶段断点控制（FB1）**：新增 Execution Architecture 节，4 个显式断点（BP-1 场景后 / BP-2 流程后 / BP-3 方案后 / BP-4 综合后），每个断点提供继续/暂停/回退三选项；主会话负责规划决策，子代理负责执行性产出（PRD 撰写、流程图、活动表）
+- **Phase 1.6 L1-L3 用户定义（FB3）**：Step 0 询问用户 L1-L3 流程层级规划（AI 不自行猜测），AI 聚焦 L4 子流程细化；两阶段确认（L1-L3 框架 → L4 细节逐 L3 确认）
+- **prd/ → requirement/ 路径收敛（FB2）**：新项目不再创建 `prd/` 目录，统一使用 `requirement/vN/`；PRD 输出路径改为 `requirement/vN/prd.md`；50+ 文件跨 skill/agent/template 路径更新；存量 `prd/` 保留 legacy fallback 读取兼容
+- **Phase 1.6 business-processes.md 重构**：新增 Step 0（L1-L3 用户定义）+ Step 1 重命名（聚焦 L4 推导）+ Step 5 两阶段确认
+
+## [0.42.0] - 2026-08-07
+
+### Added（workflow-bootstrap B5 降级路径设计 + session-start 语言要求）
 
 - **B5 路径决策重构（降级路径设计）**：4 平权选项 → 两组降级选项——第一组确保产物可信（A 逆向重建按复杂度分级推荐（≥5 模块或 ≥10 源文件强推）/ B 交叉验证主代理机械比对产出 cross-check-report.md / C 真实性核对用户确认门），第二组直接进入流程（D-F 原 A-C 平移）
 - **references/b5-path-decision.md（新建）**：B5 详细流程（分组展示模板、A 复杂度判据、B 比对清单 + 维度覆盖说明（architecture 显式排除理由）、C 两种模式核对协议（跟随 B / 独立抽查））

package/GEMINI.md

@@ -8,7 +8,7 @@ The workflow is self-contained and does not require OpenSpec or Superpowers at r
 
 
 <!-- team-flow-phase-guard-start -->
-# team-flow v0.42.0 | 阶段: {{state}} | 工作流: {{workflow}}
+# team-flow v0.43.1 | 阶段: {{state}} | 工作流: {{workflow}}
 当前阶段允许的操作由 workflow-start 路由规则定义。
 禁止跨越 DP gate 进入下一阶段。变更范围以 execution-contract.md 的 Intent Lock 为准。
 <!-- team-flow-phase-guard-end -->

package/HANDOFF.md

@@ -161,7 +161,7 @@ npm run check-versions # 版本一致性守卫（当前应 ✅ 全 0.22.4）
 
 ### 5.1 全局产物结构
 ```
-prd/                    PRD（有版本 v1→v2→v3，git 分支隔离）
+requirement/            PRD + 台账（有版本 v1→v2→v3，git 分支隔离）
 prototype/             全局原型系统（UI 契约真相源）
 docs/architecture/     全局架构锚点
 specs/<cap>/            每变更设计/任务/契约

package/INSTALL.md

@@ -7,7 +7,7 @@
 - [Fission-AI/OpenSpec](https://github.com/Fission-AI/OpenSpec) — 规划引擎（Schema 验证、Delta Spec、工件解析）
 - [obra/superpowers](https://github.com/obra/superpowers) — 执行纪律（TDD 铁律、SDD、系统化调试、代码审查）
 
-当前发布版本：**v0.42.0**。
+当前发布版本：**v0.43.1**。
 
 ---
 

package/README.md

@@ -1,6 +1,6 @@
 # team-flow
 
-> 当前版本：`v0.42.0`
+> 当前版本：`v0.43.1`
 
 > 统一插件：**team-flow**（spec 驱动开发）+ **compound-engineering 核心子集**（全局复利）+ **architecture-design**（4A+DDD 增量设计）+ **prototype**（本地 HTML 原型）+ **e2e**（AC 驱动 E2E）+ **workflow-orchestrator**（产品级编排）+ **workflow-bootstrap**（既有项目接入）。一次安装，七套能力协同。
 
@@ -56,12 +56,12 @@ git clone <your-repo> && <cli> plugin install ./team-flow
 cp -r <plugin>/skills/prototype/references/prototype-scaffold/ <project>/prototype/
 ```
 
-随后按 `prototype/design-system.md` 填 token；`prototype/` 与 `prd/` 同级、git 分支隔离版本。
+随后按 `prototype/design-system.md` 填 token；`prototype/` 与 `requirement/` 同级、git 分支隔离版本。
 
 ## 全局产物结构
 
 ```
-prd/               PRD + 实施方案 + 原型审查记录（v1→v2，分支隔离）
+requirement/       PRD + 台账 + 实施方案 + 原型审查记录（v1→v2，分支隔离）
 prototype/         全局原型（UI 契约真相源）
 docs/
   ├── architecture/  全局架构三层（v0.36.0）：ARCHITECTURE.md / PHYSICAL-MODEL.md / DATABASE.md / API-INDEX.md / INDEX.md / domains/<bc>.md / iterations/vN/（产品级快照）/ baseline.md

package/agents/architecture-design.md

@@ -36,7 +36,7 @@ You are an independent architecture designer. You read the change brief, plan, e
 |-----------|-------------|
 | `mode` | `change`（默认，workflow-start 五项检查）\| `product`（v0.36.0，S3.5 产品级架构设计） |
 | `change_brief_path` | change-brief.md 路径（scope / AC / 技术方向；change 模式必填） |
-| `plan_path` | prd/vN/plan.md 路径（高阶技术设计段） |
+| `plan_path` | requirement/vN/plan.md 路径（高阶技术设计段） |
 | `snapshot_path` | docs/architecture/iterations/vN/architecture.md（产品级快照；change 模式主输入，product 模式产出目标） |
 | `specs_dir` | changes/<name>/specs/ 路径（现有规格，如有） |
 | `global_arch_dir` | docs/architecture/ 路径（As-Is 基线） |
@@ -108,7 +108,7 @@ verdict: pending_review          # 评审门（architecture-reviewer product 视
 - Execute five-check gate BEFORE producing any deliverable
 - Produce standalone executable SQL files, not embedded code blocks
 - Cite specific brief sections and plan sections for every architecture decision
-- **Produce a PRD Feature → API Endpoint mapping table in api.md** (v0.29.0 §37): before finalizing the API routing table, read `prd/vN/prd.md` feature list (e.g., F001_P0_P1 ~ P0_PN) and map each feature to its corresponding API endpoint(s). For features involving sub-entities (明细/子项), ensure independent CRUD endpoints exist — a query-only endpoint does NOT cover "新增/编辑" functionality. Include this mapping as a dedicated section in api.md for traceability
+- **Produce a PRD Feature → API Endpoint mapping table in api.md** (v0.29.0 §37): before finalizing the API routing table, read `requirement/vN/prd.md` feature list (e.g., F001_P0_P1 ~ P0_PN) and map each feature to its corresponding API endpoint(s). For features involving sub-entities (明细/子项), ensure independent CRUD endpoints exist — a query-only endpoint does NOT cover "新增/编辑" functionality. Include this mapping as a dedicated section in api.md for traceability
 
 **DON'T:**
 - Skip the five-check gate and jump to design

package/agents/architecture-reviewer.md

@@ -21,8 +21,8 @@ After writing, return a summary of the verdict + the report file path. Do NOT mo
 
 | Parameter | Description |
 |-----------|-------------|
-| `prd_path` | PRD 文件路径（e.g., `prd/v1/prd.md`） |
-| `plan_path` | plan.md 路径（e.g., `prd/v1/plan.md`） |
+| `prd_path` | PRD 文件路径（e.g., `requirement/v1/prd.md`） |
+| `plan_path` | plan.md 路径（e.g., `requirement/v1/plan.md`） |
 | `change_brief_path` | change-brief.md 路径（e.g., `changes/<name>/change-brief.md`） |
 | `architecture_dir` | 架构产出目录（e.g., `changes/<name>/architecture/`） |
 | `global_arch_dir` | 全局架构目录（e.g., `docs/architecture/`） |
@@ -90,7 +90,7 @@ Dimensions requiring semantic understanding, marked as "advisory, false positive
 
 4. **A4 需求覆盖** (v0.29.0 §37 增强：双对照源 + 子实体 CRUD 检查):
    - **对照源 1（现有）**：Read change-brief.md → extract all requirement items (scope, AC, technical direction)
-   - **对照源 2（v0.29.0 新增）**：Read `prd/vN/prd.md` → extract feature list (e.g., F001_P0_P1 ~ P0_PN)
+   - **对照源 2（v0.29.0 新增）**：Read `requirement/vN/prd.md` → extract feature list (e.g., F001_P0_P1 ~ P0_PN)
    - Read plan.md → extract relevant technical design sections
    - For each requirement from BOTH sources, check if architecture deliverables provide corresponding design:
      - New aggregate → architecture.md covers it?

package/agents/change-split-auditor.md

@@ -11,14 +11,14 @@ You are an independent Change Split Auditor. You audit the quality of a plan.md'
 
 ## The Iron Law
 
-You are an auditor. You did NOT produce the plan or the PRD. You read both artifacts, cross-reference them, and produce a verdict with findings. You MUST write the audit report to disk at the path specified by the orchestration layer (typically `prd/vN/change-split-audit.md`). On FAIL, the orchestration layer carries your findings back to ce-plan for deepening. Do NOT modify plan.md or PRD — only write the audit report.
+You are an auditor. You did NOT produce the plan or the PRD. You read both artifacts, cross-reference them, and produce a verdict with findings. You MUST write the audit report to disk at the path specified by the orchestration layer (typically `requirement/vN/change-split-audit.md`). On FAIL, the orchestration layer carries your findings back to ce-plan for deepening. Do NOT modify plan.md or PRD — only write the audit report.
 
 ## Inputs
 
 | Parameter | Description |
 |-----------|-------------|
-| `plan_path` | plan.md 路径（e.g., `prd/v1/plan.md`） |
-| `prd_path` | PRD 文件路径（e.g., `prd/v1/prd.md`） |
+| `plan_path` | plan.md 路径（e.g., `requirement/v1/plan.md`） |
+| `prd_path` | PRD 文件路径（e.g., `requirement/v1/prd.md`） |
 
 If either path is missing or unreadable, report `FAIL` with reason `INPUT_ERROR`.
 

package/agents/need-explorer.md

@@ -23,7 +23,7 @@ You stabilize intent, not build. Ask one clear question at a time, propose 2-3 a
 |-----------|-------------|
 | `change_dir` | change 目录路径（e.g., `changes/feature-x/`） |
 | `brief_path` | change-brief.md 路径（可选,workflow-orchestrator S4 分发时存在,先读再问） |
-| `plan_path` | prd/vN/plan.md 路径（可选,brief 冲突时以 plan.md 为准） |
+| `plan_path` | requirement/vN/plan.md 路径（可选,brief 冲突时以 plan.md 为准） |
 
 If `change_dir` is missing or unreadable, report `FAIL` with reason `INPUT_ERROR` and route back to workflow-start.
 

package/agents/prd-completeness-reviewer.md

@@ -11,7 +11,7 @@ You are an independent PRD Completeness Reviewer. You check whether a PRD is **c
 
 ## The Iron Law
 
-You are an independent reviewer. You did NOT participate in producing the PRD. You read the PRD (and CONCEPTS.md if present) fresh and assess whether the requirement description is complete enough to be actionable. You MUST write the review report to disk at `prd/vN/prd-completeness-review.md`. Do NOT modify the PRD or any other artifact — only write the review report.
+You are an independent reviewer. You did NOT participate in producing the PRD. You read the PRD (and CONCEPTS.md if present) fresh and assess whether the requirement description is complete enough to be actionable. You MUST write the review report to disk at `requirement/vN/prd-completeness-review.md`. Do NOT modify the PRD or any other artifact — only write the review report.
 
 ## Division of Labor with claim verifier
 
@@ -24,7 +24,7 @@ Do NOT duplicate claim verification. A statement can be factually correct yet st
 
 | Parameter | Description |
 |-----------|-------------|
-| `prd_path` | PRD 文件路径（e.g., `prd/v1/prd.md`） |
+| `prd_path` | PRD 文件路径（e.g., `requirement/v1/prd.md`） |
 | `concepts_path` | （可选）CONCEPTS.md 路径，用于术语一致性比对 |
 
 If `prd_path` is missing or unreadable, report `FAIL` with reason `INPUT_ERROR`.

package/agents/prototype-env-scout.md

@@ -16,7 +16,7 @@ You NEVER write, edit, create, or delete any file. Your only output is the brief
 ## Invocation Contract
 
 The dispatch prompt provides (some may be absent — probe to discover):
-- `prd_path` or a hint to locate the current PRD version (e.g., `prd/v1/prd.md`).
+- `prd_path` or a hint to locate the current PRD version (e.g., `requirement/v1/prd.md`).
 - `design_system_path` (from `prototype.designSystem` config) or a hint to find `design-system.md`.
 - `prototype_root` (default `prototype/`).
 - The intent: new prototype from scratch / iterate on existing / sync after a change.
@@ -36,7 +36,7 @@ Turn the probe into a decision-ready brief: what exists, what is missing, and a
 - List existing pages (`prototype/pages/*.html`), components (`prototype/components/`), and `flow.md` if present.
 
 ### Step 3: PRD Version Probe
-- Identify the PRD version to prototype against (read `prd/vN/prd.md` frontmatter `iteration_version` if present).
+- Identify the PRD version to prototype against (read `requirement/vN/prd.md` frontmatter `iteration_version` if present).
 - Extract from the PRD the inputs the builder will need: §4 画面原型 (page list), §7 系统功能清单 (functions), §8.4 功能模块 (fields), §8.2 画面交互 (navigation/transitions).
 
 ### Step 4: Synthesize Brief + Recommended Plan

package/agents/prototype-reviewer.md

@@ -11,13 +11,13 @@ You are an independent Prototype Consistency Reviewer. You check whether an HTML
 
 ## The Iron Law
 
-You are an independent reviewer. You did NOT participate in producing the PRD or the prototype. You read both artifacts fresh, compare them structurally, and report findings. You MUST write the review report to disk at `prd/vN/prototype-auto-review.md`. Do NOT modify the prototype or PRD — only write the review report.
+You are an independent reviewer. You did NOT participate in producing the PRD or the prototype. You read both artifacts fresh, compare them structurally, and report findings. You MUST write the review report to disk at `requirement/vN/prototype-auto-review.md`. Do NOT modify the prototype or PRD — only write the review report.
 
 ## Inputs
 
 | Parameter | Description |
 |-----------|-------------|
-| `prd_path` | PRD 文件路径（e.g., `prd/v1/prd.md`） |
+| `prd_path` | PRD 文件路径（e.g., `requirement/v1/prd.md`） |
 | `prototype_path` | 原型目录路径（e.g., `prototype/`） |
 
 If either path is missing or unreadable, report `FAIL` with reason `INPUT_ERROR`.

package/agents/spec-writer.md

@@ -27,7 +27,7 @@ You write planning artifacts, never implementation code. Honor confirmed DP-0 de
 |-----------|-------------|
 | `change_dir` | change 目录路径（e.g., `changes/feature-x/`） |
 | `brief_path` | change-brief.md 路径（可选,workflow-orchestrator S4 分发时存在） |
-| `plan_path` | prd/vN/plan.md 路径（可选,高阶技术方向） |
+| `plan_path` | requirement/vN/plan.md 路径（可选,高阶技术方向） |
 | `arch_dir` | architecture/ 目录路径（可选,architecture-design 产出） |
 
 If `change_dir` is missing, or `.team-flow.yaml` `dp_0_confirmed` is not `true`, report `FAIL` with reason `INPUT_ERROR` and route back to workflow-start for DP-0.

package/docs/README_en.md

@@ -126,7 +126,7 @@ npm install -g team-flow
 
 ### Version
 
-- Current: `v0.42.0`
+- Current: `v0.43.1`
 - v0.9.1 highlights: DP-4 execution-mode recommendations, a portable runtime across 17 platforms, and a raw-package smoke with no plugin-root variable.
 - Self-contained — no OpenSpec or Superpowers runtime required
 - Upstream: [Fission-AI/OpenSpec](https://github.com/Fission-AI/OpenSpec), [obra/superpowers](https://github.com/obra/superpowers)

package/gemini-extension.json

@@ -1,6 +1,6 @@
 {
   "name": "team-flow",
   "description": "Unified workflow plugin: team-flow (spec-driven dev) + compound-engineering core subset + architecture-design (4A/DDD) + prototype (local HTML). 24 skills, one install.",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "contextFileName": "GEMINI.md"
 }

package/hooks/session-start

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# v0.42.0: auto-sync CLI version with plugin version
+# v0.43.1: auto-sync CLI version with plugin version
 set -e
 
 # ═══════════════════════════════════════════════════════════════
 # Plugin version (update this when releasing new versions)
 # ═══════════════════════════════════════════════════════════════
-PLUGIN_VERSION="0.42.0"
+PLUGIN_VERSION="0.43.1"
 
 # ═══════════════════════════════════════════════════════════════
 # Step 1: Auto-sync CLI version with plugin version
@@ -45,7 +45,7 @@ sync_tf_version
 # Step 2: Inject workflow context
 # ═══════════════════════════════════════════════════════════════
 
-msg="<EXTREMELY_IMPORTANT>\nYou have team-flow installed. Invoke /team-flow:workflow-start or /team-flow:workflow-orchestrator ONLY when active team-flow artifacts exist (\`.team-flow.yaml\`, \`proposal.md\`, \`execution-contract.md\`, \`specs/\`) or the user explicitly requests it. For ordinary coding tasks, do NOT invoke them.\n</EXTREMELY_IMPORTANT>\n<EXTREMELY_IMPORTANT>\n## Workspace Directory Rule\n\"Base directory for this skill\" = skill source location (read SKILL.md/references/ ONLY). User project = \`pwd\`. ALL project artifacts (changes/, prd/, docs/, .team-flow/, etc.) MUST operate under \`pwd\`, NEVER the skill base directory. Run \`pwd\` first in every skill execution.\n</EXTREMELY_IMPORTANT>\n<EXTREMELY_IMPORTANT>\n## Language\nCommunicate with the user in Chinese (中文). Technical terms, code, and commands remain in English.\n</EXTREMELY_IMPORTANT>"
+msg="<EXTREMELY_IMPORTANT>\nYou have team-flow installed. Invoke /team-flow:workflow-start or /team-flow:workflow-orchestrator ONLY when active team-flow artifacts exist (\`.team-flow.yaml\`, \`proposal.md\`, \`execution-contract.md\`, \`specs/\`) or the user explicitly requests it. For ordinary coding tasks, do NOT invoke them.\n</EXTREMELY_IMPORTANT>\n<EXTREMELY_IMPORTANT>\n## Workspace Directory Rule\n\"Base directory for this skill\" = skill source location (read SKILL.md/references/ ONLY). User project = \`pwd\`. ALL project artifacts (changes/, requirement/, docs/, .team-flow/, etc.) MUST operate under \`pwd\`, NEVER the skill base directory. Run \`pwd\` first in every skill execution.\n</EXTREMELY_IMPORTANT>\n<EXTREMELY_IMPORTANT>\n## Language\nCommunicate with the user in Chinese (中文). Technical terms, code, and commands remain in English.\n</EXTREMELY_IMPORTANT>"
 
 # Three platforms share the same message, only output format differs.
 if [ -n "${CURSOR_PLUGIN_ROOT:-}" ]; then

package/llms.txt

@@ -3,7 +3,7 @@
 ## Overview
 spec-superflow is a self-contained workflow integration plugin for Claude Code, Cursor, OpenAI Codex CLI/App, GitHub Copilot CLI, Gemini CLI, OpenCode, WorkBuddy, and Trae. It merges spec-driven planning artifacts (proposal, specs, design, tasks) with disciplined execution guardrails (TDD, review gates, controlled handoff) into one unified workflow.
 
-Current version: v0.42.0.
+Current version: v0.43.1.
 
 ## Key Documents
 - README.md: Chinese homepage with full usage guide and FAQ

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xulthekl/team-flow",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "description": "Unified plugin (24 skills + 15 agents) integrating team-flow, compound-engineering, architecture-design, prototype, design-system, workflow-orchestrator, workflow-bootstrap, e2e, session-handoff, workflow-feedback for multi-agent coding tools.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "team-flow",
-  "version": "0.42.0",
+  "version": "0.43.1",
   "description": "Unified workflow plugin: team-flow (spec-driven dev: TDD/SDD/code-review/debugging) + compound-engineering core subset (brainstorm/plan/compound/strategy/ideate/proof, global compounding) + architecture-design (4A+DDD incremental design & global compounding) + prototype (local HTML prototype, zero external deps) + e2e (Playwright E2E, AC-driven) + workflow-orchestrator (product-level workflow orchestration) + workflow-bootstrap (existing project onboarding) + session-handoff (context transfer) + workflow-feedback (issue tracking). 24 skills + 15 agents, one install.",
   "author": {
     "name": "LT"

package/scripts/lib/cmd-deisolate.mjs

@@ -26,6 +26,7 @@ export async function run(args) {
     options: {
       merge: { type: 'boolean', default: false },
       clean: { type: 'boolean', default: false },
+      force: { type: 'boolean', default: false }, // v0.43.1：跳过 dirty 阻断
       'project-root': { type: 'string' },
       json: { type: 'boolean', default: false },
       help: { type: 'boolean', default: false },
@@ -69,6 +70,12 @@ export async function run(args) {
   } else {
     printReport(results, values);
   }
+
+  // v0.43.1：merge 失败（冲突 / dirty 阻断）→ exit 非零，调用方（release-archivist）可检测。
+  // nothing-to-merge（success + skipped）不算失败。
+  if (results.some(r => r.merge && r.merge.success === false)) {
+    process.exitCode = 1;
+  }
 }
 
 
@@ -163,9 +170,9 @@ function processRepo(repo, values) {
     result.dirty = '?';
   }
 
-  // 操作
+  // 操作（v0.43.1：合并前防护——dirty 阻断 / ahead==0 短路，设计增强方案 v0.18 §74）
   if (values.merge) {
-    result.merge = mergeBranch(repo, branch, masterBranch);
+    result.merge = doMerge(repo, branch, masterBranch, result, values);
   }
   if (values.clean) {
     result.clean = cleanWorktree(repo, branch);
@@ -194,6 +201,28 @@ function detectMasterBranch(repoPath) {
   return 'master';
 }
 
+// v0.43.1：合并前防护（设计增强方案 v0.18 §74）
+// 1. dirty 阻断：worktree 有未提交改动时默认不合并（避免改动混入 master），--force 跳过
+// 2. ahead==0 短路：分支相对目标分支无新 commit 时跳过合并（幂等，可安全重复调用）
+// 3. 冲突报告：merge 失败时解析 unmerged 文件列表，引导人工解决而非静默失败
+function doMerge(repo, branch, masterBranch, state, values) {
+  if (state.dirty === true && !values.force) {
+    return {
+      success: false,
+      skipped: 'dirty',
+      message: `Worktree has uncommitted changes — commit or stash them before merging, or use --force`,
+    };
+  }
+  if (typeof state.ahead === 'number' && state.ahead === 0) {
+    return {
+      success: true,
+      skipped: 'nothing-to-merge',
+      message: `Branch '${branch}' is up to date with '${masterBranch}' — nothing to merge`,
+    };
+  }
+  return mergeBranch(repo, branch, masterBranch);
+}
+
 function mergeBranch(repo, branch, masterBranch) {
   try {
     const output = execFileSync('git', ['merge', branch, '--no-edit'], {
@@ -201,7 +230,30 @@ function mergeBranch(repo, branch, masterBranch) {
     });
     return { success: true, message: output.trim() };
   } catch (e) {
-    return { success: false, message: (e.stderr || e.stdout || e.message || '').toString().trim() };
+    const raw = (e.stderr || e.stdout || e.message || '').toString().trim();
+    const conflicts = collectConflicts(repo.repoPath);
+    return {
+      success: false,
+      conflicts,
+      message: conflicts.length > 0
+        ? `Merge conflict in ${conflicts.length} file(s): ${conflicts.join(', ')}. Resolve manually, then 'git add' + 'git commit' to complete the merge.`
+        : raw,
+    };
+  }
+}
+
+// v0.43.1：解析 merge 冲突的 unmerged 文件列表（git status --porcelain 的 UU/AA/DD/AU/UA/DU/UD）
+function collectConflicts(repoPath) {
+  try {
+    const status = execFileSync('git', ['status', '--porcelain'], {
+      encoding: 'utf-8', cwd: repoPath, stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return status
+      .split('\n')
+      .filter(line => /^(UU|AA|DD|AU|UA|DU|UD)/.test(line.trim()))
+      .map(line => line.trim().replace(/^(UU|AA|DD|AU|UA|DU|UD)\s+/, ''));
+  } catch {
+    return [];
   }
 }
 
@@ -260,7 +312,18 @@ function printReport(results, values) {
     console.log(`    Uncommitted changes: ${r.dirty === true ? '⚠️  YES' : r.dirty === false ? 'no' : 'unknown'}`);
 
     if (r.merge) {
-      console.log(`    Merge: ${r.merge.success ? '✅ ' + r.merge.message : '❌ ' + r.merge.message}`);
+      if (r.merge.skipped === 'nothing-to-merge') {
+        console.log(`    Merge: ⏭️  ${r.merge.message}`);
+      } else if (r.merge.skipped === 'dirty') {
+        console.log(`    Merge: ⛔ ${r.merge.message}`);
+      } else if (r.merge.success) {
+        console.log(`    Merge: ✅ ${r.merge.message}`);
+      } else {
+        console.log(`    Merge: ❌ ${r.merge.message}`);
+        if (r.merge.conflicts && r.merge.conflicts.length > 0) {
+          console.log(`    Conflicts: ${r.merge.conflicts.length} file(s)`);
+        }
+      }
     }
     if (r.clean) {
       console.log(`    Worktree removed: ${r.clean.worktreeRemoved ? '✅' : '❌'}`);
@@ -282,6 +345,7 @@ function printHelp() {
   console.log(`Usage:
   tf deisolate <change-dir>                    # dry-run: show worktree status
   tf deisolate <change-dir> --merge             # merge worktree branch back to master
+  tf deisolate <change-dir> --merge --force     # merge even with uncommitted changes
   tf deisolate <change-dir> --merge --clean     # merge + remove worktree + delete branch
   tf deisolate <change-dir> --clean             # remove worktree only (no merge)
   tf deisolate <change-dir> --json              # JSON output`);

package/scripts/team-flow.mjs

@@ -101,7 +101,7 @@ Commands:
                         Upgrade inline/batch to SDD, or replan existing SDD waves, as a new revision
   execution review <change-dir> --wave <id> --base <sha> --head <sha> --report <path> --verdict pass|fail
                         Record one review receipt for a planned wave
-  deisolate <change-dir> [--merge] [--clean] [--json]
+  deisolate <change-dir> [--merge] [--force] [--clean] [--json]
                         Show worktree status / merge branch back / clean worktree
   runtime check-update  Run a portable update check for canonical skills
   runtime infer <dir>   Infer workflow mode without a plugin-root path

package/skills/architecture-design/SKILL.md

@@ -66,7 +66,7 @@ description: 基于 4A 企业架构 + DDD 领域驱动设计的架构/API/DB 设
 ### 输入
 
 - `change-brief.md`（scope / AC / 技术方向）
-- `prd/vN/plan.md` 高阶技术设计段（模块边界/技术选型/数据流/关键聚合划分）
+- `requirement/vN/plan.md` 高阶技术设计段（模块边界/技术选型/数据流/关键聚合划分）
 - `docs/architecture/iterations/vN/architecture.md`（产品级架构快照，**主输入**，v0.35.0）——BC 边界/聚合所有权/全局契约的唯一事实源
 - 全局 `docs/architecture/`（As-Is 实际态基线，已落地部分）
 - 现有 `specs/`（若有）
@@ -156,7 +156,7 @@ changes/<name>/
 - **不**重复 Swagger 管理的内容：请求/响应 schema、错误码定义、参数明细等由 Swagger/OpenAPI 规范承载
 - frontmatter 须声明 `api_contract_manager: swagger`，表明详细契约由 Swagger 工具链管理
 - sql/ 目录中的 DDL 和 migration 脚本为独立可执行 `.sql` 文件，不嵌入 markdown 文档
-- **PRD 功能清单 → API 端点映射表（v0.29.0 §37 新增）**：在 api.md 中增加独立章节，逐条对照 `prd/vN/prd.md` 功能清单（如 F001_P0_P1 ~ P0_PN），映射每个功能点到对应的 API 端点。对于涉及子实体（明细/子项）的功能，必须确保独立 CRUD 端点存在——仅查询端点不覆盖"新增/编辑"功能。此映射表供 architecture-reviewer A4 交叉验证使用
+- **PRD 功能清单 → API 端点映射表（v0.29.0 §37 新增）**：在 api.md 中增加独立章节，逐条对照 `requirement/vN/prd.md` 功能清单（如 F001_P0_P1 ~ P0_PN），映射每个功能点到对应的 API 端点。对于涉及子实体（明细/子项）的功能，必须确保独立 CRUD 端点存在——仅查询端点不覆盖"新增/编辑"功能。此映射表供 architecture-reviewer A4 交叉验证使用
 
 **下游消费**：
 - `architecture/architecture.md` → spec-writer：design.md Decisions 约束

package/skills/architecture-design/references/s3.5-product-architecture.md

@@ -6,8 +6,8 @@
 
 ## 输入
 
-- prd/vN/prd.md（frozen_downstream，功能清单 F001_P0 等）
-- prd/vN/plan.md（高阶技术设计段：模块边界/技术选型/数据流/关键聚合划分）
+- requirement/vN/prd.md（frozen_downstream，功能清单 F001_P0 等）
+- requirement/vN/plan.md（高阶技术设计段：模块边界/技术选型/数据流/关键聚合划分）
 - prototype/（S2 产物，页面结构）
 - docs/architecture/baseline.md（S1 注入）
 - docs/architecture/CONCEPTS.md（领域词汇）
@@ -87,7 +87,7 @@ ARCH 完成（评审 PASS 或 skip 已物化）后，**阻塞确认**（AskUserQ
 - 产品级评审门 verdict = PASS（或 skip 已物化）
 - orchestrator.yaml 中 ARCH 阶段状态 = completed（workflow_phase: architecture）
 - **未触发** arch-merge 全局覆盖写（预测态不进实际态，P1）
-- **架构基线打戳（v0.36.3）**：首轮项目（`arch_baseline` 缺失）评审 PASS 后执行 `tf arch init --mode reconstruction --baseline-ref prd/vN/`（旧项目逆向重建）或 `--mode design`（全新项目正向设计）——arch-readiness/arch-snapshot 门禁的豁免键在此建立，项目进入「已建档」正轨
+- **架构基线打戳（v0.36.3）**：首轮项目（`arch_baseline` 缺失）评审 PASS 后执行 `tf arch init --mode reconstruction --baseline-ref requirement/vN/`（旧项目逆向重建）或 `--mode design`（全新项目正向设计）——arch-readiness/arch-snapshot 门禁的豁免键在此建立，项目进入「已建档」正轨
 
 ## 常见陷阱
 

package/skills/architecture-design/templates/change-brief.md

@@ -1,7 +1,7 @@
 ---
 upstream_source: orchestrator | manual | null
 upstream_req_id: <req-id>
-upstream_plan_ref: prd/vN/plan.md
+upstream_plan_ref: requirement/vN/plan.md
 upstream_change_id: C2
 plan_hash: sha256:<plan.md 内容摘要>
 ---
@@ -25,5 +25,5 @@ plan_hash: sha256:<plan.md 内容摘要>
 
 ## PRD & plan 引用
 
-- PRD: prd/vN/prd.md §<相关章节>
-- Plan: prd/vN/plan.md ### <C-ID>
+- PRD: requirement/vN/prd.md §<相关章节>
+- Plan: requirement/vN/plan.md ### <C-ID>