caroushell 0.1.7 → 0.1.8

package/dist/ai-suggester.js

@@ -47,8 +47,8 @@ async function generateContent(prompt, options) {
         }
         const out = await extractText(await res.json());
         const text = typeof out === "string" ? out : "";
-        const duration = Date.now() - start;
-        (0, logs_1.logLine)(`AI duration: ${duration} ms`);
+        const duration = (Date.now() - start) / 1000;
+        (0, logs_1.logLine)(`AI duration: ${duration} seconds`);
         return text;
     }
     catch (err) {

package/dist/app.js

@@ -6,6 +6,7 @@ const keyboard_1 = require("./keyboard");
 const carousel_1 = require("./carousel");
 const history_suggester_1 = require("./history-suggester");
 const ai_suggester_1 = require("./ai-suggester");
+const file_suggester_1 = require("./file-suggester");
 const spawner_1 = require("./spawner");
 function debounce(fn, ms) {
     // Debounce function to limit the rate at which a function can fire
@@ -18,10 +19,12 @@ function debounce(fn, ms) {
 }
 class App {
     constructor() {
+        this.usingFileSuggestions = false;
         this.terminal = new terminal_1.Terminal();
         this.keyboard = new keyboard_1.Keyboard();
         this.history = new history_suggester_1.HistorySuggester();
         this.ai = new ai_suggester_1.AISuggester();
+        this.files = new file_suggester_1.FileSuggester();
         this.carousel = new carousel_1.Carousel({
             top: this.history,
             bottom: this.ai,
@@ -64,6 +67,9 @@ class App {
                 this.queueUpdateSuggestions();
             },
             enter: async () => {
+                if (this.tryAcceptHighlightedFileSuggestion()) {
+                    return;
+                }
                 const cmd = this.carousel.getCurrentRow().trim();
                 this.carousel.setInputBuffer("", 0);
                 await this.runCommand(cmd);
@@ -99,6 +105,14 @@ class App {
                 this.carousel.moveCursorRight();
                 this.render();
             },
+            "ctrl-left": () => {
+                this.carousel.moveCursorWordLeft();
+                this.render();
+            },
+            "ctrl-right": () => {
+                this.carousel.moveCursorWordRight();
+                this.render();
+            },
             home: () => {
                 this.carousel.moveCursorHome();
                 this.render();
@@ -112,12 +126,19 @@ class App {
                 this.render();
                 this.queueUpdateSuggestions();
             },
+            tab: async () => {
+                const completed = await this.tryAutocompleteFile();
+                if (completed)
+                    return;
+                this.toggleTopSuggester();
+            },
             escape: () => { },
         };
     }
     async init() {
         await this.history.init();
         await this.ai.init();
+        await this.files.init();
     }
     async run() {
         await this.init();
@@ -170,5 +191,62 @@ class App {
         this.keyboard.stop();
         process.exit(0);
     }
+    async tryAutocompleteFile() {
+        const wordInfo = this.carousel.getWordInfoAtCursor();
+        if (!wordInfo.prefix)
+            return false;
+        const match = await this.files.findUniqueMatch(wordInfo.prefix);
+        if (!match)
+            return false;
+        const current = this.carousel.getRow(0);
+        const before = current.slice(0, wordInfo.start);
+        const after = current.slice(wordInfo.end);
+        const next = `${before}${match}${after}`;
+        this.carousel.setInputBuffer(next, wordInfo.start + match.length);
+        this.render();
+        this.queueUpdateSuggestions();
+        return true;
+    }
+    tryAcceptHighlightedFileSuggestion() {
+        const currentSuggester = this.carousel.getCurrentRowSuggester();
+        if (currentSuggester !== this.files)
+            return false;
+        const suggestion = this.carousel.getCurrentRow();
+        if (!suggestion)
+            return false;
+        const wordInfo = this.carousel.getWordInfoAtCursor();
+        const current = this.carousel.getRow(0);
+        const before = current.slice(0, wordInfo.start);
+        const after = current.slice(wordInfo.end);
+        const nextInput = `${before}${suggestion}${after}`;
+        this.carousel.setInputBuffer(nextInput, wordInfo.start + suggestion.length);
+        this.carousel.resetIndex();
+        this.showHistorySuggestions();
+        this.render();
+        this.queueUpdateSuggestions();
+        return true;
+    }
+    toggleTopSuggester() {
+        if (this.usingFileSuggestions) {
+            this.showHistorySuggestions();
+        }
+        else {
+            this.showFileSuggestions();
+        }
+        this.render();
+        this.queueUpdateSuggestions();
+    }
+    showHistorySuggestions() {
+        if (!this.usingFileSuggestions)
+            return;
+        this.usingFileSuggestions = false;
+        this.carousel.setTopSuggester(this.history);
+    }
+    showFileSuggestions() {
+        if (this.usingFileSuggestions)
+            return;
+        this.usingFileSuggestions = true;
+        this.carousel.setTopSuggester(this.files);
+    }
 }
 exports.App = App;

package/dist/carousel.js

@@ -10,14 +10,17 @@ class Carousel {
         this.index = 0;
         this.inputBuffer = "";
         this.inputCursor = 0;
+        this.emptyRow = "---";
         this.terminal = opts.terminal;
         this.top = opts.top;
         this.bottom = opts.bottom;
         this.topRowCount = opts.topRows;
         this.bottomRowCount = opts.bottomRows;
-        const empty = "---";
-        this.latestTop = Array(this.topRowCount).fill(empty);
-        this.latestBottom = Array(this.bottomRowCount).fill(empty);
+        this.latestTop = this.createEmptyRows(this.topRowCount);
+        this.latestBottom = this.createEmptyRows(this.bottomRowCount);
+    }
+    createEmptyRows(count) {
+        return Array(count).fill(this.emptyRow);
     }
     async updateSuggestions(input) {
         if (typeof input === "string") {
@@ -89,6 +92,13 @@ class Carousel {
     getCurrentRow() {
         return this.getRow(this.index);
     }
+    getCurrentRowSuggester() {
+        if (this.index > 0)
+            return this.top;
+        if (this.index < 0)
+            return this.bottom;
+        return null;
+    }
     setInputBuffer(value, cursorPos = value.length) {
         this.inputBuffer = value;
         this.inputCursor = Math.max(0, Math.min(cursorPos, this.inputBuffer.length));
@@ -127,12 +137,46 @@ class Carousel {
             return;
         this.inputCursor -= 1;
     }
+    isWhitespace(char) {
+        return /\s/.test(char);
+    }
+    moveCursorWordLeft() {
+        this.adoptSelectionIntoInput();
+        if (this.inputCursor === 0)
+            return;
+        let pos = this.inputCursor;
+        // Skip any whitespace directly to the left of the cursor
+        while (pos > 0 && this.isWhitespace(this.inputBuffer[pos - 1])) {
+            pos -= 1;
+        }
+        // Skip the word characters to the left
+        while (pos > 0 && !this.isWhitespace(this.inputBuffer[pos - 1])) {
+            pos -= 1;
+        }
+        this.inputCursor = pos;
+    }
     moveCursorRight() {
         this.adoptSelectionIntoInput();
         if (this.inputCursor >= this.inputBuffer.length)
             return;
         this.inputCursor += 1;
     }
+    moveCursorWordRight() {
+        this.adoptSelectionIntoInput();
+        if (this.inputCursor >= this.inputBuffer.length)
+            return;
+        let pos = this.inputCursor;
+        const len = this.inputBuffer.length;
+        // Skip any whitespace to the right of the cursor
+        while (pos < len && this.isWhitespace(this.inputBuffer[pos])) {
+            pos += 1;
+        }
+        // Skip through the next word
+        while (pos < len && !this.isWhitespace(this.inputBuffer[pos])) {
+            pos += 1;
+        }
+        this.inputCursor = pos;
+    }
     moveCursorHome() {
         this.adoptSelectionIntoInput();
         this.inputCursor = 0;
@@ -167,6 +211,26 @@ class Carousel {
     isPromptRowSelected() {
         return this.index === 0;
     }
+    getInputCursor() {
+        return this.inputCursor;
+    }
+    getWordInfoAtCursor() {
+        let start = this.inputCursor;
+        while (start > 0 && !this.isWhitespace(this.inputBuffer[start - 1])) {
+            start -= 1;
+        }
+        let end = this.inputCursor;
+        const len = this.inputBuffer.length;
+        while (end < len && !this.isWhitespace(this.inputBuffer[end])) {
+            end += 1;
+        }
+        return {
+            start,
+            end,
+            prefix: this.inputBuffer.slice(start, this.inputCursor),
+            word: this.inputBuffer.slice(start, end),
+        };
+    }
     getPromptCursorColumn() {
         const prefix = this.getPrefixByIndex(0);
         return prefix.length + this.inputCursor;
@@ -191,6 +255,12 @@ class Carousel {
         const cursorCol = this.getPromptCursorColumn();
         this.terminal.renderBlock(lines.map((line) => line.text), cursorRow, cursorCol);
     }
+    setTopSuggester(suggester) {
+        if (this.top === suggester)
+            return;
+        this.top = suggester;
+        this.latestTop = this.createEmptyRows(this.topRowCount);
+    }
     getSuggesters() {
         return [this.top, this.bottom];
     }

package/dist/file-suggester.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileSuggester = void 0;
+const fs_1 = require("fs");
+const maxFileAiLines = 10;
+class FileSuggester {
+    constructor() {
+        this.prefix = "📂";
+        this.files = [];
+    }
+    async init() {
+        await this.refreshFiles();
+    }
+    async refreshFiles() {
+        try {
+            const entries = await fs_1.promises.readdir(process.cwd());
+            this.files = entries.sort((a, b) => a.localeCompare(b));
+        }
+        catch {
+            this.files = [];
+        }
+    }
+    async getMatchingFiles(queryRaw) {
+        await this.refreshFiles();
+        const query = queryRaw.trim().toLowerCase();
+        if (!query) {
+            return [...this.files];
+        }
+        return this.files.filter((file) => file.toLowerCase().indexOf(query.toLowerCase()) === 0);
+    }
+    async suggest(carousel, maxDisplayed) {
+        const { prefix } = carousel.getWordInfoAtCursor();
+        const matches = await this.getMatchingFiles(prefix);
+        return matches;
+    }
+    async findUniqueMatch(prefix) {
+        const normalized = prefix.trim();
+        if (!normalized)
+            return null;
+        const matches = await this.getMatchingFiles(normalized);
+        return matches.length === 1 ? matches[0] : null;
+    }
+    descriptionForAi() {
+        const filesForAi = this.files.slice(0, maxFileAiLines);
+        const list = filesForAi.length > 0 ? filesForAi.join("\n") : "(directory is empty)";
+        return `# File context
+
+The current directory is ${process.cwd()}.
+
+The files in the current directory are:
+
+${list}`;
+    }
+}
+exports.FileSuggester = FileSuggester;

package/dist/keyboard.js

@@ -8,6 +8,7 @@ const KEYMAP = {
     '\u0003': { name: 'ctrl-c', ctrl: true }, // ^C
     '\u0004': { name: 'ctrl-d', ctrl: true }, // ^D
     '\u0015': { name: 'ctrl-u', ctrl: true }, // ^U
+    '\t': { name: 'tab' },
     '\r': { name: 'enter' },
     '\n': { name: 'enter' },
     '\u007f': { name: 'backspace' }, // DEL
@@ -18,6 +19,10 @@ const KEYMAP = {
     '\u001b[B': { name: 'down' },
     '\u001b[C': { name: 'right' },
     '\u001b[D': { name: 'left' },
+    '\u001b[1;5C': { name: 'ctrl-right', ctrl: true },
+    '\u001b[1;5D': { name: 'ctrl-left', ctrl: true },
+    '\u001b[5C': { name: 'ctrl-right', ctrl: true },
+    '\u001b[5D': { name: 'ctrl-left', ctrl: true },
     // Home/End/Delete variants
     '\u001b[H': { name: 'home' },
     '\u001b[F': { name: 'end' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caroushell",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Terminal carousel that suggests commands from history, config, and AI.",
   "type": "commonjs",
   "main": "dist/main.js",