Skip to content

fix(cli): prevent settings escape key from cancelling active turn #22788

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.

Sign up for GitHub

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

Closed
JayadityaGit wants to merge 3 commits into from
Closed

fix(cli): prevent settings escape key from cancelling active turn #22788

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35e02b6
fix(cli): prevent settings escape key from cancelling active turn
JayadityaGit Mar 17, 2026
ada8dd4
Merge branch 'main' into fix-settings-escape-propagation
JayadityaGit Mar 18, 2026
9a713ff
Merge branch 'main' into fix-settings-escape-propagation
JayadityaGit Mar 20, 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
30 changes: 15 additions & 15 deletions packages/cli/src/ui/components/shared/BaseSettingsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ export function BaseSettingsDialog({
(key: Key) => {
// Let parent handle custom keys first (only if not editing)
if (!editingKey && onKeyPress?.(key, currentItem)) {
return;
return true;
}

// Edit mode handling
Expand All @@ -286,43 +286,43 @@ export function BaseSettingsDialog({
// Navigation within edit buffer
if (keyMatchers[Command.MOVE_LEFT](key)) {
editDispatch({ type: 'MOVE_LEFT' });
return;
return true;
}
if (keyMatchers[Command.MOVE_RIGHT](key)) {
editDispatch({ type: 'MOVE_RIGHT' });
return;
return true;
}
if (keyMatchers[Command.HOME](key)) {
editDispatch({ type: 'HOME' });
return;
return true;
}
if (keyMatchers[Command.END](key)) {
editDispatch({ type: 'END' });
return;
return true;
}

// Backspace
if (keyMatchers[Command.DELETE_CHAR_LEFT](key)) {
editDispatch({ type: 'DELETE_LEFT' });
return;
return true;
}

// Delete
if (keyMatchers[Command.DELETE_CHAR_RIGHT](key)) {
editDispatch({ type: 'DELETE_RIGHT' });
return;
return true;
}

// Escape in edit mode - commit (consistent with SettingsDialog)
if (keyMatchers[Command.ESCAPE](key)) {
commitEdit();
return;
return true;
}

// Enter in edit mode - commit
if (keyMatchers[Command.RETURN](key)) {
commitEdit();
return;
return true;
}

// Up/Down in edit mode - commit and navigate.
Expand All @@ -331,15 +331,15 @@ export function BaseSettingsDialog({
if (keyMatchers[Command.DIALOG_NAVIGATION_UP](key) && !key.insertable) {
commitEdit();
moveUp();
return;
return true;
}
if (
keyMatchers[Command.DIALOG_NAVIGATION_DOWN](key) &&
!key.insertable
) {
commitEdit();
moveDown();
return;
return true;
}

// Character input
Expand All @@ -350,7 +350,7 @@ export function BaseSettingsDialog({
isNumberType: type === 'number',
});
}
return;
return true;
}

// Not in edit mode - handle navigation and actions
Expand Down Expand Up @@ -396,16 +396,16 @@ export function BaseSettingsDialog({
// Tab - switch focus section
if (key.name === 'tab' && finalShowScopeSelector) {
setFocusSection((s) => (s === 'settings' ? 'scope' : 'settings'));
return;
return true;
}

// Escape - close dialog
if (keyMatchers[Command.ESCAPE](key)) {
onClose();
return;
return true;
}

return;
return false;
},
{
isActive: true,
Expand Down