ultimate-unreal-engine-mcp 0.1.6 → 0.1.8

package/dist/plugin-bridge/client.js

@@ -55,6 +55,15 @@ export class PluginBridgeClient {
      * Entries are added before socket.write() and removed on response or timeout.
      */
     pendingCommands = new Map();
+    /** Shared singleton instance — all tool modules use the same TCP connection. */
+    static _instance = null;
+    /** Get the shared singleton bridge client. Creates one on first call. */
+    static shared() {
+        if (!PluginBridgeClient._instance) {
+            PluginBridgeClient._instance = new PluginBridgeClient();
+        }
+        return PluginBridgeClient._instance;
+    }
     constructor(port = PLUGIN_PORT) {
         this.port = port;
         this.backoff = new ExponentialBackoff();
@@ -98,13 +107,13 @@ export class PluginBridgeClient {
         const cmdWithId = { ...cmd, correlationId };
         return new Promise((resolve, reject) => {
             this.pendingCommands.set(correlationId, { resolve, reject });
-            // 10-second timeout — T-07-11 mitigation
+            // 30-second timeout — T-07-11 mitigation
             const timeoutHandle = setTimeout(() => {
                 if (this.pendingCommands.has(correlationId)) {
                     this.pendingCommands.delete(correlationId);
-                    reject(new Error(`MCP command '${cmd.type}' timed out after 10 seconds`));
+                    reject(new Error(`MCP command '${cmd.type}' timed out after 30 seconds`));
                 }
-            }, 10_000);
+            }, 30_000);
             // Write JSON-newline framed message to the socket.
             // The write callback fires on flush; reject immediately on error.
             this.socket.write(JSON.stringify(cmdWithId) + '\n', 'utf8', (err) => {
@@ -168,32 +177,53 @@ export class PluginBridgeClient {
     connect() {
         return new Promise((resolve, reject) => {
             const socket = net.createConnection({ port: this.port, host: '127.0.0.1' });
-            // JSON-newline response parser — accumulates partial chunks, splits on \n,
-            // and resolves the correlated pending promise.
-            // Threat T-07-09 mitigation: try/catch around JSON.parse; unknown correlationId
-            // is silently dropped — no state corruption.
+            // JSON response parser — handles UE's pretty-printed multi-line JSON.
+            // UE's FJsonSerializer outputs JSON with \r\n and tabs inside the object,
+            // so we can't split on \n (that would break mid-object). Instead we track
+            // brace depth: when depth returns to 0, we have a complete JSON object.
             socket.on('data', (chunk) => {
                 this.receiveBuffer += chunk.toString('utf8');
-                let newlineIdx;
-                while ((newlineIdx = this.receiveBuffer.indexOf('\n')) !== -1) {
-                    const line = this.receiveBuffer.slice(0, newlineIdx).trim();
-                    this.receiveBuffer = this.receiveBuffer.slice(newlineIdx + 1);
-                    if (line.length === 0) {
-                        continue;
-                    }
-                    try {
-                        const response = JSON.parse(line);
-                        const pending = this.pendingCommands.get(response.correlationId);
-                        if (pending) {
-                            this.pendingCommands.delete(response.correlationId);
-                            pending.resolve(response);
+                let startIdx = -1;
+                let depth = 0;
+                for (let i = 0; i < this.receiveBuffer.length; i++) {
+                    const ch = this.receiveBuffer[i];
+                    if (ch === '{') {
+                        if (depth === 0) {
+                            startIdx = i;
                         }
-                        // Unknown correlationId — silently drop (T-07-09 mitigation)
+                        depth++;
                     }
-                    catch {
-                        // Non-JSON line — ignore (T-07-09 mitigation)
+                    else if (ch === '}') {
+                        depth--;
+                        if (depth === 0 && startIdx >= 0) {
+                            const jsonStr = this.receiveBuffer.slice(startIdx, i + 1);
+                            // Remove everything up to and including this object
+                            this.receiveBuffer = this.receiveBuffer.slice(i + 1);
+                            try {
+                                const response = JSON.parse(jsonStr);
+                                const pending = this.pendingCommands.get(response.correlationId);
+                                if (pending) {
+                                    this.pendingCommands.delete(response.correlationId);
+                                    pending.resolve(response);
+                                }
+                            }
+                            catch {
+                                // Malformed JSON — ignore (T-07-09 mitigation)
+                            }
+                            // Reset loop to scan remaining buffer from the start
+                            i = -1;
+                            startIdx = -1;
+                        }
                     }
                 }
+                // Keep only unprocessed data (partial object) in the buffer
+                if (startIdx > 0) {
+                    this.receiveBuffer = this.receiveBuffer.slice(startIdx);
+                }
+                else if (depth === 0) {
+                    // No open braces — discard any whitespace/newlines between objects
+                    this.receiveBuffer = '';
+                }
             });
             socket.once('connect', () => {
                 this.socket = socket;

package/dist/tools/ai-systems/index.js

@@ -15,7 +15,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -154,7 +154,7 @@ export async function handleQueryNavmesh(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerAISystemsTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_inspect_behavior_tree (AI-01)
     // --------------------------------------------------------------------------

package/dist/tools/animation/index.js

@@ -15,7 +15,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -152,7 +152,7 @@ export async function handleReadRetargetMappings(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerAnimationTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_animation_assets (ANIM-01)
     // --------------------------------------------------------------------------

package/dist/tools/audio/index.js

@@ -61,7 +61,7 @@ async function sendOrDisconnect(b, cmd) {
  * @param b     PluginBridgeClient instance (defaults to bridge created in registerAudioTools).
  */
 export async function handleListSoundAssets(args, b) {
-    const bridge = b ?? new PluginBridgeClient();
+    const bridge = b ?? PluginBridgeClient.shared();
     // Response data shape: SoundAssetListResult
     const payload = {};
     if (args.type_filter !== undefined) {
@@ -80,7 +80,7 @@ export async function handleListSoundAssets(args, b) {
  * @param b     PluginBridgeClient instance (defaults to bridge created in registerAudioTools).
  */
 export async function handleInspectMetasound(args, b) {
-    const bridge = b ?? new PluginBridgeClient();
+    const bridge = b ?? PluginBridgeClient.shared();
     // Response data shape: MetaSoundInspectResult
     return sendOrDisconnect(bridge, {
         type: 'audio.metasound',
@@ -95,7 +95,7 @@ export async function handleInspectMetasound(args, b) {
  * @param b     PluginBridgeClient instance (defaults to bridge created in registerAudioTools).
  */
 export async function handleInspectSoundCue(args, b) {
-    const bridge = b ?? new PluginBridgeClient();
+    const bridge = b ?? PluginBridgeClient.shared();
     // Response data shape: SoundCueInspectResult
     return sendOrDisconnect(bridge, {
         type: 'audio.soundcue',
@@ -110,7 +110,7 @@ export async function handleInspectSoundCue(args, b) {
  * @param b     PluginBridgeClient instance (defaults to bridge created in registerAudioTools).
  */
 export async function handleQueryAudioInsights(args, b) {
-    const bridge = b ?? new PluginBridgeClient();
+    const bridge = b ?? PluginBridgeClient.shared();
     // Response data shape: AudioInsightsResult
     return sendOrDisconnect(bridge, {
         type: 'audio.insights',
@@ -137,7 +137,7 @@ export async function handleQueryAudioInsights(args, b) {
  * @param bridge  Optional PluginBridgeClient for testing (injected into handler calls).
  */
 export function registerAudioTools(server, bridge) {
-    const b = bridge ?? new PluginBridgeClient();
+    const b = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_sound_assets (AUD-01)
     // --------------------------------------------------------------------------

package/dist/tools/blueprint/index.js

@@ -14,7 +14,7 @@ import { validatePath } from '../../utils/path-guard.js';
 import { PROJECT_ROOT } from '../../config.js';
 // Module-level bridge instance — Phase 7 will introduce a shared singleton.
 // Two instances (blueprint + editor) is acceptable for Phase 1 stub behaviour.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 /**
  * ue_read_blueprint handler — reads Blueprint structure via plugin bridge.
  * BPR-01: returns parentClass, variables, and components.
@@ -292,9 +292,9 @@ export async function handleFindBlueprintSubclasses(args) {
  * call or access a specific C++ member via the UE Editor plugin bridge.
  * BPC-03: requires plugin; returns plugin_not_connected when editor is not running.
  */
-export async function handleTraceCppInBlueprints(args) {
+export async function handleTraceCppInBlueprints(args, b = bridge) {
     try {
-        const response = await bridge.sendCommand({
+        const response = await b.sendCommand({
             type: 'blueprint.cppUsage',
             correlationId: '',
             payload: { class_name: args.class_name, member_name: args.member_name },

package/dist/tools/chaos/index.js

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const _defaultBridge = new PluginBridgeClient();
+const _defaultBridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -148,7 +148,7 @@ export async function handleManagePhysicsCache(args, b = _defaultBridge) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerChaosTools(server, bridge) {
-    const b = bridge ?? new PluginBridgeClient();
+    const b = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_inspect_geometry_collection (CHAOS-01)
     // --------------------------------------------------------------------------

package/dist/tools/collision-physics/index.js

@@ -70,7 +70,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerCollisionPhysicsTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_read_collision (PHY-01)
     // --------------------------------------------------------------------------

package/dist/tools/editor/index.js

@@ -65,7 +65,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerEditorTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_actors
     // --------------------------------------------------------------------------

package/dist/tools/gas/index.js

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -146,7 +146,7 @@ export async function handleQueryGameplayTags(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerGASTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_abilities (GAS-01)
     // --------------------------------------------------------------------------

package/dist/tools/import-export/index.js

@@ -76,7 +76,7 @@ async function sendOrDisconnect(b, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (injected bridge replaces module singleton).
  */
 export function registerImportExportTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_import_fbx (IMP-01)
     // --------------------------------------------------------------------------

package/dist/tools/input/index.js

@@ -61,7 +61,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerInputTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_input_actions
     // --------------------------------------------------------------------------

package/dist/tools/livelink/index.js

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -138,7 +138,7 @@ export async function handlePreviewLiveLinkData(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerLiveLinkTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_livelink_sources (LL-01)
     // --------------------------------------------------------------------------

package/dist/tools/material/index.js

@@ -62,7 +62,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerMaterialTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_material_params
     // --------------------------------------------------------------------------

package/dist/tools/motion-design/index.js

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -152,7 +152,7 @@ export async function handleManageRemoteControl(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerMotionDesignTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_scene_states (MD-01)
     // --------------------------------------------------------------------------

package/dist/tools/movie-render/index.js

@@ -71,7 +71,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerMovieRenderTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_render_queue (MRP-01)
     // --------------------------------------------------------------------------

package/dist/tools/networking/index.js

@@ -15,7 +15,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported function parameter.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------

package/dist/tools/pcg/index.js

@@ -70,7 +70,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerPCGTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_list_pcg_graphs
     // --------------------------------------------------------------------------

package/dist/tools/selection/index.js

@@ -70,7 +70,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerSelectionTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_select_actors (SEL-01)
     // --------------------------------------------------------------------------

package/dist/tools/sequencer/index.js

@@ -72,7 +72,7 @@ async function sendOrDisconnect(bridge, cmd) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerSequencerTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_create_sequence
     // --------------------------------------------------------------------------

package/dist/tools/validation/index.js

@@ -6,7 +6,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -119,7 +119,7 @@ export async function handleCheckBlueprint(args, b = bridge) {
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerValidationTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_validate_asset (VAL-01)
     // --------------------------------------------------------------------------

package/dist/tools/viewport/index.js

@@ -183,7 +183,7 @@ const targetSchema = z.union([
  * @param bridge  Optional PluginBridgeClient for testing (defaults to a new instance).
  */
 export function registerViewportTools(server, bridge) {
-    const _bridge = bridge ?? new PluginBridgeClient();
+    const _bridge = bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_editor_state
     // --------------------------------------------------------------------------

package/dist/tools/worldpartition/index.js

@@ -14,7 +14,7 @@ import { z } from 'zod';
 import { withKnownIssues } from '../known-issues/middleware.js';
 import { PluginBridgeClient, PluginNotConnectedError } from '../../plugin-bridge/client.js';
 // Module-level bridge instance — injected in tests via exported handler signatures.
-const bridge = new PluginBridgeClient();
+const bridge = PluginBridgeClient.shared();
 // ---------------------------------------------------------------------------
 // sendOrDisconnect helper
 // ---------------------------------------------------------------------------
@@ -145,7 +145,7 @@ export async function handleTriggerHlodGeneration(args, b = bridge) {
  *                accept bridge injection via their exported function signatures).
  */
 export function registerWorldPartitionTools(server, _bridge) {
-    const b = _bridge ?? new PluginBridgeClient();
+    const b = _bridge ?? PluginBridgeClient.shared();
     // --------------------------------------------------------------------------
     // ue_read_world_partition (WP-01)
     // --------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-unreal-engine-mcp",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "MCP server giving AI assistants full access to Unreal Engine 5.7 projects",
   "type": "module",
   "engines": {