uloop-cli 0.62.4 → 0.63.0

package/dist/cli.bundle.cjs

@@ -5783,7 +5783,7 @@ var import_path3 = require("path");
 
 // src/default-tools.json
 var default_tools_default = {
-  version: "0.62.4",
+  version: "0.63.0",
   tools: [
     {
       name: "compile",
@@ -6227,7 +6227,7 @@ function getCachedServerVersion() {
 }
 
 // src/version.ts
-var VERSION = "0.62.4";
+var VERSION = "0.63.0";
 
 // src/spinner.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -7545,7 +7545,7 @@ var getProjectCliArgs = async (projectPath) => {
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
 var UNITY_EXECUTABLE_PATTERN_MAC = /Unity\.app\/Contents\/MacOS\/Unity/i;
 var UNITY_EXECUTABLE_PATTERN_WINDOWS = /Unity\.exe/i;
-var PROJECT_PATH_PATTERN = /-(?:projectPath|projectpath)(?:=|\s+)("[^"]+"|'[^']+'|[^\s"']+)/i;
+var PROJECT_PATH_PATTERN = /-(?:projectPath|projectpath)(?:=|\s+)("[^"]+"|'[^']+'|.+?)(?=\s+-[a-zA-Z]|$)/i;
 var PROCESS_LIST_COMMAND_MAC = "ps";
 var PROCESS_LIST_ARGS_MAC = ["-axo", "pid=,command=", "-ww"];
 var WINDOWS_POWERSHELL = "powershell";
@@ -7785,12 +7785,53 @@ async function focusUnityProcessWindows(pid) {
     console.warn(`Failed to bring Unity to front on Windows: ${message}`);
   }
 }
+async function isLockfileHeldMac(lockfilePath) {
+  try {
+    const result = await execFileAsync("lsof", [lockfilePath]);
+    const lines = result.stdout.split("\n").filter((line) => line.length > 0);
+    return lines.length > 1;
+  } catch {
+    return false;
+  }
+}
+async function isLockfileHeldWindows(lockfilePath) {
+  const escapedPath = lockfilePath.replace(/'/g, "''");
+  const scriptLines = [
+    "try {",
+    `  $f = [System.IO.File]::Open('${escapedPath}', [System.IO.FileMode]::Open, [System.IO.FileAccess]::ReadWrite, [System.IO.FileShare]::None)`,
+    "  $f.Close()",
+    "  Write-Output 'UNLOCKED'",
+    "} catch [System.IO.IOException] {",
+    "  Write-Output 'LOCKED'",
+    "} catch {",
+    "  Write-Output 'UNLOCKED'",
+    "}"
+  ];
+  try {
+    const result = await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    return result.stdout.trim() === "LOCKED";
+  } catch {
+    return false;
+  }
+}
+async function isLockfileHeld(lockfilePath) {
+  if (process.platform === "darwin") {
+    return await isLockfileHeldMac(lockfilePath);
+  }
+  if (process.platform === "win32") {
+    return await isLockfileHeldWindows(lockfilePath);
+  }
+  return false;
+}
 async function handleStaleLockfile(projectPath) {
   const tempDirectoryPath = (0, import_node_path2.join)(projectPath, TEMP_DIRECTORY_NAME);
   const lockfilePath = (0, import_node_path2.join)(tempDirectoryPath, UNITY_LOCKFILE_NAME);
   if (!(0, import_node_fs2.existsSync)(lockfilePath)) {
     return;
   }
+  if (await isLockfileHeld(lockfilePath)) {
+    throw new Error(`Unity appears to be running for this project (lockfile is held: ${lockfilePath}). Use -r to restart or -q to quit the running instance.`);
+  }
   console.log(`UnityLockfile found without active Unity process: ${lockfilePath}`);
   console.log("Assuming previous crash. Cleaning Temp directory and continuing launch.");
   try {
@@ -7809,6 +7850,8 @@ async function handleStaleLockfile(projectPath) {
   }
   console.log();
 }
+var LOCKFILE_POLL_INTERVAL_MS = 100;
+var LOCKFILE_WAIT_TIMEOUT_MS = 5e3;
 var KILL_POLL_INTERVAL_MS = 100;
 var KILL_TIMEOUT_MS = 1e4;
 var GRACEFUL_QUIT_TIMEOUT_MS = 1e4;
@@ -7994,6 +8037,17 @@ function findUnityProjectBfs(rootDir, maxDepth) {
   }
   return void 0;
 }
+async function waitForLockfile(projectPath) {
+  const lockfilePath = (0, import_node_path2.join)(projectPath, TEMP_DIRECTORY_NAME, UNITY_LOCKFILE_NAME);
+  const start = Date.now();
+  while (Date.now() - start < LOCKFILE_WAIT_TIMEOUT_MS) {
+    if ((0, import_node_fs2.existsSync)(lockfilePath)) {
+      return;
+    }
+    await new Promise((resolve5) => setTimeout(resolve5, LOCKFILE_POLL_INTERVAL_MS));
+  }
+  console.warn("Unity launched, but UnityLockfile was not detected within 5s.");
+}
 async function launch(opts) {
   const { projectPath, platform, unityArgs, unityVersion } = opts;
   const unityPath = getUnityPath(unityVersion);
@@ -8094,6 +8148,7 @@ async function orchestrateLaunch(options) {
     unityVersion
   };
   await launch(resolved);
+  await waitForLockfile(resolvedProjectPath);
   const now = /* @__PURE__ */ new Date();
   try {
     await updateLastModifiedIfExists(resolvedProjectPath, now);