@suronai/cli 0.1.31 → 0.1.32

package/package.json

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

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");
@@ -213,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;
@@ -232,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) {