@anhth2/spec-driven-dev-plugin 0.7.0 → 0.9.0

package/core/commands/review-tech-docs.md

@@ -135,6 +135,7 @@ Read `.agent/project-context.yaml`. Extract and store:
 - `paths.core_entities` → path to core-entities.md
 - `paths.tech_docs_dir` → technical documentation root
 - `paths.trace_dir` → trace state directory
+- `paths.design_spec_dir` → Design Spec documents root (FE/App only)
 
 If `paths` section is absent, use these defaults:
 - `specs_dir` = `specs/bdd`
@@ -146,11 +147,75 @@ If `paths` section is absent, use these defaults:
 - `core_entities` = `specs/domain-knowledge/core-entities.md`
 - `tech_docs_dir` = `specs/tech-docs`
 - `trace_dir` = `.trace`
+- `design_spec_dir` = `specs/design-spec`
 
 If `tech_stack.module` is set, also load `.agent/modules/{module}/stack-profile.yaml` if it exists.
 
 ---
 
+## Step 1.5 — [SERVICE ROUTING] Resolve service paths (umbrella mode)
+
+*Skip this step entirely if `setup.mode` is not `"umbrella"` and `services` section is absent from project-context.yaml.*
+
+If `services` section is present:
+
+**1. Detect active domain** (in priority order):
+- Read `@trace.domain` from target file frontmatter (if Gate loaded a target file)
+- Extract from target file path: segment immediately after `prd_dir` base path  
+  *(e.g., `specs/prd/user/FEAT-01.md` → domain = `user`)*
+- If `$ARGUMENTS` contains a path, extract the segment after `prd_dir`
+
+**2. Route to service** — if active domain matches a key in `services`:
+- Override `paths.specs_dir` → `services.{domain}.specs_dir`
+- Override `paths.tech_docs_dir` → `services.{domain}.tech_docs_dir`
+- Store `active_service` = `services.{domain}.path`
+- Store `active_service_module` = `services.{domain}.module`
+- If service has its own `module` → use it as `active_module` (overrides `tech_stack.module`)
+
+**3. Fallback** — if domain not detected or no matching service key:
+- Keep default paths from Step 1
+- Set `active_service = unresolved`
+
+**4. Spec source auto-override** — if `setup.spec_source` is set AND the corresponding path was not already explicitly set in `paths:`:
+- Override `paths.prd_dir` → `{spec_source}/specs/prd`
+- Override `paths.design_spec_dir` → `{spec_source}/specs/design-spec`
+- Override `paths.domain_knowledge_dir` → `{spec_source}/specs/domain-knowledge`
+- Override `paths.business_dictionary` → `{spec_source}/specs/domain-knowledge/business-dictionary.md`
+- Override `paths.core_entities` → `{spec_source}/specs/domain-knowledge/core-entities.md`
+- Override `paths.bug_reports_dir` → `{spec_source}/feedback/bug-reports`
+- Override `paths.bdd_proposals_dir` → `{spec_source}/feedback/bdd-proposals`
+
+> **Why under `spec_source`:** tester feedback (`/report-bug`, `/propose-scenario`) must land in the **shared spec repo** so PO/Dev see it when they `/sync`. In single-service mode (no `spec_source`), these default to `feedback/bug-reports` and `feedback/bdd-proposals` at repo root — still shared, same repo.
+
+---
+
+## Step 1.6 — [SERVICE CONVENTIONS] Load service-specific conventions (umbrella mode)
+
+*Skip this step entirely if `active_service` is `"unresolved"` or context is single-service mode.*
+
+When `active_service` has been resolved to a real path in Step 1.5 (e.g., `user-service/`):
+
+**1. Locate service config** — try in priority order:
+- `{active_service}/.agent/project-context.yaml`
+- `{active_service}/project-context.yaml`
+
+**2. If found, override with service-specific values:**
+
+| Variable | Source |
+|----------|--------|
+| `conventions.test_command` | service's `conventions.test_command` |
+| `conventions.build_command` | service's `conventions.build_command` |
+| `paths.trace_dir` | `{active_service}/{service paths.trace_dir}` — default: `{active_service}/.trace` |
+| `paths.specs_dir` | `{active_service}/{service paths.specs_dir}` (if set in service config, else keep Step 1.5 override) |
+
+**3. Store** `service_root = {active_service}` as the working directory anchor for all downstream commands:
+- Shell commands (`/run-tests`, `/generate-tests`) run **from within** `service_root`
+- File write operations (test files, trace TSVs) use paths **relative to** `service_root`
+
+**4. If service config not found** — keep umbrella defaults, still set `service_root = {active_service}` (path anchor is always needed even without a config override).
+
+---
+
 ## Step 2 — [PROJECT-CONFIG] Load module stack profile (conditional)
 
 If `tech_stack.module` is set, read `.agent/modules/{module}/stack-profile.yaml`.
@@ -241,6 +306,25 @@ These two variables (`active_module`, `platform_type`) are the canonical source
 
 ---
 
+## Step 6.7 — [GUARDRAILS] Load Project Lessons (conditional)
+
+*Accumulated mistakes the AI must not repeat in this project. These are added over time via `/learn`
+or accepted during `/review-code`, `/fix-bug`, `/debug`.*
+
+Resolve the lessons file path:
+- Use `paths.lessons_file` if set (may be service-overridden in umbrella mode, Step 1.6)
+- Else default `specs/domain-knowledge/lessons-learned.md`
+- In umbrella/service mode (when `service_root` is set), if `paths.lessons_file` is unset, default to `{service_root}/.agent/project-lessons.md`
+
+If the file exists, read it and store ALL lessons as **ACTIVE GUARDRAILS** for the session:
+- Treat each lesson's **Rule** as a hard constraint — same priority as CLAUDE.md coding standards (Step 3).
+- Before generating or modifying any artifact (PRD, BDD, tech-doc, code, test), check the output against every lesson whose `category` matches the current command AND whose `scope` matches the target (domain / file).
+- If a generated output would violate a lesson → correct it **before** presenting, and note which lesson (`L-NNN`) was applied.
+
+If the file does not exist → skip silently (no lessons captured yet).
+
+---
+
 ## Step 7 — [RECAP] Working Memory Recap (anti-lost-in-middle)
 
 After loading all context, synthesize and output a compact summary block.
@@ -256,6 +340,9 @@ Layers    : {layer order from CLAUDE.md §2, e.g., Controller → Facade → Ser
 Ticket    : {ticket_prefix}-
 Dict      : {loaded — N canonical terms, M banned terms | missing}
 Entities  : {loaded — EntityA, EntityB, EntityC | missing}
+Lessons   : {loaded — N guardrails | none yet}
+Service   : {active_service} ({active_service_module}) | single-service
+Svc Root  : {service_root} — conventions + trace_dir loaded from service config | —
 Status    : {FULL | PARTIAL — missing: CLAUDE.md / business-dict / core-entities | MINIMAL}
 ```
 
@@ -387,6 +474,59 @@ Check all standard sections are present and non-empty:
 
 → All T6 missing-section findings are **auto-fixable**: AI adds skeleton section with prompts.
 
+### T7 — Cross-Team API Contract Review
+
+*Only applies when ALL of the following are true:*
+*1. Source BDD has `@trace.platform: system`.*
+*2. Tech-doc header does NOT have `@trace.api_source: existing`.*
+
+*If `@trace.api_source: existing` → **skip T7 entirely**. Contract đã được PO xác định trong PRD — không có API design mới để đồng thuận.*
+
+This dimension ensures FE, App, and BE teams all agree on the API contract before implementation starts.
+
+**Step 1 — Check sign-off status in tech-doc header:**
+
+Read the `@trace.sign_off` block in the tech doc header. If absent → add it as a finding (auto-fixable: add skeleton).
+
+```yaml
+# @trace.sign_off:
+#   be_team:  pending    # author — set to "done" when BE satisfied with design
+#   fe_team:  pending    # FE/Web — must confirm contract matches web BDD expectations
+#   app_team: pending    # App — must confirm contract matches app BDD expectations (if applicable)
+#   sa:       pending    # SA/Tech Lead — final approval
+```
+
+**Step 2 — Contract vs BDD cross-check:**
+
+Load the web and app BDDs for this TICKET-ID (from `{paths.specs_dir}/{domain}/web/` and `{paths.specs_dir}/{domain}/app/` in the spec submodule or spec repo).
+
+For each platform BDD, verify the tech doc's API contract satisfies the BDD's `Then` clauses:
+
+| Check | Severity |
+|---|---|
+| Response fields in API contract don't cover what web BDD `Then` expects | Critical |
+| Response fields in API contract don't cover what app BDD `Then` expects | Critical |
+| Error response shape doesn't match what platform BDDs expect | Major |
+| System BDD `@system.resolution` annotation contradicts the API contract design | Critical |
+
+**Step 3 — Pending sign-off report:**
+
+After the review, list which sign-offs are still `pending`:
+
+```
+⏳ Pending sign-offs before tech docs can be approved:
+  fe_team  — FE/Web team must confirm API contract matches web BDD expectations
+  app_team — App team must confirm API contract matches app BDD expectations
+  sa       — SA/Tech Lead final approval
+
+Once sign-offs are collected → update @trace.sign_off in tech doc header, then re-run /review-tech-docs.
+Tech docs cannot be set to "approved" while any required sign-off is pending.
+```
+
+**Approval gate:**
+- If `be_team: done` AND `fe_team: done` AND `app_team: done` (or N/A) AND `sa: done` → tech docs may be set to `approved`
+- Otherwise → `@trace.status` stays `in-review` — `generate-code` is blocked
+
 ---
 
 ## Write Findings File
@@ -400,10 +540,18 @@ domain: "{domain}"
 generated_at: "{ISO datetime}"
 review_type: "tech-design"
 status: "pending_review"
+is_system_bdd: {true | false}  # true if source BDD has @trace.platform: system
+
+sign_off:                       # only present when is_system_bdd: true
+  be_team:  pending             # read from @trace.sign_off in tech-doc header
+  fe_team:  pending
+  app_team: pending             # "n/a" if project has no app platform
+  sa:       pending
+sign_off_gate: blocked          # blocked | ready — "ready" only when all required are "done"
 
 findings:
   - id: "F001"
-    check_id: "T1"           # T1–T6
+    check_id: "T1"           # T1–T7
     severity: "critical"     # critical | major | minor
     section: "{section heading or component name where issue was found}"
     finding: "{clear description of the violation or gap}"
@@ -417,6 +565,7 @@ summary:
   auto_fixable: {N}
   requires_human_decision: {N}
   recommendation: "APPROVED | NEEDS_REVISION | BLOCKED"
+  sign_off_gate: "{blocked — pending: fe_team, app_team, sa | ready}"
 ```
 
 ## Report
@@ -453,7 +602,8 @@ Suggest the logical next command based on workflow phase:
 | /define-product         | `/generate-prd {product-definition-file}`     |
 | /generate-prd           | `/refine-prd {prd-file}` then `/review-context {prd-file}` |
 | /refine-prd             | Open Review Board → update PRD → `/review-context {prd-file}` |
-| /review-context (PRD)   | `/generate-bdd {prd-file}` if APPROVED; fix PRD if NEEDS_FIX |
+| /review-context (PRD)   | FE/App: `/generate-design-spec {prd-file}` (then BDD after sign-off); BE: `/generate-bdd {prd-file}` directly; fix PRD if NEEDS_FIX |
+| /generate-design-spec   | Designer review → Figma links confirmed → PO + Designer sign-off → `/generate-bdd {prd-file}` |
 | /generate-bdd           | `/review-context {feature-file}` to verify coverage |
 | /review-context (BDD)   | `/generate-tech-docs {UC-ID}` if APPROVED; regenerate if NEEDS_FIX |
 | /generate-tech-docs     | `/review-tech-docs {tech-design-file}`        |
@@ -467,6 +617,11 @@ Suggest the logical next command based on workflow phase:
 | /validate-traces        | DRIFT/UNTRACKED → `/generate-code {UC-ID}`; GAP → `/generate-tests {UC-ID}`; all OK → create PR |
 | /fix-bug                | Create PR and link to ticket                  |
 | /debug                  | `/fix-bug {ticket-id}` if fix needed          |
+| /report-bug             | Send to dev (`/fix-bug {BUG-ID}`); if coverage gap → `/propose-scenario {UC-ID}` |
+| /propose-scenario       | Notify PO/Dev to review the proposal in `feedback/bdd-proposals/` |
+| /learn                  | Continue working — lesson applies on next command |
+| /sync                   | `/validate-traces` for full coverage; act on any `📥 tester feedback` surfaced |
+| /update-framework       | Review `git diff .agent/`, commit; `/sync` for project content |
 
 Format the footer as:
 ```
@@ -483,9 +638,17 @@ UC: {UC-ID} | Domain: {domain}
 Findings: {total} | 🔴 Critical: {N} | 🟡 Major: {N} | 🟢 Minor: {N}
 Auto-fixable: {N} | Needs human decision: {N}
 
+Sign-off gate (system BDD only):
+  be_team  : {done | pending}
+  fe_team  : {done | pending}   ← {name / "needs sign-off" }
+  app_team : {done | pending | n/a}
+  sa       : {done | pending}
+  Gate     : {🔒 BLOCKED — pending: fe_team, sa | ✅ READY}
+
 Findings file: {paths.refinement_dir}/{uc-id}-tech-review-findings.yaml
 Next: Open in Review Board → Accept/Modify/Reject each finding
       Then run: /review-tech-docs --resume {tech-design-file}
+      After all sign-offs collected → update @trace.sign_off in tech doc, re-run review
 ```
 
 ---
@@ -520,7 +683,10 @@ Review Board "Modify" note. Apply exactly what the note says. Do not invent the
 
 Edit the tech-doc file directly:
 1. Find `@trace.revision:` in the header — increment its integer value by 1.
-2. Find `@trace.status:` in the header — set its value to `draft`.
+2. Find `@trace.status:` in the header:
+   - If sign_off_gate = `ready` (all sign-offs done) → set to `approved`
+   - Otherwise → set to `in-review` (blocks `/generate-code`)
+3. If `@trace.sign_off` block is absent and this is a system BDD tech doc → add it with all values `pending`.
 
 Write both changes to the file.
 
@@ -542,8 +708,13 @@ Changes:
   - {change 2}
 
 Revision : {old} → {new}
-Status   : reset to draft (re-approval required)
+Status   : {approved | in-review}
+
+Sign-off : {✅ All done — status set to approved
+           | 🔒 Pending: fe_team, sa — status set to in-review
+              Update @trace.sign_off in tech doc when each team confirms, then re-run /review-tech-docs}
 
 Re-run /review-tech-docs {file} to confirm 0 remaining critical findings.
-Next: /generate-code {feature-file}
+Next: {/generate-code {feature-file}  ← only if status = approved
+      | Collect pending sign-offs → update @trace.sign_off → re-run /review-tech-docs}
 ```

package/core/commands/run-tests.md

@@ -131,6 +131,7 @@ Read `.agent/project-context.yaml`. Extract and store:
 - `paths.core_entities` → path to core-entities.md
 - `paths.tech_docs_dir` → technical documentation root
 - `paths.trace_dir` → trace state directory
+- `paths.design_spec_dir` → Design Spec documents root (FE/App only)
 
 If `paths` section is absent, use these defaults:
 - `specs_dir` = `specs/bdd`
@@ -142,11 +143,75 @@ If `paths` section is absent, use these defaults:
 - `core_entities` = `specs/domain-knowledge/core-entities.md`
 - `tech_docs_dir` = `specs/tech-docs`
 - `trace_dir` = `.trace`
+- `design_spec_dir` = `specs/design-spec`
 
 If `tech_stack.module` is set, also load `.agent/modules/{module}/stack-profile.yaml` if it exists.
 
 ---
 
+## Step 1.5 — [SERVICE ROUTING] Resolve service paths (umbrella mode)
+
+*Skip this step entirely if `setup.mode` is not `"umbrella"` and `services` section is absent from project-context.yaml.*
+
+If `services` section is present:
+
+**1. Detect active domain** (in priority order):
+- Read `@trace.domain` from target file frontmatter (if Gate loaded a target file)
+- Extract from target file path: segment immediately after `prd_dir` base path  
+  *(e.g., `specs/prd/user/FEAT-01.md` → domain = `user`)*
+- If `$ARGUMENTS` contains a path, extract the segment after `prd_dir`
+
+**2. Route to service** — if active domain matches a key in `services`:
+- Override `paths.specs_dir` → `services.{domain}.specs_dir`
+- Override `paths.tech_docs_dir` → `services.{domain}.tech_docs_dir`
+- Store `active_service` = `services.{domain}.path`
+- Store `active_service_module` = `services.{domain}.module`
+- If service has its own `module` → use it as `active_module` (overrides `tech_stack.module`)
+
+**3. Fallback** — if domain not detected or no matching service key:
+- Keep default paths from Step 1
+- Set `active_service = unresolved`
+
+**4. Spec source auto-override** — if `setup.spec_source` is set AND the corresponding path was not already explicitly set in `paths:`:
+- Override `paths.prd_dir` → `{spec_source}/specs/prd`
+- Override `paths.design_spec_dir` → `{spec_source}/specs/design-spec`
+- Override `paths.domain_knowledge_dir` → `{spec_source}/specs/domain-knowledge`
+- Override `paths.business_dictionary` → `{spec_source}/specs/domain-knowledge/business-dictionary.md`
+- Override `paths.core_entities` → `{spec_source}/specs/domain-knowledge/core-entities.md`
+- Override `paths.bug_reports_dir` → `{spec_source}/feedback/bug-reports`
+- Override `paths.bdd_proposals_dir` → `{spec_source}/feedback/bdd-proposals`
+
+> **Why under `spec_source`:** tester feedback (`/report-bug`, `/propose-scenario`) must land in the **shared spec repo** so PO/Dev see it when they `/sync`. In single-service mode (no `spec_source`), these default to `feedback/bug-reports` and `feedback/bdd-proposals` at repo root — still shared, same repo.
+
+---
+
+## Step 1.6 — [SERVICE CONVENTIONS] Load service-specific conventions (umbrella mode)
+
+*Skip this step entirely if `active_service` is `"unresolved"` or context is single-service mode.*
+
+When `active_service` has been resolved to a real path in Step 1.5 (e.g., `user-service/`):
+
+**1. Locate service config** — try in priority order:
+- `{active_service}/.agent/project-context.yaml`
+- `{active_service}/project-context.yaml`
+
+**2. If found, override with service-specific values:**
+
+| Variable | Source |
+|----------|--------|
+| `conventions.test_command` | service's `conventions.test_command` |
+| `conventions.build_command` | service's `conventions.build_command` |
+| `paths.trace_dir` | `{active_service}/{service paths.trace_dir}` — default: `{active_service}/.trace` |
+| `paths.specs_dir` | `{active_service}/{service paths.specs_dir}` (if set in service config, else keep Step 1.5 override) |
+
+**3. Store** `service_root = {active_service}` as the working directory anchor for all downstream commands:
+- Shell commands (`/run-tests`, `/generate-tests`) run **from within** `service_root`
+- File write operations (test files, trace TSVs) use paths **relative to** `service_root`
+
+**4. If service config not found** — keep umbrella defaults, still set `service_root = {active_service}` (path anchor is always needed even without a config override).
+
+---
+
 ## Step 2 — [PROJECT-CONFIG] Load module stack profile (conditional)
 
 If `tech_stack.module` is set, read `.agent/modules/{module}/stack-profile.yaml`.
@@ -237,6 +302,25 @@ These two variables (`active_module`, `platform_type`) are the canonical source
 
 ---
 
+## Step 6.7 — [GUARDRAILS] Load Project Lessons (conditional)
+
+*Accumulated mistakes the AI must not repeat in this project. These are added over time via `/learn`
+or accepted during `/review-code`, `/fix-bug`, `/debug`.*
+
+Resolve the lessons file path:
+- Use `paths.lessons_file` if set (may be service-overridden in umbrella mode, Step 1.6)
+- Else default `specs/domain-knowledge/lessons-learned.md`
+- In umbrella/service mode (when `service_root` is set), if `paths.lessons_file` is unset, default to `{service_root}/.agent/project-lessons.md`
+
+If the file exists, read it and store ALL lessons as **ACTIVE GUARDRAILS** for the session:
+- Treat each lesson's **Rule** as a hard constraint — same priority as CLAUDE.md coding standards (Step 3).
+- Before generating or modifying any artifact (PRD, BDD, tech-doc, code, test), check the output against every lesson whose `category` matches the current command AND whose `scope` matches the target (domain / file).
+- If a generated output would violate a lesson → correct it **before** presenting, and note which lesson (`L-NNN`) was applied.
+
+If the file does not exist → skip silently (no lessons captured yet).
+
+---
+
 ## Step 7 — [RECAP] Working Memory Recap (anti-lost-in-middle)
 
 After loading all context, synthesize and output a compact summary block.
@@ -252,6 +336,9 @@ Layers    : {layer order from CLAUDE.md §2, e.g., Controller → Facade → Ser
 Ticket    : {ticket_prefix}-
 Dict      : {loaded — N canonical terms, M banned terms | missing}
 Entities  : {loaded — EntityA, EntityB, EntityC | missing}
+Lessons   : {loaded — N guardrails | none yet}
+Service   : {active_service} ({active_service_module}) | single-service
+Svc Root  : {service_root} — conventions + trace_dir loaded from service config | —
 Status    : {FULL | PARTIAL — missing: CLAUDE.md / business-dict / core-entities | MINIMAL}
 ```
 
@@ -282,6 +369,31 @@ Use it to select the correct run command and error analysis table below.
 
 ---
 
+## Submodule Working Directory
+
+*Skip this section if `service_root` is not set (single-service mode).*
+
+When running in **umbrella/submodule mode** (`service_root` was resolved in context-loader Step 1.6):
+
+- All commands in the **Run** section below must execute from within `{service_root}/`
+- `conventions.test_command` was loaded from `{service_root}/.agent/project-context.yaml` — already service-specific
+- Prefix every shell command with `cd {service_root} &&`:
+
+```bash
+cd {service_root}
+
+# Then run any of the commands in the Run section below, e.g.:
+{conventions.test_command}
+mvn test -Dtest={ClassName}            # java-spring
+go test ./... -run Test{FunctionName}  # golang
+npx vitest run src/...                 # web-frontend
+flutter test test/{domain}/...         # flutter
+```
+
+> **Why cd?** Claude Code session is opened at umbrella root. Each service submodule has its own build tool, test runner, and dependency tree — tests must run from inside the service directory.
+
+---
+
 ## Run
 
 ### If `platform_type = backend`
@@ -444,7 +556,8 @@ Suggest the logical next command based on workflow phase:
 | /define-product         | `/generate-prd {product-definition-file}`     |
 | /generate-prd           | `/refine-prd {prd-file}` then `/review-context {prd-file}` |
 | /refine-prd             | Open Review Board → update PRD → `/review-context {prd-file}` |
-| /review-context (PRD)   | `/generate-bdd {prd-file}` if APPROVED; fix PRD if NEEDS_FIX |
+| /review-context (PRD)   | FE/App: `/generate-design-spec {prd-file}` (then BDD after sign-off); BE: `/generate-bdd {prd-file}` directly; fix PRD if NEEDS_FIX |
+| /generate-design-spec   | Designer review → Figma links confirmed → PO + Designer sign-off → `/generate-bdd {prd-file}` |
 | /generate-bdd           | `/review-context {feature-file}` to verify coverage |
 | /review-context (BDD)   | `/generate-tech-docs {UC-ID}` if APPROVED; regenerate if NEEDS_FIX |
 | /generate-tech-docs     | `/review-tech-docs {tech-design-file}`        |
@@ -458,6 +571,11 @@ Suggest the logical next command based on workflow phase:
 | /validate-traces        | DRIFT/UNTRACKED → `/generate-code {UC-ID}`; GAP → `/generate-tests {UC-ID}`; all OK → create PR |
 | /fix-bug                | Create PR and link to ticket                  |
 | /debug                  | `/fix-bug {ticket-id}` if fix needed          |
+| /report-bug             | Send to dev (`/fix-bug {BUG-ID}`); if coverage gap → `/propose-scenario {UC-ID}` |
+| /propose-scenario       | Notify PO/Dev to review the proposal in `feedback/bdd-proposals/` |
+| /learn                  | Continue working — lesson applies on next command |
+| /sync                   | `/validate-traces` for full coverage; act on any `📥 tester feedback` surfaced |
+| /update-framework       | Review `git diff .agent/`, commit; `/sync` for project content |
 
 Format the footer as:
 ```

package/core/commands/setup-ai-first.md

@@ -98,6 +98,51 @@ Check if already set up:
   - Y → continue (existing files will be preserved — each step will offer merge/skip)
 - If only `specs/` exists or only partial setup detected → continue normally (safe to re-run)
 
+## Step 0.5 — Project Type
+
+Ask the user:
+
+```
+What type of project is this?
+  1. Single-service  — one codebase, one platform (standard setup)
+  2. Umbrella repo   — this repo contains multiple service submodules (microservices / multi-app)
+  3. PO Spec repo    — docs only, no runnable code (PRD + design-spec only)
+```
+
+Store the answer as `project_type`. Default to `1` if user does not answer.
+
+Based on answer:
+
+**project_type = 1 (Single-service):** Continue standard setup below.
+
+**project_type = 2 (Umbrella):** Ask two follow-up questions:
+- "Path to spec submodule (e.g. `free-trial-specs`)? Press Enter to skip."
+- "List services as `domain:module` pairs, comma-separated
+  (e.g. `user:java-spring,order:java-spring`). Press Enter to skip."
+
+Then:
+- Skip creating `specs/prd/`, `specs/design-spec/`, `specs/domain-knowledge/` (those live in spec submodule)
+- Create only: `specs/bdd/`, `specs/tech-docs/`, `.trace/`, `.agent/review/` at umbrella level
+  *(Unless user explicitly asks to create the full structure)*
+- Generate `.agent/project-context.yaml` in umbrella mode with the services and spec_source provided
+- Skip creating `CLAUDE.md` (umbrella has no single tech stack)
+- After setup, remind: "Open each service submodule separately in Claude Code to install the framework there if needed."
+
+**project_type = 3 (PO Spec repo):**
+- Create: `specs/prd/`, `specs/design-spec/`, `specs/product-definition/`, `specs/domain-knowledge/`, `.agent/review/`
+- Skip: `specs/bdd/`, `specs/tech-docs/`, `.trace/`
+- Generate minimal `CLAUDE.md` with only §1 (project overview) and §7 (git conventions)
+- Ask the user: **"List your business domains (e.g. auth, payment, loyalty):"** — store as domain list for `project-context.yaml` and remind PO these names must be used consistently as `@trace.domain` in every PRD
+- Inform:
+  - Commands for PO repo: `/define-product`, `/generate-prd`, `/review-context`, `/generate-design-spec`
+  - **Critical for dev team handoff:** Every PRD must have `@trace.domain: {domain}` in its frontmatter. Dev team uses this to route generated BDD/code to the correct service submodule. Inconsistent domain names will break routing.
+  - Recommended PRD frontmatter:
+    ```
+    @trace.domain: {domain}    ← must match a key in dev team's services config
+    @trace.id: {TICKET-ID}
+    @trace.status: draft | approved
+    ```
+
 ## Step 1 — Create Directory Structure
 
 Create these directories (skip if they exist):
@@ -108,6 +153,7 @@ Create these directories (skip if they exist):
 │   ├── product-definition/
 │   ├── prd/
 │   ├── bdd/
+│   ├── design-spec/          ← Design Spec documents (FE/App platforms only)
 │   ├── tech-docs/            ← technical design documents
 │   └── domain-knowledge/     ← business dictionary & domain context
 ├── .trace/
@@ -115,8 +161,19 @@ Create these directories (skip if they exist):
     └── review/
 ```
 
+*Directory structure varies by `project_type` set in Step 0.5:*
+
+| project_type | Create | Skip |
+|---|---|---|
+| **1 — Single-service** | Full structure above | — |
+| **2 — Umbrella** | `.agent/review/` only (at umbrella root) | Everything else — `specs/` dirs live inside service submodules |
+| **3 — PO Spec repo** | `specs/prd/`, `specs/design-spec/`, `specs/product-definition/`, `specs/domain-knowledge/`, `.agent/review/` | `specs/bdd/`, `specs/tech-docs/`, `.trace/` |
+
 ## Step 2 — Create CLAUDE.md
 
+*Skip this step entirely if `project_type = 2` (Umbrella) — umbrella has no single tech stack.*
+*For `project_type = 3` (PO Spec repo) — create a minimal CLAUDE.md with only §1 (project overview) and §7 (git conventions). Skip §2–§6.*
+
 Check if `CLAUDE.md` exists:
 - Yes → ask "Merge template or skip?"
 - No → create from the template below
@@ -173,12 +230,19 @@ commit_feature: "feat({{TICKET_PREFIX}}-{N}): {description}"
 
 ## Step 3 — Create project-context.yaml
 
+*For `project_type = 2` (Umbrella):*
+- *If `.agent/project-context.yaml` was already generated by `--init --umbrella` → open it and verify/edit the `services` section (domain keys, paths, modules). Skip template copy below.*
+- *If not yet generated → ask: "Spec submodule path?" and "Services (domain:module pairs)?" then generate umbrella config (see Step 0.5 for format).*
+
 Create `.agent/project-context.yaml` using `.agent/templates/project-context.yaml` as the source template.
 
 Copy the template and instruct: "Open `.agent/project-context.yaml` and fill in all `{{PLACEHOLDER}}` values. The `paths` section is pre-configured with sensible defaults — adjust if your project uses different directory names."
 
 ## Step 4 — Create business-dictionary.md
 
+*Skip Steps 4 and 5 if `project_type = 2` (Umbrella) — business dictionary and core entities live in the spec submodule and are managed by the PO team. Dev team reads them from `{spec_source}/specs/domain-knowledge/`.*
+
+
 Create `specs/domain-knowledge/business-dictionary.md` if it does not exist:
 
 ```markdown
@@ -272,8 +336,12 @@ Or: VS Code → `Ctrl+Shift+P` → **"Extensions: Install from Marketplace"**
 
 ## Step 7 — Verify
 
+Checklist varies by `project_type`:
+
+**project_type = 1 (Single-service):**
 - [ ] `specs/` exists
 - [ ] `specs/bdd/` exists
+- [ ] `specs/design-spec/` exists *(skip if backend-only project)*
 - [ ] `specs/tech-docs/` exists
 - [ ] `specs/domain-knowledge/` exists
 - [ ] `.trace/` exists
@@ -282,6 +350,24 @@ Or: VS Code → `Ctrl+Shift+P` → **"Extensions: Install from Marketplace"**
 - [ ] `specs/domain-knowledge/business-dictionary.md` exists
 - [ ] `specs/domain-knowledge/core-entities.md` exists
 
+**project_type = 2 (Umbrella):**
+- [ ] `.agent/project-context.yaml` exists with `setup.mode: umbrella`
+- [ ] `services` section has at least one entry with correct domain keys
+- [ ] `spec_source` path exists (e.g., `my-project-specs/` directory is present)
+- [ ] `.agent/review/` exists
+- [ ] Spec submodule initialized: `git submodule status` shows no `-` prefix
+
+**project_type = 3 (PO Spec repo):**
+- [ ] `specs/prd/` exists
+- [ ] `specs/design-spec/` exists
+- [ ] `specs/product-definition/` exists
+- [ ] `specs/domain-knowledge/` exists
+- [ ] `.agent/review/` exists
+- [ ] `.agent/project-context.yaml` exists
+- [ ] `CLAUDE.md` exists (minimal)
+- [ ] `specs/domain-knowledge/business-dictionary.md` exists
+- [ ] `specs/domain-knowledge/core-entities.md` exists
+
 ## Output
 
 # Report Footer — Standard Command Output Format
@@ -316,7 +402,8 @@ Suggest the logical next command based on workflow phase:
 | /define-product         | `/generate-prd {product-definition-file}`     |
 | /generate-prd           | `/refine-prd {prd-file}` then `/review-context {prd-file}` |
 | /refine-prd             | Open Review Board → update PRD → `/review-context {prd-file}` |
-| /review-context (PRD)   | `/generate-bdd {prd-file}` if APPROVED; fix PRD if NEEDS_FIX |
+| /review-context (PRD)   | FE/App: `/generate-design-spec {prd-file}` (then BDD after sign-off); BE: `/generate-bdd {prd-file}` directly; fix PRD if NEEDS_FIX |
+| /generate-design-spec   | Designer review → Figma links confirmed → PO + Designer sign-off → `/generate-bdd {prd-file}` |
 | /generate-bdd           | `/review-context {feature-file}` to verify coverage |
 | /review-context (BDD)   | `/generate-tech-docs {UC-ID}` if APPROVED; regenerate if NEEDS_FIX |
 | /generate-tech-docs     | `/review-tech-docs {tech-design-file}`        |
@@ -330,6 +417,11 @@ Suggest the logical next command based on workflow phase:
 | /validate-traces        | DRIFT/UNTRACKED → `/generate-code {UC-ID}`; GAP → `/generate-tests {UC-ID}`; all OK → create PR |
 | /fix-bug                | Create PR and link to ticket                  |
 | /debug                  | `/fix-bug {ticket-id}` if fix needed          |
+| /report-bug             | Send to dev (`/fix-bug {BUG-ID}`); if coverage gap → `/propose-scenario {UC-ID}` |
+| /propose-scenario       | Notify PO/Dev to review the proposal in `feedback/bdd-proposals/` |
+| /learn                  | Continue working — lesson applies on next command |
+| /sync                   | `/validate-traces` for full coverage; act on any `📥 tester feedback` surfaced |
+| /update-framework       | Review `git diff .agent/`, commit; `/sync` for project content |
 
 Format the footer as:
 ```
@@ -342,13 +434,59 @@ Next   : {suggested command with example arguments}
 
 ```
 /setup-ai-first Complete ✅
+```
+
+Output varies by `project_type`:
+
+**Single-service:**
+```
 Next:
   1. Fill CLAUDE.md (replace {{PLACEHOLDER}} values)
   2. Fill .agent/project-context.yaml
-  3. Fill specs/domain-knowledge/business-dictionary.md  ← terminology rules
-  4. Fill specs/domain-knowledge/core-entities.md        ← entity glossary for code gen
+  3. Fill specs/domain-knowledge/business-dictionary.md
+  4. Fill specs/domain-knowledge/core-entities.md
   5. git add and commit those 4 files
-  6. Install VS Code extension (if not yet installed):
+  6. Install VS Code extension:
      code --install-extension edupia-team.spec-driven-dev-team
   7. /define-product to start your first feature
 ```
+
+**Umbrella:**
+```
+Next:
+  1. Review .agent/project-context.yaml:
+     - Update services[].path to match actual submodule directory names
+     - Update services domain keys to match @trace.domain in your PRD files
+     - Confirm spec_source path is correct
+
+  2. Run /sync — one command that handles everything else:
+     /sync
+     → git pull + submodule init + spec submodule update
+     → Auto-create .agent/project-context.yaml for each service submodule
+       (detects module from pom.xml / go.mod / package.json / pubspec.yaml etc.)
+     → Sync Living Docs panel
+     → Refresh spec-manifest.yaml
+
+  3. Start generating:
+     /generate-bdd {spec_source}/specs/prd/{domain}/TICKET-ID-prd.md
+```
+
+**PO Spec repo:**
+```
+Next:
+  1. Fill .agent/project-context.yaml:
+     - domains: [list all business domains — these become @trace.domain values in PRDs]
+     - project.name, project.description
+  2. Fill specs/domain-knowledge/business-dictionary.md  ← canonical terms
+  3. Fill specs/domain-knowledge/core-entities.md        ← entity glossary
+  4. git add and commit those files
+  5. Install VS Code extension:
+     code --install-extension edupia-team.spec-driven-dev-team
+  6. /define-product to start your first feature
+
+⚠️  Dev team handoff reminder:
+  - Each PRD must have @trace.domain matching one of your domains list
+  - When dev team sets up their umbrella repo, they map these domain names
+    to service submodule paths in their project-context.yaml services section
+  - Share domain names with dev team before they configure their umbrellas
+```