mirror of
https://github.com/jlengrand/Maestro.git
synced 2026-03-10 08:31:19 +00:00
27677f596d
- Fix logo/favicon paths (build/ → assets/) and copy icons to docs/assets/ - Add page-level metadata (description, icon) to all 19 documentation pages - Fix broken numbered list formatting in about/overview.md - Embed YouTube walkthrough videos in index.md - Standardize terminology: Agent (Maestro workspace), Provider (Claude/Codex/OpenCode), Session/Tab (conversation) - Update Key Concepts table with clear definitions - Redistribute screenshots to relevant pages (git, keyboard shortcuts, general usage) - Transform screenshots.md into Themes Gallery page - Add git diff/logs screenshots to git-worktrees.md - Add command palette screenshot to keyboard-shortcuts.md - Add session management screenshot to general-usage.md Claude ID: ad65a8b7-fc6f-4ebc-86be-ec86f66a0120 Maestro ID: b9bc0d08-5be2-4fdf-93cd-5618a8d53b35
2.7 KiB
2.7 KiB
title, description, icon
| title | description | icon |
|---|---|---|
| Git Worktrees | Run AI agents in parallel on isolated branches with Git worktree sub-agents. | git-branch |
Git worktrees enable true parallel development by letting you run multiple AI agents on separate branches simultaneously. Each worktree operates in its own isolated directory, so there's no risk of conflicts between parallel work streams.
Maestro's git integration includes built-in diff viewing and commit log browsing:
Creating a Worktree Sub-Agent
- In the agent list (left sidebar), hover over an agent in a git repository
- Click the git branch indicator (shows current branch name)
- In the overlay menu, click "Create Worktree Sub-Agent"
- Configure the worktree:
- Worktree Directory — Base folder where worktrees are created
- Branch Name — Name for the new branch (becomes the subdirectory name)
- Create PR on Completion — Auto-open a pull request when done
- Target Branch — Base branch for the PR (defaults to main/master)
How Worktree Agents Work
- Nested Display — Worktree sub-agents appear indented under their parent agent in the left sidebar
- Branch Icon — A git branch icon indicates worktree agents
- Collapse/Expand — Click the chevron on a parent agent to show/hide its worktree children
- Independent Operation — Each worktree agent has its own working directory, conversation history, and state
Creating Pull Requests
When you're done with work in a worktree:
- Right-click the worktree agent → Create Pull Request, or
- Press Cmd+K with the worktree active → search "Create Pull Request"
The PR modal shows:
- Source branch (your worktree branch)
- Target branch (configurable)
- Auto-generated title and description based on your work
Requirements: GitHub CLI (gh) must be installed and authenticated. Maestro will detect if it's missing and show installation instructions.
Use Cases
| Scenario | How Worktrees Help |
|---|---|
| Background Auto Run | Run Auto Run in a worktree while working interactively in the main repo |
| Feature Branches | Spin up a sub-agent for each feature branch |
| Code Review | Create a worktree to review and iterate on a PR without switching branches |
| Parallel Experiments | Try different approaches simultaneously without git stash/pop |
Tips
- Name branches descriptively — The branch name becomes the worktree directory name
- Use a dedicated worktree folder — Keep all worktrees in one place (e.g.,
~/worktrees/) - Clean up when done — Delete worktree agents after merging PRs to avoid clutter