@rudderhq/cli 0.1.0-canary.8 → 0.1.0-canary.9

package/dist/index.js

@@ -7938,16 +7938,36 @@ function detectPersistentCliState(options = {}) {
 function installPersistentCli(options) {
   const spawnSyncImpl = options.spawnSyncImpl ?? spawnSync;
   const command = `npm install --global ${options.installSpec}`;
-  const result = spawnSyncImpl(process.platform === "win32" ? "npm.cmd" : "npm", ["install", "--global", options.installSpec], {
+  const initialResult = runNpmGlobalInstall(spawnSyncImpl, ["install", "--global", options.installSpec]);
+  const initialOutput = collectSpawnOutput(initialResult);
+  if (initialResult.status === 0 || !isRudderBinConflict(initialOutput)) {
+    return {
+      ok: initialResult.status === 0,
+      command,
+      output: initialOutput
+    };
+  }
+  const forcedCommand = `npm install --global --force ${options.installSpec}`;
+  const forcedResult = runNpmGlobalInstall(spawnSyncImpl, ["install", "--global", "--force", options.installSpec]);
+  const forcedOutput = collectSpawnOutput(forcedResult);
+  return {
+    ok: forcedResult.status === 0,
+    command: forcedCommand,
+    output: forcedOutput || initialOutput
+  };
+}
+function runNpmGlobalInstall(spawnSyncImpl, args) {
+  return spawnSyncImpl(process.platform === "win32" ? "npm.cmd" : "npm", args, {
     encoding: "utf8",
     stdio: ["inherit", "pipe", "pipe"]
   });
-  const output = [result.stdout, result.stderr].filter((value) => typeof value === "string" && value.trim().length > 0).join("\n").trim();
-  return {
-    ok: result.status === 0,
-    command,
-    output
-  };
+}
+function collectSpawnOutput(result) {
+  return [result.stdout, result.stderr].filter((value) => typeof value === "string" && value.trim().length > 0).join("\n").trim();
+}
+function isRudderBinConflict(output) {
+  const normalized = output.toLowerCase().replaceAll("\\", "/");
+  return normalized.includes("eexist") && (normalized.includes(`/${CLI_BIN_NAME}`) || normalized.includes(`/${CLI_BIN_NAME}.cmd`) || normalized.includes(`/${CLI_BIN_NAME}.ps1`));
 }
 var CLI_NPM_PACKAGE_NAME, CLI_BIN_NAME;
 var init_install = __esm({
@@ -19514,7 +19534,7 @@ var DATA_DIR_OPTION_HELP = "Rudder data directory root (isolates state from ~/.r
 var LOCAL_ENV_OPTION_HELP = "Local environment profile (dev, prod_local, e2e)";
 function createProgram() {
   const program = new Command();
-  program.name("rudder").description("Rudder CLI \u2014 setup, diagnose, and configure your instance").version("0.1.0-canary.8");
+  program.name("rudder").description("Rudder CLI \u2014 setup, diagnose, and configure your instance").version("0.1.0-canary.9");
   program.option("--local-env <name>", LOCAL_ENV_OPTION_HELP);
   program.hook("preAction", (_thisCommand, actionCommand) => {
     const options = actionCommand.optsWithGlobals();