unity-hub-cli 0.15.0 → 0.16.0

package/dist/index.js

@@ -294,18 +294,28 @@ var MacExternalEditorPathReader = class {
     return { status: "found", path: configuredPath, name };
   }
 };
+var slnPreferringEditors = ["rider", "visual studio"];
+var prefersSlnFile = (editorPath) => {
+  const editorName = basename(editorPath, ".app").toLowerCase();
+  return slnPreferringEditors.some((name) => editorName.includes(name));
+};
 var MacExternalEditorLauncher = class {
   /**
    * Launches the external editor with the specified project root.
-   * If a .sln file exists with the project name, it will be opened directly.
-   * This allows Rider to open the solution without showing a selection dialog.
+   * For Rider/Visual Studio: opens .sln file directly if it exists.
+   * For VS Code/Cursor and others: opens the project folder.
    * @param editorPath - The path to the editor application.
    * @param projectRoot - The project root directory to open.
    */
   async launch(editorPath, projectRoot) {
-    const projectName = basename(projectRoot);
-    const slnFilePath = join3(projectRoot, `${projectName}.sln`);
-    const targetPath = existsSync(slnFilePath) ? slnFilePath : projectRoot;
+    let targetPath = projectRoot;
+    if (prefersSlnFile(editorPath)) {
+      const projectName = basename(projectRoot);
+      const slnFilePath = join3(projectRoot, `${projectName}.sln`);
+      if (existsSync(slnFilePath)) {
+        targetPath = slnFilePath;
+      }
+    }
     await execFileAsync("open", ["-a", editorPath, targetPath]);
   }
 };
@@ -316,14 +326,77 @@ import { constants as constants4, existsSync as existsSync2 } from "fs";
 import { access as access4 } from "fs/promises";
 import { basename as basename2, join as join4 } from "path";
 import { promisify as promisify2 } from "util";
+
+// src/presentation/utils/path.ts
+var homeDirectory = process.env.HOME ?? process.env.USERPROFILE ?? "";
+var normalizedHomeDirectory = homeDirectory.replace(/\\/g, "/");
+var homePrefix = normalizedHomeDirectory ? `${normalizedHomeDirectory}/` : "";
+var isGitBashEnvironment = () => {
+  if (process.platform !== "win32") {
+    return false;
+  }
+  return Boolean(process.env.MSYSTEM);
+};
+var getMsysDisabledEnv = () => {
+  if (!isGitBashEnvironment()) {
+    return process.env;
+  }
+  return {
+    ...process.env,
+    MSYS_NO_PATHCONV: "1",
+    MSYS2_ARG_CONV_EXCL: "*"
+  };
+};
+var shortenHomePath = (targetPath) => {
+  if (!normalizedHomeDirectory) {
+    return targetPath;
+  }
+  const normalizedTarget = targetPath.replace(/\\/g, "/");
+  if (normalizedTarget === normalizedHomeDirectory) {
+    return "~";
+  }
+  if (homePrefix && normalizedTarget.startsWith(homePrefix)) {
+    return `~/${normalizedTarget.slice(homePrefix.length)}`;
+  }
+  return targetPath;
+};
+var buildCdCommand = (targetPath) => {
+  if (process.platform === "win32") {
+    if (isGitBashEnvironment()) {
+      const msysPath = targetPath.replace(/^([A-Za-z]):[\\/]/, (_, drive) => `/${drive.toLowerCase()}/`).replace(/\\/g, "/");
+      const escapedForPosix2 = msysPath.replace(/'/g, "'\\''");
+      return `cd '${escapedForPosix2}'`;
+    }
+    const escapedForWindows = targetPath.replace(/"/g, '""');
+    return `cd "${escapedForWindows}"`;
+  }
+  const escapedForPosix = targetPath.replace(/'/g, "'\\''");
+  return `cd '${escapedForPosix}'`;
+};
+
+// src/infrastructure/externalEditor.win.ts
 var execFileAsync2 = promisify2(execFile2);
 var REGISTRY_PATH = "HKEY_CURRENT_USER\\Software\\Unity Technologies\\Unity Editor 5.x";
+var decodeRegBinary = (hex) => {
+  const bytes = [];
+  for (let i = 0; i < hex.length; i += 2) {
+    const byte = parseInt(hex.slice(i, i + 2), 16);
+    if (byte !== 0) {
+      bytes.push(byte);
+    }
+  }
+  return Buffer.from(bytes).toString("utf8");
+};
 var parseRegistryOutput = (stdout) => {
   const lines = stdout.split("\n");
   for (const line of lines) {
-    const match = line.match(/kScriptsDefaultApp[^\s]*\s+REG_SZ\s+(.+)/i);
-    if (match?.[1]) {
-      return match[1].trim();
+    const szMatch = line.match(/kScriptsDefaultApp[^\s]*\s+REG_SZ\s+(.+)/i);
+    if (szMatch?.[1]) {
+      return szMatch[1].trim();
+    }
+    const binaryMatch = line.match(/kScriptsDefaultApp[^\s]*\s+REG_BINARY\s+([0-9A-Fa-f]+)/i);
+    if (binaryMatch?.[1]) {
+      return decodeRegBinary(binaryMatch[1]);
     }
   }
   return void 0;
@@ -336,12 +409,11 @@ var WinExternalEditorPathReader = class {
   async read() {
     let configuredPath;
     try {
-      const result = await execFileAsync2("reg", [
-        "query",
-        REGISTRY_PATH,
-        "/v",
-        "kScriptsDefaultApp"
-      ]);
+      const result = await execFileAsync2(
+        "reg",
+        ["query", REGISTRY_PATH],
+        { env: getMsysDisabledEnv() }
+      );
       configuredPath = parseRegistryOutput(result.stdout);
     } catch {
       return { status: "not_configured" };
@@ -358,22 +430,33 @@ var WinExternalEditorPathReader = class {
     return { status: "found", path: configuredPath, name };
   }
 };
+var slnPreferringEditors2 = ["rider", "devenv", "visualstudio"];
+var prefersSlnFile2 = (editorPath) => {
+  const editorName = basename2(editorPath, ".exe").toLowerCase();
+  return slnPreferringEditors2.some((name) => editorName.includes(name));
+};
 var WinExternalEditorLauncher = class {
   /**
    * Launches the external editor with the specified project root.
-   * If a .sln file exists with the project name, it will be opened directly.
-   * This allows Rider to open the solution without showing a selection dialog.
+   * For Rider/Visual Studio: opens .sln file directly if it exists.
+   * For VS Code/Cursor and others: opens the project folder.
    * @param editorPath - The path to the editor executable.
    * @param projectRoot - The project root directory to open.
    */
   async launch(editorPath, projectRoot) {
-    const projectName = basename2(projectRoot);
-    const slnFilePath = join4(projectRoot, `${projectName}.sln`);
-    const targetPath = existsSync2(slnFilePath) ? slnFilePath : projectRoot;
+    let targetPath = projectRoot;
+    if (prefersSlnFile2(editorPath)) {
+      const projectName = basename2(projectRoot);
+      const slnFilePath = join4(projectRoot, `${projectName}.sln`);
+      if (existsSync2(slnFilePath)) {
+        targetPath = slnFilePath;
+      }
+    }
     await new Promise((resolve4, reject) => {
       const child = spawn(editorPath, [targetPath], {
         detached: true,
-        stdio: "ignore"
+        stdio: "ignore",
+        env: getMsysDisabledEnv()
       });
       const handleError = (error) => {
         child.off("spawn", handleSpawn);
@@ -478,7 +561,8 @@ var NodeProcessLauncher = class {
     await new Promise((resolve4, reject) => {
       const child = spawn2(command, args, {
         detached,
-        stdio: "ignore"
+        stdio: "ignore",
+        env: getMsysDisabledEnv()
       });
       const handleError = (error) => {
         child.off("spawn", handleSpawn);
@@ -1209,7 +1293,7 @@ var WinUnityProcessReader = class {
           "-Command",
           psCommand
         ],
-        { encoding: "utf8" }
+        { encoding: "utf8", env: getMsysDisabledEnv() }
       );
       stdout = (result.stdout ?? "").trim();
     } catch (error) {
@@ -1236,14 +1320,18 @@ var WinUnityProcessReader = class {
 var WinUnityProcessTerminator = class {
   async terminate(unityProcess) {
     try {
-      await execFileAsync5("powershell.exe", [
-        "-NoProfile",
-        "-NonInteractive",
-        "-ExecutionPolicy",
-        "Bypass",
-        "-Command",
-        `Stop-Process -Id ${unityProcess.pid}`
-      ]);
+      await execFileAsync5(
+        "powershell.exe",
+        [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          `Stop-Process -Id ${unityProcess.pid}`
+        ],
+        { env: getMsysDisabledEnv() }
+      );
     } catch (error) {
       if (!ensureProcessAlive2(unityProcess.pid)) {
         return { terminated: true, stage: "sigterm" };
@@ -1258,14 +1346,18 @@ var WinUnityProcessTerminator = class {
       }
     }
     try {
-      await execFileAsync5("powershell.exe", [
-        "-NoProfile",
-        "-NonInteractive",
-        "-ExecutionPolicy",
-        "Bypass",
-        "-Command",
-        `Stop-Process -Id ${unityProcess.pid} -Force`
-      ]);
+      await execFileAsync5(
+        "powershell.exe",
+        [
+          "-NoProfile",
+          "-NonInteractive",
+          "-ExecutionPolicy",
+          "Bypass",
+          "-Command",
+          `Stop-Process -Id ${unityProcess.pid} -Force`
+        ],
+        { env: getMsysDisabledEnv() }
+      );
     } catch (error) {
       if (!ensureProcessAlive2(unityProcess.pid)) {
         return { terminated: true, stage: "sigkill" };
@@ -1395,39 +1487,6 @@ var ThemeProvider = ({ theme, children }) => {
   return createElement(ThemeContext.Provider, { value }, children);
 };
 
-// src/presentation/utils/path.ts
-var homeDirectory = process.env.HOME ?? process.env.USERPROFILE ?? "";
-var normalizedHomeDirectory = homeDirectory.replace(/\\/g, "/");
-var homePrefix = normalizedHomeDirectory ? `${normalizedHomeDirectory}/` : "";
-var shortenHomePath = (targetPath) => {
-  if (!normalizedHomeDirectory) {
-    return targetPath;
-  }
-  const normalizedTarget = targetPath.replace(/\\/g, "/");
-  if (normalizedTarget === normalizedHomeDirectory) {
-    return "~";
-  }
-  if (homePrefix && normalizedTarget.startsWith(homePrefix)) {
-    return `~/${normalizedTarget.slice(homePrefix.length)}`;
-  }
-  return targetPath;
-};
-var buildCdCommand = (targetPath) => {
-  if (process.platform === "win32") {
-    const isGitBash = Boolean(process.env.MSYSTEM) || /bash/i.test(process.env.SHELL ?? "");
-    if (isGitBash) {
-      const windowsPath = targetPath;
-      const msysPath = windowsPath.replace(/^([A-Za-z]):[\\/]/, (_, drive) => `/${drive.toLowerCase()}/`).replace(/\\/g, "/");
-      const escapedForPosix2 = msysPath.replace(/'/g, "'\\''");
-      return `cd '${escapedForPosix2}'`;
-    }
-    const escapedForWindows = targetPath.replace(/"/g, '""');
-    return `cd "${escapedForWindows}"`;
-  }
-  const escapedForPosix = targetPath.replace(/'/g, "'\\''");
-  return `cd '${escapedForPosix}'`;
-};
-
 // src/presentation/components/ProjectRow.tsx
 import { Box as Box2, Text, useStdout } from "ink";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
@@ -1928,8 +1987,7 @@ var extractRootFolder2 = (repository) => {
   return base || void 0;
 };
 var minimumVisibleProjectCount = 4;
-var editorOnlyKey = process2.platform === "darwin" ? "\u2325o" : "Alt+o";
-var defaultHintMessage = `j/k Select \xB7 [o]pen [O]+Editor [${editorOnlyKey}]Editor [q]uit [r]efresh [c]opy [s]ort [v]isibility \xB7 ^C Exit`;
+var defaultHintMessage = `j/k Select \xB7 [o]pen [O]+Editor [i]de [q]uit [r]efresh [c]opy [s]ort [v]isibility \xB7 ^C Exit`;
 var getCopyTargetPath = (view) => {
   const root = view.repository?.root;
   return root && root.length > 0 ? root : view.project.path;
@@ -2481,7 +2539,7 @@ var App = ({
       void terminateSelected();
       return;
     }
-    if (input === "\xF8" || input === "o" && key.meta) {
+    if (input === "i") {
       void launchEditorOnly();
       return;
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "vitest run",
     "dev": "tsx src/index.ts",
     "build": "tsup",
     "start": "node dist/index.js",
@@ -55,6 +55,7 @@
     "prettier": "^3.6.2",
     "tsup": "^8.5.0",
     "tsx": "^4.20.6",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.14"
   }
 }