@quantum-ai/gemini-cli 0.45.8 → 0.45.9

package/dist/ui/hooks/vim.js

@@ -0,0 +1,1311 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useCallback, useReducer, useEffect, useRef } from 'react';
+import { useVimMode } from '../contexts/VimModeContext.js';
+import { debugLogger } from '@google/gemini-cli-core';
+import { Command } from '../key/keyMatchers.js';
+import { useKeyMatchers } from './useKeyMatchers.js';
+import { toCodePoints } from '../utils/textUtils.js';
+// Constants
+const DIGIT_MULTIPLIER = 10;
+const DEFAULT_COUNT = 1;
+const DIGIT_1_TO_9 = /^[1-9]$/;
+const DOUBLE_ESCAPE_TIMEOUT_MS = 500; // Timeout for double-escape to clear input
+// Command types
+const CMD_TYPES = {
+    DELETE_WORD_FORWARD: 'dw',
+    DELETE_WORD_BACKWARD: 'db',
+    DELETE_WORD_END: 'de',
+    DELETE_BIG_WORD_FORWARD: 'dW',
+    DELETE_BIG_WORD_BACKWARD: 'dB',
+    DELETE_BIG_WORD_END: 'dE',
+    CHANGE_WORD_FORWARD: 'cw',
+    CHANGE_WORD_BACKWARD: 'cb',
+    CHANGE_WORD_END: 'ce',
+    CHANGE_BIG_WORD_FORWARD: 'cW',
+    CHANGE_BIG_WORD_BACKWARD: 'cB',
+    CHANGE_BIG_WORD_END: 'cE',
+    DELETE_CHAR: 'x',
+    DELETE_CHAR_BEFORE: 'X',
+    TOGGLE_CASE: '~',
+    REPLACE_CHAR: 'r',
+    DELETE_LINE: 'dd',
+    CHANGE_LINE: 'cc',
+    DELETE_TO_EOL: 'D',
+    CHANGE_TO_EOL: 'C',
+    CHANGE_MOVEMENT: {
+        LEFT: 'ch',
+        DOWN: 'cj',
+        UP: 'ck',
+        RIGHT: 'cl',
+    },
+    DELETE_MOVEMENT: {
+        LEFT: 'dh',
+        DOWN: 'dj',
+        UP: 'dk',
+        RIGHT: 'dl',
+    },
+    DELETE_TO_SOL: 'd0',
+    DELETE_TO_FIRST_NONWS: 'd^',
+    CHANGE_TO_SOL: 'c0',
+    CHANGE_TO_FIRST_NONWS: 'c^',
+    DELETE_TO_FIRST_LINE: 'dgg',
+    DELETE_TO_LAST_LINE: 'dG',
+    CHANGE_TO_FIRST_LINE: 'cgg',
+    CHANGE_TO_LAST_LINE: 'cG',
+    YANK_LINE: 'yy',
+    YANK_WORD_FORWARD: 'yw',
+    YANK_BIG_WORD_FORWARD: 'yW',
+    YANK_WORD_END: 'ye',
+    YANK_BIG_WORD_END: 'yE',
+    YANK_TO_EOL: 'y$',
+    PASTE_AFTER: 'p',
+    PASTE_BEFORE: 'P',
+};
+const createClearPendingState = () => ({
+    count: 0,
+    pendingOperator: null,
+    pendingFindOp: undefined,
+});
+const initialVimState = {
+    mode: 'INSERT',
+    count: 0,
+    pendingOperator: null,
+    pendingFindOp: undefined,
+    lastCommand: null,
+    lastFind: undefined,
+};
+// Reducer function
+const vimReducer = (state, action) => {
+    switch (action.type) {
+        case 'SET_MODE':
+            return { ...state, mode: action.mode };
+        case 'SET_COUNT':
+            return { ...state, count: action.count };
+        case 'INCREMENT_COUNT':
+            return { ...state, count: state.count * DIGIT_MULTIPLIER + action.digit };
+        case 'CLEAR_COUNT':
+            return { ...state, count: 0 };
+        case 'SET_PENDING_OPERATOR':
+            return { ...state, pendingOperator: action.operator };
+        case 'SET_PENDING_FIND_OP':
+            return { ...state, pendingFindOp: action.pendingFindOp };
+        case 'SET_LAST_FIND':
+            return { ...state, lastFind: action.find };
+        case 'SET_LAST_COMMAND':
+            return { ...state, lastCommand: action.command };
+        case 'CLEAR_PENDING_STATES':
+            return {
+                ...state,
+                ...createClearPendingState(),
+            };
+        case 'ESCAPE_TO_NORMAL':
+            // Handle escape - clear all pending states (mode is updated via context)
+            return {
+                ...state,
+                ...createClearPendingState(),
+            };
+        default:
+            return state;
+    }
+};
+/**
+ * React hook that provides vim-style editing functionality for text input.
+ *
+ * Features:
+ * - Modal editing (INSERT/NORMAL modes)
+ * - Navigation: h,j,k,l,w,b,e,0,$,^,gg,G with count prefixes
+ * - Editing: x,a,i,o,O,A,I,d,c,D,C with count prefixes
+ * - Complex operations: dd,cc,dw,cw,db,cb,de,ce
+ * - Command repetition (.)
+ * - Settings persistence
+ *
+ * @param buffer - TextBuffer instance for text manipulation
+ * @param onSubmit - Optional callback for command submission
+ * @returns Object with vim state and input handler
+ */
+export function useVim(buffer, onSubmit) {
+    const keyMatchers = useKeyMatchers();
+    const { vimEnabled, vimMode, setVimMode } = useVimMode();
+    const [state, dispatch] = useReducer(vimReducer, initialVimState);
+    // Track last escape timestamp for double-escape detection
+    const lastEscapeTimestampRef = useRef(0);
+    // Sync vim mode from context to local state
+    useEffect(() => {
+        dispatch({ type: 'SET_MODE', mode: vimMode });
+    }, [vimMode]);
+    // Helper to update mode in both reducer and context
+    const updateMode = useCallback((mode) => {
+        setVimMode(mode);
+        dispatch({ type: 'SET_MODE', mode });
+    }, [setVimMode]);
+    // Helper functions using the reducer state
+    const getCurrentCount = useCallback(() => state.count || DEFAULT_COUNT, [state.count]);
+    // Returns true if two escapes occurred within DOUBLE_ESCAPE_TIMEOUT_MS.
+    const checkDoubleEscape = useCallback(() => {
+        const now = Date.now();
+        const lastEscape = lastEscapeTimestampRef.current;
+        lastEscapeTimestampRef.current = now;
+        if (now - lastEscape <= DOUBLE_ESCAPE_TIMEOUT_MS) {
+            lastEscapeTimestampRef.current = 0;
+            return true;
+        }
+        return false;
+    }, []);
+    /** Executes common commands to eliminate duplication in dot (.) repeat command */
+    const executeCommand = useCallback((cmdType, count, char) => {
+        switch (cmdType) {
+            case CMD_TYPES.DELETE_WORD_FORWARD: {
+                buffer.vimDeleteWordForward(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_WORD_BACKWARD: {
+                buffer.vimDeleteWordBackward(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_WORD_END: {
+                buffer.vimDeleteWordEnd(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_BIG_WORD_FORWARD: {
+                buffer.vimDeleteBigWordForward(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_BIG_WORD_BACKWARD: {
+                buffer.vimDeleteBigWordBackward(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_BIG_WORD_END: {
+                buffer.vimDeleteBigWordEnd(count);
+                break;
+            }
+            case CMD_TYPES.CHANGE_WORD_FORWARD: {
+                buffer.vimChangeWordForward(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_WORD_BACKWARD: {
+                buffer.vimChangeWordBackward(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_WORD_END: {
+                buffer.vimChangeWordEnd(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_BIG_WORD_FORWARD: {
+                buffer.vimChangeBigWordForward(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_BIG_WORD_BACKWARD: {
+                buffer.vimChangeBigWordBackward(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_BIG_WORD_END: {
+                buffer.vimChangeBigWordEnd(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.DELETE_CHAR: {
+                buffer.vimDeleteChar(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_CHAR_BEFORE: {
+                buffer.vimDeleteCharBefore(count);
+                break;
+            }
+            case CMD_TYPES.TOGGLE_CASE: {
+                buffer.vimToggleCase(count);
+                break;
+            }
+            case CMD_TYPES.REPLACE_CHAR: {
+                if (char)
+                    buffer.vimReplaceChar(char, count);
+                break;
+            }
+            case CMD_TYPES.DELETE_LINE: {
+                buffer.vimDeleteLine(count);
+                break;
+            }
+            case CMD_TYPES.CHANGE_LINE: {
+                buffer.vimChangeLine(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_MOVEMENT.LEFT:
+            case CMD_TYPES.CHANGE_MOVEMENT.DOWN:
+            case CMD_TYPES.CHANGE_MOVEMENT.UP:
+            case CMD_TYPES.CHANGE_MOVEMENT.RIGHT: {
+                const movementMap = {
+                    [CMD_TYPES.CHANGE_MOVEMENT.LEFT]: 'h',
+                    [CMD_TYPES.CHANGE_MOVEMENT.DOWN]: 'j',
+                    [CMD_TYPES.CHANGE_MOVEMENT.UP]: 'k',
+                    [CMD_TYPES.CHANGE_MOVEMENT.RIGHT]: 'l',
+                };
+                const movementType = movementMap[cmdType];
+                if (movementType) {
+                    buffer.vimChangeMovement(movementType, count);
+                    updateMode('INSERT');
+                }
+                break;
+            }
+            case CMD_TYPES.DELETE_TO_EOL: {
+                buffer.vimDeleteToEndOfLine(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_TO_SOL: {
+                buffer.vimDeleteToStartOfLine();
+                break;
+            }
+            case CMD_TYPES.DELETE_MOVEMENT.LEFT:
+            case CMD_TYPES.DELETE_MOVEMENT.DOWN:
+            case CMD_TYPES.DELETE_MOVEMENT.UP:
+            case CMD_TYPES.DELETE_MOVEMENT.RIGHT: {
+                const movementMap = {
+                    [CMD_TYPES.DELETE_MOVEMENT.LEFT]: 'h',
+                    [CMD_TYPES.DELETE_MOVEMENT.DOWN]: 'j',
+                    [CMD_TYPES.DELETE_MOVEMENT.UP]: 'k',
+                    [CMD_TYPES.DELETE_MOVEMENT.RIGHT]: 'l',
+                };
+                const movementType = movementMap[cmdType];
+                if (movementType) {
+                    buffer.vimChangeMovement(movementType, count);
+                }
+                break;
+            }
+            case CMD_TYPES.CHANGE_TO_EOL: {
+                buffer.vimChangeToEndOfLine(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.DELETE_TO_FIRST_NONWS: {
+                buffer.vimDeleteToFirstNonWhitespace();
+                break;
+            }
+            case CMD_TYPES.CHANGE_TO_SOL: {
+                buffer.vimChangeToStartOfLine();
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_TO_FIRST_NONWS: {
+                buffer.vimChangeToFirstNonWhitespace();
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.DELETE_TO_FIRST_LINE: {
+                buffer.vimDeleteToFirstLine(count);
+                break;
+            }
+            case CMD_TYPES.DELETE_TO_LAST_LINE: {
+                buffer.vimDeleteToLastLine(count);
+                break;
+            }
+            case CMD_TYPES.CHANGE_TO_FIRST_LINE: {
+                buffer.vimDeleteToFirstLine(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.CHANGE_TO_LAST_LINE: {
+                buffer.vimDeleteToLastLine(count);
+                updateMode('INSERT');
+                break;
+            }
+            case CMD_TYPES.YANK_LINE: {
+                buffer.vimYankLine(count);
+                break;
+            }
+            case CMD_TYPES.YANK_WORD_FORWARD: {
+                buffer.vimYankWordForward(count);
+                break;
+            }
+            case CMD_TYPES.YANK_BIG_WORD_FORWARD: {
+                buffer.vimYankBigWordForward(count);
+                break;
+            }
+            case CMD_TYPES.YANK_WORD_END: {
+                buffer.vimYankWordEnd(count);
+                break;
+            }
+            case CMD_TYPES.YANK_BIG_WORD_END: {
+                buffer.vimYankBigWordEnd(count);
+                break;
+            }
+            case CMD_TYPES.YANK_TO_EOL: {
+                buffer.vimYankToEndOfLine(count);
+                break;
+            }
+            case CMD_TYPES.PASTE_AFTER: {
+                buffer.vimPasteAfter(count);
+                break;
+            }
+            case CMD_TYPES.PASTE_BEFORE: {
+                buffer.vimPasteBefore(count);
+                break;
+            }
+            default:
+                return false;
+        }
+        return true;
+    }, [buffer, updateMode]);
+    /**
+     * Handles key input in INSERT mode
+     * @param normalizedKey - The normalized key input
+     * @returns boolean indicating if the key was handled
+     */
+    const handleInsertModeInput = useCallback((normalizedKey) => {
+        if (keyMatchers[Command.ESCAPE](normalizedKey)) {
+            // Record for double-escape detection (clearing happens in NORMAL mode)
+            checkDoubleEscape();
+            buffer.vimEscapeInsertMode();
+            dispatch({ type: 'ESCAPE_TO_NORMAL' });
+            updateMode('NORMAL');
+            return true;
+        }
+        // In INSERT mode, let InputPrompt handle completion keys and special commands
+        if (normalizedKey.name === 'tab' ||
+            (normalizedKey.name === 'enter' && !normalizedKey.ctrl) ||
+            normalizedKey.name === 'up' ||
+            normalizedKey.name === 'down' ||
+            (normalizedKey.ctrl && normalizedKey.name === 'r')) {
+            return false; // Let InputPrompt handle completion
+        }
+        // Let InputPrompt handle Ctrl+U (kill line left) and Ctrl+K (kill line right)
+        if (normalizedKey.ctrl &&
+            (normalizedKey.name === 'u' || normalizedKey.name === 'k')) {
+            return false;
+        }
+        // Let InputPrompt handle Ctrl+V for clipboard image pasting
+        if (normalizedKey.ctrl && normalizedKey.name === 'v') {
+            return false; // Let InputPrompt handle clipboard functionality
+        }
+        // Let InputPrompt handle shell commands
+        if (normalizedKey.sequence === '!' && buffer.text.length === 0) {
+            return false;
+        }
+        // Special handling for Enter key to allow command submission (lower priority than completion)
+        if (normalizedKey.name === 'enter' &&
+            !normalizedKey.alt &&
+            !normalizedKey.ctrl &&
+            !normalizedKey.cmd) {
+            if (buffer.text.trim() && onSubmit) {
+                // Handle command submission directly
+                const submittedValue = buffer.text;
+                buffer.setText('');
+                onSubmit(submittedValue);
+                return true;
+            }
+            return true; // Handled by vim (even if no onSubmit callback)
+        }
+        return buffer.handleInput(normalizedKey);
+    }, [buffer, dispatch, updateMode, onSubmit, checkDoubleEscape, keyMatchers]);
+    /**
+     * Normalizes key input to ensure all required properties are present
+     * @param key - Raw key input
+     * @returns Normalized key with all properties
+     */
+    const normalizeKey = useCallback((key) => ({
+        name: key.name || '',
+        sequence: key.sequence || '',
+        shift: key.shift || false,
+        alt: key.alt || false,
+        ctrl: key.ctrl || false,
+        cmd: key.cmd || false,
+        insertable: key.insertable || false,
+    }), []);
+    /**
+     * Handles change movement commands (ch, cj, ck, cl)
+     * @param movement - The movement direction
+     * @returns boolean indicating if command was handled
+     */
+    const handleChangeMovement = useCallback((movement) => {
+        const count = getCurrentCount();
+        dispatch({ type: 'CLEAR_COUNT' });
+        buffer.vimChangeMovement(movement, count);
+        updateMode('INSERT');
+        const cmdTypeMap = {
+            h: CMD_TYPES.CHANGE_MOVEMENT.LEFT,
+            j: CMD_TYPES.CHANGE_MOVEMENT.DOWN,
+            k: CMD_TYPES.CHANGE_MOVEMENT.UP,
+            l: CMD_TYPES.CHANGE_MOVEMENT.RIGHT,
+        };
+        dispatch({
+            type: 'SET_LAST_COMMAND',
+            command: { type: cmdTypeMap[movement], count },
+        });
+        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+        return true;
+    }, [getCurrentCount, dispatch, buffer, updateMode]);
+    /**
+     * Handles delete movement commands (dh, dj, dk, dl)
+     * @param movement - The movement direction
+     * @returns boolean indicating if command was handled
+     */
+    const handleDeleteMovement = useCallback((movement) => {
+        const count = getCurrentCount();
+        dispatch({ type: 'CLEAR_COUNT' });
+        // Note: vimChangeMovement performs the same deletion operation as what we need.
+        // The only difference between 'change' and 'delete' is that 'change' enters
+        // INSERT mode after deletion, which is handled here (we simply don't call updateMode).
+        buffer.vimChangeMovement(movement, count);
+        const cmdTypeMap = {
+            h: CMD_TYPES.DELETE_MOVEMENT.LEFT,
+            j: CMD_TYPES.DELETE_MOVEMENT.DOWN,
+            k: CMD_TYPES.DELETE_MOVEMENT.UP,
+            l: CMD_TYPES.DELETE_MOVEMENT.RIGHT,
+        };
+        dispatch({
+            type: 'SET_LAST_COMMAND',
+            command: { type: cmdTypeMap[movement], count },
+        });
+        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+        return true;
+    }, [getCurrentCount, dispatch, buffer]);
+    /**
+     * Handles operator-motion commands (dw/cw, db/cb, de/ce)
+     * @param operator - The operator type ('d' for delete, 'c' for change)
+     * @param motion - The motion type ('w', 'b', 'e')
+     * @returns boolean indicating if command was handled
+     */
+    const handleOperatorMotion = useCallback((operator, motion) => {
+        const count = getCurrentCount();
+        const commandMap = {
+            d: {
+                w: CMD_TYPES.DELETE_WORD_FORWARD,
+                b: CMD_TYPES.DELETE_WORD_BACKWARD,
+                e: CMD_TYPES.DELETE_WORD_END,
+                W: CMD_TYPES.DELETE_BIG_WORD_FORWARD,
+                B: CMD_TYPES.DELETE_BIG_WORD_BACKWARD,
+                E: CMD_TYPES.DELETE_BIG_WORD_END,
+            },
+            c: {
+                w: CMD_TYPES.CHANGE_WORD_FORWARD,
+                b: CMD_TYPES.CHANGE_WORD_BACKWARD,
+                e: CMD_TYPES.CHANGE_WORD_END,
+                W: CMD_TYPES.CHANGE_BIG_WORD_FORWARD,
+                B: CMD_TYPES.CHANGE_BIG_WORD_BACKWARD,
+                E: CMD_TYPES.CHANGE_BIG_WORD_END,
+            },
+        };
+        const cmdType = commandMap[operator][motion];
+        executeCommand(cmdType, count);
+        dispatch({
+            type: 'SET_LAST_COMMAND',
+            command: { type: cmdType, count },
+        });
+        dispatch({ type: 'CLEAR_COUNT' });
+        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+        return true;
+    }, [getCurrentCount, executeCommand, dispatch]);
+    const handleInput = useCallback((key) => {
+        if (!vimEnabled) {
+            return false; // Let InputPrompt handle it
+        }
+        let normalizedKey;
+        try {
+            normalizedKey = normalizeKey(key);
+        }
+        catch (error) {
+            // Handle malformed key inputs gracefully
+            debugLogger.warn('Malformed key input in vim mode:', key, error);
+            return false;
+        }
+        // Let InputPrompt handle Ctrl+C for clearing input (works in all modes)
+        if (keyMatchers[Command.CLEAR_INPUT](normalizedKey)) {
+            return false;
+        }
+        // Handle INSERT mode
+        if (state.mode === 'INSERT') {
+            return handleInsertModeInput(normalizedKey);
+        }
+        // Handle NORMAL mode
+        if (state.mode === 'NORMAL') {
+            if (keyMatchers[Command.ESCAPE](normalizedKey)) {
+                if (state.pendingOperator || state.pendingFindOp) {
+                    dispatch({ type: 'CLEAR_PENDING_STATES' });
+                    lastEscapeTimestampRef.current = 0;
+                    return true; // Handled by vim
+                }
+                // Check for double-escape to clear buffer
+                if (checkDoubleEscape()) {
+                    buffer.setText('');
+                    return true;
+                }
+                // First escape in NORMAL mode - pass through for UI feedback
+                return false;
+            }
+            // Handle count input (numbers 1-9, and 0 if count > 0)
+            if (DIGIT_1_TO_9.test(normalizedKey.sequence) ||
+                (normalizedKey.sequence === '0' && state.count > 0)) {
+                dispatch({
+                    type: 'INCREMENT_COUNT',
+                    digit: parseInt(normalizedKey.sequence, 10),
+                });
+                return true; // Handled by vim
+            }
+            const repeatCount = getCurrentCount();
+            // Handle pending find/till/replace — consume the next char as the target
+            if (state.pendingFindOp !== undefined) {
+                const targetChar = normalizedKey.sequence;
+                const { op, operator, count: findCount } = state.pendingFindOp;
+                dispatch({ type: 'SET_PENDING_FIND_OP', pendingFindOp: undefined });
+                dispatch({ type: 'CLEAR_COUNT' });
+                if (targetChar && toCodePoints(targetChar).length === 1) {
+                    if (op === 'r') {
+                        buffer.vimReplaceChar(targetChar, findCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: {
+                                type: CMD_TYPES.REPLACE_CHAR,
+                                count: findCount,
+                                char: targetChar,
+                            },
+                        });
+                    }
+                    else {
+                        const isBackward = op === 'F' || op === 'T';
+                        const isTill = op === 't' || op === 'T';
+                        if (operator === 'd' || operator === 'c') {
+                            const del = isBackward
+                                ? buffer.vimDeleteToCharBackward
+                                : buffer.vimDeleteToCharForward;
+                            del(targetChar, findCount, isTill);
+                            if (operator === 'c')
+                                updateMode('INSERT');
+                        }
+                        else {
+                            const find = isBackward
+                                ? buffer.vimFindCharBackward
+                                : buffer.vimFindCharForward;
+                            find(targetChar, findCount, isTill);
+                            dispatch({
+                                type: 'SET_LAST_FIND',
+                                find: { op, char: targetChar },
+                            });
+                        }
+                    }
+                }
+                return true;
+            }
+            switch (normalizedKey.sequence) {
+                case 'h': {
+                    // Check if this is part of a delete or change command (dh/ch)
+                    if (state.pendingOperator === 'd') {
+                        return handleDeleteMovement('h');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleChangeMovement('h');
+                    }
+                    // Normal left movement
+                    buffer.vimMoveLeft(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'j': {
+                    // Check if this is part of a delete or change command (dj/cj)
+                    if (state.pendingOperator === 'd') {
+                        return handleDeleteMovement('j');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleChangeMovement('j');
+                    }
+                    // Normal down movement
+                    buffer.vimMoveDown(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'k': {
+                    // Check if this is part of a delete or change command (dk/ck)
+                    if (state.pendingOperator === 'd') {
+                        return handleDeleteMovement('k');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleChangeMovement('k');
+                    }
+                    // Normal up movement
+                    buffer.vimMoveUp(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'l': {
+                    // Check if this is part of a delete or change command (dl/cl)
+                    if (state.pendingOperator === 'd') {
+                        return handleDeleteMovement('l');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleChangeMovement('l');
+                    }
+                    // Normal right movement
+                    buffer.vimMoveRight(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'w': {
+                    // Check if this is part of a delete or change command (dw/cw)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'w');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'w');
+                    }
+                    if (state.pendingOperator === 'y') {
+                        const count = getCurrentCount();
+                        executeCommand(CMD_TYPES.YANK_WORD_FORWARD, count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_WORD_FORWARD, count },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Normal word movement
+                    buffer.vimMoveWordForward(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'W': {
+                    // Check if this is part of a delete or change command (dW/cW)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'W');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'W');
+                    }
+                    if (state.pendingOperator === 'y') {
+                        const count = getCurrentCount();
+                        executeCommand(CMD_TYPES.YANK_BIG_WORD_FORWARD, count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_BIG_WORD_FORWARD, count },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Normal big word movement
+                    buffer.vimMoveBigWordForward(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'b': {
+                    // Check if this is part of a delete or change command (db/cb)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'b');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'b');
+                    }
+                    // Normal backward word movement
+                    buffer.vimMoveWordBackward(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'B': {
+                    // Check if this is part of a delete or change command (dB/cB)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'B');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'B');
+                    }
+                    // Normal backward big word movement
+                    buffer.vimMoveBigWordBackward(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'e': {
+                    // Check if this is part of a delete or change command (de/ce)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'e');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'e');
+                    }
+                    if (state.pendingOperator === 'y') {
+                        const count = getCurrentCount();
+                        executeCommand(CMD_TYPES.YANK_WORD_END, count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_WORD_END, count },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Normal word end movement
+                    buffer.vimMoveWordEnd(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'E': {
+                    // Check if this is part of a delete or change command (dE/cE)
+                    if (state.pendingOperator === 'd') {
+                        return handleOperatorMotion('d', 'E');
+                    }
+                    if (state.pendingOperator === 'c') {
+                        return handleOperatorMotion('c', 'E');
+                    }
+                    if (state.pendingOperator === 'y') {
+                        const count = getCurrentCount();
+                        executeCommand(CMD_TYPES.YANK_BIG_WORD_END, count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_BIG_WORD_END, count },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Normal big word end movement
+                    buffer.vimMoveBigWordEnd(repeatCount);
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'x': {
+                    // Delete character under cursor
+                    buffer.vimDeleteChar(repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.DELETE_CHAR, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'X': {
+                    buffer.vimDeleteCharBefore(repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: {
+                            type: CMD_TYPES.DELETE_CHAR_BEFORE,
+                            count: repeatCount,
+                        },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case '~': {
+                    buffer.vimToggleCase(repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.TOGGLE_CASE, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'r': {
+                    // Replace char: next keypress is the replacement. Not composable with d/c.
+                    dispatch({ type: 'CLEAR_PENDING_STATES' });
+                    dispatch({
+                        type: 'SET_PENDING_FIND_OP',
+                        pendingFindOp: {
+                            op: 'r',
+                            operator: undefined,
+                            count: repeatCount,
+                        },
+                    });
+                    return true;
+                }
+                case 'f':
+                case 'F':
+                case 't':
+                case 'T': {
+                    const op = normalizedKey.sequence;
+                    const operator = state.pendingOperator === 'd' || state.pendingOperator === 'c'
+                        ? state.pendingOperator
+                        : undefined;
+                    dispatch({ type: 'CLEAR_PENDING_STATES' });
+                    dispatch({
+                        type: 'SET_PENDING_FIND_OP',
+                        pendingFindOp: { op, operator, count: repeatCount },
+                    });
+                    return true;
+                }
+                case ';':
+                case ',': {
+                    if (state.lastFind) {
+                        const { op, char } = state.lastFind;
+                        const isForward = op === 'f' || op === 't';
+                        const isTill = op === 't' || op === 'T';
+                        const reverse = normalizedKey.sequence === ',';
+                        const shouldMoveForward = reverse ? !isForward : isForward;
+                        if (shouldMoveForward) {
+                            buffer.vimFindCharForward(char, repeatCount, isTill);
+                        }
+                        else {
+                            buffer.vimFindCharBackward(char, repeatCount, isTill);
+                        }
+                    }
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'i': {
+                    buffer.vimInsertAtCursor();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'a': {
+                    // Enter INSERT mode after current position
+                    buffer.vimAppendAtCursor();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'o': {
+                    // Insert new line after current line and enter INSERT mode
+                    buffer.vimOpenLineBelow();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'O': {
+                    // Insert new line before current line and enter INSERT mode
+                    buffer.vimOpenLineAbove();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case '0': {
+                    // Check if this is part of a delete command (d0)
+                    if (state.pendingOperator === 'd') {
+                        buffer.vimDeleteToStartOfLine();
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.DELETE_TO_SOL, count: 1 },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Check if this is part of a change command (c0)
+                    if (state.pendingOperator === 'c') {
+                        buffer.vimChangeToStartOfLine();
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.CHANGE_TO_SOL, count: 1 },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        updateMode('INSERT');
+                        return true;
+                    }
+                    // Move to start of line
+                    buffer.vimMoveToLineStart();
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case '$': {
+                    // Check if this is part of a delete command (d$)
+                    if (state.pendingOperator === 'd') {
+                        buffer.vimDeleteToEndOfLine(repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.DELETE_TO_EOL, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Check if this is part of a change command (c$)
+                    if (state.pendingOperator === 'c') {
+                        buffer.vimChangeToEndOfLine(repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.CHANGE_TO_EOL, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        updateMode('INSERT');
+                        return true;
+                    }
+                    // Check if this is part of a yank command (y$)
+                    if (state.pendingOperator === 'y') {
+                        executeCommand(CMD_TYPES.YANK_TO_EOL, repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_TO_EOL, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Move to end of line (with count, move down count-1 lines first)
+                    if (repeatCount > 1) {
+                        buffer.vimMoveDown(repeatCount - 1);
+                    }
+                    buffer.vimMoveToLineEnd();
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case '^': {
+                    // Check if this is part of a delete command (d^)
+                    if (state.pendingOperator === 'd') {
+                        buffer.vimDeleteToFirstNonWhitespace();
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.DELETE_TO_FIRST_NONWS, count: 1 },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Check if this is part of a change command (c^)
+                    if (state.pendingOperator === 'c') {
+                        buffer.vimChangeToFirstNonWhitespace();
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.CHANGE_TO_FIRST_NONWS, count: 1 },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        updateMode('INSERT');
+                        return true;
+                    }
+                    // Move to first non-whitespace character
+                    buffer.vimMoveToFirstNonWhitespace();
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'g': {
+                    if (state.pendingOperator === 'd') {
+                        // 'dg' - need another 'g' for 'dgg' command
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'dg' });
+                        return true;
+                    }
+                    if (state.pendingOperator === 'c') {
+                        // 'cg' - need another 'g' for 'cgg' command
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'cg' });
+                        return true;
+                    }
+                    if (state.pendingOperator === 'dg') {
+                        // 'dgg' command - delete from first line (or line N) to current line
+                        // Pass state.count directly (0 means first line, N means line N)
+                        buffer.vimDeleteToFirstLine(state.count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: {
+                                type: CMD_TYPES.DELETE_TO_FIRST_LINE,
+                                count: state.count,
+                            },
+                        });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        return true;
+                    }
+                    if (state.pendingOperator === 'cg') {
+                        // 'cgg' command - change from first line (or line N) to current line
+                        buffer.vimDeleteToFirstLine(state.count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: {
+                                type: CMD_TYPES.CHANGE_TO_FIRST_LINE,
+                                count: state.count,
+                            },
+                        });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        updateMode('INSERT');
+                        return true;
+                    }
+                    if (state.pendingOperator === 'g') {
+                        // Second 'g' - go to line N (gg command), or first line if no count
+                        if (state.count > 0) {
+                            buffer.vimMoveToLine(state.count);
+                        }
+                        else {
+                            buffer.vimMoveToFirstLine();
+                        }
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                    }
+                    else {
+                        // First 'g' - wait for second g (don't clear count yet)
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'g' });
+                    }
+                    return true;
+                }
+                case 'G': {
+                    // Check if this is part of a delete command (dG)
+                    if (state.pendingOperator === 'd') {
+                        // Pass state.count directly (0 means last line, N means line N)
+                        buffer.vimDeleteToLastLine(state.count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: {
+                                type: CMD_TYPES.DELETE_TO_LAST_LINE,
+                                count: state.count,
+                            },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        return true;
+                    }
+                    // Check if this is part of a change command (cG)
+                    if (state.pendingOperator === 'c') {
+                        buffer.vimDeleteToLastLine(state.count);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: {
+                                type: CMD_TYPES.CHANGE_TO_LAST_LINE,
+                                count: state.count,
+                            },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                        updateMode('INSERT');
+                        return true;
+                    }
+                    if (state.count > 0) {
+                        // Go to specific line number (1-based) when a count was provided
+                        buffer.vimMoveToLine(state.count);
+                    }
+                    else {
+                        // Go to last line when no count was provided
+                        buffer.vimMoveToLastLine();
+                    }
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'I': {
+                    // Enter INSERT mode at start of line (first non-whitespace)
+                    buffer.vimInsertAtLineStart();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'A': {
+                    // Enter INSERT mode at end of line
+                    buffer.vimAppendAtLineEnd();
+                    updateMode('INSERT');
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'd': {
+                    if (state.pendingOperator === 'd') {
+                        // Second 'd' - delete N lines (dd command)
+                        const repeatCount = getCurrentCount();
+                        executeCommand(CMD_TYPES.DELETE_LINE, repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.DELETE_LINE, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                    }
+                    else {
+                        // First 'd' - wait for movement command
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'd' });
+                    }
+                    return true;
+                }
+                case 'c': {
+                    if (state.pendingOperator === 'c') {
+                        // Second 'c' - change N entire lines (cc command)
+                        const repeatCount = getCurrentCount();
+                        executeCommand(CMD_TYPES.CHANGE_LINE, repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.CHANGE_LINE, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                    }
+                    else {
+                        // First 'c' - wait for movement command
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'c' });
+                    }
+                    return true;
+                }
+                case 'y': {
+                    if (state.pendingOperator === 'y') {
+                        // Second 'y' - yank N lines (yy command)
+                        const repeatCount = getCurrentCount();
+                        executeCommand(CMD_TYPES.YANK_LINE, repeatCount);
+                        dispatch({
+                            type: 'SET_LAST_COMMAND',
+                            command: { type: CMD_TYPES.YANK_LINE, count: repeatCount },
+                        });
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+                    }
+                    else if (state.pendingOperator === null) {
+                        // First 'y' - wait for motion
+                        dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'y' });
+                    }
+                    else {
+                        // Another operator is pending; clear it
+                        dispatch({ type: 'CLEAR_PENDING_STATES' });
+                    }
+                    return true;
+                }
+                case 'Y': {
+                    // Y yanks from cursor to end of line (equivalent to y$)
+                    const repeatCount = getCurrentCount();
+                    executeCommand(CMD_TYPES.YANK_TO_EOL, repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.YANK_TO_EOL, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'p': {
+                    executeCommand(CMD_TYPES.PASTE_AFTER, repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.PASTE_AFTER, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'P': {
+                    executeCommand(CMD_TYPES.PASTE_BEFORE, repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.PASTE_BEFORE, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'D': {
+                    // Delete from cursor to end of line (with count, delete to end of N lines)
+                    executeCommand(CMD_TYPES.DELETE_TO_EOL, repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.DELETE_TO_EOL, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'C': {
+                    // Change from cursor to end of line (with count, change to end of N lines)
+                    executeCommand(CMD_TYPES.CHANGE_TO_EOL, repeatCount);
+                    dispatch({
+                        type: 'SET_LAST_COMMAND',
+                        command: { type: CMD_TYPES.CHANGE_TO_EOL, count: repeatCount },
+                    });
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case 'u': {
+                    // Undo last change
+                    for (let i = 0; i < repeatCount; i++) {
+                        buffer.undo();
+                    }
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                case '.': {
+                    // Repeat last command (use current count if provided, otherwise use original count)
+                    if (state.lastCommand) {
+                        const cmdData = state.lastCommand;
+                        const count = state.count > 0 ? state.count : cmdData.count;
+                        // All repeatable commands are now handled by executeCommand
+                        executeCommand(cmdData.type, count, cmdData.char);
+                    }
+                    dispatch({ type: 'CLEAR_COUNT' });
+                    return true;
+                }
+                default: {
+                    // Check for arrow keys (they have different sequences but known names)
+                    if (normalizedKey.name === 'left') {
+                        // Left arrow - same as 'h'
+                        if (state.pendingOperator === 'd') {
+                            return handleDeleteMovement('h');
+                        }
+                        if (state.pendingOperator === 'c') {
+                            return handleChangeMovement('h');
+                        }
+                        // Normal left movement (same as 'h')
+                        buffer.vimMoveLeft(repeatCount);
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        return true;
+                    }
+                    if (normalizedKey.name === 'down') {
+                        // Down arrow - same as 'j'
+                        if (state.pendingOperator === 'd') {
+                            return handleDeleteMovement('j');
+                        }
+                        if (state.pendingOperator === 'c') {
+                            return handleChangeMovement('j');
+                        }
+                        // Normal down movement (same as 'j')
+                        buffer.vimMoveDown(repeatCount);
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        return true;
+                    }
+                    if (normalizedKey.name === 'up') {
+                        // Up arrow - same as 'k'
+                        if (state.pendingOperator === 'd') {
+                            return handleDeleteMovement('k');
+                        }
+                        if (state.pendingOperator === 'c') {
+                            return handleChangeMovement('k');
+                        }
+                        // Normal up movement (same as 'k')
+                        buffer.vimMoveUp(repeatCount);
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        return true;
+                    }
+                    if (normalizedKey.name === 'right') {
+                        // Right arrow - same as 'l'
+                        if (state.pendingOperator === 'd') {
+                            return handleDeleteMovement('l');
+                        }
+                        if (state.pendingOperator === 'c') {
+                            return handleChangeMovement('l');
+                        }
+                        // Normal right movement (same as 'l')
+                        buffer.vimMoveRight(repeatCount);
+                        dispatch({ type: 'CLEAR_COUNT' });
+                        return true;
+                    }
+                    // Unknown command, clear count and pending states
+                    dispatch({ type: 'CLEAR_PENDING_STATES' });
+                    // Ignore unmapped Insertable keys in Normal Mode, but let
+                    // modifier-key chords (ctrl/alt/cmd) fall through to other handlers.
+                    if (normalizedKey.insertable &&
+                        !normalizedKey.ctrl &&
+                        !normalizedKey.alt &&
+                        !normalizedKey.cmd) {
+                        return true;
+                    }
+                    // Not handled by vim so allow other handlers to process it.
+                    return false;
+                }
+            }
+        }
+        return false; // Not handled by vim
+    }, [
+        vimEnabled,
+        normalizeKey,
+        handleInsertModeInput,
+        state.mode,
+        state.count,
+        state.pendingOperator,
+        state.pendingFindOp,
+        state.lastCommand,
+        state.lastFind,
+        dispatch,
+        getCurrentCount,
+        handleChangeMovement,
+        handleDeleteMovement,
+        handleOperatorMotion,
+        buffer,
+        executeCommand,
+        updateMode,
+        checkDoubleEscape,
+        keyMatchers,
+    ]);
+    return {
+        mode: state.mode,
+        vimModeEnabled: vimEnabled,
+        handleInput, // Expose the input handler for InputPrompt to use
+    };
+}