@gordon.gan/specflow 1.7.0-beta → 1.8.0-beta

package/README.md

@@ -282,7 +282,7 @@ specflow init
 | **explore** | 读代码、比方案、定边界；产出 `explore.md`，confirmed 后 handoff 到 propose |
 | **propose** | 一次产出 proposal、delta specs、design、tasks（第一轮深度思考，非占位骨架）；叙述语言跟 `artifacts.language` |
 | **refine** | 内部多轮循环（≥2 轮，AI 判断收敛）；可更新任意 artifact |
-| **approval** | refine 后可选：AI 7 维闭环 + 设计质量 + 可实施性 → `approval.md`；非轻量变更走 **ACP**：分片 `approval/parts/` → Stage 12e AI Review → **`specflow approval finalize`**（lint / review-check / assemble / 多仓 bundle）；不改 phase，不阻塞 apply |
+| **approval** | refine 后可选：AI 7 维闭环 + 设计质量 + 可实施性 → `approval.md`；非轻量变更走 **ACP**：分片 `approval/parts/` → Stage 12e AI Review → **`specflow approval finalize`**。**多仓 mode A**：主仓 `/specflow:approval` 一次发起，Subagent 并行跑子仓 approval，主仓等待后 **`finalize --bundle`** 产出 `approval-unified.md`（各仓 `approval.md` 为 apply 真源） |
 | **apply** | Phase A 重写 tasks.md；Phase B 按语言路由 ECC 审查 + TDD 逐任务执行；可选 `--yes` |
 | **review** | 代码审查，对照 specs 检查回归 |
 | **test** | 单元 + 集成 + E2E + 回归测试 |

package/dist/core/approval/forbidden-patterns.js

@@ -20,8 +20,11 @@ export const INCONSISTENCY_HINT_PATTERNS = [
     /约\s*\d+\s*次/,
     /\b(?:等|etc\.?)\s*[。.)]/,
     /(?:status|状态|enum|枚举)[^.\n]{0,30}(?:等|etc)/i,
-    /\b(?:TBD|待定|未定)\b/i,
-    /(?:同上|同前|见上)(?!.*§)/,
+    /(?:^|[\s，。；])同前(?!缀)/,
+    /(?:^|[\s，。；])同上(?!所述)/,
+    /(?:^|[\s，。；])见上(?!游)/,
+    /\b(?:待定|未定)\b/i,
+    /(?<![无未不否])\bTBD\b/i,
     /\d+\s*[或\\/]\s*\d+\s*(?:均可|都行)/,
 ];
 export function findForbiddenMatch(content) {

package/dist/integrations/shared/capability-evidence.js

@@ -14,6 +14,7 @@ const MARKER_RULES = [
     { id: 'sub.approval.design_quality', skill: 'approval', includes: ['Design Quality Assessment', 'Over-Engineering'] },
     { id: 'sub.approval.acp_finalize', skill: 'approval', includes: ['specflow approval finalize', 'Stage 12f'] },
     { id: 'sub.approval.ai_review', skill: 'approval', includes: ['12e AI Review', 'part_hashes'] },
+    { id: 'sub.approval.multi_repo_subagent', skill: 'approval', includes: ['Stage 1c', 'multi-repo-spoke-subagent'] },
     { id: 'sub.apply.phase_a', skill: 'apply', includes: ['## Phase A: Task Rewrite'] },
     { id: 'sub.apply.phase_b', skill: 'apply', includes: ['## Phase B: Subagent TDD Execution'] },
     { id: 'sub.apply.gap_detection', skill: 'apply', includes: ['Gap Detection'] },

package/dist/integrations/shared/parity-manifest.js

@@ -20,6 +20,7 @@ export const CAPABILITY_MANIFEST = [
     { id: 'sub.approval.design_quality', commandId: 'approval', level: 'sub-capability', required: true },
     { id: 'sub.approval.acp_finalize', commandId: 'approval', level: 'sub-capability', required: true },
     { id: 'sub.approval.ai_review', commandId: 'approval', level: 'sub-capability', required: true },
+    { id: 'sub.approval.multi_repo_subagent', commandId: 'approval', level: 'sub-capability', required: true },
     { id: 'sub.apply.phase_a', commandId: 'apply', level: 'sub-capability', required: true },
     { id: 'sub.apply.phase_b', commandId: 'apply', level: 'sub-capability', required: true },
     { id: 'sub.apply.gap_detection', commandId: 'apply', level: 'sub-capability', required: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gordon.gan/specflow",
-  "version": "1.7.0-beta",
+  "version": "1.8.0-beta",
   "type": "module",
   "description": "SpecFlow — unified spec-driven development: OpenSpec planning + Superpowers execution in one CLI and cross-IDE workflow",
   "keywords": [

package/prompts/approval/acp-pipeline.md

@@ -63,7 +63,9 @@ interfaces:
 - **Read-only view**: `approval bundle` from `approval-playbook.yaml`
 - Do **not** LLM-unify three repos into one primary `approval/parts`
 
-See `multi-repo-guidance.md` + `templates/approval-playbook.yaml`.
+See `multi-repo-guidance.md` + `templates/approval-playbook.yaml` (+ example `templates/approval-playbook-talos-scenario-job-compile.yaml`).
+
+**Orchestration**: multi-repo mode A uses **Stage 1c** subagent parallel dispatch (`multi-repo-spoke-subagent.md`) — not a single-repo `finalize` across repos.
 
 ---
 

package/prompts/approval/generate.md

@@ -1503,6 +1503,19 @@ User natural language, workset, or cross-repo design → `multi_repo.enabled=tru
 
 Recommend `repo` on `tables[]` / `interfaces[]` / `pages[]` entries for unified mode traceability.
 
+### G.7 主仓一键 · Subagent 并行 (mode A)
+
+> Router: `prompts/approval/multi-repo-spoke-subagent.md` · Orchestrator: `skills/specflow-approval/SKILL.md` **Stage 1c**
+
+When user starts `/specflow:approval` from **primary** repo and chose **A (bundle)**:
+
+1. Primary writes `approval-playbook.yaml`; spoke indexes set `bundle.enabled: false`.
+2. **Parallel** Task subagents per non-primary repo → full spoke Map + 12e + `finalize` (no `--bundle`).
+3. Primary **wait gate** — all spokes `finalize_ok`.
+4. Primary Map + finalize + `finalize --bundle --workspace-root <primary.planning_root>`.
+
+**Anti-lazy (multi-repo)**: no unified LLM merge when mode A chosen; no stub spoke parts (`见 design.md` rows without decision text); each spoke needs `analysis.json` + `review-result.json` when `acp.review.enabled`.
+
 ---
 
 ## Part H: ACP Pipeline (Approval Compiler Pipeline)

package/prompts/approval/multi-repo-guidance.md

@@ -236,3 +236,28 @@ interfaces:
 ## 7. 与单仓关系
 
 `multi_repo.enabled=false` 时忽略本章;`change` 字段为当前规划根 change,行为与旧版一致。
+
+---
+
+## 8. 主仓一键 · Subagent 并行 (mode A/B)
+
+> Router: `prompts/approval/multi-repo-spoke-subagent.md` · Orchestrator: `skills/specflow-approval/SKILL.md` **Stage 1c**
+
+当用户在 **主仓** 发起 `/specflow:approval` 且已选 **A (bundle)** 或 **B (per_repo)**:
+
+| 角色 | 职责 |
+|------|------|
+| **主 Agent（主仓）** | intake、playbook、scope 拆分、闭环 Pass 1–11、主仓 Map、等待子仓、主仓 finalize、bundle |
+| **Subagent × 子仓** | 各子仓独立 `approval/` → Map → 12e → `finalize <spoke.change>`（**禁止** `--bundle`） |
+
+**硬顺序**:
+
+1. 主仓写好 `approval-playbook.yaml` + `multi_repo.repos[].root_hint`
+2. **并行**派发子仓 subagent（web / worker / …）
+3. **等待**全部 `finalize_ok: true`
+4. 主仓 Map + finalize
+5. 主仓 `finalize --bundle --workspace-root <主仓规划根>`
+
+**禁止**: 仅在主仓 unified 合订而不拆仓；子仓未 finalize 就 bundle；让用户手动 cd 子仓跑 CLI（除非 subagent 不可用）。
+
+**从 unified 迁移**: 将 `04.6-ui`、Worker L2 接口等 **搬迁** 到对应子仓 parts；主仓留 cross-ref + 平台/L3 正文。示例 playbook: `templates/approval-playbook-talos-scenario-job-compile.yaml`。

package/prompts/approval/multi-repo-spoke-subagent.md

@@ -0,0 +1,94 @@
+# Approval · Multi-Repo Spoke Subagent Brief
+
+> **Invoked by** primary `/specflow:approval` orchestrator via **Task** subagent (one per non-primary repo).
+> Primary repo Map/Review/Finalize stays on the **orchestrator** unless user explicitly runs approval from a spoke root.
+
+---
+
+## Mission
+
+Run **full ACP approval for ONE spoke repo only** — Index → Map → Stage 12e AI Review → `specflow approval finalize <spoke.change>` — scoped to that repo's four artifacts and **only** entities assigned to this repo in the shared playbook / primary `index.yaml`.
+
+**Do NOT** write into the primary repo. **Do NOT** LLM-merge cross-repo content into one file.
+
+**Spoke index rule**: only **`primary_repo`** sets `multi_repo.bundle.enabled: true` + hosts `approval-playbook.yaml`. Spoke repos set `bundle.enabled: false` — they **never** run `--bundle`.
+
+---
+
+## Inputs (primary must pass all)
+
+| Field | Example |
+|-------|---------|
+| `repo_id` | `talos-web` |
+| `planning_root` | `/Users/gankang/TALOS-WORK/talos-web` |
+| `change` | `web-scenario-cases` |
+| `role` | `web` |
+| `primary_change` | `scenario-job-compile` |
+| `primary_repo_id` | `talos` |
+| `workset_root` | `/Users/gankang/TALOS-WORK` |
+| `scope` | Which parts/capabilities/interfaces/pages belong to this spoke (from playbook or primary index) |
+| `cross_ref_policy` | Cross-repo refs: `见 talos approval §4.5 I8` — never duplicate platform DDL/RPC bodies |
+
+Read before writing:
+
+1. `specflow/changes/<change>/` four artifacts (phase must be `refined`)
+2. `prompts/approval/generate.md` (Part E/F), `acp-pipeline.md`, `ai-review.md`
+3. Role packs: `frontend-guidance.md` (web), `api-guidance.md` (worker), etc.
+4. Primary `approval/index.yaml` `multi_repo.repos[]` entry for this repo
+
+---
+
+## Hard scope rules
+
+| Role | Own in approval/parts | Cross-ref only (do not copy bodies) |
+|------|----------------------|-------------------------------------|
+| `platform` | compile, scheduler RPC/L4, DDL, gateway, ingest | Worker L2 HTTP, console pages |
+| `web` | §4.6 UI, web APIs (I5/I6), nav/routes | Platform scheduler/result RPC details |
+| `worker` | L2 Worker HTTP (I7/I9), executor logic, Pack | Platform L3 SubmitStepResult, Web UI |
+
+Each spoke document is **standalone per repo**: `01-intro` … `10-signoff` with **repo-scoped** §1–§3 and detailed §4 batches for that repo only.
+
+---
+
+## Execution order (spoke)
+
+```text
+cd <planning_root>
+→ Write approval/index.yaml (multi_repo.enabled=false OR spoke-local block only)
+→ Write approval/analysis.json (Passes scoped to this repo)
+→ 12a skeleton parts
+→ 12b Map batches (repo scope only)
+→ 12e: specflow approval finalize <change>  # may pause → review-packet
+→ Fix parts; write review-result.json + part_hashes (specflow approval review-hashes --json)
+→ specflow approval finalize <change>       # must exit ok
+```
+
+**Never** run `--bundle` on a spoke. Bundle is **primary only**, after all spokes report success.
+
+---
+
+## Return payload to orchestrator (required)
+
+Report in final message:
+
+```yaml
+repo_id: talos-web
+change: web-scenario-cases
+finalize_ok: true
+output_path: specflow/changes/web-scenario-cases/approval.md
+review_result: specflow/changes/web-scenario-cases/approval/review-result.json
+lint_errors: []
+blocked: false
+notes: ""
+```
+
+If `finalize_ok: false`, set `blocked: true` and paste diagnostics — orchestrator **must not** bundle.
+
+---
+
+## Anti-patterns
+
+- Writing `04.6-ui` into platform repo when web spoke exists
+- Running bundle from spoke cwd
+- Skipping finalize and pasting assembled markdown
+- Unified LLM merge (mode C) when mode A was chosen

package/skills/specflow-approval/SKILL.md

@@ -130,6 +130,118 @@ Single-repo → skip (`multi_repo.enabled=false`).
 
 ---
 
+## Stage 1c: Multi-Repo Subagent Orchestration (主仓一键 · 子仓并行)
+
+**Trigger**: `multi_repo.enabled=true` **and** user chose **A (bundle)** or **B (per_repo only)** **and** session supports **Task** subagents (Cursor Agent / compatible harness).
+
+**User-facing promise**: user starts **once** from the **primary** repo (`/specflow:approval <primary.change>`). Orchestrator runs spoke approvals **in parallel**; primary **waits** for all spokes to finish `finalize` successfully, then runs **primary Map + finalize + bundle** (mode A).
+
+Read **`prompts/approval/multi-repo-spoke-subagent.md`** before dispatching subagents.
+
+### 1c.1 Preconditions (hard)
+
+1. User gate **A** answered → `document_mode: per_repo` + `multi_repo.bundle.enabled: true` + `primary_repo` set.
+2. Primary `approval/index.yaml` lists every `multi_repo.repos[]` with `id`, `change`, **`root_hint`** (absolute planning root).
+3. Primary `approval/approval-playbook.yaml` exists (copy from `templates/approval-playbook.yaml` or `templates/approval-playbook-talos-scenario-job-compile.yaml`); every **non-primary** source has explicit `root:` in playbook. **Spoke** `index.yaml` must set `multi_repo.bundle.enabled: false` (only primary enables bundle).
+4. **Scope map** recorded: which `parts` / `interfaces` / `pages` / `capabilities` belong to each repo (from primary index inventory — **split**, do not duplicate bodies across repos).
+5. If migrating from legacy **unified** (mode C): **split parts first** — move `04.6-ui` → web, Worker L2 → worker, platform keeps L3/DDL/compile; add cross-refs. Do not bundle until split is done.
+
+### 1c.2 Phase diagram
+
+```text
+[Primary orchestrator]
+  Stage 1b intake + user gate A + playbook + scope map
+  Stage 2–11 (closed-loop) — primary reads ALL repos' four artifacts
+  Stage 12a — primary index + playbook + overlay only (optional skeleton on primary)
+
+  ═══ PARALLEL (Task subagent × each non-primary repo) ═══
+  For each spoke in multi_repo.repos[] where repo.id != primary_repo:
+    Launch Task (generalPurpose) with multi-repo-spoke-subagent.md brief
+    Inputs: repo_id, planning_root=root_hint, change, role, scope, workset_root, primary_change
+    Spoke runs: 12a → 12b → 12e → finalize <spoke.change>  (NO --bundle)
+
+  ═══ WAIT GATE (orchestrator blocks) ═══
+  Collect each spoke return payload → all finalize_ok: true
+  If any blocked → STOP; report failing repo + diagnostics; do NOT bundle
+
+  ═══ PRIMARY (sequential) ═══
+  Stage 12b Map primary-scoped parts only
+  Stage 12e AI Review + finalize <primary.change>   # no --bundle yet if review pauses
+  Re-run finalize until primary ok
+
+  ═══ BUNDLE (primary only) ═══
+  specflow approval finalize <primary.change> --bundle --workspace-root <primary.planning_root> [--render]
+  Report: each per_repo approval.md path + approval-unified.md (readonly)
+```
+
+**`--workspace-root`**: use the **primary repo planning root** (directory containing `specflow/changes/`), not the workset parent — unless every playbook `sources[]` entry sets explicit `root:` (recommended for web/worker).
+
+### 1c.3 Subagent dispatch template
+
+For each spoke, launch **one** Task in parallel (same turn when possible):
+
+```text
+Task · Spoke approval · <repo_id>
+
+Read prompts/approval/multi-repo-spoke-subagent.md and execute spoke approval end-to-end.
+
+repo_id: <id>
+planning_root: <root_hint absolute path>
+change: <spoke change name>
+role: platform | web | worker
+primary_repo_id: <primary_repo>
+primary_change: <primary change name>
+workset_root: <parent containing all repos, optional>
+scope:
+  parts: [<part ids for this repo only>]
+  interfaces: [<I ids>]
+  pages: [<page ids>]
+  capabilities: [<cap ids>]
+cross_ref_policy: 跨仓细节用「见 <other-repo> approval §x」；禁止复制平台 DDL/Worker OpenAPI 全文到本仓
+
+Return the YAML payload from multi-repo-spoke-subagent.md § Return payload.
+```
+
+**Parallelism**: launch all spoke Tasks in **one** assistant message. Do **not** start primary Map §4 batches that belong to a spoke until spoke Tasks are dispatched (orchestrator may prepare primary skeleton while spokes run).
+
+### 1c.4 Wait gate & bundle (hard)
+
+Before primary `--bundle`:
+
+| Check | Action |
+|-------|--------|
+| Each spoke `finalize_ok: true` | else STOP |
+| Each spoke `approval.md` exists | Read path from return payload |
+| Primary `finalize` ok (no lint/review errors) | else fix primary parts first |
+| Playbook sources match actual per-repo parts | `specflow approval bundle <primary.change>` dry path via finalize |
+
+On success announce:
+
+```text
+Multi-repo approval complete (mode A):
+- talos/.../approval.md (platform)
+- talos-web/.../approval.md (web)
+- talos-worker/.../approval.md (worker)
+- talos/.../approval-unified.md (readonly bundle)
+Apply uses per_repo approval.md only.
+```
+
+### 1c.5 Fallback (no Task / subagent)
+
+If subagents unavailable, run spokes **sequentially** in the same session: `cd <root_hint>` → full spoke flow → return to primary. Same wait gate before bundle. **Never** skip per-repo finalize.
+
+### 1c.6 User confirmation
+
+After Stage 12a + scope map, ask once:
+
+```text
+将并行在 N-1 个子仓生成 approval（<repo list>），主仓完成后合订 bundle。确认继续?
+```
+
+On confirm: dispatch subagents + proceed. User does **not** run spoke CLIs manually.
+
+---
+
 ## Gate: Tech Stack Intake (0→1 / 四件套缺选型)
 
 **Trigger** (any):
@@ -536,7 +648,9 @@ Low-level subcommands (`lint`, `review-pack`, `assemble`, …) remain for CI hoo
 
 ### 12g Multi-repo bundle
 
-When `multi_repo.bundle.enabled`, `finalize --bundle` (or auto) produces readonly `approval-unified.md` from `approval-playbook.yaml`. **Apply 只用各仓 approval.md 真源。**
+When `multi_repo.bundle.enabled`, **only the primary orchestrator** runs `finalize --bundle` **after** all spokes (Stage 1c wait gate) and primary finalize succeed. Produces readonly `approval-unified.md` from `approval-playbook.yaml`. **Apply 只用各仓 approval.md 真源。**
+
+Spoke subagents **must not** pass `--bundle`. See **Stage 1c**.
 
 Optional HTML: `specflow approval render <change>` or `finalize --render` → `approval.html` (browser-readable; mermaid via CDN).
 
@@ -613,14 +727,15 @@ After 12b/12c, run **Stage 12e AI Review** (fix parts, write `review-result.json
 
 Then ask:
 
-> "确认 finalize 并写入 `specflow/changes/<name>/approval.md`?"
+> "确认 finalize 并写入各仓 `approval.md`?（多仓时将并行子仓 approval，完成后主仓合订 bundle）"
 
 Do NOT finalize until the user confirms (unless they already confirmed end-to-end generation).
 
 On confirmation:
 
-1. **Segmented**: `specflow approval finalize <change>` — do not paste assembled markdown manually; do not run lint/assemble subcommands separately unless debugging.
-2. **Monolithic**: write `approval.md` directly (or parts + finalize).
+1. **Multi-repo mode A/B**: run **Stage 1c** — dispatch spoke subagents in parallel → wait gate → primary Map/12e/finalize → `finalize --bundle --workspace-root <primary.planning_root>`.
+2. **Segmented (single-repo)**: `specflow approval finalize <change>` — do not paste assembled markdown manually; do not run lint/assemble subcommands separately unless debugging.
+3. **Monolithic**: write `approval.md` directly (or parts + finalize).
 3. Include only optional chapters the user accepted.
 4. Do **not** include「AI 预审建议」in the file.
 5. Do NOT change `phase` — it remains `refined`.

package/templates/approval-playbook-talos-scenario-job-compile.yaml

@@ -0,0 +1,29 @@
+# specflow.approval.playbook/v1 — TALOS scenario-job-compile 三仓合订示例
+# Copy to: specflow/changes/scenario-job-compile/approval/approval-playbook.yaml
+# Used after per_repo split: each repo has its own approval/parts + approval.md
+schema: specflow.approval.playbook/v1
+change: scenario-job-compile
+title: 场景作业编译与逐步上报（三仓合订）
+primary_repo: talos
+
+sources:
+  - repo: talos
+    change: scenario-job-compile
+    include_parts: all
+  - repo: talos-web
+    change: web-scenario-cases
+    root: /Users/gankang/TALOS-WORK/talos-web
+    include_parts: all
+  - repo: talos-worker
+    change: scenario-execution
+    root: /Users/gankang/TALOS-WORK/talos-worker
+    include_parts: all
+
+overlay:
+  - overlays/01-unified-scope.md
+
+assemble:
+  inject_headers: true
+  dedupe_appendix: true
+  output: approval-unified.md
+  readonly: true