aether-colony 3.1.5 → 3.1.16

package/bin/generate-commands.sh

@@ -39,6 +39,28 @@ log_error() {
     echo -e "${RED}[ERROR]${NC} $1"
 }
 
+# Compute SHA hash with error handling
+# Returns 0 on success, 1 on failure
+# Echoes hash on success, error message on failure
+compute_hash() {
+    local file="$1"
+
+    if [[ ! -r "$file" ]]; then
+        echo "NOT_READABLE"
+        return 1
+    fi
+
+    local hash
+    hash=$(shasum "$file" 2>/dev/null | cut -d' ' -f1)
+    if [[ -z "$hash" ]]; then
+        echo "HASH_FAILED"
+        return 1
+    fi
+
+    echo "$hash"
+    return 0
+}
+
 # Count commands in each directory
 count_commands() {
     local dir="$1"
@@ -49,10 +71,17 @@ count_commands() {
     fi
 }
 
-# List command files
+# List command files (PLAN-006 fix #13 - warn about non-.md files)
 list_commands() {
     local dir="$1"
     if [[ -d "$dir" ]]; then
+        # Check for non-.md files and warn
+        local non_md_count
+        non_md_count=$(find "$dir" -type f ! -name "*.md" 2>/dev/null | wc -l | tr -d ' ')
+        if [[ "$non_md_count" -gt 0 ]]; then
+            log_warn "$non_md_count non-.md file(s) found in $dir (ignored)"
+        fi
+
         find "$dir" -name "*.md" -exec basename {} \; | sort
     fi
 }
@@ -67,6 +96,19 @@ check_sync() {
     echo "Claude Code commands: $claude_count"
     echo "OpenCode commands:    $opencode_count"
 
+    # PLAN-006 fix #10 - warn about empty directories
+    if [[ "$claude_count" -eq 0 ]] && [[ "$opencode_count" -eq 0 ]]; then
+        log_warn "Both command directories are empty"
+        echo "This may indicate a misconfiguration"
+    fi
+
+    # PLAN-006 fix #11 - warn about large command counts
+    local max_commands=500
+    if [[ "$claude_count" -gt "$max_commands" ]] || [[ "$opencode_count" -gt "$max_commands" ]]; then
+        log_warn "Large number of commands ($claude_count/$opencode_count)"
+        echo "This may cause performance issues during sync checks"
+    fi
+
     if [[ "$claude_count" != "$opencode_count" ]]; then
         log_error "Command counts don't match!"
         return 1
@@ -96,12 +138,16 @@ check_sync() {
 check_content() {
     log_info "Checking content-level sync (checksums)..."
 
-    local claude_files=$(list_commands "$CLAUDE_DIR")
     local drift_count=0
+    local error_count=0
+    local match_count=0
     local drift_files=""
+    local error_files=""
 
-    for file in $claude_files; do
-        local claude_file="$CLAUDE_DIR/$file"
+    # Use null delimiter for safe iteration (handles filenames with spaces)
+    while IFS= read -r -d '' claude_file; do
+        local file
+        file=$(basename "$claude_file")
         local opencode_file="$OPENCODE_DIR/$file"
 
         # Skip if OpenCode file doesn't exist (already caught by Pass 1)
@@ -109,10 +155,23 @@ check_content() {
             continue
         fi
 
-        # Compare SHA-1 checksums (portable across macOS and Linux)
+        # Compute hashes with error handling
         local claude_hash opencode_hash
-        claude_hash=$(shasum "$claude_file" | cut -d' ' -f1)
-        opencode_hash=$(shasum "$opencode_file" | cut -d' ' -f1)
+        claude_hash=$(compute_hash "$claude_file")
+        if [[ $? -ne 0 ]]; then
+            log_error "Cannot hash $claude_file ($claude_hash)"
+            error_files="${error_files}  ${file} (${claude_hash})\n"
+            error_count=$((error_count + 1))
+            continue
+        fi
+
+        opencode_hash=$(compute_hash "$opencode_file")
+        if [[ $? -ne 0 ]]; then
+            log_error "Cannot hash $opencode_file ($opencode_hash)"
+            error_files="${error_files}  ${file} (${opencode_hash})\n"
+            error_count=$((error_count + 1))
+            continue
+        fi
 
         if [[ "$claude_hash" != "$opencode_hash" ]]; then
             drift_count=$((drift_count + 1))
@@ -122,13 +181,34 @@ check_content() {
             echo "  Claude:  $claude_hash"
             echo "  OpenCode: $opencode_hash"
 
-            # Show first 10 lines of diff for context (|| true to handle set -e)
+            # PLAN-006 fix #12 - improved diff error handling
             echo "  ---"
-            diff -u "$claude_file" "$opencode_file" | head -20 || true
+            local diff_output
+            if diff_output=$(diff -u "$claude_file" "$opencode_file" 2>&1); then
+                # Files are same (shouldn't happen if hashes differ, but handle it)
+                echo "$diff_output" | head -20
+            else
+                local diff_exit=$?
+                if [[ "$diff_output" == *"diff:"* && "$diff_output" == *"No such file"* ]]; then
+                    log_error "diff failed: $diff_output"
+                else
+                    # Normal diff output (exit 1 means files differ)
+                    echo "$diff_output" | head -20
+                fi
+            fi
             echo "  ---"
             echo ""
+        else
+            match_count=$((match_count + 1))
         fi
-    done
+    done < <(find "$CLAUDE_DIR" -name "*.md" -type f -print0 2>/dev/null | sort -z)
+
+    # Report results
+    if [[ "$error_count" -gt 0 ]]; then
+        echo ""
+        log_error "Hash errors in $error_count file(s):"
+        echo -e "$error_files"
+    fi
 
     if [[ "$drift_count" -gt 0 ]]; then
         echo ""
@@ -137,7 +217,11 @@ check_content() {
         return 1
     fi
 
-    log_info "All file contents match (checksums verified)"
+    if [[ "$error_count" -gt 0 ]]; then
+        return 1
+    fi
+
+    log_info "All file contents match (checksums verified: $match_count files)"
     return 0
 }
 
@@ -145,10 +229,10 @@ check_content() {
 show_diff() {
     log_info "Comparing command sets..."
 
-    local claude_files=$(list_commands "$CLAUDE_DIR")
-
-    for file in $claude_files; do
-        local claude_file="$CLAUDE_DIR/$file"
+    # Use null delimiter for safe iteration (handles filenames with spaces)
+    while IFS= read -r -d '' claude_file; do
+        local file
+        file=$(basename "$claude_file")
         local opencode_file="$OPENCODE_DIR/$file"
 
         if [[ ! -f "$opencode_file" ]]; then
@@ -163,7 +247,7 @@ show_diff() {
         if [[ "$claude_size" != "$opencode_size" ]]; then
             echo "$file: $claude_size lines (Claude) vs $opencode_size lines (OpenCode)"
         fi
-    done
+    done < <(find "$CLAUDE_DIR" -name "*.md" -type f -print0 2>/dev/null | sort -z)
 }
 
 # Display help

package/bin/lib/caste-colors.js

@@ -17,11 +17,11 @@ const pc = require('picocolors');
 
 // Caste definitions with colors and emojis (per CONTEXT.md decisions)
 const CASTE_STYLES = {
-  builder:  { color: 'blue',   emoji: '🔨', ansi: '\033[34m', pc: pc.blue },
-  watcher:  { color: 'green',  emoji: '👁️',  ansi: '\033[32m', pc: pc.green },
-  scout:    { color: 'yellow', emoji: '🔍', ansi: '\033[33m', pc: pc.yellow },
-  chaos:    { color: 'red',    emoji: '🎲', ansi: '\033[31m', pc: pc.red },
-  prime:    { color: 'magenta',emoji: '👑', ansi: '\033[35m', pc: pc.magenta }
+  builder:  { color: 'blue',   emoji: '🔨🐜', ansi: '\033[34m', pc: pc.blue },
+  watcher:  { color: 'green',  emoji: '👁️🐜',  ansi: '\033[32m', pc: pc.green },
+  scout:    { color: 'yellow', emoji: '🔍🐜', ansi: '\033[33m', pc: pc.yellow },
+  chaos:    { color: 'red',    emoji: '🎲🐜', ansi: '\033[31m', pc: pc.red },
+  prime:    { color: 'magenta',emoji: '👑🐜', ansi: '\033[35m', pc: pc.magenta }
 };
 
 // Get style for a caste (case-insensitive)

package/bin/lib/errors.js

@@ -179,6 +179,21 @@ class ConfigurationError extends AetherError {
   }
 }
 
+/**
+ * StateSchemaError - State file schema validation errors (PLAN-007 Fix 3)
+ */
+class StateSchemaError extends AetherError {
+  constructor(message, details = {}) {
+    super(
+      ErrorCodes.E_INVALID_STATE,
+      message,
+      details,
+      'Check state file structure and fix schema errors, or restore from backup'
+    );
+    this.name = 'StateSchemaError';
+  }
+}
+
 /**
  * Map error codes to sysexits.h exit codes
  * @param {string} code - Error code
@@ -233,6 +248,7 @@ module.exports = {
   ValidationError,
   FileSystemError,
   ConfigurationError,
+  StateSchemaError,
   ErrorCodes,
   getExitCode,
   wrapError,