@ngxtm/devkit 3.19.0 → 3.21.0

package/merged-commands/code/hard.md

@@ -1,5 +1,5 @@
 ---
-description: ⚡⚡⚡ Full Development Cycle — Plan → Implement → Test → Review
+description: Full Development Cycle — Plan, Implement, Test, Review
 version: "1.0"
 category: engineering
 execution-mode: execute
@@ -13,41 +13,7 @@ execution-mode: execute
 
 ---
 
-## 🛑 PRE-FLIGHT (DO FIRST — BLOCKS PHASE 1)
-
-**LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
-
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
-
-**⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
-
----
-
-## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
-
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
-
-```yaml
-tiered_execution:
-  principle: "Sub-agent FIRST (Tier 1). EMBODY ONLY on system failure (Tier 2)."
-
-  tool_discovery: "Check runSubagent availability BEFORE first delegation"
-
-  for_each_phase:
-    TIER_1_MANDATORY: "IF tool exists → MUST use SUB_AGENT_DELEGATION"
-    TIER_2_FALLBACK: "ONLY on system error—NOT complexity/preference/speed"
-
-  anti_lazy_fallback:
-    - ❌ NEVER use Tier 2 when Tier 1 tool is available
-    - ✅ ALWAYS attempt Tier 1 first when tool exists
-    - ✅ ALWAYS log justification for Tier 2 fallback
-```
-
----
-
-## ⚠️ CRITICAL: PHASE CONTINUITY RULES
+## CRITICAL: PHASE CONTINUITY RULES
 
 ```yaml
 phase_continuity:
@@ -62,12 +28,12 @@ phase_continuity:
     - Phase 3 (Planning) MUST incorporate Scout findings
     - Phase 4 (Implementation) MUST follow the Plan file exactly
     - Phase 5 (Testing) MUST verify all plan checkpoints
-    - If prior phase file missing → Agent MUST create it
+    - If prior phase file missing → MUST create it
 ```
 
 All files in `./reports/` → English only.
 
-## 🔗 INPUT REQUIREMENTS & VERIFICATION MATRIX
+## INPUT REQUIREMENTS & VERIFICATION MATRIX
 
 ```yaml
 phase_dependencies:
@@ -109,13 +75,13 @@ phase_dependencies:
     verification: "Code MUST match plan intent"
 ```
 
-## 🛑 BLOCKING ENFORCEMENT
+## BLOCKING ENFORCEMENT
 
 ```
 BEFORE entering any BLOCKING phase:
   1. CHECK: Does required input file exist?
   2. IF missing:
-     a. OUTPUT: "⛔ BLOCKED: Missing [{file}]"
+     a. OUTPUT: "BLOCKED: Missing [{file}]"
      b. ROUTE to creating agent
      c. WAIT for creation
   3. IF exists:
@@ -125,115 +91,82 @@ BEFORE entering any BLOCKING phase:
 
 ---
 
-## ⛔ INCREMENTAL EXECUTION (MANDATORY)
+## Execution
 
-One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in one reply. No batching (load only what each phase needs). **Within each phase:** when doing a part, output it in format so user sees what’s happening (announce before doing).
+One phase at a time, sequential. Each phase must complete before next begins.
 
 ---
 
-## 🎭 Phase 1: REQUIREMENTS ANALYSIS
+## Phase 1: REQUIREMENTS ANALYSIS
 
 | Attribute   | Value                             |
 | ----------- | --------------------------------- |
-| **Agent**   | `brainstormer`                    |
+| **Role**    | `brainstormer`                    |
 | **Goal**    | Clarify requirements if ambiguous |
 | **Trigger** | If requirements unclear           |
 
-### ⚡ TIERED EXECUTION
-
-**TIER 1 (MANDATORY when tool exists):**
+### Delegation
 
-> Invoke runSubagent for `brainstormer`. Context: ISOLATED.
-
-**TIER 2 (FALLBACK on system error only):**
-
-> Load `{AGENTS_PATH}/brainstormer.md`
-> EMBODY [brainstormer] — Requires logged system error justification.
+> Task(subagent_type="general-purpose", prompt="You are a brainstormer. Clarify requirements if ambiguous using Socratic questioning and assumption surfacing. Exit when: requirements clear, scope defined, acceptance criteria established.", description="brainstormer: Clarify requirements if ambiguous")
 
 **Exit Criteria:**
 
 - [ ] Requirements clear
 - [ ] Scope defined
 - [ ] Acceptance criteria established
-- [ ] **METHODOLOGY CHECK**: Output aligns with `brainstormer` Thinking Protocol (Socratic questioning, assumption surfacing)
 
 ---
 
-## 🎭 Phase 2: CODEBASE ANALYSIS
+## Phase 2: CODEBASE ANALYSIS
 
 | Attribute | Value                         |
 | --------- | ----------------------------- |
-| **Agent** | `scouter`                     |
+| **Role**  | `scouter`                     |
 | **Goal**  | Full codebase context mapping |
 
-### ⚡ TIERED EXECUTION
-
-**TIER 1 (MANDATORY when tool exists):**
-
-> Invoke runSubagent for `scouter`. Context: ISOLATED.
-
-**TIER 2 (FALLBACK on system error only):**
+### Delegation
 
-> Load `{AGENTS_PATH}/scouter.md`
-> EMBODY [scouter] — Requires logged system error justification.
+> Task(subagent_type="general-purpose", prompt="You are a scouter. Perform full codebase context mapping. Exit when: architecture understood, patterns documented, integration points identified.", description="scouter: Full codebase context mapping")
 
 **Exit Criteria:**
 
 - [ ] Architecture understood
 - [ ] Patterns documented
 - [ ] Integration points identified
-- [ ] **METHODOLOGY CHECK**: Output aligns with `scouter` Thinking Protocol (file locations, patterns as constraints)
 
 ---
 
-## 🎭 Phase 3: IMPLEMENTATION PLANNING
+## Phase 3: IMPLEMENTATION PLANNING
 
 | Attribute | Value                      |
 | --------- | -------------------------- |
-| **Agent** | `planner`                  |
+| **Role**  | `planner`                  |
 | **Goal**  | Create implementation plan |
 
-### ⚡ TIERED EXECUTION
+### Delegation
 
-**TIER 1 (MANDATORY when tool exists):**
-
-> Invoke runSubagent for `planner`. Context: ISOLATED.
-
-**TIER 2 (FALLBACK on system error only):**
-
-> Load `{AGENTS_PATH}/planner.md`
-> EMBODY [planner] — Requires logged system error justification.
+> Task(subagent_type="general-purpose", prompt="You are a planner. Create an implementation plan incorporating Scout findings. Exit when: plan created, steps defined, risks identified.", description="planner: Create implementation plan")
 
 **Exit Criteria:**
 
 - [ ] Plan created
 - [ ] Steps defined
 - [ ] Risks identified
-- [ ] **METHODOLOGY CHECK**: Output aligns with `planner` Thinking Protocol (constraint consumption, complexity scoring)
 
 ---
 
-## 🎭 Phase 4: IMPLEMENTATION
+## Phase 4: IMPLEMENTATION
 
 | Attribute | Value                               |
 | --------- | ----------------------------------- |
-| **Agent** | `tech-lead` → routes to specialists |
+| **Role**  | `tech-lead` → routes to specialists |
 | **Goal**  | Execute plan with specialist agents |
 
-### ⚡ TIERED EXECUTION
-
-**TIER 1 (MANDATORY when tool exists):**
+### Delegation
 
-> Invoke runSubagent for `tech-lead`. Context: ISOLATED.
-> Tech-lead will spawn specialist subagents as needed.
+> Task(subagent_type="general-purpose", prompt="You are a tech-lead. Execute the implementation plan, routing to specialist engineers as needed. READ the plan completely BEFORE any implementation. Implement EXACTLY as specified. If deviation needed: STOP, document, request re-planning. Exit when: all plan steps executed, code complete, documentation updated, no unauthorized deviations.", description="tech-lead: Execute implementation plan")
 
-**TIER 2 (FALLBACK on system error only):**
-
-> Load `{AGENTS_PATH}/tech-lead.md`
-> EMBODY [tech-lead] — Requires logged system error justification.
-> Then recursively EMBODY specialists as needed.
-
-### 🔗 INPUT REQUIREMENTS (BLOCKING)
+### INPUT REQUIREMENTS (BLOCKING)
 
 ```yaml
 required_inputs:
@@ -243,13 +176,13 @@ required_inputs:
       if_missing: "STOP → Route to planner"
 ```
 
-### ⚡ STRICT ADHERENCE DIRECTIVE
+### STRICT ADHERENCE DIRECTIVE
 
 ```
 1. READ plan completely BEFORE any implementation
 2. FOR EACH plan step:
    a. Implement EXACTLY as specified
-   b. Mark complete: `- [ ]` → `- [x]`
+   b. Mark complete: - [ ] → - [x]
 3. IF deviation needed:
    a. STOP
    b. REQUEST Re-Planning
@@ -263,61 +196,44 @@ required_inputs:
 - [ ] Documentation updated
 - [ ] **Each plan step has corresponding implementation**
 - [ ] **No unauthorized deviations**
-- [ ] **METHODOLOGY CHECK**: Output aligns with `tech-lead` Thinking Protocol (proper delegation, drift detection)
 
 ---
 
-## 🎭 Phase 5: TESTING
+## Phase 5: TESTING
 
 | Attribute | Value                 |
 | --------- | --------------------- |
-| **Agent** | `tester`              |
+| **Role**  | `tester`              |
 | **Goal**  | Comprehensive testing |
 
-### ⚡ TIERED EXECUTION
-
-**TIER 1 (MANDATORY when tool exists):**
-
-> Invoke runSubagent for `tester`. Context: ISOLATED.
+### Delegation
 
-**TIER 2 (FALLBACK on system error only):**
-
-> Load `{AGENTS_PATH}/tester.md`
-> EMBODY [tester] — Requires logged system error justification.
+> Task(subagent_type="general-purpose", prompt="You are a tester. Perform comprehensive testing of the implementation. Verify all plan checkpoints. Exit when: tests written, all tests pass, coverage adequate.", description="tester: Comprehensive testing")
 
 **Exit Criteria:**
 
 - [ ] Tests written
 - [ ] All tests pass
 - [ ] Coverage adequate
-- [ ] **METHODOLOGY CHECK**: Output aligns with `tester` Thinking Protocol (test pyramid, determinism verification)
 
 ---
 
-## 🎭 Phase 6: REVIEW
+## Phase 6: REVIEW
 
 | Attribute | Value               |
 | --------- | ------------------- |
-| **Agent** | `reviewer`          |
+| **Role**  | `reviewer`          |
 | **Goal**  | Code quality review |
 
-### ⚡ TIERED EXECUTION
-
-**TIER 1 (MANDATORY when tool exists):**
-
-> Invoke runSubagent for `reviewer`. Context: ISOLATED.
-
-**TIER 2 (FALLBACK on system error only):**
+### Delegation
 
-> Load `{AGENTS_PATH}/reviewer.md`
-> EMBODY [reviewer] — Requires logged system error justification.
+> Task(subagent_type="general-purpose", prompt="You are a reviewer. Perform code quality review. Check plan compliance, standards, and blocking issues. Exit when: code reviewed, standards met, no blocking issues.", description="reviewer: Code quality review")
 
 **Exit Criteria:**
 
 - [ ] Code reviewed
 - [ ] Standards met
 - [ ] No blocking issues
-- [ ] **METHODOLOGY CHECK**: Output aligns with `reviewer` Thinking Protocol (plan compliance check, priority matrix)
 
 ---
 
@@ -325,6 +241,6 @@ required_inputs:
 
 Present implementation report with:
 
-1. ✅ **Done** — Feature complete
-2. 🚀 **Deploy** → `/deploy:preview`
-3. 📝 **Docs** → `/docs:core`
+1. **Done** — Feature complete
+2. **Deploy** → `/deploy:preview`
+3. **Docs** → `/docs:core`

package/merged-commands/code/no-test.md

@@ -3,7 +3,7 @@ description: ⚡⚡ Start coding an existing plan (no testing)
 argument-hint: [plan]
 ---
 
-**MUST READ** `CLAUDE.md` then **THINK HARDER** to start working on the following plan follow the Orchestration Protocol, Core Responsibilities, Subagents Team and Development Rules:
+**MUST READ** `CLAUDE.md` then **THINK HARDER** to start working on the following plan follow the Orchestration Protocol, Core Responsibilities, Task Agents Team and Development Rules:
 <plan>$ARGUMENTS</plan>
 
 ---
@@ -13,7 +13,7 @@ argument-hint: [plan]
 - Validate the plan's assumptions, surface blockers, and confirm priorities with the user prior to execution.
 - Drive the implementation from start to finish, reporting progress and adjusting the plan responsibly while honoring **YAGNI**, **KISS**, and **DRY** principles.
 
-**IMPORTANT:** Remind these rules with subagents communication:
+**IMPORTANT:** Remind these rules with Task agents communication:
 - Sacrifice grammar for the sake of concision when writing reports.
 - In reports, list any unresolved questions at the end, if any.
 - Ensure token efficiency while maintaining high quality.
@@ -30,9 +30,9 @@ argument-hint: [plan]
 
 **Output:** `✓ Step 0: [Plan Name] - [Phase Name]`
 
-**Subagent Pattern (use throughout):**
+**Task Agent Pattern (use throughout):**
 ```
-Task(subagent_type="[type]", prompt="[task description]", description="[brief]")
+Task(subagent_type="general-purpose", prompt="[task description]", description="[brief]")
 ```
 
 ---
@@ -65,7 +65,7 @@ Mark Step 1 complete in TodoWrite, mark Step 2 in_progress.
 
 ## Step 2: Implementation
 
-Implement selected plan phase step-by-step following extracted tasks (Step 2.1, Step 2.2, etc.). Mark tasks complete as done. For UI work, call `ui-ux-designer` subagent: "Implement [feature] UI per ./docs/design-guidelines.md". Use `ai-multimodal` skill for image assets, `imagemagick` for editing. Run type checking and compile to verify no syntax errors.
+Implement selected plan phase step-by-step following extracted tasks (Step 2.1, Step 2.2, etc.). Mark tasks complete as done. For UI work, use a Task agent for UI/UX design: Task(subagent_type="general-purpose", prompt="You are a ui-ux-designer. Implement [feature] UI per ./docs/design-guidelines.md", description="Implement UI"). Use `ai-multimodal` skill for image assets, `imagemagick` for editing. Run type checking and compile to verify no syntax errors.
 
 **Output:** `✓ Step 2: Implemented [N] files - [X/Y] tasks complete, compilation passed`
 
@@ -75,7 +75,7 @@ Mark Step 2 complete in TodoWrite, mark Step 3 in_progress.
 
 ## Step 3: Code Review & Approval ⏸ BLOCKING GATE
 
-Call `code-reviewer` subagent: "Review changes for plan phase [phase-name]. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list."
+Use a Task agent for code review: Task(subagent_type="general-purpose", prompt="You are a code-reviewer. Review changes for plan phase [phase-name]. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list.", description="Code review")
 
 **Display + Approve Flow (optimized for speed):**
 
@@ -126,8 +126,8 @@ Mark Step 3 complete in TodoWrite, mark Step 4 in_progress.
 **Prerequisites:** User approved in Step 3 (verified above).
 
 1. **STATUS UPDATE - BOTH MANDATORY - PARALLEL EXECUTION:**
-- **Call** `project-manager` sub-agent: "Update plan status in [plan-path]. Mark plan phase [phase-name] as DONE with timestamp. Update roadmap."
-- **Call** `docs-manager` sub-agent: "Update docs for plan phase [phase-name]. Changed files: [list]."
+- **Use** Task agent for project management: Task(subagent_type="general-purpose", prompt="You are a project-manager. Update plan status in [plan-path]. Mark plan phase [phase-name] as DONE with timestamp. Update roadmap.", description="Update plan status")
+- **Use** Task agent for documentation: Task(subagent_type="general-purpose", prompt="You are a docs-manager. Update docs for plan phase [phase-name]. Changed files: [list].", description="Update docs")
 
 2. **ONBOARDING CHECK:** Detect onboarding requirements (API keys, env vars, config) + generate summary report with next steps.
 
@@ -158,13 +158,13 @@ Mark Step 4 complete in TodoWrite.
 
 **TodoWrite tracking required:** Initialize at Step 0, mark each step complete before next.
 
-**Mandatory subagent calls:**
-- Step 3: `code-reviewer`
-- Step 4: `project-manager` AND `docs-manager` (when user approves)
+**Mandatory Task agent calls:**
+- Step 3: Task agent for code review
+- Step 4: Task agent for project management AND Task agent for documentation (when user approves)
 
 **Blocking gates:**
 - Step 3: User must explicitly approve (via AskUserQuestion)
-- Step 4: Both `project-manager` and `docs-manager` must complete successfully
+- Step 4: Both Task agents for project management and documentation must complete successfully
 
 **REMEMBER:**
 - Do not skip steps. Do not proceed if validation fails. Do not assume approval without user response.

package/merged-commands/code/parallel.md

@@ -16,7 +16,7 @@ Execute plan: <plan>$ARGUMENTS</plan>
 
 ### 2A. Parallel Execution
 1. Parse execution strategy (which phases concurrent/sequential, file ownership)
-2. Launch multiple `fullstack-developer` agents simultaneously for parallel phases
+2. Launch multiple Task agents for fullstack development simultaneously for parallel phases
    - Pass: phase file path, environment info, file ownership boundaries
 3. Wait for parallel group completion, verify no conflicts
 4. Execute sequential phases (one agent per phase after dependencies)
@@ -26,18 +26,18 @@ Execute plan: <plan>$ARGUMENTS</plan>
 Follow `./.claude/rules/primary-workflow.md`:
 1. Use main agent step by step
 2. Read `plan.md`, implement phases one by one
-3. Use `project-manager` for progress updates
-4. Use `ui-ux-designer` for frontend
+3. Use Task agent for project management for progress updates
+4. Use Task agent for UI/UX design for frontend
 5. Run type checking after each phase
 6. Proceed to Step 3
 
 ### 3. Testing
-- Use `tester` for full suite (NO fake data/mocks)
-- If fail: `debugger` → fix → repeat
+- Use Task agent for testing for full suite (NO fake data/mocks)
+- If fail: Task agent for debugging → fix → repeat
 
 ### 4. Code Review (Interactive Cycle)
 
-Call `code-reviewer` subagent: "Review all changes from parallel/sequential execution. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list."
+Use a Task agent for code review: Task(subagent_type="general-purpose", prompt="You are a code-reviewer. Review all changes from parallel/sequential execution. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list.", description="Code review")
 
 **Interactive Review-Fix Cycle (max 3 cycles):**
 
@@ -85,7 +85,7 @@ LOOP:
 ```
 
 ### 5. Project Management & Docs
-- If approved: `project-manager` + `docs-manager` in parallel (update plans, docs, roadmap)
+- If approved: Task agent for project management + Task agent for documentation in parallel (update plans, docs, roadmap)
 - If rejected: fix → repeat
 
 ### 6. Onboarding
@@ -93,8 +93,8 @@ LOOP:
 
 ### 7. Final Report
 - Summary, guide, next steps
-- Ask to commit (use `git-manager` if yes)
+- Ask to commit (use Task agent for git operations if yes)
 
 **Examples:**
-- Parallel: "Phases 1-3 parallel, then 4" → Launch 3 agents → Wait → Launch 1 agent
+- Parallel: "Phases 1-3 parallel, then 4" → Launch 3 Task agents → Wait → Launch 1 Task agent
 - Sequential: "Phase 1 → 2 → 3" → Main agent implements each phase

package/merged-commands/code.md

@@ -3,7 +3,7 @@ description: ⚡⚡⚡ Start coding & testing an existing plan
 argument-hint: [plan]
 ---
 
-**MUST READ** `CLAUDE.md` then **THINK HARDER** to start working on the following plan follow the Orchestration Protocol, Core Responsibilities, Subagents Team and Development Rules:
+**MUST READ** `CLAUDE.md` then **THINK HARDER** to start working on the following plan follow the Orchestration Protocol, Core Responsibilities, Task Agents Team and Development Rules:
 <plan>$ARGUMENTS</plan>
 
 ---
@@ -13,7 +13,7 @@ argument-hint: [plan]
 - Validate the plan's assumptions, surface blockers, and confirm priorities with the user prior to execution.
 - Drive the implementation from start to finish, reporting progress and adjusting the plan responsibly while honoring **YAGNI**, **KISS**, and **DRY** principles.
 
-**IMPORTANT:** Remind these rules with subagents communication:
+**IMPORTANT:** Remind these rules with Task agents communication:
 - Sacrifice grammar for the sake of concision when writing reports.
 - In reports, list any unresolved questions at the end, if any.
 - Ensure token efficiency while maintaining high quality.
@@ -36,9 +36,9 @@ Example: `plans/260108-1418-custom-domain-refactor/phase-01-database.md` → run
 
 **Output:** `✓ Step 0: [Plan Name] - [Phase Name]`
 
-**Subagent Pattern (use throughout):**
+**Task Agent Pattern (use throughout):**
 ```
-Task(subagent_type="[type]", prompt="[task description]", description="[brief]")
+Task(subagent_type="general-purpose", prompt="[task description]", description="[brief]")
 ```
 
 ---
@@ -72,7 +72,7 @@ Mark Step 1 complete in TodoWrite, mark Step 2 in_progress.
 
 ## Step 2: Implementation
 
-Implement selected plan phase step-by-step following extracted tasks (Step 2.1, Step 2.2, etc.). Mark tasks complete as done. For UI work, call `ui-ux-designer` subagent: "Implement [feature] UI per ./docs/design-guidelines.md". Use `ai-multimodal` skill for image assets, `imagemagick` for editing. Run type checking and compile to verify no syntax errors.
+Implement selected plan phase step-by-step following extracted tasks (Step 2.1, Step 2.2, etc.). Mark tasks complete as done. For UI work, use a Task agent for UI/UX design: Task(subagent_type="general-purpose", prompt="You are a ui-ux-designer. Implement [feature] UI per ./docs/design-guidelines.md", description="Implement UI"). Use `ai-multimodal` skill for image assets, `imagemagick` for editing. Run type checking and compile to verify no syntax errors.
 
 **Output:** `✓ Step 2: Implemented [N] files - [X/Y] tasks complete, compilation passed`
 
@@ -82,7 +82,7 @@ Mark Step 2 complete in TodoWrite, mark Step 3 in_progress.
 
 ## Step 3: Testing
 
-Write tests covering happy path, edge cases, and error cases. Call `tester` subagent: "Run test suite for plan phase [phase-name]". If ANY tests fail: STOP, call `debugger` subagent: "Analyze failures: [details]", fix all issues, re-run `tester`. Repeat until 100% pass.
+Write tests covering happy path, edge cases, and error cases. Use a Task agent for testing: Task(subagent_type="general-purpose", prompt="You are a tester. Run test suite for plan phase [phase-name]", description="Run tests"). If ANY tests fail: STOP, use a Task agent for debugging: Task(subagent_type="general-purpose", prompt="You are a debugger. Analyze failures: [details]", description="Debug test failures"), fix all issues, re-run tester. Repeat until 100% pass.
 
 **Testing standards:** Unit tests may use mocks for external dependencies (APIs, DB). Integration tests use test environment. E2E tests use real but isolated data. Forbidden: commenting out tests, changing assertions to pass, TODO/FIXME to defer fixes.
 
@@ -96,7 +96,7 @@ Mark Step 3 complete in TodoWrite, mark Step 4 in_progress.
 
 ## Step 4: Code Review & Approval ⏸ BLOCKING GATE
 
-Call `code-reviewer` subagent: "Review changes for plan phase [phase-name]. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list."
+Use a Task agent for code review: Task(subagent_type="general-purpose", prompt="You are a code-reviewer. Review changes for plan phase [phase-name]. Check security, performance, architecture, YAGNI/KISS/DRY. Return score (X/10), critical issues list, warnings list, suggestions list.", description="Code review")
 
 **Interactive Review-Fix Cycle (max 3 cycles):**
 
@@ -154,8 +154,8 @@ Mark Step 4 complete in TodoWrite, mark Step 5 in_progress.
 **Prerequisites:** User approved in Step 4 (verified above).
 
 1. **STATUS UPDATE - BOTH MANDATORY - PARALLEL EXECUTION:**
-- **Call** `project-manager` sub-agent: "Update plan status in [plan-path]. Mark plan phase [phase-name] as DONE with timestamp. Update roadmap."
-- **Call** `docs-manager` sub-agent: "Update docs for plan phase [phase-name]. Changed files: [list]."
+- **Use** Task agent for project management: Task(subagent_type="general-purpose", prompt="You are a project-manager. Update plan status in [plan-path]. Mark plan phase [phase-name] as DONE with timestamp. Update roadmap.", description="Update plan status")
+- **Use** Task agent for documentation: Task(subagent_type="general-purpose", prompt="You are a docs-manager. Update docs for plan phase [phase-name]. Changed files: [list].", description="Update docs")
 
 2. **ONBOARDING CHECK:** Detect onboarding requirements (API keys, env vars, config) + generate summary report with next steps.
 
@@ -187,15 +187,15 @@ Mark Step 5 complete in TodoWrite.
 
 **TodoWrite tracking required:** Initialize at Step 0, mark each step complete before next.
 
-**Mandatory subagent calls:**
-- Step 3: `tester`
-- Step 4: `code-reviewer`
-- Step 5: `project-manager` AND `docs-manager` (when user approves)
+**Mandatory Task agent calls:**
+- Step 3: Task agent for testing
+- Step 4: Task agent for code review
+- Step 5: Task agent for project management AND Task agent for documentation (when user approves)
 
 **Blocking gates:**
 - Step 3: Tests must be 100% passing
 - Step 4: User must explicitly approve (via AskUserQuestion)
-- Step 5: Both `project-manager` and `docs-manager` must complete successfully
+- Step 5: Both Task agents for project management and documentation must complete successfully
 
 **REMEMBER:**
 - Do not skip steps. Do not proceed if validation fails. Do not assume approval without user response.

package/merged-commands/comprehensive-review-full-review.md

@@ -41,13 +41,13 @@ Orchestrate comprehensive multi-dimensional code review using specialized review
 Use Task tool to orchestrate quality and architecture agents in parallel:
 
 ### 1A. Code Quality Analysis
-- Use Task tool with subagent_type="code-reviewer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Perform comprehensive code quality review for: $ARGUMENTS. Analyze code complexity, maintainability index, technical debt, code duplication, naming conventions, and adherence to Clean Code principles. Integrate with SonarQube, CodeQL, and Semgrep for static analysis. Check for code smells, anti-patterns, and violations of SOLID principles. Generate cyclomatic complexity metrics and identify refactoring opportunities."
 - Expected output: Quality metrics, code smell inventory, refactoring recommendations
 - Context: Initial codebase analysis, no dependencies on other phases
 
 ### 1B. Architecture & Design Review
-- Use Task tool with subagent_type="architect-review"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Review architectural design patterns and structural integrity in: $ARGUMENTS. Evaluate microservices boundaries, API design, database schema, dependency management, and adherence to Domain-Driven Design principles. Check for circular dependencies, inappropriate coupling, missing abstractions, and architectural drift. Verify compliance with enterprise architecture standards and cloud-native patterns."
 - Expected output: Architecture assessment, design pattern analysis, structural recommendations
 - Context: Runs parallel with code quality analysis
@@ -57,13 +57,13 @@ Use Task tool to orchestrate quality and architecture agents in parallel:
 Use Task tool with security and performance agents, incorporating Phase 1 findings:
 
 ### 2A. Security Vulnerability Assessment
-- Use Task tool with subagent_type="security-auditor"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Execute comprehensive security audit on: $ARGUMENTS. Perform OWASP Top 10 analysis, dependency vulnerability scanning with Snyk/Trivy, secrets detection with GitLeaks, input validation review, authentication/authorization assessment, and cryptographic implementation review. Include findings from Phase 1 architecture review: {phase1_architecture_context}. Check for SQL injection, XSS, CSRF, insecure deserialization, and configuration security issues."
 - Expected output: Vulnerability report, CVE list, security risk matrix, remediation steps
 - Context: Incorporates architectural vulnerabilities identified in Phase 1B
 
 ### 2B. Performance & Scalability Analysis
-- Use Task tool with subagent_type="application-performance::performance-engineer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Conduct performance analysis and scalability assessment for: $ARGUMENTS. Profile code for CPU/memory hotspots, analyze database query performance, review caching strategies, identify N+1 problems, assess connection pooling, and evaluate asynchronous processing patterns. Consider architectural findings from Phase 1: {phase1_architecture_context}. Check for memory leaks, resource contention, and bottlenecks under load."
 - Expected output: Performance metrics, bottleneck analysis, optimization recommendations
 - Context: Uses architecture insights to identify systemic performance issues
@@ -73,13 +73,13 @@ Use Task tool with security and performance agents, incorporating Phase 1 findin
 Use Task tool for test and documentation quality assessment:
 
 ### 3A. Test Coverage & Quality Analysis
-- Use Task tool with subagent_type="unit-testing::test-automator"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Evaluate testing strategy and implementation for: $ARGUMENTS. Analyze unit test coverage, integration test completeness, end-to-end test scenarios, test pyramid adherence, and test maintainability. Review test quality metrics including assertion density, test isolation, mock usage, and flakiness. Consider security and performance test requirements from Phase 2: {phase2_security_context}, {phase2_performance_context}. Verify TDD practices if --tdd-review flag is set."
 - Expected output: Coverage report, test quality metrics, testing gap analysis
 - Context: Incorporates security and performance testing requirements from Phase 2
 
 ### 3B. Documentation & API Specification Review
-- Use Task tool with subagent_type="code-documentation::docs-architect"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Review documentation completeness and quality for: $ARGUMENTS. Assess inline code documentation, API documentation (OpenAPI/Swagger), architecture decision records (ADRs), README completeness, deployment guides, and runbooks. Verify documentation reflects actual implementation based on all previous phase findings: {phase1_context}, {phase2_context}. Check for outdated documentation, missing examples, and unclear explanations."
 - Expected output: Documentation coverage report, inconsistency list, improvement recommendations
 - Context: Cross-references all previous findings to ensure documentation accuracy
@@ -89,13 +89,13 @@ Use Task tool for test and documentation quality assessment:
 Use Task tool to verify framework-specific and industry best practices:
 
 ### 4A. Framework & Language Best Practices
-- Use Task tool with subagent_type="framework-migration::legacy-modernizer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Verify adherence to framework and language best practices for: $ARGUMENTS. Check modern JavaScript/TypeScript patterns, React hooks best practices, Python PEP compliance, Java enterprise patterns, Go idiomatic code, or framework-specific conventions (based on --framework flag). Review package management, build configuration, environment handling, and deployment practices. Include all quality issues from previous phases: {all_previous_contexts}."
 - Expected output: Best practices compliance report, modernization recommendations
 - Context: Synthesizes all previous findings for framework-specific guidance
 
 ### 4B. CI/CD & DevOps Practices Review
-- Use Task tool with subagent_type="cicd-automation::deployment-engineer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Review CI/CD pipeline and DevOps practices for: $ARGUMENTS. Evaluate build automation, test automation integration, deployment strategies (blue-green, canary), infrastructure as code, monitoring/observability setup, and incident response procedures. Assess pipeline security, artifact management, and rollback capabilities. Consider all issues identified in previous phases that impact deployment: {all_critical_issues}."
 - Expected output: Pipeline assessment, DevOps maturity evaluation, automation recommendations
 - Context: Focuses on operationalizing fixes for all identified issues

package/merged-commands/context-degradation.md

@@ -157,11 +157,11 @@ Four strategies address different aspects of context degradation:
 
 **Compress**: Reduce tokens while preserving information through summarization, abstraction, and observation masking. This extends effective context capacity.
 
-**Isolate**: Split context across sub-agents or sessions to prevent any single context from growing large enough to degrade. This is the most aggressive strategy but often the most effective.
+**Isolate**: Split context across Task agents or sessions to prevent any single context from growing large enough to degrade. This is the most aggressive strategy but often the most effective.
 
 ### Architectural Patterns
 
-Implement these strategies through specific architectural patterns. Use just-in-time context loading to retrieve information only when needed. Use observation masking to replace verbose tool outputs with compact references. Use sub-agent architectures to isolate context for different tasks. Use compaction to summarize growing context before it exceeds limits.
+Implement these strategies through specific architectural patterns. Use just-in-time context loading to retrieve information only when needed. Use observation masking to replace verbose tool outputs with compact references. Use Task agent architectures to isolate context for different tasks. Use compaction to summarize growing context before it exceeds limits.
 
 ## Examples
 

package/merged-commands/context-engineering.md

@@ -25,13 +25,13 @@ Context engineering curates the smallest high-signal token set for LLM tasks. Th
 1. **Context quality > quantity** - High-signal tokens beat exhaustive content
 2. **Attention is finite** - U-shaped curve favors beginning/end positions
 3. **Progressive disclosure** - Load information just-in-time
-4. **Isolation prevents degradation** - Partition work across sub-agents
+4. **Isolation prevents degradation** - Partition work across Task agents
 5. **Measure before optimizing** - Know your baseline
 
 **IMPORTANT:**
 - Sacrifice grammar for the sake of concision.
 - Ensure token efficiency while maintaining high quality.
-- Pass these rules to subagents.
+- Pass these rules to Task agents.
 
 ## Quick Reference
 
@@ -61,7 +61,7 @@ Context engineering curates the smallest high-signal token set for LLM tasks. Th
 1. **Write**: Save context externally (scratchpads, files)
 2. **Select**: Pull only relevant context (retrieval, filtering)
 3. **Compress**: Reduce tokens while preserving info (summarization)
-4. **Isolate**: Split across sub-agents (partitioning)
+4. **Isolate**: Split across Task agents (partitioning)
 
 ## Anti-Patterns
 
@@ -75,7 +75,7 @@ Context engineering curates the smallest high-signal token set for LLM tasks. Th
 
 1. Place critical info at beginning/end of context
 2. Implement compaction at 70-80% utilization
-3. Use sub-agents for context isolation, not role-play
+3. Use Task agents for context isolation, not role-play
 4. Design tools with 4-question framework (what, when, inputs, returns)
 5. Optimize for tokens-per-task, not tokens-per-request
 6. Validate with probe-based evaluation