Feature Request: Add auto commit and merge and rebase buttons.

[imyellow]

Since the worktree is in a separate directory, I want it to be automatically git commit when the task is completed, and I want to provide a merge button so that I can merge the worktree's results into the main branch.

There's also a rebase button that rebases new code from the main branch to the worktree branch.

When creating a worktree and merging branches, I wish I could also choose which main branch to create the branch from and which branch to merge into.

When manually committing and merging, I want a pop-up window to allow me to confirm the message content and provide options to use a cheaper model to generate the commit message, like DeepSeek.

[pedramamini]

For now, take a look adding those instructions as a "nudge message" to the agent, check the agent settings. I do that for some of my agents too. Also recommend looking into the available slash commands and adding custom slash commands. Here are some of mine for example:

Adding these as options on the right-click menu for worktrees does sound like a nice idea.

[imyellow]

For now, take a look adding those instructions as a "nudge message" to the agent, check the agent settings. I do that for some of my agents too. Also recommend looking into the available slash commands and adding custom slash commands. Here are some of mine for example:

Adding these as options on the right-click menu for worktrees does sound like a nice idea.

Could you please share these promit? Thank you.

[pedramamini]

Super simple, here's an example from my RunMaestro.ai agent:

[github-actions]

This issue has been automatically marked as stale because it has had no activity for 60 days. It will be closed in 14 days if no further activity occurs. If it is still relevant, leave a comment or remove the stale label to keep it open. Thank you for your contributions.

[pedramamini]

Hi @imyellow - thanks for the detailed writeup, and sorry it went quiet long enough to get marked stale. I've taken a first pass at this in #1309.

Following @pedramamini's suggestion in this thread, the merge and rebase actions land on the right-click menu for a worktree agent:

• Merge Branch Into... - merge the worktree's branch into a branch you pick
• Rebase Branch Onto... - replay the worktree's branch on top of a branch you pick, to pull new upstream work in

Both open a confirmation modal with a branch picker, so you choose the merge target / rebase base rather than it being hardcoded to main. Choosing the base branch when creating a worktree already worked, so this fills in the other half.

A few behaviors I'd like your read on, since they were judgment calls:

1. Conflicts abort. If the merge or rebase hits a conflict, the operation is rolled back and the modal lists the conflicting files for you to resolve by hand. My reasoning: a single button click shouldn't leave your main checkout stuck mid-merge. But if you'd rather it leave the conflict in place so you can resolve it right there in the worktree, that's an easy change.
2. Merge runs where the target branch lives. Git won't check the same branch out twice, so merging into main runs in whichever worktree has main checked out, and it refuses if that checkout has uncommitted changes. Does that match how your setup is laid out?
3. Dirty worktree. Since neither git operation runs against a dirty tree, the modal notices uncommitted changes and offers to commit them first with a message you can edit - that's the confirmation popup you asked for.

Two parts of your request I intentionally left out of this PR rather than guess at:

• Auto-commit when the task completes. Needs a decision on where it hooks in and whether it's opt-in per agent. Happy to spin that out into its own issue.
• Generating the commit message with a cheaper model like DeepSeek. There's no separate "utility model" setting in Maestro today, so this is a new settings surface rather than a small addition. The message field is hand-editable for now.

What do you think? Feedback on any of the above is welcome before this merges.