unity-hub-cli 0.5.0 → 0.6.1

package/README.md

@@ -4,6 +4,8 @@
 
 A CLI tool that displays the same content as Unity Hub in an Ink-based TUI, allows navigation with arrow keys/`j`/`k`, and launches Unity Editor by pressing `o`.
 
+<img width="1678" height="1460" alt="スクリーンショット 2025-10-27 23 44 40" src="https://github.com/user-attachments/assets/db3cc995-820e-490b-a43b-393893197ab4" />
+
 ## Requirements
 
 - macOS

package/dist/index.js

@@ -347,11 +347,17 @@ var UnityHubProjectsReader = class {
 };
 
 // src/infrastructure/unityLock.ts
+import { execFile } from "child_process";
 import { constants as constants2, createReadStream, createWriteStream } from "fs";
 import { access as access2, rm } from "fs/promises";
 import { join as join3 } from "path";
 import readline from "readline";
+import { promisify } from "util";
 var RAW_PROMPT_MESSAGE = "Delete UnityLockfile and continue? Type 'y' to continue; anything else aborts: ";
+var execFileAsync = promisify(execFile);
+var buildBringToFrontScript = (pid) => {
+  return `tell application "System Events" to set frontmost of (first process whose unix id is ${pid}) to true`;
+};
 var isRawModeSupported = () => {
   const stdin = process.stdin;
   return Boolean(stdin?.isTTY && typeof stdin.setRawMode === "function" && process.stdout.isTTY);
@@ -462,7 +468,18 @@ var pathExists = async (target) => {
   }
 };
 var UnityLockChecker = class {
+  constructor(unityProcessReader) {
+    this.unityProcessReader = unityProcessReader;
+  }
   async check(projectPath) {
+    const activeProcess = await this.unityProcessReader.findByProjectPath(projectPath);
+    if (activeProcess) {
+      console.log(
+        `Unity process already running for project: ${activeProcess.projectPath} (PID: ${activeProcess.pid})`
+      );
+      await this.bringUnityToFront(activeProcess.pid);
+      return "skip";
+    }
     const lockfilePath = join3(projectPath, "Temp", "UnityLockfile");
     const hasLockfile = await pathExists(lockfilePath);
     if (!hasLockfile) {
@@ -479,6 +496,18 @@ var UnityLockChecker = class {
     console.log("Deleted UnityLockfile. Continuing launch.");
     return "allow";
   }
+  async bringUnityToFront(pid) {
+    if (process.platform !== "darwin") {
+      return;
+    }
+    try {
+      const script = buildBringToFrontScript(pid);
+      await execFileAsync("osascript", ["-e", script]);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.error(`Failed to bring Unity to front: ${message}`);
+    }
+  }
 };
 var UnityLockStatusReader = class {
   async isLocked(projectPath) {
@@ -488,12 +517,12 @@ var UnityLockStatusReader = class {
 };
 
 // src/infrastructure/unityProcess.ts
-import { execFile } from "child_process";
+import { execFile as execFile2 } from "child_process";
 import { resolve as resolve2 } from "path";
-import { promisify } from "util";
-var execFileAsync = promisify(execFile);
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile2);
 var UNITY_EXECUTABLE_PATTERN = /Unity\.app\/Contents\/MacOS\/Unity/i;
-var PROJECT_PATH_PATTERN = /-(?:projectPath|projectpath)\s+("[^"]+"|'[^']+'|[^\s"']+)/i;
+var PROJECT_PATH_PATTERN = /-(?:projectPath|projectpath)(?:=|\s+)("[^"]+"|'[^']+'|[^\s"']+)/i;
 var PROCESS_LIST_ARGS = ["-axo", "pid=,command=", "-ww"];
 var PROCESS_LIST_COMMAND = "ps";
 var TERMINATE_TIMEOUT_MILLIS = 5e3;
@@ -565,7 +594,7 @@ var MacUnityProcessReader = class {
   async listUnityProcesses() {
     let stdout;
     try {
-      const result = await execFileAsync(PROCESS_LIST_COMMAND, PROCESS_LIST_ARGS);
+      const result = await execFileAsync2(PROCESS_LIST_COMMAND, PROCESS_LIST_ARGS);
       stdout = result.stdout;
     } catch (error) {
       throw new Error(`Failed to retrieve Unity process list: ${error instanceof Error ? error.message : String(error)}`);
@@ -820,8 +849,7 @@ var App = ({
       }
       const borderRows = 2;
       const hintRows = 1;
-      const hintMarginRows = 1;
-      const reservedRows = borderRows + hintRows + hintMarginRows;
+      const reservedRows = borderRows + hintRows;
       const availableRows = stdout.rows - reservedRows;
       const rowsPerProject = Math.max(linesPerProject, 1);
       const calculatedCount = Math.max(
@@ -1148,7 +1176,7 @@ var App = ({
   ]);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", children: rows.length === 0 ? /* @__PURE__ */ jsx(Text, { children: "No Unity Hub projects were found." }) : rows }),
-    /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(Text, { children: hint }) })
+    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { children: hint }) })
   ] });
 };
 
@@ -1158,6 +1186,7 @@ var bootstrap = async () => {
   const unityHubReader = new UnityHubProjectsReader();
   const gitRepositoryInfoReader = new GitRepositoryInfoReader();
   const lockStatusReader = new UnityLockStatusReader();
+  const unityProcessReader = new MacUnityProcessReader();
   const listProjectsUseCase = new ListProjectsUseCase(
     unityHubReader,
     gitRepositoryInfoReader,
@@ -1166,8 +1195,7 @@ var bootstrap = async () => {
   );
   const editorPathResolver = new MacEditorPathResolver();
   const processLauncher = new NodeProcessLauncher();
-  const lockChecker = new UnityLockChecker();
-  const unityProcessReader = new MacUnityProcessReader();
+  const lockChecker = new UnityLockChecker(unityProcessReader);
   const unityProcessTerminator = new MacUnityProcessTerminator();
   const unityTempDirectoryCleaner = new UnityTempDirectoryCleaner();
   const launchProjectUseCase = new LaunchProjectUseCase(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unity-hub-cli",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "A CLI tool that reads Unity Hub's projects and launches Unity Editor with an interactive TUI",
   "main": "dist/index.js",
   "scripts": {