takt 0.2.3 → 0.3.2

package/resources/global/en/workflows/expert-cqrs.yaml

@@ -1,14 +1,14 @@
-# Expert Review Workflow
+# Expert CQRS Review Workflow
 # Review workflow with CQRS+ES, Frontend, Security, and QA experts
 #
 # Flow:
-# plan -> implement -> cqrs_es_review -> frontend_review -> ai_review -> security_review -> qa_review -> supervise -> COMPLETE
-#                          ↓                  ↓                 ↓              ↓                ↓            ↓
-#                     fix_cqrs_es       fix_frontend        ai_fix       fix_security       fix_qa    fix_supervisor
+# plan -> implement -> ai_review -> cqrs_es_review -> frontend_review -> security_review -> qa_review -> supervise -> COMPLETE
+#                          ↓            ↓                  ↓                  ↓                ↓            ↓
+#                        ai_fix    fix_cqrs_es       fix_frontend        fix_security       fix_qa    fix_supervisor
 #
 # Fix destination is determined by Coder based on change impact:
-# - fix_security: MINOR→security_review, MAJOR→cqrs_es_review
-# - fix_qa: MINOR→qa_review, SECURITY→security_review, MAJOR→cqrs_es_review
+# - fix_security: MINOR->security_review, MAJOR->cqrs_es_review
+# - fix_qa: MINOR->qa_review, SECURITY->security_review, MAJOR->cqrs_es_review
 #
 # Template Variables:
 #   {iteration}      - Workflow-wide turn count (total steps executed across all agents)
@@ -16,14 +16,13 @@
 #   {step_iteration} - Per-step iteration count (how many times THIS step has been executed)
 #   {task}           - Original user request
 #   {previous_response} - Output from the previous step
-#   {git_diff}       - Current uncommitted changes (git diff)
 #   {user_inputs}    - Accumulated user inputs during workflow
 #   {report_dir}     - Report directory name (e.g., "20250126-143052-task-summary")
 
 name: expert-cqrs
 description: CQRS+ES, Frontend, Security, QA Expert Review
 
-max_iterations: 20
+max_iterations: 30
 
 initial_step: plan
 
@@ -32,7 +31,31 @@ steps:
   # Phase 0: Planning
   # ===========================================
   - name: plan
-    agent: ~/.takt/agents/default/planner.md
+    edit: false
+    agent: ../agents/default/planner.md
+    report:
+      name: 00-plan.md
+      format: |
+        ```markdown
+        # Task Plan
+
+        ## Original Request
+        {User's request as-is}
+
+        ## Analysis Results
+
+        ### Objective
+        {What needs to be achieved}
+
+        ### Scope
+        {Impact scope}
+
+        ### Implementation Approach
+        {How to proceed}
+
+        ## Clarifications Needed (if any)
+        - {Unclear points or items requiring confirmation}
+        ```
     allowed_tools:
       - Read
       - Glob
@@ -41,30 +64,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Analysis complete | `[PLANNER:DONE]` |
-      | Requirements unclear | `[PLANNER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: plan (Task Analysis)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/00-plan.md
-
-      ## User Request
-      {task}
-
       ## Previous Response (when returned from implement)
       {previous_response}
 
-      ## Instructions
       Analyze the task and create an implementation plan.
 
       **Note:** If returned from implement step (Previous Response exists),
@@ -74,47 +77,22 @@ steps:
       1. Understand the requirements
       2. Identify impact scope
       3. Decide implementation approach
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # Task Plan
-
-      ## Original Request
-      {User's request as-is}
-
-      ## Analysis Results
-
-      ### Objective
-      {What needs to be achieved}
-
-      ### Scope
-      {Impact scope}
-
-      ### Implementation Approach
-      {How to proceed}
-
-      ## Clarifications Needed (if any)
-      - {Unclear points or items requiring confirmation}
-      ```
-
-      Output [PLANNER:DONE] when complete.
-      Output [PLANNER:BLOCKED] if requirements are unclear.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: implement
-      - condition: blocked
-        next_step: ABORT
+    rules:
+      - condition: Task analysis and planning is complete
+        next: implement
+      - condition: Requirements are unclear and planning cannot proceed
+        next: ABORT
 
   # ===========================================
   # Phase 1: Implementation
   # ===========================================
   - name: implement
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
+    report:
+      - Scope: 01-coder-scope.md
+      - Decisions: 02-coder-decisions.md
     allowed_tools:
       - Read
       - Glob
@@ -124,39 +102,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Implementation complete | `[CODER:DONE]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: implement
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report Files:
-        - Scope: .takt/reports/{report_dir}/01-coder-scope.md
-        - Decisions: .takt/reports/{report_dir}/02-coder-decisions.md
-
-      ## User Request
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       Follow the plan from the plan step and implement.
       Refer to the plan report (00-plan.md) and proceed with implementation.
 
-      **Report output:** Output to the `Report Files` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
       **Scope report format (create at implementation start):**
       ```markdown
       # Change Scope Declaration
@@ -186,20 +135,46 @@ steps:
       - **Options Considered**: {List of options}
       - **Reason**: {Why this option was chosen}
       ```
-
-      Include [CODER:DONE] when complete.
-      Include [CODER:BLOCKED] if you cannot proceed (returns to plan).
-    transitions:
-      - condition: done
-        next_step: cqrs_es_review
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: Implementation is complete
+        next: ai_review
+      - condition: Cannot proceed with implementation
+        next: plan
 
   # ===========================================
-  # Phase 2: CQRS+ES Review
+  # Phase 2: AI Review
   # ===========================================
-  - name: cqrs_es_review
-    agent: ~/.takt/agents/expert-cqrs/cqrs-es-reviewer.md
+  - name: ai_review
+    edit: false
+    agent: ../agents/default/ai-antipattern-reviewer.md
+    report:
+      name: 03-ai-review.md
+      format: |
+        ```markdown
+        # AI-Generated Code Review
+
+        ## Result: APPROVE / REJECT
+
+        ## Summary
+        {One sentence summarizing result}
+
+        ## Verified Items
+        | Aspect | Result | Notes |
+        |--------|--------|-------|
+        | Assumption validity | ✅ | - |
+        | API/Library existence | ✅ | - |
+        | Context fit | ✅ | - |
+        | Scope | ✅ | - |
+
+        ## Issues (if REJECT)
+        | # | Category | Location | Issue |
+        |---|----------|----------|-------|
+        | 1 | Hallucinated API | `src/file.ts:23` | Non-existent method |
+        ```
+
+        **Cognitive load reduction rules:**
+        - No issues → Summary 1 line + check table only (10 lines or less)
+        - Issues found → + Issues in table format (25 lines or less)
     allowed_tools:
       - Read
       - Glob
@@ -207,32 +182,86 @@ steps:
       - Write
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
+    instruction_template: |
+      Review the code for AI-specific issues:
+      - Assumption validation
+      - Plausible but wrong patterns
+      - Context fit with existing codebase
+      - Scope creep detection
+    rules:
+      - condition: No AI-specific issues found
+        next: cqrs_es_review
+      - condition: AI-specific issues detected
+        next: ai_fix
 
+  - name: ai_fix
+    edit: true
+    agent: ../agents/default/coder.md
+    allowed_tools:
+      - Read
+      - Glob
+      - Grep
+      - Edit
+      - Write
+      - Bash
+      - WebSearch
+      - WebFetch
+    instruction_template: |
+      ## AI Review Feedback (This is the latest instruction - prioritize this)
+      {previous_response}
 
-      ## Output Format
+      **Important**: Address the AI Reviewer's feedback.
+      Focus on:
+      - Correcting incorrect assumptions
+      - Fixing plausible-but-wrong implementations
+      - Aligning with existing codebase patterns
+      - Removing scope creep
+    pass_previous_response: true
+    rules:
+      - condition: AI Reviewer's issues have been fixed
+        next: ai_review
+      - condition: Unable to proceed with fixes
+        next: plan
 
-      | Situation | Tag |
-      |-----------|-----|
-      | Design is sound | `[CQRS-ES:APPROVE]` |
-      | Design issues found | `[CQRS-ES:REJECT]` |
+  # ===========================================
+  # Phase 3: CQRS+ES Review
+  # ===========================================
+  - name: cqrs_es_review
+    edit: false
+    agent: ../agents/expert-cqrs/cqrs-es-reviewer.md
+    report:
+      name: 04-cqrs-es-review.md
+      format: |
+        ```markdown
+        # CQRS+ES Review
+
+        ## Result: APPROVE / REJECT
+
+        ## Summary
+        {1-2 sentences summarizing result}
+
+        ## Reviewed Perspectives
+        | Perspective | Result | Notes |
+        |-------------|--------|-------|
+        | Aggregate Design | ✅ | - |
+        | Event Design | ✅ | - |
+        | Command/Query Separation | ✅ | - |
+        | Projections | ✅ | - |
+        | Eventual Consistency | ✅ | - |
+
+        ## Issues (if REJECT)
+        | # | Location | Issue | Fix |
+        |---|----------|-------|-----|
+        | 1 | `src/file.ts:42` | Issue description | Fix method |
+        ```
+    allowed_tools:
+      - Read
+      - Glob
+      - Grep
+      - Write
+      - WebSearch
+      - WebFetch
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: cqrs_es_review (CQRS+ES Expert Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/03-cqrs-es-review.md
-
-      ## Original User Request
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
-      ## Instructions
       Review the changes above from the CQRS (Command Query Responsibility Segregation)
       and Event Sourcing perspective.
 
@@ -245,46 +274,15 @@ steps:
 
       **Note**: If this project does not use CQRS+ES patterns,
       review from a general domain design perspective.
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # CQRS+ES Review
-
-      ## Result: APPROVE / REJECT
-
-      ## Summary
-      {1-2 sentences summarizing result}
-
-      ## Reviewed Perspectives
-      | Perspective | Result | Notes |
-      |-------------|--------|-------|
-      | Aggregate Design | ✅ | - |
-      | Event Design | ✅ | - |
-      | Command/Query Separation | ✅ | - |
-      | Projections | ✅ | - |
-      | Eventual Consistency | ✅ | - |
-
-      ## Issues (if REJECT)
-      | # | Location | Issue | Fix |
-      |---|----------|-------|-----|
-      | 1 | `src/file.ts:42` | Issue description | Fix method |
-      ```
-
-      Include:
-      - [CQRS-ES:APPROVE] if CQRS+ES design is sound
-      - [CQRS-ES:REJECT] if design issues found (list specific issues)
-    transitions:
-      - condition: approved
-        next_step: frontend_review
-      - condition: rejected
-        next_step: fix_cqrs_es
+    rules:
+      - condition: CQRS+ES design is sound with no issues
+        next: frontend_review
+      - condition: CQRS+ES design issues found
+        next: fix_cqrs_es
 
   - name: fix_cqrs_es
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
     allowed_tools:
       - Read
       - Glob
@@ -294,31 +292,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Fix complete | `[CODER:DONE]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: fix_cqrs_es
-
       ## CQRS+ES Review Feedback (This is the latest instruction - prioritize this)
       {previous_response}
 
-      ## Original User Request (Initial request - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       **Important**: Fix the issues pointed out by the CQRS+ES expert.
 
       Areas of concern:
@@ -327,21 +304,44 @@ steps:
       - Command/Query separation
       - Projections
       - Eventual consistency
-
-      Include [CODER:DONE] when complete.
-      Include [CODER:BLOCKED] if unable to proceed.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: cqrs_es_review
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: CQRS+ES issues have been fixed
+        next: cqrs_es_review
+      - condition: Unable to proceed with fixes
+        next: plan
 
   # ===========================================
-  # Phase 3: Frontend Review
+  # Phase 4: Frontend Review
   # ===========================================
   - name: frontend_review
-    agent: ~/.takt/agents/expert/frontend-reviewer.md
+    edit: false
+    agent: ../agents/expert/frontend-reviewer.md
+    report:
+      name: 05-frontend-review.md
+      format: |
+        ```markdown
+        # Frontend Review
+
+        ## Result: APPROVE / REJECT
+
+        ## Summary
+        {1-2 sentences summarizing result}
+
+        ## Reviewed Perspectives
+        | Perspective | Result | Notes |
+        |-------------|--------|-------|
+        | Component Design | ✅ | - |
+        | State Management | ✅ | - |
+        | Performance | ✅ | - |
+        | Accessibility | ✅ | - |
+        | Type Safety | ✅ | - |
+
+        ## Issues (if REJECT)
+        | # | Location | Issue | Fix |
+        |---|----------|-------|-----|
+        | 1 | `src/file.tsx:42` | Issue description | Fix method |
+        ```
     allowed_tools:
       - Read
       - Glob
@@ -349,32 +349,7 @@ steps:
       - Write
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Frontend design is sound | `[FRONTEND:APPROVE]` |
-      | Design issues found | `[FRONTEND:REJECT]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: frontend_review (Frontend Expert Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/04-frontend-review.md
-
-      ## Original User Request
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
-      ## Instructions
       Review the changes above from the frontend development perspective.
 
       **Review Criteria:**
@@ -386,47 +361,16 @@ steps:
       - TypeScript type safety
 
       **Note**: If this project does not include frontend code,
-      output [FRONTEND:APPROVE] and proceed.
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # Frontend Review
-
-      ## Result: APPROVE / REJECT
-
-      ## Summary
-      {1-2 sentences summarizing result}
-
-      ## Reviewed Perspectives
-      | Perspective | Result | Notes |
-      |-------------|--------|-------|
-      | Component Design | ✅ | - |
-      | State Management | ✅ | - |
-      | Performance | ✅ | - |
-      | Accessibility | ✅ | - |
-      | Type Safety | ✅ | - |
-
-      ## Issues (if REJECT)
-      | # | Location | Issue | Fix |
-      |---|----------|-------|-----|
-      | 1 | `src/file.tsx:42` | Issue description | Fix method |
-      ```
-
-      Include:
-      - [FRONTEND:APPROVE] if frontend design is sound
-      - [FRONTEND:REJECT] if design issues found (list specific issues)
-    transitions:
-      - condition: approved
-        next_step: ai_review
-      - condition: rejected
-        next_step: fix_frontend
+      approve and proceed to the next step.
+    rules:
+      - condition: Frontend design is sound with no issues
+        next: security_review
+      - condition: Frontend design issues found
+        next: fix_frontend
 
   - name: fix_frontend
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
     allowed_tools:
       - Read
       - Glob
@@ -436,31 +380,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Fix complete | `[CODER:DONE]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: fix_frontend
-
       ## Frontend Review Feedback (This is the latest instruction - prioritize this)
       {previous_response}
 
-      ## Original User Request (Initial request - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       **Important**: Fix the issues pointed out by the frontend expert.
 
       Areas of concern:
@@ -469,157 +392,45 @@ steps:
       - Performance
       - Accessibility
       - Type safety
-
-      Include [CODER:DONE] when complete.
-      Include [CODER:BLOCKED] if unable to proceed.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: frontend_review
-      - condition: blocked
-        next_step: plan
-
-  # ===========================================
-  # Phase 4: AI Review
-  # ===========================================
-  - name: ai_review
-    agent: ~/.takt/agents/default/ai-antipattern-reviewer.md
-    allowed_tools:
-      - Read
-      - Glob
-      - Grep
-      - Write
-      - WebSearch
-      - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | No AI-specific issues | `[AI_REVIEW:APPROVE]` |
-      | Issues found | `[AI_REVIEW:REJECT]` |
-    instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: ai_review (AI-Generated Code Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/05-ai-review.md
-
-      ## Original User Request (Initial request from workflow start)
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
-      ## Instructions
-      Review the code for AI-specific issues:
-      - Assumption validation
-      - Plausible but wrong patterns
-      - Context fit with existing codebase
-      - Scope creep detection
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # AI-Generated Code Review
-
-      ## Result: APPROVE / REJECT
-
-      ## Summary
-      {One sentence summarizing result}
-
-      ## Verified Items
-      | Aspect | Result | Notes |
-      |--------|--------|-------|
-      | Assumption validity | ✅ | - |
-      | API/Library existence | ✅ | - |
-      | Context fit | ✅ | - |
-      | Scope | ✅ | - |
-
-      ## Issues (if REJECT)
-      | # | Category | Location | Issue |
-      |---|----------|----------|-------|
-      | 1 | Hallucinated API | `src/file.ts:23` | Non-existent method |
-      ```
-
-      **Cognitive load reduction rules:**
-      - No issues → Summary 1 line + check table only (10 lines or less)
-      - Issues found → + Issues in table format (25 lines or less)
-
-      Include:
-      - [AI_REVIEW:APPROVE] if no AI-specific issues found
-      - [AI_REVIEW:REJECT] if issues detected (list specific problems)
-    transitions:
-      - condition: approved
-        next_step: security_review
-      - condition: rejected
-        next_step: ai_fix
-
-  - name: ai_fix
-    agent: ~/.takt/agents/default/coder.md
-    allowed_tools:
-      - Read
-      - Glob
-      - Grep
-      - Edit
-      - Write
-      - Bash
-      - WebSearch
-      - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Fix complete | `[CODER:DONE]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
-    instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: ai_fix
-
-      ## AI Review Feedback (This is the latest instruction - prioritize this)
-      {previous_response}
-
-      ## Original User Request (Initial request from workflow start - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
-      **Important**: Address the AI Reviewer's feedback.
-      Focus on:
-      - Correcting incorrect assumptions
-      - Fixing plausible-but-wrong implementations
-      - Aligning with existing codebase patterns
-      - Removing scope creep
-
-      Include [CODER:DONE] when complete.
-      Include [CODER:BLOCKED] if unable to proceed.
-    pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: ai_review
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: Frontend issues have been fixed
+        next: frontend_review
+      - condition: Unable to proceed with fixes
+        next: plan
 
   # ===========================================
   # Phase 5: Security Review
   # ===========================================
   - name: security_review
-    agent: ~/.takt/agents/expert/security-reviewer.md
+    edit: false
+    agent: ../agents/expert/security-reviewer.md
+    report:
+      name: 06-security-review.md
+      format: |
+        ```markdown
+        # Security Review
+
+        ## Result: APPROVE / REJECT
+
+        ## Severity: None / Low / Medium / High / Critical
+
+        ## Check Results
+        | Category | Result | Notes |
+        |----------|--------|-------|
+        | Injection | ✅ | - |
+        | Auth/Authz | ✅ | - |
+        | Data Protection | ✅ | - |
+        | Dependencies | ✅ | - |
+
+        ## Vulnerabilities (if REJECT)
+        | # | Severity | Type | Location | Fix |
+        |---|----------|------|----------|-----|
+        | 1 | High | SQLi | `src/db.ts:42` | Use parameterized query |
+
+        ## Warnings (non-blocking)
+        - {Security recommendations}
+        ```
     allowed_tools:
       - Read
       - Glob
@@ -627,32 +438,7 @@ steps:
       - Write
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | No security issues | `[SECURITY:APPROVE]` |
-      | Vulnerabilities found | `[SECURITY:REJECT]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: security_review (Security Expert Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/06-security-review.md
-
-      ## Original User Request
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
-      ## Instructions
       Review the changes above from the security perspective.
 
       **Review Criteria:**
@@ -661,47 +447,15 @@ steps:
       - Sensitive information handling
       - Encryption appropriateness
       - OWASP Top 10
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # Security Review
-
-      ## Result: APPROVE / REJECT
-
-      ## Severity: None / Low / Medium / High / Critical
-
-      ## Check Results
-      | Category | Result | Notes |
-      |----------|--------|-------|
-      | Injection | ✅ | - |
-      | Auth/Authz | ✅ | - |
-      | Data Protection | ✅ | - |
-      | Dependencies | ✅ | - |
-
-      ## Vulnerabilities (if REJECT)
-      | # | Severity | Type | Location | Fix |
-      |---|----------|------|----------|-----|
-      | 1 | High | SQLi | `src/db.ts:42` | Use parameterized query |
-
-      ## Warnings (non-blocking)
-      - {Security recommendations}
-      ```
-
-      Include:
-      - [SECURITY:APPROVE] if no security issues found
-      - [SECURITY:REJECT] if vulnerabilities found (list specific issues with severity)
-    transitions:
-      - condition: approved
-        next_step: qa_review
-      - condition: rejected
-        next_step: fix_security
+    rules:
+      - condition: No security issues found
+        next: qa_review
+      - condition: Security vulnerabilities detected
+        next: fix_security
 
   - name: fix_security
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
     allowed_tools:
       - Read
       - Glob
@@ -711,32 +465,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Minor fix complete | `[CODER:DONE]` |
-      | Major fix (restart from CQRS+ES) | `[CODER:REJECT]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: fix_security
-
       ## Security Review Feedback (This is the latest instruction - prioritize this)
       {previous_response}
 
-      ## Original User Request (Initial request - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       **Important**: Fix the issues pointed out by the security expert.
       Security issues should be addressed with highest priority.
 
@@ -747,28 +479,52 @@ steps:
       - Encryption issues
 
       ## Completion: Determine Change Impact
-      When fix is complete, judge the **impact scope of changes** and output the appropriate tag:
+      When fix is complete, judge the **impact scope of changes**:
 
-      - `[CODER:DONE]` - Minor fix (re-run security review only)
+      - Minor fix (re-run security review only)
         - Examples: Add validation, add escaping, configuration changes
-      - `[CODER:REJECT]` - Major fix (restart from CQRS+ES review)
+      - Major fix (restart from CQRS+ES review)
         - Examples: Data flow changes, API design changes, auth method changes, domain model changes
-
-      Include [CODER:BLOCKED] if unable to proceed.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: security_review
-      - condition: rejected
-        next_step: cqrs_es_review
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: Minor security fix is complete
+        next: security_review
+      - condition: Major fix applied requiring CQRS+ES re-review
+        next: cqrs_es_review
+      - condition: Unable to proceed with fixes
+        next: plan
 
   # ===========================================
   # Phase 6: QA Review
   # ===========================================
   - name: qa_review
-    agent: ~/.takt/agents/expert/qa-reviewer.md
+    edit: false
+    agent: ../agents/expert/qa-reviewer.md
+    report:
+      name: 07-qa-review.md
+      format: |
+        ```markdown
+        # QA Review
+
+        ## Result: APPROVE / REJECT
+
+        ## Summary
+        {1-2 sentences summarizing result}
+
+        ## Reviewed Perspectives
+        | Perspective | Result | Notes |
+        |-------------|--------|-------|
+        | Test Coverage | ✅ | - |
+        | Test Quality | ✅ | - |
+        | Error Handling | ✅ | - |
+        | Documentation | ✅ | - |
+        | Maintainability | ✅ | - |
+
+        ## Issues (if REJECT)
+        | # | Category | Issue | Fix |
+        |---|----------|-------|-----|
+        | 1 | Testing | Issue description | Fix method |
+        ```
     allowed_tools:
       - Read
       - Glob
@@ -776,32 +532,7 @@ steps:
       - Write
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Quality standards met | `[QA:APPROVE]` |
-      | Quality issues found | `[QA:REJECT]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: qa_review (QA Expert Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report File: .takt/reports/{report_dir}/07-qa-review.md
-
-      ## Original User Request
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
-      ## Instructions
       Review the changes above from the quality assurance perspective.
 
       **Review Criteria:**
@@ -811,46 +542,15 @@ steps:
       - Error handling
       - Logging and monitoring
       - Maintainability
-
-      **Report output:** Output to the `Report File` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
-      **Report format:**
-      ```markdown
-      # QA Review
-
-      ## Result: APPROVE / REJECT
-
-      ## Summary
-      {1-2 sentences summarizing result}
-
-      ## Reviewed Perspectives
-      | Perspective | Result | Notes |
-      |-------------|--------|-------|
-      | Test Coverage | ✅ | - |
-      | Test Quality | ✅ | - |
-      | Error Handling | ✅ | - |
-      | Documentation | ✅ | - |
-      | Maintainability | ✅ | - |
-
-      ## Issues (if REJECT)
-      | # | Category | Issue | Fix |
-      |---|----------|-------|-----|
-      | 1 | Testing | Issue description | Fix method |
-      ```
-
-      Include:
-      - [QA:APPROVE] if quality standards are met
-      - [QA:REJECT] if quality issues found (list specific issues)
-    transitions:
-      - condition: approved
-        next_step: supervise
-      - condition: rejected
-        next_step: fix_qa
+    rules:
+      - condition: Quality standards are met
+        next: supervise
+      - condition: Quality issues found
+        next: fix_qa
 
   - name: fix_qa
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
     allowed_tools:
       - Read
       - Glob
@@ -860,33 +560,10 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Minor fix complete | `[CODER:DONE]` |
-      | Security-impacting fix | `[CODER:IMPROVE]` |
-      | Major fix (restart from CQRS+ES) | `[CODER:REJECT]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: fix_qa
-
       ## QA Review Feedback (This is the latest instruction - prioritize this)
       {previous_response}
 
-      ## Original User Request (Initial request - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       **Important**: Fix the issues pointed out by the QA expert.
 
       Areas of concern:
@@ -897,32 +574,34 @@ steps:
       - Code quality
 
       ## Completion: Determine Change Impact
-      When fix is complete, judge the **impact scope of changes** and output the appropriate tag:
+      When fix is complete, judge the **impact scope of changes**:
 
-      - `[CODER:DONE]` - Minor fix (re-run QA review only)
+      - Minor fix (re-run QA review only)
         - Examples: Add tests, add documentation, add logs, add comments
-      - `[CODER:IMPROVE]` - Security-impacting fix (restart from security review)
+      - Security-impacting fix (restart from security review)
         - Examples: Error handling changes (error message content changes), input validation changes
-      - `[CODER:REJECT]` - Major fix (restart from CQRS+ES review)
+      - Major fix (restart from CQRS+ES review)
         - Examples: Business logic changes, data model changes, API changes
-
-      Include [CODER:BLOCKED] if unable to proceed.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: qa_review
-      - condition: improve
-        next_step: security_review
-      - condition: rejected
-        next_step: cqrs_es_review
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: Minor QA fix is complete
+        next: qa_review
+      - condition: Security-impacting fix applied
+        next: security_review
+      - condition: Major fix applied requiring CQRS+ES re-review
+        next: cqrs_es_review
+      - condition: Unable to proceed with fixes
+        next: plan
 
   # ===========================================
   # Phase 7: Supervision
   # ===========================================
   - name: supervise
-    agent: ~/.takt/agents/expert/supervisor.md
+    edit: false
+    agent: ../agents/expert/supervisor.md
+    report:
+      - Validation: 08-supervisor-validation.md
+      - Summary: summary.md
     allowed_tools:
       - Read
       - Glob
@@ -930,42 +609,15 @@ steps:
       - Write
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Ready to merge | `[SUPERVISOR:APPROVE]` |
-      | Issues found | `[SUPERVISOR:REJECT]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: supervise (Final Review)
-      - Report Directory: .takt/reports/{report_dir}/
-      - Report Files:
-        - Validation: .takt/reports/{report_dir}/08-supervisor-validation.md
-        - Summary: .takt/reports/{report_dir}/summary.md
-
-      ## Original User Request
-      {task}
-
-      ## Git Diff
-      ```diff
-      {git_diff}
-      ```
-
       ## Previous Reviews Summary
       Reaching this step means all the following reviews have been APPROVED:
+      - AI Review: APPROVED
       - CQRS+ES Review: APPROVED
       - Frontend Review: APPROVED
-      - AI Review: APPROVED
       - Security Review: APPROVED
       - QA Review: APPROVED
 
-      ## Instructions
       Run tests, verify the build, and perform final approval.
 
       **Workflow Overall Review:**
@@ -976,10 +628,6 @@ steps:
       **Review Reports:** Read all reports in Report Directory and
       check for any unaddressed improvement suggestions.
 
-      **Report output:** Output to the `Report Files` specified above.
-      - If file does not exist: Create new file
-      - If file exists: Append with `## Iteration {step_iteration}` section
-
       **Validation report format:**
       ```markdown
       # Final Validation Results
@@ -1022,9 +670,9 @@ steps:
       ## Review Results
       | Review | Result |
       |--------|--------|
+      | AI Review | ✅ APPROVE |
       | CQRS+ES | ✅ APPROVE |
       | Frontend | ✅ APPROVE |
-      | AI Review | ✅ APPROVE |
       | Security | ✅ APPROVE |
       | QA | ✅ APPROVE |
       | Supervisor | ✅ APPROVE |
@@ -1035,18 +683,15 @@ steps:
       npm run build
       ```
       ```
-
-      Output:
-      - [SUPERVISOR:APPROVE] if ready to merge
-      - [SUPERVISOR:REJECT] if issues found (specify the issues)
-    transitions:
-      - condition: approved
-        next_step: COMPLETE
-      - condition: rejected
-        next_step: fix_supervisor
+    rules:
+      - condition: All validations pass and ready to merge
+        next: COMPLETE
+      - condition: Issues detected during final review
+        next: fix_supervisor
 
   - name: fix_supervisor
-    agent: ~/.takt/agents/default/coder.md
+    edit: true
+    agent: ../agents/default/coder.md
     allowed_tools:
       - Read
       - Glob
@@ -1056,41 +701,17 @@ steps:
       - Bash
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Fix complete | `[CODER:DONE]` |
-      | Cannot proceed | `[CODER:BLOCKED]` |
     instruction_template: |
-      ## Workflow Context
-      - Iteration: {iteration}/{max_iterations} (workflow-wide)
-      - Step Iteration: {step_iteration} (times this step has run)
-      - Step: fix_supervisor
-
       ## Supervisor Feedback (This is the latest instruction - prioritize this)
       {previous_response}
 
-      ## Original User Request (Initial request - for reference)
-      {task}
-
-      ## Additional User Inputs
-      {user_inputs}
-
-      ## Instructions
       **Important**: Fix the issues pointed out by the supervisor.
 
       The supervisor has identified issues from a big-picture perspective.
       Address items in priority order.
-
-      Include [CODER:DONE] when complete.
-      Include [CODER:BLOCKED] if unable to proceed.
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: supervise
-      - condition: blocked
-        next_step: plan
+    rules:
+      - condition: Supervisor's issues have been fixed
+        next: supervise
+      - condition: Unable to proceed with fixes
+        next: plan