aidevops 2.100.7 → 2.100.9

package/VERSION

@@ -1 +1 @@
-2.100.7
+2.100.9

package/aidevops.sh

@@ -3,7 +3,7 @@
 # AI DevOps Framework CLI
 # Usage: aidevops <command> [options]
 #
-# Version: 2.100.7
+# Version: 2.100.9
 
 set -euo pipefail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "2.100.7",
+  "version": "2.100.9",
   "description": "AI DevOps Framework - AI-assisted development workflows, code quality, and deployment automation",
   "type": "module",
   "main": "index.js",

package/setup.sh

@@ -3,7 +3,7 @@
 # AI Assistant Server Access Framework Setup Script
 # Helps developers set up the framework for their infrastructure
 #
-# Version: 2.100.7
+# Version: 2.100.9
 #
 # Quick Install (one-liner):
 #   bash <(curl -fsSL https://aidevops.dev/install)
@@ -412,6 +412,85 @@ disable_ondemand_mcps() {
     return 0
 }
 
+# Validate and repair OpenCode config schema
+# Fixes common issues from manual editing or AI-generated configs:
+# - MCP entries missing "type": "local" field
+# - tools entries as objects {} instead of booleans
+# If invalid, backs up and regenerates using the generator script
+validate_opencode_config() {
+    local opencode_config
+    opencode_config=$(find_opencode_config) || return 0
+    
+    if [[ ! -f "$opencode_config" ]]; then
+        return 0
+    fi
+    
+    if ! command -v jq &> /dev/null; then
+        return 0
+    fi
+    
+    local needs_repair=false
+    local issues=""
+    
+    # Check 1: MCP entries must have "type" field (usually "local")
+    # Invalid: {"mcp": {"foo": {"command": "..."}}}
+    # Valid:   {"mcp": {"foo": {"type": "local", "command": "..."}}}
+    local mcps_without_type
+    mcps_without_type=$(jq -r '.mcp // {} | to_entries[] | select(.value.type == null and .value.command != null) | .key' "$opencode_config" 2>/dev/null | head -5)
+    if [[ -n "$mcps_without_type" ]]; then
+        needs_repair=true
+        issues="${issues}\n  - MCP entries missing 'type' field: $(echo "$mcps_without_type" | tr '\n' ', ' | sed 's/,$//')"
+    fi
+    
+    # Check 2: tools entries must be booleans, not objects
+    # Invalid: {"tools": {"gh_grep": {}}}
+    # Valid:   {"tools": {"gh_grep": true}}
+    local tools_as_objects
+    tools_as_objects=$(jq -r '.tools // {} | to_entries[] | select(.value | type == "object") | .key' "$opencode_config" 2>/dev/null | head -5)
+    if [[ -n "$tools_as_objects" ]]; then
+        needs_repair=true
+        issues="${issues}\n  - tools entries as objects instead of booleans: $(echo "$tools_as_objects" | tr '\n' ', ' | sed 's/,$//')"
+    fi
+    
+    # Check 3: Try to parse with opencode (if available) to catch other schema issues
+    if command -v opencode &> /dev/null; then
+        local validation_output
+        if ! validation_output=$(opencode --version 2>&1); then
+            # If opencode fails to start, config might be invalid
+            if echo "$validation_output" | grep -q "Configuration is invalid"; then
+                needs_repair=true
+                issues="${issues}\n  - OpenCode reports invalid configuration"
+            fi
+        fi
+    fi
+    
+    if [[ "$needs_repair" == "true" ]]; then
+        print_warning "OpenCode config has schema issues:$issues"
+        
+        # Backup the invalid config
+        create_backup_with_rotation "$opencode_config" "opencode"
+        print_info "Backed up invalid config"
+        
+        # Remove the invalid config so generator creates fresh one
+        rm -f "$opencode_config"
+        
+        # Regenerate using the generator script
+        local generator_script="$HOME/.aidevops/agents/scripts/generate-opencode-agents.sh"
+        if [[ -x "$generator_script" ]]; then
+            print_info "Regenerating OpenCode config with correct schema..."
+            if "$generator_script" > /dev/null 2>&1; then
+                print_success "OpenCode config regenerated successfully"
+            else
+                print_warning "Config regeneration failed - run manually: $generator_script"
+            fi
+        else
+            print_warning "Generator script not found - run setup.sh again after agents are deployed"
+        fi
+    fi
+    
+    return 0
+}
+
 # Migrate old config-backups to new per-type backup structure
 # This runs once to clean up the legacy backup directory
 migrate_old_backups() {
@@ -996,7 +1075,8 @@ setup_worktrunk() {
                 print_info "Shell integration not detected"
                 read -r -p "Install Worktrunk shell integration (enables 'wt switch' to change directories)? [Y/n]: " install_shell
                 if [[ "$install_shell" =~ ^[Yy]?$ ]]; then
-                    if wt config shell install 2>/dev/null; then
+                    print_info "Installing shell integration..."
+                    if wt config shell install; then
                         print_success "Shell integration installed"
                         print_info "Restart your terminal or run: source $shell_rc"
                     else
@@ -1028,8 +1108,10 @@ setup_worktrunk() {
         
         if [[ "$install_wt" =~ ^[Yy]?$ ]]; then
             if run_with_spinner "Installing Worktrunk via Homebrew" brew install max-sixty/worktrunk/wt; then
-                # Install shell integration
-                if run_with_spinner "Installing shell integration" wt config shell install; then
+                # Install shell integration (don't use spinner - command is fast and may need interaction)
+                print_info "Installing shell integration..."
+                if wt config shell install; then
+                    print_success "Shell integration installed"
                     print_info "Restart your terminal or source your shell config"
                 else
                     print_warning "Shell integration failed - run manually: wt config shell install"
@@ -1056,8 +1138,10 @@ setup_worktrunk() {
         
         if [[ "$install_wt" =~ ^[Yy]?$ ]]; then
             if run_with_spinner "Installing Worktrunk via Cargo" cargo install worktrunk; then
-                # Install shell integration
-                if run_with_spinner "Installing shell integration" wt config shell install; then
+                # Install shell integration (don't use spinner - command is fast and may need interaction)
+                print_info "Installing shell integration..."
+                if wt config shell install; then
+                    print_success "Shell integration installed"
                     print_info "Restart your terminal or source your shell config"
                 else
                     print_warning "Shell integration failed - run manually: wt config shell install"
@@ -1813,15 +1897,24 @@ deploy_aidevops_agents() {
         if [[ -f "$plan_reminder" && -f "$plan_plus" ]]; then
             # Check if plan-plus.md has the placeholder marker
             if grep -q "OPENCODE-PLAN-REMINDER-INJECT" "$plan_plus"; then
-                # Replace placeholder with extracted content
-                local reminder_content
-                reminder_content=$(cat "$plan_reminder")
-                # Use awk to replace the placeholder section
-                awk -v content="$reminder_content" '
-                    /<!-- OPENCODE-PLAN-REMINDER-INJECT-START -->/ { print; print content; skip=1; next }
-                    /<!-- OPENCODE-PLAN-REMINDER-INJECT-END -->/ { skip=0 }
-                    !skip { print }
-                ' "$plan_plus" > "$plan_plus.tmp" && mv "$plan_plus.tmp" "$plan_plus"
+                # Replace placeholder with extracted content using sed
+                # (awk -v doesn't handle multi-line content with special chars well)
+                local tmp_file
+                tmp_file=$(mktemp)
+                local in_placeholder=false
+                while IFS= read -r line || [[ -n "$line" ]]; do
+                    if [[ "$line" == *"OPENCODE-PLAN-REMINDER-INJECT-START"* ]]; then
+                        echo "$line" >> "$tmp_file"
+                        cat "$plan_reminder" >> "$tmp_file"
+                        in_placeholder=true
+                    elif [[ "$line" == *"OPENCODE-PLAN-REMINDER-INJECT-END"* ]]; then
+                        echo "$line" >> "$tmp_file"
+                        in_placeholder=false
+                    elif [[ "$in_placeholder" == false ]]; then
+                        echo "$line" >> "$tmp_file"
+                    fi
+                done < "$plan_plus"
+                mv "$tmp_file" "$plan_plus"
                 print_info "Injected OpenCode plan-reminder into Plan+"
             fi
         fi
@@ -3418,6 +3511,7 @@ main() {
     confirm_step "Migrate loop state from .claude/ to .agent/loop-state/" && migrate_loop_state_directories
     confirm_step "Cleanup deprecated agent paths" && cleanup_deprecated_paths
     confirm_step "Cleanup deprecated MCP entries (hetzner, serper, etc.)" && cleanup_deprecated_mcps
+    confirm_step "Validate and repair OpenCode config schema" && validate_opencode_config
     confirm_step "Extract OpenCode prompts" && extract_opencode_prompts
     confirm_step "Check OpenCode prompt drift" && check_opencode_prompt_drift
     confirm_step "Deploy aidevops agents to ~/.aidevops/agents/" && deploy_aidevops_agents
@@ -3532,8 +3626,8 @@ echo "  aidevops uninstall    - Remove aidevops"
         read -r -p "Launch OpenCode with /onboarding now? [Y/n]: " launch_onboarding
         if [[ "$launch_onboarding" =~ ^[Yy]?$ || "$launch_onboarding" == "Y" ]]; then
             echo ""
-            echo "Starting OpenCode..."
-            opencode --prompt "/onboarding"
+            echo "Starting OpenCode with Onboarding agent..."
+            opencode --agent Onboarding --prompt "/onboarding"
         else
             echo ""
             echo "You can run /onboarding anytime in OpenCode to configure services."