@akiojin/unity-mcp-server 5.2.1 → 5.3.1

package/README.md

@@ -63,6 +63,7 @@ Use the `search_tools` meta-tool to find the right tool quickly.
 ```
 
 More details:
+
 - Tools & Code Index workflow: [`docs/tools.md`](https://github.com/akiojin/unity-mcp-server/blob/main/docs/tools.md)
 - Configuration reference: [`docs/configuration.md`](https://github.com/akiojin/unity-mcp-server/blob/main/docs/configuration.md)
 

package/package.json

@@ -1,38 +1,12 @@
 {
   "name": "@akiojin/unity-mcp-server",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "description": "MCP server and Unity Editor bridge — enables AI assistants to control Unity for AI-assisted workflows",
   "type": "module",
   "main": "src/core/server.js",
   "bin": {
     "unity-mcp-server": "./bin/unity-mcp-server.js"
   },
-  "scripts": {
-    "start": "node src/core/server.js",
-    "dev": "node --watch src/core/server.js",
-    "build:index": "node src/tools/buildCodeIndex.js",
-    "test": "node --test tests/unit/**/*.test.js tests/integration/*.test.js",
-    "test:unit": "NODE_ENV=test node --test tests/unit/**/*.test.js",
-    "test:integration": "NODE_ENV=test node scripts/run-non-unity-tests.mjs",
-    "test:e2e": "NODE_ENV=test node --test tests/e2e/*.test.js",
-    "test:coverage": "c8 --reporter=lcov --reporter=text --reporter=html node --test tests/unit/**/*.test.js tests/integration/*.test.js",
-    "test:coverage:full": "c8 --reporter=lcov --reporter=text --reporter=html node --test tests/**/*.test.js",
-    "test:watch": "node --watch --test tests/unit/**/*.test.js",
-    "test:watch:all": "node --watch --test tests/**/*.test.js",
-    "test:performance": "node --test tests/performance/*.test.js",
-    "test:ci": "CI=true NODE_ENV=test node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/core/startupPerformance.test.js tests/unit/handlers/script/CodeIndexStatusToolHandler.test.js",
-    "test:ci:coverage": "c8 --reporter=lcov --reporter=text node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/handlers/script/CodeIndexStatusToolHandler.test.js",
-    "test:ci:all": "c8 --reporter=lcov node --test tests/unit/**/*.test.js",
-    "simulate:code-index": "node scripts/simulate-code-index-status.mjs",
-    "test:verbose": "VERBOSE_TEST=true node --test tests/**/*.test.js",
-    "prepare": "cd .. && husky || true",
-    "prepublishOnly": "npm run test:ci",
-    "postinstall": "node scripts/ensure-better-sqlite3.mjs",
-    "test:ci:unity": "timeout 60 node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/core/startupPerformance.test.js || exit 0",
-    "test:unity": "node tests/run-unity-integration.mjs",
-    "test:nounity": "npm run test:integration",
-    "test:ci:integration": "CI=true NODE_ENV=test node --test tests/integration/code-index-background.test.js"
-  },
   "keywords": [
     "mcp",
     "unity",
@@ -48,7 +22,7 @@
   "author": "Akio Jinsenji <akio-jinsenji@cloud-creative-studios.com>",
   "license": "MIT",
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.24.3",
+    "@modelcontextprotocol/sdk": "^1.25.2",
     "find-up": "^6.3.0",
     "@akiojin/fast-sql": "^0.1.0",
     "lru-cache": "^11.0.2"
@@ -78,17 +52,31 @@
     "access": "public"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.6.1",
-    "@commitlint/config-conventional": "^18.6.3",
     "c8": "^10.1.3",
-    "eslint": "^8.57.1",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.6.0",
-    "husky": "^9.1.7",
-    "markdownlint-cli": "^0.43.0",
-    "nodemon": "^3.1.7",
-    "prettier": "^3.4.2"
+    "nodemon": "^3.1.7"
+  },
+  "scripts": {
+    "start": "node src/core/server.js",
+    "dev": "node --watch src/core/server.js",
+    "build:index": "node src/tools/buildCodeIndex.js",
+    "test": "node --test tests/unit/**/*.test.js tests/integration/*.test.js",
+    "test:unit": "NODE_ENV=test node --test tests/unit/**/*.test.js",
+    "test:integration": "NODE_ENV=test node scripts/run-non-unity-tests.mjs",
+    "test:e2e": "NODE_ENV=test node --test tests/e2e/*.test.js",
+    "test:coverage": "c8 --reporter=lcov --reporter=text --reporter=html node --test tests/unit/**/*.test.js tests/integration/*.test.js",
+    "test:coverage:full": "c8 --reporter=lcov --reporter=text --reporter=html node --test tests/**/*.test.js",
+    "test:watch": "node --watch --test tests/unit/**/*.test.js",
+    "test:watch:all": "node --watch --test tests/**/*.test.js",
+    "test:performance": "node --test tests/performance/*.test.js",
+    "test:ci": "CI=true NODE_ENV=test node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/core/startupPerformance.test.js tests/unit/handlers/script/CodeIndexStatusToolHandler.test.js tests/unit/handlers/input/InputTouchToolHandler.test.js tests/unit/handlers/addressables/AddressablesAnalyzeToolHandler.test.js tests/unit/handlers/addressables/AddressablesBuildToolHandler.test.js tests/unit/handlers/addressables/AddressablesManageToolHandler.test.js",
+    "test:ci:coverage": "c8 --reporter=lcov --reporter=text node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/handlers/script/CodeIndexStatusToolHandler.test.js",
+    "test:ci:all": "c8 --reporter=lcov node --test tests/unit/**/*.test.js",
+    "simulate:code-index": "node scripts/simulate-code-index-status.mjs",
+    "test:verbose": "VERBOSE_TEST=true node --test tests/**/*.test.js",
+    "postinstall": "node scripts/ensure-better-sqlite3.mjs",
+    "test:ci:unity": "timeout 60 node --test tests/unit/core/codeIndex.test.js tests/unit/core/config.test.js tests/unit/core/indexWatcher.test.js tests/unit/core/projectInfo.test.js tests/unit/core/server.test.js tests/unit/core/startupPerformance.test.js || exit 0",
+    "test:unity": "node tests/run-unity-integration.mjs",
+    "test:nounity": "npm run test:integration",
+    "test:ci:integration": "CI=true NODE_ENV=test node --test tests/integration/code-index-background.test.js"
   }
-}
+}

package/src/core/codeIndex.js

@@ -32,6 +32,7 @@ const driverStatus = {
 const sharedConnections = {
   db: null,
   dbPath: null,
+  dbStat: null,
   schemaInitialized: false,
   SQL: null // sql.js factory
 };
@@ -73,8 +74,25 @@ export class CodeIndex {
     }
   }
 
+  invalidateSharedConnection(reason) {
+    if (reason) logger.info(`[index] ${reason}`);
+    try {
+      if (sharedConnections.db) {
+        sharedConnections.db.close();
+      }
+    } catch {
+      // Ignore close errors
+    }
+    sharedConnections.db = null;
+    sharedConnections.dbPath = null;
+    sharedConnections.dbStat = null;
+    sharedConnections.schemaInitialized = false;
+    queryCache.clear();
+    statsCache.clear();
+    this.db = null;
+  }
+
   async open() {
-    if (this.db) return this.db;
     const ok = await this._ensureDriver();
     if (!ok) return null;
     const info = await this.projectInfo.get();
@@ -83,15 +101,32 @@ export class CodeIndex {
     const dbPath = path.join(dir, 'code-index.db');
     this.dbPath = dbPath;
 
+    const fileStat = (() => {
+      try {
+        if (!fs.existsSync(dbPath)) return null;
+        const stat = fs.statSync(dbPath);
+        return { mtimeMs: stat.mtimeMs, size: stat.size };
+      } catch {
+        return null;
+      }
+    })();
+
+    if (this.db && (sharedConnections.db !== this.db || sharedConnections.dbPath !== dbPath)) {
+      this.db = null;
+    }
+
     // Use shared connection for all CodeIndex instances
     if (sharedConnections.db && sharedConnections.dbPath === dbPath) {
       // Verify the DB file still exists before returning cached connection
-      if (!fs.existsSync(dbPath)) {
+      if (!fileStat) {
         // File was deleted or never created, invalidate cache
-        logger.info('[index] DB file missing, invalidating cached connection');
-        sharedConnections.db = null;
-        sharedConnections.dbPath = null;
-        sharedConnections.schemaInitialized = false;
+        this.invalidateSharedConnection('DB file missing, invalidating cached connection');
+      } else if (
+        sharedConnections.dbStat &&
+        (fileStat.mtimeMs !== sharedConnections.dbStat.mtimeMs ||
+          fileStat.size !== sharedConnections.dbStat.size)
+      ) {
+        this.invalidateSharedConnection('DB file changed on disk, reloading connection');
       } else {
         this.db = sharedConnections.db;
         return this.db;
@@ -108,6 +143,7 @@ export class CodeIndex {
       }
       sharedConnections.db = this.db;
       sharedConnections.dbPath = dbPath;
+      sharedConnections.dbStat = fileStat;
     } catch (e) {
       this.disabled = true;
       const errMsg = e && typeof e === 'object' && 'message' in e ? e.message : String(e);
@@ -131,6 +167,14 @@ export class CodeIndex {
       const data = this.db.exportDb();
       const buffer = Buffer.from(data);
       fs.writeFileSync(this.dbPath, buffer);
+      if (sharedConnections.dbPath === this.dbPath) {
+        try {
+          const stat = fs.statSync(this.dbPath);
+          sharedConnections.dbStat = { mtimeMs: stat.mtimeMs, size: stat.size };
+        } catch {
+          sharedConnections.dbStat = null;
+        }
+      }
     } catch (e) {
       const errMsg = e && typeof e === 'object' && 'message' in e ? e.message : String(e);
       logger.warn(`[index] Failed to save database: ${errMsg}`);
@@ -417,14 +461,16 @@ export class CodeIndex {
    * Close the database connection
    */
   close() {
+    const wasShared = sharedConnections.db === this.db;
     if (this.db) {
       this._saveToFile();
       this.db.close();
       this.db = null;
     }
-    if (sharedConnections.db === this.db) {
+    if (wasShared) {
       sharedConnections.db = null;
       sharedConnections.dbPath = null;
+      sharedConnections.dbStat = null;
     }
   }
 }
@@ -449,4 +495,5 @@ export function __resetCodeIndexDriverStatusForTest() {
   sharedConnections.dbPath = null;
   sharedConnections.schemaInitialized = false;
   sharedConnections.SQL = null;
+  sharedConnections.dbStat = null;
 }

package/src/core/config.js

@@ -153,7 +153,8 @@ const baseConfig = {
 
   // LSP client defaults
   lsp: {
-    requestTimeoutMs: 120000
+    requestTimeoutMs: 120000,
+    slowRequestWarnMs: 2000
   },
 
   // Indexing (code index) settings
@@ -184,6 +185,7 @@ function loadEnvConfig() {
 
   const telemetryEnabled = parseBoolEnv(process.env.UNITY_MCP_TELEMETRY_ENABLED);
   const lspRequestTimeoutMs = parseIntEnv(process.env.UNITY_MCP_LSP_REQUEST_TIMEOUT_MS);
+  const lspSlowRequestWarnMs = parseIntEnv(process.env.UNITY_MCP_LSP_SLOW_REQUEST_WARN_MS);
 
   const out = {};
 
@@ -221,6 +223,9 @@ function loadEnvConfig() {
   if (lspRequestTimeoutMs !== undefined) {
     out.lsp = { requestTimeoutMs: lspRequestTimeoutMs };
   }
+  if (lspSlowRequestWarnMs !== undefined) {
+    out.lsp = { ...(out.lsp || {}), slowRequestWarnMs: lspSlowRequestWarnMs };
+  }
 
   return out;
 }
@@ -301,6 +306,15 @@ function validateAndNormalizeConfig(cfg) {
       cfg.lsp.requestTimeoutMs = 60000;
     }
   }
+  if (cfg.lsp?.slowRequestWarnMs !== undefined) {
+    const t = Number(cfg.lsp.slowRequestWarnMs);
+    if (!Number.isFinite(t) || t < 0) {
+      logger.warning(
+        `[unity-mcp-server] WARN: Invalid UNITY_MCP_LSP_SLOW_REQUEST_WARN_MS (${cfg.lsp.slowRequestWarnMs}); using default 2000`
+      );
+      cfg.lsp.slowRequestWarnMs = 2000;
+    }
+  }
 }
 
 export const config = merge(baseConfig, loadEnvConfig());

package/src/core/httpServer.js

@@ -59,7 +59,9 @@ export function createHttpServer({
           payload = JSON.parse(raw || '{}');
         } catch (e) {
           res.writeHead(400, { 'Content-Type': 'application/json; charset=utf-8' });
-          res.end(JSON.stringify({ jsonrpc: '2.0', error: { code: -32700, message: 'Invalid JSON' } }));
+          res.end(
+            JSON.stringify({ jsonrpc: '2.0', error: { code: -32700, message: 'Invalid JSON' } })
+          );
           return;
         }
 
@@ -77,7 +79,13 @@ export function createHttpServer({
           const handler = handlers.get(name);
           if (!handler) {
             res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
-            res.end(JSON.stringify({ jsonrpc: '2.0', id, error: { code: -32004, message: `Tool not found: ${name}` } }));
+            res.end(
+              JSON.stringify({
+                jsonrpc: '2.0',
+                id,
+                error: { code: -32004, message: `Tool not found: ${name}` }
+              })
+            );
             return;
           }
           try {
@@ -87,13 +95,21 @@ export function createHttpServer({
           } catch (e) {
             logger.error(`[http] tool error ${name}: ${e.message}`);
             res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
-            res.end(JSON.stringify({ jsonrpc: '2.0', id, error: { code: -32000, message: e.message } }));
+            res.end(
+              JSON.stringify({ jsonrpc: '2.0', id, error: { code: -32000, message: e.message } })
+            );
           }
           return;
         }
 
         res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
-        res.end(JSON.stringify({ jsonrpc: '2.0', id, error: { code: -32601, message: 'Method not found' } }));
+        res.end(
+          JSON.stringify({
+            jsonrpc: '2.0',
+            id,
+            error: { code: -32601, message: 'Method not found' }
+          })
+        );
         return;
       }
 
@@ -125,7 +141,9 @@ export function createHttpServer({
       server.listen(port, host, () => {
         server.off('error', onError);
         const address = server.address();
-        logger.info(`HTTP listening on http://${host}:${address.port}, telemetry: ${telemetryEnabled ? 'on' : 'off'}`);
+        logger.info(
+          `HTTP listening on http://${host}:${address.port}, telemetry: ${telemetryEnabled ? 'on' : 'off'}`
+        );
         resolve(address.port);
       });
     });
@@ -142,6 +160,12 @@ export function createHttpServer({
     start,
     close,
     getPort: () => server.address()?.port,
-    health: () => buildHealthResponse({ startedAt, mode: 'http', port: server.address()?.port, telemetryEnabled })
+    health: () =>
+      buildHealthResponse({
+        startedAt,
+        mode: 'http',
+        port: server.address()?.port,
+        telemetryEnabled
+      })
   };
 }

package/src/core/indexBuildWorkerPool.js

@@ -1,11 +1,58 @@
 import { Worker } from 'worker_threads';
 import path from 'path';
+import os from 'os';
+import fs from 'fs';
+import crypto from 'crypto';
 import { fileURLToPath } from 'url';
-import { logger } from './config.js';
+import { logger, WORKSPACE_ROOT } from './config.js';
 import { JobManager } from './jobManager.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const DEFAULT_DB_RELATIVE_PATH = path.join('.unity', 'cache', 'code-index', 'code-index.db');
+const DEFAULT_TMP_DB_DIR = path.join(os.tmpdir(), 'unity-mcp-code-index');
+
+/**
+ * Resolve database path for Worker Thread builds.
+ * Falls back to workspace-root based cache when dbPath is not provided.
+ * @param {Object} [options] - Build options
+ * @param {string} [options.dbPath] - Explicit database path
+ * @param {string} [options.projectRoot] - Unity project root path
+ * @returns {string} Resolved database path
+ */
+export function resolveDbPath(options = {}) {
+  if (typeof options.dbPath === 'string' && options.dbPath.trim().length > 0) {
+    return options.dbPath;
+  }
+
+  const workspaceRoot =
+    typeof WORKSPACE_ROOT === 'string' && WORKSPACE_ROOT.trim().length > 0 ? WORKSPACE_ROOT : '';
+  if (workspaceRoot) {
+    return path.resolve(workspaceRoot, DEFAULT_DB_RELATIVE_PATH);
+  }
+
+  const projectRoot =
+    typeof options.projectRoot === 'string' && options.projectRoot.trim().length > 0
+      ? options.projectRoot
+      : '';
+  const projectExists = projectRoot && fs.existsSync(projectRoot);
+
+  if (projectExists) {
+    return path.join(projectRoot, DEFAULT_DB_RELATIVE_PATH);
+  }
+
+  if (projectRoot) {
+    // Fallback for mock/non-existent roots used in integration tests.
+    const hash = crypto
+      .createHash('sha1')
+      .update(projectRoot || 'unknown-project-root', 'utf8')
+      .digest('hex')
+      .slice(0, 12);
+    return path.join(DEFAULT_TMP_DB_DIR, hash, 'code-index.db');
+  }
+
+  return path.resolve(process.cwd(), DEFAULT_DB_RELATIVE_PATH);
+}
 
 /**
  * Worker Thread pool for non-blocking code index builds.
@@ -52,12 +99,19 @@ export class IndexBuildWorkerPool {
 
     return new Promise((resolve, reject) => {
       const workerPath = path.join(__dirname, 'workers', 'indexBuildWorker.js');
+      const buildOptions = options ?? {};
+      const resolvedDbPath = resolveDbPath(buildOptions);
+      const concurrency =
+        Number.isFinite(buildOptions.concurrency) && buildOptions.concurrency > 0
+          ? buildOptions.concurrency
+          : 1;
 
       try {
         this.worker = new Worker(workerPath, {
           workerData: {
-            ...options,
-            concurrency: options.concurrency || 1
+            ...buildOptions,
+            dbPath: resolvedDbPath,
+            concurrency
           }
         });
 

package/src/core/indexWatcher.js

@@ -6,6 +6,7 @@ export class IndexWatcher {
   constructor(unityConnection) {
     this.unityConnection = unityConnection;
     this.timer = null;
+    this.startTimeout = null;
     this.running = false;
     this.jobManager = JobManager.getInstance();
     this.currentWatcherJobId = null;
@@ -16,7 +17,7 @@ export class IndexWatcher {
 
   start() {
     if (!config.indexing?.watch) return;
-    if (this.timer) return;
+    if (this.timer || this.startTimeout) return;
     const interval = Math.max(2000, Number(config.indexing.intervalMs || 15000));
     // Initial delay: wait longer to allow MCP server to fully initialize
     // and first tool calls to complete before starting background indexing
@@ -24,7 +25,8 @@ export class IndexWatcher {
     logger.info(`[index] watcher enabled (interval=${interval}ms, initialDelay=${initialDelay}ms)`);
 
     // Delay initial tick significantly to avoid blocking MCP server initialization
-    const delayedStart = setTimeout(() => {
+    this.startTimeout = setTimeout(() => {
+      this.startTimeout = null;
       this.tick();
       // Start periodic timer only after first tick
       this.timer = setInterval(() => this.tick(), interval);
@@ -32,12 +34,16 @@ export class IndexWatcher {
         this.timer.unref();
       }
     }, initialDelay);
-    if (typeof delayedStart.unref === 'function') {
-      delayedStart.unref();
+    if (typeof this.startTimeout?.unref === 'function') {
+      this.startTimeout.unref();
     }
   }
 
   stop() {
+    if (this.startTimeout) {
+      clearTimeout(this.startTimeout);
+      this.startTimeout = null;
+    }
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;

package/src/core/projectInfo.js

@@ -104,18 +104,40 @@ export class ProjectInfoProvider {
       try {
         const info = await this.unityConnection.sendCommand('get_editor_info', {});
         if (info && info.projectRoot && info.assetsPath) {
-          this.cached = {
-            projectRoot: info.projectRoot,
-            assetsPath: info.assetsPath,
-            packagesPath: normalize(info.packagesPath || path.join(info.projectRoot, 'Packages')),
-            packageCachePath: normalize(
-              info.packageCachePath || path.join(info.projectRoot, 'Library/PackageCache')
-            ),
-            codeIndexRoot: normalize(
-              info.codeIndexRoot || resolveDefaultCodeIndexRoot(info.projectRoot)
-            )
-          };
-          return this.cached;
+          const projectRoot = normalize(info.projectRoot);
+          const assetsPath = normalize(info.assetsPath || path.join(info.projectRoot, 'Assets'));
+          const packagesPath = normalize(
+            info.packagesPath || path.join(info.projectRoot, 'Packages')
+          );
+          let localReady = false;
+          try {
+            localReady =
+              fs.existsSync(assetsPath) &&
+              fs.existsSync(packagesPath) &&
+              fs.statSync(assetsPath).isDirectory() &&
+              fs.statSync(packagesPath).isDirectory();
+          } catch {
+            localReady = false;
+          }
+
+          if (localReady) {
+            this.cached = {
+              projectRoot,
+              assetsPath,
+              packagesPath,
+              packageCachePath: normalize(
+                info.packageCachePath || path.join(info.projectRoot, 'Library/PackageCache')
+              ),
+              codeIndexRoot: normalize(
+                info.codeIndexRoot || resolveDefaultCodeIndexRoot(info.projectRoot)
+              )
+            };
+            return this.cached;
+          }
+
+          logger.warning(
+            'get_editor_info returned paths not found locally; falling back to local inference'
+          );
         }
       } catch (e) {
         logger.warning(`get_editor_info failed: ${e.message}`);