@suronai/cli 0.1.41 → 0.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suronai/cli",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "Suron CLI — secrets delivery",
   "type": "module",
   "bin": {

package/src/commands.js

@@ -30,15 +30,14 @@ function openBrowser(url) {
   }
 }
 
-function waitForEnter(prompt) {
-  process.stdout.write(prompt);
+function prompt(question) {
   return new Promise(resolve => {
+    process.stdout.write(question);
     const handler = (buf) => {
-      if (buf.toString().includes("\n")) {
-        process.stdin.removeListener("data", handler);
-        process.stdin.pause();
-        resolve();
-      }
+      const line = buf.toString().split("\n")[0].trim();
+      process.stdin.removeListener("data", handler);
+      process.stdin.pause();
+      resolve(line);
     };
     process.stdin.resume();
     process.stdin.setEncoding("utf-8");
@@ -106,10 +105,21 @@ function installSdk(cwd) {
 // ── Entry-point patching ──────────────────────────────────────────────────────
 
 async function patchEntryPoint(cwd, isEsm) {
+  // Check package.json "main" first, then fall back to common names
+  let mainFromPkg = null;
+  try {
+    const pkg = JSON.parse(readFileSync(join(cwd, "package.json"), "utf-8"));
+    if (pkg.main) mainFromPkg = pkg.main;
+  } catch {}
+
   const candidates = isEsm
     ? ["index.js", "index.mjs", "src/index.js", "src/index.mjs"]
     : ["index.js", "index.cjs", "src/index.js", "src/index.cjs"];
 
+  if (mainFromPkg && !candidates.includes(mainFromPkg)) {
+    candidates.unshift(mainFromPkg);
+  }
+
   let entryPath = null;
   for (const rel of candidates) {
     const abs = join(cwd, rel);
@@ -138,7 +148,18 @@ async function patchEntryPoint(cwd, isEsm) {
         }
       } else {
         if (trimmed.includes("require")) {
-          replacement = indent + 'const { config } = require("@suronai/sdk");\n' + indent + "await config();";
+          // Handle: require("dotenv").config()  →  require("@suronai/sdk").config()
+          // Handle: require("dotenv/config")    →  require("@suronai/sdk").config()
+          // Handle: const x = require("dotenv") →  const { config } = require("@suronai/sdk")\nawait config()
+          if (/require\(['"]dotenv['"]\)\.config/.test(trimmed)) {
+            replacement = indent + trimmed.replace(/require\(['"]dotenv['"]\)/, 'require("@suronai/sdk")');
+            // wrap the whole statement to be async-aware
+            replacement = indent + `await require("@suronai/sdk").config();`;
+          } else if (/require\(['"]dotenv\/config['"]\)/.test(trimmed)) {
+            replacement = indent + `await require("@suronai/sdk").config();`;
+          } else {
+            replacement = indent + `const { config: suronConfig } = require("@suronai/sdk");\n` + indent + `await suronConfig();`;
+          }
         }
       }
       toReplace.push({ index: i, content: lines[i], replacement });
@@ -178,8 +199,7 @@ async function patchEntryPoint(cwd, isEsm) {
     console.log(ui.blank());
   }
 
-  await waitForEnter(ui.promptLine("apply patch?  [Y/n]"));
-  const answer = "";
+  const answer = await prompt(ui.promptLine("apply patch?  [Y/n]"));
   const confirmed = answer === "" || /^y(es)?$/i.test(answer);
   console.log(ui.blank());
   console.log(ui.hr());
@@ -220,8 +240,7 @@ function printSnippet(isEsm) {
     console.log(ui.INDENT + "   " + ui.amber('import { config } from "@suronai/sdk"'));
     console.log(ui.INDENT + "   " + ui.amber("await config()"));
   } else {
-    console.log(ui.INDENT + "   " + ui.amber('const { config } = require("@suronai/sdk")'));
-    console.log(ui.INDENT + "   " + ui.amber("await config()"));
+    console.log(ui.INDENT + "   " + ui.amber('await require("@suronai/sdk").config()'));
   }
   console.log(ui.blank());
   console.log(ui.hr());
@@ -263,7 +282,7 @@ export const loginCommand = new Command("login")
     console.log(ui.kv("URL", loginUrl, 6));
     console.log(ui.blank());
 
-    await waitForEnter(ui.promptLine("open browser"));
+    await prompt(ui.promptLine("open browser"));
     openBrowser(loginUrl);
     console.log(ui.blank());
 
@@ -494,6 +513,7 @@ export const whoamiCommand = new Command("whoami")
   });
 
 export const upCommand = new Command("up")
+  .description("Push a new version of .env")
   .action(async () => {
     requireToken();
     const cwd = process.cwd();
@@ -502,9 +522,20 @@ export const upCommand = new Command("up")
     if (!existsSync(join(cwd, ".env")))         cancel(".env not found");
 
     const suronJson     = JSON.parse(readFileSync(join(cwd, ".suron.json"), "utf-8"));
-    const { app_id }    = suronJson;
+    const { app_id, version: currentVersion } = suronJson;
     const env_plaintext = readFileSync(join(cwd, ".env"), "utf-8");
 
+    // ── Check if anything changed ─────────────────────────────────────────────
+    try {
+      const latest = await api(`/apps/${app_id}/versions/${currentVersion}`);
+      if (latest.env_plaintext?.trim() === env_plaintext.trim()) {
+        console.log(ui.blank());
+        console.log(ui.okBlock("nothing to push  ·  .env unchanged since " + currentVersion));
+        console.log(ui.blank());
+        return;
+      }
+    } catch { /* if fetch fails just proceed */ }
+
     const s = spinner();
     s.start("Pushing new version");