Skip to content

Commit 8e8e7b3

Browse files
authored
Ctrl-O (#17617)
1 parent d75dc88 commit 8e8e7b3

File tree

6 files changed

+25
-19
lines changed

6 files changed

+25
-19
lines changed

docs/cli/keyboard-shortcuts.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,20 @@ available combinations.
9494

9595
#### App Controls
9696

97-
| Action | Keys |
98-
| ----------------------------------------------------------------------------------------------------- | ---------------- |
99-
| Toggle detailed error information. | `F12` |
100-
| Toggle the full TODO list. | `Ctrl + T` |
101-
| Show IDE context details. | `Ctrl + G` |
102-
| Toggle Markdown rendering. | `Alt + M` |
103-
| Toggle copy mode when in alternate buffer mode. | `Ctrl + S` |
104-
| Toggle YOLO (auto-approval) mode for tool calls. | `Ctrl + Y` |
105-
| Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). | `Shift + Tab` |
106-
| Expand a height-constrained response to show additional lines when not in alternate buffer mode. | `Ctrl + S` |
107-
| Focus the shell input from the gemini input. | `Tab (no Shift)` |
108-
| Focus the Gemini input from the shell input. | `Tab` |
109-
| Clear the terminal screen and redraw the UI. | `Ctrl + L` |
110-
| Restart the application. | `R` |
97+
| Action | Keys |
98+
| ----------------------------------------------------------------------------------------------------- | -------------------------- |
99+
| Toggle detailed error information. | `F12` |
100+
| Toggle the full TODO list. | `Ctrl + T` |
101+
| Show IDE context details. | `Ctrl + G` |
102+
| Toggle Markdown rendering. | `Alt + M` |
103+
| Toggle copy mode when in alternate buffer mode. | `Ctrl + S` |
104+
| Toggle YOLO (auto-approval) mode for tool calls. | `Ctrl + Y` |
105+
| Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). | `Shift + Tab` |
106+
| Expand a height-constrained response to show additional lines when not in alternate buffer mode. | `Ctrl + O`<br />`Ctrl + S` |
107+
| Focus the shell input from the gemini input. | `Tab (no Shift)` |
108+
| Focus the Gemini input from the shell input. | `Tab` |
109+
| Clear the terminal screen and redraw the UI. | `Ctrl + L` |
110+
| Restart the application. | `R` |
111111

112112
<!-- KEYBINDINGS-AUTOGEN:END -->
113113

packages/cli/src/config/keyBindings.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,10 @@ export const defaultKeyBindings: KeyBindingConfig = {
253253
[Command.TOGGLE_COPY_MODE]: [{ key: 's', ctrl: true }],
254254
[Command.TOGGLE_YOLO]: [{ key: 'y', ctrl: true }],
255255
[Command.CYCLE_APPROVAL_MODE]: [{ key: 'tab', shift: true }],
256-
[Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
256+
[Command.SHOW_MORE_LINES]: [
257+
{ key: 'o', ctrl: true },
258+
{ key: 's', ctrl: true },
259+
],
257260
[Command.FOCUS_SHELL_INPUT]: [{ key: 'tab', shift: false }],
258261
[Command.UNFOCUS_SHELL_INPUT]: [{ key: 'tab' }],
259262
[Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],

packages/cli/src/ui/components/ShowMoreLines.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('ShowMoreLines', () => {
4848
} as NonNullable<ReturnType<typeof useOverflowState>>);
4949
mockUseStreamingContext.mockReturnValue(streamingState);
5050
const { lastFrame } = render(<ShowMoreLines constrainHeight={true} />);
51-
expect(lastFrame()).toContain('Press ctrl-s to show more lines');
51+
expect(lastFrame()).toContain('Press ctrl-o to show more lines');
5252
},
5353
);
5454
});

packages/cli/src/ui/components/ShowMoreLines.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const ShowMoreLines = ({ constrainHeight }: ShowMoreLinesProps) => {
3333
return (
3434
<Box>
3535
<Text color={theme.text.secondary} wrap="truncate">
36-
Press ctrl-s to show more lines
36+
Press ctrl-o to show more lines
3737
</Text>
3838
</Box>
3939
);

packages/cli/src/ui/constants/tips.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export const INFORMATIVE_TIPS = [
8888
'Clear your screen at any time with Ctrl+L…',
8989
'Toggle the debug console display with F12…',
9090
'Toggle the todo list display with Ctrl+T…',
91-
'See full, untruncated responses with Ctrl+S…',
91+
'See full, untruncated responses with Ctrl+O…',
9292
'Toggle auto-approval (YOLO mode) for all tools with Ctrl+Y…',
9393
'Cycle through approval modes (Default, Plan, Auto-Edit) with Shift+Tab…',
9494
'Toggle Markdown rendering (raw markdown mode) with Alt+M…',

packages/cli/src/ui/keyMatchers.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,10 @@ describe('keyMatchers', () => {
308308
},
309309
{
310310
command: Command.SHOW_MORE_LINES,
311-
positive: [createKey('s', { ctrl: true })],
311+
positive: [
312+
createKey('s', { ctrl: true }),
313+
createKey('o', { ctrl: true }),
314+
],
312315
negative: [createKey('s'), createKey('l', { ctrl: true })],
313316
},
314317

0 commit comments

Comments
 (0)