@freesyntax/notch-cli 0.4.0 → 0.4.2

package/dist/index.js

@@ -22,6 +22,12 @@ import path from "path";
 
 // src/providers/registry.ts
 import { createOpenAI } from "@ai-sdk/openai";
+var MissingApiKeyError = class extends Error {
+  constructor() {
+    super("NOTCH_API_KEY is not set");
+    this.name = "MissingApiKeyError";
+  }
+};
 var MODEL_CATALOG = {
   "notch-cinder": {
     id: "notch-cinder",
@@ -74,9 +80,7 @@ function resolveModel(config) {
   const baseUrl = config.baseUrl ?? process.env.NOTCH_BASE_URL ?? info.baseUrl;
   const apiKey = config.apiKey ?? process.env.NOTCH_API_KEY;
   if (!apiKey) {
-    throw new Error(
-      "NOTCH_API_KEY is not set. Set it via the NOTCH_API_KEY environment variable or --api-key flag."
-    );
+    throw new MissingApiKeyError();
   }
   const provider = createOpenAI({
     apiKey,
@@ -1186,8 +1190,23 @@ async function runAgentLoop(messages, config) {
     }
   };
 }
-async function buildSystemPrompt(projectRoot) {
-  const parts = [
+var CINDER_SYSTEM_PROMPT_PARTS = [
+  "You are Notch, an expert AI coding assistant. Built by Driftrail.",
+  "Be concise. Think before acting. Do exactly what the user asks, nothing more.",
+  "",
+  "## Tools available",
+  "Read, Write, Edit, Shell, Git, Glob, Grep, WebFetch.",
+  "",
+  "## Core rules",
+  "- Read files before editing them. Never guess at file content.",
+  "- Use exact string matching for edits.",
+  "- If a task is complex, break it into steps.",
+  "- If a command fails, read the error, fix it, and retry. Do not apologize \u2014 just fix it.",
+  "- Keep responses short. No lengthy explanations unless asked."
+];
+async function buildSystemPrompt(projectRoot, modelId) {
+  const isCinder = (modelId ?? "").toLowerCase().includes("cinder");
+  const parts = isCinder ? [...CINDER_SYSTEM_PROMPT_PARTS] : [
     "You are Notch, an expert AI coding assistant built by Driftrail.",
     "You help developers write, debug, refactor, and understand code.",
     "You have access to tools for reading/writing files, running shell commands, searching code, and git operations.",
@@ -1214,7 +1233,9 @@ async function buildSystemPrompt(projectRoot) {
     }
   } catch {
   }
-  parts.push("", "## Available Tools", describeTools());
+  if (!isCinder) {
+    parts.push("", "## Available Tools", describeTools());
+  }
   return parts.join("\n");
 }
 
@@ -2770,26 +2791,18 @@ function formatThemeList(activeId) {
 
 // src/ui/banner.ts
 var MANTIS = [
-  "  \u25C9\u2588\u2580\u2580\u2580\u2580\u2588\u25C9",
-  //  head + eyes
-  "   \u2580\u2588\u2584\u2584\u2588\u2580",
-  //  jaw
-  "     \u2590\u258C",
-  //  thin neck
-  "  \u2588\u2580 \u2590\u258C \u2580\u2588",
-  //  forelegs out
-  "  \u2580\u2588\u2584\u2588\u2588\u2584\u2588\u2580",
-  //  forelegs folding (prayer)
-  "    \u2590\u2588\u2588\u258C",
-  //  thorax
-  "    \u2590\u2588\u2588\u258C",
-  //  abdomen
-  "    \u2590\u2588\u2588\u258C",
-  //  abdomen
-  "   \u2584\u2580  \u2580\u2584",
-  //  legs splay
-  "  \u2580      \u2580"
-  //  feet
+  "  \u2571\u25C9\u25C9\u2572",
+  //  ╱◉◉╲  antennae + eyes
+  "   \u2588\u2588\u2588",
+  //   ███   head
+  "   \u2590\u2588\u258C",
+  //   ▐█▌   neck
+  " \u2584\u2580\u2590\u2588\u258C\u2580\u2584",
+  // ▄▀▐█▌▀▄  prayer arms
+  "   \u2590\u2588\u258C",
+  //   ▐█▌   abdomen
+  "  \u2580\u2580 \u2580\u2580"
+  //  ▀▀ ▀▀  feet
 ];
 var LOGO_INLINE = [
   " \u2588\u2588\u2584  \u2588  \u2584\u2580\u2580\u2584 \u2580\u2588\u2580 \u2584\u2580\u2580\u2584 \u2588  \u2588",
@@ -2798,7 +2811,7 @@ var LOGO_INLINE = [
 ];
 function colorMantis(line) {
   const t = theme();
-  return line.replace(/\u25c9/g, t.mascotAccent("\u25C9")).replace(/[\u2588]/g, (ch) => t.mascot(ch)).replace(/[\u2584\u2580]/g, (ch) => t.mascot(ch)).replace(/\u2590/g, t.mascot("\u2590")).replace(/\u258c/g, t.mascot("\u258C"));
+  return line.replace(/[\u2571\u2572]/g, (ch) => t.mascot(ch)).replace(/\u25c9/g, t.mascotAccent("\u25C9")).replace(/[\u2588]/g, (ch) => t.mascot(ch)).replace(/[\u2584\u2580]/g, (ch) => t.mascot(ch)).replace(/\u2590/g, t.mascot("\u2590")).replace(/\u258c/g, t.mascot("\u258C"));
 }
 function printBanner(version, modelLabel, modelId, modelSize, project) {
   const t = theme();
@@ -2816,7 +2829,7 @@ function printBanner(version, modelLabel, modelId, modelSize, project) {
   const divider = t.border("  " + "\u2500".repeat(divWidth));
   console.log(divider);
   console.log(
-    t.dim("  ") + t.bold(modelLabel) + t.dim(` (${modelSize})`) + t.dim("  \u2502  v") + t.text(version) + t.dim("  \u2502  ") + t.dim("by ") + t.tagline("Driftrail")
+    t.dim("  ") + t.bold(modelLabel) + t.dim("  \u2502  v") + t.text(version) + t.dim("  \u2502  ") + t.dim("by ") + t.tagline("Driftrail")
   );
   console.log(t.dim(`  ${project}`));
   console.log(divider);
@@ -3716,7 +3729,7 @@ function completeFilePath(partial, cwd) {
 
 // src/index.ts
 import fs18 from "fs/promises";
-var VERSION = "0.4.0";
+var VERSION = "0.4.1";
 var modelChoices = MODEL_IDS.join(", ");
 var program = new Command().name("notch").description("Notch CLI \u2014 AI-powered coding assistant by Driftrail").version(VERSION).argument("[prompt...]", "One-shot prompt (runs once and exits)").option(`-m, --model <model>`, `Notch model (${modelChoices})`).option("--base-url <url>", "Override Notch API base URL").option("--api-key <key>", "Notch API key (prefer NOTCH_API_KEY env var)").option("--no-repo-map", "Disable automatic repository mapping").option("--no-markdown", "Disable markdown rendering in output").option("--max-iterations <n>", "Max tool-call rounds per turn", "25").option("-y, --yes", "Auto-confirm destructive actions").option("--trust", "Trust mode \u2014 auto-allow all tool calls").option("--theme <theme>", `UI color theme (${THEME_IDS.join(", ")})`).option("--resume", "Resume the last session for this project").option("--session <id>", "Resume a specific session by ID").option("--cwd <dir>", "Set working directory").parse(process.argv);
 var opts = program.opts();
@@ -3728,9 +3741,8 @@ function printModelTable(activeModel) {
     const info = MODEL_CATALOG[id];
     const active = id === activeModel ? t.success(" \u25CF") : "  ";
     const label = id === activeModel ? t.bold(`${info.label}`) : t.dim(`${info.label}`);
-    const size = t.info(info.size.padEnd(4));
     const ctx = t.dim(`${(info.contextWindow / 1024).toFixed(0)}K ctx`);
-    console.log(`  ${active} ${t.brand(id.padEnd(14))} ${size} ${label}  ${ctx}`);
+    console.log(`  ${active} ${t.brand(id.padEnd(14))} ${label}  ${ctx}`);
   }
   console.log(t.dim(`
   Switch with: /model <name>
@@ -3880,7 +3892,31 @@ async function main() {
     setTheme(config.theme);
   }
   let activeModelId = config.models.chat.model;
-  let model = resolveModel(config.models.chat);
+  let model;
+  try {
+    model = resolveModel(config.models.chat);
+  } catch (err) {
+    if (err instanceof MissingApiKeyError) {
+      console.log("");
+      console.log("  \x1B[1m\x1B[36m\u26A1 Welcome to Notch CLI\x1B[0m");
+      console.log("");
+      console.log("  To get started, you need a Notch API key.");
+      console.log("");
+      console.log("  \x1B[1mOption 1:\x1B[0m Log in via browser (recommended)");
+      console.log("    \x1B[33m$ notch login\x1B[0m");
+      console.log("");
+      console.log("  \x1B[1mOption 2:\x1B[0m Set your API key directly");
+      console.log("    \x1B[33m$ export NOTCH_API_KEY=your-key-here\x1B[0m");
+      console.log("");
+      console.log("  \x1B[1mOption 3:\x1B[0m Pass it inline");
+      console.log("    \x1B[33m$ notch --api-key your-key-here\x1B[0m");
+      console.log("");
+      console.log("  Get your key at: \x1B[4mhttps://freesyntax.com/settings\x1B[0m");
+      console.log("");
+      process.exit(0);
+    }
+    throw err;
+  }
   const info = MODEL_CATALOG[activeModelId];
   printBanner(VERSION, info.label, info.id, info.size, config.projectRoot);
   checkForUpdates(VERSION).then((msg) => {
@@ -3912,10 +3948,12 @@ async function main() {
       spinner.warn("Could not build repo map");
     }
   }
-  const baseSystemPrompt = await buildSystemPrompt(config.projectRoot);
+  const baseSystemPrompt = await buildSystemPrompt(config.projectRoot, activeModelId);
+  const isCinder = activeModelId.includes("cinder");
   const systemPrompt = [
     baseSystemPrompt,
-    repoMapStr ? `
+    // Skip repo map for Cinder — too many tokens for a 4B model
+    !isCinder && repoMapStr ? `
 ## Repository Map
 ${repoMapStr}` : ""
   ].join("");
@@ -4126,7 +4164,7 @@ Analyze the above input.`;
       config.models.chat.model = activeModelId;
       model = resolveModel(config.models.chat);
       const switchedInfo = MODEL_CATALOG[activeModelId];
-      console.log(chalk8.green(`  Switched to ${switchedInfo.label} (${switchedInfo.id}, ${switchedInfo.size})
+      console.log(chalk8.green(`  Switched to ${switchedInfo.label} (${switchedInfo.id})
 `));
       rl.prompt();
       return;
@@ -4707,7 +4745,7 @@ async function handleRalphSubcommand(args, cliOpts) {
   const config = await loadConfig(cliOpts.cwd ? { projectRoot: cliOpts.cwd } : {});
   if (cliOpts.model) config.models.chat.model = cliOpts.model;
   const model = resolveModel(config.models.chat);
-  const systemPrompt = await buildSystemPrompt(config.projectRoot);
+  const systemPrompt = await buildSystemPrompt(config.projectRoot, config.models.chat.model);
   const toolCtx = {
     cwd: config.projectRoot,
     requireConfirm: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freesyntax/notch-cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Notch CLI — AI-powered coding assistant by Driftrail",
   "type": "module",
   "bin": {