Support command/ctrl/alt backspace correctly (#17175)

packages/cli/src/ui/hooks/keyToAnsi.ts

@@ -69,7 +69,7 @@ export function keyToAnsi(key: Key): string | null {
   }
 
   // If it's a simple character, return it.
-  if (!key.ctrl && !key.meta && key.sequence) {
+  if (!key.ctrl && !key.cmd && key.sequence) {
     return key.sequence;
   }
 

packages/cli/src/ui/hooks/useApprovalModeIndicator.test.ts

@@ -314,8 +314,8 @@ describe('useApprovalModeIndicator', () => {
     act(() => {
       capturedUseKeypressHandler({
         name: 'a',
-        ctrl: true,
         shift: true,
+        ctrl: true,
       } as Key);
     });
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();

packages/cli/src/ui/hooks/useKeypress.test.tsx

@@ -114,7 +114,13 @@ describe(`useKeypress`, () => {
     const key = { name: 'return', sequence: '\x1B\r' };
     act(() => stdin.write(key.sequence));
     expect(onKeypress).toHaveBeenCalledWith(
-      expect.objectContaining({ ...key, meta: true }),
+      expect.objectContaining({
+        ...key,
+        shift: false,
+        alt: true,
+        ctrl: false,
+        cmd: false,
+      }),
     );
   });
 
@@ -140,9 +146,10 @@ describe(`useKeypress`, () => {
       expect(onKeypress).toHaveBeenCalledTimes(1);
       expect(onKeypress).toHaveBeenCalledWith({
         name: 'paste',
-        ctrl: false,
-        meta: false,
         shift: false,
+        alt: false,
+        ctrl: false,
+        cmd: false,
         insertable: true,
         sequence: pasteText,
       });

packages/cli/src/ui/hooks/useSelectionList.test.tsx

@@ -59,7 +59,8 @@ describe('useSelectionList', () => {
           name,
           sequence,
           ctrl: options.ctrl ?? false,
-          meta: false,
+          cmd: false,
+          alt: false,
           shift: options.shift ?? false,
           insertable: false,
         };
@@ -328,7 +329,8 @@ describe('useSelectionList', () => {
           name,
           sequence: name,
           ctrl: false,
-          meta: false,
+          cmd: false,
+          alt: false,
           shift: false,
           insertable: true,
         };
@@ -377,7 +379,8 @@ describe('useSelectionList', () => {
             name,
             sequence: name,
             ctrl: false,
-            meta: false,
+            cmd: false,
+            alt: false,
             shift: false,
             insertable: false,
           };

packages/cli/src/ui/hooks/vim.test.tsx

@@ -36,9 +36,10 @@ vi.mock('../contexts/VimModeContext.js', () => ({
 const createKey = (partial: Partial<Key>): Key => ({
   name: partial.name || '',
   sequence: partial.sequence || '',
-  ctrl: partial.ctrl || false,
-  meta: partial.meta || false,
   shift: partial.shift || false,
+  alt: partial.alt || false,
+  ctrl: partial.ctrl || false,
+  cmd: partial.cmd || false,
   insertable: partial.insertable || false,
   ...partial,
 });

packages/cli/src/ui/hooks/vim.ts

@@ -280,8 +280,9 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
       // Special handling for Enter key to allow command submission (lower priority than completion)
       if (
         normalizedKey.name === 'return' &&
+        !normalizedKey.alt &&
         !normalizedKey.ctrl &&
-        !normalizedKey.meta
+        !normalizedKey.cmd
       ) {
         if (buffer.text.trim() && onSubmit) {
           // Handle command submission directly
@@ -309,9 +310,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
     (key: Key): Key => ({
       name: key.name || '',
       sequence: key.sequence || '',
-      ctrl: key.ctrl || false,
-      meta: key.meta || false,
       shift: key.shift || false,
+      alt: key.alt || false,
+      ctrl: key.ctrl || false,
+      cmd: key.cmd || false,
       insertable: key.insertable || false,
     }),
     [],