@jakkrichm/create-nexus-devflow 2.2.2 → 2.6.0

package/template/.claude/skills/devflow/SKILL.md

@@ -5,26 +5,19 @@ description: "[devflow][B] Flagship interactive guide, state inspector, and inte
 
 # devflow - Interactive Workflow Guide & Intent Router for Nexus-DevFlow
 
-## Command Track Policy
-- [F] Fast-Track only
-- [D] Deep-Track only
-- [B] Available in both tracks (Track-agnostic)
-
-
-Use this skill to guide the user on what to do next, inspect current workspace state, map their natural language intent to the right Nexus-DevFlow track (Fast-Track or Deep-Track) or companion command, or display a sitemap of available DevFlow skills.
+Use this skill to guide the user on what to do next, inspect current workspace state, map their natural language intent to the matching Nexus-DevFlow stage or companion command, or display a sitemap of available DevFlow skills.
 
 ## Input
 
-- **No argument (`devflow`, `devflow`, `$devflow`, or `status`)**: Inspect current workspace state (active run in `devflow/runs/` or `devflow/context/current-stage.md`, active discovery in `devflow/discoveries/`, pending ideas in `devflow/ideas.md`, open findings in `devflow/context/findings.md`, and project overview in `devflow/context/project-overview.md`) and recommend the exact next action.
-- **With user request (`devflow "<request>"`)**: Classify the user's intent and guide them to the matching DevFlow workflow track or companion command path.
+- **No argument (`devflow`, `/devflow`, `$devflow`, or `status`)**: Inspect current workspace state (active run in `devflow/context/current-stage.md`, active living spec in `devflow/context/current-feature.md`, active discovery in `devflow/discoveries/`, pending ideas in `devflow/ideas.md`, open findings in `devflow/context/findings.md`, and project overview in `devflow/context/project-overview.md`) and recommend the exact next action.
+- **With user request (`devflow "<request>"`)**: Classify the user's intent and guide them to the matching DevFlow workflow stage or companion command path.
 
-## Dual-Track Architecture
+## The Unified Living Spec Architecture (DevFlow 2.5.0)
 
-Nexus-DevFlow supports two seamless workflow tracks:
-1. **🏎️ Fast-Track (Blueprint Mode - 4 Steps)**: `/spec` ➔ `/implement` ➔ `/check` ➔ `/complete`  
-   *Driven by a **Single Living Spec (`current-feature.md`)** for fast, high-velocity daily development and bugfixes (85% of tasks).*
-2. **🏗️ Deep-Track (Architect Mode - 8 Steps)**: `discovery` ➔ `10-define` ➔ `20-spec` ➔ `30-plan` ➔ `40-execute` ➔ `50-verify` ➔ `60-report` ➔ `70-deliver`  
-   *Driven by modular separate stage files for large, high-stakes architectural epics and multi-agent coordination.*
+Nexus-DevFlow uses a **Single Unified Living Spec Model**:
+- **The 4-Stage Lifecycle**: `/feature` (or `/fix`) ➔ `/implement` ➔ `/check` ➔ `/complete`
+- Driven by a **Single Living Spec (`devflow/context/current-feature.md`)** that integrates architectural depth (Define, Spec, Plan, Execution Log, Multi-Lane QA, and Release Digest) into one clear living document.
+- **Pre-Flight Inception Engine**: Companion skills (`/discovery`, `/idea`, `/grill`, `/brainstorm`) feed directly into `/feature`.
 
 ---
 
@@ -33,93 +26,72 @@ Nexus-DevFlow supports two seamless workflow tracks:
 When invoked without an argument (or when determining the next step), inspect:
 
 1. **Project Setup Baseline**: Read `devflow/context/project-overview.md` and `devflow/context/coding-standards.md`. If empty or default placeholders, recommend `onboard` (for fresh projects) or `adopt` (for existing codebases).
-2. **Active Delivery Run**: Read `devflow/context/current-stage.md` and check `devflow/runs/{RUNNING_ID}/`.
-   - **If Fast-Track (`current-feature.md`, `spec.md`, or `blueprint.md` present)**:
-     - If `current-feature.md` (or `spec.md`) has incomplete checklist items -> Recommend `/implement` (or `implement {RUNNING_ID}`).
-     - If all tasks done but no passing verification evidence -> Recommend `/check` (or `check {RUNNING_ID}`).
-     - If verification evidence passed -> Recommend `/complete` (or `complete {RUNNING_ID}`).
-   - **If Deep-Track (numbered stage files present)**:
-     - If at `10-define.md` -> Recommend `20-spec {RUNNING_ID}`.
-     - If at `20-spec.md` -> Recommend `30-plan {RUNNING_ID}`.
-     - If at `30-plan.md` -> Recommend `40-execute {RUNNING_ID}`.
-     - If at `40-execute.md` with all tasks done -> Recommend `50-verify {RUNNING_ID}`.
-     - If passed `50-verify.md` -> Recommend `60-report {RUNNING_ID}` then `70-deliver {RUNNING_ID}`.
+2. **Active Delivery Run**: Read `devflow/context/current-stage.md` and `devflow/context/current-feature.md`.
+   - If `current-feature.md` has incomplete checklist tasks (`- [ ]`) -> Recommend `/implement`.
+   - If all tasks are completed (`- [x]`) but no passing verification evidence in Section 5 -> Recommend `/check`.
+   - If verification evidence passed in Section 5 -> Recommend `/complete`.
 3. **Active Discovery**: Check `devflow/discoveries/` for open discovery notes.
-4. **Pending Ideas Inbox**: Check `devflow/ideas.md`. If items exist under `## 📌 Pending Ideas`, summarize them in a **💡 Pending Ideas (Inbox)** list with their IDs (`[IDEA-xxx]`), feasibility, and mention that they can be started with `/spec IDEA-xxx` or `/discovery IDEA-xxx`.
+4. **Pending Ideas Inbox**: Check `devflow/ideas.md`. If items exist under `## 📌 Pending Ideas`, summarize them in a **💡 Pending Ideas (Inbox)** list with their IDs (`[IDEA-xxx]`), feasibility, and mention that they can be started with `/feature IDEA-xxx` or `/discovery IDEA-xxx`.
 5. **Audit Findings Ledger**: Check `devflow/context/findings.md` for open high-severity findings.
 
 ### Default State Recommendations
-- if no run is active and user wants to start a feature -> Recommend `/feature <name>`.
+- If no run is active and user wants to start a feature -> Recommend `/feature <name>`.
 - If no run is active and user wants to fix a bug -> Recommend `/fix <bug>`.
-- If no run is active and user has pending ideas in `devflow/ideas.md` -> Highlight `/spec IDEA-xxx` or `/discovery IDEA-xxx`.
-- If no run is active and user wants deep architectural exploration -> Recommend `discovery`.
+- If no run is active and user has pending ideas in `devflow/ideas.md` -> Highlight `/feature IDEA-xxx` or `/discovery IDEA-xxx`.
+- If no run is active and user wants deep architectural exploration -> Recommend `/discovery`.
 - If user asks to check system health -> Recommend `doctor`.
 
 ---
 
 ## Intent Classification & Skill Routing
 
-| User Intent / Request Type | Recommended Skill | Normal Name / Alias | Track / Lifecycle Path |
+| User Intent / Request Type | Recommended Skill | Normal Name / Alias | Lifecycle Path |
 | :--- | :--- | :--- | :--- |
-| **"Spec new feature / lean workflow"** | `spec` | `/spec` / `/feature` | **Fast-Track**: `/spec` -> `/implement` -> `/check` -> `/complete` |
-| **"Quick bugfix / ad-hoc change"** | `spec` | `/fix` | **Fast-Track**: `/fix` -> `/implement` -> `/check` -> `/complete` |
+| **"Spec new feature / living spec"** | `feature` | `/feature` / `/spec` | **Unified**: `/feature` -> `/implement` -> `/check` -> `/complete` |
+| **"Quick bugfix / ad-hoc change"** | `fix` | `/fix` | **Unified**: `/fix` -> `/implement` -> `/check` -> `/complete` |
 | **"Capture quick idea / thought"** | `idea` | `/idea` | **Companion**: Enriches & saves to `devflow/ideas.md` |
-| **"Execute implementation tasks"** | `implement` | `/implement` | **Fast-Track**: `/implement` -> `/check` |
-| **"Run QA verification & check"** | `check` | `/check` | **Fast-Track**: `/check` -> `/complete` |
-| **"Complete run & git merge"** | `complete` | `/complete` | **Fast-Track**: `/complete` |
-| **"Generate HTML dashboard report"**| `report-html` | `/report:html` | **Standalone**: Converts `current-feature.md` / `60-report.md` to HTML |
-| "Setup DevFlow on fresh/new project" | `onboard` | `onboard` / `setup` | `onboard` -> `/spec` or `10-define` |
-| "Adopt DevFlow on existing codebase" | `adopt` | `adopt` / `bootstrap` | `adopt` -> `/spec` or `10-define` |
+| **"Pre-delivery exploration / research"**| `discovery`| `/discovery` | **Pre-Flight**: `discovery` -> `/feature` |
+| **"Socratic alignment / ADR / glossary"**| `grill` | `/grill` / `/align` | **Pre-Flight**: `grill` -> `/feature` |
+| **"Execute implementation tasks"** | `implement` | `/implement` | **Core Loop**: `/implement` -> `/check` |
+| **"Run QA verification & check"** | `check` | `/check` | **Core Loop**: `/check` -> `/complete` |
+| **"Complete run & git merge"** | `complete` | `/complete` | **Core Loop**: `/complete` |
+| **"Generate HTML dashboard report"**| `report-html` | `/report:html` | **Standalone**: Converts `current-feature.md` or archive to HTML |
+| "Setup DevFlow on fresh/new project" | `onboard` | `onboard` / `setup` | `onboard` -> `/feature` |
+| "Adopt DevFlow on existing codebase" | `adopt` | `adopt` / `bootstrap` | `adopt` -> `/feature` |
 | "Check setup health & diagnostics" | `doctor` | `doctor` / `health` | `doctor` |
-| "Explore a new request / deep idea" | `discovery` | `discovery` / `/discovery` | **Deep-Track**: `discovery` -> `10` -> `20` -> ... |
-| "Define delivery boundaries and ID" | `10-define` | `define` | **Deep-Track**: `10` -> `20` -> `30` |
-| "Break down spec into plan (Deep)" | `30-plan` | `plan` | **Deep-Track**: `30` -> `40` -> `50` |
-| "Deep code implementation" | `40-execute` | `implement` | **Deep-Track**: `40` -> `50` |
-| "Deep QA verification" | `50-verify` | `verify` | **Deep-Track**: `50` -> `60` -> `70` |
-| "Deep markdown digest report" | `60-report` | `report` | **Deep-Track**: `60` -> `70` |
-| "Deep release packaging & merge" | `70-deliver` | `release` | **Deep-Track**: `70-deliver` |
 | "Human manual QA walkthrough guide" | `try` | `try` | Companion (after implement or check) |
-| "Safely plan feature or run reversal" | `rollback` | `rollback` | Companion |
+| "Safely plan feature or run reversal"| `rollback` | `rollback` | Companion |
 | "Set up automatic GitHub Actions CI" | `ci` | `ci` | Companion |
-| "Pre-check scope & risks before spec" | `brief` | `brief` | Companion |
+| "Pre-check scope & risks before spec"| `brief` | `brief` | Companion |
 | "Run autonomous bounded delivery loop"| `autopilot` | `autopilot` | Companion |
 | "Brainstorm ideas without ID" | `brainstorm` | `brainstorm` | Companion |
-| "Socratic alignment / ADR / glossary" | `grill` | `/grill` / `align` | Companion (pre-spec / domain modeling) |
 | "Investigate failure or root cause" | `debug` | `debug` | Companion |
 
 ---
 
 ## Available Skills Sitemap
 
-### 1. Fast-Track (Blueprint Mode - 4 Steps)
-- `spec` (`/spec`, `/feature`, `/fix`, `$spec`) - Define, spec, plan, and create `current-feature.md`
-- `implement` (`/implement`, `$implement`) - Execute planned checklist tasks with TDD
-- `check` (`/check`, `$check`) - Senior QA review, multi-lane verification, record evidence
-- `complete` (`/complete`, `$complete`) - Safety pass, release digest, git merge, close run
+### 1. Mainline Living Spec Loop (4 Steps)
+- `feature` (`/feature`, `/spec`) - Define, spec, and plan in `current-feature.md`
+- `fix` (`/fix`) - Document an ad-hoc bug or change in `current-feature.md`
+- `implement` (`/implement`) - Execute planned checklist tasks with TDD
+- `check` (`/check`) - Senior QA review, multi-lane verification, record evidence
+- `complete` (`/complete`) - Safety pass, release digest, git merge, close run
 
-### 2. Deep-Track (Architect Mode - 8 Steps)
+### 2. Pre-Flight Discovery Engine
 - `discovery` - Project roadmap planning or feature exploration before delivery commitment
-- `10-define` - Lock delivery boundaries and allocate Running ID
-- `20-spec` - Formalize markdown delivery contract
-- `30-plan` - Breakdown spec into phased tasks with test decisions
-- `40-execute` - Incremental task implementation
-- `50-verify` - Senior QA review and multi-lane validation
-- `60-report` - Generate standardized markdown digest report
-- `70-deliver` - Release packaging, release notes, and merge
-
-### 3. Public Companion Commands
-- `devflow` (`status`, `/devflow`) - Interactive guide, state inspector, and router
-- `idea` (`/idea`) - Quick idea capture and AI feasibility enrichment into `devflow/ideas.md`
-- `grill` (`/grill`, `align`) - Codebase-grounded Socratic alignment, domain glossary, and ADR recorder
-- `brainstorm` - Ideate and compare trade-off options without allocating running IDs
-- `report-html` (`/report:html`) - Standalone interactive HTML report dashboard generator
-- `onboard` - Baseline stack setup for freshly scaffolded projects
-- `adopt` - Bootstrap DevFlow into existing brownfield projects
-- `doctor` - Read-only health check for setup and drift
-- `try` - Step-by-step human manual QA review guide
-- `rollback` - Safe feature/run reversal planner
-- `ci` - Automatic GitHub Actions workflow setup
-- `brief` - Read-only scope and risk pre-briefing
-- `autopilot` - Autonomous bounded delivery loop
-- `debug` - Root cause investigation before or during implementation
-- `overview` - Living context synchronization into project-overview.md
+- `idea` - Quick idea capture with AI feasibility scoring
+- `grill` (or `align`) - Socratic alignment, domain modeling, and ADR recording
+- `brainstorm` - Multi-option ideation with trade-off analysis
+
+### 3. Verification & Diagnostic Companions
+- `doctor` - Health check for setup, adapters, and workspace state
+- `audit` - Branch-aware or full-project code, security, and quality review
+- `test` / `tests` - Test suite runner and unit test scaffolding
+- `ci` - Set up or normalize GitHub Actions checks
+- `status` - Read-only progress summary and next action suggestion
+- `try` - Human manual QA walkthrough guide
+- `report-html` - Standalone interactive HTML report dashboard
+- `debug` - Root-cause investigation without editing code
+- `rollback` - Safe reversal of completed features
+- `release` - Deployment readiness check

package/template/.claude/skills/discovery/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: discovery
-description: "[devflow][D] Unified discovery and exploration stage in DevFlow 2.0 - conducts project-level roadmap discovery (project-plan.md/build-plan.md) or feature-level exploration (Stage 00) before delivery commitment."
+description: "[devflow][D] Unified discovery and exploration stage in DevFlow 2.5.0 - conducts project-level roadmap discovery (project-plan.md/build-plan.md) or feature-level pre-delivery exploration before the Single Living Spec lifecycle."
 argument-hint: "[{title, request, IDEA-xxx, or discovery-id}]"
 ---
 
@@ -10,7 +10,7 @@ $ARGUMENTS
 
 `/discovery` is the central discovery entry point in Nexus-DevFlow. It operates in two adaptive modes based on input scope:
 1. **🗺️ Macro Project Discovery**: Develops high-level product and build roadmap plans (`devflow/project-plan.md` & `devflow/build-plan.md`) through an adaptive conversation before `/overview`.
-2. **🔍 Micro Feature Exploration (Stage 00)**: Explores a specific feature, request, or idea before committing to delivery, routes through supporting lenses, and finishes with a visible `Proceed`, `Defer`, or `Reject` decision before `10-define`.
+2. **🔍 Micro Feature Exploration (Pre-Flight)**: Explores a specific feature, request, or idea before committing to delivery, routes through supporting lenses, and finishes with a visible `Proceed`, `Defer`, or `Reject` decision before `/feature` or `/fix`.
 
 ---
 
@@ -21,7 +21,7 @@ $ARGUMENTS
 /discovery
 /discovery --project
 
-# 2. Micro Feature Exploration Mode (Stage 00 of Deep-Track)
+# 2. Micro Feature Exploration Mode (Pre-Flight)
 /discovery {title or request}
 /discovery IDEA-xxx
 /discovery {discovery-id}
@@ -44,7 +44,7 @@ Use when:
 
 ---
 
-## Mode 2: Micro Feature Exploration (Stage 00 of Deep-Track)
+## Mode 2: Micro Feature Exploration (Pre-Flight)
 
 Use when:
 - Exploring a specific feature, complex architectural change, or pending idea (`/discovery IDEA-xxx`).
@@ -76,8 +76,7 @@ devflow/discoveries/{DISCOVERY_ID}-{slug}/discovery.md
 ### Decision & Approval Gate:
 Set one visible decision:
 - `Proceed`: Enough value and evidence exist to define delivery work:
-  - **🏎️ Fast-Track (Recommended for 85% of standard features/fixes)**: Handoff to `/feature {discovery_id}` or `/fix {discovery_id}` (writes `devflow/context/current-feature.md`).
-  - **🏗️ Deep-Track (For large architectural epics/migrations)**: Handoff to `10-define {discovery_id}` (writes `devflow/context/current-run/10-define.md`).
+  - Handoff to `/feature {discovery_id}` or `/fix {discovery_id}` to create the Single Living Spec in `devflow/context/current-feature.md`.
 - `Defer`: The idea remains relevant but timing or evidence is not ready.
 - `Reject`: The idea should not proceed under current framing.
 
@@ -86,6 +85,5 @@ Set one visible decision:
 ## Next Workflow Recommendations
 
 - **From Macro Project Mode**: Run `/overview` to compile context into `devflow/context/project-overview.md`.
-- **From Micro Stage 00 (Approved Proceed ➔ Fast-Track)**: Run `/feature {discovery_id}` to start lean living spec.
-- **From Micro Stage 00 (Approved Proceed ➔ Deep-Track)**: Run `10-define {discovery_id}` to allocate a Running ID.
-- **From Micro Stage 00 (Defer / Reject)**: No next command needed.
+- **From Micro Pre-Flight (Approved Proceed)**: Run `/feature {discovery_id}` or `/fix {discovery_id}` to start the Single Living Spec lifecycle.
+- **From Micro Pre-Flight (Defer / Reject)**: No next command needed.

package/template/AGENTS.md

@@ -1,12 +1,12 @@
-# Nexus-DevFlow 2.0 (The 3-Pillars & Dual-Track Model)
+# Nexus-DevFlow 2.6.0 (The 3-Pillars & Single Living Spec Model)
 
 Instructions for AI coding agents working in this project. This is the cross-tool entry point: Codex, Google Antigravity, Cursor, GitHub Copilot, Gemini CLI, Aider, Zed, Windsurf, and others read `AGENTS.md`. Claude Code reads `CLAUDE.md`, which imports this file (`@AGENTS.md`), so there is a single source of truth.
 
 ## What this is
 
-This project uses **Nexus-DevFlow**, an agentic workflow layer supporting **The 3-Pillars Workspace Architecture & Dual-Track Delivery**:
+This project uses **Nexus-DevFlow**, an agentic workflow layer supporting **The 3-Pillars Workspace Architecture & Single Living Spec Model**:
 1. **🔮 Future (Backlog)**: `devflow/ideas.md` — Centralized Idea Inbox with AI scoring.
-2. **⚡ Present (Active Context)**: `devflow/context/` — Living Source of Truth & Active Work (`current-feature.md` for Fast-Track, `current-run/` for Deep-Track).
+2. **⚡ Present (Active Context)**: `devflow/context/` — Living Source of Truth & Active Work (`current-feature.md` Single Living Spec).
 3. **📦 Past (History Archive)**: `devflow/history/` — Categorized delivery archives (`features/`, `fixes/`, `rollbacks/`, and `HISTORY.md`).
 
 To start a new project, scaffold the application first in an empty folder, then run `npx @jakkrichm/create-nexus-devflow` to overlay DevFlow onto your codebase.
@@ -18,6 +18,7 @@ To start a new project, scaffold the application first in an empty folder, then
 - `devflow/context/ai-interaction.md` - how to interact with the user on this project
 - `devflow/context/current-stage.md` - active discovery or running delivery state
 - `devflow/context/findings.md` - quality, security, and verification ledger
+- `devflow/context/glossary.md` - domain terms & architecture definitions
 
 ## Tool-Specific Adapters & Execution Rules
 
@@ -31,60 +32,50 @@ Unused adapter families can be removed. Codex, Antigravity, GitHub Copilot, and
 
 ### Universal Invocation & Agent Directives:
 
-1. **Canonical Command Names & AI Provider Invocation**: Each workflow stage and companion tool has exactly **one Canonical Name** (e.g. `feature`, `fix`, `implement`, `check`, `complete`, `discovery`, `10-define`, `20-spec`, `30-plan`, `40-execute`, `50-verify`, `60-report`, `70-deliver`, `devflow`, `doctor`, `overview`, `debug`, `onboard`, `adopt`, `try`, `rollback`, `idea`, `ci`, `test`, `autopilot`, `prototype`, `report-html`, `brief`, `audit`, `release`, `brainstorm`, `grill`). The way you invoke commands depends on your AI Provider / Tool:
-   - **Canonical Name (Plain text)**: Directly invoke or prompt the command by its standard name (e.g., `feature`, `40-execute`, `devflow`, `discovery`).
-   - **Slash Prefix (`/`)**: For tools supporting slash commands (Claude Code, Google Antigravity, Gemini CLI), e.g., `/feature`, `/fix`, `/implement`, `/40-execute`, `/devflow`, `/discovery`.
-   - **Dollar Prefix (`$`)**: For OpenAI Codex CLI or skill-invocation tools, e.g., `$feature`, `$fix`, `$40-execute`, `$devflow`, `$discovery`.
+1. **Canonical Command Names & AI Provider Invocation**: Each workflow stage and companion tool has exactly **one Canonical Name** (e.g. `feature`, `fix`, `implement`, `check`, `complete`, `discovery`, `idea`, `grill`, `brainstorm`, `devflow`, `doctor`, `overview`, `debug`, `onboard`, `adopt`, `try`, `rollback`, `ci`, `test`, `tests`, `autopilot`, `prototype`, `report-html`, `brief`, `audit`, `release`). The way you invoke commands depends on your AI Provider / Tool:
+   - **Canonical Name (Plain text)**: Directly invoke or prompt the command by its standard name (e.g., `feature`, `implement`, `devflow`, `discovery`).
+   - **Slash Prefix (`/`)**: For tools supporting slash commands (Claude Code, Google Antigravity, Gemini CLI), e.g., `/feature`, `/fix`, `/implement`, `/devflow`, `/discovery`.
+   - **Dollar Prefix (`$`)**: For OpenAI Codex CLI or skill-invocation tools, e.g., `$feature`, `$fix`, `$devflow`, `$discovery`.
 2. **OpenAI Codex & Non-Native CLI Tools**: In environments without automatic background skill discovery (such as OpenAI Codex CLI, Aider, or generic terminals), **you MUST use your file reading tool to inspect `.agents/skills/<skill>/SKILL.md` before executing the stage** to strictly follow its schema, artifact contract, and quality gates.
 3. **Google Antigravity & Claude Code**: Native skill engines automatically discover and surface `.agents/skills/` and `.claude/skills/`.
 4. **State-Aware Inspection**: When unsure what to do next, invoke `devflow` to automatically inspect `devflow/context/current-stage.md` and active context in `devflow/context/`.
-5. **Default Artifact & Communication Language (Thai)**: All generated markdown stage artifacts (`current-feature.md`, `00-explore.md`...`70-deliver.md`) and user communication MUST default to **Thai (`th`)**, while code, technical terms, file paths, and identifiers remain in English.
+5. **Default Artifact & Communication Language (Thai)**: All generated markdown stage artifacts (`current-feature.md`, `discovery.md`, etc.) and user communication MUST default to **Thai (`th`)**, while code, technical terms, file paths, and identifiers remain in English.
 
 ---
 
-## 🏎️ Track 1: Fast-Track (Blueprint Mode - 4 Steps)
+## ⚡ The Unified 4-Stage Living Spec Lifecycle
 
-Recommended for 85% of daily work (features, bug fixes, UI improvements, iterative tasks):
+All development tasks (from lean UI fixes to deep architectural epics) execute through the 4-step progressive lifecycle:
 
 ```text
 /feature (หรือ /fix) ──▶ /implement ──▶ /check ──▶ /complete
 ```
 
 1. **`feature` / `fix` (`/feature`, `/fix`, `/spec`)**:
-   - **Purpose**: Combines Discover, Define, Spec, and Plan into one unified step. Checks Single Active Run Guardrail, allocates sequential ID (`xxx-slug`), and creates the **Single Living Spec (`devflow/context/current-feature.md`)**.
+   - **Purpose**: Combines Discover, Define, Spec, and Plan into one unified step. Checks Single Active Run Guardrail, allocates sequential ID (`xxx-slug`), and creates the **Single Living Spec (`devflow/context/current-feature.md`)** with 6 structured sections.
    - **Artifact**: `devflow/context/current-feature.md`
 2. **`implement` (`/implement`)**:
-   - **Purpose**: Incrementally executes checklist tasks with TDD discipline and appends progress to `devflow/context/current-feature.md`.
+   - **Purpose**: Incrementally executes checklist tasks with TDD discipline (Red-Green-Refactor) and appends diff evidence to `current-feature.md`.
 3. **`check` (`/check`)**:
-   - **Purpose**: Senior QA review, multi-lane verification matrix (Typecheck, Lint, Test suites, manual proof), and records evidence into `devflow/context/current-feature.md`.
+   - **Purpose**: Senior QA review, multi-lane verification matrix (Typecheck, Lint, Test suites, manual proof), and records empirical proof into `current-feature.md`.
 4. **`complete` (`/complete`)**:
-   - **Purpose**: Final safety pass, records Release Digest, automatically archives to `devflow/history/{features|fixes|rollbacks}/{xxx-slug}.md`, resets the stub, performs git merge, and closes the run without auto HTML generation.
+   - **Purpose**: Final safety pass, records Release Digest, automatically archives to `devflow/history/{features|fixes|rollbacks}/{xxx-slug}.md`, resets the stub, and performs git squash-merge.
 
 ---
 
-## 🏗️ Track 2: Deep-Track (Architect Mode - 8 Steps)
+## 🔮 Pre-Flight Discovery & Architectural Alignment (Companions)
 
-Recommended for large architectural epics, database migrations, and multi-agent coordination:
-
-```text
-discovery ──▶ 10-define ──▶ 20-spec ──▶ 30-plan ──▶ 40-execute ──▶ 50-verify ──▶ 60-report ──▶ 70-deliver
-```
-
-1. `discovery`: Unified pre-delivery discovery & exploration (project-level roadmap planning or feature-level exploration with 5 lenses: Brainstorm, Research, PRD, Bug Triage, Grill) before delivery commitment (`devflow/discoveries/{DISC-ID}/discovery.md`).
-2. `10-define`: Turn approved discovery into bounded delivery run in `devflow/context/current-run/10-define.md`.
-3. `20-spec`: Formalize markdown-first delivery contract & acceptance criteria (`20-spec.md`).
-4. `30-plan`: Breakdown spec into executable tasks with test decisions (`30-plan.md` + checklists).
-5. `40-execute`: Incremental task execution behind review gates (`40-execute.md`).
-6. `50-verify`: Senior QA review & multi-lane verification checks (`50-verify.md`).
-7. `60-report`: Standardized markdown delivery digest (`60-report.md`).
-8. `70-deliver`: Release packaging, git merge, archives `devflow/context/current-run/` ➔ `devflow/history/{category}/{xxx-slug}/`, and closes run.
+- `discovery`: Unified pre-delivery discovery & exploration (`devflow/discoveries/{DISC-ID}/discovery.md`).
+- `idea`: Quick idea capture and AI feasibility scoring (`devflow/ideas.md`).
+- `grill` (or `align`): Socratic alignment, domain modeling, and ADR recording (`devflow/decisions/`).
+- `brainstorm`: Divergent/convergent ideation with trade-off analysis.
 
 ---
 
 ## 🌐 Standalone HTML Reporting Policy
 
 > [!IMPORTANT]
-> **No Auto-Generated HTML**: Mainline flows (`/complete` and `60-report`) strictly output Markdown only.
+> **No Auto-Generated HTML**: Mainline flows (`/complete`) strictly output Markdown only.
 > When an interactive web dashboard is desired for presentation or sharing, invoke the standalone companion command:
 > `/report:html` (or `npm run report:html -- {ID}`).
 

package/template/devflow/build-plan.md

@@ -76,5 +76,14 @@
   - *Dependencies*: None
   - *Scope*: นำ Strict TDD (Red-Green-Refactor) Sub-Tasks และ Two-Stage Review Pattern (Stage 1: Spec Fidelity, Stage 2: Quality & Security Gate) ผสานเข้าสู่ Prompt Rules, Coding Standards, AI Interaction และ Stage Skills (`30-plan`, `40-execute`, `50-verify`, `feature`, `implement`, `check`, `debug`) พร้อมอัปเดต Template และ Unit Tests
 
+---
+
+## ⚡ Phase 10: Nexus-DevFlow 2.5.0 (Unified Living Spec Model)
+
+- [x] **10. Unify Deep-Track and Fast-Track into Single Living Spec Model** `[Size: L]`
+  - *Dependencies*: ADR-001
+  - *Scope*: รวมความสามารถเชิงสถาปัตยกรรมระดับลึกของ Deep-Track เข้าสู่ 4 ขั้นตอนหลักของ Fast-Track บนเอกสาร Single Living Spec (`current-feature.md`) จัดเก็บประวัติแบบ Single Archive (`.md`), ปลดระวาง stage skills 10-70 ที่ซ้ำซ้อน, และปรับปรุงเอกสาร & Schemas ทั้งหมด
+
+
 
 

package/template/devflow/context/ai-interaction.md

@@ -27,69 +27,68 @@ Format every response for fast scanning and readability:
 
 ---
 
-## 3. Dual-Track Workflow Lifecycle (The 3-Pillars Model)
+## 3. The 3-Pillars Unified Architecture (DevFlow 2.5.0)
 
 ```text
 devflow/
-├── 🔮 ideas.md        # [Future] Idea Inbox
-├── ⚡ context/         # [Present] Living Spec (current-feature.md) & Active State
+├── 🔮 ideas.md        # [Future] Idea Inbox with AI Feasibility Scoring
+├── ⚡ context/         # [Present] Single Living Spec (current-feature.md) & Active State
 └── 📦 history/         # [Past] features/, fixes/, rollbacks/, and HISTORY.md
 ```
 
-### 🏎️ Track 1: Fast-Track (Blueprint Mode — 4 Steps)
-*Recommended for 85% of daily engineering work (features, bug fixes, UI improvements, iterative refactoring).*
-
-The entire lifecycle is driven by the **Single Living Spec (`devflow/context/current-feature.md`)**:
-
-1. **Spec (`/feature` or `/fix`)**:
-   - Checks **Single Active Run Guardrail** (rejects if an uncompleted task is still active).
-   - Analyzes request (or consumes `IDEA-xxx` from `devflow/ideas.md`).
-   - Allocates sequential ID without prefix (e.g. `022-{slug}`) and creates branch `feature/{xxx-slug}` or `fix/{xxx-slug}`.
-   - Generates `devflow/context/current-feature.md` containing **Section 1 (Scope & AC)**, **Section 2 (Plan & Test Strategy)**, and **Section 3 (Checklist)**.
-2. **Implement (`/implement`)**:
-   - Executes checklist tasks incrementally one small diff at a time using **TDD (Red-Green-Refactor)**.
-   - Updates `## 4. Implementation Record` and marks tasks `- [x]` in `current-feature.md`.
-3. **Check (`/check`)**:
-   - Senior QA multi-lane verification (Lane 1: Typecheck/Lint, Lane 2: Test Suites, Lane 3: Manual Proof).
-   - Records empirical proof under `## 5. Verification Evidence` in `current-feature.md`.
-4. **Complete (`/complete`)**:
-   - Final safety pass, updates `## 6. Release & Handoff` digest in `current-feature.md`.
-   - Automatically archives `current-feature.md` ➔ `devflow/history/{features|fixes|rollbacks}/{xxx-slug}.md`.
-   - Appends resolved findings and cleans `findings.md`.
-   - Resets `current-feature.md` back to the idle stub.
-   - Performs Git squash-merge into `main`, updates `devflow/history/HISTORY.md`, and sets workspace to Idle.
-
----
-
-### 🏗️ Track 2: Deep-Track (Architect Mode — 8 Steps)
-*Recommended for large architectural epics, database migrations, security audits, and multi-agent coordination.*
+### ⚡ The Unified 4-Stage Living Spec Lifecycle
+*ขับเคลื่อนการพัฒนาทุกระดับ (ตั้งแต่ Fast Fix จนถึง Architectural Epic) ด้วยเอกสารฉบับเดียว **Single Living Spec (`devflow/context/current-feature.md`)** ที่รวมความลึกระดับ Architect Mode เข้ากับความคล่องตัวระดับ Lean Velocity:*
 
 ```text
-discovery ➔ 10-define ➔ 20-spec ➔ 30-plan ➔ 40-execute ➔ 50-verify ➔ 60-report ➔ 70-deliver
+/feature (หรือ /fix) ──▶ /implement ──▶ /check ──▶ /complete
 ```
 
-1. `discovery`: Unified pre-delivery discovery & Socratic alignment (`DISC-YYYYMMDD-NNN` or project roadmap).
-2. `10-define`: Turn approved discovery into bounded delivery run in `devflow/context/current-run/10-define.md`.
-3. `20-spec`: Formalize markdown delivery contract & acceptance criteria (`20-spec.md`).
-4. `30-plan`: Breakdown spec into atomic 2-5 min tasks with explicit TDD decisions (`30-plan.md` + checklists).
-5. `40-execute`: Strict Red-Green-Refactor task execution behind review gates (`40-execute.md`).
-6. `50-verify`: Senior QA Two-Stage Review (Spec Fidelity + Quality/Security Gate) (`50-verify.md`).
-7. `60-report`: Standardized markdown delivery digest (`60-report.md`).
-8. `70-deliver`: Release packaging, git merge, archives `devflow/context/current-run/` ➔ `devflow/history/{category}/{xxx-slug}/`, and closes the run.
+1. **Stage 1: Spec (`/feature` หรือ `/fix`)**:
+   - ตรวจสอบ **Single Active Run Guardrail** (บล็อกการเปิดงานซ้อนถ้ามีงานที่ยังไม่เสร็จ)
+   - ดึงบริบทจาก `devflow/discoveries/`, `devflow/ideas.md`, หรือคำขอของผู้ใช้
+   - จัดสรร Running ID (`xxx-slug`) และสร้าง Branch `feature/{xxx-slug}` หรือ `fix/{xxx-slug}`
+   - เขียน **Single Living Spec (`current-feature.md`)** ครอบคลุม:
+     - `## 🎯 1. Define & Boundaries` (Problem, In/Out Scope, Risks, Success Criteria)
+     - `## 📐 2. Technical Spec & Contracts` (Architecture, Models, Interface Contracts, Non-functional, ACs)
+     - `## 📋 3. Execution Plan & TDD Checklist` (Atomic tasks, `[TDD-Red/Green/Refactor]` Triplets)
+
+2. **Stage 2: Implement (`/implement`)**:
+   - ดำเนินการ Task-by-task ตาม Checklist อย่างเคร่งครัดด้วย **TDD (Red-Green-Refactor)**
+   - ติ๊กเครื่องหมาย `- [x]` และบันทึก `## ⚡ 4. Implementation Log & Evidence` (Diff summary, Checkpoints) ลงใน `current-feature.md`
+
+3. **Stage 3: Check (`/check`)**:
+   - Senior QA Multi-Lane Verification (Typecheck, Lint, Test Suites, Manual Proof)
+   - บันทึกผลการพิสูจน์เชิงประจักษ์ลงใน `## 🧪 5. Multi-Lane Verification Matrix` ใน `current-feature.md`
+
+4. **Stage 4: Complete (`/complete`)**:
+   - สรุปผล `## 📦 6. Release Digest & Retrospective` (Changelog, Lessons Learned, ADRs)
+   - ทำการ Archive `current-feature.md` ไปเป็นไฟล์เดี่ยวที่ `devflow/history/{features|fixes|rollbacks}/{xxx-slug}.md`
+   - **Mandatory Delivery Gate**: บังคับถามผู้ใช้ก่อนเสมอว่าต้องการ Delivery รูปแบบใด:
+     - **Option 1 (Team MR/PR Flow)**: Pull master/main ล่าสุดมารวมกับ Feature/Dev Branch แล้ว push branch ขึ้นไปเพื่อเปิด MR/PR (ไม่ merge เข้า main/master ในเครื่อง และไม่แตะ protected branch)
+     - **Option 2 (Direct Squash-Merge)**: ทำการ Squash-merge เข้า main/master ในเครื่องเฉพาะเมื่อผู้ใช้สั่งโดยตรงเท่านั้น
+   - รีเซ็ต `current-feature.md` กลับเป็น Idle stub เมื่อปิดรอบงานเรียบร้อย
 
 ---
 
+### 🔮 Pre-Flight Discovery & Architectural Alignment (Companion Tools)
+สำหรับงานที่ต้องการสำรวจไอเดีย, ค้นคว้าทางเทคนิค, หรือการออกแบบสถาปัตยกรรมก่อนเริ่มสร้าง Spec:
+- `/discovery`: Unified Pre-delivery Discovery & Research (บันทึกใน `devflow/discoveries/`)
+- `/idea`: วิเคราะห์และบันทึกไอเดียลงใน `devflow/ideas.md`
+- `/grill` (หรือ `/align`): Socratic Alignment, Domain Modeling & บันทึก ADRs ลงใน `devflow/decisions/`
+- `/brainstorm`: เครื่องมือระดมความคิดทางเลือก 2-3 Options พร้อมเปรียบเทียบ Trade-offs
+
+
 ## 4. Strict TDD & Two-Stage Review Interaction Rules
 
 ### 🔴🟢 Strict TDD Execution Discipline
-During implementation in `/implement` and `40-execute`:
+During implementation in `/implement`:
 - **Show Red Phase**: First execute tests to demonstrate expected failure *before* adding production code.
 - **Show Green Phase**: Add minimal production code, re-run tests, and report pass rate.
 - **Show Refactor Phase**: Polish and clean up with zero test regression.
 - **Forbidden**: Never present functional code changes without matching test execution evidence.
 
 ### 🛡️ Two-Stage Verification Reporting
-During `/check` and `50-verify`:
+During `/check`:
 - **Stage 1 (Spec Fidelity Gate)**: Report each Acceptance Criterion and "Done When" status.
 - **Stage 2 (Code Quality & Security Gate)**: Report Typecheck, Lint, Test Suites, Security checks, and Findings Ledger (0 blockers).
 
@@ -98,7 +97,7 @@ During `/check` and `50-verify`:
 ## 5. Standalone HTML Reporting Policy
 
 > [!IMPORTANT]
-> **No Auto-Generated HTML**: Mainline stages (`/complete` and `60-report`) strictly output Markdown only.
+> **No Auto-Generated HTML**: The mainline `/complete` stage strictly outputs Markdown only.
 > When an interactive web dashboard is desired for presentation or sharing, invoke the standalone companion command:
 > `/report:html` (or `npm run report:html -- {ID}`).
 
@@ -109,7 +108,6 @@ During `/check` and `50-verify`:
 Progress lives in persistent files, not in transient chat history:
 
 - In Fast-Track: `devflow/context/current-feature.md` maintains ticked checklist boxes `- [x]`.
-- In Deep-Track: `devflow/context/current-run/` maintains stage markdown files.
 - In Git: Commits, branches, and working tree maintain the code history.
 - When starting a fresh session after a context clear, run `devflow` or inspect `current-stage.md` to pick up immediately from the next pending step.
 
@@ -117,8 +115,8 @@ Progress lives in persistent files, not in transient chat history:
 
 ## 6. Single Active Run Guardrail (One Thing at a Time)
 
-- Only one active run is allowed at a time across both Fast-Track and Deep-Track.
-- The AI will actively block opening a new feature or fix until the current one is completed with `/complete` or `70-deliver` (or explicitly rolled back/cancelled).
+- Only one active Single Living Spec run is allowed at a time.
+- The AI will actively block opening a new feature or fix until the current one is completed with `/complete` (or explicitly rolled back/cancelled).
 
 ---
 

package/template/devflow/context/coding-standards.md

@@ -14,16 +14,40 @@
 
 ---
 
-## 2. CLI Architecture & Engineering Principles
-
-- **Separation of Concerns (Deep Modules & Information Hiding)**:
+## 2. CLI Architecture & Deep Modules Philosophy
+
+- **Deep Modules Principles (John Ousterhout Philosophy)**:
+  - **Module**: Anything with an interface and an implementation (function, class, package, or subsystem).
+  - **Interface**: Everything a caller must know to use the module correctly (types, invariants, ordering, error modes, configuration).
+  - **Implementation**: The hidden body of code inside the module.
+  - **Depth (High Leverage)**: A module is **Deep** when a large amount of complex behavior sits behind a small, simple interface. A module is **Shallow** (to be avoided) when its interface is nearly as complex as its implementation.
+  - **Seam**: The clean architectural location where an interface lives.
+  - **Adapter**: A concrete implementer satisfying the interface at a seam.
+  - **The Deletion Test**: Imagine deleting the module. If complexity concentrates across N callers, it was earning its keep (Deep). If complexity simply vanishes or moves, it was a pass-through (Shallow).
+  - **Designing for Testability**:
+    - *Accept dependencies, don't instantiate them inside.*
+    - *Return results, minimize unobservable side effects.*
+    - *Small surface area: fewer methods and simple parameter objects.*
+- **Separation of Concerns (Information Hiding)**:
   - Keep CLI entry points (`bin/create-nexus-devflow.ts`) thin: handle argument parsing, option normalization, and terminal formatting.
   - Encapsulate all core business logic, filesystem operations, and parsing inside modular libraries (`lib/current-work.ts`, `lib/findings.ts`, `lib/git.ts`, `lib/uninstall.ts`, `lib/update.ts`).
-  - **Deep Modules**: Strive for simple, narrow interfaces that hide extensive implementation complexity internally.
 - **Refactoring & Code Simplification (Simplify Discipline)**:
   - **Early Returns**: Guard conditions should exit early to eliminate deep nesting.
   - **Single Responsibility (SRP)**: Functions should do one cohesive thing and stay under 50 lines whenever possible.
   - **Pure Functions**: Favor deterministic functions without side effects for data transformation and parsing.
+- **Baseline 12 Fowler Code Smells (Continuous Refactoring)**:
+  - **Mysterious Name**: Names that don't reveal what they do -> Rename with clear intention.
+  - **Duplicated Code**: Identical or similar logic shapes -> Extract shared helper.
+  - **Feature Envy**: Method reaching into another object's data -> Move method onto that data.
+  - **Data Clumps**: Same 3+ fields traveling together -> Bundle into a cohesive type.
+  - **Primitive Obsession**: Raw string/number representing a domain concept -> Define a branded/domain type.
+  - **Repeated Switches**: Duplicate `switch`/`if` cascades -> Use polymorphism or lookup map.
+  - **Shotgun Surgery**: One change forcing scattered edits in many files -> Unify into one deep module.
+  - **Divergent Change**: One file edited for multiple unrelated reasons -> Split responsibilities.
+  - **Speculative Generality**: Hooks/params added for hypothetical needs -> Delete and inline until needed.
+  - **Message Chains**: Long `a.b().c().d()` navigation -> Hide behind a method on the root object.
+  - **Middle Man**: Class/function that only delegates -> Remove and call target directly.
+  - **Refused Bequest**: Subclass ignoring inherited methods -> Replace inheritance with composition.
 - **Safety Flags & Idempotency**:
   - Destructive or mutating operations (e.g. `uninstall`, `update`, `install`) must support safety flags:
     - `--dry-run`: Preview actions and affected files without modifying the disk.
@@ -109,7 +133,7 @@ Testing is a core quality gate in Nexus-DevFlow, not an afterthought:
   - Never claim a task is "working", "tested", or "verified" without providing concrete empirical proof (exact command executed, terminal output, pass/fail counts, exit code).
 - **Two-Stage Review Pattern (Verification Gate)**:
   - **Stage 1: Spec Fidelity & Acceptance Gate**:
-    - Verify 100% conformance against the living spec (`current-feature.md` or `20-spec.md`).
+    - Verify 100% conformance against the Single Living Spec (`current-feature.md`).
     - Validate all Acceptance Criteria (ACs) and "Done When" observables without missing requirements or scope creep.
     - Test edge cases and boundary conditions defined in the specification.
   - **Stage 2: Code Quality, Security & Architecture Gate**:
@@ -129,7 +153,8 @@ Testing is a core quality gate in Nexus-DevFlow, not an afterthought:
   - `fixed`: Repaired in code, pending QA re-verification.
   - `closed`: Verified by QA as completely resolved without regressions.
   - `accepted`: Formally waived with recorded user justification.
-- **P0/P1 Blockers**: Any P0 or P1 finding in `open` or `fixed` status unconditionally blocks `/complete` and `70-deliver`.
+- **P0/P1 Blockers**: Any P0 or P1 finding in `open` or `fixed` status unconditionally blocks `/complete`.
+- **Allowed Waivers**: A P0 or P1 finding may only be bypassed if marked `accepted` (with explicit user justification recorded) or `invalid` (with evidence recorded by `/audit`).
 
 ---
 

package/template/devflow/context/current-stage.md

@@ -1,8 +1,11 @@
-# Current DevFlow Run Status
+# Current Stage
 
-- **Active Discovery ID**: `None`
-- **Active Running ID**: `None`
-- **Current Stage**: `Idle (Ready for new /feature, /fix, /discovery, or /10-define)`
-- **Living Spec**: `None`
-- **Last Completed Run**: `None`
-- **Last Updated**: `None`
+- Active Discovery ID: `None`
+- Active Running ID: `None`
+- Track: `idle`
+- Current Stage: `idle`
+- Active Branch: `main`
+- Living Spec: `devflow/context/current-feature.md`
+- Next Action: `Run /feature, /fix, or /discovery to start new work.`
+- Last Completed Run: `None`
+- Last Updated: `None`