@machina.ai/cell-cli 1.0.13-rc9 → 1.0.21-rc1

package/dist/src/ui/components/shared/text-buffer.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import stripAnsi from 'strip-ansi';
+import { stripVTControlCharacters } from 'util';
 import { spawnSync } from 'child_process';
 import fs from 'fs';
 import os from 'os';
@@ -12,6 +13,7 @@ import { useState, useCallback, useEffect, useMemo, useReducer } from 'react';
 import stringWidth from 'string-width';
 import { unescapePath } from '@machina.ai/cell-cli-core';
 import { toCodePoints, cpLen, cpSlice } from '../../utils/textUtils.js';
+import { handleVimAction } from './vim-buffer-actions.js';
 // Simple helper for word‑wise ops.
 function isWordChar(ch) {
     if (ch === undefined) {
@@ -19,24 +21,397 @@ function isWordChar(ch) {
     }
     return !/[\s,.;!?]/.test(ch);
 }
+// Helper functions for line-based word navigation
+export const isWordCharStrict = (char) => /[\w\p{L}\p{N}]/u.test(char); // Matches a single character that is any Unicode letter, any Unicode number, or an underscore
+export const isWhitespace = (char) => /\s/.test(char);
+// Check if a character is a combining mark (only diacritics for now)
+export const isCombiningMark = (char) => /\p{M}/u.test(char);
+// Check if a character should be considered part of a word (including combining marks)
+export const isWordCharWithCombining = (char) => isWordCharStrict(char) || isCombiningMark(char);
+// Get the script of a character (simplified for common scripts)
+export const getCharScript = (char) => {
+    if (/[\p{Script=Latin}]/u.test(char))
+        return 'latin'; // All Latin script chars including diacritics
+    if (/[\p{Script=Han}]/u.test(char))
+        return 'han'; // Chinese
+    if (/[\p{Script=Arabic}]/u.test(char))
+        return 'arabic';
+    if (/[\p{Script=Hiragana}]/u.test(char))
+        return 'hiragana';
+    if (/[\p{Script=Katakana}]/u.test(char))
+        return 'katakana';
+    if (/[\p{Script=Cyrillic}]/u.test(char))
+        return 'cyrillic';
+    return 'other';
+};
+// Check if two characters are from different scripts (indicating word boundary)
+export const isDifferentScript = (char1, char2) => {
+    if (!isWordCharStrict(char1) || !isWordCharStrict(char2))
+        return false;
+    return getCharScript(char1) !== getCharScript(char2);
+};
+// Find next word start within a line, starting from col
+export const findNextWordStartInLine = (line, col) => {
+    const chars = toCodePoints(line);
+    let i = col;
+    if (i >= chars.length)
+        return null;
+    const currentChar = chars[i];
+    // Skip current word/sequence based on character type
+    if (isWordCharStrict(currentChar)) {
+        while (i < chars.length && isWordCharWithCombining(chars[i])) {
+            // Check for script boundary - if next character is from different script, stop here
+            if (i + 1 < chars.length &&
+                isWordCharStrict(chars[i + 1]) &&
+                isDifferentScript(chars[i], chars[i + 1])) {
+                i++; // Include current character
+                break; // Stop at script boundary
+            }
+            i++;
+        }
+    }
+    else if (!isWhitespace(currentChar)) {
+        while (i < chars.length &&
+            !isWordCharStrict(chars[i]) &&
+            !isWhitespace(chars[i])) {
+            i++;
+        }
+    }
+    // Skip whitespace
+    while (i < chars.length && isWhitespace(chars[i])) {
+        i++;
+    }
+    return i < chars.length ? i : null;
+};
+// Find previous word start within a line
+export const findPrevWordStartInLine = (line, col) => {
+    const chars = toCodePoints(line);
+    let i = col;
+    if (i <= 0)
+        return null;
+    i--;
+    // Skip whitespace moving backwards
+    while (i >= 0 && isWhitespace(chars[i])) {
+        i--;
+    }
+    if (i < 0)
+        return null;
+    if (isWordCharStrict(chars[i])) {
+        // We're in a word, move to its beginning
+        while (i >= 0 && isWordCharStrict(chars[i])) {
+            // Check for script boundary - if previous character is from different script, stop here
+            if (i - 1 >= 0 &&
+                isWordCharStrict(chars[i - 1]) &&
+                isDifferentScript(chars[i], chars[i - 1])) {
+                return i; // Return current position at script boundary
+            }
+            i--;
+        }
+        return i + 1;
+    }
+    else {
+        // We're in punctuation, move to its beginning
+        while (i >= 0 && !isWordCharStrict(chars[i]) && !isWhitespace(chars[i])) {
+            i--;
+        }
+        return i + 1;
+    }
+};
+// Find word end within a line
+export const findWordEndInLine = (line, col) => {
+    const chars = toCodePoints(line);
+    let i = col;
+    // If we're already at the end of a word (including punctuation sequences), advance to next word
+    // This includes both regular word endings and script boundaries
+    const atEndOfWordChar = i < chars.length &&
+        isWordCharWithCombining(chars[i]) &&
+        (i + 1 >= chars.length ||
+            !isWordCharWithCombining(chars[i + 1]) ||
+            (isWordCharStrict(chars[i]) &&
+                i + 1 < chars.length &&
+                isWordCharStrict(chars[i + 1]) &&
+                isDifferentScript(chars[i], chars[i + 1])));
+    const atEndOfPunctuation = i < chars.length &&
+        !isWordCharWithCombining(chars[i]) &&
+        !isWhitespace(chars[i]) &&
+        (i + 1 >= chars.length ||
+            isWhitespace(chars[i + 1]) ||
+            isWordCharWithCombining(chars[i + 1]));
+    if (atEndOfWordChar || atEndOfPunctuation) {
+        // We're at the end of a word or punctuation sequence, move forward to find next word
+        i++;
+        // Skip whitespace to find next word or punctuation
+        while (i < chars.length && isWhitespace(chars[i])) {
+            i++;
+        }
+    }
+    // If we're not on a word character, find the next word or punctuation sequence
+    if (i < chars.length && !isWordCharWithCombining(chars[i])) {
+        // Skip whitespace to find next word or punctuation
+        while (i < chars.length && isWhitespace(chars[i])) {
+            i++;
+        }
+    }
+    // Move to end of current word (including combining marks, but stop at script boundaries)
+    let foundWord = false;
+    let lastBaseCharPos = -1;
+    if (i < chars.length && isWordCharWithCombining(chars[i])) {
+        // Handle word characters
+        while (i < chars.length && isWordCharWithCombining(chars[i])) {
+            foundWord = true;
+            // Track the position of the last base character (not combining mark)
+            if (isWordCharStrict(chars[i])) {
+                lastBaseCharPos = i;
+            }
+            // Check if next character is from a different script (word boundary)
+            if (i + 1 < chars.length &&
+                isWordCharStrict(chars[i + 1]) &&
+                isDifferentScript(chars[i], chars[i + 1])) {
+                i++; // Include current character
+                if (isWordCharStrict(chars[i - 1])) {
+                    lastBaseCharPos = i - 1;
+                }
+                break; // Stop at script boundary
+            }
+            i++;
+        }
+    }
+    else if (i < chars.length && !isWhitespace(chars[i])) {
+        // Handle punctuation sequences (like ████)
+        while (i < chars.length &&
+            !isWordCharStrict(chars[i]) &&
+            !isWhitespace(chars[i])) {
+            foundWord = true;
+            lastBaseCharPos = i;
+            i++;
+        }
+    }
+    // Only return a position if we actually found a word
+    // Return the position of the last base character, not combining marks
+    if (foundWord && lastBaseCharPos >= col) {
+        return lastBaseCharPos;
+    }
+    return null;
+};
+// Find next word across lines
+export const findNextWordAcrossLines = (lines, cursorRow, cursorCol, searchForWordStart) => {
+    // First try current line
+    const currentLine = lines[cursorRow] || '';
+    const colInCurrentLine = searchForWordStart
+        ? findNextWordStartInLine(currentLine, cursorCol)
+        : findWordEndInLine(currentLine, cursorCol);
+    if (colInCurrentLine !== null) {
+        return { row: cursorRow, col: colInCurrentLine };
+    }
+    // Search subsequent lines
+    for (let row = cursorRow + 1; row < lines.length; row++) {
+        const line = lines[row] || '';
+        const chars = toCodePoints(line);
+        // For empty lines, if we haven't found any words yet, return the empty line
+        if (chars.length === 0) {
+            // Check if there are any words in remaining lines
+            let hasWordsInLaterLines = false;
+            for (let laterRow = row + 1; laterRow < lines.length; laterRow++) {
+                const laterLine = lines[laterRow] || '';
+                const laterChars = toCodePoints(laterLine);
+                let firstNonWhitespace = 0;
+                while (firstNonWhitespace < laterChars.length &&
+                    isWhitespace(laterChars[firstNonWhitespace])) {
+                    firstNonWhitespace++;
+                }
+                if (firstNonWhitespace < laterChars.length) {
+                    hasWordsInLaterLines = true;
+                    break;
+                }
+            }
+            // If no words in later lines, return the empty line
+            if (!hasWordsInLaterLines) {
+                return { row, col: 0 };
+            }
+            continue;
+        }
+        // Find first non-whitespace
+        let firstNonWhitespace = 0;
+        while (firstNonWhitespace < chars.length &&
+            isWhitespace(chars[firstNonWhitespace])) {
+            firstNonWhitespace++;
+        }
+        if (firstNonWhitespace < chars.length) {
+            if (searchForWordStart) {
+                return { row, col: firstNonWhitespace };
+            }
+            else {
+                // For word end, find the end of the first word
+                const endCol = findWordEndInLine(line, firstNonWhitespace);
+                if (endCol !== null) {
+                    return { row, col: endCol };
+                }
+            }
+        }
+    }
+    return null;
+};
+// Find previous word across lines
+export const findPrevWordAcrossLines = (lines, cursorRow, cursorCol) => {
+    // First try current line
+    const currentLine = lines[cursorRow] || '';
+    const colInCurrentLine = findPrevWordStartInLine(currentLine, cursorCol);
+    if (colInCurrentLine !== null) {
+        return { row: cursorRow, col: colInCurrentLine };
+    }
+    // Search previous lines
+    for (let row = cursorRow - 1; row >= 0; row--) {
+        const line = lines[row] || '';
+        const chars = toCodePoints(line);
+        if (chars.length === 0)
+            continue;
+        // Find last word start
+        let lastWordStart = chars.length;
+        while (lastWordStart > 0 && isWhitespace(chars[lastWordStart - 1])) {
+            lastWordStart--;
+        }
+        if (lastWordStart > 0) {
+            // Find start of this word
+            const wordStart = findPrevWordStartInLine(line, lastWordStart);
+            if (wordStart !== null) {
+                return { row, col: wordStart };
+            }
+        }
+    }
+    return null;
+};
+// Helper functions for vim line operations
+export const getPositionFromOffsets = (startOffset, endOffset, lines) => {
+    let offset = 0;
+    let startRow = 0;
+    let startCol = 0;
+    let endRow = 0;
+    let endCol = 0;
+    // Find start position
+    for (let i = 0; i < lines.length; i++) {
+        const lineLength = lines[i].length + 1; // +1 for newline
+        if (offset + lineLength > startOffset) {
+            startRow = i;
+            startCol = startOffset - offset;
+            break;
+        }
+        offset += lineLength;
+    }
+    // Find end position
+    offset = 0;
+    for (let i = 0; i < lines.length; i++) {
+        const lineLength = lines[i].length + (i < lines.length - 1 ? 1 : 0); // +1 for newline except last line
+        if (offset + lineLength >= endOffset) {
+            endRow = i;
+            endCol = endOffset - offset;
+            break;
+        }
+        offset += lineLength;
+    }
+    return { startRow, startCol, endRow, endCol };
+};
+export const getLineRangeOffsets = (startRow, lineCount, lines) => {
+    let startOffset = 0;
+    // Calculate start offset
+    for (let i = 0; i < startRow; i++) {
+        startOffset += lines[i].length + 1; // +1 for newline
+    }
+    // Calculate end offset
+    let endOffset = startOffset;
+    for (let i = 0; i < lineCount; i++) {
+        const lineIndex = startRow + i;
+        if (lineIndex < lines.length) {
+            endOffset += lines[lineIndex].length;
+            if (lineIndex < lines.length - 1) {
+                endOffset += 1; // +1 for newline
+            }
+        }
+    }
+    return { startOffset, endOffset };
+};
+export const replaceRangeInternal = (state, startRow, startCol, endRow, endCol, text) => {
+    const currentLine = (row) => state.lines[row] || '';
+    const currentLineLen = (row) => cpLen(currentLine(row));
+    const clamp = (value, min, max) => Math.min(Math.max(value, min), max);
+    if (startRow > endRow ||
+        (startRow === endRow && startCol > endCol) ||
+        startRow < 0 ||
+        startCol < 0 ||
+        endRow >= state.lines.length ||
+        (endRow < state.lines.length && endCol > currentLineLen(endRow))) {
+        return state; // Invalid range
+    }
+    const newLines = [...state.lines];
+    const sCol = clamp(startCol, 0, currentLineLen(startRow));
+    const eCol = clamp(endCol, 0, currentLineLen(endRow));
+    const prefix = cpSlice(currentLine(startRow), 0, sCol);
+    const suffix = cpSlice(currentLine(endRow), eCol);
+    const normalisedReplacement = text
+        .replace(/\r\n/g, '\n')
+        .replace(/\r/g, '\n');
+    const replacementParts = normalisedReplacement.split('\n');
+    // The combined first line of the new text
+    const firstLine = prefix + replacementParts[0];
+    if (replacementParts.length === 1) {
+        // No newlines in replacement: combine prefix, replacement, and suffix on one line.
+        newLines.splice(startRow, endRow - startRow + 1, firstLine + suffix);
+    }
+    else {
+        // Newlines in replacement: create new lines.
+        const lastLine = replacementParts[replacementParts.length - 1] + suffix;
+        const middleLines = replacementParts.slice(1, -1);
+        newLines.splice(startRow, endRow - startRow + 1, firstLine, ...middleLines, lastLine);
+    }
+    const finalCursorRow = startRow + replacementParts.length - 1;
+    const finalCursorCol = (replacementParts.length > 1 ? 0 : sCol) +
+        cpLen(replacementParts[replacementParts.length - 1]);
+    return {
+        ...state,
+        lines: newLines,
+        cursorRow: Math.min(Math.max(finalCursorRow, 0), newLines.length - 1),
+        cursorCol: Math.max(0, Math.min(finalCursorCol, cpLen(newLines[finalCursorRow] || ''))),
+        preferredCol: null,
+    };
+};
 /**
  * Strip characters that can break terminal rendering.
  *
- * Strip ANSI escape codes and control characters except for line breaks.
- * Control characters such as delete break terminal UI rendering.
+ * Uses Node.js built-in stripVTControlCharacters to handle VT sequences,
+ * then filters remaining control characters that can disrupt display.
+ *
+ * Characters stripped:
+ * - ANSI escape sequences (via strip-ansi)
+ * - VT control sequences (via Node.js util.stripVTControlCharacters)
+ * - C0 control chars (0x00-0x1F) except CR/LF which are handled elsewhere
+ * - C1 control chars (0x80-0x9F) that can cause display issues
+ *
+ * Characters preserved:
+ * - All printable Unicode including emojis
+ * - DEL (0x7F) - handled functionally by applyOperations, not a display issue
+ * - CR/LF (0x0D/0x0A) - needed for line breaks
  */
 function stripUnsafeCharacters(str) {
-    const stripped = stripAnsi(str);
-    return toCodePoints(stripped)
+    const strippedAnsi = stripAnsi(str);
+    const strippedVT = stripVTControlCharacters(strippedAnsi);
+    return toCodePoints(strippedVT)
         .filter((char) => {
-        if (char.length > 1)
-            return false;
         const code = char.codePointAt(0);
-        if (code === undefined) {
+        if (code === undefined)
             return false;
-        }
-        const isUnsafe = code === 127 || (code <= 31 && code !== 13 && code !== 10);
-        return !isUnsafe;
+        // Preserve CR/LF for line handling
+        if (code === 0x0a || code === 0x0d)
+            return true;
+        // Remove C0 control chars (except CR/LF) that can break display
+        // Examples: BELL(0x07) makes noise, BS(0x08) moves cursor, VT(0x0B), FF(0x0C)
+        if (code >= 0x00 && code <= 0x1f)
+            return false;
+        // Remove C1 control chars (0x80-0x9F) - legacy 8-bit control codes
+        if (code >= 0x80 && code <= 0x9f)
+            return false;
+        // Preserve DEL (0x7F) - it's handled functionally by applyOperations as backspace
+        // and doesn't cause rendering issues when displayed
+        // Preserve all other characters including Unicode/emojis
+        return true;
     })
         .join('');
 }
@@ -106,6 +481,24 @@ export function offsetToLogicalPos(text, offset) {
     }
     return [row, col];
 }
+/**
+ * Converts logical row/col position to absolute text offset
+ * Inverse operation of offsetToLogicalPos
+ */
+export function logicalPosToOffset(lines, row, col) {
+    let offset = 0;
+    // Clamp row to valid range
+    const actualRow = Math.min(row, lines.length - 1);
+    // Add lengths of all lines before the target row
+    for (let i = 0; i < actualRow; i++) {
+        offset += cpLen(lines[i]) + 1; // +1 for newline
+    }
+    // Add column offset within the target row
+    if (actualRow >= 0 && actualRow < lines.length) {
+        offset += Math.min(col, cpLen(lines[actualRow]));
+    }
+    return offset;
+}
 // Helper to calculate visual lines and map cursor positions
 function calculateVisualLayout(logicalLines, logicalCursor, viewportWidth) {
     const visualLines = [];
@@ -279,26 +672,27 @@ function calculateVisualLayout(logicalLines, logicalCursor, viewportWidth) {
     };
 }
 const historyLimit = 100;
-export function textBufferReducer(state, action) {
-    const pushUndo = (currentState) => {
-        const snapshot = {
-            lines: [...currentState.lines],
-            cursorRow: currentState.cursorRow,
-            cursorCol: currentState.cursorCol,
-        };
-        const newStack = [...currentState.undoStack, snapshot];
-        if (newStack.length > historyLimit) {
-            newStack.shift();
-        }
-        return { ...currentState, undoStack: newStack, redoStack: [] };
+export const pushUndo = (currentState) => {
+    const snapshot = {
+        lines: [...currentState.lines],
+        cursorRow: currentState.cursorRow,
+        cursorCol: currentState.cursorCol,
     };
+    const newStack = [...currentState.undoStack, snapshot];
+    if (newStack.length > historyLimit) {
+        newStack.shift();
+    }
+    return { ...currentState, undoStack: newStack, redoStack: [] };
+};
+export function textBufferReducer(state, action) {
+    const pushUndoLocal = pushUndo;
     const currentLine = (r) => state.lines[r] ?? '';
     const currentLineLen = (r) => cpLen(currentLine(r));
     switch (action.type) {
         case 'set_text': {
             let nextState = state;
             if (action.pushToUndo !== false) {
-                nextState = pushUndo(state);
+                nextState = pushUndoLocal(state);
             }
             const newContentLines = action.payload
                 .replace(/\r\n?/g, '\n')
@@ -314,7 +708,7 @@ export function textBufferReducer(state, action) {
             };
         }
         case 'insert': {
-            const nextState = pushUndo(state);
+            const nextState = pushUndoLocal(state);
             const newLines = [...nextState.lines];
             let newCursorRow = nextState.cursorRow;
             let newCursorCol = nextState.cursorCol;
@@ -346,7 +740,7 @@ export function textBufferReducer(state, action) {
             };
         }
         case 'backspace': {
-            const nextState = pushUndo(state);
+            const nextState = pushUndoLocal(state);
             const newLines = [...nextState.lines];
             let newCursorRow = nextState.cursorRow;
             let newCursorCol = nextState.cursorCol;
@@ -523,7 +917,7 @@ export function textBufferReducer(state, action) {
             const { cursorRow, cursorCol, lines } = state;
             const lineContent = currentLine(cursorRow);
             if (cursorCol < currentLineLen(cursorRow)) {
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] =
                     cpSlice(lineContent, 0, cursorCol) +
@@ -531,7 +925,7 @@ export function textBufferReducer(state, action) {
                 return { ...nextState, lines: newLines, preferredCol: null };
             }
             else if (cursorRow < lines.length - 1) {
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const nextLineContent = currentLine(cursorRow + 1);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] = lineContent + nextLineContent;
@@ -546,7 +940,7 @@ export function textBufferReducer(state, action) {
                 return state;
             if (cursorCol === 0) {
                 // Act as a backspace
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const prevLineContent = currentLine(cursorRow - 1);
                 const currentLineContentVal = currentLine(cursorRow);
                 const newCol = cpLen(prevLineContent);
@@ -561,7 +955,7 @@ export function textBufferReducer(state, action) {
                     preferredCol: null,
                 };
             }
-            const nextState = pushUndo(state);
+            const nextState = pushUndoLocal(state);
             const lineContent = currentLine(cursorRow);
             const arr = toCodePoints(lineContent);
             let start = cursorCol;
@@ -599,14 +993,14 @@ export function textBufferReducer(state, action) {
                 return state;
             if (cursorCol >= arr.length) {
                 // Act as a delete
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const nextLineContent = currentLine(cursorRow + 1);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] = lineContent + nextLineContent;
                 newLines.splice(cursorRow + 1, 1);
                 return { ...nextState, lines: newLines, preferredCol: null };
             }
-            const nextState = pushUndo(state);
+            const nextState = pushUndoLocal(state);
             let end = cursorCol;
             while (end < arr.length && !isWordChar(arr[end]))
                 end++;
@@ -621,14 +1015,14 @@ export function textBufferReducer(state, action) {
             const { cursorRow, cursorCol, lines } = state;
             const lineContent = currentLine(cursorRow);
             if (cursorCol < currentLineLen(cursorRow)) {
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] = cpSlice(lineContent, 0, cursorCol);
                 return { ...nextState, lines: newLines };
             }
             else if (cursorRow < lines.length - 1) {
                 // Act as a delete
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const nextLineContent = currentLine(cursorRow + 1);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] = lineContent + nextLineContent;
@@ -640,7 +1034,7 @@ export function textBufferReducer(state, action) {
         case 'kill_line_left': {
             const { cursorRow, cursorCol } = state;
             if (cursorCol > 0) {
-                const nextState = pushUndo(state);
+                const nextState = pushUndoLocal(state);
                 const lineContent = currentLine(cursorRow);
                 const newLines = [...nextState.lines];
                 newLines[cursorRow] = cpSlice(lineContent, cursorCol);
@@ -687,51 +1081,8 @@ export function textBufferReducer(state, action) {
         }
         case 'replace_range': {
             const { startRow, startCol, endRow, endCol, text } = action.payload;
-            if (startRow > endRow ||
-                (startRow === endRow && startCol > endCol) ||
-                startRow < 0 ||
-                startCol < 0 ||
-                endRow >= state.lines.length ||
-                (endRow < state.lines.length && endCol > currentLineLen(endRow))) {
-                return state; // Invalid range
-            }
-            const nextState = pushUndo(state);
-            const newLines = [...nextState.lines];
-            const sCol = clamp(startCol, 0, currentLineLen(startRow));
-            const eCol = clamp(endCol, 0, currentLineLen(endRow));
-            const prefix = cpSlice(currentLine(startRow), 0, sCol);
-            const suffix = cpSlice(currentLine(endRow), eCol);
-            const normalisedReplacement = text
-                .replace(/\r\n/g, '\n')
-                .replace(/\r/g, '\n');
-            const replacementParts = normalisedReplacement.split('\n');
-            // Replace the content
-            if (startRow === endRow) {
-                newLines[startRow] = prefix + normalisedReplacement + suffix;
-            }
-            else {
-                const firstLine = prefix + replacementParts[0];
-                if (replacementParts.length === 1) {
-                    // Single line of replacement text, but spanning multiple original lines
-                    newLines.splice(startRow, endRow - startRow + 1, firstLine + suffix);
-                }
-                else {
-                    // Multi-line replacement text
-                    const lastLine = replacementParts[replacementParts.length - 1] + suffix;
-                    const middleLines = replacementParts.slice(1, -1);
-                    newLines.splice(startRow, endRow - startRow + 1, firstLine, ...middleLines, lastLine);
-                }
-            }
-            const finalCursorRow = startRow + replacementParts.length - 1;
-            const finalCursorCol = (replacementParts.length > 1 ? 0 : sCol) +
-                cpLen(replacementParts[replacementParts.length - 1]);
-            return {
-                ...nextState,
-                lines: newLines,
-                cursorRow: finalCursorRow,
-                cursorCol: finalCursorCol,
-                preferredCol: null,
-            };
+            const nextState = pushUndoLocal(state);
+            return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, text);
         }
         case 'move_to_offset': {
             const { offset } = action.payload;
@@ -744,8 +1095,42 @@ export function textBufferReducer(state, action) {
             };
         }
         case 'create_undo_snapshot': {
-            return pushUndo(state);
+            return pushUndoLocal(state);
         }
+        // Vim-specific operations
+        case 'vim_delete_word_forward':
+        case 'vim_delete_word_backward':
+        case 'vim_delete_word_end':
+        case 'vim_change_word_forward':
+        case 'vim_change_word_backward':
+        case 'vim_change_word_end':
+        case 'vim_delete_line':
+        case 'vim_change_line':
+        case 'vim_delete_to_end_of_line':
+        case 'vim_change_to_end_of_line':
+        case 'vim_change_movement':
+        case 'vim_move_left':
+        case 'vim_move_right':
+        case 'vim_move_up':
+        case 'vim_move_down':
+        case 'vim_move_word_forward':
+        case 'vim_move_word_backward':
+        case 'vim_move_word_end':
+        case 'vim_delete_char':
+        case 'vim_insert_at_cursor':
+        case 'vim_append_at_cursor':
+        case 'vim_open_line_below':
+        case 'vim_open_line_above':
+        case 'vim_append_at_line_end':
+        case 'vim_insert_at_line_start':
+        case 'vim_move_to_line_start':
+        case 'vim_move_to_line_end':
+        case 'vim_move_to_first_nonwhitespace':
+        case 'vim_move_to_first_line':
+        case 'vim_move_to_last_line':
+        case 'vim_move_to_line':
+        case 'vim_escape_insert_mode':
+            return handleVimAction(state, action);
         default: {
             const exhaustiveCheck = action;
             console.error(`Unknown action encountered: ${exhaustiveCheck}`);
@@ -798,22 +1183,23 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
             setVisualScrollRow(newVisualScrollRow);
         }
     }, [visualCursor, visualScrollRow, viewport]);
-    const insert = useCallback((ch) => {
+    const insert = useCallback((ch, { paste = false } = {}) => {
         if (/[\n\r]/.test(ch)) {
             dispatch({ type: 'insert', payload: ch });
             return;
         }
         const minLengthToInferAsDragDrop = 3;
-        if (ch.length >= minLengthToInferAsDragDrop && !shellModeActive) {
-            let potentialPath = ch;
-            if (potentialPath.length > 2 &&
-                potentialPath.startsWith("'") &&
-                potentialPath.endsWith("'")) {
-                potentialPath = ch.slice(1, -1);
+        if (ch.length >= minLengthToInferAsDragDrop &&
+            !shellModeActive &&
+            paste) {
+            let potentialPath = ch.trim();
+            const quoteMatch = potentialPath.match(/^'(.*)'$/);
+            if (quoteMatch) {
+                potentialPath = quoteMatch[1];
             }
             potentialPath = potentialPath.trim();
             if (isValidPath(unescapePath(potentialPath))) {
-                ch = `@${potentialPath}`;
+                ch = `@${potentialPath} `;
             }
         }
         let currentText = '';
@@ -866,6 +1252,104 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
     const killLineLeft = useCallback(() => {
         dispatch({ type: 'kill_line_left' });
     }, []);
+    // Vim-specific operations
+    const vimDeleteWordForward = useCallback((count) => {
+        dispatch({ type: 'vim_delete_word_forward', payload: { count } });
+    }, []);
+    const vimDeleteWordBackward = useCallback((count) => {
+        dispatch({ type: 'vim_delete_word_backward', payload: { count } });
+    }, []);
+    const vimDeleteWordEnd = useCallback((count) => {
+        dispatch({ type: 'vim_delete_word_end', payload: { count } });
+    }, []);
+    const vimChangeWordForward = useCallback((count) => {
+        dispatch({ type: 'vim_change_word_forward', payload: { count } });
+    }, []);
+    const vimChangeWordBackward = useCallback((count) => {
+        dispatch({ type: 'vim_change_word_backward', payload: { count } });
+    }, []);
+    const vimChangeWordEnd = useCallback((count) => {
+        dispatch({ type: 'vim_change_word_end', payload: { count } });
+    }, []);
+    const vimDeleteLine = useCallback((count) => {
+        dispatch({ type: 'vim_delete_line', payload: { count } });
+    }, []);
+    const vimChangeLine = useCallback((count) => {
+        dispatch({ type: 'vim_change_line', payload: { count } });
+    }, []);
+    const vimDeleteToEndOfLine = useCallback(() => {
+        dispatch({ type: 'vim_delete_to_end_of_line' });
+    }, []);
+    const vimChangeToEndOfLine = useCallback(() => {
+        dispatch({ type: 'vim_change_to_end_of_line' });
+    }, []);
+    const vimChangeMovement = useCallback((movement, count) => {
+        dispatch({ type: 'vim_change_movement', payload: { movement, count } });
+    }, []);
+    // New vim navigation and operation methods
+    const vimMoveLeft = useCallback((count) => {
+        dispatch({ type: 'vim_move_left', payload: { count } });
+    }, []);
+    const vimMoveRight = useCallback((count) => {
+        dispatch({ type: 'vim_move_right', payload: { count } });
+    }, []);
+    const vimMoveUp = useCallback((count) => {
+        dispatch({ type: 'vim_move_up', payload: { count } });
+    }, []);
+    const vimMoveDown = useCallback((count) => {
+        dispatch({ type: 'vim_move_down', payload: { count } });
+    }, []);
+    const vimMoveWordForward = useCallback((count) => {
+        dispatch({ type: 'vim_move_word_forward', payload: { count } });
+    }, []);
+    const vimMoveWordBackward = useCallback((count) => {
+        dispatch({ type: 'vim_move_word_backward', payload: { count } });
+    }, []);
+    const vimMoveWordEnd = useCallback((count) => {
+        dispatch({ type: 'vim_move_word_end', payload: { count } });
+    }, []);
+    const vimDeleteChar = useCallback((count) => {
+        dispatch({ type: 'vim_delete_char', payload: { count } });
+    }, []);
+    const vimInsertAtCursor = useCallback(() => {
+        dispatch({ type: 'vim_insert_at_cursor' });
+    }, []);
+    const vimAppendAtCursor = useCallback(() => {
+        dispatch({ type: 'vim_append_at_cursor' });
+    }, []);
+    const vimOpenLineBelow = useCallback(() => {
+        dispatch({ type: 'vim_open_line_below' });
+    }, []);
+    const vimOpenLineAbove = useCallback(() => {
+        dispatch({ type: 'vim_open_line_above' });
+    }, []);
+    const vimAppendAtLineEnd = useCallback(() => {
+        dispatch({ type: 'vim_append_at_line_end' });
+    }, []);
+    const vimInsertAtLineStart = useCallback(() => {
+        dispatch({ type: 'vim_insert_at_line_start' });
+    }, []);
+    const vimMoveToLineStart = useCallback(() => {
+        dispatch({ type: 'vim_move_to_line_start' });
+    }, []);
+    const vimMoveToLineEnd = useCallback(() => {
+        dispatch({ type: 'vim_move_to_line_end' });
+    }, []);
+    const vimMoveToFirstNonWhitespace = useCallback(() => {
+        dispatch({ type: 'vim_move_to_first_nonwhitespace' });
+    }, []);
+    const vimMoveToFirstLine = useCallback(() => {
+        dispatch({ type: 'vim_move_to_first_line' });
+    }, []);
+    const vimMoveToLastLine = useCallback(() => {
+        dispatch({ type: 'vim_move_to_last_line' });
+    }, []);
+    const vimMoveToLine = useCallback((lineNumber) => {
+        dispatch({ type: 'vim_move_to_line', payload: { lineNumber } });
+    }, []);
+    const vimEscapeInsertMode = useCallback(() => {
+        dispatch({ type: 'vim_escape_insert_mode' });
+    }, []);
     const openInExternalEditor = useCallback(async (opts = {}) => {
         const editor = opts.editor ??
             process.env['VISUAL'] ??
@@ -911,6 +1395,12 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
     }, [text, stdin, setRawMode]);
     const handleInput = useCallback((key) => {
         const { sequence: input } = key;
+        if (key.paste) {
+            // Do not do any other processing on pastes so ensure we handle them
+            // before all other cases.
+            insert(input, { paste: key.paste });
+            return;
+        }
         if (key.name === 'return' ||
             input === '\r' ||
             input === '\n' ||
@@ -959,7 +1449,7 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
         else if (key.name === 'delete' || (key.ctrl && key.name === 'd'))
             del();
         else if (input && !key.ctrl && !key.meta) {
-            insert(input);
+            insert(input, { paste: key.paste });
         }
     }, [newline, move, deleteWordLeft, deleteWordRight, backspace, del, insert]);
     const renderedVisualLines = useMemo(() => visualLines.slice(visualScrollRow, visualScrollRow + viewport.height), [visualLines, visualScrollRow, viewport.height]);
@@ -1004,6 +1494,39 @@ export function useTextBuffer({ initialText = '', initialCursorOffset = 0, viewp
         killLineLeft,
         handleInput,
         openInExternalEditor,
+        // Vim-specific operations
+        vimDeleteWordForward,
+        vimDeleteWordBackward,
+        vimDeleteWordEnd,
+        vimChangeWordForward,
+        vimChangeWordBackward,
+        vimChangeWordEnd,
+        vimDeleteLine,
+        vimChangeLine,
+        vimDeleteToEndOfLine,
+        vimChangeToEndOfLine,
+        vimChangeMovement,
+        vimMoveLeft,
+        vimMoveRight,
+        vimMoveUp,
+        vimMoveDown,
+        vimMoveWordForward,
+        vimMoveWordBackward,
+        vimMoveWordEnd,
+        vimDeleteChar,
+        vimInsertAtCursor,
+        vimAppendAtCursor,
+        vimOpenLineBelow,
+        vimOpenLineAbove,
+        vimAppendAtLineEnd,
+        vimInsertAtLineStart,
+        vimMoveToLineStart,
+        vimMoveToLineEnd,
+        vimMoveToFirstNonWhitespace,
+        vimMoveToFirstLine,
+        vimMoveToLastLine,
+        vimMoveToLine,
+        vimEscapeInsertMode,
     };
     return returnValue;
 }