aether-code 0.43.0 → 0.43.1

package/src/ink-input.js

@@ -1,91 +1,91 @@
-// Ink-based boxed input for the REPL — the bordered live input box (Claude
-// Code-style). Rendered fresh for each prompt, then unmounted so the agent's
-// plain console.log streaming during a turn never fights Ink for the terminal.
-//
-// Uses a `single`-line border (broadly supported in cmd.exe Consolas) rather
-// than rounded corners, which render as tofu on some Windows fonts.
-//
-// No JSX / no build step: components are built with React.createElement so the
-// package ships as-is. `InputApp` is exported (pure UI + callbacks) so it can be
-// unit-tested with ink-testing-library without a real TTY.
-
-import React, { useState, useRef } from "react";
-import { render, Box, Text, useApp, useInput } from "ink";
-import TextInput from "ink-text-input";
-
-const h = React.createElement;
-
-// Sentinel promptBoxed() resolves with on a double Ctrl+C, so the caller can
-// distinguish "user wants to quit" from an empty submitted line. Plain ASCII so
-// it can never be confused with a real keystroke or hide invisible chars.
-export const EXIT_SIGNAL = "<<aether-exit>>";
-
-/**
- * Pure input UI. Calls onSubmit(value) on Enter and onExit() on a double Ctrl+C.
- * Up/Down arrows walk `history` (newest last). No process/terminal side effects
- * of its own, so it's testable in isolation with ink-testing-library.
- */
-export function InputApp({ onSubmit, onExit, statusLeft = "", statusRight = "", history = [] }) {
-  const [value, setValue] = useState("");
-  const lastCtrlC = useRef(0);
-  const histIdx = useRef(history.length);
-
-  useInput((input, key) => {
-    if (key.ctrl && input === "c") {
-      const now = Date.now();
-      if (now - lastCtrlC.current < 1500) onExit();
-      else { lastCtrlC.current = now; setValue(""); }
-      return;
-    }
-    if (key.upArrow) {
-      if (histIdx.current > 0) { histIdx.current -= 1; setValue(history[histIdx.current] ?? ""); }
-    } else if (key.downArrow) {
-      if (histIdx.current < history.length - 1) { histIdx.current += 1; setValue(history[histIdx.current] ?? ""); }
-      else { histIdx.current = history.length; setValue(""); }
-    }
-  });
-
-  return h(
-    Box,
-    { flexDirection: "column", width: "100%" },
-    h(
-      Box,
-      { borderStyle: "single", borderColor: "magenta", paddingX: 1 },
-      h(Text, { color: "magenta", bold: true }, "> "),
-      h(TextInput, { value, onChange: setValue, onSubmit, placeholder: "" }),
-    ),
-    h(
-      Box,
-      { paddingX: 1, width: "100%", justifyContent: "space-between" },
-      h(Text, { dimColor: true }, statusLeft),
-      h(Text, { dimColor: true }, statusRight),
-    ),
-  );
-}
-
-/**
- * Render a one-shot boxed input and resolve with the submitted line. Resolves
- * EXIT_SIGNAL on a double Ctrl+C; resolves "" if the app exits without a submit.
- */
-export function promptBoxed(opts = {}) {
-  return new Promise((resolve) => {
-    let done = false;
-    let appApi = null;
-    const fin = (val) => {
-      if (done) return;
-      done = true;
-      try { if (appApi) appApi.exit(); } catch { /* already exiting */ }
-      resolve(val);
-    };
-    const Wrapper = () => {
-      appApi = useApp();
-      return h(InputApp, {
-        ...opts,
-        onSubmit: (v) => fin(v),
-        onExit: () => fin(EXIT_SIGNAL),
-      });
-    };
-    const instance = render(h(Wrapper), { exitOnCtrlC: false });
-    instance.waitUntilExit().then(() => { if (!done) { done = true; resolve(""); } });
-  });
-}
+// Ink-based boxed input for the REPL — the bordered live input box (Claude
+// Code-style). Rendered fresh for each prompt, then unmounted so the agent's
+// plain console.log streaming during a turn never fights Ink for the terminal.
+//
+// Uses a `single`-line border (broadly supported in cmd.exe Consolas) rather
+// than rounded corners, which render as tofu on some Windows fonts.
+//
+// No JSX / no build step: components are built with React.createElement so the
+// package ships as-is. `InputApp` is exported (pure UI + callbacks) so it can be
+// unit-tested with ink-testing-library without a real TTY.
+
+import React, { useState, useRef } from "react";
+import { render, Box, Text, useApp, useInput } from "ink";
+import TextInput from "ink-text-input";
+
+const h = React.createElement;
+
+// Sentinel promptBoxed() resolves with on a double Ctrl+C, so the caller can
+// distinguish "user wants to quit" from an empty submitted line. Plain ASCII so
+// it can never be confused with a real keystroke or hide invisible chars.
+export const EXIT_SIGNAL = "<<aether-exit>>";
+
+/**
+ * Pure input UI. Calls onSubmit(value) on Enter and onExit() on a double Ctrl+C.
+ * Up/Down arrows walk `history` (newest last). No process/terminal side effects
+ * of its own, so it's testable in isolation with ink-testing-library.
+ */
+export function InputApp({ onSubmit, onExit, statusLeft = "", statusRight = "", history = [] }) {
+  const [value, setValue] = useState("");
+  const lastCtrlC = useRef(0);
+  const histIdx = useRef(history.length);
+
+  useInput((input, key) => {
+    if (key.ctrl && input === "c") {
+      const now = Date.now();
+      if (now - lastCtrlC.current < 1500) onExit();
+      else { lastCtrlC.current = now; setValue(""); }
+      return;
+    }
+    if (key.upArrow) {
+      if (histIdx.current > 0) { histIdx.current -= 1; setValue(history[histIdx.current] ?? ""); }
+    } else if (key.downArrow) {
+      if (histIdx.current < history.length - 1) { histIdx.current += 1; setValue(history[histIdx.current] ?? ""); }
+      else { histIdx.current = history.length; setValue(""); }
+    }
+  });
+
+  return h(
+    Box,
+    { flexDirection: "column", width: "100%" },
+    h(
+      Box,
+      { borderStyle: "single", borderColor: "magenta", paddingX: 1 },
+      h(Text, { color: "magenta", bold: true }, "> "),
+      h(TextInput, { value, onChange: setValue, onSubmit, placeholder: "" }),
+    ),
+    h(
+      Box,
+      { paddingX: 1, width: "100%", justifyContent: "space-between" },
+      h(Text, { dimColor: true }, statusLeft),
+      h(Text, { dimColor: true }, statusRight),
+    ),
+  );
+}
+
+/**
+ * Render a one-shot boxed input and resolve with the submitted line. Resolves
+ * EXIT_SIGNAL on a double Ctrl+C; resolves "" if the app exits without a submit.
+ */
+export function promptBoxed(opts = {}) {
+  return new Promise((resolve) => {
+    let done = false;
+    let appApi = null;
+    const fin = (val) => {
+      if (done) return;
+      done = true;
+      try { if (appApi) appApi.exit(); } catch { /* already exiting */ }
+      resolve(val);
+    };
+    const Wrapper = () => {
+      appApi = useApp();
+      return h(InputApp, {
+        ...opts,
+        onSubmit: (v) => fin(v),
+        onExit: () => fin(EXIT_SIGNAL),
+      });
+    };
+    const instance = render(h(Wrapper), { exitOnCtrlC: false });
+    instance.waitUntilExit().then(() => { if (!done) { done = true; resolve(""); } });
+  });
+}

package/src/mcp-cli.js

@@ -1,94 +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);
-}
+// `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);
+}