From 959814c8dce672575b2f7e5ed1134906bbf97305 Mon Sep 17 00:00:00 2001 From: dlovell Date: Tue, 9 Jun 2026 07:20:08 -0400 Subject: [PATCH] fix: record .resolved-env in worktree manifest to unblock cleanup 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 --- dev/devcontainer | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/devcontainer b/dev/devcontainer index 3b81d30..b8de393 100755 --- a/dev/devcontainer +++ b/dev/devcontainer @@ -414,6 +414,7 @@ ensure_up() { ensure_external_volumes if [ "$DEV_WORKSPACE" != "$DEV_MAIN_TREE" ]; then (cd "$DEV_WORKSPACE" && "$DEV_BASE_DIR/dev/setup-worktree") + printf 'copy\t%s\n' ".envrcs/.resolved-env" >> "$DEV_WORKSPACE/.envrcs/.worktree-manifest" fi if ! is_running; then