nou-cli 0.5.0 → 0.5.2

package/dist/src/syntax/index.js

@@ -2,8 +2,8 @@ import { existsSync } from "fs";
 import { createRequire } from "module";
 import path from "path";
 import { fileURLToPath } from "url";
-import chalk from "chalk";
 import { Language, Parser } from "web-tree-sitter";
+import { themeColors } from "./themes.js";
 /** File extension -> grammar name (tree-sitter-<name>.wasm). Only these are shipped with Nou. */
 const GRAMMARS = {
     ".ts": "typescript", ".mts": "typescript", ".cts": "typescript", ".tsx": "tsx",
@@ -30,6 +30,11 @@ let init = null;
 const languages = new Map();
 let parser = null;
 const listeners = new Set();
+/** Tells views to re-highlight (a grammar or the fallback highlighter just loaded). */
+export function notifySyntaxLoaded() {
+    for (const l of listeners)
+        l();
+}
 /** Called when a grammar finishes loading, so views can re-highlight. */
 export function onGrammarLoaded(listener) {
     listeners.add(listener);
@@ -51,8 +56,7 @@ function load(name) {
         if (!dir)
             throw new Error("grammars not found");
         languages.set(name, await Language.load(path.join(dir, `tree-sitter-${name}.wasm`)));
-        for (const l of listeners)
-            l();
+        notifySyntaxLoaded();
     })
         .catch(() => languages.set(name, "failed"));
 }
@@ -87,20 +91,6 @@ export function preload(file) {
     if (name)
         load(name);
 }
-// --- highlighting --------------------------------------------------------------
-const COLORS = {
-    keyword: chalk.hex("#bb9af7"),
-    string: chalk.hex("#9ece6a"),
-    number: chalk.hex("#ff9e64"),
-    comment: chalk.hex("#565f89").italic,
-    type: chalk.hex("#2ac3de"),
-    func: chalk.hex("#7aa2f7"),
-    property: chalk.hex("#73daca"),
-    constant: chalk.hex("#ff9e64"),
-    tag: chalk.hex("#f7768e"),
-    punctuation: chalk.hex("#89ddff"),
-    plain: chalk.hex("#c0caf5"),
-};
 const STRINGS = /^(string|template_string|string_fragment|string_content|raw_string_literal|interpreted_string_literal|char_literal|character_literal|escape_sequence|string_literal|heredoc_body)$/;
 const NUMBERS = /^(number|integer|float|integer_literal|float_literal|number_literal|decimal_integer_literal|decimal_floating_point_literal)$/;
 const TYPES = /^(type_identifier|predefined_type|primitive_type|builtin_type|type)$/;
@@ -178,11 +168,11 @@ export function highlightTree(file, text) {
             const node = cursor.currentNode;
             if (node.childCount === 0 || node.type.includes("comment") || (isString(node) && !hasSubstitution(node))) {
                 if (node.startIndex >= pos) {
-                    out += COLORS.plain(text.slice(pos, node.startIndex));
+                    out += themeColors().plain(text.slice(pos, node.startIndex));
                     const color = colorFor(node);
                     const span = text.slice(node.startIndex, node.endIndex);
                     // Color each line separately so styles don't bleed across line breaks.
-                    out += span.split("\n").map((part) => (color ? COLORS[color](part) : COLORS.plain(part))).join("\n");
+                    out += span.split("\n").map((part) => (color ? themeColors()[color](part) : themeColors().plain(part))).join("\n");
                     pos = node.endIndex;
                 }
             }
@@ -194,7 +184,7 @@ export function highlightTree(file, text) {
     };
     if (cursor.gotoFirstChild())
         visit();
-    out += COLORS.plain(text.slice(pos));
+    out += themeColors().plain(text.slice(pos));
     tree.delete();
     return out.split("\n");
 }

package/dist/src/syntax/themes.js

@@ -0,0 +1,57 @@
+import chalk, {} from "chalk";
+/** Well-known editor themes; one-dark is the default because it reads well on most dark terminals. */
+const PALETTES = {
+    "one-dark": {
+        keyword: "#c678dd", string: "#98c379", number: "#d19a66", comment: "#7f848e", type: "#e5c07b", func: "#61afef",
+        property: "#e06c75", constant: "#d19a66", tag: "#e06c75", punctuation: "#abb2bf", plain: "#d7dae0",
+    },
+    "tokyo-night": {
+        keyword: "#bb9af7", string: "#9ece6a", number: "#ff9e64", comment: "#737aa2", type: "#2ac3de", func: "#7aa2f7",
+        property: "#73daca", constant: "#ff9e64", tag: "#f7768e", punctuation: "#89ddff", plain: "#c0caf5",
+    },
+    "github-dark": {
+        keyword: "#ff7b72", string: "#a5d6ff", number: "#79c0ff", comment: "#8b949e", type: "#ffa657", func: "#d2a8ff",
+        property: "#79c0ff", constant: "#79c0ff", tag: "#7ee787", punctuation: "#c9d1d9", plain: "#e6edf3",
+    },
+    dracula: {
+        keyword: "#ff79c6", string: "#f1fa8c", number: "#bd93f9", comment: "#8a94c4", type: "#8be9fd", func: "#50fa7b",
+        property: "#66d9ef", constant: "#bd93f9", tag: "#ff79c6", punctuation: "#f8f8f2", plain: "#f8f8f2",
+    },
+    "high-contrast": {
+        keyword: "#ff9cf5", string: "#a6ff8f", number: "#ffd27f", comment: "#b0b0b0", type: "#7fe7ff", func: "#8fc7ff",
+        property: "#ffb38a", constant: "#ffd27f", tag: "#ff8a8a", punctuation: "#ffffff", plain: "#ffffff",
+    },
+    "github-light": {
+        keyword: "#cf222e", string: "#0a3069", number: "#0550ae", comment: "#6e7781", type: "#953800", func: "#8250df",
+        property: "#0550ae", constant: "#0550ae", tag: "#116329", punctuation: "#24292f", plain: "#24292f",
+    },
+};
+const paint = (palette) => Object.fromEntries(Object.entries(palette).map(([role, hex]) => [role, role === "comment" ? chalk.hex(hex).italic : chalk.hex(hex)]));
+let current = "one-dark";
+let colors = paint(PALETTES[current]);
+let version = 0;
+/** The chalk styles for the current theme. */
+export const themeColors = () => colors;
+/** Changes whenever the theme does, so cached highlighting can be redone. */
+export const themeVersion = () => version;
+export function setCodeTheme(theme) {
+    if (theme === current || !PALETTES[theme])
+        return;
+    current = theme;
+    colors = paint(PALETTES[theme]);
+    version++;
+}
+/** The same colors for highlight.js (cli-highlight), used for languages tree-sitter doesn't cover. */
+export function highlightJsTheme() {
+    const c = colors;
+    return {
+        keyword: c.keyword, built_in: c.type, type: c.type, literal: c.constant, number: c.number, regexp: c.string,
+        string: c.string, subst: c.plain, symbol: c.constant, class: c.type, function: c.func, title: c.func, params: c.plain,
+        comment: c.comment, doctag: c.comment, meta: c.comment, "meta-keyword": c.keyword, "meta-string": c.string,
+        section: c.func, tag: c.tag, name: c.tag, "builtin-name": c.type, attr: c.property, attribute: c.property,
+        variable: c.plain, bullet: c.punctuation, code: c.string, emphasis: c.plain.italic, strong: c.plain.bold,
+        formula: c.plain, link: c.func, quote: c.comment, "selector-tag": c.tag, "selector-id": c.func, "selector-class": c.func,
+        "selector-attr": c.property, "selector-pseudo": c.property, "template-tag": c.keyword, "template-variable": c.plain,
+        addition: c.string, deletion: c.tag, default: c.plain,
+    };
+}

package/dist/src/tools/index.js

@@ -3,13 +3,17 @@ export const tools = [
         type: "function",
         function: {
             name: "run_command",
-            description: "Run a terminal command",
+            description: "Run a shell command in the project folder: tests, builds, type checks, git, package scripts. Returns its output (stdout and stderr together) and, when it fails, its exit code. Use grep, glob and read_file rather than grep/find/cat here. Quote paths with spaces. Don't start interactive programs or servers that never exit.",
             parameters: {
                 type: "object",
                 properties: {
                     command: {
                         type: "string",
                         description: "The shell command to run",
+                    },
+                    timeout: {
+                        type: "number",
+                        description: "Seconds to wait before stopping it. Defaults to 120, at most 600.",
                     }
                 },
                 required: ["command"]
@@ -20,7 +24,7 @@ export const tools = [
         type: "function",
         function: {
             name: "read_file",
-            description: "Read a file. Long files come back in pages of up to 1000 lines; the end of each page says how to read on.",
+            description: "Read a file. Lines come back numbered (\"  12\\tcode\"); the numbers aren't part of the file. Long files come back in pages of up to 1000 lines; the end of each page says how to read on.",
             parameters: {
                 type: "object",
                 properties: {
@@ -99,6 +103,31 @@ export const tools = [
             }
         }
     },
+    {
+        type: "function",
+        function: {
+            name: "open_file",
+            description: "Show a file in the user's code view (the middle panel), scrolled to a line with the given lines highlighted. Use it when the user asks where something is or to show/open/find something: find the exact place first, then open it.",
+            parameters: {
+                type: "object",
+                properties: {
+                    path: {
+                        type: "string",
+                        description: "Path to the file, relative to the project root",
+                    },
+                    line: {
+                        type: "number",
+                        description: "First line to show and highlight (1-based)",
+                    },
+                    end_line: {
+                        type: "number",
+                        description: "Last line to highlight, e.g. the end of the function. Defaults to line.",
+                    }
+                },
+                required: ["path"]
+            }
+        }
+    },
     {
         type: "function",
         function: {
@@ -145,6 +174,61 @@ export const tools = [
             }
         }
     },
+    {
+        type: "function",
+        function: {
+            name: "multi_edit",
+            description: "Make several edits to one file at once, shown to the user as one change. Each edit works like edit_file, applied in order to the result of the one before; if any fails, none are made. Use it instead of several edit_file calls on the same file.",
+            parameters: {
+                type: "object",
+                properties: {
+                    path: {
+                        type: "string",
+                        description: "Path to the file to edit"
+                    },
+                    edits: {
+                        type: "array",
+                        description: "The edits, in order",
+                        items: {
+                            type: "object",
+                            properties: {
+                                old_string: { type: "string", description: "The exact text to replace" },
+                                new_string: { type: "string", description: "The text to put in its place" },
+                                replace_all: { type: "boolean", description: "Replace every occurrence. Defaults to false." }
+                            },
+                            required: ["old_string", "new_string"]
+                        }
+                    }
+                },
+                required: ["path", "edits"]
+            }
+        }
+    },
+    {
+        type: "function",
+        function: {
+            name: "update_plan",
+            description: "Keep a short checklist for a task with several steps: send the whole list each time, with each step's status. The user sees it. Use it for anything with three or more steps; skip it for quick questions and one-line fixes.",
+            parameters: {
+                type: "object",
+                properties: {
+                    steps: {
+                        type: "array",
+                        description: "Every step, in order",
+                        items: {
+                            type: "object",
+                            properties: {
+                                step: { type: "string", description: "What the step does, in a few words" },
+                                status: { type: "string", enum: ["pending", "in_progress", "done"], description: "Where it's at" }
+                            },
+                            required: ["step", "status"]
+                        }
+                    }
+                },
+                required: ["steps"]
+            }
+        }
+    },
     {
         type: "function",
         function: {