insert branches with modify#107
Draft
skarim wants to merge 5 commits into
Draft
Conversation
Add `i` (insert below) and `I` (insert above) key bindings to the interactive modify view, allowing users to insert new empty branches into an existing stack. This follows Vim-inspired semantics where lowercase `i` inserts below the cursor and uppercase `I` inserts above. ## TUI behavior When the user presses `i` or `I`, the TUI enters an insert input mode (similar to rename mode) where they type a new branch name. The input is validated against git ref naming rules, local branch uniqueness, and in-stack name collisions. On confirm, a placeholder node is inserted at the correct position in the branch list with a green "✚ insert" annotation badge and green connector styling. Insert is a structure operation — it works alongside fold, rename, and drop, but is mutually exclusive with reorder (consistent with existing mode exclusivity rules). Undo (`z`) removes the inserted node cleanly. ## Apply engine At apply time (Step 2 in the pipeline, between renames and folds), the engine creates the new git branch at the parent branch's tip via `git.CreateBranch` and inserts a `BranchRef` into the stack metadata at the correct position. If the insertion changes the base of a branch that has an open PR, `affectsPRs` is set to trigger a required `gh stack submit` afterward. ## Header shortcut updates - Combined the fold shortcuts into a single line: `d/u - fold down/up` - Added insert shortcuts on their own line: `i/I - insert below/above` - Reordered fold references throughout to list "down" before "up" for consistency with the insert shortcut ordering ## Files changed - types.go: ActionInsertBelow/ActionInsertAbove types, IsInserted field, InsertedBranches in ApplyResult - model.go: key bindings, insert input mode, undo, mode exclusivity, annotation, styling, header shortcuts, effective-index tracking to prevent false reorder detection when inserts shift node positions - styles.go: green insert badge/branch/connector styles - status.go: insert counting in pending change summary - help.go: new "Insert below / above" section, reordered fold heading - apply.go: BuildPlan and ApplyPlan handle insert actions - modify.go: updated command description and success summary - README.md: updated keybindings table ## Test coverage - 16 new TUI tests: insert below/above, top/bottom edges, undo, mode exclusivity, merged branch guard, cancel/empty input, duplicate name validation, pending summary counting, annotation rendering, mixed operations with drop/fold, apply acceptance - 4 new apply tests: BuildPlan produces correct insert actions, ApplyPlan creates branches and updates stack metadata, insert at stack start uses trunk as parent, affectsPRs triggered when inserting before a branch with an open PR
Fix three bugs with the insert branch feature in the modify TUI, and
adjust rename behavior on inserted nodes.
## Bug 1: False "moved" annotations on existing branches
After inserting a branch, all branches below the insertion point
displayed "↕ moved 1 layer down" annotations. This happened because
`nodeAnnotation` and `toNodeData` compared each node's
`OriginalPosition` against its raw array index, which gets shifted
when an inserted node is added to the slice.
Fix: introduce an `effectiveIdx` parameter that counts only
non-inserted nodes, so position comparisons reflect the original
ordering. The View loop computes effective indices by incrementing
only for non-inserted nodes and passes them to the rendering
functions.
## Bug 2: Header branch count inflated by staged inserts
The branch count in the header ("N branches") included inserted
placeholder nodes, making it appear as though the stack had grown
before changes were applied.
Fix: `buildHeaderConfig` now excludes `IsInserted` nodes from the
branch count. The count reflects only the original branches in the
stack.
## Bug 3: Operations allowed on inserted placeholder nodes
Inserted nodes could be folded into other branches, which makes no
sense for a placeholder with no commits. Additionally, the "last
branch" guard counted inserted nodes as active, allowing users to
drop all original branches and bypass the empty-stack check.
Fix:
- `fold()` rejects inserted nodes with a descriptive error message.
- `toggleDrop()` on an inserted node removes it entirely and pops
the original insert action from the undo stack (clean cancellation
rather than a separate undo entry).
- All three "active branch" guards (`toggleDrop`, `fold`, `tryApply`)
now exclude `IsInserted` nodes, ensuring at least one original
branch always remains in the stack.
## Rename on inserted branches
Instead of blocking renames on inserted nodes, pressing `r` now
enters rename mode and updates the insert action's name in place.
The node's `Ref.Branch` and `PendingAction.NewName` are both updated
directly — no separate rename action is created in the undo stack.
This lets users fix a typo without having to drop and re-insert.
## Tests added
- `TestInsertDoesNotShowMovedAnnotation` — verifies no false move
annotations appear on existing branches after an insert
- `TestBranchCountExcludesInserts` — verifies header count stays
stable after insert
- `TestCannotFoldInsertedBranch` — verifies fold is blocked
- `TestCannotRenameInsertedBranch` — verifies rename updates the
insert name in place
- `TestDropInsertedBranchRemovesIt` — verifies drop removes the node
- `TestDropInsertedBranchCanBeUndone` — verifies drop pops the
original insert from the undo stack
- `TestCannotDropAllOriginalBranchesWithInsert` — verifies the
empty-stack guard excludes inserted nodes
8dd6ae0 to
5466a8a
Compare
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
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.
add insert branch operation to modify TUI
Add
i(insert below) andI(insert above) key bindings to theinteractive modify view, allowing users to insert new empty branches
into an existing stack. This follows Vim-inspired semantics where
lowercase
iinserts below the cursor and uppercaseIinserts above.TUI behavior
When the user presses
iorI, the TUI enters an insert input mode(similar to rename mode) where they type a new branch name. The input
is validated against git ref naming rules, local branch uniqueness, and
in-stack name collisions. On confirm, a placeholder node is inserted at
the correct position in the branch list with a green "✚ insert"
annotation badge and green connector styling.
Insert is a structure operation — it works alongside fold, rename, and
drop, but is mutually exclusive with reorder (consistent with existing
mode exclusivity rules). Undo (
z) removes the inserted node cleanly.Apply engine
At apply time (Step 2 in the pipeline, between renames and folds), the
engine creates the new git branch at the parent branch's tip via
git.CreateBranchand inserts aBranchRefinto the stack metadata atthe correct position. If the insertion changes the base of a branch
that has an open PR,
affectsPRsis set to trigger a requiredgh stack submitafterward.Header shortcut updates
d/u - fold down/upi/I - insert below/aboveconsistency with the insert shortcut ordering
Files changed
InsertedBranches in ApplyResult
annotation, styling, header shortcuts, effective-index tracking to
prevent false reorder detection when inserts shift node positions
Test coverage
exclusivity, merged branch guard, cancel/empty input, duplicate name
validation, pending summary counting, annotation rendering, mixed
operations with drop/fold, apply acceptance
ApplyPlan creates branches and updates stack metadata, insert at
stack start uses trunk as parent, affectsPRs triggered when inserting
before a branch with an open PR
Stack created with GitHub Stacks CLI • Give Feedback 💬