aether-code 0.20.0 → 0.22.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.20.0";
+const VERSION = "0.22.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.20.0",
+  "version": "0.22.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/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/menu.js

@@ -0,0 +1,83 @@
+// Interactive multiple-choice menu — arrow/number selectable, cmd.exe-safe.
+//
+// Deliberately NOT Ink (which ghosts in the legacy Windows console). Uses a
+// simple manual redraw: print the list, and on each keypress move the cursor
+// back up to the top of the menu (ESC[nA) and clear-to-end (ESC[J), then
+// reprint. That's the same VT layer that already renders our ANSI colours, so
+// it works in cmd.exe, Windows Terminal, and POSIX terminals alike.
+//
+// Returns the chosen option object ({label, description}), or null if cancelled.
+
+import readline from "node:readline";
+import { c } from "./render.js";
+
+const ellip = (s, n) => (s && s.length > n ? s.slice(0, n - 1) + "…" : s || "");
+
+export function promptChoice({ question, options }) {
+  const opts = (options || [])
+    .map((o) => (typeof o === "string" ? { label: o } : o))
+    .filter((o) => o && o.label);
+
+  return new Promise((resolve) => {
+    // Non-interactive (piped / CI): pick the first option so automation never
+    // hangs waiting on a keypress that can't come. Print a note so it's visible.
+    if (!process.stdin.isTTY || opts.length === 0) {
+      const pick = opts[0] ?? null;
+      if (pick) process.stdout.write(c.cyan("● ") + c.bold(question) + c.gray(`  → ${pick.label} (auto)\n`));
+      resolve(pick);
+      return;
+    }
+
+    let sel = 0;
+    const total = opts.length + 3; // question line + options + blank + hint line
+
+    const draw = (first) => {
+      if (!first) process.stdout.write(`\x1b[${total}A`); // cursor up to menu top
+      process.stdout.write("\x1b[J"); // clear from cursor to end of screen
+      process.stdout.write(c.cyan("● ") + c.bold(question) + "\n");
+      opts.forEach((o, i) => {
+        const active = i === sel;
+        const pointer = active ? c.cyan("→") : " ";
+        const num = active ? c.cyan(c.bold(`${i + 1}.`)) : c.gray(`${i + 1}.`);
+        const label = active ? c.bold(o.label) : o.label;
+        const desc = o.description ? c.gray("  " + ellip(o.description, 60)) : "";
+        process.stdout.write(`  ${pointer} ${num} ${label}${desc}\n`);
+      });
+      process.stdout.write("\n" + c.gray("  ↑/↓ move · 1-9 pick · Enter select · Esc cancel") + "\n");
+    };
+
+    const cleanup = () => {
+      process.stdin.removeListener("keypress", onKey);
+      if (process.stdin.isTTY) process.stdin.setRawMode(false);
+      process.stdin.pause();
+    };
+
+    const finish = (result) => {
+      cleanup();
+      // Collapse the menu to a compact answer line so the transcript stays clean.
+      process.stdout.write(`\x1b[${total}A\x1b[J`);
+      process.stdout.write(c.cyan("● ") + c.bold(question) + "\n");
+      if (result) process.stdout.write("  " + c.cyan("→") + " " + c.green(result.label) + "\n\n");
+      else process.stdout.write("  " + c.gray("(cancelled — proceeding with best judgment)") + "\n\n");
+      resolve(result);
+    };
+
+    const onKey = (str, key) => {
+      if (!key) return;
+      if (key.name === "up" || key.name === "k") { sel = (sel - 1 + opts.length) % opts.length; draw(false); }
+      else if (key.name === "down" || key.name === "j" || key.name === "tab") { sel = (sel + 1) % opts.length; draw(false); }
+      else if (str && /^[1-9]$/.test(str)) {
+        const i = parseInt(str, 10) - 1;
+        if (i < opts.length) finish(opts[i]);
+      }
+      else if (key.name === "return") finish(opts[sel]);
+      else if (key.name === "escape" || (key.ctrl && key.name === "c")) finish(null);
+    };
+
+    readline.emitKeypressEvents(process.stdin);
+    if (process.stdin.isTTY) process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.on("keypress", onKey);
+    draw(true);
+  });
+}

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}`);
 }
@@ -54,6 +69,7 @@ export function toolLabel(name, args) {
     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))}`;
   }
 }
@@ -69,19 +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 {
@@ -93,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

@@ -13,11 +13,11 @@ 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";
 
-const VERSION = "0.20.0";
+const VERSION = "0.22.0";
 const MODEL_NAME = "Aether Core";
 
 const SHORTCUTS = `
@@ -272,24 +272,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

@@ -13,6 +13,7 @@ import path from "node:path";
 import readline from "node:readline";
 import { spawn } from "node:child_process";
 import { c } from "./render.js";
+import { promptChoice } from "./menu.js";
 import { unifiedDiff, summarizeWrite } from "./diff.js";
 import { getConfig } from "./config.js";
 
@@ -194,6 +195,33 @@ export const TOOL_DEFINITIONS = [
       },
     },
   },
+  {
+    type: "function",
+    function: {
+      name: "ask_user",
+      description:
+        "Ask the user a single multiple-choice question and wait for their answer. Use this ONLY when the request is genuinely ambiguous AND the answer materially changes what you build — e.g. which platform/framework/language, the scope, or an irreversible decision. Ask BEFORE building when a wrong assumption would waste real work. Give 2–5 concrete options, each with a short description; put the best default first. Do NOT use it for trivial choices, things you can infer, or to confirm permission to act — just build when the task is clear.",
+      parameters: {
+        type: "object",
+        properties: {
+          question: { type: "string", description: "The single, focused question to ask." },
+          options: {
+            type: "array",
+            description: "2–5 options. Each is {label, description}. Best default first.",
+            items: {
+              type: "object",
+              properties: {
+                label: { type: "string", description: "Short option label." },
+                description: { type: "string", description: "One-line explanation of this option." },
+              },
+              required: ["label"],
+            },
+          },
+        },
+        required: ["question", "options"],
+      },
+    },
+  },
 ];
 
 /* ─────────────────────── Argument validation ─────────────────────── */
@@ -362,6 +390,7 @@ export async function executeTool(call, opts) {
     web_search: () => webSearch(args, opts),
     web_fetch: () => webFetch(args, opts),
     todo_write: () => todoWrite(args, opts),
+    ask_user: () => askUser(args, opts),
   };
   const fn = handlers[name];
   if (!fn) {
@@ -374,6 +403,23 @@ export async function executeTool(call, opts) {
   }
 }
 
+// Ask the user a multiple-choice question and block on their answer. Not a
+// permission gate — it runs even in skip-permissions mode, because the model is
+// explicitly requesting input. In a non-TTY the menu auto-picks the first
+// option so scripted runs don't hang.
+async function askUser(args, _opts) {
+  const options = Array.isArray(args.options) ? args.options : [];
+  if (options.length === 0) {
+    return { ok: false, output: "ask_user requires a non-empty options array" };
+  }
+  const choice = await promptChoice({ question: String(args.question || "Which option?"), options });
+  if (!choice) {
+    return { ok: true, output: "The user cancelled the question. Proceed with your best judgment." };
+  }
+  const extra = choice.description ? ` (${choice.description})` : "";
+  return { ok: true, output: `The user chose: ${choice.label}${extra}` };
+}
+
 function readFile(args, opts) {
   if (typeof args.path !== "string") return { ok: false, output: "path is required" };
   const abs = resolveSafe(args.path, opts);
@@ -511,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);
@@ -547,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);
@@ -676,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." };
@@ -783,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"
@@ -796,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("");