xtra-cli 0.1.10 → 0.2.3

package/dist/commands/ui.js

@@ -41,178 +41,249 @@ const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const readline = __importStar(require("readline"));
 const api_1 = require("../lib/api");
+const config_1 = require("../lib/config");
 const ENVS = ["development", "staging", "production"];
-// ─── Rendering ────────────────────────────────────────────────────────────────
-function clear() { process.stdout.write("\x1Bc"); }
-function renderHeader() {
-    console.log(chalk_1.default.cyan("╔═══════════════════════════════════════════════════════════╗"));
-    console.log(chalk_1.default.cyan("║") + chalk_1.default.bold.cyan("  🔒  XtraSecurity — Interactive Shell                     ") + chalk_1.default.cyan("║"));
-    console.log(chalk_1.default.cyan("╚═══════════════════════════════════════════════════════════╝"));
-    console.log(chalk_1.default.gray("  ↑↓ Navigate  •  Enter Select  •  Tab Switch Panel  •  Q Quit\n"));
-}
-function renderList(title, items, selectedIdx, active) {
-    const border = active ? chalk_1.default.cyan : chalk_1.default.gray;
-    console.log(border(`┌─ ${title} ${"─".repeat(Math.max(0, 28 - title.length))}┐`));
-    items.forEach((item, i) => {
-        const isSelected = i === selectedIdx;
-        const icon = isSelected ? (active ? chalk_1.default.cyan("▶ ") : chalk_1.default.gray("▶ ")) : "  ";
-        const text = isSelected && active ? chalk_1.default.bold.cyan(item) : isSelected ? chalk_1.default.cyan(item) : chalk_1.default.white(item);
-        console.log(border("│") + ` ${icon}${text}`.padEnd(30) + border("│"));
-    });
-    console.log(border(`└${"─".repeat(32)}┘`));
-}
-function renderSecrets(secrets, selectedIdx, active) {
-    const border = active ? chalk_1.default.cyan : chalk_1.default.gray;
-    const COLS = [36, 12, 20];
-    const sep = "─".repeat(COLS[0]) + "┬" + "─".repeat(COLS[1]) + "┬" + "─".repeat(COLS[2]);
-    console.log(border(`┌${sep}┐`));
-    const header = [
-        chalk_1.default.bold.yellow("KEY".padEnd(COLS[0])),
-        chalk_1.default.bold.yellow("VALUE".padEnd(COLS[1])),
-        chalk_1.default.bold.yellow("UPDATED".padEnd(COLS[2]))
-    ].join(border("│"));
-    console.log(border("│") + header + border("│"));
-    console.log(border(`├${sep}┤`));
-    if (secrets.length === 0) {
-        console.log(border("│") + chalk_1.default.gray("  No secrets found.".padEnd(COLS[0] + COLS[1] + COLS[2] + 2)) + border("│"));
-    }
-    else {
-        secrets.forEach((s, i) => {
-            const isSelected = i === selectedIdx;
-            const fmt = (t, w) => {
-                const str = t.length > w - 2 ? t.slice(0, w - 5) + "..." : t;
-                return isSelected && active ? chalk_1.default.bold.bgCyan.black(str.padEnd(w)) : isSelected ? chalk_1.default.cyan(str.padEnd(w)) : str.padEnd(w);
-            };
-            const row = [
-                fmt(s.key, COLS[0]),
-                fmt("*".repeat(8), COLS[1]),
-                fmt(new Date(s.updatedAt).toLocaleDateString(), COLS[2]),
-            ].join(border("│"));
-            console.log(border("│") + row + border("│"));
-        });
-    }
-    console.log(border(`└${"─".repeat(COLS[0])}┴${"─".repeat(COLS[1])}┴${"─".repeat(COLS[2])}┘`));
-}
-function renderStatus(msg) {
-    console.log("\n" + chalk_1.default.gray("  ● ") + chalk_1.default.white(msg));
+const ENV_COLORS = {
+    development: chalk_1.default.green,
+    staging: chalk_1.default.yellow,
+    production: chalk_1.default.red,
+};
+const W = process.stdout.columns || 120;
+// ─── Box Drawing Helpers ─────────────────────────────────────────────────────
+const B = {
+    tl: "╭", tr: "╮", bl: "╰", br: "╯",
+    h: "─", v: "│", x: "┼",
+    lt: "├", rt: "┤", tt: "┬", bt: "┴",
+};
+function hline(width, c = B.h) { return c.repeat(width); }
+function box(title, lines, width, active) {
+    const border = active ? chalk_1.default.cyan : chalk_1.default.hex("#2d3a4d");
+    const inner = width - 2;
+    const pad = (s) => s.padEnd(inner).slice(0, inner);
+    const label = active
+        ? chalk_1.default.bold.cyan(` ${title} `)
+        : chalk_1.default.hex("#4a5568")(` ${title} `);
+    const titleLine = border(B.tl) + label + border(hline(inner - title.length - 2)) + border(B.tr);
+    const body = lines.map(l => border(B.v) + l.slice(0, inner).padEnd(inner) + border(B.v));
+    const foot = border(B.bl) + border(hline(inner)) + border(B.br);
+    return [titleLine, ...body, foot];
 }
-// ─── Main TUI Loop ────────────────────────────────────────────────────────────
+function clear() { process.stdout.write("\x1B[H\x1B[2J\x1B[3J"); }
+// ─── Main TUI ────────────────────────────────────────────────────────────────
 async function runUI() {
-    let screen = "project";
+    let panel = "projects";
     let projects = [];
-    let projectIdx = 0;
+    let projIdx = 0;
     let envIdx = 0;
     let secrets = [];
-    let secretIdx = 0;
-    let status = "Loading projects...";
+    let secIdx = 0;
+    let status = "Loading…";
     let loading = false;
+    let showValues = false;
+    // ── Loaders ────────────────────────────────────────────────────────────────
     async function loadProjects() {
+        status = "Loading projects…";
+        draw();
         try {
-            projects = await api_1.api.getProjects();
+            const raw = await api_1.api.getProjects();
+            projects = Array.isArray(raw) ? raw : raw.projects ?? [];
             status = projects.length > 0
-                ? `Loaded ${projects.length} projects. Use ↑↓ and Enter to navigate.`
-                : "No projects found. Try running `xtra login`.";
+                ? `${projects.length} project(s) found  ·  ↑↓ navigate  ·  Enter to load secrets`
+                : "No projects found. Run `xtra login` first.";
         }
         catch (e) {
-            status = chalk_1.default.red(`Error: ${e.message}`);
+            status = chalk_1.default.red(`✗ ${e.message}`);
         }
         draw();
     }
     async function loadSecrets() {
-        if (!projects[projectIdx])
+        if (!projects[projIdx])
             return;
         loading = true;
-        status = `Fetching secrets for ${projects[projectIdx].name}/${ENVS[envIdx]}...`;
+        status = `Fetching secrets for ${chalk_1.default.cyan(projects[projIdx].name)} / ${ENV_COLORS[ENVS[envIdx]](ENVS[envIdx])}…`;
         draw();
         try {
-            secrets = await api_1.api.getSecrets(projects[projectIdx].id, ENVS[envIdx]);
-            secretIdx = 0;
-            status = `${secrets.length} secret(s) loaded. Tab to switch panel, Q to quit.`;
+            const rc = (0, config_1.getRcConfig)();
+            const branch = rc.branch || "main";
+            const raw = await api_1.api.getSecrets(projects[projIdx].id, ENVS[envIdx], branch);
+            if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+                secrets = Object.entries(raw).map(([key, value]) => ({
+                    id: key, key, value: String(value), updatedAt: new Date().toISOString(),
+                }));
+            }
+            else if (Array.isArray(raw)) {
+                secrets = raw;
+            }
+            else {
+                secrets = [];
+            }
+            secIdx = 0;
+            status = secrets.length > 0
+                ? `${secrets.length} secret(s) ·  V toggle values  ·  Tab switch panel  ·  Q quit`
+                : "No secrets in this environment.";
         }
         catch (e) {
             secrets = [];
-            status = chalk_1.default.red(`Error: ${e.message}`);
+            status = chalk_1.default.red(`✗ ${e.message}`);
         }
         loading = false;
         draw();
     }
+    // ── Render ─────────────────────────────────────────────────────────────────
     function draw() {
         clear();
-        renderHeader();
-        const projectNames = projects.map(p => p.name);
-        renderList("PROJECTS", projectNames.length ? projectNames : ["(loading...)"], projectIdx, screen === "project");
+        // ── Header ──────────────────────────────────────────────────────────────
+        const appTitle = chalk_1.default.bold.cyan("  🔒 XtraSecurity") + chalk_1.default.hex("#4a5a6b")(" — Interactive Secrets Shell");
+        const env = ENV_COLORS[ENVS[envIdx]] ? ENV_COLORS[ENVS[envIdx]](ENVS[envIdx]) : chalk_1.default.white(ENVS[envIdx]);
+        const crumb = projects[projIdx]
+            ? chalk_1.default.hex("#4a5568")(`  ${projects[projIdx].name} `) + chalk_1.default.hex("#4a5568")("/") + chalk_1.default.hex("#4a5568")(` ${ENVS[envIdx]}`)
+            : chalk_1.default.hex("#4a5568")("  No project selected");
         console.log();
-        renderList("ENVIRONMENT", ENVS, envIdx, screen === "env");
+        console.log(appTitle + chalk_1.default.hex("#2d3a4d")("  │") + crumb);
+        console.log(chalk_1.default.hex("#1e293b")(hline(W)));
         console.log();
+        // ── Left column: Projects (22 chr) + Env (22 chr) ─────────────────────
+        const LEFT_W = 26;
+        const RIGHT_W = W - LEFT_W - 3;
+        // Projects panel
+        const projLines = (projects.length > 0 ? projects : [{ id: "", name: "(loading…)" }]).map((p, i) => {
+            const active = i === projIdx;
+            const icon = active ? chalk_1.default.cyan("▶ ") : "  ";
+            const name = active && panel === "projects"
+                ? chalk_1.default.bold.bgCyan.black(` ${p.name} `.padEnd(LEFT_W - 4))
+                : active
+                    ? chalk_1.default.bold.cyan(p.name)
+                    : chalk_1.default.hex("#6b7c93")(p.name);
+            return ` ${icon}${name}`;
+        });
+        const projBox = box("PROJECTS", projLines, LEFT_W, panel === "projects");
+        // Env panel
+        const envLines = ENVS.map((e, i) => {
+            const active = i === envIdx;
+            const icon = active ? chalk_1.default.cyan("▶ ") : "  ";
+            const col = ENV_COLORS[e] ?? chalk_1.default.white;
+            const name = active && panel === "env"
+                ? chalk_1.default.bold.bgCyan.black(` ${e} `.padEnd(LEFT_W - 4))
+                : active
+                    ? col.bold(e)
+                    : chalk_1.default.hex("#6b7c93")(e);
+            return ` ${icon}${name}`;
+        });
+        const envBox = box("ENVIRONMENT", envLines, LEFT_W, panel === "env");
+        // Secrets panel
+        const KW = Math.floor((RIGHT_W - 3) * 0.45);
+        const VW = Math.floor((RIGHT_W - 3) * 0.35);
+        const DW = RIGHT_W - KW - VW - 4;
+        const secHeader = chalk_1.default.bold.hex("#64748b")("KEY".padEnd(KW)) + "  " + chalk_1.default.bold.hex("#64748b")("VALUE".padEnd(VW)) + "  " + chalk_1.default.bold.hex("#64748b")("UPDATED".padEnd(DW));
+        const divider = chalk_1.default.hex("#1e293b")(hline(KW) + "  " + hline(VW) + "  " + hline(DW));
+        let secLines;
         if (loading) {
-            console.log(chalk_1.default.cyan("  ⠋ Loading secrets..."));
+            secLines = [` ${chalk_1.default.cyan("⠋")} Loading…`];
+        }
+        else if (secrets.length === 0) {
+            secLines = [` ${chalk_1.default.hex("#4a5568")("No secrets in this environment.")}`];
         }
         else {
-            renderSecrets(secrets, secretIdx, screen === "secrets");
+            secLines = [" " + secHeader, " " + divider, ...secrets.map((s, i) => {
+                    const sel = i === secIdx && panel === "secrets";
+                    const key = s.key.padEnd(KW).slice(0, KW);
+                    const val = showValues ? s.value.padEnd(VW).slice(0, VW) : "●".repeat(Math.min(8, VW)).padEnd(VW).slice(0, VW);
+                    const dt = new Date(s.updatedAt).toLocaleDateString("en-GB", { day: "2-digit", month: "short" }).padEnd(DW);
+                    if (sel) {
+                        return chalk_1.default.bold.bgHex("#0e243e")(" ▶ " + chalk_1.default.cyan(key) + "  " + chalk_1.default.greenBright(val) + "  " + chalk_1.default.hex("#4a9eff")(dt) + " ");
+                    }
+                    return "   " + chalk_1.default.white(key) + "  " + chalk_1.default.hex("#4a5568")(val) + "  " + chalk_1.default.hex("#374151")(dt);
+                })];
+        }
+        const secBox = box(`SECRETS (${secrets.length})`, secLines, RIGHT_W, panel === "secrets");
+        // ── Print side-by-side ────────────────────────────────────────────────
+        const leftPanel = [...projBox, ...["", ""], ...envBox];
+        const maxRows = Math.max(leftPanel.length, secBox.length);
+        const gap = chalk_1.default.hex("#1e293b")("  │  ");
+        for (let r = 0; r < maxRows; r++) {
+            const l = leftPanel[r] ?? " ".repeat(LEFT_W);
+            const rr = secBox[r] ?? " ".repeat(RIGHT_W);
+            console.log(l + gap + rr);
         }
-        renderStatus(status);
+        // ── Footer ───────────────────────────────────────────────────────────
+        console.log();
+        console.log(chalk_1.default.hex("#1e293b")(hline(W)));
+        const keys = [
+            [chalk_1.default.hex("#64748b")("↑↓"), "Navigate"],
+            [chalk_1.default.hex("#64748b")("Enter"), "Select"],
+            [chalk_1.default.hex("#64748b")("Tab"), "Switch Panel"],
+            [chalk_1.default.hex("#64748b")("V"), showValues ? chalk_1.default.green("Hide values") : chalk_1.default.yellow("Show values")],
+            [chalk_1.default.hex("#64748b")("Q"), "Quit"],
+        ].map(([k, a]) => `${k} ${chalk_1.default.hex("#374151")(a)}`).join(chalk_1.default.hex("#1e293b")("  ·  "));
+        console.log("  " + keys);
+        console.log();
+        console.log("  " + (status || ""));
     }
-    // Set up raw mode for keyboard input
+    // ── Keyboard ──────────────────────────────────────────────────────────────
     readline.emitKeypressEvents(process.stdin);
     if (process.stdin.isTTY)
         process.stdin.setRawMode(true);
-    process.stdin.on("keypress", async (str, key) => {
+    process.stdin.on("keypress", async (_str, key) => {
         if (!key)
             return;
         // Quit
-        if (str === "q" || str === "Q" || (key.ctrl && key.name === "c")) {
+        if (key.name === "q" || (key.ctrl && key.name === "c")) {
             if (process.stdin.isTTY)
                 process.stdin.setRawMode(false);
             clear();
-            console.log(chalk_1.default.cyan("Goodbye! 👋"));
+            console.log(chalk_1.default.cyan("  Goodbye! 👋\n"));
             process.exit(0);
         }
-        // Tab to cycle panels
+        // Toggle secret values with V
+        if (key.name === "v") {
+            showValues = !showValues;
+            draw();
+            return;
+        }
+        // Tab cycle panels
         if (key.name === "tab") {
-            screen = screen === "project" ? "env" : screen === "env" ? "secrets" : "project";
+            panel = panel === "projects" ? "env" : panel === "env" ? "secrets" : "projects";
             draw();
             return;
         }
-        // Navigation based on active panel
-        if (screen === "project") {
+        if (panel === "projects") {
             if (key.name === "up")
-                projectIdx = Math.max(0, projectIdx - 1);
+                projIdx = Math.max(0, projIdx - 1);
             if (key.name === "down")
-                projectIdx = Math.min(projects.length - 1, projectIdx + 1);
+                projIdx = Math.min(projects.length - 1, projIdx + 1);
             if (key.name === "return") {
-                screen = "env";
-                await loadSecrets();
+                panel = "env";
+                draw();
                 return;
             }
         }
-        if (screen === "env") {
+        if (panel === "env") {
             if (key.name === "up")
                 envIdx = Math.max(0, envIdx - 1);
             if (key.name === "down")
                 envIdx = Math.min(ENVS.length - 1, envIdx + 1);
             if (key.name === "return") {
-                screen = "secrets";
+                panel = "secrets";
                 await loadSecrets();
                 return;
             }
         }
-        if (screen === "secrets") {
+        if (panel === "secrets") {
             if (key.name === "up")
-                secretIdx = Math.max(0, secretIdx - 1);
+                secIdx = Math.max(0, secIdx - 1);
             if (key.name === "down")
-                secretIdx = Math.min(secrets.length - 1, secretIdx + 1);
+                secIdx = Math.min(secrets.length - 1, secIdx + 1);
         }
         draw();
     });
+    // ── Boot ──────────────────────────────────────────────────────────────────
     await loadProjects();
     if (projects.length > 0)
         await loadSecrets();
     else
         draw();
 }
-// ─── Commander Command ────────────────────────────────────────────────────────
+// ─── Commander ───────────────────────────────────────────────────────────────
 exports.uiCommand = new commander_1.Command("ui")
-    .description("Launch interactive TUI secrets dashboard (arrow keys to navigate, Q to quit)")
-    .action(async () => {
-    await runUI();
-});
+    .description("Launch interactive TUI secrets dashboard (arrow keys, Tab, Q to quit)")
+    .action(async () => { await runUI(); });

package/dist/commands/watch.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watchCommand = void 0;
 /**
- * watch.ts — Live reload secrets in dev mode
+ * watch.ts — Live reload secrets in dev mode
  *
  * Polls XtraSecurity Cloud for secret changes at a configurable interval.
  * When a change is detected, restarts the child process with fresh secrets.
@@ -26,7 +26,7 @@ function hashSecrets(secrets) {
 }
 async function startProcess(command, args, secrets, useShell) {
     if (child) {
-        process.stdout.write(chalk_1.default.yellow("\n  [watch] Secret change detected — restarting...\n"));
+        process.stdout.write(chalk_1.default.yellow("\n  [watch] Secret change detected — restarting...\n"));
         child.kill("SIGTERM");
         // Give it 500ms to terminate gracefully
         await new Promise(r => setTimeout(r, 500));
@@ -50,7 +50,7 @@ async function startProcess(command, args, secrets, useShell) {
     });
 }
 exports.watchCommand = new commander_1.Command("watch")
-    .description("Live reload — auto-restart process when secrets change in cloud")
+    .description("Live reload — auto-restart process when secrets change in cloud")
     .option("-p, --project <id>", "Project ID")
     .option("-e, --env <environment>", "Environment", "development")
     .option("-b, --branch <branch>", "Branch", "main")
@@ -69,19 +69,19 @@ Examples:
     const envMap = { dev: "development", stg: "staging", prod: "production" };
     env = envMap[env] || env;
     if (!project)
-        project = (0, config_1.getConfigValue)("project");
+        project = (0, config_1.getRcConfig)().project;
     if (!project) {
         console.error(chalk_1.default.red("Error: Project ID required. Use -p <id> or run 'xtra project set'."));
         process.exit(1);
     }
-    // Block production watch — too dangerous
+    // Block production watch — too dangerous
     if (env === "production") {
-        console.error(chalk_1.default.red("⚠  xtra watch is not allowed in PRODUCTION for safety reasons."));
+        console.error(chalk_1.default.red("âš   xtra watch is not allowed in PRODUCTION for safety reasons."));
         console.error(chalk_1.default.gray("   Use xtra run for one-shot production injection."));
         process.exit(1);
     }
     const pollMs = Math.max(3, parseInt(interval)) * 1000;
-    console.log(chalk_1.default.bold(`\n👁  xtra watch — watching ${env}/${branch} (every ${interval}s)\n`));
+    console.log(chalk_1.default.bold(`\n👁  xtra watch — watching ${env}/${branch} (every ${interval}s)\n`));
     console.log(chalk_1.default.gray(`   Press Ctrl+C to stop.\n`));
     // Graceful shutdown
     process.on("SIGINT", () => {
@@ -110,12 +110,12 @@ Examples:
                 await startProcess(command, args, secrets, useShell);
             }
             else {
-                process.stdout.write(chalk_1.default.gray(`  [watch] ${new Date().toLocaleTimeString()} — no changes\r`));
+                process.stdout.write(chalk_1.default.gray(`  [watch] ${new Date().toLocaleTimeString()} — no changes\r`));
             }
         }
         catch (e) {
             process.stdout.write(chalk_1.default.yellow(`\n  [watch] Poll failed: ${e.message}\n`));
-            // Don't exit — keep trying
+            // Don't exit — keep trying
         }
     }, pollMs);
 });

package/dist/lib/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectConfig = exports.getAuthToken = exports.clearConfig = exports.setConfig = exports.getConfigValue = exports.getConfig = void 0;
+exports.getRcConfig = exports.getProjectConfig = exports.getAuthToken = exports.clearConfig = exports.setConfig = exports.getConfigValue = exports.getConfig = void 0;
 const conf_1 = __importDefault(require("conf"));
 const PRODUCTION_API_URL = "https://xtra-security.vercel.app/api";
 const config = new conf_1.default({
@@ -47,3 +47,24 @@ const getProjectConfig = async () => {
     }
 };
 exports.getProjectConfig = getProjectConfig;
+/**
+ * Reads .xtrarc from the current working directory.
+ * Returns project/env/branch with fallback to the global conf store.
+ * All commands should use this instead of calling getConfigValue() directly.
+ */
+const getRcConfig = () => {
+    let rc = {};
+    try {
+        const rcPath = path_1.default.join(process.cwd(), ".xtrarc");
+        if (fs_1.default.existsSync(rcPath)) {
+            rc = JSON.parse(fs_1.default.readFileSync(rcPath, "utf-8"));
+        }
+    }
+    catch (_) { }
+    return {
+        project: rc.project || config.get("project") || "",
+        env: rc.env || config.get("env") || "development",
+        branch: rc.branch || config.get("branch") || "main",
+    };
+};
+exports.getRcConfig = getRcConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xtra-cli",
-    "version": "0.1.10",
+    "version": "0.2.3",
     "description": "CLI for XtraSecurity Platform",
     "main": "dist/index.js",
     "bin": {