@code-yeongyu/senpi-tui 2026.7.26 → 2026.7.28-3

package/dist/components/editor.d.ts

@@ -1,4 +1,5 @@
 import type { AutocompleteProvider } from "../autocomplete.ts";
+import { type EditorPasteState } from "../paste-markers.ts";
 import { type Component, type Focusable, type TUI } from "../tui.ts";
 import { type SelectListTheme } from "./select-list.ts";
 /**
@@ -59,8 +60,7 @@ export declare class Editor implements Component, Focusable {
     private autocompleteRequestTask;
     private autocompleteStartToken;
     private autocompleteRequestId;
-    private pastes;
-    private pasteCounter;
+    private pasteMarkers;
     private pasteBuffer;
     private isInPaste;
     private history;
@@ -77,10 +77,9 @@ export declare class Editor implements Component, Focusable {
     onChange?: (text: string) => void;
     disableSubmit: boolean;
     constructor(tui: TUI, theme: EditorTheme, options?: EditorOptions);
-    /** Set of currently valid paste IDs, for marker-aware segmentation. */
-    private validPasteIds;
-    /** Segment text with paste-marker awareness, only merging markers with valid IDs. */
+    /** Segment text with paste-marker awareness, only merging exact canonical markers. */
     private segment;
+    private removePasteMarker;
     getPaddingX(): number;
     setPaddingX(padding: number): void;
     getAutocompleteMaxVisible(): number;
@@ -104,7 +103,6 @@ export declare class Editor implements Component, Focusable {
     handleInput(data: string): void;
     private layoutText;
     getText(): string;
-    private expandPasteMarkers;
     /**
      * Get text with paste markers expanded to their actual content.
      * Use this when you need the full content (e.g., for external editor).
@@ -116,6 +114,18 @@ export declare class Editor implements Component, Focusable {
         col: number;
     };
     setText(text: string): void;
+    /**
+     * Snapshot the large-paste registry (marker id -> stored body) so it can be
+     * transferred to another editor instance alongside getText().
+     */
+    getPasteState(): EditorPasteState;
+    /**
+     * Install a paste registry snapshot taken from another editor instance.
+     * Call after setText() with the source editor's raw text: entries whose
+     * markers are not present in the current text are dropped, and the paste
+     * counter is raised so future paste ids cannot collide.
+     */
+    setPasteState(state: EditorPasteState): void;
     /**
      * Insert text at the current cursor position.
      * Used for programmatic insertion (e.g., clipboard image markers).

package/dist/components/editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/components/editor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/components/editor.ts"],"names":[],"mappings":"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"}

package/dist/components/editor.js

@@ -1,6 +1,7 @@
 import { getKeybindings } from "../keybindings.js";
 import { decodePrintableKey, matchesKey } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
+import { isPasteMarker, PasteMarkerRegistry, pasteMarkerId, segmentWithPasteMarkers, } from "../paste-markers.js";
 import { CURSOR_MARKER } from "../tui.js";
 import { UndoStack } from "../undo-stack.js";
 import { cjkBreakRegex, getGraphemeSegmenter, getWordSegmenter, isWhitespaceChar, sliceByColumn, visibleWidth, } from "../utils.js";
@@ -8,66 +9,6 @@ import { findWordBackward, findWordForward } from "../word-navigation.js";
 import { SelectList } from "./select-list.js";
 const graphemeSegmenter = getGraphemeSegmenter();
 const wordSegmenter = getWordSegmenter();
-/** Regex matching paste markers like `[paste #1 +123 lines]` or `[paste #2 1234 chars]`. */
-const PASTE_MARKER_REGEX = /\[paste #(\d+)( (\+\d+ lines|\d+ chars))?\]/g;
-/** Non-global version for single-segment testing. */
-const PASTE_MARKER_SINGLE = /^\[paste #(\d+)( (\+\d+ lines|\d+ chars))?\]$/;
-/** Check if a segment is a paste marker (i.e. was merged by segmentWithMarkers). */
-function isPasteMarker(segment) {
-    return segment.length >= 10 && PASTE_MARKER_SINGLE.test(segment);
-}
-/**
- * A segmenter that wraps Intl.Segmenter and merges graphemes that fall
- * within paste markers into single atomic segments.  This makes cursor
- * movement, deletion, word-wrap, etc. treat paste markers as single units.
- *
- * Only markers whose numeric ID exists in `validIds` are merged.
- */
-function segmentWithMarkers(text, baseSegmenter, validIds) {
-    // Fast path: no paste markers in the text or no valid IDs.
-    if (validIds.size === 0 || !text.includes("[paste #")) {
-        return baseSegmenter.segment(text);
-    }
-    // Find all marker spans with valid IDs.
-    const markers = [];
-    for (const m of text.matchAll(PASTE_MARKER_REGEX)) {
-        const id = Number.parseInt(m[1], 10);
-        if (!validIds.has(id))
-            continue;
-        markers.push({ start: m.index, end: m.index + m[0].length });
-    }
-    if (markers.length === 0) {
-        return baseSegmenter.segment(text);
-    }
-    // Build merged segment list.
-    const baseSegments = baseSegmenter.segment(text);
-    const result = [];
-    let markerIdx = 0;
-    for (const seg of baseSegments) {
-        // Skip past markers that are entirely before this segment.
-        while (markerIdx < markers.length && markers[markerIdx].end <= seg.index) {
-            markerIdx++;
-        }
-        const marker = markerIdx < markers.length ? markers[markerIdx] : null;
-        if (marker && seg.index >= marker.start && seg.index < marker.end) {
-            // This segment falls inside a marker.
-            // If this is the first segment of the marker, emit a merged segment.
-            if (seg.index === marker.start) {
-                const markerText = text.slice(marker.start, marker.end);
-                result.push({
-                    segment: markerText,
-                    index: marker.start,
-                    input: text,
-                });
-            }
-            // Otherwise skip (already merged into the first segment).
-        }
-        else {
-            result.push(seg);
-        }
-    }
-    return result;
-}
 function isPrintableAsciiText(text) {
     for (let i = 0; i < text.length; i++) {
         const code = text.charCodeAt(i);
@@ -258,8 +199,7 @@ export class Editor {
         this.autocompleteStartToken = 0;
         this.autocompleteRequestId = 0;
         // Paste tracking for large pastes
-        this.pastes = new Map();
-        this.pasteCounter = 0;
+        this.pasteMarkers = new PasteMarkerRegistry();
         // Bracketed paste mode buffering
         this.pasteBuffer = "";
         this.isInPaste = false;
@@ -292,13 +232,16 @@ export class Editor {
         const maxVisible = options.autocompleteMaxVisible ?? 5;
         this.autocompleteMaxVisible = Number.isFinite(maxVisible) ? Math.max(3, Math.min(20, Math.floor(maxVisible))) : 5;
     }
-    /** Set of currently valid paste IDs, for marker-aware segmentation. */
-    validPasteIds() {
-        return new Set(this.pastes.keys());
-    }
-    /** Segment text with paste-marker awareness, only merging markers with valid IDs. */
+    /** Segment text with paste-marker awareness, only merging exact canonical markers. */
     segment(text, mode) {
-        return segmentWithMarkers(text, mode === "word" ? wordSegmenter : graphemeSegmenter, this.validPasteIds());
+        return segmentWithPasteMarkers(text, mode === "word" ? wordSegmenter : graphemeSegmenter, this.pasteMarkers.authorizedMarkers(text));
+    }
+    removePasteMarker(id) {
+        const removal = this.pasteMarkers.remove(id, this.getText());
+        if (!removal.removed)
+            return false;
+        this.state.lines = removal.text.split("\n");
+        return true;
     }
     getPaddingX() {
         return this.paddingX;
@@ -879,20 +822,12 @@ export class Editor {
     getText() {
         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;
-    }
     /**
      * Get text with paste markers expanded to their actual content.
      * Use this when you need the full content (e.g., for external editor).
      */
     getExpandedText() {
-        return this.expandPasteMarkers(this.state.lines.join("\n"));
+        return this.pasteMarkers.expand(this.state.lines.join("\n"));
     }
     getLines() {
         return [...this.state.lines];
@@ -905,14 +840,30 @@ export class Editor {
         this.lastAction = null;
         this.exitHistoryBrowsing();
         const normalized = this.normalizeText(text);
+        const previousText = this.getText();
         // Push undo snapshot if content differs (makes programmatic changes undoable)
-        if (this.getText() !== normalized) {
+        if (previousText !== normalized) {
             this.pushUndoSnapshot();
         }
-        this.pastes.clear();
-        this.pasteCounter = 0;
+        this.pasteMarkers.prune(normalized, previousText);
         this.setTextInternal(normalized);
     }
+    /**
+     * Snapshot the large-paste registry (marker id -> stored body) so it can be
+     * transferred to another editor instance alongside getText().
+     */
+    getPasteState() {
+        return this.pasteMarkers.snapshot();
+    }
+    /**
+     * Install a paste registry snapshot taken from another editor instance.
+     * Call after setText() with the source editor's raw text: entries whose
+     * markers are not present in the current text are dropped, and the paste
+     * counter is raised so future paste ids cannot collide.
+     */
+    setPasteState(state) {
+        this.pasteMarkers.install(state, this.getText());
+    }
     /**
      * Insert text at the current cursor position.
      * Used for programmatic insertion (e.g., clipboard image markers).
@@ -1069,14 +1020,7 @@ export class Editor {
         // Check if this is a large paste (> 10 lines or > 1000 characters)
         const totalChars = filteredText.length;
         if (pastedLines.length > 10 || totalChars > 1000) {
-            // Store the paste and insert a marker
-            this.pasteCounter++;
-            const pasteId = this.pasteCounter;
-            this.pastes.set(pasteId, filteredText);
-            // Insert marker like "[paste #1 +123 lines]" or "[paste #1 1234 chars]"
-            const marker = pastedLines.length > 10
-                ? `[paste #${pasteId} +${pastedLines.length} lines]`
-                : `[paste #${pasteId} ${totalChars} chars]`;
+            const marker = this.pasteMarkers.add(filteredText, pastedLines.length, totalChars);
             this.insertTextAtCursorInternal(marker);
             return;
         }
@@ -1120,10 +1064,9 @@ export class Editor {
     }
     submitValue() {
         this.cancelAutocomplete();
-        const result = this.expandPasteMarkers(this.state.lines.join("\n")).trim();
+        const result = this.pasteMarkers.expand(this.state.lines.join("\n")).trim();
         this.state = { lines: [""], cursorLine: 0, cursorCol: 0 };
-        this.pastes.clear();
-        this.pasteCounter = 0;
+        this.pasteMarkers.clear();
         this.exitHistoryBrowsing();
         this.scrollOffset = 0;
         this.undoStack.clear();
@@ -1145,33 +1088,18 @@ export class Editor {
             const graphemes = [...this.segment(beforeCursor, "grapheme")];
             const lastGrapheme = graphemes[graphemes.length - 1];
             const graphemeLength = lastGrapheme ? lastGrapheme.segment.length : 1;
-            const isPastedSegmented = PASTE_MARKER_SINGLE.exec(lastGrapheme.segment);
-            if (isPastedSegmented) {
-                // This contains the id part e.g 4 from [paste #4 +123 lines]
-                const targetId = Number(isPastedSegmented[1]);
-                this.pastes.delete(targetId);
-                this.pasteCounter--;
-                // Shift registry entries down in ascending id order, independent
-                // of marker order in the text ([paste #3] becomes [paste #2] when
-                // [paste #1] is removed).
-                const higherIds = [...this.pastes.keys()].filter((id) => id > targetId).sort((a, b) => a - b);
-                for (const id of higherIds) {
-                    this.pastes.set(id - 1, this.pastes.get(id));
-                    this.pastes.delete(id);
-                }
-                // Renumber markers with ids greater than the removed one.
-                this.state.lines = this.state.lines.map((line) => line.replace(PASTE_MARKER_REGEX, (fullMatch, idGroup, suffixGroup) => {
-                    const x = Number(idGroup);
-                    if (x <= targetId)
-                        return fullMatch;
-                    return `[paste #${x - 1}${suffixGroup}]`;
-                }));
+            const targetId = pasteMarkerId(lastGrapheme?.segment ?? "");
+            if (targetId !== undefined) {
+                this.removePasteMarker(targetId);
+                this.setCursorCol(Math.max(0, this.state.cursorCol - graphemeLength));
+            }
+            else {
+                line = this.state.lines[this.state.cursorLine] || "";
+                const before = line.slice(0, this.state.cursorCol - graphemeLength);
+                const after = line.slice(this.state.cursorCol);
+                this.state.lines[this.state.cursorLine] = before + after;
+                this.setCursorCol(this.state.cursorCol - graphemeLength);
             }
-            line = this.state.lines[this.state.cursorLine] || "";
-            const before = line.slice(0, this.state.cursorCol - graphemeLength);
-            const after = line.slice(this.state.cursorCol);
-            this.state.lines[this.state.cursorLine] = before + after;
-            this.setCursorCol(this.state.cursorCol - graphemeLength);
         }
         else if (this.state.cursorLine > 0) {
             this.pushUndoSnapshot();
@@ -1471,6 +1399,12 @@ export class Editor {
             // Find the first grapheme at cursor
             const graphemes = [...this.segment(afterCursor, "grapheme")];
             const firstGrapheme = graphemes[0];
+            const markerId = firstGrapheme && isPasteMarker(firstGrapheme.segment) ? pasteMarkerId(firstGrapheme.segment) : undefined;
+            if (markerId !== undefined) {
+                this.removePasteMarker(markerId);
+                this.onChange?.(this.getText());
+                return;
+            }
             const graphemeLength = firstGrapheme ? firstGrapheme.segment.length : 1;
             const before = currentLine.slice(0, this.state.cursorCol);
             const after = currentLine.slice(this.state.cursorCol + graphemeLength);
@@ -1753,7 +1687,10 @@ export class Editor {
         }
     }
     pushUndoSnapshot() {
-        this.undoStack.push({ state: this.state, pastes: this.pastes, pasteCounter: this.pasteCounter });
+        this.undoStack.push({
+            state: this.state,
+            pasteState: this.pasteMarkers.snapshot(),
+        });
     }
     undo() {
         this.exitHistoryBrowsing();
@@ -1761,8 +1698,7 @@ export class Editor {
         if (!snapshot)
             return;
         Object.assign(this.state, snapshot.state);
-        this.pastes = snapshot.pastes;
-        this.pasteCounter = snapshot.pasteCounter;
+        this.pasteMarkers.restore(snapshot.pasteState);
         this.lastAction = null;
         this.preferredVisualCol = null;
         if (this.onChange) {