uloop-cli 0.44.2 → 0.45.2

package/dist/cli.bundle.cjs

@@ -3453,8 +3453,8 @@ var require_commander = __commonJS({
 });
 
 // src/cli.ts
-var import_fs4 = require("fs");
-var import_path5 = require("path");
+var import_fs5 = require("fs");
+var import_path6 = require("path");
 var import_os2 = require("os");
 var import_child_process = require("child_process");
 
@@ -3475,6 +3475,11 @@ var {
   Help
 } = import_index.default;
 
+// src/execute-tool.ts
+var readline = __toESM(require("readline"), 1);
+var import_fs3 = require("fs");
+var import_path4 = require("path");
+
 // src/direct-unity-client.ts
 var net = __toESM(require("net"), 1);
 
@@ -3685,7 +3690,7 @@ var import_path3 = require("path");
 
 // src/default-tools.json
 var default_tools_default = {
-  version: "0.44.2",
+  version: "0.45.2",
   tools: [
     {
       name: "compile",
@@ -4082,9 +4087,96 @@ function getCacheFilePath() {
 }
 
 // src/version.ts
-var VERSION = "0.44.2";
+var VERSION = "0.45.2";
+
+// src/spinner.ts
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var FRAME_INTERVAL_MS = 80;
+function createSpinner(initialMessage) {
+  if (!process.stderr.isTTY) {
+    return {
+      update: () => {
+      },
+      stop: () => {
+      }
+    };
+  }
+  let frameIndex = 0;
+  let currentMessage = initialMessage;
+  const render = () => {
+    const frame = SPINNER_FRAMES[frameIndex];
+    process.stderr.write(`\r\x1B[K${frame} ${currentMessage}`);
+    frameIndex = (frameIndex + 1) % SPINNER_FRAMES.length;
+  };
+  render();
+  const intervalId = setInterval(render, FRAME_INTERVAL_MS);
+  return {
+    update(message) {
+      currentMessage = message;
+    },
+    stop() {
+      clearInterval(intervalId);
+      process.stderr.write("\r\x1B[K");
+    }
+  };
+}
 
 // src/execute-tool.ts
+function suppressStdinEcho() {
+  if (!process.stdin.isTTY) {
+    return () => {
+    };
+  }
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: false
+  });
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  const onData = (data) => {
+    if (data[0] === 3) {
+      process.exit(130);
+    }
+  };
+  process.stdin.on("data", onData);
+  return () => {
+    process.stdin.off("data", onData);
+    process.stdin.setRawMode(false);
+    process.stdin.pause();
+    rl.close();
+  };
+}
+var RETRY_DELAY_MS = 500;
+var MAX_RETRIES = 3;
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryableError(error) {
+  if (!(error instanceof Error)) {
+    return false;
+  }
+  const message = error.message;
+  return message.includes("ECONNREFUSED") || message === "UNITY_NO_RESPONSE";
+}
+function checkUnityBusyState() {
+  const projectRoot = findUnityProjectRoot();
+  if (projectRoot === null) {
+    return;
+  }
+  const compilingLock = (0, import_path4.join)(projectRoot, "Temp", "compiling.lock");
+  if ((0, import_fs3.existsSync)(compilingLock)) {
+    throw new Error("UNITY_COMPILING");
+  }
+  const domainReloadLock = (0, import_path4.join)(projectRoot, "Temp", "domainreload.lock");
+  if ((0, import_fs3.existsSync)(domainReloadLock)) {
+    throw new Error("UNITY_DOMAIN_RELOAD");
+  }
+  const serverStartingLock = (0, import_path4.join)(projectRoot, "Temp", "serverstarting.lock");
+  if ((0, import_fs3.existsSync)(serverStartingLock)) {
+    throw new Error("UNITY_SERVER_STARTING");
+  }
+}
 async function executeToolCommand(toolName, params, globalOptions) {
   let portNumber;
   if (globalOptions.port) {
@@ -4095,14 +4187,38 @@ async function executeToolCommand(toolName, params, globalOptions) {
     portNumber = parsed;
   }
   const port = await resolveUnityPort(portNumber);
-  const client = new DirectUnityClient(port);
-  try {
-    await client.connect();
-    const result = await client.sendRequest(toolName, params);
-    console.log(JSON.stringify(result, null, 2));
-  } finally {
-    client.disconnect();
+  const restoreStdin = suppressStdinEcho();
+  const spinner = createSpinner("Connecting to Unity...");
+  let lastError;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    checkUnityBusyState();
+    const client = new DirectUnityClient(port);
+    try {
+      await client.connect();
+      spinner.update(`Executing ${toolName}...`);
+      const result = await client.sendRequest(toolName, params);
+      if (result === void 0 || result === null) {
+        throw new Error("UNITY_NO_RESPONSE");
+      }
+      spinner.stop();
+      restoreStdin();
+      console.log(JSON.stringify(result, null, 2));
+      return;
+    } catch (error) {
+      lastError = error;
+      client.disconnect();
+      if (!isRetryableError(error) || attempt >= MAX_RETRIES) {
+        break;
+      }
+      spinner.update("Retrying connection...");
+      await sleep(RETRY_DELAY_MS);
+    } finally {
+      client.disconnect();
+    }
   }
+  spinner.stop();
+  restoreStdin();
+  throw lastError;
 }
 async function listAvailableTools(globalOptions) {
   let portNumber;
@@ -4114,19 +4230,40 @@ async function listAvailableTools(globalOptions) {
     portNumber = parsed;
   }
   const port = await resolveUnityPort(portNumber);
-  const client = new DirectUnityClient(port);
-  try {
-    await client.connect();
-    const result = await client.sendRequest("get-tool-details", { IncludeDevelopmentOnly: false });
-    if (!result.Tools || !Array.isArray(result.Tools)) {
-      throw new Error("Unexpected response from Unity: missing Tools array");
-    }
-    for (const tool of result.Tools) {
-      console.log(`  - ${tool.name}`);
+  const restoreStdin = suppressStdinEcho();
+  const spinner = createSpinner("Connecting to Unity...");
+  let lastError;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    checkUnityBusyState();
+    const client = new DirectUnityClient(port);
+    try {
+      await client.connect();
+      spinner.update("Fetching tool list...");
+      const result = await client.sendRequest("get-tool-details", { IncludeDevelopmentOnly: false });
+      if (!result.Tools || !Array.isArray(result.Tools)) {
+        throw new Error("Unexpected response from Unity: missing Tools array");
+      }
+      spinner.stop();
+      restoreStdin();
+      for (const tool of result.Tools) {
+        console.log(`  - ${tool.name}`);
+      }
+      return;
+    } catch (error) {
+      lastError = error;
+      client.disconnect();
+      if (!isRetryableError(error) || attempt >= MAX_RETRIES) {
+        break;
+      }
+      spinner.update("Retrying connection...");
+      await sleep(RETRY_DELAY_MS);
+    } finally {
+      client.disconnect();
     }
-  } finally {
-    client.disconnect();
   }
+  spinner.stop();
+  restoreStdin();
+  throw lastError;
 }
 function convertProperties(unityProps) {
   const result = {};
@@ -4150,35 +4287,57 @@ async function syncTools(globalOptions) {
     portNumber = parsed;
   }
   const port = await resolveUnityPort(portNumber);
-  const client = new DirectUnityClient(port);
-  try {
-    await client.connect();
-    const result = await client.sendRequest("get-tool-details", { IncludeDevelopmentOnly: false });
-    if (!result.Tools || !Array.isArray(result.Tools)) {
-      throw new Error("Unexpected response from Unity: missing Tools array");
-    }
-    const cache = {
-      version: VERSION,
-      updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      tools: result.Tools.map((tool) => ({
-        name: tool.name,
-        description: tool.description,
-        inputSchema: {
-          type: "object",
-          properties: convertProperties(tool.parameterSchema.Properties),
-          required: tool.parameterSchema.Required
-        }
-      }))
-    };
-    saveToolsCache(cache);
-    console.log(`Synced ${cache.tools.length} tools to ${getCacheFilePath()}`);
-    console.log("\nTools:");
-    for (const tool of cache.tools) {
-      console.log(`  - ${tool.name}`);
+  const restoreStdin = suppressStdinEcho();
+  const spinner = createSpinner("Connecting to Unity...");
+  let lastError;
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+    checkUnityBusyState();
+    const client = new DirectUnityClient(port);
+    try {
+      await client.connect();
+      spinner.update("Syncing tools...");
+      const result = await client.sendRequest("get-tool-details", { IncludeDevelopmentOnly: false });
+      spinner.stop();
+      if (!result.Tools || !Array.isArray(result.Tools)) {
+        restoreStdin();
+        throw new Error("Unexpected response from Unity: missing Tools array");
+      }
+      const cache = {
+        version: VERSION,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        tools: result.Tools.map((tool) => ({
+          name: tool.name,
+          description: tool.description,
+          inputSchema: {
+            type: "object",
+            properties: convertProperties(tool.parameterSchema.Properties),
+            required: tool.parameterSchema.Required
+          }
+        }))
+      };
+      saveToolsCache(cache);
+      console.log(`Synced ${cache.tools.length} tools to ${getCacheFilePath()}`);
+      console.log("\nTools:");
+      for (const tool of cache.tools) {
+        console.log(`  - ${tool.name}`);
+      }
+      restoreStdin();
+      return;
+    } catch (error) {
+      lastError = error;
+      client.disconnect();
+      if (!isRetryableError(error) || attempt >= MAX_RETRIES) {
+        break;
+      }
+      spinner.update("Retrying connection...");
+      await sleep(RETRY_DELAY_MS);
+    } finally {
+      client.disconnect();
     }
-  } finally {
-    client.disconnect();
   }
+  spinner.stop();
+  restoreStdin();
+  throw lastError;
 }
 
 // src/arg-parser.ts
@@ -4188,12 +4347,12 @@ function pascalToKebabCase(pascal) {
 }
 
 // src/skills/skills-manager.ts
-var import_fs3 = require("fs");
-var import_path4 = require("path");
+var import_fs4 = require("fs");
+var import_path5 = require("path");
 var import_os = require("os");
 
 // src/skills/skill-definitions/uloop-compile/SKILL.md
-var SKILL_default = "---\nname: uloop-compile\ndescription: Compile Unity project via uloop CLI. Use when you need to: (1) Verify C# code compiles successfully after editing scripts, (2) Check for compile errors or warnings, (3) Validate script changes before running tests.\n---\n\n# uloop compile\n\nExecute Unity project compilation.\n\n## Usage\n\n```bash\nuloop compile [--force-recompile]\n```\n\n## Parameters\n\n| Parameter | Type | Description |\n|-----------|------|-------------|\n| `--force-recompile` | boolean | Force full recompilation (triggers Domain Reload) |\n\n## Examples\n\n```bash\n# Check compilation\nuloop compile\n\n# Force full recompilation\nuloop compile --force-recompile\n```\n\n## Output\n\nReturns JSON:\n- `Success`: boolean\n- `ErrorCount`: number\n- `WarningCount`: number\n";
+var SKILL_default = '---\nname: uloop-compile\ndescription: Compile Unity project via uloop CLI. Use when you need to: (1) Verify C# code compiles successfully after editing scripts, (2) Check for compile errors or warnings, (3) Validate script changes before running tests.\n---\n\n# uloop compile\n\nExecute Unity project compilation.\n\n## Usage\n\n```bash\nuloop compile [--force-recompile]\n```\n\n## Parameters\n\n| Parameter | Type | Description |\n|-----------|------|-------------|\n| `--force-recompile` | boolean | Force full recompilation (triggers Domain Reload) |\n\n## Examples\n\n```bash\n# Check compilation\nuloop compile\n\n# Force full recompilation\nuloop compile --force-recompile\n```\n\n## Output\n\nReturns JSON:\n- `Success`: boolean\n- `ErrorCount`: number\n- `WarningCount`: number\n\n## Troubleshooting\n\nIf CLI hangs or shows "Unity is busy" errors after compilation, stale lock files may be preventing connection. Run the following to clean them up:\n\n```bash\nuloop fix\n```\n\nThis removes any leftover lock files (`compiling.lock`, `domainreload.lock`, `serverstarting.lock`) from the Unity project\'s Temp directory.\n';
 
 // src/skills/skill-definitions/uloop-get-logs/SKILL.md
 var SKILL_default2 = '---\nname: uloop-get-logs\ndescription: Retrieve Unity Console logs via uloop CLI. Use when you need to: (1) Check for errors or warnings after operations, (2) Debug runtime issues in Unity Editor, (3) Investigate unexpected behavior or exceptions.\n---\n\n# uloop get-logs\n\nRetrieve logs from Unity Console.\n\n## Usage\n\n```bash\nuloop get-logs [options]\n```\n\n## Parameters\n\n| Parameter | Type | Default | Description |\n|-----------|------|---------|-------------|\n| `--log-type` | string | `All` | Log type filter: `Error`, `Warning`, `Log`, `All` |\n| `--max-count` | integer | `100` | Maximum number of logs to retrieve |\n| `--search-text` | string | - | Text to search within logs |\n| `--include-stack-trace` | boolean | `true` | Include stack trace in output |\n| `--use-regex` | boolean | `false` | Use regex for search |\n| `--search-in-stack-trace` | boolean | `false` | Search within stack trace |\n\n## Examples\n\n```bash\n# Get all logs\nuloop get-logs\n\n# Get only errors\nuloop get-logs --log-type Error\n\n# Search for specific text\nuloop get-logs --search-text "NullReference"\n\n# Regex search\nuloop get-logs --search-text "Missing.*Component" --use-regex\n```\n\n## Output\n\nReturns JSON array of log entries with message, type, and optional stack trace.\n';
@@ -4269,69 +4428,69 @@ var BUNDLED_SKILLS = [
 ];
 
 // src/skills/skills-manager.ts
-function getGlobalSkillsDir() {
-  return (0, import_path4.join)((0, import_os.homedir)(), ".claude", "skills");
+function getGlobalSkillsDir(target) {
+  return (0, import_path5.join)((0, import_os.homedir)(), target.projectDir, "skills");
 }
-function getProjectSkillsDir() {
-  return (0, import_path4.join)(process.cwd(), ".claude", "skills");
+function getProjectSkillsDir(target) {
+  return (0, import_path5.join)(process.cwd(), target.projectDir, "skills");
 }
-function getSkillPath(skillDirName, global) {
-  const baseDir = global ? getGlobalSkillsDir() : getProjectSkillsDir();
-  return (0, import_path4.join)(baseDir, skillDirName, "SKILL.md");
+function getSkillPath(skillDirName, target, global) {
+  const baseDir = global ? getGlobalSkillsDir(target) : getProjectSkillsDir(target);
+  return (0, import_path5.join)(baseDir, skillDirName, target.skillFileName);
 }
-function isSkillInstalled(skill, global) {
-  const skillPath = getSkillPath(skill.dirName, global);
-  return (0, import_fs3.existsSync)(skillPath);
+function isSkillInstalled(skill, target, global) {
+  const skillPath = getSkillPath(skill.dirName, target, global);
+  return (0, import_fs4.existsSync)(skillPath);
 }
-function isSkillOutdated(skill, global) {
-  const skillPath = getSkillPath(skill.dirName, global);
-  if (!(0, import_fs3.existsSync)(skillPath)) {
+function isSkillOutdated(skill, target, global) {
+  const skillPath = getSkillPath(skill.dirName, target, global);
+  if (!(0, import_fs4.existsSync)(skillPath)) {
     return false;
   }
-  const installedContent = (0, import_fs3.readFileSync)(skillPath, "utf-8");
+  const installedContent = (0, import_fs4.readFileSync)(skillPath, "utf-8");
   return installedContent !== skill.content;
 }
-function getSkillStatus(skill, global) {
-  if (!isSkillInstalled(skill, global)) {
+function getSkillStatus(skill, target, global) {
+  if (!isSkillInstalled(skill, target, global)) {
     return "not_installed";
   }
-  if (isSkillOutdated(skill, global)) {
+  if (isSkillOutdated(skill, target, global)) {
     return "outdated";
   }
   return "installed";
 }
-function getAllSkillStatuses(global) {
+function getAllSkillStatuses(target, global) {
   return BUNDLED_SKILLS.map((skill) => ({
     name: skill.name,
-    status: getSkillStatus(skill, global),
-    path: isSkillInstalled(skill, global) ? getSkillPath(skill.dirName, global) : void 0
+    status: getSkillStatus(skill, target, global),
+    path: isSkillInstalled(skill, target, global) ? getSkillPath(skill.dirName, target, global) : void 0
   }));
 }
-function installSkill(skill, global) {
-  const baseDir = global ? getGlobalSkillsDir() : getProjectSkillsDir();
-  const skillDir = (0, import_path4.join)(baseDir, skill.dirName);
-  const skillPath = (0, import_path4.join)(skillDir, "SKILL.md");
-  (0, import_fs3.mkdirSync)(skillDir, { recursive: true });
-  (0, import_fs3.writeFileSync)(skillPath, skill.content, "utf-8");
+function installSkill(skill, target, global) {
+  const baseDir = global ? getGlobalSkillsDir(target) : getProjectSkillsDir(target);
+  const skillDir = (0, import_path5.join)(baseDir, skill.dirName);
+  const skillPath = (0, import_path5.join)(skillDir, target.skillFileName);
+  (0, import_fs4.mkdirSync)(skillDir, { recursive: true });
+  (0, import_fs4.writeFileSync)(skillPath, skill.content, "utf-8");
 }
-function uninstallSkill(skill, global) {
-  const baseDir = global ? getGlobalSkillsDir() : getProjectSkillsDir();
-  const skillDir = (0, import_path4.join)(baseDir, skill.dirName);
-  if (!(0, import_fs3.existsSync)(skillDir)) {
+function uninstallSkill(skill, target, global) {
+  const baseDir = global ? getGlobalSkillsDir(target) : getProjectSkillsDir(target);
+  const skillDir = (0, import_path5.join)(baseDir, skill.dirName);
+  if (!(0, import_fs4.existsSync)(skillDir)) {
     return false;
   }
-  (0, import_fs3.rmSync)(skillDir, { recursive: true, force: true });
+  (0, import_fs4.rmSync)(skillDir, { recursive: true, force: true });
   return true;
 }
-function installAllSkills(global) {
+function installAllSkills(target, global) {
   const result = { installed: 0, updated: 0, skipped: 0 };
   for (const skill of BUNDLED_SKILLS) {
-    const status = getSkillStatus(skill, global);
+    const status = getSkillStatus(skill, target, global);
     if (status === "not_installed") {
-      installSkill(skill, global);
+      installSkill(skill, target, global);
       result.installed++;
     } else if (status === "outdated") {
-      installSkill(skill, global);
+      installSkill(skill, target, global);
       result.updated++;
     } else {
       result.skipped++;
@@ -4339,10 +4498,10 @@ function installAllSkills(global) {
   }
   return result;
 }
-function uninstallAllSkills(global) {
+function uninstallAllSkills(target, global) {
   const result = { removed: 0, notFound: 0 };
   for (const skill of BUNDLED_SKILLS) {
-    if (uninstallSkill(skill, global)) {
+    if (uninstallSkill(skill, target, global)) {
       result.removed++;
     } else {
       result.notFound++;
@@ -4350,41 +4509,103 @@ function uninstallAllSkills(global) {
   }
   return result;
 }
-function getInstallDir(global) {
-  return global ? getGlobalSkillsDir() : getProjectSkillsDir();
+function getInstallDir(target, global) {
+  return global ? getGlobalSkillsDir(target) : getProjectSkillsDir(target);
 }
 function getTotalSkillCount() {
   return BUNDLED_SKILLS.length;
 }
 
+// src/skills/target-config.ts
+var TARGET_CONFIGS = {
+  claude: {
+    id: "claude",
+    displayName: "Claude Code",
+    projectDir: ".claude",
+    skillFileName: "SKILL.md"
+  },
+  codex: {
+    id: "codex",
+    displayName: "Codex CLI",
+    projectDir: ".codex",
+    skillFileName: "SKILL.md"
+  }
+};
+var ALL_TARGET_IDS = ["claude", "codex"];
+function getTargetConfig(id) {
+  return TARGET_CONFIGS[id];
+}
+
 // src/skills/skills-command.ts
 function registerSkillsCommand(program3) {
-  const skillsCmd = program3.command("skills").description("Manage uloop skills for Claude Code");
-  skillsCmd.command("list").description("List all uloop skills and their installation status").option("-g, --global", "Check global installation (~/.claude/skills/)").action((options) => {
-    listSkills(options.global ?? false);
+  const skillsCmd = program3.command("skills").description("Manage uloop skills for AI coding tools");
+  skillsCmd.command("list").description("List all uloop skills and their installation status").option("-g, --global", "Check global installation").option("--claude", "Check Claude Code installation").option("--codex", "Check Codex CLI installation").action((options) => {
+    const targets = resolveTargets(options);
+    const global = options.global ?? false;
+    listSkills(targets, global);
   });
-  skillsCmd.command("install").description("Install all uloop skills").option("-g, --global", "Install to global location (~/.claude/skills/)").action((options) => {
-    installSkills(options.global ?? false);
+  skillsCmd.command("install").description("Install all uloop skills").option("-g, --global", "Install to global location").option("--claude", "Install to Claude Code").option("--codex", "Install to Codex CLI").action((options) => {
+    const targets = resolveTargets(options);
+    if (targets.length === 0) {
+      showTargetGuidance("install");
+      return;
+    }
+    installSkills(targets, options.global ?? false);
   });
-  skillsCmd.command("uninstall").description("Uninstall all uloop skills").option("-g, --global", "Uninstall from global location (~/.claude/skills/)").action((options) => {
-    uninstallSkills(options.global ?? false);
+  skillsCmd.command("uninstall").description("Uninstall all uloop skills").option("-g, --global", "Uninstall from global location").option("--claude", "Uninstall from Claude Code").option("--codex", "Uninstall from Codex CLI").action((options) => {
+    const targets = resolveTargets(options);
+    if (targets.length === 0) {
+      showTargetGuidance("uninstall");
+      return;
+    }
+    uninstallSkills(targets, options.global ?? false);
   });
 }
-function listSkills(global) {
+function resolveTargets(options) {
+  const targets = [];
+  if (options.claude) {
+    targets.push(getTargetConfig("claude"));
+  }
+  if (options.codex) {
+    targets.push(getTargetConfig("codex"));
+  }
+  return targets;
+}
+function showTargetGuidance(command) {
+  console.log(`
+Please specify at least one target for '${command}':`);
+  console.log("");
+  console.log("Available targets:");
+  console.log("  --claude   Claude Code (.claude/skills/)");
+  console.log("  --codex    Codex CLI (.codex/skills/)");
+  console.log("");
+  console.log("Options:");
+  console.log("  -g, --global   Use global location (~/.claude/ or ~/.codex/)");
+  console.log("");
+  console.log("Examples:");
+  console.log(`  uloop skills ${command} --claude`);
+  console.log(`  uloop skills ${command} --codex --global`);
+  console.log(`  uloop skills ${command} --claude --codex`);
+}
+function listSkills(targets, global) {
   const location = global ? "Global" : "Project";
-  const dir = getInstallDir(global);
+  const targetConfigs = targets.length > 0 ? targets : ALL_TARGET_IDS.map(getTargetConfig);
   console.log(`
-uloop Skills Status (${location}):`);
-  console.log(`Location: ${dir}`);
-  console.log("=".repeat(50));
+uloop Skills Status:`);
   console.log("");
-  const statuses = getAllSkillStatuses(global);
-  for (const skill of statuses) {
-    const icon = getStatusIcon(skill.status);
-    const statusText = getStatusText(skill.status);
-    console.log(`  ${icon} ${skill.name} (${statusText})`);
+  for (const target of targetConfigs) {
+    const dir = getInstallDir(target, global);
+    console.log(`${target.displayName} (${location}):`);
+    console.log(`Location: ${dir}`);
+    console.log("=".repeat(50));
+    const statuses = getAllSkillStatuses(target, global);
+    for (const skill of statuses) {
+      const icon = getStatusIcon(skill.status);
+      const statusText = getStatusText(skill.status);
+      console.log(`  ${icon} ${skill.name} (${statusText})`);
+    }
+    console.log("");
   }
-  console.log("");
   console.log(`Total: ${getTotalSkillCount()} bundled skills`);
 }
 function getStatusIcon(status) {
@@ -4411,34 +4632,40 @@ function getStatusText(status) {
       return "unknown";
   }
 }
-function installSkills(global) {
+function installSkills(targets, global) {
   const location = global ? "global" : "project";
-  const dir = getInstallDir(global);
   console.log(`
 Installing uloop skills (${location})...`);
   console.log("");
-  const result = installAllSkills(global);
-  console.log(`\x1B[32m\u2713\x1B[0m Installed: ${result.installed}`);
-  console.log(`\x1B[33m\u2191\x1B[0m Updated: ${result.updated}`);
-  console.log(`\x1B[90m-\x1B[0m Skipped (up-to-date): ${result.skipped}`);
-  console.log("");
-  console.log(`Skills installed to ${dir}`);
+  for (const target of targets) {
+    const dir = getInstallDir(target, global);
+    const result = installAllSkills(target, global);
+    console.log(`${target.displayName}:`);
+    console.log(`  \x1B[32m\u2713\x1B[0m Installed: ${result.installed}`);
+    console.log(`  \x1B[33m\u2191\x1B[0m Updated: ${result.updated}`);
+    console.log(`  \x1B[90m-\x1B[0m Skipped (up-to-date): ${result.skipped}`);
+    console.log(`  Location: ${dir}`);
+    console.log("");
+  }
 }
-function uninstallSkills(global) {
+function uninstallSkills(targets, global) {
   const location = global ? "global" : "project";
-  const dir = getInstallDir(global);
   console.log(`
 Uninstalling uloop skills (${location})...`);
   console.log("");
-  const result = uninstallAllSkills(global);
-  console.log(`\x1B[31m\u2717\x1B[0m Removed: ${result.removed}`);
-  console.log(`\x1B[90m-\x1B[0m Not found: ${result.notFound}`);
-  console.log("");
-  console.log(`Skills removed from ${dir}`);
+  for (const target of targets) {
+    const dir = getInstallDir(target, global);
+    const result = uninstallAllSkills(target, global);
+    console.log(`${target.displayName}:`);
+    console.log(`  \x1B[31m\u2717\x1B[0m Removed: ${result.removed}`);
+    console.log(`  \x1B[90m-\x1B[0m Not found: ${result.notFound}`);
+    console.log(`  Location: ${dir}`);
+    console.log("");
+  }
 }
 
 // src/cli.ts
-var BUILTIN_COMMANDS = ["list", "sync", "completion", "update", "skills"];
+var BUILTIN_COMMANDS = ["list", "sync", "completion", "update", "fix", "skills"];
 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)");
@@ -4455,6 +4682,9 @@ 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();
+});
 registerSkillsCommand(program2);
 var toolsCache = loadToolsCache();
 for (const tool of toolsCache.tools) {
@@ -4538,27 +4768,34 @@ function extractGlobalOptions(options) {
     port: options["port"]
   };
 }
-function isDomainReloadLockFilePresent() {
-  const projectRoot = findUnityProjectRoot();
-  if (projectRoot === null) {
-    return false;
-  }
-  const lockPath = (0, import_path5.join)(projectRoot, "Temp", "domainreload.lock");
-  return (0, import_fs4.existsSync)(lockPath);
-}
 async function runWithErrorHandling(fn) {
   try {
     await fn();
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
+    if (message === "UNITY_COMPILING") {
+      console.error("\x1B[33m\u23F3 Unity is compiling scripts.\x1B[0m");
+      console.error("Please wait for compilation to finish and try again.");
+      process.exit(1);
+    }
+    if (message === "UNITY_DOMAIN_RELOAD") {
+      console.error("\x1B[33m\u23F3 Unity is reloading (Domain Reload in progress).\x1B[0m");
+      console.error("Please wait a moment and try again.");
+      process.exit(1);
+    }
+    if (message === "UNITY_SERVER_STARTING") {
+      console.error("\x1B[33m\u23F3 Unity server is starting.\x1B[0m");
+      console.error("Please wait a moment and try again.");
+      process.exit(1);
+    }
+    if (message === "UNITY_NO_RESPONSE") {
+      console.error("\x1B[33m\u23F3 Unity is busy (no response received).\x1B[0m");
+      console.error("Unity may be compiling, reloading, or starting. Please wait and try again.");
+      process.exit(1);
+    }
     if (message.includes("ECONNREFUSED")) {
-      if (isDomainReloadLockFilePresent()) {
-        console.error("\x1B[33m\u23F3 Unity is reloading (Domain Reload in progress).\x1B[0m");
-        console.error("Please wait a moment and try again.");
-      } else {
-        console.error("\x1B[31mError: Cannot connect to Unity.\x1B[0m");
-        console.error("Make sure Unity is running with uLoopMCP installed.");
-      }
+      console.error("\x1B[31mError: Cannot connect to Unity.\x1B[0m");
+      console.error("Make sure Unity is running with uLoopMCP installed.");
       process.exit(1);
     }
     console.error(`\x1B[31mError: ${message}\x1B[0m`);
@@ -4567,7 +4804,7 @@ async function runWithErrorHandling(fn) {
 }
 function detectShell() {
   const shell = process.env["SHELL"] || "";
-  const shellName = (0, import_path5.basename)(shell).replace(/\.exe$/i, "");
+  const shellName = (0, import_path6.basename)(shell).replace(/\.exe$/i, "");
   if (shellName === "zsh") {
     return "zsh";
   }
@@ -4582,12 +4819,12 @@ function detectShell() {
 function getShellConfigPath(shell) {
   const home = (0, import_os2.homedir)();
   if (shell === "zsh") {
-    return (0, import_path5.join)(home, ".zshrc");
+    return (0, import_path6.join)(home, ".zshrc");
   }
   if (shell === "powershell") {
-    return (0, import_path5.join)(home, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1");
+    return (0, import_path6.join)(home, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1");
   }
-  return (0, import_path5.join)(home, ".bashrc");
+  return (0, import_path6.join)(home, ".bashrc");
 }
 function getCompletionScript(shell) {
   if (shell === "bash") {
@@ -4663,6 +4900,30 @@ function updateCli() {
     process.exit(1);
   });
 }
+var LOCK_FILES = ["compiling.lock", "domainreload.lock", "serverstarting.lock"];
+function cleanupLockFiles() {
+  const projectRoot = findUnityProjectRoot();
+  if (projectRoot === null) {
+    console.error("Could not find Unity project root.");
+    process.exit(1);
+  }
+  const tempDir = (0, import_path6.join)(projectRoot, "Temp");
+  let cleaned = 0;
+  for (const lockFile of LOCK_FILES) {
+    const lockPath = (0, import_path6.join)(tempDir, lockFile);
+    if ((0, import_fs5.existsSync)(lockPath)) {
+      (0, import_fs5.unlinkSync)(lockPath);
+      console.log(`Removed: ${lockFile}`);
+      cleaned++;
+    }
+  }
+  if (cleaned === 0) {
+    console.log("No lock files found.");
+  } else {
+    console.log(`
+\u2705 Cleaned up ${cleaned} lock file(s).`);
+  }
+}
 function handleCompletion(install, shellOverride) {
   let shell;
   if (shellOverride) {
@@ -4686,13 +4947,13 @@ function handleCompletion(install, shellOverride) {
     return;
   }
   const configPath = getShellConfigPath(shell);
-  const configDir = (0, import_path5.dirname)(configPath);
-  if (!(0, import_fs4.existsSync)(configDir)) {
-    (0, import_fs4.mkdirSync)(configDir, { recursive: true });
+  const configDir = (0, import_path6.dirname)(configPath);
+  if (!(0, import_fs5.existsSync)(configDir)) {
+    (0, import_fs5.mkdirSync)(configDir, { recursive: true });
   }
   let content = "";
-  if ((0, import_fs4.existsSync)(configPath)) {
-    content = (0, import_fs4.readFileSync)(configPath, "utf-8");
+  if ((0, import_fs5.existsSync)(configPath)) {
+    content = (0, import_fs5.readFileSync)(configPath, "utf-8");
     content = content.replace(
       /\n?# >>> uloop completion >>>[\s\S]*?# <<< uloop completion <<<\n?/g,
       ""
@@ -4706,7 +4967,7 @@ ${startMarker}
 ${script}
 ${endMarker}
 `;
-    (0, import_fs4.writeFileSync)(configPath, content + lineToAdd, "utf-8");
+    (0, import_fs5.writeFileSync)(configPath, content + lineToAdd, "utf-8");
   } else {
     const evalLine = `eval "$(uloop completion --shell ${shell})"`;
     const lineToAdd = `
@@ -4714,7 +4975,7 @@ ${startMarker}
 ${evalLine}
 ${endMarker}
 `;
-    (0, import_fs4.writeFileSync)(configPath, content + lineToAdd, "utf-8");
+    (0, import_fs5.writeFileSync)(configPath, content + lineToAdd, "utf-8");
   }
   console.log(`Completion installed to ${configPath}`);
   if (shell === "powershell") {