aether-colony 3.1.17 → 5.1.0

package/.opencode/commands/ant/build.md

@@ -1,29 +1,20 @@
+<!-- Generated from .aether/commands/build.yaml - DO NOT EDIT DIRECTLY -->
 ---
 name: ant:build
 description: "🔨🐜🏗️🐜🔨 Build a phase with pure emergence - colony self-organizes and completes tasks"
 ---
 
-You are the **Queen**. You DIRECTLY spawn multiple workers — do not delegate to a single Prime Worker.
-
-The phase to build is: `$ARGUMENTS`
-
-## Instructions
-
-### Step 0: Version Check (Non-blocking)
-
-Run using the Bash tool: `bash .aether/aether-utils.sh version-check 2>/dev/null || true`
+### Step -1: Normalize Arguments
 
-If the command succeeds and the JSON result contains a non-empty string, display it as a one-line notice. Proceed regardless of outcome.
+Run: `normalized_args=$(bash .aether/aether-utils.sh normalize-args "$@")`
 
-### Step 0.6: Verify LiteLLM Proxy
+This ensures arguments work correctly in both Claude Code and OpenCode. Use `$normalized_args` throughout this command.
 
-Check that the LiteLLM proxy is running for model routing:
+You are the **Queen**. You DIRECTLY spawn multiple workers — do not delegate to a single Prime Worker.
 
-```bash
-curl -s http://localhost:4000/health | grep -q "healthy" && echo "Proxy healthy" || echo "Proxy not running - workers will use default model"
-```
+The phase to build is: `$normalized_args`
 
-If proxy is not healthy, log a warning but continue (workers will fall back to default routing).
+## Instructions
 
 ### Step 0.5: Load Colony State
 
@@ -49,41 +40,40 @@ After displaying context, run: `bash .aether/aether-utils.sh unload-state` to re
 
 ### Step 1: Validate + Read State
 
-**Parse $ARGUMENTS:**
+**Parse $normalized_args:**
 1. Extract the phase number (first argument)
 2. Check remaining arguments for flags:
    - If contains `--verbose` or `-v`: set `verbose_mode = true`
    - If contains `--no-visual`: set `visual_mode = false` (visual is ON by default)
-   - If contains `--model <name>` or `-m <name>`: set `cli_model_override = <name>`
+   - If contains `--depth <level>`: set `cli_depth_override = <level>`
    - Otherwise: set `visual_mode = true` (visual is default)
 
 If the phase number is empty or not a number:
 
 ```
-Usage: /ant:build <phase_number> [--verbose|-v] [--no-visual] [--model <model>|-m <model>]
+Usage: /ant:build <phase_number> [--verbose|-v] [--no-visual] [--depth <level>]
 
 Options:
   --verbose, -v       Show full completion details (spawn tree, TDD, patterns)
   --no-visual         Disable real-time visual display (visual is on by default)
-  --model, -m <name>  Override model for this build (one-time)
+  --depth <level>     Set colony depth for this build (light|standard|deep|full)
 
 Examples:
   /ant:build 1              Build Phase 1 (with visual display)
   /ant:build 1 --verbose    Build Phase 1 (full details + visual)
   /ant:build 1 --no-visual  Build Phase 1 without visual display
-  /ant:build 1 --model glm-5    Build Phase 1 with glm-5 for all workers
+  /ant:build 1 --depth deep Build Phase 1 with thorough investigation
 ```
 
 Stop here.
 
-**Validate CLI model override (if provided):**
-If `cli_model_override` is set:
-1. Validate the model: `bash .aether/aether-utils.sh model-profile validate "$cli_model_override"`
-2. Parse JSON result - if `.result.valid` is false:
-   - Display: `Error: Invalid model "$cli_model_override"`
-   - Display: `Valid models: {list from .result.models}`
+**Set colony depth (if --depth flag provided):**
+If `cli_depth_override` is set:
+1. Run using Bash tool: `bash .aether/aether-utils.sh colony-depth set "$cli_depth_override"`
+2. Parse JSON result - if `.ok` is false:
+   - Display: `Error: Invalid depth "$cli_depth_override". Use: light, standard, deep, full`
    - Stop here
-3. If valid: Display `Using override model: {model}`
+3. If valid: Display `Colony depth: {level}`
 
 **Auto-upgrade old state:**
 If `version` field is missing, "1.0", or "2.0":
@@ -152,8 +142,8 @@ git rev-parse --git-dir 2>/dev/null
 ```
 
 - **If succeeds** (is a git repo):
-  1. Check for changes in Aether-managed directories only: `.aether .claude/commands/ant .claude/commands/st .opencode runtime bin`
-  2. **If changes exist**: `git stash push -m "aether-checkpoint: pre-phase-$PHASE_NUMBER" -- .aether .claude/commands/ant .claude/commands/st .opencode runtime bin`
+  1. Check for changes in Aether-managed directories only: `.aether .claude/commands/ant .claude/commands/st .opencode bin`
+  2. **If changes exist**: `git stash push -m "aether-checkpoint: pre-phase-$PHASE_NUMBER" -- .aether .claude/commands/ant .claude/commands/st .opencode bin`
      - IMPORTANT: Never use `--include-untracked` — it stashes ALL files including user work!
      - Verify: `git stash list | head -1 | grep "aether-checkpoint"` — warn if empty
      - Store checkpoint as `{type: "stash", ref: "aether-checkpoint: pre-phase-$PHASE_NUMBER"}`
@@ -175,6 +165,14 @@ Output header:
 🔄 Rollback: `git stash pop` (stash) or `git reset --hard {ref}` (commit)
 ```
 
+Run using the Bash tool with description "Showing phase progress...":
+```bash
+progress_bar=$(bash .aether/aether-utils.sh generate-progress-bar "$current_phase" "$total_phases" 20 2>/dev/null || echo "")
+if [[ -n "$progress_bar" ]]; then
+  echo "[Phase ${current_phase}/${total_phases}] ${progress_bar}"
+fi
+```
+
 ### Step 4: Load Constraints
 
 Read `.aether/data/constraints.json` if it exists.
@@ -222,8 +220,7 @@ bash .aether/aether-utils.sh survey-load "{phase_name}" 2>/dev/null
 
 **Display summary:**
 ```
-🗺️ SURVEY LOADED
-================
+━━━ 🗺️🐜 S U R V E Y   L O A D E D ━━━
 {for each doc loaded}
   {emoji} {filename} — {brief description}
 {/for}
@@ -261,8 +258,7 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
 
 **Display summary (if any wisdom exists):**
 ```
-📜 QUEEN WISDOM LOADED
-=====================
+━━━ 📜🐜 Q U E E N   W I S D O M ━━━
 {if queen_philosophies:}  📜 Philosophies: yes{/if}
 {if queen_patterns:}  🧭 Patterns: yes{/if}
 {if queen_redirects:}  ⚠️ Redirects: yes{/if}
@@ -274,6 +270,47 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
 
 **Graceful handling:** If QUEEN.md doesn't exist or `queen-read` fails, continue without wisdom injection. Workers will receive standard prompts.
 
+### Step 4.1.6: Load Active Pheromones (Signal Consumption)
+
+Call `pheromone-read` to extract active colony signals for worker priming:
+
+```bash
+bash .aether/aether-utils.sh pheromone-read 2>/dev/null
+```
+
+**Parse the JSON response:**
+- If `.ok` is false or command fails: Set `pheromone_section = null` and skip pheromone injection
+- If successful: Extract signals from `.result.signals`
+
+**Active Signals Section Template (injected into builder prompts):**
+```
+--- ACTIVE SIGNALS (Pheromone Consumption) ---
+{focus_section if .result.signals.focus exists:}
+  🎯 FOCUS: {focus_description}
+{redirect_section if .result.signals.redirect exists:}
+  ⚠️ AVOID: {redirect_description}
+{feedback_section if .result.signals.feedback exists:}
+  💬 FEEDBACK: {feedback_description}
+--- END SIGNALS ---
+```
+
+**Store for builder injection:**
+- `pheromone_section` — formatted signal section for builder prompts
+
+**Display summary (if any signals exist):**
+```
+━━━ 🦠🐜 P H E R O M O N E S   D E T E C T E D ━━━
+{focus_present:}  🎯 Focus signal: yes{/if}
+{redirect_present:}  ⚠️ Redirect signal: yes{/if}
+{feedback_present:}  💬 Feedback signal: yes{/if}
+
+{if none exist:}  (no active signals){/if}
+```
+
+**Graceful handling:** If pheromone-read fails or no signals exist, continue without pheromone injection.
+
+---
+
 ### Step 4.2: Archaeologist Pre-Build Scan
 
 **Conditional step — only fires when the phase modifies existing files.**
@@ -294,20 +331,18 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
    ```bash
    bash .aether/aether-utils.sh generate-ant-name "archaeologist"
    bash .aether/aether-utils.sh spawn-log "Queen" "scout" "{archaeologist_name}" "Pre-build archaeology scan"
-   bash .aether/aether-utils.sh swarm-display-update "{archaeologist_name}" "scout" "excavating" "Pre-build archaeology scan" "Queen" '{"read":0,"grep":0,"edit":0,"bash":0}' 0 "fungus_garden" 15
    ```
 
    Display:
    ```
-   🏺  Archaeologist {archaeologist_name} spawning
+   🏺🐜 Archaeologist {archaeologist_name} spawning
        Scanning history of files to be modified...
    ```
 
-   Spawn a Scout (using Task tool with `subagent_type="general-purpose"`) with this prompt:
-   # NOTE: Claude Code uses aether-archaeologist; OpenCode uses general-purpose with role injection
+   Spawn using Task tool with `subagent_type="aether-archaeologist"`, include `description: "🏺 Archaeologist {archaeologist_name}: Pre-build history scan"`:
 
    ```
-   You are {Archaeologist-Name}, a 🏺 Archaeologist Ant.
+   You are {Archaeologist-Name}, a 🏺🐜 Archaeologist Ant.
 
    Mission: Pre-build archaeology scan
 
@@ -332,10 +367,9 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
 
    **Wait for results** (blocking — use TaskOutput with `block: true`).
 
-   Log completion and update swarm display:
+   Log completion:
    ```bash
    bash .aether/aether-utils.sh spawn-complete "{archaeologist_name}" "completed" "Pre-build archaeology scan"
-   bash .aether/aether-utils.sh swarm-display-update "{archaeologist_name}" "scout" "completed" "Pre-build archaeology scan" "Queen" '{"read":8,"grep":5,"edit":0,"bash":2}' 100 "fungus_garden" 100
    ```
 
 3. **Store and display findings:**
@@ -344,8 +378,7 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
 
    Display summary:
    ```
-   🏺 ARCHAEOLOGY CONTEXT
-   =====================
+   ━━━ 🏺🐜 A R C H A E O L O G Y ━━━
    {summary of findings from archaeologist}
    ```
 
@@ -353,34 +386,22 @@ queen_decrees = .result.wisdom.decrees (if .result.priming.has_decrees)
    The `archaeology_context` will be injected into builder prompts in Step 5.1 (see below).
    If this step was skipped (no existing files modified), the archaeology section is omitted from builder prompts.
 
+---
+
 ### Step 5: Initialize Swarm Display and Analyze Tasks
 
 **YOU (the Queen) will spawn workers directly. Do NOT delegate to a single Prime Worker.**
 
-**Initialize visual swarm tracking:**
-```bash
-# Generate unique build ID
-build_id="build-$(date +%s)"
-
-# Initialize swarm display for this build
-bash .aether/aether-utils.sh swarm-display-init "$build_id"
-
-# Log phase start
-bash .aether/aether-utils.sh activity-log "EXECUTING" "Queen" "Phase {id}: {name} - Queen dispatching workers"
-
-# Display animated header
-bash .aether/aether-utils.sh swarm-display-update "Queen" "prime" "excavating" "Phase {id}: {name}" "Colony" '{"read":0,"grep":0,"edit":0,"bash":0}' 10 "fungus_garden" 0
+**Show build header:**
 ```
-
-**Show real-time display header:**
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Phase {id}: {name} — {N} waves, {M} tasks
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ```
-🔨  COLONY BUILD INITIATED
-═══════════════════════════════════════════════════
-Phase {id}: {name}
-Build ID: {build_id}
 
-Launching swarm display...
-```
+Where N = number of builder waves (excluding watcher/chaos) and M = total builder tasks.
+
+Record `build_started_at_epoch=$(date +%s)` — this epoch integer is used by the BUILD SUMMARY block in Step 7 to calculate elapsed time.
 
 Analyze the phase tasks:
 
@@ -392,10 +413,10 @@ Analyze the phase tasks:
    - **Wave 3+:** Continue until all tasks assigned
 
 2. **Assign castes:**
-   - Implementation tasks → 🔨 Builder
-   - Research/docs tasks → 🔍 Scout
-   - Testing/validation → 👁️ Watcher (ALWAYS spawn at least one)
-   - Resilience testing → 🎲 Chaos (ALWAYS spawn one after Watcher)
+   - Implementation tasks → 🔨🐜 Builder
+   - Research/docs tasks → 🔍🐜 Scout
+   - Testing/validation → 👁️🐜 Watcher (ALWAYS spawn at least one)
+   - Resilience testing → 🎲🐜 Chaos (ALWAYS spawn one after Watcher)
 
 3. **Generate ant names for each worker:**
 ```bash
@@ -406,47 +427,100 @@ bash .aether/aether-utils.sh generate-ant-name "chaos"
 
 Display spawn plan with caste emojis:
 ```
-🐜  SPAWN PLAN
+━━━ 🐜 S P A W N   P L A N ━━━
 
 Wave 1  — Parallel
-  🔨 {Builder-Name}  Task {id}  {description}
-  🔨 {Builder-Name}  Task {id}  {description}
+  🔨🐜 {Builder-Name}  Task {id}  {description}
+  🔨🐜 {Builder-Name}  Task {id}  {description}
 
 Wave 2  — After Wave 1
-  🔨 {Builder-Name}  Task {id}  {description}
+  🔨🐜 {Builder-Name}  Task {id}  {description}
 
 Verification
-  👁️ {Watcher-Name}  Verify all work independently
-  🎲 {Chaos-Name}   Resilience testing (after Watcher)
+  👁️🐜 {Watcher-Name}  Verify all work independently
+  🎲🐜 {Chaos-Name}   Resilience testing (after Watcher)
 
 Total: {N} Builders + 1 Watcher + 1 Chaos = {N+2} spawns
 ```
 
 **Caste Emoji Legend:**
-- 🔨 Builder  (cyan if color enabled)
-- 👁️ Watcher  (green if color enabled)
-- 🎲 Chaos    (red if color enabled)
-- 🔍 Scout    (yellow if color enabled)
-- 🏺 Archaeologist (magenta if color enabled)
+- 🔨🐜 Builder  (cyan if color enabled)
+- 👁️🐜 Watcher  (green if color enabled)
+- 🎲🐜 Chaos    (red if color enabled)
+- 🔍🐜 Scout    (yellow if color enabled)
+- 🏺🐜 Archaeologist (magenta if color enabled)
 - 🥚 Queen/Prime
 
 **Every spawn must show its caste emoji.**
 
+### Step 5.0.5: Select and Announce Workflow Pattern
+
+Examine the phase name and task descriptions. Select the first matching pattern:
+
+| Phase contains | Pattern |
+|----------------|---------|
+| "bug", "fix", "error", "broken", "failing" | Investigate-Fix |
+| "research", "oracle", "explore", "investigate" | Deep Research |
+| "refactor", "restructure", "clean", "reorganize" | Refactor |
+| "security", "audit", "compliance", "accessibility", "license" | Compliance |
+| "docs", "documentation", "readme", "guide" | Documentation Sprint |
+| (default) | SPBV |
+
+Display the selected pattern:
+```
+━━ Pattern: {pattern_name} ━━
+{announce_line from Queen's Workflow Patterns definition}
+```
+
+Store `selected_pattern` for inclusion in the BUILD SUMMARY (Step 7).
+
 ### Step 5.1: Spawn Wave 1 Workers (Parallel)
 
 **CRITICAL: Spawn ALL Wave 1 workers in a SINGLE message using multiple Task tool calls.**
 
-For each Wave 1 task, use Task tool with `subagent_type="general-purpose"` (DO NOT use run_in_background - multiple Task calls in a single message run in parallel and block until complete):
+**CRITICAL: Spawn ALL Wave 1 workers in a SINGLE message using multiple Task tool calls.**
+
+**Announce the wave before spawning:**
+
+Display the spawn announcement immediately before firing Task calls:
+
+For single-caste waves (typical — all builders):
+```
+──── 🔨🐜 Spawning {N} Builders in parallel ────
+```
+
+For mixed-caste waves (uncommon):
+```
+──── 🐜 Spawning {N} workers ({X} 🔨 Builder, {Y} 🔍 Scout) ────
+```
+
+For a single worker:
+```
+──── 🔨🐜 Spawning {ant_name} — {task_summary} ────
+```
+
+**First, mark build start in context:**
+```bash
+bash .aether/aether-utils.sh context-update build-start {phase_id} {wave_1_worker_count} {wave_1_task_count}
+```
+
+Before dispatching each worker, refresh colony context so new pheromones/memory are visible:
+```bash
+prime_result=$(bash .aether/aether-utils.sh colony-prime --compact 2>/dev/null)
+```
+Update `prompt_section` from `prime_result.result.prompt_section`.
+
+For each Wave 1 task, use Task tool with `subagent_type="aether-builder"`, include `description: "🔨 Builder {Ant-Name}: {task_description}"` (DO NOT use run_in_background - multiple Task calls in a single message run in parallel and block until complete):
 
 Log each spawn and update swarm display:
 ```bash
 bash .aether/aether-utils.sh spawn-log "Queen" "builder" "{ant_name}" "{task_description}"
-bash .aether/aether-utils.sh swarm-display-update "{ant_name}" "builder" "excavating" "{task_description}" "Queen" '{"read":0,"grep":0,"edit":0,"bash":0}' 0 "fungus_garden" 10
+bash .aether/aether-utils.sh context-update worker-spawn "{ant_name}" "builder" "{task_description}"
 ```
 
 **Builder Worker Prompt (CLEAN OUTPUT):**
 ```
-You are {Ant-Name}, a 🔨 Builder Ant.
+You are {Ant-Name}, a 🔨🐜 Builder Ant.
 
 Task {id}: {description}
 
@@ -454,64 +528,216 @@ Goal: "{colony_goal}"
 
 { archaeology_context if exists }
 
+{ queen_wisdom_section if any wisdom exists }
+
+{ pheromone_section if pheromone_section exists }
+
 Work:
 1. Read .aether/workers.md for Builder discipline
 2. Implement task, write tests
 3. Log activity: bash .aether/aether-utils.sh activity-log "ACTION" "{Ant-Name}" "description"
-4. Update display: bash .aether/aether-utils.sh swarm-display-update "{Ant-Name}" "builder" "excavating" "current task" "Queen" '{"read":0,"grep":0,"edit":0,"bash":0}' {progress} "fungus_garden" 50
 
 Spawn sub-workers ONLY if 3x complexity:
-- Check: bash .aether/aether-utils.sh spawn-can-spawn {depth}
+- Check: bash .aether/aether-utils.sh spawn-can-spawn {depth} --enforce
 - Generate name: bash .aether/aether-utils.sh generate-ant-name "builder"
 - Announce: "🐜 Spawning {child_name} for {reason}"
 - Log: bash .aether/aether-utils.sh spawn-log "{Ant-Name}" "builder" "{child_name}" "{task}"
 
+Count your total tool calls (Read + Grep + Edit + Bash + Write) and report as tool_count.
+
 Return ONLY this JSON (no other text):
-{"ant_name": "{Ant-Name}", "task_id": "{id}", "status": "completed|failed|blocked", "summary": "What you did", "files_created": [], "files_modified": [], "tests_written": [], "blockers": []}
+{"ant_name": "{Ant-Name}", "task_id": "{id}", "status": "completed|failed|blocked", "summary": "What you did", "tool_count": 0, "files_created": [], "files_modified": [], "tests_written": [], "blockers": []}
+```
+
+**Queen Wisdom Section Template (injected only if wisdom exists):**
+```
+--- QUEEN WISDOM (Eternal Guidance) ---
+{ if queen_philosophies: }
+📜 Philosophies:
+{queen_philosophies}
+{ endif }
+{ if queen_patterns: }
+🧭 Patterns:
+{queen_patterns}
+{ endif }
+{ if queen_redirects: }
+⚠️ Redirects (AVOID these):
+{queen_redirects}
+{ endif }
+{ if queen_stack_wisdom: }
+🔧 Stack Wisdom:
+{queen_stack_wisdom}
+{ endif }
+{ if queen_decrees: }
+🏛️ Decrees:
+{queen_decrees}
+{ endif }
+--- END QUEEN WISDOM ---
+```
+
+**Queen Wisdom Section Template (injected only if wisdom exists):**
+```
+--- QUEEN WISDOM (Eternal Guidance) ---
+{ if queen_philosophies: }
+📜 Philosophies:
+{queen_philosophies}
+{ endif }
+{ if queen_patterns: }
+🧭 Patterns:
+{queen_patterns}
+{ endif }
+{ if queen_redirects: }
+⚠️ Redirects (AVOID these):
+{queen_redirects}
+{ endif }
+{ if queen_stack_wisdom: }
+🔧 Stack Wisdom:
+{queen_stack_wisdom}
+{ endif }
+{ if queen_decrees: }
+🏛️ Decrees:
+{queen_decrees}
+{ endif }
+--- END QUEEN WISDOM ---
+```
+
+**Active Signals Section (injected if pheromones exist):**
+```
+--- ACTIVE SIGNALS (From User) ---
+
+🎯 PRIORITIES (FOCUS):
+{for each priority}
+- {priority}
+{endfor}
+
+⚠️ CONSTRAINTS (REDIRECT - AVOID):
+{for each constraint}
+- {constraint.content}
+{endfor}
+
+--- END ACTIVE SIGNALS ---
 ```
 
 ### Step 5.2: Process Wave 1 Results
 
 **Task calls return results directly (no TaskOutput needed).**
 
-**As each worker result arrives, immediately display:**
+Before using any worker payload, validate schema:
+```bash
+bash .aether/aether-utils.sh validate-worker-response builder '{worker_json}'
+```
+If validation fails, treat the worker as failed with blocker `invalid_worker_response`.
+
+**As each worker result arrives, IMMEDIATELY display a single completion line — do not wait for other workers:**
+
+For successful workers:
 ```
-✅ 🔨 {Builder-Name} completed Task {id}
-   📖{read_count} 🔍{grep_count} ✏️{edit_count} ⚡{bash_count}  {elapsed_time}
+🔨 {Ant-Name}: {task_description} ({tool_count} tools) ✓
 ```
 
+For failed workers:
+```
+🔨 {Ant-Name}: {task_description} ✗ ({failure_reason} after {tool_count} tools)
+```
+
+Where `tool_count` comes from the worker's returned JSON `tool_count` field, and `failure_reason` is extracted from the first item in the worker's `blockers` array or "unknown error" if empty.
+
 Log and update swarm display:
 ```bash
 bash .aether/aether-utils.sh spawn-complete "{ant_name}" "completed" "{summary}"
-bash .aether/aether-utils.sh swarm-display-update "{ant_name}" "builder" "completed" "{task_description}" "Queen" '{"read":5,"grep":3,"edit":2,"bash":1}' 100 "fungus_garden" 100
+bash .aether/aether-utils.sh context-update worker-complete "{ant_name}" "completed"
+```
+
+**Check for total wave failure:**
+
+After processing all worker results in this wave, check if EVERY worker returned `status: "failed"`. If ALL workers in the wave failed:
+
+Display a prominent halt alert:
+```
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  ⚠ WAVE FAILURE — BUILD HALTED
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+All {N} workers in Wave {X} failed. Something is fundamentally wrong.
+
+Failed workers:
+  {for each failed worker in this wave:}
+  {caste_emoji} {Ant-Name}: {task_description} ✗ ({failure_reason} after {tool_count} tools)
+  {end for}
+
+Next steps:
+  /ant:flags      Review blockers
+  /ant:swarm      Auto-repair mode
 ```
 
-**Parse each worker's JSON output to collect:** status, files_created, files_modified, blockers
+Then STOP — do not proceed to subsequent waves, Watcher, or Chaos. Skip directly to Step 5.9 synthesis with `status: "failed"`.
+
+**Partial wave failure — escalation path:**
+
+If SOME (but not all) workers in the wave failed:
+1. For each failed worker, attempt Tier 3 escalation: Queen spawns a different caste for the same task
+2. If Tier 3 succeeds: continue to next wave
+3. If Tier 3 fails: display the Tier 4 ESCALATION banner (from Queen agent definition):
+
+```
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+  ⚠ ESCALATION — QUEEN NEEDS YOU
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Task: {failed task description}
+Phase: {phase number} — {phase name}
+
+Tried:
+  • Worker retry (2 attempts) — {what failed}
+  • Parent tried alternate approach — {what failed}
+  • Queen reassigned to {other caste} — {what failed}
+
+Options:
+  A) {recommended option} — RECOMMENDED
+  B) {alternate option}
+  C) Skip and continue — this task will be marked blocked
+
+Awaiting your choice.
+```
 
-**Visual Mode: Render live display (if enabled):**
-If `visual_mode` is true, render the swarm display after all workers complete:
+Log escalation as flag:
 ```bash
-bash .aether/aether-utils.sh swarm-display-render "$build_id"
+bash .aether/aether-utils.sh flag-add "blocker" "{task title}" "{failure summary}" "escalation" {phase_number}
 ```
 
+If at least one worker succeeded, continue normally to the next wave.
+
+**Parse each worker's validated JSON output to collect:** status, files_created, files_modified, blockers
+
 ### Step 5.3: Spawn Wave 2+ Workers (Sequential Waves)
 
+**Before each subsequent wave, display a wave separator:**
+```
+━━━ 🐜 Wave {X} of {N} ━━━
+```
+Then display the spawn announcement (same format as Step 5.1).
+
 Repeat Step 5.1-5.2 for each subsequent wave, waiting for previous wave to complete.
 
 ### Step 5.4: Spawn Watcher for Verification
 
 **MANDATORY: Always spawn a Watcher — testing must be independent.**
 
-Spawn the Watcher using Task tool with `subagent_type="general-purpose"` (DO NOT use run_in_background - task blocks until complete):
+**Announce the verification wave:**
+```
+━━━ 👁️🐜 V E R I F I C A T I O N ━━━
+──── 👁️🐜 Spawning {watcher_name} — Independent verification ────
+```
+
+Spawn the Watcher using Task tool with `subagent_type="aether-watcher"`, include `description: "👁️ Watcher {Watcher-Name}: Independent verification"` (DO NOT use run_in_background - task blocks until complete):
 
 ```bash
 bash .aether/aether-utils.sh spawn-log "Queen" "watcher" "{watcher_name}" "Independent verification"
-bash .aether/aether-utils.sh swarm-display-update "{watcher_name}" "watcher" "observing" "Verification in progress" "Queen" '{"read":0,"grep":0,"edit":0,"bash":0}' 0 "nursery" 50
 ```
 
 **Watcher Worker Prompt (CLEAN OUTPUT):**
 ```
-You are {Watcher-Name}, a 👁️ Watcher Ant.
+You are {Watcher-Name}, a 👁️🐜 Watcher Ant.
 
 Verify all work done by Builders in Phase {id}.
 
@@ -529,23 +755,37 @@ Spawn sub-workers if needed:
 - Log: bash .aether/aether-utils.sh spawn-log "{Watcher-Name}" "watcher" "{child}" "{task}"
 - Announce: "🐜 Spawning {child} to investigate {issue}"
 
+Count your total tool calls (Read + Grep + Edit + Bash + Write) and report as tool_count.
+
 Return ONLY this JSON:
-{"ant_name": "{Watcher-Name}", "verification_passed": true|false, "files_verified": [], "issues_found": [], "quality_score": N, "recommendation": "proceed|fix_required"}
+{"ant_name": "{Watcher-Name}", "verification_passed": true|false, "files_verified": [], "issues_found": [], "quality_score": N, "tool_count": 0, "recommendation": "proceed|fix_required"}
 ```
 
 ### Step 5.5: Process Watcher Results
 
 **Task call returns results directly (no TaskOutput needed).**
 
-**Parse the Watcher's JSON response:** verification_passed, issues_found, quality_score, recommendation
+Validate watcher payload first:
+```bash
+bash .aether/aether-utils.sh validate-worker-response watcher '{watcher_json}'
+```
+
+**Parse the Watcher's validated JSON response:** verification_passed, issues_found, quality_score, recommendation
 
-**Store results for synthesis in Step 5.7**
+**Display Watcher completion line:**
 
-**Update swarm display when Watcher completes:**
-```bash
-bash .aether/aether-utils.sh swarm-display-update "{watcher_name}" "watcher" "completed" "Verification complete" "Queen" '{"read":3,"grep":2,"edit":0,"bash":1}' 100 "nursery" 100
+For successful verification:
+```
+👁️ {Watcher-Name}: Independent verification ({tool_count} tools) ✓
 ```
 
+For failed verification:
+```
+👁️ {Watcher-Name}: Independent verification ✗ ({issues_found count} issues after {tool_count} tools)
+```
+
+**Store results for synthesis in Step 5.7**
+
 ### Step 5.6: Spawn Chaos Ant for Resilience Testing
 
 **After the Watcher completes, spawn a Chaos Ant to probe the phase work for edge cases and boundary conditions.**
@@ -554,7 +794,6 @@ Generate a chaos ant name and log the spawn:
 ```bash
 bash .aether/aether-utils.sh generate-ant-name "chaos"
 bash .aether/aether-utils.sh spawn-log "Queen" "chaos" "{chaos_name}" "Resilience testing of Phase {id} work"
-bash .aether/aether-utils.sh swarm-display-update "{chaos_name}" "chaos" "probing" "Resilience testing" "Queen" '{"read":0,"grep":0,"edit":0,"bash":0}' 0 "refuse_pile" 75
 ```
 
 **Retrieve existing flags for this phase** (to avoid duplicate findings):
@@ -563,12 +802,16 @@ bash .aether/aether-utils.sh flag-list --phase {phase_number}
 ```
 Parse the result and extract unresolved flag titles into a list: `{existing_flag_titles}` (comma-separated titles from `.result.flags[].title`). If no flags exist, set `{existing_flag_titles}` to "None".
 
-Spawn the Chaos Ant using Task tool with `subagent_type="general-purpose"` (DO NOT use run_in_background - task blocks until complete):
-# NOTE: Claude Code uses aether-chaos; OpenCode uses general-purpose with role injection
+**Announce the resilience testing wave:**
+```
+──── 🎲🐜 Spawning {chaos_name} — resilience testing ────
+```
+
+Spawn the Chaos Ant using Task tool with `subagent_type="aether-chaos"`, include `description: "🎲 Chaos {Chaos-Name}: Resilience testing"` (DO NOT use run_in_background - task blocks until complete):
 
 **Chaos Ant Prompt (CLEAN OUTPUT):**
 ```
-You are {Chaos-Name}, a 🎲 Chaos Ant.
+You are {Chaos-Name}, a 🎲🐜 Chaos Ant.
 
 Test Phase {id} work for edge cases and boundary conditions.
 
@@ -582,8 +825,10 @@ Rules:
 - Read-only (don't modify code)
 - Focus: edge cases, boundaries, error handling
 
+Count your total tool calls (Read + Grep + Edit + Bash + Write) and report as tool_count.
+
 Return ONLY this JSON:
-{"ant_name": "{Chaos-Name}", "scenarios_tested": 5, "findings": [{"id": 1, "category": "edge_case|boundary|error_handling", "severity": "critical|high|medium|low", "title": "...", "description": "..."}], "overall_resilience": "strong|moderate|weak", "summary": "..."}
+{"ant_name": "{Chaos-Name}", "scenarios_tested": 5, "findings": [{"id": 1, "category": "edge_case|boundary|error_handling", "severity": "critical|high|medium|low", "title": "...", "description": "..."}], "overall_resilience": "strong|moderate|weak", "tool_count": 0, "summary": "..."}
 ```
 
 ### Step 5.7: Process Chaos Ant Results
@@ -592,6 +837,11 @@ Return ONLY this JSON:
 
 **Parse the Chaos Ant's JSON response:** findings, overall_resilience, summary
 
+**Display Chaos completion line:**
+```
+🎲 {Chaos-Name}: Resilience testing ({tool_count} tools) ✓
+```
+
 **Store results for synthesis in Step 5.9**
 
 **Flag critical/high findings:**
@@ -610,7 +860,6 @@ bash .aether/aether-utils.sh activity-log "FLAG" "Chaos" "Created blocker: {find
 Log chaos ant completion and update swarm display:
 ```bash
 bash .aether/aether-utils.sh spawn-complete "{chaos_name}" "completed" "{summary}"
-bash .aether/aether-utils.sh swarm-display-update "{chaos_name}" "chaos" "completed" "Resilience testing done" "Queen" '{"read":2,"grep":1,"edit":0,"bash":0}' 100 "refuse_pile" 100
 ```
 
 ### Step 5.8: Create Flags for Verification Failures
@@ -678,36 +927,22 @@ bash .aether/aether-utils.sh activity-log "GRAVE" "Queen" "Grave marker placed a
 
 **Error Handoff Update:**
 If workers failed, update handoff with error context for recovery:
-```bash
-cat > .aether/HANDOFF.md << 'HANDOFF_EOF'
-# Colony Session — Build Errors
-
-## ⚠️ Build Status: ISSUES DETECTED
-**Phase:** {phase_number} — {phase_name}
-**Status:** Build completed with failures
-**Updated:** $(date -u +%Y-%m-%dT%H:%M:%SZ)
 
-## Failed Workers
-{for each failed worker:}
-- {ant_name}: {failure_summary}
-{end for}
+Resolve the build error handoff template path:
+  Check ~/.aether/system/templates/handoff-build-error.template.md first,
+  then .aether/templates/handoff-build-error.template.md.
 
-## Grave Markers Placed
-{for each grave:}
-- {file}: {caution_level} caution
-{end for}
+If no template found: output "Template missing: handoff-build-error.template.md. Run aether update to fix." and stop.
 
-## Recovery Options
-1. Review failures: Check `.aether/data/activity.log`
-2. Fix and retry: `/ant:build {phase_number}`
-3. Swarm fix: `/ant:swarm` for auto-repair
-4. Manual fix: Address issues, then `/ant:continue`
+Read the template file. Fill all {{PLACEHOLDER}} values:
+  - {{PHASE_NUMBER}} → current phase number
+  - {{PHASE_NAME}} → current phase name
+  - {{BUILD_TIMESTAMP}} → current ISO-8601 UTC timestamp
+  - {{FAILED_WORKERS}} → formatted list of failed workers (one "- {ant_name}: {failure_summary}" per line)
+  - {{GRAVE_MARKERS}} → formatted list of grave markers (one "- {file}: {caution_level} caution" per line)
 
-## Session Note
-Build completed but workers failed. Grave markers placed.
-Review failures before advancing.
-HANDOFF_EOF
-```
+Remove the HTML comment lines at the top of the template.
+Write the result to .aether/HANDOFF.md using the Write tool.
 
 Only fires when workers fail. Zero impact on successful builds.
 
@@ -785,8 +1020,7 @@ Return JSON:
 Parse synthesis result. If `ui_touched` is true:
 
 ```
-Visual Checkpoint
-=================
+━━━ 🖼️🐜 V I S U A L   C H E C K P O I N T ━━━
 
 UI changes detected. Verify appearance before continuing.
 
@@ -832,157 +1066,103 @@ jq -n \
     "can_resume": true,
     "note": "Phase build completed. Run /ant:continue to advance if verification passed."
   }' > .aether/data/last-build-result.json
+```
 
-# Write handoff markdown
-cat > .aether/HANDOFF.md << 'HANDOFF_EOF'
-# Colony Session — Build Complete
-
-## Quick Resume
-Run `/ant:continue` to advance phase, or `/ant:resume-colony` to restore full context.
-
-## State at Build Completion
-- Goal: "$(jq -r '.goal' .aether/data/COLONY_STATE.json)"
-- Phase: {phase_number} — {phase_name}
-- Build Status: {synthesis.status}
-- Updated: $(date -u +%Y-%m-%dT%H:%M:%SZ)
-
-## Build Summary
-{summary}
-
-## Tasks
-- Completed: {synthesis.tasks_completed | length}
-- Failed: {synthesis.tasks_failed | length}
+Resolve the build success handoff template path:
+  Check ~/.aether/system/templates/handoff-build-success.template.md first,
+  then .aether/templates/handoff-build-success.template.md.
 
-## Files Changed
-- Created: {synthesis.files_created | length} files
-- Modified: {synthesis.files_modified | length} files
+If no template found: output "Template missing: handoff-build-success.template.md. Run aether update to fix." and stop.
 
-## Next Steps
-- If verification passed: `/ant:continue` to advance to next phase
-- If issues found: `/ant:flags` to review blockers
-- To pause: `/ant:pause-colony`
+Read the template file. Fill all {{PLACEHOLDER}} values:
+  - {{GOAL}} → colony goal (from COLONY_STATE.json)
+  - {{PHASE_NUMBER}} → current phase number
+  - {{PHASE_NAME}} → current phase name
+  - {{BUILD_STATUS}} → synthesis.status
+  - {{BUILD_TIMESTAMP}} → current ISO-8601 UTC timestamp
+  - {{BUILD_SUMMARY}} → synthesis summary
+  - {{TASKS_COMPLETED}} → count of completed tasks
+  - {{TASKS_FAILED}} → count of failed tasks
+  - {{FILES_CREATED}} → count of created files
+  - {{FILES_MODIFIED}} → count of modified files
+  - {{SESSION_NOTE}} → "Build succeeded — ready to advance." if status is completed, else "Build completed with issues — review before continuing."
 
-## Session Note
-$(if synthesis.status == "completed" then "Build succeeded — ready to advance." else "Build completed with issues — review before continuing." end)
-HANDOFF_EOF
-```
+Remove the HTML comment lines at the top of the template.
+Write the result to .aether/HANDOFF.md using the Write tool.
 
 This ensures the handoff always reflects the latest build state, even if the session crashes before explicit pause.
 
-### Step 7: Display Results
+### Step 6.6: Update Context Document
 
-**This step runs ONLY after synthesis is complete. All values come from actual worker results.**
+Log this build activity to `.aether/CONTEXT.md`:
 
-**First, render the final swarm display showing all completed workers:**
 ```bash
-# Final swarm display update - mark Queen as completed
-bash .aether/aether-utils.sh swarm-display-update "Queen" "prime" "completed" "Phase {id} complete" "Colony" '{"read":10,"grep":5,"edit":5,"bash":2}' 100 "fungus_garden" 100
-
-# Render the final swarm display
-bash .aether/aether-utils.sh swarm-display-render "$build_id"
+bash .aether/aether-utils.sh context-update activity "build {phase_id}" "{synthesis.status}" "{files_created_count + files_modified_count}"
 ```
 
-The swarm display will show:
-- 🐜 All workers with their caste emojis (🔨 Builder, 👁️ Watcher, 🎲 Chaos)
-- 📖 Tool usage stats (Read, Grep, Edit, Bash counts)
-- 🏠 Chamber activity map (Fungus Garden, Nursery, Refuse Pile)
-- ✅ Progress bars at 100% for completed work
-- 🌈 Color-coded by caste
-
-**Then display build summary based on synthesis results AND `verbose_mode` from Step 1:**
-
-**If verbose_mode = false (compact output, ~12 lines):**
-
+Mark build as complete in context:
+```bash
+bash .aether/aether-utils.sh context-update build-complete "{synthesis.status}" "{synthesis.status == 'completed' ? 'success' : 'failed'}"
 ```
-🔨 PHASE {id} {status_icon}
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-📍 {name}
-📊 {status} | 📁 {files_created count} created, {files_modified count} modified
-🐜 {spawn_count} workers | 🧪 {tests_total} tests {if all_passing}passing{else}{passed}/{total}{end if}
-{if learning.patterns_observed.length > 0:}🧠 +{patterns_observed.length} patterns{end if}
 
-{if synthesis.status == "failed" OR verification.recommendation == "fix_required":}
-⚠️  BLOCKERS: {first 2 issues, comma-separated}
-{end if}
+Also update safe-to-clear status:
+- If build completed successfully: `context-update safe-to-clear "YES" "Build complete, ready to continue"`
+- If build failed: `context-update safe-to-clear "NO" "Build failed — run /ant:swarm or /ant:flags"`
 
-➡️  Next: {primary_command}
-    --verbose for spawn tree, TDD details, patterns
-```
+### Step 7: Display Results
 
-**Status icon logic:** completed+proceed = checkmark, blockers = warning, failed = X
+**This step runs ONLY after synthesis is complete. All values come from actual worker results.**
 
-**Primary command logic:**
-- completed + proceed: `/ant:continue`
-- has blockers: `/ant:flags`
-- failed: `/ant:swarm`
+**Display BUILD SUMMARY (always shown, replaces compact/verbose split):**
 
-**If verbose_mode = true (full output):**
+Calculate `total_tools` by summing `tool_count` from all worker return JSONs (builders + watcher + chaos).
+Calculate `elapsed` using `build_started_at_epoch` (epoch integer captured at Step 5 start): `$(( $(date +%s) - build_started_at_epoch ))` formatted as Xm Ys.
 
 ```
-🔨🐜🏗️🐜🔨 ═══════════════════════════════════════════════════
-   P H A S E   {id}   C O M P L E T E
-═══════════════════════════════════════════════════ 🔨🐜🏗️🐜🔨
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+   B U I L D   S U M M A R Y
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Phase {id}: {name}
+Pattern:  {selected_pattern}
 
-📍 Phase {id}: {name}
-📊 Status: {status}
-💾 Git Checkpoint: {commit_hash}
-
-📝 Summary:
-   {summary from synthesis}
-
-🐜 Colony Work Tree:
-   👑Queen
-{for each spawn in spawn_tree:}
-   ├── {caste_emoji}{ant_name}: {task} [{status}]
-{end for}
-
-✅ Tasks Completed:
-{for each task in tasks_completed:}
-   🐜 {task_id}: done
-{end for}
-{for each task in tasks_failed:}
-   ❌ {task_id}: failed
-{end for}
-
-📁 Files: {files_created count} created, {files_modified count} modified
-
-{if tdd.tests_added > 0:}
-🧪 TDD: {tdd.cycles_completed} cycles | {tdd.tests_added} tests | {tdd.coverage_percent}% coverage
-{end if}
+Workers:  {pass_count} passed  {fail_count} failed  ({total} total)
+Tools:    {total_tools} calls across all workers
+Duration: {elapsed}
 
-{if learning.patterns_observed not empty:}
-🧠 Patterns Learned:
-{for each pattern in learning.patterns_observed:}
-   🐜 {pattern.trigger} → {pattern.action}
-{end for}
-{end if}
+{if fail_count > 0:}
+Failed:
+  {for each failed worker:}
+  {caste_emoji} {Ant-Name}: {task_description} ✗ ({failure_reason} after {tool_count} tools)
+  {end for}
 
-{if debugging.issues_encountered > 0:}
-🔧 Debugging: {debugging.issues_resolved}/{debugging.issues_encountered} resolved
+Retry: /ant:swarm to auto-repair failed tasks, or /ant:flags to review blockers
 {end if}
+```
 
-🤖 Model Routing:
-{for each spawn in spawn_tree where model_context exists:}
-   {caste_emoji}{ant_name}: {model_context.assigned} {if model_context.assigned matches caste expectation:}✓{else}⚠️{end if}
-{end for}
-   Proxy: {if proxy_healthy:}✓ Healthy @ http://localhost:4000{else}✗ Not running (using default model){end if}
-
-🐜 Next Steps:
-{if synthesis.status == "completed" AND verification.recommendation == "proceed":}
-   /ant:continue   ➡️  Advance to next phase
-   /ant:feedback   💬 Give feedback first
-{else if synthesis.status == "failed" OR verification.recommendation == "fix_required":}
-   ⚠️  BLOCKERS DETECTED - Cannot proceed until resolved
-   /ant:flags      🚩 View blockers
-   /ant:swarm      🔥 Auto-fix issues
-{end if}
+**If verbose_mode is true**, additionally show the spawn tree and TDD details after the BUILD SUMMARY block (keep the existing verbose-only sections: Colony Work Tree, Tasks Completed, TDD, Patterns Learned, Debugging, Model Routing). Prepend with:
+```
+━━ Details (--verbose) ━━
+```
 
-💾 State persisted — safe to /clear, then run /ant:continue
+After displaying the BUILD SUMMARY (and optional verbose details), display Next Steps based on synthesis results:
+```bash
+state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json 2>/dev/null || echo "IDLE")
+current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json 2>/dev/null || echo "0")
+total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json 2>/dev/null || echo "0")
+bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
 ```
 
-**Conditional Next Steps:** The suggestions above are based on actual worker results. If verification failed or blockers exist, `/ant:continue` is NOT suggested.
+**Routing Note:** The state-based Next Up block above routes based on colony state. If verification failed or blockers exist, review `/ant:flags` before continuing.
 
 **IMPORTANT:** Build does NOT update task statuses or advance state. Run `/ant:continue` to:
 - Mark tasks as completed
 - Extract learnings
 - Advance to next phase
+
+### Step 8: Update Session
+
+Update the session tracking file to enable `/ant:resume` after context clear:
+
+```bash
+bash .aether/aether-utils.sh session-update "/ant:build {phase_id}" "/ant:continue" "Phase {phase_id} build completed: {synthesis.status}"
+```