uloop-cli 1.7.2 → 1.7.3

package/dist/cli.bundle.cjs

@@ -5768,6 +5768,13 @@ var UnityNotRunningError = class extends Error {
   }
   projectRoot;
 };
+var UnityServerNotRunningError = class extends Error {
+  constructor(projectRoot) {
+    super("UNITY_SERVER_NOT_RUNNING");
+    this.projectRoot = projectRoot;
+  }
+  projectRoot;
+};
 function normalizePort(port) {
   if (typeof port !== "number") {
     return null;
@@ -5847,9 +5854,6 @@ async function readPortFromSettingsOrThrow(projectRoot) {
       continue;
     }
     const settings = parsed;
-    if (settings.isServerRunning === false) {
-      throw new UnityNotRunningError(projectRoot);
-    }
     const port = resolvePortFromUnitySettings(settings);
     if (port !== null) {
       return port;
@@ -5908,7 +5912,7 @@ var import_path4 = require("path");
 
 // src/default-tools.json
 var default_tools_default = {
-  version: "1.7.2",
+  version: "1.7.3",
   tools: [
     {
       name: "compile",
@@ -6541,7 +6545,7 @@ function getCachedServerVersion() {
 }
 
 // src/version.ts
-var VERSION = "1.7.2";
+var VERSION = "1.7.3";
 
 // src/spinner.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
@@ -6575,6 +6579,228 @@ function createSpinner(initialMessage) {
   };
 }
 
+// src/unity-process.ts
+var import_node_child_process = require("node:child_process");
+var import_node_util = require("node:util");
+var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
+var WINDOWS_PROCESS_QUERY = `Get-CimInstance Win32_Process -Filter "name = 'Unity.exe'" | Select-Object ProcessId, CommandLine | ConvertTo-Json -Compress`;
+var defaultDependencies = {
+  platform: process.platform,
+  runCommand: runUnityProcessQuery
+};
+function buildUnityProcessCommand(platform) {
+  if (platform === "darwin") {
+    return {
+      command: "ps",
+      args: ["-Ao", "pid=,command="]
+    };
+  }
+  if (platform === "linux") {
+    return {
+      command: "ps",
+      args: ["-eo", "pid=,args="]
+    };
+  }
+  if (platform === "win32") {
+    return {
+      command: "powershell.exe",
+      args: ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_PROCESS_QUERY]
+    };
+  }
+  return null;
+}
+function parseUnityProcesses(platform, output) {
+  if (platform === "win32") {
+    return parseWindowsUnityProcesses(output);
+  }
+  return parsePsUnityProcesses(output);
+}
+function tokenizeCommandLine(commandLine) {
+  const tokens = [];
+  let current = "";
+  let inQuotes = false;
+  for (let i = 0; i < commandLine.length; i++) {
+    const character = commandLine[i];
+    if (character === '"') {
+      inQuotes = !inQuotes;
+      continue;
+    }
+    if (!inQuotes && /\s/.test(character)) {
+      if (current.length > 0) {
+        tokens.push(current);
+        current = "";
+      }
+      continue;
+    }
+    current += character;
+  }
+  if (current.length > 0) {
+    tokens.push(current);
+  }
+  return tokens;
+}
+function extractUnityProjectPath(commandLine) {
+  const tokens = tokenizeCommandLine(commandLine);
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i].toLowerCase();
+    if (token !== "-projectpath") {
+      continue;
+    }
+    const projectPath = tokens[i + 1];
+    return projectPath ?? null;
+  }
+  return null;
+}
+function normalizeUnityProjectPath(projectPath, platform) {
+  const normalizedSeparators = projectPath.replace(/\\/g, "/").replace(/\/+$/, "");
+  if (platform === "win32") {
+    return normalizedSeparators.toLowerCase();
+  }
+  return normalizedSeparators;
+}
+function isUnityProcessForProject(commandLine, projectRoot, platform) {
+  if (platform !== "win32") {
+    return commandLineContainsProjectRoot(commandLine, projectRoot, platform);
+  }
+  const extractedProjectPath = extractUnityProjectPath(commandLine);
+  if (extractedProjectPath === null) {
+    return false;
+  }
+  return normalizeUnityProjectPath(extractedProjectPath, platform) === normalizeUnityProjectPath(projectRoot, platform);
+}
+function commandLineContainsProjectRoot(commandLine, projectRoot, platform) {
+  const projectPathFlagIndex = commandLine.toLowerCase().indexOf(" -projectpath");
+  if (projectPathFlagIndex === -1) {
+    return false;
+  }
+  const normalizedProjectRoot = normalizeUnityProjectPath(projectRoot, platform);
+  let projectRootIndex = commandLine.indexOf(normalizedProjectRoot, projectPathFlagIndex);
+  while (projectRootIndex !== -1) {
+    const beforeProjectRoot = commandLine[projectRootIndex - 1];
+    const projectPathEndIndex = skipTrailingProjectPathSeparators(
+      commandLine,
+      projectRootIndex + normalizedProjectRoot.length
+    );
+    if (isProjectPathBoundaryCharacter(beforeProjectRoot) && isProjectPathTerminator(commandLine, projectPathEndIndex)) {
+      return true;
+    }
+    projectRootIndex = commandLine.indexOf(normalizedProjectRoot, projectRootIndex + 1);
+  }
+  return false;
+}
+function isProjectPathBoundaryCharacter(character) {
+  return character === void 0 || /\s|["']/.test(character);
+}
+function skipTrailingProjectPathSeparators(commandLine, startIndex) {
+  let index = startIndex;
+  while (readCharacterAt(commandLine, index) === "/") {
+    index += 1;
+  }
+  return index;
+}
+function isProjectPathTerminator(commandLine, projectRootEndIndex) {
+  const character = readCharacterAt(commandLine, projectRootEndIndex);
+  if (character === null) {
+    return true;
+  }
+  if (character === '"' || character === "'") {
+    return true;
+  }
+  if (!/\s/.test(character)) {
+    return false;
+  }
+  for (let i = projectRootEndIndex; i < commandLine.length; i++) {
+    const trailingCharacter = readCharacterAt(commandLine, i);
+    if (trailingCharacter === null) {
+      return true;
+    }
+    if (/\s/.test(trailingCharacter)) {
+      continue;
+    }
+    return trailingCharacter === "-";
+  }
+  return true;
+}
+function readCharacterAt(value, index) {
+  const character = value.slice(index, index + 1);
+  if (character.length === 0) {
+    return null;
+  }
+  return character;
+}
+function isUnityEditorProcess(commandLine, platform) {
+  const lowerCommandLine = commandLine.toLowerCase();
+  if (lowerCommandLine.length === 0) {
+    return false;
+  }
+  const projectPathFlagIndex = lowerCommandLine.indexOf(" -projectpath");
+  const executableSection = projectPathFlagIndex === -1 ? lowerCommandLine : lowerCommandLine.slice(0, projectPathFlagIndex);
+  if (platform === "win32") {
+    return executableSection.includes("unity.exe");
+  }
+  if (platform === "darwin") {
+    return executableSection.includes("/unity.app/contents/macos/unity");
+  }
+  if (platform === "linux") {
+    return executableSection.endsWith("/unity") || executableSection.endsWith("/unity-editor") || executableSection.includes("/editor/unity");
+  }
+  return false;
+}
+async function findRunningUnityProcessForProject(projectRoot, dependencies = defaultDependencies) {
+  const unityProcessCommand = buildUnityProcessCommand(dependencies.platform);
+  if (unityProcessCommand === null) {
+    return null;
+  }
+  const output = await dependencies.runCommand(
+    unityProcessCommand.command,
+    unityProcessCommand.args
+  );
+  const runningProcesses = parseUnityProcesses(dependencies.platform, output);
+  const matchingProcess = runningProcesses.find(
+    (processInfo) => isUnityEditorProcess(processInfo.commandLine, dependencies.platform) && isUnityProcessForProject(processInfo.commandLine, projectRoot, dependencies.platform)
+  );
+  if (matchingProcess === void 0) {
+    return null;
+  }
+  return {
+    pid: matchingProcess.pid
+  };
+}
+async function runUnityProcessQuery(command, args) {
+  const { stdout } = await execFileAsync(command, args, {
+    encoding: "utf8",
+    maxBuffer: 1024 * 1024
+  });
+  return stdout;
+}
+function parsePsUnityProcesses(output) {
+  return output.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0).map((line) => {
+    const match = line.match(/^(\d+)\s+(.+)$/);
+    if (match === null) {
+      return null;
+    }
+    return {
+      pid: Number.parseInt(match[1], 10),
+      commandLine: match[2]
+    };
+  }).filter((processInfo) => processInfo !== null);
+}
+function parseWindowsUnityProcesses(output) {
+  const trimmed = output.trim();
+  if (trimmed.length === 0) {
+    return [];
+  }
+  const parsed = JSON.parse(trimmed);
+  const processArray = Array.isArray(parsed) ? parsed : [parsed];
+  return processArray.filter(isWindowsUnityProcessWithCommandLine).map((processInfo) => ({
+    pid: processInfo.ProcessId,
+    commandLine: processInfo.CommandLine
+  }));
+}
+function isWindowsUnityProcessWithCommandLine(processInfo) {
+  return typeof processInfo.ProcessId === "number" && typeof processInfo.CommandLine === "string";
+}
+
 // src/compile-helpers.ts
 var import_node_assert2 = __toESM(require("node:assert"), 1);
 var import_fs4 = require("fs");
@@ -6810,6 +7036,9 @@ var RETRY_DELAY_MS = 500;
 var MAX_RETRIES = 3;
 var COMPILE_WAIT_TIMEOUT_MS = 9e4;
 var COMPILE_WAIT_POLL_INTERVAL_MS = 100;
+var defaultConnectionFailureDiagnosisDependencies = {
+  findRunningUnityProcessForProjectFn: findRunningUnityProcessForProject
+};
 function getCompileExecutionOptions(toolName, params) {
   if (toolName !== "compile") {
     return {
@@ -6826,6 +7055,34 @@ function isRetryableError(error) {
   const message = error.message;
   return message.includes("ECONNREFUSED") || message.includes("EADDRNOTAVAIL") || message === "UNITY_NO_RESPONSE";
 }
+async function diagnoseRetryableProjectConnectionError(error, projectRoot, shouldDiagnoseProjectState, dependencies = defaultConnectionFailureDiagnosisDependencies) {
+  if (!shouldDiagnoseProjectState || projectRoot === null || !isRetryableError(error)) {
+    return error;
+  }
+  const runningProcess = await dependencies.findRunningUnityProcessForProjectFn(projectRoot).catch(() => void 0);
+  if (runningProcess === void 0) {
+    return error;
+  }
+  if (runningProcess === null) {
+    return new UnityNotRunningError(projectRoot);
+  }
+  return new UnityServerNotRunningError(projectRoot);
+}
+async function throwFinalToolError(error, projectRoot, shouldDiagnoseProjectState) {
+  const diagnosedError = await diagnoseRetryableProjectConnectionError(
+    error,
+    projectRoot,
+    shouldDiagnoseProjectState
+  );
+  if (diagnosedError instanceof Error) {
+    throw diagnosedError;
+  }
+  if (typeof diagnosedError === "string") {
+    throw new Error(diagnosedError);
+  }
+  const serializedError = JSON.stringify(diagnosedError);
+  throw new Error(serializedError ?? "Unknown error");
+}
 function isTransportDisconnectError(error) {
   if (!(error instanceof Error)) {
     return false;
@@ -6952,8 +7209,8 @@ async function executeToolCommand(toolName, params, globalOptions) {
     if (immediateResult === void 0 && !requestDispatched) {
       spinner.stop();
       restoreStdin();
-      if (lastError instanceof Error) {
-        throw lastError;
+      if (lastError !== void 0) {
+        await throwFinalToolError(lastError, projectRoot, shouldValidateProject);
       }
       throw new Error(
         "Compile request never reached Unity. Check that Unity is running and retry."
@@ -7004,14 +7261,7 @@ async function executeToolCommand(toolName, params, globalOptions) {
   if (lastError === void 0) {
     throw new Error("Tool execution failed without error details.");
   }
-  if (lastError instanceof Error) {
-    throw lastError;
-  }
-  if (typeof lastError === "string") {
-    throw new Error(lastError);
-  }
-  const serializedError = JSON.stringify(lastError);
-  throw new Error(serializedError ?? "Unknown error");
+  await throwFinalToolError(lastError, projectRoot, shouldValidateProject);
 }
 async function listAvailableTools(globalOptions) {
   let portNumber;
@@ -7062,7 +7312,7 @@ async function listAvailableTools(globalOptions) {
   }
   spinner.stop();
   restoreStdin();
-  throw lastError;
+  await throwFinalToolError(lastError, projectRoot, shouldValidateProject);
 }
 function convertProperties(unityProps) {
   const result = {};
@@ -7143,7 +7393,7 @@ async function syncTools(globalOptions) {
   }
   spinner.stop();
   restoreStdin();
-  throw lastError;
+  await throwFinalToolError(lastError, projectRoot, shouldValidateProject);
 }
 
 // src/arg-parser.ts
@@ -8023,11 +8273,11 @@ Uninstalling uloop skills (${location})...`);
 var import_path9 = require("path");
 
 // node_modules/launch-unity/dist/lib.js
-var import_node_child_process = require("node:child_process");
+var import_node_child_process2 = require("node:child_process");
 var import_node_fs2 = require("node:fs");
 var import_promises4 = require("node:fs/promises");
 var import_node_path2 = require("node:path");
-var import_node_util = require("node:util");
+var import_node_util2 = require("node:util");
 
 // node_modules/launch-unity/dist/unityHub.js
 var import_promises3 = require("node:fs/promises");
@@ -8299,7 +8549,7 @@ var getProjectCliArgs = async (projectPath) => {
 };
 
 // node_modules/launch-unity/dist/lib.js
-var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
+var execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process2.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+-[a-zA-Z]|$)/i;
@@ -8399,7 +8649,7 @@ var isUnityAuxiliaryProcess = (command) => {
 async function listUnityProcessesMac() {
   let stdout = "";
   try {
-    const result = await execFileAsync(PROCESS_LIST_COMMAND_MAC, PROCESS_LIST_ARGS_MAC);
+    const result = await execFileAsync2(PROCESS_LIST_COMMAND_MAC, PROCESS_LIST_ARGS_MAC);
     stdout = result.stdout;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -8446,7 +8696,7 @@ async function listUnityProcessesWindows() {
   ];
   let stdout = "";
   try {
-    const result = await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    const result = await execFileAsync2(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
     stdout = result.stdout ?? "";
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -8509,7 +8759,7 @@ async function focusUnityProcess(pid) {
 async function focusUnityProcessMac(pid) {
   const script = `tell application "System Events" to set frontmost of (first process whose unix id is ${pid}) to true`;
   try {
-    await execFileAsync("osascript", ["-e", script]);
+    await execFileAsync2("osascript", ["-e", script]);
     console.log("Brought existing Unity to the front.");
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -8537,7 +8787,7 @@ async function focusUnityProcessWindows(pid) {
     "[Win32Interop]::SetForegroundWindow($handle) | Out-Null"
   ];
   try {
-    await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    await execFileAsync2(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
     console.log("Brought existing Unity to the front.");
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -8546,7 +8796,7 @@ async function focusUnityProcessWindows(pid) {
 }
 async function isLockfileHeldMac(lockfilePath) {
   try {
-    const result = await execFileAsync("lsof", [lockfilePath]);
+    const result = await execFileAsync2("lsof", [lockfilePath]);
     const lines = result.stdout.split("\n").filter((line) => line.length > 0);
     return lines.length > 1;
   } catch {
@@ -8567,7 +8817,7 @@ async function isLockfileHeldWindows(lockfilePath) {
     "}"
   ];
   try {
-    const result = await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    const result = await execFileAsync2(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
     return result.stdout.trim() === "LOCKED";
   } catch {
     return false;
@@ -8677,7 +8927,7 @@ async function sendGracefulQuitMac(pid) {
     "end tell"
   ].join("\n");
   try {
-    await execFileAsync("osascript", ["-e", script]);
+    await execFileAsync2("osascript", ["-e", script]);
   } catch {
   }
 }
@@ -8687,7 +8937,7 @@ async function sendGracefulQuitWindows(pid) {
     `try { $proc = Get-Process -Id ${pid} -ErrorAction Stop; $proc.CloseMainWindow() | Out-Null } catch { }`
   ];
   try {
-    await execFileAsync(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
+    await execFileAsync2(WINDOWS_POWERSHELL, ["-NoProfile", "-Command", scriptLines.join("\n")]);
   } catch {
   }
 }
@@ -8849,7 +9099,7 @@ async function launch(opts) {
     args.push(...unityArgs);
   }
   return new Promise((resolve7, reject) => {
-    const child = (0, import_node_child_process.spawn)(unityPath, args, {
+    const child = (0, import_node_child_process2.spawn)(unityPath, args, {
       stdio: "ignore",
       detached: true,
       // Git Bash (MSYS) がWindows パスをUnix 形式に自動変換するのを防ぐ
@@ -9036,6 +9286,15 @@ function registerFocusWindowCommand(program3, helpGroup) {
 
 // src/cli-project-error.ts
 function getProjectResolutionErrorLines(error) {
+  if (error instanceof UnityServerNotRunningError) {
+    return [
+      "Error: Unity Editor is running, but Unity CLI Loop server is not.",
+      "",
+      `  Project: ${error.projectRoot}`,
+      "",
+      "Start the server from: Window > Unity CLI Loop > Server"
+    ];
+  }
   if (error instanceof UnityNotRunningError) {
     return [
       "Error: Unity Editor for this project is not running.",
@@ -9316,7 +9575,7 @@ async function runWithErrorHandling(fn) {
   try {
     await fn();
   } catch (error) {
-    if (error instanceof UnityNotRunningError) {
+    if (error instanceof UnityNotRunningError || error instanceof UnityServerNotRunningError) {
       for (const line of getProjectResolutionErrorLines(error)) {
         console.error(line.startsWith("Error: ") ? `\x1B[31m${line}\x1B[0m` : line);
       }