Prevent cleanup from deleting active agent cwd#536
Merged
Conversation
Cleanup and finish commands can be launched through wrappers that run their destructive worktree prune subprocesses from a repo root instead of the caller's nested agent cwd. The finish/prune path now forwards the original cwd, resolves it back to the managed worktree for the same git common dir, and skips any worktree containing that cwd. Constraint: Codex and Claude hooks reload skills after tool use and fail with os error 2 when their cwd disappears. Rejected: Only pivot finish to repo root | wrapper and cleanup entrypoints still lose the caller cwd before prune. Confidence: high Scope-risk: narrow Directive: Do not remove GUARDEX_FINISH_ACTIVE_CWD or GUARDEX_PRUNE_ACTIVE_CWD propagation without reproducing finish/cleanup from a nested active worktree cwd. Tested: node --test test/worktree.test.js test/finish.test.js test/metadata.test.js Tested: bash -n scripts/agent-branch-finish.sh Tested: bash -n scripts/agent-worktree-prune.sh Tested: openspec validate --specs
NagyVikt
deleted the
agent/codex/protect-active-cwd-during-cleanup-2026-05-07-15-13
branch
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
1 participant
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.
Automated by gx branch finish (PR flow).