aether-colony 5.3.2 → 5.4.0

package/.aether/commands/entomb.yaml

@@ -126,7 +126,7 @@ body_claude: |
 
   ```bash
   # Check for pending proposals
-  proposals=$(bash .aether/aether-utils.sh learning-check-promotion 2>/dev/null || echo '{"proposals":[]}')
+  proposals=$(aether learning-check-promotion 2>/dev/null || echo '{"proposals":[]}')
   proposal_count=$(echo "$proposals" | jq '.proposals | length')
 
   if [[ "$proposal_count" -gt 0 ]]; then
@@ -140,7 +140,7 @@ body_claude: |
     echo ""
 
     # Run approval workflow (blocking)
-    bash .aether/aether-utils.sh learning-approve-proposals
+    aether learning-approve-proposals
 
     echo ""
     echo "Wisdom review complete. Proceeding with entombment..."
@@ -202,12 +202,12 @@ body_claude: |
   ```bash
   queen_file=".aether/QUEEN.md"
   if [[ ! -f "$queen_file" ]]; then
-    init_result=$(bash .aether/aether-utils.sh queen-init 2>/dev/null || echo '{"ok":false}')
+    init_result=$(aether queen-init 2>/dev/null || echo '{"ok":false}')
     init_ok=$(echo "$init_result" | jq -r '.ok // false')
     if [[ "$init_ok" == "true" ]]; then
       created=$(echo "$init_result" | jq -r '.result.created // false')
       if [[ "$created" == "true" ]]; then
-        bash .aether/aether-utils.sh activity-log "CREATED" "Queen" "Initialized QUEEN.md for wisdom storage"
+        aether activity-log "CREATED" "Queen" "Initialized QUEEN.md for wisdom storage"
       fi
     fi
   fi
@@ -245,7 +245,7 @@ body_claude: |
 
   Create the chamber:
   ```bash
-  bash .aether/aether-utils.sh chamber-create \
+  aether chamber-create \
     ".aether/chambers/$chamber_name" \
     ".aether/data/COLONY_STATE.json" \
     "$goal" \
@@ -295,7 +295,7 @@ body_claude: |
 
   ```bash
   chamber_dir=".aether/chambers/$chamber_name"
-  xml_result=$(bash .aether/aether-utils.sh colony-archive-xml "$chamber_dir/colony-archive.xml" 2>&1)
+  xml_result=$(aether colony-archive-xml --output "$chamber_dir/colony-archive.xml" 2>&1)
   xml_ok=$(echo "$xml_result" | jq -r '.ok // false' 2>/dev/null)
 
   if [[ "$xml_ok" != "true" ]]; then
@@ -323,7 +323,7 @@ body_claude: |
 
   Run verification:
   ```bash
-  bash .aether/aether-utils.sh chamber-verify ".aether/chambers/$chamber_name"
+  aether chamber-verify --path ".aether/chambers/$chamber_name"
   ```
 
   If verification fails, display error and stop:
@@ -341,7 +341,7 @@ body_claude: |
 
   Write colony summary to eternal memory:
   ```bash
-  bash .aether/aether-utils.sh eternal-init  # idempotent
+  aether eternal-init  # idempotent
   eternal_file="$HOME/.aether/eternal/memory.json"
   if [[ -f "$eternal_file" ]]; then
     colony_entry=$(jq -n \
@@ -441,7 +441,7 @@ body_claude: |
   Display:
   ```
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     C O L O N Y   E N T O M B E D
+  ⚰️ C O L O N Y   E N T O M B E D
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   Entombed v{colony_version}
@@ -679,7 +679,7 @@ body_opencode: |
 
   Create the chamber:
   ```bash
-  bash .aether/aether-utils.sh chamber-create \
+  aether chamber-create \
     ".aether/chambers/{chamber_name}" \
     ".aether/data/COLONY_STATE.json" \
     "{goal}" \
@@ -697,7 +697,7 @@ body_opencode: |
 
   ```bash
   chamber_dir=".aether/chambers/$chamber_name"
-  xml_result=$(bash .aether/aether-utils.sh colony-archive-xml "$chamber_dir/colony-archive.xml" 2>&1)
+  xml_result=$(aether colony-archive-xml --output "$chamber_dir/colony-archive.xml" 2>&1)
   xml_ok=$(echo "$xml_result" | jq -r '.ok // false' 2>/dev/null)
 
   if [[ "$xml_ok" != "true" ]]; then
@@ -733,7 +733,7 @@ body_opencode: |
 
   Run verification:
   ```bash
-  bash .aether/aether-utils.sh chamber-verify ".aether/chambers/{chamber_name}"
+  aether chamber-verify --path ".aether/chambers/{chamber_name}"
   ```
 
   If verification fails, display error and stop:

package/.aether/commands/export-signals.yaml

@@ -20,7 +20,7 @@ body: |
 
   Run using the Bash tool with description "Exporting pheromone signals to XML...":
   ```bash
-  bash .aether/aether-utils.sh pheromone-export-xml "<output_path>"
+  aether pheromone-export-xml --output "<output_path>"
   ```
 
   Parse the returned JSON:
@@ -59,6 +59,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/feedback.yaml

@@ -32,7 +32,7 @@ body: |
   {{#claude}}
   {{TOOL_PREFIX "Recording colony feedback..."}}
   ```bash
-  bash .aether/aether-utils.sh pheromone-write FEEDBACK "<content>" --strength 0.7 --reason "User feedback guidance" --ttl <ttl>
+  aether pheromone-write --type FEEDBACK --content "<content>" --strength 0.7 --reason "User feedback guidance" --ttl <ttl>
   ```
 
   **Create instinct from feedback:**
@@ -59,14 +59,14 @@ body: |
 
   {{TOOL_PREFIX "Updating context document..."}}
   ```bash
-  bash .aether/aether-utils.sh context-update constraint feedback "<content>" "user" 2>/dev/null || true
+  aether context-update --section constraint --key feedback --content "<content>" "user" 2>/dev/null || true
   ```
 
   ### Step 3: Get Active Counts
 
   {{TOOL_PREFIX "Counting active signals..."}}
   ```bash
-  bash .aether/aether-utils.sh pheromone-count
+  aether pheromone-count
   ```
 
   ### Step 4: Confirm
@@ -119,8 +119,8 @@ body: |
 
   **Write pheromone signal and update context:**
   ```bash
-  bash .aether/aether-utils.sh pheromone-write FEEDBACK "$normalized_args" --strength 0.7 --reason "User feedback guidance" 2>/dev/null || true
-  bash .aether/aether-utils.sh context-update constraint feedback "$normalized_args" "user" 2>/dev/null || true
+  aether pheromone-write --type FEEDBACK --content "$normalized_args" --strength 0.7 --reason "User feedback guidance" 2>/dev/null || true
+  aether context-update --section constraint --key feedback --content "$normalized_args" "user" 2>/dev/null || true
   ```
 
   ### Step 3: Confirm
@@ -153,6 +153,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/flag.yaml

@@ -48,7 +48,7 @@ body: |
 
   {{TOOL_PREFIX "Raising colony flag..."}}
   ```bash
-  bash .aether/aether-utils.sh flag-add "{type}" "{title}" "{description}" "manual" {phase_or_null}
+  aether flag-add --severity "{type}" --title "{title}" --description "{description}" --source "manual" --phase {phase_or_null}
   ```
 
   Parse the result for the flag ID.
@@ -144,7 +144,7 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}
 

package/.aether/commands/flags.yaml

@@ -32,7 +32,7 @@ body: |
   If `--resolve` was provided:
   {{/opencode}}
   ```bash
-  bash .aether/aether-utils.sh flag-resolve "{flag_id}" "{resolution_message}"
+  aether flag-resolve --id "{flag_id}" --message "{resolution_message}"
   ```
   Output:
   ```
@@ -49,7 +49,7 @@ body: |
   If `--ack` was provided:
   {{/opencode}}
   ```bash
-  bash .aether/aether-utils.sh flag-acknowledge "{flag_id}"
+  aether flag-acknowledge --id "{flag_id}"
   ```
   Output:
   ```
@@ -68,7 +68,7 @@ body: |
   Run:
   {{/opencode}}
   ```bash
-  bash .aether/aether-utils.sh flag-list {options}
+  aether flag-list {options}
   ```
 
   Parse result for flags array.
@@ -153,7 +153,7 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}
 

package/.aether/commands/focus.yaml

@@ -32,7 +32,7 @@ body: |
   {{#claude}}
   {{TOOL_PREFIX "Setting colony focus..."}}
   ```bash
-  bash .aether/aether-utils.sh pheromone-write FOCUS "<content>" --strength 0.8 --reason "User directed colony attention" --ttl <ttl>
+  aether pheromone-write --type FOCUS --content "<content>" --strength 0.8 --reason "User directed colony attention" --ttl <ttl>
   ```
 
   Parse the returned JSON for the signal ID.
@@ -41,14 +41,14 @@ body: |
 
   {{TOOL_PREFIX "Updating context document..."}}
   ```bash
-  bash .aether/aether-utils.sh context-update constraint focus "<content>" "user" 2>/dev/null || true
+  aether context-update --section constraint --key focus --content "<content>" "user" 2>/dev/null || true
   ```
 
   ### Step 3: Get Active Counts
 
   {{TOOL_PREFIX "Counting active signals..."}}
   ```bash
-  bash .aether/aether-utils.sh pheromone-count
+  aether pheromone-count
   ```
 
   ### Step 4: Confirm
@@ -75,8 +75,8 @@ body: |
 
   **Write pheromone signal and update context:**
   ```bash
-  bash .aether/aether-utils.sh pheromone-write FOCUS "$normalized_args" --strength 0.8 --reason "User directed colony attention" 2>/dev/null || true
-  bash .aether/aether-utils.sh context-update constraint focus "$normalized_args" "user" 2>/dev/null || true
+  aether pheromone-write --type FOCUS --content "$normalized_args" --strength 0.8 --reason "User directed colony attention" 2>/dev/null || true
+  aether context-update --section constraint --key focus --content "$normalized_args" "user" 2>/dev/null || true
   ```
 
   ### Step 3: Confirm
@@ -107,6 +107,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/help.yaml

@@ -162,6 +162,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/history.yaml

@@ -132,6 +132,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/import-signals.yaml

@@ -33,7 +33,7 @@ body: |
 
   Run using the Bash tool with description "Importing pheromone signals from XML...":
   ```bash
-  bash .aether/aether-utils.sh pheromone-import-xml "<xml_path>" "<colony_prefix>"
+  aether pheromone-import-xml --input "<xml_path>" --colony "<colony_prefix>"
   ```
 
   Parse the returned JSON:
@@ -74,6 +74,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/init.yaml

@@ -44,7 +44,6 @@ body: |
   - .aether/dreams/ (user notes)
   - .aether/chambers/ (archived colonies)
   - .env* files
-  - .claude/settings.json
   - .github/workflows/
   </read_only>
 
@@ -93,7 +92,7 @@ body: |
 
   {{TOOL_PREFIX "Initializing QUEEN.md..."}}
   ```
-  bash .aether/aether-utils.sh queen-init
+  aether queen-init
   ```
 
   Parse the JSON result:
@@ -106,7 +105,7 @@ body: |
 
   Run the scan via Bash tool:
   ```bash
-  scan_result=$(bash .aether/aether-utils.sh init-research 2>/dev/null)
+  scan_result=$(aether init-research 2>/dev/null)
   scan_data=$(echo "$scan_result" | jq '.result')
   ```
 
@@ -159,7 +158,7 @@ body: |
   Display a brief header:
   ```
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     A E T H E R   C O L O N Y   I N I T
+  🥚 A E T H E R   C O L O N Y   I N I T
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
   ```
 
@@ -277,14 +276,14 @@ body: |
 
   1. Write charter content via:
   ```bash
-  bash .aether/aether-utils.sh charter-write --intent "{approved_intent}" --vision "{approved_vision}" --governance "{approved_governance}" --goals "{approved_goals}"
+  aether charter-write --intent "{approved_intent}" --vision "{approved_vision}" --governance "{approved_governance}" --goals "{approved_goals}"
   ```
 
   2. Auto-apply approved pheromone suggestions (see pheromone auto-apply below).
 
   3. Update the goal field in COLONY_STATE.json in-place using the state API:
   ```bash
-  bash .aether/aether-utils.sh state-write "$(jq --arg new_goal "{approved_intent}" '.goal = $new_goal' .aether/data/COLONY_STATE.json)"
+  aether state-write "$(jq --arg new_goal "{approved_intent}" '.goal = $new_goal' .aether/data/COLONY_STATE.json)"
   ```
 
   4. **Verify the write** — read back and confirm goal is set:
@@ -302,7 +301,7 @@ body: |
   fi
   ```
 
-  5. Run `bash .aether/aether-utils.sh session-init "$(jq -r '.session_id' .aether/data/COLONY_STATE.json)" "{approved_intent}"`
+  5. Run `aether session-init "$(jq -r '.session_id' .aether/data/COLONY_STATE.json)" "{approved_intent}"`
 
   6. Skip to Step 8 (display result). Do NOT write COLONY_STATE.json from template, do NOT write constraints.json, do NOT write pheromones.json.
 
@@ -360,12 +359,12 @@ body: |
   done
   ```
 
-  8. Run `bash .aether/aether-utils.sh context-update init "{approved_intent}"`
-  9. Run `bash .aether/aether-utils.sh validate-state colony`
+  8. Run `aether context-update init "{approved_intent}"`
+  9. Run `aether validate-state colony`
   10. Register repo (silent on failure):
   ```bash
-  domain_tags=$(bash .aether/aether-utils.sh domain-detect 2>/dev/null | jq -r '.result.tags // ""' || echo "")
-  bash .aether/aether-utils.sh registry-add "$(pwd)" "$(jq -r '.version // "unknown"' ~/.aether/version.json 2>/dev/null || echo 'unknown')" --goal "{approved_intent}" --active true --tags "$domain_tags" 2>/dev/null || true
+  domain_tags=$(aether domain-detect 2>/dev/null | jq -r '.result.tags // ""' || echo "")
+  aether registry-add --path "$(pwd)" "$(jq -r '.version // "unknown"' ~/.aether/version.json 2>/dev/null || echo 'unknown')" --goal "{approved_intent}" --active true --tags "$domain_tags" 2>/dev/null || true
   cp ~/.aether/version.json .aether/version.json 2>/dev/null || true
   ```
   11. Seed QUEEN.md from hive (non-blocking):
@@ -375,10 +374,10 @@ body: |
     "$HOME/.aether/registry.json" 2>/dev/null || echo "")
   seed_args="queen-seed-from-hive --limit 5"
   [[ -n "$domain_tags" ]] && seed_args="$seed_args --domain $domain_tags"
-  seed_result=$(bash .aether/aether-utils.sh $seed_args 2>/dev/null || echo '{}')
+  seed_result=$(aether $seed_args 2>/dev/null || echo '{}')
   seeded_count=$(echo "$seed_result" | jq -r '.result.seeded // 0' 2>/dev/null || echo "0")
   ```
-  12. Run `bash .aether/aether-utils.sh session-init "{session_id}" "{approved_intent}"`
+  12. Run `aether session-init "{session_id}" "{approved_intent}"`
 
   **Pheromone auto-apply (referenced by both re-init and fresh init paths above):**
 
@@ -386,7 +385,7 @@ body: |
 
   For each approved pheromone suggestion, call:
   ```bash
-  bash .aether/aether-utils.sh pheromone-write "{type}" '{content}' --source "system:init" --reason '{reason}' --ttl "30d" 2>/dev/null || true
+  aether pheromone-write "{type}" '{content}' --source "system:init" --reason '{reason}' --ttl "30d" 2>/dev/null || true
   ```
 
   Implementation notes:
@@ -444,21 +443,21 @@ body: |
   ```bash
   # Import pheromones (per D-09)
   if [[ -f "$latest_chamber/pheromones.xml" ]]; then
-    pher_import=$(bash .aether/aether-utils.sh pheromone-import-xml "$latest_chamber/pheromones.xml" "imported" 2>/dev/null || echo '{"ok":false}')
+    pher_import=$(aether pheromone-import-xml --input "$latest_chamber/pheromones.xml" --colony "imported" 2>/dev/null || echo '{"ok":false}')
     pher_imported=$(echo "$pher_import" | jq -r '.result.imported // 0' 2>/dev/null || echo "0")
     echo "Pheromones: ${pher_imported} signal(s) imported"
   fi
 
   # Import wisdom to queen-wisdom.json (per D-09)
   if [[ -f "$latest_chamber/queen-wisdom.xml" ]]; then
-    wis_import=$(bash .aether/aether-utils.sh wisdom-import-xml "$latest_chamber/queen-wisdom.xml" ".aether/data/queen-wisdom.json" 2>/dev/null || echo '{"ok":false}')
+    wis_import=$(aether wisdom-import-xml "$latest_chamber/queen-wisdom.xml" ".aether/data/queen-wisdom.json" 2>/dev/null || echo '{"ok":false}')
     wis_imported=$(echo "$wis_import" | jq -r '.result.imported // 0' 2>/dev/null || echo "0")
     echo "Wisdom: ${wis_imported} entries(s) imported to queen-wisdom.json"
   fi
 
   # Import registry lineage (per D-09)
   if [[ -f "$latest_chamber/colony-registry.xml" ]]; then
-    reg_import=$(bash .aether/aether-utils.sh registry-import-xml "$latest_chamber/colony-registry.xml" 2>/dev/null || echo '{"ok":false}')
+    reg_import=$(aether registry-import-xml "$latest_chamber/colony-registry.xml" 2>/dev/null || echo '{"ok":false}')
     reg_imported=$(echo "$reg_import" | jq -r '.result.imported // 0' 2>/dev/null || echo "0")
     echo "Registry: ${reg_imported} colon(ies) lineage imported"
   fi
@@ -473,30 +472,48 @@ body: |
   **If xml_import_available is false (no chambers, no XML, or no xmllint):**
 
   Skip silently -- proceed directly to Step 8 without any mention of import (per D-11).
+  ### Step 7.5: Install Clash Detection Hook
+
+  If `.aether/utils/clash-detect.sh` exists, run:
+
+  ```bash
+  aether clash-setup --install 2>/dev/null || true
+  ```
+
+  This installs the PreToolUse hook that prevents conflicting edits across worktrees.
+  Non-blocking — if it fails, init continues normally.
+
+  Also configure the merge driver for package-lock.json:
+
+  ```bash
+  git config merge.lockfile.driver "bash .aether/utils/merge-driver-lockfile.sh %O %A %B" 2>/dev/null || true
+  git config merge.lockfile.name "npm lockfile auto-merge" 2>/dev/null || true
+  ```
+
   ### Step 8: Display Result
 
   Display the success header and result block:
 
   ```
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     A E T H E R   C O L O N Y
+  🥚 A E T H E R   C O L O N Y
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-  Queen has set the colony's intention
+  👑 Queen has set the colony's intention
 
      "{approved_intent}"
 
-     Colony Status: READY
+     🟢 Colony Status: READY
 
-  {If re-init: "   Mode: Re-init (charter updated, state preserved)"}
-  {If fresh and seeded_count > 0: "   Hive wisdom: {seeded_count} cross-colony pattern(s) seeded into QUEEN.md"}
+  {If re-init: "   🔄 Mode: Re-init (charter updated, state preserved)"}
+  {If fresh and seeded_count > 0: "   🧠 Hive wisdom: {seeded_count} cross-colony pattern(s) seeded into QUEEN.md"}
 
-  State persisted -- safe to /clear, then run /ant:plan
+  💾 State persisted -- safe to /clear, then run /ant:plan
 
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     Next Up
+  🐜 Next Up
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-     /ant:plan                 Generate execution plan
-     /ant:status               Check colony state
-     /ant:focus                Set initial focus
+     /ant:plan                 📊 Generate execution plan
+     /ant:status               📋 Check colony state
+     /ant:focus                🎯 Set initial focus
   ```

package/.aether/commands/insert-phase.yaml

@@ -67,7 +67,7 @@ body: |
   {{TOOL_PREFIX "Inserting corrective phase..."}}
 
   ```bash
-  bash .aether/aether-utils.sh phase-insert "<phase_name>" "<goal_text>" "<constraints_text>"
+  aether phase-insert --name "<phase_name>" --goal "<goal_text>" --constraints "<constraints_text>"
   ```
 
   Parse JSON result:

package/.aether/commands/interpret.yaml

@@ -236,7 +236,7 @@ body: |
   Run using the Bash tool with description "Logging interpretation activity...":
   {{/claude}}
   ```bash
-  bash .aether/aether-utils.sh activity-log "INTERPRET" "Interpreter" "Dream review: {dream_file}, {confirmed} confirmed, {partial} partial, {unconfirmed} unconfirmed, {refuted} refuted, {actions_taken} actions taken"
+  aether activity-log "INTERPRET" "Interpreter" "Dream review: {dream_file}, {confirmed} confirmed, {partial} partial, {unconfirmed} unconfirmed, {refuted} refuted, {actions_taken} actions taken"
   ```
 
   ### Step 8: Display Closing
@@ -268,7 +268,7 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}
 

package/.aether/commands/lay-eggs.yaml

@@ -145,11 +145,11 @@ body: |
   {{#claude}}
   Run using the Bash tool with description "Initializing QUEEN.md...":
   ```bash
-  bash .aether/aether-utils.sh queen-init
+  aether queen-init
   ```
   {{/claude}}
   {{#opencode}}
-  Run: `bash .aether/aether-utils.sh queen-init`
+  Run: `aether queen-init`
   {{/opencode}}
 
   Parse the JSON result:
@@ -167,7 +167,7 @@ body: |
   Run (ignore errors):
   {{/opencode}}
   ```bash
-  bash .aether/aether-utils.sh registry-add "$(pwd)" "$(jq -r '.version // "unknown"' ~/.aether/version.json 2>/dev/null || echo 'unknown')" 2>/dev/null || true
+  aether registry-add --path "$(pwd)" "$(jq -r '.version // "unknown"' ~/.aether/version.json 2>/dev/null || echo 'unknown')" 2>/dev/null || true
   ```
 
   ### Step 7: Verify Setup

package/.aether/commands/maturity.yaml

@@ -8,7 +8,7 @@ body: |
   ### Step 1: Detect Current Milestone
 
   {{TOOL_PREFIX "Detecting colony milestone..."}}
-  `bash .aether/aether-utils.sh milestone-detect`
+  `aether milestone-detect`
 
   Parse JSON result to get:
   - `milestone`: Current milestone name (First Mound, Open Chambers, Brood Stable, Ventilated Nest, Sealed Chambers, Crowned Anthill)
@@ -117,6 +117,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}

package/.aether/commands/memory-details.yaml

@@ -17,7 +17,7 @@ body: |
 
   Run using the Bash tool with description "Loading colony memory...":
   ```bash
-  bash .aether/aether-utils.sh memory-metrics
+  aether memory-metrics
   ```
 
   ### Step 2: Display Wisdom (from QUEEN.md)

package/.aether/commands/migrate-state.yaml

@@ -169,6 +169,6 @@ body: |
   state=$(jq -r '.state // "IDLE"' .aether/data/COLONY_STATE.json)
   current_phase=$(jq -r '.current_phase // 0' .aether/data/COLONY_STATE.json)
   total_phases=$(jq -r '.plan.phases | length' .aether/data/COLONY_STATE.json)
-  bash .aether/aether-utils.sh print-next-up "$state" "$current_phase" "$total_phases"
+  aether print-next-up
   ```
   {{/claude}}