aidevops 2.56.0 → 2.57.0

package/README.md

@@ -57,7 +57,7 @@ The result: AI agents that work *with* your development process, not around it.
 [![GitHub commits since latest release](https://img.shields.io/github/commits-since/marcusquinn/aidevops/latest)](https://github.com/marcusquinn/aidevops/commits/main)
 
 <!-- Repository Stats -->
-[![Version](https://img.shields.io/badge/Version-2.56.0-blue)](https://github.com/marcusquinn/aidevops/releases)
+[![Version](https://img.shields.io/badge/Version-2.57.0-blue)](https://github.com/marcusquinn/aidevops/releases)
 [![GitHub repo size](https://img.shields.io/github/repo-size/marcusquinn/aidevops?style=flat&color=blue)](https://github.com/marcusquinn/aidevops)
 [![Lines of code](https://img.shields.io/badge/Lines%20of%20Code-18%2C000%2B-brightgreen)](https://github.com/marcusquinn/aidevops)
 [![GitHub language count](https://img.shields.io/github/languages/count/marcusquinn/aidevops)](https://github.com/marcusquinn/aidevops)

package/VERSION

@@ -1 +1 @@
-2.56.0
+2.57.0

package/aidevops.sh

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aidevops",
-  "version": "2.56.0",
+  "version": "2.57.0",
   "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.56.0
+# Version: 2.57.0
 #
 # Quick Install (one-liner):
 #   bash <(curl -fsSL https://aidevops.dev/install)
@@ -562,6 +562,132 @@ setup_git_clis() {
     return 0
 }
 
+# Setup Worktrunk - Git worktree management for parallel AI agent workflows
+setup_worktrunk() {
+    print_info "Setting up Worktrunk (git worktree management)..."
+    
+    # Check if worktrunk (wt) is already installed
+    if command -v wt >/dev/null 2>&1; then
+        local wt_version
+        wt_version=$(wt --version 2>/dev/null | head -1 || echo "unknown")
+        print_success "Worktrunk already installed: $wt_version"
+        
+        # Check if shell integration is installed
+        local shell_name
+        shell_name=$(basename "${SHELL:-/bin/bash}")
+        local shell_rc=""
+        case "$shell_name" in
+            zsh)  shell_rc="$HOME/.zshrc" ;;
+            bash) 
+                if [[ "$(uname)" == "Darwin" ]]; then
+                    shell_rc="$HOME/.bash_profile"
+                else
+                    shell_rc="$HOME/.bashrc"
+                fi
+                ;;
+        esac
+        
+        if [[ -n "$shell_rc" ]] && [[ -f "$shell_rc" ]]; then
+            if ! grep -q "worktrunk" "$shell_rc" 2>/dev/null; then
+                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" == "y" ]]; then
+                    if wt config shell install 2>/dev/null; then
+                        print_success "Shell integration installed"
+                        print_info "Restart your terminal or run: source $shell_rc"
+                    else
+                        print_warning "Shell integration failed - run manually: wt config shell install"
+                    fi
+                fi
+            else
+                print_success "Shell integration already configured"
+            fi
+        fi
+        return 0
+    fi
+    
+    # Worktrunk not installed - offer to install
+    print_info "Worktrunk makes git worktrees as easy as branches"
+    echo "  • wt switch feat     - Switch/create worktree (with cd)"
+    echo "  • wt list            - List worktrees with CI status"
+    echo "  • wt merge           - Squash/rebase/merge + cleanup"
+    echo "  • Hooks for automated setup (npm install, etc.)"
+    echo ""
+    echo "  Note: aidevops also includes worktree-helper.sh as a fallback"
+    echo ""
+    
+    local pkg_manager
+    pkg_manager=$(detect_package_manager)
+    
+    if [[ "$pkg_manager" == "brew" ]]; then
+        read -r -p "Install Worktrunk via Homebrew? (y/n): " install_wt
+        
+        if [[ "$install_wt" == "y" ]]; then
+            print_info "Installing Worktrunk..."
+            if brew install max-sixty/worktrunk/wt 2>/dev/null; then
+                print_success "Worktrunk installed"
+                
+                # Install shell integration
+                print_info "Installing shell integration..."
+                if wt config shell install 2>/dev/null; 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"
+                fi
+                
+                echo ""
+                print_info "Quick start:"
+                echo "  wt switch feature/my-feature  # Create/switch to worktree"
+                echo "  wt list                       # List all worktrees"
+                echo "  wt merge                      # Merge and cleanup"
+                echo ""
+                print_info "Documentation: ~/.aidevops/agents/tools/git/worktrunk.md"
+            else
+                print_warning "Homebrew installation failed"
+                echo "  Try: cargo install worktrunk && wt config shell install"
+            fi
+        else
+            print_info "Skipped Worktrunk installation"
+            print_info "Install later: brew install max-sixty/worktrunk/wt"
+            print_info "Fallback available: ~/.aidevops/agents/scripts/worktree-helper.sh"
+        fi
+    elif command -v cargo >/dev/null 2>&1; then
+        read -r -p "Install Worktrunk via Cargo? (y/n): " install_wt
+        
+        if [[ "$install_wt" == "y" ]]; then
+            print_info "Installing Worktrunk via Cargo..."
+            if cargo install worktrunk 2>/dev/null; then
+                print_success "Worktrunk installed"
+                
+                # Install shell integration
+                if wt config shell install 2>/dev/null; then
+                    print_success "Shell integration installed"
+                else
+                    print_warning "Shell integration failed - run manually: wt config shell install"
+                fi
+            else
+                print_warning "Cargo installation failed"
+            fi
+        else
+            print_info "Skipped Worktrunk installation"
+        fi
+    else
+        print_warning "Worktrunk not installed"
+        echo ""
+        echo "  Install options:"
+        echo "    macOS/Linux (Homebrew): brew install max-sixty/worktrunk/wt"
+        echo "    Cargo:                  cargo install worktrunk"
+        echo "    Windows:                winget install max-sixty.worktrunk"
+        echo ""
+        echo "  After install: wt config shell install"
+        echo ""
+        print_info "Fallback available: ~/.aidevops/agents/scripts/worktree-helper.sh"
+    fi
+    
+    return 0
+}
+
 # Setup recommended tools (Tabby terminal, Zed editor)
 setup_recommended_tools() {
     print_info "Checking recommended development tools..."
@@ -2306,6 +2432,7 @@ main() {
     confirm_step "Check optional dependencies (bun, node, python)" && check_optional_deps
     confirm_step "Setup recommended tools (Tabby, Zed, etc.)" && setup_recommended_tools
     confirm_step "Setup Git CLIs (gh, glab, tea)" && setup_git_clis
+    confirm_step "Setup Worktrunk (git worktree management)" && setup_worktrunk
     confirm_step "Setup SSH key" && setup_ssh_key
     confirm_step "Setup configuration files" && setup_configs
     confirm_step "Set secure permissions on config files" && set_permissions

package/templates/deploy-templates.sh

@@ -12,6 +12,10 @@ readonly YELLOW='\033[1;33m'
 readonly BLUE='\033[0;34m'
 readonly NC='\033[0m' # No Color
 
+# Backup configuration
+readonly BACKUP_KEEP_COUNT=5
+readonly BACKUP_BASE_DIR="$HOME/.aidevops/template-backups"
+
 # Print functions
 print_info() { local msg="$1"; echo -e "${BLUE}[INFO]${NC} $msg"; return 0; }
 print_success() { local msg="$1"; echo -e "${GREEN}[SUCCESS]${NC} $msg"; return 0; }
@@ -28,15 +32,93 @@ if [[ ! -f "$REPO_ROOT/AGENTS.md" ]] || [[ ! -d "$REPO_ROOT/.agent" ]]; then
     exit 1
 fi
 
+# Create a backup with rotation (keeps last N backups in centralized location)
+# Usage: create_backup_with_rotation <source_path> <backup_name>
+create_backup_with_rotation() {
+    local source_path="$1"
+    local backup_name="$2"
+    local backup_dir
+    # Use nanoseconds to avoid collisions on rapid successive invocations
+    backup_dir="$BACKUP_BASE_DIR/$backup_name/$(date +%Y%m%d_%H%M%S%N)"
+
+    # Validate source exists before attempting backup
+    if [[ -d "$source_path" ]]; then
+        mkdir -p "$backup_dir"
+        cp -R "$source_path" "$backup_dir/"
+    elif [[ -f "$source_path" ]]; then
+        mkdir -p "$backup_dir"
+        cp "$source_path" "$backup_dir/"
+    else
+        print_warning "Source path does not exist: $source_path"
+        return 1
+    fi
+
+    print_info "Backed up to $backup_dir"
+
+    # Rotate old backups (keep last N)
+    local backup_type_dir="$BACKUP_BASE_DIR/$backup_name"
+    local backup_count
+    backup_count=$(find "$backup_type_dir" -maxdepth 1 -type d -name "20*" 2>/dev/null | wc -l)
+
+    if (( backup_count > BACKUP_KEEP_COUNT )); then
+        local to_delete=$((backup_count - BACKUP_KEEP_COUNT))
+        # Delete oldest backups (sorted by name = sorted by date)
+        find "$backup_type_dir" -maxdepth 1 -type d -name "20*" -print0 2>/dev/null | sort -z | head -z -n "$to_delete" | xargs -0 rm -rf
+        print_info "Rotated backups: removed $to_delete old backup(s)"
+    fi
+
+    return 0
+}
+
+# Clean up old in-place backup files from previous versions
+# Uses find -delete to safely remove only files (not directories)
+cleanup_old_backups() {
+    local cleaned=0
+    local count
+    
+    # Clean ~/AGENTS.md.backup.* files
+    count=$(find "$HOME" -maxdepth 1 -name "AGENTS.md.backup.*" -type f 2>/dev/null | wc -l)
+    if (( count > 0 )); then
+        find "$HOME" -maxdepth 1 -name "AGENTS.md.backup.*" -type f -delete 2>/dev/null
+        (( cleaned += count ))
+    fi
+    
+    # Clean ~/git/AGENTS.md.backup.* or ~/Git/AGENTS.md.backup.* files
+    for git_dir in "$HOME/git" "$HOME/Git"; do
+        if [[ -d "$git_dir" ]]; then
+            count=$(find "$git_dir" -maxdepth 1 -name "AGENTS.md.backup.*" -type f 2>/dev/null | wc -l)
+            if (( count > 0 )); then
+                find "$git_dir" -maxdepth 1 -name "AGENTS.md.backup.*" -type f -delete 2>/dev/null
+                (( cleaned += count ))
+            fi
+        fi
+    done
+    
+    # Clean ~/.aidevops/.agent-workspace/README.md.backup.* files
+    local workspace="$HOME/.aidevops/.agent-workspace"
+    if [[ -d "$workspace" ]]; then
+        count=$(find "$workspace" -maxdepth 1 -name "README.md.backup.*" -type f 2>/dev/null | wc -l)
+        if (( count > 0 )); then
+            find "$workspace" -maxdepth 1 -name "README.md.backup.*" -type f -delete 2>/dev/null
+            (( cleaned += count ))
+        fi
+    fi
+    
+    if (( cleaned > 0 )); then
+        print_success "Cleaned up $cleaned old backup file(s)"
+    fi
+    
+    return 0
+}
+
 deploy_home_agents() {
     local target_file="$HOME/AGENTS.md"
     
     print_info "Deploying minimal AGENTS.md to home directory..."
     
-    # Backup existing file if it exists
+    # Backup existing file if it exists (with rotation)
     if [[ -f "$target_file" ]]; then
-        print_warning "Existing AGENTS.md found, creating backup..."
-        cp "$target_file" "$target_file.backup.$(date +%Y%m%d_%H%M%S)"
+        create_backup_with_rotation "$target_file" "home-agents"
     fi
     
     # Deploy template
@@ -57,10 +139,9 @@ deploy_git_agents() {
         print_info "Created git directory: $git_dir"
     fi
     
-    # Backup existing file if it exists
+    # Backup existing file if it exists (with rotation)
     if [[ -f "$target_file" ]]; then
-        print_warning "Existing git/AGENTS.md found, creating backup..."
-        cp "$target_file" "$target_file.backup.$(date +%Y%m%d_%H%M%S)"
+        create_backup_with_rotation "$target_file" "git-agents"
     fi
     
     # Deploy template
@@ -81,10 +162,9 @@ deploy_agent_directory() {
         print_info "Created workspace directory: $agent_workspace"
     fi
     
-    # Backup existing README if it exists
+    # Backup existing README if it exists (with rotation)
     if [[ -f "$target_file" ]]; then
-        print_warning "Existing .agent-workspace/README.md found, creating backup..."
-        cp "$target_file" "$target_file.backup.$(date +%Y%m%d_%H%M%S)"
+        create_backup_with_rotation "$target_file" "workspace-readme"
     fi
     
     # Deploy template
@@ -128,6 +208,9 @@ main() {
     print_info "Deploying minimal, secure AGENTS.md templates..."
     print_warning "These templates contain minimal instructions to prevent prompt injection attacks"
     
+    # Clean up old in-place backups from previous versions
+    cleanup_old_backups
+    
     deploy_home_agents
     deploy_git_agents
     deploy_agent_directory