Skip to content

feat(isolation): integrate Git worktree isolation into experimental commands#161

Draft
moisgobg wants to merge 1 commit intofeature/asddfrom
feature/isolation-worktree
Draft

feat(isolation): integrate Git worktree isolation into experimental commands#161
moisgobg wants to merge 1 commit intofeature/asddfrom
feature/isolation-worktree

Conversation

@moisgobg
Copy link
Copy Markdown
Contributor

@moisgobg moisgobg commented Apr 7, 2026

Description

This PR introduces experimental conductor commands (implement.toml, revert.toml, and review.toml in commands/conductor_exp/) that leverage Git Worktree orchestration.

Changes

  • implement: Integrates worktree isolation. Checks for existing worktrees or initializes new ones, handling everything from isolated branch generation to synchronizing documentation inside the worktree context. Added handling for the temporary review-report.md.
  • review: Updates the review process to respect the isolated worktree scope (.gemini/worktrees/<track_id>) when auditing diffs and files. Adds options to discard the isolated work or merge it back to the base branch.
  • revert: Adds awareness of the active worktree state. Provides rollback commands (abort track, rollback last commit, rollback to checkpoint) targeting the specific isolated session without affecting the main project tree.

Note: The previous MCP server implementation has been removed in favor of these shell-driven experimental commands to simplify the architecture.

Includes updates to support isolated worktrees in implement, revert, and review experimental commands, as well as handling for the temporal review-report.md.
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