wattetheria 0.2.8 → 0.2.9

package/README.md

@@ -552,6 +552,11 @@ CLI prerequisites:
 
 The CLI handles image pull, deployment directory setup, environment generation, container start,
 and health checks internally.
+Agent commands such as `identity`, `wallet`, `servicenet`, and `publish` are forwarded to the
+platform native `wattetheria-client-cli` bundled under `bin/native/<platform>-<arch>/`; installed
+release packages should not require Rust on the user's machine. Release publishing can stage a
+native CLI binary with `npm run stage:native-cli -- --platform <platform> --arch <arch> --source <path>`.
+`WATTETHERIA_CLI_BIN` remains an advanced override for custom local binaries.
 
 Version commands:
 

package/lib/cli.js

@@ -29,6 +29,26 @@ const WINDOWS_DOCKER_CANDIDATES = [
   "C:\\Program Files\\Docker\\Docker\\resources\\bin\\docker.exe",
   "C:\\Program Files\\Docker\\cli-plugins\\docker.exe"
 ];
+const RUST_CLI_BASE_NAME = "wattetheria-client-cli";
+const NATIVE_ARCH_ALIASES = new Map([
+  ["x64", "x64"],
+  ["arm64", "arm64"]
+]);
+const BANNER_COMMANDS = new Set([
+  "help",
+  "install",
+  "start",
+  "up",
+  "update",
+  "restart",
+  "stop",
+  "down",
+  "uninstall",
+  "doctor"
+]);
+const ANSI_ORANGE = "\x1b[38;5;166m";
+const ANSI_MUTED = "\x1b[38;5;244m";
+const ANSI_RESET = "\x1b[0m";
 
 function printHelp() {
   console.log(`Wattetheria CLI ${PACKAGE_JSON.version}
@@ -52,7 +72,7 @@ Commands:
   doctor      Check local prerequisites
   help        Show this help
 
-Developer subcommands (forwarded to the local 'wattetheria-client-cli' Rust binary):
+Agent subcommands (forwarded to the bundled native CLI when available):
   identity    init | show | export-seed
   wallet      manage wallet payment accounts
   servicenet  provider register
@@ -485,7 +505,19 @@ function formatCliVersionString() {
 }
 
 function formatBanner(options) {
-  return `${formatReleaseVersionString(options)} — Local agent runtime with swarm sync and external agent reach.`;
+  const wordmark = [
+    " __        __    _   _   _          _   _               _       ",
+    " \\ \\      / /_ _| |_| |_| |__   ___| |_| |__   ___ _ __(_) __ _ ",
+    "  \\ \\ /\\ / / _` | __| __| '_ \\ / _ \\ __| '_ \\ / _ \\ '__| |/ _` |",
+    "   \\ V  V / (_| | |_| |_| | | |  __/ |_| | | |  __/ |  | | (_| |",
+    "    \\_/\\_/ \\__,_|\\__|\\__|_| |_|\\___|\\__|_| |_|\\___|_|  |_|\\__,_|"
+  ].join("\n");
+  const subtitle = `${formatReleaseVersionString(options)} - local agent runtime, swarm sync, external agent reach`;
+
+  if (!supportsBannerColor()) {
+    return `${wordmark}\n${subtitle}`;
+  }
+  return `${ANSI_ORANGE}${wordmark}${ANSI_RESET}\n${ANSI_MUTED}${subtitle}${ANSI_RESET}`;
 }
 
 function formatDockerStatusMessage(status) {
@@ -1170,7 +1202,10 @@ function printImages(options) {
 }
 
 function shouldPrintBanner(command) {
-  return !["help", "--help", "-h", "version", "images", "mcp-proxy"].includes(command);
+  return isInteractiveTerminal()
+    && !process.env.CI
+    && !process.env.WATTETHERIA_NO_BANNER
+    && BANNER_COMMANDS.has(command);
 }
 
 function printBanner(options) {
@@ -1178,6 +1213,12 @@ function printBanner(options) {
   console.log("");
 }
 
+function supportsBannerColor() {
+  return process.stdout.isTTY
+    && !process.env.NO_COLOR
+    && process.env.TERM !== "dumb";
+}
+
 // Forwarded subcommands delegate verbatim to the local Rust binary
 // `wattetheria-client-cli`. Keep the JS side stupid — no flag parsing here.
 const FORWARDED_SUBCOMMANDS = new Set([
@@ -1187,13 +1228,34 @@ const FORWARDED_SUBCOMMANDS = new Set([
   "publish",
 ]);
 
+function nativePlatformKey(platform = process.platform, arch = process.arch) {
+  const normalizedArch = NATIVE_ARCH_ALIASES.get(arch);
+  if (!normalizedArch || !["darwin", "linux", "win32"].includes(platform)) {
+    return "";
+  }
+  return `${platform}-${normalizedArch}`;
+}
+
+function rustCliBinaryName(platform = process.platform) {
+  return platform === "win32" ? `${RUST_CLI_BASE_NAME}.exe` : RUST_CLI_BASE_NAME;
+}
+
+function bundledRustBinaryPath() {
+  const platformKey = nativePlatformKey();
+  if (!platformKey) {
+    return "";
+  }
+  return path.join(PACKAGE_ROOT, "bin", "native", platformKey, rustCliBinaryName());
+}
+
 function forwardToRustBinary(commandName, rawArgv) {
   // Only the Rust binary name is allowed here. The bare `wattetheria` name
   // resolves to this JS shim on most user PATHs (via the npm bin link), so
   // including it would create an infinite spawn loop.
   const candidates = [
     process.env.WATTETHERIA_CLI_BIN,
-    "wattetheria-client-cli",
+    bundledRustBinaryPath(),
+    RUST_CLI_BASE_NAME,
   ].filter(Boolean);
 
   for (const candidate of candidates) {
@@ -1211,10 +1273,11 @@ function forwardToRustBinary(commandName, rawArgv) {
     }
   }
 
+  const platformKey = nativePlatformKey() || `${process.platform}-${process.arch}`;
   throw new Error(
-    `Could not find the Rust 'wattetheria-client-cli' binary on PATH. ` +
-      `Build it with 'cargo build --release -p wattetheria-client-cli' and ` +
-      `add it to your PATH, or set WATTETHERIA_CLI_BIN to its full path.`
+    `Could not find the Wattetheria native CLI for ${platformKey}. ` +
+      `Install a package that includes bin/native/${platformKey}/${rustCliBinaryName()}, ` +
+      `or set WATTETHERIA_CLI_BIN to the full path of ${rustCliBinaryName()}.`
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wattetheria",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Wattetheria deployment CLI",
   "license": "Apache-2.0",
   "type": "commonjs",
@@ -8,6 +8,7 @@
   "files": [
     "bin/",
     "lib/",
+    "scripts/stage-native-cli.js",
     ".env.release",
     "docker-compose.release.yml",
     "README.md",
@@ -20,7 +21,8 @@
     "access": "public"
   },
   "scripts": {
-    "check": "node --check bin/wattetheria.js && node --check lib/cli.js"
+    "check": "node --check bin/wattetheria.js && node --check lib/cli.js && node --check scripts/stage-native-cli.js",
+    "stage:native-cli": "node scripts/stage-native-cli.js"
   },
   "keywords": [
     "wattetheria",

package/scripts/stage-native-cli.js

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+
+const ROOT_DIR = path.resolve(__dirname, "..");
+const BASE_NAME = "wattetheria-client-cli";
+const SUPPORTED_PLATFORMS = new Set(["darwin", "linux", "win32"]);
+const SUPPORTED_ARCHES = new Set(["x64", "arm64"]);
+
+function parseArgs(argv) {
+  const options = {
+    platform: process.env.WATTETHERIA_NATIVE_PLATFORM || process.platform,
+    arch: process.env.WATTETHERIA_NATIVE_ARCH || process.arch,
+    source: process.env.WATTETHERIA_NATIVE_CLI_BIN || "",
+  };
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (arg === "--platform") {
+      options.platform = requireValue(arg, argv[++index]);
+    } else if (arg === "--arch") {
+      options.arch = requireValue(arg, argv[++index]);
+    } else if (arg === "--source") {
+      options.source = requireValue(arg, argv[++index]);
+    } else {
+      throw new Error(`Unknown option: ${arg}`);
+    }
+  }
+
+  return options;
+}
+
+function requireValue(flag, value) {
+  if (!value || value.startsWith("-")) {
+    throw new Error(`Missing value for ${flag}`);
+  }
+  return value;
+}
+
+function binaryName(platform) {
+  return platform === "win32" ? `${BASE_NAME}.exe` : BASE_NAME;
+}
+
+function defaultSource(platform) {
+  return path.join(ROOT_DIR, "target", "release", binaryName(platform));
+}
+
+function targetKey(platform, arch) {
+  if (!SUPPORTED_PLATFORMS.has(platform)) {
+    throw new Error(`Unsupported native CLI platform: ${platform}`);
+  }
+  if (!SUPPORTED_ARCHES.has(arch)) {
+    throw new Error(`Unsupported native CLI arch: ${arch}`);
+  }
+  return `${platform}-${arch}`;
+}
+
+function stageNativeCli(options) {
+  const key = targetKey(options.platform, options.arch);
+  const source = path.resolve(options.source || defaultSource(options.platform));
+  if (!fs.existsSync(source)) {
+    throw new Error(
+      `Native CLI binary not found at ${source}. Build it first or pass --source.`
+    );
+  }
+
+  const targetDir = path.join(ROOT_DIR, "bin", "native", key);
+  const target = path.join(targetDir, binaryName(options.platform));
+  fs.mkdirSync(targetDir, { recursive: true });
+  fs.copyFileSync(source, target);
+  if (options.platform !== "win32") {
+    fs.chmodSync(target, 0o755);
+  }
+  console.log(`staged ${target}`);
+}
+
+try {
+  stageNativeCli(parseArgs(process.argv.slice(2)));
+} catch (error) {
+  console.error(error && error.message ? error.message : String(error));
+  process.exit(1);
+}