uloop-cli 1.6.4 → 1.7.2

package/dist/cli.bundle.cjs

@@ -9,6 +9,10 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -25,6 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // node_modules/commander/lib/error.js
 var require_error = __commonJS({
@@ -5382,6 +5387,14 @@ var require_semver2 = __commonJS({
   }
 });
 
+// src/cli.ts
+var cli_exports = {};
+__export(cli_exports, {
+  getInstalledVersion: () => getInstalledVersion,
+  updateCli: () => updateCli
+});
+module.exports = __toCommonJS(cli_exports);
+
 // src/cli-constants.ts
 var PRODUCT_DISPLAY_NAME = "Unity CLI Loop";
 var MENU_PATH_SERVER = "Window > Unity CLI Loop > Server";
@@ -5605,8 +5618,12 @@ function isUnityProject(dirPath) {
   const hasProjectSettings = (0, import_fs.existsSync)((0, import_path.join)(dirPath, "ProjectSettings"));
   return hasAssets && hasProjectSettings;
 }
+function getUnitySettingsCandidatePaths(dirPath) {
+  const settingsPath = (0, import_path.join)(dirPath, "UserSettings/UnityMcpSettings.json");
+  return [settingsPath, `${settingsPath}.tmp`, `${settingsPath}.bak`];
+}
 function hasUloopInstalled(dirPath) {
-  return (0, import_fs.existsSync)((0, import_path.join)(dirPath, "UserSettings/UnityMcpSettings.json"));
+  return getUnitySettingsCandidatePaths(dirPath).some((path) => (0, import_fs.existsSync)(path));
 }
 function isUnityProjectWithUloop(dirPath) {
   return isUnityProject(dirPath) && hasUloopInstalled(dirPath);
@@ -5813,34 +5830,32 @@ Run 'uloop launch -r' to restart Unity.`
   );
 }
 async function readPortFromSettingsOrThrow(projectRoot) {
-  const settingsPath = (0, import_path2.join)(projectRoot, "UserSettings/UnityMcpSettings.json");
-  if (!(0, import_fs2.existsSync)(settingsPath)) {
-    throw createSettingsReadError(projectRoot);
-  }
-  let content;
-  try {
-    content = await (0, import_promises.readFile)(settingsPath, "utf-8");
-  } catch {
-    throw createSettingsReadError(projectRoot);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(content);
-  } catch {
-    throw createSettingsReadError(projectRoot);
-  }
-  if (typeof parsed !== "object" || parsed === null) {
-    throw createSettingsReadError(projectRoot);
-  }
-  const settings = parsed;
-  if (settings.isServerRunning === false) {
-    throw new UnityNotRunningError(projectRoot);
-  }
-  const port = resolvePortFromUnitySettings(settings);
-  if (port === null) {
-    throw createSettingsReadError(projectRoot);
+  for (const settingsPath of getUnitySettingsCandidatePaths(projectRoot)) {
+    let content;
+    try {
+      content = await (0, import_promises.readFile)(settingsPath, "utf-8");
+    } catch {
+      continue;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(content);
+    } catch {
+      continue;
+    }
+    if (typeof parsed !== "object" || parsed === null) {
+      continue;
+    }
+    const settings = parsed;
+    if (settings.isServerRunning === false) {
+      throw new UnityNotRunningError(projectRoot);
+    }
+    const port = resolvePortFromUnitySettings(settings);
+    if (port !== null) {
+      return port;
+    }
   }
-  return port;
+  throw createSettingsReadError(projectRoot);
 }
 
 // src/project-validator.ts
@@ -5893,7 +5908,7 @@ var import_path4 = require("path");
 
 // src/default-tools.json
 var default_tools_default = {
-  version: "1.6.4",
+  version: "1.7.2",
   tools: [
     {
       name: "compile",
@@ -6526,7 +6541,7 @@ function getCachedServerVersion() {
 }
 
 // src/version.ts
-var VERSION = "1.6.4";
+var VERSION = "1.7.2";
 
 // src/spinner.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -6862,6 +6877,12 @@ function checkUnityBusyState(projectPath) {
     throw new Error("UNITY_SERVER_STARTING");
   }
 }
+function checkUnityBusyStateBeforeProjectResolution(globalOptions) {
+  if (globalOptions.port !== void 0) {
+    return;
+  }
+  checkUnityBusyState(globalOptions.projectPath);
+}
 async function executeToolCommand(toolName, params, globalOptions) {
   let portNumber;
   if (globalOptions.port) {
@@ -6871,6 +6892,7 @@ async function executeToolCommand(toolName, params, globalOptions) {
     }
     portNumber = parsed;
   }
+  checkUnityBusyStateBeforeProjectResolution(globalOptions);
   const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const compileOptions = getCompileExecutionOptions(toolName, params);
   const shouldWaitForDomainReload = compileOptions.waitForDomainReload;
@@ -6883,7 +6905,7 @@ async function executeToolCommand(toolName, params, globalOptions) {
   const shouldValidateProject = portNumber === void 0 && projectRoot !== null;
   let requestDispatched = false;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState(globalOptions.projectPath);
+    checkUnityBusyStateBeforeProjectResolution(globalOptions);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -7000,6 +7022,7 @@ async function listAvailableTools(globalOptions) {
     }
     portNumber = parsed;
   }
+  checkUnityBusyStateBeforeProjectResolution(globalOptions);
   const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const projectRoot = globalOptions.projectPath !== void 0 ? validateProjectPath(globalOptions.projectPath) : findUnityProjectRoot();
   const shouldValidateProject = portNumber === void 0 && projectRoot !== null;
@@ -7007,7 +7030,7 @@ async function listAvailableTools(globalOptions) {
   const spinner = createSpinner("Connecting to Unity...");
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState(globalOptions.projectPath);
+    checkUnityBusyStateBeforeProjectResolution(globalOptions);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -7062,6 +7085,7 @@ async function syncTools(globalOptions) {
     }
     portNumber = parsed;
   }
+  checkUnityBusyStateBeforeProjectResolution(globalOptions);
   const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const projectRoot = globalOptions.projectPath !== void 0 ? validateProjectPath(globalOptions.projectPath) : findUnityProjectRoot();
   const shouldValidateProject = portNumber === void 0 && projectRoot !== null;
@@ -7069,7 +7093,7 @@ async function syncTools(globalOptions) {
   const spinner = createSpinner("Connecting to Unity...");
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState(globalOptions.projectPath);
+    checkUnityBusyStateBeforeProjectResolution(globalOptions);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -9010,6 +9034,28 @@ function registerFocusWindowCommand(program3, helpGroup) {
   });
 }
 
+// src/cli-project-error.ts
+function getProjectResolutionErrorLines(error) {
+  if (error instanceof UnityNotRunningError) {
+    return [
+      "Error: Unity Editor for this project is not running.",
+      "",
+      `  Project: ${error.projectRoot}`,
+      "",
+      "Start the Unity Editor for this project and try again."
+    ];
+  }
+  return [
+    "Error: Connected Unity instance belongs to a different project.",
+    "",
+    `  Project:      ${error.expectedProjectRoot}`,
+    `  Connected to: ${error.connectedProjectRoot}`,
+    "",
+    "Another Unity instance was found, but it belongs to a different project.",
+    "Start the Unity Editor for this project, or use --project-path to specify the target."
+  ];
+}
+
 // src/cli.ts
 var FOCUS_WINDOW_COMMAND = "focus-window";
 var LAUNCH_COMMAND = "launch";
@@ -9271,23 +9317,15 @@ async function runWithErrorHandling(fn) {
     await fn();
   } catch (error) {
     if (error instanceof UnityNotRunningError) {
-      console.error("\x1B[31mError: Unity Editor for this project is not running.\x1B[0m");
-      console.error("");
-      console.error(`  Project: ${error.projectRoot}`);
-      console.error("");
-      console.error("Start the Unity Editor for this project and try again.");
+      for (const line of getProjectResolutionErrorLines(error)) {
+        console.error(line.startsWith("Error: ") ? `\x1B[31m${line}\x1B[0m` : line);
+      }
       process.exit(1);
     }
     if (error instanceof ProjectMismatchError) {
-      console.error("\x1B[31mError: Unity Editor for this project is not running.\x1B[0m");
-      console.error("");
-      console.error(`  Project:      ${error.expectedProjectRoot}`);
-      console.error(`  Connected to: ${error.connectedProjectRoot}`);
-      console.error("");
-      console.error("Another Unity instance was found, but it belongs to a different project.");
-      console.error(
-        "Start the Unity Editor for this project, or use --project-path to specify the target."
-      );
+      for (const line of getProjectResolutionErrorLines(error)) {
+        console.error(line.startsWith("Error: ") ? `\x1B[31m${line}\x1B[0m` : line);
+      }
       process.exit(1);
     }
     const message = error instanceof Error ? error.message : String(error);
@@ -9410,9 +9448,7 @@ compdef _uloop uloop`;
 }
 function getInstalledVersion(callback) {
   const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
-  const child = (0, import_child_process.spawn)(npmCommand, ["list", "-g", "uloop-cli", "--json"], {
-    shell: true
-  });
+  const child = (0, import_child_process.spawn)(npmCommand, ["list", "-g", "uloop-cli", "--json"]);
   let stdout = "";
   child.stdout.on("data", (data) => {
     stdout += data.toString();
@@ -9459,8 +9495,7 @@ function updateCli() {
   console.log("Updating uloop-cli to the latest version...");
   const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
   const child = (0, import_child_process.spawn)(npmCommand, ["install", "-g", "uloop-cli@latest"], {
-    stdio: "inherit",
-    shell: true
+    stdio: "inherit"
   });
   child.on("close", (code) => {
     if (code === 0) {
@@ -9753,5 +9788,12 @@ async function main() {
   }
   program2.parse();
 }
-void main();
+if (process.env.JEST_WORKER_ID === void 0) {
+  void main();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getInstalledVersion,
+  updateCli
+});
 //# sourceMappingURL=cli.bundle.cjs.map