@suronai/cli 2.0.2 → 2.0.3

package/cli.js

@@ -46,8 +46,8 @@ const c = {
 
 // ── Logo ──────────────────────────────────────────────────────────────────────
 const logo = `
-  ${c.orange("▄▀  █ █ █▀▄ █▀█ █▄ █")}
-  ${c.orange("▀▄█ ▀▄█ █▀▄ █▄█ █ ▀█")}  ${c.gray("secrets manager · v2")}
+  ${c.orange("▄▀▀ █ █ █▀▄ █▀█ █▄ █")}
+  ${c.orange("▀▀▄ ▀▄█ █▀▄ █▄█ █ ▀█")}  ${c.gray("secrets manager · v2")}
 `;
 
 // ── Config ────────────────────────────────────────────────────────────────────
@@ -75,7 +75,7 @@ function getConfig() {
 function requireConfig() {
   const cfg = getConfig();
   if (!cfg.url) {
-    console.error(c.red("✗ SURON_URL not set — run: suron init"));
+    console.error(c.red("✗ SURON_URL not set — run: suron login"));
     process.exit(1);
   }
   return cfg;
@@ -154,10 +154,10 @@ function printHelp() {
   console.log(logo);
   const sections = [
     { heading: "Setup", cmds: [
-      ["suron init",                "",                               "Interactive setup wizard — saves ~/.suron/config"],
-      ["suron login",               "",                               "Authenticate CLI via browser (opens dashboard)"],
+      ["suron login",               "",                               "Authenticate CLI — asks for URLs + opens approval page in browser"],
       ["suron logout",              "",                               "Remove saved credentials"],
       ["suron whoami",              "",                               "Show current auth status"],
+      ["suron init",                "",                               "(legacy) — just runs: suron login"],
     ]},
     { heading: "Scaffold", cmds: [
       ["suron new <directory>",     "",                               "Scaffold a new Node.js project with SURON pre-wired"],
@@ -196,57 +196,65 @@ function printHelp() {
   const cfg = getConfig();
   console.log(`  ${c.gray("Config:")} ${cfg.url ? c.cyan(cfg.url) : c.red("not set — run: suron init")}`);
   console.log(`  ${c.gray("Version:")} ${c.gray(VERSION)}`);
-  console.log(`  ${c.gray("Docs:  ")} ${c.cyan("https://github.com/your-org/suron")}\n`);
+  console.log(`  ${c.gray("Docs:  ")} ${c.cyan("https://github.com/Cryptoistaken/Suron")}\n`);
 }
 
 // ── INIT ──────────────────────────────────────────────────────────────────────
 async function cmdInit() {
   console.log(logo);
-  console.log(`${c.bold("Setup Wizard")} — saves config to ${c.cyan(CONFIG_FILE)}\n`);
-  const ex = loadConfig();
-
-  const url     = await prompt(`Convex URL       ${ex.SURON_URL           ? c.gray("("+ex.SURON_URL+")") : c.gray("e.g. https://xxx.convex.cloud")}: `);
-  const dashUrl = await prompt(`Dashboard URL    ${ex.SURON_DASHBOARD_URL ? c.gray("("+ex.SURON_DASHBOARD_URL+")") : c.gray("e.g. https://suron.vercel.app")}: `);
-
-  const cfg = {
-    ...ex,
-    ...(url     ? { SURON_URL:           url     } : {}),
-    ...(dashUrl ? { SURON_DASHBOARD_URL: dashUrl } : {}),
-  };
-  saveConfig(cfg);
-  console.log(c.green(`\n✓ Config saved`));
-  console.log(c.gray(`  SURON_URL           = ${cfg.SURON_URL}`));
-  if (cfg.SURON_DASHBOARD_URL) console.log(c.gray(`  SURON_DASHBOARD_URL = ${cfg.SURON_DASHBOARD_URL}`));
-  console.log(`\n${c.dim("  Next: suron login   or   suron apps create --name my-app")}\n`);
+  console.log(`${c.bold("Setup Wizard")}\n`);
+  console.log(c.gray("  suron init is no longer needed for URL setup."));
+  console.log(c.gray("  Run ") + c.cyan("suron login") + c.gray(" — it will ask for your Convex URL and Dashboard URL automatically.\n"));
+  console.log(c.dim("  Or run: suron whoami   to check current status\n"));
 }
 
 // ── LOGIN ─────────────────────────────────────────────────────────────────────
 async function cmdLogin() {
-  const { url } = requireConfig();
-  const client = getClient();
   console.log(logo);
   console.log(`${c.bold("CLI Authentication")}\n`);
 
+  // ── Step 1: ensure Convex URL is set
+  let cfg = loadConfig();
+  let convexUrl = process.env.SURON_URL ?? cfg.SURON_URL;
+  if (!convexUrl) {
+    console.log(c.gray("  No Convex URL found. Let's set it up.\n"));
+    convexUrl = await prompt(`  Convex URL ${c.gray("(e.g. https://xxx.eu-west-1.convex.cloud)")}: `);
+    if (!convexUrl) { console.error(c.red("✗ Convex URL is required")); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
+    cfg = { ...cfg, SURON_URL: convexUrl };
+    saveConfig(cfg);
+    console.log(c.green("  ✓ Convex URL saved\n"));
+  }
+
+  // ── Step 2: ensure Dashboard URL is set
+  let dashUrl = process.env.SURON_DASHBOARD_URL ?? cfg.SURON_DASHBOARD_URL;
+  if (!dashUrl) {
+    console.log(c.gray("  No Dashboard URL found. Where is your SURON dashboard deployed?\n"));
+    dashUrl = await prompt(`  Dashboard URL ${c.gray("(e.g. https://suron.vercel.app)")}: `);
+    if (!dashUrl) { console.error(c.red("✗ Dashboard URL is required")); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
+    cfg = { ...cfg, SURON_DASHBOARD_URL: dashUrl };
+    saveConfig(cfg);
+    console.log(c.green("  ✓ Dashboard URL saved\n"));
+  }
+
+  // ── Step 3: create session and open browser
+  const client = new ConvexHttpClient(convexUrl);
   let sessionId, code;
   try {
     const r = await client.mutation("auth:createCliSession", {});
     sessionId = r.sessionId; code = r.code;
-  } catch(e) { console.error(c.red(`✗ ${e.message}`)); process.exit(1); }
+  } catch(e) { console.error(c.red(`✗ ${e.message}`)); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
 
-  const dashUrl = process.env.SURON_DASHBOARD_URL ?? loadConfig().SURON_DASHBOARD_URL;
-  if (!dashUrl) {
-    console.error(c.red("✗ SURON_DASHBOARD_URL not set — run: suron init"));
-    process.exit(1);
-  }
+  const approvalUrl = `${dashUrl.replace(/\/$/, "")}/approve?code=${code}`;
 
-  const approvalUrl = `${dashUrl}/cli-auth?code=${code}`;
-  console.log(`  ${c.bold("Login code")}:  ${c.orange(c.bold(code))}\n`);
-  console.log(`  ${c.gray("Approval URL")}: ${c.cyan(approvalUrl)}\n`);
-  console.log(c.dim("  Press Enter to open in browser…"));
+  console.log(`  ${c.bold("Your code")}: ${c.orange(c.bold(code))}\n`);
+  console.log(`  ${c.gray("Opening approval page in browser…")}`);
+  console.log(`  ${c.dim(approvalUrl)}\n`);
+  console.log(c.dim("  Press Enter to open in browser, or visit the URL above manually."));
   await prompt("");
   openBrowser(approvalUrl);
-  console.log(c.gray("\n  Waiting for dashboard approval…  (Ctrl+C to cancel)\n"));
+  console.log(c.gray("\n  Waiting for approval…  (Ctrl+C to cancel)\n"));
 
+  // ── Step 4: poll
   const deadline = Date.now() + 10 * 60 * 1000;
   let dots = 0;
   while (Date.now() < deadline) {
@@ -257,20 +265,23 @@ async function cmdLogin() {
     process.stdout.write(`\r  ${c.gray("Waiting" + ".".repeat(dots).padEnd(3))}`);
     if (result.status === "approved" && result.adminToken) {
       process.stdout.write("\n");
-      const cfg = loadConfig();
       cfg.SURON_ADMIN_TOKEN = result.adminToken;
       saveConfig(cfg);
       console.log(`\n${c.green("✓ Authenticated!")} Token saved to ${c.cyan(CONFIG_FILE)}\n`);
+      await new Promise(r => setTimeout(r, 50));
       process.exit(0);
     }
     if (result.status === "denied") {
-      console.log("\n" + c.red("✗ Denied by dashboard.")); process.exit(1);
+      process.stdout.write("\n"); console.log(c.red("✗ Denied."));
+      await new Promise(r => setTimeout(r, 50)); process.exit(1);
     }
     if (["expired","not_found"].includes(result.status)) {
-      console.log("\n" + c.red("✗ Session expired. Run: suron login")); process.exit(1);
+      process.stdout.write("\n"); console.log(c.red("✗ Session expired. Run: suron login"));
+      await new Promise(r => setTimeout(r, 50)); process.exit(1);
     }
   }
-  console.log("\n" + c.red("✗ Timed out.")); process.exit(1);
+  process.stdout.write("\n"); console.log(c.red("✗ Timed out."));
+  await new Promise(r => setTimeout(r, 50)); process.exit(1);
 }
 
 // ── WHOAMI ────────────────────────────────────────────────────────────────────
@@ -731,7 +742,7 @@ try {
     case "--help":
     case "-h":        printHelp();              break;
     case "version":   console.log(`suron v${VERSION}`); break;
-    case "init":      await cmdInit();          break;
+    case "init":      await cmdLogin();          break;  // init now just runs login
     case "login":     await cmdLogin();         break;
     case "logout":    cmdLogout();              break;
     case "whoami":    await cmdWhoami();        break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suronai/cli",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "SURON CLI — manage secrets, push .env files, scaffold Node.js projects with Telegram approval",
   "main": "cli.js",
   "type": "module",
@@ -26,14 +26,14 @@
   ],
   "license": "MIT",
   "author": "SuronAI",
-  "homepage": "https://github.com/your-org/suron",
+  "homepage": "https://github.com/Cryptoistaken/Suron",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/your-org/suron.git",
+    "url": "git+https://github.com/Cryptoistaken/Suron.git",
     "directory": "SDK/CLI"
   },
   "bugs": {
-    "url": "https://github.com/your-org/suron/issues"
+    "url": "https://github.com/Cryptoistaken/Suron/issues"
   },
   "files": [
     "suron",

package/suron

@@ -203,50 +203,69 @@ function printHelp() {
 async function cmdInit() {
   console.log(logo);
   console.log(`${c.bold("Setup Wizard")} — saves config to ${c.cyan(CONFIG_FILE)}\n`);
+  console.log(c.dim("  Tip: suron login will also ask for these URLs if not set.\n"));
   const ex = loadConfig();
 
-  const url     = await prompt(`Convex URL       ${ex.SURON_URL           ? c.gray("("+ex.SURON_URL+")") : c.gray("e.g. https://xxx.convex.cloud")}: `);
-  const dashUrl = await prompt(`Dashboard URL    ${ex.SURON_DASHBOARD_URL ? c.gray("("+ex.SURON_DASHBOARD_URL+")") : c.gray("e.g. https://suron.vercel.app")}: `);
+  const url = await prompt(`Convex URL  ${ex.SURON_URL ? c.gray("("+ex.SURON_URL+")") : c.gray("e.g. https://xxx.convex.cloud")}: `);
 
   const cfg = {
     ...ex,
-    ...(url     ? { SURON_URL:           url     } : {}),
-    ...(dashUrl ? { SURON_DASHBOARD_URL: dashUrl } : {}),
+    ...(url ? { SURON_URL: url } : {}),
   };
   saveConfig(cfg);
   console.log(c.green(`\n✓ Config saved`));
-  console.log(c.gray(`  SURON_URL           = ${cfg.SURON_URL}`));
-  if (cfg.SURON_DASHBOARD_URL) console.log(c.gray(`  SURON_DASHBOARD_URL = ${cfg.SURON_DASHBOARD_URL}`));
-  console.log(`\n${c.dim("  Next: suron login   or   suron apps create --name my-app")}\n`);
+  console.log(c.gray(`  SURON_URL = ${cfg.SURON_URL ?? c.red("(not set)")}`));
+  console.log(`\n${c.dim("  Next: suron login")}\n`);
 }
 
 // ── LOGIN ─────────────────────────────────────────────────────────────────────
 async function cmdLogin() {
-  const { url } = requireConfig();
-  const client = getClient();
   console.log(logo);
   console.log(`${c.bold("CLI Authentication")}\n`);
 
+  // ── Step 1: ensure Convex URL is set ────────────────────────────────────────
+  let cfg = loadConfig();
+  let convexUrl = process.env.SURON_URL ?? cfg.SURON_URL;
+  if (!convexUrl) {
+    console.log(c.gray("  No Convex URL found. Let's set it up.\n"));
+    convexUrl = await prompt(`  Convex URL ${c.gray("(e.g. https://xxx.eu-west-1.convex.cloud)")}: `);
+    if (!convexUrl) { console.error(c.red("✗ Convex URL is required")); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
+    cfg = { ...cfg, SURON_URL: convexUrl };
+    saveConfig(cfg);
+    console.log(c.green("  ✓ Convex URL saved\n"));
+  }
+
+  // ── Step 2: ensure Dashboard URL is set ─────────────────────────────────────
+  let dashUrl = process.env.SURON_DASHBOARD_URL ?? cfg.SURON_DASHBOARD_URL;
+  if (!dashUrl) {
+    console.log(c.gray("  No Dashboard URL found. Where is your SURON dashboard deployed?\n"));
+    dashUrl = await prompt(`  Dashboard URL ${c.gray("(e.g. https://suron.vercel.app)")}: `);
+    if (!dashUrl) { console.error(c.red("✗ Dashboard URL is required")); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
+    cfg = { ...cfg, SURON_DASHBOARD_URL: dashUrl };
+    saveConfig(cfg);
+    console.log(c.green("  ✓ Dashboard URL saved\n"));
+  }
+
+  // ── Step 3: create session and open browser ──────────────────────────────────
+  const client = new ConvexHttpClient(convexUrl);
   let sessionId, code;
   try {
     const r = await client.mutation("auth:createCliSession", {});
     sessionId = r.sessionId; code = r.code;
-  } catch(e) { console.error(c.red(`✗ ${e.message}`)); process.exit(1); }
+  } catch(e) { console.error(c.red(`✗ ${e.message}`)); await new Promise(r => setTimeout(r, 50)); process.exit(1); }
 
-  const dashUrl = process.env.SURON_DASHBOARD_URL ?? loadConfig().SURON_DASHBOARD_URL;
-  if (!dashUrl) {
-    console.error(c.red("✗ SURON_DASHBOARD_URL not set — run: suron init"));
-    process.exit(1);
-  }
+  // Open a clean standalone approval page (not the full dashboard)
+  const approvalUrl = `${dashUrl.replace(/\/$/, "")}/approve?code=${code}`;
 
-  const approvalUrl = `${dashUrl}/cli-auth?code=${code}`;
-  console.log(`  ${c.bold("Login code")}:  ${c.orange(c.bold(code))}\n`);
-  console.log(`  ${c.gray("Approval URL")}: ${c.cyan(approvalUrl)}\n`);
-  console.log(c.dim("  Press Enter to open in browser…"));
+  console.log(`  ${c.bold("Your code")}: ${c.orange(c.bold(code))}\n`);
+  console.log(`  ${c.gray("Opening approval page in browser…")}`);
+  console.log(`  ${c.dim(approvalUrl)}\n`);
+  console.log(c.dim("  Press Enter to open in browser, or visit the URL above manually."));
   await prompt("");
   openBrowser(approvalUrl);
-  console.log(c.gray("\n  Waiting for dashboard approval…  (Ctrl+C to cancel)\n"));
+  console.log(c.gray("\n  Waiting for approval…  (Ctrl+C to cancel)\n"));
 
+  // ── Step 4: poll until approved/denied/expired ───────────────────────────────
   const deadline = Date.now() + 10 * 60 * 1000;
   let dots = 0;
   while (Date.now() < deadline) {
@@ -257,20 +276,26 @@ async function cmdLogin() {
     process.stdout.write(`\r  ${c.gray("Waiting" + ".".repeat(dots).padEnd(3))}`);
     if (result.status === "approved" && result.adminToken) {
       process.stdout.write("\n");
-      const cfg = loadConfig();
       cfg.SURON_ADMIN_TOKEN = result.adminToken;
       saveConfig(cfg);
       console.log(`\n${c.green("✓ Authenticated!")} Token saved to ${c.cyan(CONFIG_FILE)}\n`);
+      await new Promise(r => setTimeout(r, 50));
       process.exit(0);
     }
     if (result.status === "denied") {
-      console.log("\n" + c.red("✗ Denied by dashboard.")); process.exit(1);
+      process.stdout.write("\n");
+      console.log(c.red("✗ Denied."));
+      await new Promise(r => setTimeout(r, 50)); process.exit(1);
     }
     if (["expired","not_found"].includes(result.status)) {
-      console.log("\n" + c.red("✗ Session expired. Run: suron login")); process.exit(1);
+      process.stdout.write("\n");
+      console.log(c.red("✗ Session expired. Run: suron login"));
+      await new Promise(r => setTimeout(r, 50)); process.exit(1);
     }
   }
-  console.log("\n" + c.red("✗ Timed out.")); process.exit(1);
+  process.stdout.write("\n");
+  console.log(c.red("✗ Timed out."));
+  await new Promise(r => setTimeout(r, 50)); process.exit(1);
 }
 
 // ── WHOAMI ────────────────────────────────────────────────────────────────────