@freesyntax/notch-cli 0.4.1 → 0.4.4

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   clearCredentials,
   loadCredentials,
   login
-} from "./chunk-TJS4W4R5.js";
+} from "./chunk-FIFC4V2R.js";
 import {
   autoCompress,
   estimateTokens
@@ -11,7 +11,7 @@ import {
 
 // src/index.ts
 import { Command } from "commander";
-import chalk8 from "chalk";
+import chalk9 from "chalk";
 import ora from "ora";
 import * as readline from "readline";
 import * as nodePath from "path";
@@ -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,
@@ -826,20 +830,373 @@ ${text}` };
   }
 };
 
+// src/tools/github.ts
+import { z as z9 } from "zod";
+var GITHUB_API = "https://api.github.com";
+function getToken() {
+  return process.env.GITHUB_TOKEN || process.env.GH_TOKEN || null;
+}
+async function ghFetch(path19, opts2 = {}) {
+  const token = getToken();
+  const headers = {
+    "Accept": "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+    ...opts2.headers ?? {}
+  };
+  if (token) headers["Authorization"] = `Bearer ${token}`;
+  return fetch(`${GITHUB_API}${path19}`, { ...opts2, headers });
+}
+var parameters9 = z9.object({
+  action: z9.enum([
+    "create_pr",
+    "list_prs",
+    "list_issues",
+    "repo_info",
+    "create_issue",
+    "pr_status"
+  ]).describe("The GitHub operation to perform"),
+  owner: z9.string().describe("Repository owner (user or org)"),
+  repo: z9.string().describe("Repository name"),
+  // PR fields
+  title: z9.string().optional().describe("PR or issue title"),
+  body: z9.string().optional().describe("PR or issue body/description"),
+  head: z9.string().optional().describe("PR source branch"),
+  base: z9.string().optional().describe("PR target branch (default: main)"),
+  // Issue fields
+  labels: z9.array(z9.string()).optional().describe("Labels for issue"),
+  // Filter
+  state: z9.enum(["open", "closed", "all"]).optional().describe("Filter by state"),
+  pr_number: z9.number().optional().describe("PR number for status check")
+});
+async function execute(args, _ctx) {
+  const token = getToken();
+  if (!token) {
+    return {
+      content: "No GitHub token found. Set GITHUB_TOKEN or GH_TOKEN environment variable.\nYou can create a token at https://github.com/settings/tokens",
+      isError: true
+    };
+  }
+  try {
+    switch (args.action) {
+      case "repo_info": {
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}`);
+        if (!res.ok) return { content: `GitHub API error: ${res.status} ${await res.text()}`, isError: true };
+        const repo = await res.json();
+        return {
+          content: [
+            `Repository: ${repo.full_name}`,
+            `Description: ${repo.description || "None"}`,
+            `Stars: ${repo.stargazers_count} | Forks: ${repo.forks_count} | Open issues: ${repo.open_issues_count}`,
+            `Default branch: ${repo.default_branch}`,
+            `Language: ${repo.language || "Unknown"}`,
+            `Private: ${repo.private}`,
+            `URL: ${repo.html_url}`
+          ].join("\n")
+        };
+      }
+      case "list_prs": {
+        const state = args.state ?? "open";
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}/pulls?state=${state}&per_page=15`);
+        if (!res.ok) return { content: `GitHub API error: ${res.status}`, isError: true };
+        const prs = await res.json();
+        if (prs.length === 0) return { content: `No ${state} pull requests.` };
+        const lines = prs.map(
+          (pr) => `#${pr.number} [${pr.state}] ${pr.title} (${pr.head.ref} \u2192 ${pr.base.ref}) by @${pr.user.login}`
+        );
+        return { content: lines.join("\n") };
+      }
+      case "list_issues": {
+        const state = args.state ?? "open";
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}/issues?state=${state}&per_page=15`);
+        if (!res.ok) return { content: `GitHub API error: ${res.status}`, isError: true };
+        const issues = await res.json();
+        const realIssues = issues.filter((i) => !i.pull_request);
+        if (realIssues.length === 0) return { content: `No ${state} issues.` };
+        const lines = realIssues.map((i) => {
+          const labels = i.labels.map((l) => l.name).join(", ");
+          return `#${i.number} [${i.state}] ${i.title}${labels ? ` [${labels}]` : ""} by @${i.user.login}`;
+        });
+        return { content: lines.join("\n") };
+      }
+      case "create_pr": {
+        if (!args.title || !args.head) {
+          return { content: "title and head branch are required for create_pr", isError: true };
+        }
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}/pulls`, {
+          method: "POST",
+          body: JSON.stringify({
+            title: args.title,
+            body: args.body ?? "",
+            head: args.head,
+            base: args.base ?? "main"
+          })
+        });
+        if (!res.ok) {
+          const err = await res.json();
+          return { content: `Failed to create PR: ${err.message || res.status}`, isError: true };
+        }
+        const pr = await res.json();
+        return { content: `PR #${pr.number} created: ${pr.html_url}` };
+      }
+      case "create_issue": {
+        if (!args.title) {
+          return { content: "title is required for create_issue", isError: true };
+        }
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}/issues`, {
+          method: "POST",
+          body: JSON.stringify({
+            title: args.title,
+            body: args.body ?? "",
+            labels: args.labels ?? []
+          })
+        });
+        if (!res.ok) {
+          const err = await res.json();
+          return { content: `Failed to create issue: ${err.message || res.status}`, isError: true };
+        }
+        const issue = await res.json();
+        return { content: `Issue #${issue.number} created: ${issue.html_url}` };
+      }
+      case "pr_status": {
+        if (!args.pr_number) {
+          return { content: "pr_number is required for pr_status", isError: true };
+        }
+        const res = await ghFetch(`/repos/${args.owner}/${args.repo}/pulls/${args.pr_number}`);
+        if (!res.ok) return { content: `GitHub API error: ${res.status}`, isError: true };
+        const pr = await res.json();
+        const checksRes = await ghFetch(`/repos/${args.owner}/${args.repo}/commits/${pr.head.sha}/check-runs`);
+        let checksInfo = "";
+        if (checksRes.ok) {
+          const checks = await checksRes.json();
+          if (checks.check_runs?.length) {
+            checksInfo = "\nChecks:\n" + checks.check_runs.map(
+              (c) => `  ${c.status === "completed" ? c.conclusion === "success" ? "\u2713" : "\u2717" : "\u25CC"} ${c.name}: ${c.conclusion ?? c.status}`
+            ).join("\n");
+          }
+        }
+        return {
+          content: [
+            `PR #${pr.number}: ${pr.title}`,
+            `State: ${pr.state} | Mergeable: ${pr.mergeable ?? "checking..."}`,
+            `${pr.head.ref} \u2192 ${pr.base.ref}`,
+            `Author: @${pr.user.login}`,
+            `+${pr.additions} -${pr.deletions} (${pr.changed_files} files)`,
+            `Reviews: ${pr.requested_reviewers?.length ?? 0} requested`,
+            checksInfo,
+            `URL: ${pr.html_url}`
+          ].join("\n")
+        };
+      }
+      default:
+        return { content: `Unknown action: ${args.action}`, isError: true };
+    }
+  } catch (err) {
+    return { content: `GitHub error: ${err.message}`, isError: true };
+  }
+}
+var githubTool = {
+  name: "github",
+  description: "GitHub operations \u2014 create PRs, list issues, check PR status, view repo info. Requires GITHUB_TOKEN env var.",
+  parameters: parameters9,
+  execute
+};
+
+// src/mcp/client.ts
+import { spawn } from "child_process";
+import { z as z10 } from "zod";
+var MCPClient = class {
+  constructor(config, serverName) {
+    this.config = config;
+    this.serverName = serverName;
+  }
+  process = null;
+  requestId = 0;
+  pendingRequests = /* @__PURE__ */ new Map();
+  buffer = "";
+  serverName;
+  _tools = [];
+  /**
+   * Start the MCP server and initialize the connection.
+   */
+  async connect() {
+    this.process = spawn(this.config.command, this.config.args ?? [], {
+      stdio: ["pipe", "pipe", "pipe"],
+      env: { ...process.env, ...this.config.env },
+      cwd: this.config.cwd
+    });
+    this.process.stdout?.setEncoding("utf-8");
+    this.process.stdout?.on("data", (data) => {
+      this.buffer += data;
+      this.processBuffer();
+    });
+    this.process.on("error", (err) => {
+      for (const [id, pending] of this.pendingRequests) {
+        pending.reject(new Error(`MCP server ${this.serverName} error: ${err.message}`));
+        this.pendingRequests.delete(id);
+      }
+    });
+    this.process.on("exit", (code) => {
+      for (const [id, pending] of this.pendingRequests) {
+        pending.reject(new Error(`MCP server ${this.serverName} exited with code ${code}`));
+        this.pendingRequests.delete(id);
+      }
+    });
+    await this.sendRequest("initialize", {
+      protocolVersion: "2024-11-05",
+      capabilities: {},
+      clientInfo: { name: "notch-cli", version: "0.3.0" }
+    });
+    this.sendNotification("notifications/initialized", {});
+    const result = await this.sendRequest("tools/list", {});
+    this._tools = result.tools ?? [];
+  }
+  /**
+   * Get discovered tools from this server.
+   */
+  get tools() {
+    return this._tools;
+  }
+  /**
+   * Check if the MCP server process is still alive.
+   */
+  get isAlive() {
+    return this.process !== null && this.process.exitCode === null && !this.process.killed;
+  }
+  /**
+   * Call a tool on the MCP server. Auto-reconnects if the server has crashed.
+   */
+  async callTool(name, args) {
+    if (!this.isAlive) {
+      try {
+        await this.connect();
+      } catch (err) {
+        throw new Error(`MCP server ${this.serverName} is down and could not reconnect: ${err.message}`);
+      }
+    }
+    const result = await this.sendRequest("tools/call", { name, arguments: args });
+    return result;
+  }
+  /**
+   * Disconnect from the MCP server.
+   */
+  disconnect() {
+    if (this.process) {
+      this.process.stdin?.end();
+      this.process.kill();
+      this.process = null;
+    }
+    this.pendingRequests.clear();
+  }
+  sendRequest(method, params) {
+    return new Promise((resolve2, reject) => {
+      const id = ++this.requestId;
+      const msg = {
+        jsonrpc: "2.0",
+        id,
+        method,
+        params
+      };
+      this.pendingRequests.set(id, { resolve: resolve2, reject });
+      const data = JSON.stringify(msg);
+      const header = `Content-Length: ${Buffer.byteLength(data)}\r
+\r
+`;
+      this.process?.stdin?.write(header + data);
+      setTimeout(() => {
+        if (this.pendingRequests.has(id)) {
+          this.pendingRequests.delete(id);
+          reject(new Error(`MCP request ${method} timed out`));
+        }
+      }, 3e4);
+    });
+  }
+  sendNotification(method, params) {
+    const msg = {
+      jsonrpc: "2.0",
+      method,
+      params
+    };
+    const data = JSON.stringify(msg);
+    const header = `Content-Length: ${Buffer.byteLength(data)}\r
+\r
+`;
+    this.process?.stdin?.write(header + data);
+  }
+  processBuffer() {
+    while (this.buffer.length > 0) {
+      const headerEnd = this.buffer.indexOf("\r\n\r\n");
+      if (headerEnd === -1) break;
+      const header = this.buffer.slice(0, headerEnd);
+      const lengthMatch = header.match(/Content-Length:\s*(\d+)/i);
+      if (!lengthMatch) {
+        const nlIdx = this.buffer.indexOf("\n");
+        if (nlIdx === -1) break;
+        const line = this.buffer.slice(0, nlIdx).trim();
+        this.buffer = this.buffer.slice(nlIdx + 1);
+        if (line) this.handleMessage(line);
+        continue;
+      }
+      const contentLength = parseInt(lengthMatch[1], 10);
+      const messageStart = headerEnd + 4;
+      if (this.buffer.length < messageStart + contentLength) break;
+      const body = this.buffer.slice(messageStart, messageStart + contentLength);
+      this.buffer = this.buffer.slice(messageStart + contentLength);
+      this.handleMessage(body);
+    }
+  }
+  handleMessage(raw) {
+    try {
+      const msg = JSON.parse(raw);
+      if (msg.id !== void 0 && this.pendingRequests.has(msg.id)) {
+        const pending = this.pendingRequests.get(msg.id);
+        this.pendingRequests.delete(msg.id);
+        if (msg.error) {
+          pending.reject(new Error(`MCP error: ${msg.error.message}`));
+        } else {
+          pending.resolve(msg.result);
+        }
+      }
+    } catch {
+    }
+  }
+};
+function parseMCPConfig(config) {
+  const servers = config?.mcpServers;
+  if (!servers || typeof servers !== "object") return {};
+  const result = {};
+  for (const [name, cfg] of Object.entries(servers)) {
+    const c = cfg;
+    if (c?.command) {
+      result[name] = {
+        command: c.command,
+        args: c.args,
+        env: c.env,
+        cwd: c.cwd
+      };
+    }
+  }
+  return result;
+}
+
 // src/tools/index.ts
-var ALL_TOOLS = [
+var BUILTIN_TOOLS = [
   readTool,
   writeTool,
   editTool,
   shellTool,
   gitTool,
+  githubTool,
   grepTool,
   globTool,
   webFetchTool
 ];
+var mcpTools = [];
+function getAllTools() {
+  return [...BUILTIN_TOOLS, ...mcpTools];
+}
 function buildToolMap(ctx) {
   const map = {};
-  for (const t of ALL_TOOLS) {
+  for (const t of getAllTools()) {
     map[t.name] = tool({
       description: t.description,
       parameters: t.parameters,
@@ -884,7 +1241,7 @@ ${paramSummary}`
   return map;
 }
 function describeTools() {
-  return ALL_TOOLS.map(
+  return getAllTools().map(
     (t) => `- **${t.name}**: ${t.description}`
   ).join("\n");
 }
@@ -2307,36 +2664,49 @@ async function resolveGlob(pattern, cwd) {
   }
 }
 
+// src/ui/banner.ts
+import chalk6 from "chalk";
+
 // src/ui/themes.ts
 import chalk5 from "chalk";
 var defaultTheme = {
   name: "Default",
-  description: "Classic Notch \u2014 green mantis, blue wordmark",
-  brand: chalk5.blueBright,
-  mascot: chalk5.greenBright,
-  mascotAccent: chalk5.yellowBright,
-  tagline: chalk5.cyan,
-  prompt: chalk5.blueBright,
-  border: chalk5.gray,
-  dim: chalk5.gray,
-  text: chalk5.white,
-  bold: chalk5.white.bold,
+  description: "FreeSyntax \u2014 silver, white, monochrome",
+  brand: chalk5.hex("#D4D4D4"),
+  // silver (banner uses gradient override)
+  mascot: chalk5.hex("#AAAAAA"),
+  // medium gray mantis
+  mascotAccent: chalk5.hex("#FFFFFF"),
+  // white eyes
+  tagline: chalk5.hex("#777777"),
+  // muted gray
+  prompt: chalk5.hex("#CCCCCC"),
+  // silver prompt
+  border: chalk5.hex("#444444"),
+  // dark border
+  dim: chalk5.hex("#666666"),
+  // muted text
+  text: chalk5.hex("#D4D4D4"),
+  // silver body text
+  bold: chalk5.hex("#FFFFFF").bold,
+  // pure white emphasis
   success: chalk5.green,
   warning: chalk5.yellow,
   error: chalk5.red,
-  info: chalk5.cyan,
-  toolName: chalk5.gray,
-  toolArgs: chalk5.gray,
-  toolResult: chalk5.gray,
+  info: chalk5.hex("#BBBBBB"),
+  // light gray info
+  toolName: chalk5.hex("#AAAAAA"),
+  toolArgs: chalk5.hex("#777777"),
+  toolResult: chalk5.hex("#555555"),
   diffAdd: chalk5.green,
   diffRemove: chalk5.red,
-  diffHeader: chalk5.cyan,
-  mdH1: chalk5.white.bold,
-  mdH2: chalk5.blueBright,
-  mdH3: chalk5.cyan,
-  mdCode: chalk5.cyan,
-  mdInlineCode: chalk5.bgGray.white,
-  mdLink: chalk5.blue.underline,
+  diffHeader: chalk5.hex("#CCCCCC"),
+  mdH1: chalk5.hex("#FFFFFF").bold,
+  mdH2: chalk5.hex("#D4D4D4"),
+  mdH3: chalk5.hex("#AAAAAA"),
+  mdCode: chalk5.hex("#BBBBBB"),
+  mdInlineCode: chalk5.hex("#CCCCCC"),
+  mdLink: chalk5.hex("#D4D4D4").underline,
   meterLow: chalk5.green,
   meterMid: chalk5.yellow,
   meterHigh: chalk5.red
@@ -2786,59 +3156,104 @@ 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
+var NOTCH_LARGE = [
+  "\u2588\u2588\u2584   \u2588  \u2584\u2588\u2588\u2580\u2580\u2588\u2588\u2584  \u2580\u2588\u2588\u2580\u2580\u2580\u2580  \u2584\u2588\u2588\u2580\u2580\u2588\u2588\u2584  \u2588\u2588  \u2588\u2588",
+  "\u2588\u2580\u2588\u2588  \u2588  \u2588\u2588    \u2588\u2588    \u2588\u2588      \u2588\u2588        \u2588\u2580\u2588\u2588\u2580\u2588",
+  "\u2588 \u2580\u2588\u2584 \u2588  \u2588\u2588    \u2588\u2588    \u2588\u2588      \u2588\u2588        \u2588  \u2580  \u2588",
+  "\u2588  \u2580\u2588\u2584\u2588  \u2588\u2588    \u2588\u2588    \u2588\u2588      \u2588\u2588        \u2588     \u2588",
+  "\u2588   \u2580\u2588\u2588  \u2588\u2588    \u2588\u2588    \u2588\u2588      \u2588\u2588    \u2588\u2588  \u2588     \u2588",
+  "\u2588    \u2588\u2588  \u2580\u2588\u2588\u2584\u2584\u2588\u2588\u2580    \u2588\u2588      \u2580\u2588\u2588\u2584\u2584\u2588\u2588\u2580  \u2588   \u2588",
+  "\u2580     \u2580    \u2580\u2580\u2580\u2580      \u2580\u2580        \u2580\u2580\u2580\u2580    \u2580   \u2580"
 ];
-var LOGO_INLINE = [
-  " \u2588\u2588\u2584  \u2588  \u2584\u2580\u2580\u2584 \u2580\u2588\u2580 \u2584\u2580\u2580\u2584 \u2588  \u2588",
-  " \u2588 \u2580\u2584 \u2588  \u2588  \u2588  \u2588  \u2588    \u2588\u2580\u2580\u2588",
-  " \u2588  \u2580\u2588\u2588  \u2580\u2584\u2584\u2580  \u2588  \u2580\u2584\u2584\u2580 \u2588  \u2588"
+var ROW_COLORS = [
+  "#666666",
+  // dim silver
+  "#888888",
+  // medium gray
+  "#AAAAAA",
+  // silver
+  "#CCCCCC",
+  // light silver
+  "#DDDDDD",
+  // near white
+  "#EEEEEE",
+  // bright
+  "#FFFFFF"
+  // pure white
+];
+function colorBannerLine(line, rowIndex) {
+  const t = theme();
+  if (t.name !== "Default") {
+    return t.brand(line);
+  }
+  const color = ROW_COLORS[rowIndex] ?? "#CCCCCC";
+  return chalk6.hex(color)(line);
+}
+var MANTIS = [
+  "  \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
 ];
 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();
   const termWidth = process.stdout.columns || 80;
   console.log("");
-  for (const line of MANTIS) {
-    console.log("  " + colorMantis(line));
+  for (let i = 0; i < NOTCH_LARGE.length; i++) {
+    console.log("  " + colorBannerLine(NOTCH_LARGE[i], i));
   }
   console.log("");
-  for (const line of LOGO_INLINE) {
-    console.log("  " + t.brand(line));
-  }
-  console.log("");
-  const divWidth = Math.min(50, termWidth - 4);
+  const mantisStr = MANTIS.map((l) => colorMantis(l));
+  const divWidth = Math.min(54, termWidth - 4);
   const divider = t.border("  " + "\u2500".repeat(divWidth));
   console.log(divider);
-  console.log(
-    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}`));
+  const info = [
+    t.dim("  ") + t.bold(modelLabel) + t.dim("  \u2502  v") + t.text(version),
+    t.dim("  ") + t.dim(project),
+    t.dim("  ") + t.dim("by ") + t.tagline("Driftrail")
+  ];
+  for (let i = 0; i < Math.max(mantisStr.length, info.length); i++) {
+    const left = i < mantisStr.length ? "  " + mantisStr[i] : "";
+    const right = i < info.length ? info[i] : "";
+    if (left && right) {
+      const rawLeft = "  " + MANTIS[i];
+      const pad = Math.max(0, 16 - rawLeft.length);
+      console.log(left + " ".repeat(pad) + right);
+    } else if (left) {
+      console.log(left);
+    } else {
+      console.log("  " + " ".repeat(14) + right);
+    }
+  }
   console.log(divider);
   console.log("");
 }
+function printWordmark(version) {
+  const t = theme();
+  const termWidth = process.stdout.columns || 80;
+  console.log("");
+  for (let i = 0; i < NOTCH_LARGE.length; i++) {
+    console.log("  " + colorBannerLine(NOTCH_LARGE[i], i));
+  }
+  console.log("");
+  const divWidth = Math.min(54, termWidth - 4);
+  console.log(t.border("  " + "\u2500".repeat(divWidth)));
+  console.log(t.dim("  v" + version) + t.dim("  \u2502  ") + t.tagline("by Driftrail"));
+  console.log(t.border("  " + "\u2500".repeat(divWidth)));
+  console.log("");
+}
 function printMantis() {
   const t = theme();
   console.log("");
@@ -2881,7 +3296,7 @@ function formatTokens(n) {
 import fs12 from "fs/promises";
 import path13 from "path";
 import os3 from "os";
-import chalk6 from "chalk";
+import chalk7 from "chalk";
 var CACHE_FILE = path13.join(os3.homedir(), ".notch", "update-check.json");
 var CHECK_INTERVAL = 24 * 60 * 60 * 1e3;
 var PACKAGE_NAME = "notch-cli";
@@ -2925,7 +3340,7 @@ function isNewer(latest, current) {
   return false;
 }
 function formatUpdateMessage(current, latest) {
-  return chalk6.yellow(`  Update available: ${current} -> ${latest}. Run: npm update -g ${PACKAGE_NAME}
+  return chalk7.yellow(`  Update available: ${current} -> ${latest}. Run: npm update -g ${PACKAGE_NAME}
 `);
 }
 async function loadCache() {
@@ -3279,7 +3694,7 @@ async function exportSession(messages, outputPath, meta) {
 // src/init.ts
 import fs16 from "fs/promises";
 import path17 from "path";
-import chalk7 from "chalk";
+import chalk8 from "chalk";
 var DEFAULT_CONFIG = {
   model: "notch-forge",
   temperature: 0.3,
@@ -3326,15 +3741,15 @@ async function initProject(projectRoot) {
   }
   if (!configExists) {
     await fs16.writeFile(configPath, JSON.stringify(DEFAULT_CONFIG, null, 2) + "\n", "utf-8");
-    console.log(chalk7.green(`  Created ${configPath}`));
+    console.log(chalk8.green(`  Created ${configPath}`));
   } else {
-    console.log(chalk7.gray(`  Skipped ${configPath} (already exists)`));
+    console.log(chalk8.gray(`  Skipped ${configPath} (already exists)`));
   }
   if (!instructionsExist) {
     await fs16.writeFile(instructionsPath, DEFAULT_INSTRUCTIONS, "utf-8");
-    console.log(chalk7.green(`  Created ${instructionsPath}`));
+    console.log(chalk8.green(`  Created ${instructionsPath}`));
   } else {
-    console.log(chalk7.gray(`  Skipped ${instructionsPath} (already exists)`));
+    console.log(chalk8.gray(`  Skipped ${instructionsPath} (already exists)`));
   }
   const gitignorePath = path17.join(projectRoot, ".gitignore");
   try {
@@ -3344,13 +3759,13 @@ async function initProject(projectRoot) {
     if (additions.length > 0) {
       const append = "\n# Notch CLI\n" + additions.join("\n") + "\n";
       await fs16.appendFile(gitignorePath, append, "utf-8");
-      console.log(chalk7.green(`  Updated .gitignore`));
+      console.log(chalk8.green(`  Updated .gitignore`));
     }
   } catch {
   }
   console.log("");
-  console.log(chalk7.cyan("  Notch initialized! Edit .notch.md to customize behavior."));
-  console.log(chalk7.gray('  Run "notch" to start.\n'));
+  console.log(chalk8.cyan("  Notch initialized! Edit .notch.md to customize behavior."));
+  console.log(chalk8.gray('  Run "notch" to start.\n'));
 }
 
 // src/tools/diff-preview.ts
@@ -3469,183 +3884,6 @@ function findSync(oldLines, newLines, oi, ni, lookAhead) {
   return null;
 }
 
-// src/mcp/client.ts
-import { spawn } from "child_process";
-import { z as z9 } from "zod";
-var MCPClient = class {
-  constructor(config, serverName) {
-    this.config = config;
-    this.serverName = serverName;
-  }
-  process = null;
-  requestId = 0;
-  pendingRequests = /* @__PURE__ */ new Map();
-  buffer = "";
-  serverName;
-  _tools = [];
-  /**
-   * Start the MCP server and initialize the connection.
-   */
-  async connect() {
-    this.process = spawn(this.config.command, this.config.args ?? [], {
-      stdio: ["pipe", "pipe", "pipe"],
-      env: { ...process.env, ...this.config.env },
-      cwd: this.config.cwd
-    });
-    this.process.stdout?.setEncoding("utf-8");
-    this.process.stdout?.on("data", (data) => {
-      this.buffer += data;
-      this.processBuffer();
-    });
-    this.process.on("error", (err) => {
-      for (const [id, pending] of this.pendingRequests) {
-        pending.reject(new Error(`MCP server ${this.serverName} error: ${err.message}`));
-        this.pendingRequests.delete(id);
-      }
-    });
-    this.process.on("exit", (code) => {
-      for (const [id, pending] of this.pendingRequests) {
-        pending.reject(new Error(`MCP server ${this.serverName} exited with code ${code}`));
-        this.pendingRequests.delete(id);
-      }
-    });
-    await this.sendRequest("initialize", {
-      protocolVersion: "2024-11-05",
-      capabilities: {},
-      clientInfo: { name: "notch-cli", version: "0.3.0" }
-    });
-    this.sendNotification("notifications/initialized", {});
-    const result = await this.sendRequest("tools/list", {});
-    this._tools = result.tools ?? [];
-  }
-  /**
-   * Get discovered tools from this server.
-   */
-  get tools() {
-    return this._tools;
-  }
-  /**
-   * Check if the MCP server process is still alive.
-   */
-  get isAlive() {
-    return this.process !== null && this.process.exitCode === null && !this.process.killed;
-  }
-  /**
-   * Call a tool on the MCP server. Auto-reconnects if the server has crashed.
-   */
-  async callTool(name, args) {
-    if (!this.isAlive) {
-      try {
-        await this.connect();
-      } catch (err) {
-        throw new Error(`MCP server ${this.serverName} is down and could not reconnect: ${err.message}`);
-      }
-    }
-    const result = await this.sendRequest("tools/call", { name, arguments: args });
-    return result;
-  }
-  /**
-   * Disconnect from the MCP server.
-   */
-  disconnect() {
-    if (this.process) {
-      this.process.stdin?.end();
-      this.process.kill();
-      this.process = null;
-    }
-    this.pendingRequests.clear();
-  }
-  sendRequest(method, params) {
-    return new Promise((resolve2, reject) => {
-      const id = ++this.requestId;
-      const msg = {
-        jsonrpc: "2.0",
-        id,
-        method,
-        params
-      };
-      this.pendingRequests.set(id, { resolve: resolve2, reject });
-      const data = JSON.stringify(msg);
-      const header = `Content-Length: ${Buffer.byteLength(data)}\r
-\r
-`;
-      this.process?.stdin?.write(header + data);
-      setTimeout(() => {
-        if (this.pendingRequests.has(id)) {
-          this.pendingRequests.delete(id);
-          reject(new Error(`MCP request ${method} timed out`));
-        }
-      }, 3e4);
-    });
-  }
-  sendNotification(method, params) {
-    const msg = {
-      jsonrpc: "2.0",
-      method,
-      params
-    };
-    const data = JSON.stringify(msg);
-    const header = `Content-Length: ${Buffer.byteLength(data)}\r
-\r
-`;
-    this.process?.stdin?.write(header + data);
-  }
-  processBuffer() {
-    while (this.buffer.length > 0) {
-      const headerEnd = this.buffer.indexOf("\r\n\r\n");
-      if (headerEnd === -1) break;
-      const header = this.buffer.slice(0, headerEnd);
-      const lengthMatch = header.match(/Content-Length:\s*(\d+)/i);
-      if (!lengthMatch) {
-        const nlIdx = this.buffer.indexOf("\n");
-        if (nlIdx === -1) break;
-        const line = this.buffer.slice(0, nlIdx).trim();
-        this.buffer = this.buffer.slice(nlIdx + 1);
-        if (line) this.handleMessage(line);
-        continue;
-      }
-      const contentLength = parseInt(lengthMatch[1], 10);
-      const messageStart = headerEnd + 4;
-      if (this.buffer.length < messageStart + contentLength) break;
-      const body = this.buffer.slice(messageStart, messageStart + contentLength);
-      this.buffer = this.buffer.slice(messageStart + contentLength);
-      this.handleMessage(body);
-    }
-  }
-  handleMessage(raw) {
-    try {
-      const msg = JSON.parse(raw);
-      if (msg.id !== void 0 && this.pendingRequests.has(msg.id)) {
-        const pending = this.pendingRequests.get(msg.id);
-        this.pendingRequests.delete(msg.id);
-        if (msg.error) {
-          pending.reject(new Error(`MCP error: ${msg.error.message}`));
-        } else {
-          pending.resolve(msg.result);
-        }
-      }
-    } catch {
-    }
-  }
-};
-function parseMCPConfig(config) {
-  const servers = config?.mcpServers;
-  if (!servers || typeof servers !== "object") return {};
-  const result = {};
-  for (const [name, cfg] of Object.entries(servers)) {
-    const c = cfg;
-    if (c?.command) {
-      result[name] = {
-        command: c.command,
-        args: c.args,
-        env: c.env,
-        cwd: c.cwd
-      };
-    }
-  }
-  return result;
-}
-
 // src/ui/completions.ts
 import fs17 from "fs";
 import path18 from "path";
@@ -3753,7 +3991,7 @@ function printModelTable(activeModel) {
 `));
 }
 function printHelp() {
-  console.log(chalk8.gray(`
+  console.log(chalk9.gray(`
   Commands:
     /model              \u2014 Show available models
     /model <name>       \u2014 Switch model (e.g., /model pyre)
@@ -3826,13 +4064,13 @@ async function main() {
     try {
       spinner.stop();
       const creds = await login();
-      console.log(chalk8.green(`
+      console.log(chalk9.green(`
   \u2713 Signed in as ${creds.email}`));
-      console.log(chalk8.gray(`  API key stored in ${(await import("./auth-GTGBXOSH.js")).getCredentialsPath()}
+      console.log(chalk9.gray(`  API key stored in ${(await import("./auth-JQX6MHJG.js")).getCredentialsPath()}
 `));
     } catch (err) {
       spinner.stop();
-      console.error(chalk8.red(`
+      console.error(chalk9.red(`
   Login failed: ${err.message}
 `));
       process.exit(1);
@@ -3842,10 +4080,10 @@ async function main() {
   if (promptArgs[0] === "logout") {
     const creds = await loadCredentials();
     if (!creds) {
-      console.log(chalk8.gray("\n  Not signed in.\n"));
+      console.log(chalk9.gray("\n  Not signed in.\n"));
     } else {
       await clearCredentials();
-      console.log(chalk8.green(`
+      console.log(chalk9.green(`
   \u2713 Signed out (${creds.email})
 `));
     }
@@ -3854,13 +4092,13 @@ async function main() {
   if (promptArgs[0] === "whoami") {
     const creds = await loadCredentials();
     if (!creds) {
-      console.log(chalk8.gray("\n  Not signed in. Run: notch login\n"));
+      console.log(chalk9.gray("\n  Not signed in. Run: notch login\n"));
     } else {
       const keyPreview = `${creds.token.slice(0, 12)}...`;
-      console.log(chalk8.gray(`
-  Signed in as ${chalk8.white(creds.email)}`));
-      console.log(chalk8.gray(`  Key: ${keyPreview}`));
-      console.log(chalk8.gray(`  Since: ${new Date(creds.createdAt).toLocaleDateString()}
+      console.log(chalk9.gray(`
+  Signed in as ${chalk9.white(creds.email)}`));
+      console.log(chalk9.gray(`  Key: ${keyPreview}`));
+      console.log(chalk9.gray(`  Since: ${new Date(creds.createdAt).toLocaleDateString()}
 `));
     }
     return;
@@ -3884,8 +4122,8 @@ async function main() {
   const config = await loadConfig(configOverrides);
   if (opts.model) {
     if (!isValidModel(opts.model)) {
-      console.error(chalk8.red(`  Unknown model: ${opts.model}`));
-      console.error(chalk8.gray(`  Available: ${modelChoices}`));
+      console.error(chalk9.red(`  Unknown model: ${opts.model}`));
+      console.error(chalk9.gray(`  Available: ${modelChoices}`));
       process.exit(1);
     }
     config.models.chat.model = opts.model;
@@ -3896,18 +4134,40 @@ 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) {
+      printWordmark(VERSION);
+      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.dev/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) => {
     if (msg) console.log(msg);
   });
   const hookTrustPrompt = async (commands) => {
-    console.warn(chalk8.yellow("\n\u26A0  This project contains hooks in .notch.json that will run shell commands:"));
-    commands.forEach((cmd) => console.warn(chalk8.gray(`   \u2022 ${cmd}`)));
+    console.warn(chalk9.yellow("\n\u26A0  This project contains hooks in .notch.json that will run shell commands:"));
+    commands.forEach((cmd) => console.warn(chalk9.gray(`   \u2022 ${cmd}`)));
     const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
     return new Promise((resolve2) => {
-      rl2.question(chalk8.yellow("\nAllow these hooks for this project? [y/N] "), (answer) => {
+      rl2.question(chalk9.yellow("\nAllow these hooks for this project? [y/N] "), (answer) => {
         rl2.close();
         resolve2(answer.trim().toLowerCase() === "y");
       });
@@ -3953,9 +4213,9 @@ ${repoMapStr}` : ""
         const client = new MCPClient(mcpConfig, name);
         await client.connect();
         mcpClients.push(client);
-        console.log(chalk8.green(`  MCP: Connected to ${name} (${client.tools.length} tools)`));
+        console.log(chalk9.green(`  MCP: Connected to ${name} (${client.tools.length} tools)`));
       } catch (err) {
-        console.log(chalk8.yellow(`  MCP: Could not connect to ${name}: ${err.message}`));
+        console.log(chalk9.yellow(`  MCP: Could not connect to ${name}: ${err.message}`));
       }
     }
   } catch {
@@ -3972,7 +4232,7 @@ ${repoMapStr}` : ""
         });
       });
     },
-    log: (msg) => console.log(chalk8.gray(`  ${msg}`)),
+    log: (msg) => console.log(chalk9.gray(`  ${msg}`)),
     checkPermission: config.permissionMode === "trust" ? () => "allow" : (toolName, args) => checkPermission(permissions, toolName, args),
     runHook: async (event, ctx) => {
       if (!config.enableHooks || hookConfig.hooks.length === 0) return;
@@ -3982,7 +4242,7 @@ ${repoMapStr}` : ""
       });
       for (const r of results) {
         if (!r.ok) {
-          console.log(chalk8.yellow(`  Hook failed (${r.hook.event}): ${r.error}`));
+          console.log(chalk9.yellow(`  Hook failed (${r.hook.event}): ${r.error}`));
         }
       }
     }
@@ -3994,10 +4254,10 @@ ${repoMapStr}` : ""
     if (session) {
       messages.push(...session.messages);
       sessionId = session.meta.id;
-      console.log(chalk8.green(`  Resumed session ${session.meta.id} (${session.meta.turns} turns)
+      console.log(chalk9.green(`  Resumed session ${session.meta.id} (${session.meta.turns} turns)
 `));
     } else {
-      console.log(chalk8.gray("  No session to resume.\n"));
+      console.log(chalk9.gray("  No session to resume.\n"));
     }
   }
   const pipedInput = await readStdin();
@@ -4018,10 +4278,10 @@ Analyze the above input.`;
     const refContext = formatReferences(references);
     const finalPrompt = refContext + cleanInput;
     messages.push({ role: "user", content: finalPrompt });
-    console.log(chalk8.cyan(`> ${oneShot || "(piped input)"}
+    console.log(chalk9.cyan(`> ${oneShot || "(piped input)"}
 `));
     if (references.length > 0) {
-      console.log(chalk8.gray(`  Injected ${references.length} reference(s)
+      console.log(chalk9.gray(`  Injected ${references.length} reference(s)
 `));
     }
     const spinner = ora("Thinking...").start();
@@ -4040,13 +4300,13 @@ Analyze the above input.`;
           onToolCall: (name, args) => {
             if (spinner.isSpinning) spinner.stop();
             const argSummary = Object.entries(args).map(([k, v]) => `${k}=${String(v).slice(0, 60)}`).join(", ");
-            console.log(chalk8.gray(`
+            console.log(chalk9.gray(`
   \u2192 ${name}(${argSummary})`));
           },
           onToolResult: (_name, result, isError) => {
             const preview = result.slice(0, 100).replace(/\n/g, " ");
-            const icon = isError ? chalk8.red("\u2717") : chalk8.green("\u2713");
-            console.log(chalk8.gray(`    ${icon} ${preview}${result.length > 100 ? "..." : ""}`));
+            const icon = isError ? chalk9.red("\u2717") : chalk9.green("\u2713");
+            console.log(chalk9.gray(`    ${icon} ${preview}${result.length > 100 ? "..." : ""}`));
           }
         })
       );
@@ -4059,7 +4319,7 @@ Analyze the above input.`;
           model: activeModelId
         });
         costTracker.record(activeModelId, response.usage.promptTokens, response.usage.completionTokens);
-        console.log(usage.formatLast());
+        console.log(usage.formatLast() + "  " + costTracker.formatLastCost());
       }
     } catch (err) {
       spinner.fail(`Error: ${err.message}`);
@@ -4071,7 +4331,7 @@ Analyze the above input.`;
     const savedPlan = await loadPlan(config.projectRoot);
     if (savedPlan) {
       ralphPlan = savedPlan;
-      console.log(chalk8.gray(`  Ralph plan loaded (${savedPlan.tasks.length} tasks)
+      console.log(chalk9.gray(`  Ralph plan loaded (${savedPlan.tasks.length} tasks)
 `));
     }
   } catch {
@@ -4083,7 +4343,7 @@ Analyze the above input.`;
     prompt: theme().prompt("notch> "),
     completer: (line) => completer(line)
   });
-  console.log(chalk8.gray("  Type your request, or /help for commands.\n"));
+  console.log(chalk9.gray("  Type your request, or /help for commands.\n"));
   rl.prompt();
   rl.on("line", async (line) => {
     const input = line.trim();
@@ -4099,7 +4359,7 @@ Analyze the above input.`;
       if (messages.length > 0) {
         try {
           const id = await saveSession(config.projectRoot, messages, { model: activeModelId });
-          console.log(chalk8.gray(`  Session saved: ${id}`));
+          console.log(chalk9.gray(`  Session saved: ${id}`));
         } catch {
         }
       }
@@ -4110,12 +4370,12 @@ Analyze the above input.`;
         }
       }
       await toolCtx.runHook?.("session-end", {});
-      console.log(chalk8.gray("\n  Goodbye!\n"));
+      console.log(chalk9.gray("\n  Goodbye!\n"));
       process.exit(0);
     }
     if (input === "/clear") {
       messages.length = 0;
-      console.log(chalk8.gray("  Conversation cleared.\n"));
+      console.log(chalk9.gray("  Conversation cleared.\n"));
       rl.prompt();
       return;
     }
@@ -4135,8 +4395,8 @@ Analyze the above input.`;
         newModel = `notch-${newModel}`;
       }
       if (!isValidModel(newModel)) {
-        console.log(chalk8.red(`  Unknown model: ${newModel}`));
-        console.log(chalk8.gray(`  Available: ${modelChoices}`));
+        console.log(chalk9.red(`  Unknown model: ${newModel}`));
+        console.log(chalk9.gray(`  Available: ${modelChoices}`));
         rl.prompt();
         return;
       }
@@ -4144,7 +4404,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})
+      console.log(chalk9.green(`  Switched to ${switchedInfo.label} (${switchedInfo.id})
 `));
       rl.prompt();
       return;
@@ -4157,22 +4417,22 @@ Analyze the above input.`;
         statusSpinner.succeed(`${statusInfo.label} (${activeModelId}) is reachable`);
       } else {
         statusSpinner.fail(check.error ?? "API unreachable");
-        console.log(chalk8.gray("  Tip: Set NOTCH_API_KEY or use --api-key, and verify your Modal endpoint is running.\n"));
+        console.log(chalk9.gray("  Tip: Set NOTCH_API_KEY or use --api-key, and verify your Modal endpoint is running.\n"));
       }
       rl.prompt();
       return;
     }
     if (input === "/undo") {
       if (checkpoints.undoCount === 0) {
-        console.log(chalk8.gray("  Nothing to undo.\n"));
+        console.log(chalk9.gray("  Nothing to undo.\n"));
         rl.prompt();
         return;
       }
       const undone = await checkpoints.undo();
       if (undone) {
         const fileCount = undone.files.length;
-        console.log(chalk8.yellow(`  Undid "${undone.description}" (${fileCount} file${fileCount !== 1 ? "s" : ""} restored)`));
-        console.log(chalk8.gray(`  ${checkpoints.undoCount} checkpoint${checkpoints.undoCount !== 1 ? "s" : ""} remaining
+        console.log(chalk9.yellow(`  Undid "${undone.description}" (${fileCount} file${fileCount !== 1 ? "s" : ""} restored)`));
+        console.log(chalk9.gray(`  ${checkpoints.undoCount} checkpoint${checkpoints.undoCount !== 1 ? "s" : ""} remaining
 `));
       }
       rl.prompt();
@@ -4180,7 +4440,7 @@ Analyze the above input.`;
     }
     if (input === "/usage") {
       if (usage.turnCount === 0) {
-        console.log(chalk8.gray("  No usage yet.\n"));
+        console.log(chalk9.gray("  No usage yet.\n"));
       } else {
         console.log(usage.formatSession());
         const currentTokens = estimateTokens(messages);
@@ -4193,7 +4453,7 @@ Analyze the above input.`;
     }
     if (input === "/cost") {
       if (costTracker.totalCost === 0) {
-        console.log(chalk8.gray("  No cost data yet.\n"));
+        console.log(chalk9.gray("  No cost data yet.\n"));
       } else {
         console.log(costTracker.formatTotal());
         console.log(costTracker.formatByModel());
@@ -4208,7 +4468,7 @@ Analyze the above input.`;
       const compressed = await autoCompress2(messages, model, MODEL_CATALOG[activeModelId].contextWindow);
       messages.length = 0;
       messages.push(...compressed);
-      console.log(chalk8.green(`  Compressed: ${before} messages \u2192 ${messages.length} messages`));
+      console.log(chalk9.green(`  Compressed: ${before} messages \u2192 ${messages.length} messages`));
       console.log("");
       rl.prompt();
       return;
@@ -4216,10 +4476,10 @@ Analyze the above input.`;
     if (input === "/diff") {
       const diffs = checkpoints.allDiffs();
       if (diffs.length === 0) {
-        console.log(chalk8.gray("  No file changes this session.\n"));
+        console.log(chalk9.gray("  No file changes this session.\n"));
       } else {
         for (const df of diffs) {
-          console.log(chalk8.cyan(`  ${df.path}:`));
+          console.log(chalk9.cyan(`  ${df.path}:`));
           console.log(unifiedDiff(df.before, df.after, df.path));
           console.log("");
         }
@@ -4235,10 +4495,10 @@ Analyze the above input.`;
           projectRoot: config.projectRoot,
           outputPath: exportPath
         });
-        console.log(chalk8.green(`  Exported to ${ePath}
+        console.log(chalk9.green(`  Exported to ${ePath}
 `));
       } catch (err) {
-        console.log(chalk8.red(`  Export failed: ${err.message}
+        console.log(chalk9.red(`  Export failed: ${err.message}
 `));
       }
       rl.prompt();
@@ -4248,10 +4508,10 @@ Analyze the above input.`;
       try {
         const id = await saveSession(config.projectRoot, messages, { model: activeModelId });
         sessionId = id;
-        console.log(chalk8.green(`  Session saved: ${id}
+        console.log(chalk9.green(`  Session saved: ${id}
 `));
       } catch (err) {
-        console.log(chalk8.red(`  Save failed: ${err.message}
+        console.log(chalk9.red(`  Save failed: ${err.message}
 `));
       }
       rl.prompt();
@@ -4261,16 +4521,16 @@ Analyze the above input.`;
       try {
         const sessions = await listSessions(config.projectRoot);
         if (sessions.length === 0) {
-          console.log(chalk8.gray("  No saved sessions.\n"));
+          console.log(chalk9.gray("  No saved sessions.\n"));
         } else {
-          console.log(chalk8.gray("\n  Saved sessions:\n"));
+          console.log(chalk9.gray("\n  Saved sessions:\n"));
           for (const s of sessions.slice(0, 10)) {
-            console.log(chalk8.gray(`    ${s.id}  ${s.turns} turns  ${s.date}  ${s.model}`));
+            console.log(chalk9.gray(`    ${s.id}  ${s.turns} turns  ${s.date}  ${s.model}`));
           }
           console.log("");
         }
       } catch (err) {
-        console.log(chalk8.red(`  Error listing sessions: ${err.message}
+        console.log(chalk9.red(`  Error listing sessions: ${err.message}
 `));
       }
       rl.prompt();
@@ -4288,18 +4548,18 @@ Analyze the above input.`;
             const savedPlan = await loadPlan(config.projectRoot);
             if (savedPlan) {
               ralphPlan = savedPlan;
-              console.log(chalk8.green(`  Ralph plan restored (${savedPlan.tasks.length} tasks)
+              console.log(chalk9.green(`  Ralph plan restored (${savedPlan.tasks.length} tasks)
 `));
             }
           } catch {
           }
-          console.log(chalk8.green(`  Resumed session ${session.meta.id} (${session.meta.turns} turns)
+          console.log(chalk9.green(`  Resumed session ${session.meta.id} (${session.meta.turns} turns)
 `));
         } else {
-          console.log(chalk8.gray("  No session found.\n"));
+          console.log(chalk9.gray("  No session found.\n"));
         }
       } catch (err) {
-        console.log(chalk8.red(`  Resume failed: ${err.message}
+        console.log(chalk9.red(`  Resume failed: ${err.message}
 `));
       }
       rl.prompt();
@@ -4308,7 +4568,7 @@ Analyze the above input.`;
     if (input.startsWith("/search ")) {
       const query = input.replace("/search ", "").trim().toLowerCase();
       if (!query) {
-        console.log(chalk8.gray("  Usage: /search <query>\n"));
+        console.log(chalk9.gray("  Usage: /search <query>\n"));
         rl.prompt();
         return;
       }
@@ -4325,14 +4585,14 @@ Analyze the above input.`;
         }
       }
       if (matches.length === 0) {
-        console.log(chalk8.gray(`  No matches for "${query}"
+        console.log(chalk9.gray(`  No matches for "${query}"
 `));
       } else {
-        console.log(chalk8.gray(`
+        console.log(chalk9.gray(`
   ${matches.length} match(es) for "${query}":
 `));
         for (const m of matches.slice(0, 10)) {
-          console.log(chalk8.gray(`    [${m.index}] ${m.role}: ${m.preview}`));
+          console.log(chalk9.gray(`    [${m.index}] ${m.role}: ${m.preview}`));
         }
         console.log("");
       }
@@ -4346,7 +4606,7 @@ Analyze the above input.`;
         activePlan = await generatePlan(task, model, systemPrompt);
         planSpinner.succeed("Plan generated");
         console.log(formatPlan(activePlan));
-        console.log(chalk8.gray("  Use /plan approve to execute, /plan edit to modify, or /plan cancel to discard.\n"));
+        console.log(chalk9.gray("  Use /plan approve to execute, /plan edit to modify, or /plan cancel to discard.\n"));
       } catch (err) {
         planSpinner.fail(`Plan failed: ${err.message}`);
       }
@@ -4355,11 +4615,11 @@ Analyze the above input.`;
     }
     if (input === "/plan approve") {
       if (!activePlan) {
-        console.log(chalk8.gray("  No active plan. Use /plan <task> to create one.\n"));
+        console.log(chalk9.gray("  No active plan. Use /plan <task> to create one.\n"));
         rl.prompt();
         return;
       }
-      console.log(chalk8.green("  Executing plan...\n"));
+      console.log(chalk9.green("  Executing plan...\n"));
       while (!isPlanComplete(activePlan)) {
         const stepPrompt = currentStepPrompt(activePlan);
         messages.push({ role: "user", content: stepPrompt });
@@ -4377,10 +4637,10 @@ Analyze the above input.`;
             },
             onToolCall: (name) => {
               if (planStepSpinner.isSpinning) planStepSpinner.stop();
-              console.log(chalk8.gray(`  \u2192 ${name}`));
+              console.log(chalk9.gray(`  \u2192 ${name}`));
             },
             onToolResult: (_name, _result, isError) => {
-              console.log(isError ? chalk8.red("    \u2717") : chalk8.green("    \u2713"));
+              console.log(isError ? chalk9.red("    \u2717") : chalk9.green("    \u2713"));
             }
           });
           console.log("\n");
@@ -4393,7 +4653,7 @@ Analyze the above input.`;
         }
       }
       if (activePlan && isPlanComplete(activePlan)) {
-        console.log(chalk8.green("  Plan completed!\n"));
+        console.log(chalk9.green("  Plan completed!\n"));
       }
       activePlan = null;
       rl.prompt();
@@ -4401,26 +4661,26 @@ Analyze the above input.`;
     }
     if (input === "/plan edit") {
       if (!activePlan) {
-        console.log(chalk8.gray("  No active plan to edit.\n"));
+        console.log(chalk9.gray("  No active plan to edit.\n"));
         rl.prompt();
         return;
       }
       console.log(formatPlan(activePlan));
-      console.log(chalk8.gray("  Type a modified plan description and use /plan <new task> to regenerate,"));
-      console.log(chalk8.gray("  or /plan approve to proceed with the current plan.\n"));
+      console.log(chalk9.gray("  Type a modified plan description and use /plan <new task> to regenerate,"));
+      console.log(chalk9.gray("  or /plan approve to proceed with the current plan.\n"));
       rl.prompt();
       return;
     }
     if (input === "/plan cancel") {
       activePlan = null;
-      console.log(chalk8.gray("  Plan discarded.\n"));
+      console.log(chalk9.gray("  Plan discarded.\n"));
       rl.prompt();
       return;
     }
     if (input.startsWith("/agent ")) {
       const task = input.replace("/agent ", "").trim();
       const agentId = nextSubagentId();
-      console.log(chalk8.cyan(`  Spawning subagent #${agentId}: ${task}
+      console.log(chalk9.cyan(`  Spawning subagent #${agentId}: ${task}
 `));
       spawnSubagent({
         id: agentId,
@@ -4430,14 +4690,14 @@ Analyze the above input.`;
         toolContext: toolCtx,
         contextWindow: MODEL_CATALOG[activeModelId].contextWindow,
         onComplete: (result) => {
-          console.log(chalk8.green(`
+          console.log(chalk9.green(`
   Subagent #${agentId} finished:`));
-          console.log(chalk8.gray(`  ${result.slice(0, 200)}
+          console.log(chalk9.gray(`  ${result.slice(0, 200)}
 `));
           rl.prompt();
         },
         onError: (err) => {
-          console.log(chalk8.red(`
+          console.log(chalk9.red(`
   Subagent #${agentId} failed: ${err}
 `));
           rl.prompt();
@@ -4450,18 +4710,18 @@ Analyze the above input.`;
       try {
         const memories = await loadMemories(config.projectRoot);
         if (memories.length === 0) {
-          console.log(chalk8.gray("  No saved memories.\n"));
+          console.log(chalk9.gray("  No saved memories.\n"));
         } else {
-          console.log(chalk8.gray(`
+          console.log(chalk9.gray(`
   ${memories.length} saved memories:
 `));
           for (const m of memories) {
-            console.log(chalk8.gray(`    [${m.type}] ${m.content.slice(0, 80)}`));
+            console.log(chalk9.gray(`    [${m.type}] ${m.content.slice(0, 80)}`));
           }
           console.log("");
         }
       } catch (err) {
-        console.log(chalk8.red(`  Error: ${err.message}
+        console.log(chalk9.red(`  Error: ${err.message}
 `));
       }
       rl.prompt();
@@ -4472,16 +4732,16 @@ Analyze the above input.`;
       try {
         const results = await searchMemories(config.projectRoot, query);
         if (results.length === 0) {
-          console.log(chalk8.gray(`  No memories matching "${query}"
+          console.log(chalk9.gray(`  No memories matching "${query}"
 `));
         } else {
           for (const m of results) {
-            console.log(chalk8.gray(`    [${m.type}] ${m.content.slice(0, 100)}`));
+            console.log(chalk9.gray(`    [${m.type}] ${m.content.slice(0, 100)}`));
           }
           console.log("");
         }
       } catch (err) {
-        console.log(chalk8.red(`  Error: ${err.message}
+        console.log(chalk9.red(`  Error: ${err.message}
 `));
       }
       rl.prompt();
@@ -4493,10 +4753,10 @@ Analyze the above input.`;
         for (const m of memories) {
           await deleteMemory(config.projectRoot, m.id);
         }
-        console.log(chalk8.yellow(`  Cleared ${memories.length} memories.
+        console.log(chalk9.yellow(`  Cleared ${memories.length} memories.
 `));
       } catch (err) {
-        console.log(chalk8.red(`  Error: ${err.message}
+        console.log(chalk9.red(`  Error: ${err.message}
 `));
       }
       rl.prompt();
@@ -4524,27 +4784,27 @@ Analyze the above input.`;
     }
     if (input === "/ralph run") {
       if (!ralphPlan) {
-        console.log(chalk8.gray("  No Ralph plan. Use /ralph plan <goal> first.\n"));
+        console.log(chalk9.gray("  No Ralph plan. Use /ralph plan <goal> first.\n"));
         rl.prompt();
         return;
       }
-      console.log(chalk8.green("  Ralph is running...\n"));
+      console.log(chalk9.green("  Ralph is running...\n"));
       try {
         ralphPlan = await runRalphLoop(ralphPlan, {
           model,
           systemPrompt,
           toolContext: toolCtx,
           contextWindow: MODEL_CATALOG[activeModelId].contextWindow,
-          onTaskStart: (task) => console.log(chalk8.cyan(`  \u25B6 Task: ${task.description}`)),
-          onTaskComplete: (task) => console.log(chalk8.green(`  \u2713 Done: ${task.description}
+          onTaskStart: (task) => console.log(chalk9.cyan(`  \u25B6 Task: ${task.description}`)),
+          onTaskComplete: (task) => console.log(chalk9.green(`  \u2713 Done: ${task.description}
 `)),
-          onTaskFail: (task, err) => console.log(chalk8.red(`  \u2717 Failed: ${task.description} (${err})
+          onTaskFail: (task, err) => console.log(chalk9.red(`  \u2717 Failed: ${task.description} (${err})
 `))
         });
         await savePlan(config.projectRoot, ralphPlan);
         console.log(formatRalphStatus(ralphPlan));
       } catch (err) {
-        console.log(chalk8.red(`  Ralph error: ${err.message}
+        console.log(chalk9.red(`  Ralph error: ${err.message}
 `));
       }
       rl.prompt();
@@ -4552,7 +4812,7 @@ Analyze the above input.`;
     }
     if (input === "/ralph status") {
       if (!ralphPlan) {
-        console.log(chalk8.gray("  No Ralph plan active.\n"));
+        console.log(chalk9.gray("  No Ralph plan active.\n"));
       } else {
         console.log(formatRalphStatus(ralphPlan));
       }
@@ -4563,26 +4823,26 @@ Analyze the above input.`;
       ralphPlan = null;
       await deletePlan(config.projectRoot).catch(() => {
       });
-      console.log(chalk8.gray("  Ralph plan cleared.\n"));
+      console.log(chalk9.gray("  Ralph plan cleared.\n"));
       rl.prompt();
       return;
     }
     if (input === "/branch") {
       const branchId = `branch-${branches.size + 1}`;
       branches.set(branchId, [...messages]);
-      console.log(chalk8.green(`  Forked conversation as "${branchId}" (${messages.length} messages)
+      console.log(chalk9.green(`  Forked conversation as "${branchId}" (${messages.length} messages)
 `));
       rl.prompt();
       return;
     }
     if (input === "/branches") {
       if (branches.size === 0) {
-        console.log(chalk8.gray("  No conversation branches. Use /branch to fork.\n"));
+        console.log(chalk9.gray("  No conversation branches. Use /branch to fork.\n"));
       } else {
-        console.log(chalk8.gray("\n  Branches:\n"));
+        console.log(chalk9.gray("\n  Branches:\n"));
         for (const [name, msgs] of branches) {
-          const marker = name === currentBranch ? chalk8.green(" \u25CF") : "  ";
-          console.log(chalk8.gray(`  ${marker} ${name}  (${msgs.length} messages)`));
+          const marker = name === currentBranch ? chalk9.green(" \u25CF") : "  ";
+          console.log(chalk9.gray(`  ${marker} ${name}  (${msgs.length} messages)`));
         }
         console.log("");
       }
@@ -4619,8 +4879,8 @@ Analyze the above input.`;
       return;
     }
     if (input.startsWith("/")) {
-      console.log(chalk8.red(`  Unknown command: ${input}`));
-      console.log(chalk8.gray("  Type /help for available commands.\n"));
+      console.log(chalk9.red(`  Unknown command: ${input}`));
+      console.log(chalk9.gray("  Type /help for available commands.\n"));
       rl.prompt();
       return;
     }
@@ -4628,7 +4888,7 @@ Analyze the above input.`;
     const refContext = formatReferences(references);
     const finalPrompt = refContext + cleanInput;
     if (references.length > 0) {
-      console.log(chalk8.gray(`  Injected ${references.length} reference(s)`));
+      console.log(chalk9.gray(`  Injected ${references.length} reference(s)`));
     }
     messages.push({ role: "user", content: finalPrompt });
     const spinner = ora("Thinking...").start();
@@ -4654,16 +4914,16 @@ Analyze the above input.`;
               const val = String(v);
               return `${k}=${val.length > 60 ? val.slice(0, 60) + "..." : val}`;
             }).join(", ");
-            console.log(chalk8.gray(`
+            console.log(chalk9.gray(`
   \u2192 ${name}(${argSummary})`));
           },
           onToolResult: (_name, result, isError) => {
             const preview = result.slice(0, 100).replace(/\n/g, " ");
-            const icon = isError ? chalk8.red("\u2717") : chalk8.green("\u2713");
-            console.log(chalk8.gray(`    ${icon} ${preview}${result.length > 100 ? "..." : ""}`));
+            const icon = isError ? chalk9.red("\u2717") : chalk9.green("\u2713");
+            console.log(chalk9.gray(`    ${icon} ${preview}${result.length > 100 ? "..." : ""}`));
           },
           onCompress: () => {
-            console.log(chalk8.yellow("\n  [Context compressed to fit window]\n"));
+            console.log(chalk9.yellow("\n  [Context compressed to fit window]\n"));
           }
         })
       );
@@ -4677,7 +4937,7 @@ Analyze the above input.`;
           model: activeModelId
         });
         costTracker.record(activeModelId, response.usage.promptTokens, response.usage.completionTokens);
-        console.log(usage.formatLast());
+        console.log(usage.formatLast() + "  " + costTracker.formatLastCost());
         const currentTokens = estimateTokens(messages);
         const ctxWindow = MODEL_CATALOG[activeModelId].contextWindow;
         if (currentTokens > ctxWindow * 0.5) {
@@ -4696,7 +4956,7 @@ Analyze the above input.`;
               type: "auto",
               content: memMatch[1]
             });
-            console.log(chalk8.gray("  (Saved to memory)\n"));
+            console.log(chalk9.gray("  (Saved to memory)\n"));
           } catch {
           }
         }
@@ -4706,13 +4966,13 @@ Analyze the above input.`;
       checkpoints.discard();
       const msg = err.message?.toLowerCase() ?? "";
       if (msg.includes("fetch") || msg.includes("econnrefused") || msg.includes("network")) {
-        console.log(chalk8.gray("  Tip: Check that your Notch endpoint is running. Use /status to verify.\n"));
+        console.log(chalk9.gray("  Tip: Check that your Notch endpoint is running. Use /status to verify.\n"));
       } else if (msg.includes("401") || msg.includes("unauthorized") || msg.includes("api key")) {
-        console.log(chalk8.gray("  Tip: Set NOTCH_API_KEY env var or use --api-key flag.\n"));
+        console.log(chalk9.gray("  Tip: Set NOTCH_API_KEY env var or use --api-key flag.\n"));
       } else if (msg.includes("429") || msg.includes("rate limit")) {
-        console.log(chalk8.gray("  Tip: Rate limited. Wait a moment and try again.\n"));
+        console.log(chalk9.gray("  Tip: Rate limited. Wait a moment and try again.\n"));
       } else {
-        console.log(chalk8.gray("  (The conversation history is preserved. Try again.)\n"));
+        console.log(chalk9.gray("  (The conversation history is preserved. Try again.)\n"));
       }
     }
     rl.prompt();
@@ -4730,13 +4990,13 @@ async function handleRalphSubcommand(args, cliOpts) {
     cwd: config.projectRoot,
     requireConfirm: false,
     confirm: async () => true,
-    log: (msg) => console.log(chalk8.gray(`  ${msg}`))
+    log: (msg) => console.log(chalk9.gray(`  ${msg}`))
   };
   const subcommand = args[0];
   if (subcommand === "plan") {
     const goal = args.slice(1).join(" ");
     if (!goal) {
-      console.error(chalk8.red("  Usage: notch ralph plan <goal>"));
+      console.error(chalk9.red("  Usage: notch ralph plan <goal>"));
       process.exit(1);
     }
     const spinner = ora("Ralph is planning...").start();
@@ -4747,7 +5007,7 @@ async function handleRalphSubcommand(args, cliOpts) {
   } else if (subcommand === "run") {
     let plan = await loadPlan(config.projectRoot);
     if (!plan) {
-      console.error(chalk8.red("  No plan found. Run: notch ralph plan <goal>"));
+      console.error(chalk9.red("  No plan found. Run: notch ralph plan <goal>"));
       process.exit(1);
     }
     plan = await runRalphLoop(plan, {
@@ -4755,27 +5015,27 @@ async function handleRalphSubcommand(args, cliOpts) {
       systemPrompt,
       toolContext: toolCtx,
       contextWindow: MODEL_CATALOG[config.models.chat.model].contextWindow,
-      onTaskStart: (t) => console.log(chalk8.cyan(`  \u25B6 ${t.description}`)),
-      onTaskComplete: (t) => console.log(chalk8.green(`  \u2713 ${t.description}`)),
-      onTaskFail: (t, e) => console.log(chalk8.red(`  \u2717 ${t.description}: ${e}`))
+      onTaskStart: (t) => console.log(chalk9.cyan(`  \u25B6 ${t.description}`)),
+      onTaskComplete: (t) => console.log(chalk9.green(`  \u2713 ${t.description}`)),
+      onTaskFail: (t, e) => console.log(chalk9.red(`  \u2717 ${t.description}: ${e}`))
     });
     await savePlan(config.projectRoot, plan);
     console.log(formatRalphStatus(plan));
   } else if (subcommand === "status") {
     const plan = await loadPlan(config.projectRoot);
     if (!plan) {
-      console.log(chalk8.gray("  No Ralph plan found."));
+      console.log(chalk9.gray("  No Ralph plan found."));
     } else {
       console.log(formatRalphStatus(plan));
     }
   } else {
-    console.error(chalk8.red(`  Unknown: notch ralph ${subcommand}`));
-    console.error(chalk8.gray("  Usage: notch ralph <plan|run|status>"));
+    console.error(chalk9.red(`  Unknown: notch ralph ${subcommand}`));
+    console.error(chalk9.gray("  Usage: notch ralph <plan|run|status>"));
     process.exit(1);
   }
 }
 main().catch((err) => {
-  console.error(chalk8.red(`
+  console.error(chalk9.red(`
 Fatal: ${err.message}
 `));
   process.exit(1);