Conversation
When users accidentally edit main/dev before starting an agent lane, those changes should follow the new agent branch instead of staying on the protected checkout. agent-branch-start now auto-stashes tracked changes on protected base branches and re-applies them in the created agent worktree. Constraint: Keep codex-agent launches working even when setup left only untracked files on base branch Rejected: Auto-transfer all dirty states including untracked-only changes | broke codex-agent tests by forcing unnecessary stash re-apply Confidence: high Scope-risk: moderate Reversibility: clean Directive: Preserve protected-branch auto-transfer for tracked edits; if stash format changes, keep stash-ref parsing colon-safe Tested: node --test test/fuzzing.test.js test/install.test.js test/metadata.test.js (pass) Not-tested: Manual conflict-heavy stash apply with partially overlapping tracked edits across very large repos
NagyVikt
deleted the
agent/codex/20260411-144342-odin-megkapja-hu-auto-transfer-protected-dirty
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 scripts/agent-branch-finish.sh (PR flow).