@suronai/cli 0.1.33 → 0.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suronai/cli",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "CLI for Suron — suron login, init, whoami, recover",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -1,11 +1,13 @@
 import { Command } from "commander";
 import { existsSync, writeFileSync, readFileSync } from "fs";
-import { join, basename } from "path";
+import { join, basename, relative } from "path";
 import { execSync } from "child_process";
 import { requireApiUrl, prompt } from "../utils/config.js";
 import { encryptDotenv, readPrivateKey } from "../utils/dotenvx.js";
 import c from "../utils/colors.js";
 
+const HR = "  " + c.dim("─".repeat(55));
+
 export const initCommand = new Command("init")
   .description("Encrypt .env and register this app with Suron")
   .option("--name <n>", "App name (skips interactive prompt)")
@@ -13,38 +15,73 @@ export const initCommand = new Command("init")
     const cwd    = process.cwd();
     const apiUrl = requireApiUrl();
 
-    console.log("\n" + c.bold("  suron init") + "  —  " + c.dim(cwd) + "\n");
+    console.log();
 
     if (existsSync(join(cwd, ".suron.json"))) {
-      console.error("  " + c.red("✗") + "  .suron.json already exists — this app is already initialised.");
-      console.error("       To restore a lost config, run: " + c.bold("suron recover") + "\n");
+      console.error("  " + c.red("✗") + "  already initialised — .suron.json exists");
+      console.error("       To restore a lost config: " + c.bold("suron recover") + "\n");
       process.exit(1);
     }
 
     if (!existsSync(join(cwd, ".env"))) {
-      console.error("  " + c.red("✗") + "  .env not found in current directory");
+      console.error("  " + c.red("✗") + "  .env not found");
       console.error("       Create a .env file with your secrets, then run: suron init\n");
       process.exit(1);
     }
 
-    // ── App name ─────────────────────────────────────────────────────────────
-    const suggested = basename(cwd) || "my-project";
+    // ── App name ──────────────────────────────────────────────────────────────
+    // Preserve the folder's original casing as the default suggestion.
+    const suggested = sanitiseName(basename(cwd) || "myapp");
     let appName;
 
     if (opts.name) {
       appName = sanitiseName(opts.name);
-      console.log("  App name     " + c.cyan(appName));
     } else {
-      const raw = await prompt(`  App name [${c.dim(sanitiseName(suggested))}] › `);
+      const raw = await prompt("  App name " + c.dim("· ") + c.dim("[" + suggested + "] › "));
       appName = sanitiseName(raw || suggested);
     }
 
-    // ── Encrypt ───────────────────────────────────────────────────────────────
-    console.log("\n  " + c.dim("Encrypting .env..."));
+    if (!appName) {
+      console.error("  " + c.red("✗") + "  App name is required and must contain at least one letter or digit.");
+      console.error("       Example: suron init --name MyApp\n");
+      process.exit(1);
+    }
 
+    console.log("  App name " + c.dim("·") + " " + c.cyan(appName));
+    console.log(HR);
+
+    // ── Steps tracker ─────────────────────────────────────────────────────────
+    const steps = {
+      encrypt:  { label: "Encrypt",  detail: ".env",          status: "pending" },
+      keys:     { label: "Key",      detail: ".env.keys",     status: "pending" },
+      gitignore:{ label: "Gitignore",detail: ".gitignore",    status: "pending" },
+      register: { label: "Register", detail: appName,         status: "pending" },
+      sdk:      { label: "SDK",      detail: "@suronai/sdk",  status: "pending" },
+    };
+
+    function printSteps() {
+      for (const s of Object.values(steps)) {
+        const dot = s.status === "done"    ? c.green("●")
+                  : s.status === "skip"    ? c.dim("○")
+                  : s.status === "fail"    ? c.red("●")
+                  :                          c.dim("○");
+        const detail = s.status === "fail" ? c.red(s.detail) : c.dim(s.detail);
+        const label  = s.label.padEnd(11);
+        const dots   = c.dim(".".repeat(Math.max(2, 44 - label.length - s.detail.length)));
+        const note   = s.note ? "  " + c.dim(s.note) : "";
+        console.log("  " + dot + "  " + label + detail + dots + (s.status === "done" ? c.green(" done") : s.status === "skip" ? c.dim(" skip") : s.status === "fail" ? c.red(" fail") : "") + note);
+      }
+    }
+
+    // ── Encrypt ───────────────────────────────────────────────────────────────
     try {
       encryptDotenv(cwd);
+      steps.encrypt.status  = "done";
+      steps.keys.status     = "done";
     } catch (err) {
+      steps.encrypt.status = "fail";
+      printSteps();
+      console.log(HR);
       console.error("\n  " + c.red("✗") + "  " + err.message + "\n");
       process.exit(1);
     }
@@ -53,13 +90,19 @@ export const initCommand = new Command("init")
     try {
       privateKey = readPrivateKey(cwd);
     } catch (err) {
+      steps.keys.status = "fail";
+      printSteps();
+      console.log(HR);
       console.error("\n  " + c.red("✗") + "  " + err.message + "\n");
       process.exit(1);
     }
 
-    // ── Register ──────────────────────────────────────────────────────────────
-    console.log("  " + c.dim("Registering app..."));
+    // ── .gitignore ────────────────────────────────────────────────────────────
+    const gitignoreResult = ensureGitignore(cwd);
+    steps.gitignore.status = "done";
+    steps.gitignore.note   = gitignoreResult;
 
+    // ── Register ──────────────────────────────────────────────────────────────
     let res;
     try {
       res = await fetch(`${apiUrl}/cli/register-app`, {
@@ -68,6 +111,9 @@ export const initCommand = new Command("init")
         body: JSON.stringify({ name: appName, private_key: privateKey }),
       });
     } catch (err) {
+      steps.register.status = "fail";
+      printSteps();
+      console.log(HR);
       console.error("\n  " + c.red("✗") + `  Could not reach Suron API: ${err.message}\n`);
       process.exit(1);
     }
@@ -75,10 +121,13 @@ export const initCommand = new Command("init")
     if (!res.ok) {
       let body = {};
       try { body = await res.json(); } catch { /* ignore */ }
-
+      steps.register.status = "fail";
+      printSteps();
+      console.log(HR);
       if (res.status === 409) {
-        console.error("\n  " + c.red("✗") + `  An app named "${c.cyan(appName)}" is already registered.`);
-        console.error("       If you lost .suron.json, run: " + c.bold("suron recover") + "\n");
+        const canonical = body?.existing_name ?? appName;
+        console.error("\n  " + c.red("✗") + `  An app named "${c.cyan(String(canonical))}" is already registered (case-insensitive match).`);
+        console.error("       If you lost .suron.json, run: " + c.bold("suron recover --name " + String(canonical)) + "\n");
       } else {
         console.error("\n  " + c.red("✗") + `  ${body?.error ?? `register-app failed (${res.status})`}\n`);
       }
@@ -86,9 +135,7 @@ export const initCommand = new Command("init")
     }
 
     const { app_id } = await res.json();
-
-    // ── .gitignore ─────────────────────────────────────────────────────────────
-    ensureGitignore(cwd);
+    steps.register.status = "done";
 
     // ── Write .suron.json ─────────────────────────────────────────────────────
     writeFileSync(
@@ -110,35 +157,43 @@ export const initCommand = new Command("init")
       } catch { /* ignore */ }
 
       if (!alreadyInstalled) {
-        console.log("  " + c.dim("Installing @suronai/sdk..."));
         const pm = detectPackageManager(cwd);
         try {
-          execSync(`${pm} ${pmAddCmd(pm)} @suronai/sdk`, { cwd, stdio: "inherit" });
+          execSync(`${pm} ${pmAddCmd(pm)} @suronai/sdk`, { cwd, stdio: "pipe" });
+          steps.sdk.status = "done";
         } catch {
-          console.error("  " + c.yellow("⚠") + "  SDK install failed — run manually: npm install @suronai/sdk");
+          steps.sdk.status = "fail";
+          steps.sdk.note   = "run: npm install @suronai/sdk";
         }
       } else {
-        console.log("  " + c.dim("@suronai/sdk already installed — skipped."));
+        steps.sdk.status = "skip";
+        steps.sdk.note   = "already installed";
       }
+    } else {
+      steps.sdk.status = "skip";
+      steps.sdk.note   = "no package.json";
     }
 
+    printSteps();
+    console.log(HR);
+
     // ── Patch entry point ─────────────────────────────────────────────────────
     await patchEntryPoint(cwd, isEsm);
 
     // ── Done ──────────────────────────────────────────────────────────────────
     console.log();
-    console.log("  " + c.green("✓") + "  .env encrypted          " + c.dim("(safe to commit)"));
-    console.log("  " + c.green("✓") + "  .env.keys kept           " + c.dim("(gitignored)")  );
-    console.log("  " + c.green("✓") + "  .suron.json written      " + c.dim("(safe to commit)"));
-    console.log("  " + c.green("✓") + "  @suronai/sdk installed");
+    console.log("  " + c.dim("◇") + "  .env encrypted        " + c.dim("safe to commit"));
+    console.log("  " + c.dim("◇") + "  .env.keys             " + c.dim("gitignored, keep it safe"));
+    console.log("  " + c.dim("◇") + "  .suron.json           " + c.dim("safe to commit"));
+    console.log("  " + c.dim("◆") + "  " + c.bold("ready"));
     console.log();
   });
 
 /**
- * Ensures .env.keys is in .gitignore.
- * Creates .gitignore if it doesn't exist.
- * Appends the entry if it's not already present (exact line match).
+ * Ensures standard entries are in .gitignore.
+ * Creates the file if it doesn't exist.
  * @param {string} cwd
+ * @returns {string} short note for the steps display
  */
 const GITIGNORE_ENTRIES = [
   "node_modules/",
@@ -151,16 +206,17 @@ function ensureGitignore(cwd) {
 
   if (!existsSync(gitignorePath)) {
     writeFileSync(gitignorePath, GITIGNORE_ENTRIES.join("\n") + "\n", "utf-8");
-    return;
+    return "created";
   }
 
-  const content = readFileSync(gitignorePath, "utf-8");
+  const content  = readFileSync(gitignorePath, "utf-8");
   const existing = new Set(content.split("\n").map(l => l.trim()));
-  const missing = GITIGNORE_ENTRIES.filter(e => !existing.has(e));
-  if (missing.length === 0) return;
+  const missing  = GITIGNORE_ENTRIES.filter(e => !existing.has(e));
+  if (missing.length === 0) return "already set";
 
   const separator = content.endsWith("\n") ? "" : "\n";
   writeFileSync(gitignorePath, content + separator + missing.join("\n") + "\n", "utf-8");
+  return "updated";
 }
 
 /** @param {string} cwd @returns {string} */
@@ -177,23 +233,17 @@ function pmAddCmd(pm) {
 }
 
 /**
- * Strips hyphens, underscores, spaces and other non-alphanumeric characters
- * so the app name is always a single lowercase word. e.g. "camp-haven" -> "camphaven".
+ * Strips everything except letters and digits while preserving the original case.
+ * The backend stores names case-sensitively for display but compares lowercase
+ * for uniqueness, so "DataHaven" and "datahaven" are the same app.
  * @param {string} name
  * @returns {string}
  */
 function sanitiseName(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]/g, "");
+  return name.replace(/[^a-zA-Z0-9]/g, "");
 }
 
 /**
- * Scans the entry point line-by-line for any lines that reference "dotenv".
- * Shows the user exactly what was found and what it will be replaced with,
- * then asks for confirmation before writing.
- *
- * Works for any import/require pattern because it does a literal line search
- * rather than trying to anticipate every possible dotenv usage style.
- *
  * @param {string} cwd
  * @param {boolean} isEsm
  */
@@ -209,7 +259,9 @@ async function patchEntryPoint(cwd, isEsm) {
   }
 
   if (!entryPath) {
-    console.log("\n  Add to your app entry point:\n");
+    console.log("  " + c.dim("▎"));
+    console.log("  " + c.dim("▎") + "  Add to your app entry point:");
+    console.log("  " + c.dim("▎"));
     printSnippet(isEsm);
     return;
   }
@@ -219,11 +271,8 @@ async function patchEntryPoint(cwd, isEsm) {
 
   const lines = src.split("\n");
 
-  // Two-pass scan:
-  //   Pass 1 — lines containing "dotenv" (import or require)
-  //   Pass 2 — bare config() / config({...}) call lines that don't contain "dotenv"
-  //            (these appear after the import was already on a separate line)
-  const toReplace = [];
+  // Pass 1 — lines containing "dotenv"
+  const toReplace   = [];
   const seenIndices = new Set();
 
   for (let i = 0; i < lines.length; i++) {
@@ -246,13 +295,12 @@ async function patchEntryPoint(cwd, isEsm) {
     }
   }
 
-  // Pass 2: bare config() call — only in ESM where the import and call are separate lines
+  // Pass 2 — bare config() call (ESM only — import and call are on separate lines)
   if (isEsm) {
     for (let i = 0; i < lines.length; i++) {
       if (seenIndices.has(i)) continue;
       const trimmed = lines[i].trim();
       const indent  = lines[i].match(/^(\s*)/)[1];
-      // Matches: config() / config({}) / config({ ... }) — with or without semicolon
       if (/^config\s*\(.*\);?$/.test(trimmed) && !trimmed.startsWith("//")) {
         toReplace.push({
           index: i,
@@ -261,78 +309,73 @@ async function patchEntryPoint(cwd, isEsm) {
         });
       }
     }
-    // Sort by line number so the diff preview is in file order
     toReplace.sort((a, b) => a.index - b.index);
   }
 
   if (toReplace.length === 0) {
-    console.log("\n  Add to your app entry point:\n");
+    console.log("  " + c.dim("▎"));
+    console.log("  " + c.dim("▎") + "  Add to your app entry point:");
+    console.log("  " + c.dim("▎"));
     printSnippet(isEsm);
     return;
   }
 
-  const relEntry = entryPath.replace(cwd + "\\", "").replace(cwd + "/", "");
-  console.log();
-  console.log("  " + c.yellow("▶") + "  Found dotenv in " + c.dim(relEntry) + ":");
-  console.log();
+  const relEntry = relative(cwd, entryPath);
 
-  const replacements = toReplace;
+  // ── Diff preview ───────────────────────────────────────────────────────────
+  console.log("  " + c.dim("▎"));
+  console.log("  " + c.dim("▎  ") + c.dim(relEntry));
+  console.log("  " + c.dim("▎"));
 
-  // Show the diff preview
-  for (const { content, replacement } of replacements) {
-    console.log("    " + c.red("-") + "  " + c.dim(content.trim()));
+  for (const { content, replacement } of toReplace) {
+    console.log("  " + c.dim("▎  ") + c.red("⁻") + "  " + c.dim(content.trim()));
     if (replacement !== null) {
       for (const l of replacement.split("\n")) {
-        console.log("    " + c.green("+") + "  " + c.cyan(l.trim()));
+        console.log("  " + c.dim("▎  ") + c.green("⁺") + "  " + c.cyan(l.trim()));
       }
     } else {
-      console.log("    " + c.yellow("?") + "  " + c.dim("(no automatic replacement — update manually)"));
+      console.log("  " + c.dim("▎  ") + c.yellow("?") + "  " + c.dim("(no automatic replacement — update manually)"));
     }
-    console.log();
+    console.log("  " + c.dim("▎"));
   }
 
-  const answer = await prompt("  Apply replacements? [" + c.green("Y") + "/n] › ");
+  const answer = await prompt("  " + c.dim("▎") + "  apply? " + c.dim("[Y/n] › "));
   const confirmed = answer === "" || /^y(es)?$/i.test(answer);
+  console.log(HR);
 
   if (!confirmed) {
-    console.log("  " + c.dim("Skipped.") + " Add manually:\n");
+    console.log();
+    console.log("  " + c.dim("skipped — add manually:"));
+    console.log();
     printSnippet(isEsm);
     return;
   }
 
-  // Apply — walk lines, replace only the matched dotenv lines, touch nothing else
-  const indexMap = new Map(replacements.map(r => [r.index, r]));
+  // Apply
+  const indexMap = new Map(toReplace.map(r => [r.index, r]));
   const outLines = lines.map((line, i) => {
     const r = indexMap.get(i);
     return (r && r.replacement !== null) ? r.replacement : line;
   });
 
-  // For ESM: if await config() isn't already right after the imports, move it there
-  // automatically as part of the same patch — no second prompt needed.
+  // Move await config() to right after last import block (ESM)
   if (isEsm) {
-    const callLineIndex = outLines.findIndex(l => /^\s*await config\s*\(\s*\);?\s*$/.test(l));
+    const callLineIndex  = outLines.findIndex(l => /^\s*await config\s*\(/.test(l));
     const lastImportIndex = outLines.reduce((last, l, i) => l.trimStart().startsWith("import ") ? i : last, -1);
 
-    if (callLineIndex !== -1 && callLineIndex !== lastImportIndex + 1 && callLineIndex !== lastImportIndex + 2) {
+    if (callLineIndex !== -1 && callLineIndex > lastImportIndex + 2) {
       const callLine = outLines[callLineIndex];
-      // Remove from current position (and any adjacent blank line below it)
       outLines.splice(callLineIndex, 1);
       if (outLines[callLineIndex]?.trim() === "") outLines.splice(callLineIndex, 1);
-
-      // Re-find last import index after splice (indices shifted)
       const newLastImport = outLines.reduce((last, l, i) => l.trimStart().startsWith("import ") ? i : last, -1);
-
-      // Insert: blank line + await config() + blank line, after last import
       outLines.splice(newLastImport + 1, 0, "", callLine, "");
     }
   }
 
   try {
     writeFileSync(entryPath, outLines.join("\n"), "utf-8");
-    console.log("  " + c.green("✓") + "  " + c.dim(relEntry) + " patched");
   } catch (err) {
     console.error("  " + c.red("✗") + "  Could not write " + relEntry + ": " + err.message);
-    console.log("  Add manually:\n");
     printSnippet(isEsm);
   }
 }
@@ -340,11 +383,12 @@ async function patchEntryPoint(cwd, isEsm) {
 /** @param {boolean} isEsm */
 function printSnippet(isEsm) {
   if (isEsm) {
-    console.log("    " + c.cyan("import") + " { config } from " + c.green("'@suronai/sdk'"));
-    console.log("    " + c.cyan("await") + " config()");
+    console.log("  " + c.dim("▎  ") + c.cyan("import") + " { config } from " + c.green("'@suronai/sdk'"));
+    console.log("  " + c.dim("▎  ") + c.cyan("await") + " config()");
   } else {
-    console.log("    const { config } = " + c.cyan("require") + "(" + c.green("'@suronai/sdk'") + ")");
-    console.log("    " + c.cyan("await") + " config()");
+    console.log("  " + c.dim("▎  ") + "const { config } = " + c.cyan("require") + "(" + c.green("'@suronai/sdk'") + ")");
+    console.log("  " + c.dim("▎  ") + c.cyan("await") + " config()");
   }
-  console.log();
+  console.log("  " + c.dim("▎"));
+  console.log(HR);
 }

package/src/commands/recover.js

@@ -23,18 +23,21 @@ export const recoverCommand = new Command("recover")
     }
 
     // ── App name ──────────────────────────────────────────────────────────────
+    // Names are case-insensitive for lookup — "datahaven" finds "DataHaven".
+    // We preserve the input casing here; the backend returns the canonical name.
     let appName;
     if (opts.name) {
-      appName = opts.name.toLowerCase().replace(/[^a-z0-9]/g, "");
+      // Strip non-alphanumeric but preserve case — backend does case-insensitive match.
+      appName = opts.name.replace(/[^a-zA-Z0-9]/g, "");
       console.log("  App name     " + c.cyan(appName));
     } else {
-      const suggested = basename(cwd) || "my-project";
+      const suggested = sanitiseName(basename(cwd) || "myapp");
       const raw = await prompt(`  App name [${c.dim(suggested)}] › `);
-      appName = (raw || suggested).toLowerCase().replace(/[^a-z0-9]/g, "");
+      appName = sanitiseName(raw || suggested);
     }
 
     if (!appName) {
-      console.error("  " + c.red("✗") + "  App name is required.\n");
+      console.error("  " + c.red("✗") + "  App name is required and must contain at least one letter or digit.\n");
       process.exit(1);
     }
 
@@ -58,7 +61,7 @@ export const recoverCommand = new Command("recover")
       try { body = await res.json(); } catch { /* ignore */ }
       if (res.status === 404) {
         console.error("\n  " + c.red("✗") + `  No app named "${c.cyan(appName)}" found.`);
-        console.error("       Check the name carefully — names are lowercase and alphanumeric only.\n");
+        console.error("       Lookup is case-insensitive — check spelling (letters and numbers only).\n");
       } else {
         console.error("\n  " + c.red("✗") + `  ${body?.error ?? `recover-app failed (${res.status})`}\n`);
       }
@@ -68,6 +71,7 @@ export const recoverCommand = new Command("recover")
     const { app_id, name } = await res.json();
 
     // ── Write .suron.json ─────────────────────────────────────────────────────
+    // Use the canonical name returned by the server (original registration casing).
     writeFileSync(
       join(cwd, ".suron.json"),
       JSON.stringify({ app: name, id: app_id, api_url: apiUrl }, null, 2) + "\n",
@@ -80,3 +84,12 @@ export const recoverCommand = new Command("recover")
     console.log("  " + c.dim("    id:   ") + c.cyan(app_id));
     console.log();
   });
+
+/**
+ * Strips non-alphanumeric characters while preserving case.
+ * @param {string} name
+ * @returns {string}
+ */
+function sanitiseName(name) {
+  return name.replace(/[^a-zA-Z0-9]/g, "");
+}