@xingjisoft/neutrino 0.1.4 → 0.1.5

package/dist/screens/history.js

@@ -1,6 +1,7 @@
 import { Screen } from "../terminal/screen.js";
 import { C } from "../colors.js";
-import { deleteSession, listSessions, loadSession } from "../config.js";
+import { deleteSession, listSessionsForCwd, loadSession } from "../config.js";
+import { ellipsizeStart } from "../width.js";
 import { drawHeader } from "../header.js";
 import { drawHint } from "../ui.js";
 const LIST_TOP = 5;
@@ -12,8 +13,11 @@ export class HistoryScreen extends Screen {
     lastHoverY = -1;
     rows = [];
     itemBounds = [];
+    cwd = process.cwd();
     onActivate() {
-        this.sessions = listSessions();
+        // Only sessions started in the current working directory are listed.
+        this.cwd = process.cwd();
+        this.sessions = listSessionsForCwd(this.cwd);
         this.selectedIdx = this.sessions.length > 0 ? 1 : 0;
         this.scrollTop = 0;
         this.rows = [];
@@ -104,7 +108,7 @@ export class HistoryScreen extends Screen {
         if (!session)
             return;
         deleteSession(session.id);
-        this.sessions = listSessions();
+        this.sessions = listSessionsForCwd(this.cwd);
         this.selectedIdx = Math.min(this.selectedIdx, this.sessions.length);
         this.app.render();
     }
@@ -120,8 +124,6 @@ export class HistoryScreen extends Screen {
             rows.push(`${created} | ${s.provider}/${s.model} (${s.intensity}) | ${s.message_count} msgs`);
             if (s.title)
                 rows.push(`    ${s.title}`);
-            if (s.cwd)
-                rows.push(`    ${s.cwd}`);
             itemBounds.push({ start, end: rows.length });
         }
         this.rows = rows;
@@ -132,7 +134,7 @@ export class HistoryScreen extends Screen {
         const w = buf.width;
         const h = buf.height;
         buf.centerText(2, "History", { fg: C.accent, bold: true });
-        buf.centerText(3, "Select a session to load", { fg: C.dim });
+        buf.centerText(3, `Sessions in ${ellipsizeStart(this.cwd, Math.max(8, w - 14))}`, { fg: C.dim });
         const listBottom = h - 2;
         const viewH = Math.max(1, listBottom - LIST_TOP);
         this.buildRows();
@@ -160,7 +162,7 @@ export class HistoryScreen extends Screen {
             buf.writeText(0, y, (prefix + row).slice(0, w), style);
         }
         if (this.sessions.length === 0) {
-            buf.centerText(LIST_TOP + 1, "No sessions yet", { fg: C.dim });
+            buf.centerText(LIST_TOP + 1, "No sessions in this directory", { fg: C.dim });
         }
         drawHint(buf, listBottom, "↑/↓ select  ·  Enter load  ·  click to load  ·  Delete delete  ·  right-click back  ·  Esc back");
     }

package/dist/screens/settings.js

@@ -1,38 +1,108 @@
 import { Screen } from "../terminal/screen.js";
 import { C } from "../colors.js";
-import { COMPRESS_THRESHOLD_OPTIONS, CONFIG_FILE, INTENSITY_LEVELS, loadConfig, saveConfig, } from "../config.js";
+import { CONTEXT_WINDOW_OPTIONS, DEFAULT_CONTEXT_WINDOW, contextWindow, CONFIG_FILE, INTENSITY_LEVELS, getModelsByProvider, loadConfig, loadModels, saveConfig, saveModels, } from "../config.js";
 import { drawHeader } from "../header.js";
 import { centerVertically, drawHint } from "../ui.js";
+import { hashWebPassword } from "../web/auth.js";
 /** The settings that can be changed here, top to bottom. */
-const ROWS = ["intensity", "compress"];
+const ROWS = ["intensity", "compress", "approval_model", "extreme_approval", "sound", "web_password"];
 export class SettingsScreen extends Screen {
     intensityIdx = 2;
-    thresholdIdx = 3;
+    contextTokens = DEFAULT_CONTEXT_WINDOW;
+    contextChanged = false;
+    /** 0 = same model as the chat, otherwise index + 1 into `models`. */
+    approvalModelIdx = 0;
+    /** 0 = off (human only), 1 = on (two independent assessments). */
+    extremeIdx = 0;
+    /** 0 = silent, 1 = audible cue on turn end and on approval requests. */
+    soundIdx = 1;
+    models = [];
     rowIdx = 0;
     lastHoverX = -1;
     lastHoverY = -1;
+    editingPassword = false;
+    passwordDraft = "";
+    passwordMessage = "Press Enter to change";
     onActivate() {
         const config = loadConfig();
         const current = String(config.default_intensity ?? "High");
         const i = INTENSITY_LEVELS.indexOf(current);
         this.intensityIdx = i >= 0 ? i : 2;
-        const threshold = Number(config.context_compress_threshold ?? 32000);
-        const t = COMPRESS_THRESHOLD_OPTIONS.findIndex((o) => o.value === threshold);
-        this.thresholdIdx = t >= 0 ? t : 3;
+        const state = this.app.state;
+        const model = getModelsByProvider()[state.selectedProvider]?.find((m) => m.name === state.selectedModelName);
+        this.contextTokens = contextWindow(model?.context_window);
+        this.contextChanged = false;
+        this.models = Object.values(getModelsByProvider()).flatMap((list) => list.map((m) => m.name));
+        const currentApproval = String(config.approval_model ?? "");
+        const approvalAt = currentApproval ? this.models.indexOf(currentApproval) : -1;
+        this.approvalModelIdx = approvalAt >= 0 ? approvalAt + 1 : 0;
+        this.extremeIdx = config.auto_approve_extreme_risk === true ? 1 : 0;
+        this.soundIdx = config.sound_alerts === false ? 0 : 1;
     }
     /** Change the value of a row by `delta` steps and persist it immediately. */
     cycle(row, delta) {
+        if (row === "web_password") {
+            this.editingPassword = true;
+            this.passwordDraft = "";
+            this.passwordMessage = "Type new password";
+            return;
+        }
         if (row === "intensity") {
             const n = INTENSITY_LEVELS.length;
             this.intensityIdx = (this.intensityIdx + delta + n) % n;
         }
+        else if (row === "approval_model") {
+            const n = this.models.length + 1;
+            this.approvalModelIdx = (this.approvalModelIdx + delta + n) % n;
+        }
+        else if (row === "extreme_approval") {
+            // A switch, not a list: any nudge flips it.
+            this.extremeIdx = this.extremeIdx === 1 ? 0 : 1;
+        }
+        else if (row === "sound") {
+            this.soundIdx = this.soundIdx === 1 ? 0 : 1;
+        }
         else {
-            const n = COMPRESS_THRESHOLD_OPTIONS.length;
-            this.thresholdIdx = (this.thresholdIdx + delta + n) % n;
+            const options = [...new Set([...CONTEXT_WINDOW_OPTIONS, this.contextTokens])].sort((a, b) => a - b);
+            const i = options.indexOf(this.contextTokens);
+            this.contextTokens = options[(i + delta + options.length) % options.length];
+            this.contextChanged = true;
         }
         this.save();
     }
     onKey(key) {
+        if (this.editingPassword) {
+            if (key.name === "escape") {
+                this.editingPassword = false;
+                this.passwordDraft = "";
+                this.passwordMessage = "Press Enter to change";
+            }
+            else if (key.name === "enter" || key.name === "return") {
+                try {
+                    const hash = hashWebPassword(this.passwordDraft);
+                    const config = loadConfig();
+                    config.web_password_hash = hash;
+                    saveConfig(config);
+                    this.editingPassword = false;
+                    this.passwordDraft = "";
+                    this.passwordMessage = "Saved permanently";
+                }
+                catch (error) {
+                    this.passwordMessage = error instanceof Error ? error.message : "Could not save password";
+                }
+            }
+            else if (key.name === "backspace") {
+                this.passwordDraft = Array.from(this.passwordDraft).slice(0, -1).join("");
+            }
+            else if (key.ctrl && key.name === "u") {
+                this.passwordDraft = "";
+            }
+            else if (key.char && !key.ctrl && !key.meta) {
+                this.passwordDraft = (this.passwordDraft + key.char).slice(0, 256);
+            }
+            this.app.render();
+            return;
+        }
         if (key.name === "up") {
             this.rowIdx = (this.rowIdx + ROWS.length - 1) % ROWS.length;
             this.app.render();
@@ -50,7 +120,10 @@ export class SettingsScreen extends Screen {
             this.app.render();
         }
         else if (key.name === "enter" || key.name === "return") {
-            this.save();
+            if (ROWS[this.rowIdx] === "web_password")
+                this.cycle("web_password", 1);
+            else
+                this.save();
             this.app.render();
         }
         else if (key.name === "escape") {
@@ -59,6 +132,8 @@ export class SettingsScreen extends Screen {
         }
     }
     onMouse(ev) {
+        if (this.editingPassword)
+            return;
         const layout = this.layout();
         if (!layout)
             return;
@@ -106,10 +181,38 @@ export class SettingsScreen extends Screen {
             }
         }
     }
+    onPaste(text) {
+        if (!this.editingPassword)
+            return;
+        this.passwordDraft = (this.passwordDraft + text).slice(0, 256);
+        this.app.render();
+    }
+    onDeactivate() {
+        this.passwordDraft = "";
+        this.editingPassword = false;
+    }
     rowTexts() {
         return [
             { label: "Default intensity", value: INTENSITY_LEVELS[this.intensityIdx] },
-            { label: "Auto-compress context", value: COMPRESS_THRESHOLD_OPTIONS[this.thresholdIdx].label },
+            { label: "Model context (80%)", value: `${this.contextTokens.toLocaleString("en-US")} tokens` },
+            {
+                label: "Approval reviewer model",
+                value: this.approvalModelIdx === 0 ? "Same as chat" : this.models[this.approvalModelIdx - 1] ?? "Same as chat",
+            },
+            {
+                label: "Extreme-risk auto-approval",
+                // Names the mechanism: three separate review rounds, not three reviewers
+                // sitting in one panel.
+                value: this.extremeIdx === 1 ? "On (3 separate rounds)" : "Off (human only)",
+            },
+            {
+                label: "Sound alerts",
+                value: this.soundIdx === 1 ? "On (turn end, approvals)" : "Off",
+            },
+            {
+                label: "Web password",
+                value: this.editingPassword ? "*".repeat(Math.min(this.passwordDraft.length, 24)) || "Type new password" : this.passwordMessage,
+            },
         ];
     }
     layout() {
@@ -128,7 +231,19 @@ export class SettingsScreen extends Screen {
     save() {
         const config = loadConfig();
         config.default_intensity = INTENSITY_LEVELS[this.intensityIdx];
-        config.context_compress_threshold = COMPRESS_THRESHOLD_OPTIONS[this.thresholdIdx].value;
+        if (this.contextChanged) {
+            const data = loadModels();
+            const state = this.app.state;
+            const model = data.providers.find((p) => p.name === state.selectedProvider)?.models.find((m) => m.name === state.selectedModelName);
+            if (model) {
+                model.context_window = this.contextTokens;
+                saveModels(data);
+            }
+            this.contextChanged = false;
+        }
+        config.approval_model = this.approvalModelIdx === 0 ? "" : this.models[this.approvalModelIdx - 1] ?? "";
+        config.auto_approve_extreme_risk = this.extremeIdx === 1;
+        config.sound_alerts = this.soundIdx === 1;
         saveConfig(config);
     }
     render(buf) {
@@ -149,7 +264,7 @@ export class SettingsScreen extends Screen {
             const selected = i === this.rowIdx;
             const marker = selected ? "▸ " : "  ";
             const label = rows[i].label.padEnd(labelW);
-            const value = selected ? `◂ ${rows[i].value} ▸` : rows[i].value;
+            const value = selected && ROWS[i] !== "web_password" ? `◂ ${rows[i].value} ▸` : rows[i].value;
             const text = marker + label + "   " + value;
             if (selected) {
                 buf.centerText(y, " " + text + " ", { fg: C.accent, bg: C.highlightBg, bold: true });
@@ -161,11 +276,13 @@ export class SettingsScreen extends Screen {
         }
         y += 1;
         if (y < h) {
-            buf.centerText(y, `config: ${CONFIG_FILE}`, { fg: C.dim });
+            buf.centerText(y, this.editingPassword ? this.passwordMessage : `config: ${CONFIG_FILE}`, { fg: C.dim });
             y += 1;
         }
         if (y < h) {
-            drawHint(buf, y, "↑/↓ select  ·  ←/→ change  ·  Enter apply  ·  right-click back  ·  Esc back");
+            drawHint(buf, y, this.editingPassword
+                ? "Type or paste password  ·  Enter save  ·  Esc cancel"
+                : "↑/↓ select  ·  ←/→ change  ·  Enter apply  ·  right-click back  ·  Esc back");
         }
     }
 }

package/dist/screens/start.js

@@ -1,21 +1,35 @@
 import { Screen } from "../terminal/screen.js";
 import { C } from "../colors.js";
-import { loadLogo, loadVersion } from "../config.js";
+import { loadLogo, loadVersion, loadConfig, saveConfig, normalizeApprovalMode } from "../config.js";
 import { drawHeader } from "../header.js";
-import { centerVertically, computeInputWindow, cursorFromColumn, drawHint, drawInputBox, drawTabButton, inRect, } from "../ui.js";
+import { centerVertically, computeInputWindow, cursorFromColumn, drawHint, drawInputBox, drawTabButton, inRect, approvalToggle, drawApprovalToggle, } from "../ui.js";
 const TABS = ["Model", "History", "Settings"];
 const LOGO = loadLogo();
-const FOCUS_COUNT = TABS.length + 1; // input box + 3 tabs
+const FOCUS_COUNT = TABS.length + 2; // input box + 3 tabs + approval mode
 const INPUT_H = 3;
 const TAB_H = 3;
 function isLowSurrogate(code) {
     return code >= 0xdc00 && code <= 0xdfff;
 }
 export class StartScreen extends Screen {
+    get approvalMode() {
+        return normalizeApprovalMode(loadConfig().approval_mode);
+    }
+    toggleApproval() {
+        const config = loadConfig();
+        config.approval_mode = this.approvalMode === "auto" ? "request" : "auto";
+        saveConfig(config);
+        this.app.render();
+    }
+    logoLines() {
+        const lines = LOGO.replace(/\n+$/, "").split("\n");
+        const count = Math.max(0, Math.min(lines.length, this.app.height - 13));
+        return count ? lines.slice(-count) : [];
+    }
     inputValue = "";
     cursor = 0;
-    focusIdx = 0; // 0 = input box, 1..3 = tabs
-    hoverIdx = -1; // -1 = nothing, 0 = input box, 1..3 = tabs
+    focusIdx = 0; // 0 = input box, 1..3 = tabs, 4 = approval mode
+    hoverIdx = -1; // -1 = nothing, otherwise the control index
     lastHoverX = -1;
     lastHoverY = -1;
     showsCursor() {
@@ -34,6 +48,10 @@ export class StartScreen extends Screen {
         this.app.render();
     }
     onKey(key) {
+        if (key.name === "tab") {
+            this.move(key.shift ? -1 : 1);
+            return;
+        }
         // When the input box is focused and holds text, left/right move the text
         // cursor instead of switching between the input box and the tabs. When the
         // input box is empty (or another control is focused), left/right switch.
@@ -61,6 +79,9 @@ export class StartScreen extends Screen {
                 if (text)
                     this.app.startNewChat(text);
             }
+            else if (this.focusIdx === FOCUS_COUNT - 1) {
+                this.toggleApproval();
+            }
             else {
                 this.enterTab();
             }
@@ -117,7 +138,10 @@ export class StartScreen extends Screen {
             this.lastHoverY = ev.y;
             const layout = this.layout();
             let hover = -1;
-            if (layout && inRect(ev.x, ev.y, { x: layout.inputX, y: layout.inputY, w: layout.inputW, h: INPUT_H })) {
+            if (inRect(ev.x, ev.y, approvalToggle(this.app.width, this.app.height - 4, this.approvalMode))) {
+                hover = FOCUS_COUNT - 1;
+            }
+            else if (layout && inRect(ev.x, ev.y, { x: layout.inputX, y: layout.inputY, w: layout.inputW, h: INPUT_H })) {
                 hover = 0;
             }
             else if (layout && ev.y >= layout.tabY && ev.y < layout.tabY + TAB_H) {
@@ -140,6 +164,11 @@ export class StartScreen extends Screen {
                 return;
             if (ev.button === 2)
                 return; // right click: no-op on start screen
+            if (ev.y >= 1 && inRect(ev.x, ev.y, approvalToggle(this.app.width, this.app.height - 4, this.approvalMode))) {
+                this.focusIdx = FOCUS_COUNT - 1;
+                this.toggleApproval();
+                return;
+            }
             if (ev.y === 0) {
                 this.app.openModelConfig();
                 return;
@@ -180,6 +209,8 @@ export class StartScreen extends Screen {
         for (let y = inputY; y <= tabY + TAB_H; y++)
             if (y >= 0 && y < h)
                 rows.push(y);
+        if (h - 4 >= 1)
+            rows.push(h - 4);
         return rows;
     }
     layout() {
@@ -187,10 +218,11 @@ export class StartScreen extends Screen {
         const h = this.app.height;
         const inputW = Math.min(78, w - 4);
         const inputX = Math.floor((w - inputW) / 2);
-        const logoLines = LOGO.replace(/\n+$/, "").split("\n");
+        const logoLines = this.logoLines();
         const gap = 1;
-        const contentH = logoLines.length + 1 + INPUT_H + gap + TAB_H;
-        const inputY = centerVertically(h, contentH) + logoLines.length + 1;
+        const logoGap = logoLines.length ? 1 : 0;
+        const contentH = logoLines.length + logoGap + INPUT_H + gap + TAB_H;
+        const inputY = centerVertically(h - 4, contentH) + logoLines.length + logoGap;
         const tabY = inputY + INPUT_H + gap;
         const tabGap = 2;
         const tabInner = inputW - tabGap * (TABS.length - 1);
@@ -242,18 +274,19 @@ export class StartScreen extends Screen {
         const h = buf.height;
         const inputW = Math.min(78, w - 4);
         const inputX = Math.floor((w - inputW) / 2);
-        const logoLines = LOGO.replace(/\n+$/, "").split("\n");
+        const logoLines = this.logoLines();
         const logoMax = logoLines.reduce((m, l) => Math.max(m, l.length), 0);
         const logoX = Math.max(0, Math.floor((w - logoMax) / 2));
         const gap = 1;
-        const contentH = logoLines.length + 1 + INPUT_H + gap + TAB_H;
-        const top = centerVertically(h, contentH);
+        const logoGap = logoLines.length ? 1 : 0;
+        const contentH = logoLines.length + logoGap + INPUT_H + gap + TAB_H;
+        const top = centerVertically(h - 4, contentH);
         let y = top;
         for (const line of logoLines) {
             buf.writeText(logoX, y, line, { fg: C.accent, bold: true });
             y++;
         }
-        y += 1;
+        y += logoGap;
         drawInputBox(buf, inputX, y, inputW, this.inputValue, this.cursor, {
             active: this.focusIdx === 0,
             cursorOn: this.app.state.cursorOn,
@@ -277,10 +310,10 @@ export class StartScreen extends Screen {
         const version = loadVersion();
         const versionY = h - 2;
         const showVersion = version.length > 0 && versionY >= 1;
-        // The hint sits right below the tabs, but is dropped when it would land on
-        // or below the reserved version row so the two never collide.
+        // Reserve the button row and the blank row between it and the version.
         const hintY = y + TAB_H + 1;
-        if (hintY < h && (!showVersion || hintY < versionY)) {
+        const approvalY = h - 4;
+        if (hintY < approvalY) {
             const nav = this.focusIdx === 0 && this.inputValue.length > 0
                 ? "←/→ move cursor · ↑/↓ switch"
                 : "←/→ / ↑/↓ switch";
@@ -289,5 +322,6 @@ export class StartScreen extends Screen {
         if (showVersion) {
             buf.centerText(versionY, `v${version}`, { fg: C.dim });
         }
+        drawApprovalToggle(buf, approvalY, this.approvalMode, this.focusIdx === FOCUS_COUNT - 1 || this.hoverIdx === FOCUS_COUNT - 1);
     }
 }

package/dist/state.js

@@ -9,6 +9,7 @@ export function defaultState() {
         isThinking: false,
         blinkOn: false,
         cursorOn: true,
+        approval: null,
         selection: null,
     };
 }

package/dist/terminal/input.js

@@ -54,9 +54,20 @@ export class InputReader {
         stdin.removeListener("data", this.dataHandler);
         if (this.escTimer)
             clearTimeout(this.escTimer);
-        if (stdin.isTTY)
-            stdin.setRawMode(false);
-        stdin.pause();
+        try {
+            if (stdin.isTTY)
+                stdin.setRawMode(false);
+        }
+        catch {
+            // The console already went away; leaving raw mode is best-effort here and
+            // failing must not abort the rest of the shutdown.
+        }
+        try {
+            stdin.pause();
+        }
+        catch {
+            // Same as above.
+        }
     }
     onData(chunk) {
         this.pending += this.decoder.decode(chunk, { stream: true });

package/dist/terminal/renderer.js

@@ -1,4 +1,5 @@
 import process from "node:process";
+import { restoreTerminalSync, markTuiActive } from "./restore.js";
 import { isControlChar } from "../sanitize.js";
 function styleKey(st) {
     let k = "";
@@ -44,6 +45,7 @@ function rowSignature(row) {
 }
 export class Renderer {
     prevSig = [];
+    disposed = false;
     prevW = 0;
     prevH = 0;
     out = process.stdout;
@@ -56,17 +58,21 @@ export class Renderer {
     lastBuf = null;
     lastForce = [];
     init() {
+        // Tell the crash guard the terminal is ours *before* touching it, so a
+        // crash that skips dispose() can still undo every switch below.
+        markTuiActive();
         this.write("\x1b[?1049h"); // alternate screen
         this.write("\x1b[?25l"); // hide cursor
         this.write("\x1b[?1000h\x1b[?1002h\x1b[?1003h\x1b[?1006h\x1b[?1015h"); // mouse tracking (incl. any-event for hover)
         this.write("\x1b[?2004h"); // bracketed paste (so pastes can be told apart from typing)
     }
     dispose() {
-        this.write("\x1b[?2004l");
-        this.write("\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l\x1b[?1015l");
-        this.write("\x1b[?25h");
-        this.write("\x1b[?1049l");
-        this.write("\x1b[0m");
+        if (this.disposed)
+            return;
+        this.disposed = true;
+        // stdout.write may still be queued when App.quit calls process.exit.
+        // Use the same synchronous teardown as the crash/exit guard.
+        restoreTerminalSync();
     }
     /**
      * @param forceRows rows to repaint unconditionally, even when their contents
@@ -92,6 +98,17 @@ export class Renderer {
             all.push(y);
         this.draw(this.lastBuf, all);
     }
+    /**
+     * Ring the terminal bell.
+     *
+     * Written straight to the stream rather than into a frame: BEL has no visual
+     * effect, so it cannot desync the diffed rows, and it must never end up in
+     * `lastBuf` where repaint() would replay it.
+     */
+    bell(times = 1) {
+        const count = Math.max(1, Math.trunc(times) || 1);
+        this.write("\x07".repeat(count));
+    }
     draw(buf, forceRows) {
         const w = buf.width;
         const h = buf.height;
@@ -140,6 +157,14 @@ export class Renderer {
         return s;
     }
     write(chunk) {
-        this.out.write(chunk);
+        if (this.disposed || this.out.destroyed || this.out.writableEnded)
+            return;
+        try {
+            this.out.write(chunk);
+        }
+        catch {
+            // A terminal that vanished (closed window, dying conhost) must not take
+            // the whole session down with it.
+        }
     }
 }