caroushell 0.1.11 → 0.1.13

package/dist/app.js

@@ -142,7 +142,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 +174,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 +183,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() {
@@ -208,6 +210,7 @@ class App {
         return true;
     }
     tryAcceptHighlightedFileSuggestion() {
+        // After ENTER on a file suggestion, we want to place the match at the cursor
         const currentSuggester = this.carousel.getCurrentRowSuggester();
         if (currentSuggester !== this.files)
             return false;

package/dist/file-suggester.js

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileSuggester = void 0;
 const fs_1 = require("fs");
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const maxFileAiLines = 10;
 class FileSuggester {
     constructor() {
@@ -22,11 +27,53 @@ class FileSuggester {
     }
     async getMatchingFiles(queryRaw) {
         await this.refreshFiles();
-        const query = queryRaw.trim().toLowerCase();
-        if (!query) {
-            return [...this.files];
+        const query = queryRaw.trim();
+        const { dirDisplay, fragment, dirPath } = this.parseQuery(query);
+        const entries = await this.readDirectory(dirPath);
+        const needle = fragment.toLowerCase();
+        return entries
+            .filter((entry) => entry.toLowerCase().startsWith(needle))
+            .map((entry) => `${dirDisplay}${entry}`);
+    }
+    async readDirectory(dirPath) {
+        try {
+            const entries = await fs_1.promises.readdir(dirPath);
+            return entries.sort((a, b) => a.localeCompare(b));
+        }
+        catch {
+            return [];
+        }
+    }
+    parseQuery(query) {
+        const lastForward = query.lastIndexOf("/");
+        const lastBackward = query.lastIndexOf("\\");
+        const lastSeparator = Math.max(lastForward, lastBackward);
+        if (lastSeparator === -1) {
+            return {
+                dirDisplay: "",
+                fragment: query,
+                dirPath: process.cwd(),
+            };
+        }
+        const dirDisplay = query.slice(0, lastSeparator + 1);
+        const fragment = query.slice(lastSeparator + 1);
+        return {
+            dirDisplay,
+            fragment,
+            dirPath: this.resolveDirectory(dirDisplay),
+        };
+    }
+    resolveDirectory(dirDisplay) {
+        if (!dirDisplay) {
+            return process.cwd();
+        }
+        if (dirDisplay.startsWith("~")) {
+            const rest = dirDisplay.slice(1);
+            const normalizedRest = rest.replace(/^[\\/]/, "");
+            return path_1.default.resolve(os_1.default.homedir(), normalizedRest.replace(/\//g, path_1.default.sep));
         }
-        return this.files.filter((file) => file.toLowerCase().indexOf(query.toLowerCase()) === 0);
+        const converted = dirDisplay.replace(/\//g, path_1.default.sep);
+        return path_1.default.resolve(process.cwd(), converted);
     }
     async suggest(carousel, maxDisplayed) {
         const { prefix } = carousel.getWordInfoAtCursor();

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.11",
+  "version": "0.1.13",
   "description": "Terminal carousel that suggests commands from history, config, and AI.",
   "type": "commonjs",
   "main": "dist/main.js",