@uipath/rpa-tool 0.9.2 → 0.9.3

package/dist/tool.js

@@ -61025,7 +61025,7 @@ var {
 // package.json
 var package_default = {
   name: "@uipath/rpa-tool",
-  version: "0.9.2",
+  version: "0.9.3",
   description: "Tool for creating and managing UiPath RPA projects",
   keywords: [
     "uipcli-tool",
@@ -61238,7 +61238,7 @@ init_dist();
 // src/commands/packager/packager-shared.ts
 init_dist();
 import { existsSync as existsSync5 } from "node:fs";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 
 // node_modules/@uipath/tool-workflowcompiler/dist/index.js
 init_dist2();
@@ -61894,7 +61894,7 @@ class WorkflowCompilerToolFactory {
 toolsFactoryRepository.registerProjectToolFactory(new WorkflowCompilerToolFactory);
 
 // src/resolution/helm-config.ts
-var DEFAULT_HELM_VERSION = "0.9.2";
+var DEFAULT_HELM_VERSION = "0.9.3";
 var helmConfig = {
   helmVersion: DEFAULT_HELM_VERSION
 };
@@ -61903,7 +61903,7 @@ var helmConfig = {
 import { spawn as spawn3 } from "node:child_process";
 import { existsSync as existsSync3, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { homedir as homedir3, tmpdir as tmpdir3 } from "node:os";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 
 // src/resolution/resolver-deps.ts
 import { execFileSync as execFileSync5, spawn as spawn2 } from "node:child_process";
@@ -62690,6 +62690,72 @@ var STUDIO_EXE = "UiPath.Studio.exe";
 var HELM_EXE = process.platform === "win32" ? "UiPath.Studio.Helm.exe" : "UiPath.Studio.Helm";
 var HELM_INTEROP_MANIFEST = "helm-interop-manifest.json";
 
+// src/resolution/robot-bin-resolver.ts
+import { join as join4 } from "node:path";
+var ROBOT_SERVICE_DLL = "UiPath.Service.NetCoreHost.dll";
+var MACOS_ASSISTANT_ROBOT_PATH = "/Applications/UiPath Assistant.app/Contents/Robot";
+var REGISTRY_HIVES = [
+  "HKCU\\Software\\UiPath\\UiPath Studio",
+  "HKLM\\Software\\UiPath\\UiPath Studio"
+];
+function queryRegistryRobotDir(deps) {
+  for (const hive of REGISTRY_HIVES) {
+    try {
+      const output = deps.executeCommand("reg", [
+        "query",
+        hive,
+        "/v",
+        "InstallDir"
+      ]);
+      const match = output.match(/InstallDir\s+REG_SZ\s+(.+)/);
+      if (match)
+        return match[1].trim();
+    } catch {}
+  }
+  return;
+}
+function resolveRobotDir(cliPath, deps) {
+  if (cliPath) {
+    deps.log(`Using --robot-dir: ${cliPath}`);
+    return cliPath;
+  }
+  const envPath = process.env.UIPATH_ROBOT_DIR;
+  if (envPath) {
+    deps.log(`Using UIPATH_ROBOT_DIR: ${envPath}`);
+    return envPath;
+  }
+  if (process.platform === "win32") {
+    const dir = queryRegistryRobotDir(deps);
+    if (dir) {
+      deps.log(`Resolved robot dir from registry: ${dir}`);
+      return dir;
+    }
+  }
+  if (process.platform === "darwin") {
+    if (deps.fileExists(join4(MACOS_ASSISTANT_ROBOT_PATH, ROBOT_SERVICE_DLL))) {
+      deps.log(`Found robot at well-known path: ${MACOS_ASSISTANT_ROBOT_PATH}`);
+      return MACOS_ASSISTANT_ROBOT_PATH;
+    }
+  }
+  deps.log("Robot dir not resolved — Robot must already be running");
+  return null;
+}
+function resolveBundledDotnet(robotDir, deps) {
+  if (!robotDir)
+    return;
+  const exePath = process.platform === "win32" ? join4(robotDir, "dotnet.exe") : join4(robotDir, "dotnet", "dotnet");
+  if (!deps.fileExists(exePath))
+    return;
+  const dotnetRoot = process.platform === "win32" ? robotDir : join4(robotDir, "dotnet");
+  return {
+    exePath,
+    env: {
+      DOTNET_ROOT: dotnetRoot,
+      DOTNET_MULTILEVEL_LOOKUP: "0"
+    }
+  };
+}
+
 // src/resolution/helm-nuget-resolver.ts
 var RESTORE_HEARTBEAT_INTERVAL_MS = 15000;
 var HELM_PACKAGE_PREFIX = "UiPath.Studio.Helm";
@@ -62751,20 +62817,22 @@ function getNuGetGlobalPackagesDir() {
   const envPath = process.env.NUGET_PACKAGES;
   if (envPath && existsSync3(envPath))
     return envPath;
-  return join4(homedir3(), ".nuget", "packages");
+  return join5(homedir3(), ".nuget", "packages");
 }
 function findCachedHelmPackage(packageId, version) {
   const packagesDir = getNuGetGlobalPackagesDir();
-  const packageDir = join4(packagesDir, packageId.toLowerCase(), version, "tools");
-  if (existsSync3(join4(packageDir, HELM_INTEROP_MANIFEST))) {
+  const packageDir = join5(packagesDir, packageId.toLowerCase(), version, "tools");
+  if (existsSync3(join5(packageDir, HELM_INTEROP_MANIFEST))) {
     return packageDir;
   }
   return null;
 }
-function spawnWithHeartbeat(command, args, heartbeatMessage) {
+function spawnWithHeartbeat(command, args, heartbeatMessage, env) {
   return new Promise((resolve2, reject) => {
+    const spawnEnv = env ? { ...process.env, ...env } : undefined;
     const child = spawn3(command, args, {
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      env: spawnEnv
     });
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -62800,8 +62868,17 @@ function spawnWithHeartbeat(command, args, heartbeatMessage) {
     });
   });
 }
+function isDotnetOnSystemPath(deps) {
+  const probeCmd = process.platform === "win32" ? "where" : "which";
+  try {
+    const result = deps.executeCommand(probeCmd, ["dotnet"]);
+    return result.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
 async function restoreHelmPackage(packageId, version, deps, nugetSource) {
-  const tempDir = mkdtempSync(join4(tmpdir3(), "helm-nuget-"));
+  const tempDir = mkdtempSync(join5(tmpdir3(), "helm-nuget-"));
   try {
     const projectContent = `<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
@@ -62811,21 +62888,39 @@ async function restoreHelmPackage(packageId, version, deps, nugetSource) {
     <PackageReference Include="${packageId}" Version="${version}" />
   </ItemGroup>
 </Project>`;
-    const projectPath = join4(tempDir, "HelmRestore.csproj");
+    const projectPath = join5(tempDir, "HelmRestore.csproj");
     writeFileSync(projectPath, projectContent, "utf-8");
-    const nugetConfigPath = join4(tempDir, "nuget.config");
+    const nugetConfigPath = join5(tempDir, "nuget.config");
     writeFileSync(nugetConfigPath, buildHelmNuGetConfigXml(version), "utf-8");
     const args = ["restore", projectPath, "--verbosity", "quiet"];
     if (nugetSource) {
       args.push("--source", nugetSource);
     }
+    let dotnetCmd;
+    let dotnetEnv;
+    if (isDotnetOnSystemPath(deps)) {
+      dotnetCmd = "dotnet";
+      dotnetEnv = undefined;
+      deps.log("Using system dotnet on PATH for restore");
+    } else {
+      const bundled = resolveBundledDotnet(resolveRobotDir(undefined, deps), deps);
+      if (bundled) {
+        dotnetCmd = bundled.exePath;
+        dotnetEnv = bundled.env;
+        deps.log(`System dotnet not on PATH; using bundled dotnet: ${bundled.exePath}`);
+      } else {
+        dotnetCmd = "dotnet";
+        dotnetEnv = undefined;
+        deps.log("No dotnet found on PATH and no bundled dotnet detected — restore will likely fail");
+      }
+    }
     const feedSummary = describeRestoreFeeds(version, nugetSource);
-    deps.log(`Restoring Helm NuGet package: dotnet ${args.join(" ")}`);
+    deps.log(`Restoring Helm NuGet package: ${dotnetCmd} ${args.join(" ")}`);
     for (const line of feedSummary) {
       deps.log(`  feed: ${line}`);
     }
     try {
-      await spawnWithHeartbeat("dotnet", args, `still restoring ${packageId}@${version}…`);
+      await spawnWithHeartbeat(dotnetCmd, args, `still restoring ${packageId}@${version}…`, dotnetEnv);
     } catch (err2) {
       const baseMessage = err2 instanceof Error ? err2.message : String(err2);
       const feedsBlock = feedSummary.map((l) => `  - ${l}`).join(`
@@ -62847,7 +62942,7 @@ ${hint}`);
 async function resolveHelmFromNuGet(version, deps, nugetSource) {
   const localDir = process.env.HELM_LOCAL_DIR;
   if (localDir) {
-    const helmExePath2 = join4(localDir, HELM_EXE);
+    const helmExePath2 = join5(localDir, HELM_EXE);
     if (existsSync3(helmExePath2)) {
       deps.log(`Using local Helm from HELM_LOCAL_DIR: ${localDir}`);
       return { toolsDir: localDir, helmExePath: helmExePath2 };
@@ -62872,7 +62967,7 @@ async function resolveHelmFromNuGet(version, deps, nugetSource) {
 `);
     deps.log(`Helm package restored to: ${toolsDir}`);
   }
-  const helmExePath = join4(toolsDir, HELM_EXE);
+  const helmExePath = join5(toolsDir, HELM_EXE);
   if (!existsSync3(helmExePath)) {
     throw new Error(`Helm binary not found at ${helmExePath} after NuGet restore. ` + "The package may be corrupt or incomplete.");
   }
@@ -62894,7 +62989,7 @@ async function resolveWorkflowCompiler() {
       log: (msg) => logger.debug(msg)
     };
     const { toolsDir } = await resolveHelmFromNuGet(helmVersion, deps);
-    const compilerPath = join6(toolsDir, WORKFLOW_COMPILER_EXE);
+    const compilerPath = join7(toolsDir, WORKFLOW_COMPILER_EXE);
     if (existsSync5(compilerPath)) {
       logger.debug(`Using WorkflowCompiler from Helm NuGet package: ${compilerPath}`);
       return compilerPath;
@@ -63089,7 +63184,7 @@ function registerPackCommand(program3) {
 init_dist();
 import { mkdtempSync as mkdtempSync2 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
-import { isAbsolute as isAbsolute3, join as join7, relative as relative3, resolve as resolve3 } from "node:path";
+import { isAbsolute as isAbsolute3, join as join8, relative as relative3, resolve as resolve3 } from "node:path";
 function isWithinOrEqual(parent, candidate) {
   const norm = process.platform === "win32" ? (p) => p.toLowerCase() : (p) => p;
   const rel = relative3(norm(resolve3(parent)), norm(resolve3(candidate)));
@@ -63111,7 +63206,7 @@ function registerRestoreCommand(program3) {
       label: "Restore",
       hint: "Check project path and NuGet configuration.",
       execute: async (packager, options) => {
-        options.outputPath = outputPath ?? mkdtempSync2(join7(tmpdir5(), "rpa-tool-restore-"));
+        options.outputPath = outputPath ?? mkdtempSync2(join8(tmpdir5(), "rpa-tool-restore-"));
         return packager.restoreProjectAsync(options);
       }
     });
@@ -63435,7 +63530,7 @@ function filterByBackend(instances, preference) {
   }
 }
 // src/resolution/studio-bin-resolver.ts
-import { dirname as dirname3, join as join8 } from "node:path";
+import { dirname as dirname3, join as join9 } from "node:path";
 function getProcessExecutablePath(pid, deps) {
   const exePath = deps.executeCommand("powershell", [
     "-NoProfile",
@@ -63444,7 +63539,7 @@ function getProcessExecutablePath(pid, deps) {
   ]);
   return dirname3(exePath);
 }
-var REGISTRY_HIVES = [
+var REGISTRY_HIVES2 = [
   "HKCU\\Software\\UiPath\\UiPath Studio",
   "HKLM\\Software\\UiPath\\UiPath Studio"
 ];
@@ -63463,7 +63558,7 @@ function queryRegistryHive(hive, deps) {
   }
 }
 function queryRegistryInstallDir(deps) {
-  for (const hive of REGISTRY_HIVES) {
+  for (const hive of REGISTRY_HIVES2) {
     const dir = queryRegistryHive(hive, deps);
     if (dir)
       return dir;
@@ -63506,7 +63601,7 @@ function getStudioFileVersion(binDir, deps) {
     return "unknown";
   }
   try {
-    const exePath = join8(binDir, STUDIO_EXE);
+    const exePath = join9(binDir, STUDIO_EXE);
     const raw = deps.executeCommand("powershell", [
       "-NoProfile",
       "-Command",
@@ -63519,7 +63614,7 @@ function getStudioFileVersion(binDir, deps) {
   }
 }
 function readManifest(binDir, filename, deps) {
-  const manifestPath = join8(binDir, filename);
+  const manifestPath = join9(binDir, filename);
   try {
     const content = deps.readFile(manifestPath);
     return JSON.parse(content);
@@ -63532,7 +63627,7 @@ function readInteropManifest(binDir, deps) {
   return readManifest(binDir, INTEROP_MANIFEST, deps);
 }
 function validateInteropSupport(binDir, deps) {
-  const manifestPath = join8(binDir, INTEROP_MANIFEST);
+  const manifestPath = join9(binDir, INTEROP_MANIFEST);
   if (!deps.fileExists(manifestPath)) {
     const version = getStudioFileVersion(binDir, deps);
     throw new Error(`Studio ${version} does not support rpa-tool. Please upgrade to the latest version of UiPath Studio.`);
@@ -63541,59 +63636,6 @@ function validateInteropSupport(binDir, deps) {
 
 // src/resolution/studio-startup.ts
 import { join as join10 } from "node:path";
-
-// src/resolution/robot-bin-resolver.ts
-import { join as join9 } from "node:path";
-var ROBOT_SERVICE_DLL = "UiPath.Service.NetCoreHost.dll";
-var MACOS_ASSISTANT_ROBOT_PATH = "/Applications/UiPath Assistant.app/Contents/Robot";
-var REGISTRY_HIVES2 = [
-  "HKCU\\Software\\UiPath\\UiPath Studio",
-  "HKLM\\Software\\UiPath\\UiPath Studio"
-];
-function queryRegistryRobotDir(deps) {
-  for (const hive of REGISTRY_HIVES2) {
-    try {
-      const output = deps.executeCommand("reg", [
-        "query",
-        hive,
-        "/v",
-        "InstallDir"
-      ]);
-      const match = output.match(/InstallDir\s+REG_SZ\s+(.+)/);
-      if (match)
-        return match[1].trim();
-    } catch {}
-  }
-  return;
-}
-function resolveRobotDir(cliPath, deps) {
-  if (cliPath) {
-    deps.log(`Using --robot-dir: ${cliPath}`);
-    return cliPath;
-  }
-  const envPath = process.env.UIPATH_ROBOT_DIR;
-  if (envPath) {
-    deps.log(`Using UIPATH_ROBOT_DIR: ${envPath}`);
-    return envPath;
-  }
-  if (process.platform === "win32") {
-    const dir = queryRegistryRobotDir(deps);
-    if (dir) {
-      deps.log(`Resolved robot dir from registry: ${dir}`);
-      return dir;
-    }
-  }
-  if (process.platform === "darwin") {
-    if (deps.fileExists(join9(MACOS_ASSISTANT_ROBOT_PATH, ROBOT_SERVICE_DLL))) {
-      deps.log(`Found robot at well-known path: ${MACOS_ASSISTANT_ROBOT_PATH}`);
-      return MACOS_ASSISTANT_ROBOT_PATH;
-    }
-  }
-  deps.log("Robot dir not resolved — Robot must already be running");
-  return null;
-}
-
-// src/resolution/studio-startup.ts
 async function waitForInstanceAvailability(processId, deps, timeoutMs = DEFAULT_TIMEOUT_MS) {
   const deadline = Date.now() + timeoutMs;
   let pollCount = 0;
@@ -63653,19 +63695,6 @@ async function startStudioAndWait(binDir, deps, timeoutMs = DEFAULT_TIMEOUT_MS)
   }
   throw new Error(`Studio did not become ready within ${timeoutMs / 1000}s after ${pollCount} polls. ` + "Check that UiPath.Studio.exe can start successfully.");
 }
-function resolveBundledDotnetEnv(robotDir, deps) {
-  if (!robotDir)
-    return;
-  const dotnetExePath = process.platform === "win32" ? join10(robotDir, "dotnet.exe") : join10(robotDir, "dotnet", "dotnet");
-  if (!deps.fileExists(dotnetExePath))
-    return;
-  const dotnetRoot = process.platform === "win32" ? robotDir : join10(robotDir, "dotnet");
-  deps.log(`Bundled dotnet found in Robot dir, setting DOTNET_ROOT=${dotnetRoot}`);
-  return {
-    DOTNET_ROOT: dotnetRoot,
-    DOTNET_MULTILEVEL_LOOKUP: "0"
-  };
-}
 async function startHelmAndWait(deps, timeoutMs = DEFAULT_TIMEOUT_MS, options) {
   let extraArgs = [...options.extraArgs ?? []];
   const existingPids = new Set(deps.discoverInstances().instances.map((i3) => i3.processId));
@@ -63675,7 +63704,11 @@ async function startHelmAndWait(deps, timeoutMs = DEFAULT_TIMEOUT_MS, options) {
     extraArgs = ["--robot-dir", robotDir, ...extraArgs];
     deps.log(`Robot dir resolved: ${robotDir}`);
   }
-  const helmEnv = resolveBundledDotnetEnv(robotDir, deps);
+  const bundledDotnet = resolveBundledDotnet(robotDir, deps);
+  const helmEnv = bundledDotnet?.env;
+  if (bundledDotnet) {
+    deps.log(`Bundled dotnet found in Robot dir, setting DOTNET_ROOT=${bundledDotnet.env.DOTNET_ROOT}`);
+  }
   const exePath = options.helmExePath;
   deps.log(`Using NuGet-resolved Helm: ${exePath}`);
   deps.log(`Starting Helm: ${exePath}${extraArgs.length ? ` ${extraArgs.join(" ")}` : ""}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uipath/rpa-tool",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Tool for creating and managing UiPath RPA projects",
   "keywords": [
     "uipcli-tool",