uloop-cli 1.6.3 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uloop-cli",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "//version": "x-release-please-version",
   "description": "CLI tool for Unity Editor communication via Unity CLI Loop",
   "main": "dist/cli.bundle.cjs",
@@ -49,17 +49,17 @@
   "devDependencies": {
     "@eslint/js": "10.0.1",
     "@types/jest": "30.0.0",
-    "@types/node": "25.5.0",
+    "@types/node": "25.5.2",
     "@types/semver": "7.7.1",
-    "esbuild": "0.27.4",
-    "eslint": "10.1.0",
+    "esbuild": "0.28.0",
+    "eslint": "10.2.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-security": "4.0.0",
     "jest": "30.3.0",
-    "knip": "6.1.1",
+    "knip": "6.3.0",
     "prettier": "3.8.1",
-    "ts-jest": "29.4.6",
+    "ts-jest": "29.4.9",
     "typescript": "5.9.3",
     "typescript-eslint": "8.58.0"
   },

package/src/__tests__/port-resolver.test.ts

@@ -142,4 +142,49 @@ describe('resolveUnityPort with project settings', () => {
       'Could not read Unity server port from settings',
     );
   });
+
+  it('returns port when primary settings file is missing but backup exists', async () => {
+    writeFileSync(
+      join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json.bak'),
+      JSON.stringify({ isServerRunning: true, customPort: 8722 }),
+    );
+
+    const port = await resolveUnityPort(undefined, tempProjectRoot);
+    expect(port).toBe(8722);
+  });
+
+  it('returns port when primary settings file is missing but temp exists', async () => {
+    writeFileSync(
+      join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json.tmp'),
+      JSON.stringify({ isServerRunning: true, customPort: 8723 }),
+    );
+
+    const port = await resolveUnityPort(undefined, tempProjectRoot);
+    expect(port).toBe(8723);
+  });
+
+  it('returns port from temp when both temp and backup exist', async () => {
+    writeFileSync(
+      join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json.tmp'),
+      JSON.stringify({ isServerRunning: true, customPort: 8724 }),
+    );
+    writeFileSync(
+      join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json.bak'),
+      JSON.stringify({ isServerRunning: true, customPort: 8725 }),
+    );
+
+    const port = await resolveUnityPort(undefined, tempProjectRoot);
+    expect(port).toBe(8724);
+  });
+
+  it('falls back to temp when primary settings file contains invalid JSON', async () => {
+    writeFileSync(join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json'), 'not valid json{{{');
+    writeFileSync(
+      join(tempProjectRoot, 'UserSettings/UnityMcpSettings.json.tmp'),
+      JSON.stringify({ isServerRunning: true, customPort: 8726 }),
+    );
+
+    const port = await resolveUnityPort(undefined, tempProjectRoot);
+    expect(port).toBe(8726);
+  });
 });

package/src/__tests__/project-root.test.ts

@@ -4,7 +4,11 @@
 import { mkdirSync, writeFileSync, rmSync } from 'fs';
 import { join } from 'path';
 import { tmpdir } from 'os';
-import { findUnityProjectRoot, resetMultipleProjectsWarning } from '../project-root.js';
+import {
+  findUnityProjectRoot,
+  hasUloopInstalled,
+  resetMultipleProjectsWarning,
+} from '../project-root.js';
 
 function createUnityProject(basePath: string, name: string): string {
   const projectPath = join(basePath, name);
@@ -95,3 +99,33 @@ describe('findUnityProjectRoot', () => {
     expect(result).toBe(join(testDir, 'Alpha'));
   });
 });
+
+describe('hasUloopInstalled', () => {
+  let testDir: string;
+
+  beforeEach(() => {
+    testDir = join(
+      tmpdir(),
+      `uloop-installed-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    );
+    mkdirSync(join(testDir, 'Assets'), { recursive: true });
+    mkdirSync(join(testDir, 'ProjectSettings'), { recursive: true });
+    mkdirSync(join(testDir, 'UserSettings'), { recursive: true });
+  });
+
+  afterEach(() => {
+    rmSync(testDir, { recursive: true, force: true });
+  });
+
+  it('returns true when only backup settings file exists', () => {
+    writeFileSync(join(testDir, 'UserSettings/UnityMcpSettings.json.bak'), '{}');
+
+    expect(hasUloopInstalled(testDir)).toBe(true);
+  });
+
+  it('returns true when only temp settings file exists', () => {
+    writeFileSync(join(testDir, 'UserSettings/UnityMcpSettings.json.tmp'), '{}');
+
+    expect(hasUloopInstalled(testDir)).toBe(true);
+  });
+});

package/src/default-tools.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.3",
+  "version": "1.7.0",
   "tools": [
     {
       "name": "compile",

package/src/port-resolver.ts

@@ -10,7 +10,12 @@ import { PRODUCT_DISPLAY_NAME } from './cli-constants';
 import { readFile } from 'fs/promises';
 import { existsSync } from 'fs';
 import { join, resolve } from 'path';
-import { findUnityProjectRoot, isUnityProject, hasUloopInstalled } from './project-root.js';
+import {
+  findUnityProjectRoot,
+  getUnitySettingsCandidatePaths,
+  isUnityProject,
+  hasUloopInstalled,
+} from './project-root.js';
 
 export class UnityNotRunningError extends Error {
   constructor(public readonly projectRoot: string) {
@@ -105,41 +110,37 @@ function createSettingsReadError(projectRoot: string): Error {
 
 // File I/O and JSON parsing can fail for external reasons (permissions, corruption, concurrent writes)
 async function readPortFromSettingsOrThrow(projectRoot: string): Promise<number> {
-  const settingsPath = join(projectRoot, 'UserSettings/UnityMcpSettings.json');
-
-  if (!existsSync(settingsPath)) {
-    throw createSettingsReadError(projectRoot);
-  }
-
-  let content: string;
-  try {
-    content = await readFile(settingsPath, 'utf-8');
-  } catch {
-    throw createSettingsReadError(projectRoot);
-  }
-
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(content);
-  } catch {
-    throw createSettingsReadError(projectRoot);
-  }
-
-  if (typeof parsed !== 'object' || parsed === null) {
-    throw createSettingsReadError(projectRoot);
-  }
-  const settings = parsed as UnityMcpSettings;
-
-  // Only block when isServerRunning is explicitly false (Unity clean shutdown).
-  // undefined/missing means old settings format — proceed to next validation stage.
-  if (settings.isServerRunning === false) {
-    throw new UnityNotRunningError(projectRoot);
-  }
-
-  const port = resolvePortFromUnitySettings(settings);
-  if (port === null) {
-    throw createSettingsReadError(projectRoot);
-  }
-
-  return port;
+  for (const settingsPath of getUnitySettingsCandidatePaths(projectRoot)) {
+    let content: string;
+    try {
+      content = await readFile(settingsPath, 'utf-8');
+    } catch {
+      continue;
+    }
+
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(content);
+    } catch {
+      continue;
+    }
+
+    if (typeof parsed !== 'object' || parsed === null) {
+      continue;
+    }
+    const settings = parsed as UnityMcpSettings;
+
+    // Only block when isServerRunning is explicitly false (Unity clean shutdown).
+    // undefined/missing means old settings format — proceed to next validation stage.
+    if (settings.isServerRunning === false) {
+      throw new UnityNotRunningError(projectRoot);
+    }
+
+    const port = resolvePortFromUnitySettings(settings);
+    if (port !== null) {
+      return port;
+    }
+  }
+
+  throw createSettingsReadError(projectRoot);
 }

package/src/project-root.ts

@@ -28,8 +28,13 @@ export function isUnityProject(dirPath: string): boolean {
   return hasAssets && hasProjectSettings;
 }
 
+export function getUnitySettingsCandidatePaths(dirPath: string): string[] {
+  const settingsPath = join(dirPath, 'UserSettings/UnityMcpSettings.json');
+  return [settingsPath, `${settingsPath}.tmp`, `${settingsPath}.bak`];
+}
+
 export function hasUloopInstalled(dirPath: string): boolean {
-  return existsSync(join(dirPath, 'UserSettings/UnityMcpSettings.json'));
+  return getUnitySettingsCandidatePaths(dirPath).some(path => existsSync(path));
 }
 
 function isUnityProjectWithUloop(dirPath: string): boolean {

package/src/version.ts

@@ -4,4 +4,4 @@
  * This file exists to avoid bundling the entire package.json into the CLI bundle.
  * This version is automatically updated by release-please.
  */
-export const VERSION = '1.6.3'; // x-release-please-version
+export const VERSION = '1.7.0'; // x-release-please-version