Skip to content

fix: record .resolved-env in worktree manifest to unblock cleanup#19

Merged
dlovell merged 1 commit into
mainfrom
fix/gitignore-resolved-env
Jun 9, 2026
Merged

fix: record .resolved-env in worktree manifest to unblock cleanup#19
dlovell merged 1 commit into
mainfrom
fix/gitignore-resolved-env

Conversation

@dlovell

@dlovell dlovell commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Summary

  • write_resolved_env creates .envrcs/.resolved-env in every worktree but never recorded it in the manifest
  • cleanup-worktree's pre-flight check treated it as untracked dirt and refused to remove the worktree, requiring manual .gitignore edits in every project
  • Append a copy entry to the manifest after setup-worktree so cleanup can remove it automatically

Test plan

  • Create a worktree, verify .envrcs/.resolved-env appears in .envrcs/.worktree-manifest
  • Run cleanup-worktree on that worktree — should succeed without manual .gitignore edits

🤖 Generated with Claude Code

write_resolved_env creates .envrcs/.resolved-env in every worktree but
never recorded it in the manifest. cleanup-worktree's pre-flight check
then treated it as untracked dirt and refused to remove the worktree,
forcing manual .gitignore edits in every project.

Append a manifest entry after setup-worktree so cleanup knows the file
is infrastructure-managed and can remove it automatically.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dlovell dlovell marked this pull request as ready for review June 9, 2026 12:50
@dlovell dlovell merged commit eadfb23 into main Jun 9, 2026
5 checks passed
@dlovell dlovell deleted the fix/gitignore-resolved-env branch June 9, 2026 12:50
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