@lead-routing/cli 0.1.0 → 0.1.2

package/dist/index.js

@@ -902,8 +902,15 @@ function getTunneledDbUrl(localDir, localPort) {
 }
 function findPrismaBin() {
   const candidates = [
+    // npx / npm global install: @lead-routing/cli is nested under the scope dir,
+    // so prisma lands 3 levels above dist/ in node_modules/.bin/
+    // e.g. ~/.npm/_npx/HASH/node_modules/.bin/prisma
+    path.join(__dirname, "../../../.bin/prisma"),
+    path.join(__dirname, "../../../prisma/bin/prisma.js"),
+    // Fallback: prisma nested inside the package's own node_modules (hoisted install)
     path.join(__dirname, "../node_modules/.bin/prisma"),
     path.join(__dirname, "../node_modules/prisma/bin/prisma.js"),
+    // Monorepo dev paths
     path.resolve("packages/db/node_modules/.bin/prisma"),
     path.resolve("node_modules/.bin/prisma"),
     path.resolve("node_modules/.pnpm/node_modules/.bin/prisma")
@@ -1043,18 +1050,26 @@ async function sfdcDeployInline(params) {
     { reject: false }
   );
   const alreadyAuthed = authCheck === 0;
+  let sfCredEnv = {};
+  let targetOrgArgs = ["--target-org", orgAlias];
   if (alreadyAuthed) {
     log6.success("Using existing Salesforce authentication");
   } else {
-    await loginViaAppBridge(appUrl, orgAlias);
+    const { accessToken, instanceUrl, aliasStored } = await loginViaAppBridge(appUrl, orgAlias);
+    sfCredEnv = { SF_ACCESS_TOKEN: accessToken, SF_ORG_INSTANCE_URL: instanceUrl };
+    if (!aliasStored) {
+      targetOrgArgs = [];
+    }
   }
   s.start("Copying Salesforce package\u2026");
-  const bundledPkg = join5(__dirname2, "..", "sfdc-package");
+  const inDist = join5(__dirname2, "sfdc-package");
+  const nextToDist = join5(__dirname2, "..", "sfdc-package");
+  const bundledPkg = existsSync4(inDist) ? inDist : nextToDist;
   const destPkg = join5(installDir ?? tmpdir(), "lead-routing-sfdc-package");
   if (!existsSync4(bundledPkg)) {
     s.stop("sfdc-package not found in CLI bundle");
     throw new Error(
-      `Expected bundle at: ${bundledPkg}
+      `Expected bundle at: ${inDist}
 The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
     );
   }
@@ -1104,8 +1119,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   try {
     await execa3(
       "sf",
-      ["project", "deploy", "start", "--target-org", orgAlias, "--source-dir", "force-app"],
-      { cwd: destPkg, stdio: "inherit" }
+      ["project", "deploy", "start", ...targetOrgArgs, "--source-dir", "force-app"],
+      { cwd: destPkg, stdio: "inherit", env: { ...process.env, ...sfCredEnv } }
     );
     s.stop("Package deployed");
   } catch (err) {
@@ -1122,8 +1137,8 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
   try {
     await execa3(
       "sf",
-      ["org", "assign", "permset", "--name", "LeadRouterAdmin", "--target-org", orgAlias],
-      { stdio: "inherit" }
+      ["org", "assign", "permset", "--name", "LeadRouterAdmin", ...targetOrgArgs],
+      { stdio: "inherit", env: { ...process.env, ...sfCredEnv } }
     );
     s.stop("Permission set assigned \u2014 Lead Router Setup will appear in the App Launcher");
   } catch (err) {
@@ -1145,12 +1160,11 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
       const qr = await execa3("sf", [
         "data",
         "query",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--query",
         "SELECT Id FROM Routing_Settings__c LIMIT 1",
         "--json"
-      ]);
+      ], { env: { ...process.env, ...sfCredEnv } });
       const parsed = JSON.parse(qr.stdout);
       existingId = parsed?.result?.records?.[0]?.Id;
     } catch {
@@ -1160,27 +1174,25 @@ The CLI may need to be reinstalled: npm i -g @lead-routing/cli`
         "data",
         "update",
         "record",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--sobject",
         "Routing_Settings__c",
         "--record-id",
         existingId,
         "--values",
         `App_Url__c='${appUrl}' Engine_Endpoint__c='${engineUrl}'`
-      ], { stdio: "inherit" });
+      ], { stdio: "inherit", env: { ...process.env, ...sfCredEnv } });
     } else {
       await execa3("sf", [
         "data",
         "create",
         "record",
-        "--target-org",
-        orgAlias,
+        ...targetOrgArgs,
         "--sobject",
         "Routing_Settings__c",
         "--values",
         `App_Url__c='${appUrl}' Engine_Endpoint__c='${engineUrl}'`
-      ], { stdio: "inherit" });
+      ], { stdio: "inherit", env: { ...process.env, ...sfCredEnv } });
     }
     s.stop("Org settings written");
   } catch (err) {
@@ -1252,17 +1264,20 @@ Ensure the app is running and the URL is correct.`
     );
   }
   s.stop("Authenticated with Salesforce");
+  let aliasStored = false;
   try {
     await execa3(
       "sf",
       ["org", "login", "access-token", "--instance-url", instanceUrl, "--alias", orgAlias, "--no-prompt"],
-      { input: accessToken + "\n" }
+      { env: { ...process.env, SFDX_ACCESS_TOKEN: accessToken } }
     );
     log6.success(`Salesforce org saved as "${orgAlias}"`);
+    aliasStored = true;
   } catch (err) {
-    log6.warn(`Could not store sf CLI credentials: ${String(err)}`);
-    log6.info("Re-authenticate manually if deploy commands fail: sf org login web");
+    log6.warn(`Could not persist sf CLI credentials: ${String(err)}`);
+    log6.info("Continuing with direct token auth for this session.");
   }
+  return { accessToken, instanceUrl, aliasStored };
 }
 
 // src/steps/app-launcher-guide.ts

package/dist/sfdc-package/force-app/main/default/remoteSiteSettings/LeadRouterApp.remoteSite-meta.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RemoteSiteSetting xmlns="http://soap.sforce.com/2006/04/metadata">
+    <description>Lead Router App URL — patched by lead-routing sfdc deploy</description>
+    <disableProtocolSecurity>false</disableProtocolSecurity>
+    <isActive>true</isActive>
+    <url>https://app.example.com</url>
+</RemoteSiteSetting>

package/package.json

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