aether-code 0.16.3 → 0.17.0

package/bin/aether-code.js

@@ -26,7 +26,7 @@ import {
 import readline from "node:readline";
 import { c, errorLine, divider } from "../src/render.js";
 
-const VERSION = "0.16.3";
+const VERSION = "0.17.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.16.3",
+  "version": "0.17.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

@@ -6,7 +6,7 @@ import { agentTurnStream, AetherError } from "./api.js";
 import { TOOL_DEFINITIONS, executeTool } from "./tools.js";
 import { unnamespaceToolName } from "./mcp.js";
 import { loadAllSkills, selectSkills, renderSkillsBlock } from "./skills.js";
-import { c, divider, turn, toolLabel, toolSummary, stripModelTokens, errorLine } from "./render.js";
+import { c, divider, turn, toolLabel, toolSummary, makeTokenStripper, errorLine } from "./render.js";
 
 const DEFAULT_MAX_TURNS = 25;
 
@@ -59,6 +59,7 @@ export async function runAgent({
     // calling a particular tool (i.e. the `name` arrives in the stream).
     const announced = new Set();
     let lastWasText = false;
+    const stripper = makeTokenStripper();
 
     // Select skills for this turn against the current user prompt + any
     // paths the model has read so far. Prepend the matching skills' bodies
@@ -73,8 +74,9 @@ export async function runAgent({
         messages: turnMessages,
         tools,
         onDelta: (text) => {
-          // Strip any leaked model channel/control tokens before display.
-          const clean = stripModelTokens(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;
           if (!lastWasText) {
             process.stdout.write("  ");
@@ -100,7 +102,12 @@ export async function runAgent({
       throw err;
     }
 
-    // End-of-turn newline + cost meter
+    // Flush any held-back partial token, then close the line.
+    const tail = stripper.flush();
+    if (tail) {
+      if (!lastWasText) { process.stdout.write("  "); lastWasText = true; }
+      process.stdout.write(tail);
+    }
     if (lastWasText) process.stdout.write("\n");
     totalCredits += res.creditsCharged ?? 0;
     totalIn += res.usage?.prompt_tokens ?? 0;

package/src/render.js

@@ -92,11 +92,40 @@ export function toolSummary(name, result) {
 // 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(/<\|[a-z_]*\|?>/gi, "")
-    .replace(/<\/?[a-z_]*\|>/gi, "")
-    .replace(/<\|[a-z_]*>/gi, "");
+  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) {

package/src/repl.js

@@ -17,7 +17,7 @@ import { c, errorLine } from "./render.js";
 import { checkForUpdate } from "./update-check.js";
 import { promptBoxed, EXIT_SIGNAL } from "./ink-input.js";
 
-const VERSION = "0.16.3";
+const VERSION = "0.17.0";
 const MODEL_NAME = "Aether Core";
 
 const SHORTCUTS = `
@@ -100,28 +100,32 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, maxTur
     process.env.AETHER_NO_INK !== "1" &&
     (process.env.AETHER_INK === "1" || !legacyWinConsole);
   let inkBroken = false;
-  let rl = null;
 
   // The Ink box carries its own status bar; the plain prompt doesn't, so show a
   // one-line hint up front when we won't be using Ink.
   if (!useInk) console.log(` ${c.cyan("/help")}${c.dim(" shortcuts")}   ${c.cyan("/exit")}${c.dim(" quit")}\n`);
 
-  function ensureReadline() {
-    if (rl) return rl;
-    rl = readline.createInterface({ input: process.stdin, output: process.stdout, historySize: 200 });
-    let lastSigint = 0;
-    rl.on("SIGINT", () => {
-      const now = Date.now();
-      if (now - lastSigint < 1500) { console.log(c.gray("\nbye.")); rl.close(); process.exit(0); }
-      lastSigint = now;
-      console.log(c.gray(`\n(Press Ctrl+C again within 1.5s to exit, or type ${c.cyan("/exit")})`));
-    });
-    return rl;
-  }
-
+  // Fresh readline interface PER PROMPT. A single persistent interface
+  // conflicted with the per-confirmation readline interfaces the tools open
+  // during a turn (each [y/N] prompt). When a tool's interface closed it left
+  // the REPL's stdin dead — so after finishing a request aether printed the
+  // prompt and immediately EXITED instead of waiting for the next message.
+  // Opening a fresh one each prompt guarantees only one interface exists at a
+  // time, so the REPL keeps running until the user /exits. Returns EXIT_SIGNAL
+  // on a double Ctrl+C.
   function readlineQuestion() {
-    const r = ensureReadline();
-    return new Promise((resolve) => r.question(c.magenta("> "), (ans) => resolve(ans)));
+    return new Promise((resolve) => {
+      const r = readline.createInterface({ input: process.stdin, output: process.stdout, historySize: 200 });
+      let lastSigint = 0;
+      r.on("SIGINT", () => {
+        const now = Date.now();
+        if (now - lastSigint < 1500) { r.close(); resolve(EXIT_SIGNAL); return; }
+        lastSigint = now;
+        process.stdout.write(c.gray(`\n(Press Ctrl+C again within 1.5s to exit, or type ${c.cyan("/exit")})\n`));
+        r.prompt();
+      });
+      r.question(c.magenta("> "), (ans) => { r.close(); resolve(ans); });
+    });
   }
 
   // Returns the next raw input line, or EXIT_SIGNAL to quit.
@@ -143,7 +147,7 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, maxTur
 
   while (true) {
     const raw = await nextLine();
-    if (raw === EXIT_SIGNAL) { console.log(c.gray("bye.")); if (rl) rl.close(); return; }
+    if (raw === EXIT_SIGNAL) { console.log(c.gray("bye.")); return; }
     const line = (raw ?? "").trim();
     if (!line) continue;
 
@@ -155,7 +159,7 @@ export async function runRepl({ cwd: initialCwd, autoYes: initialAutoYes, maxTur
     // Slash command?
     if (line.startsWith("/") || line === "?") {
       const handled = await handleSlash(line, state);
-      if (handled === "exit") { if (rl) rl.close(); return; }
+      if (handled === "exit") return;
       printStatusLine(state);
       continue;
     }