nou-cli 0.5.3 → 0.5.4

package/dist/src/ui/Chat.js

@@ -3,13 +3,23 @@ import { memo, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useAnimation, useInput } from "ink";
 import { statSync } from "fs";
 import path from "path";
-import { closeOpenMarkdown, linkAt, linkFileRefs, renderMarkdown, wrap } from "./text.js";
+import { closeOpenMarkdown, linkAt, linkFileRefs, linkUrls, renderMarkdown, wrap } from "./text.js";
 import { ChatInput, inputHeight } from "./ChatInput.js";
 import { copyToClipboard } from "./clipboard.js";
-import { C, SPINNER } from "./theme.js";
+import { C, SPINNER, ANIMATION_MS } from "./theme.js";
 import { Pane } from "./Pane.js";
 import { matchCommands } from "./commands.js";
 import { Scrollbar, topFor } from "./scroll.js";
+/**
+ * What the agent did between replies (files read, commands run...) folds into one line, like Claude's
+ * "▸ 5 steps": click it (or Ctrl+O for all of them) to see each step. `open` holds the runs shown open.
+ */
+function stepLines(steps, open, live, inner) {
+    const last = steps[steps.length - 1].text.replace(/\s+/g, " ");
+    const summary = `${open ? "▾" : "▸"} ${steps.length} steps${open ? "" : ` · ${live ? "now: " : "last: "}${last}`}`;
+    const head = { text: ` ${summary.length > inner - 4 ? `${summary.slice(0, inner - 5)}…` : summary}`, color: open ? C.accent2 : C.dim, lead: " ⚙", leadColor: C.dim, toggle: steps[0] };
+    return open ? [head, ...steps.flatMap((e) => cachedLines(e, inner).map((l) => (l.lead === " ⚙" ? { ...l, lead: "  " } : l)))] : [head];
+}
 const BAR = "▌ ";
 // Whether a path in a message is a file in the project, remembered so each one is checked once.
 const knownFiles = new Map();
@@ -54,7 +64,7 @@ function entryLines(entry, inner, links = true) {
             ? { icon: "⚙", color: C.dim }
             : entry.kind === "error" ? { icon: "✖", color: C.red } : { icon: "ℹ", color: C.accent };
         wrap(entry.text, inner - 4).forEach((line, i) => {
-            const spans = links && entry.kind !== "user" ? linkFileRefs([{ text: ` ${line}` }], isProjectFile) : [];
+            const spans = links && entry.kind !== "user" ? linkFileRefs(linkUrls([{ text: ` ${line}` }]), isProjectFile) : [];
             out.push({ text: ` ${line}`, color: style.color, lead: i === 0 ? ` ${style.icon}` : "  ", leadColor: style.color, ...(spans.some((sp) => sp.link) ? { spans } : {}) });
         });
     }
@@ -71,17 +81,67 @@ function cachedLines(entry, inner) {
     laidOut.set(entry, { inner, lines });
     return lines;
 }
+/**
+ * Where each tab sits in the chat's title row (columns from the pane's inner left edge), and the "+"
+ * that opens a new one: shared by the drawing and the clicks.
+ */
+export function chatTabZones(tabs) {
+    // One tab: just "Chat +", to leave the title row its room.
+    if (tabs.length === 1)
+        return { zones: [{ id: tabs[0].id, from: 3, to: 7 }], plus: 8, width: 9 };
+    let x = 3; // " ◆ "
+    const zones = tabs.map((t) => {
+        const w = tabText(t).length;
+        const zone = { id: t.id, from: x, to: x + w };
+        x += w + 1;
+        return zone;
+    });
+    return { zones, plus: x + 1, width: x + 3 };
+}
+const tabText = (t) => ` ${t.state === "busy" ? "● " : t.state === "waiting" ? "! " : ""}${t.label} `;
 const lineText = (line) => (line.spans ? line.spans.map((s) => s.text).join("") : line.text ?? "");
-export const Chat = memo(function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, scrollTo, prefill, extraCommands, onMenu, onSubmit, onAnswer, click, onOpenRef, select, queued = [] }) {
-    const [input, setInput] = useState("");
+export const Chat = memo(function Chat({ width, height, focused, entries, streaming, busy, approval, approvalNote, contextChip, wheel, scrollTo, prefill, extraCommands, onMenu, onSubmit, onAnswer, click, onOpenRef, select, tabs, queued = [] }) {
+    const [input, setInputText] = useState("");
+    // Whether the chat has the keyboard right now: a key handler from a render before focus moved away can
+    // still be attached for a moment (on a busy machine), and its keys belong to the pane that has focus.
+    const focusedNow = useRef(focused);
+    focusedNow.current = focused;
+    const [menuRow, setMenuRow] = useState(0);
+    /** A new input also puts the command menu back on its first row, in the same render. */
+    const setInput = (text) => {
+        setInputText(text);
+        setMenuRow(0);
+    };
     useEffect(() => {
         if (prefill)
             setInput(prefill.text);
     }, [prefill?.nonce]);
     const [scrollBack, setScrollBack] = useState(0);
-    const { frame } = useAnimation({ interval: 80, isActive: !!busy });
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!busy });
     const inner = width - 3; // minus the borders and the scrollbar
-    const history = useMemo(() => entries.flatMap((e) => cachedLines(e, inner)), [entries, inner]);
+    const [openSteps, setOpenSteps] = useState(new Set());
+    const [allOpen, setAllOpen] = useState(false);
+    const history = useMemo(() => {
+        const out = [];
+        for (let i = 0; i < entries.length;) {
+            if (entries[i].kind !== "tool") {
+                out.push(...cachedLines(entries[i], inner));
+                i++;
+                continue;
+            }
+            // A run of steps: one alone is shown as is, two or more fold into a line.
+            let j = i;
+            while (j < entries.length && entries[j].kind === "tool")
+                j++;
+            const steps = entries.slice(i, j);
+            if (steps.length === 1)
+                out.push(...cachedLines(steps[0], inner));
+            else
+                out.push(...stepLines(steps, allOpen || openSteps.has(steps[0]), !!busy && j === entries.length, inner));
+            i = j;
+        }
+        return out;
+    }, [entries, inner, openSteps, allOpen, !!busy]);
     const lines = useMemo(() => (streaming ? [...history, ...entryLines({ kind: "assistant", text: closeOpenMarkdown(streaming) }, inner, false)] : history), [history, streaming, inner]);
     // At the bottom, new output scrolls into view. Scrolled up to read, the view stays where it is
     // (counted from the bottom, so it moves up by however many lines arrived) until you scroll back down.
@@ -135,8 +195,6 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
     // Typing "/" opens a menu of commands with what each does; ↑↓ pick one, Tab completes, Enter runs it.
     const menuOpen = focused && !approval && input.startsWith("/") && !input.includes(" ") && !input.includes("\n");
     const matches = useMemo(() => (menuOpen ? matchCommands(input, extraCommands) : []), [menuOpen, input, extraCommands]);
-    const [menuRow, setMenuRow] = useState(0);
-    useEffect(() => setMenuRow(0), [input]);
     const showMenu = matches.length > 0;
     useEffect(() => onMenu?.(showMenu), [showMenu]);
     const menuRows = Math.min(matches.length, Math.max(1, Math.min(7, height - 12)));
@@ -164,6 +222,20 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         if (!click)
             return;
         const line = visible[click.row];
+        const run = line?.toggle;
+        if (run) {
+            setOpenSteps((open) => {
+                const next = new Set(open);
+                if (next.has(run) || allOpen)
+                    next.delete(run);
+                else
+                    next.add(run);
+                return next;
+            });
+            if (allOpen)
+                setAllOpen(false);
+            return;
+        }
         const ref = line?.spans ? linkAt(line.spans, click.col) : null;
         if (ref)
             onOpenRef?.(ref);
@@ -225,13 +297,19 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
         else if (typed && typed >= " ")
             setInput(typed); // printable, not a control key
     }, { isActive: focused && !!approval && !input });
-    useInput((_input, key) => {
+    useInput((input, key) => {
         if (key.pageUp || (key.upArrow && key.shift))
             setScrollBack((b) => Math.min(maxBack, Math.min(b, maxBack) + Math.max(1, rows - 2)));
         else if (key.pageDown || (key.downArrow && key.shift))
             setScrollBack((b) => Math.max(0, Math.min(b, maxBack) - Math.max(1, rows - 2)));
         else if (key.ctrl && key.home)
             setScrollBack(maxBack);
+        else if (key.ctrl && input === "o") {
+            // Open every run of steps, or fold them all (the ones opened by a click too).
+            setAllOpen(!allOpen);
+            if (allOpen)
+                setOpenSteps(new Set());
+        }
         else if (key.ctrl && key.end)
             setScrollBack(0);
     }, { isActive: focused });
@@ -262,19 +340,22 @@ export const Chat = memo(function Chat({ width, height, focused, entries, stream
                 ? line.spans.map((span, i) => (_jsx(Text, { bold: !!span.bold || !!line.bold, italic: !!span.italic, dimColor: !!span.dim && !span.link, underline: !!span.link, ...(span.link ? { color: C.cyan } : span.code ? { color: C.yellow } : line.color ? { color: line.color } : { color: C.text }), children: span.text }, i)))
                 : _jsx(Text, { bold: !!line.bold, dimColor: !!line.dim, ...(line.color ? { color: line.color } : {}), children: line.text || " " })] }, key));
     const empty = entries.length === 0 && !streaming;
-    const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.accent2, children: "\u25C6" }), " Chat", flash ? _jsxs(Text, { color: C.green, bold: true, children: ["  ", flash] }) : back
+    const title = (_jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.accent2, children: "\u25C6" }), " ", tabs && tabs.items.length > 1 ? (_jsxs(_Fragment, { children: [tabs.items.map((t) => (_jsxs(Text, { children: [_jsx(Text, { ...(t.id === tabs.active ? { backgroundColor: C.panel, color: C.text, bold: true } : { color: t.state === "waiting" ? C.yellow : C.dim }), children: tabText(t) }), " "] }, t.id))), _jsx(Text, { color: C.accent2, bold: true, children: " + " })] })) : _jsxs(_Fragment, { children: ["Chat", tabs ? _jsx(Text, { color: C.accent2, bold: true, children: " +" }) : null] }), flash ? _jsxs(Text, { color: C.green, bold: true, children: ["  ", flash] }) : back
                 ? unread
                     ? _jsxs(Text, { color: C.green, bold: true, children: ["  \u2193 ", unread, " new lines below", _jsx(Text, { color: C.dim, children: " \u00B7 PgDn / wheel / Ctrl+End" })] })
                     : _jsxs(Text, { color: C.yellow, children: ["  \u2191 scrolled ", back, " lines", _jsx(Text, { color: C.dim, children: " \u00B7 PgDn / wheel / Ctrl+End" })] })
                 : maxBack > 0 ? _jsx(Text, { color: C.dim, children: "  PgUp / wheel to scroll" }) : null] }));
-    return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: empty ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: C.dim, children: "Try:" }), _jsx(Text, { color: C.text, children: "  \u201Cexplain this file\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cwhat changed since my last commit?\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cadd error handling here\u201D" }), _jsx(Text, { children: " " }), _jsx(Text, { color: C.dim, children: "I can see the file you have open." })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { children: visible.map((line, i) => _jsx(Text, { color: line.leadColor ?? C.dim, children: `${line.lead ?? "  "}${i < visible.length - 1 ? "\n" : ""}` }, i)) }) }), _jsx(Box, { flexDirection: "column", width: inner - 2, flexShrink: 0, children: visible.map((line, i) => {
-                                        const range = selectedIn(firstShown + i);
-                                        if (!range)
-                                            return render(line, firstShown + i, false);
-                                        const t = lineText(line) || " ";
-                                        return (_jsxs(Text, { wrap: "truncate-end", color: C.text, children: [t.slice(0, range[0]), _jsx(Text, { inverse: true, children: t.slice(range[0], range[1]) || " " }), t.slice(range[1])] }, firstShown + i));
-                                    }) })] })) }), _jsx(Scrollbar, { total: lines.length, top: firstShown, rows: rows, focused: focused })] }), _jsx(Box, { flexDirection: "column", children: footer.map((line, i) => render(line, `f${i}`)) }), showMenu ? (_jsx(Box, { flexDirection: "column", children: matches.slice(menuStart, menuStart + menuRows).map((c, i) => {
+    // The messages, rebuilt only when they or the scroll position change: typing, the context chip and the
+    // spinner re-render the chat without touching its (often hundreds of) lines.
+    const messages = useMemo(() => (_jsx(_Fragment, { children: empty ? (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: C.dim, children: "Try:" }), _jsx(Text, { color: C.text, children: "  \u201Cexplain this file\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cwhat changed since my last commit?\u201D" }), _jsx(Text, { color: C.text, children: "  \u201Cadd error handling here\u201D" }), _jsx(Text, { children: " " }), _jsx(Text, { color: C.dim, children: "I can see the file you have open." })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 2, flexShrink: 0, children: _jsx(Text, { children: visible.map((line, i) => _jsx(Text, { color: line.leadColor ?? C.dim, children: `${line.lead ?? "  "}${i < visible.length - 1 ? "\n" : ""}` }, i)) }) }), _jsx(Box, { flexDirection: "column", width: inner - 2, flexShrink: 0, children: visible.map((line, i) => {
+                        const range = selectedIn(firstShown + i);
+                        if (!range)
+                            return render(line, firstShown + i, false);
+                        const t = lineText(line) || " ";
+                        return (_jsxs(Text, { wrap: "truncate-end", color: C.text, children: [t.slice(0, range[0]), _jsx(Text, { inverse: true, children: t.slice(range[0], range[1]) || " " }), t.slice(range[1])] }, firstShown + i));
+                    }) })] })) })), [lines, firstShown, visible.length, selection, inner, empty]);
+    return (_jsxs(Pane, { title: title, width: width, height: height, focused: focused, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: inner, flexShrink: 0, children: messages }), _jsx(Scrollbar, { total: lines.length, top: firstShown, rows: rows, focused: focused })] }), _jsx(Box, { flexDirection: "column", children: footer.map((line, i) => render(line, `f${i}`)) }), showMenu ? (_jsx(Box, { flexDirection: "column", children: matches.slice(menuStart, menuStart + menuRows).map((c, i) => {
                     const selected = menuStart + i === menuRow;
                     return (_jsxs(Text, { wrap: "truncate-end", ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▸" : " " }), _jsxs(Text, { color: selected ? C.accent : C.text, bold: selected, children: ["/", c.name] }), c.args && inner >= 56 ? _jsxs(Text, { color: C.dim, children: [" ", c.args] }) : null /* narrow: the description matters more */, _jsxs(Text, { color: C.dim, children: ["  ", c.description] })] }, c.name));
-                }) })) : (_jsx(Text, { wrap: "truncate-end", color: C.dim, children: contextChip ? _jsxs(_Fragment, { children: [_jsx(Text, { color: C.cyan, children: "@" }), " ", contextChip] }) : " " })), _jsx(Text, { color: focused ? C.accent : C.dim, children: "─".repeat(Math.max(0, inner + 1)) }), _jsx(ChatInput, { value: input, onChange: setInput, onSubmit: submit, focus: focused && !(approval && !input), width: inner + 1, history: sent, arrowsTaken: showMenu, placeholder: busy ? (inner >= 44 ? "Enter queues · Alt+Enter sends now · Esc stops" : "Enter queues · Esc stops") : showMenu ? "↑↓ choose · Tab complete · Enter run" : inner >= 44 ? "Ask anything · / for commands · ↑ history" : "Ask anything · / commands" })] }));
+                }) })) : (_jsx(Text, { wrap: "truncate-end", color: C.dim, children: contextChip ? _jsxs(_Fragment, { children: [_jsx(Text, { color: C.cyan, children: "@" }), " ", contextChip] }) : " " })), _jsx(Text, { color: focused ? C.accent : C.dim, children: "─".repeat(Math.max(0, inner + 1)) }), _jsx(ChatInput, { value: input, onChange: (text) => focusedNow.current && setInput(text), onSubmit: submit, focus: focused && !(approval && !input), width: inner + 1, history: sent, arrowsTaken: showMenu, placeholder: busy ? (inner >= 44 ? "Enter queues · Alt+Enter sends now · Esc stops" : "Enter queues · Esc stops") : showMenu ? "↑↓ choose · Tab complete · Enter run" : inner >= 44 ? "Ask anything · / for commands · ↑ history" : "Ask anything · / commands" })] }));
 });

package/dist/src/ui/Editor.js

@@ -1,4 +1,4 @@
-import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo, useEffect, useMemo, useRef, useState } from "react";
 import path from "path";
 import { Box, Text, useInput, usePaste } from "ink";
@@ -8,6 +8,7 @@ import { SEVERITY_STYLE } from "./ProblemsView.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
 import { copyToClipboard, readClipboard } from "./clipboard.js";
+import { guideProgress } from "../guide/index.js";
 const TAB = "  ";
 const expand = (s) => s.replace(/\t/g, TAB);
 /** Screen column of buffer column `col` on `line` (tabs take two cells). */
@@ -87,13 +88,24 @@ const LINE_COMMENTS = {
     ".toml": "#", ".r": "#", ".pl": "#", ".ex": "#", ".exs": "#", ".dockerfile": "#", ".sql": "--", ".lua": "--", ".hs": "--",
 };
 const commentFor = (file) => LINE_COMMENTS[path.extname(file).toLowerCase()] ?? (path.basename(file).toLowerCase() === "dockerfile" ? "#" : null);
+/** A line without the cursor or a selection: kept as is while you type on other lines. */
+const PlainRow = memo(function PlainRow({ num, numColor, text }) {
+    return _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { color: numColor, children: num }), text || " "] });
+});
 /** A text editor: arrows and the mouse to move, Shift to select, Ctrl+C/X/V clipboard, Ctrl+S save, Ctrl+Z undo, Esc leave. */
-export const Editor = memo(function Editor({ width, height, focused, filePath, initial, baseline, startLine, startCol, problems, autoSave, syntaxVersion, wheel, scrollTo, mouse, onSave, onExit, onState, onHover, onDefinition, tabs }) {
+export const Editor = memo(function Editor({ width, height, focused, filePath, initial, baseline, startLine, startCol, problems, autoSave, syntaxVersion, wheel, scrollTo, mouse, onSave, onExit, onState, onHover, onDefinition, tabs, guide, onGuideDone }) {
     const eol = useMemo(() => (baseline.includes("\r\n") ? "\r\n" : "\n"), [baseline]);
     const indentUnit = useMemo(() => (/^\t/m.test(initial) ? "\t" : "  "), [initial]);
     const comment = useMemo(() => commentFor(filePath), [filePath]);
     const [buf, setBuf] = useState(() => {
         const lines = initial.replace(/\r\n/g, "\n").split("\n");
+        if (guide) {
+            // A fresh line for the guided code, indented like its first line.
+            const row = Math.max(0, Math.min(lines.length, guide.row));
+            const indent = guide.code.match(/^[ \t]*/)[0];
+            lines.splice(row, 0, indent);
+            return { lines, row, col: indent.length, anchor: null };
+        }
         const row = Math.max(0, Math.min(lines.length - 1, (startLine ?? 1) - 1));
         const col = startCol ? Math.min(lines[row].length, startCol - 1) : lines[row].match(/^\s*/)[0].length;
         return { lines, row, col, anchor: null };
@@ -517,6 +529,12 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
             }
             return insert(`\n${indent}${opens ? indentUnit : ""}`);
         }
+        if (key.tab && !key.shift && !hasSelection && guide && ghost) {
+            // Guided: Tab types the rest of the line for you (and the next line's indentation).
+            const end = ghost.indexOf("\n");
+            const chunk = end < 0 ? ghost : ghost.slice(0, end + 1) + ghost.slice(end + 1).match(/^[ \t]*/)[0];
+            return insert(chunk);
+        }
         if (key.tab) {
             // With a selection, or Shift+Tab: indent or outdent whole lines.
             if (key.shift)
@@ -589,16 +607,32 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
         return map;
     }, [problems]);
     const sel = selection(buf);
+    // Guided typing: how much of the step's code is typed (from its line's start to the cursor).
+    const guideRow = guide ? Math.max(0, Math.min(buf.lines.length - 1, guide.row)) : -1;
+    const typed = guide && (buf.row > guideRow || (buf.row === guideRow)) ? [...buf.lines.slice(guideRow, buf.row), buf.lines[buf.row].slice(0, buf.col)].join("\n") : null;
+    const progress = guide && typed !== null ? guideProgress(typed, guide.code) : -1;
+    const ghost = guide && progress >= 0 ? guide.code.slice(progress) : "";
+    const guideDone = useRef(false);
+    useEffect(() => {
+        if (guide && progress === guide.code.length && !guideDone.current) {
+            guideDone.current = true;
+            onGuideDone?.();
+        }
+    }, [progress]);
     const cursorProblem = byLine.get(buf.row + 1)?.[0];
     const selectedCount = sel ? selectedText(buf).length : 0;
-    const status = confirmExit
+    const guideStatus = !guide ? null
+        : progress < 0 ? "Not quite: that doesn't match the step's code. Backspace and try again (the dim text shows what goes here)."
+            : ghost ? `Type the dim text${ghost.includes("\n") ? ` (${ghost.split("\n").length} lines to go)` : ""} · Tab fills in the rest of the line · Esc stop`
+                : "✓ Step done";
+    const status = guideStatus && !confirmExit && !prompt ? guideStatus : confirmExit
         ? "Unsaved changes! Ctrl+S save & close · Esc discard · any key keep editing"
         : prompt
             ? prompt.kind === "find" ? `Find: ${prompt.text}▏  Enter/↓ next · Shift+Enter/↑ previous · Esc close` : `Go to line: ${prompt.text}▏  Enter go · Esc cancel`
             : flash ?? (cursorProblem
                 ? `${SEVERITY_STYLE[cursorProblem.severity].icon} ${cursorProblem.message} (${cursorProblem.source})`
                 : `Ln ${buf.row + 1}, Col ${buf.col + 1}${sel ? `  (${selectedCount} selected · Ctrl+C copy · Ctrl+X cut)` : ""}${dirty ? "  ● modified" : ""}   Ctrl+F find · Ctrl+/ comment · Esc done`);
-    const statusColor = confirmExit ? C.red : prompt ? C.accent : flash ? C.green : cursorProblem ? SEVERITY_STYLE[cursorProblem.severity].color : C.dim;
+    const statusColor = guideStatus && !confirmExit && !prompt ? (progress < 0 ? C.red : C.accent2) : confirmExit ? C.red : prompt ? C.accent : flash ? C.green : cursorProblem ? SEVERITY_STYLE[cursorProblem.severity].color : C.dim;
     const hoverLines = hover ? hover.split("\n").filter((l) => l.trim()).slice(0, 6) : [];
     const cursorVisible = buf.row >= v.top && buf.row < v.top + rows;
     return (_jsxs(Pane, { title: _jsxs(_Fragment, { children: [tabs ?? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: color, children: icon }), " ", filePath, dirty ? _jsx(Text, { color: C.yellow, children: " \u25CF" }) : ""] }), "  ", _jsx(Text, { backgroundColor: C.green, color: "black", children: " \u270E EDITING " }), !cursorVisible ? _jsxs(Text, { color: C.dim, children: ["  cursor on line ", buf.row + 1, " \u00B7 \u2191\u2193 to go back"] }) : null] }), width: width, height: height, focused: focused, accent: C.green, children: [_jsxs(Box, { flexDirection: "row", height: rows, children: [_jsx(Box, { flexDirection: "column", width: width - 3, flexShrink: 0, children: visible.map((line, i) => {
@@ -609,7 +643,7 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                             const num = (_jsxs(Text, { color: mark?.color ?? (isCursorLine ? C.green : C.dim), children: [String(n + 1).padStart(gutter - 2), mark ? ` ${mark.icon}` : isCursorLine ? " ▸" : "  "] }));
                             const inSelection = sel && n >= sel.start.row && n <= sel.end.row;
                             if (!isCursorLine && !inSelection) {
-                                return _jsxs(Text, { wrap: "truncate-end", children: [num, colored[i] || " "] }, n);
+                                return _jsx(PlainRow, { num: `${String(n + 1).padStart(gutter - 2)}${mark ? ` ${mark.icon}` : "  "}`, numColor: mark?.color ?? C.dim, text: colored[i] ?? "" }, n);
                             }
                             // Lines with the cursor or a selection show plain text, so both can be drawn exactly.
                             const shown = expand(line).slice(v.left, v.left + textWidth);
@@ -626,8 +660,11 @@ export const Editor = memo(function Editor({ width, height, focused, filePath, i
                                 else
                                     cells.push(cell);
                             }
+                            // The code still to type, dim, from the cursor to the end of its line (only past the line's text).
+                            const ghostLine = isCursorLine && ghost && buf.col >= line.length ? ghost.split("\n")[0] : "";
+                            const ghostMore = isCursorLine && ghost && buf.col >= line.length ? ghost.split("\n").length - 1 : 0;
                             return (_jsxs(Text, { wrap: "truncate-end", children: [num, cells.map((c, j) => c.cursor
-                                        ? _jsx(Text, { inverse: true, color: C.green, children: c.text }, j)
-                                        : _jsx(Text, { color: C.text, ...(c.selected ? { backgroundColor: "#364a82" } : {}), children: c.text }, j))] }, n));
+                                        ? _jsx(Text, { inverse: true, color: C.green, children: ghostLine ? ghostLine[0] : c.text }, j)
+                                        : _jsx(Text, { color: C.text, ...(c.selected ? { backgroundColor: "#364a82" } : {}), children: c.text }, j)), ghostLine.length > 1 ? _jsx(Text, { color: C.dim, italic: true, children: expand(ghostLine.slice(1)) }) : null, ghostMore ? _jsxs(Text, { color: C.accent2, children: [ghostLine ? "  " : "", "\u23CE", ghostMore > 1 ? ` +${ghostMore - 1} line${ghostMore > 2 ? "s" : ""}` : ""] }) : null] }, n));
                         }) }), _jsx(Scrollbar, { total: buf.lines.length, top: v.top, rows: rows, focused: focused })] }), hoverLines.length > 0 && (_jsx(Box, { position: "absolute", top: Math.max(1, rows - hoverLines.length - 1), left: gutter + 1, flexDirection: "column", borderStyle: "round", borderColor: C.accent2, width: Math.min(width - gutter - 3, 2 + Math.max(...hoverLines.map((l) => l.length))), children: hoverLines.map((l, i) => _jsx(Text, { color: C.text, wrap: "truncate-end", children: l.padEnd(width) }, i)) })), _jsx(Text, { wrap: "truncate-end", color: statusColor, children: ` ${status}` })] }));
 });

package/dist/src/ui/FileTree.js

@@ -4,7 +4,7 @@ import { readdirSync } from "fs";
 import path from "path";
 import { Box, Text, useAnimation, useInput } from "ink";
 import { IGNORED } from "../commands/index.js";
-import { C, GIT_COLORS, fileIcon, gradient } from "./theme.js";
+import { C, GIT_COLORS, fileIcon, gradient, ANIMATION_MS } from "./theme.js";
 import { Pane } from "./Pane.js";
 import { Scrollbar, topFor } from "./scroll.js";
 function listDir(dir) {
@@ -167,7 +167,7 @@ export const FileTree = memo(function FileTree({ width, height, focused, openFil
         else
             onOpen(node.path);
     }, [click?.nonce]);
-    const { frame } = useAnimation({ interval: 120, isActive: !!working?.size });
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!working?.size });
     const inner = width - 3; // minus the borders and the scrollbar
     const title = changesOnly
         ? _jsxs(_Fragment, { children: [" ", _jsx(Text, { color: C.yellow, children: "\u00B1" }), " Changes ", _jsxs(Text, { color: C.dim, children: ["(", nodes.length, ")  c: all files"] })] })

package/dist/src/ui/GamePanel.js

@@ -81,7 +81,7 @@ export const GamePanel = memo(function GamePanel({ width, height, focused, movin
     }, { isActive: focused });
     const color = focused || moving ? C.accent2 : C.dim;
     const inner = width - 2;
-    const title = moving ? " ✦ Drop it on a pane: files, code or chat" : playing ? ` ✦ ${playing.game.title}  ⠿ drag to move` : " ✦ Games  ⠿ drag to move";
+    const title = moving ? " ✦ Drop it on a pane: files, code or chat" : `${playing ? ` ✦ ${playing.game.title}` : " ✦ Games"}  ⠿ drag to move · top edge resizes`;
     // The title row: the name and the drag handle, and × (close) at the right.
     const head = title.length > inner - 3 ? `${title.slice(0, inner - 4)}…` : title.padEnd(inner - 3);
     const hint = !focused ? "click to play" : playing ? (view?.over ? "Enter again · q games · Esc leave" : `${paused ? "PAUSED · " : ""}Space pause · q games · Esc leave`) : "↑↓ choose · Enter play · Esc leave";

package/dist/src/ui/Header.js

@@ -2,11 +2,11 @@ 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 { 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 });
+    const { frame } = useAnimation({ interval: ANIMATION_MS, isActive: !!busy });
     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,7 @@
 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 { Pane } from "./Pane.js";
 export const SEVERITY_STYLE = {
     error: { icon: "✖", color: C.red },
@@ -11,7 +11,7 @@ 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 { frame } = useAnimation({ interval: ANIMATION_MS, isActive: checking.length > 0 });
     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,7 +40,7 @@ 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 { frame } = useAnimation({ interval: ANIMATION_MS });
     const provider = providers[row] ?? providers[0];
     const listed = models[provider.id];
     // Load the model list for the highlighted provider.

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(["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,6 +28,11 @@ 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: "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" },

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;

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.4",
   "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": {