Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
dd00d5d
complete
Adib234 Dec 30, 2025
2f21975
fix tests
Adib234 Dec 30, 2025
9921a21
completed useRewindLogic hook
Adib234 Dec 30, 2025
224c48c
fix build
Adib234 Dec 30, 2025
abe45d4
address nit by bot
Adib234 Dec 30, 2025
b4c545c
fix tests
Adib234 Jan 8, 2026
16208b9
address feedback
Adib234 Jan 9, 2026
ac24cfb
complete
Adib234 Dec 30, 2025
ce265ea
fix tests
Adib234 Dec 30, 2025
1a06bb6
forgot to rebase this change
Adib234 Jan 9, 2026
1f1c5f2
address feedback from first round of review
Adib234 Jan 12, 2026
d9848ca
address feedback from second round of review
Adib234 Jan 12, 2026
ab382cb
fix tests
Adib234 Jan 12, 2026
72be8aa
fix tests
Adib234 Jan 12, 2026
acd7446
update stripreferencecontent
Adib234 Jan 12, 2026
36e4662
address another round of feedback
Adib234 Jan 13, 2026
5a1ec92
chore: rename escapeRegExp to escapeRegexSpecialCharacters and add do…
Adib234 Jan 13, 2026
bbe8a95
remove no-op function
Adib234 Jan 14, 2026
19835db
complete
Adib234 Dec 30, 2025
90d0983
fix tests
Adib234 Dec 30, 2025
e163ecc
complete feature
Adib234 Dec 30, 2025
f4c6e57
address nit by bot
Adib234 Dec 30, 2025
8defcc4
fix build
Adib234 Jan 14, 2026
04ed10f
restore
Adib234 Jan 14, 2026
0f98e75
address feedback from a round of /review-frontend
Adib234 Jan 14, 2026
94a7974
add toast for telling users new keyboard shortcut for clearing text
Adib234 Jan 14, 2026
a3dd453
- implemented a loading state when there is a rewind to provide feedback
Adib234 Jan 14, 2026
2912c79
fix bug when closing rewind viewer shows toast text for 2nd press again
Adib234 Jan 14, 2026
80e862b
create shared component for expandable prompt
Adib234 Jan 14, 2026
eb9573a
update test
Adib234 Jan 14, 2026
7a0d9e4
format file
Adib234 Jan 14, 2026
f441924
restore package-lock.json
Adib234 Jan 14, 2026
485ac88
make prompt expandable not by default
Adib234 Jan 16, 2026
a81420c
Merge branch 'main' into adibakm/rewind-command
Adib234 Jan 16, 2026
46e2764
update test
Adib234 Jan 16, 2026
14f75b7
update test
Adib234 Jan 16, 2026
cab6977
Merge branch 'main' into adibakm/rewind-command
Adib234 Jan 16, 2026
fd02b7f
Merge branch 'main' into adibakm/rewind-command
Adib234 Jan 17, 2026
f4baedc
address feedback from Jacob
Adib234 Jan 17, 2026
f2424cb
add educational toast to notifications so that it appears at the same…
Adib234 Jan 20, 2026
6825a67
Merge branch 'main' into adibakm/rewind-command
Adib234 Jan 21, 2026
e75590e
address another round of feedback
Adib234 Jan 21, 2026
cd34f27
address feedback from running /review-frontend myself
Adib234 Jan 21, 2026
6270e08
Merge branch 'main' into adibakm/rewind-command
Adib234 Jan 21, 2026
8d5801a
fix failing tests
Adib234 Jan 21, 2026
03abc9b
address nits and stick to first message in the history
Adib234 Jan 22, 2026
72afc71
restore formatter test and update RewindViewer snapshot
Adib234 Jan 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/cli/keyboard-shortcuts.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ available combinations.
| Start reverse search through history. | `Ctrl + R` |
| Submit the selected reverse-search match. | `Enter (no Ctrl)` |
| Accept a suggestion while reverse searching. | `Tab` |
| Browse and rewind previous interactions. | `Double Esc` |

#### Navigation

Expand Down
4 changes: 4 additions & 0 deletions packages/cli/src/config/keyBindings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export enum Command {
REVERSE_SEARCH = 'history.search.start',
SUBMIT_REVERSE_SEARCH = 'history.search.submit',
ACCEPT_SUGGESTION_REVERSE_SEARCH = 'history.search.accept',
REWIND = 'history.rewind',

// Navigation
NAVIGATION_UP = 'nav.up',
Expand Down Expand Up @@ -188,6 +189,7 @@ export const defaultKeyBindings: KeyBindingConfig = {
[Command.HISTORY_UP]: [{ key: 'p', shift: false, ctrl: true }],
[Command.HISTORY_DOWN]: [{ key: 'n', shift: false, ctrl: true }],
[Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
[Command.REWIND]: [{ key: 'double escape' }],
[Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],

Expand Down Expand Up @@ -317,6 +319,7 @@ export const commandCategories: readonly CommandCategory[] = [
Command.REVERSE_SEARCH,
Command.SUBMIT_REVERSE_SEARCH,
Command.ACCEPT_SUGGESTION_REVERSE_SEARCH,
Command.REWIND,
],
},
{
Expand Down Expand Up @@ -413,6 +416,7 @@ export const commandDescriptions: Readonly<Record<Command, string>> = {
[Command.SUBMIT_REVERSE_SEARCH]: 'Submit the selected reverse-search match.',
[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]:
'Accept a suggestion while reverse searching.',
[Command.REWIND]: 'Browse and rewind previous interactions.',

// Navigation
[Command.NAVIGATION_UP]: 'Move selection up in lists.',
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/services/BuiltinCommandLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { directoryCommand } from '../ui/commands/directoryCommand.js';
import { editorCommand } from '../ui/commands/editorCommand.js';
import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
import { helpCommand } from '../ui/commands/helpCommand.js';
import { rewindCommand } from '../ui/commands/rewindCommand.js';
import { hooksCommand } from '../ui/commands/hooksCommand.js';
import { ideCommand } from '../ui/commands/ideCommand.js';
import { initCommand } from '../ui/commands/initCommand.js';
Expand Down Expand Up @@ -106,6 +107,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
: [extensionsCommand(this.config?.getEnableExtensionReloading())]),
helpCommand,
...(this.config?.getEnableHooksUI() ? [hooksCommand] : []),
rewindCommand,
await ideCommand(),
initCommand,
...(this.config?.getMcpEnabled() === false
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/ui/AppContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -689,6 +689,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
toggleDebugProfiler,
dispatchExtensionStateUpdate,
addConfirmUpdateExtensionRequest,
setText: (text: string) => buffer.setText(text),
}),
[
setAuthState,
Expand All @@ -705,6 +706,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
openPermissionsDialog,
addConfirmUpdateExtensionRequest,
toggleDebugProfiler,
buffer,
],
);

Expand Down
Loading
Loading