nou-cli 0.5.20 → 0.5.21

package/README.md

@@ -69,8 +69,7 @@ Needs **Node 22.12+** and an interactive terminal (Windows Terminal, PowerShell,
 | 🎚️ **Speed vs smarts** | Pick how hard the model thinks in plain words: **Fastest** and **Fast** (cheaper + faster), **Balanced** (the default), **Smarter** and **Smartest** (thinks longer, costs more). In <kbd>s</kbd> settings, or `/effort smarter`. |
 | 🛞 **Pick your agent** | Nou's own, or Claude Code, Codex or pi, switchable like models, with the same diffs, approvals and undo. |
 | 🧩 **Plugins** | Add your own tools and slash commands with a single file. |
-| 🔎 **Quick open** | <kbd>Ctrl</kbd>+<kbd>P</kbd> (or `/files`) fuzzy-finds any file; <kbd>?</kbd> (or `/actions`) lists every action. |
-| 🔍 **Search every file** | `/search <text>` (or <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd> in terminals that report it) finds the text in every file as you type, each line as `file:line` with the match highlighted; <kbd>Enter</kbd> opens that line. Lowercase ignores case; a capital letter matches case exactly. |
+| 🔎 **Quick open and search** | <kbd>Ctrl</kbd>+<kbd>P</kbd> (or `/files`) finds a file by name; <kbd>Tab</kbd> switches the same popup to searching the text inside every file (and back), keeping what you typed: each line as `file:line` with the match highlighted, <kbd>Enter</kbd> opens it. `/search <text>` (or <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd> where the terminal reports it) opens it straight on searching inside. Lowercase ignores case; a capital matches case exactly. <kbd>?</kbd> (or `/actions`) lists every action. |
 | 🔋 **Easy on your battery** | Idle, Nou uses next to no CPU. When its window is in the background (in terminals that report focus: iTerm2, Terminal.app, kitty, Ghostty, WezTerm, Windows Terminal, VS Code), spinners and git polling pause until you come back, and TypeScript checks are incremental. |
 | 👓 **Easy to read** | Hints and secondary text keep at least 4.5:1 contrast. Nou asks your terminal whether its background is light or dark and picks matching colors (code switches to GitHub Light on a light background); set it yourself in <kbd>s</kbd> settings → **Nou's colors**. |
 

package/dist/src/ui/App.js

@@ -55,8 +55,6 @@ const MIN_CODE = 20;
 const MIN_CHAT = 24;
 const NO_LINES = new Set();
 const NO_FILES = new Set();
-const NO_SEARCH_FILES = [];
-const NO_SEARCH_ACTIONS = [];
 const DOUBLE_CLICK_MS = 500;
 /** How long each follow step stays on screen before the next. */
 const FOLLOW_STEP_MS = { slow: 2500, normal: 1200, fast: 450, instant: 0 };
@@ -126,8 +124,12 @@ export function App({ initialModel, permContext, resume }) {
     const [setupReason, setSetupReason] = useState(null);
     /** The file finder / command palette: closed (null), or open with this query (">" for commands). */
     const [quickOpen, setQuickOpen] = useState(null);
-    /** Searching the text of every file (Ctrl+Shift+F, /search): what's typed so far, or null when closed. */
-    const [searching, setSearching] = useState(null);
+    /** The quick-open popup opens on searching inside files (/search, Ctrl+Shift+F) rather than file names. */
+    const [quickText, setQuickText] = useState(false);
+    const setSearching = (query) => {
+        setQuickText(true);
+        setQuickOpen(query);
+    };
     /** /resume's picker: the conversations, in the palette's place while it's open. */
     const [resumePicker, setResumePicker] = useState(null);
     /** What the open picker is for, said in its empty search box. */
@@ -2700,24 +2702,28 @@ ${snippet}
     clickable.current = { status: zones, modelFrom: columns - (" LOCAL ".length + ` ${modelLabel} `.length + 1) };
     return (_jsxs(Box, { flexDirection: "column", width: columns, height: rows, children: [_jsx(Header, { width: columns, branch: branch, changes: git.size, model: modelLabel, local: choice.provider.local, busy: busy, update: update, tabs: tabsOfWorkspaces, project: projectName }), _jsxs(Box, { flexDirection: "row", height: height, children: [_jsx(FileTree, { width: treeWidth, height: heights.tree, focused: focus === "tree", openFile: openFile, reveal: reveal, version: treeVersion, changed: edited, working: working, ...(tourFiles ? { showing: tourFiles } : {}), git: git, problemCounts: problemCounts, wheelPane: "tree", scrollTo: scrollFor("tree"), click: treeClick, onOpen: onTreeOpen, onHover: onTreeHover }), codePanel === "problems" && !pendingChange ? (_jsx(ProblemsView, { width: codeWidth, height: heights.code, focused: focus === "code", problems: diagnostics.all(), checking: checking, wheelPane: "code", onJump: onJump, onClose: onCloseProblems })) : showEditor ? (_jsx(Editor, { ...(tabStrip ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, initial: draft.current?.path === openFile ? draft.current.text : content, baseline: draft.current?.path === openFile ? draft.current.baseline : content, startLine: editorStart.line, ...(editorStart.col ? { startCol: editorStart.col } : {}), problems: fileProblems, autoSave: settings.autoSave, syntaxVersion: syntaxVersion, wheelPane: "code", scrollTo: scrollFor("code"), mouse: editorMouse, onHover: onEditorHover, onDefinition: onEditorDefinition, onSave: onEditorSave, onExit: onEditorExit, onState: onEditorState, ...(guideStep && openFile === guideStep.file ? { guide: { row: guideStep.line - 1, code: guideStep.code }, onGuideDone } : {}) }, `${openFile}:${editorStart.nonce}`)) : (_jsx(CodeView, { ...(tour && tour.stops[tour.at]?.file === openFile && !diff ? { showing: `${tour.at + 1}/${tour.stops.length}` } : {}), ...(tabStrip && !diff ? { tabs: tabStrip } : {}), width: codeWidth, height: heights.code, focused: focus === "code", filePath: openFile, content: content, diff: diff, diffLabel: diffMode === "git" ? "vs HEAD" : diffMode === "session" ? sessionView?.label ?? "this session" : "Nou's edit", pending: !!pendingChange && diff === pendingChange, marked: record?.lines ?? NO_LINES, problems: fileProblems, focusLine: focusLine, syntaxVersion: syntaxVersion, diffNote: pendingChange && diff === pendingChange ? pendingNote?.short ?? (checking.length ? "checking…" : null) : null, wheelPane: "code", scrollTo: scrollFor("code"), onViewport: onViewport, defineAt: codeDefine, onDefine: onCodeDefine, onFinding: onCodeFinding, findRequest: findRequest, foldClick: foldClick, foldAll: foldAll })), _jsx(Chat, { width: chatWidth, height: heights.chat, focused: focus === "chat", entries: entries, streaming: streaming, busy: busy, approval: approval?.request ?? null, approvalNote: pendingChange ? pendingNote?.detail ?? null : null, contextChip: contextChip, wheelPane: "chat", scrollTo: scrollFor("chat"), prefill: chatPrefill, extraCommands: pluginCommands, onMenu: onChatMenu, onSubmit: onSend, queued: queued, sendNowFirst: settings.sendNowWhileBusy, onSendNow: sendNow, onSelecting: onChatSelecting, onAnswer: onAnswer, click: chatClick, select: chatSelect, tabs: chatTabsProp(), onOpenRef: openRef })] }), _jsx(Box, { children: _jsxs(Text, { wrap: "truncate-end", children: [_jsx(Text, { backgroundColor: mode.color, color: C.onBadge, bold: true, children: ` ${mode.label} ` }), _jsx(Text, { backgroundColor: C.panel, color: autoMode === "ask" ? C.dim : C.orange, bold: autoMode !== "ask", children: ` ${autoMode === "ask" ? "ask" : autoMode} ` }), _jsx(Text, { backgroundColor: C.panel, color: follow ? C.green : C.dim, children: followChip }), _jsx(Text, { backgroundColor: C.panel, color: totals.errors ? C.red : C.dim, children: ` ✗ ${totals.errors}` }), _jsx(Text, { backgroundColor: C.panel, color: totals.warnings ? C.yellow : C.dim, children: ` ▲ ${totals.warnings} ` }), checking.length > 0 && _jsxs(Text, { color: C.accent2, children: [" \u27F3 ", checking.join(", ")] }), exitArmed
                             ? _jsxs(Text, { color: C.yellow, bold: true, children: ["  ", "Press again to quit", draft.current && settings.autoSave === "off" ? ` (unsaved changes in ${draft.current.path} will be lost)` : ""] })
-                            : shownHints.map(([key, action], i) => (_jsxs(Text, { children: [i === 0 ? "  " : _jsx(Text, { color: C.dim, children: " \u00B7 " }), _jsx(Text, { color: C.text, children: key }), _jsxs(Text, { color: C.dim, children: [" ", action] })] }, key)))] }) }), layout.current.terminal && shellRef.current && (_jsx(Box, { position: "absolute", marginLeft: layout.current.terminal.x, marginTop: layout.current.terminal.y, children: _jsx(Terminal, { shell: shellRef.current, version: termVersion, width: layout.current.terminal.width, height: layout.current.terminal.height, focused: focus === "terminal", wheelPane: "terminal", onLeave: leaveTerminal, onClose: () => toggleTerminal(false), onResize: resizeTerminal }) })), layout.current.game && (_jsx(Box, { position: "absolute", marginLeft: layout.current.game.x, marginTop: layout.current.game.y, children: _jsx(GameGuard, { children: _jsx(GamePanel, { width: layout.current.game.width, height: layout.current.game.height, focused: focus === "game", moving: !!gameDrag, installed: settings.games, best: settings.gameBest ?? {}, onScore: onGameScore, onLeave: leaveGames, onOpenSettings: gamesSettings }) }) })), searching !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: NO_SEARCH_FILES, actions: NO_SEARCH_ACTIONS, initialQuery: searching, placeholder: "Search every file\u2026", searchText: searchText, onPick: () => { }, onPickHit: (hit) => {
-                    setSearching(null);
+                            : shownHints.map(([key, action], i) => (_jsxs(Text, { children: [i === 0 ? "  " : _jsx(Text, { color: C.dim, children: " \u00B7 " }), _jsx(Text, { color: C.text, children: key }), _jsxs(Text, { color: C.dim, children: [" ", action] })] }, key)))] }) }), layout.current.terminal && shellRef.current && (_jsx(Box, { position: "absolute", marginLeft: layout.current.terminal.x, marginTop: layout.current.terminal.y, children: _jsx(Terminal, { shell: shellRef.current, version: termVersion, width: layout.current.terminal.width, height: layout.current.terminal.height, focused: focus === "terminal", wheelPane: "terminal", onLeave: leaveTerminal, onClose: () => toggleTerminal(false), onResize: resizeTerminal }) })), layout.current.game && (_jsx(Box, { position: "absolute", marginLeft: layout.current.game.x, marginTop: layout.current.game.y, children: _jsx(GameGuard, { children: _jsx(GamePanel, { width: layout.current.game.width, height: layout.current.game.height, focused: focus === "game", moving: !!gameDrag, installed: settings.games, best: settings.gameBest ?? {}, onScore: onGameScore, onLeave: leaveGames, onOpenSettings: gamesSettings }) }) })), quickOpen !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, recent: recent, actions: resumePicker ?? paletteActions, initialQuery: quickOpen, ...(resumePicker ? { placeholder: "type to filter", title: pickerTitle } : { searchText, startInText: quickText }), onPickHit: (hit) => {
+                    setQuickOpen(null);
+                    setQuickText(false);
                     clearFollow();
                     // Opens the line with the match, highlighted, and puts the keyboard there.
                     openAt(hit.file, hit.line, false, hit.line);
                     setFocus("code");
-                }, onRun: () => { }, onClose: () => setSearching(null) })), quickOpen !== null && (_jsx(QuickOpen, { width: columns, top: 3, files: allFiles, recent: recent, actions: resumePicker ?? paletteActions, initialQuery: quickOpen, ...(resumePicker ? { placeholder: "type to filter", title: pickerTitle } : {}), onPick: (file) => {
+                }, onPick: (file) => {
                     setQuickOpen(null);
+                    setQuickText(false);
                     clearFollow();
                     open(file);
                     setReveal(file);
                     setFocus("code");
                 }, onRun: (action) => {
                     setQuickOpen(null);
+                    setQuickText(false);
                     setResumePicker(null);
                     action.run();
                 }, onClose: () => {
                     setQuickOpen(null);
+                    setQuickText(false);
                     setResumePicker(null);
                 } }))] }));
 }

package/dist/src/ui/QuickOpen.js

@@ -58,18 +58,20 @@ export function score(file, query) {
     return { score: total - file.length * 0.05, hits };
 }
 /** Ctrl+P: find a file. Start with ">" (or press ?) for every action Nou has, with its shortcut. */
-export function QuickOpen({ width, top, files, recent = [], actions, initialQuery = "", placeholder = "Go to file…  (> for commands)", title, onPick, searchText, onPickHit, onRun, onClose }) {
+export function QuickOpen({ width, top, files, recent = [], actions, initialQuery = "", placeholder = "Go to file…  (> for commands)", title, onPick, searchText, startInText = false, onPickHit, onRun, onClose }) {
     const [query, setQuery] = useState(initialQuery);
     const [cursor, setCursor] = useState(0);
-    // Search mode reads every file, so it waits for a pause in the typing (each search is one pass, cached).
-    const textMode = !!searchText;
+    // One popup for both: file names, or (Tab) the text inside every file. Searching inside reads every file,
+    // so it waits for a pause in the typing (each search is one pass, cached).
+    const [inText, setInText] = useState(startInText);
+    const textMode = !!searchText && inText;
     const [searched, setSearched] = useState({ query: "", hits: [], more: false });
     useEffect(() => {
-        if (!searchText)
+        if (!searchText || !textMode)
             return;
         const timer = setTimeout(() => setSearched({ query, ...searchText(query) }), query === searched.query ? 0 : 120);
         return () => clearTimeout(timer);
-    }, [query, !!searchText]);
+    }, [query, textMode]);
     const boxWidth = Math.min(80, Math.max(40, width - 10));
     const inner = boxWidth - 2; // fill every cell so the screen underneath doesn't show through
     const commandMode = !textMode && query.startsWith(">");
@@ -101,6 +103,11 @@ export function QuickOpen({ width, top, files, recent = [], actions, initialQuer
     useInput((_input, key) => {
         if (key.escape)
             onClose();
+        else if (key.tab && searchText && !query.startsWith(">")) {
+            // Tab: file names <-> the text inside files, keeping what's typed.
+            setInText((t) => !t);
+            setCursor(0);
+        }
         else if (key.upArrow)
             setCursor((c) => (c - 1 + Math.max(1, count)) % Math.max(1, count));
         else if (key.downArrow)
@@ -114,7 +121,7 @@ export function QuickOpen({ width, top, files, recent = [], actions, initialQuer
     /** Cut at the end (a title reads from the start). */
     const fit = (s, n) => (s.length > n ? `${s.slice(0, n - 1)}…` : s.padEnd(n));
     const pad = (s) => (s.length > inner ? `…${s.slice(-(inner - 1))}` : s.padEnd(inner));
-    return (_jsxs(Box, { position: "absolute", top: top, left: Math.floor((width - boxWidth) / 2), width: boxWidth, flexDirection: "column", borderStyle: "round", borderColor: C.accent2, children: [_jsxs(Text, { backgroundColor: C.panel, children: [_jsx(Text, { color: C.accent2, bold: true, children: fit(` ${title ?? (textMode ? "Search every file · type a word or phrase (/search)" : commandMode ? "Every action · type to filter (? or /actions)" : "Find a file · type part of its name (Ctrl+P or /files)")}`, inner - 6) }), _jsx(Text, { color: C.dim, children: "Esc ×".padStart(6) })] }), _jsxs(Text, { backgroundColor: C.panel, children: [_jsx(Text, { color: C.accent2, bold: true, children: " \u2315 " }), _jsx(TextInput, { value: query, onChange: (v) => {
+    return (_jsxs(Box, { position: "absolute", top: top, left: Math.floor((width - boxWidth) / 2), width: boxWidth, flexDirection: "column", borderStyle: "round", borderColor: C.accent2, children: [_jsxs(Text, { backgroundColor: C.panel, children: [_jsx(Text, { color: C.accent2, bold: true, children: fit(` ${title ?? (textMode ? "Search inside files · Tab: file names instead" : commandMode ? "Every action · type to filter (? or /actions)" : searchText ? "Find a file by name · Tab: search inside files" : "Find a file · type part of its name")}`, inner - 6) }), _jsx(Text, { color: C.dim, children: "Esc ×".padStart(6) })] }), _jsxs(Text, { backgroundColor: C.panel, children: [_jsx(Text, { color: C.accent2, bold: true, children: " \u2315 " }), _jsx(TextInput, { value: query, onChange: (v) => {
                             setQuery(v);
                             setCursor(0);
                         }, onSubmit: () => {
@@ -164,6 +171,6 @@ export function QuickOpen({ width, top, files, recent = [], actions, initialQuer
                 const hits = new Set(r.m.hits.map((h) => h + 1));
                 return (_jsxs(Text, { ...(selected ? { backgroundColor: C.panel } : {}), children: [_jsx(Text, { color: selected ? C.accent2 : C.dim, children: selected ? "▌" : " " }), _jsx(Text, { color: color, children: icon }), [...label].map((ch, j) => (_jsx(Text, { color: hits.has(j) ? C.yellow : selected ? C.text : C.dim, bold: hits.has(j), children: ch }, j))), _jsx(Text, { color: C.dim, children: tag })] }, r.file));
             }), _jsx(Text, { color: C.dim, children: pad(textMode
-                    ? ` ↑↓ select · Enter opens the line · Esc close   ${searched.query === query && query.trim() ? `${hits.length}${searched.more ? "+" : ""} lines` : ""}`
-                    : commandMode ? ` ↑↓ select · Enter run · Esc close   ${found.length} commands` : " ↑↓ select · Enter open · > commands · Esc close") })] }));
+                    ? ` ↑↓ select · Enter opens the line · Tab names · Esc close   ${searched.query === query && query.trim() ? `${hits.length}${searched.more ? "+" : ""} lines` : ""}`
+                    : commandMode ? ` ↑↓ select · Enter run · Esc close   ${found.length} commands` : ` ↑↓ select · Enter open${searchText ? " · Tab inside files" : ""} · > commands · Esc close`) })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.5.20",
+  "version": "0.5.21",
   "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": {