fix(cli): improve focus navigation for interactive and background shells (#18343)

2026-04-22 19:14:33 -07:00 · 2026-02-06 10:36:14 -08:00
parent f062f56b43
commit ec5836c4d6
19 changed files with 456 additions and 256 deletions
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import { formatKeyBinding, formatCommand } from './keybindingUtils.js';
+import { Command } from '../../config/keyBindings.js';
+
+describe('keybindingUtils', () => {
+  describe('formatKeyBinding', () => {
+    it('formats simple keys', () => {
+      expect(formatKeyBinding({ key: 'a' })).toBe('A');
+      expect(formatKeyBinding({ key: 'return' })).toBe('Enter');
+      expect(formatKeyBinding({ key: 'escape' })).toBe('Esc');
+    });
+
+    it('formats modifiers', () => {
+      expect(formatKeyBinding({ key: 'c', ctrl: true })).toBe('Ctrl+C');
+      expect(formatKeyBinding({ key: 'z', cmd: true })).toBe('Cmd+Z');
+      expect(formatKeyBinding({ key: 'up', shift: true })).toBe('Shift+Up');
+      expect(formatKeyBinding({ key: 'left', alt: true })).toBe('Alt+Left');
+    });
+
+    it('formats multiple modifiers in order', () => {
+      expect(formatKeyBinding({ key: 'z', ctrl: true, shift: true })).toBe(
+        'Ctrl+Shift+Z',
+      );
+      expect(
+        formatKeyBinding({
+          key: 'a',
+          ctrl: true,
+          alt: true,
+          shift: true,
+          cmd: true,
+        }),
+      ).toBe('Ctrl+Alt+Shift+Cmd+A');
+    });
+  });
+
+  describe('formatCommand', () => {
+    it('formats default commands', () => {
+      expect(formatCommand(Command.QUIT)).toBe('Ctrl+C');
+      expect(formatCommand(Command.SUBMIT)).toBe('Enter');
+      expect(formatCommand(Command.TOGGLE_BACKGROUND_SHELL)).toBe('Ctrl+B');
+    });
+
+    it('returns empty string for unknown commands', () => {
+      expect(formatCommand('unknown.command' as unknown as Command)).toBe('');
+    });
+  });
+});
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  type Command,
+  type KeyBinding,
+  type KeyBindingConfig,
+  defaultKeyBindings,
+} from '../../config/keyBindings.js';
+
+/**
+ * Maps internal key names to user-friendly display names.
+ */
+const KEY_NAME_MAP: Record<string, string> = {
+  return: 'Enter',
+  escape: 'Esc',
+  backspace: 'Backspace',
+  delete: 'Delete',
+  up: 'Up',
+  down: 'Down',
+  left: 'Left',
+  right: 'Right',
+  pageup: 'Page Up',
+  pagedown: 'Page Down',
+  home: 'Home',
+  end: 'End',
+  tab: 'Tab',
+  space: 'Space',
+};
+
+/**
+ * Formats a single KeyBinding into a human-readable string (e.g., "Ctrl+C").
+ */
+export function formatKeyBinding(binding: KeyBinding): string {
+  const parts: string[] = [];
+
+  if (binding.ctrl) parts.push('Ctrl');
+  if (binding.alt) parts.push('Alt');
+  if (binding.shift) parts.push('Shift');
+  if (binding.cmd) parts.push('Cmd');
+
+  const keyName = KEY_NAME_MAP[binding.key] || binding.key.toUpperCase();
+  parts.push(keyName);
+
+  return parts.join('+');
+}
+
+/**
+ * Formats the primary keybinding for a command.
+ */
+export function formatCommand(
+  command: Command,
+  config: KeyBindingConfig = defaultKeyBindings,
+): string {
+  const bindings = config[command];
+  if (!bindings || bindings.length === 0) {
+    return '';
+  }
+
+  // Use the first binding as the primary one for display
+  return formatKeyBinding(bindings[0]);
+}