@caupulican/pi-tui 0.81.42 → 0.84.1

package/dist/components/editor.js

@@ -1,3 +1,6 @@
+import { BracketedPasteBuffer } from "../bracketed-paste.js";
+import { DELETE_CHARACTER_BACKWARD, DELETE_CHARACTER_FORWARD, DELETE_TO_LINE_END, DELETE_TO_LINE_START, DELETE_WORD_BACKWARD, DELETE_WORD_FORWARD, dispatchDeletionInput, } from "../editing-actions.js";
+import { firstNonWhitespaceCharacter } from "../editor-component.js";
 import { getKeybindings } from "../keybindings.js";
 import { decodePrintableKey, matchesKey } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
@@ -183,68 +186,50 @@ function createScrollBorder(direction, hiddenLineCount, width) {
     return sliceByColumn(indicator, 0, indicatorWidth, true) + ellipsis;
 }
 export class Editor {
-    state = {
-        lines: [""],
-        cursorLine: 0,
-        cursorCol: 0,
-    };
-    /** Focusable interface - set by TUI when focus changes */
-    focused = false;
-    tui;
-    theme;
-    paddingX = 0;
-    // Store last render width for cursor navigation
-    lastWidth = 80;
-    // Vertical scrolling support
-    scrollOffset = 0;
-    // Border color (can be changed dynamically)
-    borderColor;
-    // Autocomplete support
-    autocompleteProvider;
-    autocompleteList;
-    autocompleteState = null;
-    autocompletePrefix = "";
-    autocompleteMaxVisible = 5;
-    autocompleteAbort;
-    autocompleteDebounceTimer;
-    autocompleteRequestTask = Promise.resolve();
-    autocompleteStartToken = 0;
-    autocompleteRequestId = 0;
-    // Paste tracking for large pastes
-    pastes = new Map();
-    pasteCounter = 0;
-    // Bracketed paste mode buffering
-    pasteBuffer = "";
-    isInPaste = false;
-    // Prompt history for up/down navigation
-    history = [];
-    historyIndex = -1; // -1 = not browsing, 0 = most recent, 1 = older, etc.
-    /**
-     * Consulted on Up arrow in an empty editor, before history navigation.
-     * Return true after restoring queued message(s) into the editor to consume
-     * the key; return false to fall through to history.
-     */
-    onRecallQueued;
-    // Kill ring for Emacs-style kill/yank operations
-    killRing = new KillRing();
-    lastAction = null;
-    // Character jump mode
-    jumpMode = null;
-    // Preferred visual column for vertical cursor movement (sticky column)
-    preferredVisualCol = null;
-    // When the cursor is snapped to the start of an atomic segment, e.g. a
-    // paste marker, cursorCol no longer reflects where the cursor would have
-    // landed. This field stores the pre-snap cursorCol so that the next
-    // vertical move can resolve it to a visual column on whatever VL it belongs
-    // to.
-    snappedFromCursorCol = null;
-    // Undo support
-    undoStack = new UndoStack();
-    privateContent;
-    onSubmit;
-    onChange;
-    disableSubmit = false;
     constructor(tui, theme, options = {}) {
+        this.state = {
+            lines: [""],
+            cursorLine: 0,
+            cursorCol: 0,
+        };
+        /** Focusable interface - set by TUI when focus changes */
+        this.focused = false;
+        this.paddingX = 0;
+        // Store last render width for cursor navigation
+        this.lastWidth = 80;
+        // Vertical scrolling support
+        this.scrollOffset = 0;
+        this.autocompleteState = null;
+        this.autocompletePrefix = "";
+        this.autocompleteMaxVisible = 5;
+        this.autocompleteRequestTask = Promise.resolve();
+        this.autocompleteStartToken = 0;
+        this.autocompleteRequestId = 0;
+        // Paste tracking for large pastes
+        this.pastes = new Map();
+        this.pasteCounter = 0;
+        // Bracketed paste mode buffering
+        this.bracketedPaste = new BracketedPasteBuffer();
+        // Prompt history for up/down navigation
+        this.history = [];
+        this.historyIndex = -1; // -1 = not browsing, 0 = most recent, 1 = older, etc.
+        // Kill ring for Emacs-style kill/yank operations
+        this.killRing = new KillRing();
+        this.lastAction = null;
+        // Character jump mode
+        this.jumpMode = null;
+        // Preferred visual column for vertical cursor movement (sticky column)
+        this.preferredVisualCol = null;
+        // When the cursor is snapped to the start of an atomic segment, e.g. a
+        // paste marker, cursorCol no longer reflects where the cursor would have
+        // landed. This field stores the pre-snap cursorCol so that the next
+        // vertical move can resolve it to a visual column on whatever VL it belongs
+        // to.
+        this.snappedFromCursorCol = null;
+        // Undo support
+        this.undoStack = new UndoStack();
+        this.supportsChangeSummary = true;
+        this.disableSubmit = false;
         this.tui = tui;
         this.theme = theme;
         this.borderColor = theme.borderColor;
@@ -254,6 +239,19 @@ export class Editor {
         const maxVisible = options.autocompleteMaxVisible ?? 5;
         this.autocompleteMaxVisible = Number.isFinite(maxVisible) ? Math.max(3, Math.min(20, Math.floor(maxVisible))) : 5;
     }
+    notifyChange() {
+        if (this.onChangeSummary) {
+            let firstNonWhitespace;
+            for (const line of this.state.lines) {
+                firstNonWhitespace = firstNonWhitespaceCharacter(line);
+                if (firstNonWhitespace !== undefined)
+                    break;
+            }
+            this.onChangeSummary({ firstNonWhitespace });
+        }
+        if (this.onChange)
+            this.onChange(this.getText());
+    }
     /** Set of currently valid paste IDs, for marker-aware segmentation. */
     validPasteIds() {
         return new Set(this.pastes.keys());
@@ -360,9 +358,7 @@ export class Editor {
         this.setCursorCol(this.state.lines[this.state.cursorLine]?.length || 0);
         // Reset scroll - render() will adjust to show cursor
         this.scrollOffset = 0;
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
     invalidate() {
         // No cached state to invalidate currently
@@ -487,30 +483,19 @@ export class Editor {
             // Control character - cancel and fall through to normal handling
             this.jumpMode = null;
         }
-        // Handle bracketed paste mode
-        if (data.includes("\x1b[200~")) {
-            this.isInPaste = true;
-            this.pasteBuffer = "";
-            data = data.replace("\x1b[200~", "");
-        }
-        if (this.isInPaste) {
-            this.pasteBuffer += data;
-            const endIndex = this.pasteBuffer.indexOf("\x1b[201~");
-            if (endIndex !== -1) {
-                const pasteContent = this.pasteBuffer.substring(0, endIndex);
-                if (pasteContent.length > 0) {
-                    this.handlePaste(pasteContent);
-                }
-                this.isInPaste = false;
-                const remaining = this.pasteBuffer.substring(endIndex + 6);
-                this.pasteBuffer = "";
-                if (remaining.length > 0) {
-                    this.handleInput(remaining);
-                }
-                return;
+        const pasteResult = this.bracketedPaste.consume(data);
+        if (pasteResult.kind === "pending")
+            return;
+        if (pasteResult.kind === "complete") {
+            if (pasteResult.content.length > 0) {
+                this.handlePaste(pasteResult.content);
+            }
+            if (pasteResult.remainder.length > 0) {
+                this.handleInput(pasteResult.remainder);
             }
             return;
         }
+        data = pasteResult.data;
         // Ctrl+C - let parent handle (exit/clear)
         if (kb.matches(data, "tui.input.copy")) {
             return;
@@ -532,37 +517,21 @@ export class Editor {
                 return;
             }
             if (kb.matches(data, "tui.input.tab")) {
-                const selected = this.autocompleteList.getSelectedItem();
-                if (selected && this.autocompleteProvider) {
-                    this.pushUndoSnapshot();
-                    this.lastAction = null;
-                    const result = this.autocompleteProvider.applyCompletion(this.state.lines, this.state.cursorLine, this.state.cursorCol, selected, this.autocompletePrefix);
-                    this.state.lines = result.lines;
-                    this.state.cursorLine = result.cursorLine;
-                    this.setCursorCol(result.cursorCol);
+                if (this.applySelectedAutocomplete()) {
                     this.cancelAutocomplete();
-                    if (this.onChange)
-                        this.onChange(this.getText());
+                    this.notifyChange();
                 }
                 return;
             }
             if (kb.matches(data, "tui.select.confirm")) {
-                const selected = this.autocompleteList.getSelectedItem();
-                if (selected && this.autocompleteProvider) {
-                    this.pushUndoSnapshot();
-                    this.lastAction = null;
-                    const result = this.autocompleteProvider.applyCompletion(this.state.lines, this.state.cursorLine, this.state.cursorCol, selected, this.autocompletePrefix);
-                    this.state.lines = result.lines;
-                    this.state.cursorLine = result.cursorLine;
-                    this.setCursorCol(result.cursorCol);
+                if (this.applySelectedAutocomplete()) {
                     if (this.autocompletePrefix.startsWith("/")) {
                         this.cancelAutocomplete();
                         // Fall through to submit
                     }
                     else {
                         this.cancelAutocomplete();
-                        if (this.onChange)
-                            this.onChange(this.getText());
+                        this.notifyChange();
                         return;
                     }
                 }
@@ -573,31 +542,8 @@ export class Editor {
             this.handleTabCompletion();
             return;
         }
-        // Deletion actions
-        if (kb.matches(data, "tui.editor.deleteToLineEnd")) {
-            this.deleteToEndOfLine();
-            return;
-        }
-        if (kb.matches(data, "tui.editor.deleteToLineStart")) {
-            this.deleteToStartOfLine();
-            return;
-        }
-        if (kb.matches(data, "tui.editor.deleteWordBackward")) {
-            this.deleteWordBackwards();
-            return;
-        }
-        if (kb.matches(data, "tui.editor.deleteWordForward")) {
-            this.deleteWordForward();
-            return;
-        }
-        if (kb.matches(data, "tui.editor.deleteCharBackward") || matchesKey(data, "shift+backspace")) {
-            this.handleBackspace();
-            return;
-        }
-        if (kb.matches(data, "tui.editor.deleteCharForward") || matchesKey(data, "shift+delete")) {
-            this.handleForwardDelete();
+        if (dispatchDeletionInput(data, this))
             return;
-        }
         // Kill ring actions
         if (kb.matches(data, "tui.editor.yank")) {
             if (!this.privateContent)
@@ -634,7 +580,7 @@ export class Editor {
             (data.length > 1 && data.includes("\x1b") && data.includes("\r")) ||
             (data === "\n" && data.length === 1)) {
             if (this.shouldSubmitOnBackslashEnter(data, kb)) {
-                this.handleBackspace();
+                this[DELETE_CHARACTER_BACKWARD]();
                 this.submitValue();
                 return;
             }
@@ -649,7 +595,7 @@ export class Editor {
             // If char before cursor is \, delete it and insert newline instead of submitting.
             const currentLine = this.state.lines[this.state.cursorLine] || "";
             if (this.state.cursorCol > 0 && currentLine[this.state.cursorCol - 1] === "\\") {
-                this.handleBackspace();
+                this[DELETE_CHARACTER_BACKWARD]();
                 this.addNewLine();
                 return;
             }
@@ -730,6 +676,18 @@ export class Editor {
             this.insertCharacter(data);
         }
     }
+    applySelectedAutocomplete() {
+        const selected = this.autocompleteList?.getSelectedItem();
+        if (!selected || !this.autocompleteProvider)
+            return false;
+        this.pushUndoSnapshot();
+        this.lastAction = null;
+        const result = this.autocompleteProvider.applyCompletion(this.state.lines, this.state.cursorLine, this.state.cursorCol, selected, this.autocompletePrefix);
+        this.state.lines = result.lines;
+        this.state.cursorLine = result.cursorLine;
+        this.setCursorCol(result.cursorCol);
+        return true;
+    }
     layoutText(contentWidth) {
         const layoutLines = [];
         if (this.state.lines.length === 0 || (this.state.lines.length === 1 && this.state.lines[0] === "")) {
@@ -817,12 +775,7 @@ export class Editor {
         return this.state.lines.join("\n");
     }
     expandPasteMarkers(text) {
-        let result = text;
-        for (const [pasteId, pasteContent] of this.pastes) {
-            const markerRegex = new RegExp(`\\[paste #${pasteId}( (\\+\\d+ lines|\\d+ chars))?\\]`, "g");
-            result = result.replace(markerRegex, () => pasteContent);
-        }
-        return result;
+        return text.replace(PASTE_MARKER_REGEX, (marker, idGroup) => this.pastes.get(Number(idGroup)) ?? marker);
     }
     /**
      * Get text with paste markers expanded to their actual content.
@@ -856,8 +809,7 @@ export class Editor {
         this.state = { lines: [""], cursorLine: 0, cursorCol: 0 };
         this.pastes.clear();
         this.pasteCounter = 0;
-        this.pasteBuffer = "";
-        this.isInPaste = false;
+        this.bracketedPaste.clear();
         this.history = [];
         this.historyIndex = -1;
         this.killRing = new KillRing();
@@ -867,8 +819,7 @@ export class Editor {
         this.preferredVisualCol = null;
         this.snappedFromCursorCol = null;
         this.scrollOffset = 0;
-        if (this.onChange)
-            this.onChange("");
+        this.notifyChange();
     }
     /**
      * Insert text at the current cursor position.
@@ -929,9 +880,7 @@ export class Editor {
             this.state.cursorLine += insertedLines.length - 1;
             this.setCursorCol((insertedLines[insertedLines.length - 1] || "").length);
         }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
     // All the editor methods from before...
     insertCharacter(char, skipUndoCoalescing) {
@@ -952,9 +901,7 @@ export class Editor {
         const after = line.slice(this.state.cursorCol);
         this.state.lines[this.state.cursorLine] = before + char + after;
         this.setCursorCol(this.state.cursorCol + char.length);
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
         // Check if we should trigger or update autocomplete
         if (!this.autocompleteState) {
             // Auto-trigger for "/" at the start of a line (slash commands)
@@ -972,22 +919,28 @@ export class Editor {
             }
             // Also auto-trigger when typing letters in a slash command or symbol completion context
             else if (/[a-zA-Z0-9.\-_]/.test(char)) {
-                const currentLine = this.state.lines[this.state.cursorLine] || "";
-                const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
-                // Check if we're in a slash command (with or without space for arguments)
-                if (this.isInSlashCommandContext(textBeforeCursor)) {
-                    this.tryTriggerAutocomplete();
-                }
-                // Check if we're in a symbol-based completion context like @ or #
-                else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
-                    this.tryTriggerAutocomplete();
-                }
+                this.triggerAutocompleteForCurrentContext();
             }
         }
         else {
             this.updateAutocomplete();
         }
     }
+    triggerAutocompleteForCurrentContext() {
+        const currentLine = this.state.lines[this.state.cursorLine] || "";
+        const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
+        if (this.isInSlashCommandContext(textBeforeCursor) || /(?:^|[\s])[@#][^\s]*$/.test(textBeforeCursor)) {
+            this.tryTriggerAutocomplete();
+        }
+    }
+    refreshAutocompleteAfterDeletion() {
+        if (this.autocompleteState) {
+            this.updateAutocomplete();
+        }
+        else {
+            this.triggerAutocompleteForCurrentContext();
+        }
+    }
     handlePaste(pastedText) {
         this.cancelAutocomplete();
         this.historyIndex = -1; // Exit history browsing mode
@@ -1009,10 +962,9 @@ export class Editor {
         // Clean the pasted text: normalize line endings, expand tabs
         const cleanText = this.normalizeText(decodedText);
         // Filter out non-printable characters except newlines
-        let filteredText = cleanText
-            .split("")
-            .filter((char) => char === "\n" || (this.privateContent && char === "\t") || char.charCodeAt(0) >= 32)
-            .join("");
+        let filteredText = this.privateContent
+            ? cleanText.replace(/[\x00-\x08\x0b-\x1f]/g, "")
+            : cleanText.replace(/[\x00-\x09\x0b-\x1f]/g, "");
         // If pasting a file path (starts with /, ~, or .) and the character before
         // the cursor is a word character, prepend a space for better readability
         if (!this.privateContent && /^[/~.]/.test(filteredText)) {
@@ -1060,9 +1012,7 @@ export class Editor {
         // Move cursor to start of new line
         this.state.cursorLine++;
         this.setCursorCol(0);
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
     shouldSubmitOnBackslashEnter(data, kb) {
         if (this.disableSubmit)
@@ -1084,7 +1034,7 @@ export class Editor {
         if (this.onSubmit)
             this.onSubmit(result);
     }
-    handleBackspace() {
+    [DELETE_CHARACTER_BACKWARD]() {
         this.historyIndex = -1; // Exit history browsing mode
         this.lastAction = null;
         if (this.state.cursorCol > 0) {
@@ -1119,34 +1069,10 @@ export class Editor {
         }
         else if (this.state.cursorLine > 0) {
             this.pushUndoSnapshot();
-            // Merge with previous line
-            const currentLine = this.state.lines[this.state.cursorLine] || "";
-            const previousLine = this.state.lines[this.state.cursorLine - 1] || "";
-            this.state.lines[this.state.cursorLine - 1] = previousLine + currentLine;
-            this.state.lines.splice(this.state.cursorLine, 1);
-            this.state.cursorLine--;
-            this.setCursorCol(previousLine.length);
-        }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
-        // Update or re-trigger autocomplete after backspace
-        if (this.autocompleteState) {
-            this.updateAutocomplete();
-        }
-        else {
-            // If autocomplete was cancelled (no matches), re-trigger if we're in a completable context
-            const currentLine = this.state.lines[this.state.cursorLine] || "";
-            const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
-            // Slash command context
-            if (this.isInSlashCommandContext(textBeforeCursor)) {
-                this.tryTriggerAutocomplete();
-            }
-            // Symbol-based completion context like @ or #
-            else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
-                this.tryTriggerAutocomplete();
-            }
+            this.mergeCurrentLineIntoPrevious();
         }
+        this.notifyChange();
+        this.refreshAutocompleteAfterDeletion();
     }
     /**
      * Set cursor column and clear preferredVisualCol.
@@ -1282,7 +1208,33 @@ export class Editor {
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         this.setCursorCol(currentLine.length);
     }
-    deleteToStartOfLine() {
+    mergeCurrentLineIntoPrevious() {
+        const currentLine = this.state.lines[this.state.cursorLine] || "";
+        const previousLine = this.state.lines[this.state.cursorLine - 1] || "";
+        this.state.lines[this.state.cursorLine - 1] = previousLine + currentLine;
+        this.state.lines.splice(this.state.cursorLine, 1);
+        this.state.cursorLine--;
+        this.setCursorCol(previousLine.length);
+    }
+    mergeNextLineIntoCurrent() {
+        const currentLine = this.state.lines[this.state.cursorLine] || "";
+        const nextLine = this.state.lines[this.state.cursorLine + 1] || "";
+        this.state.lines[this.state.cursorLine] = currentLine + nextLine;
+        this.state.lines.splice(this.state.cursorLine + 1, 1);
+    }
+    isAtCurrentLineEnd(currentLine) {
+        return this.state.cursorCol >= currentLine.length;
+    }
+    hasNextLine() {
+        return this.state.cursorLine < this.state.lines.length - 1;
+    }
+    recordKilledNewline(prepend) {
+        if (this.privateContent)
+            return;
+        this.killRing.push("\n", { prepend, accumulate: this.lastAction === "kill" });
+        this.lastAction = "kill";
+    }
+    [DELETE_TO_LINE_START]() {
         this.historyIndex = -1; // Exit history browsing mode
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         if (this.state.cursorCol > 0) {
@@ -1299,22 +1251,12 @@ export class Editor {
         }
         else if (this.state.cursorLine > 0) {
             this.pushUndoSnapshot();
-            // At start of line - merge with previous line, treating newline as deleted text
-            if (!this.privateContent) {
-                this.killRing.push("\n", { prepend: true, accumulate: this.lastAction === "kill" });
-                this.lastAction = "kill";
-            }
-            const previousLine = this.state.lines[this.state.cursorLine - 1] || "";
-            this.state.lines[this.state.cursorLine - 1] = previousLine + currentLine;
-            this.state.lines.splice(this.state.cursorLine, 1);
-            this.state.cursorLine--;
-            this.setCursorCol(previousLine.length);
-        }
-        if (this.onChange) {
-            this.onChange(this.getText());
+            this.recordKilledNewline(true);
+            this.mergeCurrentLineIntoPrevious();
         }
+        this.notifyChange();
     }
-    deleteToEndOfLine() {
+    [DELETE_TO_LINE_END]() {
         this.historyIndex = -1; // Exit history browsing mode
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         if (this.state.cursorCol < currentLine.length) {
@@ -1330,36 +1272,20 @@ export class Editor {
         }
         else if (this.state.cursorLine < this.state.lines.length - 1) {
             this.pushUndoSnapshot();
-            // At end of line - merge with next line, treating newline as deleted text
-            if (!this.privateContent) {
-                this.killRing.push("\n", { prepend: false, accumulate: this.lastAction === "kill" });
-                this.lastAction = "kill";
-            }
-            const nextLine = this.state.lines[this.state.cursorLine + 1] || "";
-            this.state.lines[this.state.cursorLine] = currentLine + nextLine;
-            this.state.lines.splice(this.state.cursorLine + 1, 1);
-        }
-        if (this.onChange) {
-            this.onChange(this.getText());
+            this.recordKilledNewline(false);
+            this.mergeNextLineIntoCurrent();
         }
+        this.notifyChange();
     }
-    deleteWordBackwards() {
+    [DELETE_WORD_BACKWARD]() {
         this.historyIndex = -1; // Exit history browsing mode
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         // If at start of line, behave like backspace at column 0 (merge with previous line)
         if (this.state.cursorCol === 0) {
             if (this.state.cursorLine > 0) {
                 this.pushUndoSnapshot();
-                // Treat newline as deleted text (backward deletion = prepend)
-                if (!this.privateContent) {
-                    this.killRing.push("\n", { prepend: true, accumulate: this.lastAction === "kill" });
-                    this.lastAction = "kill";
-                }
-                const previousLine = this.state.lines[this.state.cursorLine - 1] || "";
-                this.state.lines[this.state.cursorLine - 1] = previousLine + currentLine;
-                this.state.lines.splice(this.state.cursorLine, 1);
-                this.state.cursorLine--;
-                this.setCursorCol(previousLine.length);
+                this.recordKilledNewline(true);
+                this.mergeCurrentLineIntoPrevious();
             }
         }
         else {
@@ -1379,25 +1305,17 @@ export class Editor {
                 currentLine.slice(0, deleteFrom) + currentLine.slice(this.state.cursorCol);
             this.setCursorCol(deleteFrom);
         }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
-    deleteWordForward() {
+    [DELETE_WORD_FORWARD]() {
         this.historyIndex = -1; // Exit history browsing mode
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         // If at end of line, merge with next line (delete the newline)
-        if (this.state.cursorCol >= currentLine.length) {
-            if (this.state.cursorLine < this.state.lines.length - 1) {
+        if (this.isAtCurrentLineEnd(currentLine)) {
+            if (this.hasNextLine()) {
                 this.pushUndoSnapshot();
-                // Treat newline as deleted text (forward deletion = append)
-                if (!this.privateContent) {
-                    this.killRing.push("\n", { prepend: false, accumulate: this.lastAction === "kill" });
-                    this.lastAction = "kill";
-                }
-                const nextLine = this.state.lines[this.state.cursorLine + 1] || "";
-                this.state.lines[this.state.cursorLine] = currentLine + nextLine;
-                this.state.lines.splice(this.state.cursorLine + 1, 1);
+                this.recordKilledNewline(false);
+                this.mergeNextLineIntoCurrent();
             }
         }
         else {
@@ -1416,11 +1334,9 @@ export class Editor {
             this.state.lines[this.state.cursorLine] =
                 currentLine.slice(0, this.state.cursorCol) + currentLine.slice(deleteTo);
         }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
-    handleForwardDelete() {
+    [DELETE_CHARACTER_FORWARD]() {
         this.historyIndex = -1; // Exit history browsing mode
         this.lastAction = null;
         const currentLine = this.state.lines[this.state.cursorLine] || "";
@@ -1438,30 +1354,10 @@ export class Editor {
         }
         else if (this.state.cursorLine < this.state.lines.length - 1) {
             this.pushUndoSnapshot();
-            // At end of line - merge with next line
-            const nextLine = this.state.lines[this.state.cursorLine + 1] || "";
-            this.state.lines[this.state.cursorLine] = currentLine + nextLine;
-            this.state.lines.splice(this.state.cursorLine + 1, 1);
-        }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
-        // Update or re-trigger autocomplete after forward delete
-        if (this.autocompleteState) {
-            this.updateAutocomplete();
-        }
-        else {
-            const currentLine = this.state.lines[this.state.cursorLine] || "";
-            const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
-            // Slash command context
-            if (this.isInSlashCommandContext(textBeforeCursor)) {
-                this.tryTriggerAutocomplete();
-            }
-            // Symbol-based completion context like @ or #
-            else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
-                this.tryTriggerAutocomplete();
-            }
+            this.mergeNextLineIntoCurrent();
         }
+        this.notifyChange();
+        this.refreshAutocompleteAfterDeletion();
     }
     /**
      * Build a mapping from visual lines to logical positions.
@@ -1634,36 +1530,7 @@ export class Editor {
      */
     insertYankedText(text) {
         this.historyIndex = -1; // Exit history browsing mode
-        const lines = text.split("\n");
-        if (lines.length === 1) {
-            // Single line - insert at cursor
-            const currentLine = this.state.lines[this.state.cursorLine] || "";
-            const before = currentLine.slice(0, this.state.cursorCol);
-            const after = currentLine.slice(this.state.cursorCol);
-            this.state.lines[this.state.cursorLine] = before + text + after;
-            this.setCursorCol(this.state.cursorCol + text.length);
-        }
-        else {
-            // Multi-line insert
-            const currentLine = this.state.lines[this.state.cursorLine] || "";
-            const before = currentLine.slice(0, this.state.cursorCol);
-            const after = currentLine.slice(this.state.cursorCol);
-            // First line merges with text before cursor
-            this.state.lines[this.state.cursorLine] = before + (lines[0] || "");
-            // Insert middle lines
-            for (let i = 1; i < lines.length - 1; i++) {
-                this.state.lines.splice(this.state.cursorLine + i, 0, lines[i] || "");
-            }
-            // Last line merges with text after cursor
-            const lastLineIndex = this.state.cursorLine + lines.length - 1;
-            this.state.lines.splice(lastLineIndex, 0, (lines[lines.length - 1] || "") + after);
-            // Update cursor position
-            this.state.cursorLine = lastLineIndex;
-            this.setCursorCol((lines[lines.length - 1] || "").length);
-        }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.insertTextAtCursorInternal(text);
     }
     /**
      * Delete the previously yanked text (used by yank-pop).
@@ -1697,9 +1564,7 @@ export class Editor {
             this.state.cursorLine = startLine;
             this.setCursorCol(startCol);
         }
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
     pushUndoSnapshot() {
         if (this.privateContent)
@@ -1716,9 +1581,7 @@ export class Editor {
         this.pasteCounter = snapshot.pasteCounter;
         this.lastAction = null;
         this.preferredVisualCol = null;
-        if (this.onChange) {
-            this.onChange(this.getText());
-        }
+        this.notifyChange();
     }
     /**
      * Jump to the first occurrence of a character in the specified direction.
@@ -1752,8 +1615,8 @@ export class Editor {
         this.lastAction = null;
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         // If at end of line, move to start of next line
-        if (this.state.cursorCol >= currentLine.length) {
-            if (this.state.cursorLine < this.state.lines.length - 1) {
+        if (this.isAtCurrentLineEnd(currentLine)) {
+            if (this.hasNextLine()) {
                 this.state.cursorLine++;
                 this.setCursorCol(0);
             }
@@ -1900,8 +1763,7 @@ export class Editor {
             this.state.lines = result.lines;
             this.state.cursorLine = result.cursorLine;
             this.setCursorCol(result.cursorCol);
-            if (this.onChange)
-                this.onChange(this.getText());
+            this.notifyChange();
             this.tui.requestRender();
             return;
         }