caroushell 0.1.23 → 0.1.24

package/dist/app.js

@@ -5,7 +5,6 @@ const terminal_1 = require("./terminal");
 const keyboard_1 = require("./keyboard");
 const carousel_1 = require("./carousel");
 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");
@@ -18,14 +17,14 @@ class App {
         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.bottomSuggester = deps.bottomPanel ?? new carousel_1.NullSuggester();
         this.files = deps.files ?? new file_suggester_1.FileSuggester();
-        this.suggesters = deps.suggesters ?? [this.history, this.ai, this.files];
+        this.suggesters = deps.suggesters ?? [this.history, this.bottomSuggester, this.files];
         this.carousel = new carousel_1.Carousel({
             top: this.history,
-            bottom: this.ai,
+            bottom: this.bottomSuggester,
             topRows: 2,
-            bottomRows: 2,
+            bottomRows: this.bottomSuggester instanceof carousel_1.NullSuggester ? 0 : 2,
             terminal: this.terminal,
         });
         this.queueUpdateSuggestions = () => {
@@ -137,9 +136,9 @@ class App {
         };
     }
     async init() {
-        await this.history.init();
-        await this.ai.init();
-        await this.files.init();
+        for (const s of this.suggesters) {
+            await s.init();
+        }
     }
     async run() {
         await this.init();
@@ -185,6 +184,7 @@ class App {
         this.terminal.write("\n");
         this.keyboard.disableCapture();
         this.terminal.disableWrites();
+        await this.preBroadcastCommand(cmd);
         try {
             const storeInHistory = await (0, spawner_1.runUserCommand)(cmd);
             if (storeInHistory) {
@@ -291,6 +291,19 @@ class App {
         this.usingFileSuggestions = true;
         this.carousel.setTopSuggester(this.files);
     }
+    async preBroadcastCommand(cmd) {
+        const listeners = this.suggesters
+            .map((suggester) => suggester.onCommandWillRun?.(cmd))
+            .filter(Boolean);
+        if (listeners.length === 0)
+            return;
+        try {
+            await Promise.all(listeners);
+        }
+        catch (err) {
+            (0, logs_1.logLine)("suggester onCommandWillRun error: " + err?.message);
+        }
+    }
     async broadcastCommand(cmd) {
         const listeners = this.suggesters
             .map((suggester) => suggester.onCommandRan?.(cmd))

package/dist/carousel.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Carousel = void 0;
+exports.Carousel = exports.NullSuggester = void 0;
 exports.getDisplayWidth = getDisplayWidth;
 const logs_1 = require("./logs");
 const terminal_1 = require("./terminal");
@@ -57,6 +57,16 @@ function getDisplayWidth(text) {
     }
     return width;
 }
+class NullSuggester {
+    constructor() {
+        this.prefix = "";
+    }
+    async init() { }
+    async refreshSuggestions() { }
+    latest() { return []; }
+    descriptionForAi() { return ""; }
+}
+exports.NullSuggester = NullSuggester;
 class Carousel {
     constructor(opts) {
         this.index = 0;

package/dist/config.js

@@ -88,7 +88,6 @@ async function doesConfigExist() {
     }
 }
 async function getConfig() {
-    const configPath = getConfigPath();
     const raw = await readConfigFile();
     const envApiKey = process.env.CAROUSHELL_API_KEY || process.env.GEMINI_API_KEY || undefined;
     const envApiUrl = process.env.CAROUSHELL_API_URL || undefined;
@@ -107,9 +106,6 @@ async function getConfig() {
     if (!resolved.model && geminiApiKey) {
         resolved.model = GEMINI_DEFAULT_MODEL;
     }
-    if (!resolved.apiUrl || !resolved.apiKey || !resolved.model) {
-        throw new Error(`Config at ${configPath} is missing required fields. Please include apiUrl, apiKey, and model (or just GEMINI_API_KEY).`);
-    }
     return resolved;
 }
 function isGeminiUrl(url) {

package/dist/hello-new-user.js

@@ -70,7 +70,23 @@ async function runHelloNewUserFlow(configPath) {
     await fs_1.promises.mkdir(dir, { recursive: true });
     console.log("");
     console.log("Welcome to Caroushell!");
-    console.log(`Let's set up AI suggestions. You'll need an API endpoint URL, a key, and model id. These will be stored at ${configPath}`);
+    console.log("");
+    const rl = readline_1.default.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    const wantsAi = (await prompt("Do you want to set up AI auto-complete? (y/n): ", rl))
+        .trim()
+        .toLowerCase();
+    if (wantsAi !== "y" && wantsAi !== "yes") {
+        rl.close();
+        // Writing noAi or any key will skip the new user flow next run
+        await fs_1.promises.writeFile(configPath, "noAi = true\n", "utf8");
+        console.log("\nSkipping AI setup. You can set it up later by editing " + configPath);
+        console.log("");
+        return null;
+    }
+    console.log(`\nLet's set up AI suggestions. You'll need an API endpoint URL, a key, and model id. These will be stored at ${configPath}`);
     console.log("");
     console.log("Some example endpoints you can paste:");
     console.log("  - OpenRouter: https://openrouter.ai/api/v1");
@@ -78,10 +94,6 @@ async function runHelloNewUserFlow(configPath) {
     console.log("  - Google:     https://generativelanguage.googleapis.com/v1beta/openai");
     console.log("");
     console.log("Press Ctrl+C any time to abort.\n");
-    const rl = readline_1.default.createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    });
     let apiUrl = "";
     while (!apiUrl) {
         const answer = (await prompt("API URL: ", rl)).trim();

package/dist/history-suggester.js

@@ -48,9 +48,10 @@ class HistorySuggester {
             .catch(() => { });
         await fs_1.promises.appendFile(this.filePath, this.serializeHistoryEntry(command), "utf8");
     }
-    async onCommandRan(command) {
+    async onCommandWillRun(command) {
         await this.add(command);
     }
+    async onCommandRan(command) { }
     latest() {
         return this.filteredItems;
     }

package/dist/main.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const path_1 = require("path");
 const app_1 = require("./app");
+const ai_suggester_1 = require("./ai-suggester");
+const carousel_1 = require("./carousel");
 const hello_new_user_1 = require("./hello-new-user");
 const logs_1 = require("./logs");
 const config_1 = require("./config");
@@ -25,7 +27,11 @@ async function main() {
     if (!(await (0, config_1.doesConfigExist)())) {
         await (0, hello_new_user_1.runHelloNewUserFlow)((0, config_1.getConfigPath)());
     }
-    const app = new app_1.App();
+    const config = await (0, config_1.getConfig)();
+    const bottomPanel = config.apiUrl && config.apiKey && config.model
+        ? new ai_suggester_1.AISuggester()
+        : new carousel_1.NullSuggester();
+    const app = new app_1.App({ bottomPanel });
     await app.run();
 }
 main().catch((err) => {

package/dist/spawner.js

@@ -144,10 +144,19 @@ async function runUserCommand(command) {
         stdio: "inherit",
         windowsVerbatimArguments: true,
     });
-    await new Promise((resolve, reject) => {
-        proc.on("error", reject);
-        proc.on("close", () => resolve());
-    });
+    // While a user command owns the terminal, Ctrl+C should interrupt that command
+    // without taking down the parent Caroushell process.
+    const ignoreSigint = () => { };
+    process.on("SIGINT", ignoreSigint);
+    try {
+        await new Promise((resolve, reject) => {
+            proc.on("error", reject);
+            proc.on("close", () => resolve());
+        });
+    }
+    finally {
+        process.off("SIGINT", ignoreSigint);
+    }
     // Why save failed commands? Well eg sometimes we want to run a test
     // many times until we fix it.
     return true;

package/package.json

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