Skip to content

docs: add Worktrunk as recommended worktree tool#116

Merged
marcusquinn merged 3 commits intomainfrom
chore/readme-worktrunk
Jan 17, 2026
Merged

docs: add Worktrunk as recommended worktree tool#116
marcusquinn merged 3 commits intomainfrom
chore/readme-worktrunk

Conversation

@marcusquinn
Copy link
Owner

@marcusquinn marcusquinn commented Jan 17, 2026

Summary

  • Document Worktrunk (wt) as the primary worktree management tool in README
  • Show installation command and key usage patterns (switch, list, merge)
  • Keep worktree-helper.sh as fallback for no-dependency environments
  • Update session spawning example to use wt switch -c -x

Changes

  • Git Worktrees section: Restructured to show Worktrunk first with full command examples
  • Session Management section: Updated worktree example to use Worktrunk

Why

Worktrunk provides a better UX than raw git worktree commands:

  • Shell integration (auto-cd into worktrees)
  • CI status and PR links in wt list
  • Integrated merge workflow with cleanup
  • LLM commit message support

The framework already documents Worktrunk in .agent/tools/git/worktrunk.md and .agent/workflows/worktree.md, but the main README was missing this recommendation.

Summary by CodeRabbit

  • Documentation
    • Replaced Git worktree guidance with a recommended Worktrunk-first workflow, added install and wt command examples (switch/list/merge), retained a non-dependency fallback, updated session-management guidance and related links, and adjusted wording/benefits to reflect AI sessions.
  • Chores
    • Bumped project version metadata to 2.60.0 across documentation and setup/configuration artifacts.

✏️ Tip: You can customize this high-level summary in your review settings.

- Document Worktrunk (wt) as the primary worktree management tool
- Show installation, key commands (switch, list, merge)
- Keep worktree-helper.sh as fallback for no-dependency environments
- Update session spawning example to use wt switch -c -x
@gemini-code-assist
Copy link

Summary of Changes

Hello @marcusquinn, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates the project's README.md to officially recommend Worktrunk as the preferred solution for managing Git worktrees. This change aims to enhance the developer experience by providing a more robust and feature-rich tool for parallel development, while still offering a no-dependency fallback.

Highlights

  • Worktrunk Recommendation: The README.md now prominently features Worktrunk (wt) as the primary tool for Git worktree management, including installation instructions and key usage examples.
  • Fallback Mechanism: The existing worktree-helper.sh script is retained and documented as a fallback option for environments without Worktrunk.
  • Session Management Update: The example for spawning worktree-based sessions in the "Session Management" section has been updated to utilize Worktrunk's wt switch -c -x command.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 17, 2026

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Walkthrough

README updates replace Worktree/script-based examples with Worktrunk (wt) usage, change "OpenCode session" to "AI session", add Worktrunk documentation references, and bump project version metadata in setup.sh and sonar-project.properties.

Changes

Cohort / File(s) Summary
Documentation — README
README.md
Replaces script-based quick-usage and Worktree examples with a Worktrunk-first workflow (wt switch, wt list, wt merge), adds brew install path, updates session-management examples to use Worktrunk, inserts .agent/tools/git/worktrunk.md documentation reference, and renames "OpenCode session" to "AI session". Review for example accuracy and link targets.
Scripts — Version metadata
setup.sh
Bumped version string from 2.59.0 to 2.60.0. No logic changes.
CI / Analysis config
sonar-project.properties
Bumped sonar.projectVersion from 2.59.0 to 2.60.0. No other config changes.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Poem

🌲 A trunk for work, a tidy new tune,
wt steps in under the brew-sipping moon.
AI sessions hum, branches align,
Docs refreshed — version bumped in line. ✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and accurately reflects the main objective of the PR—adding Worktrunk documentation as the recommended worktree tool. The README changes focus entirely on this shift.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link

🔍 Code Quality Report

�[0;35m[MONITOR]�[0m Code Review Monitoring Report

�[0;34m[INFO]�[0m Latest Quality Status:
SonarCloud: 0 bugs, 0 vulnerabilities, 272 code smells

�[0;34m[INFO]�[0m Recent monitoring activity:
Sat Jan 17 16:00:03 UTC 2026: Code review monitoring started
Sat Jan 17 16:00:04 UTC 2026: SonarCloud - Bugs: 0, Vulnerabilities: 0, Code Smells: 272
Sat Jan 17 16:00:04 UTC 2026: Qlty - 0 issues found, auto-formatting applied
Sat Jan 17 16:00:06 UTC 2026: Codacy analysis completed with auto-fixes

📈 Current Quality Metrics

  • BUGS: 0
  • CODE SMELLS: 272
  • VULNERABILITIES: 0

Generated on: Sat Jan 17 16:00:46 UTC 2026


Generated by AI DevOps Framework Code Review Monitoring

@augmentcode
Copy link

augmentcode bot commented Jan 17, 2026

🤖 Augment PR Summary

Summary: Updates the main README to recommend Worktrunk (wt) as the primary way to manage Git worktrees for parallel branch development.

Changes:

  • Restructures the Git Worktrees section to show Worktrunk first, including install and common workflows (switch/create, list, merge/cleanup)
  • Keeps worktree-helper.sh documented as a no-dependency fallback option
  • Updates the session spawning/worktree example to use wt switch -c -x …
  • Adjusts wording to be tool-agnostic ("AI session" vs "OpenCode session")
  • Adds a pointer to .agent/tools/git/worktrunk.md for detailed Worktrunk docs

🤖 Was this summary useful? React with 👍 or 👎

Copy link

@augmentcode augmentcode bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review completed. 1 suggestions posted.

Fix All in Augment

Comment augment review to trigger a new review at any time.

README.md Outdated
# Create worktree + cd into it
wt switch -c feature/my-feature

# Create worktree + start Claude Code
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section uses a claude example (wt ... -x claude) but the later session example uses opencode; consider clarifying that -x can launch any AI CLI (or keep one tool name consistent) to avoid confusing readers about which command is expected.

Fix This in Augment

🤖 Was this useful? React with 👍 or 👎

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the documentation to recommend Worktrunk (wt) as the primary tool for managing Git worktrees, moving the existing worktree-helper.sh script to a fallback option. The changes are well-structured and make the documentation clearer by highlighting a tool with a better user experience. I've provided a few suggestions to further improve the clarity and completeness of the documentation, particularly around the installation instructions for Worktrunk and the usage of the fallback script to ensure users have all the necessary information.

README.md Outdated
cd ../project-feature-next-feature && opencode
# Worktree-based (isolated branch) - recommended
wt switch -c -x opencode feature/next-feature # Worktrunk: create + start OpenCode
# Or fallback: ~/.aidevops/agents/scripts/worktree-helper.sh add feature/next-feature

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The fallback command provided is incomplete and could be misleading. The recommended wt command it's an alternative to creates a worktree, switches to it, and executes opencode. The current fallback only shows the creation step. To be a true alternative, it should show all steps, including changing into the new worktree directory and starting opencode, similar to how it was before this change.

Suggested change
# Or fallback: ~/.aidevops/agents/scripts/worktree-helper.sh add feature/next-feature
# Or fallback:
# ~/.aidevops/agents/scripts/worktree-helper.sh add feature/next-feature
# cd <path-to-worktree> && opencode

~/.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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For the shell integration from wt config shell install to take effect, the user needs to restart their shell. It would be helpful to add a comment mentioning this to improve the user experience.

Suggested change
brew install max-sixty/worktrunk/wt && wt config shell install
brew install max-sixty/worktrunk/wt && wt config shell install
# Restart your shell for the changes to take effect


# Clean up after merge
```bash
~/.aidevops/agents/scripts/worktree-helper.sh add feature/my-feature

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The previous version of the documentation included a helpful comment indicating the path where the worktree is created (e.g., # Creates: ~/Git/aidevops-feature-my-feature/). This was useful for users to know how to navigate to the new worktree. Since worktree-helper.sh is now the fallback, it would be beneficial to add this explanatory comment back to guide users.

Suggested change
~/.aidevops/agents/scripts/worktree-helper.sh add feature/my-feature
~/.aidevops/agents/scripts/worktree-helper.sh add feature/my-feature
# Note: This creates a new directory for the worktree, e.g., ~/Git/aidevops-feature-my-feature/

- Add shell restart note after wt config shell install
- Clarify -x flag runs any AI CLI command
- Add path comment to fallback worktree-helper.sh example
- Expand fallback in session spawning to show full workflow
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
README.md (1)

60-60: Fix version badge to match release version.

Pipeline validation failed: the version badge shows 2.59.0 but should show 2.60.0.

🔧 Proposed fix
-[![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-actions
Copy link

🔍 Code Quality Report

�[0;35m[MONITOR]�[0m Code Review Monitoring Report

�[0;34m[INFO]�[0m Latest Quality Status:
SonarCloud: 0 bugs, 0 vulnerabilities, 272 code smells

�[0;34m[INFO]�[0m Recent monitoring activity:
Sat Jan 17 16:03:03 UTC 2026: Code review monitoring started
Sat Jan 17 16:03:04 UTC 2026: SonarCloud - Bugs: 0, Vulnerabilities: 0, Code Smells: 272
Sat Jan 17 16:03:04 UTC 2026: Qlty - 0 issues found, auto-formatting applied
Sat Jan 17 16:03:06 UTC 2026: Codacy analysis completed with auto-fixes

📈 Current Quality Metrics

  • BUGS: 0
  • CODE SMELLS: 272
  • VULNERABILITIES: 0

Generated on: Sat Jan 17 16:03:45 UTC 2026


Generated by AI DevOps Framework Code Review Monitoring

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
README.md (1)

60-60: Critical: Version badge mismatch detected by pipeline.

The version badge shows 2.59.0 but the pipeline expects 2.60.0. This appears to be unrelated to the Worktrunk documentation changes but needs to be corrected before merge.

🔧 Proposed fix
-[![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)

Fix version inconsistency:
- README.md badge: 2.59.0 → 2.60.0
- sonar-project.properties: 2.59.0 → 2.60.0
- setup.sh header: 2.59.0 → 2.60.0
@sonarqubecloud
Copy link

@github-actions
Copy link

🔍 Code Quality Report

�[0;35m[MONITOR]�[0m Code Review Monitoring Report

�[0;34m[INFO]�[0m Latest Quality Status:
SonarCloud: 0 bugs, 0 vulnerabilities, 272 code smells

�[0;34m[INFO]�[0m Recent monitoring activity:
Sat Jan 17 16:33:02 UTC 2026: Code review monitoring started
Sat Jan 17 16:33:02 UTC 2026: SonarCloud - Bugs: 0, Vulnerabilities: 0, Code Smells: 272
Sat Jan 17 16:33:02 UTC 2026: Qlty - 0 issues found, auto-formatting applied
Sat Jan 17 16:33:04 UTC 2026: Codacy analysis completed with auto-fixes

📈 Current Quality Metrics

  • BUGS: 0
  • CODE SMELLS: 272
  • VULNERABILITIES: 0

Generated on: Sat Jan 17 16:33:45 UTC 2026


Generated by AI DevOps Framework Code Review Monitoring

@marcusquinn marcusquinn merged commit 5664357 into main Jan 17, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant