viepilot 2.15.0 → 2.22.0

package/workflows/brainstorm.md

@@ -7,9 +7,10 @@ Allows research inline within the same brainstorm session when needed.
 
 | Feature | Claude Code (terminal) | Cursor (Agent/Skills) | Codex CLI | Antigravity (native) |
 |---------|----------------------|-----------------------|-----------|----------------------|
-| Interactive prompts | ✅ `AskUserQuestion` tool | ❌ text fallback | ❌ text fallback | ❌ text fallback |
+| Interactive prompts | ✅ `AskUserQuestion` tool — **REQUIRED** | ❌ text fallback | ❌ text fallback | ❌ text fallback |
 
-When `AskUserQuestion` is not available, each prompt block falls back to the plain-text numbered list shown below it — no configuration needed.
+**Claude Code (terminal):** Always call `AskUserQuestion` first. Only fall back to the plain-text menu below if the tool returns an error or is unavailable.
+**Cursor / Codex CLI / Antigravity / other adapters:** `AskUserQuestion` not available — use text menus below.
 
 ## ViePilot Skill Scope Policy (BUG-004)
 
@@ -47,12 +48,12 @@ Parse results to get list of existing sessions.
 **If previous sessions exist:**
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "Previous brainstorm sessions found. What would you like to do?"
 >   - header: "Session"
 >   - options: [{ label: "Continue recent session", description: "Resume the most recent session from where it stopped" }, { label: "Review specific session", description: "Choose a particular session to review or continue" }, { label: "New brainstorm session", description: "Start fresh — previous sessions are preserved" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text menu below
+> **Cursor / Codex / Antigravity / other:** use text menu below
 
 ```
 I found previous brainstorm sessions:
@@ -137,12 +138,12 @@ If the user is brainstorming a landing page / homepage / marketing page:
 2. Present a layout menu for the user to choose from:
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "Which landing page layout fits your goals and audience?"
 >   - header: "Layout"
 >   - options: [{ label: "Layout A — Hero centric", description: "Hero + trust logos + features + CTA — best for brand awareness and conversions" }, { label: "Layout B — Problem/Solution", description: "Problem/Solution + social proof + pricing + FAQ — best for SaaS sign-ups" }, { label: "Layout C — Product storytelling", description: "Screenshots + testimonials + final CTA — best for product demos" }, { label: "Layout D — SaaS conversion", description: "Integrations + comparison + onboarding steps — best for tool adoption" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use list below
+> **Cursor / Codex / Antigravity / other:** use list below
 
    - Layout A: Hero centric + trust logos + features + CTA
    - Layout B: Problem/Solution + social proof + pricing + FAQ
@@ -593,6 +594,40 @@ After intake is **completed** or a **valid skip** (META already has profile) →
 <step name="save_session">
 ## 6. Save Session
 
+### Pre-Save Phase Assignment Validation (ENH-052)
+
+Before writing the session file, validate phase assignment completeness:
+
+**Scope-locked session** — `## Phases` section exists with real content OR user confirmed scope finalized (ref: Step 5.1 condition 1):
+
+```
+CHECK 1: Does session draft contain a non-empty ## Phases section?
+CHECK 2: Does Phase 1 have at least one feature/capability assigned?
+CHECK 3: Are there any features listed outside a phase (unassigned)?
+```
+
+**Gate condition:**
+- If scope is locked AND (CHECK 1 fails OR CHECK 2 fails):
+  → **Block save.** Show:
+  ```
+  ⚠️  Phase assignment incomplete — cannot save as Completed.
+
+  Features were discussed but no phase assignments exist.
+  Before saving:
+    1. Assign all features to phases (## Phases section)
+    2. Ensure Phase 1 has at least one feature
+
+  Return to the conversation to assign phases, then /save again.
+  ```
+- If scope is **not** locked (exploratory session — no feature assignments):
+  → **Allow save** with `Status: In Progress` and add advisory note to session file:
+  ```markdown
+  > ⚠️ Exploratory session — no phase assignments yet.
+  > Run /vp-brainstorm to continue and assign features to phases before /vp-crystallize.
+  ```
+- If brownfield stub session (`IS_BROWNFIELD=true`): **skip this gate** — brownfield stubs intentionally have no phases.
+- If all checks pass → proceed to file write below.
+
 Create/update file: `docs/brainstorm/session-{YYYY-MM-DD}.md`
 
 ```markdown

package/workflows/crystallize.md

@@ -6,9 +6,10 @@ Convert brainstorm sessions into structured artifacts for autonomous AI executio
 
 | Feature | Claude Code (terminal) | Cursor (Agent/Skills) | Codex CLI | Antigravity (native) |
 |---------|----------------------|-----------------------|-----------|----------------------|
-| Interactive prompts | ✅ `AskUserQuestion` tool | ❌ text fallback | ❌ text fallback | ❌ text fallback |
+| Interactive prompts | ✅ `AskUserQuestion` tool — **REQUIRED** | ❌ text fallback | ❌ text fallback | ❌ text fallback |
 
-When `AskUserQuestion` is not available, each prompt block falls back to the plain-text numbered list shown below it — no configuration needed.
+**Claude Code (terminal):** Always call `AskUserQuestion` first. Only fall back to the plain-text menu below if the tool returns an error or is unavailable.
+**Cursor / Codex CLI / Antigravity / other adapters:** `AskUserQuestion` not available — use text menus below.
 
 ## ViePilot Skill Scope Policy (BUG-004)
 
@@ -102,12 +103,12 @@ Ask the user for project information:
 ### License & Year
 
 > **Adapter-aware prompt (question 13):**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "Which license for this project?"
 >   - header: "License"
 >   - options: [{ label: "MIT", description: "Permissive — most common open-source choice" }, { label: "Apache-2.0", description: "Permissive with patent grant — preferred for enterprise OSS" }, { label: "GPL-3.0", description: "Copyleft — derivative works must stay open-source" }, { label: "Proprietary", description: "All rights reserved — no public redistribution" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text list below
+> **Cursor / Codex / Antigravity / other:** use text list below
 
 ```
 13. License?
@@ -134,12 +135,12 @@ Store all metadata for template generation.
 - Warn: "`.viepilot/` already exists. Re-running brownfield mode will overwrite artifacts."
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "`.viepilot/` already exists. Re-running brownfield mode will overwrite artifacts. Continue?"
 >   - header: "Overwrite?"
 >   - options: [{ label: "Yes, continue", description: "Overwrite existing .viepilot/ artifacts with new scan results" }, { label: "No, abort", description: "Stop here — keep existing artifacts unchanged" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text prompt below
+> **Cursor / Codex / Antigravity / other:** use text prompt below
 >
 > Ask: "Continue? (y/n)" — abort if n.
 
@@ -227,12 +228,12 @@ If `polyrepo_hints` is empty → skip this section entirely (no empty array in c
 **Interactive prompt** (fire when `polyrepo_hints` non-empty):
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "Polyrepo signals detected — this repo may be part of a multi-repo system. Would you like to provide related repo URLs?"
 >   - header: "Polyrepo?"
 >   - options: [{ label: "Yes, I'll list them", description: "Provide sibling repo URLs — improves system-level context accuracy" }, { label: "Skip for now", description: "Continue without related repos — affected fields will be marked ASSUMED" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text prompt below
+> **Cursor / Codex / Antigravity / other:** use text prompt below
 
 ```
 ⚠️ Polyrepo signals detected:
@@ -786,6 +787,31 @@ When generating TRACKER.md in Step 9 (brownfield mode only), append:
 
 </step>
 
+<step name="brownfield_execution_path">
+## Brownfield Execution Path
+
+When `IS_BROWNFIELD=true`, the following table governs which steps execute:
+
+| Step | Name | Brownfield behavior | Rationale |
+|------|------|---------------------|-----------|
+| 0 | Collect metadata | **RUN** | Always needed |
+| 0-B | Brownfield scanner | **RUN** | Core brownfield step |
+| 0-C | Generate brainstorm stub | **RUN** | Creates `session-brownfield-import.md` |
+| 1 | Analyze brainstorm | **RUN (stub only)** | Reads brownfield stub; skips greenfield-only checks |
+| 1A | UI direction gate | **CONDITIONAL** — run if `.viepilot/ui-direction/` already exists in the project |
+| 1B | Stack research cache | **CONDITIONAL** — skip if brownfield scanner already populated stack cache |
+| 1C | Architect artifact consumption | **SKIP** — no architect HTML workspace in a brownfield import |
+| 1D | Architect auto-activate suggestion | **SKIP** — no scope brainstorm; architect mode not applicable |
+| 2+ | All subsequent steps | **RUN** — same as greenfield from Step 2 onward |
+
+> **Implementation note for AI agents:** When `IS_BROWNFIELD=true`, check each CONDITIONAL
+> step against the stated condition before executing. Do **not** skip Step 1 entirely —
+> read the brownfield stub to extract stack + gap data for Step 2 (AI-GUIDE.md generation).
+> For Step 1B: check `~/.viepilot/stacks/` for entries created during the Step 0-B scan;
+> if present and non-empty, skip the full research pass in 1B.
+
+</step>
+
 <step name="analyze_brainstorm">
 ## Step 1: Analyze Brainstorm
 
@@ -842,12 +868,12 @@ Check if `.viepilot/ui-direction/` exists and contains any session artifacts.
 If `ui_scope_detected = true` **AND** artifacts are missing → **STOP** and present:
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "UI Direction artifacts missing. The brainstorm indicates UI scope but `.viepilot/ui-direction/` has no artifacts. How to proceed?"
 >   - header: "UI Direction"
 >   - options: [{ label: "Return to /vp-brainstorm --ui (Recommended)", description: "Create UI direction artifacts first for best results" }, { label: "Continue with assumptions", description: "Record assumptions in ARCHITECTURE.md and proceed without visual direction" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text menu below
+> **Cursor / Codex / Antigravity / other:** use text menu below
 
 ```
 ⚠️ UI Direction artifacts missing
@@ -1016,12 +1042,12 @@ If `.viepilot/architect/` does **not** exist but brainstorm shows complex archit
 - Suggest (soft prompt — not a hard block):
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "Complex architecture detected (≥5 services/components). Would you like to create architecture visualizations first with /vp-brainstorm --architect?"
 >   - header: "Architect?"
 >   - options: [{ label: "Yes, go to architect mode", description: "Create visual architecture diagrams before crystallizing (recommended for complex systems)" }, { label: "No, continue now", description: "Continue crystallize with text-only brainstorm — no visual diagrams" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text menu below
+> **Cursor / Codex / Antigravity / other:** use text menu below
 
   ```
   💡 Would you like to return to /vp-brainstorm --architect to create visualizations first?

package/workflows/evolve.md

@@ -6,9 +6,10 @@ Upgrade or expand the project: add features, start a new milestone, or refactor.
 
 | Feature | Claude Code (terminal) | Cursor (Agent/Skills) | Codex CLI | Antigravity (native) |
 |---------|----------------------|-----------------------|-----------|----------------------|
-| Interactive prompts | ✅ `AskUserQuestion` tool | ❌ text fallback | ❌ text fallback | ❌ text fallback |
+| Interactive prompts | ✅ `AskUserQuestion` tool — **REQUIRED** | ❌ text fallback | ❌ text fallback | ❌ text fallback |
 
-When `AskUserQuestion` is not available, each prompt block falls back to the plain-text numbered list shown below it — no configuration needed.
+**Claude Code (terminal):** Always call `AskUserQuestion` first. Only fall back to the plain-text menu below if the tool returns an error or is unavailable.
+**Cursor / Codex CLI / Antigravity / other adapters:** `AskUserQuestion` not available — use text menus below.
 
 ## ViePilot Skill Scope Policy (BUG-004)
 
@@ -54,8 +55,9 @@ Determine:
 How would you like to evolve the project?
 ```
 
-> **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable.
+> **Cursor / Codex / Antigravity:** use text menu below.
+> AUQ spec:
 >   - question: "How would you like to evolve the project?"
 >   - header: "Evolve mode"
 >   - options: [{ label: "Add Feature", description: "Add a new capability to the current milestone" }, { label: "New Milestone", description: "Archive current milestone and start a new scope" }, { label: "Refactor", description: "Improve existing code without adding new features" }]
@@ -81,23 +83,25 @@ Describe the new feature:
 3. Which services/modules affected?
 4. Dependencies on existing code?
 
-> **Adapter-aware prompt (question 5 — complexity):**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED (question 5 — complexity):** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable.
+> **Cursor / Codex / Antigravity:** use text menu below.
+> AUQ spec:
 >   - question: "Estimated implementation complexity?"
 >   - header: "Complexity"
 >   - options: [{ label: "S — Small", description: "Few hours — isolated change, 1 file" }, { label: "M — Medium", description: "1–2 days — 1–2 files, some integration" }, { label: "L — Large", description: "3–5 days — multiple modules affected" }, { label: "XL — Extra Large", description: "1+ week — architectural change or major feature" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text below
+> **Cursor / Codex / Antigravity / other:** use text below
 
 5. Estimated complexity? (S/M/L/XL)
 
-> **Adapter-aware prompt (question 6 — brainstorm routing):**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED (question 6 — brainstorm routing):** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable.
+> **Cursor / Codex / Antigravity:** use text menu below.
+> AUQ spec:
 >   - question: "Does this feature need a brainstorm session first?"
 >   - header: "Brainstorm?"
 >   - options: [{ label: "Yes — go to /vp-brainstorm", description: "Research-heavy, UX-driven, or landing page feature — brainstorm first" }, { label: "No — plan directly", description: "Scope is clear — proceed to phase/task planning now" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text below
+> **Cursor / Codex / Antigravity / other:** use text below
 
 6. Need deep brainstorm? (landing page / UX / growth ideas / research-heavy)
 ```
@@ -288,13 +292,15 @@ Add to ROADMAP.md as phase {N+0.5} or insert between phases.
 <step name="update_version">
 ## 4. Update Version
 
-Based on changes:
+Apply the canonical bump rules from `.viepilot/SYSTEM-RULES.md → Version Bump Rules`.
+Precedence: MAJOR > MINOR > PATCH. Mixed phase → highest applicable bump wins.
 
-| Mode | Version Bump |
-|------|--------------|
-| Add Feature | MINOR (x.Y.z) |
-| New Milestone | MAJOR or MINOR |
-| Refactor | PATCH (x.y.Z) |
+Quick reference:
+- Add Feature → **MINOR**
+- Bug fix only → **PATCH**
+- Refactor (no behavior change) → **PATCH**
+- Mixed feature + fix → **MINOR**
+- Breaking change → **MAJOR**
 
 Update in:
 - TRACKER.md
@@ -305,6 +311,8 @@ Update in:
 <step name="confirm">
 ## 5. Confirm & Suggest Next
 
+Output the evolution summary banner:
+
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  VIEPILOT ► EVOLVE COMPLETE ✓
@@ -322,7 +330,32 @@ Update in:
  - Phase {N}: {name}
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- Next: /vp-auto --from {new_phase}
+```
+
+Then — **Claude Code adapter (terminal): use AskUserQuestion**:
+
+```
+question: "Phase {N} planned. What would you like to do next?"
+options:
+  - label: "Execute now → /vp-auto"
+    description: "Start implementing Phase {N} immediately (Recommended)"
+  - label: "Create another request → /vp-request"
+    description: "Log more requests before implementing"
+  - label: "Done for now"
+    description: "Exit — run /vp-auto later to start implementation"
+```
+
+**On selection:**
+- "Execute now → /vp-auto": invoke `/vp-auto --from {new_phase}` skill
+- "Create another request → /vp-request": invoke `/vp-request` skill
+- "Done for now": print brief confirmation and exit
+
+**Text fallback (Cursor, Codex, Copilot, Antigravity — AUQ not available):**
+```
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ Next:
+ - /vp-auto --from {new_phase}    Execute Phase {N}
+ - /vp-request                    Create another request
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
 </step>

package/workflows/request.md

@@ -6,9 +6,10 @@ Create and manage project requests: bugs, features, enhancements, tech debt, and
 
 | Feature | Claude Code (terminal) | Cursor (Agent/Skills) | Codex CLI | Antigravity (native) |
 |---------|----------------------|-----------------------|-----------|----------------------|
-| Interactive prompts | ✅ `AskUserQuestion` tool | ❌ text fallback | ❌ text fallback | ❌ text fallback |
+| Interactive prompts | ✅ `AskUserQuestion` tool — **REQUIRED** | ❌ text fallback | ❌ text fallback | ❌ text fallback |
 
-When `AskUserQuestion` is not available, each prompt block falls back to the plain-text numbered list shown below it — no configuration needed.
+**Claude Code (terminal):** Always call `AskUserQuestion` first. Only fall back to the plain-text menu below if the tool returns an error or is unavailable.
+**Cursor / Codex CLI / Antigravity / other adapters:** `AskUserQuestion` not available — use text menus below.
 
 ## ViePilot Skill Scope Policy (BUG-004)
 
@@ -63,12 +64,12 @@ Parse `{{VP_ARGS}}` for type flag:
 If no flag, ask user:
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "What type of request would you like to create?"
 >   - header: "Request type"
 >   - options: [{ label: "🐛 Bug Report", description: "Something is broken — file a defect report" }, { label: "✨ Feature Request", description: "New functionality — add a capability that doesn't exist yet" }, { label: "🔧 Enhancement", description: "Improve existing feature — make something better" }, { label: "🧹 Technical Debt", description: "Code cleanup / refactor — no new behavior" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text menu below (Brainstorm and List options remain text-only)
+> **Cursor / Codex / Antigravity / other:** use text menu below (Brainstorm and List options remain text-only)
 
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -86,6 +87,39 @@ What type of request?
 ```
 </step>
 
+<step name="feasibility_gate">
+## 2B. Feasibility Gate — research-agent (ENH-057)
+
+**Trigger**: auto-activate for **Feature** and **Enhancement** requests when any of:
+- User description mentions a new platform, IDE, API, protocol, or SDK
+- User asks "is this possible?", "how does X work?", "feasibility of X"
+- Request type = Feature AND subject is an external integration
+
+**Skip for**: Bug reports, internal refactors, Enhancement requests on known code.
+
+If triggered:
+
+**Claude Code (terminal) — invoke research-agent:**
+```
+Agent({
+  subagent_type: "general-purpose",
+  description: "research-agent: feasibility study for {topic}",
+  prompt: `
+    Load agents/research-agent.md for full spec.
+    Topic: {extracted from user description}
+    Questions: ["What SDK/API exists?", "What are integration points?", "What config dir/convention?", "Feasibility rating?"]
+    Return a ## Research Findings section + ## Sources.
+  `
+})
+```
+
+**Non-Claude Code**: if web search available, perform inline research. Otherwise note "manual research needed" and continue gathering details.
+
+**Output**: embed research-agent findings in the `## Research Findings` section of the request file.
+
+> This gate made FEAT-019 (Copilot adapter) research systematic — apply it to all future platform/API feature requests.
+</step>
+
 <step name="list_requests">
 ## 3. List Requests (if --list)
 
@@ -136,12 +170,12 @@ Options:
 6. Severity?
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "What is the bug severity?"
 >   - header: "Severity"
 >   - options: [{ label: "Critical", description: "System down, data loss — needs immediate attention" }, { label: "High", description: "Major feature broken — significantly impacts users" }, { label: "Medium", description: "Feature impaired — workaround exists" }, { label: "Low", description: "Minor / cosmetic issue — no functional impact" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text list below
+> **Cursor / Codex / Antigravity / other:** use text list below
 
    1. Critical - System down, data loss
    2. High - Major feature broken
@@ -219,12 +253,12 @@ Create `BUG-{N}.md`:
 5. Priority?
 
 > **Adapter-aware prompt:**
-> - **Claude Code (terminal):** use `AskUserQuestion` tool — spec:
+> **Claude Code (terminal) — REQUIRED:** Call `AskUserQuestion` tool. Only fall back to text menu if the tool errors or is unavailable. AUQ spec:
 >   - question: "What is the feature priority?"
 >   - header: "Priority"
 >   - options: [{ label: "Must-have", description: "Critical for release — cannot ship without it" }, { label: "Should-have", description: "Important but not blocking — include if capacity allows" }, { label: "Nice-to-have", description: "Quality-of-life improvement — can defer to next milestone" }]
 >   - multiSelect: false
-> - **Cursor / Codex / Antigravity / other:** use text list below
+> **Cursor / Codex / Antigravity / other:** use text list below
 
    1. Must-have - Critical for release
    2. Should-have - Important but not blocking
@@ -256,6 +290,9 @@ Create `FEAT-{N}.md`:
 ## Summary
 {TITLE}
 
+## Research Findings
+{Populated by research-agent if feasibility gate triggered (Step 2B); omit section if not applicable}
+
 ## Problem Statement
 {PROBLEM}
 
@@ -544,6 +581,8 @@ git push
 <step name="confirm">
 ## 7. Confirm
 
+Output the request summary banner:
+
 ```
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
  VIEPILOT ► REQUEST CREATED ✓
@@ -558,15 +597,33 @@ git push
  File: .viepilot/requests/{TYPE}-{N}.md
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
- Next Steps
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+```
+
+Then — **Claude Code adapter (terminal): use AskUserQuestion**:
 
- /vp-request --list    View all requests
- /vp-evolve            ROADMAP + phase/tasks (before code)
- /vp-auto              Implement theo task plan (sau evolve)
- /vp-request           Create another request
- /vp-status            See overall progress
+```
+question: "Request {TYPE}-{N} logged. What would you like to do next?"
+options:
+  - label: "Plan phase + tasks → /vp-evolve"
+    description: "Create ROADMAP entry, phase dir, and task files now (Recommended)"
+  - label: "Create another request → /vp-request"
+    description: "Log more requests before planning"
+  - label: "Done for now"
+    description: "Exit — request is saved in backlog"
+```
+
+**On selection:**
+- "Plan phase + tasks → /vp-evolve": invoke `/vp-evolve` skill
+- "Create another request → /vp-request": invoke `/vp-request` skill
+- "Done for now": print brief confirmation and exit
 
+**Text fallback (Cursor, Codex, Copilot, Antigravity — AUQ not available):**
+```
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ Next:
+ - /vp-evolve            Plan phase/tasks + ROADMAP
+ - /vp-request           Create another request
+ - /vp-request --list    View all requests
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
 </step>

package/workflows/rollback.md

@@ -8,7 +8,8 @@ Safe rollback to any ViePilot checkpoint with backup and state preservation.
 ## 1. List Available Checkpoints
 
 ```bash
-git tag --sort=-creatordate | rg "(^vp-p|^-*vp-backup|^[a-z0-9-]+-vp-p|^[a-z0-9-]+-vp-backup)" | head -20
+git tag --sort=-creatordate | rg "(^vp-p|^-*vp-backup|^[a-z0-9._-]+-vp-p|^[a-z0-9._-]+-vp-backup)" | head -20
+# [a-z0-9._-]+ matches both legacy and enriched (prefix-branch-version-vp-p*) formats (ENH-050)
 ```
 
 For each tag, get info:
@@ -127,13 +128,44 @@ git log -1 --oneline
 <step name="update_state">
 ## 7. Update State Files
 
-Parse tag to determine phase/task (support both legacy and project-scoped):
-- `vp-p{N}-t{M}` or `{project}-vp-p{N}-t{M}` → Phase N, Task M, status: in_progress
-- `vp-p{N}-t{M}-done` or `{project}-vp-p{N}-t{M}-done` → Phase N, Task M+1, status: not_started
-- `vp-p{N}-complete` or `{project}-vp-p{N}-complete` → Phase N+1, Task 1, status: not_started
+Parse tag to determine phase/task — 3 supported formats (ENH-050):
 
-Update HANDOFF.json accordingly.
-Update TRACKER.md progress.
+- **Format A** (legacy): `vp-p{N}-t{M}[-done]` or `vp-p{N}-complete`
+- **Format B** (project-scoped): `{project}-vp-p{N}-t{M}[-done]` or `{project}-vp-p{N}-complete`
+- **Format C** (enriched): `{project}-{branch}-{version}-vp-p{N}-t{M}[-done|-complete]`
+
+For all formats, extract N and M by matching the terminal segments:
+
+```bash
+TAG="{selected_tag}"
+
+# Extract phase number — works for all 3 formats
+PHASE_NUM=$(echo "$TAG" | grep -oE 'vp-p[0-9]+' | grep -oE '[0-9]+$')
+
+# Extract task number if present
+TASK_NUM=$(echo "$TAG" | grep -oE '\-t[0-9]+' | tail -1 | grep -oE '[0-9]+$')
+
+# Determine restore intent
+if echo "$TAG" | grep -q '\-complete$'; then
+  # Phase complete tag → restore to start of next phase
+  RESTORE_PHASE=$((PHASE_NUM + 1))
+  RESTORE_TASK=1
+  RESTORE_STATUS="not_started"
+elif echo "$TAG" | grep -q '\-done$'; then
+  # Task done tag → restore to start of next task
+  RESTORE_PHASE=$PHASE_NUM
+  RESTORE_TASK=$((TASK_NUM + 1))
+  RESTORE_STATUS="not_started"
+else
+  # Task start tag → restore to in-progress state
+  RESTORE_PHASE=$PHASE_NUM
+  RESTORE_TASK=${TASK_NUM:-1}
+  RESTORE_STATUS="in_progress"
+fi
+```
+
+Update HANDOFF.json with `RESTORE_PHASE`, `RESTORE_TASK`, `RESTORE_STATUS`.
+Update TRACKER.md progress accordingly.
 </step>
 
 <step name="confirm_success">