aether-code 0.9.0 → 0.10.0

package/bin/aether-code.js

@@ -15,9 +15,10 @@ import { runSetup } from "../src/setup.js";
 import { fetchBalance, AetherError } from "../src/api.js";
 import { writeConfigFile, getConfig, CONFIG_PATH } from "../src/config.js";
 import { loadMcpConfig, MCPManager } from "../src/mcp.js";
+import { addServer, removeServer, listServers } from "../src/mcp-cli.js";
 import { c, errorLine, divider } from "../src/render.js";
 
-const VERSION = "0.9.0";
+const VERSION = "0.10.0";
 
 /**
  * Try to start MCP servers from ~/.aether/mcp.json. Returns a started
@@ -64,6 +65,7 @@ ${c.bold("SUBCOMMANDS")}
   ${c.cyan("logout")}                               Clear saved API key
   ${c.cyan("balance")}                              Show plan + credit balance
   ${c.cyan("config")} show|set|set-base|path        Manage config file
+  ${c.cyan("mcp")} list|add|remove                  Manage MCP server connections
 
 ${c.bold("EXAMPLES")}
   aether                               # interactive REPL
@@ -156,6 +158,10 @@ async function main() {
     await handleBalance();
     return;
   }
+  if (sub === "mcp") {
+    await handleMcp(args._.slice(1));
+    return;
+  }
 
   const prompt = args._.join(" ").trim();
 
@@ -259,6 +265,95 @@ async function handleBalance() {
   }
 }
 
+async function handleMcp(rest) {
+  const sub = (rest[0] || "list").toLowerCase();
+
+  if (sub === "list" || sub === "ls") {
+    const servers = listServers();
+    if (servers.length === 0) {
+      console.log(c.gray("No MCP servers configured."));
+      console.log(c.gray("Add one with:"));
+      console.log(c.gray("  aether mcp add <name> -- <command> [args...]"));
+      console.log(c.gray("Example:"));
+      console.log(
+        c.gray('  aether mcp add filesystem -- npx -y @modelcontextprotocol/server-filesystem /path'),
+      );
+      return;
+    }
+    console.log(c.bold(`Configured MCP servers (${servers.length}):`));
+    for (const [name, cfg] of servers) {
+      const argsStr = cfg.args && cfg.args.length > 0 ? " " + cfg.args.join(" ") : "";
+      console.log(`  ${c.cyan(name)}: ${cfg.command}${argsStr}`);
+      if (cfg.env && Object.keys(cfg.env).length > 0) {
+        for (const [k, v] of Object.entries(cfg.env)) {
+          console.log(c.gray(`    env ${k}=${v}`));
+        }
+      }
+    }
+    return;
+  }
+
+  if (sub === "add") {
+    // Syntax: aether mcp add <name> [--env KEY=VAL]... -- <command> [args...]
+    const tail = rest.slice(1);
+    const dashIdx = tail.indexOf("--");
+    if (dashIdx === -1) {
+      die(
+        'Usage: aether mcp add <name> [--env KEY=VAL]... -- <command> [args...]\n' +
+          'Example: aether mcp add fs -- npx -y @modelcontextprotocol/server-filesystem /tmp',
+      );
+    }
+    const pre = tail.slice(0, dashIdx);
+    const post = tail.slice(dashIdx + 1);
+    const name = pre[0];
+    if (!name) die("aether mcp add: missing <name>");
+    if (post.length === 0) die("aether mcp add: missing <command> after '--'");
+
+    const env = {};
+    for (let i = 1; i < pre.length; i++) {
+      if (pre[i] === "--env") {
+        const kv = pre[++i];
+        if (!kv) die("--env needs a KEY=VAL argument");
+        const eq = kv.indexOf("=");
+        if (eq <= 0) die(`--env value must be KEY=VAL, got: ${kv}`);
+        env[kv.slice(0, eq)] = kv.slice(eq + 1);
+      } else {
+        die(`aether mcp add: unrecognized option "${pre[i]}" before the '--' separator`);
+      }
+    }
+
+    const command = post[0];
+    const cmdArgs = post.slice(1);
+    try {
+      const entry = addServer({ name, command, args: cmdArgs, env });
+      console.log(`${c.green("✓")} Added MCP server "${c.cyan(name)}".`);
+      const argsStr = entry.args && entry.args.length > 0 ? " " + entry.args.join(" ") : "";
+      console.log(c.gray(`  ${entry.command}${argsStr}`));
+      console.log(c.gray("Restart the agent (or run `aether`) to attach it."));
+    } catch (e) {
+      die(e.message || String(e));
+    }
+    return;
+  }
+
+  if (sub === "remove" || sub === "rm" || sub === "delete") {
+    const name = rest[1];
+    if (!name) die("aether mcp remove: missing <name>");
+    try {
+      removeServer({ name });
+      console.log(`${c.green("✓")} Removed MCP server "${c.cyan(name)}".`);
+    } catch (e) {
+      die(e.message || String(e));
+    }
+    return;
+  }
+
+  die(
+    `aether mcp: unknown subcommand "${sub}".\n` +
+      "Try one of: list, add, remove.",
+  );
+}
+
 main().catch((err) => {
   console.error(errorLine(err.message || String(err)));
   if (process.env.DEBUG) console.error(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aether-code",
-  "version": "0.9.0",
+  "version": "0.10.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": {
@@ -22,7 +22,7 @@
     "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",
+    "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 src/mcp-cli.js",
     "test": "node --test \"test/**/*.test.js\""
   },
   "keywords": [

package/src/mcp-cli.js

@@ -0,0 +1,94 @@
+// `aether mcp` subcommand machinery: add / remove / list MCP servers
+// in ~/.aether/mcp.json without the user hand-editing JSON.
+//
+// All read/write goes through this module so the validation (delegated to
+// mcp.js) is consistent with what MCPManager will accept at runtime.
+// configPath is injectable for tests; production code uses DEFAULT_PATH.
+
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { validateMcpConfig } from "./mcp.js";
+
+const DEFAULT_PATH = path.join(os.homedir(), ".aether", "mcp.json");
+
+function resolvePath(opts) {
+  return opts?.configPath || DEFAULT_PATH;
+}
+
+export function readConfig(opts) {
+  const p = resolvePath(opts);
+  if (!fs.existsSync(p)) return { mcpServers: {} };
+  let raw;
+  try {
+    raw = fs.readFileSync(p, "utf8");
+  } catch (e) {
+    throw new Error(`MCP config at ${p} unreadable: ${e.message}`);
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed.mcpServers || typeof parsed.mcpServers !== "object") {
+      return { ...parsed, mcpServers: {} };
+    }
+    return parsed;
+  } catch (e) {
+    throw new Error(`MCP config at ${p} is not valid JSON: ${e.message}`);
+  }
+}
+
+function writeConfig(config, opts) {
+  const p = resolvePath(opts);
+  fs.mkdirSync(path.dirname(p), { recursive: true });
+  // Pretty-print so users can read + hand-edit if they want, and trailing
+  // newline so diff tools don't bicker.
+  fs.writeFileSync(p, JSON.stringify(config, null, 2) + "\n", "utf8");
+}
+
+/**
+ * Add a server entry. Mutates ~/.aether/mcp.json (creating it + the dir
+ * if missing). Validates the full resulting config via validateMcpConfig
+ * so a bad add can't poison the file with a config the runtime would
+ * later reject.
+ */
+export function addServer({ configPath, name, command, args = [], env = {} }) {
+  const cfg = readConfig({ configPath });
+  if (cfg.mcpServers[name]) {
+    throw new Error(
+      `MCP server "${name}" already configured. Remove it first with \`aether mcp remove ${name}\` or pick a different name.`,
+    );
+  }
+  const entry = { command };
+  if (args.length > 0) entry.args = args;
+  if (Object.keys(env).length > 0) entry.env = env;
+  const next = {
+    ...cfg,
+    mcpServers: { ...cfg.mcpServers, [name]: entry },
+  };
+  validateMcpConfig(next, configPath || "<add>"); // throws on schema failure
+  writeConfig(next, { configPath });
+  return entry;
+}
+
+/**
+ * Remove a server entry by name. Throws if it doesn't exist (so the user
+ * notices typos instead of silently no-op'ing).
+ */
+export function removeServer({ configPath, name }) {
+  const cfg = readConfig({ configPath });
+  if (!cfg.mcpServers[name]) {
+    throw new Error(`MCP server "${name}" not configured.`);
+  }
+  const nextServers = { ...cfg.mcpServers };
+  delete nextServers[name];
+  const next = { ...cfg, mcpServers: nextServers };
+  writeConfig(next, { configPath });
+}
+
+/**
+ * Return [[name, entry], ...] for every configured server. Empty array
+ * when no config exists or mcpServers is empty.
+ */
+export function listServers(opts) {
+  const cfg = readConfig(opts);
+  return Object.entries(cfg.mcpServers);
+}