aether-code 0.33.4 → 0.33.6

package/bin/aether-code.js

@@ -28,7 +28,7 @@ import {
 import readline from "node:readline";
 import { c, errorLine, divider, setTerminalTitle } from "../src/render.js";
 
-const VERSION = "0.33.4";
+const VERSION = "0.33.6";
 
 /**
  * Try to start MCP servers from ~/.aether/mcp.json. Returns a started

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aether-code",
-  "version": "0.33.4",
+  "version": "0.33.6",
   "description": "Uncensored AI coding agent for your terminal — Claude Code alternative with MCP support. Reads code, writes files, runs commands. Drives IDA Pro, Roblox Studio, Wireshark, Blender, and any MCP server. No refusal layer.",
   "homepage": "https://trynoguard.com",
   "repository": {

package/src/box-input.js

@@ -113,15 +113,17 @@ export function promptBox({ history = [], placeholder = "Message Aether...", mod
       // Bare prompt — just "> " like Claude Code
       const promptLine = c.dim(prefixStr) + content;
 
-      // Bottom status bar — matches Claude's "manual mode on · ? for shortcuts · + for agents"
+      // Bottom status bar — colored block prefix like Claude's
+      const blk = (code) => `\x1b[${code}m \x1b[0m`;
+      const barPrefix = blk(46) + blk(44);
       const imgNote = clipImages.length > 0 ? c.cyan(" images queued") + c.dim(" \xB7 ") : "";
-      const statusBar = c.dim(
-        mode + " mode" +
+      const statusText = c.dim(
+        " " + mode + " mode" +
         " \xB7 " + "? for shortcuts" +
         " \xB7 " + "@file for images",
       ) + imgNote;
 
-      process.stdout.write(promptLine + "\n" + statusBar + "\n");
+      process.stdout.write(promptLine + "\n" + barPrefix + statusText + "\n");
       drawn = 2;
     };
 
@@ -140,11 +142,15 @@ export function promptBox({ history = [], placeholder = "Message Aether...", mod
 
       if (finalResult && finalResult !== EXIT_SIGNAL) {
         const echoText = (result || "").trim();
-        const suffix = clipImages.length > 0
-          ? c.cyan(` [+${clipImages.length} image${clipImages.length > 1 ? "s" : ""}]`)
+        const imgTag = clipImages.length > 0
+          ? ` [+${clipImages.length} image${clipImages.length > 1 ? "s" : ""}]`
           : "";
         if (echoText || clipImages.length > 0) {
-          process.stdout.write(c.cyan("> ") + (echoText || c.dim("(image)")) + suffix + "\n");
+          const displayText = echoText || "(image)";
+          const cols = process.stdout.columns || 80;
+          const textLen = displayText.length + imgTag.length + 2;
+          const pad = Math.max(0, cols - textLen);
+          process.stdout.write(`\x1b[48;5;236m  ${displayText}${imgTag}${" ".repeat(pad)}\x1b[0m\n`);
         }
       }
       resolve(finalResult);

package/src/render.js

@@ -1,257 +1,268 @@
-// ANSI helpers — no chalk dependency.
-
-const isTty = process.stdout.isTTY;
-const noColor = !!process.env.NO_COLOR || !isTty;
-
-function wrap(open, close) {
-  return (s) => (noColor ? String(s) : `\x1b[${open}m${s}\x1b[${close}m`);
-}
-
-export const c = {
-  bold:    wrap(1, 22),
-  dim:     wrap(2, 22),
-  red:     wrap(31, 39),
-  green:   wrap(32, 39),
-  yellow:  wrap(33, 39),
-  blue:    wrap(34, 39),
-  magenta: wrap(35, 39),
-  cyan:    wrap(36, 39),
-  gray:    wrap(90, 39),
-};
-
-export function divider() {
-  const w = process.stdout.columns || 60;
-  return c.gray("─".repeat(Math.min(60, w)));
-}
-
-const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
-
-// Draw a bordered box around content lines, returning the rows as an array (so
-// boxes can be composed side by side). Rounded box-drawing chars.
-export function boxLines(lines, { color = c.gray, padX = 2, minInner = 0 } = {}) {
-  const inner = Math.max(minInner, 0, ...lines.map((l) => stripAnsi(l).length));
-  const w = inner + padX * 2;
-  const top = color("╭" + "─".repeat(w) + "╮");
-  const bot = color("╰" + "─".repeat(w) + "╯");
-  const mid = lines.map(
-    (l) => color("│") + " ".repeat(padX) + l + " ".repeat(inner - stripAnsi(l).length + padX) + color("│"),
-  );
-  return [top, ...mid, bot];
-}
-
-export function box(lines, opts) {
-  return boxLines(lines, opts).join("\n");
-}
-
-// Join two blocks of lines horizontally with a gap, padding the left block to a
-// uniform width so the right block aligns. Shorter block is padded with blanks.
-export function sideBySide(a, b, gap = 3) {
-  const wa = Math.max(0, ...a.map((l) => stripAnsi(l).length));
-  const h = Math.max(a.length, b.length);
-  const out = [];
-  for (let i = 0; i < h; i++) {
-    const la = a[i] ?? "";
-    const lb = b[i] ?? "";
-    out.push(la + " ".repeat(wa - stripAnsi(la).length + gap) + lb);
-  }
-  return out.join("\n");
-}
-
-export function turn(n) {
-  return c.gray(`turn ${n}`);
-}
-
-export function toolHeader(name, args) {
-  // Format args compactly. If any value is huge, truncate it.
-  const compact = JSON.stringify(args);
-  const trimmed = compact.length > 120 ? compact.slice(0, 117) + "..." : compact;
-  return `${c.cyan(c.bold(name))}${c.gray("(")}${c.gray(trimmed)}${c.gray(")")}`;
-}
-
-const ellip = (s, n) => (s && s.length > n ? s.slice(0, n - 1) + "…" : s || "");
-
-// Clean one-line label for a tool call — a verb + its key argument, instead of
-// dumping raw JSON (which buried file contents / queries in noise).
-export function toolLabel(name, args) {
-  const a = args || {};
-  const verb = (v) => c.cyan(c.bold(v));
-  const arg = (s) => c.gray(ellip(s == null ? "" : String(s), 72));
-  switch (name) {
-    case "read_file":    return `${verb("read")}   ${arg(a.path)}`;
-    case "write_file":   return `${verb("write")}  ${arg(a.path)}`;
-    case "edit_file":    return `${verb("edit")}   ${arg(a.path)}`;
-    case "list_dir":     return `${verb("list")}   ${arg(a.path)}`;
-    case "glob_files":   return `${verb("find")}   ${arg(a.pattern)}`;
-    case "search_files": return `${verb("search")} ${arg(`/${a.pattern}/ in ${a.path ?? "."}`)}`;
-    case "run_shell":    return `${verb("run")}    ${arg(a.command)}`;
-    case "web_search":   return `${verb("search web")} ${arg(JSON.stringify(a.query ?? ""))}`;
-    case "web_fetch":    return `${verb("fetch")}  ${arg(a.url)}`;
-    case "todo_write":   return ""; // its Plan box is the label
-    case "ask_user":     return ""; // the interactive menu is its display
-    default:             return `${verb(name)} ${arg(JSON.stringify(a))}`;
-  }
-}
-
-// Set the terminal window/tab title (so cmd.exe shows "Aether", not the node
-// path). OSC 0 — supported by cmd.exe, Windows Terminal, and POSIX terminals.
-export function setTerminalTitle(title) {
-  if (process.stdout.isTTY) process.stdout.write(`\x1b]0;${title}\x07`);
-}
-
-// Live "working…" spinner with optional live metrics (token count, status).
-// Rewrites a single line in place (\r) with a rotating half-circle + elapsed
-// time (mm:ss when > 60s) + any metrics fed via update(). stop() clears the
-// line and restores the cursor. No-op in non-TTY.
-export function startSpinner(label) {
-  if (!process.stdout.isTTY) return { stop: () => {}, update: () => {} };
-  const frames = ["◐", "◓", "◑", "◒"];
-  const t0 = Date.now();
-  let i = 0;
-  let tokenCount = 0;
-  let statusText = "";
-  process.stdout.write("\x1b[?25l"); // hide cursor
-  const render = () => {
-    const ms = Date.now() - t0;
-    const secs = Math.floor(ms / 1000);
-    const timeFmt = secs >= 60
-      ? `${Math.floor(secs / 60)}m ${String(secs % 60).padStart(2, "0")}s`
-      : `${secs}s`;
-    const parts = [];
-    if (secs > 0) parts.push(timeFmt);
-    if (tokenCount > 0) parts.push(`↓ ${fmtTokens(tokenCount)} tokens`);
-    if (statusText) parts.push(statusText);
-    const metrics = parts.length > 0 ? c.gray(` (${parts.join(" · ")})`) : "";
-    process.stdout.write(`\r\x1b[K${c.cyan(frames[i % frames.length])} ${c.gray(label + "…")}${metrics}`);
-    i++;
-  };
-  render();
-  const timer = setInterval(render, 120);
-  if (typeof timer.unref === "function") timer.unref(); // don't keep the process alive
-  return {
-    update(data) {
-      if (data.tokens != null) tokenCount = data.tokens;
-      if (data.status != null) statusText = data.status;
-    },
-    stop() {
-      clearInterval(timer);
-      process.stdout.write("\r\x1b[K\x1b[?25h"); // clear line + show cursor
-    },
-  };
-}
-
-// Human-friendly token count (14.2k, 1.3M, etc.)
-export function fmtTokens(n) {
-  if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + "M";
-  if (n >= 1_000) return (n / 1_000).toFixed(1) + "k";
-  return String(n);
-}
-
-// Compact one-line turn summary printed after each agent turn completes.
-export function turnStats({ elapsed, tokensIn, tokensOut, tools, credits }) {
-  const parts = [];
-  if (elapsed > 0) {
-    const s = Math.floor(elapsed / 1000);
-    parts.push(s >= 60 ? `${Math.floor(s / 60)}m ${String(s % 60).padStart(2, "0")}s` : `${s}s`);
-  }
-  if (tokensIn > 0 || tokensOut > 0) {
-    parts.push(`${fmtTokens(tokensIn)}→${fmtTokens(tokensOut)} tokens`);
-  }
-  if (tools > 0) parts.push(`${tools} tool call${tools === 1 ? "" : "s"}`);
-  if (credits > 0) parts.push(`${credits} cr`);
-  return parts.length > 0 ? c.dim(`  ── ${parts.join(" · ")}`) : "";
-}
-
-// Terse one-line result summary instead of dumping raw JSON / file contents.
-// Tools whose handlers already render rich output (diffs, the shell stream, the
-// plan) just get a check — the detail was already printed.
-export function toolSummary(name, result) {
-  const ok = result.ok;
-  // A tree branch links the result to the action above it (modern CLI style).
-  const branch = ok ? c.green("└─") : c.red("└─");
-  const out = result.output ?? "";
-  const firstLine = out.split("\n").find((l) => l.trim()) ?? "";
-
-  if (name === "run_shell") {
-    let code = null;
-    try { code = JSON.parse(out).exit_code; } catch { /* ignore */ }
-    return `  ${branch} ${c.gray(code === null ? (ok ? "done" : "failed") : `exit ${code}`)}`;
-  }
-  if (name === "todo_write") return ""; // the Plan is its own feedback
-  if (name === "ask_user") return ""; // the menu already showed the answer
-  if (name === "write_file" || name === "edit_file") {
-    // Handler already printed the diff; echo its short status line.
-    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
-  }
-  let summary = "";
-  try {
-    const j = JSON.parse(out);
-    if (Array.isArray(j)) summary = `${j.length} result${j.length === 1 ? "" : "s"}`;
-    else if (Array.isArray(j.files)) summary = `${j.files.length} file${j.files.length === 1 ? "" : "s"}`;
-    else if (Array.isArray(j.matches)) summary = `${j.matches.length} match${j.matches.length === 1 ? "" : "es"}`;
-  } catch { /* not JSON */ }
-  if (!summary) {
-    summary = name === "read_file" ? `${out.split("\n").length} lines` : ellip(firstLine, 100);
-  }
-  return `  ${branch} ${c.gray(summary)}`;
-}
-
-// Strip model "harmony"/channel control tokens (<|channel|>, <|message|>,
-// <|tool_response|>, <channel|>, …) that occasionally leak into the text
-// stream. Belt-and-suspenders alongside the server-side scrub.
-// Only strips tokens containing a PIPE — the harmony/channel control tokens
-// (<|channel|>, <|tool_response|>, <channel|>) always have one. Real code like
-// <div>, Vec<T>, a < b has no pipe and is left untouched.
-const MODEL_TOKEN_RE = /<\|[a-z_]*\|?>|<[a-z_]+\|>/gi;
-
-export function stripModelTokens(text) {
-  return text.replace(MODEL_TOKEN_RE, "");
-}
-
-// Streaming-safe stripper: the leaked tokens (<|channel|>, <|tool_response|>, …)
-// can be split across stream chunks ("<chann" then "el|>"), which a per-delta
-// regex misses. This buffers any trailing "<…" that might be the start of a
-// token and only emits it once it's confirmed not-a-token (or on flush).
-export function makeTokenStripper() {
-  let buf = "";
-  return {
-    push(text) {
-      buf = (buf + text).replace(MODEL_TOKEN_RE, "");
-      const partial = buf.match(/<[|a-z_/]*$/i); // possible token start at the tail
-      if (partial) {
-        const emit = buf.slice(0, partial.index);
-        buf = buf.slice(partial.index);
-        return emit;
-      }
-      const emit = buf;
-      buf = "";
-      return emit;
-    },
-    flush() {
-      const out = buf.replace(MODEL_TOKEN_RE, "");
-      buf = "";
-      return out;
-    },
-  };
-}
-
-export function toolResult(text, ok = true) {
-  const prefix = ok ? c.green("  ● ") : c.red("  × ");
-  // First line bold-ish, then dim continuation
-  const lines = text.split("\n");
-  const head = lines[0].slice(0, 200);
-  const rest = lines.slice(1, 6).join("\n").slice(0, 600);
-  return `${prefix}${head}${rest ? "\n" + c.dim(rest) : ""}`;
-}
-
-export function assistant(text) {
-  // Indent each line for visual separation from tool calls
-  return text.split("\n").map((l) => `  ${l}`).join("\n");
-}
-
-export function errorLine(msg) {
-  return `${c.red(c.bold("Error:"))} ${msg}`;
-}
-
-export function note(msg) {
-  return c.dim(msg);
-}
+// ANSI helpers — no chalk dependency.
+
+const isTty = process.stdout.isTTY;
+const noColor = !!process.env.NO_COLOR || !isTty;
+
+function wrap(open, close) {
+  return (s) => (noColor ? String(s) : `\x1b[${open}m${s}\x1b[${close}m`);
+}
+
+export const c = {
+  bold:    wrap(1, 22),
+  dim:     wrap(2, 22),
+  red:     wrap(31, 39),
+  green:   wrap(32, 39),
+  yellow:  wrap(33, 39),
+  blue:    wrap(34, 39),
+  magenta: wrap(35, 39),
+  cyan:    wrap(36, 39),
+  gray:    wrap(90, 39),
+};
+
+export function divider() {
+  const w = process.stdout.columns || 60;
+  return c.gray("─".repeat(Math.min(60, w)));
+}
+
+const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
+
+export function boxLines(lines, { color = c.gray, padX = 2, minInner = 0 } = {}) {
+  const inner = Math.max(minInner, 0, ...lines.map((l) => stripAnsi(l).length));
+  const w = inner + padX * 2;
+  const top = color("╭" + "─".repeat(w) + "╮");
+  const bot = color("╰" + "─".repeat(w) + "╯");
+  const mid = lines.map(
+    (l) => color("│") + " ".repeat(padX) + l + " ".repeat(inner - stripAnsi(l).length + padX) + color("│"),
+  );
+  return [top, ...mid, bot];
+}
+
+export function box(lines, opts) {
+  return boxLines(lines, opts).join("\n");
+}
+
+export function sideBySide(a, b, gap = 3) {
+  const wa = Math.max(0, ...a.map((l) => stripAnsi(l).length));
+  const h = Math.max(a.length, b.length);
+  const out = [];
+  for (let i = 0; i < h; i++) {
+    const la = a[i] ?? "";
+    const lb = b[i] ?? "";
+    out.push(la + " ".repeat(wa - stripAnsi(la).length + gap) + lb);
+  }
+  return out.join("\n");
+}
+
+export function turn(n) {
+  return c.gray(`turn ${n}`);
+}
+
+export function toolHeader(name, args) {
+  const compact = JSON.stringify(args);
+  const trimmed = compact.length > 120 ? compact.slice(0, 117) + "..." : compact;
+  return `${c.cyan(c.bold(name))}${c.gray("(")}${c.gray(trimmed)}${c.gray(")")}`;
+}
+
+const ellip = (s, n) => (s && s.length > n ? s.slice(0, n - 1) + "…" : s || "");
+
+export function toolLabel(name, args) {
+  const a = args || {};
+  const verb = (v) => c.cyan(c.bold(v));
+  const arg = (s) => c.gray(ellip(s == null ? "" : String(s), 72));
+  switch (name) {
+    case "read_file":    return `${verb("read")}   ${arg(a.path)}`;
+    case "write_file":   return `${verb("write")}  ${arg(a.path)}`;
+    case "edit_file":    return `${verb("edit")}   ${arg(a.path)}`;
+    case "list_dir":     return `${verb("list")}   ${arg(a.path)}`;
+    case "glob_files":   return `${verb("find")}   ${arg(a.pattern)}`;
+    case "search_files": return `${verb("search")} ${arg(`/${a.pattern}/ in ${a.path ?? "."}`)}`;
+    case "run_shell":    return `${verb("run")}    ${arg(a.command)}`;
+    case "web_search":   return `${verb("search web")} ${arg(JSON.stringify(a.query ?? ""))}`;
+    case "web_fetch":    return `${verb("fetch")}  ${arg(a.url)}`;
+    case "todo_write":   return "";
+    case "ask_user":     return "";
+    default:             return `${verb(name)} ${arg(JSON.stringify(a))}`;
+  }
+}
+
+export function setTerminalTitle(title) {
+  if (process.stdout.isTTY) process.stdout.write(`\x1b]0;${title}\x07`);
+}
+
+// Fun thinking words — like Claude Code's "Hullaballooing...", "Cogitating..."
+const THINKING_WORDS = [
+  "Thinking",
+  "Pondering",
+  "Mulling",
+  "Cogitating",
+  "Ruminating",
+  "Deliberating",
+  "Contemplating",
+  "Noodling",
+  "Musing",
+  "Brainstorming",
+  "Percolating",
+  "Brainwaving",
+  "Daydreaming",
+  "Hullaballooing",
+  "Churning",
+  "Brewing",
+  "Conjuring",
+  "Scheming",
+  "Hatching",
+  "Concocting",
+  "Simmering",
+  "Marinating",
+  "Fermenting",
+  "Stewing",
+  "Whittling",
+  "Tinkering",
+  "Puzzling",
+  "Deciphering",
+  "Unraveling",
+  "Distilling",
+];
+
+// Pick a random thinking word (seeded by current second so it varies per call)
+function pickThinkingWord() {
+  const idx = (Date.now() % (THINKING_WORDS.length * 1000)) / 1000 | 0;
+  return THINKING_WORDS[idx % THINKING_WORDS.length];
+}
+
+export function startSpinner(label) {
+  if (!process.stdout.isTTY) return { stop: () => {}, update: () => {} };
+  const frames = ["◐", "◓", "◑", "◒"];
+  const t0 = Date.now();
+  let i = 0;
+  let tokenCount = 0;
+  let statusText = "";
+  const isThinking = label === "thinking";
+  const thinkWord = isThinking ? pickThinkingWord() : null;
+  process.stdout.write("\x1b[?25l");
+  const render = () => {
+    const ms = Date.now() - t0;
+    const secs = Math.floor(ms / 1000);
+    const timeFmt = secs >= 60
+      ? `${Math.floor(secs / 60)}m ${String(secs % 60).padStart(2, "0")}s`
+      : `${secs}s`;
+    const parts = [];
+    if (secs > 0) parts.push(timeFmt);
+    if (tokenCount > 0) parts.push(`${fmtTokens(tokenCount)} tokens`);
+    if (statusText) parts.push(statusText);
+    const metrics = parts.length > 0 ? c.gray(` (${parts.join(" \xB7 ")})`) : "";
+    const displayLabel = isThinking ? thinkWord : label;
+    process.stdout.write(`\r\x1b[K${c.cyan(frames[i % frames.length])} ${c.dim(displayLabel + "...")}${metrics}`);
+    i++;
+  };
+  render();
+  const timer = setInterval(render, 120);
+  if (typeof timer.unref === "function") timer.unref();
+  return {
+    update(data) {
+      if (data.tokens != null) tokenCount = data.tokens;
+      if (data.status != null) statusText = data.status;
+    },
+    stop() {
+      clearInterval(timer);
+      process.stdout.write("\r\x1b[K\x1b[?25h");
+    },
+  };
+}
+
+export function fmtTokens(n) {
+  if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + "M";
+  if (n >= 1_000) return (n / 1_000).toFixed(1) + "k";
+  return String(n);
+}
+
+export function turnStats({ elapsed, tokensIn, tokensOut, tools, credits }) {
+  const parts = [];
+  if (elapsed > 0) {
+    const s = Math.floor(elapsed / 1000);
+    parts.push(s >= 60 ? `${Math.floor(s / 60)}m ${String(s % 60).padStart(2, "0")}s` : `${s}s`);
+  }
+  if (tokensIn > 0 || tokensOut > 0) {
+    parts.push(`${fmtTokens(tokensIn)}->${fmtTokens(tokensOut)} tokens`);
+  }
+  if (tools > 0) parts.push(`${tools} tool call${tools === 1 ? "" : "s"}`);
+  if (credits > 0) parts.push(`${credits} cr`);
+  return parts.length > 0 ? c.dim(`  Brewed for ${parts.join(" \xB7 ")}`) : "";
+}
+
+export function toolResult(text, ok = true) {
+  const prefix = ok ? c.green("  ● ") : c.red("  × ");
+  const lines = text.split("\n");
+  const head = lines[0].slice(0, 200);
+  const rest = lines.slice(1, 6).join("\n").slice(0, 600);
+  return `${prefix}${head}${rest ? "\n" + c.dim(rest) : ""}`;
+}
+
+export function assistant(text) {
+  return text.split("\n").map((l) => `  ${l}`).join("\n");
+}
+
+export function errorLine(msg) {
+  return `${c.red(c.bold("Error:"))} ${msg}`;
+}
+
+export function note(msg) {
+  return c.dim(msg);
+}
+
+export function toolSummary(name, result) {
+  const ok = result.ok;
+  const branch = ok ? c.green("└─") : c.red("└─");
+  const out = result.output ?? "";
+  const firstLine = out.split("\n").find((l) => l.trim()) ?? "";
+
+  if (name === "run_shell") {
+    let code = null;
+    try { code = JSON.parse(out).exit_code; } catch { /* ignore */ }
+    return `  ${branch} ${c.gray(code === null ? (ok ? "done" : "failed") : `exit ${code}`)}`;
+  }
+  if (name === "todo_write") return "";
+  if (name === "ask_user") return "";
+  if (name === "write_file" || name === "edit_file") {
+    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
+  }
+  let summary = "";
+  try {
+    const j = JSON.parse(out);
+    if (Array.isArray(j)) summary = `${j.length} result${j.length === 1 ? "" : "s"}`;
+    else if (Array.isArray(j.files)) summary = `${j.files.length} file${j.files.length === 1 ? "" : "s"}`;
+    else if (Array.isArray(j.matches)) summary = `${j.matches.length} match${j.matches.length === 1 ? "" : "es"}`;
+  } catch { /* not JSON */ }
+  if (!summary) {
+    summary = name === "read_file" ? `${out.split("\n").length} lines` : ellip(firstLine, 100);
+  }
+  return `  ${branch} ${c.gray(summary)}`;
+}
+
+const MODEL_TOKEN_RE = /<\|[a-z_]*\|?>|<[a-z_]+\|>/gi;
+
+export function stripModelTokens(text) {
+  return text.replace(MODEL_TOKEN_RE, "");
+}
+
+export function makeTokenStripper() {
+  let buf = "";
+  return {
+    push(text) {
+      buf = (buf + text).replace(MODEL_TOKEN_RE, "");
+      const partial = buf.match(/<[|a-z_/]*$/i);
+      if (partial) {
+        const emit = buf.slice(0, partial.index);
+        buf = buf.slice(partial.index);
+        return emit;
+      }
+      const emit = buf;
+      buf = "";
+      return emit;
+    },
+    flush() {
+      const out = buf.replace(MODEL_TOKEN_RE, "");
+      buf = "";
+      return out;
+    },
+  };
+}

package/src/repl.js

@@ -9,7 +9,7 @@ import { c, errorLine } from "./render.js";
 import { autoUpdate } from "./update-check.js";
 import { promptBox, EXIT_SIGNAL } from "./box-input.js";
 
-const VERSION = "0.33.4";
+const VERSION = "0.33.6";
 const MODEL_NAME = "Aether Core";
 
 const MODEL_ALIASES = {
@@ -33,6 +33,8 @@ ${c.gray("Anything else is sent to the agent as your next message.")}
 ${c.gray("Conversation history is kept across messages until you /clear.")}
 `;
 
+const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
+
 export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafePaths: initialUnsafePaths, maxTurns: initialMaxTurns, model: initialModel = null, mcpManager = null }) {
   const initialAlias = Object.values(MODEL_ALIASES).find((a) => a.id === initialModel);
   const state = {
@@ -80,7 +82,7 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
   // Clear screen — clean start, no leftover shell text (matches Claude Code)
   process.stdout.write("\x1b[2J\x1b[H");
 
-  printBanner(state);
+  const bannerLineCount = printBanner(state);
 
   const updateMsg = await updatePromise;
   let extraLines = 0;
@@ -88,9 +90,8 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
 
   // Push prompt to bottom of screen — big empty gap like Claude Code
   const rows = process.stdout.rows || 24;
-  const bannerLines = 5; // 1 blank + 3 logo lines + 1 blank after
   const promptLines = 2; // "> " input + status bar
-  const filler = Math.max(0, rows - bannerLines - extraLines - promptLines - 1);
+  const filler = Math.max(0, rows - bannerLineCount - extraLines - promptLines - 1);
   for (let i = 0; i < filler; i++) console.log("");
 
   const inputHistory = [];
@@ -129,6 +130,11 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
     if (!result.ok && result.error) {
       console.log("\n" + errorLine(result.error.message || String(result.error)));
     }
+
+    // Push prompt back toward the bottom — content scrolls UP like Claude Code.
+    const rowsNow = process.stdout.rows || 24;
+    const gap = Math.max(0, Math.floor(rowsNow * 0.4));
+    for (let g = 0; g < gap; g++) console.log("");
   }
 }
 
@@ -222,30 +228,74 @@ async function handleSlash(line, state) {
   return null;
 }
 
-/* ───────── banner ───────── */
+/* ───────── banner (two-column like Claude Code) ───────── */
 
 const shortenPath = (p, max) => (p.length <= max ? p : "..." + p.slice(p.length - max + 3));
 
+function padRight(str, width) {
+  const visible = stripAnsi(str).length;
+  const need = Math.max(0, width - visible);
+  return str + " ".repeat(need);
+}
+
 function printBanner(state) {
+  const cols = process.stdout.columns || 80;
   const credits = state.balance != null ? `${state.balance.toLocaleString()} credits` : "";
   const plan = state.plan && state.plan !== "FREE" ? state.plan : "";
 
-  // Block logo using ANSI background colors — renders correctly in ANY terminal.
-  // Each block = 2 spaces with colored background. No special chars needed.
   const blk = (code) => `\x1b[${code}m  \x1b[0m`;
-  const C = blk(46); // cyan background
-  const B = blk(44); // blue background
-
-  const gap = "  ";
+  const C = blk(46);
+  const B = blk(44);
 
   const modelParts = [state.modelName];
   if (credits) modelParts.push(credits);
   if (plan) modelParts.push(c.cyan(plan));
   const modelLine = modelParts.join(c.dim(" \xB7 "));
 
+  const leftW = Math.min(Math.floor(cols * 0.52), 50);
+  const pathMax = Math.max(20, leftW - 14);
+
+  const leftLines = [
+    c.dim("──") + " " + c.bold("Aether Code") + " " + c.dim("v" + VERSION),
+    "    " + c.bold("Welcome back!"),
+    "",
+    `    ${C}${B} ${C}`,
+    `    ${B}${C} ${B}   ${modelLine}`,
+    `    ${C}${B} ${C}   ${c.dim(shortenPath(state.cwd, pathMax))}`,
+  ];
+
+  const rightLines = [
+    c.bold("Tips for getting started"),
+    c.dim("Ask Aether to build, debug, or refactor your code"),
+    "",
+    c.yellow("What's new"),
+    c.dim("Creative thinking words while processing"),
+    c.dim("User message highlight bar + prompt at bottom"),
+  ];
+
+  const twoCol = cols >= 70;
+  let printed = 0;
+
   console.log("");
-  console.log(` ${C}${B} ${C}${gap}${c.bold("Aether Code")} ${c.dim("v" + VERSION)}`);
-  console.log(` ${B}${C} ${B}${gap}${modelLine}`);
-  console.log(` ${C}${B} ${C}${gap}${c.dim(shortenPath(state.cwd, 55))}`);
+  printed++;
+
+  if (twoCol) {
+    const h = Math.max(leftLines.length, rightLines.length);
+    for (let i = 0; i < h; i++) {
+      const left = leftLines[i] || "";
+      const right = rightLines[i] || "";
+      console.log(" " + padRight(left, leftW) + right);
+      printed++;
+    }
+  } else {
+    for (const line of leftLines) {
+      console.log(" " + line);
+      printed++;
+    }
+  }
+
   console.log("");
+  printed++;
+
+  return printed;
 }