caroushell 0.1.18 → 0.1.20

package/dist/ai-suggester.js

@@ -171,8 +171,9 @@ class AISuggester {
                 descriptions.push(desc);
             }
         }
-        const prompt = `You are a shell assistant. Given a partial shell input, suggest ${maxDisplayed}\
-useful, concise shell commands that the user might run next.\
+        const prompt = `You are a shell assistant. Given a partial shell input, \
+suggest ${maxDisplayed} useful, concise shell commands that the user might run \
+next.
 Return one suggestion per line, no numbering, no extra text.
 Return the whole suggestion, not just what remains to type out.
 
@@ -193,7 +194,7 @@ ${descriptions.join("\n\n")}
             .map((s) => s.trim())
             .filter(Boolean)
             .slice(0, maxDisplayed);
-        (0, logs_1.logLine)(`AI lines: ${lines.length}`);
+        (0, logs_1.logLine)(`AI lines: ${lines}`);
         return lines;
     }
 }

package/dist/app.js

@@ -8,14 +8,16 @@ 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");
+const logs_1 = require("./logs");
 class App {
-    constructor() {
+    constructor(deps = {}) {
         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.terminal = deps.terminal ?? new terminal_1.Terminal();
+        this.keyboard = deps.keyboard ?? new keyboard_1.Keyboard();
+        this.history = deps.topPanel ?? new history_suggester_1.HistorySuggester();
+        this.ai = deps.bottomPanel ?? new ai_suggester_1.AISuggester();
+        this.files = deps.files ?? new file_suggester_1.FileSuggester();
+        this.suggesters = deps.suggesters ?? [this.history, this.ai, this.files];
         this.carousel = new carousel_1.Carousel({
             top: this.history,
             bottom: this.ai,
@@ -170,7 +172,7 @@ class App {
         try {
             const storeInHistory = await (0, spawner_1.runUserCommand)(cmd);
             if (storeInHistory) {
-                await this.history.add(cmd);
+                await this.broadcastCommand(cmd);
             }
         }
         finally {
@@ -242,5 +244,18 @@ class App {
         this.usingFileSuggestions = true;
         this.carousel.setTopSuggester(this.files);
     }
+    async broadcastCommand(cmd) {
+        const listeners = this.suggesters
+            .map((suggester) => suggester.onCommandRan?.(cmd))
+            .filter(Boolean);
+        if (listeners.length === 0)
+            return;
+        try {
+            await Promise.all(listeners);
+        }
+        catch (err) {
+            (0, logs_1.logLine)("suggester onCommandRan error: " + err?.message);
+        }
+    }
 }
 exports.App = App;

package/dist/history-suggester.js

@@ -10,6 +10,7 @@ const config_1 = require("./config");
 class HistorySuggester {
     constructor(filePath) {
         this.prefix = "⌛";
+        // `items` is the history as a list of commands, with the most recent at index 0
         this.items = [];
         this.filteredItems = [];
         this.maxItems = 1000;
@@ -47,6 +48,9 @@ class HistorySuggester {
             .catch(() => { });
         await fs_1.promises.appendFile(this.filePath, this.serializeHistoryEntry(command), "utf8");
     }
+    async onCommandRan(command) {
+        await this.add(command);
+    }
     latest() {
         return this.filteredItems;
     }
@@ -71,18 +75,19 @@ class HistorySuggester {
         carousel.render();
     }
     descriptionForAi() {
+        // This goes into the prompt
         const lines = [];
         const maxHistoryLines = 20;
-        const start = Math.max(0, this.items.length - maxHistoryLines);
-        const end = this.items.length - 1;
-        const reverseSlice = this.items.slice(start, end).reverse();
-        if (reverseSlice.length > 0) {
-            lines.push(`The most recent command is: "${reverseSlice[0]}"`);
+        const start = 0;
+        const end = maxHistoryLines;
+        const newToOldSlice = this.items.slice(start, end);
+        if (newToOldSlice.length > 0) {
+            lines.push(`The most recent command is: "${newToOldSlice[0]}"`);
         }
-        if (reverseSlice.length > 1) {
+        if (newToOldSlice.length > 1) {
             lines.push("The most recent commands are (from recent to oldest):");
-            for (let i = 0; i < reverseSlice.length; i++) {
-                lines.push(`  ${i + 1}. ${reverseSlice[i]}`);
+            for (let i = 0; i < newToOldSlice.length; i++) {
+                lines.push(`  ${i + 1}. ${newToOldSlice[i]}`);
             }
         }
         return lines.join("\n");

package/dist/keyboard.js

@@ -48,12 +48,12 @@ for (const seq of Object.keys(KEYMAP)) {
     }
 }
 class Keyboard extends events_1.EventEmitter {
-    constructor() {
-        super(...arguments);
+    constructor(stdin = process.stdin) {
+        super();
         this.capturing = false;
         this.buffer = '';
-        this.stdin = process.stdin;
         this.onData = (data) => this.handleData(data);
+        this.stdin = stdin;
     }
     enableCapture() {
         if (this.capturing)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caroushell",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Terminal carousel that suggests commands from history, config, and AI.",
   "type": "commonjs",
   "main": "dist/main.js",
@@ -17,6 +17,7 @@
     "build": "tsc -p tsconfig.release.json",
     "prepare": "npm run build",
     "start": "node dist/main.js",
+    "test": "node --import tsx --test tests/*.ts",
     "test:generate": "tsx src/test-generate.ts",
     "lint": "eslint . --ext .ts",
     "release": "tsx scripts/release.ts"