@lead-routing/cli 0.1.5 → 0.1.6

package/dist/index.js

@@ -5,7 +5,7 @@ import { Command } from "commander";
 
 // src/commands/init.ts
 import { promises as dns } from "dns";
-import { intro, outro, note as note4, log as log8, confirm as confirm3, cancel as cancel3, isCancel as isCancel4, password as promptPassword } from "@clack/prompts";
+import { intro, outro, note as note4, log as log9, confirm as confirm2, cancel as cancel3, isCancel as isCancel4, password as promptPassword } from "@clack/prompts";
 import chalk2 from "chalk";
 
 // src/steps/prerequisites.ts
@@ -69,7 +69,16 @@ async function checkSalesforceCLI() {
 // src/steps/collect-ssh-config.ts
 import { existsSync } from "fs";
 import { homedir } from "os";
-import { text, password, select, note, cancel, isCancel } from "@clack/prompts";
+import { join } from "path";
+import { text, password, note, log as log2, cancel, isCancel } from "@clack/prompts";
+var DEFAULT_KEYS = [
+  join(homedir(), ".ssh", "id_ed25519"),
+  join(homedir(), ".ssh", "id_rsa"),
+  join(homedir(), ".ssh", "id_ecdsa")
+];
+function detectDefaultKey() {
+  return DEFAULT_KEYS.find(existsSync);
+}
 function bail(value) {
   if (isCancel(value)) {
     cancel("Setup cancelled.");
@@ -77,9 +86,9 @@ function bail(value) {
   }
   throw new Error("Unexpected cancel");
 }
-async function collectSshConfig() {
+async function collectSshConfig(opts = {}) {
   note(
-    "The CLI will SSH into your server to deploy the full stack.\nYou will need:\n  \u2022 Server hostname or IP address\n  \u2022 SSH access (key file recommended, password supported)\n  \u2022 Docker 24+ already installed on the server",
+    "The CLI will SSH into your server to deploy the full stack.\nYou will need:\n  \u2022 Server hostname or IP address\n  \u2022 SSH access (key auto-detected, or password)\n  \u2022 Docker 24+ already installed on the server",
     "Server connection"
   );
   const host = await text({
@@ -88,82 +97,43 @@ async function collectSshConfig() {
     validate: (v) => !v ? "Required" : void 0
   });
   if (isCancel(host)) bail(host);
-  const portRaw = await text({
-    message: "SSH port",
-    placeholder: "22",
-    initialValue: "22",
-    validate: (v) => {
-      const n = parseInt(v, 10);
-      if (isNaN(n) || n < 1 || n > 65535) return "Must be a valid port (1\u201365535)";
-    }
-  });
-  if (isCancel(portRaw)) bail(portRaw);
-  const username = await text({
-    message: "SSH username",
-    placeholder: "root",
-    initialValue: "root",
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (isCancel(username)) bail(username);
-  const authMethod = await select({
-    message: "SSH authentication method",
-    options: [
-      { value: "key", label: "SSH key file (recommended)" },
-      { value: "password", label: "Password" }
-    ]
-  });
-  if (isCancel(authMethod)) bail(authMethod);
   let privateKeyPath;
   let pwd;
-  if (authMethod === "key") {
-    const defaultKey = `${homedir()}/.ssh/id_rsa`;
-    const keyPath = await text({
-      message: "Path to SSH private key",
-      placeholder: defaultKey,
-      initialValue: `~/.ssh/id_rsa`,
-      validate: (v) => {
-        const resolved = v.startsWith("~") ? homedir() + v.slice(1) : v;
-        if (!existsSync(resolved)) return `Key file not found: ${resolved}`;
-      }
-    });
-    if (isCancel(keyPath)) bail(keyPath);
-    const raw = keyPath;
-    privateKeyPath = raw.startsWith("~") ? homedir() + raw.slice(1) : raw;
+  if (opts.sshKey) {
+    const resolved = opts.sshKey.startsWith("~") ? homedir() + opts.sshKey.slice(1) : opts.sshKey;
+    if (!existsSync(resolved)) {
+      log2.error(`SSH key not found: ${resolved}`);
+      process.exit(1);
+    }
+    privateKeyPath = resolved;
+    log2.info(`Using SSH key: ${opts.sshKey}`);
   } else {
-    const p = await password({
-      message: "SSH password",
-      validate: (v) => !v ? "Required" : void 0
-    });
-    if (isCancel(p)) bail(p);
-    pwd = p;
+    const detected = detectDefaultKey();
+    if (detected) {
+      privateKeyPath = detected;
+      log2.info(`Using SSH key: ${detected.replace(homedir(), "~")}`);
+    } else {
+      log2.warn("No SSH key found at ~/.ssh/id_ed25519, ~/.ssh/id_rsa, or ~/.ssh/id_ecdsa");
+      const p = await password({
+        message: `SSH password for ${opts.sshUser ?? "root"}@${host}`,
+        validate: (v) => !v ? "Required" : void 0
+      });
+      if (isCancel(p)) bail(p);
+      pwd = p;
+    }
   }
-  const remoteDir = await text({
-    message: "Remote install directory on server",
-    placeholder: "~/lead-routing",
-    initialValue: "~/lead-routing",
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (isCancel(remoteDir)) bail(remoteDir);
   return {
     host,
-    port: parseInt(portRaw, 10),
-    username,
+    port: opts.sshPort ?? 22,
+    username: opts.sshUser ?? "root",
     privateKeyPath,
     password: pwd,
-    remoteDir
+    remoteDir: opts.remoteDir ?? "~/lead-routing"
   };
 }
 
 // src/steps/collect-config.ts
-import {
-  text as text2,
-  password as password2,
-  select as select2,
-  confirm,
-  note as note2,
-  cancel as cancel2,
-  isCancel as isCancel2
-} from "@clack/prompts";
+import { text as text2, password as password2, note as note2, cancel as cancel2, isCancel as isCancel2 } from "@clack/prompts";
 
 // src/utils/crypto.ts
 import { randomBytes } from "crypto";
@@ -179,9 +149,9 @@ function bail2(value) {
   }
   throw new Error("Unexpected cancel");
 }
-async function collectConfig() {
+async function collectConfig(opts = {}) {
   note2(
-    "You will need:\n  \u2022 A Salesforce Connected App (Client ID + Secret) \u2014 instructions below\n  \u2022 A public URL or localhost for the app\n  \u2022 PostgreSQL + Redis (or let Docker manage them)",
+    "You will need:\n  \u2022 A Salesforce Connected App (Client ID + Secret) \u2014 instructions below\n  \u2022 Public HTTPS URLs for the web app and routing engine",
     "Before you begin"
   );
   const appUrl = await text2({
@@ -200,8 +170,7 @@ async function collectConfig() {
   if (isCancel2(appUrl)) bail2(appUrl);
   const engineUrl = await text2({
     message: "Engine URL (public URL Salesforce will use to route leads)",
-    placeholder: "https://engine.acme.com",
-    hint: "Subdomain: https://engine.acme.com  \u2022  Same domain + port: https://acme.com:3001",
+    placeholder: "https://engine.acme.com  or  https://acme.com:3001",
     validate: (v) => {
       if (!v) return "Required";
       try {
@@ -239,66 +208,12 @@ async function collectConfig() {
     validate: (v) => !v ? "Required" : void 0
   });
   if (isCancel2(sfdcClientSecret)) bail2(sfdcClientSecret);
-  const sfdcLoginUrlChoice = await select2({
-    message: "Salesforce environment",
-    options: [
-      { value: "https://login.salesforce.com", label: "Production / Developer org" },
-      { value: "https://test.salesforce.com", label: "Sandbox" }
-    ]
-  });
-  if (isCancel2(sfdcLoginUrlChoice)) bail2(sfdcLoginUrlChoice);
-  const sfdcLoginUrl = sfdcLoginUrlChoice;
-  const orgAlias = await text2({
-    message: "Salesforce org alias (used by the sf CLI to identify this org)",
-    placeholder: "lead-routing",
-    initialValue: "lead-routing",
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (isCancel2(orgAlias)) bail2(orgAlias);
-  const managedDb = await confirm({
-    message: "Manage PostgreSQL with Docker? (recommended \u2014 choose No to provide your own URL)",
-    initialValue: true
-  });
-  if (isCancel2(managedDb)) bail2(managedDb);
-  let databaseUrl = "";
-  let dbPassword = generateSecret(16);
-  if (managedDb) {
-    databaseUrl = "postgresql://leadrouting:" + dbPassword + "@postgres:5432/leadrouting";
-  } else {
-    const url = await text2({
-      message: "PostgreSQL connection URL",
-      placeholder: "postgresql://user:pass@host:5432/dbname",
-      validate: (v) => {
-        if (!v) return "Required";
-        if (!v.startsWith("postgresql://") && !v.startsWith("postgres://"))
-          return "Must start with postgresql:// or postgres://";
-      }
-    });
-    if (isCancel2(url)) bail2(url);
-    databaseUrl = url;
-    dbPassword = "";
-  }
-  const managedRedis = await confirm({
-    message: "Manage Redis with Docker? (recommended \u2014 choose No to provide your own URL)",
-    initialValue: true
-  });
-  if (isCancel2(managedRedis)) bail2(managedRedis);
-  let redisUrl = "";
-  if (managedRedis) {
-    redisUrl = "redis://redis:6379";
-  } else {
-    const url = await text2({
-      message: "Redis connection URL",
-      placeholder: "redis://user:pass@host:6379",
-      validate: (v) => {
-        if (!v) return "Required";
-        if (!v.startsWith("redis://") && !v.startsWith("rediss://"))
-          return "Must start with redis:// or rediss://";
-      }
-    });
-    if (isCancel2(url)) bail2(url);
-    redisUrl = url;
-  }
+  const sfdcLoginUrl = opts.sandbox ? "https://test.salesforce.com" : "https://login.salesforce.com";
+  const dbPassword = generateSecret(16);
+  const managedDb = !opts.externalDb;
+  const databaseUrl = opts.externalDb ?? `postgresql://leadrouting:${dbPassword}@postgres:5432/leadrouting`;
+  const managedRedis = !opts.externalRedis;
+  const redisUrl = opts.externalRedis ?? "redis://redis:6379";
   note2("This creates the first admin user for the web app.", "Admin Account");
   const adminEmail = await text2({
     message: "Admin email address",
@@ -317,27 +232,6 @@ async function collectConfig() {
     }
   });
   if (isCancel2(adminPassword)) bail2(adminPassword);
-  const wantResend = await confirm({
-    message: "Configure Resend for email invites? (optional)",
-    initialValue: false
-  });
-  if (isCancel2(wantResend)) bail2(wantResend);
-  let resendApiKey = "";
-  let feedbackToEmail = "";
-  if (wantResend) {
-    const key = await text2({
-      message: "Resend API key",
-      placeholder: "re_..."
-    });
-    if (isCancel2(key)) bail2(key);
-    resendApiKey = key ?? "";
-    const email = await text2({
-      message: "Email address to receive feedback",
-      placeholder: "feedback@acme.com"
-    });
-    if (isCancel2(email)) bail2(email);
-    feedbackToEmail = email ?? "";
-  }
   const sessionSecret = generateSecret(32);
   const engineWebhookSecret = generateSecret(32);
   const adminSecret = generateSecret(16);
@@ -347,16 +241,15 @@ async function collectConfig() {
     sfdcClientId: sfdcClientId.trim(),
     sfdcClientSecret: sfdcClientSecret.trim(),
     sfdcLoginUrl,
-    orgAlias,
     managedDb,
     databaseUrl,
-    dbPassword,
+    dbPassword: managedDb ? dbPassword : "",
     managedRedis,
     redisUrl,
     adminEmail,
     adminPassword,
-    resendApiKey,
-    feedbackToEmail,
+    resendApiKey: "",
+    feedbackToEmail: "",
     sessionSecret,
     engineWebhookSecret,
     adminSecret
@@ -365,9 +258,9 @@ async function collectConfig() {
 
 // src/steps/generate-files.ts
 import { mkdirSync, writeFileSync as writeFileSync2, readFileSync as readFileSync2 } from "fs";
-import { join as join2, dirname } from "path";
+import { join as join3, dirname } from "path";
 import { fileURLToPath } from "url";
-import { log as log2 } from "@clack/prompts";
+import { log as log3 } from "@clack/prompts";
 
 // src/templates/docker-compose.ts
 function renderDockerCompose(c) {
@@ -596,9 +489,9 @@ function renderCaddyfile(appUrl, engineUrl) {
 
 // src/utils/config.ts
 import { readFileSync, writeFileSync, existsSync as existsSync2 } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 function getConfigPath(dir) {
-  return join(dir, "lead-routing.json");
+  return join2(dir, "lead-routing.json");
 }
 function readConfig(dir) {
   const path2 = getConfigPath(dir);
@@ -613,10 +506,10 @@ function writeConfig(dir, config2) {
   writeFileSync(getConfigPath(dir), JSON.stringify(config2, null, 2), "utf8");
 }
 function findInstallDir(startDir = process.cwd()) {
-  const candidate = join(startDir, "lead-routing.json");
+  const candidate = join2(startDir, "lead-routing.json");
   if (existsSync2(candidate)) return startDir;
-  const nested = join(startDir, "lead-routing", "lead-routing.json");
-  if (existsSync2(nested)) return join(startDir, "lead-routing");
+  const nested = join2(startDir, "lead-routing", "lead-routing.json");
+  if (existsSync2(nested)) return join2(startDir, "lead-routing");
   return null;
 }
 
@@ -624,14 +517,14 @@ function findInstallDir(startDir = process.cwd()) {
 var __dirname = dirname(fileURLToPath(import.meta.url));
 function getCliVersion() {
   try {
-    const pkg = JSON.parse(readFileSync2(join2(__dirname, "../../package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync2(join3(__dirname, "../../package.json"), "utf8"));
     return pkg.version ?? "0.1.0";
   } catch {
     return "0.1.0";
   }
 }
 function generateFiles(cfg, sshCfg) {
-  const dir = join2(process.cwd(), "lead-routing");
+  const dir = join3(process.cwd(), "lead-routing");
   mkdirSync(dir, { recursive: true });
   const dockerEngineUrl = `http://engine:3001`;
   const composeContent = renderDockerCompose({
@@ -639,12 +532,12 @@ function generateFiles(cfg, sshCfg) {
     managedRedis: cfg.managedRedis,
     dbPassword: cfg.dbPassword
   });
-  const composeFile = join2(dir, "docker-compose.yml");
+  const composeFile = join3(dir, "docker-compose.yml");
   writeFileSync2(composeFile, composeContent, "utf8");
-  log2.success("Generated docker-compose.yml");
+  log3.success("Generated docker-compose.yml");
   const caddyfileContent = renderCaddyfile(cfg.appUrl, cfg.engineUrl);
-  writeFileSync2(join2(dir, "Caddyfile"), caddyfileContent, "utf8");
-  log2.success("Generated Caddyfile");
+  writeFileSync2(join3(dir, "Caddyfile"), caddyfileContent, "utf8");
+  log3.success("Generated Caddyfile");
   const envWebContent = renderEnvWeb({
     appUrl: cfg.appUrl,
     engineUrl: dockerEngineUrl,
@@ -659,9 +552,9 @@ function generateFiles(cfg, sshCfg) {
     resendApiKey: cfg.resendApiKey || void 0,
     feedbackToEmail: cfg.feedbackToEmail || void 0
   });
-  const envWeb = join2(dir, ".env.web");
+  const envWeb = join3(dir, ".env.web");
   writeFileSync2(envWeb, envWebContent, "utf8");
-  log2.success("Generated .env.web");
+  log3.success("Generated .env.web");
   const envEngineContent = renderEnvEngine({
     databaseUrl: cfg.databaseUrl,
     redisUrl: cfg.redisUrl,
@@ -670,9 +563,9 @@ function generateFiles(cfg, sshCfg) {
     sfdcLoginUrl: cfg.sfdcLoginUrl,
     engineWebhookSecret: cfg.engineWebhookSecret
   });
-  const envEngine = join2(dir, ".env.engine");
+  const envEngine = join3(dir, ".env.engine");
   writeFileSync2(envEngine, envEngineContent, "utf8");
-  log2.success("Generated .env.engine");
+  log3.success("Generated .env.engine");
   writeConfig(dir, {
     appUrl: cfg.appUrl,
     engineUrl: cfg.engineUrl,
@@ -695,12 +588,12 @@ function generateFiles(cfg, sshCfg) {
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
     version: getCliVersion()
   });
-  log2.success("Generated lead-routing.json");
+  log3.success("Generated lead-routing.json");
   return { dir, composeFile, envWeb, envEngine, adminSecret: cfg.adminSecret };
 }
 
 // src/steps/check-remote-prerequisites.ts
-import { log as log3 } from "@clack/prompts";
+import { log as log4 } from "@clack/prompts";
 async function checkRemotePrerequisites(ssh) {
   const results = await Promise.all([
     checkRemoteDocker(ssh),
@@ -712,15 +605,15 @@ async function checkRemotePrerequisites(ssh) {
   const warnings = results.filter((r) => !r.ok && r.warn);
   for (const r of results) {
     if (r.ok) {
-      log3.success(r.label);
+      log4.success(r.label);
     } else if (r.warn) {
-      log3.warn(r.label);
+      log4.warn(r.label);
     } else {
-      log3.error(r.label);
+      log4.error(r.label);
     }
   }
   if (warnings.length > 0) {
-    log3.warn("Non-blocking warnings above \u2014 setup will continue.");
+    log4.warn("Non-blocking warnings above \u2014 setup will continue.");
   }
   if (failed.length > 0) {
     throw new Error(
@@ -794,7 +687,7 @@ async function checkRemotePort(ssh, port) {
 }
 
 // src/steps/upload-files.ts
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 import { spinner as spinner2 } from "@clack/prompts";
 async function uploadFiles(ssh, localDir, remoteDir) {
   const s = spinner2();
@@ -810,7 +703,7 @@ async function uploadFiles(ssh, localDir, remoteDir) {
     ];
     await ssh.upload(
       filenames.map((f) => ({
-        local: join3(localDir, f),
+        local: join4(localDir, f),
         remote: `${remoteDir}/${f}`
       }))
     );
@@ -822,7 +715,7 @@ async function uploadFiles(ssh, localDir, remoteDir) {
 }
 
 // src/steps/start-services.ts
-import { spinner as spinner3, log as log4 } from "@clack/prompts";
+import { spinner as spinner3, log as log5 } from "@clack/prompts";
 async function startServices(ssh, remoteDir) {
   await wipeStalePostgresVolume(ssh, remoteDir);
   await pullImages(ssh, remoteDir);
@@ -843,7 +736,7 @@ async function wipeStalePostgresVolume(ssh, remoteDir) {
     s.stop("Old volumes removed \u2014 database will be initialised fresh");
   } catch {
     s.stop("Could not remove old volumes \u2014 proceeding anyway");
-    log4.warn(
+    log5.warn(
       `If migrations fail with "authentication error", remove the postgres_data volume manually:
   ssh into your server and run: docker volume rm ${volumeName}`
     );
@@ -857,7 +750,7 @@ async function pullImages(ssh, remoteDir) {
     s.stop("Images pulled successfully");
   } catch {
     s.stop("Could not pull images from registry \u2014 using local images if available");
-    log4.warn(
+    log5.warn(
       "Registry pull failed. If images are available on the server locally, setup will continue."
     );
   }
@@ -892,7 +785,7 @@ async function waitForPostgres(ssh, remoteDir) {
   }
   if (!containerReady) {
     s.stop("PostgreSQL readiness check timed out \u2014 continuing anyway");
-    log4.warn("PostgreSQL may not be fully ready. If migrations fail, try `lead-routing deploy`.");
+    log5.warn("PostgreSQL may not be fully ready. If migrations fail, try `lead-routing deploy`.");
     return;
   }
   for (let j = 0; j < 8; j++) {
@@ -907,7 +800,7 @@ async function waitForPostgres(ssh, remoteDir) {
     await sleep(1e3);
   }
   s.stop("PostgreSQL is ready");
-  log4.warn("Host TCP port check timed out \u2014 tunnel may have issues. Proceeding anyway.");
+  log5.warn("Host TCP port check timed out \u2014 tunnel may have issues. Proceeding anyway.");
 }
 function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
@@ -1022,7 +915,7 @@ ON CONFLICT ("orgId", email) DO NOTHING;
 }
 
 // src/steps/verify-health.ts
-import { spinner as spinner5, log as log5 } from "@clack/prompts";
+import { spinner as spinner5, log as log6 } from "@clack/prompts";
 async function verifyHealth(appUrl, engineUrl, ssh, remoteDir) {
   const checks = [
     { service: "Web app", url: `${appUrl}/api/health` },
@@ -1031,17 +924,17 @@ async function verifyHealth(appUrl, engineUrl, ssh, remoteDir) {
   const results = await Promise.all(checks.map(({ service, url }) => pollHealth(service, url)));
   for (const r of results) {
     if (r.ok) {
-      log5.success(`${r.service} \u2014 ${r.url}`);
+      log6.success(`${r.service} \u2014 ${r.url}`);
     } else {
-      log5.warn(`${r.service} \u2014 did not respond after ${r.detail}`);
+      log6.warn(`${r.service} \u2014 did not respond after ${r.detail}`);
     }
   }
   const failed = results.filter((r) => !r.ok);
   if (failed.length === 0) return;
-  log5.info("Fetching remote diagnostics\u2026");
+  log6.info("Fetching remote diagnostics\u2026");
   try {
     const { stdout: ps } = await ssh.execSilent("docker compose ps --format table", remoteDir);
-    if (ps.trim()) log5.info(`Container status:
+    if (ps.trim()) log6.info(`Container status:
 ${ps.trim()}`);
   } catch {
   }
@@ -1050,7 +943,7 @@ ${ps.trim()}`);
       "docker compose logs caddy --tail 30 --no-color 2>&1",
       remoteDir
     );
-    if (caddyLogs.trim()) log5.info(`Caddy logs (last 30 lines):
+    if (caddyLogs.trim()) log6.info(`Caddy logs (last 30 lines):
 ${caddyLogs.trim()}`);
   } catch {
   }
@@ -1101,10 +994,10 @@ function sleep2(ms) {
 
 // src/steps/sfdc-deploy-inline.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync4, cpSync, rmSync } from "fs";
-import { join as join5, dirname as dirname3 } from "path";
+import { join as join6, dirname as dirname3 } from "path";
 import { tmpdir } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import { spinner as spinner6, log as log6 } from "@clack/prompts";
+import { spinner as spinner6, log as log7 } from "@clack/prompts";
 import { execa as execa3 } from "execa";
 var __dirname3 = dirname3(fileURLToPath3(import.meta.url));
 function patchXml(content, tag, value) {
@@ -1123,7 +1016,7 @@ async function sfdcDeployInline(params) {
   let sfCredEnv = {};
   let targetOrgArgs = ["--target-org", orgAlias];
   if (alreadyAuthed) {
-    log6.success("Using existing Salesforce authentication");
+    log7.success("Using existing Salesforce authentication");
   } else {
     const { accessToken, instanceUrl, aliasStored } = await loginViaAppBridge(appUrl, orgAlias);
     sfCredEnv = { SF_ACCESS_TOKEN: accessToken, SF_ORG_INSTANCE_URL: instanceUrl };
@@ -1132,10 +1025,10 @@ async function sfdcDeployInline(params) {
     }
   }
   s.start("Copying Salesforce package\u2026");
-  const inDist = join5(__dirname3, "sfdc-package");
-  const nextToDist = join5(__dirname3, "..", "sfdc-package");
+  const inDist = join6(__dirname3, "sfdc-package");
+  const nextToDist = join6(__dirname3, "..", "sfdc-package");
   const bundledPkg = existsSync4(inDist) ? inDist : nextToDist;
-  const destPkg = join5(installDir ?? tmpdir(), "lead-routing-sfdc-package");
+  const destPkg = join6(installDir ?? tmpdir(), "lead-routing-sfdc-package");
   if (!existsSync4(bundledPkg)) {
     s.stop("sfdc-package not found in CLI bundle");
     throw new Error(
@@ -1146,7 +1039,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   if (existsSync4(destPkg)) rmSync(destPkg, { recursive: true, force: true });
   cpSync(bundledPkg, destPkg, { recursive: true });
   s.stop("Package copied");
-  const ncPath = join5(
+  const ncPath = join6(
     destPkg,
     "force-app",
     "main",
@@ -1158,7 +1051,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     const nc = patchXml(readFileSync4(ncPath, "utf8"), "endpoint", engineUrl);
     writeFileSync3(ncPath, nc, "utf8");
   }
-  const rssEnginePath = join5(
+  const rssEnginePath = join6(
     destPkg,
     "force-app",
     "main",
@@ -1171,7 +1064,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     rss = patchXml(rss, "description", "Lead Router Engine endpoint");
     writeFileSync3(rssEnginePath, rss, "utf8");
   }
-  const rssAppPath = join5(
+  const rssAppPath = join6(
     destPkg,
     "force-app",
     "main",
@@ -1184,7 +1077,7 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     rss = patchXml(rss, "description", "Lead Router App URL");
     writeFileSync3(rssAppPath, rss, "utf8");
   }
-  log6.success("Remote Site Settings patched");
+  log7.success("Remote Site Settings patched");
   s.start("Deploying Salesforce package (this may take ~2 min)\u2026");
   try {
     await execa3(
@@ -1217,8 +1110,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
       s.stop("Permission set already assigned");
     } else {
       s.stop("Permission set assignment failed (non-fatal)");
-      log6.warn(msg);
-      log6.info(
+      log7.warn(msg);
+      log7.info(
         "Grant access manually:\n  Salesforce Setup \u2192 Users \u2192 Permission Sets \u2192 Lead Router Admin \u2192 Manage Assignments"
       );
     }
@@ -1267,8 +1160,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     s.stop("Org settings written");
   } catch (err) {
     s.stop("Org settings write failed (non-fatal)");
-    log6.warn(String(err));
-    log6.info("Set manually: Salesforce \u2192 Custom Settings \u2192 Routing Settings \u2192 Manage");
+    log7.warn(String(err));
+    log7.info("Set manually: Salesforce \u2192 Custom Settings \u2192 Routing Settings \u2192 Manage");
   }
 }
 async function loginViaAppBridge(rawAppUrl, orgAlias) {
@@ -1297,11 +1190,11 @@ Ensure the app is running and the URL is correct.`
     );
   }
   s.stop("Auth session started");
-  log6.info(`Open this URL in your browser to authenticate with Salesforce:
+  log7.info(`Open this URL in your browser to authenticate with Salesforce:
 
   ${authUrl}
 `);
-  log6.info('If Chrome shows a "Dangerous site" warning with no proceed option, paste the URL into Safari or Firefox.');
+  log7.info('If Chrome shows a "Dangerous site" warning with no proceed option, paste the URL into Safari or Firefox.');
   const opener = process.platform === "win32" ? "start" : process.platform === "darwin" ? "open" : "xdg-open";
   await execa3(opener, [authUrl], { reject: false }).catch(() => {
   });
@@ -1341,17 +1234,17 @@ Ensure the app is running and the URL is correct.`
       ["org", "login", "access-token", "--instance-url", instanceUrl, "--alias", orgAlias, "--no-prompt"],
       { env: { ...process.env, SFDX_ACCESS_TOKEN: accessToken } }
     );
-    log6.success(`Salesforce org saved as "${orgAlias}"`);
+    log7.success(`Salesforce org saved as "${orgAlias}"`);
     aliasStored = true;
   } catch (err) {
-    log6.warn(`Could not persist sf CLI credentials: ${String(err)}`);
-    log6.info("Continuing with direct token auth for this session.");
+    log7.warn(`Could not persist sf CLI credentials: ${String(err)}`);
+    log7.info("Continuing with direct token auth for this session.");
   }
   return { accessToken, instanceUrl, aliasStored };
 }
 
 // src/steps/app-launcher-guide.ts
-import { note as note3, confirm as confirm2, isCancel as isCancel3, log as log7 } from "@clack/prompts";
+import { note as note3, confirm, isCancel as isCancel3, log as log8 } from "@clack/prompts";
 import chalk from "chalk";
 async function guideAppLauncherSetup(appUrl) {
   note3(
@@ -1372,24 +1265,24 @@ async function guideAppLauncherSetup(appUrl) {
 ` + chalk.dim("Keep this terminal open while you complete the wizard."),
     "Complete Salesforce setup"
   );
-  const done = await confirm2({
+  const done = await confirm({
     message: "Have you completed the App Launcher wizard?",
     initialValue: false
   });
   if (isCancel3(done)) {
-    log7.warn(
+    log8.warn(
       "Wizard skipped. Run `lead-routing sfdc deploy` to retry the Salesforce setup."
     );
     return;
   }
   if (!done) {
-    log7.warn(
+    log8.warn(
       `No problem \u2014 complete it at your own pace.
   Open App Launcher \u2192 Lead Router Setup \u2192 Connect to Lead Router
   Dashboard: ${appUrl}`
     );
   } else {
-    log7.success("Salesforce setup complete");
+    log8.success("Salesforce setup complete");
   }
 }
 
@@ -1519,11 +1412,11 @@ async function checkDnsResolvable(appUrl, engineUrl) {
     try {
       await dns.lookup(host);
     } catch {
-      log8.warn(
+      log9.warn(
         `${chalk2.yellow(host)} does not resolve in DNS yet.
   Check for typos \u2014 a bad domain will cause a 2-minute timeout at step 8.`
       );
-      const go = await confirm3({ message: "Continue anyway?", initialValue: true });
+      const go = await confirm2({ message: "Continue anyway?", initialValue: true });
       if (isCancel4(go) || !go) {
         cancel3("Setup cancelled.");
         process.exit(0);
@@ -1543,7 +1436,7 @@ async function runInit(options = {}) {
     try {
       const dir = findInstallDir();
       if (!dir) {
-        log8.error("No lead-routing.json found \u2014 run `lead-routing init` first.");
+        log9.error("No lead-routing.json found \u2014 run `lead-routing init` first.");
         process.exit(1);
       }
       const saved = readConfig(dir);
@@ -1555,7 +1448,7 @@ async function runInit(options = {}) {
         if (typeof pw === "symbol") process.exit(0);
         sshPassword = pw;
       }
-      log8.step("Connecting to server");
+      log9.step("Connecting to server");
       await ssh.connect({
         host: saved.ssh.host,
         port: saved.ssh.port,
@@ -1564,11 +1457,11 @@ async function runInit(options = {}) {
         password: sshPassword,
         remoteDir: saved.remoteDir
       });
-      log8.success(`Connected to ${saved.ssh.host}`);
+      log9.success(`Connected to ${saved.ssh.host}`);
       const remoteDir = await ssh.resolveHome(saved.remoteDir);
-      log8.step("Step 8/9  Verifying health");
+      log9.step("Step 8/9  Verifying health");
       await verifyHealth(saved.appUrl, saved.engineUrl, ssh, remoteDir);
-      log8.step("Step 9/9  Deploying Salesforce package");
+      log9.step("Step 9/9  Deploying Salesforce package");
       await sfdcDeployInline({
         appUrl: saved.appUrl,
         engineUrl: saved.engineUrl,
@@ -1592,7 +1485,7 @@ async function runInit(options = {}) {
       );
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      log8.error(`Resume failed: ${message}`);
+      log9.error(`Resume failed: ${message}`);
       process.exit(1);
     } finally {
       await ssh.disconnect();
@@ -1600,14 +1493,33 @@ async function runInit(options = {}) {
     return;
   }
   try {
-    log8.step("Step 1/9  Checking local prerequisites");
+    log9.step("Step 1/9  Checking local prerequisites");
     await checkPrerequisites();
-    log8.step("Step 2/9  Server connection");
-    const sshCfg = await collectSshConfig();
-    log8.step("Step 3/9  Configuration");
-    const cfg = await collectConfig();
+    log9.step("Step 2/9  SSH connection");
+    const sshCfg = await collectSshConfig({
+      sshPort: options.sshPort,
+      sshUser: options.sshUser,
+      sshKey: options.sshKey,
+      remoteDir: options.remoteDir
+    });
+    if (!dryRun) {
+      try {
+        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);
+      }
+    }
+    log9.step("Step 3/9  Configuration");
+    const cfg = await collectConfig({
+      sandbox: options.sandbox,
+      externalDb: options.externalDb,
+      externalRedis: options.externalRedis
+    });
     await checkDnsResolvable(cfg.appUrl, cfg.engineUrl);
-    log8.step("Step 4/9  Generating config files");
+    log9.step("Step 4/9  Generating config files");
     const { dir, adminSecret } = generateFiles(cfg, sshCfg);
     note4(
       `Local config directory: ${chalk2.cyan(dir)}
@@ -1624,22 +1536,21 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
       );
       return;
     }
-    log8.step("Step 5/9  Connecting to server");
-    await ssh.connect(sshCfg);
+    log9.step("Step 5/9  Remote setup");
     const remoteDir = await ssh.resolveHome(sshCfg.remoteDir);
     await checkRemotePrerequisites(ssh);
     await uploadFiles(ssh, dir, remoteDir);
-    log8.step("Step 6/9  Starting services");
+    log9.step("Step 6/9  Starting services");
     await startServices(ssh, remoteDir);
-    log8.step("Step 7/9  Database migrations");
+    log9.step("Step 7/9  Database migrations");
     await runMigrations(ssh, dir, cfg.adminEmail, cfg.adminPassword);
-    log8.step("Step 8/9  Verifying health");
+    log9.step("Step 8/9  Verifying health");
     await verifyHealth(cfg.appUrl, cfg.engineUrl, ssh, remoteDir);
-    log8.step("Step 9/9  Deploying Salesforce package");
+    log9.step("Step 9/9  Deploying Salesforce package");
     await sfdcDeployInline({
       appUrl: cfg.appUrl,
       engineUrl: cfg.engineUrl,
-      orgAlias: cfg.orgAlias,
+      orgAlias: "lead-routing",
       sfdcClientId: cfg.sfdcClientId,
       sfdcLoginUrl: cfg.sfdcLoginUrl,
       installDir: dir
@@ -1663,7 +1574,7 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
     );
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log8.error(`Setup failed: ${message}`);
+    log9.error(`Setup failed: ${message}`);
     process.exit(1);
   } finally {
     await ssh.disconnect();
@@ -1672,16 +1583,16 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
 
 // src/commands/deploy.ts
 import { writeFileSync as writeFileSync4, unlinkSync } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 import { tmpdir as tmpdir2 } from "os";
-import { intro as intro2, outro as outro2, log as log9, password as promptPassword2 } from "@clack/prompts";
+import { intro as intro2, outro as outro2, log as log10, password as promptPassword2 } from "@clack/prompts";
 import chalk3 from "chalk";
 async function runDeploy() {
   console.log();
   intro2(chalk3.bold.cyan("Lead Routing \u2014 Deploy"));
   const dir = findInstallDir();
   if (!dir) {
-    log9.error(
+    log10.error(
       "No lead-routing.json found. Run `lead-routing init` first, or run this command from your install directory."
     );
     process.exit(1);
@@ -1705,28 +1616,28 @@ async function runDeploy() {
       password: sshPassword,
       remoteDir: cfg.remoteDir
     });
-    log9.success(`Connected to ${cfg.ssh.host}`);
+    log10.success(`Connected to ${cfg.ssh.host}`);
   } catch (err) {
-    log9.error(`SSH connection failed: ${String(err)}`);
+    log10.error(`SSH connection failed: ${String(err)}`);
     process.exit(1);
   }
   try {
     const remoteDir = await ssh.resolveHome(cfg.remoteDir);
-    log9.step("Syncing Caddyfile");
+    log10.step("Syncing Caddyfile");
     const caddyContent = renderCaddyfile(cfg.appUrl, cfg.engineUrl);
-    const tmpCaddy = join6(tmpdir2(), "lead-routing-Caddyfile");
+    const tmpCaddy = join7(tmpdir2(), "lead-routing-Caddyfile");
     writeFileSync4(tmpCaddy, caddyContent, "utf8");
     await ssh.upload([{ local: tmpCaddy, remote: `${remoteDir}/Caddyfile` }]);
     unlinkSync(tmpCaddy);
     await ssh.exec("docker compose restart caddy", remoteDir);
-    log9.success("Caddyfile synced \u2014 waiting for TLS cert (~30s)");
-    log9.step("Pulling latest Docker images");
+    log10.success("Caddyfile synced \u2014 waiting for TLS cert (~30s)");
+    log10.step("Pulling latest Docker images");
     await ssh.exec("docker compose pull", remoteDir);
-    log9.success("Images pulled");
-    log9.step("Restarting services");
+    log10.success("Images pulled");
+    log10.step("Restarting services");
     await ssh.exec("docker compose up -d --remove-orphans", remoteDir);
-    log9.success("Services restarted");
-    log9.step("Running database migrations");
+    log10.success("Services restarted");
+    log10.step("Running database migrations");
     await runMigrations(ssh, dir);
     outro2(
       chalk3.green("\u2714  Deployment complete!") + `
@@ -1735,7 +1646,7 @@ async function runDeploy() {
     );
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
-    log9.error(`Deploy failed: ${message}`);
+    log10.error(`Deploy failed: ${message}`);
     process.exit(1);
   } finally {
     await ssh.disconnect();
@@ -1743,7 +1654,7 @@ async function runDeploy() {
 }
 
 // src/commands/doctor.ts
-import { intro as intro3, outro as outro3, log as log10 } from "@clack/prompts";
+import { intro as intro3, outro as outro3, log as log11 } from "@clack/prompts";
 import chalk4 from "chalk";
 import { execa as execa4 } from "execa";
 async function runDoctor() {
@@ -1751,7 +1662,7 @@ async function runDoctor() {
   intro3(chalk4.bold.cyan("Lead Routing \u2014 Health Check"));
   const dir = findInstallDir();
   if (!dir) {
-    log10.error("No lead-routing.json found. Run `lead-routing init` first.");
+    log11.error("No lead-routing.json found. Run `lead-routing init` first.");
     process.exit(1);
   }
   const cfg = readConfig(dir);
@@ -1834,17 +1745,17 @@ async function checkEndpoint(label, url) {
 }
 
 // src/commands/logs.ts
-import { log as log11 } from "@clack/prompts";
+import { log as log12 } from "@clack/prompts";
 import { execa as execa5 } from "execa";
 var VALID_SERVICES = ["web", "engine", "postgres", "redis"];
 async function runLogs(service = "engine") {
   if (!VALID_SERVICES.includes(service)) {
-    log11.error(`Unknown service "${service}". Valid options: ${VALID_SERVICES.join(", ")}`);
+    log12.error(`Unknown service "${service}". Valid options: ${VALID_SERVICES.join(", ")}`);
     process.exit(1);
   }
   const dir = findInstallDir();
   if (!dir) {
-    log11.error("No lead-routing.json found. Run `lead-routing init` first.");
+    log12.error("No lead-routing.json found. Run `lead-routing init` first.");
     process.exit(1);
   }
   console.log(`
@@ -1859,12 +1770,12 @@ Streaming logs for ${service} (Ctrl+C to stop)...
 }
 
 // src/commands/status.ts
-import { log as log12 } from "@clack/prompts";
+import { log as log13 } from "@clack/prompts";
 import { execa as execa6 } from "execa";
 async function runStatus() {
   const dir = findInstallDir();
   if (!dir) {
-    log12.error("No lead-routing.json found. Run `lead-routing init` first.");
+    log13.error("No lead-routing.json found. Run `lead-routing init` first.");
     process.exit(1);
   }
   const result = await execa6("docker", ["compose", "ps"], {
@@ -1873,15 +1784,15 @@ async function runStatus() {
     reject: false
   });
   if (result.exitCode !== 0) {
-    log12.error("Failed to get container status. Is Docker running?");
+    log13.error("Failed to get container status. Is Docker running?");
     process.exit(1);
   }
 }
 
 // src/commands/config.ts
 import { readFileSync as readFileSync5, writeFileSync as writeFileSync5, existsSync as existsSync5 } from "fs";
-import { join as join7 } from "path";
-import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner7, log as log13 } from "@clack/prompts";
+import { join as join8 } from "path";
+import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner7, log as log14 } from "@clack/prompts";
 import chalk5 from "chalk";
 import { execa as execa7 } from "execa";
 function parseEnv(filePath) {
@@ -1920,18 +1831,18 @@ async function runConfigSfdc() {
   intro4("Lead Routing \u2014 Update Salesforce Credentials");
   const dir = findInstallDir();
   if (!dir) {
-    log13.error("No lead-routing installation found in the current directory.");
-    log13.info("Run `lead-routing init` first, or cd into your installation directory.");
+    log14.error("No lead-routing installation found in the current directory.");
+    log14.info("Run `lead-routing init` first, or cd into your installation directory.");
     process.exit(1);
   }
-  const envWeb = join7(dir, ".env.web");
-  const envEngine = join7(dir, ".env.engine");
+  const envWeb = join8(dir, ".env.web");
+  const envEngine = join8(dir, ".env.engine");
   const currentWeb = parseEnv(envWeb);
   const currentClientId = currentWeb.get("SFDC_CLIENT_ID") ?? "";
   const currentLoginUrl = currentWeb.get("SFDC_LOGIN_URL") ?? "https://login.salesforce.com";
   const currentAppUrl = currentWeb.get("APP_URL") ?? "";
   const callbackUrl = `${currentAppUrl}/api/auth/callback`;
-  log13.info(
+  log14.info(
     `Paste the credentials from your Salesforce Connected App.
 Callback URL for your Connected App: ${callbackUrl}`
   );
@@ -1956,7 +1867,7 @@ Callback URL for your Connected App: ${callbackUrl}`
   };
   writeEnv(envWeb, updates);
   writeEnv(envEngine, updates);
-  log13.success("Updated .env.web and .env.engine");
+  log14.success("Updated .env.web and .env.engine");
   const s = spinner7();
   s.start("Restarting web and engine containers\u2026");
   try {
@@ -1966,7 +1877,7 @@ Callback URL for your Connected App: ${callbackUrl}`
     s.stop("Containers restarted");
   } catch (err) {
     s.stop("Restart failed \u2014 run `docker compose up -d --force-recreate web engine` manually");
-    log13.warn(String(err));
+    log14.warn(String(err));
   }
   outro4(
     "Salesforce credentials updated!\n\nNext: go to the web app \u2192 Settings \u2192 Connect Salesforce to refresh your OAuth tokens."
@@ -1978,7 +1889,7 @@ function runConfigShow() {
     console.error("No lead-routing installation found in the current directory.");
     process.exit(1);
   }
-  const envWeb = join7(dir, ".env.web");
+  const envWeb = join8(dir, ".env.web");
   const cfg = parseEnv(envWeb);
   const adminSecret = cfg.get("ADMIN_SECRET") ?? "(not found)";
   const appUrl = cfg.get("APP_URL") ?? "(not found)";
@@ -1994,7 +1905,7 @@ function runConfigShow() {
 }
 
 // src/commands/sfdc.ts
-import { intro as intro5, outro as outro5, text as text4, spinner as spinner8, log as log14 } from "@clack/prompts";
+import { intro as intro5, outro as outro5, text as text4, spinner as spinner8, log as log15 } from "@clack/prompts";
 import chalk6 from "chalk";
 import { execa as execa8 } from "execa";
 async function runSfdcDeploy() {
@@ -2006,9 +1917,9 @@ async function runSfdcDeploy() {
   if (config2?.appUrl && config2?.engineUrl) {
     appUrl = config2.appUrl;
     engineUrl = config2.engineUrl;
-    log14.info(`Using config from ${dir}/lead-routing.json`);
+    log15.info(`Using config from ${dir}/lead-routing.json`);
   } else {
-    log14.warn("No lead-routing.json found \u2014 enter the URLs from your installation.");
+    log15.warn("No lead-routing.json found \u2014 enter the URLs from your installation.");
     const rawApp = await text4({
       message: "App URL (e.g. https://leads.acme.com)",
       validate: (v) => !v ? "Required" : void 0
@@ -2029,7 +1940,7 @@ async function runSfdcDeploy() {
     s.stop("Salesforce CLI found");
   } catch {
     s.stop("Salesforce CLI (sf) not found");
-    log14.error(
+    log15.error(
       "Install the Salesforce CLI and re-run this command:\n  https://developer.salesforce.com/tools/salesforcecli"
     );
     process.exit(1);
@@ -2052,7 +1963,7 @@ async function runSfdcDeploy() {
       installDir: dir ?? void 0
     });
   } catch (err) {
-    log14.error(err instanceof Error ? err.message : String(err));
+    log15.error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   }
   await guideAppLauncherSetup(appUrl);
@@ -2066,7 +1977,17 @@ 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.command("init").description("Interactive setup wizard \u2014 configure and deploy the full Lead Routing stack").option("--dry-run", "Run the wizard and generate config files without starting Docker services").option("--resume", "Skip steps 1-7 and resume from health check using existing lead-routing.json").action((opts) => runInit({ dryRun: opts.dryRun, resume: opts.resume }));
+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,
+  sandbox: opts.sandbox,
+  sshPort: opts.sshPort,
+  sshUser: opts.sshUser,
+  sshKey: opts.sshKey,
+  remoteDir: opts.remoteDir,
+  externalDb: opts.externalDb,
+  externalRedis: opts.externalRedis
+}));
 program.command("deploy").description("Pull latest images, restart services, and run any pending migrations").action(runDeploy);
 program.command("doctor").description("Check the health of all services in your installation").action(runDoctor);
 program.command("logs [service]").description("Stream logs from a service (web, engine, postgres, redis). Defaults to engine.").action((service) => runLogs(service));

package/package.json

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