caroushell 0.1.29 → 0.1.31

package/dist/app.js

@@ -19,7 +19,11 @@ class App {
         this.history = deps.topPanel ?? new history_suggester_1.HistorySuggester();
         this.bottomSuggester = deps.bottomPanel ?? new carousel_1.NullSuggester();
         this.files = deps.files ?? new file_suggester_1.FileSuggester();
-        this.suggesters = deps.suggesters ?? [this.history, this.bottomSuggester, this.files];
+        this.suggesters = deps.suggesters ?? [
+            this.history,
+            this.bottomSuggester,
+            this.files,
+        ];
         this.carousel = new carousel_1.Carousel({
             top: this.history,
             bottom: this.bottomSuggester,

package/dist/carousel.js

@@ -63,8 +63,12 @@ class NullSuggester {
     }
     async init() { }
     async refreshSuggestions() { }
-    latest() { return []; }
-    descriptionForAi() { return ""; }
+    latest() {
+        return [];
+    }
+    descriptionForAi() {
+        return "";
+    }
 }
 exports.NullSuggester = NullSuggester;
 class Carousel {
@@ -149,10 +153,18 @@ class Carousel {
         return prefix;
     }
     getFormattedPromptRow(lineIndex, lineText, promptSelected) {
-        const { reset, dim } = terminal_1.colors;
+        const { reset, dimmest, dim } = terminal_1.colors;
         const color = promptSelected ? terminal_1.colors.purple : dim;
+        const separatorColor = promptSelected ? dim : dimmest;
         const prefix = this.getPromptPrefix(lineIndex);
-        return `${color}${prefix}${lineText}${reset}`;
+        // Color the separators differently from the prompt prefix
+        const formattedPrefix = prefix
+            .split("")
+            .map((char) => char === ":" || char === ">"
+            ? `${separatorColor}${char}${color}`
+            : char)
+            .join("");
+        return `${color}${formattedPrefix}${lineText}${reset}`;
     }
     getCurrentRow() {
         return this.getRow(this.index);

package/dist/config.js

@@ -40,7 +40,6 @@ exports.configFolder = configFolder;
 exports.getConfigPath = getConfigPath;
 exports.doesConfigExist = doesConfigExist;
 exports.getConfig = getConfig;
-exports.buildPromptLine0 = buildPromptLine0;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
@@ -114,35 +113,3 @@ function isGeminiUrl(url) {
     return (lower.includes("generativelanguage.googleapis.com") ||
         lower.includes("gemini"));
 }
-function normalizeCwd(cwd) {
-    const normalized = cwd.replace(/\\/g, "/");
-    const home = os.homedir().replace(/\\/g, "/");
-    if (normalized === home)
-        return "~";
-    if (normalized.startsWith(home + "/")) {
-        return "~" + normalized.slice(home.length);
-    }
-    return normalized;
-}
-function shortenPath(p) {
-    const parts = p.split("/");
-    return parts
-        .map((part, i) => {
-        if (i === parts.length - 1)
-            return part;
-        if (part === "" || part === "~")
-            return part;
-        return part[0];
-    })
-        .join("/");
-}
-function buildPromptLine0(config) {
-    return () => {
-        const normalized = normalizeCwd(process.cwd());
-        const template = config.prompt ?? "$> ";
-        return template
-            .replace(/\{hostname\}/g, os.hostname())
-            .replace(/\{directory\}/g, normalized)
-            .replace(/\{short-directory\}/g, shortenPath(normalized));
-    };
-}

package/dist/hello-new-user.js

@@ -43,6 +43,16 @@ const readline_1 = __importDefault(require("readline"));
 const ai_suggester_1 = require("./ai-suggester");
 const preferredModels = ["gemini-2.5-flash-lite", "gpt-4o-mini"];
 const defaultPromptTemplate = "$> ";
+const promptPresets = [
+    { key: "1", label: "Minimal", template: defaultPromptTemplate },
+    { key: "2", label: "Hostname", template: "{hostname} > " },
+    {
+        key: "3",
+        label: "Hostname + short path",
+        template: "{hostname}:{short-directory} > ",
+    },
+    { key: "4", label: "Path", template: "{directory} > " },
+];
 function serializeToml(obj) {
     const lines = [];
     const sections = [];
@@ -65,18 +75,28 @@ function serializeToml(obj) {
     return lines.join("\n");
 }
 async function askPromptConfig(prompter, logFn) {
-    logFn("Customize your shell prompt with plain text and tokens.");
-    logFn("Available tokens:");
+    logFn("Choose a shell prompt style.");
+    for (const preset of promptPresets) {
+        logFn(`  ${preset.key}. ${preset.label}: ${preset.template}`);
+    }
+    logFn("");
+    logFn("You can customize this later in the config file with these tokens:");
     logFn("  {hostname}");
+    logFn("  {user}");
     logFn("  {directory}");
     logFn("  {short-directory}");
     logFn(`Press Enter to keep the default prompt: ${defaultPromptTemplate}`);
-    const answer = await prompter.ask("Prompt template: ");
-    const trimmed = answer.trim();
-    if (!trimmed || trimmed === defaultPromptTemplate.trim()) {
-        return undefined;
+    while (true) {
+        const answer = (await prompter.ask("Prompt style [1-4]: ")).trim();
+        if (!answer || answer === "1") {
+            return undefined;
+        }
+        const preset = promptPresets.find((candidate) => candidate.key === answer);
+        if (preset) {
+            return preset.template;
+        }
+        logFn("Choose 1, 2, 3, or 4.");
     }
-    return answer;
 }
 function isInteractive() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);

package/dist/keyboard.js

@@ -6,41 +6,41 @@ const events_1 = require("events");
 // Map semantic key names to escape/control sequences
 const KEY_DEFINITIONS = {
     // Control keys
-    'ctrl-c': [{ sequence: '\u0003', ctrl: true }], // ^C
-    'ctrl-d': [{ sequence: '\u0004', ctrl: true }], // ^D
-    'ctrl-u': [{ sequence: '\u0015', ctrl: true }], // ^U
-    tab: [{ sequence: '\t' }],
-    enter: [{ sequence: '\r' }, { sequence: '\n' }],
-    backspace: [{ sequence: '\u007f' }, { sequence: '\u0008' }], // DEL, BS (Windows)
-    escape: [{ sequence: '\u001b' }],
+    "ctrl-c": [{ sequence: "\u0003", ctrl: true }], // ^C
+    "ctrl-d": [{ sequence: "\u0004", ctrl: true }], // ^D
+    "ctrl-u": [{ sequence: "\u0015", ctrl: true }], // ^U
+    tab: [{ sequence: "\t" }],
+    enter: [{ sequence: "\r" }, { sequence: "\n" }],
+    backspace: [{ sequence: "\u007f" }, { sequence: "\u0008" }], // DEL, BS (Windows)
+    escape: [{ sequence: "\u001b" }],
     // Arrows (ANSI)
-    up: [{ sequence: '\u001b[A' }],
-    down: [{ sequence: '\u001b[B' }],
-    right: [{ sequence: '\u001b[C' }],
-    left: [{ sequence: '\u001b[D' }],
-    'ctrl-right': [
-        { sequence: '\u001b[1;5C', ctrl: true },
-        { sequence: '\u001b[5C', ctrl: true },
+    up: [{ sequence: "\u001b[A" }],
+    down: [{ sequence: "\u001b[B" }],
+    right: [{ sequence: "\u001b[C" }],
+    left: [{ sequence: "\u001b[D" }],
+    "ctrl-right": [
+        { sequence: "\u001b[1;5C", ctrl: true },
+        { sequence: "\u001b[5C", ctrl: true },
         // Option/Alt-based word jumps (macOS/iTerm send meta-modified arrows or ESC+b/f)
-        { sequence: '\u001b[1;3C', meta: true },
-        { sequence: '\u001b[1;9C', meta: true },
-        { sequence: '\u001bf', meta: true },
+        { sequence: "\u001b[1;3C", meta: true },
+        { sequence: "\u001b[1;9C", meta: true },
+        { sequence: "\u001bf", meta: true },
     ],
-    'ctrl-left': [
-        { sequence: '\u001b[1;5D', ctrl: true },
-        { sequence: '\u001b[5D', ctrl: true },
+    "ctrl-left": [
+        { sequence: "\u001b[1;5D", ctrl: true },
+        { sequence: "\u001b[5D", ctrl: true },
         // Option/Alt-based word jumps (macOS/iTerm send meta-modified arrows or ESC+b/f)
-        { sequence: '\u001b[1;3D', meta: true },
-        { sequence: '\u001b[1;9D', meta: true },
-        { sequence: '\u001bb', meta: true },
+        { sequence: "\u001b[1;3D", meta: true },
+        { sequence: "\u001b[1;9D", meta: true },
+        { sequence: "\u001bb", meta: true },
     ],
     // Home/End/Delete variants
-    home: [{ sequence: '\u001b[H' }, { sequence: '\u001b[1~' }],
-    end: [{ sequence: '\u001b[F' }, { sequence: '\u001b[4~' }],
-    delete: [{ sequence: '\u001b[3~' }],
+    home: [{ sequence: "\u001b[H" }, { sequence: "\u001b[1~" }],
+    end: [{ sequence: "\u001b[F" }, { sequence: "\u001b[4~" }],
+    delete: [{ sequence: "\u001b[3~" }],
     // Focus in/out (sent by some terminals on focus change - swallow these)
-    'focus-in': [{ sequence: '\u001b[I' }],
-    'focus-out': [{ sequence: '\u001b[O' }],
+    "focus-in": [{ sequence: "\u001b[I" }],
+    "focus-out": [{ sequence: "\u001b[O" }],
 };
 exports.KEY_SEQUENCES = Object.fromEntries(Object.entries(KEY_DEFINITIONS).map(([name, defs]) => [
     name,
@@ -72,28 +72,28 @@ class Keyboard extends events_1.EventEmitter {
     constructor(stdin = process.stdin) {
         super();
         this.capturing = false;
-        this.buffer = '';
+        this.buffer = "";
         this.onData = (data) => this.handleData(data);
         this.stdin = stdin;
     }
     enableCapture() {
         if (this.capturing)
             return;
-        this.stdin.setEncoding('utf8');
+        this.stdin.setEncoding("utf8");
         if (this.stdin.isTTY)
             this.stdin.setRawMode(true);
-        this.stdin.on('data', this.onData);
+        this.stdin.on("data", this.onData);
         this.stdin.resume();
         this.capturing = true;
     }
     disableCapture() {
         if (!this.capturing)
             return;
-        this.stdin.off('data', this.onData);
+        this.stdin.off("data", this.onData);
         if (this.stdin.isTTY)
             this.stdin.setRawMode(false);
         this.stdin.pause();
-        this.buffer = '';
+        this.buffer = "";
         this.capturing = false;
     }
     handleData(data) {
@@ -104,27 +104,27 @@ class Keyboard extends events_1.EventEmitter {
         // Try to consume as many full key sequences as possible
         while (this.buffer.length > 0) {
             const evt = this.matchSequence(this.buffer);
-            if (evt === 'need-more')
+            if (evt === "need-more")
                 return; // wait for more bytes
             if (evt) {
                 // Swallow focus in/out sequences so they don't show up as visible chars
-                if (evt.name === 'focus-in' || evt.name === 'focus-out') {
+                if (evt.name === "focus-in" || evt.name === "focus-out") {
                     this.buffer = this.buffer.slice(evt.sequence.length);
                     continue;
                 }
-                this.emit('key', evt);
+                this.emit("key", evt);
                 this.buffer = this.buffer.slice(evt.sequence.length);
                 continue;
             }
             // No mapped sequence at buffer start; emit first char as 'char'
             const ch = this.buffer[0];
             const code = ch.charCodeAt(0);
-            if (code < 32 && ch !== '\t') {
+            if (code < 32 && ch !== "\t") {
                 // ignore other control chars
                 this.buffer = this.buffer.slice(1);
                 continue;
             }
-            this.emit('key', { name: 'char', sequence: ch });
+            this.emit("key", { name: "char", sequence: ch });
             this.buffer = this.buffer.slice(1);
         }
     }
@@ -149,7 +149,7 @@ class Keyboard extends events_1.EventEmitter {
             return matched;
         // If current buffer is a prefix to any known sequence, wait for more
         if (KEY_PREFIXES.has(buf))
-            return 'need-more';
+            return "need-more";
         // No sequence match
         return null;
     }

package/dist/main.js

@@ -9,6 +9,7 @@ const carousel_1 = require("./carousel");
 const hello_new_user_1 = require("./hello-new-user");
 const logs_1 = require("./logs");
 const config_1 = require("./config");
+const prompt_1 = require("./prompt");
 function shouldPrintVersion() {
     return process.argv.includes("--version");
 }
@@ -31,7 +32,7 @@ async function main() {
     const bottomPanel = config.apiUrl && config.apiKey && config.model
         ? new ai_suggester_1.AISuggester()
         : new carousel_1.NullSuggester();
-    const app = new app_1.App({ bottomPanel, promptLine0: (0, config_1.buildPromptLine0)(config) });
+    const app = new app_1.App({ bottomPanel, promptLine0: (0, prompt_1.buildPromptLine0)(config) });
     await app.run();
 }
 main().catch((err) => {

package/dist/prompt.js

@@ -0,0 +1,74 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildPromptLine0 = buildPromptLine0;
+const os = __importStar(require("os"));
+function normalizeCwd(cwd) {
+    const normalized = cwd.replace(/\\/g, "/");
+    const home = os.homedir().replace(/\\/g, "/");
+    if (normalized === home)
+        return "~";
+    if (normalized.startsWith(home + "/")) {
+        return "~" + normalized.slice(home.length);
+    }
+    return normalized;
+}
+function shortenPath(p) {
+    const parts = p.split("/");
+    return parts
+        .map((part, i) => {
+        if (i === parts.length - 1)
+            return part;
+        if (part === "" || part === "~")
+            return part;
+        return part[0];
+    })
+        .join("/");
+}
+function getCurrentUsername() {
+    return process.env.USERNAME || process.env.USER || os.userInfo().username;
+}
+function buildPromptLine0(config) {
+    return () => {
+        const normalized = normalizeCwd(process.cwd());
+        const username = getCurrentUsername();
+        const template = config.prompt ?? "$> ";
+        return template
+            .replace(/\{hostname\}/g, os.hostname())
+            .replace(/\{directory\}/g, normalized)
+            .replace(/\{short-directory\}/g, shortenPath(normalized))
+            .replace(/\{user\}/g, username);
+    };
+}

package/dist/terminal.js

@@ -22,8 +22,6 @@ class Terminal {
         this.cursorRow = 0;
         this.cursorCol = 0;
         this.writesDisabled = false;
-        this.pendingBlock = null;
-        this.renderScheduled = false;
     }
     disableWrites() {
         this.writesDisabled = true;
@@ -72,63 +70,47 @@ class Terminal {
     write(text) {
         if (!this.canWrite())
             return;
-        this.flushPendingRender();
         this.out.write(text);
     }
     hideCursor() {
-        this.write("\x1b[?25l");
+        if (!this.canWrite())
+            return;
+        this.out.write("\x1b[?25l");
     }
     showCursor() {
-        this.write("\x1b[?25h");
-    }
-    // Render a block of lines by clearing previous block (if any) and writing fresh
-    renderBlock(lines, cursorRow, cursorCol) {
         if (!this.canWrite())
             return;
-        this.pendingBlock = {
-            lines: [...lines],
-            cursorRow,
-            cursorCol,
-        };
-        if (this.renderScheduled)
-            return;
-        this.renderScheduled = true;
-        queueMicrotask(() => this.flushPendingRender());
+        this.out.write("\x1b[?25h");
     }
-    flushPendingRender() {
-        if (!this.pendingBlock) {
-            this.renderScheduled = false;
-            return;
-        }
-        const pending = this.pendingBlock;
-        this.pendingBlock = null;
-        this.renderScheduled = false;
+    // 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.hideCursor();
             this.moveCursorToTopOfBlock();
             if (this.activeRows > 0) {
                 readline_1.default.cursorTo(this.out, 0);
                 readline_1.default.clearScreenDown(this.out);
             }
-            for (let i = 0; i < pending.lines.length; i++) {
-                this.out.write(pending.lines[i]);
-                if (i < pending.lines.length - 1)
+            for (let i = 0; i < lines.length; i++) {
+                this.out.write(lines[i]);
+                if (i < lines.length - 1)
                     this.out.write("\n");
             }
-            this.activeRows = pending.lines.length;
+            this.activeRows = lines.length;
             this.cursorRow = Math.max(0, this.activeRows - 1);
-            const lastLine = pending.lines[this.cursorRow] || "";
+            const lastLine = lines[this.cursorRow] || "";
             this.cursorCol = lastLine.length;
-            const needsPosition = typeof pending.cursorRow === "number" ||
-                typeof pending.cursorCol === "number";
+            const needsPosition = typeof cursorRow === "number" || typeof cursorCol === "number";
             if (needsPosition) {
-                const targetRow = typeof pending.cursorRow === "number"
-                    ? Math.min(Math.max(pending.cursorRow, 0), Math.max(0, this.activeRows - 1))
+                const targetRow = typeof cursorRow === "number"
+                    ? Math.min(Math.max(cursorRow, 0), Math.max(0, this.activeRows - 1))
                     : this.cursorRow;
-                const targetCol = Math.max(0, pending.cursorCol ?? this.cursorCol);
+                const targetCol = Math.max(0, cursorCol ?? this.cursorCol);
                 this.moveCursorTo(targetRow, targetCol);
             }
+            this.showCursor();
         });
     }
     moveCursorTo(lineIndex, column) {
@@ -149,8 +131,6 @@ class Terminal {
     // When we have printed arbitrary output that is not managed by renderBlock,
     // reset internal line tracking so the next render starts fresh.
     resetBlockTracking() {
-        this.pendingBlock = null;
-        this.renderScheduled = false;
         this.activeRows = 0;
         this.cursorRow = 0;
         this.cursorCol = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caroushell",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Terminal carousel that suggests commands from history, config, and AI.",
   "type": "commonjs",
   "main": "dist/main.js",
@@ -18,7 +18,8 @@
     "prepare": "npm run build",
     "start": "node dist/main.js",
     "test": "node --import tsx --test tests/*.ts",
-    "test:generate": "tsx src/test-generate.ts",
+    "test:ai-generate": "tsx src/test-generate.ts",
+    "format": "prettier . --write",
     "lint": "eslint . --ext .ts",
     "release": "tsx scripts/release.ts"
   },
@@ -47,6 +48,7 @@
     "@typescript-eslint/eslint-plugin": "^8.46.4",
     "@typescript-eslint/parser": "^8.46.4",
     "eslint": "^9.39.1",
+    "prettier": "^3.8.1",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3"
   },