@entelligentsia/forgecli 1.0.36 → 1.0.40

package/node_modules/@earendil-works/pi-tui/dist/components/editor.js

@@ -3,7 +3,7 @@ import { decodePrintableKey, matchesKey } from "../keys.js";
 import { KillRing } from "../kill-ring.js";
 import { CURSOR_MARKER } from "../tui.js";
 import { UndoStack } from "../undo-stack.js";
-import { getGraphemeSegmenter, getWordSegmenter, isWhitespaceChar, truncateToWidth, visibleWidth } from "../utils.js";
+import { cjkBreakRegex, getGraphemeSegmenter, getWordSegmenter, isWhitespaceChar, truncateToWidth, visibleWidth, } from "../utils.js";
 import { findWordBackward, findWordForward } from "../word-navigation.js";
 import { SelectList } from "./select-list.js";
 const graphemeSegmenter = getGraphemeSegmenter();
@@ -140,14 +140,23 @@ export function wordWrapLine(line, maxWidth, preSegmented) {
         }
         // Advance.
         currentWidth += gWidth;
-        // Record wrap opportunity: whitespace followed by non-whitespace.
-        // Multiple spaces join (no break between them); the break point is
-        // after the last space before the next word.
+        // Record wrap opportunity: whitespace followed by non-whitespace
+        // (multiple spaces join; the break point is after the last space),
+        // or at a boundary where either side is CJK (CJK allows breaking
+        // between any adjacent characters).
         const next = segments[i + 1];
         if (isWs && next && (isPasteMarker(next.segment) || !isWhitespaceChar(next.segment))) {
             wrapOppIndex = next.index;
             wrapOppWidth = currentWidth;
         }
+        else if (!isWs && next && !isWhitespaceChar(next.segment)) {
+            const isCjk = !isPasteMarker(grapheme) && cjkBreakRegex.test(grapheme);
+            const nextIsCjk = !isPasteMarker(next.segment) && cjkBreakRegex.test(next.segment);
+            if (isCjk || nextIsCjk) {
+                wrapOppIndex = next.index;
+                wrapOppWidth = currentWidth;
+            }
+        }
     }
     // Push final chunk.
     chunks.push({ text: line.slice(chunkStart), startIndex: chunkStart, endIndex: line.length });
@@ -158,6 +167,17 @@ const SLASH_COMMAND_SELECT_LIST_LAYOUT = {
     maxPrimaryColumnWidth: 32,
 };
 const ATTACHMENT_AUTOCOMPLETE_DEBOUNCE_MS = 20;
+const DEFAULT_AUTOCOMPLETE_TRIGGER_CHARACTERS = ["@", "#"];
+function escapeCharacterClass(value) {
+    return value.replace(/[\\^$.*+?()[\]{}|-]/g, "\\$&");
+}
+function buildTriggerPattern(triggerCharacters) {
+    return new RegExp(`(?:^|[\\s])[${triggerCharacters.map(escapeCharacterClass).join("")}][^\\s]*$`);
+}
+function buildDebouncePattern(triggerCharacters) {
+    const escapedWithoutAt = triggerCharacters.filter((character) => character !== "@").map(escapeCharacterClass);
+    return new RegExp(`(?:^|[ \\t])(?:@(?:"[^"]*|[^\\s]*)|[${escapedWithoutAt.join("")}][^\\s]*)$`);
+}
 export class Editor {
     state = {
         lines: [""],
@@ -177,6 +197,9 @@ export class Editor {
     borderColor;
     // Autocomplete support
     autocompleteProvider;
+    autocompleteTriggerCharacters = [...DEFAULT_AUTOCOMPLETE_TRIGGER_CHARACTERS];
+    autocompleteTriggerPattern = buildTriggerPattern(this.autocompleteTriggerCharacters);
+    autocompleteDebouncePattern = buildDebouncePattern(this.autocompleteTriggerCharacters);
     autocompleteList;
     autocompleteState = null;
     autocompletePrefix = "";
@@ -195,6 +218,7 @@ export class Editor {
     // Prompt history for up/down navigation
     history = [];
     historyIndex = -1; // -1 = not browsing, 0 = most recent, 1 = older, etc.
+    historyDraft = null;
     // Kill ring for Emacs-style kill/yank operations
     killRing = new KillRing();
     lastAction = null;
@@ -253,6 +277,7 @@ export class Editor {
     setAutocompleteProvider(provider) {
         this.cancelAutocomplete();
         this.autocompleteProvider = provider;
+        this.setAutocompleteTriggerCharacters(provider.triggerCharacters ?? []);
     }
     /**
      * Add a prompt to history for up/down arrow navigation.
@@ -271,9 +296,6 @@ export class Editor {
             this.history.pop();
         }
     }
-    isEditorEmpty() {
-        return this.state.lines.length === 1 && this.state.lines[0] === "";
-    }
     isOnFirstVisualLine() {
         const visualLines = this.buildVisualLineMap(this.lastWidth);
         const currentVisualLine = this.findCurrentVisualLine(visualLines);
@@ -294,22 +316,38 @@ export class Editor {
         // Capture state when first entering history browsing mode
         if (this.historyIndex === -1 && newIndex >= 0) {
             this.pushUndoSnapshot();
+            this.historyDraft = structuredClone(this.state);
         }
         this.historyIndex = newIndex;
         if (this.historyIndex === -1) {
-            // Returned to "current" state - clear editor
-            this.setTextInternal("");
+            const draft = this.historyDraft;
+            this.historyDraft = null;
+            if (draft) {
+                this.state = draft;
+                this.preferredVisualCol = null;
+                this.snappedFromCursorCol = null;
+                this.scrollOffset = 0;
+                if (this.onChange)
+                    this.onChange(this.getText());
+            }
+            else {
+                this.setTextInternal("");
+            }
         }
         else {
-            this.setTextInternal(this.history[this.historyIndex] || "");
+            this.setTextInternal(this.history[this.historyIndex] || "", direction === -1 ? "start" : "end");
         }
     }
+    exitHistoryBrowsing() {
+        this.historyIndex = -1;
+        this.historyDraft = null;
+    }
     /** Internal setText that doesn't reset history state - used by navigateHistory */
-    setTextInternal(text) {
+    setTextInternal(text, cursorPlacement = "end") {
         const lines = text.split("\n");
         this.state.lines = lines.length === 0 ? [""] : lines;
-        this.state.cursorLine = this.state.lines.length - 1;
-        this.setCursorCol(this.state.lines[this.state.cursorLine]?.length || 0);
+        this.state.cursorLine = cursorPlacement === "start" ? 0 : this.state.lines.length - 1;
+        this.setCursorCol(cursorPlacement === "start" ? 0 : this.state.lines[this.state.cursorLine]?.length || 0);
         // Reset scroll - render() will adjust to show cursor
         this.scrollOffset = 0;
         if (this.onChange) {
@@ -368,8 +406,10 @@ export class Editor {
             result.push(horizontal.repeat(width));
         }
         // Render each visible layout line
-        // Emit hardware cursor marker only when focused and not showing autocomplete
-        const emitCursorMarker = this.focused && !this.autocompleteState;
+        // Emit hardware cursor marker when focused so TUI can position the
+        // hardware cursor for IME candidate-window placement even while
+        // autocomplete (e.g. slash-command menu) is visible.
+        const emitCursorMarker = this.focused;
         for (const layoutLine of visibleLines) {
             let displayText = layoutLine.text;
             let lineVisibleWidth = visibleWidth(layoutLine.text);
@@ -616,10 +656,7 @@ export class Editor {
         }
         // Arrow key navigation (with history support)
         if (kb.matches(data, "tui.editor.cursorUp")) {
-            if (this.isEditorEmpty()) {
-                this.navigateHistory(-1);
-            }
-            else if (this.historyIndex > -1 && this.isOnFirstVisualLine()) {
+            if (this.isOnFirstVisualLine() && this.history.length > 0) {
                 this.navigateHistory(-1);
             }
             else if (this.isOnFirstVisualLine()) {
@@ -795,7 +832,7 @@ export class Editor {
     setText(text) {
         this.cancelAutocomplete();
         this.lastAction = null;
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         const normalized = this.normalizeText(text);
         // Push undo snapshot if content differs (makes programmatic changes undoable)
         if (this.getText() !== normalized) {
@@ -814,7 +851,7 @@ export class Editor {
         this.cancelAutocomplete();
         this.pushUndoSnapshot();
         this.lastAction = null;
-        this.historyIndex = -1;
+        this.exitHistoryBrowsing();
         this.insertTextAtCursorInternal(text);
     }
     /**
@@ -867,7 +904,7 @@ export class Editor {
     }
     // All the editor methods from before...
     insertCharacter(char, skipUndoCoalescing) {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         // Undo coalescing (fish-style):
         // - Consecutive word chars coalesce into one undo unit
         // - Space captures state before itself (so undo removes space+following word together)
@@ -893,8 +930,8 @@ export class Editor {
             if (char === "/" && this.isAtStartOfMessage()) {
                 this.tryTriggerAutocomplete();
             }
-            // Auto-trigger for symbol-based completion like @ or # at token boundaries
-            else if (char === "@" || char === "#") {
+            // Auto-trigger for symbol-based completion like @, #, or provider triggers at token boundaries
+            else if (this.autocompleteTriggerCharacters.includes(char)) {
                 const currentLine = this.state.lines[this.state.cursorLine] || "";
                 const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
                 const charBeforeSymbol = textBeforeCursor[textBeforeCursor.length - 2];
@@ -910,8 +947,8 @@ export class Editor {
                 if (this.isInSlashCommandContext(textBeforeCursor)) {
                     this.tryTriggerAutocomplete();
                 }
-                // Check if we're in a symbol-based completion context like @ or #
-                else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
+                // Check if we're in a symbol-based completion context like @, #, or provider triggers
+                else if (this.autocompleteTriggerPattern.test(textBeforeCursor)) {
                     this.tryTriggerAutocomplete();
                 }
             }
@@ -922,7 +959,7 @@ export class Editor {
     }
     handlePaste(pastedText) {
         this.cancelAutocomplete();
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         this.lastAction = null;
         this.pushUndoSnapshot();
         // Some terminals (e.g. tmux popups with extended-keys-format=csi-u) re-encode
@@ -980,7 +1017,7 @@ export class Editor {
     }
     addNewLine() {
         this.cancelAutocomplete();
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         this.lastAction = null;
         this.pushUndoSnapshot();
         const currentLine = this.state.lines[this.state.cursorLine] || "";
@@ -1014,7 +1051,7 @@ export class Editor {
         this.state = { lines: [""], cursorLine: 0, cursorCol: 0 };
         this.pastes.clear();
         this.pasteCounter = 0;
-        this.historyIndex = -1;
+        this.exitHistoryBrowsing();
         this.scrollOffset = 0;
         this.undoStack.clear();
         this.lastAction = null;
@@ -1024,7 +1061,7 @@ export class Editor {
             this.onSubmit(result);
     }
     handleBackspace() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         this.lastAction = null;
         if (this.state.cursorCol > 0) {
             this.pushUndoSnapshot();
@@ -1065,8 +1102,8 @@ export class Editor {
             if (this.isInSlashCommandContext(textBeforeCursor)) {
                 this.tryTriggerAutocomplete();
             }
-            // Symbol-based completion context like @ or #
-            else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
+            // Symbol-based completion context like @, #, or provider triggers
+            else if (this.autocompleteTriggerPattern.test(textBeforeCursor)) {
                 this.tryTriggerAutocomplete();
             }
         }
@@ -1206,7 +1243,7 @@ export class Editor {
         this.setCursorCol(currentLine.length);
     }
     deleteToStartOfLine() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         if (this.state.cursorCol > 0) {
             this.pushUndoSnapshot();
@@ -1234,7 +1271,7 @@ export class Editor {
         }
     }
     deleteToEndOfLine() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         if (this.state.cursorCol < currentLine.length) {
             this.pushUndoSnapshot();
@@ -1259,7 +1296,7 @@ export class Editor {
         }
     }
     deleteWordBackwards() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         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) {
@@ -1295,7 +1332,7 @@ export class Editor {
         }
     }
     deleteWordForward() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         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) {
@@ -1328,7 +1365,7 @@ export class Editor {
         }
     }
     handleForwardDelete() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         this.lastAction = null;
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         if (this.state.cursorCol < currentLine.length) {
@@ -1364,8 +1401,8 @@ export class Editor {
             if (this.isInSlashCommandContext(textBeforeCursor)) {
                 this.tryTriggerAutocomplete();
             }
-            // Symbol-based completion context like @ or #
-            else if (textBeforeCursor.match(/(?:^|[\s])[@#][^\s]*$/)) {
+            // Symbol-based completion context like @, #, or provider triggers
+            else if (this.autocompleteTriggerPattern.test(textBeforeCursor)) {
                 this.tryTriggerAutocomplete();
             }
         }
@@ -1476,6 +1513,17 @@ export class Editor {
                 }
             }
         }
+        // Keep an open autocomplete picker in sync with the new cursor
+        // position: cursor movement changes the text before the cursor, so a
+        // picker computed for the old position is stale. Re-query so it
+        // refreshes — or closes when the new position yields no suggestions —
+        // mirroring insertCharacter()/handleBackspace(). Without this, arrowing
+        // left from `/cmd ` back into the command name leaves the argument
+        // picker showing against a `/cmd` prefix (and a Tab there would
+        // concatenate the stale suggestion onto the partial command name).
+        if (this.autocompleteState) {
+            this.updateAutocomplete();
+        }
     }
     /**
      * Scroll by a page (direction: -1 for up, 1 for down).
@@ -1540,7 +1588,7 @@ export class Editor {
      * Insert text at cursor position (used by yank operations).
      */
     insertYankedText(text) {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         const lines = text.split("\n");
         if (lines.length === 1) {
             // Single line - insert at cursor
@@ -1612,7 +1660,7 @@ export class Editor {
         this.undoStack.push(this.state);
     }
     undo() {
-        this.historyIndex = -1; // Exit history browsing mode
+        this.exitHistoryBrowsing();
         const snapshot = this.undoStack.pop();
         if (!snapshot)
             return;
@@ -1773,14 +1821,25 @@ export class Editor {
         })();
         await this.autocompleteRequestTask;
     }
+    setAutocompleteTriggerCharacters(triggerCharacters) {
+        const next = [...DEFAULT_AUTOCOMPLETE_TRIGGER_CHARACTERS];
+        for (const character of triggerCharacters) {
+            if (character.length !== 1 || character === "/" || isWhitespaceChar(character) || next.includes(character)) {
+                continue;
+            }
+            next.push(character);
+        }
+        this.autocompleteTriggerCharacters = next;
+        this.autocompleteTriggerPattern = buildTriggerPattern(next);
+        this.autocompleteDebouncePattern = buildDebouncePattern(next);
+    }
     getAutocompleteDebounceMs(options) {
         if (options.explicitTab || options.force) {
             return 0;
         }
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
-        const isSymbolAutocompleteContext = /(?:^|[ \t])(?:@(?:"[^"]*|[^\s]*)|#[^\s]*)$/.test(textBeforeCursor);
-        return isSymbolAutocompleteContext ? ATTACHMENT_AUTOCOMPLETE_DEBOUNCE_MS : 0;
+        return this.autocompleteDebouncePattern.test(textBeforeCursor) ? ATTACHMENT_AUTOCOMPLETE_DEBOUNCE_MS : 0;
     }
     async runAutocompleteRequest(requestId, controller, snapshotText, snapshotLine, snapshotCol, options) {
         if (!this.autocompleteProvider)