@namch/agent-assistant 1.0.4 → 1.1.1

package/commands/design/focus.md

@@ -20,17 +20,19 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (focus variant enables find-skills for superior skill matching).
+
 ---
 
 ## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
 
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
+> **Reference: AGENTS.md (Tiered Execution)`
 
 ```yaml
 tiered_execution:
@@ -176,54 +178,36 @@ One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in
 
 ---
 
-## 🛡️ STRICT CONTEXT GATE — Automatic Context Optimization
+## 🛡️ CONTEXT GATE CHECKPOINT
 
-> **⚡ FOCUS MODE**: This checkpoint executes automatically. NO user input required.
-> 
-> **PURPOSE**: Prevent "context rot" by forcibly clearing noisy design exploration history.
-> This acts as a mandatory "firewall" before review and implementation handoff.
+> **⛔ BLOCKING**: Load Context Gate protocol NOW before proceeding.
+>
+> **LOAD**: `rules/CONTEXT-GATE.md` — Execute FOCUS MODE (Design variant)
+>
+> This is a MANDATORY checkpoint. Cannot skip or bypass.
 
-### 🔒 AUTOMATIC EXECUTION (NO PROMPT)
+### ⚡ EXECUTION
 
 ```yaml
-strict_context_gate:
-  mode: "AUTOMATIC - No user interaction"
-  behavior: "Force Clear context & Ready"
+context_gate_execution:
+  mode: "FOCUS (Automatic)"
+  trigger: "After Phase 4 (Design Creation) completes"
+  protocol: "Follow rules/CONTEXT-GATE.md § FOCUS MODE § design_focus_variant"
   
-  execution:
-    1. ANNOUNCE: |
-       ## 🛡️ Strict Context Gate — Automatic
-       
-       ✅ **Design Complete**: `./reports/designs/DESIGN-{request}.md`
-       🔒 **Focus Mode**: Automatically clearing context for review/implementation.
-       
-       ⚡ Executing: **Clear context & Ready**...
-    
-    2. CONTEXT_DIRECTIVE: |
-       ╔══════════════════════════════════════════════════════════════════╗
-       ║  ⛔ MANDATORY CONTEXT RESET — FOCUS  MODE                        ║
-       ╠══════════════════════════════════════════════════════════════════╣
-       ║  IGNORE: All design exploration, rejected alternatives,          ║
-       ║          iteration history, and intermediate reasoning.          ║
-       ║                                                                  ║
-       ║  SOLE SOURCE OF TRUTH: Design file in ./reports/designs/         ║
-       ║                                                                  ║
-       ║  PROCEED: Continue to Design Review with clean context.          ║
-       ║           Then handoff to implementation.                        ║
-       ╚══════════════════════════════════════════════════════════════════╝
-    
-    3. LOAD: Read Design file as if seeing it for the first time
-    
-    4. PROCEED: Continue to Phase 5 (Design Review)
+  variant_adjustments:
+    remaining_phases: "Phase 5 (Design Review) → Implementation Handoff"
+    deliverable_file: "./reports/designs/DESIGN-{request}.md"
 ```
 
-### 📋 Post-Gate Status
+**DO NOT proceed to Phase 5 until Context Gate completes.**
+
+## ❌ Discarded:
+- Design exploration noise
+- Rejected alternatives
+- Iteration history
+- Chat history
 
-```markdown
-🔒 **Context Gate Passed**
-- Previous context: DISCARDED
-- Active context: Design file only
-- Mode: Clean review start
+Mode: Clean review start
 
 Proceeding to Design Review...
 ```

package/commands/design/hard.md

@@ -17,17 +17,19 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (hard/focus variants enable find-skills).
+
 ---
 
 ## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
 
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
+> **Reference: AGENTS.md (Tiered Execution)`
 
 ```yaml
 tiered_execution:
@@ -208,22 +210,56 @@ option_1_clear_ready:
     2. CONTEXT_DIRECTIVE: |
        ⛔ IGNORE all design exploration and rejected alternatives.
        ✅ DESIGN FILE is SOLE SOURCE OF TRUTH.
-    3. PROCEED: Continue to Design Review phase
-
-option_2_review_first:
-  behavior: "Clear and show summary"
-  steps:
-    1. ACKNOWLEDGE: "⏸️ Context cleared."
-    2. OUTPUT: Display design summary for user review
-    3. WAIT: For user approval
+    3. RELOAD_ESSENTIAL_CONTEXT: |
+       ## 📥 Essential Context Reload
+       
+       Read Design file and extract these sections for review/handoff context:
+       
+       1️⃣ **USER REQUEST (VERBATIM)**: 
+          - Extract from Design header: `## 📌 User Request (VERBATIM)`
+          - This is the ORIGINAL design request to verify against
+       
+       2️⃣ **ACCEPTANCE CRITERIA**:
+          - Extract from Design header: `## 🎯 Acceptance Criteria`
+          - These are the checkpoints for design approval
+       
+       3️⃣ **DESIGN DOCUMENT**:
+          - Full design content from `./reports/designs/DESIGN-{request}.md`
+          - This is the SOLE SOURCE OF TRUTH for design decisions
+       
+       4️⃣ **REMAINING PHASES**: Phase 5 (Design Review) → Implementation Handoff
+       
+       5️⃣ **REVIEW RULES** (Summary):
+          - Verify design meets original user request
+          - Check all acceptance criteria are addressed
+          - Ensure design is implementation-ready
+    4. PROCEED: Continue to Design Review phase
+    5. POST_STATUS: |
+       🔒 **Context Gate Passed**
+       
+## 🛡️ VERIFICATION CHECKPOINT
+
+> **⛔ BLOCKING**: Load Context Gate protocol NOW before proceeding.
+>
+> **LOAD**: `rules/CONTEXT-GATE.md` — Execute HARD MODE (Design variant)
+>
+> This is a MANDATORY checkpoint. Cannot skip or bypass.
+
+### ⚡ EXECUTION
 
-option_3_continue_no_clear:
-  behavior: "Proceed with caution"
-  steps:
-    1. WARN: "⚠️ Design exploration history retained."
-    2. PROCEED: Continue to review with existing context
+```yaml
+context_gate_execution:
+  mode: "HARD (User Choice)"
+  trigger: "After Phase 4 (Design Creation) completes"
+  protocol: "Follow rules/CONTEXT-GATE.md § HARD MODE § design_hard_variant"
+  
+  variant_adjustments:
+    deliverable_file: "./reports/designs/DESIGN-{request}.md"
+    remaining_phases: "Phase 5 (Design Review) → Implementation Handoff"
 ```
 
+**DO NOT proceed to Phase 5 until user selects option.**
+
 ---
 
 ## 🎭 Phase 5: DESIGN REVIEW

package/commands/design.md

@@ -17,9 +17,9 @@ execution-mode: router
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ 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.
 

package/commands/docs/audit.md

@@ -17,9 +17,9 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
@@ -27,7 +27,7 @@ execution-mode: execute
 
 ## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
 
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
+> **Reference: AGENTS.md (Tiered Execution)`
 
 ```yaml
 tiered_execution:
@@ -48,7 +48,7 @@ tiered_execution:
 > **MUST CREATE ALL 4 FILES**. Incomplete = FAILED execution.
 
 > **⛔ DOCUMENT LANGUAGE — NON-NEGOTIABLE**  
-> Every file under `./documents/` must be written in **English only**. Do not use the user's language (e.g. Vietnamese) for file content. (ORCHESTRATION-LAWS § LAW 6.)
+> Every file under `./documents/` must be written in **English only**. Do not use the user's language (e.g. Vietnamese) for file content. (CORE § LAW 6.)
 
 | File                                         | Purpose                          |
 | -------------------------------------------- | -------------------------------- |

package/commands/docs/business.md

@@ -17,9 +17,9 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
@@ -27,7 +27,7 @@ execution-mode: execute
 
 ## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
 
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
+> **Reference: AGENTS.md (Tiered Execution)`
 
 ```yaml
 tiered_execution:
@@ -48,7 +48,7 @@ tiered_execution:
 > **MUST CREATE ALL 4 FILES**. Incomplete = FAILED execution.
 
 > **⛔ DOCUMENT LANGUAGE — NON-NEGOTIABLE**  
-> Every file under `./documents/` must be written in **English only**. Do not use the user's language (e.g. Vietnamese) for file content. (ORCHESTRATION-LAWS § LAW 6.)
+> Every file under `./documents/` must be written in **English only**. Do not use the user's language (e.g. Vietnamese) for file content. (CORE § LAW 6.)
 
 | File                                         | Purpose                       |
 | -------------------------------------------- | ----------------------------- |

package/commands/docs/core.md

@@ -17,9 +17,9 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
@@ -27,7 +27,7 @@ execution-mode: execute
 
 ## 🔀 TIERED EXECUTION PROTOCOL (MANDATORY)
 
-> **Reference**: `{RULES_PATH}/ADAPTIVE-EXECUTION.md`
+> **Reference: AGENTS.md (Tiered Execution)`
 
 ```yaml
 tiered_execution:
@@ -48,7 +48,7 @@ tiered_execution:
 > **MUST CREATE ALL 5 FILES**. Incomplete = FAILED execution.
 
 > **⛔ DOCUMENT LANGUAGE — NON-NEGOTIABLE**  
-> Every file under `./documents/` must be written in **English only**. Headings, body text, tables, and lists must be in English. Do not use the user's language (e.g. Vietnamese) for file content. Chat/UI may follow user language; document files do not. (ORCHESTRATION-LAWS § LAW 6.)
+> Every file under `./documents/` must be written in **English only**. Headings, body text, tables, and lists must be in English. Do not use the user's language (e.g. Vietnamese) for file content. Chat/UI may follow user language; document files do not. (CORE § LAW 6.)
 
 | File                                    | Purpose                                                       |
 | --------------------------------------- | ------------------------------------------------------------- |

package/commands/docs.md

@@ -17,9 +17,9 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ 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 (e.g. docs/core.md), and execute it.
 

package/commands/fix/fast.md

@@ -16,12 +16,14 @@ 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  
+1. CORE.md — Identity, Laws, Routing  
+2. PHASES.md — Phase Execution  
+3. AGENTS.md — Tiered Execution  
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand. Fast variant uses matrix-only (no dynamic discovery for speed optimization).
+
 ---
 
 ## 🔀 TIERED EXECUTION

package/commands/fix/focus.md

@@ -20,12 +20,14 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (focus variant enables find-skills for superior skill matching).
+
 ---
 
 ## 🔀 TIERED EXECUTION
@@ -52,7 +54,7 @@ All files in `./reports/` → English only.
 
 ## ⛔ 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). Format: rules/EXECUTION-PROTOCOL.md § Phase output structure.
+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). Format: rules/PHASES.md § Phase output structure.
 
 ---
 
@@ -83,55 +85,45 @@ One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in
 
 ---
 
-## 🛡️ STRICT CONTEXT GATE — Automatic Context Optimization
+## 🛡️ CONTEXT GATE CHECKPOINT
 
-> **⚡ FOCUS MODE**: This checkpoint executes automatically. NO user input required.
+> **⛔ BLOCKING**: Load Context Gate protocol NOW before proceeding.
+>
+> **LOAD**: `rules/CONTEXT-GATE.md` — Execute FOCUS MODE protocol
 >
-> **PURPOSE**: Prevent "context rot" by forcibly clearing noisy debugging/planning history.
-> This acts as a mandatory "firewall" between Planning and Implementation phases.
+> This is a MANDATORY checkpoint. Cannot skip or bypass.
 
-### 🔒 AUTOMATIC EXECUTION (NO PROMPT)
+### ⚡ EXECUTION
 
 ```yaml
-strict_context_gate:
-  mode: "AUTOMATIC - No user interaction"
-  behavior: "Force Clear context & Auto-Implement"
-
-  execution:
-    1. ANNOUNCE: |
-      ## 🛡️ Strict Context Gate — Automatic
-
-      ✅ **Fix Plan Complete**: Strategy defined with rollback.
-      🔒 **Focus Mode**: Automatically clearing context for implementation.
-
-      ⚡ Executing: **Clear context & Auto-Implement**...
-
-    2. CONTEXT_DIRECTIVE: |
-      ╔══════════════════════════════════════════════════════════════════╗
-      ║  ⛔ MANDATORY CONTEXT RESET — FOCUS MODE                         ║
-      ╠══════════════════════════════════════════════════════════════════╣
-      ║  IGNORE: All previous debugging hypotheses, failed attempts,     ║
-      ║          research explorations, and intermediate reasoning.      ║
-      ║                                                                  ║
-      ║  SOLE SOURCE OF TRUTH: Fix plan with rollback strategy.          ║
-      ║                                                                  ║
-      ║  PROCEED: Begin Implementation phase with FRESH context mindset. ║
-      ║           Treat this as a NEW conversation starting from Plan.   ║
-      ╚══════════════════════════════════════════════════════════════════╝
-
-    3. LOAD: Read Fix plan completely as if seeing it for the first time
-
-    4. PROCEED: Start Phase 4 (Implementation) immediately
+context_gate_execution:
+  mode: "FOCUS (Automatic)"
+  trigger: "After Phase 3 (Fix Planning) completes"
+  protocol: "Follow rules/CONTEXT-GATE.md § FOCUS MODE"
+  
+  variant_adjustments:
+    remaining_phases: "Phase 4 → 5 → 5.5"
+    plan_type: "Fix plan with rollback strategy"
 ```
 
-### 📋 Post-Gate Status
+**DO NOT proceed to Phase 4 until Context Gate completes.**
+
+---
+
+## ✅ Reloaded:
+- User request (original issue verbatim)
+- Acceptance criteria (fix verification checkpoints)
+- Fix plan with rollback strategy
+- Remaining phases workflow
+- Implementation rules summary
 
-```markdown
-🔒 **Context Gate Passed**
+## ❌ Discarded:
+- Debugging hypotheses
+- Failed investigation attempts
+- Research explorations
+- Chat history noise
 
-- Previous context: DISCARDED
-- Active context: Fix plan only
-- Mode: Fresh implementation start
+Mode: Fresh implementation start
 
 Proceeding to Implementation...
 ```

package/commands/fix/hard.md

@@ -16,12 +16,14 @@ 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  
+1. CORE.md — Identity, Laws, Routing  
+2. PHASES.md — Phase Execution  
+3. AGENTS.md — Tiered Execution  
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (hard/focus variants enable find-skills).
+
 ---
 
 ## 🔀 TIERED EXECUTION
@@ -48,7 +50,7 @@ All files in `./reports/` → English only.
 
 ## ⛔ 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). Format: rules/EXECUTION-PROTOCOL.md § Phase output structure.
+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). Format: rules/PHASES.md § Phase output structure.
 
 ---
 
@@ -95,45 +97,29 @@ One phase at a time, each phase independent: Phase 1 → then Phase 2 → … in
 
 **Choose how to proceed with implementation:**
 
-| Option | Action | Description |
-|--------|--------|-------------|
-| **1. 🚀 Clear context & Auto-Implement** | `RECOMMENDED` | Fresh start: Reload Plan, ignore chat history, begin fix immediately |
-| **2. ⏸️ Clear context & Manual** | `SAFE` | Clear context, reload Plan, pause for your command before coding |
-| **3. ⚠️ Continue (No Clear)** | `RISKY` | Proceed with full history attached (may cause hallucination) |
+## 🛡️ VERIFICATION CHECKPOINT
 
-⏳ Awaiting selection...
-```
+> **⛔ BLOCKING**: Load Context Gate protocol NOW before proceeding.
+>
+> **LOAD**: `rules/CONTEXT-GATE.md` — Execute HARD MODE protocol
+>
+> This is a MANDATORY checkpoint. Cannot skip or bypass.
 
-### 🔄 EXECUTION BEHAVIOR
+### ⚡ EXECUTION
 
 ```yaml
-option_1_clear_auto_implement:
-  behavior: "RECOMMENDED - Simulate fresh start"
-  steps:
-    1. ACKNOWLEDGE: "🚀 Executing Clear context & Auto-Implement..."
-    2. CONTEXT_DIRECTIVE: |
-       ⛔ IGNORE all previous chat messages and reasoning chains.
-       ✅ RELOAD: Fix plan as SOLE SOURCE OF TRUTH.
-       ✅ PROCEED: Begin Phase 4 (Implementation) immediately.
-    3. EXECUTE: Start Implementation phase with fresh context mindset
-
-option_2_clear_manual:
-  behavior: "Clear and wait for explicit command"
-  steps:
-    1. ACKNOWLEDGE: "⏸️ Context cleared. Plan reloaded."
-    2. CONTEXT_DIRECTIVE: |
-       ⛔ IGNORE all previous chat messages and reasoning chains.
-       ✅ RELOAD: Fix plan as SOLE SOURCE OF TRUTH.
-    3. OUTPUT: "Ready for fix implementation. Type `/continue` or give specific instructions."
-    4. WAIT: For user command before proceeding
-
-option_3_continue_no_clear:
-  behavior: "Proceed with caution - context rot risk"
-  steps:
-    1. WARN: "⚠️ Continuing with full history. Higher hallucination risk."
-    2. PROCEED: Continue to Phase 4 with existing context
+context_gate_execution:
+  mode: "HARD (User Choice)"
+  trigger: "After Phase 3 (Fix Planning) completes"
+  protocol: "Follow rules/CONTEXT-GATE.md § HARD MODE"
+  
+  variant_adjustments:
+    plan_type: "Fix plan with rollback strategy"
+    remaining_phases: "Phase 4 → 5 → 5.5"
 ```
 
+**DO NOT proceed to Phase 4 until user selects option.**
+
 ---
 
 ## 🎭 Phase 4: IMPLEMENTATION

package/commands/fix.md

@@ -17,9 +17,9 @@ execution-mode: router
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ 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.
 

package/commands/plan/fast.md

@@ -17,12 +17,14 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand. Fast variant uses matrix-only (no dynamic discovery for speed optimization).
+
 ---
 
 ## 🔀 TIERED EXECUTION
@@ -38,7 +40,7 @@ execution-mode: execute
 
 ## ⛔ 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). Format: rules/EXECUTION-PROTOCOL.md § Phase output structure.
+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). Format: rules/PHASES.md § Phase output structure.
 
 ---
 

package/commands/plan/focus.md

@@ -20,12 +20,14 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (focus variant enables find-skills for superior skill matching).
+
 ---
 
 ## 🔀 TIERED EXECUTION
@@ -69,7 +71,7 @@ When the logical plan would have **> 3 phases** or **estimated effort > 3 days**
 
 ## ⛔ 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). Format: rules/EXECUTION-PROTOCOL.md § Phase output structure.
+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). Format: rules/PHASES.md § Phase output structure.
 
 ---
 

package/commands/plan/hard.md

@@ -17,12 +17,14 @@ execution-mode: execute
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ Do not run Phase 1 until all are loaded.** Follow **all** rules in those files; they override any conflicting instructions in this file.
 
+**Skills Resolution**: When delegating, load `SKILLS.md` on-demand for fitness calculation and dynamic discovery (hard/focus variants enable find-skills).
+
 ---
 
 ## 🔀 TIERED EXECUTION
@@ -66,7 +68,7 @@ When the logical plan would have **> 3 phases** or **estimated effort > 3 days**
 
 ## ⛔ 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). Format: rules/EXECUTION-PROTOCOL.md § Phase output structure.
+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). Format: rules/PHASES.md § Phase output structure.
 
 ---
 

package/commands/plan.md

@@ -17,9 +17,9 @@ execution-mode: router
 
 **LOAD now** (in order; path `./rules/` or `~/.{TOOL}/skills/agent-assistant/rules/`):
 
-1. ORCHESTRATION-LAWS.md
-2. ADAPTIVE-EXECUTION.md
-3. EXECUTION-PROTOCOL.md
+1. CORE.md — Identity, Laws, Routing
+2. PHASES.md — Phase Execution
+3. AGENTS.md — Tiered Execution
 
 **⛔ 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 (e.g. plan/hard.md), and execute it.