aether-code 0.43.1 → 0.43.3

package/src/render.js

@@ -1,288 +1,254 @@
-// 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("Glob")}   ${arg(a.pattern)}`;
-    case "search_files": return `${verb("Grep")}   ${arg(`/${a.pattern}/ in ${a.path ?? "."}`)}`;
-    case "run_shell":    return `${verb("Bash")}   ${arg(a.command)}`;
-    case "web_search":   return `${verb("WebSearch")} ${arg(a.query ?? "")}`;
-    case "web_fetch":    return `${verb("WebFetch")}  ${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: () => {} };
-  // Ping-pong animation — cmd.exe-safe chars inspired by Claude Code's sparkle cycle
-  const frames = ["\xB7", "*", "+", "*", "\xB7", ".", "\xB7", "*", "+", "*", "\xB7", "."];
-  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} credit${credits === 1 ? "" : "s"}`);
-  return parts.length > 0 ? c.dim(`  ${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;
-    let stderr = "";
-    try {
-      const j = JSON.parse(out);
-      code = j.exit_code;
-      stderr = (j.stderr || "").split("\n")[0] || "";
-    } catch { /* ignore */ }
-    const status = code === null ? (ok ? "done" : "failed") : code === 0 ? "done" : `exit ${code}`;
-    const detail = !ok && stderr ? ` ${ellip(stderr, 60)}` : "";
-    return `  ${branch} ${c.gray(status + detail)}`;
-  }
-  if (name === "todo_write") return "";
-  if (name === "ask_user") return "";
-  if (name === "write_file") {
-    return `  ${branch} ${c.gray("wrote file")}`;
-  }
-  if (name === "edit_file") {
-    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
-  }
-  if (name === "web_search") {
-    let count = 0;
-    try { const j = JSON.parse(out); if (Array.isArray(j)) count = j.length; } catch { /* ignore */ }
-    return `  ${branch} ${c.gray(count > 0 ? `${count} results` : "no results")}`;
-  }
-  if (name === "web_fetch") {
-    const lines = out.split("\n").length;
-    return `  ${branch} ${c.gray(`${lines} lines fetched`)}`;
-  }
-  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;
-    },
-  };
-}
+// 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.bold(v);
+  const arg = (s) => ellip(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("Glob")}    ${arg(a.pattern)}`;
+    case "search_files": return `${verb("Grep")}    ${arg(`/${a.pattern}/${a.path ? ` in ${a.path}` : ""}`)}`;
+    case "run_shell":    return `${verb("Bash")}    ${c.dim(ellip(String(a.command), 72))}`;
+    case "web_search":   return `${verb("Search")}  ${arg(a.query ?? "")}`;
+    case "web_fetch":    return `${verb("Fetch")}   ${arg(a.url)}`;
+    case "todo_write":   return "";
+    case "ask_user":     return "";
+    case "git_status":   return `${verb("Git")}     ${arg("status")}`;
+    case "git_diff":     return `${verb("Git")}     ${arg("diff" + (a.staged ? " --staged" : "") + (a.base ? ` ${a.base}...${a.head || "HEAD"}` : ""))}`;
+    case "git_log":      return `${verb("Git")}     ${arg("log" + (a.file ? ` -- ${a.file}` : "") + (a.branch ? ` ${a.branch}` : ""))}`;
+    case "git_commit":   return `${verb("Git")}     ${arg(`commit "${ellip(a.message || "", 50)}"`)}`
+    case "git_branch":   return `${verb("Git")}     ${arg(`branch ${a.name}`)}`;
+    case "git_push":     return `${verb("Git")}     ${arg("push" + (a.force ? " --force" : ""))}`;
+    case "git_create_pr": return `${verb("Git")}     ${arg(`pr "${ellip(a.title || "", 50)}"`)}`
+    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. Rewrites a single line in place (\r) with a rotating
+// half-circle (Geometric Shapes — same block as ●, so cmd.exe-safe) + elapsed
+// seconds, so the user sees the agent is alive while the model thinks or a slow
+// tool runs. stop() clears the line and restores the cursor. No-op in non-TTY.
+export function startSpinner(label) {
+  if (!process.stdout.isTTY) return { stop: () => {} };
+  const frames = ["◐", "◓", "◑", "◒"];
+  const t0 = Date.now();
+  let i = 0;
+  process.stdout.write("\x1b[?25l"); // hide cursor
+  const render = () => {
+    const s = Math.floor((Date.now() - t0) / 1000);
+    const tail = s > 0 ? c.gray(`  ${s}s`) : "";
+    process.stdout.write(`\r\x1b[K${c.cyan(frames[i % frames.length])} ${c.gray(label + "…")}${tail}`);
+    i++;
+  };
+  render();
+  const timer = setInterval(render, 120);
+  if (typeof timer.unref === "function") timer.unref(); // don't keep the process alive
+  return {
+    stop: () => {
+      clearInterval(timer);
+      process.stdout.write("\r\x1b[K\x1b[?25h"); // clear line + show cursor
+    },
+  };
+}
+
+// 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 === "git_commit" || name === "git_push" || name === "git_create_pr") {
+    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
+  }
+  if (name === "git_status") {
+    try {
+      const s = JSON.parse(out);
+      if (s.clean) return `  ${branch} ${c.gray("clean")}`;
+      const parts = [];
+      if (s.staged?.length) parts.push(`${s.staged.length} staged`);
+      if (s.unstaged?.length) parts.push(`${s.unstaged.length} modified`);
+      if (s.untracked?.length) parts.push(`${s.untracked.length} untracked`);
+      return `  ${branch} ${c.gray(parts.join(", "))}`;
+    } catch { /* fall through */ }
+  }
+  if (name === "git_diff") {
+    if (out === "(no changes)") return `  ${branch} ${c.gray("no changes")}`;
+    const diffLines = out.split("\n").length;
+    return `  ${branch} ${c.gray(`${diffLines} lines of diff`)}`;
+  }
+  if (name === "git_log") {
+    const logLines = out.trim().split("\n").filter((l) => l.trim()).length;
+    return `  ${branch} ${c.gray(`${logLines} lines`)}`;
+  }
+  if (name === "git_branch") {
+    return `  ${branch} ${c.gray(ellip(firstLine, 100))}`;
+  }
+  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);
+}