@eve-horizon/cli 0.2.38 → 0.2.40

package/dist/index.js

@@ -9811,8 +9811,8 @@ var require_sync = __commonJS({
       }
       return x;
     };
-    var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync24, pkgfile) {
-      var body = readFileSync24(pkgfile);
+    var defaultReadPackageSync = function defaultReadPackageSync2(readFileSync25, pkgfile) {
+      var body = readFileSync25(pkgfile);
       try {
         var pkg = JSON.parse(body);
         return pkg;
@@ -9832,7 +9832,7 @@ var require_sync = __commonJS({
       }
       var opts = normalizeOptions(x, options);
       var isFile = opts.isFile || defaultIsFile;
-      var readFileSync24 = opts.readFileSync || fs6.readFileSync;
+      var readFileSync25 = opts.readFileSync || fs6.readFileSync;
       var isDirectory = opts.isDirectory || defaultIsDir;
       var realpathSync = opts.realpathSync || defaultRealpathSync;
       var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
@@ -9889,7 +9889,7 @@ var require_sync = __commonJS({
         if (!isFile(pkgfile)) {
           return loadpkg(path8.dirname(dir));
         }
-        var pkg = readPackageSync(readFileSync24, pkgfile);
+        var pkg = readPackageSync(readFileSync25, pkgfile);
         if (pkg && opts.packageFilter) {
           pkg = opts.packageFilter(
             pkg,
@@ -9903,7 +9903,7 @@ var require_sync = __commonJS({
         var pkgfile = path8.join(maybeRealpathSync(realpathSync, x2, opts), "/package.json");
         if (isFile(pkgfile)) {
           try {
-            var pkg = readPackageSync(readFileSync24, pkgfile);
+            var pkg = readPackageSync(readFileSync25, pkgfile);
           } catch (e) {
           }
           if (pkg && opts.packageFilter) {
@@ -48552,6 +48552,10 @@ var require_src57 = __commonJS({
   }
 });
 
+// src/index.ts
+var import_fs4 = require("fs");
+var import_path3 = require("path");
+
 // src/lib/args.ts
 function parseArgs(args) {
   const flags = {};
@@ -48648,7 +48652,7 @@ var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
 var import_yaml = require("yaml");
 var DEFAULT_PROFILE = "default";
-var DEFAULT_API_URL = "http://api.eve.lvh.me";
+var DEFAULT_API_URL = "https://api.eh1.incept5.dev";
 function getRepoProfilePath() {
   return (0, import_node_path2.join)(process.cwd(), ".eve", "profile.yaml");
 }
@@ -49522,7 +49526,7 @@ for cloud deployments. Credentials are stored globally per API URL.`,
         options: [
           "--email <email>         Email address for SSH login (uses profile default_email if not provided)",
           "--user-id <id>          User id for SSH login",
-          "--ssh-key <path>        Path to SSH private key (uses profile default_ssh_key, then ~/.ssh/id_ed25519)",
+          "--ssh-key <path>        Path to SSH private key (auto-discovers from ~/.ssh/ if omitted)",
           "--ttl <days>            Token TTL in days (1-90, default: server configured)",
           "--password <pass>       Supabase password (triggers Supabase login)",
           "--supabase-url <url>    Supabase URL",
@@ -51553,6 +51557,22 @@ async function requestRaw(context2, path8, options = {}) {
       body: options.body ? JSON.stringify(options.body) : void 0
     });
   } catch (error) {
+    const cause = error instanceof Error ? error.cause : void 0;
+    const code = cause?.code;
+    const isConnectionError = code === "ECONNREFUSED" || code === "ENOTFOUND" || code === "ETIMEDOUT" || error instanceof Error && error.message.includes("fetch failed");
+    if (isConnectionError) {
+      throw new Error(
+        `Could not connect to ${context2.apiUrl}
+
+  The API is unreachable. Check that:
+  - The URL is correct (current: ${context2.apiUrl})
+  - Your internet connection is working
+
+  To change the API URL:
+    eve profile set default --api-url <url>
+    or set EVE_API_URL=<url>`
+      );
+    }
     const message = error instanceof Error ? error.message : String(error);
     throw new Error(`Request failed for ${method} ${url}: ${message}`);
   }
@@ -62200,7 +62220,7 @@ var import_child_process = require("child_process");
 var import_util4 = require("util");
 var execFileAsync = (0, import_util4.promisify)(import_child_process.execFile);
 
-// src/lib/logs.ts
+// ../shared/dist/log-normalize.js
 function normalizeLogLine(line) {
   const kind = line.kind;
   const raw = line.raw;
@@ -66153,6 +66173,41 @@ function pickFreshestCodeAuth() {
   if (candidates.length === 0) return null;
   return candidates.reduce((best, c) => c.expiresAt > best.expiresAt ? c : best);
 }
+var SSH_KEY_IGNORE = /* @__PURE__ */ new Set([
+  "config",
+  "known_hosts",
+  "known_hosts.old",
+  "authorized_keys",
+  "environment"
+]);
+var SSH_KEY_PRIORITY = {
+  id_ed25519: 0,
+  id_ecdsa: 1,
+  id_rsa: 2
+};
+function discoverSshKeys() {
+  const sshDir = (0, import_node_path5.join)((0, import_node_os3.homedir)(), ".ssh");
+  if (!(0, import_node_fs5.existsSync)(sshDir)) return [];
+  let entries;
+  try {
+    entries = (0, import_node_fs5.readdirSync)(sshDir);
+  } catch {
+    return [];
+  }
+  const candidates = [];
+  for (const name of entries) {
+    if (name.startsWith(".")) continue;
+    if (name.endsWith(".pub")) continue;
+    if (SSH_KEY_IGNORE.has(name)) continue;
+    if (!name.startsWith("id_") && !name.includes("key")) continue;
+    const fullPath = (0, import_node_path5.join)(sshDir, name);
+    const pubPath = `${fullPath}.pub`;
+    if (!(0, import_node_fs5.existsSync)(pubPath)) continue;
+    const priority = SSH_KEY_PRIORITY[name] ?? 10;
+    candidates.push({ path: fullPath, priority });
+  }
+  return candidates.sort((a, b2) => a.priority - b2.priority).map((c) => c.path);
+}
 function signNonceWithSsh(keyPath, nonce) {
   const tempDir = (0, import_node_fs5.mkdtempSync)((0, import_node_path5.join)((0, import_node_os3.tmpdir)(), "eve-auth-"));
   const noncePath = (0, import_node_path5.join)(tempDir, "nonce");
@@ -66171,12 +66226,17 @@ function signNonceWithSsh(keyPath, nonce) {
   }
 }
 async function attemptSshLogin(context2, credentials, flags, email, userId, ttlDays) {
+  const explicitKey = getStringFlag(flags, ["ssh-key"]) || process.env.EVE_AUTH_SSH_KEY || context2.profile.default_ssh_key;
+  const keysToTry = explicitKey ? [explicitKey] : discoverSshKeys();
+  if (keysToTry.length === 0) {
+    return {
+      success: false,
+      error: "No SSH keys found. Provide --ssh-key <path> or add a keypair to ~/.ssh/"
+    };
+  }
   const challengeResponse = await requestRaw(context2, "/auth/challenge", {
     method: "POST",
-    body: {
-      email,
-      user_id: userId
-    }
+    body: { email, user_id: userId }
   });
   if (!challengeResponse.ok) {
     const message = typeof challengeResponse.data === "string" ? challengeResponse.data : challengeResponse.text;
@@ -66186,33 +66246,42 @@ async function attemptSshLogin(context2, credentials, flags, email, userId, ttlD
   if (!challenge.challenge_id || !challenge.nonce) {
     return { success: false, error: "Challenge response missing fields" };
   }
-  const sshKeyPath = getStringFlag(flags, ["ssh-key"]) || process.env.EVE_AUTH_SSH_KEY || context2.profile.default_ssh_key || (0, import_node_path5.join)((0, import_node_os3.homedir)(), ".ssh", "id_ed25519");
-  let signature;
-  try {
-    signature = signNonceWithSsh(sshKeyPath, challenge.nonce);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    return { success: false, error: `Failed to sign challenge: ${msg}` };
-  }
-  const verifyResponse = await requestRaw(context2, "/auth/verify", {
-    method: "POST",
-    body: { challenge_id: challenge.challenge_id, signature, ...ttlDays !== void 0 && { ttl_days: ttlDays } }
-  });
-  if (!verifyResponse.ok) {
-    const message = typeof verifyResponse.data === "string" ? verifyResponse.data : verifyResponse.text;
-    return { success: false, error: `Auth verify failed: ${message}` };
-  }
-  const payload = verifyResponse.data;
-  if (!payload.access_token) {
-    return { success: false, error: "Auth verify response missing access_token" };
+  let lastError = "";
+  for (const keyPath of keysToTry) {
+    let signature;
+    try {
+      signature = signNonceWithSsh(keyPath, challenge.nonce);
+    } catch {
+      continue;
+    }
+    const verifyResponse = await requestRaw(context2, "/auth/verify", {
+      method: "POST",
+      body: {
+        challenge_id: challenge.challenge_id,
+        signature,
+        ...ttlDays !== void 0 && { ttl_days: ttlDays }
+      }
+    });
+    if (verifyResponse.ok) {
+      const payload = verifyResponse.data;
+      if (!payload.access_token) {
+        return { success: false, error: "Auth verify response missing access_token" };
+      }
+      credentials.tokens[context2.authKey] = {
+        access_token: payload.access_token,
+        expires_at: payload.expires_at,
+        token_type: payload.token_type
+      };
+      saveCredentials(credentials);
+      if (!explicitKey) {
+        const shortPath = keyPath.replace((0, import_node_os3.homedir)(), "~");
+        console.log(`Using SSH key: ${shortPath}`);
+      }
+      return { success: true, tokenType: payload.token_type };
+    }
+    lastError = typeof verifyResponse.data === "string" ? verifyResponse.data : verifyResponse.text;
   }
-  credentials.tokens[context2.authKey] = {
-    access_token: payload.access_token,
-    expires_at: payload.expires_at,
-    token_type: payload.token_type
-  };
-  saveCredentials(credentials);
-  return { success: true, tokenType: payload.token_type };
+  return { success: false, error: `Auth verify failed: ${lastError}` };
 }
 async function fetchGitHubKeys(username) {
   const response = await fetch(`https://github.com/${username}.keys`);
@@ -73349,6 +73418,9 @@ var import_node_fs10 = require("node:fs");
 async function handleAdmin(subcommand, positionals, flags, context2) {
   const json = Boolean(flags.json);
   switch (subcommand) {
+    case "users": {
+      return handleUsers(flags, context2, json);
+    }
     case "invite": {
       const githubUsername = getStringFlag(flags, ["github"]);
       const sshKeyPath = getStringFlag(flags, ["ssh-key"]);
@@ -73834,8 +73906,68 @@ ${rows.length} alias(es)`);
       }
     }
     default:
-      throw new Error("Usage: eve admin <invite|pricing|receipts|balance|usage|ingress-aliases|access-requests>");
+      throw new Error("Usage: eve admin <users|invite|pricing|receipts|balance|usage|ingress-aliases|access-requests>");
+  }
+}
+async function handleUsers(flags, context2, json) {
+  const users = await requestJson(context2, "/system/users");
+  if (json) {
+    outputJson(users, true);
+    return;
+  }
+  if (users.length === 0) {
+    console.log("No users found.");
+    return;
+  }
+  const rows = [];
+  for (const user of users) {
+    const base = {
+      id: user.id,
+      email: user.email,
+      name: user.display_name ?? "-",
+      admin: user.is_admin ? "yes" : "",
+      created: user.created_at?.split("T")[0] ?? ""
+    };
+    if (user.memberships.length === 0) {
+      rows.push({ ...base, org: "-", role: "-" });
+    } else {
+      for (const m of user.memberships) {
+        rows.push({ ...base, org: m.org_slug || m.org_name, role: m.role });
+      }
+    }
+  }
+  const col = (key, header2) => Math.max(header2.length, ...rows.map((r) => r[key].length));
+  const w = {
+    email: col("email", "Email"),
+    name: col("name", "Name"),
+    admin: col("admin", "Admin"),
+    org: col("org", "Org"),
+    role: col("role", "Role"),
+    created: col("created", "Created")
+  };
+  const pad3 = (s, n) => s + " ".repeat(Math.max(0, n - s.length));
+  const header = [
+    pad3("Email", w.email),
+    pad3("Name", w.name),
+    pad3("Admin", w.admin),
+    pad3("Org", w.org),
+    pad3("Role", w.role),
+    pad3("Created", w.created)
+  ].join("  ");
+  console.log(header);
+  console.log("-".repeat(header.length));
+  for (const row of rows) {
+    console.log([
+      pad3(row.email, w.email),
+      pad3(row.name, w.name),
+      pad3(row.admin, w.admin),
+      pad3(row.org, w.org),
+      pad3(row.role, w.role),
+      pad3(row.created, w.created)
+    ].join("  "));
   }
+  console.log("");
+  console.log(`${users.length} user(s)`);
 }
 function formatBalanceSummary(data) {
   if (!data.currency) {
@@ -80498,11 +80630,60 @@ function sleep(ms) {
 }
 
 // src/index.ts
+function getCliVersion() {
+  try {
+    const pkg = JSON.parse((0, import_fs4.readFileSync)((0, import_path3.join)(__dirname, "..", "package.json"), "utf-8"));
+    return pkg.version;
+  } catch {
+    return "unknown";
+  }
+}
+async function showVersion(json, apiUrl) {
+  const cliVersion = getCliVersion();
+  let platformInfo = null;
+  if (apiUrl) {
+    try {
+      const res = await fetch(`${apiUrl}/health/version`);
+      if (res.ok) {
+        platformInfo = await res.json();
+      }
+    } catch {
+    }
+  }
+  if (json) {
+    const result = { cli: cliVersion };
+    if (platformInfo) {
+      result.platform = platformInfo;
+    }
+    if (apiUrl) {
+      result.apiUrl = apiUrl;
+    }
+    console.log(JSON.stringify(result, null, 2));
+  } else {
+    console.log(`eve v${cliVersion}`);
+    if (platformInfo) {
+      const sha = platformInfo.gitSha !== "unknown" ? ` (${platformInfo.gitSha.slice(0, 7)})` : "";
+      console.log(`platform v${platformInfo.version}${sha}`);
+    }
+  }
+}
 async function main2() {
   const { flags, positionals } = parseArgs(process.argv.slice(2));
   const command = positionals[0];
   const subcommand = positionals[1];
   const rest = positionals.slice(2);
+  if (flags.version || command === "-v" || command === "version") {
+    const json = Boolean(flags.json);
+    let apiUrl;
+    try {
+      const credentials2 = loadCredentials();
+      const context3 = resolveContext(flags, credentials2);
+      apiUrl = context3.apiUrl;
+    } catch {
+    }
+    await showVersion(json, apiUrl);
+    return;
+  }
   if (!command || command === "-h" || command === "--help") {
     showMainHelp();
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eve-horizon/cli",
-  "version": "0.2.38",
+  "version": "0.2.40",
   "description": "Eve Horizon CLI",
   "license": "MIT",
   "repository": {