@lead-routing/cli 0.8.3 → 0.8.4

package/dist/index.js

@@ -112,38 +112,35 @@ function bail2(value) {
 async function collectConfig(opts = {}, authEmail, authPassword) {
   const crmType = opts.crmType ?? "salesforce";
   note2(
-    "You will need:\n  \u2022 Public HTTPS URLs for the web app and routing engine",
+    "You will need:\n  \u2022 A domain with wildcard DNS (*.acme.com) pointing to your server",
     "Before you begin"
   );
-  const appUrl = await text2({
-    message: "App URL (public URL where the web app will be accessible)",
-    placeholder: "https://routing.acme.com",
+  const domain = await text2({
+    message: "Your domain (we'll create app/api/evals/mcp subdomains):",
+    placeholder: "acme.com",
     validate: (v) => {
-      if (!v) return "Required";
-      try {
-        const u = new URL(v);
-        if (u.protocol !== "https:") return "Must be an HTTPS URL (required for Salesforce OAuth)";
-      } catch {
-        return "Must be a valid URL (e.g. https://routing.acme.com)";
-      }
+      if (!v?.trim()) return "Domain is required";
+      const clean = v.trim().replace(/^https?:\/\//, "").replace(/\/+$/, "");
+      if (!clean.includes(".")) return "Enter a valid domain (e.g. acme.com)";
     }
   });
-  if (isCancel2(appUrl)) bail2(appUrl);
-  const crmLabel = crmType === "hubspot" ? "HubSpot" : "Salesforce";
-  const engineUrl = await text2({
-    message: `Engine URL (public URL ${crmLabel} will use to route leads)`,
-    placeholder: "https://engine.acme.com  or  https://acme.com:3001",
-    validate: (v) => {
-      if (!v) return "Required";
-      try {
-        const u = new URL(v);
-        if (u.protocol !== "https:") return `Must be an HTTPS URL (${crmLabel} requires HTTPS)`;
-      } catch {
-        return "Must be a valid URL (e.g. https://engine.acme.com)";
-      }
-    }
-  });
-  if (isCancel2(engineUrl)) bail2(engineUrl);
+  if (isCancel2(domain)) bail2(domain);
+  const baseDomain = domain.trim().replace(/^https?:\/\//, "").replace(/\/+$/, "");
+  const appUrl = `https://app.${baseDomain}`;
+  const engineUrl = `https://api.${baseDomain}`;
+  const langfuseUrl = `https://evals.${baseDomain}`;
+  const mcpUrl = `https://mcp.${baseDomain}`;
+  note2(
+    [
+      `App:     ${appUrl}`,
+      `Engine:  ${engineUrl}`,
+      `Evals:   ${langfuseUrl}`,
+      `MCP:     ${mcpUrl}`,
+      "",
+      `Add this DNS record: *.${baseDomain} -> A -> <your server IP>`
+    ].join("\n"),
+    "URLs"
+  );
   const dbPassword = generateSecret(16);
   const managedDb = !opts.externalDb;
   const databaseUrl = opts.externalDb ?? `postgresql://leadrouting:${dbPassword}@postgres:5432/leadrouting`;
@@ -186,8 +183,11 @@ async function collectConfig(opts = {}, authEmail, authPassword) {
   const hubspotClientId = void 0;
   const hubspotClientSecret = void 0;
   return {
-    appUrl: appUrl.trim().replace(/\/+$/, ""),
-    engineUrl: engineUrl.trim().replace(/\/+$/, ""),
+    appUrl,
+    engineUrl,
+    baseDomain,
+    langfuseUrl,
+    mcpUrl,
     crmType,
     managedDb,
     databaseUrl,
@@ -294,9 +294,26 @@ function renderDockerCompose(c) {
     depends_on:
       postgres:
         condition: service_healthy
+` : "";
+  const mcpService = c.managedMcp ? `
+  mcp:
+    image: ghcr.io/atgatzby/lead-routing-mcp:latest
+    restart: unless-stopped
+    environment:
+      APP_URL: http://web:3000
+      ENGINE_URL: http://engine:3001
+      API_TOKEN: ${c.mcpApiToken ?? ""}
+      WEBHOOK_SECRET: ${c.mcpWebhookSecret ?? ""}
+      CRM_TYPE: ${c.mcpCrmType ?? "salesforce"}
+      PORT: "3100"
+      TRANSPORT: http
+    depends_on:
+      web:
+        condition: service_healthy
 ` : "";
   const caddyDeps = ["web", "engine"];
   if (c.managedLangfuse) caddyDeps.push("langfuse");
+  if (c.managedMcp) caddyDeps.push("mcp");
   const caddyService = `
   caddy:
     image: caddy:2-alpine
@@ -324,6 +341,7 @@ ${caddyDeps.map((d) => `      - ${d}`).join("\n")}
     webService.trimEnd(),
     engineService.trimEnd(),
     langfuseService.trimEnd(),
+    mcpService.trimEnd(),
     caddyService.trimEnd(),
     volumes
   ].filter(Boolean).join("\n");
@@ -443,68 +461,32 @@ function renderEnvEngine(c) {
 }
 
 // src/templates/caddy.ts
-function renderCaddyfile(appUrl, engineUrl, langfuseUrl) {
-  const appHost = new URL(appUrl).hostname;
-  const engineParsed = new URL(engineUrl);
+function renderCaddyfile(appUrlOrConfig, engineUrl, langfuseUrl) {
+  let config2;
+  if (typeof appUrlOrConfig === "string") {
+    config2 = { appUrl: appUrlOrConfig, engineUrl, langfuseUrl };
+  } else {
+    config2 = appUrlOrConfig;
+  }
+  const appHost = new URL(config2.appUrl).hostname;
+  const engineParsed = new URL(config2.engineUrl);
   const engineHost = engineParsed.hostname;
   const enginePort = engineParsed.port;
   let langfuseHostname = "";
-  if (langfuseUrl) {
+  if (config2.langfuseUrl) {
     try {
-      langfuseHostname = new URL(langfuseUrl).hostname;
+      langfuseHostname = new URL(config2.langfuseUrl).hostname;
     } catch {
     }
   }
-  const isSameDomain = engineHost === appHost;
-  if (isSameDomain && enginePort) {
-    return [
-      `# Lead Routing \u2014 Caddyfile`,
-      `# Generated by lead-routing CLI`,
-      `# Caddy auto-provisions SSL certificates via Let's Encrypt`,
-      ``,
-      `(security_headers) {`,
-      `  header {`,
-      `    X-Content-Type-Options nosniff`,
-      `    X-Frame-Options DENY`,
-      `    Referrer-Policy strict-origin-when-cross-origin`,
-      `    Permissions-Policy interest-cohort=()`,
-      `    Strict-Transport-Security "max-age=31536000; includeSubDomains"`,
-      `  }`,
-      `}`,
-      ``,
-      `${appHost} {`,
-      `  import security_headers`,
-      `  reverse_proxy web:3000 {`,
-      `    health_uri /api/health`,
-      `    health_interval 15s`,
-      `  }`,
-      `}`,
-      ``,
-      `${appHost}:${enginePort} {`,
-      `  import security_headers`,
-      `  reverse_proxy engine:3001 {`,
-      `    health_uri /health`,
-      `    health_interval 15s`,
-      `  }`,
-      `}`,
-      ...langfuseHostname ? [
-        ``,
-        `${langfuseHostname} {`,
-        `  import security_headers`,
-        `  reverse_proxy langfuse:3000`,
-        `}`
-      ] : [],
-      ``,
-      `# Marketing site \u2014 served independently`,
-      `openedgeai.tech {`,
-      `  import security_headers`,
-      `  root * /srv/marketing-site`,
-      `  file_server`,
-      `  try_files {path} /index.html`,
-      `}`
-    ].join("\n");
+  let mcpHostname = "";
+  if (config2.mcpEnabled && config2.mcpUrl) {
+    try {
+      mcpHostname = new URL(config2.mcpUrl).hostname;
+    } catch {
+    }
   }
-  return [
+  const header = [
     `# Lead Routing \u2014 Caddyfile`,
     `# Generated by lead-routing CLI`,
     `# Caddy auto-provisions SSL certificates via Let's Encrypt`,
@@ -517,7 +499,9 @@ function renderCaddyfile(appUrl, engineUrl, langfuseUrl) {
     `    Permissions-Policy interest-cohort=()`,
     `    Strict-Transport-Security "max-age=31536000; includeSubDomains"`,
     `  }`,
-    `}`,
+    `}`
+  ];
+  const appBlock = [
     ``,
     `${appHost} {`,
     `  import security_headers`,
@@ -525,22 +509,34 @@ function renderCaddyfile(appUrl, engineUrl, langfuseUrl) {
     `    health_uri /api/health`,
     `    health_interval 15s`,
     `  }`,
-    `}`,
+    `}`
+  ];
+  const engineAddress = engineHost === appHost && enginePort ? `${engineHost}:${enginePort}` : engineHost;
+  const engineBlock = [
     ``,
-    `${engineHost} {`,
+    `${engineAddress} {`,
     `  import security_headers`,
     `  reverse_proxy engine:3001 {`,
     `    health_uri /health`,
     `    health_interval 15s`,
     `  }`,
-    `}`,
-    ...langfuseHostname ? [
-      ``,
-      `${langfuseHostname} {`,
-      `  import security_headers`,
-      `  reverse_proxy langfuse:3000`,
-      `}`
-    ] : [],
+    `}`
+  ];
+  const langfuseBlock = langfuseHostname ? [
+    ``,
+    `${langfuseHostname} {`,
+    `  import security_headers`,
+    `  reverse_proxy langfuse:3000`,
+    `}`
+  ] : [];
+  const mcpBlock = mcpHostname ? [
+    ``,
+    `${mcpHostname} {`,
+    `  import security_headers`,
+    `  reverse_proxy mcp:3100`,
+    `}`
+  ] : [];
+  const marketingBlock = [
     ``,
     `# Marketing site \u2014 served independently`,
     `openedgeai.tech {`,
@@ -549,6 +545,14 @@ function renderCaddyfile(appUrl, engineUrl, langfuseUrl) {
     `  file_server`,
     `  try_files {path} /index.html`,
     `}`
+  ];
+  return [
+    ...header,
+    ...appBlock,
+    ...engineBlock,
+    ...langfuseBlock,
+    ...mcpBlock,
+    ...marketingBlock
   ].join("\n");
 }
 
@@ -602,12 +606,22 @@ function generateFiles(cfg, sshCfg, license = { licenseTier: "free" }, agentApi)
     managedLangfuse: !!agentApi,
     langfuseUrl: agentApi?.langfuseUrl,
     langfuseSecret: agentApi?.langfuseSecret,
-    langfuseSalt: agentApi?.langfuseSalt
+    langfuseSalt: agentApi?.langfuseSalt,
+    managedMcp: !!agentApi,
+    mcpWebhookSecret: cfg.engineWebhookSecret,
+    mcpCrmType: cfg.crmType
   });
   const composeFile = join2(dir, "docker-compose.yml");
   writeFileSync2(composeFile, composeContent, "utf8");
   log3.success("Generated docker-compose.yml");
-  const caddyfileContent = renderCaddyfile(cfg.appUrl, cfg.engineUrl, agentApi?.langfuseUrl);
+  const caddyfileContent = renderCaddyfile({
+    appUrl: cfg.appUrl,
+    engineUrl: cfg.engineUrl,
+    baseDomain: cfg.baseDomain,
+    langfuseUrl: agentApi ? cfg.langfuseUrl : void 0,
+    mcpEnabled: !!agentApi,
+    mcpUrl: cfg.mcpUrl
+  });
   writeFileSync2(join2(dir, "Caddyfile"), caddyfileContent, "utf8");
   log3.success("Generated Caddyfile");
   const envWebContent = renderEnvWeb({
@@ -650,6 +664,8 @@ function generateFiles(cfg, sshCfg, license = { licenseTier: "free" }, agentApi)
   writeConfig(dir, {
     appUrl: cfg.appUrl,
     engineUrl: cfg.engineUrl,
+    baseDomain: cfg.baseDomain,
+    mcpUrl: cfg.mcpUrl,
     crmType: cfg.crmType,
     installDir: dir,
     remoteDir: sshCfg.remoteDir,
@@ -1502,23 +1518,10 @@ Install URL: ${chalk2.cyan(MANAGED_PACKAGE_INSTALL_URL)}`,
       cancel3("Setup cancelled.");
       process.exit(0);
     }
-    let langfuseUrl = "";
+    let langfuseUrl = cfg.langfuseUrl;
     let langfuseSecret = "";
     let langfuseSalt = "";
     if (enableAgentApi) {
-      const appDomain = new URL(cfg.appUrl).hostname;
-      const baseDomain = appDomain.replace(/^app\d*\./, "");
-      const suggestedLangfuse = `evals.${baseDomain}`;
-      const lfUrl = await text3({
-        message: "Langfuse dashboard URL:",
-        initialValue: `https://${suggestedLangfuse}`,
-        placeholder: `https://${suggestedLangfuse}`
-      });
-      if (isCancel3(lfUrl)) {
-        cancel3("Setup cancelled.");
-        process.exit(0);
-      }
-      langfuseUrl = lfUrl.trim();
       langfuseSecret = generateSecret(32);
       langfuseSalt = generateSecret(16);
     }
@@ -1691,6 +1694,7 @@ Click "Connect HubSpot" to authorize the integration.`,
         const mcpDir = join5(homedir3(), ".lead-routing");
         mkdirSync3(mcpDir, { recursive: true });
         const mcpConfig = { appUrl: cfg.appUrl, engineUrl: cfg.engineUrl, webhookSecret, crmType: cfg.crmType || "salesforce" };
+        if (cfg.mcpUrl) mcpConfig.mcpUrl = cfg.mcpUrl;
         if (apiToken) mcpConfig.apiToken = apiToken;
         writeFileSync4(
           join5(mcpDir, "mcp.json"),
@@ -1709,18 +1713,21 @@ Click "Connect HubSpot" to authorize the integration.`,
 ` : `  ${chalk2.cyan("2.")} Go to Integrations \u2192 HubSpot \u2192 Connect
   ${chalk2.cyan("3.")} Authorize the HubSpot integration
 `;
-    const agentApiLines = enableAgentApi ? `  Langfuse dashboard: ${chalk2.cyan(langfuseUrl)}
-  MCP config:         ~/.lead-routing/mcp.json
+    const agentApiLines = enableAgentApi ? `  Evals:          ${chalk2.cyan(cfg.langfuseUrl)}
+  MCP:            ${chalk2.cyan(cfg.mcpUrl)}
+  MCP config:     ~/.lead-routing/mcp.json
+` : "";
+    const dnsLine = cfg.baseDomain ? `
+  DNS: Add ${chalk2.white(`*.${cfg.baseDomain}`)} -> A -> <server IP>
 ` : "";
     outro(
       chalk2.green("\u2714  You're live!") + `
 
   Dashboard:      ${chalk2.cyan(cfg.appUrl)}
-  Routing engine: ${chalk2.cyan(cfg.engineUrl)}
+  Engine:         ${chalk2.cyan(cfg.engineUrl)}
 ` + agentApiLines + `
   Admin email:    ${chalk2.white(cfg.adminEmail)}
-
-` + chalk2.bold("  Next steps:\n") + `  ${chalk2.cyan("1.")} Open ${chalk2.cyan(cfg.appUrl)} and log in
+` + dnsLine + "\n" + chalk2.bold("  Next steps:\n") + `  ${chalk2.cyan("1.")} Open ${chalk2.cyan(cfg.appUrl)} and log in
 ` + crmSteps + `  ${chalk2.cyan("4.")} Create your first routing rule
 
   Run ${chalk2.cyan("lead-routing doctor")} to check service health at any time.

package/package.json

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