nou-cli 0.5.1 → 0.5.2

package/dist/src/ui/text.js

@@ -1,7 +1,16 @@
 import path from "path";
-import { highlight, supportsLanguage } from "cli-highlight";
 import { diffLines } from "diff";
-import { highlightTree } from "../syntax/index.js";
+import { highlightTree, notifySyntaxLoaded } from "../syntax/index.js";
+import { highlightJsTheme } from "../syntax/themes.js";
+let fallback = null;
+let loading = null;
+export function loadFallbackHighlighter() {
+    loading ??= import("cli-highlight").then((m) => {
+        fallback = { highlight: m.highlight, supportsLanguage: m.supportsLanguage };
+        notifySyntaxLoaded();
+    }, () => { });
+    return loading;
+}
 const LANGUAGES = {
     ".ts": "typescript", ".tsx": "typescript", ".mts": "typescript", ".cts": "typescript",
     ".js": "javascript", ".jsx": "javascript", ".mjs": "javascript", ".cjs": "javascript",
@@ -23,10 +32,16 @@ export function highlightLines(filePath, text) {
     if (tree)
         return tree;
     const language = LANGUAGES[path.extname(filePath).toLowerCase()];
-    if (!language || !supportsLanguage(language) || text.length > 200_000)
+    if (!language || text.length > 200_000)
+        return plain;
+    if (!fallback) {
+        void loadFallbackHighlighter();
+        return plain;
+    }
+    if (!fallback.supportsLanguage(language))
         return plain;
     try {
-        return highlight(plain.join("\n"), { language, ignoreIllegals: true }).split("\n");
+        return fallback.highlight(plain.join("\n"), { language, ignoreIllegals: true, theme: highlightJsTheme() }).split("\n");
     }
     catch {
         return plain;
@@ -135,7 +150,7 @@ export function inlineSpans(text, base = { text: "" }) {
         out.push({ ...base, text: text.slice(pos) });
     return out.filter((s) => s.text);
 }
-const sameStyle = (a, b) => !!a.bold === !!b.bold && !!a.italic === !!b.italic && !!a.code === !!b.code && !!a.dim === !!b.dim;
+const sameStyle = (a, b) => !!a.bold === !!b.bold && !!a.italic === !!b.italic && !!a.code === !!b.code && !!a.dim === !!b.dim && a.link === b.link;
 /** Word-wraps styled spans; continuation lines start with `indent` spaces. */
 function wrapSpans(spans, width, indent = 0) {
     const max = Math.max(1, width);
@@ -186,7 +201,9 @@ function wrapSpans(spans, width, indent = 0) {
 }
 const cells = (row) => row.trim().replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim());
 /** Renders markdown for the terminal: headings, lists, quotes, code blocks, tables and inline styles, wrapped to `width`. */
-export function renderMarkdown(text, 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));
     const out = [];
     const src = splitLines(text);
     let fence = null;
@@ -215,7 +232,7 @@ export function renderMarkdown(text, width) {
             for (; j < src.length && /^\s*\|/.test(src[j]); j++)
                 rows.push(cells(src[j]));
             i = j - 1;
-            const plain = rows.map((r) => r.map((c) => inlineSpans(c).map((s) => s.text).join("")));
+            const plain = rows.map((r) => r.map((c) => spansOf(c).map((s) => s.text).join("")));
             const columns = Math.max(...plain.map((r) => r.length));
             const widths = Array.from({ length: columns }, (_, c) => Math.max(...plain.map((r) => (r[c] ?? "").length)));
             const fits = widths.reduce((a, b) => a + b, 0) + 3 * (columns - 1) <= width;
@@ -224,7 +241,7 @@ export function renderMarkdown(text, width) {
                 row.forEach((cell, c) => {
                     if (c > 0)
                         spans.push({ text: " │ ", dim: true });
-                    spans.push(...inlineSpans(cell, r === 0 ? { text: "", bold: true } : { text: "" }));
+                    spans.push(...spansOf(cell, r === 0 ? { text: "", bold: true } : { text: "" }));
                     if (fits && c < columns - 1)
                         spans.push({ text: " ".repeat(widths[c] - plain[r][c].length) });
                 });
@@ -237,7 +254,7 @@ export function renderMarkdown(text, width) {
         }
         const heading = raw.match(/^\s{0,3}(#{1,6})\s+(.*?)\s*#*\s*$/);
         if (heading) {
-            for (const line of wrapSpans(inlineSpans(heading[2], { text: "", bold: true }), width))
+            for (const line of wrapSpans(spansOf(heading[2], { text: "", bold: true }), width))
                 out.push({ kind: "heading", spans: line });
             continue;
         }
@@ -247,7 +264,7 @@ export function renderMarkdown(text, width) {
         }
         const quote = raw.match(/^\s*>\s?(.*)/);
         if (quote) {
-            for (const line of wrapSpans(inlineSpans(quote[1], { text: "", italic: true }), width - 2))
+            for (const line of wrapSpans(spansOf(quote[1], { text: "", italic: true }), width - 2))
                 out.push({ kind: "quote", spans: [{ text: "│ ", dim: true }, ...line] });
             continue;
         }
@@ -256,12 +273,99 @@ export function renderMarkdown(text, width) {
             const depth = Math.floor(item[1].length / 2) * 2;
             const task = item[3] ? (/x/i.test(item[3]) ? "☑ " : "☐ ") : "";
             const bullet = `${" ".repeat(depth)}${/\d/.test(item[2]) ? item[2] : "•"} ${task}`;
-            for (const line of wrapSpans([{ text: bullet }, ...inlineSpans(item[4])], width, bullet.length))
+            for (const line of wrapSpans([{ text: bullet }, ...spansOf(item[4])], width, bullet.length))
                 out.push({ kind: "text", spans: line });
             continue;
         }
-        for (const line of wrapSpans(inlineSpans(raw), width))
+        for (const line of wrapSpans(spansOf(raw), width))
             out.push({ kind: "text", spans: line });
     }
     return out;
 }
+/**
+ * path, path:line or path:line-line; a path has a dot in its last part, so plain words don't match.
+ * Windows paths (C:\\dir\\file.ts, dir\\file.ts) count too.
+ */
+const FILE_REF = /(?<![\w/\\.@~-])((?:[A-Za-z]:[\\/]|\.{0,2}[\\/])?(?:[\w@.~+-]+[\\/])*[\w@-][\w@.~+-]*\.[A-Za-z0-9]{1,8})(?::(\d+)(?:[-–](\d+))?)?(?![\w/\\])/g;
+/** Splits out the references to files that exist (per `isFile`) as link spans, keeping each span's style. */
+export function linkFileRefs(spans, isFile) {
+    const out = [];
+    for (const span of spans) {
+        let pos = 0;
+        for (const m of span.text.matchAll(FILE_REF)) {
+            const file = m[1].replace(/^\.[\\/]/, "");
+            if (!isFile(file))
+                continue;
+            if (m.index > pos)
+                out.push({ ...span, text: span.text.slice(pos, m.index) });
+            const link = { path: file };
+            if (m[2])
+                link.line = Number(m[2]);
+            if (m[3])
+                link.to = Number(m[3]);
+            out.push({ ...span, text: m[0], link });
+            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;
+    for (const span of spans) {
+        if (col >= x && col < x + span.text.length)
+            return span.link ?? null;
+        x += span.text.length;
+    }
+    return null;
+}
+// eslint-disable-next-line no-control-regex -- color codes start with ESC
+const ESCAPE = /\x1b\[[\d;]*m/y;
+/**
+ * Columns `from` to `from + width` of a highlighted line, keeping its colors: the color codes before
+ * `from` are kept (so the text still starts in the right color), the characters are dropped.
+ */
+export function sliceAnsi(line, from, width = Infinity) {
+    let out = "";
+    let column = 0;
+    for (let i = 0; i < line.length;) {
+        ESCAPE.lastIndex = i;
+        const code = ESCAPE.exec(line);
+        if (code) {
+            out += code[0];
+            i += code[0].length;
+            continue;
+        }
+        const ch = String.fromCodePoint(line.codePointAt(i));
+        if (column >= from && column < from + width)
+            out += ch;
+        column++;
+        i += ch.length;
+    }
+    return out;
+}
+/** Wraps visible columns `from`..`to` of a highlighted line in `open`/`close` codes (e.g. to mark a search match). */
+export function markAnsi(line, from, to, open = "\x1b[7m", close = "\x1b[27m") {
+    let out = "";
+    let column = 0;
+    for (let i = 0; i < line.length;) {
+        ESCAPE.lastIndex = i;
+        const code = ESCAPE.exec(line);
+        if (code) {
+            out += code[0];
+            i += code[0].length;
+            continue;
+        }
+        const ch = String.fromCodePoint(line.codePointAt(i));
+        if (column === from)
+            out += open;
+        out += ch;
+        column++;
+        if (column === to)
+            out += close;
+        i += ch.length;
+    }
+    return out;
+}

package/dist/src/ui/width-shim.js

@@ -0,0 +1,7 @@
+/** Stands in for string-width (see fast-width.ts): the real one, named in this module's URL, made faster. */
+import { fastStringWidth } from "./fast-width.js";
+const of = new URL(import.meta.url).searchParams.get("of");
+if (!of)
+    throw new Error("width-shim needs ?of=<string-width url>");
+const real = (await import(of)).default;
+export default fastStringWidth(real);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nou-cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "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": {
@@ -47,6 +47,7 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.133.0",
     "@clack/prompts": "^1.1.0",
+    "@modelcontextprotocol/sdk": "1.32.1",
     "chalk": "^5.6.2",
     "cli-highlight": "^2.1.11",
     "diff": "^9.0.0",