@akiojin/unity-mcp-server 2.41.7 → 2.41.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akiojin/unity-mcp-server",
-  "version": "2.41.7",
+  "version": "2.41.8",
   "description": "MCP server and Unity Editor bridge — enables AI assistants to control Unity for AI-assisted workflows",
   "type": "module",
   "main": "src/core/server.js",

package/src/handlers/script/CodeIndexBuildToolHandler.js

@@ -3,7 +3,7 @@ import { CodeIndex } from '../../core/codeIndex.js';
 import fs from 'fs';
 import path from 'path';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { logger } from '../../core/config.js';
 import { JobManager } from '../../core/jobManager.js';
 
@@ -99,7 +99,7 @@ export class CodeIndexBuildToolHandler extends BaseToolHandler {
       // Initialize LSP with error handling
       if (!this.lsp) {
         try {
-          this.lsp = new LspRpcClient(info.projectRoot);
+          this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
           logger.info(`[index][${job.id}] LSP initialized for project: ${info.projectRoot}`);
         } catch (lspError) {
           logger.error(`[index][${job.id}] LSP initialization failed: ${lspError.message}`);

package/src/handlers/script/CodeIndexUpdateToolHandler.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 import { CodeIndex } from '../../core/codeIndex.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 
 /**
  * Incrementally refresh the persistent code index after local edits.
@@ -60,7 +60,7 @@ export class CodeIndexUpdateToolHandler extends BaseToolHandler {
     const projectRoot = info.projectRoot;
 
     if (!this.lsp) {
-      this.lsp = new LspRpcClient(projectRoot);
+      this.lsp = await LspRpcClientSingleton.getInstance(projectRoot);
     }
 
     const normalized = requested.map(p => this._normalizePath(p, projectRoot));

package/src/handlers/script/ScriptEditSnippetToolHandler.js

@@ -3,7 +3,7 @@ import path from 'path';
 import crypto from 'crypto';
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 
 const MAX_INSTRUCTIONS = 10;
 const MAX_DIFF_CHARS = 80;
@@ -258,7 +258,7 @@ export class ScriptEditSnippetToolHandler extends BaseToolHandler {
 
   async #validateWithLsp(info, relative, updatedText) {
     if (!this.lsp) {
-      this.lsp = new LspRpcClient(info.projectRoot);
+      this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
     }
     return await this.lsp.validateText(relative, updatedText);
   }

package/src/handlers/script/ScriptEditStructuredToolHandler.js

@@ -1,5 +1,5 @@
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 
 export class ScriptEditStructuredToolHandler extends BaseToolHandler {
@@ -91,7 +91,7 @@ export class ScriptEditStructuredToolHandler extends BaseToolHandler {
 
     // Map operations to LSP extensions
     const info = await this.projectInfo.get();
-    if (!this.lsp) this.lsp = new LspRpcClient(info.projectRoot);
+    if (!this.lsp) this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
 
     if (operation === 'replace_body') {
       const resp = await this.lsp.request('mcp/replaceSymbolBody', {

package/src/handlers/script/ScriptRefactorRenameToolHandler.js

@@ -1,5 +1,5 @@
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 
 export class ScriptRefactorRenameToolHandler extends BaseToolHandler {
@@ -38,7 +38,7 @@ export class ScriptRefactorRenameToolHandler extends BaseToolHandler {
   async execute(params) {
     const { relative, namePath, newName, preview = true } = params;
     const info = await this.projectInfo.get();
-    if (!this.lsp) this.lsp = new LspRpcClient(info.projectRoot);
+    if (!this.lsp) this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
     const resp = await this.lsp.request('mcp/renameByNamePath', {
       relative: String(relative).replace(/\\\\/g, '/'),
       namePath: String(namePath),

package/src/handlers/script/ScriptRefsFindToolHandler.js

@@ -1,6 +1,6 @@
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
 import { CodeIndex } from '../../core/codeIndex.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 
 export class ScriptRefsFindToolHandler extends BaseToolHandler {
@@ -84,7 +84,7 @@ export class ScriptRefsFindToolHandler extends BaseToolHandler {
 
     // LSP拡張へ委譲（mcp/referencesByName）
     const info = await this.projectInfo.get();
-    if (!this.lsp) this.lsp = new LspRpcClient(info.projectRoot);
+    if (!this.lsp) this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
     const resp = await this.lsp.request('mcp/referencesByName', { name: String(name) });
     let raw = Array.isArray(resp?.result) ? resp.result : [];
 

package/src/handlers/script/ScriptRemoveSymbolToolHandler.js

@@ -1,5 +1,5 @@
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 
 // script_*系に名称統一: シンボル削除（型/メンバー）
@@ -39,7 +39,7 @@ export class ScriptRemoveSymbolToolHandler extends BaseToolHandler {
       removeEmptyFile = false
     } = params;
     const info = await this.projectInfo.get();
-    if (!this.lsp) this.lsp = new LspRpcClient(info.projectRoot);
+    if (!this.lsp) this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
     const resp = await this.lsp.request('mcp/removeSymbol', {
       relative: String(path).replace(/\\\\/g, '/'),
       namePath: String(namePath),

package/src/handlers/script/ScriptSymbolFindToolHandler.js

@@ -1,6 +1,6 @@
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
 import { CodeIndex } from '../../core/codeIndex.js';
-import { LspRpcClient } from '../../lsp/LspRpcClient.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
 
 export class ScriptSymbolFindToolHandler extends BaseToolHandler {
@@ -72,7 +72,7 @@ export class ScriptSymbolFindToolHandler extends BaseToolHandler {
       }));
     } else {
       const info = await this.projectInfo.get();
-      if (!this.lsp) this.lsp = new LspRpcClient(info.projectRoot);
+      if (!this.lsp) this.lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
       const resp = await this.lsp.request('workspace/symbol', { query: String(name) });
       const arr = resp?.result || [];
       const root = String(info.projectRoot || '').replace(/\\\\/g, '/');

package/src/handlers/script/ScriptSymbolsGetToolHandler.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { BaseToolHandler } from '../base/BaseToolHandler.js';
 import { ProjectInfoProvider } from '../../core/projectInfo.js';
+import { LspRpcClientSingleton } from '../../lsp/LspRpcClientSingleton.js';
 
 export class ScriptSymbolsGetToolHandler extends BaseToolHandler {
   constructor(unityConnection) {
@@ -55,8 +56,7 @@ export class ScriptSymbolsGetToolHandler extends BaseToolHandler {
       const abs = path.join(info.projectRoot, relPath);
       const st = await fs.stat(abs).catch(() => null);
       if (!st || !st.isFile()) return { error: 'File not found', path: relPath };
-      const { LspRpcClient } = await import('../../lsp/LspRpcClient.js');
-      const lsp = new LspRpcClient(info.projectRoot);
+      const lsp = await LspRpcClientSingleton.getInstance(info.projectRoot);
       const uri = 'file://' + abs.replace(/\\\\/g, '/');
       const res = await lsp.request('textDocument/documentSymbol', { textDocument: { uri } });
       const docSymbols = res?.result ?? res ?? [];

package/src/lsp/LspProcessManager.js

@@ -51,6 +51,15 @@ export class LspProcessManager {
     if (!this.state.proc || this.state.proc.killed) return;
     const p = this.state.proc;
     this.state.proc = null;
+
+    // Remove all listeners to prevent memory leaks
+    try {
+      if (p.stdout) p.stdout.removeAllListeners();
+      if (p.stderr) p.stderr.removeAllListeners();
+      p.removeAllListeners('error');
+      p.removeAllListeners('close');
+    } catch {}
+
     try {
       // Send LSP shutdown/exit if possible
       const shutdown = obj => {

package/src/lsp/LspRpcClientSingleton.js

@@ -0,0 +1,90 @@
+import { LspRpcClient } from './LspRpcClient.js';
+import { logger } from '../core/config.js';
+
+/**
+ * Singleton manager for LspRpcClient instances.
+ * Maintains one client per projectRoot to enable process reuse and improve performance.
+ */
+
+let instance = null;
+let currentProjectRoot = null;
+let heartbeatTimer = null;
+
+export class LspRpcClientSingleton {
+  /**
+   * Get or create a shared LspRpcClient instance.
+   * @param {string} projectRoot - Project root path
+   * @returns {Promise<LspRpcClient>} Shared client instance
+   */
+  static async getInstance(projectRoot) {
+    // If projectRoot changed, reset the instance
+    if (instance && currentProjectRoot !== projectRoot) {
+      logger.info('[LspRpcClientSingleton] projectRoot changed, resetting instance');
+      await LspRpcClientSingleton.reset();
+    }
+
+    if (!instance) {
+      instance = new LspRpcClient(projectRoot);
+      currentProjectRoot = projectRoot;
+      logger.info(`[LspRpcClientSingleton] created new instance for ${projectRoot}`);
+      LspRpcClientSingleton.#startHeartbeat();
+    }
+
+    return instance;
+  }
+
+  /**
+   * Reset the singleton instance and stop the process.
+   */
+  static async reset() {
+    LspRpcClientSingleton.#stopHeartbeat();
+    if (instance) {
+      try {
+        await instance.mgr.stop();
+      } catch (e) {
+        logger.warn(`[LspRpcClientSingleton] error stopping: ${e.message}`);
+      }
+      instance = null;
+      currentProjectRoot = null;
+      logger.info('[LspRpcClientSingleton] instance reset');
+    }
+  }
+
+  /**
+   * Start heartbeat monitoring to detect dead processes.
+   */
+  static #startHeartbeat() {
+    if (heartbeatTimer) return;
+    heartbeatTimer = setInterval(async () => {
+      if (!instance) return;
+      try {
+        // Use workspace/symbol with empty query as a lightweight ping
+        await instance.request('workspace/symbol', { query: '' });
+      } catch (e) {
+        logger.warn(`[LspRpcClientSingleton] heartbeat failed: ${e.message}, resetting...`);
+        // Process is dead, reset instance for next request
+        instance = null;
+        currentProjectRoot = null;
+        LspRpcClientSingleton.#stopHeartbeat();
+      }
+    }, 30000); // 30 seconds
+  }
+
+  /**
+   * Stop heartbeat monitoring.
+   */
+  static #stopHeartbeat() {
+    if (heartbeatTimer) {
+      clearInterval(heartbeatTimer);
+      heartbeatTimer = null;
+    }
+  }
+
+  /**
+   * Check if an instance exists.
+   * @returns {boolean}
+   */
+  static hasInstance() {
+    return instance !== null;
+  }
+}