@chrrxs/robloxstudio-mcp 3.1.2 → 3.1.3

package/dist/index.js

@@ -2483,6 +2483,12 @@ var BridgeService = class {
       multiplayerGroups: this.getMultiplayerGroups()
     };
   }
+  /** Local topology is authoritative; remote adapters must refresh before fanout. */
+  refreshTopologyForRouting(signal) {
+    if (signal?.aborted)
+      throw new Error("Request aborted before topology resolution");
+    return void 0;
+  }
   resolveConnectedInstanceId(instanceId) {
     const exact = this.getInstances().find((instance) => instance.id === instanceId);
     const groupedRuntime = this.getPeers().find((peer) => peer.multiplayerGroupId !== void 0 && isRuntimeRole(peer.role) && connectedRuntimeInstanceId(peer) === instanceId);
@@ -11908,6 +11914,9 @@ var RobloxStudioTools = class {
     if (tail !== void 0 && (!Number.isInteger(tail) || tail < 0)) {
       throw new Error("get_runtime_logs tail must be a non-negative integer.");
     }
+    const refresh = this.bridge.refreshTopologyForRouting(signal);
+    if (refresh)
+      await refresh;
     const instances = this.bridge.getInstances();
     const groups = this.bridge.getMultiplayerGroups();
     let selectedGroup = multiplayer_group_id === void 0 ? void 0 : groups.find((group) => group.id === multiplayer_group_id);
@@ -12628,6 +12637,8 @@ var RobloxStudioTools = class {
         });
       }
       return this._textResult({
+        // Keep lifecycle diagnostics on failures; only successful responses are brief.
+        ...body2,
         success: false,
         action,
         error: body2.error ?? "start_failed",
@@ -12644,6 +12655,7 @@ var RobloxStudioTools = class {
       });
     }
     return this._textResult({
+      ...body,
       success: false,
       action,
       error: body.error ?? "stop_failed",
@@ -12732,7 +12744,7 @@ var RobloxStudioTools = class {
       wait = {
         ok: false,
         roles: this._rolesForScope(instanceId),
-        timedOut: false
+        timedOut: response.timedOut === true
       };
     }
     const body = wait ? {
@@ -12747,8 +12759,8 @@ var RobloxStudioTools = class {
         ...body,
         success: false,
         error: "Playtest teardown did not complete.",
-        message: response?.success === true ? wait.timedOut ? "Stop signal was accepted, but runtime peers did not disconnect before timeout." : "Stop signal was accepted, but runtime peers are still connected." : "Edit stop request failed, and runtime peers are still connected.",
-        stopSignalAccepted: response?.success === true,
+        message: response.stopSignalAccepted === true && typeof response.message === "string" ? response.message : response?.success === true ? wait.timedOut ? "Stop signal was accepted, but runtime peers did not disconnect before timeout." : "Stop signal was accepted, but runtime peers are still connected." : "Edit stop request failed, and runtime peers are still connected.",
+        stopSignalAccepted: response?.success === true || response.stopSignalAccepted === true,
         stopRequestError,
         runtimeRoles,
         possibleCause: "A game shutdown hook such as BindToClose may be blocking Studio teardown. No runtime hard-stop or synthetic keyboard fallback was attempted."
@@ -14032,6 +14044,9 @@ var ProxyBridgeService = class _ProxyBridgeService extends BridgeService {
   initialRefresh;
   refreshTimer;
   static REFRESH_INTERVAL_MS = 1e3;
+  static TOPOLOGY_TIMEOUT_MS = 2e3;
+  topologyGeneration = 0;
+  appliedTopologyGeneration = 0;
   constructor(primaryBaseUrl, authToken) {
     super();
     this.primaryBaseUrl = primaryBaseUrl;
@@ -14049,17 +14064,33 @@ var ProxyBridgeService = class _ProxyBridgeService extends BridgeService {
       headers["X-MCP-Auth"] = this.authToken;
     return headers;
   }
-  async refreshTopology() {
+  refreshTopologyForRouting(signal) {
+    return this.refreshTopology(signal, true);
+  }
+  async refreshTopology(signal, requireFresh = false) {
+    const generation = ++this.topologyGeneration;
+    const controller = new AbortController();
+    const abort = () => controller.abort(signal?.reason);
+    signal?.addEventListener("abort", abort, { once: true });
+    if (signal?.aborted)
+      abort();
+    const timeout = setTimeout(() => controller.abort(new Error("Studio topology refresh timed out")), _ProxyBridgeService.TOPOLOGY_TIMEOUT_MS);
     try {
+      controller.signal.throwIfAborted();
       const res = await fetch(`${this.primaryBaseUrl}/topology`, {
-        headers: this.authHeaders()
+        headers: this.authHeaders(),
+        signal: controller.signal
       });
       if (!res.ok)
-        return;
+        throw new Error(`Studio topology returned HTTP ${res.status}`);
       const body = await res.json();
-      if (!Array.isArray(body.peers) || !Array.isArray(body.instances) || !Array.isArray(body.multiplayerGroups)) {
-        return;
+      controller.signal.throwIfAborted();
+      if (!body || !Array.isArray(body.peers) || !Array.isArray(body.instances) || !Array.isArray(body.multiplayerGroups)) {
+        throw new Error("Primary returned invalid Studio topology");
       }
+      if (generation < this.appliedTopologyGeneration)
+        return;
+      this.appliedTopologyGeneration = generation;
       const previousPeers = new Map(this.cachedPeers.map((peer) => [peer.peerId, peer]));
       this.cachedPeers = body.peers;
       this.cachedInstances = body.instances;
@@ -14069,7 +14100,12 @@ var ProxyBridgeService = class _ProxyBridgeService extends BridgeService {
           this.notifyPeerRegistered(toPublicPeer(peer));
         }
       }
-    } catch {
+    } catch (error) {
+      if (requireFresh)
+        throw error;
+    } finally {
+      clearTimeout(timeout);
+      signal?.removeEventListener("abort", abort);
     }
   }
   getPeers() {
@@ -16459,7 +16495,7 @@ var getAllTools = () => [...TOOL_DEFINITIONS];
 
 // ../core/dist/install-plugin-helpers.js
 var import_saxes = __toESM(require_saxes(), 1);
-import { existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync, rmSync as rmSync2, statSync as statSync3, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync4, readFileSync as readFileSync6, renameSync, rmSync as rmSync2, rmdirSync, statSync as statSync3, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
 import { execSync } from "child_process";
 import { randomUUID as randomUUID5 } from "crypto";
 import { basename as basename3, join as join5 } from "path";
@@ -16610,7 +16646,79 @@ Delete ${otherAssetName} manually or use the default CLI installer behavior to r
 }
 var PLUGIN_INSTALL_LOCK_NAME = ".robloxstudio-mcp-plugin-install.lock";
 function errorCode(error) {
-  return error.code;
+  return error !== null && typeof error === "object" && "code" in error && typeof error.code === "string" ? error.code : void 0;
+}
+function pluginInstallLockError(lockPath, reason) {
+  return new Error(`${reason}: ${lockPath}. If no installer or lock recovery is running, remove that lock directory and retry.`);
+}
+function readPluginInstallLockOwner(lockPath) {
+  const ownerPath = join5(lockPath, "owner.json");
+  if (!lstatSync(lockPath).isDirectory() || !lstatSync(ownerPath).isFile()) {
+    throw new Error("Lock and owner metadata must be a directory and regular file");
+  }
+  const owner = JSON.parse(readFileSync6(ownerPath, "utf8"));
+  if (owner === null || typeof owner !== "object" || !("pid" in owner) || typeof owner.pid !== "number" || !Number.isSafeInteger(owner.pid) || owner.pid <= 0 || owner.pid > 2147483647 || !("token" in owner) || typeof owner.token !== "string" || !/^[a-zA-Z0-9-]{1,128}$/.test(owner.token) || !("createdAt" in owner) || typeof owner.createdAt !== "number" || !Number.isFinite(owner.createdAt) || owner.createdAt < 0) {
+    throw new Error("Invalid lock owner metadata");
+  }
+  return { pid: owner.pid, token: owner.token, createdAt: owner.createdAt };
+}
+function assertPluginInstallOwnerExited(lockPath, owner) {
+  if (owner.pid !== process.pid) {
+    try {
+      process.kill(owner.pid, 0);
+    } catch (error) {
+      if (errorCode(error) === "ESRCH")
+        return;
+      throw pluginInstallLockError(lockPath, `Cannot confirm that plugin installation owner PID ${owner.pid} has exited (${errorCode(error) ?? error})`);
+    }
+  }
+  throw pluginInstallLockError(lockPath, `Another Studio plugin installation is already in progress (owner PID ${owner.pid})`);
+}
+function recoverPluginInstallLock(lockPath, warn) {
+  let owner;
+  try {
+    owner = readPluginInstallLockOwner(lockPath);
+  } catch (error) {
+    throw pluginInstallLockError(lockPath, `Cannot safely read plugin installation lock owner (${error})`);
+  }
+  assertPluginInstallOwnerExited(lockPath, owner);
+  const claimPath = join5(lockPath, `recovery-${owner.token}`);
+  try {
+    mkdirSync4(claimPath);
+  } catch (error) {
+    throw pluginInstallLockError(lockPath, errorCode(error) === "EEXIST" ? "Plugin installation lock recovery is already in progress or was interrupted" : `Could not claim plugin installation lock recovery (${error})`);
+  }
+  const abandonedPath = `${lockPath}.${randomUUID5()}.abandoned`;
+  let moved = false;
+  try {
+    let currentOwner;
+    try {
+      currentOwner = readPluginInstallLockOwner(lockPath);
+    } catch (error) {
+      throw pluginInstallLockError(lockPath, `Cannot safely recheck plugin installation lock owner (${error})`);
+    }
+    if (currentOwner.pid !== owner.pid || currentOwner.token !== owner.token || currentOwner.createdAt !== owner.createdAt) {
+      throw pluginInstallLockError(lockPath, "Plugin installation lock owner changed; retry installation");
+    }
+    assertPluginInstallOwnerExited(lockPath, currentOwner);
+    renameSync(lockPath, abandonedPath);
+    moved = true;
+  } finally {
+    if (!moved) {
+      try {
+        rmdirSync(claimPath);
+      } catch (error) {
+        if (errorCode(error) !== "ENOENT") {
+          warn(`[install-plugin] Could not release lock recovery claim ${claimPath}: ${error}`);
+        }
+      }
+    }
+  }
+  try {
+    rmSync2(abandonedPath, { recursive: true, force: true });
+  } catch (error) {
+    warn(`[install-plugin] Could not clean abandoned install lock ${abandonedPath}: ${error}`);
+  }
 }
 function acquirePluginInstallLock(pluginsFolder, warn) {
   const lockPath = join5(pluginsFolder, PLUGIN_INSTALL_LOCK_NAME);
@@ -16625,7 +16733,14 @@ function acquirePluginInstallLock(pluginsFolder, warn) {
   } catch (error) {
     if (errorCode(error) !== "EEXIST")
       throw error;
-    throw new Error(`Another Studio plugin installation is already in progress: ${lockPath}. If no installer is running, remove that lock directory and retry.`);
+    recoverPluginInstallLock(lockPath, warn);
+    try {
+      mkdirSync4(lockPath);
+    } catch (retryError) {
+      if (errorCode(retryError) !== "EEXIST")
+        throw retryError;
+      throw pluginInstallLockError(lockPath, "Another Studio plugin installation is already in progress");
+    }
   }
   try {
     writeFileSync3(ownerPath, `${JSON.stringify(owner)}
@@ -16643,7 +16758,7 @@ function acquirePluginInstallLock(pluginsFolder, warn) {
   }
   return () => {
     try {
-      const currentOwner = JSON.parse(readFileSync6(ownerPath, "utf8"));
+      const currentOwner = readPluginInstallLockOwner(lockPath);
       if (currentOwner.pid === owner.pid && currentOwner.token === owner.token) {
         rmSync2(lockPath, { recursive: true, force: true });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrrxs/robloxstudio-mcp",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "MCP server for testing, debugging, and controlling Roblox Studio from AI coding tools",
   "main": "dist/index.js",
   "type": "module",

package/studio-plugin/MCPPlugin.rbxmx

@@ -1472,9 +1472,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.1.2" is replaced with the package version at package time
+	-- "3.1.3" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-3.1.2`
+	return `{tostring(h)}-3.1.3`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -7985,6 +7985,16 @@ local function startPlaytest(requestData)
 			error = "start_playtest is single-player only. Use multiplayer_test_start for multi-client StudioTestService sessions.",
 		}
 	end
+	-- Peer teardown and ExecutePlayModeAsync completion can precede native edit
+	-- readiness. Do not acknowledge a new start that the engine cannot execute.
+	if not StudioTestService.EditModeActive then
+		return {
+			success = false,
+			error = "Studio is not ready to start a playtest.",
+			message = "Wait for Studio to finish its current playtest transition before starting another.",
+			editModeReady = false,
+		}
+	end
 	-- Self-heal: if testRunning is stuck true but Studio reports no active
 	-- playtest, the previous start_playtest's task.spawn was orphaned
 	-- (plugin reload mid-test, Studio entered some inconsistent state, etc).
@@ -8064,22 +8074,24 @@ local function stopPlaytest(_requestData)
 		}
 	end
 	StopPlayMonitor.clearPending(stopRequest.requestId)
-	-- Request was consumed (EndTest called). ExecutePlayModeAsync in our
-	-- startPlaytest task.spawn is still unwinding though — testRunning stays
-	-- true until that yield completes and the post-block runs. Wait so
-	-- back-to-back stop -> start sequences don't race against the prior
-	-- teardown and get "A test is already running". 10s covers play-DM
-	-- teardown on heavier places; if it still hasn't cleared we return
-	-- anyway so users aren't stuck — but note that in the response so the
-	-- caller knows a subsequent start may need a moment.
+	-- EndTest consumption, task completion, and native edit readiness are distinct
+	-- milestones. In particular, testRunning can clear before Studio accepts another
+	-- ExecutePlayModeAsync call (and is never set for manually started playtests).
+	-- Only report completion after both tracked execution and native teardown settle.
 	local deadline = tick() + 10
-	while testRunning and tick() < deadline do
+	while (testRunning or not StudioTestService.EditModeActive) and tick() < deadline do
 		task.wait(0.1)
 	end
-	if testRunning then
+	local editModeReady = StudioTestService.EditModeActive
+	if testRunning or not editModeReady then
 		return {
-			success = true,
-			message = "Playtest stop signal sent; teardown still in progress.",
+			success = false,
+			error = "Playtest teardown did not complete.",
+			message = "Stop signal was accepted, but Studio teardown did not settle before timeout.",
+			stopSignalAccepted = true,
+			editModeReady = editModeReady,
+			playtestTaskPending = testRunning,
+			timedOut = true,
 		}
 	end
 	return {
@@ -9815,7 +9827,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "3.1.2"
+local CURRENT_VERSION = "3.1.3"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
 local function createConnection(port)