uloop-cli 0.65.0 → 0.66.1

package/dist/cli.bundle.cjs

@@ -5486,13 +5486,13 @@ var DirectUnityClient = class {
   requestId = 0;
   receiveBuffer = Buffer.alloc(0);
   async connect() {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       this.socket = new net.Socket();
       this.socket.on("error", (error) => {
         reject(new Error(`Connection error: ${error.message}`));
       });
       this.socket.connect(this.port, this.host, () => {
-        resolve5();
+        resolve6();
       });
     });
   }
@@ -5508,7 +5508,7 @@ var DirectUnityClient = class {
     };
     const requestJson = JSON.stringify(request);
     const framedMessage = createFrame(requestJson);
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const socket = this.socket;
       const cleanup = () => {
         clearTimeout(timeoutId);
@@ -5545,7 +5545,7 @@ var DirectUnityClient = class {
           reject(new Error(`Unity error: ${response.error.message}`));
           return;
         }
-        resolve5(response.result);
+        resolve6(response.result);
       };
       const onError = (error) => {
         cleanup();
@@ -5759,13 +5759,41 @@ function resolvePortFromUnitySettings(settings) {
   }
   return null;
 }
-async function resolveUnityPort(explicitPort) {
+function validateProjectPath(projectPath) {
+  const resolved = (0, import_path2.resolve)(projectPath);
+  if (!(0, import_fs2.existsSync)(resolved)) {
+    throw new Error(`Path does not exist: ${resolved}`);
+  }
+  if (!isUnityProject(resolved)) {
+    throw new Error(`Not a Unity project (Assets/ or ProjectSettings/ not found): ${resolved}`);
+  }
+  if (!hasUloopInstalled(resolved)) {
+    throw new Error(
+      `uLoopMCP is not installed in this project (UserSettings/UnityMcpSettings.json not found): ${resolved}`
+    );
+  }
+  return resolved;
+}
+async function resolveUnityPort(explicitPort, projectPath) {
+  if (explicitPort !== void 0 && projectPath !== void 0) {
+    throw new Error("Cannot specify both --port and --project-path. Use one or the other.");
+  }
   if (explicitPort !== void 0) {
     return explicitPort;
   }
+  if (projectPath !== void 0) {
+    const resolved = validateProjectPath(projectPath);
+    const settingsPort2 = await readPortFromSettings(resolved);
+    if (settingsPort2 !== null) {
+      return settingsPort2;
+    }
+    return DEFAULT_PORT;
+  }
   const projectRoot = findUnityProjectRoot();
   if (projectRoot === null) {
-    throw new Error("Unity project not found. Use --port option to specify the port explicitly.");
+    throw new Error(
+      "Unity project not found. Use --port or --project-path option to specify the target."
+    );
   }
   const settingsPort = await readPortFromSettings(projectRoot);
   if (settingsPort !== null) {
@@ -5799,7 +5827,7 @@ var import_path3 = require("path");
 
 // src/default-tools.json
 var default_tools_default = {
-  version: "0.65.0",
+  version: "0.66.1",
   tools: [
     {
       name: "compile",
@@ -6247,7 +6275,7 @@ function getCachedServerVersion() {
 }
 
 // src/version.ts
-var VERSION = "0.65.0";
+var VERSION = "0.66.1";
 
 // src/spinner.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -6383,11 +6411,11 @@ function tryReadCompileResult(projectRoot, requestId) {
   }
 }
 function canSendRequestToUnity(port) {
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     const socket = new net2.Socket();
     const timer = setTimeout(() => {
       socket.destroy();
-      resolve5(false);
+      resolve6(false);
     }, READINESS_CHECK_TIMEOUT_MS);
     const cleanup = () => {
       clearTimeout(timer);
@@ -6410,21 +6438,21 @@ function canSendRequestToUnity(port) {
       const sepIndex = buffer.indexOf(HEADER_SEPARATOR2);
       if (sepIndex !== -1) {
         cleanup();
-        resolve5(true);
+        resolve6(true);
       }
     });
     socket.on("error", () => {
       cleanup();
-      resolve5(false);
+      resolve6(false);
     });
     socket.on("close", () => {
       clearTimeout(timer);
-      resolve5(false);
+      resolve6(false);
     });
   });
 }
 function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 async function waitForCompileCompletion(options) {
   const startTime = Date.now();
@@ -6565,8 +6593,8 @@ function checkServerVersion(result) {
     printVersionWarning(VERSION, serverVersion);
   }
 }
-function checkUnityBusyState() {
-  const projectRoot = findUnityProjectRoot();
+function checkUnityBusyState(projectPath) {
+  const projectRoot = projectPath !== void 0 ? validateProjectPath(projectPath) : findUnityProjectRoot();
   if (projectRoot === null) {
     return;
   }
@@ -6592,7 +6620,7 @@ async function executeToolCommand(toolName, params, globalOptions) {
     }
     portNumber = parsed;
   }
-  const port = await resolveUnityPort(portNumber);
+  const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const compileOptions = getCompileExecutionOptions(toolName, params);
   const shouldWaitForDomainReload = compileOptions.waitForDomainReload;
   const compileRequestId = shouldWaitForDomainReload ? ensureCompileRequestId(params) : void 0;
@@ -6600,10 +6628,10 @@ async function executeToolCommand(toolName, params, globalOptions) {
   const spinner = createSpinner("Connecting to Unity...");
   let lastError;
   let immediateResult;
-  const projectRoot = findUnityProjectRoot();
+  const projectRoot = globalOptions.projectPath !== void 0 ? validateProjectPath(globalOptions.projectPath) : findUnityProjectRoot();
   let requestDispatched = false;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState();
+    checkUnityBusyState(globalOptions.projectPath);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -6717,12 +6745,12 @@ async function listAvailableTools(globalOptions) {
     }
     portNumber = parsed;
   }
-  const port = await resolveUnityPort(portNumber);
+  const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const restoreStdin = suppressStdinEcho();
   const spinner = createSpinner("Connecting to Unity...");
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState();
+    checkUnityBusyState(globalOptions.projectPath);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -6774,12 +6802,12 @@ async function syncTools(globalOptions) {
     }
     portNumber = parsed;
   }
-  const port = await resolveUnityPort(portNumber);
+  const port = await resolveUnityPort(portNumber, globalOptions.projectPath);
   const restoreStdin = suppressStdinEcho();
   const spinner = createSpinner("Connecting to Unity...");
   let lastError;
   for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    checkUnityBusyState();
+    checkUnityBusyState(globalOptions.projectPath);
     const client = new DirectUnityClient(port);
     try {
       await client.connect();
@@ -8212,7 +8240,7 @@ async function waitForProcessExit(pid, timeoutMs) {
     if (!isProcessAlive(pid)) {
       return true;
     }
-    await new Promise((resolve5) => setTimeout(resolve5, KILL_POLL_INTERVAL_MS));
+    await new Promise((resolve6) => setTimeout(resolve6, KILL_POLL_INTERVAL_MS));
   }
   return false;
 }
@@ -8381,7 +8409,7 @@ async function waitForLockfile(projectPath) {
     if ((0, import_node_fs2.existsSync)(lockfilePath)) {
       return;
     }
-    await new Promise((resolve5) => setTimeout(resolve5, LOCKFILE_POLL_INTERVAL_MS));
+    await new Promise((resolve6) => setTimeout(resolve6, LOCKFILE_POLL_INTERVAL_MS));
   }
   console.warn("Unity launched, but UnityLockfile was not detected within 5s.");
 }
@@ -8412,7 +8440,7 @@ async function launch(opts) {
   if (unityArgs.length > 0) {
     args.push(...unityArgs);
   }
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const child = (0, import_node_child_process.spawn)(unityPath, args, {
       stdio: "ignore",
       detached: true,
@@ -8429,7 +8457,7 @@ async function launch(opts) {
     const handleSpawn = () => {
       child.removeListener("error", handleError);
       child.unref();
-      resolve5();
+      resolve6();
     };
     child.once("error", handleError);
     child.once("spawn", handleSpawn);
@@ -8537,8 +8565,24 @@ async function runLaunchCommand(projectPath, options) {
 
 // src/commands/focus-window.ts
 function registerFocusWindowCommand(program3) {
-  program3.command("focus-window").description("Bring Unity Editor window to front using OS-level commands").action(async () => {
-    const projectRoot = findUnityProjectRoot();
+  program3.command("focus-window").description("Bring Unity Editor window to front using OS-level commands").option("--project-path <path>", "Unity project path").action(async (options) => {
+    let projectRoot;
+    if (options.projectPath !== void 0) {
+      try {
+        projectRoot = validateProjectPath(options.projectPath);
+      } catch (error) {
+        console.error(
+          JSON.stringify({
+            Success: false,
+            Message: error instanceof Error ? error.message : String(error)
+          })
+        );
+        process.exit(1);
+        return;
+      }
+    } else {
+      projectRoot = findUnityProjectRoot();
+    }
     if (projectRoot === null) {
       console.error(
         JSON.stringify({
@@ -8596,11 +8640,11 @@ var program2 = new Command();
 program2.name("uloop").description("Unity MCP CLI - Direct communication with Unity Editor").version(VERSION, "-v, --version", "Output the version number");
 program2.option("--list-commands", "List all command names (for shell completion)");
 program2.option("--list-options <cmd>", "List options for a command (for shell completion)");
-program2.command("list").description("List all available tools from Unity").option("-p, --port <port>", "Unity TCP port").action(async (options) => {
-  await runWithErrorHandling(() => listAvailableTools(options));
+program2.command("list").description("List all available tools from Unity").option("-p, --port <port>", "Unity TCP port").option("--project-path <path>", "Unity project path").action(async (options) => {
+  await runWithErrorHandling(() => listAvailableTools(extractGlobalOptions(options)));
 });
-program2.command("sync").description("Sync tool definitions from Unity to local cache").option("-p, --port <port>", "Unity TCP port").action(async (options) => {
-  await runWithErrorHandling(() => syncTools(options));
+program2.command("sync").description("Sync tool definitions from Unity to local cache").option("-p, --port <port>", "Unity TCP port").option("--project-path <path>", "Unity project path").action(async (options) => {
+  await runWithErrorHandling(() => syncTools(extractGlobalOptions(options)));
 });
 program2.command("completion").description("Setup shell completion").option("--install", "Install completion to shell config file").option("--shell <type>", "Shell type: bash, zsh, or powershell").action((options) => {
   handleCompletion(options.install ?? false, options.shell);
@@ -8608,8 +8652,11 @@ program2.command("completion").description("Setup shell completion").option("--i
 program2.command("update").description("Update uloop CLI to the latest version").action(() => {
   updateCli();
 });
-program2.command("fix").description("Clean up stale lock files that may prevent CLI from connecting").action(() => {
-  cleanupLockFiles();
+program2.command("fix").description("Clean up stale lock files that may prevent CLI from connecting").option("--project-path <path>", "Unity project path").action(async (options) => {
+  await runWithErrorHandling(() => {
+    cleanupLockFiles(options.projectPath);
+    return Promise.resolve();
+  });
 });
 registerSkillsCommand(program2);
 registerLaunchCommand(program2);
@@ -8632,6 +8679,7 @@ function registerToolCommand(tool) {
     }
   }
   cmd.option("-p, --port <port>", "Unity TCP port");
+  cmd.option("--project-path <path>", "Unity project path");
   cmd.action(async (options) => {
     const params = buildParams(options, properties);
     if (tool.name === "execute-dynamic-code" && params["Code"]) {
@@ -8738,7 +8786,8 @@ function convertValue(value, propInfo) {
 }
 function extractGlobalOptions(options) {
   return {
-    port: options["port"]
+    port: options["port"],
+    projectPath: options["projectPath"]
   };
 }
 function isConnectionError(message) {
@@ -8973,8 +9022,8 @@ function updateCli() {
   });
 }
 var LOCK_FILES = ["compiling.lock", "domainreload.lock", "serverstarting.lock"];
-function cleanupLockFiles() {
-  const projectRoot = findUnityProjectRoot();
+function cleanupLockFiles(projectPath) {
+  const projectRoot = projectPath !== void 0 ? validateProjectPath(projectPath) : findUnityProjectRoot();
   if (projectRoot === null) {
     console.error("Could not find Unity project root.");
     process.exit(1);
@@ -9102,20 +9151,33 @@ function shouldSkipAutoSync(cmdName, args) {
   return args.some((arg) => NO_SYNC_FLAGS.includes(arg));
 }
 function extractSyncGlobalOptions(args) {
+  const options = {};
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === "--port" || arg === "-p") {
       const nextArg = args[i + 1];
       if (nextArg !== void 0 && !nextArg.startsWith("-")) {
-        return { port: nextArg };
+        options.port = nextArg;
       }
       continue;
     }
     if (arg.startsWith("--port=")) {
-      return { port: arg.slice("--port=".length) };
+      options.port = arg.slice("--port=".length);
+      continue;
+    }
+    if (arg === "--project-path") {
+      const nextArg = args[i + 1];
+      if (nextArg !== void 0 && !nextArg.startsWith("-")) {
+        options.projectPath = nextArg;
+      }
+      continue;
+    }
+    if (arg.startsWith("--project-path=")) {
+      options.projectPath = arg.slice("--project-path=".length);
+      continue;
     }
   }
-  return {};
+  return options;
 }
 async function main() {
   if (handleCompletionOptions()) {