@chrrxs/robloxstudio-mcp 2.16.2 → 2.16.3

package/dist/index.js

@@ -3221,6 +3221,10 @@ var init_tools = __esm({
       _clientRolesForInstance(instanceId) {
         return this._rolesForInstance(instanceId).filter((role) => /^client-\d+$/.test(role)).sort((a, b) => Number(a.slice("client-".length)) - Number(b.slice("client-".length)));
       }
+      _runtimeTargetsForEquivalentInstances(instanceId) {
+        const instanceIds = new Set(this.bridge.getEquivalentInstanceIds(instanceId));
+        return this.bridge.getInstances().filter((i) => instanceIds.has(i.instanceId) && (i.role === "server" || /^client-\d+$/.test(i.role))).map((i) => ({ instanceId: i.instanceId, role: i.role }));
+      }
       _resolveDeviceSimulatorSingleTarget(target, instance_id, toolName) {
         const selectedTarget = target ?? "edit";
         if (selectedTarget === "server" || selectedTarget === "all" || selectedTarget === "all-clients" || selectedTarget === "edit-proxy") {
@@ -4487,10 +4491,27 @@ ${code}`
       }
       async stopPlaytest(instance_id) {
         const { instanceId } = this._resolveSingleTarget("edit", instance_id);
-        const response = await this.client.request("/api/stop-playtest", {}, instanceId, "edit");
+        let response;
+        let stopRequestError;
+        try {
+          response = await this.client.request("/api/stop-playtest", {}, instanceId, "edit");
+        } catch (error) {
+          stopRequestError = errorMessage(error);
+          response = {
+            success: false,
+            error: "Edit stop request failed.",
+            detail: stopRequestError
+          };
+        }
         let wait;
         if (response?.success === true) {
           wait = await this._waitForRuntimeRoles(instanceId, { noRuntime: true }, 15, true);
+        } else if (this._runtimeTargetsForEquivalentInstances(instanceId).length > 0) {
+          wait = {
+            ok: false,
+            roles: this._rolesForEquivalentInstances(instanceId),
+            timedOut: false
+          };
         }
         const body = wait ? {
           ...response,
@@ -4498,6 +4519,22 @@ ${code}`
           timedOut: wait.timedOut,
           roles: wait.roles
         } : response;
+        if (wait && !wait.ok) {
+          const runtimeRoles = wait.roles.filter((role) => role === "server" || /^client-\d+$/.test(role));
+          const failureBody = {
+            ...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,
+            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."
+          };
+          return {
+            content: [{ type: "text", text: JSON.stringify(failureBody) }]
+          };
+        }
         return {
           content: [{ type: "text", text: JSON.stringify(body) }]
         };

package/package.json

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

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -432,6 +432,31 @@ end
 local proxyByPlayer = {}
 local proxyRegisterFailuresByPlayer = {}
 local serverBrokerStarted = false
+local function unregisterProxy(player, entry)
+	local _condition = entry
+	if _condition == nil then
+		local _player = player
+		_condition = proxyByPlayer[_player]
+	end
+	local proxy = _condition
+	if not proxy then
+		return nil
+	end
+	local _player = player
+	proxyByPlayer[_player] = nil
+	local _player_1 = player
+	proxyRegisterFailuresByPlayer[_player_1] = nil
+	postJson("/disconnect", {
+		pluginSessionId = proxy.pluginSessionId,
+	})
+end
+local function disconnectAllProxies()
+	for player, entry in proxyByPlayer do
+		unregisterProxy(player, entry)
+	end
+	table.clear(proxyByPlayer)
+	table.clear(proxyRegisterFailuresByPlayer)
+end
 local function pollProxy(proxyId, player, rf)
 	while true do
 		local _condition = player.Parent ~= nil
@@ -442,6 +467,10 @@ local function pollProxy(proxyId, player, rf)
 		if not _condition then
 			break
 		end
+		if not RunService:IsRunning() then
+			unregisterProxy(player)
+			break
+		end
 		local ok, res = pcall(function()
 			return HttpService:RequestAsync({
 				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
@@ -575,25 +604,10 @@ local function setupServerBroker()
 		task.spawn(registerProxy, p, broker)
 	end
 	Players.PlayerRemoving:Connect(function(p)
-		local _p = p
-		local entry = proxyByPlayer[_p]
-		if entry then
-			local _p_1 = p
-			proxyByPlayer[_p_1] = nil
-			local _p_2 = p
-			proxyRegisterFailuresByPlayer[_p_2] = nil
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
+		unregisterProxy(p)
 	end)
 	game:BindToClose(function()
-		for _, entry in proxyByPlayer do
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
-		table.clear(proxyByPlayer)
+		disconnectAllProxies()
 	end)
 end
 return {
@@ -601,6 +615,7 @@ return {
 	DEFAULT_MCP_URL = DEFAULT_MCP_URL,
 	getServerUrl = getServerUrl,
 	setServerUrl = setServerUrl,
+	disconnectAllProxies = disconnectAllProxies,
 	forkRole = forkRole,
 	setupClientBroker = setupClientBroker,
 	setupServerBroker = setupServerBroker,
@@ -636,6 +651,7 @@ local SerializationHandlers = TS.import(script, script.Parent, "handlers", "Seri
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
 local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
+local ClientBroker = TS.import(script, script.Parent, "ClientBroker")
 local ServerUrlSettings = TS.import(script, script.Parent, "ServerUrlSettings")
 local HttpDiagnostics = TS.import(script, script.Parent, "HttpDiagnostics")
 -- Per-plugin-load random GUID. Used as the /poll URL param so the server
@@ -708,6 +724,7 @@ local function detectRole()
 	end
 	return "client"
 end
+local initialRole = detectRole()
 local routeMap = {
 	["/api/file-tree"] = QueryHandlers.getFileTree,
 	["/api/search-files"] = QueryHandlers.searchFiles,
@@ -1125,6 +1142,7 @@ local function pollForRequests(connIndex)
 		end
 	end
 end
+local deactivatePlugin
 local function activatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
@@ -1157,6 +1175,11 @@ local function activatePlugin(connIndex)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
 			local now = tick()
+			if initialRole == "server" and not RunService:IsRunning() then
+				ClientBroker.disconnectAllProxies()
+				deactivatePlugin(idx)
+				return nil
+			end
 			local currentInstanceId = computeInstanceId()
 			if lastReadyInstanceId ~= nil and currentInstanceId ~= lastReadyInstanceId then
 				cachedPlaceName = nil
@@ -1181,7 +1204,7 @@ local function activatePlugin(connIndex)
 	-- Watch identity fields so stale name or anon instance ids are refreshed.
 	ensureIdentityWatcher(conn)
 end
-local function deactivatePlugin(connIndex)
+function deactivatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
 		_condition = State.getActiveTabIndex()
@@ -1388,9 +1411,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.16.2" is replaced with the package version at package time
+	-- "2.16.3" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.16.2`
+	return `{tostring(h)}-2.16.3`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -8018,7 +8041,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.16.2"
+local CURRENT_VERSION = "2.16.3"
 local PLUGIN_VARIANT = "inspector"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8297,7 +8320,7 @@ local function handleStopRequest(key, request)
 		return nil
 	end
 	if endTestIssued then
-		writeResult(key, request, true)
+		writeResult(key, request, false, "StudioTestService:EndTest was already issued for this play session, but the runtime DataModel is still alive.")
 		return nil
 	end
 	if not RunService:IsRunning() or not RunService:IsServer() then

package/studio-plugin/MCPPlugin.rbxmx

@@ -432,6 +432,31 @@ end
 local proxyByPlayer = {}
 local proxyRegisterFailuresByPlayer = {}
 local serverBrokerStarted = false
+local function unregisterProxy(player, entry)
+	local _condition = entry
+	if _condition == nil then
+		local _player = player
+		_condition = proxyByPlayer[_player]
+	end
+	local proxy = _condition
+	if not proxy then
+		return nil
+	end
+	local _player = player
+	proxyByPlayer[_player] = nil
+	local _player_1 = player
+	proxyRegisterFailuresByPlayer[_player_1] = nil
+	postJson("/disconnect", {
+		pluginSessionId = proxy.pluginSessionId,
+	})
+end
+local function disconnectAllProxies()
+	for player, entry in proxyByPlayer do
+		unregisterProxy(player, entry)
+	end
+	table.clear(proxyByPlayer)
+	table.clear(proxyRegisterFailuresByPlayer)
+end
 local function pollProxy(proxyId, player, rf)
 	while true do
 		local _condition = player.Parent ~= nil
@@ -442,6 +467,10 @@ local function pollProxy(proxyId, player, rf)
 		if not _condition then
 			break
 		end
+		if not RunService:IsRunning() then
+			unregisterProxy(player)
+			break
+		end
 		local ok, res = pcall(function()
 			return HttpService:RequestAsync({
 				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
@@ -575,25 +604,10 @@ local function setupServerBroker()
 		task.spawn(registerProxy, p, broker)
 	end
 	Players.PlayerRemoving:Connect(function(p)
-		local _p = p
-		local entry = proxyByPlayer[_p]
-		if entry then
-			local _p_1 = p
-			proxyByPlayer[_p_1] = nil
-			local _p_2 = p
-			proxyRegisterFailuresByPlayer[_p_2] = nil
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
+		unregisterProxy(p)
 	end)
 	game:BindToClose(function()
-		for _, entry in proxyByPlayer do
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
-		table.clear(proxyByPlayer)
+		disconnectAllProxies()
 	end)
 end
 return {
@@ -601,6 +615,7 @@ return {
 	DEFAULT_MCP_URL = DEFAULT_MCP_URL,
 	getServerUrl = getServerUrl,
 	setServerUrl = setServerUrl,
+	disconnectAllProxies = disconnectAllProxies,
 	forkRole = forkRole,
 	setupClientBroker = setupClientBroker,
 	setupServerBroker = setupServerBroker,
@@ -636,6 +651,7 @@ local SerializationHandlers = TS.import(script, script.Parent, "handlers", "Seri
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
 local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
+local ClientBroker = TS.import(script, script.Parent, "ClientBroker")
 local ServerUrlSettings = TS.import(script, script.Parent, "ServerUrlSettings")
 local HttpDiagnostics = TS.import(script, script.Parent, "HttpDiagnostics")
 -- Per-plugin-load random GUID. Used as the /poll URL param so the server
@@ -708,6 +724,7 @@ local function detectRole()
 	end
 	return "client"
 end
+local initialRole = detectRole()
 local routeMap = {
 	["/api/file-tree"] = QueryHandlers.getFileTree,
 	["/api/search-files"] = QueryHandlers.searchFiles,
@@ -1125,6 +1142,7 @@ local function pollForRequests(connIndex)
 		end
 	end
 end
+local deactivatePlugin
 local function activatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
@@ -1157,6 +1175,11 @@ local function activatePlugin(connIndex)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
 			local now = tick()
+			if initialRole == "server" and not RunService:IsRunning() then
+				ClientBroker.disconnectAllProxies()
+				deactivatePlugin(idx)
+				return nil
+			end
 			local currentInstanceId = computeInstanceId()
 			if lastReadyInstanceId ~= nil and currentInstanceId ~= lastReadyInstanceId then
 				cachedPlaceName = nil
@@ -1181,7 +1204,7 @@ local function activatePlugin(connIndex)
 	-- Watch identity fields so stale name or anon instance ids are refreshed.
 	ensureIdentityWatcher(conn)
 end
-local function deactivatePlugin(connIndex)
+function deactivatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
 		_condition = State.getActiveTabIndex()
@@ -1388,9 +1411,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.16.2" is replaced with the package version at package time
+	-- "2.16.3" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.16.2`
+	return `{tostring(h)}-2.16.3`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -8018,7 +8041,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.16.2"
+local CURRENT_VERSION = "2.16.3"
 local PLUGIN_VARIANT = "main"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8297,7 +8320,7 @@ local function handleStopRequest(key, request)
 		return nil
 	end
 	if endTestIssued then
-		writeResult(key, request, true)
+		writeResult(key, request, false, "StudioTestService:EndTest was already issued for this play session, but the runtime DataModel is still alive.")
 		return nil
 	end
 	if not RunService:IsRunning() or not RunService:IsServer() then

package/studio-plugin/src/modules/ClientBroker.ts

@@ -296,8 +296,28 @@ const proxyByPlayer = new Map<Player, ProxyEntry>();
 const proxyRegisterFailuresByPlayer = new Set<Player>();
 let serverBrokerStarted = false;
 
+function unregisterProxy(player: Player, entry?: ProxyEntry): void {
+	const proxy = entry ?? proxyByPlayer.get(player);
+	if (!proxy) return;
+	proxyByPlayer.delete(player);
+	proxyRegisterFailuresByPlayer.delete(player);
+	postJson("/disconnect", { pluginSessionId: proxy.pluginSessionId });
+}
+
+function disconnectAllProxies(): void {
+	for (const [player, entry] of proxyByPlayer) {
+		unregisterProxy(player, entry);
+	}
+	proxyByPlayer.clear();
+	proxyRegisterFailuresByPlayer.clear();
+}
+
 function pollProxy(proxyId: string, player: Player, rf: RemoteFunction) {
 	while (player.Parent !== undefined && proxyByPlayer.has(player)) {
+		if (!RunService.IsRunning()) {
+			unregisterProxy(player);
+			break;
+		}
 		const [ok, res] = pcall(() =>
 			HttpService.RequestAsync({
 				Url: `${mcpUrl}/poll?pluginSessionId=${proxyId}`,
@@ -396,18 +416,10 @@ function setupServerBroker() {
 		task.spawn(registerProxy, p, broker);
 	}
 	Players.PlayerRemoving.Connect((p) => {
-		const entry = proxyByPlayer.get(p);
-		if (entry) {
-			proxyByPlayer.delete(p);
-			proxyRegisterFailuresByPlayer.delete(p);
-			postJson("/disconnect", { pluginSessionId: entry.pluginSessionId });
-		}
+		unregisterProxy(p);
 	});
 	game.BindToClose(() => {
-		for (const [, entry] of proxyByPlayer) {
-			postJson("/disconnect", { pluginSessionId: entry.pluginSessionId });
-		}
-		proxyByPlayer.clear();
+		disconnectAllProxies();
 	});
 }
 
@@ -416,6 +428,7 @@ export = {
 	DEFAULT_MCP_URL,
 	getServerUrl,
 	setServerUrl,
+	disconnectAllProxies,
 	forkRole,
 	setupClientBroker,
 	setupServerBroker,

package/studio-plugin/src/modules/Communication.ts

@@ -18,6 +18,7 @@ import SerializationHandlers from "./handlers/SerializationHandlers";
 import MemoryHandlers from "./handlers/MemoryHandlers";
 import SceneAnalysisHandlers from "./handlers/SceneAnalysisHandlers";
 import EvalRuntimeHandlers from "./handlers/EvalRuntimeHandlers";
+import ClientBroker from "./ClientBroker";
 import ServerUrlSettings from "./ServerUrlSettings";
 import HttpDiagnostics from "./HttpDiagnostics";
 import { Connection, RequestPayload, PollResponse, ReadyResponse } from "../types";
@@ -89,6 +90,8 @@ function detectRole(): string {
 	return "client";
 }
 
+const initialRole = detectRole();
+
 type Handler = (data: Record<string, unknown>) => unknown;
 
 const routeMap: Record<string, Handler> = {
@@ -510,6 +513,11 @@ function activatePlugin(connIndex?: number) {
 	if (!conn.heartbeatConnection) {
 		conn.heartbeatConnection = RunService.Heartbeat.Connect(() => {
 			const now = tick();
+			if (initialRole === "server" && !RunService.IsRunning()) {
+				ClientBroker.disconnectAllProxies();
+				deactivatePlugin(idx);
+				return;
+			}
 			const currentInstanceId = computeInstanceId();
 			if (lastReadyInstanceId !== undefined && currentInstanceId !== lastReadyInstanceId) {
 				cachedPlaceName = undefined;

package/studio-plugin/src/modules/StopPlayMonitor.ts

@@ -162,7 +162,12 @@ function handleStopRequest(key: string, request: StopPayload): void {
 	}
 
 	if (endTestIssued) {
-		writeResult(key, request, true);
+		writeResult(
+			key,
+			request,
+			false,
+			"StudioTestService:EndTest was already issued for this play session, but the runtime DataModel is still alive.",
+		);
 		return;
 	}