diff --git a/README.md b/README.md index 23acb713..7abf4fbb 100644 --- a/README.md +++ b/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) -[![Version](https://img.shields.io/badge/Version-2.59.0-blue)](https://github.com/marcusquinn/aidevops/releases) +[![Version](https://img.shields.io/badge/Version-2.60.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) @@ -1144,17 +1144,32 @@ See `.agent/scripts/commands/full-loop.md` for complete documentation. Work on multiple branches simultaneously without stashing or switching. Each branch gets its own directory. -**Quick usage:** +**Recommended: [Worktrunk](https://worktrunk.dev)** (`wt`) - Git worktree management with shell integration, CI status, and PR links: ```bash -# Create worktree for a new branch -~/.aidevops/agents/scripts/worktree-helper.sh add feature/my-feature -# Creates: ~/Git/aidevops-feature-my-feature/ +# Install (macOS/Linux) +brew install max-sixty/worktrunk/wt && wt config shell install +# Restart your shell for shell integration to take effect -# List all worktrees -~/.aidevops/agents/scripts/worktree-helper.sh list +# Create worktree + cd into it +wt switch -c feature/my-feature + +# Create worktree + start any AI CLI (-x runs command after switch) +wt switch -c -x claude feature/ai-task + +# List worktrees with CI status and PR links +wt list + +# Merge + cleanup (squash/rebase options) +wt merge +``` + +**Fallback** (no dependencies): -# Clean up after merge +```bash +~/.aidevops/agents/scripts/worktree-helper.sh add feature/my-feature +# Creates: ~/Git/{repo}-feature-my-feature/ (cd there manually) +~/.aidevops/agents/scripts/worktree-helper.sh list ~/.aidevops/agents/scripts/worktree-helper.sh clean ``` @@ -1162,11 +1177,11 @@ Work on multiple branches simultaneously without stashing or switching. Each bra - Run tests on one branch while coding on another - Compare implementations side-by-side - No context switching or stash management -- Each OpenCode session can work on a different branch +- Each AI session can work on a different branch **Worktree-first workflow:** The pre-edit check now **enforces** worktrees as the default when creating branches, keeping your main directory on `main`. This prevents uncommitted changes from blocking branch switches and ensures parallel sessions don't inherit wrong branch state. -See `.agent/workflows/worktree.md` for the complete guide. +See `.agent/workflows/worktree.md` for the complete guide and `.agent/tools/git/worktrunk.md` for Worktrunk documentation. ### Session Management - Parallel AI Sessions @@ -1190,9 +1205,11 @@ opencode --non-interactive --prompt "Continue with feature X" & # New terminal tab (macOS) osascript -e 'tell application "Terminal" to do script "cd ~/Git/project && opencode"' -# Worktree-based (isolated branch) -~/.aidevops/agents/scripts/worktree-helper.sh add feature/next-feature -cd ../project-feature-next-feature && opencode +# Worktree-based (isolated branch) - recommended +wt switch -c -x opencode feature/next-feature # Worktrunk: create + start AI CLI +# Or fallback: +# ~/.aidevops/agents/scripts/worktree-helper.sh add feature/next-feature +# cd ~/Git/{repo}-feature-next-feature && opencode ``` **Session handoff pattern:** diff --git a/setup.sh b/setup.sh index cfc23f34..30432063 100755 --- a/setup.sh +++ b/setup.sh @@ -3,7 +3,7 @@ # AI Assistant Server Access Framework Setup Script # Helps developers set up the framework for their infrastructure # -# Version: 2.59.0 +# Version: 2.60.0 # # Quick Install (one-liner): # bash <(curl -fsSL https://aidevops.dev/install) diff --git a/sonar-project.properties b/sonar-project.properties index bff9a745..2e69a34d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,7 +5,7 @@ sonar.organization=marcusquinn # This is the name and version displayed in the SonarCloud UI sonar.projectName=AI DevOps Framework -sonar.projectVersion=2.59.0 +sonar.projectVersion=2.60.0 # Path is relative to the sonar-project.properties file sonar.sources=.agent,configs,templates