@lead-routing/cli 0.1.6 → 0.1.8

package/dist/index.js

@@ -676,11 +676,20 @@ async function checkRemotePort(ssh, port) {
   const { stdout: occupant } = await ssh.execSilent(
     `ss -tlnp 2>/dev/null | grep ':${port} ' | head -1 || echo "unknown process"`
   );
+  const occupantStr = occupant.trim();
+  if (occupantStr.includes("docker-proxy")) {
+    return {
+      ok: false,
+      warn: true,
+      label: `Port ${port} is held by an existing Docker container (docker-proxy).
+  Docker Compose will reclaim it when the new stack starts \u2014 continuing.`
+    };
+  }
   return {
     ok: false,
-    // Hard error — Caddy cannot get TLS certs without these ports
+    // Hard error — non-Docker process; Caddy cannot get TLS certs without these ports
     label: `Port ${port} is occupied and could not be freed automatically.
-  Occupant: ${occupant.trim()}
+  Occupant: ${occupantStr}
   Stop the conflicting process on the server, then re-run:
     lead-routing init`
   };
@@ -893,9 +902,9 @@ async function seedAdminUser(localDir, localPort, adminEmail, adminPassword) {
     const safeEmail = adminEmail.replace(/'/g, "''");
     const safeWebhookSecret = webhookSecret.replace(/'/g, "''");
     const sql = `
--- Create initial organisation if none exists
-INSERT INTO organizations (id, "webhookSecret", "createdAt", "updatedAt")
-SELECT gen_random_uuid(), '${safeWebhookSecret}', NOW(), NOW()
+-- Create initial organisation if none exists (self-hosted defaults: PAID plan, unlimited seats/quota)
+INSERT INTO organizations (id, "webhookSecret", plan, "seatsPurchased", "routingQuota", "isActive", "createdAt", "updatedAt")
+SELECT gen_random_uuid(), '${safeWebhookSecret}', 'PAID', 9999, 999999, true, NOW(), NOW()
 WHERE NOT EXISTS (SELECT 1 FROM organizations);
 
 -- Create admin AppUser under the first org (idempotent)
@@ -1496,7 +1505,7 @@ async function runInit(options = {}) {
     log9.step("Step 1/9  Checking local prerequisites");
     await checkPrerequisites();
     log9.step("Step 2/9  SSH connection");
-    const sshCfg = await collectSshConfig({
+    let sshCfg = await collectSshConfig({
       sshPort: options.sshPort,
       sshUser: options.sshUser,
       sshKey: options.sshKey,
@@ -1507,9 +1516,31 @@ async function runInit(options = {}) {
         await ssh.connect(sshCfg);
         log9.success(`Connected to ${sshCfg.host}`);
       } catch (err) {
-        log9.error(`SSH connection failed: ${String(err)}`);
-        log9.info("Fix your SSH credentials and re-run `lead-routing init`.");
-        process.exit(1);
+        if (sshCfg.privateKeyPath && !sshCfg.password) {
+          log9.warn(`Key auth failed \u2014 the server rejected the SSH key`);
+          log9.info("Falling back to password auth\u2026");
+          const pw = await promptPassword({
+            message: `SSH password for ${sshCfg.username}@${sshCfg.host}`,
+            validate: (v) => !v ? "Required" : void 0
+          });
+          if (isCancel4(pw)) {
+            cancel3("Setup cancelled.");
+            process.exit(0);
+          }
+          sshCfg = { ...sshCfg, privateKeyPath: void 0, password: pw };
+          try {
+            await ssh.connect(sshCfg);
+            log9.success(`Connected to ${sshCfg.host}`);
+          } catch (err2) {
+            log9.error(`SSH connection failed: ${String(err2)}`);
+            log9.info("Fix your SSH credentials and re-run `lead-routing init`.");
+            process.exit(1);
+          }
+        } else {
+          log9.error(`SSH connection failed: ${String(err)}`);
+          log9.info("Fix your SSH credentials and re-run `lead-routing init`.");
+          process.exit(1);
+        }
       }
     }
     log9.step("Step 3/9  Configuration");
@@ -1976,7 +2007,7 @@ async function runSfdcDeploy() {
 
 // src/index.ts
 var program = new Command();
-program.name("lead-routing").description("Self-hosted Lead Routing \u2014 scaffold, deploy, and manage your installation").version("0.1.0");
+program.name("lead-routing").description("Self-hosted Lead Routing \u2014 scaffold, deploy, and manage your installation").version("0.1.8");
 program.command("init").description("Interactive setup wizard \u2014 configure and deploy the full Lead Routing stack").option("--dry-run", "Generate config files without connecting or deploying").option("--resume", "Skip to health check using existing lead-routing.json (post-timeout recovery)").option("--sandbox", "Use Salesforce sandbox (test.salesforce.com) instead of production").option("--ssh-port <port>", "SSH port (default: 22)", parseInt).option("--ssh-user <user>", "SSH username (default: root)").option("--ssh-key <path>", "Path to SSH private key (overrides auto-detection)").option("--remote-dir <path>", "Remote install directory (default: ~/lead-routing)").option("--external-db <url>", "Use external PostgreSQL URL instead of managed Docker container").option("--external-redis <url>", "Use external Redis URL instead of managed Docker container").action((opts) => runInit({
   dryRun: opts.dryRun,
   resume: opts.resume,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lead-routing/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Self-hosted deployment CLI for Lead Routing",
   "homepage": "https://github.com/lead-routing/lead-routing",
   "keywords": ["salesforce", "lead-routing", "self-hosted", "deployment", "cli"],