@suronai/cli 0.1.30 → 0.1.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@suronai/cli",
-  "version": "0.1.30",
-  "description": "CLI for Suron — suron login, init, whoami, rotate",
+  "version": "0.1.32",
+  "description": "CLI for Suron — suron login, init, whoami, recover",
   "type": "module",
   "bin": {
     "suron": "./src/index.js"
@@ -10,8 +10,8 @@
     "src"
   ],
   "scripts": {
-    "build": "node --check src/index.js src/commands/login.js src/commands/init.js src/commands/rotate.js src/commands/whoami.js src/utils/config.js src/utils/dotenvx.js src/utils/colors.js",
-    "lint": "node --check src/index.js src/commands/login.js src/commands/init.js src/commands/rotate.js src/commands/whoami.js src/utils/config.js src/utils/dotenvx.js src/utils/colors.js"
+    "build": "node --check src/index.js src/commands/login.js src/commands/init.js src/commands/whoami.js src/commands/recover.js src/utils/config.js src/utils/dotenvx.js src/utils/colors.js",
+    "lint": "node --check src/index.js src/commands/login.js src/commands/init.js src/commands/whoami.js src/commands/recover.js src/utils/config.js src/utils/dotenvx.js src/utils/colors.js"
   },
   "dependencies": {
     "@dotenvx/dotenvx": "latest",

package/src/commands/init.js

@@ -15,6 +15,12 @@ export const initCommand = new Command("init")
 
     console.log("\n" + c.bold("  suron init") + "  —  " + c.dim(cwd) + "\n");
 
+    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");
+      process.exit(1);
+    }
+
     if (!existsSync(join(cwd, ".env"))) {
       console.error("  " + c.red("✗") + "  .env not found in current directory");
       console.error("       Create a .env file with your secrets, then run: suron init\n");
@@ -67,17 +73,23 @@ export const initCommand = new Command("init")
     }
 
     if (!res.ok) {
-      let errMsg = `register-app failed (${res.status})`;
-      try {
-        const body = await res.json();
-        if (body?.error) errMsg = body.error;
-      } catch { /* ignore */ }
-      console.error("\n  " + c.red("✗") + `  ${errMsg}\n`);
+      let body = {};
+      try { body = await res.json(); } catch { /* ignore */ }
+
+      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");
+      } else {
+        console.error("\n  " + c.red("✗") + `  ${body?.error ?? `register-app failed (${res.status})`}\n`);
+      }
       process.exit(1);
     }
 
     const { app_id } = await res.json();
 
+    // ── .gitignore ─────────────────────────────────────────────────────────────
+    ensureGitignore(cwd);
+
     // ── Write .suron.json ─────────────────────────────────────────────────────
     writeFileSync(
       join(cwd, ".suron.json"),
@@ -105,6 +117,8 @@ export const initCommand = new Command("init")
         } catch {
           console.error("  " + c.yellow("⚠") + "  SDK install failed — run manually: npm install @suronai/sdk");
         }
+      } else {
+        console.log("  " + c.dim("@suronai/sdk already installed — skipped."));
       }
     }
 
@@ -114,12 +128,41 @@ export const initCommand = new Command("init")
     // ── Done ──────────────────────────────────────────────────────────────────
     console.log();
     console.log("  " + c.green("✓") + "  .env encrypted          " + c.dim("(safe to commit)"));
-    console.log("  " + c.green("✓") + "  .env.keys kept           " + c.dim("(add to .gitignore)"));
+    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();
   });
 
+/**
+ * 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).
+ * @param {string} cwd
+ */
+const GITIGNORE_ENTRIES = [
+  "node_modules/",
+  "package-lock.json",
+  ".env.keys",
+];
+
+function ensureGitignore(cwd) {
+  const gitignorePath = join(cwd, ".gitignore");
+
+  if (!existsSync(gitignorePath)) {
+    writeFileSync(gitignorePath, GITIGNORE_ENTRIES.join("\n") + "\n", "utf-8");
+    return;
+  }
+
+  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 separator = content.endsWith("\n") ? "" : "\n";
+  writeFileSync(gitignorePath, content + separator + missing.join("\n") + "\n", "utf-8");
+}
+
 /** @param {string} cwd @returns {string} */
 function detectPackageManager(cwd) {
   if (existsSync(join(cwd, "pnpm-lock.yaml"))) return "pnpm";
@@ -176,15 +219,53 @@ async function patchEntryPoint(cwd, isEsm) {
 
   const lines = src.split("\n");
 
-  // Find every line that references dotenv (import or require, any style)
-  const dotenvLines = [];
+  // 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 = [];
+  const seenIndices = new Set();
+
   for (let i = 0; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    const indent  = lines[i].match(/^(\s*)/)[1];
+
     if (lines[i].includes("dotenv")) {
-      dotenvLines.push({ index: i, content: lines[i] });
+      seenIndices.add(i);
+      let replacement = null;
+      if (isEsm) {
+        if (trimmed.startsWith("import")) {
+          replacement = indent + trimmed.replace(/(from\s+)['"]dotenv(?:\/config)?['"]/, '$1"@suronai/sdk"');
+        }
+      } else {
+        if (trimmed.includes("require")) {
+          replacement = indent + "const { config } = require(\"@suronai/sdk\");\n" + indent + "await config();";
+        }
+      }
+      toReplace.push({ index: i, content: lines[i], replacement });
     }
   }
 
-  if (dotenvLines.length === 0) {
+  // Pass 2: bare config() call — only in ESM where the import and call are 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,
+          content: lines[i],
+          replacement: indent + trimmed.replace(/^config\s*\(/, "await config("),
+        });
+      }
+    }
+    // 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");
     printSnippet(isEsm);
     return;
@@ -195,36 +276,7 @@ async function patchEntryPoint(cwd, isEsm) {
   console.log("  " + c.yellow("▶") + "  Found dotenv in " + c.dim(relEntry) + ":");
   console.log();
 
-  // For each dotenv line, compute its replacement.
-  // We preserve the original line's leading whitespace (indent) and only
-  // swap out the dotenv-specific part — nothing else on the line is touched.
-  const replacements = dotenvLines.map(({ index, content }) => {
-    const trimmed = content.trim();
-    const indent  = content.match(/^(\s*)/)[1];
-    let replacement = null;
-
-    if (isEsm) {
-      // import { config } from "dotenv"  →  import { config } from "@suronai/sdk"
-      // Preserves the quote style and anything else on the line.
-      if (trimmed.startsWith("import") && trimmed.includes("dotenv")) {
-        replacement = indent + trimmed.replace(/(from\s+)['"]dotenv['"]/, '$1"@suronai/sdk"');
-      }
-      // config();  →  await config();
-      // Only matches lines that are purely a config() call, nothing else.
-      else if (/^config\s*\(\s*\);?$/.test(trimmed)) {
-        replacement = indent + trimmed.replace(/^config\s*\(/, "await config(");
-      }
-    } else {
-      // require("dotenv").config()  →  const { config } = require("@suronai/sdk"); await config();
-      if (trimmed.includes("require") && trimmed.includes("dotenv")) {
-        replacement = indent + "const { config } = require(\"@suronai/sdk\");\n" + indent + "await config();";
-      }
-    }
-
-    // If we found a dotenv line but don't know how to replace it, show it
-    // with a warning so the user knows to handle it manually.
-    return { index, content, replacement };
-  });
+  const replacements = toReplace;
 
   // Show the diff preview
   for (const { content, replacement } of replacements) {

package/src/commands/recover.js

@@ -0,0 +1,82 @@
+import { Command } from "commander";
+import { existsSync, writeFileSync } from "fs";
+import { join, basename } from "path";
+import { requireApiUrl, prompt } from "../utils/config.js";
+import c from "../utils/colors.js";
+
+export const recoverCommand = new Command("recover")
+  .description("Restore a lost .suron.json by looking up your app name")
+  .option("--name <n>", "App name to recover (skips interactive prompt)")
+  .action(async (opts) => {
+    const cwd    = process.cwd();
+    const apiUrl = requireApiUrl();
+
+    console.log("\n" + c.bold("  suron recover") + "  —  " + c.dim(cwd) + "\n");
+
+    if (existsSync(join(cwd, ".suron.json"))) {
+      console.log("  " + c.yellow("⚠") + "  .suron.json already exists here.");
+      const answer = await prompt("  Overwrite it? [y/N] › ");
+      if (!/^y(es)?$/i.test(answer)) {
+        console.log("  " + c.dim("Cancelled.\n"));
+        process.exit(0);
+      }
+    }
+
+    // ── App name ──────────────────────────────────────────────────────────────
+    let appName;
+    if (opts.name) {
+      appName = opts.name.toLowerCase().replace(/[^a-z0-9]/g, "");
+      console.log("  App name     " + c.cyan(appName));
+    } else {
+      const suggested = basename(cwd) || "my-project";
+      const raw = await prompt(`  App name [${c.dim(suggested)}] › `);
+      appName = (raw || suggested).toLowerCase().replace(/[^a-z0-9]/g, "");
+    }
+
+    if (!appName) {
+      console.error("  " + c.red("✗") + "  App name is required.\n");
+      process.exit(1);
+    }
+
+    // ── Look up app ───────────────────────────────────────────────────────────
+    console.log("\n  " + c.dim("Looking up app..."));
+
+    let res;
+    try {
+      res = await fetch(`${apiUrl}/cli/recover-app`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ name: appName }),
+      });
+    } catch (err) {
+      console.error("\n  " + c.red("✗") + `  Could not reach Suron API: ${err.message}\n`);
+      process.exit(1);
+    }
+
+    if (!res.ok) {
+      let body = {};
+      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");
+      } else {
+        console.error("\n  " + c.red("✗") + `  ${body?.error ?? `recover-app failed (${res.status})`}\n`);
+      }
+      process.exit(1);
+    }
+
+    const { app_id, name } = await res.json();
+
+    // ── Write .suron.json ─────────────────────────────────────────────────────
+    writeFileSync(
+      join(cwd, ".suron.json"),
+      JSON.stringify({ app: name, id: app_id, api_url: apiUrl }, null, 2) + "\n",
+      "utf-8"
+    );
+
+    console.log();
+    console.log("  " + c.green("✓") + "  .suron.json restored");
+    console.log("  " + c.dim("    app:  ") + c.cyan(name));
+    console.log("  " + c.dim("    id:   ") + c.cyan(app_id));
+    console.log();
+  });

package/src/index.js

@@ -2,10 +2,10 @@
 
 import { Command } from "commander";
 import { createRequire } from "module";
-import { loginCommand }  from "./commands/login.js";
-import { initCommand }   from "./commands/init.js";
-import { whoamiCommand } from "./commands/whoami.js";
-import { rotateCommand } from "./commands/rotate.js";
+import { loginCommand }   from "./commands/login.js";
+import { initCommand }    from "./commands/init.js";
+import { whoamiCommand }  from "./commands/whoami.js";
+import { recoverCommand } from "./commands/recover.js";
 
 const require  = createRequire(import.meta.url);
 const { version } = require("../package.json");
@@ -20,6 +20,6 @@ program
 program.addCommand(loginCommand);
 program.addCommand(initCommand);
 program.addCommand(whoamiCommand);
-program.addCommand(rotateCommand);
+program.addCommand(recoverCommand);
 
 program.parse(process.argv);

package/src/commands/rotate.js

@@ -1,80 +0,0 @@
-import { Command } from "commander";
-import { existsSync, readFileSync, unlinkSync } from "fs";
-import { join } from "path";
-import { requireApiUrl } from "../utils/config.js";
-import { encryptDotenv, readPrivateKey } from "../utils/dotenvx.js";
-import c from "../utils/colors.js";
-
-export const rotateCommand = new Command("rotate")
-  .description("Re-encrypt .env with a new private key and update Suron")
-  .action(async () => {
-    const cwd    = process.cwd();
-    const apiUrl = requireApiUrl();
-
-    console.log("\n" + c.bold("  suron rotate") + "  —  " + c.dim(cwd) + "\n");
-
-    const suronJsonPath = join(cwd, ".suron.json");
-    if (!existsSync(suronJsonPath)) {
-      console.error("  " + c.red("✗") + "  .suron.json not found — run: suron init\n");
-      process.exit(1);
-    }
-
-    let suronConfig;
-    try {
-      suronConfig = JSON.parse(readFileSync(suronJsonPath, "utf-8"));
-    } catch {
-      console.error("  " + c.red("✗") + "  .suron.json is malformed\n");
-      process.exit(1);
-    }
-
-    if (!existsSync(join(cwd, ".env"))) {
-      console.error("  " + c.red("✗") + "  .env not found\n");
-      process.exit(1);
-    }
-
-    console.log("  " + c.dim("Re-encrypting .env with a new private key..."));
-
-    try {
-      encryptDotenv(cwd);
-    } catch (err) {
-      console.error("\n  " + c.red("✗") + "  " + err.message + "\n");
-      process.exit(1);
-    }
-
-    let newPrivateKey;
-    try {
-      newPrivateKey = readPrivateKey(cwd);
-    } catch (err) {
-      console.error("\n  " + c.red("✗") + "  " + err.message + "\n");
-      process.exit(1);
-    }
-
-    console.log("  " + c.dim("Updating private key in Suron..."));
-
-    let res;
-    try {
-      res = await fetch(`${apiUrl}/cli/rotate-key`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ app_id: suronConfig.id, private_key: newPrivateKey }),
-      });
-    } catch (err) {
-      console.error("\n  " + c.red("✗") + `  Could not reach Suron API: ${err.message}\n`);
-      process.exit(1);
-    }
-
-    if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      console.error("\n  " + c.red("✗") + `  rotate-key failed (${res.status}): ${text}\n`);
-      process.exit(1);
-    }
-
-    const keysPath = join(cwd, ".env.keys");
-    if (existsSync(keysPath)) unlinkSync(keysPath);
-
-    console.log();
-    console.log("  " + c.green("✓") + "  Key rotated");
-    console.log("  " + c.green("✓") + "  .env re-encrypted   " + c.dim("(safe to commit)"));
-    console.log("  " + c.green("✓") + "  .env.keys deleted");
-    console.log();
-  });