aether-code 0.21.0 → 0.23.0

package/bin/aether-code.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aether-code",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "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/agent.js

@@ -79,8 +79,9 @@ export async function runAgent({
   let lastBalance = null;
 
   for (let i = 0; i < maxTurns; i++) {
-    // A blank line separates steps (no noisy "turn N" headers).
-    process.stdout.write("\n");
+    // No turn header and no leading blank here — each step (assistant text and
+    // each tool label) begins with its own "\n● ", so spacing stays exactly one
+    // blank line per step instead of stacking up.
 
     // Stream the assistant's response. Print text deltas as they arrive,
     // along with tool-call announcements as soon as the model commits to
@@ -107,7 +108,7 @@ export async function runAgent({
           const clean = stripper.push(text);
           if (!clean) return;
           if (!lastWasText) {
-            process.stdout.write(c.cyan("● "));
+            process.stdout.write("\n" + c.cyan("● "));
             lastWasText = true;
           }
           process.stdout.write(clean);
@@ -133,7 +134,7 @@ export async function runAgent({
     // Flush any held-back partial token, then close the line.
     const tail = stripper.flush();
     if (tail) {
-      if (!lastWasText) { process.stdout.write(c.cyan("● ")); lastWasText = true; }
+      if (!lastWasText) { process.stdout.write("\n" + c.cyan("● ")); lastWasText = true; }
       process.stdout.write(tail);
     }
     if (lastWasText) process.stdout.write("\n");

package/src/box-input.js

@@ -0,0 +1,132 @@
+// Bordered single-line text input — raw-mode, cmd.exe-safe.
+//
+// Like the ask_user menu, this is NOT Ink (which ghosts in the legacy Windows
+// console). It draws a 3-line box + hint, and on every keystroke moves the
+// cursor back up (ESC[nA), clears (ESC[J), and reprints. The caret is a FAKE
+// cursor (inverse-video cell) and the real terminal cursor is hidden, so there
+// is no cursor-column math to get wrong. Long input scrolls horizontally under
+// a fixed right border.
+//
+// Returns the typed string, or EXIT_SIGNAL on Ctrl+C / Ctrl+D.
+
+import readline from "node:readline";
+import { c } from "./render.js";
+
+export const EXIT_SIGNAL = "<<aether-exit>>";
+
+const HIDE = "\x1b[?25l";
+const SHOW = "\x1b[?25h";
+const INV = (s) => `\x1b[7m${s}\x1b[27m`;
+
+export function promptBox({ history = [], placeholder = "type a message…  /help for commands" } = {}) {
+  return new Promise((resolve) => {
+    // Non-interactive (piped / tests): plain readline, no box.
+    if (!process.stdin.isTTY) {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      rl.question(c.magenta("› "), (a) => { rl.close(); resolve(a); });
+      return;
+    }
+
+    let buf = "";
+    let pos = 0;                 // caret index within buf
+    const hist = history.slice();
+    let histIdx = hist.length;   // points one past the end (current draft)
+    let draft = "";
+    let drawn = 0;
+    let lastSigint = 0;
+
+    const innerW = () => Math.max(24, Math.min(process.stdout.columns || 80, 100) - 6);
+
+    const draw = (first) => {
+      const W = innerW();
+      if (!first) process.stdout.write(`\x1b[${drawn}A`);
+      process.stdout.write("\x1b[J");
+
+      // Horizontal scroll: keep the caret within the visible window.
+      const maxVisible = W - 1;
+      const start = pos > maxVisible ? pos - maxVisible : 0;
+      const view = buf.slice(start, start + W);
+      const rel = pos - start;
+
+      let content;
+      if (buf.length === 0) {
+        const ph = placeholder.slice(0, W - 1);
+        content = INV(" ") + c.dim(ph) + " ".repeat(Math.max(0, W - 1 - ph.length));
+      } else {
+        let s = "";
+        for (let i = 0; i < W; i++) {
+          const ch = view[i] ?? " ";
+          s += i === rel ? INV(ch) : ch;
+        }
+        content = s;
+      }
+
+      const top = c.magenta("╭" + "─".repeat(W + 4) + "╮");
+      const mid = c.magenta("│") + " " + c.magenta("›") + " " + content + " " + c.magenta("│");
+      const bot = c.magenta("╰" + "─".repeat(W + 4) + "╯");
+      const hint = c.dim("  Enter send · ↑↓ history · /help · /exit");
+
+      process.stdout.write(top + "\n" + mid + "\n" + bot + "\n" + hint + "\n");
+      drawn = 4;
+    };
+
+    const finish = (result) => {
+      process.stdin.removeListener("keypress", onKey);
+      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      process.stdin.pause();
+      process.stdout.write(`\x1b[${drawn}A\x1b[J` + SHOW);
+      // Echo the submitted line so it persists in scrollback.
+      if (result && result !== EXIT_SIGNAL && result.trim()) {
+        process.stdout.write(c.magenta("› ") + result + "\n");
+      }
+      resolve(result);
+    };
+
+    const onKey = (str, key) => {
+      if (!key) return;
+      const k = key.name;
+
+      if (k === "return" || k === "enter") return finish(buf);
+      if (key.ctrl && k === "c") {
+        const now = Date.now();
+        if (now - lastSigint < 1500 || buf.length === 0) return finish(EXIT_SIGNAL);
+        lastSigint = now;
+        buf = ""; pos = 0; draw(false);
+        return;
+      }
+      if (key.ctrl && k === "d") return finish(buf.length === 0 ? EXIT_SIGNAL : buf);
+
+      if (k === "backspace") { if (pos > 0) { buf = buf.slice(0, pos - 1) + buf.slice(pos); pos--; } }
+      else if (k === "delete") { buf = buf.slice(0, pos) + buf.slice(pos + 1); }
+      else if (k === "left") { if (pos > 0) pos--; }
+      else if (k === "right") { if (pos < buf.length) pos++; }
+      else if (k === "home" || (key.ctrl && k === "a")) pos = 0;
+      else if (k === "end" || (key.ctrl && k === "e")) pos = buf.length;
+      else if (key.ctrl && k === "u") { buf = ""; pos = 0; }
+      else if (k === "up") {
+        if (histIdx === hist.length) draft = buf;
+        if (histIdx > 0) { histIdx--; buf = hist[histIdx] ?? ""; pos = buf.length; }
+      }
+      else if (k === "down") {
+        if (histIdx < hist.length) {
+          histIdx++;
+          buf = histIdx === hist.length ? draft : (hist[histIdx] ?? "");
+          pos = buf.length;
+        }
+      }
+      else if (str && !key.ctrl && !key.meta && str >= " " && str !== "\x7f") {
+        buf = buf.slice(0, pos) + str + buf.slice(pos);
+        pos += str.length;
+      }
+      else return; // ignore unhandled keys without a redraw
+      draw(false);
+    };
+
+    process.stdout.write(HIDE);
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.isTTY) process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("keypress", onKey);
+    draw(true);
+  });
+}

package/src/diff.js

@@ -24,7 +24,7 @@ export function unifiedDiff(oldText, newText, filename) {
   const changedNew = newLines.slice(prefix, newLines.length - suffix);
 
   const lines = [];
-  lines.push(c.bold(c.cyan(`@@ ${filename} @@`)));
+  // No "@@ file @@" header — the "● write <file>" label already names the file.
   if (prefix > 0) lines.push(c.gray(`  …${prefix} unchanged line${prefix === 1 ? "" : "s"} above…`));
   for (const l of changedOld) lines.push(c.red(`- ${l}`));
   for (const l of changedNew) lines.push(c.green(`+ ${l}`));

package/src/render.js

@@ -24,6 +24,21 @@ export function divider() {
   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. Light box-drawing chars — same
+// Unicode block as the rules we already render, so it's safe in cmd.exe.
+export function box(lines, { color = c.gray, padX = 2 } = {}) {
+  const inner = Math.max(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].join("\n");
+}
+
 export function turn(n) {
   return c.gray(`turn ${n}`);
 }
@@ -70,20 +85,21 @@ export function setTerminalTitle(title) {
 // plan) just get a check — the detail was already printed.
 export function toolSummary(name, result) {
   const ok = result.ok;
-  const mark = ok ? c.green("●") : c.red("×");
+  // 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 `  ${mark} ${c.gray(code === null ? (ok ? "done" : "failed") : `exit ${code}`)}`;
+    return `  ${branch} ${c.gray(code === null ? (ok ? "done" : "failed") : `exit ${code}`)}`;
   }
-  if (name === "todo_write") return ""; // the Plan box is its own feedback
+  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 `  ${mark} ${c.gray(ellip(firstLine, 100))}`;
+    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
   }
   let summary = "";
   try {
@@ -95,7 +111,7 @@ export function toolSummary(name, result) {
   if (!summary) {
     summary = name === "read_file" ? `${out.split("\n").length} lines` : ellip(firstLine, 100);
   }
-  return `  ${mark} ${c.gray(summary)}`;
+  return `  ${branch} ${c.gray(summary)}`;
 }
 
 // Strip model "harmony"/channel control tokens (<|channel|>, <|message|>,

package/src/repl.js

@@ -8,16 +8,15 @@
 //   - Bottom status line is rendered after each turn
 //   - Ctrl+C: first press cancels in-progress turn, second press exits
 
-import readline from "node:readline";
 import path from "node:path";
 import { runAgent } from "./agent.js";
 import { fetchBalance, AetherError } from "./api.js";
 import { runSetup } from "./setup.js";
-import { c, errorLine } from "./render.js";
+import { c, errorLine, box } from "./render.js";
 import { checkForUpdate } from "./update-check.js";
-import { promptBoxed, EXIT_SIGNAL } from "./ink-input.js";
+import { promptBox, EXIT_SIGNAL } from "./box-input.js";
 
-const VERSION = "0.21.0";
+const VERSION = "0.23.0";
 const MODEL_NAME = "Aether Core";
 
 const SHORTCUTS = `
@@ -85,76 +84,19 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
   const updateNudge = await updatePromise;
   if (updateNudge) console.log(updateNudge + "\n");
 
-  // Input: the Ink boxed input (bordered, Claude-style) when the terminal
-  // renders it cleanly, with a readline fallback otherwise.
-  //
-  // The legacy Windows console (cmd.exe / conhost) mishandles Ink's live
-  // redraw + raw-mode: typed characters ghost (the console echoes what Ink
-  // already drew) and the box border tears on each keystroke. Windows Terminal
-  // (sets WT_SESSION) and non-Windows render Ink correctly. So we default to
-  // the clean prompt on legacy Windows console; AETHER_INK=1 forces Ink there
-  // for anyone who wants to try it, AETHER_NO_INK=1 forces the plain prompt.
+  // Input: a bordered raw-mode box (box-input.js) — cmd.exe-safe and identical
+  // everywhere. (Ink's live redraw ghosts in the legacy Windows console, so we
+  // don't use it.) Each prompt is independent; the tool y/N prompts and the
+  // ask_user menu run BETWEEN prompts in raw mode too, so nothing overlaps.
   const inputHistory = [];
-  const legacyWinConsole = process.platform === "win32" && !process.env.WT_SESSION;
-  const useInk =
-    !!process.stdin.isTTY &&
-    process.env.AETHER_NO_INK !== "1" &&
-    (process.env.AETHER_INK === "1" || !legacyWinConsole);
-  let inkBroken = false;
-
-  // The Ink box carries its own status bar; the plain prompt doesn't, so show a
-  // one-line hint up front when we won't be using Ink.
-  if (!useInk) console.log(` ${c.cyan("/help")}${c.dim(" shortcuts")}   ${c.cyan("/exit")}${c.dim(" quit")}\n`);
-
-  // Fresh readline interface PER PROMPT. A single persistent interface
-  // conflicted with the per-confirmation readline interfaces the tools open
-  // during a turn (each [y/N] prompt). When a tool's interface closed it left
-  // the REPL's stdin dead — so after finishing a request aether printed the
-  // prompt and immediately EXITED instead of waiting for the next message.
-  // Opening a fresh one each prompt guarantees only one interface exists at a
-  // time, so the REPL keeps running until the user /exits. Returns EXIT_SIGNAL
-  // on a double Ctrl+C.
-  function readlineQuestion() {
-    return new Promise((resolve) => {
-      const r = readline.createInterface({ input: process.stdin, output: process.stdout, historySize: 200 });
-      let lastSigint = 0;
-      r.on("SIGINT", () => {
-        const now = Date.now();
-        if (now - lastSigint < 1500) { r.close(); resolve(EXIT_SIGNAL); return; }
-        lastSigint = now;
-        process.stdout.write(c.gray(`\n(Press Ctrl+C again within 1.5s to exit, or type ${c.cyan("/exit")})\n`));
-        r.prompt();
-      });
-      r.question(c.magenta("> "), (ans) => { r.close(); resolve(ans); });
-    });
-  }
-
-  // Returns the next raw input line, or EXIT_SIGNAL to quit.
-  async function nextLine() {
-    if (useInk && !inkBroken) {
-      try {
-        return await promptBoxed({
-          statusLeft: ` ${c.cyan("/help")}${c.dim(" shortcuts")}   ${c.cyan("/exit")}${c.dim(" quit")}`,
-          statusRight: `${state.autoYes ? "auto-yes" : "review"} · ${MODEL_NAME}`,
-          history: inputHistory,
-        });
-      } catch {
-        inkBroken = true;
-        console.log(c.gray("(rich input unavailable here — using the basic prompt)"));
-      }
-    }
-    return readlineQuestion();
-  }
 
   while (true) {
-    const raw = await nextLine();
+    const raw = await promptBox({ history: inputHistory });
     if (raw === EXIT_SIGNAL) { console.log(c.gray("bye.")); return; }
     const line = (raw ?? "").trim();
     if (!line) continue;
 
-    // Echo the submitted line so it persists in scrollback (Ink clears its box
-    // region on unmount). Skip in readline mode — the terminal already echoed it.
-    if (useInk && !inkBroken) console.log(c.magenta("> ") + line);
+    // promptBox already echoes "› <line>" on submit, so no echo needed here.
     inputHistory.push(line);
 
     // Slash command?
@@ -272,24 +214,16 @@ const visLen = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 const shortenPath = (p, max) => (p.length <= max ? p : "..." + p.slice(p.length - max + 3));
 
 function printBanner(state) {
-  const cols = process.stdout.columns || 80;
-  const W = Math.max(40, Math.min(cols - 1, 64));
-  // Brand-coloured rules top + bottom; content is indented with no right
-  // border, so nothing can misalign regardless of terminal font/width.
-  const rule = c.magenta("─".repeat(W));
   const mode = state.autoYes ? (state.unsafePaths ? "skip-permissions" : "auto-yes") : "review mode";
-
+  const credits = state.balance != null ? `${state.balance.toLocaleString()} credits · ` : "";
+  const lines = [
+    c.bold(c.magenta("aether")) + c.gray("  ·  ") + c.bold(MODEL_NAME) + c.gray("   v" + VERSION),
+    c.gray("1M context · uncensored · " + mode),
+    c.gray(credits + shortenPath(state.cwd, 52)),
+  ];
   console.log("");
-  console.log(rule);
-  console.log(`  ${c.bold(c.magenta("aether-code"))}${c.gray("   v" + VERSION)}`);
-  console.log(`  ${c.gray(`${MODEL_NAME} · 1M context · uncensored`)}`);
-  console.log(`  ${c.gray(mode)}${state.balance != null ? c.gray(`  ·  ${state.balance.toLocaleString()} credits`) : ""}`);
-  console.log(`  ${c.gray(shortenPath(state.cwd, W - 2))}`);
-  console.log(rule);
+  console.log(box(lines, { color: c.magenta, padX: 2 }));
   console.log("");
-  // No bottom status bar here — the Ink input box renders its own persistent
-  // status bar beneath it (one bar, Claude-style). The readline fallback prints
-  // a one-line hint instead (see runRepl).
 }
 
 function printStatusLine(state) {

package/src/tools.js

@@ -557,8 +557,7 @@ async function writeFile(args, opts) {
   if (exists && oldContent === args.content) {
     return { ok: true, output: `(no change — file already matches)` };
   }
-  // Show diff + confirm
-  console.log("");
+  // Show diff + confirm (the "● write <file>" label already spaced this block)
   console.log(summarizeWrite(oldContent, args.content, path.relative(opts.cwd, abs)));
   console.log(unifiedDiff(oldContent ?? "", args.content, path.relative(opts.cwd, abs)));
   const approved = await confirm(c.yellow("Apply this write?"), opts.autoYes);
@@ -593,7 +592,6 @@ async function editFile(args, opts) {
     ? oldContent.split(args.find).join(args.replace)
     : oldContent.replace(args.find, args.replace);
   const rel = path.relative(opts.cwd, abs);
-  console.log("");
   console.log(c.dim(`edit ${rel}${args.replace_all ? ` (${occurrences} occurrences)` : ""}`));
   console.log(unifiedDiff(oldContent, newContent, rel));
   const approved = await confirm(c.yellow("Apply this edit?"), opts.autoYes);
@@ -722,7 +720,6 @@ export function htmlToText(html) {
 async function runShell(args, opts) {
   if (typeof args.command !== "string") return { ok: false, output: "command is required" };
   const cwd = args.cwd ? resolveSafe(args.cwd, opts) : opts.cwd;
-  console.log("");
   console.log(c.yellow("$ ") + c.bold(args.command) + (args.cwd ? c.dim(`  (cwd: ${args.cwd})`) : ""));
   const approved = await confirm(c.yellow("Run this command?"), opts.autoYes);
   if (!approved) return { ok: false, output: "User declined the command." };
@@ -829,7 +826,7 @@ function todoWrite(args, opts) {
 function renderTodos(todos) {
   if (!process.stdout.isTTY) return; // skip render in non-TTY (CI, piped, tests)
   console.log("");
-  console.log(c.dim("─── Plan ───"));
+  console.log(c.cyan("●") + " " + c.bold("Plan"));
   for (const t of todos) {
     const icon =
       t.status === "completed"
@@ -842,7 +839,7 @@ function renderTodos(todos) {
         ? c.dim(t.content)
         : t.status === "in_progress"
           ? c.bold(t.content)
-          : t.content;
+          : c.gray(t.content);
     console.log(`  ${icon} ${text}`);
   }
   console.log("");