Better worktree handling#3120
Merged
Merged
Conversation
dgageot
commented
Jun 15, 2026
Member
- Create worktree sooner
- Add documentation
- Reopen sessions in their worktree
- Let the user choose a worktree base
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
Toolsets capture their working directory when they are built during LoadTeam. Because the worktree was created afterwards, the shell tool stayed rooted in the user's checkout while file-editing tools wrote into the worktree — so shell git commands operated on the wrong branch. Create the worktree first and install it as the working directory before LoadTeam runs, so every tool (the shell included) operates inside the worktree. Extracted loadTeamInWorktree to keep the ordering explicit and testable, and tear down the worktree if the load fails so a failure leaves nothing behind.
--working-dir already selects the directory the worktree is branched from: addGatewayFlags' PersistentPreRunE chdirs into it before the run, so os.Getwd() (the worktree's base) reflects it. Make that contract explicit by branching loadTeamInWorktree from the resolved base dir, and add a test proving the worktree is created from the --working-dir repo (shared object store, same HEAD) rather than the process's original cwd.
When --session names an existing session that ran in a worktree, the toolsets must be rooted in that worktree again. Re-passing --worktree is not an option: Create fails when the worktree already exists. Instead, peek the resumed session's stored WorkingDir (via a new backend ResumeWorkingDir) before LoadTeam and adopt it as the working directory, so the shell and every other tool reattach to the worktree transparently. An explicit --worktree/--worktree-pr on the resuming run still takes precedence. Misses (no --session, relative refs, unknown IDs, empty or vanished dirs) fall back to normal working-directory resolution.
By default a --worktree branches from the repository's current HEAD. --worktree-base lets callers branch from another ref (a branch, tag, commit, or remote-tracking ref). When the base names a remote-tracking ref like origin/main, that remote branch is fetched first so the worktree starts from the latest remote state — removing the need for callers to fetch themselves before creating a worktree. Implemented as a worktree.WithBase option so existing callers are unaffected. --worktree-base requires --worktree and is mutually exclusive with --worktree-pr, --remote and --sandbox.
…base Clarify that every tool (the shell included) runs inside the worktree, that --worktree composes with --working-dir, and that a worktree run is resumed with --session (not by re-passing --worktree). Document the new --worktree-base flag and add matching examples.
8df6e3f to
212c2c4
Compare
A bare "git fetch <remote> <branch>" only guarantees FETCH_HEAD is updated; under non-standard fetch configurations (custom refspecs, --no-tags, tagOpt) refs/remotes/<remote>/<branch> can stay stale, so the subsequent "git worktree add ... <remote>/<branch>" would branch from an outdated commit. Use a fully-qualified refspec so the remote-tracking ref is always updated, and cover the missing-fetch-config case with a test.
ResumeWorkingDir bailed out on relative session refs (e.g. --session -1), so resuming the last session via an offset silently dropped worktree reattachment. The shared session store is already open at this point, so resolve the relative ref against it like an explicit ID does.
When LoadTeam fails because ctx was cancelled (Ctrl-C), removing the worktree with that same cancelled context immediately kills the git subprocess, leaving the worktree and branch orphaned. Use context.WithoutCancel(ctx) so cleanup runs to completion, matching the pattern already used for the interactive-exit cleanup path.
Member
Author
|
Addressed the review feedback (3 new commits, branch already on top of latest
|
gtardif
approved these changes
Jun 15, 2026
This was referenced Jun 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
