@travisennis/acai 0.0.7 → 0.0.8

package/dist/tui/components/editor.js

@@ -1,46 +1,128 @@
+import { isCtrlC, isEnter, isEscape, isNavigationKey, isTab, } from "../../terminal/keys.js";
+import { getSegmenter } from "../../terminal/segmenter.js";
 import style from "../../terminal/style.js";
 import { visibleWidth } from "../utils.js";
-import { isNavigationKey, isTab, SelectList } from "./select-list.js";
-// Grapheme segmenter for proper Unicode iteration (handles emojis, etc.)
-const segmenter = new Intl.Segmenter();
-// Cache for line metrics to avoid repeated segmentation
+import { SelectList } from "./select-list.js";
+// Cache for line metrics to avoid repeated segmentation (LRU-style)
 const lineMetricsCache = {
     maxSize: 1000,
     cache: new Map(),
     get(line) {
-        let cached = this.cache.get(line);
-        if (!cached) {
-            // Fast path for ASCII-only lines (common case)
-            if (/^[\x20-\x7E\t]*$/.test(line)) {
-                // ASCII characters (including tabs)
-                const graphemes = line.split(""); // Simple split for ASCII
-                const widths = graphemes.map((char) => (char === "\t" ? 3 : 1));
-                const totalWidth = widths.reduce((sum, w) => sum + w, 0);
-                cached = { graphemes, widths, totalWidth };
-            }
-            else {
-                // Complex Unicode line, use full segmentation
-                const graphemes = [...segmenter.segment(line)].map((seg) => seg.segment);
-                const widths = graphemes.map((g) => visibleWidth(g));
-                const totalWidth = widths.reduce((sum, w) => sum + w, 0);
-                cached = { graphemes, widths, totalWidth };
-            }
+        const cached = this.cache.get(line);
+        if (cached) {
+            // Move to end for LRU behavior (most recently used)
+            this.cache.delete(line);
             this.cache.set(line, cached);
-            // Enforce size limit
-            if (this.cache.size > this.maxSize) {
-                // Delete first (oldest) entry - simple but not LRU; okay for our use case
-                const firstKey = this.cache.keys().next().value;
-                if (firstKey !== undefined) {
-                    this.cache.delete(firstKey);
-                }
+            return cached;
+        }
+        // Compute metrics
+        let result;
+        // Fast path for ASCII-only lines (common case)
+        if (/^[\x20-\x7E\t]*$/.test(line)) {
+            const graphemes = line.split("");
+            const widths = graphemes.map((char) => (char === "\t" ? 3 : 1));
+            const totalWidth = widths.reduce((sum, w) => sum + w, 0);
+            result = { graphemes, widths, totalWidth };
+        }
+        else {
+            // Complex Unicode line, use shared segmenter
+            const graphemes = [...getSegmenter().segment(line)].map((seg) => seg.segment);
+            const widths = graphemes.map((g) => visibleWidth(g));
+            const totalWidth = widths.reduce((sum, w) => sum + w, 0);
+            result = { graphemes, widths, totalWidth };
+        }
+        // Enforce size limit before adding (evict oldest = first entry)
+        if (this.cache.size >= this.maxSize) {
+            const firstKey = this.cache.keys().next().value;
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
             }
         }
-        return cached;
+        this.cache.set(line, result);
+        return result;
     },
     clear() {
         this.cache.clear();
     },
 };
+/**
+ * Compute word-wrapped chunks for a line that exceeds the given width.
+ * Shared between layoutText() and buildVisualLineMap() to avoid duplication.
+ */
+function computeLineChunks(line, maxWidth) {
+    const chunks = [];
+    let currentChunk = "";
+    let currentWidth = 0;
+    let chunkStartIndex = 0;
+    let currentIndex = 0;
+    // Split into words (separated by whitespace) while preserving separators
+    const wordPattern = /(\s+)|(\S+\s*)|(\S)/g;
+    const parts = [];
+    let match = wordPattern.exec(line);
+    let pos = 0;
+    while (match !== null) {
+        const matchedText = match[0];
+        const isWhitespace = /^\s*$/.test(matchedText);
+        const width = matchedText
+            .split("")
+            .reduce((sum, c) => sum + (c === "\t" ? 3 : 1), 0);
+        parts.push({ text: matchedText, isWord: !isWhitespace, width });
+        pos = match.index + matchedText.length;
+        match = wordPattern.exec(line);
+    }
+    // Handle remaining text after last match
+    if (pos < line.length) {
+        const remaining = line.slice(pos);
+        const width = remaining
+            .split("")
+            .reduce((sum, c) => sum + (c === "\t" ? 3 : 1), 0);
+        parts.push({ text: remaining, isWord: true, width });
+    }
+    for (const part of parts) {
+        const wouldExceed = currentWidth + part.width > maxWidth;
+        const isWordPart = part.isWord && currentChunk.length > 0 && !currentChunk.endsWith(" ");
+        if (wouldExceed && isWordPart && currentChunk.trimEnd().length > 0) {
+            // Current word would overflow - break before this word
+            chunks.push({
+                text: currentChunk,
+                startIndex: chunkStartIndex,
+                endIndex: currentIndex,
+                width: currentWidth,
+            });
+            currentChunk = part.text;
+            currentWidth = part.width;
+            chunkStartIndex = currentIndex;
+        }
+        else if (wouldExceed && currentChunk !== "") {
+            // Non-word or start of line overflow - break here
+            chunks.push({
+                text: currentChunk,
+                startIndex: chunkStartIndex,
+                endIndex: currentIndex,
+                width: currentWidth,
+            });
+            currentChunk = part.text;
+            currentWidth = part.width;
+            chunkStartIndex = currentIndex;
+        }
+        else {
+            // Add to current chunk
+            currentChunk += part.text;
+            currentWidth += part.width;
+        }
+        currentIndex += part.text.length;
+    }
+    // Push the last chunk
+    if (currentChunk !== "") {
+        chunks.push({
+            text: currentChunk,
+            startIndex: chunkStartIndex,
+            endIndex: currentIndex,
+            width: currentWidth,
+        });
+    }
+    return chunks;
+}
 /**
  * Text editor component with support for multi-line input and autocomplete.
  *
@@ -91,7 +173,6 @@ export class Editor {
     disableSubmit = false;
     // Custom key handlers for coding-agent
     onEscape;
-    onCtrlC;
     onRenderRequested;
     constructor(theme) {
         // Default theme if none provided (backward compatibility)
@@ -181,7 +262,7 @@ export class Editor {
                 if (after.length > 0) {
                     // Cursor is on a character (grapheme) - replace it with highlighted version
                     // Get the first grapheme from 'after'
-                    const afterGraphemes = [...segmenter.segment(after)];
+                    const afterGraphemes = [...getSegmenter().segment(after)];
                     const firstGrapheme = afterGraphemes[0]?.segment || "";
                     const restAfter = after.slice(firstGrapheme.length);
                     const cursor = `\x1b[7m${firstGrapheme}\x1b[0m`;
@@ -200,7 +281,7 @@ export class Editor {
                     else {
                         // Line is at full width - use reverse video on last grapheme if possible
                         // or just show cursor at the end without adding space
-                        const beforeGraphemes = [...segmenter.segment(before)];
+                        const beforeGraphemes = [...getSegmenter().segment(before)];
                         if (beforeGraphemes.length > 0) {
                             const lastGrapheme = beforeGraphemes[beforeGraphemes.length - 1]?.segment || "";
                             const cursor = `\x1b[7m${lastGrapheme}\x1b[0m`;
@@ -269,13 +350,12 @@ export class Editor {
         }
         // Intercept Escape key - but only if autocomplete is NOT active
         // (let parent handle escape for autocomplete cancellation)
-        if (data === "\x1b" && this.onEscape && !this.isShowingAutocomplete()) {
+        if (isEscape(data) && this.onEscape && !this.isShowingAutocomplete()) {
             this.onEscape();
             return;
         }
         // Intercept Ctrl+C
-        if (data === "\x03" && this.onCtrlC) {
-            this.onCtrlC();
+        if (isCtrlC(data)) {
             return;
         }
         // Process regular input data
@@ -290,12 +370,12 @@ export class Editor {
         // Handle autocomplete special keys first (but don't block other input)
         if (this.isAutocompleting && this.autocompleteList) {
             // Escape - cancel autocomplete
-            if (data === "\x1b") {
+            if (isEscape(data)) {
                 this.cancelAutocomplete();
                 return;
             }
             // Enter - apply selection
-            if (data === "\r") {
+            if (isEnter(data)) {
                 const selected = this.autocompleteList.getSelectedItem();
                 if (selected && this.autocompleteProvider) {
                     const result = this.autocompleteProvider.applyCompletion(this.state.lines, this.state.cursorLine, this.state.cursorCol, selected, this.autocompletePrefix);
@@ -488,43 +568,8 @@ export class Editor {
                 }
             }
             else {
-                // Line needs wrapping - use cached graphemes and widths
-                const chunks = [];
-                let currentChunk = "";
-                let currentWidth = 0;
-                let chunkStartIndex = 0;
-                let currentIndex = 0;
-                for (let g = 0; g < metrics.graphemes.length; g++) {
-                    const grapheme = metrics.graphemes[g];
-                    const graphemeWidth = metrics.widths[g];
-                    if (currentWidth + graphemeWidth > contentWidth &&
-                        currentChunk !== "") {
-                        // Start a new chunk
-                        chunks.push({
-                            text: currentChunk,
-                            startIndex: chunkStartIndex,
-                            endIndex: currentIndex,
-                            width: currentWidth,
-                        });
-                        currentChunk = grapheme;
-                        currentWidth = graphemeWidth;
-                        chunkStartIndex = currentIndex;
-                    }
-                    else {
-                        currentChunk += grapheme;
-                        currentWidth += graphemeWidth;
-                    }
-                    currentIndex += grapheme.length;
-                }
-                // Push the last chunk
-                if (currentChunk !== "") {
-                    chunks.push({
-                        text: currentChunk,
-                        startIndex: chunkStartIndex,
-                        endIndex: currentIndex,
-                        width: currentWidth,
-                    });
-                }
+                // Line needs wrapping - use shared helper
+                const chunks = computeLineChunks(line, contentWidth);
                 for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
                     const chunk = chunks[chunkIndex];
                     if (!chunk)
@@ -593,6 +638,18 @@ export class Editor {
                     void this.tryTriggerAutocomplete();
                 }
             }
+            // Auto-trigger for "#" file search
+            else if (char === "#") {
+                const currentLine = this.state.lines[this.state.cursorLine] || "";
+                const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
+                // Only trigger if # is after whitespace or at start of line
+                const charBeforeHash = textBeforeCursor[textBeforeCursor.length - 2];
+                if (textBeforeCursor.length === 1 ||
+                    charBeforeHash === " " ||
+                    charBeforeHash === "\t") {
+                    void this.tryTriggerAutocomplete();
+                }
+            }
             // Also auto-trigger when typing letters in a slash command context
             else if (/[a-zA-Z0-9]/.test(char)) {
                 const currentLine = this.state.lines[this.state.cursorLine] || "";
@@ -605,6 +662,10 @@ export class Editor {
                 else if (textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/)) {
                     void this.tryTriggerAutocomplete();
                 }
+                // Check if we're in a # file search context
+                else if (textBeforeCursor.match(/(?:^|[\s])#[^\s]*$/)) {
+                    void this.tryTriggerAutocomplete();
+                }
             }
         }
         else {
@@ -857,35 +918,13 @@ export class Editor {
                 visualLines.push({ logicalLine: i, startCol: 0, length: line.length });
             }
             else {
-                // Line needs wrapping - use cached graphemes and widths
-                let currentWidth = 0;
-                let chunkStartIndex = 0;
-                let currentIndex = 0;
-                for (let g = 0; g < metrics.graphemes.length; g++) {
-                    const grapheme = metrics.graphemes[g];
-                    const graphemeWidth = metrics.widths[g];
-                    if (currentWidth + graphemeWidth > width &&
-                        currentIndex > chunkStartIndex) {
-                        // Start a new chunk
-                        visualLines.push({
-                            logicalLine: i,
-                            startCol: chunkStartIndex,
-                            length: currentIndex - chunkStartIndex,
-                        });
-                        chunkStartIndex = currentIndex;
-                        currentWidth = graphemeWidth;
-                    }
-                    else {
-                        currentWidth += graphemeWidth;
-                    }
-                    currentIndex += grapheme.length;
-                }
-                // Push the last chunk
-                if (currentIndex > chunkStartIndex) {
+                // Line needs wrapping - use shared helper
+                const chunks = computeLineChunks(line, width);
+                for (const chunk of chunks) {
                     visualLines.push({
                         logicalLine: i,
-                        startCol: chunkStartIndex,
-                        length: currentIndex - chunkStartIndex,
+                        startCol: chunk.startIndex,
+                        length: chunk.endIndex - chunk.startIndex,
                     });
                 }
             }
@@ -1127,14 +1166,16 @@ export class Editor {
         const currentLine = this.state.lines[this.state.cursorLine] || "";
         const textBeforeCursor = currentLine.slice(0, this.state.cursorCol);
         // If we're no longer in the context that triggered autocomplete, cancel it
-        // For slash commands, check if we're still in slash command context
-        // For file paths, check if we're still in the same path context
-        if (textBeforeCursor.startsWith("/")) {
-            // For slash commands, we should continue autocomplete as long as we're in slash command context
-            // Don't cancel based on prefix matching for progressive typing
+        // For slash commands, @ file attachments, and # file search, allow progressive typing
+        // For other file paths, check if we're still in the same path context
+        if (textBeforeCursor.startsWith("/") ||
+            textBeforeCursor.match(/(?:^|[\s])@[^\s]*$/) ||
+            textBeforeCursor.match(/(?:^|[\s])#[^\s]*$/)) {
+            // For slash commands, @ file attachments, and # file search,
+            // continue autocomplete as long as we're in the right context
         }
         else {
-            // For file paths, check if we're still in the same path context
+            // For other file paths, check if we're still in the same path context
             if (!textBeforeCursor.endsWith(this.autocompletePrefix)) {
                 this.cancelAutocomplete();
                 return;

package/dist/tui/components/footer.d.ts

@@ -1,12 +1,25 @@
+import type { LanguageModelUsage } from "ai";
 import type { AgentState } from "../../agent/index.ts";
-import { Container } from "../tui.ts";
-/**
- * Footer component that shows pwd, token stats, and context usage
- */
-export declare class FooterComponent extends Container {
+import type { ModelManager } from "../../models/manager.ts";
+import type { ProjectStatusData } from "../../repl/project-status.ts";
+import { type Component } from "../tui.ts";
+type State = {
+    projectStatus: ProjectStatusData;
+    currentContextWindow: number;
+    contextWindow: number;
+    usage?: LanguageModelUsage;
+    agentState?: AgentState;
+};
+export declare class FooterComponent implements Component {
+    private modelManager;
     private state;
-    constructor(state: AgentState);
-    updateState(state: AgentState): void;
+    private progressBar;
+    private usage?;
+    private agentState?;
+    constructor(modelManager: ModelManager, state: State);
+    setState(state: State): void;
+    resetState(): void;
     render(width: number): string[];
 }
+export {};
 //# sourceMappingURL=footer.d.ts.map

package/dist/tui/components/footer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"footer.d.ts","sourceRoot":"","sources":["../../../source/tui/components/footer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,OAAO,CAAC,KAAK,CAAa;gBAEd,KAAK,EAAE,UAAU;IAK7B,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAI3B,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;CA+IzC"}
+{"version":3,"file":"footer.d.ts","sourceRoot":"","sources":["../../../source/tui/components/footer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,WAAW,CAAC;AAGzD,KAAK,KAAK,GAAG;IACX,aAAa,EAAE,iBAAiB,CAAC;IACjC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,kBAAkB,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,CAAC;AAqCF,qBAAa,eAAgB,YAAW,SAAS;IAC/C,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,KAAK,CAAC,CAAqB;IACnC,OAAO,CAAC,UAAU,CAAC,CAAa;gBACpB,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK;IAWpD,QAAQ,CAAC,KAAK,EAAE,KAAK;IAYrB,UAAU;IAKV,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;CA+DhC"}