aether-code 0.43.2 → 0.43.4

package/bin/aether-code.js

@@ -31,6 +31,14 @@ import { getVersion } from "../src/version.js";
 
 const VERSION = getVersion();
 
+function formatElapsed(ms) {
+  const s = Math.round(ms / 1000);
+  if (s < 60) return `${s}s`;
+  const m = Math.floor(s / 60);
+  const rem = s % 60;
+  return rem > 0 ? `${m}m ${rem}s` : `${m}m`;
+}
+
 /**
  * Try to start MCP servers from ~/.aether/mcp.json. Returns a started
  * MCPManager (possibly with zero servers) or null if no config exists.
@@ -245,12 +253,12 @@ async function main() {
     if (!ok) process.exit(1);
   }
 
-  console.log(divider());
-  const modeLabel = autoYes && unsafePaths ? " · skip-permissions" : `${autoYes ? " · auto-yes" : " · review"}${unsafePaths ? "" : " · sandboxed"}`;
-  console.log(c.magenta(c.bold("aether-code")) + c.gray(` · cwd ${cwd}${modeLabel}`));
+  const modeLabel = autoYes && unsafePaths ? "skip-permissions" : `${autoYes ? "auto-yes" : "review"}${unsafePaths ? "" : " · sandboxed"}`;
+  console.log("");
+  console.log(c.magenta(c.bold("aether")) + c.gray(` · ${modeLabel} · cwd ${cwd}`));
   if (redirectedFrom) console.log(c.gray(`(launched from ${redirectedFrom} — saving to ${cwd} instead)`));
-  console.log(c.gray(`task: `) + prompt);
-  console.log(divider());
+  console.log(c.dim(prompt));
+  console.log("");
 
   const mcpManager = await bootMcp();
   const result = await runAgent({
@@ -264,17 +272,16 @@ async function main() {
   });
   if (mcpManager) await mcpManager.shutdown().catch(() => {});
 
-  console.log("\n" + divider());
+  const elapsed = result.elapsed ? formatElapsed(result.elapsed) : "";
+  console.log("");
   if (result.ok) {
-    console.log(c.green(c.bold("● Done")) + c.gray(`  ${result.turns} turn${result.turns === 1 ? "" : "s"} · ${result.totalCredits} credits · ${result.totalIn}→${result.totalOut} tokens`));
-    if (typeof result.balance === "number") {
-      console.log(c.gray(`  balance: ${result.balance.toLocaleString()} credits`));
-    }
+    const parts = [elapsed, `${result.totalCredits} credits`];
+    if (typeof result.balance === "number") parts.push(`balance: ${result.balance.toLocaleString()}`);
+    console.log(c.dim(`Done in ${parts.filter(Boolean).join(" · ")}`));
   } else {
-    console.log(c.red(c.bold("× Stopped")) + c.gray(`  ${result.totalCredits} credits used · ${result.totalIn}→${result.totalOut} tokens`));
+    console.log(c.red("Stopped") + c.gray(`  ${result.totalCredits} credits used` + (elapsed ? ` · ${elapsed}` : "")));
     if (result.error) console.log(errorLine(result.error.message));
   }
-  console.log(divider());
 }
 
 async function handleConfig(rest) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aether-code",
-  "version": "0.43.2",
+  "version": "0.43.4",
   "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

@@ -129,6 +129,7 @@ export async function runAgent({
   let totalIn = 0;
   let totalOut = 0;
   let lastBalance = null;
+  const t0 = Date.now();
   // Loop guard: count identical (name+args) tool calls across the whole run so a
   // confused model can't burn turns re-running the same call (e.g. glob *.md x9).
   const callCounts = new Map();
@@ -159,6 +160,8 @@ export async function runAgent({
     const announced = new Set();
     let lastWasText = false;
     const stripper = makeTokenStripper();
+    let textEmitted = false; // track if real content has been emitted this turn
+    const CHANNEL_WORD_SET = new Set(["thought","analysis","final","commentary","thinking","return","assistant","user","system","developer","tool"]);
 
     // Select skills for this turn against the current user prompt + any
     // paths the model has read so far. Prepend the matching skills' bodies
@@ -179,16 +182,23 @@ export async function runAgent({
         tools,
         model,
         onDelta: (text) => {
-          // Buffered strip of leaked model channel/control tokens (which can
-          // be split across stream chunks) before display.
           const clean = stripper.push(text);
           if (!clean) return;
-          // Don't open a "● " bullet for leading whitespace (e.g. when a whole
-          // turn's text was suppressed as a leak, leaving only a stray newline).
+          // Before any real content, strip stray channel name words that leak
+          // as the first tokens (e.g. "thought\nthought\n" from harmony).
+          if (!textEmitted) {
+            const stripped = clean.replace(/^[\s]*(thought|analysis|final|commentary|thinking|return|assistant|user|system|developer|tool)[\s]*/gi, "");
+            if (!stripped.trim()) return;
+            textEmitted = true;
+            stopSpin();
+            process.stdout.write("\n" + stripped);
+            lastWasText = true;
+            return;
+          }
           if (!lastWasText && !clean.trim()) return;
           stopSpin();
           if (!lastWasText) {
-            process.stdout.write("\n" + c.cyan("● "));
+            process.stdout.write("\n");
             lastWasText = true;
           }
           process.stdout.write(clean);
@@ -208,16 +218,19 @@ export async function runAgent({
     } catch (err) {
       stopSpin();
       if (err instanceof AetherError) {
-        return { ok: false, error: err, totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+        return { ok: false, error: err, totalCredits, totalIn, totalOut, balance: lastBalance, messages, elapsed: Date.now() - t0 };
       }
       throw err;
     }
     stopSpin(); // ensure it's cleared even if the turn produced no output
 
     // Flush any held-back partial token, then close the line.
-    const tail = stripper.flush();
+    let tail = stripper.flush();
+    if (tail && !textEmitted) {
+      tail = tail.replace(/^[\s]*(thought|analysis|final|commentary|thinking|return|assistant|user|system|developer|tool)[\s]*/gi, "");
+    }
     if (tail && (lastWasText || tail.trim())) {
-      if (!lastWasText) { process.stdout.write("\n" + c.cyan("● ")); lastWasText = true; }
+      if (!lastWasText) { process.stdout.write("\n"); lastWasText = true; }
       process.stdout.write(tail);
     }
     if (lastWasText) process.stdout.write("\n");
@@ -228,10 +241,10 @@ export async function runAgent({
     if (typeof res.balanceAfter === "number") lastBalance = res.balanceAfter;
     onTokens({ totalCredits, totalIn, totalOut, balance: lastBalance });
 
-    // Per-turn cost — visible so users catch runaway loops early
-    const inK = ((res.usage?.prompt_tokens ?? 0) / 1000).toFixed(1);
-    const outTok = res.usage?.completion_tokens ?? 0;
-    console.log(c.gray(`  ${inK}k→${outTok} tokens · ${turnCredits} credits (total: ${totalCredits})`));
+    // Per-turn cost — only shown when credits are high enough to warrant attention
+    if (turnCredits > 20) {
+      console.log(c.gray(`  ${turnCredits} credits this turn (${totalCredits} total)`));
+    }
 
     // Push assistant message into history
     messages.push({
@@ -252,19 +265,19 @@ export async function runAgent({
     // Credit cap — hard stop to prevent runaway cost
     if (maxCredits > 0 && totalCredits >= maxCredits) {
       console.log(c.red(`\n[Credit budget exhausted: ${totalCredits} credits used, limit was ${maxCredits}. Stopping.]`));
-      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages, elapsed: Date.now() - t0 };
     }
 
     // Tool call count cap
     if (toolCalls.length > 0 && totalToolCalls + toolCalls.length > MAX_TOTAL_TOOL_CALLS) {
       console.log(c.red(`\n[Tool call limit reached (${MAX_TOTAL_TOOL_CALLS}). Stopping.]`));
-      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages, elapsed: Date.now() - t0 };
     }
 
     // Consecutive tool-only turns cap (model stuck in a tool loop with no text)
     if (consecutiveToolOnlyTurns >= MAX_CONSECUTIVE_TOOL_ONLY) {
       console.log(c.red(`\n[Too many consecutive tool-only turns (${MAX_CONSECUTIVE_TOOL_ONLY}). Stopping.]`));
-      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+      return { ok: true, totalCredits, totalIn, totalOut, balance: lastBalance, messages, elapsed: Date.now() - t0 };
     }
     if (toolCalls.length === 0) {
       // Completeness guard: on a modification task, if the model read files it
@@ -373,7 +386,7 @@ export async function runAgent({
           console.log("  " + c.green("●") + " " + p + c.gray(` — ${action}`));
         }
       }
-      return { ok: true, totalCredits, totalIn, totalOut, turns: i + 1, balance: lastBalance, messages };
+      return { ok: true, totalCredits, totalIn, totalOut, turns: i + 1, balance: lastBalance, messages, elapsed: Date.now() - t0 };
     }
 
     // Execute each tool call. Show the actual args (now that we have them
@@ -384,7 +397,7 @@ export async function runAgent({
       try { args = JSON.parse(call.function.arguments || "{}"); } catch { /* leave empty */ }
       // todo_write renders its own Plan box, so it returns an empty label.
       const label = toolLabel(call.function.name, args);
-      if (label) console.log("\n" + c.cyan("●") + " " + label);
+      if (label) console.log("\n" + c.green("●") + " " + label);
 
       // Loop guard — short-circuit a tool call we've already run 3+ times with
       // the same args, and tell the model to change approach instead of looping.
@@ -445,7 +458,7 @@ export async function runAgent({
   }
 
   console.log(c.yellow(`\nReached max turns (${maxTurns}). Stopping.`));
-  return { ok: false, error: new Error("Max turns reached"), totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+  return { ok: false, error: new Error("Max turns reached"), totalCredits, totalIn, totalOut, balance: lastBalance, messages, elapsed: Date.now() - t0 };
 }
 
 // A build/verify command failing because the TOOLCHAIN ITSELF is missing (e.g.

package/src/render.js

@@ -74,27 +74,27 @@ const ellip = (s, n) => (s && s.length > n ? s.slice(0, n - 1) + "…" : s || ""
 // dumping raw JSON (which buried file contents / queries in noise).
 export function toolLabel(name, args) {
   const a = args || {};
-  const verb = (v) => c.cyan(c.bold(v));
-  const arg = (s) => c.gray(ellip(String(s), 72));
+  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("find")}   ${arg(a.pattern)}`;
-    case "search_files": return `${verb("search")} ${arg(`/${a.pattern}/ in ${a.path ?? "."}`)}`;
-    case "run_shell":    return `${verb("run")}    ${arg(a.command)}`;
-    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
-    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)}"`)}`
+    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))}`;
   }
 }
@@ -199,9 +199,10 @@ export function toolSummary(name, result) {
 // (<|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;
+const CHANNEL_NAMES_RE = /^[ \t]*(thought|analysis|final|commentary|thinking|return|assistant|user|system|developer|tool)[ \t]*$/gim;
 
 export function stripModelTokens(text) {
-  return text.replace(MODEL_TOKEN_RE, "");
+  return text.replace(MODEL_TOKEN_RE, "").replace(CHANNEL_NAMES_RE, "");
 }
 
 // Streaming-safe stripper: the leaked tokens (<|channel|>, <|tool_response|>, …)
@@ -212,7 +213,7 @@ export function makeTokenStripper() {
   let buf = "";
   return {
     push(text) {
-      buf = (buf + text).replace(MODEL_TOKEN_RE, "");
+      buf = (buf + text).replace(MODEL_TOKEN_RE, "").replace(CHANNEL_NAMES_RE, "");
       const partial = buf.match(/<[|a-z_/]*$/i); // possible token start at the tail
       if (partial) {
         const emit = buf.slice(0, partial.index);
@@ -224,7 +225,7 @@ export function makeTokenStripper() {
       return emit;
     },
     flush() {
-      const out = buf.replace(MODEL_TOKEN_RE, "");
+      const out = buf.replace(MODEL_TOKEN_RE, "").replace(CHANNEL_NAMES_RE, "");
       buf = "";
       return out;
     },

package/src/repl.js

@@ -434,11 +434,8 @@ function printBanner(state, projectLine = "", resumed = false) {
 
 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("  ·  ")));
+  if (state.balance != null) parts.push(`${state.balance.toLocaleString()} credits`);
+  parts.push(state.autoYes ? "skip-permissions" : "review mode");
+  if (state.messages.length > 0) parts.push(`${state.messages.length} msgs`);
+  console.log(c.dim(parts.join(" · ")));
 }