caroushell 0.1.19 → 0.1.21

package/README.md

@@ -3,8 +3,8 @@
 [![npm version](https://img.shields.io/npm/v/caroushell.svg)](https://www.npmjs.com/package/caroushell)
 [![npm downloads](https://img.shields.io/npm/dm/caroushell.svg)](https://www.npmjs.com/package/caroushell)
 
-Caroushell is an interactive terminal carousel that suggests commands from your
-history, and AI suggestions as you type.
+Caroushell is kind of like `bash` but you see history and AI suggestions as you
+type.
 
 ## Features
 
@@ -12,9 +12,6 @@ history, and AI suggestions as you type.
 - The bottom panel of the carousel shows AI-generated command suggestions.
 - Go up and down the carousel with arrow keys.
 - Press `Enter` to run the highlighted command.
-- Logs activity under `~/.caroushell/logs` for easy troubleshooting.
-- Extensible config file (`~/.caroushell/config.toml`) so you can point the CLI
-  at different AI providers.
 
 ## UI
 
@@ -42,12 +39,13 @@ It would look like this:
 
 ![Caroushell ai suggestion for ffmpeg slowmo](docs/assets/demo.gif)
 
-## Requirements
+## Setup
 
 - Node.js 18 or newer.
 - On first launch Caroushell will prompt you for an OpenAI-compatible endpoint
   URL, API key, and model name, then store them in `~/.caroushell/config.toml`.
 - You can also create the file manually:
+- Logs are at `~/.caroushell/logs` for easy troubleshooting.
 
 ```toml
 apiUrl = "https://openrouter.ai/api/v1"

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,11 +172,12 @@ class App {
         try {
             const storeInHistory = await (0, spawner_1.runUserCommand)(cmd);
             if (storeInHistory) {
-                await this.history.add(cmd);
+                await this.broadcastCommand(cmd);
             }
         }
         finally {
             this.terminal.enableWrites();
+            this.terminal.reset();
             this.keyboard.enableCapture();
         }
     }
@@ -242,5 +245,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

@@ -48,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;
     }

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/dist/spawner.js

@@ -7,6 +7,18 @@ const logs_1 = require("./logs");
 const isWin = process.platform === "win32";
 const shellBinary = isWin ? "cmd.exe" : "/bin/bash";
 const shellArgs = isWin ? ["/d", "/s", "/c"] : ["-lc"];
+const dirStack = [];
+// Track last-known cwd per drive so `E:` switches like cmd.exe
+// into the folder you were in before switching drives.
+const driveCwds = {};
+function updateDriveCwd(cwd = process.cwd()) {
+    if (!isWin)
+        return;
+    const drive = cwd.slice(0, 2).toUpperCase();
+    if (/^[A-Z]:$/.test(drive)) {
+        driveCwds[drive] = cwd;
+    }
+}
 const builtInCommands = {
     cd: async (args) => {
         if (args.length === 1) {
@@ -16,6 +28,7 @@ const builtInCommands = {
         const dest = expandVars(args[1]);
         try {
             process.chdir(dest);
+            updateDriveCwd();
         }
         catch (err) {
             process.stderr.write(`cd: ${err.message}\n`);
@@ -23,11 +36,66 @@ const builtInCommands = {
         }
         return true;
     },
+    pushd: async (args) => {
+        const current = process.cwd();
+        if (args.length === 1) {
+            const next = dirStack.shift();
+            if (!next) {
+                process.stderr.write("pushd: no other directory\n");
+                return false;
+            }
+            dirStack.unshift(current);
+            try {
+                process.chdir(next);
+                updateDriveCwd();
+            }
+            catch (err) {
+                process.stderr.write(`pushd: ${err.message}\n`);
+                dirStack.shift();
+                return false;
+            }
+            writeDirStack();
+            return true;
+        }
+        const dest = expandVars(args[1]);
+        try {
+            process.chdir(dest);
+            updateDriveCwd();
+        }
+        catch (err) {
+            process.stderr.write(`pushd: ${err.message}\n`);
+            return false;
+        }
+        dirStack.unshift(current);
+        writeDirStack();
+        return true;
+    },
+    popd: async () => {
+        const next = dirStack.shift();
+        if (!next) {
+            process.stderr.write("popd: directory stack empty\n");
+            return false;
+        }
+        try {
+            process.chdir(next);
+            updateDriveCwd();
+        }
+        catch (err) {
+            process.stderr.write(`popd: ${err.message}\n`);
+            return false;
+        }
+        writeDirStack();
+        return true;
+    },
     exit: async () => {
         (0, process_1.exit)(0);
         return false;
     },
 };
+function writeDirStack() {
+    const parts = [process.cwd(), ...dirStack];
+    process.stdout.write(parts.join(" ") + "\n");
+}
 function expandVars(input) {
     let out = input;
     if (isWin) {
@@ -52,6 +120,20 @@ async function runUserCommand(command) {
     const trimmed = command.trim();
     if (!trimmed)
         return false;
+    if (isWin && /^[a-zA-Z]:$/.test(trimmed)) {
+        // Windows drive switch (eg "E:") should restore that drive's last cwd.
+        const drive = trimmed.toUpperCase();
+        const target = driveCwds[drive] ?? `${drive}\\`;
+        try {
+            process.chdir(target);
+            updateDriveCwd();
+            return true;
+        }
+        catch (err) {
+            process.stderr.write(`${trimmed}: ${err.message}\n`);
+            return false;
+        }
+    }
     const args = command.split(/\s+/);
     if (typeof args[0] === "string" && builtInCommands[args[0]]) {
         return await builtInCommands[args[0]](args);
@@ -70,3 +152,4 @@ async function runUserCommand(command) {
     // many times until we fix it.
     return true;
 }
+updateDriveCwd();

package/dist/terminal.js

@@ -29,6 +29,13 @@ class Terminal {
     enableWrites() {
         this.writesDisabled = false;
     }
+    reset() {
+        // Some apps (such as vim) change the terminal cursor mode.
+        // We need to reset it to the default. To avoid arrow keys causing this:
+        // $> OAOBOCODODODODOAOAOCOB
+        const RESET_CURSOR_MODE = "\x1b[?1l";
+        this.write(RESET_CURSOR_MODE);
+    }
     canWrite() {
         return !this.writesDisabled;
     }

package/package.json

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