@ngxtm/devkit 3.18.0 → 3.20.0

package/merged-commands/multi-platform-apps-multi-platform.md

@@ -31,7 +31,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 ## Phase 1: Architecture and API Design (Sequential)
 
 ### 1. Define Feature Requirements and API Contracts
-- Use Task tool with subagent_type="backend-architect"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Design the API contract for feature: $ARGUMENTS. Create OpenAPI 3.1 specification with:
   - RESTful endpoints with proper HTTP methods and status codes
   - GraphQL schema if applicable for complex data queries
@@ -44,7 +44,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Complete API specification, data models, and integration guidelines
 
 ### 2. Design System and UI/UX Consistency
-- Use Task tool with subagent_type="ui-ux-designer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Create cross-platform design system for feature using API spec: [previous output]. Include:
   - Component specifications for each platform (Material Design, iOS HIG, Fluent)
   - Responsive layouts for web (mobile-first approach)
@@ -57,7 +57,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Design system documentation, component library specs, platform guidelines
 
 ### 3. Shared Business Logic Architecture
-- Use Task tool with subagent_type="comprehensive-review::architect-review"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Design shared business logic architecture for cross-platform feature. Define:
   - Core domain models and entities (platform-agnostic)
   - Business rules and validation logic
@@ -72,7 +72,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 ## Phase 2: Parallel Platform Implementation
 
 ### 4a. Web Implementation (React/Next.js)
-- Use Task tool with subagent_type="frontend-developer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Implement web version of feature using:
   - React 18+ with Next.js 14+ App Router
   - TypeScript for type safety
@@ -87,7 +87,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Complete web implementation with tests
 
 ### 4b. iOS Implementation (SwiftUI)
-- Use Task tool with subagent_type="ios-developer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Implement iOS version using:
   - SwiftUI with iOS 17+ features
   - Swift 5.9+ with async/await
@@ -102,7 +102,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Native iOS implementation with unit/UI tests
 
 ### 4c. Android Implementation (Kotlin/Compose)
-- Use Task tool with subagent_type="mobile-developer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Implement Android version using:
   - Jetpack Compose with Material 3
   - Kotlin coroutines and Flow
@@ -117,7 +117,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Native Android implementation with tests
 
 ### 4d. Desktop Implementation (Optional - Electron/Tauri)
-- Use Task tool with subagent_type="frontend-mobile-development::frontend-developer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Implement desktop version using Tauri 2.0 or Electron with:
   - Shared web codebase where possible
   - Native OS integration (system tray, notifications)
@@ -133,7 +133,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 ## Phase 3: Integration and Validation
 
 ### 5. API Documentation and Testing
-- Use Task tool with subagent_type="documentation-generation::api-documenter"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Create comprehensive API documentation including:
   - Interactive OpenAPI/Swagger documentation
   - Platform-specific integration guides
@@ -149,7 +149,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Complete API documentation portal, test results
 
 ### 6. Cross-Platform Testing and Feature Parity
-- Use Task tool with subagent_type="unit-testing::test-automator"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Validate feature parity across all platforms:
   - Functional testing matrix (features work identically)
   - UI consistency verification (follows design system)
@@ -164,7 +164,7 @@ Build and deploy the same feature consistently across web, mobile, and desktop p
 - Expected output: Test report, parity matrix, performance metrics
 
 ### 7. Platform-Specific Optimizations
-- Use Task tool with subagent_type="application-performance::performance-engineer"
+- Use Task tool with subagent_type="general-purpose"
 - Prompt: "Optimize each platform implementation:
   - Web: Bundle size, lazy loading, CDN setup, SEO
   - iOS: App size, launch time, memory usage, battery

package/merged-commands/nestjs-expert.md

@@ -20,7 +20,7 @@ You are an expert in Nest.js with deep knowledge of enterprise-grade Node.js app
    - Node.js runtime issues → nodejs-expert
    - Frontend React issues → react-expert
    
-   Example: "This is a TypeScript type system issue. Use the typescript-type-expert subagent. Stopping here."
+   Example: "This is a TypeScript type system issue. Use the typescript-type-expert Task agent. Stopping here."
 
 1. Detect Nest.js project setup using internal tools first (Read, Grep, Glob)
 2. Identify architecture patterns and existing modules

package/merged-commands/performance-testing-review-multi-agent-review.md

@@ -59,7 +59,7 @@ The Multi-Agent Review Tool leverages a distributed, specialized agent network t
 - **Dynamic Agent Matching**:
   - Analyze input characteristics
   - Select most appropriate agent types
-  - Configure specialized sub-agents dynamically
+  - Configure specialized Task agents dynamically
 - **Expertise Routing**:
   ```python
   def route_agents(code_context):

package/merged-commands/plan/archive.md

@@ -23,7 +23,7 @@ Use `AskUserQuestion` tool to ask if user wants to document journal entries or n
 Skip this step if user selects "No".
 If user selects "Yes":
 - Analyze the information in previous steps.
-- Use Task tool with `subagent_type="journal-writer"` in parallel to document all plans.
+- Use Task tool with `subagent_type="general-purpose"` in parallel to document all plans: Task(subagent_type="general-purpose", prompt="You are a journal-writer. Document these plans...", description="Write journal entries")
 - Journal entries should be concise and focused on the most important events, key changes, impacts, and decisions.
 - Keep journal entries in the `./docs/journals/` directory.
 

package/merged-commands/plan/ci.md

@@ -8,7 +8,7 @@ Activate `planning` skill.
 ## Github Actions URL
  $ARGUMENTS
 
-Use the `planner` subagent to read the github actions logs, analyze and find the root causes of the issues, then provide a detailed plan for implementing the fixes.
+Use a Task agent for planning to read the github actions logs, analyze and find the root causes of the issues, then provide a detailed plan for implementing the fixes: Task(subagent_type="general-purpose", prompt="You are a planner. Read github actions logs, analyze root causes, create fix plan...", description="Analyze CI logs and plan fixes")
 
 **Plan File Specification:**
 - Every `plan.md` MUST start with YAML frontmatter:

package/merged-commands/plan/fast.md

@@ -19,10 +19,10 @@ Check the `## Plan Context` section in the injected context:
 - If "Plan: none" → Create new plan using naming from `## Naming` section.
 
 ## Workflow
-Use `planner` subagent to:
+Use Task agent for planning: Task(subagent_type="general-purpose", prompt="You are a planner. Create implementation plan...", description="Create plan") to:
 1. If creating new: Create directory using `Plan dir:` from `## Naming` section, then run `node .claude/scripts/set-active-plan.cjs {plan-dir}`
    If reusing: Use the active plan path from Plan Context.
-   Make sure you pass the directory path to every subagent during the process.
+   Make sure you pass the directory path to every Task agent during the process.
 2. Follow strictly to the "Plan Creation & Organization" rules of `planning` skill.
 3. Analyze the codebase by reading `codebase-summary.md`, `code-standards.md`, `system-architecture.md` and `project-overview-pdr.md` file.
 4. Gathers all information and create an implementation plan of this task.

package/merged-commands/plan/hard.md

@@ -21,14 +21,14 @@ Check the `## Plan Context` section in the injected context:
 ## Workflow
 1. If creating new: Create directory using `Plan dir:` from `## Naming` section, then run `node .claude/scripts/set-active-plan.cjs {plan-dir}`
    If reusing: Use the active plan path from Plan Context.
-   Make sure you pass the directory path to every subagent during the process.
+   Make sure you pass the directory path to every Task agent during the process.
 2. Follow strictly to the "Plan Creation & Organization" rules of `planning` skill.
-3. Use multiple `researcher` agents (max 2 agents) in parallel to research for this task:
+3. Use multiple Task agents for research (max 2 agents) in parallel to research for this task: Task(subagent_type="general-purpose", prompt="You are a researcher. Research [aspect]...", description="Research [topic]")
    Each agent research for a different aspect of the task and are allowed to perform max 5 tool calls.
 4. Analyze the codebase by reading `codebase-summary.md`, `code-standards.md`, `system-architecture.md` and `project-overview-pdr.md` file.
    **ONLY PERFORM THIS FOLLOWING STEP IF `codebase-summary.md` is not available or older than 3 days**: Use `/scout <instructions>` slash command to search the codebase for files needed to complete the task.
-5. Main agent gathers all research and scout report filepaths, and pass them to `planner` subagent with the prompt to create an implementation plan of this task.
-6. Main agent receives the implementation plan from `planner` subagent, and ask user to review the plan
+5. Main agent gathers all research and scout report filepaths, and pass them to Task agent for planning with the prompt to create an implementation plan of this task: Task(subagent_type="general-purpose", prompt="You are a planner. Create implementation plan based on research and scout reports...", description="Create implementation plan")
+6. Main agent receives the implementation plan from Task agent, and ask user to review the plan
 
 ## Post-Plan Validation (Optional)
 

package/merged-commands/plan/parallel.md

@@ -13,14 +13,14 @@ $ARGUMENTS
 
 ## Workflow
 1. Create a directory using naming pattern from `## Naming` section in injected context.
-   Make sure you pass the directory path to every subagent during the process.
+   Make sure you pass the directory path to every Task agent during the process.
 2. Follow strictly to the "Plan Creation & Organization" rules of `planning` skill.
-3. Use multiple `researcher` agents (max 2 agents) in parallel to research for this task:
+3. Use multiple Task agents for research (max 2 agents) in parallel to research for this task: Task(subagent_type="general-purpose", prompt="You are a researcher. Research [aspect]...", description="Research [topic]")
    Each agent research for a different aspect of the task and are allowed to perform max 5 tool calls.
 4. Analyze the codebase by reading `codebase-summary.md`, `code-standards.md`, `system-architecture.md` and `project-overview-pdr.md` file.
    **ONLY PERFORM THIS FOLLOWING STEP IF `codebase-summary.md` is not available or older than 3 days**: Use `/scout <instructions>` slash command to search the codebase for files needed to complete the task.
-5. Main agent gathers all research and scout report filepaths, and pass them to `planner` subagent with the prompt to create a parallel-optimized implementation plan.
-6. Main agent receives the implementation plan from `planner` subagent, and ask user to review the plan
+5. Main agent gathers all research and scout report filepaths, and pass them to Task agent for planning with the prompt to create a parallel-optimized implementation plan: Task(subagent_type="general-purpose", prompt="You are a planner. Create parallel-optimized implementation plan...", description="Create parallel plan")
+6. Main agent receives the implementation plan from Task agent, and ask user to review the plan
 
 ## Post-Plan Validation (Optional)
 
@@ -39,7 +39,7 @@ After plan creation, offer validation interview to confirm decisions before impl
 
 ## Special Requirements for Parallel Execution
 
-**CRITICAL:** The planner subagent must create phases that:
+**CRITICAL:** The Task agent for planning must create phases that:
 1. **Can be executed independently** - Each phase should be self-contained with no runtime dependencies on other phases
 2. **Have clear boundaries** - No file overlap between phases (each file should only be modified in ONE phase)
 3. **Separate concerns logically** - Group by architectural layer, feature domain, or technology stack

package/merged-commands/plan/two.md

@@ -7,20 +7,20 @@ Think harder.
 Activate `planning` skill.
 
 ## Your mission
-Use the `planner` subagent to create 2 detailed implementation plans for this following task:
+Use the Task agent for planning to create 2 detailed implementation plans for this following task: Task(subagent_type="general-purpose", prompt="You are a planner. Create 2 implementation plans...", description="Create dual plans")
 <task>
  $ARGUMENTS
 </task>
 
 ## Workflow
 1. First: Create a directory using naming pattern from `## Naming` section in injected context.
-   Make sure you pass the directory path to every subagent during the process.
+   Make sure you pass the directory path to every Task agent during the process.
 2. Follow strictly to the "Plan Creation & Organization" rules of `planning` skill.
-3. Use multiple `researcher` agents in parallel to research for this task, each agent research for a different aspect of the task and perform max 5 researches (max 5 tool calls).
-4. Use `scout` agent to search the codebase for files needed to complete the task.
-5. Main agent gathers all research and scout report filepaths, and pass them to `planner` subagent with the detailed instructions prompt to create an implementation plan of this task.
+3. Use multiple Task agents for research in parallel to research for this task, each agent research for a different aspect of the task and perform max 5 researches (max 5 tool calls): Task(subagent_type="general-purpose", prompt="You are a researcher. Research [aspect]...", description="Research [topic]")
+4. Use Task agent for scouting to search the codebase for files needed to complete the task: Task(subagent_type="general-purpose", prompt="You are a scout. Search codebase...", description="Scout codebase")
+5. Main agent gathers all research and scout report filepaths, and pass them to Task agent for planning with the detailed instructions prompt to create an implementation plan of this task: Task(subagent_type="general-purpose", prompt="You are a planner. Create implementation plan...", description="Create plan")
   **Output:** Provide at least 2 implementation approaches with clear trade-offs, and explain the pros and cons of each approach, and provide a recommended approach.
-1. Main agent receives the implementation plan from `planner` subagent, and ask user to review the plan
+1. Main agent receives the implementation plan from Task agent, and ask user to review the plan
 
 ## Plan File Specification
 - Every `plan.md` MUST start with YAML frontmatter:

package/merged-commands/requesting-code-review.md

@@ -7,14 +7,14 @@ source: community
 
 # Requesting Code Review
 
-Dispatch superpowers:code-reviewer subagent to catch issues before they cascade.
+Dispatch superpowers:code-reviewer Task agent to catch issues before they cascade.
 
 **Core principle:** Review early, review often.
 
 ## When to Request Review
 
 **Mandatory:**
-- After each task in subagent-driven development
+- After each task in Task agent-driven development
 - After completing major feature
 - Before merge to main
 
@@ -31,7 +31,7 @@ BASE_SHA=$(git rev-parse HEAD~1)  # or origin/main
 HEAD_SHA=$(git rev-parse HEAD)
 ```
 
-**2. Dispatch code-reviewer subagent:**
+**2. Dispatch code-reviewer Task agent:**
 
 Use Task tool with superpowers:code-reviewer type, fill template at `code-reviewer.md`
 
@@ -58,14 +58,14 @@ You: Let me request code review before proceeding.
 BASE_SHA=$(git log --oneline | grep "Task 1" | head -1 | awk '{print $1}')
 HEAD_SHA=$(git rev-parse HEAD)
 
-[Dispatch superpowers:code-reviewer subagent]
+[Dispatch superpowers:code-reviewer Task agent]
   WHAT_WAS_IMPLEMENTED: Verification and repair functions for conversation index
   PLAN_OR_REQUIREMENTS: Task 2 from docs/plans/deployment-plan.md
   BASE_SHA: a7981ec
   HEAD_SHA: 3df7661
   DESCRIPTION: Added verifyIndex() and repairIndex() with 4 issue types
 
-[Subagent returns]:
+[Task agent returns]:
   Strengths: Clean architecture, real tests
   Issues:
     Important: Missing progress indicators
@@ -78,7 +78,7 @@ You: [Fix progress indicators]
 
 ## Integration with Workflows
 
-**Subagent-Driven Development:**
+**Task Agent-Driven Development:**
 - Review after EACH task
 - Catch issues before they compound
 - Fix before moving to next task

package/merged-commands/review/codebase/parallel.md

@@ -3,7 +3,7 @@ description: ⚡⚡⚡ Ultrathink edge cases, then parallel verify with code-rev
 argument-hint: [scope-or-prompt]
 ---
 
-**Ultrathink** to exhaustively list ALL potential edge cases, then dispatch parallel `code-reviewer` agents to verify: <scope>$ARGUMENTS</scope>
+**Ultrathink** to exhaustively list ALL potential edge cases, then dispatch parallel Task agents for code review to verify: <scope>$ARGUMENTS</scope>
 
 **IMPORTANT:** Activate needed skills. Ensure token efficiency. Sacrifice grammar for concision.
 
@@ -39,13 +39,13 @@ Main agent deeply analyzes the scope to LIST all potential edge cases FIRST:
 ### 2. Categorize & Assign
 
 Group edge cases by similar scope for parallel verification:
-- Each category → one `code-reviewer` agent
+- Each category → one Task agent for code review
 - Max 6 categories (merge small ones)
 - Each reviewer gets specific edge cases to VERIFY, not discover
 
 ### 3. Parallel Verification
 
-Launch N `code-reviewer` subagents simultaneously:
+Launch N Task agents for code review simultaneously: Task(subagent_type="general-purpose", prompt="You are a code-reviewer. Verify these edge cases...", description="Verify edge cases for [category]")
 - Pass: category name, list of edge cases, relevant files
 - Task: **VERIFY** if each edge case is properly handled in code
 - Report: which edge cases are handled vs unhandled
@@ -93,7 +93,7 @@ Collect all verification reports:
 ### 6. Final Report
 
 - Summary of verification
-- Ask: "Commit? [Y/n]" → use `git-manager`
+- Ask: "Commit? [Y/n]" → use Task agent for git management
 
 ## Example
 
@@ -112,7 +112,7 @@ User: /review:codebase:parallel auth module
    - Token handling (5 cases)
    - Session management (3 cases)
 
-3. Parallel → 3 code-reviewers verify simultaneously
+3. Parallel → 3 Task agents for code review verify simultaneously
 
 4. Aggregate → 8 handled, 3 unhandled, 1 partial
 

package/merged-commands/review/codebase.md

@@ -3,7 +3,7 @@ description: ⚡⚡⚡ Scan & analyze the codebase.
 argument-hint: [tasks-or-prompt]
 ---
 
-Think harder to scan the codebase and analyze it follow the Orchestration Protocol, Core Responsibilities, Subagents Team and Development Rules: 
+Think harder to scan the codebase and analyze it follow the Orchestration Protocol, Core Responsibilities, and Development Rules:
 <tasks>$ARGUMENTS</tasks>
 
 ---
@@ -22,26 +22,26 @@ Think harder to scan the codebase and analyze it follow the Orchestration Protoc
 
 ### Research
 
-* Use 2 `researcher` subagents in parallel to search up to max 5 sources for the user's request, idea validation, best practices, challenges, and find the best possible solutions.
+* Use 2 Task agents in parallel to search up to max 5 sources for the user's request, idea validation, best practices, challenges, and find the best possible solutions: Task(subagent_type="general-purpose", prompt="You are a researcher. Search for...", description="Research [topic]")
 * Keep every research markdown report concise (≤150 lines) while covering all requested topics and citations.
 * Use `/scout:ext` (preferred) or `/scout` (fallback) slash command to search the codebase for files needed to complete the task
 
 ### Code Review
 
-* After finishing, use multiple `code-reviewer` subagents in parallel to review code. 
+* After finishing, use multiple Task agents in parallel to review code: Task(subagent_type="general-purpose", prompt="You are a code-reviewer. Review...", description="Code review")
 * If there are any issues, duplicate code, or security vulnerabilities, ask main agent to improve the code and repeat the "Testing" process until all tests pass. 
 * When all tests pass, code is reviewed, the tasks are completed, report back to user with a summary of the changes and explain everything briefly, ask user to review the changes and approve them.
 * **IMPORTANT:** Sacrifice grammar for the sake of concision when writing outputs.
 
 ### Plan
-* Use `planner` subagent to analyze reports from `researcher` and `scout` subagents to create an improvement plan following the progressive disclosure structure:
+* Use Task agent to analyze reports from researcher and scout Task agents to create an improvement plan following the progressive disclosure structure: Task(subagent_type="general-purpose", prompt="You are a planner. Analyze reports and create improvement plan...", description="Create improvement plan")
   - Create a directory using naming pattern from `## Naming` section.
   - Save the overview access point at `plan.md`, keep it generic, under 80 lines, and list each phase with status/progress and links.
   - For each phase, add `phase-XX-phase-name.md` files containing sections (Context links, Overview with date/priority/statuses, Key Insights, Requirements, Architecture, Related code files, Implementation Steps, Todo list, Success Criteria, Risk Assessment, Security Considerations, Next steps).
 
 ### Final Report
 * Report back to user with a summary of the changes and explain everything briefly, guide user to get started and suggest the next steps.
-* Ask the user if they want to commit and push to git repository, if yes, use `git-manager` subagent to commit and push to git repository.
+* Ask the user if they want to commit and push to git repository, if yes, use Task agent to commit and push to git repository: Task(subagent_type="general-purpose", prompt="You are a git-manager. Commit and push...", description="Git commit and push")
 
 **REMEMBER**:
 - You can always generate images with `ai-multimodal` skill on the fly for visual assets.

package/merged-commands/review/fast.md

@@ -1,5 +1,5 @@
 ---
-description: ⚡ Quick Review — Fast PR/file review
+description: Quick Review — Fast PR/file review
 version: "1.0"
 category: validation
 execution-mode: execute
@@ -13,38 +13,22 @@ 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
-
-| Tier | When | Action |
-|------|------|--------|
-| **TIER 1** | runSubagent EXISTS | Invoke sub-agent (MANDATORY) |
-| **TIER 2** | Tool MISSING | EMBODY agent file (FALLBACK) |
+## Execution
+One phase at a time, sequential. Each phase must complete before next begins.
 
 ---
 
-## ⛔ INCREMENTAL EXECUTION (MANDATORY)
+## Phase 1: CODE REVIEW
 
-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).
-
----
+| Attribute | Value |
+|-----------|-------|
+| **Role** | `reviewer` |
+| **Goal** | Review code quality |
+| **Exit** | Issues documented, recommendations provided |
 
-## 🎭 Phase 1: CODE REVIEW
+### Delegation
 
-| Agent | `reviewer` |
-|-------|------------|
-| Goal | Review code quality |
-| Exit | Issues documented, recommendations provided |
+> Task(subagent_type="general-purpose", prompt="You are a reviewer. Review code quality. Exit when issues are documented and recommendations are provided.", description="reviewer: Review code quality")
 
 ---
 
@@ -61,5 +45,5 @@ One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in
 
 Present review with:
 
-1. ✅ **Approved** — Code ready
-2. 🔧 **Fix needed** → `/fix:fast`
+1. **Approved** — Code ready
+2. **Fix needed** → `/fix:fast`

package/merged-commands/review/hard.md

@@ -1,5 +1,5 @@
 ---
-description: ⚡⚡⚡ Full Review — Deep code analysis with architecture review
+description: Full Review — Deep code analysis with architecture review
 version: "1.0"
 category: validation
 execution-mode: execute
@@ -13,27 +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
-
-| Tier | When | Action |
-|------|------|--------|
-| **TIER 1** | runSubagent EXISTS | Invoke sub-agent (MANDATORY) |
-| **TIER 2** | Tool MISSING | EMBODY agent file (FALLBACK) |
-
----
-
-## 📁 PLAN COMPLIANCE CHECK
+## PLAN COMPLIANCE CHECK
 
 ```
 IF ./reports/plans/PLAN-{scope}.md exists:
@@ -44,46 +24,65 @@ IF ./reports/plans/PLAN-{scope}.md exists:
 
 ---
 
-## ⛔ INCREMENTAL EXECUTION (MANDATORY)
-
-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).
+## Execution
+One phase at a time, sequential. Each phase must complete before next begins.
 
 ---
 
-## 🎭 Phase 1: ARCHITECTURE REVIEW
+## Phase 1: ARCHITECTURE REVIEW
+
+| Attribute | Value |
+|-----------|-------|
+| **Role** | `tech-lead` |
+| **Goal** | Review architecture decisions |
+| **Exit** | Architecture assessed, patterns validated |
+
+### Delegation
 
-| Agent | `tech-lead` |
-|-------|-------------|
-| Goal | Review architecture decisions |
-| Exit | Architecture assessed, patterns validated |
+> Task(subagent_type="general-purpose", prompt="You are a tech-lead. Review architecture decisions. Exit when architecture is assessed and patterns are validated.", description="tech-lead: Review architecture decisions")
 
 ---
 
-## 🎭 Phase 2: CODE REVIEW
+## Phase 2: CODE REVIEW
+
+| Attribute | Value |
+|-----------|-------|
+| **Role** | `reviewer` |
+| **Prerequisite** | READ PLAN file if exists |
+| **Goal** | Deep code analysis |
+| **Exit** | Code quality assessed, issues documented |
+
+### Delegation
 
-| Agent | `reviewer` |
-|-------|------------|
-| Prerequisite | READ PLAN file if exists |
-| Goal | Deep code analysis |
-| Exit | Code quality assessed, issues documented |
+> Task(subagent_type="general-purpose", prompt="You are a reviewer. Perform deep code analysis. Read the PLAN file if it exists. Exit when code quality is assessed and issues are documented.", description="reviewer: Deep code analysis")
 
 ---
 
-## 🎭 Phase 3: SECURITY REVIEW
+## Phase 3: SECURITY REVIEW
 
-| Agent | `security-engineer` |
-|-------|----------------------|
-| Goal | Security assessment |
-| Exit | Security reviewed, vulnerabilities documented |
+| Attribute | Value |
+|-----------|-------|
+| **Role** | `security-engineer` |
+| **Goal** | Security assessment |
+| **Exit** | Security reviewed, vulnerabilities documented |
+
+### Delegation
+
+> Task(subagent_type="general-purpose", prompt="You are a security-engineer. Perform a security assessment. Exit when security is reviewed and vulnerabilities are documented.", description="security-engineer: Security assessment")
 
 ---
 
-## 🎭 Phase 4: PERFORMANCE REVIEW
+## Phase 4: PERFORMANCE REVIEW
+
+| Attribute | Value |
+|-----------|-------|
+| **Role** | `performance-engineer` |
+| **Goal** | Performance assessment |
+| **Exit** | Performance issues identified |
+
+### Delegation
 
-| Agent | `performance-engineer` |
-|-------|------------------------|
-| Goal | Performance assessment |
-| Exit | Performance issues identified |
+> Task(subagent_type="general-purpose", prompt="You are a performance-engineer. Perform a performance assessment. Exit when performance issues are identified.", description="performance-engineer: Performance assessment")
 
 ---
 
@@ -91,6 +90,6 @@ One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in
 
 Present review with:
 
-1. ✅ **Approved** — Code ready
-2. 🔧 **Fix** → `/fix`
-3. 🧪 **Test** → `/test`
+1. **Approved** — Code ready
+2. **Fix** → `/fix`
+3. **Test** → `/test`

package/merged-commands/review.md

@@ -13,17 +13,6 @@ execution-mode: router
 
 ---
 
-## 🛑 PRE-FLIGHT (DO FIRST — BLOCKS EXECUTION)
-
-**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 any workflow phase until all are loaded.** Follow **all** rules in those files. Then run this file's ROUTING LOGIC, LOAD the chosen variant workflow, and execute it.
-
----
-
 ## ROUTING LOGIC
 
 ```