caroushell 0.1.12 → 0.1.14

package/dist/ai-suggester.js

@@ -5,6 +5,27 @@ exports.generateContent = generateContent;
 exports.listModels = listModels;
 const logs_1 = require("./logs");
 const config_1 = require("./config");
+function debounceAsync(fn, delayMs) {
+    let tim = null;
+    let rejectLast = null;
+    return (...args) => {
+        if (tim)
+            clearTimeout(tim);
+        return new Promise((resolve, reject) => {
+            if (rejectLast) {
+                rejectLast(new Error("debounced"));
+            }
+            rejectLast = reject;
+            tim = setTimeout(() => {
+                tim = null;
+                rejectLast = null;
+                fn(...args)
+                    .then(resolve)
+                    .catch(reject);
+            }, delayMs);
+        });
+    };
+}
 async function generateContent(prompt, options) {
     const apiKey = options?.apiKey ||
         process.env.CAROUSHELL_API_KEY ||
@@ -100,6 +121,8 @@ async function extractText(json) {
 class AISuggester {
     constructor(opts) {
         this.prefix = "🤖";
+        this.latestSuggestions = [];
+        this.debouncedSuggest = debounceAsync(this.runSuggestNow.bind(this), 350);
         this.apiKey = opts?.apiKey;
         this.apiUrl = opts?.apiUrl;
         this.model = opts?.model;
@@ -118,11 +141,29 @@ class AISuggester {
     descriptionForAi() {
         return "";
     }
-    async suggest(carousel, maxDisplayed) {
+    latest() {
+        return this.latestSuggestions;
+    }
+    async refreshSuggestions(carousel, maxDisplayed) {
         if (!this.apiKey || !this.apiUrl || !this.model) {
             (0, logs_1.logLine)("AI generation skipped: missing API configuration");
-            return [];
+            this.latestSuggestions = [];
+            carousel.render();
+            return;
         }
+        try {
+            const suggestions = await this.debouncedSuggest(carousel, maxDisplayed);
+            this.latestSuggestions = suggestions.slice(0, maxDisplayed);
+        }
+        catch (err) {
+            if (err?.message !== "debounced") {
+                (0, logs_1.logLine)("ai suggest error: " + err?.message);
+            }
+            this.latestSuggestions = [];
+        }
+        carousel.render();
+    }
+    async runSuggestNow(carousel, maxDisplayed) {
         const descriptions = [];
         for (const suggester of carousel.getSuggesters()) {
             const desc = suggester.descriptionForAi();

package/dist/app.js

@@ -8,15 +8,6 @@ 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
-    let t = null;
-    return (...args) => {
-        if (t)
-            clearTimeout(t);
-        t = setTimeout(() => fn(...args), ms);
-    };
-}
 class App {
     constructor() {
         this.usingFileSuggestions = false;
@@ -32,9 +23,9 @@ class App {
             bottomRows: 2,
             terminal: this.terminal,
         });
-        this.queueUpdateSuggestions = debounce(async () => {
-            await this.carousel.updateSuggestions();
-        }, 300);
+        this.queueUpdateSuggestions = () => {
+            void this.carousel.updateSuggestions();
+        };
         this.handlers = {
             "ctrl-c": () => {
                 if (this.carousel.isPromptRowSelected() && !this.carousel.hasInput()) {
@@ -142,7 +133,7 @@ class App {
     }
     async run() {
         await this.init();
-        this.keyboard.start();
+        this.keyboard.enableCapture();
         this.keyboard.on("key", (evt) => {
             void this.handleKey(evt);
         });
@@ -174,7 +165,8 @@ class App {
         this.terminal.renderBlock(lines);
         // Ensure command output starts on the next line
         this.terminal.write("\n");
-        this.keyboard.pause();
+        this.keyboard.disableCapture();
+        this.terminal.disableWrites();
         try {
             const storeInHistory = await (0, spawner_1.runUserCommand)(cmd);
             if (storeInHistory) {
@@ -182,13 +174,14 @@ class App {
             }
         }
         finally {
-            this.keyboard.resume();
+            this.terminal.enableWrites();
+            this.keyboard.enableCapture();
         }
     }
     exit() {
         // Clear terminal contents before shutting down to leave a clean screen.
         this.terminal.renderBlock([]);
-        this.keyboard.stop();
+        this.keyboard.disableCapture();
         process.exit(0);
     }
     async tryAutocompleteFile() {

package/dist/carousel.js

@@ -5,61 +5,49 @@ const logs_1 = require("./logs");
 const terminal_1 = require("./terminal");
 class Carousel {
     constructor(opts) {
-        this.latestTop = [];
-        this.latestBottom = [];
         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;
-        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") {
             this.setInputBuffer(input);
         }
-        const topPromise = this.top.suggest(this, this.topRowCount);
-        const bottomPromise = this.bottom.suggest(this, this.bottomRowCount);
-        void topPromise.then((r) => {
-            this.latestTop = r;
-            this.render();
-        });
-        void bottomPromise.then((r) => {
-            this.latestBottom = r;
-            this.render();
-        });
+        void this.top.refreshSuggestions(this, this.topRowCount);
+        void this.bottom.refreshSuggestions(this, this.bottomRowCount);
     }
     up() {
         this.index += 1;
-        if (this.index >= this.latestTop.length) {
-            this.index = this.latestTop.length;
+        const topLength = this.top.latest().length;
+        if (this.index >= topLength) {
+            this.index = topLength;
         }
     }
     down() {
         this.index -= 1;
-        if (-this.index >= this.latestBottom.length) {
-            this.index = -this.latestBottom.length;
+        const bottomLength = this.bottom.latest().length;
+        if (-this.index >= bottomLength) {
+            this.index = -bottomLength;
         }
     }
     getRow(rowIndex) {
+        const latestTop = this.top.latest();
+        const latestBottom = this.bottom.latest();
         if (rowIndex < 0) {
             const bottomIndex = -rowIndex - 1;
-            return this.latestBottom[bottomIndex] || "";
+            return latestBottom[bottomIndex] || "";
         }
         if (rowIndex === 0) {
             return this.inputBuffer;
         }
         if (rowIndex > 0) {
             const topIndex = rowIndex - 1;
-            return this.latestTop[topIndex] || "";
+            return latestTop[topIndex] || "";
         }
         return "";
     }
@@ -259,7 +247,10 @@ class Carousel {
         if (this.top === suggester)
             return;
         this.top = suggester;
-        this.latestTop = this.createEmptyRows(this.topRowCount);
+        if (this.index > 0) {
+            const topLength = this.top.latest().length;
+            this.index = Math.min(this.index, topLength);
+        }
     }
     getSuggesters() {
         return [this.top, this.bottom];

package/dist/file-suggester.js

@@ -12,6 +12,7 @@ class FileSuggester {
     constructor() {
         this.prefix = "📂";
         this.files = [];
+        this.latestSuggestions = [];
     }
     async init() {
         await this.refreshFiles();
@@ -75,10 +76,13 @@ class FileSuggester {
         const converted = dirDisplay.replace(/\//g, path_1.default.sep);
         return path_1.default.resolve(process.cwd(), converted);
     }
-    async suggest(carousel, maxDisplayed) {
+    latest() {
+        return this.latestSuggestions;
+    }
+    async refreshSuggestions(carousel, maxDisplayed) {
         const { prefix } = carousel.getWordInfoAtCursor();
-        const matches = await this.getMatchingFiles(prefix);
-        return matches;
+        this.latestSuggestions = await this.getMatchingFiles(prefix);
+        carousel.render();
     }
     async findUniqueMatch(prefix) {
         const normalized = prefix.trim();

package/dist/hello-new-user.js

@@ -41,6 +41,7 @@ const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const readline_1 = __importDefault(require("readline"));
 const ai_suggester_1 = require("./ai-suggester");
+const preferredModels = ["gemini-2.5-flash-lite", "gpt-4o-mini"];
 function isInteractive() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
@@ -49,6 +50,17 @@ async function prompt(question, rl) {
         rl.question(question, (answer) => resolve(answer));
     });
 }
+function findShortestMatches(models, preferredList) {
+    const matches = [];
+    for (const pref of preferredList) {
+        const hits = models.filter((modelId) => modelId.includes(pref));
+        if (hits.length) {
+            const shortest = hits.reduce((best, candidate) => candidate.length < best.length ? candidate : best);
+            matches.push(shortest);
+        }
+    }
+    return [...new Set(matches)];
+}
 async function runHelloNewUserFlow(configPath) {
     if (!isInteractive()) {
         throw new Error(`Missing config at ${configPath} and no interactive terminal is available.\n` +
@@ -92,10 +104,17 @@ async function runHelloNewUserFlow(configPath) {
     }
     const models = await (0, ai_suggester_1.listModels)(apiUrl, apiKey);
     if (models.length > 0) {
+        const preferred = findShortestMatches(models, preferredModels);
         console.log("Here are a few example model ids from your api service. Choose a fast and cheap model because AI suggestions happen as you type.");
         for (const model of models.slice(0, 5)) {
             console.log(`  - ${model}`);
         }
+        if (preferred.length) {
+            console.log("Recommended models from your provider:");
+            for (const model of preferred) {
+                console.log(`  - ${model}`);
+            }
+        }
     }
     let model = "";
     while (!model) {

package/dist/history-suggester.js

@@ -44,24 +44,31 @@ class HistorySuggester {
             .catch(() => { });
         await fs_1.promises.appendFile(this.filePath, this.serializeHistoryEntry(command), "utf8");
     }
-    async suggest(carousel, maxDisplayed) {
+    latest() {
+        return this.items;
+    }
+    async refreshSuggestions(carousel, maxDisplayed) {
         const input = carousel.getCurrentRow();
+        let results;
         if (!input) {
             // this.items 0 index is newest
-            return this.items;
+            results = this.items;
         }
-        const q = input.toLowerCase();
-        const matched = [];
-        // iterate from newest to oldest so we skip older duplicates
-        const seen = new Set();
-        for (let i = 0; i < this.items.length; i++) {
-            const it = this.items[i];
-            if (it.toLowerCase().includes(q) && !seen.has(it)) {
-                seen.add(it);
-                matched.push(it);
+        else {
+            const q = input.toLowerCase();
+            const matched = [];
+            // iterate from newest to oldest so we skip older duplicates
+            const seen = new Set();
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i];
+                if (it.toLowerCase().includes(q) && !seen.has(it)) {
+                    seen.add(it);
+                    matched.push(it);
+                }
             }
+            results = matched;
         }
-        return matched;
+        carousel.render();
     }
     descriptionForAi() {
         const lines = [];

package/dist/keyboard.js

@@ -50,38 +50,15 @@ for (const seq of Object.keys(KEYMAP)) {
 class Keyboard extends events_1.EventEmitter {
     constructor() {
         super(...arguments);
-        this.active = false;
         this.capturing = false;
         this.buffer = '';
         this.stdin = process.stdin;
         this.onData = (data) => this.handleData(data);
     }
-    start() {
-        if (this.active)
-            return;
-        this.active = true;
-        this.stdin.setEncoding('utf8');
-        this.enableCapture();
-    }
-    stop() {
-        if (!this.active)
-            return;
-        this.active = false;
-        this.disableCapture();
-    }
-    pause() {
-        if (!this.active)
-            return;
-        this.disableCapture();
-    }
-    resume() {
-        if (!this.active)
-            return;
-        this.enableCapture();
-    }
     enableCapture() {
         if (this.capturing)
             return;
+        this.stdin.setEncoding('utf8');
         if (this.stdin.isTTY)
             this.stdin.setRawMode(true);
         this.stdin.on('data', this.onData);

package/dist/terminal.js

@@ -21,6 +21,16 @@ class Terminal {
         this.activeRows = 0;
         this.cursorRow = 0;
         this.cursorCol = 0;
+        this.writesDisabled = false;
+    }
+    disableWrites() {
+        this.writesDisabled = true;
+    }
+    enableWrites() {
+        this.writesDisabled = false;
+    }
+    canWrite() {
+        return !this.writesDisabled;
     }
     moveCursorToTopOfBlock() {
         if (this.activeRows === 0)
@@ -51,6 +61,8 @@ class Terminal {
         }
     }
     write(text) {
+        if (!this.canWrite())
+            return;
         this.out.write(text);
     }
     hideCursor() {
@@ -61,6 +73,8 @@ class Terminal {
     }
     // Render a block of lines by clearing previous block (if any) and writing fresh
     renderBlock(lines, cursorRow, cursorCol) {
+        if (!this.canWrite())
+            return;
         this.withCork(() => {
             this.moveCursorToTopOfBlock();
             if (this.activeRows > 0) {
@@ -68,9 +82,9 @@ class Terminal {
                 readline_1.default.clearScreenDown(this.out);
             }
             for (let i = 0; i < lines.length; i++) {
-                this.out.write(lines[i]);
+                this.write(lines[i]);
                 if (i < lines.length - 1)
-                    this.out.write("\n");
+                    this.write("\n");
             }
             this.activeRows = lines.length;
             this.cursorRow = Math.max(0, this.activeRows - 1);
@@ -87,6 +101,8 @@ class Terminal {
         });
     }
     moveCursorTo(lineIndex, column) {
+        if (!this.canWrite())
+            return;
         if (this.activeRows === 0)
             return;
         const safeLine = Math.min(Math.max(lineIndex, 0), Math.max(0, this.activeRows - 1));

package/package.json

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