@chrrxs/robloxstudio-mcp 3.0.4 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrrxs/robloxstudio-mcp",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "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

@@ -16,6 +16,7 @@ local cleanupEditBridgeArtifacts = _EvalBridges.cleanupEditBridgeArtifacts
 local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
+local StudioEventStream = TS.import(script, script, "modules", "StudioEventStream")
 local BreakpointHandlers = TS.import(script, script, "modules", "handlers", "BreakpointHandlers")
 local RenderMonitor = TS.import(script, script, "modules", "RenderMonitor")
 -- Track render-loop liveness so input/screenshot tools can report "window
@@ -32,8 +33,9 @@ RuntimeLogBuffer.install()
 StopPlayMonitor.init(plugin)
 BreakpointHandlers.init(plugin)
 ServerUrlSettings.init(plugin)
+local startupRole = ClientBroker.forkRole()
 local function applyRememberedServerUrl()
-	if ClientBroker.forkRole() == "client" then
+	if startupRole == "client" then
 		return nil
 	end
 	local rememberedServerUrl = ServerUrlSettings.readServerUrl()
@@ -49,6 +51,15 @@ local function applyRememberedServerUrl()
 	ClientBroker.setServerUrl(rememberedServerUrl)
 end
 applyRememberedServerUrl()
+-- Play DataModels do not reliably fire Plugin.Unloading before Studio tears
+-- down their VM. Close the persistent WebStreamClient while BindToClose still
+-- gives this server peer a live execution context; otherwise each play cycle
+-- can retain one native event stream until Studio itself is restarted. The
+-- transport releases that native stream before yielding to unregister the
+-- logical server peer.
+if startupRole == "server" then
+	game:BindToClose(StudioEventStream.suspendForShutdown)
+end
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://75876056391496"
@@ -91,7 +102,7 @@ task.delay(TOOLBAR_REGISTRATION_DELAY_SECONDS, registerToolbarButton)
 -- play peers' plugin instances load without ever registering. Run after a
 -- short delay so the UI/State have a chance to initialize first.
 task.delay(2, function()
-	local role = ClientBroker.forkRole()
+	local role = startupRole
 	if role == "edit" then
 		cleanupEditBridgeArtifacts()
 	else
@@ -133,7 +144,10 @@ task.delay(2, function()
 		-- The play-server DM is the only one where StudioTestService:EndTest is
 		-- legal, so the stop-play monitor lives here. It consumes tokenized
 		-- stop requests from plugin settings and acknowledges EndTest results.
-		StopPlayMonitor.startMonitor()
+		StopPlayMonitor.startMonitor({
+			beforeEndTest = StudioEventStream.suspendForShutdown,
+			afterEndTestFailure = StudioEventStream.resumeAfterShutdownFailure,
+		})
 	elseif role == "client" then
 		ClientBroker.setupClientBroker()
 	end
@@ -1348,9 +1362,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.0.4" is replaced with the package version at package time
+	-- "3.0.5" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-3.0.4`
+	return `{tostring(h)}-3.0.5`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -9566,7 +9580,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "3.0.4"
+local CURRENT_VERSION = "3.0.5"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
 local function createConnection(port)
@@ -9646,6 +9660,7 @@ local WAIT_POLL_SEC = 0.1
 local REQUEST_TTL_SEC = 12.0
 local pluginRef
 local endTestIssued = false
+local transportLifecycle
 local function init(p)
 	pluginRef = p
 end
@@ -9789,15 +9804,29 @@ local function handleStopRequest(key, request)
 		return nil
 	end
 	endTestIssued = true
+	local lifecycle = transportLifecycle
+	if lifecycle ~= nil then
+		local closeOk, closeError = pcall(lifecycle.beforeEndTest)
+		if not closeOk then
+			warn(`[robloxstudio-mcp] Failed to close the play-server transport before EndTest: {tostring(closeError)}`)
+		end
+	end
 	local endOk, endErr = pcall(function()
 		return StudioTestService:EndTest("stopped_by_mcp")
 	end)
 	writeResult(key, request, endOk, if endOk then nil else tostring(endErr))
 	if not endOk then
 		endTestIssued = false
+		if lifecycle ~= nil then
+			local restoreOk, restoreError = pcall(lifecycle.afterEndTestFailure)
+			if not restoreOk then
+				warn(`[robloxstudio-mcp] Failed to restore the play-server transport after EndTest failed: {tostring(restoreError)}`)
+			end
+		end
 	end
 end
-local function startMonitor()
+local function startMonitor(lifecycle)
+	transportLifecycle = lifecycle
 	if not pluginRef then
 		warn("[robloxstudio-mcp] StopPlayMonitor.startMonitor called before init; skipping")
 		return nil
@@ -9903,6 +9932,7 @@ local MAX_TERMINAL_RESPONSES = 256
 local STREAM_SILENCE_TIMEOUT_SECONDS = 20
 local options
 local active = false
+local shutdownSuspended = false
 local generation = 0
 local reconnectAttempt = 0
 local streamClient
@@ -10035,6 +10065,21 @@ local function closeCurrentStream()
 		end)
 	end
 end
+local function disconnectSession(currentOptions)
+	pcall(function()
+		return HttpService:RequestAsync({
+			Url = `{currentOptions.serverUrl}/disconnect`,
+			Method = "POST",
+			Headers = {
+				["Content-Type"] = "application/json",
+			},
+			Body = HttpService:JSONEncode({
+				pluginSessionId = PluginSession.id,
+				timestamp = tick(),
+			}),
+		})
+	end)
+end
 local function responseRetryDelay(attempt)
 	return math.min(INITIAL_RESPONSE_RETRY_DELAY_SECONDS * math.pow(2, math.max(attempt - 1, 0)), MAX_RESPONSE_RETRY_DELAY_SECONDS)
 end
@@ -10523,11 +10568,12 @@ function connect(expectedGeneration)
 end
 local stop
 local function start(newOptions)
-	if active then
+	if active or shutdownSuspended then
 		stop()
 	end
 	options = newOptions
 	active = true
+	shutdownSuspended = false
 	reconnectAttempt = 0
 	generation += 1
 	connect(generation)
@@ -10541,12 +10587,39 @@ function refresh()
 	reconnectAttempt = 0
 	connect(generation)
 end
+-- EndTest can tear down a play DataModel without giving Plugin.Unloading a
+-- usable execution window. Release the native WebStreamClient before the
+-- yielding unregister request, but retain local request state and connection
+-- options so a failed EndTest can register again and reconnect.
+local function suspendForShutdown()
+	local currentOptions = options
+	if not active or currentOptions == nil then
+		return nil
+	end
+	active = false
+	shutdownSuspended = true
+	generation += 1
+	reconnectAttempt = 0
+	closeCurrentStream()
+	disconnectSession(currentOptions)
+end
+local function resumeAfterShutdownFailure()
+	if not shutdownSuspended or options == nil then
+		return nil
+	end
+	shutdownSuspended = false
+	active = true
+	generation += 1
+	reconnectAttempt = 0
+	connect(generation)
+end
 function stop()
-	if not active then
+	if not active and not shutdownSuspended then
 		return nil
 	end
 	local currentOptions = options
 	active = false
+	shutdownSuspended = false
 	generation += 1
 	for _, inFlight in inFlightRequests do
 		inFlight.cancelled = true
@@ -10558,24 +10631,14 @@ function stop()
 	options = nil
 	reconnectAttempt = 0
 	if currentOptions ~= nil then
-		pcall(function()
-			return HttpService:RequestAsync({
-				Url = `{currentOptions.serverUrl}/disconnect`,
-				Method = "POST",
-				Headers = {
-					["Content-Type"] = "application/json",
-				},
-				Body = HttpService:JSONEncode({
-					pluginSessionId = PluginSession.id,
-					timestamp = tick(),
-				}),
-			})
-		end)
+		disconnectSession(currentOptions)
 	end
 end
 return {
 	start = start,
 	refresh = refresh,
+	suspendForShutdown = suspendForShutdown,
+	resumeAfterShutdownFailure = resumeAfterShutdownFailure,
 	stop = stop,
 }
 ]]></string>