aether-code 0.6.2 → 0.9.0

package/package.json

@@ -1,38 +1,42 @@
-{
-  "name": "aether-code",
-  "version": "0.6.2",
-  "description": "Uncensored AI coding agent for your terminal. Type `aether` to launch the interactive REPL — like Claude Code, with no refusal layer.",
-  "homepage": "https://trynoguard.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/dannyphantomx64/aether-code"
-  },
-  "license": "MIT",
-  "type": "module",
-  "bin": {
-    "aether": "bin/aether-code.js"
-  },
-  "files": [
-    "bin",
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "scripts": {
-    "lint": "node --check bin/aether-code.js && node --check src/agent.js && node --check src/api.js && node --check src/config.js && node --check src/render.js && node --check src/tools.js && node --check src/diff.js && node --check src/repl.js && node --check src/plan.js && node --check src/sessions.js"
-  },
-  "keywords": [
-    "aether",
-    "uncensored",
-    "ai",
-    "coding-agent",
-    "claude-code-alternative",
-    "agent",
-    "cli",
-    "tool-use",
-    "agentic"
-  ]
-}
+{
+  "name": "aether-code",
+  "version": "0.9.0",
+  "description": "Uncensored AI coding agent for your terminal. Type `aether` to launch the interactive REPL — like Claude Code, with no refusal layer.",
+  "homepage": "https://trynoguard.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dannyphantomx64/aether-code"
+  },
+  "license": "MIT",
+  "type": "module",
+  "bin": {
+    "aether": "bin/aether-code.js"
+  },
+  "files": [
+    "bin",
+    "src",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "scripts": {
+    "lint": "node --check bin/aether-code.js src/agent.js src/api.js src/config.js src/render.js src/tools.js src/diff.js src/repl.js src/mcp.js",
+    "test": "node --test \"test/**/*.test.js\""
+  },
+  "keywords": [
+    "aether",
+    "uncensored",
+    "ai",
+    "coding-agent",
+    "claude-code-alternative",
+    "agent",
+    "cli",
+    "tool-use",
+    "agentic"
+  ],
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0"
+  }
+}

package/src/agent.js

@@ -1,201 +1,134 @@
-// Agent loop. Streams each turn from /api/v1/agent/stream, prints text deltas
-// in real-time, executes any tool calls, loops until the model returns no
-// tool calls (task done) or max-turns is reached.
-
-import { agentTurnStream, AetherError } from "./api.js";
-import { TOOL_DEFINITIONS, executeTool } from "./tools.js";
-import { saveSession, newSessionId } from "./sessions.js";
-import {
-  c, turnLine, costLine, toolAnnounce, toolResultLine, errorLine, assistantPrefix,
-} from "./render.js";
-
-const DEFAULT_MAX_TURNS = 25;
-
-export async function runAgent({
-  initialPrompt,
-  priorMessages,
-  cwd,
-  autoYes = false,
-  unsafePaths = false,
-  maxTurns = DEFAULT_MAX_TURNS,
-  onTokens = () => {},
-  // Session persistence options
-  sessionId,                  // existing id (resume) or null (new)
-  saveSessions = true,        // disable with --no-save
-  sessionCreatedAt,           // ISO from prior session, or now
-  // Prior cumulative totals from a resumed session — used so the saved
-  // session reflects lifetime usage, not just this invocation.
-  priorTotalCredits = 0,
-  priorTotalIn = 0,
-  priorTotalOut = 0,
-}) {
-  const messages = priorMessages
-    ? [...priorMessages, { role: "user", content: initialPrompt }]
-    : [{ role: "user", content: initialPrompt }];
-  // Per-invocation counters (used in the result summary).
-  let totalCredits = 0;
-  let totalIn = 0;
-  let totalOut = 0;
-  let lastBalance = null;
-
-  // Session bookkeeping — save after every turn so a crash doesn't lose state.
-  const activeSessionId = sessionId ?? (saveSessions ? newSessionId() : null);
-  const createdAt = sessionCreatedAt ?? new Date().toISOString();
-  // Find the first user message text for the index display
-  const firstUser = messages.find((m) => m.role === "user");
-  const firstUserMessage =
-    firstUser && typeof firstUser.content === "string" ? firstUser.content : initialPrompt;
-  const persist = () => {
-    if (!activeSessionId || !saveSessions) return;
-    try {
-      saveSession({
-        id: activeSessionId,
-        createdAt,
-        cwd,
-        // Save cumulative lifetime totals so /sessions show reflects all runs.
-        totalCredits: priorTotalCredits + totalCredits,
-        totalIn: priorTotalIn + totalIn,
-        totalOut: priorTotalOut + totalOut,
-        firstUserMessage,
-        messages,
-      });
-    } catch (e) {
-      // Don't kill the agent on save failure; just warn once.
-      console.log(c.dim(`(session save failed: ${e.message})`));
-    }
-  };
-
-  for (let i = 0; i < maxTurns; i++) {
-    process.stdout.write("\n" + turnLine(i + 1) + "\n");
-
-    const announced = new Set();
-    let textOpened = false;
-
-    let res;
-    try {
-      res = await agentTurnStream({
-        messages,
-        tools: TOOL_DEFINITIONS,
-        onDelta: (text) => {
-          if (!textOpened) {
-            process.stdout.write(assistantPrefix() + " ");
-            textOpened = true;
-          }
-          process.stdout.write(text);
-        },
-        onToolCallDelta: (delta) => {
-          // Print friendly tool-call header once name + (eventually) args land.
-          // We delay the announce until args are mostly assembled — see below.
-          if (delta.name && !announced.has(delta.index)) {
-            announced.add(delta.index);
-            if (textOpened) {
-              process.stdout.write("\n");
-              textOpened = false;
-            }
-            process.stdout.write(c.cyan("  ⚡ ") + c.bold(c.cyan(delta.name)) + c.dim(" preparing…\n"));
-          }
-        },
-      });
-    } catch (err) {
-      if (err instanceof AetherError) {
-        persist();
-        return {
-          ok: false,
-          error: err,
-          totalCredits,
-          totalIn,
-          totalOut,
-          balance: lastBalance,
-          messages,
-          sessionId: activeSessionId,
-        };
-      }
-      throw err;
-    }
-
-    // End-of-turn: handle three render cases for the assistant message.
-    //
-    // 1. Deltas streamed normally → close the line we opened with onDelta.
-    // 2. No deltas fired BUT the final accumulated content has text → safety
-    //    net: print it retroactively (defends against any SSE buffering
-    //    race we haven't seen but could exist).
-    // 3. No deltas, no content, no tool calls → the model emitted only
-    //    internal/whitespace tokens. Show a placeholder so the user isn't
-    //    confused by a silent turn that still consumed credits.
-    const finalText = res.message.content ?? "";
-    const hasToolCalls = (res.message.tool_calls?.length ?? 0) > 0;
-    if (textOpened) {
-      process.stdout.write("\n");
-    } else if (finalText.length > 0) {
-      process.stdout.write(assistantPrefix() + " " + finalText + "\n");
-    } else if (!hasToolCalls) {
-      process.stdout.write(assistantPrefix() + " " + c.dim("(empty response)") + "\n");
-    }
-    totalCredits += res.creditsCharged ?? 0;
-    totalIn += res.usage?.prompt_tokens ?? 0;
-    totalOut += res.usage?.completion_tokens ?? 0;
-    if (typeof res.balanceAfter === "number") lastBalance = res.balanceAfter;
-    onTokens({ totalCredits, totalIn, totalOut, balance: lastBalance });
-    process.stdout.write(costLine({
-      creditsCharged: res.creditsCharged ?? 0,
-      inputTokens: res.usage?.prompt_tokens ?? 0,
-      outputTokens: res.usage?.completion_tokens ?? 0,
-      finishReason: res.finish_reason,
-    }) + "\n");
-
-    // Push assistant message into history. Coerce null → "" (Venice hates null).
-    messages.push({
-      role: "assistant",
-      content: res.message.content ?? "",
-      tool_calls: res.message.tool_calls,
-    });
-
-    const toolCalls = res.message.tool_calls ?? [];
-    if (toolCalls.length === 0) {
-      persist();
-      return {
-        ok: true,
-        totalCredits,
-        totalIn,
-        totalOut,
-        turns: i + 1,
-        balance: lastBalance,
-        messages,
-        sessionId: activeSessionId,
-      };
-    }
-
-    // Execute each tool call. Now we know the full args, render the friendly
-    // label + execute + show summarized result.
-    for (const call of toolCalls) {
-      let args = {};
-      try { args = JSON.parse(call.function.arguments || "{}"); } catch { /* leave empty */ }
-      console.log("");
-      console.log(toolAnnounce(call.function.name, args));
-
-      const result = await executeTool(call, { cwd, autoYes, unsafePaths });
-      console.log(toolResultLine(call.function.name, result));
-
-      messages.push({
-        role: "tool",
-        tool_call_id: call.id,
-        content: result.output ?? (result.ok ? "(no output)" : "Failed."),
-      });
-    }
-    // Save after each tool round so a kill -9 doesn't lose state
-    persist();
-  }
-
-  console.log(c.yellow(`\n⚠ Reached max turns (${maxTurns}). Stopping.`));
-  persist();
-  return {
-    ok: false,
-    error: new Error("Max turns reached"),
-    totalCredits,
-    totalIn,
-    totalOut,
-    balance: lastBalance,
-    messages,
-    sessionId: activeSessionId,
-  };
-}
+// Agent loop. Streams each turn from /api/v1/agent/stream, prints text deltas
+// in real-time, executes any tool calls, loops until the model returns no
+// tool calls (task done) or max-turns is reached.
+
+import { agentTurnStream, AetherError } from "./api.js";
+import { TOOL_DEFINITIONS, executeTool } from "./tools.js";
+import { unnamespaceToolName } from "./mcp.js";
+import { c, divider, turn, toolHeader, toolResult, errorLine } from "./render.js";
+
+const DEFAULT_MAX_TURNS = 25;
+
+export async function runAgent({
+  initialPrompt,
+  priorMessages,
+  cwd,
+  autoYes = false,
+  unsafePaths = false,
+  maxTurns = DEFAULT_MAX_TURNS,
+  onTokens = () => {},
+  // Optional MCPManager. When provided, its tools are merged into the agent's
+  // toolset and tool calls prefixed `mcp__` are routed to it instead of the
+  // built-in executeTool.
+  mcpManager = null,
+}) {
+  // Merge built-in tools with MCP-provided tools. MCP tools come second so
+  // any name collision (unlikely given namespacing, but defense in depth)
+  // resolves to the built-in.
+  const tools = mcpManager
+    ? [...TOOL_DEFINITIONS, ...mcpManager.getToolDefinitions()]
+    : TOOL_DEFINITIONS;
+  // Two callers: one-shot (initialPrompt only, fresh conversation) and REPL
+  // (priorMessages + initialPrompt to continue an ongoing chat).
+  const messages = priorMessages
+    ? [...priorMessages, { role: "user", content: initialPrompt }]
+    : [{ role: "user", content: initialPrompt }];
+  let totalCredits = 0;
+  let totalIn = 0;
+  let totalOut = 0;
+  let lastBalance = null;
+
+  for (let i = 0; i < maxTurns; i++) {
+    process.stdout.write("\n" + turn(i + 1) + "\n");
+
+    // Stream the assistant's response. Print text deltas as they arrive,
+    // along with tool-call announcements as soon as the model commits to
+    // calling a particular tool (i.e. the `name` arrives in the stream).
+    const announced = new Set();
+    let lastWasText = false;
+
+    let res;
+    try {
+      res = await agentTurnStream({
+        messages,
+        tools,
+        onDelta: (text) => {
+          if (!lastWasText) {
+            process.stdout.write("  ");
+            lastWasText = true;
+          }
+          process.stdout.write(text);
+        },
+        onToolCallDelta: (delta) => {
+          // Print the tool header once we know the name (first chunk for that index)
+          if (delta.name && !announced.has(delta.index)) {
+            announced.add(delta.index);
+            if (lastWasText) process.stdout.write("\n");
+            lastWasText = false;
+            process.stdout.write(c.cyan(c.bold(delta.name)) + c.gray("(...)") + c.gray(" preparing args\n"));
+          }
+        },
+      });
+    } catch (err) {
+      if (err instanceof AetherError) {
+        return { ok: false, error: err, totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+      }
+      throw err;
+    }
+
+    // End-of-turn newline + cost meter
+    if (lastWasText) process.stdout.write("\n");
+    totalCredits += res.creditsCharged ?? 0;
+    totalIn += res.usage?.prompt_tokens ?? 0;
+    totalOut += res.usage?.completion_tokens ?? 0;
+    if (typeof res.balanceAfter === "number") lastBalance = res.balanceAfter;
+    onTokens({ totalCredits, totalIn, totalOut, balance: lastBalance });
+    process.stdout.write(
+      c.dim(`  ${res.creditsCharged ?? 0} cr · ${res.usage?.prompt_tokens ?? 0}→${res.usage?.completion_tokens ?? 0} tokens · finish: ${res.finish_reason}\n`),
+    );
+
+    // Push assistant message into history
+    messages.push({
+      role: "assistant",
+      content: res.message.content,
+      tool_calls: res.message.tool_calls,
+    });
+
+    const toolCalls = res.message.tool_calls ?? [];
+    if (toolCalls.length === 0) {
+      return { ok: true, totalCredits, totalIn, totalOut, turns: i + 1, balance: lastBalance, messages };
+    }
+
+    // Execute each tool call. Show the actual args (now that we have them
+    // fully assembled) and run.
+    for (const call of toolCalls) {
+      let args = {};
+      try { args = JSON.parse(call.function.arguments || "{}"); } catch { /* leave empty */ }
+      console.log("");
+      console.log(toolHeader(call.function.name, args));
+
+      // Route to MCP if the tool name is namespaced (mcp__server__tool);
+      // otherwise execute the built-in tool. unnamespaceToolName returns
+      // null for non-MCP names, which is our cheap dispatch test.
+      let result;
+      if (mcpManager && unnamespaceToolName(call.function.name)) {
+        result = await mcpManager.callTool(call.function.name, args);
+      } else {
+        result = await executeTool(call, { cwd, autoYes, unsafePaths });
+      }
+      if (result.output) {
+        const preview = result.output.length > 800 ? result.output.slice(0, 800) + "\n…(truncated)" : result.output;
+        console.log(toolResult(preview, result.ok));
+      }
+
+      messages.push({
+        role: "tool",
+        tool_call_id: call.id,
+        content: result.output ?? (result.ok ? "(no output)" : "Failed."),
+      });
+    }
+  }
+
+  console.log(c.yellow(`\nReached max turns (${maxTurns}). Stopping.`));
+  return { ok: false, error: new Error("Max turns reached"), totalCredits, totalIn, totalOut, balance: lastBalance, messages };
+}