aether-code 0.43.1 → 0.43.3

package/src/api.js

@@ -1,37 +1,43 @@
 // API client.
 
-import fs from "node:fs";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { getConfig } from "./config.js";
+import { getVersion } from "./version.js";
 
-// Resolve our own version once for the User-Agent header — read from
-// package.json so it can't drift (the file previously sent three different
-// hardcoded versions across three calls).
-function readVersion() {
-  try {
-    const pkgPath = path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json");
-    return JSON.parse(fs.readFileSync(pkgPath, "utf8")).version || "0";
-  } catch {
-    return "0";
-  }
-}
-const USER_AGENT = `aether-code/${readVersion()}`;
+const USER_AGENT = `aether-code/${getVersion()}`;
 
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
+// Per-request connect timeout. The server retries upstream internally (up to
+// 5 × 75s = 375s worst case), and during that time the CLI's fetch() just
+// hangs with zero feedback. This cap ensures we abort, show a retry message,
+// and try again rather than sitting dead for minutes.
+const CONNECT_TIMEOUT_MS = 90_000;
+
 /**
  * fetch() with bounded exponential-backoff retries. Retries on thrown network
  * errors (DNS/reset/offline blip) and transient 5xx; never retries 4xx
  * (auth/credit/validation — a retry won't help). Body is always a small JSON
  * string, so resending is safe. For the streaming endpoint only the initial
  * connection is retried.
+ *
+ * Each request has a hard 90s connect timeout via AbortController — if the
+ * server hasn't responded with headers by then, we abort and retry. This
+ * prevents the CLI from hanging indefinitely while the server retries
+ * upstream internally.
  */
-export async function fetchWithRetry(url, options, { retries = 2, baseDelay = 500, onRetry } = {}) {
+export async function fetchWithRetry(url, options, { retries = 4, baseDelay = 1000, timeoutMs = CONNECT_TIMEOUT_MS, onRetry } = {}) {
   let attempt = 0;
   while (true) {
+    const ac = new AbortController();
+    const timer = setTimeout(() => ac.abort(new Error(`Server did not respond within ${Math.round(timeoutMs / 1000)}s`)), timeoutMs);
+    // If the caller already set a signal, chain it so both can abort.
+    const callerSignal = options?.signal;
+    if (callerSignal) {
+      callerSignal.addEventListener("abort", () => ac.abort(callerSignal.reason), { once: true });
+    }
     try {
-      const res = await fetch(url, options);
+      const res = await fetch(url, { ...options, signal: ac.signal });
+      clearTimeout(timer);
       if (res.status >= 500 && attempt < retries) {
         // Release the connection back to the pool before retrying — an
         // unconsumed body keeps the socket open (undici won't reuse it).
@@ -43,6 +49,7 @@ export async function fetchWithRetry(url, options, { retries = 2, baseDelay = 50
       }
       return res;
     } catch (e) {
+      clearTimeout(timer);
       if (attempt < retries) {
         attempt++;
         if (onRetry) onRetry(attempt, e.message);
@@ -60,9 +67,12 @@ function defaultOnRetry(attempt, why) {
 
 /**
  * Free balance + plan check via /api/v1/me. Doesn't charge credits.
+ * Pass an explicit key to bypass the config chain (used during setup to
+ * verify the exact key the user entered, not whatever env var is set).
  */
-export async function fetchBalance() {
-  const { apiKey, baseUrl } = getConfig();
+export async function fetchBalance(apiKeyOverride) {
+  const { apiKey: configKey, baseUrl } = getConfig();
+  const apiKey = apiKeyOverride || configKey;
   if (!apiKey) {
     throw new AetherError(
       "No API key. Set AETHER_API_KEY or run `aether config set <key>`.",
@@ -90,7 +100,7 @@ export async function fetchBalance() {
     const msg = data?.error || `${res.status} ${res.statusText}`;
     throw new AetherError(msg, code, res.status, data);
   }
-  return data; // { plan, role, planCredits, topupCredits, balance, isSuspended, rate }
+  return data; // { plan, planCredits, topupCredits, balance, isSuspended }
 }
 
 export class AetherError extends Error {
@@ -212,12 +222,12 @@ export async function agentTurnStream({
 
   // Watchdog: if the open stream stalls (no bytes) for too long, abort instead
   // of hanging the CLI forever.
-  const READ_TIMEOUT_MS = 120_000;
+  const READ_TIMEOUT_MS = 180_000;
   const readOnce = () => {
     let timer;
     const timeout = new Promise((_, reject) => {
       timer = setTimeout(
-        () => reject(new AetherError("Stream stalled — no data for 120s", "STREAM_TIMEOUT", 0)),
+        () => reject(new AetherError(`Stream stalled — no data for ${Math.round(READ_TIMEOUT_MS / 1000)}s`, "STREAM_TIMEOUT", 0)),
         READ_TIMEOUT_MS,
       );
     });

package/src/box-input.js

@@ -1,20 +1,15 @@
-// Minimal prompt input — raw-mode, cmd.exe-safe.
-// Bare "> " prompt with bottom status bar, matching Claude Code's layout.
+// Bordered single-line text input — raw-mode, cmd.exe-safe.
 //
-// Features:
-//   - Ctrl+V / Alt+V: paste image from clipboard
-//   - @file.png: reference images by path (parsed by agent.js)
-//   - Arrow keys, Home/End, Ctrl+A/E, Ctrl+U, history navigation
-//   - Horizontal scroll for long input
+// 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 (with @temppath appended for clipboard images),
-// or EXIT_SIGNAL on Ctrl+C / Ctrl+D.
+// Returns the typed string, or EXIT_SIGNAL on Ctrl+C / Ctrl+D.
 
 import readline from "node:readline";
-import { execFileSync } from "node:child_process";
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import { c } from "./render.js";
 
 export const EXIT_SIGNAL = "<<aether-exit>>";
@@ -23,146 +18,68 @@ const HIDE = "\x1b[?25l";
 const SHOW = "\x1b[?25h";
 const INV = (s) => `\x1b[7m${s}\x1b[27m`;
 
-function grabClipboardImage() {
-  const tmpFile = path.join(os.tmpdir(), `aether-paste-${Date.now()}.png`);
-
-  try {
-    if (process.platform === "win32") {
-      const script =
-        "Add-Type -AssemblyName System.Windows.Forms;" +
-        "$img=[System.Windows.Forms.Clipboard]::GetImage();" +
-        "if($img){$img.Save('" + tmpFile.replace(/'/g, "''") + "'," +
-        "[System.Drawing.Imaging.ImageFormat]::Png);'OK'}else{'NO_IMAGE'}";
-      const out = execFileSync("powershell.exe", [
-        "-NoProfile", "-NonInteractive", "-Command", script,
-      ], { timeout: 5000, encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-      if (out.endsWith("OK") && fs.existsSync(tmpFile)) return tmpFile;
-    } else if (process.platform === "darwin") {
-      try {
-        execFileSync("pngpaste", [tmpFile], { timeout: 3000, stdio: "pipe" });
-        if (fs.existsSync(tmpFile) && fs.statSync(tmpFile).size > 0) return tmpFile;
-      } catch { /* pngpaste not installed */ }
-    } else {
-      try {
-        const fd = fs.openSync(tmpFile, "w");
-        try {
-          execFileSync("xclip", ["-selection", "clipboard", "-t", "image/png", "-o"], {
-            timeout: 3000, stdio: ["pipe", fd, "pipe"],
-          });
-        } finally {
-          fs.closeSync(fd);
-        }
-        if (fs.existsSync(tmpFile) && fs.statSync(tmpFile).size > 0) return tmpFile;
-      } catch { /* xclip not installed */ }
-    }
-  } catch { /* any failure — fall through */ }
-
-  try { if (fs.existsSync(tmpFile)) fs.unlinkSync(tmpFile); } catch { /* ignore */ }
-  return null;
-}
-
-export function promptBox({ history = [], placeholder = "", mode = "review", suppressEcho = false, onResize = null } = {}) {
+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.cyan("> "), (a) => { rl.close(); resolve(a); });
+      rl.question(c.magenta("› "), (a) => { rl.close(); resolve(a); });
       return;
     }
 
     let buf = "";
-    let pos = 0;
+    let pos = 0;                 // caret index within buf
     const hist = history.slice();
-    let histIdx = hist.length;
+    let histIdx = hist.length;   // points one past the end (current draft)
     let draft = "";
     let drawn = 0;
     let lastSigint = 0;
-    const clipImages = [];
-    let resizeHandler = null;
-    let resizeTimer = null;
 
-    const termW = () => Math.max(30, (process.stdout.columns || 80) - 2);
-
-    const stripAnsi = (s) => s.replace(/\x1b\[[0-9;]*m/g, "");
-    const rowsFor = (line, cols) => Math.max(1, Math.ceil((stripAnsi(line).length || 1) / cols));
+    const innerW = () => Math.max(24, Math.min(process.stdout.columns || 80, 100) - 6);
 
     const draw = (first) => {
-      const W = termW();
-      const termCols = process.stdout.columns || 80;
+      const W = innerW();
       if (!first) process.stdout.write(`\x1b[${drawn}A`);
       process.stdout.write("\x1b[J");
 
-      const prefixStr = "> ";
-      const prefixLen = 2;
-      const imgSuffix = clipImages.length > 0 ? ` [+${clipImages.length} img]` : "";
-      const maxVisible = Math.max(8, W - prefixLen - imgSuffix.length);
+      // 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 + maxVisible);
+      const view = buf.slice(start, start + W);
       const rel = pos - start;
 
       let content;
-      if (buf.length === 0 && clipImages.length === 0) {
-        content = INV(" ") + c.dim(placeholder.slice(0, maxVisible - 1));
-      } else if (buf.length === 0 && clipImages.length > 0) {
-        const tag = `[${clipImages.length} image${clipImages.length > 1 ? "s" : ""} pasted]`;
-        content = INV(" ") + c.cyan(tag);
+      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 < maxVisible; i++) {
+        for (let i = 0; i < W; i++) {
           const ch = view[i] ?? " ";
           s += i === rel ? INV(ch) : ch;
         }
-        if (imgSuffix) s += c.cyan(imgSuffix);
         content = s;
       }
 
-      const promptLine = c.dim(prefixStr) + content;
-
-      const blk = (code) => `\x1b[${code}m \x1b[0m`;
-      const barPrefix = blk("48;2;209;107;52") + blk("48;2;0;178;169");
-      const imgNote = clipImages.length > 0 ? c.cyan(" images queued") + c.dim(" \xB7 ") : "";
-      const modeLabel = mode === "auto-yes" ? "auto-accept" : "confirm writes";
-      const baseStatus = " " + modeLabel + " \xB7 /help for shortcuts \xB7 @file to include";
-      const barPrefixLen = 2;
-      const imgNoteLen = clipImages.length > 0 ? 17 : 0;
-      const maxStatusLen = Math.max(10, termCols - barPrefixLen - imgNoteLen - 1);
-      const truncStatus = baseStatus.length > maxStatusLen ? baseStatus.slice(0, maxStatusLen) : baseStatus;
-      const statusText = c.dim(truncStatus) + imgNote;
-
-      const rule = c.cyan("─".repeat(Math.max(0, termCols)));
-      const lines = [rule, promptLine, rule, barPrefix + statusText];
-      drawn = lines.reduce((sum, l) => sum + rowsFor(l, termCols), 0);
-      process.stdout.write(lines.join("\n") + "\n");
+      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) => {
-      if (resizeTimer) { clearTimeout(resizeTimer); resizeTimer = null; }
-      if (resizeHandler) process.stdout.removeListener("resize", resizeHandler);
       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);
-
-      let finalResult = result;
-      if (result !== null && result !== EXIT_SIGNAL && clipImages.length > 0) {
-        const userText = (result || "").trim();
-        const imgRefs = clipImages.map((p) => `@"${p}"`).join(" ");
-        finalResult = userText ? `${userText} ${imgRefs}` : `What is in this image? ${imgRefs}`;
+      // Echo the submitted line so it persists in scrollback.
+      if (result && result !== EXIT_SIGNAL && result.trim()) {
+        process.stdout.write(c.magenta("› ") + result + "\n");
       }
-
-      if (!suppressEcho && finalResult && finalResult !== EXIT_SIGNAL) {
-        const echoText = (result || "").trim();
-        const imgTag = clipImages.length > 0
-          ? ` [+${clipImages.length} image${clipImages.length > 1 ? "s" : ""}]`
-          : "";
-        if (echoText || clipImages.length > 0) {
-          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);
+      resolve(result);
     };
 
     const onKey = (str, key) => {
@@ -172,22 +89,13 @@ export function promptBox({ history = [], placeholder = "", mode = "review", sup
       if (k === "return" || k === "enter") return finish(buf);
       if (key.ctrl && k === "c") {
         const now = Date.now();
-        if (now - lastSigint < 1500 || (buf.length === 0 && clipImages.length === 0)) return finish(EXIT_SIGNAL);
+        if (now - lastSigint < 1500 || buf.length === 0) return finish(EXIT_SIGNAL);
         lastSigint = now;
-        buf = ""; pos = 0; clipImages.length = 0; draw(false);
+        buf = ""; pos = 0; draw(false);
         return;
       }
       if (key.ctrl && k === "d") return finish(buf.length === 0 ? EXIT_SIGNAL : buf);
 
-      if ((key.meta && k === "v") || (key.ctrl && k === "v")) {
-        const imgPath = grabClipboardImage();
-        if (imgPath) {
-          clipImages.push(imgPath);
-        }
-        draw(false);
-        return;
-      }
-
       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--; }
@@ -210,7 +118,7 @@ export function promptBox({ history = [], placeholder = "", mode = "review", sup
         buf = buf.slice(0, pos) + str + buf.slice(pos);
         pos += str.length;
       }
-      else return;
+      else return; // ignore unhandled keys without a redraw
       draw(false);
     };
 
@@ -220,18 +128,5 @@ export function promptBox({ history = [], placeholder = "", mode = "review", sup
     process.stdin.resume();
     process.stdin.on("keypress", onKey);
     draw(true);
-    resizeHandler = () => {
-      if (resizeTimer) clearTimeout(resizeTimer);
-      resizeTimer = setTimeout(() => {
-        resizeTimer = null;
-        if (onResize) {
-          onResize();
-        } else {
-          process.stdout.write(`\x1b[${drawn}A\x1b[J`);
-        }
-        draw(true);
-      }, 120);
-    };
-    process.stdout.on("resize", resizeHandler);
   });
 }

package/src/config.js

@@ -1,38 +1,38 @@
-// Config — reads ~/.aetherrc (shared format with aether-cli) and env vars.
-// Same precedence: env wins over file.
-
-import fs from "node:fs";
-import path from "node:path";
-import os from "node:os";
-
-const FILE = path.join(os.homedir(), ".aetherrc");
-const DEFAULT_BASE = "https://trynoguard.com";
-
-export function readConfigFile() {
-  try {
-    const raw = fs.readFileSync(FILE, "utf8");
-    return JSON.parse(raw);
-  } catch {
-    return {};
-  }
-}
-
-export function writeConfigFile(patch) {
-  const current = readConfigFile();
-  const next = { ...current, ...patch };
-  // 0600 — readable only by the user. Mirrors what ssh, gnupg, etc. enforce
-  // on credential files. Treat the API key like an SSH key.
-  fs.writeFileSync(FILE, JSON.stringify(next, null, 2), { mode: 0o600 });
-  try { fs.chmodSync(FILE, 0o600); } catch { /* windows ignores */ }
-}
-
-export function getConfig() {
-  const file = readConfigFile();
-  return {
-    apiKey: process.env.AETHER_API_KEY || file.apiKey || "",
-    baseUrl: (process.env.AETHER_BASE_URL || file.baseUrl || DEFAULT_BASE).replace(/\/+$/, ""),
-    configPath: FILE,
-  };
-}
-
-export const CONFIG_PATH = FILE;
+// Config — reads ~/.aetherrc (shared format with aether-cli) and env vars.
+// Same precedence: env wins over file.
+
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+
+const FILE = path.join(os.homedir(), ".aetherrc");
+const DEFAULT_BASE = "https://trynoguard.com";
+
+export function readConfigFile() {
+  try {
+    const raw = fs.readFileSync(FILE, "utf8");
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+export function writeConfigFile(patch) {
+  const current = readConfigFile();
+  const next = { ...current, ...patch };
+  // 0600 — readable only by the user. Mirrors what ssh, gnupg, etc. enforce
+  // on credential files. Treat the API key like an SSH key.
+  fs.writeFileSync(FILE, JSON.stringify(next, null, 2), { mode: 0o600 });
+  try { fs.chmodSync(FILE, 0o600); } catch { /* windows ignores */ }
+}
+
+export function getConfig() {
+  const file = readConfigFile();
+  return {
+    apiKey: process.env.AETHER_API_KEY || file.apiKey || "",
+    baseUrl: (process.env.AETHER_BASE_URL || file.baseUrl || DEFAULT_BASE).replace(/\/+$/, ""),
+    configPath: FILE,
+  };
+}
+
+export const CONFIG_PATH = FILE;

package/src/diff.js

@@ -1,49 +1,49 @@
-// Tiny line-by-line diff for write_file confirmation prompts.
-// Not a "real" diff — just a side-by-side highlight of what's changing.
-// Good enough for confirmation prompts, deliberately not pretending to be `git diff`.
-
-import { c } from "./render.js";
-
-export function unifiedDiff(oldText, newText, filename) {
-  const oldLines = (oldText || "").split("\n");
-  const newLines = (newText || "").split("\n");
-  const max = Math.max(oldLines.length, newLines.length);
-
-  // Find common prefix and suffix to keep the diff focused
-  let prefix = 0;
-  while (prefix < max && oldLines[prefix] === newLines[prefix]) prefix++;
-  let suffix = 0;
-  while (
-    suffix < max - prefix &&
-    oldLines[oldLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]
-  ) {
-    suffix++;
-  }
-
-  const changedOld = oldLines.slice(prefix, oldLines.length - suffix);
-  const changedNew = newLines.slice(prefix, newLines.length - suffix);
-
-  const lines = [];
-  // 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}`));
-  if (suffix > 0) lines.push(c.gray(`  …${suffix} unchanged line${suffix === 1 ? "" : "s"} below…`));
-
-  // Cap output so writes don't flood the terminal — a short preview is enough
-  // (skip-permissions auto-applies; the full file is on disk to inspect).
-  const MAX = 14;
-  if (lines.length > MAX) {
-    const shown = lines.slice(0, MAX - 1);
-    return [...shown, c.gray(`  …${lines.length - shown.length} more lines (see the file)…`)].join("\n");
-  }
-  return lines.join("\n");
-}
-
-export function summarizeWrite(oldText, newText, filename) {
-  const oldLines = (oldText || "").split("\n").length;
-  const newLines = (newText || "").split("\n").length;
-  const isCreate = oldText === null || oldText === undefined;
-  const verb = isCreate ? "create" : "rewrite";
-  return c.dim(`${verb} ${filename} (${oldLines} → ${newLines} lines, ${(newText || "").length} bytes)`);
-}
+// Tiny line-by-line diff for write_file confirmation prompts.
+// Not a "real" diff — just a side-by-side highlight of what's changing.
+// Good enough for confirmation prompts, deliberately not pretending to be `git diff`.
+
+import { c } from "./render.js";
+
+export function unifiedDiff(oldText, newText, filename) {
+  const oldLines = (oldText || "").split("\n");
+  const newLines = (newText || "").split("\n");
+  const max = Math.max(oldLines.length, newLines.length);
+
+  // Find common prefix and suffix to keep the diff focused
+  let prefix = 0;
+  while (prefix < max && oldLines[prefix] === newLines[prefix]) prefix++;
+  let suffix = 0;
+  while (
+    suffix < max - prefix &&
+    oldLines[oldLines.length - 1 - suffix] === newLines[newLines.length - 1 - suffix]
+  ) {
+    suffix++;
+  }
+
+  const changedOld = oldLines.slice(prefix, oldLines.length - suffix);
+  const changedNew = newLines.slice(prefix, newLines.length - suffix);
+
+  const lines = [];
+  // 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}`));
+  if (suffix > 0) lines.push(c.gray(`  …${suffix} unchanged line${suffix === 1 ? "" : "s"} below…`));
+
+  // Cap output so writes don't flood the terminal — a short preview is enough
+  // (skip-permissions auto-applies; the full file is on disk to inspect).
+  const MAX = 14;
+  if (lines.length > MAX) {
+    const shown = lines.slice(0, MAX - 1);
+    return [...shown, c.gray(`  …${lines.length - shown.length} more lines (see the file)…`)].join("\n");
+  }
+  return lines.join("\n");
+}
+
+export function summarizeWrite(oldText, newText, filename) {
+  const oldLines = (oldText || "").split("\n").length;
+  const newLines = (newText || "").split("\n").length;
+  const isCreate = oldText === null || oldText === undefined;
+  const verb = isCreate ? "create" : "rewrite";
+  return c.dim(`${verb} ${filename} (${oldLines} → ${newLines} lines, ${(newText || "").length} bytes)`);
+}