@etree/cli 2.0.1 → 2.0.2

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@etree/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "private": false,
+  "files": [
+    "dist"
+  ],
   "bin": {
-    "et": "./dist/index.js",
-    "envtree": "./dist/index.js"
+    "et": "dist/index.js",
+    "envtree": "dist/index.js"
   },
   "scripts": {
     "dev": "tsc --watch",

package/eslint.config.mjs

@@ -1,4 +0,0 @@
-import { config } from "@envtree/eslint-config/base";
-
-/** @type {import("eslint").Linter.Config[]} */
-export default config;

package/src/commands/auth.ts

@@ -1,258 +0,0 @@
-import { Command } from "commander";
-import inquirer from "inquirer";
-import chalk from "chalk";
-import ora from "ora";
-import { apiRequest } from "../lib/api";
-import { saveSession, clearSession, getSession } from "../lib/config";
-import { generateKeys, derivePublicKey, shutdown } from "../lib/crypto";
-import { savePrivateKey, hasPrivateKey } from "../lib/key-store";
-
-export function registerAuthCommands(program: Command): void {
-  // ── signup ──
-  program
-    .command("signup")
-    .description("Create a new EnvTree account")
-    .action(async () => {
-      const answers = await inquirer.prompt([
-        { type: "input", name: "email", message: "Email:" },
-        { type: "input", name: "username", message: "Username:" },
-        {
-          type: "password",
-          name: "password",
-          message: "Password:",
-          mask: "*",
-        },
-        {
-          type: "password",
-          name: "confirmPassword",
-          message: "Confirm Password:",
-          mask: "*",
-        },
-      ]);
-
-      if (answers.password !== answers.confirmPassword) {
-        console.log(chalk.red("Passwords do not match"));
-        return;
-      }
-
-      const spinner = ora("Creating account...").start();
-      try {
-        const result = await apiRequest(
-          "POST",
-          "/auth/signup",
-          {
-            email: answers.email,
-            password: answers.password,
-            username: answers.username,
-          },
-          false,
-        );
-
-        if (!result.session) {
-          spinner.succeed(
-            "Account created! Please verify your email, then run: et login",
-          );
-          return;
-        }
-
-        saveSession({
-          access_token: result.session.access_token,
-          refresh_token: result.session.refresh_token,
-          user_id: result.user.id,
-          email: answers.email,
-          username: answers.username,
-        });
-
-        spinner.text = "Generating encryption keys...";
-        const keys = await generateKeys();
-        savePrivateKey(keys.private_key);
-
-        await apiRequest("PUT", "/profile/public-key", {
-          public_key: keys.public_key,
-        });
-
-        spinner.succeed(chalk.green("Account created & keys generated!"));
-        console.log(
-          chalk.dim(`   User: ${answers.username} (${answers.email})`),
-        );
-        console.log(
-          chalk.dim("   Private key saved to ~/.envtree/private_key"),
-        );
-      } catch (err: any) {
-        spinner.fail(chalk.red(`Signup failed: ${err.message}`));
-      } finally {
-        shutdown();
-      }
-    });
-
-  // ── login ──
-  program
-    .command("login")
-    .description("Log in to your EnvTree account")
-    .option("-e, --email <email>", "Email (non-interactive)")
-    .option("-p, --password <password>", "Password (non-interactive)")
-    .action(async (opts: { email?: string; password?: string }) => {
-      let email = opts.email;
-      let password = opts.password;
-
-      // Interactive mode if flags not provided
-      if (!email || !password) {
-        const answers = await inquirer.prompt([
-          ...(!email
-            ? [{ type: "input", name: "email", message: "Email:" }]
-            : []),
-          ...(!password
-            ? [
-                {
-                  type: "password",
-                  name: "password",
-                  message: "Password:",
-                  mask: "*",
-                },
-              ]
-            : []),
-        ]);
-        email = email || answers.email;
-        password = password || answers.password;
-      }
-
-      const spinner = ora("Logging in...").start();
-      try {
-        const result = await apiRequest(
-          "POST",
-          "/auth/login",
-          { email, password },
-          false,
-        );
-
-        saveSession({
-          access_token: result.session.access_token,
-          refresh_token: result.session.refresh_token,
-          user_id: result.user.id,
-          email: result.user.email,
-          username: email!,
-        });
-
-        // Fetch profile to get real username
-        const profileResult = await apiRequest(
-          "GET",
-          "/profile/me",
-          undefined,
-          true,
-        );
-        if (profileResult.profile?.username) {
-          saveSession({
-            access_token: result.session.access_token,
-            refresh_token: result.session.refresh_token,
-            user_id: result.user.id,
-            email: result.user.email,
-            username: profileResult.profile.username,
-          });
-        }
-
-        // Always sync public key with server
-        if (hasPrivateKey()) {
-          // Derive public key from existing private key and upload it
-          spinner.text = "Syncing encryption keys...";
-          const privateKey = require("../lib/key-store").getPrivateKey();
-          const publicKey = await derivePublicKey(privateKey);
-          await apiRequest("PUT", "/profile/public-key", {
-            public_key: publicKey,
-          });
-          spinner.succeed(chalk.green("Logged in!"));
-        } else {
-          // Generate a new keypair
-          spinner.text = "Generating encryption keys...";
-          const keys = await generateKeys();
-          savePrivateKey(keys.private_key);
-
-          await apiRequest("PUT", "/profile/public-key", {
-            public_key: keys.public_key,
-          });
-
-          spinner.succeed(chalk.green("Logged in & keys generated!"));
-          console.log(
-            chalk.dim("   Private key saved to ~/.envtree/private_key"),
-          );
-        }
-
-        console.log(chalk.dim(`   User: ${result.user.email}`));
-      } catch (err: any) {
-        spinner.fail(chalk.red(`Login failed: ${err.message}`));
-      } finally {
-        shutdown();
-      }
-    });
-
-  // ── logout ──
-  program
-    .command("logout")
-    .description("Log out of your EnvTree account")
-    .action(() => {
-      clearSession();
-      console.log(chalk.green("Logged out"));
-    });
-
-  // ── whoami ──
-  program
-    .command("whoami")
-    .description("Show the current logged-in user")
-    .action(async () => {
-      const session = getSession();
-      if (!session) {
-        console.log(chalk.yellow("Not logged in. Run: et login"));
-        return;
-      }
-
-      try {
-        const result = await apiRequest("GET", "/profile/me");
-        console.log(chalk.bold("EnvTree User"));
-        console.log(`   Username:   ${result.profile.username}`);
-        console.log(`   Email:      ${result.profile.email}`);
-        console.log(
-          `   Public Key: ${result.profile.public_key ? result.profile.public_key.substring(0, 20) + "..." : chalk.yellow("not set")}`,
-        );
-      } catch {
-        console.log(chalk.dim(`   Username: ${session.username}`));
-        console.log(chalk.dim(`   Email:    ${session.email}`));
-        console.log(chalk.yellow("   (offline — showing cached info)"));
-      }
-    });
-
-  // ── delete-account ──
-  program
-    .command("delete-account")
-    .description("Permanently delete your EnvTree account")
-    .action(async () => {
-      const session = getSession();
-      if (!session) {
-        console.log(chalk.yellow("Not logged in. Run: et login"));
-        return;
-      }
-
-      const { confirm } = await inquirer.prompt([
-        {
-          type: "confirm",
-          name: "confirm",
-          message: chalk.red(
-            "⚠ This will permanently delete your account and all your wallets. Are you sure?",
-          ),
-          default: false,
-        },
-      ]);
-
-      if (!confirm) {
-        console.log(chalk.dim("Cancelled."));
-        return;
-      }
-
-      const spinner = ora("Deleting account...").start();
-      try {
-        await apiRequest("DELETE", "/auth/account");
-        clearSession();
-        spinner.succeed(chalk.green("Account deleted. Goodbye!"));
-      } catch (err: any) {
-        spinner.fail(chalk.red(`Failed: ${err.message}`));
-      }
-    });
-}

package/src/commands/config.ts

@@ -1,47 +0,0 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import { getConfig, saveConfig } from "../lib/config";
-
-export function registerConfigCommands(program: Command): void {
-  const config = program
-    .command("config")
-    .description("Manage CLI configuration");
-
-  // ── config show ──
-  config
-    .command("show")
-    .description("Display current configuration")
-    .action(() => {
-      const cfg = getConfig();
-      console.log(chalk.bold("\nEnvTree Config"));
-      console.log(`   Server:  ${chalk.cyan(cfg.server_url)}`);
-      console.log(
-        `   Session: ${cfg.session ? chalk.green("active") + chalk.dim(` (${cfg.session.email})`) : chalk.yellow("none")}`,
-      );
-      console.log(
-        chalk.dim(`   Config:  ~/.envtree/config.json`),
-      );
-      console.log(
-        chalk.dim(`   Keys:    ~/.envtree/private_key`),
-      );
-      console.log("");
-    });
-
-  // ── config set ──
-  config
-    .command("set <key> <value>")
-    .description("Set a configuration value (e.g. server URL)")
-    .action((key: string, value: string) => {
-      const cfg = getConfig();
-
-      if (key === "server" || key === "server_url") {
-        cfg.server_url = value;
-        saveConfig(cfg);
-        console.log(chalk.green(`Server URL set to: ${value}`));
-      } else {
-        console.log(
-          chalk.red(`Unknown config key: "${key}". Available: server`),
-        );
-      }
-    });
-}

package/src/commands/init.ts

@@ -1,187 +0,0 @@
-import { Command } from "commander";
-import inquirer from "inquirer";
-import chalk from "chalk";
-import ora from "ora";
-import { apiRequest } from "../lib/api";
-import { saveSession } from "../lib/config";
-import { generateKeys, derivePublicKey, shutdown } from "../lib/crypto";
-import { savePrivateKey, hasPrivateKey, getPrivateKey } from "../lib/key-store";
-
-export function registerInitCommand(program: Command): void {
-  program
-    .command("init")
-    .description("First-time setup — create an account or log in")
-    .action(async () => {
-      console.log(chalk.bold("\n🌲 Welcome to EnvTree!\n"));
-
-      const { action } = await inquirer.prompt([
-        {
-          type: "list",
-          name: "action",
-          message: "What would you like to do?",
-          choices: [
-            { name: "Create a new account", value: "signup" },
-            { name: "Log in to existing account", value: "login" },
-          ],
-        },
-      ]);
-
-      if (action === "signup") {
-        const answers = await inquirer.prompt([
-          { type: "input", name: "email", message: "Email:" },
-          { type: "input", name: "username", message: "Username:" },
-          {
-            type: "password",
-            name: "password",
-            message: "Password:",
-            mask: "*",
-          },
-          {
-            type: "password",
-            name: "confirmPassword",
-            message: "Confirm Password:",
-            mask: "*",
-          },
-        ]);
-
-        if (answers.password !== answers.confirmPassword) {
-          console.log(chalk.red("\n  Passwords do not match"));
-          return;
-        }
-
-        const spinner = ora("Creating account...").start();
-        try {
-          const result = await apiRequest(
-            "POST",
-            "/auth/signup",
-            {
-              email: answers.email,
-              password: answers.password,
-              username: answers.username,
-            },
-            false,
-          );
-
-          if (!result.session) {
-            spinner.succeed(
-              "Account created! Check your email, then run: et login",
-            );
-            return;
-          }
-
-          saveSession({
-            access_token: result.session.access_token,
-            refresh_token: result.session.refresh_token,
-            user_id: result.user.id,
-            email: answers.email,
-            username: answers.username,
-          });
-
-          spinner.text = "Generating encryption keys...";
-          const keys = await generateKeys();
-          savePrivateKey(keys.private_key);
-
-          await apiRequest("PUT", "/profile/public-key", {
-            public_key: keys.public_key,
-          });
-
-          spinner.succeed(chalk.green("All set! You're ready to go."));
-          console.log(
-            chalk.dim(`   User: ${answers.username} (${answers.email})`),
-          );
-          console.log("");
-          console.log(chalk.bold("  Next steps:"));
-          console.log(
-            chalk.cyan("    et wallet create my-project   ") +
-              chalk.dim("Create a wallet"),
-          );
-          console.log(
-            chalk.cyan('    et push my-project API_KEY "sk-..."  ') +
-              chalk.dim("Store a secret"),
-          );
-          console.log(
-            chalk.cyan("    et pull my-project            ") +
-              chalk.dim("Sync to .env"),
-          );
-          console.log("");
-        } catch (err: any) {
-          spinner.fail(chalk.red(`Signup failed: ${err.message}`));
-        } finally {
-          shutdown();
-        }
-      } else {
-        // Login flow
-        const answers = await inquirer.prompt([
-          { type: "input", name: "email", message: "Email:" },
-          {
-            type: "password",
-            name: "password",
-            message: "Password:",
-            mask: "*",
-          },
-        ]);
-
-        const spinner = ora("Logging in...").start();
-        try {
-          const result = await apiRequest(
-            "POST",
-            "/auth/login",
-            {
-              email: answers.email,
-              password: answers.password,
-            },
-            false,
-          );
-
-          saveSession({
-            access_token: result.session.access_token,
-            refresh_token: result.session.refresh_token,
-            user_id: result.user.id,
-            email: result.user.email,
-            username: answers.email,
-          });
-
-          const profileResult = await apiRequest(
-            "GET",
-            "/profile/me",
-            undefined,
-            true,
-          );
-          if (profileResult.profile?.username) {
-            saveSession({
-              access_token: result.session.access_token,
-              refresh_token: result.session.refresh_token,
-              user_id: result.user.id,
-              email: result.user.email,
-              username: profileResult.profile.username,
-            });
-          }
-
-          // Always sync public key with server
-          if (hasPrivateKey()) {
-            spinner.text = "Syncing encryption keys...";
-            const pk = getPrivateKey()!;
-            const publicKey = await derivePublicKey(pk);
-            await apiRequest("PUT", "/profile/public-key", {
-              public_key: publicKey,
-            });
-          } else {
-            spinner.text = "Generating encryption keys...";
-            const keys = await generateKeys();
-            savePrivateKey(keys.private_key);
-            await apiRequest("PUT", "/profile/public-key", {
-              public_key: keys.public_key,
-            });
-          }
-
-          spinner.succeed(chalk.green("Logged in! You're ready to go."));
-          console.log(chalk.dim(`   User: ${result.user.email}`));
-          console.log("");
-        } catch (err: any) {
-          spinner.fail(chalk.red(`Login failed: ${err.message}`));
-        } finally {
-          shutdown();
-        }
-      }
-    });
-}

package/src/commands/member.ts

@@ -1,146 +0,0 @@
-import { Command } from "commander";
-import chalk from "chalk";
-import ora from "ora";
-import { api } from "../lib/api";
-
-/**
- * Helper: find a wallet ID by name from the user's wallets.
- */
-async function findWalletId(name: string): Promise<string | null> {
-  const result = await api.get("/wallets");
-  const owned = result.owned.find((w: any) => w.name === name);
-  if (owned) return owned.id;
-  const shared = result.shared.find((w: any) => w.name === name);
-  if (shared) return shared.id;
-  return null;
-}
-
-export function registerMemberCommands(program: Command): void {
-  const member = program.command("member").description("Manage wallet members");
-
-  // ── member add ──
-  member
-    .command("add <wallet> <username>")
-    .description("Add a member to a wallet")
-    .option("-r, --role <role>", "Role: admin, read, write", "read")
-    .action(
-      async (walletName: string, username: string, opts: { role: string }) => {
-        const spinner = ora("Adding member...").start();
-        try {
-          const walletId = await findWalletId(walletName);
-          if (!walletId) {
-            spinner.fail(chalk.red(`Wallet "${walletName}" not found`));
-            return;
-          }
-
-          const result = await api.post(`/wallets/${walletId}/members`, {
-            username,
-            role: opts.role,
-          });
-
-          spinner.succeed(
-            chalk.green(
-              `Added "${username}" as ${opts.role} to "${walletName}"`,
-            ),
-          );
-
-          if (result.public_key) {
-            console.log(
-              chalk.dim(
-                `   Their public key: ${result.public_key.substring(0, 20)}...`,
-              ),
-            );
-            console.log(
-              chalk.yellow(
-                "   ⚠ Remember to re-encrypt secrets for this user:",
-              ),
-            );
-            console.log(
-              chalk.yellow(`     envtree secret share ${walletName}`),
-            );
-          }
-        } catch (err: any) {
-          spinner.fail(chalk.red(`Failed: ${err.message}`));
-        }
-      },
-    );
-
-  // ── member list ──
-  member
-    .command("list <wallet>")
-    .alias("ls")
-    .description("List members of a wallet")
-    .action(async (walletName: string) => {
-      const spinner = ora("Fetching members...").start();
-      try {
-        const walletId = await findWalletId(walletName);
-        if (!walletId) {
-          spinner.fail(chalk.red(`Wallet "${walletName}" not found`));
-          return;
-        }
-
-        const result = await api.get(`/wallets/${walletId}/members`);
-        spinner.stop();
-
-        console.log(chalk.bold(`\nMembers of "${walletName}"`));
-
-        // Owner
-        if (result.owner) {
-          console.log(
-            `   ${chalk.cyan(result.owner.username)} ${chalk.dim(`(${result.owner.email})`)} ${chalk.green("[owner]")}`,
-          );
-        }
-
-        // Members
-        if (result.members && result.members.length > 0) {
-          for (const m of result.members) {
-            const roleColor =
-              m.role === "admin"
-                ? chalk.magenta
-                : m.role === "write"
-                  ? chalk.blue
-                  : chalk.dim;
-            console.log(
-              `   ${chalk.cyan(m.user.username)} ${chalk.dim(`(${m.user.email})`)} ${roleColor(`[${m.role}]`)}`,
-            );
-          }
-        } else {
-          console.log(chalk.dim("   No additional members"));
-        }
-        console.log("");
-      } catch (err: any) {
-        spinner.fail(chalk.red(`Failed: ${err.message}`));
-      }
-    });
-
-  // ── member remove ──
-  member
-    .command("remove <wallet> <username>")
-    .description("Remove a member from a wallet")
-    .action(async (walletName: string, username: string) => {
-      const spinner = ora("Removing member...").start();
-      try {
-        const walletId = await findWalletId(walletName);
-        if (!walletId) {
-          spinner.fail(chalk.red(`Wallet "${walletName}" not found`));
-          return;
-        }
-
-        // Look up user ID by username
-        const profileResult = await api.get(`/profile/${username}`);
-        if (!profileResult.profile) {
-          spinner.fail(chalk.red(`User "${username}" not found`));
-          return;
-        }
-
-        await api.delete(
-          `/wallets/${walletId}/members/${profileResult.profile.id}`,
-        );
-        spinner.succeed(
-          chalk.green(`Removed "${username}" from "${walletName}"`),
-        );
-      } catch (err: any) {
-        spinner.fail(chalk.red(`Failed: ${err.message}`));
-      }
-    });
-}