@lead-routing/cli 0.4.0 → 0.4.2

package/dist/index.js

@@ -6,6 +6,8 @@ import { Command } from "commander";
 // src/commands/init.ts
 import { promises as dns } from "dns";
 import { readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
+import { exec } from "child_process";
+import { platform } from "os";
 import { join as join4 } from "path";
 import { intro, outro, note as note3, log as log7, confirm, cancel as cancel3, isCancel as isCancel3, password as promptPassword } from "@clack/prompts";
 import chalk from "chalk";
@@ -111,7 +113,7 @@ function bail2(value) {
 }
 async function collectConfig(opts = {}) {
   note2(
-    "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",
+    "You will need:\n  \u2022 Public HTTPS URLs for the web app and routing engine",
     "Before you begin"
   );
   const appUrl = await text2({
@@ -142,33 +144,6 @@ async function collectConfig(opts = {}) {
     }
   });
   if (isCancel2(engineUrl)) bail2(engineUrl);
-  const callbackUrl = `${appUrl.trim().replace(/\/+$/, "")}/api/auth/sfdc/callback`;
-  note2(
-    `You need a Salesforce Connected App. If you haven't created one yet:
-
-  1. Go to Salesforce Setup \u2192 App Manager \u2192 New Connected App
-  2. Connected App Name: Lead Routing
-  3. Check "Enable OAuth Settings"
-  4. Callback URL (copy exactly \u2014 must match):
-       ${callbackUrl}
-  5. Selected Scopes: api  \u2022  refresh_token, offline_access
-  6. Check "Require Secret for Web Server Flow"
-  7. Save \u2014 wait ~2 min, then click "Manage Consumer Details"
-  8. Copy the Consumer Key (Client ID) and Consumer Secret below`,
-    "Salesforce Connected App setup"
-  );
-  const sfdcClientId = await text2({
-    message: 'Consumer Key (labelled "Client ID" in newer orgs)',
-    placeholder: "3MVG9...",
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (isCancel2(sfdcClientId)) bail2(sfdcClientId);
-  const sfdcClientSecret = await password2({
-    message: 'Consumer Secret (labelled "Client Secret" in newer orgs)',
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (isCancel2(sfdcClientSecret)) bail2(sfdcClientSecret);
-  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`;
@@ -200,9 +175,6 @@ async function collectConfig(opts = {}) {
   return {
     appUrl: appUrl.trim().replace(/\/+$/, ""),
     engineUrl: engineUrl.trim().replace(/\/+$/, ""),
-    sfdcClientId: sfdcClientId.trim(),
-    sfdcClientSecret: sfdcClientSecret.trim(),
-    sfdcLoginUrl,
     managedDb,
     databaseUrl,
     dbPassword: managedDb ? dbPassword : "",
@@ -360,12 +332,6 @@ function renderEnvWeb(c) {
     `# Redis`,
     `REDIS_URL=${c.redisUrl}`,
     ``,
-    `# Salesforce OAuth`,
-    `SFDC_CLIENT_ID=${c.sfdcClientId}`,
-    `SFDC_CLIENT_SECRET=${c.sfdcClientSecret}`,
-    `SFDC_LOGIN_URL=${c.sfdcLoginUrl}`,
-    `SFDC_REDIRECT_URI=${c.appUrl.replace(/\/+$/, "")}/api/auth/sfdc/callback`,
-    ``,
     `# Session`,
     `SESSION_SECRET=${c.sessionSecret}`,
     ``,
@@ -400,11 +366,6 @@ function renderEnvEngine(c) {
     `# Redis`,
     `REDIS_URL=${c.redisUrl}`,
     ``,
-    `# Salesforce OAuth`,
-    `SFDC_CLIENT_ID=${c.sfdcClientId}`,
-    `SFDC_CLIENT_SECRET=${c.sfdcClientSecret}`,
-    `SFDC_LOGIN_URL=${c.sfdcLoginUrl}`,
-    ``,
     `# Webhook`,
     `ENGINE_WEBHOOK_SECRET=${c.engineWebhookSecret}`,
     ``,
@@ -544,9 +505,6 @@ function generateFiles(cfg, sshCfg) {
     publicEngineUrl: cfg.engineUrl,
     databaseUrl: cfg.databaseUrl,
     redisUrl: cfg.redisUrl,
-    sfdcClientId: cfg.sfdcClientId,
-    sfdcClientSecret: cfg.sfdcClientSecret,
-    sfdcLoginUrl: cfg.sfdcLoginUrl,
     sessionSecret: cfg.sessionSecret,
     engineWebhookSecret: cfg.engineWebhookSecret,
     adminSecret: cfg.adminSecret,
@@ -562,9 +520,6 @@ function generateFiles(cfg, sshCfg) {
   const envEngineContent = renderEnvEngine({
     databaseUrl: cfg.databaseUrl,
     redisUrl: cfg.redisUrl,
-    sfdcClientId: cfg.sfdcClientId,
-    sfdcClientSecret: cfg.sfdcClientSecret,
-    sfdcLoginUrl: cfg.sfdcLoginUrl,
     engineWebhookSecret: cfg.engineWebhookSecret,
     internalApiKey: cfg.internalApiKey
   });
@@ -587,9 +542,6 @@ function generateFiles(cfg, sshCfg) {
       db: cfg.managedDb,
       redis: cfg.managedRedis
     },
-    // Stored so `lead-routing sfdc deploy` can re-authenticate without re-prompting
-    sfdcClientId: cfg.sfdcClientId,
-    sfdcLoginUrl: cfg.sfdcLoginUrl,
     engineWebhookSecret: cfg.engineWebhookSecret,
     installedAt: (/* @__PURE__ */ new Date()).toISOString(),
     version: getCliVersion()
@@ -1050,6 +1002,11 @@ ${result.stderr || result.stdout}`
 };
 
 // src/commands/init.ts
+var MANAGED_PACKAGE_INSTALL_URL = "https://login.salesforce.com/packaging/installPackage.apexp?p0=04tgL000000CTnp";
+function openBrowser(url) {
+  const cmd = platform() === "darwin" ? "open" : "xdg-open";
+  exec(`${cmd} ${JSON.stringify(url)}`);
+}
 async function checkDnsResolvable(appUrl, engineUrl) {
   let hosts;
   try {
@@ -1108,26 +1065,9 @@ async function runInit(options = {}) {
       });
       log7.success(`Connected to ${saved.ssh.host}`);
       const remoteDir = await ssh.resolveHome(saved.remoteDir);
-      log7.step("Step 7/7  Verifying health");
+      log7.step("Verifying health");
       await verifyHealth(saved.appUrl, saved.engineUrl, ssh, remoteDir);
-      note3(
-        `Open ${saved.appUrl} \u2192 Integrations \u2192 Salesforce to connect your CRM and deploy the package.`,
-        "Next: Connect Salesforce"
-      );
-      outro(
-        chalk.green("\u2714  You're live!") + `
-
-  Dashboard:      ${chalk.cyan(saved.appUrl)}
-  Routing engine: ${chalk.cyan(saved.engineUrl)}
-
-` + chalk.bold("  Next steps:\n") + `  ${chalk.cyan("1.")} Open ${chalk.cyan(saved.appUrl)} and log in
-  ${chalk.cyan("2.")} Go to Integrations \u2192 Salesforce to connect your org
-  ${chalk.cyan("3.")} Deploy the package and configure routing objects
-  ${chalk.cyan("4.")} Create your first routing rule
-
-  Run ${chalk.cyan("lead-routing doctor")} to check service health at any time.
-  Run ${chalk.cyan("lead-routing deploy")} to update to a new version.`
-      );
+      outro(chalk.green("\u2714  Services are healthy!"));
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       log7.error(`Resume failed: ${message}`);
@@ -1138,9 +1078,33 @@ async function runInit(options = {}) {
     return;
   }
   try {
-    log7.step("Step 1/7  Checking local prerequisites");
+    log7.step("Step 1/8  Install Salesforce Package");
+    note3(
+      `The Lead Router managed package installs the required Connected App,
+triggers, and custom objects in your Salesforce org.
+
+Install URL: ${chalk.cyan(MANAGED_PACKAGE_INSTALL_URL)}`,
+      "Salesforce Package"
+    );
+    log7.info("Opening install URL in your browser...");
+    openBrowser(MANAGED_PACKAGE_INSTALL_URL);
+    log7.info(`${chalk.dim("If the browser didn't open, visit the URL above manually.")}`);
+    const installed = await confirm({
+      message: 'Have you installed the package? (Click "Install for All Users" in Salesforce)',
+      initialValue: false
+    });
+    if (isCancel3(installed)) {
+      cancel3("Setup cancelled.");
+      process.exit(0);
+    }
+    if (!installed) {
+      log7.warn("You can install the package later from Integrations \u2192 Salesforce in the web app.");
+    } else {
+      log7.success("Salesforce package installed");
+    }
+    log7.step("Step 2/8  Checking local prerequisites");
     await checkPrerequisites();
-    log7.step("Step 2/7  SSH connection");
+    log7.step("Step 3/8  SSH connection");
     const sshCfg = await collectSshConfig({
       sshPort: options.sshPort,
       sshUser: options.sshUser,
@@ -1157,14 +1121,13 @@ async function runInit(options = {}) {
         process.exit(1);
       }
     }
-    log7.step("Step 3/7  Configuration");
+    log7.step("Step 4/8  Configuration");
     const cfg = await collectConfig({
-      sandbox: options.sandbox,
       externalDb: options.externalDb,
       externalRedis: options.externalRedis
     });
     await checkDnsResolvable(cfg.appUrl, cfg.engineUrl);
-    log7.step("Step 4/7  Generating config files");
+    log7.step("Step 5/8  Generating config files");
     const { dir, adminSecret } = generateFiles(cfg, sshCfg);
     note3(
       `Local config directory: ${chalk.cyan(dir)}
@@ -1181,13 +1144,13 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
       );
       return;
     }
-    log7.step("Step 5/7  Remote setup");
+    log7.step("Step 6/8  Remote setup");
     const remoteDir = await ssh.resolveHome(sshCfg.remoteDir);
     await checkRemotePrerequisites(ssh);
     await uploadFiles(ssh, dir, remoteDir);
-    log7.step("Step 6/7  Starting services");
+    log7.step("Step 7/8  Starting services");
     await startServices(ssh, remoteDir);
-    log7.step("Step 7/7  Verifying health");
+    log7.step("Step 8/8  Verifying health");
     await verifyHealth(cfg.appUrl, cfg.engineUrl, ssh, remoteDir);
     try {
       const envWebPath = join4(dir, ".env.web");
@@ -1198,7 +1161,8 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
     } catch {
     }
     note3(
-      `Open ${cfg.appUrl} \u2192 Integrations \u2192 Salesforce to connect your CRM and deploy the package.`,
+      `Open ${cfg.appUrl} \u2192 Integrations \u2192 Salesforce to connect your org.
+The managed package is already installed \u2014 just click "Connect Salesforce" to authorize.`,
       "Next: Connect Salesforce"
     );
     outro(
@@ -1212,8 +1176,8 @@ Files created: docker-compose.yml, Caddyfile, .env.web, .env.engine, lead-routin
                   ${chalk.dim("run `lead-routing config show` to retrieve later")}
 
 ` + chalk.bold("  Next steps:\n") + `  ${chalk.cyan("1.")} Open ${chalk.cyan(cfg.appUrl)} and log in
-  ${chalk.cyan("2.")} Go to Integrations \u2192 Salesforce to connect your org
-  ${chalk.cyan("3.")} Deploy the package and configure routing objects
+  ${chalk.cyan("2.")} Go to Integrations \u2192 Salesforce \u2192 Connect
+  ${chalk.cyan("3.")} Complete the onboarding wizard in Salesforce
   ${chalk.cyan("4.")} Create your first routing rule
 
   Run ${chalk.cyan("lead-routing doctor")} to check service health at any time.
@@ -1437,9 +1401,8 @@ async function runStatus() {
 // src/commands/config.ts
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync5, existsSync as existsSync3 } from "fs";
 import { join as join6 } from "path";
-import { intro as intro4, outro as outro4, text as text3, password as password3, spinner as spinner5, log as log12 } from "@clack/prompts";
+import { intro as intro4, outro as outro4, log as log12 } from "@clack/prompts";
 import chalk4 from "chalk";
-import { execa as execa4 } from "execa";
 function parseEnv(filePath) {
   const map = /* @__PURE__ */ new Map();
   if (!existsSync3(filePath)) return map;
@@ -1452,81 +1415,18 @@ function parseEnv(filePath) {
   }
   return map;
 }
-function writeEnv(filePath, updates) {
-  const lines = existsSync3(filePath) ? readFileSync4(filePath, "utf8").split("\n") : [];
-  const updated = /* @__PURE__ */ new Set();
-  const result = lines.map((line) => {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) return line;
-    const eq = trimmed.indexOf("=");
-    if (eq === -1) return line;
-    const key = trimmed.slice(0, eq);
-    if (key in updates) {
-      updated.add(key);
-      return `${key}=${updates[key]}`;
-    }
-    return line;
-  });
-  for (const [key, val] of Object.entries(updates)) {
-    if (!updated.has(key)) result.push(`${key}=${val}`);
-  }
-  writeFileSync5(filePath, result.join("\n"), "utf8");
-}
 async function runConfigSfdc() {
-  intro4("Lead Routing \u2014 Update Salesforce Credentials");
+  intro4("Lead Routing \u2014 Salesforce Configuration");
   const dir = findInstallDir();
   if (!dir) {
     log12.error("No lead-routing installation found in the current directory.");
     log12.info("Run `lead-routing init` first, or cd into your installation directory.");
     process.exit(1);
   }
-  const envWeb = join6(dir, ".env.web");
-  const envEngine = join6(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`;
   log12.info(
-    `Paste the credentials from your Salesforce Connected App.
-Callback URL for your Connected App: ${callbackUrl}`
-  );
-  const clientId = await text3({
-    message: "Consumer Key (Client ID)",
-    initialValue: currentClientId,
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (clientId === null || typeof clientId === "symbol") {
-    process.exit(0);
-  }
-  const clientSecret = await password3({
-    message: "Consumer Secret (Client Secret)",
-    validate: (v) => !v ? "Required" : void 0
-  });
-  if (clientSecret === null || typeof clientSecret === "symbol") {
-    process.exit(0);
-  }
-  const updates = {
-    SFDC_CLIENT_ID: clientId,
-    SFDC_CLIENT_SECRET: clientSecret
-  };
-  writeEnv(envWeb, updates);
-  writeEnv(envEngine, updates);
-  log12.success("Updated .env.web and .env.engine");
-  const s = spinner5();
-  s.start("Restarting web and engine containers\u2026");
-  try {
-    await execa4("docker", ["compose", "up", "-d", "--force-recreate", "web", "engine"], {
-      cwd: dir
-    });
-    s.stop("Containers restarted");
-  } catch (err) {
-    s.stop("Restart failed \u2014 run `docker compose up -d --force-recreate web engine` manually");
-    log12.warn(String(err));
-  }
-  outro4(
-    "Salesforce credentials updated!\n\nNext: go to the web app \u2192 Settings \u2192 Connect Salesforce to refresh your OAuth tokens."
+    "Salesforce credentials are now managed automatically via the managed package.\nNo manual configuration is needed.\n\nIf you need to reconnect Salesforce, go to the web app \u2192 Settings \u2192 Connect Salesforce."
   );
+  outro4("No changes needed.");
 }
 function runConfigShow() {
   const dir = findInstallDir();
@@ -1538,19 +1438,16 @@ function runConfigShow() {
   const cfg = parseEnv(envWeb);
   const adminSecret = cfg.get("ADMIN_SECRET") ?? "(not found)";
   const appUrl = cfg.get("APP_URL") ?? "(not found)";
-  const sfdcClientId = cfg.get("SFDC_CLIENT_ID") ?? "(not found)";
   console.log();
   console.log(chalk4.bold("Lead Routing \u2014 Installation Config"));
   console.log();
   console.log(`  Admin panel:   ${chalk4.cyan(appUrl + "/admin")}`);
   console.log(`  Admin secret:  ${chalk4.yellow(adminSecret)}`);
   console.log();
-  console.log(`  SFDC Client ID: ${chalk4.white(sfdcClientId)}`);
-  console.log();
 }
 
 // src/commands/sfdc.ts
-import { intro as intro5, outro as outro5, text as text4, log as log15 } from "@clack/prompts";
+import { intro as intro5, outro as outro5, text as text3, log as log15 } from "@clack/prompts";
 import chalk6 from "chalk";
 
 // src/steps/sfdc-deploy-inline.ts
@@ -1559,7 +1456,7 @@ import { join as join8, dirname as dirname2 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { execSync } from "child_process";
-import { spinner as spinner6, log as log13 } from "@clack/prompts";
+import { spinner as spinner5, log as log13 } from "@clack/prompts";
 
 // src/utils/sfdc-api.ts
 var API_VERSION = "v59.0";
@@ -1680,9 +1577,9 @@ Content-Type: application/zip\r
       body
     });
     if (!res.ok) {
-      const text5 = await res.text();
+      const text4 = await res.text();
       throw new Error(
-        `Metadata deploy request failed (${res.status}): ${text5}`
+        `Metadata deploy request failed (${res.status}): ${text4}`
       );
     }
     const result = await res.json();
@@ -1699,9 +1596,9 @@ Content-Type: application/zip\r
       const url = `${this.baseUrl}/metadata/deployRequest/${deployId}?includeDetails=true`;
       const res = await fetch(url, { headers: this.headers() });
       if (!res.ok) {
-        const text5 = await res.text();
+        const text4 = await res.text();
         throw new Error(
-          `Deploy status check failed (${res.status}): ${text5}`
+          `Deploy status check failed (${res.status}): ${text4}`
         );
       }
       const data = await res.json();
@@ -1842,7 +1739,7 @@ function patchXml(content, tag, value) {
 }
 async function sfdcDeployInline(params) {
   const { appUrl, engineUrl, installDir } = params;
-  const s = spinner6();
+  const s = spinner5();
   const { accessToken, instanceUrl } = await loginViaAppBridge(appUrl);
   const sf = new SalesforceApi(instanceUrl, accessToken);
   s.start("Copying Salesforce package\u2026");
@@ -1985,7 +1882,7 @@ ${failureMsg || result.errorMessage || "Unknown error"}`
 }
 async function loginViaAppBridge(rawAppUrl) {
   const appUrl = rawAppUrl.replace(/\/+$/, "");
-  const s = spinner6();
+  const s = spinner5();
   s.start("Starting Salesforce authentication via your Lead Router app\u2026");
   let sessionId;
   let authUrl;
@@ -2107,20 +2004,20 @@ async function runSfdcDeploy() {
     log15.info(`Using config from ${dir}/lead-routing.json`);
   } else {
     log15.warn("No lead-routing.json found \u2014 enter the URLs from your installation.");
-    const rawApp = await text4({
+    const rawApp = await text3({
       message: "App URL (e.g. https://leads.acme.com)",
       validate: (v) => !v ? "Required" : void 0
     });
     if (typeof rawApp === "symbol") process.exit(0);
     appUrl = rawApp.trim();
-    const rawEngine = await text4({
+    const rawEngine = await text3({
       message: "Engine URL (e.g. https://engine.acme.com or https://acme.com:3001)",
       validate: (v) => !v ? "Required" : void 0
     });
     if (typeof rawEngine === "symbol") process.exit(0);
     engineUrl = rawEngine.trim();
   }
-  const alias = await text4({
+  const alias = await text3({
     message: "Salesforce org alias (used to log in)",
     placeholder: "lead-routing",
     initialValue: "lead-routing",
@@ -2132,9 +2029,6 @@ async function runSfdcDeploy() {
       appUrl,
       engineUrl,
       orgAlias: alias,
-      // Read from config if available
-      sfdcClientId: config2?.sfdcClientId ?? "",
-      sfdcLoginUrl: config2?.sfdcLoginUrl ?? "https://login.salesforce.com",
       installDir: dir ?? void 0,
       webhookSecret: config2?.engineWebhookSecret
     });
@@ -2241,10 +2135,9 @@ async function runUninstall() {
 // 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.13");
-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({
+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("--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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lead-routing/cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Self-hosted deployment CLI for Lead Routing",
   "homepage": "https://github.com/lead-routing/lead-routing",
   "keywords": [
@@ -12,7 +12,7 @@
   ],
   "type": "module",
   "bin": {
-    "lead-routing": "./dist/index.js"
+    "lead-routing": "dist/index.js"
   },
   "engines": {
     "node": ">=20"