launch-unity 0.13.0 → 0.14.0

package/dist/index.d.ts

@@ -3,5 +3,5 @@
  * Exports core functions for programmatic usage.
  * Uses lib.ts which has no CLI side effects.
  */
-export { LaunchOptions, LaunchResolvedOptions, UnityProcessInfo, parseArgs, findUnityProjectBfs, getUnityVersion, launch, findRunningUnityProcess, focusUnityProcess, killRunningUnity, handleStaleLockfile, ensureProjectEntryAndUpdate, updateLastModifiedIfExists, } from './lib.js';
+export { LaunchOptions, LaunchResolvedOptions, UnityProcessInfo, parseArgs, findUnityProjectBfs, getUnityVersion, launch, findRunningUnityProcess, focusUnityProcess, killRunningUnity, quitRunningUnity, handleStaleLockfile, ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs, } from './lib.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAEhB,SAAS,EACT,mBAAmB,EACnB,eAAe,EACf,MAAM,EACN,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,aAAa,EACb,qBAAqB,EACrB,gBAAgB,EAEhB,SAAS,EACT,mBAAmB,EACnB,eAAe,EACf,MAAM,EACN,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC1B,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,MAAM,UAAU,CAAC"}

package/dist/index.js

@@ -5,4 +5,4 @@
  */
 export { 
 // Functions
-parseArgs, findUnityProjectBfs, getUnityVersion, launch, findRunningUnityProcess, focusUnityProcess, killRunningUnity, handleStaleLockfile, ensureProjectEntryAndUpdate, updateLastModifiedIfExists, } from './lib.js';
+parseArgs, findUnityProjectBfs, getUnityVersion, launch, findRunningUnityProcess, focusUnityProcess, killRunningUnity, quitRunningUnity, handleStaleLockfile, ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs, } from './lib.js';

package/dist/launch.d.ts

@@ -6,6 +6,7 @@ export type LaunchOptions = {
     unityArgs: string[];
     searchMaxDepth: number;
     restart: boolean;
+    quit: boolean;
     addUnityHub: boolean;
     favoriteUnityHub: boolean;
 };
@@ -25,6 +26,7 @@ export declare function findRunningUnityProcess(projectPath: string): Promise<Un
 export declare function focusUnityProcess(pid: number): Promise<void>;
 export declare function handleStaleLockfile(projectPath: string): Promise<void>;
 export declare function killRunningUnity(projectPath: string): Promise<void>;
+export declare function quitRunningUnity(projectPath: string): Promise<void>;
 export declare function findUnityProjectBfs(rootDir: string, maxDepth: number): string | undefined;
 export declare function launch(opts: LaunchResolvedOptions): Promise<void>;
 //# sourceMappingURL=launch.d.ts.map

package/dist/launch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../src/launch.ts"],"names":[],"mappings":";AAeA,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAyJF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CAqHvD;AAyCD,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAe3D;AA2ND,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAIxG;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlE;AA4CD,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB5E;AAiCD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBzE;AAgDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqDzF;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCvE"}
+{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../src/launch.ts"],"names":[],"mappings":";AAeA,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAyJF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CA2HvD;AA0CD,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAe3D;AA2ND,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAIxG;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlE;AA4CD,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B5E;AAkCD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBzE;AA0CD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BzE;AAgDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqDzF;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6DvE"}

package/dist/launch.js

@@ -9,7 +9,7 @@ import { rm } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { promisify } from "node:util";
-import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs } from "./unityHub.js";
+import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, groupCliArgs } from "./unityHub.js";
 const execFileAsync = promisify(execFile);
 const UNITY_EXECUTABLE_PATTERN_MAC = /Unity\.app\/Contents\/MacOS\/Unity/i;
 const UNITY_EXECUTABLE_PATTERN_WINDOWS = /Unity\.exe/i;
@@ -144,6 +144,7 @@ export function parseArgs(argv) {
     const positionals = [];
     let maxDepth = 3; // default 3; -1 means unlimited
     let restart = false;
+    let quit = false;
     let addUnityHub = false;
     let favoriteUnityHub = false;
     let platform;
@@ -161,6 +162,10 @@ export function parseArgs(argv) {
             restart = true;
             continue;
         }
+        if (arg === "-q" || arg === "--quit") {
+            quit = true;
+            continue;
+        }
         if (arg === "-u" ||
             arg === "-a" ||
             arg === "--unity-hub-entry" ||
@@ -226,6 +231,7 @@ export function parseArgs(argv) {
         unityArgs,
         searchMaxDepth: maxDepth,
         restart,
+        quit,
         addUnityHub,
         favoriteUnityHub,
     };
@@ -266,6 +272,7 @@ Options:
   -h, --help          Show this help message
   -v, --version       Show version number
   -r, --restart       Kill running Unity and restart
+  -q, --quit          Quit running Unity gracefully (force-kill on timeout)
   -p, --platform <P>  Passed to Unity as -buildTarget (e.g., StandaloneOSX, Android, iOS)
   --max-depth <N>     Search depth when PROJECT_PATH is omitted (default 3, -1 unlimited)
   -u, -a, --unity-hub-entry, --add-unity-hub
@@ -554,9 +561,11 @@ export async function handleStaleLockfile(projectPath) {
         const message = error instanceof Error ? error.message : String(error);
         console.warn(`Failed to delete UnityLockfile: ${message}`);
     }
+    console.log();
 }
 const KILL_POLL_INTERVAL_MS = 100;
 const KILL_TIMEOUT_MS = 10000;
+const GRACEFUL_QUIT_TIMEOUT_MS = 10000;
 function isProcessAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -574,9 +583,9 @@ function killProcess(pid) {
         // Process already exited
     }
 }
-async function waitForProcessExit(pid) {
+async function waitForProcessExit(pid, timeoutMs) {
     const start = Date.now();
-    while (Date.now() - start < KILL_TIMEOUT_MS) {
+    while (Date.now() - start < timeoutMs) {
         if (!isProcessAlive(pid)) {
             return true;
         }
@@ -588,17 +597,82 @@ export async function killRunningUnity(projectPath) {
     const processInfo = await findRunningUnityProcess(projectPath);
     if (!processInfo) {
         console.log("No running Unity process found for this project.");
+        console.log();
         return;
     }
     const pid = processInfo.pid;
     console.log(`Killing Unity (PID: ${pid})...`);
     killProcess(pid);
-    const exited = await waitForProcessExit(pid);
+    const exited = await waitForProcessExit(pid, KILL_TIMEOUT_MS);
     if (!exited) {
         console.error(`Error: Failed to kill Unity (PID: ${pid}) within ${KILL_TIMEOUT_MS / 1000}s.`);
         process.exit(1);
     }
     console.log("Unity killed.");
+    console.log();
+}
+async function sendGracefulQuitMac(pid) {
+    // System Events quit and "tell application to quit" leave UnityLockfile behind,
+    // so we send Cmd+Q keystroke to trigger Unity's normal user-initiated shutdown flow
+    const script = [
+        'tell application "System Events"',
+        `  set frontmost of (first process whose unix id is ${pid}) to true`,
+        '  keystroke "q" using {command down}',
+        "end tell",
+    ].join("\n");
+    try {
+        await execFileAsync("osascript", ["-e", script]);
+    }
+    catch {
+        // Process may have already exited
+    }
+}
+async function sendGracefulQuitWindows(pid) {
+    // process.kill(pid, "SIGTERM") forcefully kills on Windows, so use CloseMainWindow() to send WM_CLOSE
+    const scriptLines = [
+        "$ErrorActionPreference = 'Stop'",
+        `try { $proc = Get-Process -Id ${pid} -ErrorAction Stop; $proc.CloseMainWindow() | Out-Null } catch { }`,
+    ];
+    try {
+        await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    }
+    catch {
+        // Process may have already exited
+    }
+}
+async function sendGracefulQuit(pid) {
+    if (process.platform === "darwin") {
+        await sendGracefulQuitMac(pid);
+        return;
+    }
+    if (process.platform === "win32") {
+        await sendGracefulQuitWindows(pid);
+        return;
+    }
+}
+export async function quitRunningUnity(projectPath) {
+    const processInfo = await findRunningUnityProcess(projectPath);
+    if (!processInfo) {
+        console.log("No running Unity process found for this project.");
+        return;
+    }
+    const pid = processInfo.pid;
+    console.log(`Quitting Unity (PID: ${pid})...`);
+    await sendGracefulQuit(pid);
+    console.log(`Sent graceful quit signal. Waiting up to ${GRACEFUL_QUIT_TIMEOUT_MS / 1000}s...`);
+    const exitedGracefully = await waitForProcessExit(pid, GRACEFUL_QUIT_TIMEOUT_MS);
+    if (exitedGracefully) {
+        console.log("Unity quit gracefully.");
+        return;
+    }
+    console.log("Unity did not respond to graceful quit. Force killing...");
+    killProcess(pid);
+    const exitedAfterKill = await waitForProcessExit(pid, KILL_TIMEOUT_MS);
+    if (!exitedAfterKill) {
+        console.error(`Error: Failed to kill Unity (PID: ${pid}) within ${KILL_TIMEOUT_MS / 1000}s.`);
+        process.exit(1);
+    }
+    console.log("Unity force killed.");
 }
 function hasBuildTargetArg(unityArgs) {
     for (const arg of unityArgs) {
@@ -698,7 +772,6 @@ export function findUnityProjectBfs(rootDir, maxDepth) {
 export async function launch(opts) {
     const { projectPath, platform, unityArgs, unityVersion } = opts;
     const unityPath = getUnityPath(unityVersion);
-    console.log(`Detected Unity version: ${unityVersion}`);
     if (!existsSync(unityPath)) {
         console.error(`Error: Unity ${unityVersion} not found at ${unityPath}`);
         console.error("Please install Unity through Unity Hub.");
@@ -706,6 +779,7 @@ export async function launch(opts) {
     }
     console.log("Opening Unity...");
     console.log(`Project Path: ${projectPath}`);
+    console.log(`Detected Unity version: ${unityVersion}`);
     const args = ["-projectPath", projectPath];
     const unityArgsContainBuildTarget = hasBuildTargetArg(unityArgs);
     if (platform && platform.length > 0 && !unityArgsContainBuildTarget) {
@@ -713,13 +787,40 @@ export async function launch(opts) {
     }
     const hubCliArgs = await getProjectCliArgs(projectPath);
     if (hubCliArgs.length > 0) {
+        console.log("Unity Hub launch options:");
+        for (const line of groupCliArgs(hubCliArgs)) {
+            console.log(`  ${line}`);
+        }
         args.push(...hubCliArgs);
     }
+    else {
+        console.log("Unity Hub launch options: none");
+    }
     if (unityArgs.length > 0) {
         args.push(...unityArgs);
     }
-    const child = spawn(unityPath, args, { stdio: "ignore", detached: true });
-    child.unref();
+    return new Promise((resolve, reject) => {
+        const child = spawn(unityPath, args, {
+            stdio: "ignore",
+            detached: true,
+            // Git Bash (MSYS) がWindows パスをUnix 形式に自動変換するのを防ぐ
+            env: {
+                ...process.env,
+                MSYS_NO_PATHCONV: "1",
+            },
+        });
+        const handleError = (error) => {
+            child.removeListener("spawn", handleSpawn);
+            reject(new Error(`Failed to launch Unity: ${error.message}`));
+        };
+        const handleSpawn = () => {
+            child.removeListener("error", handleError);
+            child.unref();
+            resolve();
+        };
+        child.once("error", handleError);
+        child.once("spawn", handleSpawn);
+    });
 }
 async function main() {
     const options = parseArgs(process.argv);
@@ -731,14 +832,14 @@ async function main() {
     if (!resolvedProjectPath) {
         const searchRoot = process.cwd();
         const depthInfo = options.searchMaxDepth === -1 ? "unlimited" : String(options.searchMaxDepth);
-        console.log(`No PROJECT_PATH provided. Searching under ${searchRoot} (max-depth: ${depthInfo})...`);
+        console.log(`Searching for Unity project under ${searchRoot} (max-depth: ${depthInfo})...`);
         const found = findUnityProjectBfs(searchRoot, options.searchMaxDepth);
         if (!found) {
             console.error(`Error: Unity project not found under ${searchRoot}.`);
             process.exit(1);
             return;
         }
-        console.log(`Selected project: ${found}`);
+        console.log();
         resolvedProjectPath = found;
     }
     ensureProjectPath(resolvedProjectPath);
@@ -759,6 +860,14 @@ async function main() {
         }
         return;
     }
+    if (options.quit && options.restart) {
+        console.error("Error: --quit and --restart cannot be used together.");
+        process.exit(1);
+    }
+    if (options.quit) {
+        await quitRunningUnity(resolvedProjectPath);
+        return;
+    }
     if (options.restart) {
         await killRunningUnity(resolvedProjectPath);
     }

package/dist/lib.d.ts

@@ -2,7 +2,7 @@
  * launch-unity core library functions.
  * Pure library code without CLI entry point or side effects.
  */
-import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs } from "./unityHub.js";
+import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs } from "./unityHub.js";
 export type LaunchOptions = {
     subcommand?: "update";
     projectPath?: string;
@@ -10,6 +10,7 @@ export type LaunchOptions = {
     unityArgs: string[];
     searchMaxDepth: number;
     restart: boolean;
+    quit: boolean;
     addUnityHub: boolean;
     favoriteUnityHub: boolean;
 };
@@ -29,7 +30,8 @@ export declare function findRunningUnityProcess(projectPath: string): Promise<Un
 export declare function focusUnityProcess(pid: number): Promise<void>;
 export declare function handleStaleLockfile(projectPath: string): Promise<void>;
 export declare function killRunningUnity(projectPath: string): Promise<void>;
+export declare function quitRunningUnity(projectPath: string): Promise<void>;
 export declare function findUnityProjectBfs(rootDir: string, maxDepth: number): string | undefined;
 export declare function launch(opts: LaunchResolvedOptions): Promise<void>;
-export { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs };
+export { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs };
 //# sourceMappingURL=lib.d.ts.map

package/dist/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEzH,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAYF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CAmHvD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAc3D;AAoND,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAIxG;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlE;AA4CD,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB5E;AAiCD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBzE;AAgDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqDzF;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCvE;AAGD,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../src/lib.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEvI,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAYF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CAyHvD;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAc3D;AAoND,wBAAsB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAIxG;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlE;AA4CD,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B5E;AAkCD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBzE;AA0CD,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BzE;AAgDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAqDzF;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6DvE;AAGD,OAAO,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC"}

package/dist/lib.js

@@ -7,7 +7,7 @@ import { existsSync, readFileSync, readdirSync, lstatSync, realpathSync } from "
 import { rm } from "node:fs/promises";
 import { join, resolve } from "node:path";
 import { promisify } from "node:util";
-import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs } from "./unityHub.js";
+import { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs } from "./unityHub.js";
 const execFileAsync = promisify(execFile);
 const UNITY_EXECUTABLE_PATTERN_MAC = /Unity\.app\/Contents\/MacOS\/Unity/i;
 const UNITY_EXECUTABLE_PATTERN_WINDOWS = /Unity\.exe/i;
@@ -31,6 +31,7 @@ export function parseArgs(argv) {
     const positionals = [];
     let maxDepth = 3; // default 3; -1 means unlimited
     let restart = false;
+    let quit = false;
     let addUnityHub = false;
     let favoriteUnityHub = false;
     let platform;
@@ -46,6 +47,10 @@ export function parseArgs(argv) {
             restart = true;
             continue;
         }
+        if (arg === "-q" || arg === "--quit") {
+            quit = true;
+            continue;
+        }
         if (arg === "-u" ||
             arg === "-a" ||
             arg === "--unity-hub-entry" ||
@@ -111,6 +116,7 @@ export function parseArgs(argv) {
         unityArgs,
         searchMaxDepth: maxDepth,
         restart,
+        quit,
         addUnityHub,
         favoriteUnityHub,
     };
@@ -393,9 +399,11 @@ export async function handleStaleLockfile(projectPath) {
         const message = error instanceof Error ? error.message : String(error);
         console.warn(`Failed to delete UnityLockfile: ${message}`);
     }
+    console.log();
 }
 const KILL_POLL_INTERVAL_MS = 100;
 const KILL_TIMEOUT_MS = 10000;
+const GRACEFUL_QUIT_TIMEOUT_MS = 10000;
 function isProcessAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -413,9 +421,9 @@ function killProcess(pid) {
         // Process already exited
     }
 }
-async function waitForProcessExit(pid) {
+async function waitForProcessExit(pid, timeoutMs) {
     const start = Date.now();
-    while (Date.now() - start < KILL_TIMEOUT_MS) {
+    while (Date.now() - start < timeoutMs) {
         if (!isProcessAlive(pid)) {
             return true;
         }
@@ -427,16 +435,80 @@ export async function killRunningUnity(projectPath) {
     const processInfo = await findRunningUnityProcess(projectPath);
     if (!processInfo) {
         console.log("No running Unity process found for this project.");
+        console.log();
         return;
     }
     const pid = processInfo.pid;
     console.log(`Killing Unity (PID: ${pid})...`);
     killProcess(pid);
-    const exited = await waitForProcessExit(pid);
+    const exited = await waitForProcessExit(pid, KILL_TIMEOUT_MS);
     if (!exited) {
         throw new Error(`Failed to kill Unity (PID: ${pid}) within ${KILL_TIMEOUT_MS / 1000}s.`);
     }
     console.log("Unity killed.");
+    console.log();
+}
+async function sendGracefulQuitMac(pid) {
+    // System Events quit and "tell application to quit" leave UnityLockfile behind,
+    // so we send Cmd+Q keystroke to trigger Unity's normal user-initiated shutdown flow
+    const script = [
+        'tell application "System Events"',
+        `  set frontmost of (first process whose unix id is ${pid}) to true`,
+        '  keystroke "q" using {command down}',
+        "end tell",
+    ].join("\n");
+    try {
+        await execFileAsync("osascript", ["-e", script]);
+    }
+    catch {
+        // Process may have already exited
+    }
+}
+async function sendGracefulQuitWindows(pid) {
+    // process.kill(pid, "SIGTERM") forcefully kills on Windows, so use CloseMainWindow() to send WM_CLOSE
+    const scriptLines = [
+        "$ErrorActionPreference = 'Stop'",
+        `try { $proc = Get-Process -Id ${pid} -ErrorAction Stop; $proc.CloseMainWindow() | Out-Null } catch { }`,
+    ];
+    try {
+        await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    }
+    catch {
+        // Process may have already exited
+    }
+}
+async function sendGracefulQuit(pid) {
+    if (process.platform === "darwin") {
+        await sendGracefulQuitMac(pid);
+        return;
+    }
+    if (process.platform === "win32") {
+        await sendGracefulQuitWindows(pid);
+        return;
+    }
+}
+export async function quitRunningUnity(projectPath) {
+    const processInfo = await findRunningUnityProcess(projectPath);
+    if (!processInfo) {
+        console.log("No running Unity process found for this project.");
+        return;
+    }
+    const pid = processInfo.pid;
+    console.log(`Quitting Unity (PID: ${pid})...`);
+    await sendGracefulQuit(pid);
+    console.log(`Sent graceful quit signal. Waiting up to ${GRACEFUL_QUIT_TIMEOUT_MS / 1000}s...`);
+    const exitedGracefully = await waitForProcessExit(pid, GRACEFUL_QUIT_TIMEOUT_MS);
+    if (exitedGracefully) {
+        console.log("Unity quit gracefully.");
+        return;
+    }
+    console.log("Unity did not respond to graceful quit. Force killing...");
+    killProcess(pid);
+    const exitedAfterKill = await waitForProcessExit(pid, KILL_TIMEOUT_MS);
+    if (!exitedAfterKill) {
+        throw new Error(`Failed to kill Unity (PID: ${pid}) within ${KILL_TIMEOUT_MS / 1000}s.`);
+    }
+    console.log("Unity force killed.");
 }
 function hasBuildTargetArg(unityArgs) {
     for (const arg of unityArgs) {
@@ -536,12 +608,12 @@ export function findUnityProjectBfs(rootDir, maxDepth) {
 export async function launch(opts) {
     const { projectPath, platform, unityArgs, unityVersion } = opts;
     const unityPath = getUnityPath(unityVersion);
-    console.log(`Detected Unity version: ${unityVersion}`);
     if (!existsSync(unityPath)) {
         throw new Error(`Unity ${unityVersion} not found at ${unityPath}. Please install Unity through Unity Hub.`);
     }
     console.log("Opening Unity...");
     console.log(`Project Path: ${projectPath}`);
+    console.log(`Detected Unity version: ${unityVersion}`);
     const args = ["-projectPath", projectPath];
     const unityArgsContainBuildTarget = hasBuildTargetArg(unityArgs);
     if (platform && platform.length > 0 && !unityArgsContainBuildTarget) {
@@ -549,13 +621,40 @@ export async function launch(opts) {
     }
     const hubCliArgs = await getProjectCliArgs(projectPath);
     if (hubCliArgs.length > 0) {
+        console.log("Unity Hub launch options:");
+        for (const line of groupCliArgs(hubCliArgs)) {
+            console.log(`  ${line}`);
+        }
         args.push(...hubCliArgs);
     }
+    else {
+        console.log("Unity Hub launch options: none");
+    }
     if (unityArgs.length > 0) {
         args.push(...unityArgs);
     }
-    const child = spawn(unityPath, args, { stdio: "ignore", detached: true });
-    child.unref();
+    return new Promise((resolve, reject) => {
+        const child = spawn(unityPath, args, {
+            stdio: "ignore",
+            detached: true,
+            // Git Bash (MSYS) がWindows パスをUnix 形式に自動変換するのを防ぐ
+            env: {
+                ...process.env,
+                MSYS_NO_PATHCONV: "1",
+            },
+        });
+        const handleError = (error) => {
+            child.removeListener("spawn", handleSpawn);
+            reject(new Error(`Failed to launch Unity: ${error.message}`));
+        };
+        const handleSpawn = () => {
+            child.removeListener("error", handleError);
+            child.unref();
+            resolve();
+        };
+        child.once("error", handleError);
+        child.once("spawn", handleSpawn);
+    });
 }
 // Re-export Unity Hub functions
-export { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs };
+export { ensureProjectEntryAndUpdate, updateLastModifiedIfExists, getProjectCliArgs, parseCliArgs, groupCliArgs };

package/dist/unityHub.d.ts

@@ -1,5 +1,6 @@
 export declare const ensureProjectEntryAndUpdate: (projectPath: string, version: string, when: Date, setFavorite?: boolean) => Promise<void>;
 export declare const updateLastModifiedIfExists: (projectPath: string, when: Date) => Promise<void>;
 export declare const parseCliArgs: (cliArgsString: string) => string[];
+export declare const groupCliArgs: (args: readonly string[]) => string[];
 export declare const getProjectCliArgs: (projectPath: string) => Promise<string[]>;
 //# sourceMappingURL=unityHub.d.ts.map

package/dist/unityHub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unityHub.d.ts","sourceRoot":"","sources":["../src/unityHub.ts"],"names":[],"mappings":"AAwFA,eAAO,MAAM,2BAA2B,GACtC,aAAa,MAAM,EACnB,SAAS,MAAM,EACf,MAAM,IAAI,EACV,qBAAmB,KAClB,OAAO,CAAC,IAAI,CAgEd,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,aAAa,MAAM,EACnB,MAAM,IAAI,KACT,OAAO,CAAC,IAAI,CAuDd,CAAC;AAoBF,eAAO,MAAM,YAAY,GAAI,eAAe,MAAM,KAAG,MAAM,EA6C1D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CA8C7E,CAAC"}
+{"version":3,"file":"unityHub.d.ts","sourceRoot":"","sources":["../src/unityHub.ts"],"names":[],"mappings":"AAwFA,eAAO,MAAM,2BAA2B,GACtC,aAAa,MAAM,EACnB,SAAS,MAAM,EACf,MAAM,IAAI,EACV,qBAAmB,KAClB,OAAO,CAAC,IAAI,CAgEd,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,aAAa,MAAM,EACnB,MAAM,IAAI,KACT,OAAO,CAAC,IAAI,CAuDd,CAAC;AAoBF,eAAO,MAAM,YAAY,GAAI,eAAe,MAAM,KAAG,MAAM,EA6C1D,CAAC;AAGF,eAAO,MAAM,YAAY,GAAI,MAAM,SAAS,MAAM,EAAE,KAAG,MAAM,EAiB5D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CA8C7E,CAAC"}

package/dist/unityHub.js

@@ -225,6 +225,27 @@ export const parseCliArgs = (cliArgsString) => {
     }
     return tokens;
 };
+// "-flag value" pairs are grouped into single strings for display (e.g. ["-foo", "bar", "-baz", "qux"] -> ["-foo bar", "-baz qux"])
+export const groupCliArgs = (args) => {
+    const groups = [];
+    let current = "";
+    for (const arg of args) {
+        if (arg.startsWith("-") && current.length > 0) {
+            groups.push(current);
+            current = arg;
+        }
+        else if (current.length === 0) {
+            current = arg;
+        }
+        else {
+            current += ` ${arg}`;
+        }
+    }
+    if (current.length > 0) {
+        groups.push(current);
+    }
+    return groups;
+};
 export const getProjectCliArgs = async (projectPath) => {
     assert(projectPath !== null && projectPath !== undefined, "projectPath must not be null");
     const infoFilePath = resolveUnityHubProjectsInfoFile();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "launch-unity",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Open a Unity project with the matching Editor version (macOS/Windows)",
   "type": "module",
   "main": "dist/index.js",