caroushell 0.1.3 → 0.1.6

package/README.md

@@ -10,22 +10,26 @@ history, and AI suggestions as you type.
 - 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.json`) so you can point the CLI
+- Extensible config file (`~/.caroushell/config.toml`) so you can point the CLI
   at different AI providers.
 
 ## Requirements
 
 - 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.json`.
+  URL, API key, and model name, then store them in `~/.caroushell/config.toml`.
 - You can also create the file manually:
 
-```json
-{
-  "apiUrl": "https://openrouter.ai/api/v1",
-  "apiKey": "your-api-key",
-  "model": "gpt-4o-mini"
-}
+```toml
+apiUrl = "https://openrouter.ai/api/v1"
+apiKey = "your-api-key"
+model = "gpt-4o-mini"
+```
+
+or
+
+```toml
+GEMINI_API_KEY = "AIzaSyD...N-wK"
 ```
 
 Any endpoint that implements the OpenAI Chat Completions API (OpenRouter,
@@ -60,7 +64,7 @@ Caroushell opens an interactive prompt:
 
 Logs are written to `~/.caroushell/logs/MM-DD.txt`. Inspect these files if you
 need to debug AI suggestions or the terminal renderer. Configuration lives at
-`~/.caroushell/config.json` (override via `CAROUSHELL_CONFIG_PATH`).
+`~/.caroushell/config.toml` (override via `CAROUSHELL_CONFIG_PATH`).
 
 ## Development
 

package/dist/ai-suggester.js

@@ -109,14 +109,6 @@ class AISuggester {
         this.apiUrl =
             this.apiUrl || config.apiUrl || process.env.CAROUSHELL_API_URL;
         this.model = this.model || config.model || process.env.CAROUSHELL_MODEL;
-        // If the user provided only a Gemini key, default the URL/model accordingly.
-        if (!this.apiUrl && config.GEMINI_API_KEY) {
-            this.apiUrl =
-                "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash-lite:generateContent";
-        }
-        if (!this.model && config.GEMINI_API_KEY) {
-            this.model = "gemini-2.5-flash-lite";
-        }
     }
     descriptionForAi() {
         return "";

package/dist/app.js

@@ -67,7 +67,13 @@ class App {
                 const cmd = this.carousel.getCurrentRow().trim();
                 this.carousel.setInputBuffer("", 0);
                 await this.runCommand(cmd);
+                // Carousel should point to the prompt
                 this.carousel.resetIndex();
+                // After arbitrary output, reset render block tracking
+                this.terminal.resetBlockTracking();
+                // Render the prompt, without this we'd wait for the suggestions to call render
+                // and it would appear slow
+                this.render();
                 this.queueUpdateSuggestions();
             },
             char: (evt) => {
@@ -129,7 +135,6 @@ class App {
             await fn(evt);
         }
     }
-    queueUpdateSuggestions() { }
     render() {
         this.carousel.render();
         // Cursor placement handled inside carousel render.
@@ -140,7 +145,6 @@ class App {
             // Log an empty line
             this.terminal.renderBlock([">"]);
             this.terminal.write("\n");
-            this.terminal.resetBlockTracking();
             return;
         }
         // Log command in yellow
@@ -159,10 +163,10 @@ class App {
         finally {
             this.keyboard.resume();
         }
-        // After arbitrary output, reset render block tracking
-        this.terminal.resetBlockTracking();
     }
     exit() {
+        // Clear terminal contents before shutting down to leave a clean screen.
+        this.terminal.renderBlock([]);
         this.keyboard.stop();
         process.exit(0);
     }

package/dist/carousel.js

@@ -25,11 +25,11 @@ class Carousel {
         }
         const topPromise = this.top.suggest(this, this.topRowCount);
         const bottomPromise = this.bottom.suggest(this, this.bottomRowCount);
-        topPromise.then((r) => {
+        void topPromise.then((r) => {
             this.latestTop = r;
             this.render();
         });
-        bottomPromise.then((r) => {
+        void bottomPromise.then((r) => {
             this.latestBottom = r;
             this.render();
         });

package/dist/config.js

@@ -32,6 +32,9 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configFolder = configFolder;
 exports.getConfigPath = getConfigPath;
@@ -40,7 +43,8 @@ exports.getConfig = getConfig;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
-const GEMINI_DEFAULT_API_URL = "https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash-lite:generateContent";
+const toml_1 = __importDefault(require("toml"));
+const GEMINI_DEFAULT_API_URL = "https://generativelanguage.googleapis.com/v1beta/openai";
 const GEMINI_DEFAULT_MODEL = "gemini-2.5-flash-lite";
 function configFolder(subpath) {
     const home = os.homedir();
@@ -48,19 +52,27 @@ function configFolder(subpath) {
     return path.join(home, ".caroushell", subpath);
 }
 function getConfigPath() {
-    return process.env.CAROUSHELL_CONFIG_PATH || configFolder("config.json");
+    return process.env.CAROUSHELL_CONFIG_PATH || configFolder("config.toml");
 }
 async function readConfigFile() {
     const configPath = getConfigPath();
     const raw = await fs_1.promises.readFile(configPath, "utf8");
-    return JSON.parse(raw);
+    if (!raw.trim()) {
+        return {};
+    }
+    try {
+        return toml_1.default.parse(raw);
+    }
+    catch (err) {
+        throw new Error(`Error parsing config file at ${configPath}: ${err}`);
+    }
 }
 async function doesConfigExist() {
     const configPath = getConfigPath();
     try {
         await fs_1.promises.access(configPath);
         const raw = await readConfigFile();
-        if (!raw)
+        if (!raw || Object.keys(raw).length === 0)
             return false;
         return true;
     }
@@ -68,7 +80,7 @@ async function doesConfigExist() {
         if (err?.code === "ENOENT") {
             return false;
         }
-        // detect empty json file syntax error
+        // Treat invalid TOML as missing so we can reprompt the user.
         if (err instanceof SyntaxError) {
             return false;
         }

package/dist/hello-new-user.js

@@ -113,7 +113,10 @@ async function runHelloNewUserFlow(configPath) {
         apiKey,
         model,
     };
-    await fs_1.promises.writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf8");
+    const tomlBody = Object.entries(config)
+        .map(([key, value]) => `${key} = ${JSON.stringify(value)}`)
+        .join("\n");
+    await fs_1.promises.writeFile(configPath, tomlBody + "\n", "utf8");
     console.log(`\nSaved config to ${configPath}`);
     console.log("You can edit this file later if you want to switch providers.\n");
     return config;

package/dist/history-suggester.js

@@ -23,7 +23,7 @@ class HistorySuggester {
         catch { }
         try {
             const data = await fs_1.promises.readFile(this.filePath, "utf8");
-            this.items = data.split(/\r?\n/).filter(Boolean);
+            this.items = this.parseHistory(data);
         }
         catch {
             this.items = [];
@@ -32,29 +32,34 @@ class HistorySuggester {
     async add(command) {
         if (!command.trim())
             return;
-        if (this.items[this.items.length - 1] === command) {
+        if (this.items[0] === command) {
             // Deduplicate recent duplicate
             return;
         }
-        this.items.push(command);
+        this.items.unshift(command);
         if (this.items.length > this.maxItems)
-            this.items.shift();
+            this.items.pop();
         await fs_1.promises
             .mkdir(path_1.default.dirname(this.filePath), { recursive: true })
             .catch(() => { });
-        await fs_1.promises.writeFile(this.filePath, this.items.join("\n"), "utf8");
+        await fs_1.promises.appendFile(this.filePath, this.serializeHistoryEntry(command), "utf8");
     }
     async suggest(carousel, maxDisplayed) {
         const input = carousel.getCurrentRow();
         if (!input) {
-            return this.items.reverse();
+            // this.items 0 index is newest
+            return this.items;
         }
         const q = input.toLowerCase();
         const matched = [];
-        for (let i = this.items.length - 1; i >= 0; i--) {
+        // 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))
+            if (it.toLowerCase().includes(q) && !seen.has(it)) {
+                seen.add(it);
                 matched.push(it);
+            }
         }
         return matched;
     }
@@ -75,5 +80,32 @@ class HistorySuggester {
         }
         return lines.join("\n");
     }
+    parseHistory(data) {
+        const entries = [];
+        let currentLines = [];
+        const flush = () => {
+            if (currentLines.length > 0) {
+                entries.push(currentLines.join("\n"));
+                currentLines = [];
+            }
+        };
+        const rows = data.split(/\n/);
+        for (const rawLine of rows) {
+            const line = rawLine.replace(/\r$/, "");
+            if (line.startsWith("+")) {
+                currentLines.push(line.slice(1));
+            }
+            else {
+                flush();
+            }
+        }
+        flush();
+        return entries.slice(-this.maxItems).reverse();
+    }
+    serializeHistoryEntry(command) {
+        const timestamp = new Date().toISOString();
+        const lines = command.split("\n").map((line) => `+${line}`);
+        return `\n# ${timestamp}\n${lines.join("\n")}\n`;
+    }
 }
 exports.HistorySuggester = HistorySuggester;

package/dist/main.js

@@ -15,6 +15,7 @@ async function main() {
     await app.run();
 }
 main().catch((err) => {
+    console.error("Caroushell uncaught error:");
     console.error(err);
     process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caroushell",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "Terminal carousel that suggests commands from history, config, and AI.",
   "type": "commonjs",
   "main": "dist/main.js",
@@ -14,10 +14,12 @@
   ],
   "scripts": {
     "dev": "tsx src/main.ts",
-    "build": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.release.json",
     "prepare": "npm run build",
     "start": "node dist/main.js",
-    "test:generate": "tsx src/test-generate.ts"
+    "test:generate": "tsx src/test-generate.ts",
+    "lint": "eslint . --ext .ts",
+    "release": "tsx scripts/release.ts"
   },
   "keywords": [
     "cli",
@@ -46,5 +48,8 @@
     "eslint": "^9.39.1",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3"
+  },
+  "dependencies": {
+    "toml": "^3.0.0"
   }
 }