aether-code 0.36.7 → 0.36.8

package/src/repl.js

@@ -1,17 +1,27 @@
 // Interactive REPL — Claude-CLI-style. Launched when `aether-code` is run
 // without a task argument.
+//
+// Behaviors:
+//   - Banner on startup (version, model, balance, cwd, mode)
+//   - Persistent message history across prompts within the session
+//   - Slash commands: /help, /exit, /clear, /balance, /cwd, /yes, /turns
+//   - Bottom status line is rendered after each turn
+//   - Ctrl+C: first press cancels in-progress turn, second press exits
 
 import path from "node:path";
 import { runAgent } from "./agent.js";
 import { fetchBalance, AetherError } from "./api.js";
 import { runSetup } from "./setup.js";
-import { c, errorLine, turnStats } from "./render.js";
-import { autoUpdate } from "./update-check.js";
+import { c, errorLine, boxLines, sideBySide } from "./render.js";
+import { checkForUpdate } from "./update-check.js";
 import { promptBox, EXIT_SIGNAL } from "./box-input.js";
 
-const VERSION = "0.36.7";
+const VERSION = "0.32.0";
 const MODEL_NAME = "Aether Core";
 
+// /model aliases → { id, name }. id=null = server default (gemma / Aether Core).
+// Premium models are gated SERVER-SIDE: if you haven't purchased credits, the
+// server transparently uses Core instead — selecting one here can't bypass that.
 const MODEL_ALIASES = {
   core: { id: null, name: "Aether Core" },
   gemma: { id: null, name: "Aether Core" },
@@ -33,39 +43,6 @@ ${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, "");
-
-function getVisibleRows() {
-  let rows = process.stdout.rows || 24;
-  if (process.platform === "win32" && !process.env.WT_SESSION && rows > 60) {
-    rows = 24;
-  }
-  return rows;
-}
-
-function pushPromptToBottom(contentLines) {
-  const visibleRows = getVisibleRows();
-  const promptHeight = 4;
-  const gap = Math.max(0, visibleRows - contentLines - promptHeight);
-  if (gap > 0) process.stdout.write("\n".repeat(gap));
-}
-
-function drawStaticPrompt(startRow, state) {
-  const termCols = process.stdout.columns || 80;
-  const ruleStr = `\x1b[36m ${"─".repeat(Math.max(0, termCols - 2))}\x1b[0m`;
-  const modeStr = state.autoYes ? "auto-yes" : "review";
-  const blkFn = (code) => `\x1b[${code}m \x1b[0m`;
-  const statusBar = blkFn(46) + blkFn(44) +
-    `\x1b[2m ${modeStr} mode \xB7 ? for shortcuts \xB7 @file for images\x1b[0m`;
-  process.stdout.write(
-    `\x1b[${startRow};1H` +
-    ruleStr + "\n" +
-    `\x1b[2m> \x1b[0m` + "\n" +
-    ruleStr + "\n" +
-    statusBar,
-  );
-}
-
 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 = {
@@ -75,24 +52,29 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
     maxTurns: initialMaxTurns ?? 25,
     model: initialModel ?? null,
     modelName: initialAlias?.name ?? MODEL_NAME,
-    messages: [],
+    messages: [], // accumulates across turns
     balance: null,
     sessionCredits: 0,
     sessionIn: 0,
     sessionOut: 0,
   };
 
-  const updatePromise = autoUpdate().catch(() => null);
+  // Kick off the npm update check concurrently with the balance fetch so it
+  // adds no startup latency; the nudge (if any) prints just under the banner.
+  const updatePromise = checkForUpdate().catch(() => null);
 
+  // Free balance check up front. If no key configured, walk through first-time
+  // setup flow (open browser → paste key → verify → save).
   let needsSetup = false;
   try {
     const me = await fetchBalance();
     state.balance = me.balance;
-    state.plan = me.plan || "FREE";
+    state.plan = me.plan;
   } catch (err) {
     if (err instanceof AetherError && (err.code === "NO_API_KEY" || err.status === 401)) {
       needsSetup = true;
     } else {
+      // Transient network or other — surface but don't block
       console.log(c.gray(`(could not fetch balance: ${err.message})`));
     }
   }
@@ -103,108 +85,52 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
       console.log(c.gray("Aborting — no valid API key."));
       process.exit(1);
     }
+    // Re-fetch balance now that the key is saved
     try {
       const me = await fetchBalance();
       state.balance = me.balance;
-      state.plan = me.plan || "FREE";
-    } catch { /* tolerate */ }
+      state.plan = me.plan;
+    } catch { /* tolerate — banner just won't show balance */ }
   }
 
-  // Clear screen — clean start, no leftover shell text (matches Claude Code)
-  process.stdout.write("\x1b[2J\x1b[H");
-
-  const bannerLineCount = printBanner(state);
-
-  const updateMsg = await updatePromise;
-  let extraLines = 0;
-  if (updateMsg) { console.log(updateMsg); extraLines++; }
-
-  pushPromptToBottom(bannerLineCount + extraLines);
+  printBanner(state);
+  const updateNudge = await updatePromise;
+  if (updateNudge) console.log(updateNudge + "\n");
 
+  // 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 handlePromptResize = () => {
-    const vr = getVisibleRows();
-    process.stdout.write("\x1b[2J\x1b[H");
-    printBanner(state);
-    process.stdout.write(`\x1b[${Math.max(1, vr - 3)};1H`);
-  };
-
   while (true) {
-    const raw = await promptBox({ history: inputHistory, mode: state.autoYes ? "auto-yes" : "review", suppressEcho: true, onResize: handlePromptResize });
+    const raw = await promptBox({ history: inputHistory });
     if (raw === EXIT_SIGNAL) { console.log(c.gray("bye.")); return; }
     const line = (raw ?? "").trim();
     if (!line) continue;
 
+    // promptBox already echoes "› <line>" on submit, so no echo needed here.
     inputHistory.push(line);
 
+    // Slash command?
     if (line.startsWith("/") || line === "?") {
       const handled = await handleSlash(line, state);
       if (handled === "exit") return;
+      printStatusLine(state);
       continue;
     }
 
-    // Build banner + echo as one buffer, write atomically (no flash, no garbling)
-    const bLines = buildBannerLines(state);
-    const echoDisplay = line.length > 200 ? line.slice(0, 197) + "..." : line;
-    const echoCols = process.stdout.columns || 80;
-    const echoLen = echoDisplay.length + 2;
-    const echoPad = Math.max(0, echoCols - echoLen);
-    const echoBar = `\x1b[48;5;236m  ${echoDisplay}${" ".repeat(echoPad)}\x1b[0m`;
-
-    const vr = getVisibleRows();
-    let scrollEnd = Math.max(4, vr - 4);
-    let promptRow = scrollEnd + 1;
-
-    // Clear screen, print banner + echo, draw static prompt at bottom,
-    // then set scroll region so agent output stays above the prompt.
-    process.stdout.write(
-      "\x1b[r" +
-      "\x1b[2J\x1b[H" +
-      bLines.join("\n") + "\n" + echoBar + "\n",
-    );
-    drawStaticPrompt(promptRow, state);
-
-    const agentRow = Math.min(bLines.length + 2, scrollEnd);
-    process.stdout.write(`\x1b[1;${scrollEnd}r\x1b[${agentRow};1H`);
-
-    const onResize = () => {
-      const newVr = getVisibleRows();
-      const newScrollEnd = Math.max(4, newVr - 4);
-      const newPromptRow = newScrollEnd + 1;
-      process.stdout.write(
-        "\x1b7" +
-        "\x1b[r" +
-        `\x1b[${promptRow};1H\x1b[J`,
-      );
-      drawStaticPrompt(newPromptRow, state);
-      process.stdout.write(
-        `\x1b[1;${newScrollEnd}r` +
-        "\x1b8",
-      );
-      scrollEnd = newScrollEnd;
-      promptRow = newPromptRow;
-    };
-    process.stdout.on("resize", onResize);
-
-    const t0 = Date.now();
-    let result;
-    try {
-      result = await runAgent({
-        initialPrompt: line,
-        priorMessages: state.messages.length > 0 ? state.messages : undefined,
-        cwd: state.cwd,
-        autoYes: state.autoYes,
-        unsafePaths: state.unsafePaths,
-        model: state.model,
-        maxTurns: state.maxTurns,
-        mcpManager,
-      });
-    } finally {
-      process.stdout.removeListener("resize", onResize);
-      process.stdout.write("\x1b[r");
-    }
-    const elapsed = Date.now() - t0;
+    // Otherwise — send as a message to the agent
+    const result = await runAgent({
+      initialPrompt: line,
+      priorMessages: state.messages.length > 0 ? state.messages : undefined,
+      cwd: state.cwd,
+      autoYes: state.autoYes,
+      unsafePaths: state.unsafePaths,
+      model: state.model,
+      maxTurns: state.maxTurns,
+      mcpManager,
+    });
 
     state.sessionCredits += result.totalCredits ?? 0;
     state.sessionIn += result.totalIn ?? 0;
@@ -214,20 +140,10 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, unsafe
 
     if (!result.ok && result.error) {
       console.log("\n" + errorLine(result.error.message || String(result.error)));
+      // Don't kill the session on a single error — surface it and continue.
     }
 
-    const stats = turnStats({
-      elapsed,
-      tokensIn: 0,
-      tokensOut: 0,
-      tools: 0,
-      credits: result.totalCredits ?? 0,
-    });
-    if (stats) console.log(stats);
-    console.log("");
-
-    // Position cursor at prompt area for the interactive prompt
-    process.stdout.write(`\x1b[${promptRow};1H\x1b[J`);
+    printStatusLine(state);
   }
 }
 
@@ -259,10 +175,10 @@ async function handleSlash(line, state) {
       try {
         const me = await fetchBalance();
         state.balance = me.balance;
-        state.plan = me.plan || "FREE";
+        state.plan = me.plan;
         console.log(
           c.cyan(`balance: ${me.balance.toLocaleString()} credits`) +
-            c.gray(` \xB7 plan: ${me.plan || "FREE"} (${me.planCredits ?? 0} plan + ${me.topupCredits ?? 0} topup)`),
+            c.gray(` · plan: ${me.plan} (${me.planCredits} plan + ${me.topupCredits} topup)`),
         );
       } catch (err) {
         console.log(errorLine(err.message || String(err)));
@@ -275,7 +191,7 @@ async function handleSlash(line, state) {
         try {
           process.chdir(next);
           state.cwd = next;
-          console.log(c.gray(`cwd -> ${state.cwd}`));
+          console.log(c.gray(`cwd → ${state.cwd}`));
         } catch (err) {
           console.log(errorLine(err.message));
         }
@@ -307,7 +223,7 @@ async function handleSlash(line, state) {
         state.modelName = MODEL_ALIASES[key].name;
         const premium = state.model !== null;
         console.log(
-          c.gray(`model -> ${c.cyan(state.modelName)}`) +
+          c.gray(`model → ${c.cyan(state.modelName)}`) +
             (premium ? c.gray("  (premium — needs purchased credits, else falls back to Core)") : ""),
         );
       } else {
@@ -321,85 +237,55 @@ async function handleSlash(line, state) {
   return null;
 }
 
-/* ───────── banner (two-column like Claude Code) ───────── */
+/* ───────── banner + status ───────── */
 
+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 padRight(str, width) {
-  const visible = stripAnsi(str).length;
-  const need = Math.max(0, width - visible);
-  return str + " ".repeat(need);
-}
-
-function centerIn(str, width) {
-  const visible = stripAnsi(str).length;
-  if (visible >= width) return str;
-  const left = Math.floor((width - visible) / 2);
-  return " ".repeat(left) + str;
-}
+// Short, hand-curated highlights shown in the "What's new" box. Update with
+// notable releases — keep it to ~3 lines so it balances the banner height.
+const WHATS_NEW = [
+  "Files now save to your Desktop",
+  "Live thinking spinner + loop guard",
+  "Asks you when a task is unclear",
+];
 
-function buildBannerLines(state) {
-  const cols = process.stdout.columns || 80;
+function printBanner(state) {
+  const mode = state.autoYes ? (state.unsafePaths ? "skip-permissions" : "auto-yes") : "review mode";
   const credits = state.balance != null ? `${state.balance.toLocaleString()} credits` : "";
-  const plan = state.plan && state.plan !== "FREE" ? state.plan : "";
-
-  const blk = (code) => `\x1b[${code}m  \x1b[0m`;
-  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 ruleW = cols - 2;
-  const leftW = Math.min(Math.floor(cols * 0.5), 45);
-  const twoCol = cols >= 70;
-
-  const titleText = " Aether Code v" + VERSION + " ";
-  const titleRuleRight = Math.max(0, ruleW - 3 - titleText.length);
-  const topRule = c.cyan("──" + titleText + "─".repeat(titleRuleRight));
-
-  const VL = c.cyan("│");
-  const lines = [];
-
-  lines.push("");
-  lines.push(" " + topRule);
-
-  const bottomRule = c.cyan(" " + "─".repeat(ruleW));
-
-  if (twoCol) {
-    const row = (left, right) => {
-      lines.push(" " + padRight(left, leftW) + " " + VL + " " + right);
-    };
+  const left = boxLines(
+    [
+      c.bold(c.magenta("aether")) + c.gray("  ·  ") + c.bold(state.modelName) + c.gray("   v" + VERSION),
+      c.gray("uncensored AI coding agent"),
+      c.gray((credits ? credits + " · " : "") + mode),
+      c.gray(shortenPath(state.cwd, 52)),
+    ],
+    { color: c.magenta, padX: 2 },
+  );
+  const right = boxLines(
+    [c.bold(c.cyan("What's new")), ...WHATS_NEW.map((s) => c.gray("• " + s))],
+    { color: c.cyan, padX: 2 },
+  );
 
-    row(centerIn(c.bold("Welcome back!"), leftW), c.bold("Tips for getting started"));
-    row("", c.dim("Ask Aether to build, debug, or refactor code"));
-    row(centerIn(`${C}${B} ${C}`, leftW), "");
-    row(centerIn(`${B}${C} ${B}`, leftW), c.yellow("What's new"));
-    row(centerIn(`${C}${B} ${C}`, leftW), c.dim("Creative thinking words while processing"));
-    row("", c.dim("Prompt pins to bottom, content scrolls up"));
-    row("", "");
-    row(centerIn(modelLine, leftW), "");
-    row(centerIn(c.dim(shortenPath(state.cwd, 50)), leftW), "");
+  console.log("");
+  const cols = process.stdout.columns || 80;
+  // Only place the two boxes side by side when there's room; otherwise the
+  // banner alone (narrow terminals would wrap and tear the second box).
+  if (cols >= visLen(left[0]) + visLen(right[0]) + 4) {
+    console.log(sideBySide(left, right, 3));
   } else {
-    lines.push("");
-    lines.push(centerIn(c.bold("Welcome back!"), cols - 4));
-    lines.push("");
-    lines.push(centerIn(`${C}${B} ${C}`, cols - 4));
-    lines.push(centerIn(`${B}${C} ${B}`, cols - 4));
-    lines.push(centerIn(`${C}${B} ${C}`, cols - 4));
-    lines.push("");
-    lines.push(centerIn(modelLine, cols - 4));
-    lines.push(centerIn(c.dim(shortenPath(state.cwd, 50)), cols - 4));
+    console.log(left.join("\n"));
   }
-
-  lines.push(bottomRule);
-  return lines;
+  console.log("");
 }
 
-function printBanner(state) {
-  const lines = buildBannerLines(state);
-  for (const l of lines) console.log(l);
-  return lines.length;
+function printStatusLine(state) {
+  const parts = [];
+  parts.push(c.gray(`session: ${state.sessionCredits} cr · ${state.sessionIn}→${state.sessionOut} tokens`));
+  if (state.balance != null) parts.push(c.gray(`balance: ${state.balance.toLocaleString()}`));
+  if (state.messages.length > 0) {
+    parts.push(c.gray(`history: ${state.messages.length} msg${state.messages.length === 1 ? "" : "s"}`));
+  }
+  parts.push(c.cyan(state.autoYes ? "auto-yes" : "review"));
+  console.log(c.dim(parts.join("  ·  ")));
 }