nou-cli 0.5.3 → 0.5.6

package/dist/src/ui/Header.js

@@ -2,11 +2,14 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { memo } from "react";
 import path from "path";
 import { Box, Text, useAnimation } from "ink";
-import { C, SPINNER, gradient } from "./theme.js";
+import { C, SPINNER, gradient, ANIMATION_MS } from "./theme.js";
+import { useTerminalFocused } from "./focus.js";
 import { currentVersion } from "../update/index.js";
 const VERSION = `v${currentVersion()}`;
 export const Header = memo(function Header({ width, branch, changes, model, local, busy, update }) {
-    const { frame } = useAnimation({ interval: 120, isActive: !!busy });
+    // The spinner stops while Nou's window is in the background: nobody sees it, and each frame is a redraw.
+    const windowFocused = useTerminalFocused();
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!busy && windowFocused });
     const project = path.basename(process.cwd());
     return (_jsxs(Box, { width: width, justifyContent: "space-between", children: [_jsx(Box, { flexShrink: 1, flexGrow: 1, overflow: "hidden", children: _jsxs(Text, { wrap: "truncate-end", children: [" ", gradient("◆ NOU", busy ? frame : 0).map((g, i) => _jsx(Text, { bold: true, color: g.color, children: g.ch }, i)), _jsxs(Text, { color: C.dim, children: [" ", VERSION] }), _jsx(Text, { color: C.dim, children: "  \u2502  " }), _jsx(Text, { color: C.text, children: project }), branch && (_jsxs(_Fragment, { children: [_jsx(Text, { color: C.dim, children: "  \u2502  " }), _jsxs(Text, { color: C.accent2, children: ["\u2387 ", branch] }), changes > 0 && _jsxs(Text, { color: C.yellow, children: [" \u00B1", changes] })] })), busy && _jsxs(Text, { color: C.accent2, children: ["  ", SPINNER[frame % SPINNER.length], " ", busy] })] }) }), _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate-end", children: [update && width >= 110 && _jsxs(Text, { color: C.green, bold: true, children: ["\u2B06 v", update, " available \u00B7 run `nou update`  "] }), _jsx(Text, { backgroundColor: local ? C.green : C.accent2, color: "black", bold: true, children: ` ${local ? "⌂ LOCAL" : "☁ CLOUD"} ` }), _jsx(Text, { backgroundColor: C.panel, color: C.text, children: ` ${model} ` }), " "] }) })] }));
 });

package/dist/src/ui/ProblemsView.js

@@ -1,7 +1,8 @@
 import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
-import { C, SPINNER, fileIcon } from "./theme.js";
+import { C, SPINNER, fileIcon, ANIMATION_MS } from "./theme.js";
+import { useTerminalFocused } from "./focus.js";
 import { Pane } from "./Pane.js";
 export const SEVERITY_STYLE = {
     error: { icon: "✖", color: C.red },
@@ -11,7 +12,8 @@ export const SEVERITY_STYLE = {
 export function ProblemsView({ width, height, focused, problems, checking, wheel, onJump, onClose }) {
     const [cursor, setCursor] = useState(0);
     const [onlyErrors, setOnlyErrors] = useState(false);
-    const { frame } = useAnimation({ interval: 80, isActive: checking.length > 0 });
+    const windowFocused = useTerminalFocused();
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: checking.length > 0 && windowFocused });
     const rows = useMemo(() => {
         const list = onlyErrors ? problems.filter((d) => d.severity === "error") : problems;
         const out = [];

package/dist/src/ui/Settings.js

@@ -11,7 +11,7 @@ import { PLUGIN_DIRS, isEnabled, trustState } from "../plugins/index.js";
 import { currentVersion } from "../update/index.js";
 import { describe, providers, rejectedKey } from "../providers/index.js";
 import { ENGINES, isInstalled } from "../engines/index.js";
-import { C, SPINNER } from "./theme.js";
+import { C, SPINNER, ANIMATION_MS } from "./theme.js";
 /** A few lines of code to show what a code theme looks like. */
 const THEME_PREVIEW = `// Greets someone, politely
 export function greet(name: string, times = 2): string {
@@ -40,9 +40,11 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
     const [models, setModels] = useState({});
     const [connecting, setConnecting] = useState(connectTo?.connect ? { step: 0, values: {} } : null);
     const [field, setField] = useState(() => (connectTo?.connect ? initialValue(connectTo.connect[0]) : ""));
-    const { frame } = useAnimation({ interval: 80 });
     const provider = providers[row] ?? providers[0];
     const listed = models[provider.id];
+    // Only "loading models…" animates; a timer running the whole time settings is open would redraw it 10
+    // times a second for nothing.
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: listed === "loading" });
     // Load the model list for the highlighted provider.
     useEffect(() => {
         if (tab !== "Model" || connecting || provider.unavailable() || models[provider.id])
@@ -190,6 +192,11 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
             used += cost(--first);
         return { first, last };
     })();
+    const gameWindow = (() => {
+        const fit = Math.max(1, Math.floor((boxHeight - 4) / 3));
+        const first = Math.max(0, Math.min((tab === "Games" ? row : 0) - fit + 1, GAMES.length - fit));
+        return { first, last: first + fit };
+    })();
     const toggle = (on, warn) => (_jsx(Text, { color: on ? (warn ? C.orange : C.green) : C.dim, bold: true, children: on ? "● ON " : "○ OFF" }));
     const body = () => {
         if (tab === "Model") {
@@ -252,7 +259,7 @@ export function Settings({ width, height, settings, choice, plugins, connectTo,
                     }), prefWindow.last < PREFS.length ? _jsxs(Text, { color: C.dim, children: ["  \u2193 ", PREFS.length - prefWindow.last, " more"] }) : null] }));
         }
         if (tab === "Games") {
-            return (_jsxs(Box, { flexDirection: "column", height: boxHeight, borderStyle: "round", borderColor: C.accent, paddingX: 1, children: [_jsx(Text, { color: C.dim, children: "Little games for a break while Nou works. Added ones show in the Games panel: /games, or ? then \"games\"." }), _jsx(Text, { children: " " }), GAMES.map((g, i) => {
+            return (_jsxs(Box, { flexDirection: "column", height: boxHeight, borderStyle: "round", borderColor: C.accent, paddingX: 1, children: [_jsx(Text, { color: C.dim, wrap: "truncate-end", children: "Little games for a break while Nou works. Added ones show in the Games panel: /games." }), _jsx(Text, { children: " " }), GAMES.map((g, i) => ({ g, i })).slice(gameWindow.first, gameWindow.last).map(({ g, i }) => {
                         const selected = i === row;
                         const added = settings.games.includes(g.id);
                         return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸ " : "  " }), added ? _jsx(Text, { color: C.green, bold: true, children: "\u2713 ADDED" }) : _jsx(Text, { color: C.accent2, bold: true, children: "\u2B07 GET  " }), _jsxs(Text, { color: C.text, bold: true, children: [" ", g.title] }), _jsxs(Text, { color: C.dim, children: ["  ", g.controls] })] }), _jsxs(Text, { color: C.dim, wrap: "truncate-end", children: ["    ", g.blurb] })] }, g.id));

package/dist/src/ui/Terminal.js

@@ -6,8 +6,9 @@ const COLORS = { out: C.text, command: C.accent, info: C.dim, error: C.red };
 /**
  * The terminal panel, under the code like VS Code's: type a command and Enter runs it. While one runs,
  * what you type goes to it; Ctrl+C stops it. ↑↓ go through what you ran, Ctrl+L clears, Esc leaves.
+ * Drag its top border (or Alt+↑/↓) to make it taller or shorter.
  */
-export const Terminal = memo(function Terminal({ shell, version, width, height, focused, wheel, onLeave }) {
+export const Terminal = memo(function Terminal({ shell, version, width, height, focused, wheel, onLeave, onResize }) {
     const [input, setInput] = useState("");
     const [history, setHistory] = useState([]);
     const [back, setBack] = useState(-1);
@@ -57,6 +58,8 @@ export const Terminal = memo(function Terminal({ shell, version, width, height,
             setBack(-1);
             return;
         }
+        if (key.meta && (key.upArrow || key.downArrow))
+            return onResize(key.upArrow ? 2 : -2);
         if (key.upArrow || key.downArrow) {
             if (!history.length)
                 return;
@@ -79,6 +82,6 @@ export const Terminal = memo(function Terminal({ shell, version, width, height,
             setInput((v) => v + typed.replace(/[\r\n]+/g, " "));
     }, { isActive: focused });
     const color = focused ? C.accent : C.dim;
-    const title = ` ▸ Terminal${shell.running ? "  ● running · Ctrl+C stops" : ""}${at ? `  ↑ ${at} lines` : ""}`;
+    const title = ` ▸ Terminal${shell.running ? "  ● running · Ctrl+C stops" : ""}${at ? `  ↑ ${at} lines` : ""}${focused && !shell.running && !at ? "  ⇕ drag this edge or Alt+↑↓ to resize" : ""}`;
     return (_jsxs(Box, { width: width, height: height, flexDirection: "column", borderStyle: focused ? "round" : "single", borderColor: color, overflow: "hidden", children: [_jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: color, bold: true, children: title.slice(0, inner - 3).padEnd(inner - 3) }), _jsx(Text, { color: C.text, bold: true, children: " \u00D7 " })] }), _jsx(Box, { flexDirection: "column", height: outRows, flexShrink: 0, children: shown.map((l, i) => _jsx(Text, { color: l.color, wrap: "truncate-end", children: l.text }, i)) }), _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { color: shell.running ? C.yellow : C.green, children: promptText }), _jsx(Text, { color: C.text, children: input }), focused ? _jsx(Text, { inverse: true, children: " " }) : null] })] }));
 });

package/dist/src/ui/clipboard.js

@@ -59,3 +59,22 @@ export async function readClipboard() {
     }
     return null;
 }
+/** Opens a web address in the default browser (the terminal's own link handling can't: Nou has the mouse). */
+export function openInBrowser(url) {
+    if (!/^https?:\/\//.test(url))
+        return false;
+    if (process.env.NOU_TEST_OPEN)
+        return (globalThis.__opened = url), true; // tests: note it, open nothing
+    const [cmd, args] = process.platform === "darwin" ? ["open", [url]]
+        : process.platform === "win32" ? ["cmd", ["/c", "start", "", url.replace(/&/g, "^&")]]
+            : ["xdg-open", [url]];
+    try {
+        const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+        child.on("error", () => { });
+        child.unref();
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/src/ui/commands.js

@@ -1,3 +1,15 @@
+/**
+ * Commands that only change what's on screen (or handle a busy Nou themselves): they run right away
+ * while Nou works instead of waiting in the queue behind it.
+ */
+const INSTANT = new Set(["fold", "unfold", "redraw", "new", "tab", "close", "terminal", "games", "open", "settings", "auto", "diff", "sessions", "history", "problems", "copy", "help", "version", "cancel"]);
+/** Whether a typed command runs right away while Nou works (see INSTANT); `/showme` counts only to look or step. */
+export function runsWhileBusy(text) {
+    const [name, ...rest] = text.slice(1).trim().split(/\s+/);
+    if (name === "showme" || name === "teach")
+        return !rest.length || /^(next|skip|stop|end)$/.test(rest.join(" "));
+    return text.startsWith("/") && INSTANT.has(name ?? "");
+}
 export const SLASH_COMMANDS = [
     { name: "model", args: "[provider:model]", description: "show or switch the model" },
     { name: "models", args: "[provider]", description: "list the models a provider offers" },
@@ -16,12 +28,20 @@ export const SLASH_COMMANDS = [
     { name: "copy", args: "[code|file]", description: "copy the last reply, its last code block, or the open file" },
     { name: "compact", description: "summarize the conversation to free up context" },
     { name: "clear", description: "start a fresh conversation" },
+    { name: "showme", args: "<what you want>", description: "Nou shows you how, step by step, and you type it (with the code shown ahead of your cursor)" },
+    { name: "teach", args: "<what you want>", description: "same as /showme: Nou teaches you to make the change yourself, step by step" },
+    { name: "new", description: "a new conversation tab: another agent, working alongside this one" },
+    { name: "tab", args: "[n]", description: "list the conversation tabs, or switch to tab n" },
+    { name: "close", description: "close this conversation tab (it stays saved for /resume)" },
+    { name: "fold", description: "fold every function and block in the open file to its first line (z toggles)" },
+    { name: "unfold", description: "open every fold in the open file" },
+    { name: "redraw", description: "draw the whole screen again (Ctrl+L), if it ever looks shifted or clicks land a row off" },
     { name: "terminal", description: "a terminal under the code, like VS Code's (or press `)" },
     { name: "resume", args: "[number|last]", description: "pick up an earlier conversation in this folder (any engine)" },
     { name: "pull", args: "<model>", description: "download an Ollama model" },
     { name: "plugins", args: "[add|new <name>]", description: "your plugins and the starter ones" },
     { name: "mcp", args: "[add|remove|import]", description: "MCP servers: tools from other programs (/mcp add browser for a browser)" },
-    { name: "games", description: "open or close the Games panel (Pong, Snake, Breakout)" },
+    { name: "games", description: "open or close the Games panel (Pong, Snake, Breakout, Dodge, Hop, Pairs)" },
     { name: "version", description: "which version of Nou this is" },
     { name: "help", description: "all commands and keys" },
 ];

package/dist/src/ui/focus.js

@@ -0,0 +1,59 @@
+import { useEffect, useSyncExternalStore } from "react";
+import { useStdin } from "ink";
+/**
+ * Whether Nou's terminal window is the one in front. Terminals that report focus (xterm's mode 1004:
+ * iTerm2, Terminal.app, kitty, Ghostty, WezTerm, Windows Terminal, VS Code's, tmux with focus-events on)
+ * send ESC [ I and ESC [ O as you switch windows; Nou then stops its spinners and git polling while you're
+ * elsewhere, so it doesn't keep the CPU (and the terminal's redraws) busy for something nobody is watching.
+ * Terminals that don't report it never send either, and Nou stays "focused" as before.
+ */
+let focused = true;
+const listeners = new Set();
+export function setTerminalFocused(next) {
+    if (next === focused)
+        return;
+    focused = next;
+    for (const listener of listeners)
+        listener();
+}
+export const terminalFocused = () => focused;
+export function onTerminalFocus(listener) {
+    listeners.add(listener);
+    return () => listeners.delete(listener);
+}
+export function useTerminalFocused() {
+    return useSyncExternalStore(onTerminalFocus, terminalFocused, terminalFocused);
+}
+/** The last focus report in a chunk of terminal input, if there is one. Ink ignores these, so they're never typed. */
+export function parseFocus(chunk) {
+    const at = Math.max(chunk.lastIndexOf("\x1b[I"), chunk.lastIndexOf("\x1b[O"));
+    return at < 0 ? null : chunk[at + 2] === "I";
+}
+const ENABLE = "\x1b[?1004h";
+const DISABLE = "\x1b[?1004l";
+let exitHookInstalled = false;
+/** Asks the terminal to report focus while mounted, and keeps `useTerminalFocused` up to date. */
+export function useFocusReporting(enabled) {
+    const { stdin } = useStdin();
+    useEffect(() => {
+        if (!enabled || !stdin)
+            return;
+        const terminal = process.stdout.isTTY ? process.stdout : null;
+        terminal?.write(ENABLE);
+        if (terminal && !exitHookInstalled) {
+            process.on("exit", () => process.stdout.write(DISABLE));
+            exitHookInstalled = true;
+        }
+        const onData = (data) => {
+            const next = parseFocus(String(data));
+            if (next !== null)
+                setTerminalFocused(next);
+        };
+        stdin.on("data", onData);
+        return () => {
+            stdin.off("data", onData);
+            terminal?.write(DISABLE);
+            setTerminalFocused(true);
+        };
+    }, [enabled, stdin]);
+}

package/dist/src/ui/redraw.js

@@ -0,0 +1,16 @@
+/**
+ * A full repaint: the app normally rewrites only the lines that changed, so if anything outside it ever
+ * wrote to the terminal, the screen would stay shifted (clicks landing a row off) until something forces
+ * every line out again. The CLI hands over Ink's clear here; /redraw and Ctrl+L call it.
+ */
+let clearScreen = null;
+export function setScreenClear(fn) {
+    clearScreen = fn;
+}
+/** Forgets what's on screen, so the next frame is drawn in full; false where there's no terminal (tests). */
+export function forgetScreen() {
+    if (!clearScreen)
+        return false;
+    clearScreen();
+    return true;
+}

package/dist/src/ui/render-options.js

@@ -8,6 +8,9 @@ export const RENDER_OPTIONS = {
     incrementalRendering: true,
     // Up to 60 frames a second, so scrolling and typing keep up with the keyboard and mouse.
     maxFps: 60,
+    // Library output goes to ~/.nou/nou.log instead (see cli.ts): Ink's console patch would print it into
+    // the full-screen app, scrolling it so clicks land a row off.
+    patchConsole: false,
     // Terminals that speak the kitty keyboard protocol (kitty, Ghostty, WezTerm, iTerm2, foot...) then tell
     // Enter from Ctrl+Enter, Cmd+Enter and Shift+Enter, so those can add a line in the chat. Others just
     // don't answer the query and keys work as before.

package/dist/src/ui/text.js

@@ -140,9 +140,11 @@ export function inlineSpans(text, base = { text: "" }) {
         else if (m[5] !== undefined || m[6] !== undefined)
             out.push(...inlineSpans(m[5] ?? m[6], { ...base, italic: true }));
         else {
-            out.push(...inlineSpans(m[7], base));
+            // [text](https://...) links to the page; [text](file) is left for the file links.
+            const web = /^https?:\/\//.test(m[8]) ? { ...base, link: { path: "", url: m[8] } } : base;
+            out.push(...inlineSpans(m[7], web));
             if (m[8] !== m[7])
-                out.push({ ...base, text: ` (${m[8]})`, dim: true });
+                out.push({ ...web, text: ` (${m[8]})`, dim: true });
         }
         pos = m.index + m[0].length;
     }
@@ -203,7 +205,8 @@ const cells = (row) => row.trim().replace(/^\|/, "").replace(/\|$/, "").split("|
 /** Renders markdown for the terminal: headings, lists, quotes, code blocks, tables and inline styles, wrapped to `width`. */
 export function renderMarkdown(text, width, isFile) {
     // File references become links before wrapping, so a long path that wraps is still one link.
-    const spansOf = (line, base) => (isFile ? linkFileRefs(inlineSpans(line, base), isFile) : inlineSpans(line, base));
+    // Web addresses first, so a file name inside a URL stays part of the URL.
+    const spansOf = (line, base) => (isFile ? linkFileRefs(linkUrls(inlineSpans(line, base)), isFile) : linkUrls(inlineSpans(line, base)));
     const out = [];
     const src = splitLines(text);
     let fence = null;
@@ -291,6 +294,10 @@ const FILE_REF = /(?<![\w/\\.@~-])((?:[A-Za-z]:[\\/]|\.{0,2}[\\/])?(?:[\w@.~+-]+
 export function linkFileRefs(spans, isFile) {
     const out = [];
     for (const span of spans) {
+        if (span.link) {
+            out.push(span);
+            continue;
+        }
         let pos = 0;
         for (const m of span.text.matchAll(FILE_REF)) {
             const file = m[1].replace(/^\.[\\/]/, "");
@@ -311,6 +318,27 @@ export function linkFileRefs(spans, isFile) {
     }
     return out;
 }
+const URL_RE = /\bhttps?:\/\/[^\s<>()"'`]+[^\s<>()"'`.,;:!?]/g;
+/** Splits out web addresses (http:// and https://) as link spans, keeping each span's style. */
+export function linkUrls(spans) {
+    const out = [];
+    for (const span of spans) {
+        if (span.link || span.code || !span.text.includes("http")) {
+            out.push(span);
+            continue;
+        }
+        let pos = 0;
+        for (const m of span.text.matchAll(URL_RE)) {
+            if (m.index > pos)
+                out.push({ ...span, text: span.text.slice(pos, m.index) });
+            out.push({ ...span, text: m[0], link: { path: "", url: m[0] } });
+            pos = m.index + m[0].length;
+        }
+        if (pos < span.text.length)
+            out.push(pos ? { ...span, text: span.text.slice(pos) } : span);
+    }
+    return out;
+}
 /** The link at column `col` of a line of spans, if any. */
 export function linkAt(spans, col) {
     let x = 0;
@@ -385,3 +413,48 @@ export function closeOpenMarkdown(text) {
         out += "**";
     return out;
 }
+/**
+ * Regions that can fold, from indentation (like VS Code without a language server): a line followed by
+ * more-indented lines folds them, and the closing bracket that ends the block. 1-based line -> last line.
+ */
+export function foldRanges(text) {
+    const lines = text.replace(/\r\n/g, "\n").split("\n");
+    const indent = (s) => s.match(/^[ \t]*/)[0].replace(/\t/g, "  ").length;
+    const blank = (s) => !s.trim();
+    const out = new Map();
+    for (let i = 0; i < lines.length; i++) {
+        if (blank(lines[i]))
+            continue;
+        const base = indent(lines[i]);
+        let j = i + 1;
+        while (j < lines.length && blank(lines[j]))
+            j++;
+        if (j >= lines.length || indent(lines[j]) <= base)
+            continue;
+        let end = j;
+        for (let k = j; k < lines.length; k++) {
+            if (blank(lines[k]))
+                continue;
+            if (indent(lines[k]) <= base)
+                break;
+            end = k;
+        }
+        // The line that closes the block (`}`, `)`, `]`, `end`...) folds with it.
+        const next = end + 1;
+        if (next < lines.length && indent(lines[next]) === base && /^\s*([}\])]|end\b|<\/)/.test(lines[next]))
+            end = next;
+        if (end > i)
+            out.set(i + 1, end + 1);
+    }
+    return out;
+}
+/** The file lines (1-based) left showing with `folded` regions (start lines) closed. */
+export function unfoldedLines(count, ranges, folded) {
+    const out = [];
+    for (let n = 1; n <= count; n++) {
+        out.push(n);
+        if (folded.has(n) && ranges.has(n))
+            n = ranges.get(n);
+    }
+    return out;
+}

package/dist/src/ui/theme.js

@@ -12,6 +12,8 @@ export const C = {
     dim: "#565f89",
     panel: "#1f2335",
 };
+/** Every spinner and shimmer ticks on this one interval, so they redraw together in a single frame. */
+export const ANIMATION_MS = 100;
 export const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 const GRADIENT = [C.accent, "#8c9cf7", C.accent2, "#c39af2", "#e08ad6", C.red, C.orange, C.yellow, C.green, C.cyan];
 /** Colors for each character of a label, shifted by `frame` so it shimmers when animated. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.5.3",
+  "version": "0.5.6",
   "description": "Nou: an IDE-style AI coding assistant for your terminal. Local (Ollama, LM Studio) and cloud (Claude, OpenAI, Gemini...) models, live diffs, git-aware, built-in editor.",
   "type": "module",
   "bin": {