-
-
Notifications
You must be signed in to change notification settings - Fork 1
refactor(workstation): extract rebase-plan input handlers into surfaces/rebase/input.ts #1802
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
gfargo-horizon-agent
merged 2 commits into
main
from
agent/coco-1063-extract-rebase-plan-handlers-into-surfac
Jul 21, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| import type { LogInkAction, LogInkState } from '../../runtime/inkViewModel' | ||
| import type { | ||
| LogInkInputContext, | ||
| LogInkInputEvent, | ||
| LogInkInputKey, | ||
| } from '../../runtime/inkInput' | ||
|
|
||
| /** | ||
| * In-TUI interactive rebase surface (#1359), extracted out of | ||
| * `inkInput.ts`'s monolithic router (#1625 second surface, following | ||
| * `surfaces/bisect/input.ts`). Scoped entirely to `state.activeView === | ||
| * 'rebase' && state.rebasePlan`, with no dependency on any other view's | ||
| * state, which is what makes it safe to lift verbatim. | ||
| * | ||
| * Returns `null` when no rebase-local binding matches, so the caller | ||
| * (`getLogInkInputEvents`) falls through to the rest of the router. | ||
| */ | ||
| export function handleRebaseInput( | ||
| state: LogInkState, | ||
| inputValue: string, | ||
| key: LogInkInputKey, | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars -- signature kept symmetric with handleBisectInput; no rebase binding reads context | ||
| context: LogInkInputContext | ||
| ): LogInkInputEvent[] | null { | ||
| if (state.activeView !== 'rebase' || !state.rebasePlan) { | ||
| return null | ||
| } | ||
|
|
||
| // #1446 — rebase-plan discard guard. A fully retagged/reordered | ||
| // rebase plan is expensive to recreate; Esc-ing away should confirm | ||
| // before silently dropping it, matching the compose-draft pattern. | ||
| // The confirm is only raised when Esc WOULD pop away from the rebase | ||
| // view (viewStack > 1) — otherwise there's nowhere to go and Esc | ||
| // is a no-op anyway. | ||
| if (key.escape && state.viewStack.length > 1) { | ||
| return [action({ type: 'setPendingConfirmation', value: 'discard-rebase-plan' })] | ||
| } | ||
|
|
||
| // ── In-TUI interactive rebase surface (#1359) ─────────────────────── | ||
|
gfargo-horizon-agent[bot] marked this conversation as resolved.
|
||
| // The plan claims its keys while the view is active: j/k cursor, J/K | ||
| // reorder, p/s/f/d/e retag, r reword (prompt), Enter executes (behind | ||
| // a y-confirm), Esc pops (which clears the plan). Placed before every | ||
| // other single-letter handler so the rebase letters can't leak into | ||
| // sort/fixup/diff-toggle semantics. | ||
| if (inputValue === 'J') { | ||
|
gfargo-horizon-agent[bot] marked this conversation as resolved.
|
||
| return [action({ type: 'moveRebaseRow', delta: 1 })] | ||
| } | ||
| if (inputValue === 'K') { | ||
| return [action({ type: 'moveRebaseRow', delta: -1 })] | ||
| } | ||
| if (inputValue === 'p') { | ||
| return [action({ type: 'setRebaseAction', action: 'pick' })] | ||
| } | ||
| if (inputValue === 's') { | ||
| return [action({ type: 'setRebaseAction', action: 'squash' })] | ||
| } | ||
| if (inputValue === 'f') { | ||
| return [action({ type: 'setRebaseAction', action: 'fixup' })] | ||
| } | ||
| if (inputValue === 'd') { | ||
| return [action({ type: 'setRebaseAction', action: 'drop' })] | ||
| } | ||
| if (inputValue === 'e') { | ||
| return [action({ type: 'setRebaseAction', action: 'edit' })] | ||
| } | ||
| if (inputValue === 'r') { | ||
| const row = state.rebasePlan.rows[state.rebasePlan.selectedIndex] | ||
| return [action({ | ||
| type: 'openInputPrompt', | ||
| kind: 'rebase-reword', | ||
| label: `New message for ${row?.shortSha ?? 'commit'}`, | ||
| initial: row?.newMessage ?? row?.subject ?? '', | ||
| })] | ||
| } | ||
| if (key.return) { | ||
| return [action({ type: 'setPendingConfirmation', value: 'execute-rebase-plan' })] | ||
| } | ||
|
|
||
| if (key.upArrow || inputValue === 'k') { | ||
| return [action({ type: 'moveRebaseCursor', delta: -1 })] | ||
| } | ||
|
|
||
| if (key.downArrow || inputValue === 'j') { | ||
| return [action({ type: 'moveRebaseCursor', delta: 1 })] | ||
| } | ||
|
|
||
| return null | ||
| } | ||
|
|
||
| function action(actionValue: LogInkAction): LogInkInputEvent { | ||
| return { | ||
| type: 'action', | ||
| action: actionValue, | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.