@chrrxs/robloxstudio-mcp-inspector 2.11.1 → 2.11.2

package/dist/index.js

@@ -1928,23 +1928,9 @@ ${code}`
         };
       }
       async stopPlaytest() {
-        let hasProxy = this.bridge.getInstances().some((i) => i.role === "edit-proxy");
-        if (!hasProxy) {
-          const deadline = Date.now() + 1500;
-          while (!hasProxy && Date.now() < deadline) {
-            await new Promise((r) => setTimeout(r, 150));
-            hasProxy = this.bridge.getInstances().some((i) => i.role === "edit-proxy");
-          }
-        }
-        const target = hasProxy ? "edit-proxy" : "edit";
-        const response = await this.client.request("/api/stop-playtest", {}, target);
+        const response = await this.client.request("/api/stop-playtest", {}, "edit");
         return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(response)
-            }
-          ]
+          content: [{ type: "text", text: JSON.stringify(response) }]
         };
       }
       async getPlaytestOutput(target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrrxs/robloxstudio-mcp-inspector",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "description": "Read-only MCP Server for Roblox Studio (fork of boshyxd/robloxstudio-mcp-inspector with per-peer execute_luau fixes baked in)",
   "main": "dist/index.js",
   "type": "module",

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -11,10 +11,15 @@ local UI = TS.import(script, script, "modules", "UI")
 local Communication = TS.import(script, script, "modules", "Communication")
 local ClientBroker = TS.import(script, script, "modules", "ClientBroker")
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
+local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
 -- Attach the per-peer LogService.MessageOut listener as early as possible so
 -- boot-time prints from the user's place scripts are captured. Powers the
 -- get_runtime_logs MCP tool. Idempotent; safe to call before UI.init().
 RuntimeLogBuffer.install()
+-- Share the plugin reference with the stop-play signaling module so both the
+-- edit DM (write the flag) and the play-server DM (read+act on the flag) can
+-- access plugin:SetSetting/GetSetting.
+StopPlayMonitor.init(plugin)
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://125921838360800"
@@ -65,6 +70,10 @@ task.delay(2, function()
 	end
 	if role == "server" then
 		ClientBroker.setupServerBroker()
+		-- The play-server DM is the only one where StudioTestService:EndTest is
+		-- legal, so the stop-play monitor lives here. Reads MCP_STOP_PLAY_SIGNAL
+		-- at 1Hz and calls EndTest when the edit DM sets it.
+		StopPlayMonitor.startMonitor()
 	elseif role == "client" then
 		ClientBroker.setupClientBroker()
 	end
@@ -94,12 +103,10 @@ local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandl
 -- in ReplicatedStorage; each player gets a proxy "client" registration on the
 -- MCP side, polled and dispatched by the server peer.
 --
--- The same server peer also registers an "edit" proxy that intercepts
--- /api/stop-playtest specifically - StudioTestService:EndTest only works from
--- the play server DM, so the real edit DM cannot satisfy stop requests on its
--- own. MCP returns the same pending request to multiple pollers until someone
--- /responds, so non-stop edit-targeted requests fall through to the actual
--- edit DM untouched.
+-- (Previously the server peer also registered an "edit-proxy" role to
+-- intercept /api/stop-playtest and call StudioTestService:EndTest. That hack
+-- is gone: stop now uses StopPlayMonitor with plugin:SetSetting cross-DM
+-- signaling, which works regardless of MCP server state.)
 local MCP_URL = "http://localhost:58741"
 local BROKER_NAME = "__MCPClientBroker"
 -- Endpoints the server-peer broker is allowed to forward to the client peer.
@@ -329,59 +336,10 @@ local function registerProxy(player, rf)
 	proxyByPlayer[_player_1] = _arg1
 	task.spawn(pollProxy, proxyId, player, rf)
 end
-local function startEditProxyLoop()
-	task.spawn(function()
-		local proxyId = HttpService:GenerateGUID(false)
-		local ok, res = postJson("/ready", {
-			instanceId = proxyId,
-			role = "edit-proxy",
-		})
-		if not ok or not res or not res.Success then
-			warn("[MCPFork] edit-proxy register failed")
-			return nil
-		end
-		while true do
-			local okPoll, pollRes = pcall(function()
-				return HttpService:RequestAsync({
-					Url = `{MCP_URL}/poll?instanceId={proxyId}`,
-					Method = "GET",
-					Headers = {
-						["Content-Type"] = "application/json",
-					},
-				})
-			end)
-			if okPoll and pollRes and (pollRes.Success or pollRes.StatusCode == 503) then
-				local okJson, body = pcall(function()
-					return HttpService:JSONDecode(pollRes.Body)
-				end)
-				if okJson and body then
-					-- Re-register if the server lost our edit-proxy registration.
-					if body.knownInstance == false then
-						reRegisterProxy(proxyId, "edit-proxy")
-					end
-					if body.request and body.request.endpoint == "/api/stop-playtest" and body.requestId ~= nil then
-						local sts = game:GetService("StudioTestService")
-						local endOk, endErr = pcall(function()
-							return sts:EndTest("stopped_by_mcp")
-						end)
-						local response = if endOk then {
-							success = true,
-							message = "Playtest stopped via edit-proxy/EndTest",
-						} else {
-							success = false,
-							error = `EndTest failed: {tostring(endErr)}`,
-						}
-						postJson("/response", {
-							requestId = body.requestId,
-							response = response,
-						})
-					end
-				end
-			end
-			task.wait(0.15)
-		end
-	end)
-end
+-- (Removed: startEditProxyLoop. The play-server DM no longer registers an
+-- "edit-proxy" peer with the MCP server. stop_playtest now uses a cross-DM
+-- plugin:SetSetting flag consumed by StopPlayMonitor in the play-server DM,
+-- which doesn't depend on MCP server state or peer registration at all.)
 local function setupServerBroker()
 	local rf = ReplicatedStorage:FindFirstChild(BROKER_NAME)
 	if not rf then
@@ -415,7 +373,6 @@ local function setupServerBroker()
 		end
 		table.clear(proxyByPlayer)
 	end)
-	startEditProxyLoop()
 end
 return {
 	MCP_URL = MCP_URL,
@@ -5689,10 +5646,14 @@ local LogService = _services.LogService
 local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
 local installBridges = _EvalBridges.installBridges
 local cleanupBridges = _EvalBridges.cleanupBridges
+local StopPlayMonitor = TS.import(script, script.Parent.Parent, "StopPlayMonitor")
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
 local ScriptEditorService = game:GetService("ScriptEditorService")
-local STOP_SIGNAL = "__MCP_STOP__"
+-- NAV_SIGNAL flows from the edit DM to the play-server DM via the injected
+-- __MCP_CommandListener Script + LogService.MessageOut. Stop signaling moved
+-- off this path entirely (see StopPlayMonitor) because cross-DM MessageOut
+-- reflection from edit -> play-server does not work in practice.
 local NAV_SIGNAL = "__MCP_NAV__"
 local NAV_RESULT = "__MCP_NAV_RESULT__"
 local testRunning = false
@@ -5704,16 +5665,13 @@ local stopListenerScript
 local navResultCallback
 local function buildCommandListenerSource()
 	return `local LogService = game:GetService("LogService")\
-local StudioTestService = game:GetService("StudioTestService")\
 local PathfindingService = game:GetService("PathfindingService")\
 local Players = game:GetService("Players")\
 local HttpService = game:GetService("HttpService")\
 local NAV_SIG = "{NAV_SIGNAL}"\
 local NAV_RES = "{NAV_RESULT}"\
 LogService.MessageOut:Connect(function(msg)\
-	if msg == "{STOP_SIGNAL}" then\
-		pcall(function() StudioTestService:EndTest("stopped_by_mcp") end)\
-	elseif string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then\
+	if string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then\
 		local json = string.sub(msg, #NAV_SIG + 2)\
 		task.spawn(function()\
 			local ok, d = pcall(function() return HttpService:JSONDecode(json) end)\
@@ -5812,9 +5770,6 @@ local function startPlaytest(requestData)
 	testError = nil
 	cleanupStopListener()
 	logConnection = LogService.MessageOut:Connect(function(message, messageType)
-		if message == STOP_SIGNAL then
-			return nil
-		end
 		local _message = message
 		local _arg1 = #NAV_SIGNAL
 		if string.sub(_message, 1, _arg1) == NAV_SIGNAL then
@@ -5876,25 +5831,42 @@ local function startPlaytest(requestData)
 		cleanupStopListener()
 		cleanupBridges()
 	end)
-	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s)` else `Playtest started in {mode} mode`
+	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s).` else `Playtest started in {mode} mode.`
 	local response = {
 		success = true,
 		message = msg,
-		evalBridges = if bridgeInstall.installed then "installed" else `failed: {bridgeInstall.error}`,
 	}
+	-- Only mention eval bridges when they failed — when they're fine, the
+	-- detail is noise. eval_server_runtime / eval_client_runtime will surface
+	-- their own clear errors if the caller tries to use them after a failed
+	-- install.
+	if not bridgeInstall.installed then
+		response.evalBridgesError = bridgeInstall.error
+	end
 	return response
 end
 local function stopPlaytest(_requestData)
-	-- Server-side routing (tools/index.ts:stopPlaytest) sends /api/stop-playtest
-	-- to the role="edit-proxy" instance whenever one is registered. This handler
-	-- is only reached when there's no edit-proxy - i.e. no active playtest, or
-	-- the play DMs haven't completed plugin auto-activation yet. Calling
-	-- StudioTestService:EndTest from the edit DM is illegal ("can only be
-	-- called from the server DataModel of a running Studio play session"), so
-	-- don't try - return a clean "no active playtest" response instead.
+	-- Signal the play-server DM's StopPlayMonitor via plugin:SetSetting (a
+	-- cross-DM persistent store). The monitor polls at 1Hz, sees the flag,
+	-- calls StudioTestService:EndTest, then resets the flag. We wait up to
+	-- 2.5s for the reset to confirm a play DM actually consumed the request,
+	-- which avoids returning success when nothing is running.
+	if not StopPlayMonitor.requestStop() then
+		return {
+			error = "Plugin not ready. Try again in a moment.",
+		}
+	end
+	if StopPlayMonitor.waitForConsumption() then
+		return {
+			success = true,
+			message = "Playtest stopped.",
+		}
+	end
+	-- Clean up the pending flag so a future playtest's monitor doesn't fire
+	-- EndTest on its own startup against a stale signal.
+	StopPlayMonitor.clearPending()
 	return {
-		error = "No active playtest to stop (edit-proxy not registered).",
-		hint = "If a playtest is running, the play-server DM may not have completed plugin auto-activation yet. " .. "Wait a moment and retry, or call execute_luau target=server with StudioTestService:EndTest as a manual fallback.",
+		error = "No active playtest to stop.",
 	}
 end
 local function getPlaytestOutput(_requestData)
@@ -6203,7 +6175,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.11.1"
+local CURRENT_VERSION = "2.11.2"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6296,6 +6268,113 @@ return {
         </Properties>
       </Item>
       <Item class="ModuleScript" referent="22">
+        <Properties>
+          <string name="Name">StopPlayMonitor</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+-- Cross-DM stop_playtest signaling via plugin:SetSetting.
+--
+-- `plugin:SetSetting` / `plugin:GetSetting` is a per-plugin persistent store
+-- that's shared across every DataModel the plugin runs in (edit, play-server,
+-- play-clients). We use it as a one-bit flag for "please call EndTest in the
+-- play-server DM":
+--
+--   * The edit DM's stopPlaytest handler writes the flag (requestStop).
+--   * A monitor loop running inside the play-server DM polls the flag at 1Hz
+--     and calls StudioTestService:EndTest when it flips true, then resets it.
+--   * The edit DM then waits up to ~2.5s for the flag to be reset, which
+--     tells us a play-server actually consumed the request (no false-positive
+--     success when nothing was running).
+--
+-- Why this is simpler than the previous edit-proxy registration:
+--   * Doesn't depend on the MCP server tracking peer roles at all.
+--   * Survives MCP server restarts: monitor loop is local to the play-server
+--     plugin lifetime, not to any HTTP/registration state.
+--   * No need for cross-DM LogService.MessageOut reflection (which we verified
+--     does not work edit -> play-server anyway).
+--
+-- Pattern mirrors the official Roblox Studio MCP
+-- (Roblox/studio-rust-mcp-server, plugin/src/Utils/GameStopUtil.luau).
+local StudioTestService = game:GetService("StudioTestService")
+local SETTING_KEY = "MCP_STOP_PLAY_SIGNAL"
+local POLL_INTERVAL_SEC = 1
+local WAIT_FOR_CONSUMPTION_TIMEOUT_SEC = 2.5
+local WAIT_POLL_SEC = 0.1
+local pluginRef
+local function init(p)
+	pluginRef = p
+end
+local function startMonitor()
+	if not pluginRef then
+		warn("[MCP] StopPlayMonitor.startMonitor called before init; skipping")
+		return nil
+	end
+	-- Clear any stale value left from a prior session. If a real stop request
+	-- is in-flight when this runs, the requesting edit DM will set it again
+	-- within its 2.5s wait window.
+	pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, false)
+	end)
+	task.spawn(function()
+		while true do
+			local okGet, val = pcall(function()
+				return pluginRef:GetSetting(SETTING_KEY)
+			end)
+			if okGet and val == true then
+				pcall(function()
+					return pluginRef:SetSetting(SETTING_KEY, false)
+				end)
+				pcall(function()
+					return StudioTestService:EndTest("stopped_by_mcp")
+				end)
+			end
+			task.wait(POLL_INTERVAL_SEC)
+		end
+	end)
+end
+local function requestStop()
+	if not pluginRef then
+		return false
+	end
+	local ok = pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, true)
+	end)
+	return ok
+end
+local function waitForConsumption()
+	if not pluginRef then
+		return false
+	end
+	local start = tick()
+	while tick() - start < WAIT_FOR_CONSUMPTION_TIMEOUT_SEC do
+		local okGet, val = pcall(function()
+			return pluginRef:GetSetting(SETTING_KEY)
+		end)
+		if okGet and val ~= true then
+			return true
+		end
+		task.wait(WAIT_POLL_SEC)
+	end
+	return false
+end
+local function clearPending()
+	if not pluginRef then
+		return nil
+	end
+	pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, false)
+	end)
+end
+return {
+	init = init,
+	startMonitor = startMonitor,
+	requestStop = requestStop,
+	waitForConsumption = waitForConsumption,
+	clearPending = clearPending,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7046,7 +7125,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7576,11 +7655,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="27">
+    <Item class="Folder" referent="28">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -9654,7 +9733,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -9921,15 +10000,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="28">
+    <Item class="Folder" referent="29">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="29">
+      <Item class="Folder" referent="30">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {

package/studio-plugin/MCPPlugin.rbxmx

@@ -11,10 +11,15 @@ local UI = TS.import(script, script, "modules", "UI")
 local Communication = TS.import(script, script, "modules", "Communication")
 local ClientBroker = TS.import(script, script, "modules", "ClientBroker")
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
+local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
 -- Attach the per-peer LogService.MessageOut listener as early as possible so
 -- boot-time prints from the user's place scripts are captured. Powers the
 -- get_runtime_logs MCP tool. Idempotent; safe to call before UI.init().
 RuntimeLogBuffer.install()
+-- Share the plugin reference with the stop-play signaling module so both the
+-- edit DM (write the flag) and the play-server DM (read+act on the flag) can
+-- access plugin:SetSetting/GetSetting.
+StopPlayMonitor.init(plugin)
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://75876056391496"
@@ -65,6 +70,10 @@ task.delay(2, function()
 	end
 	if role == "server" then
 		ClientBroker.setupServerBroker()
+		-- The play-server DM is the only one where StudioTestService:EndTest is
+		-- legal, so the stop-play monitor lives here. Reads MCP_STOP_PLAY_SIGNAL
+		-- at 1Hz and calls EndTest when the edit DM sets it.
+		StopPlayMonitor.startMonitor()
 	elseif role == "client" then
 		ClientBroker.setupClientBroker()
 	end
@@ -94,12 +103,10 @@ local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandl
 -- in ReplicatedStorage; each player gets a proxy "client" registration on the
 -- MCP side, polled and dispatched by the server peer.
 --
--- The same server peer also registers an "edit" proxy that intercepts
--- /api/stop-playtest specifically - StudioTestService:EndTest only works from
--- the play server DM, so the real edit DM cannot satisfy stop requests on its
--- own. MCP returns the same pending request to multiple pollers until someone
--- /responds, so non-stop edit-targeted requests fall through to the actual
--- edit DM untouched.
+-- (Previously the server peer also registered an "edit-proxy" role to
+-- intercept /api/stop-playtest and call StudioTestService:EndTest. That hack
+-- is gone: stop now uses StopPlayMonitor with plugin:SetSetting cross-DM
+-- signaling, which works regardless of MCP server state.)
 local MCP_URL = "http://localhost:58741"
 local BROKER_NAME = "__MCPClientBroker"
 -- Endpoints the server-peer broker is allowed to forward to the client peer.
@@ -329,59 +336,10 @@ local function registerProxy(player, rf)
 	proxyByPlayer[_player_1] = _arg1
 	task.spawn(pollProxy, proxyId, player, rf)
 end
-local function startEditProxyLoop()
-	task.spawn(function()
-		local proxyId = HttpService:GenerateGUID(false)
-		local ok, res = postJson("/ready", {
-			instanceId = proxyId,
-			role = "edit-proxy",
-		})
-		if not ok or not res or not res.Success then
-			warn("[MCPFork] edit-proxy register failed")
-			return nil
-		end
-		while true do
-			local okPoll, pollRes = pcall(function()
-				return HttpService:RequestAsync({
-					Url = `{MCP_URL}/poll?instanceId={proxyId}`,
-					Method = "GET",
-					Headers = {
-						["Content-Type"] = "application/json",
-					},
-				})
-			end)
-			if okPoll and pollRes and (pollRes.Success or pollRes.StatusCode == 503) then
-				local okJson, body = pcall(function()
-					return HttpService:JSONDecode(pollRes.Body)
-				end)
-				if okJson and body then
-					-- Re-register if the server lost our edit-proxy registration.
-					if body.knownInstance == false then
-						reRegisterProxy(proxyId, "edit-proxy")
-					end
-					if body.request and body.request.endpoint == "/api/stop-playtest" and body.requestId ~= nil then
-						local sts = game:GetService("StudioTestService")
-						local endOk, endErr = pcall(function()
-							return sts:EndTest("stopped_by_mcp")
-						end)
-						local response = if endOk then {
-							success = true,
-							message = "Playtest stopped via edit-proxy/EndTest",
-						} else {
-							success = false,
-							error = `EndTest failed: {tostring(endErr)}`,
-						}
-						postJson("/response", {
-							requestId = body.requestId,
-							response = response,
-						})
-					end
-				end
-			end
-			task.wait(0.15)
-		end
-	end)
-end
+-- (Removed: startEditProxyLoop. The play-server DM no longer registers an
+-- "edit-proxy" peer with the MCP server. stop_playtest now uses a cross-DM
+-- plugin:SetSetting flag consumed by StopPlayMonitor in the play-server DM,
+-- which doesn't depend on MCP server state or peer registration at all.)
 local function setupServerBroker()
 	local rf = ReplicatedStorage:FindFirstChild(BROKER_NAME)
 	if not rf then
@@ -415,7 +373,6 @@ local function setupServerBroker()
 		end
 		table.clear(proxyByPlayer)
 	end)
-	startEditProxyLoop()
 end
 return {
 	MCP_URL = MCP_URL,
@@ -5689,10 +5646,14 @@ local LogService = _services.LogService
 local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
 local installBridges = _EvalBridges.installBridges
 local cleanupBridges = _EvalBridges.cleanupBridges
+local StopPlayMonitor = TS.import(script, script.Parent.Parent, "StopPlayMonitor")
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
 local ScriptEditorService = game:GetService("ScriptEditorService")
-local STOP_SIGNAL = "__MCP_STOP__"
+-- NAV_SIGNAL flows from the edit DM to the play-server DM via the injected
+-- __MCP_CommandListener Script + LogService.MessageOut. Stop signaling moved
+-- off this path entirely (see StopPlayMonitor) because cross-DM MessageOut
+-- reflection from edit -> play-server does not work in practice.
 local NAV_SIGNAL = "__MCP_NAV__"
 local NAV_RESULT = "__MCP_NAV_RESULT__"
 local testRunning = false
@@ -5704,16 +5665,13 @@ local stopListenerScript
 local navResultCallback
 local function buildCommandListenerSource()
 	return `local LogService = game:GetService("LogService")\
-local StudioTestService = game:GetService("StudioTestService")\
 local PathfindingService = game:GetService("PathfindingService")\
 local Players = game:GetService("Players")\
 local HttpService = game:GetService("HttpService")\
 local NAV_SIG = "{NAV_SIGNAL}"\
 local NAV_RES = "{NAV_RESULT}"\
 LogService.MessageOut:Connect(function(msg)\
-	if msg == "{STOP_SIGNAL}" then\
-		pcall(function() StudioTestService:EndTest("stopped_by_mcp") end)\
-	elseif string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then\
+	if string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then\
 		local json = string.sub(msg, #NAV_SIG + 2)\
 		task.spawn(function()\
 			local ok, d = pcall(function() return HttpService:JSONDecode(json) end)\
@@ -5812,9 +5770,6 @@ local function startPlaytest(requestData)
 	testError = nil
 	cleanupStopListener()
 	logConnection = LogService.MessageOut:Connect(function(message, messageType)
-		if message == STOP_SIGNAL then
-			return nil
-		end
 		local _message = message
 		local _arg1 = #NAV_SIGNAL
 		if string.sub(_message, 1, _arg1) == NAV_SIGNAL then
@@ -5876,25 +5831,42 @@ local function startPlaytest(requestData)
 		cleanupStopListener()
 		cleanupBridges()
 	end)
-	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s)` else `Playtest started in {mode} mode`
+	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s).` else `Playtest started in {mode} mode.`
 	local response = {
 		success = true,
 		message = msg,
-		evalBridges = if bridgeInstall.installed then "installed" else `failed: {bridgeInstall.error}`,
 	}
+	-- Only mention eval bridges when they failed — when they're fine, the
+	-- detail is noise. eval_server_runtime / eval_client_runtime will surface
+	-- their own clear errors if the caller tries to use them after a failed
+	-- install.
+	if not bridgeInstall.installed then
+		response.evalBridgesError = bridgeInstall.error
+	end
 	return response
 end
 local function stopPlaytest(_requestData)
-	-- Server-side routing (tools/index.ts:stopPlaytest) sends /api/stop-playtest
-	-- to the role="edit-proxy" instance whenever one is registered. This handler
-	-- is only reached when there's no edit-proxy - i.e. no active playtest, or
-	-- the play DMs haven't completed plugin auto-activation yet. Calling
-	-- StudioTestService:EndTest from the edit DM is illegal ("can only be
-	-- called from the server DataModel of a running Studio play session"), so
-	-- don't try - return a clean "no active playtest" response instead.
+	-- Signal the play-server DM's StopPlayMonitor via plugin:SetSetting (a
+	-- cross-DM persistent store). The monitor polls at 1Hz, sees the flag,
+	-- calls StudioTestService:EndTest, then resets the flag. We wait up to
+	-- 2.5s for the reset to confirm a play DM actually consumed the request,
+	-- which avoids returning success when nothing is running.
+	if not StopPlayMonitor.requestStop() then
+		return {
+			error = "Plugin not ready. Try again in a moment.",
+		}
+	end
+	if StopPlayMonitor.waitForConsumption() then
+		return {
+			success = true,
+			message = "Playtest stopped.",
+		}
+	end
+	-- Clean up the pending flag so a future playtest's monitor doesn't fire
+	-- EndTest on its own startup against a stale signal.
+	StopPlayMonitor.clearPending()
 	return {
-		error = "No active playtest to stop (edit-proxy not registered).",
-		hint = "If a playtest is running, the play-server DM may not have completed plugin auto-activation yet. " .. "Wait a moment and retry, or call execute_luau target=server with StudioTestService:EndTest as a manual fallback.",
+		error = "No active playtest to stop.",
 	}
 end
 local function getPlaytestOutput(_requestData)
@@ -6203,7 +6175,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.11.1"
+local CURRENT_VERSION = "2.11.2"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6296,6 +6268,113 @@ return {
         </Properties>
       </Item>
       <Item class="ModuleScript" referent="22">
+        <Properties>
+          <string name="Name">StopPlayMonitor</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+-- Cross-DM stop_playtest signaling via plugin:SetSetting.
+--
+-- `plugin:SetSetting` / `plugin:GetSetting` is a per-plugin persistent store
+-- that's shared across every DataModel the plugin runs in (edit, play-server,
+-- play-clients). We use it as a one-bit flag for "please call EndTest in the
+-- play-server DM":
+--
+--   * The edit DM's stopPlaytest handler writes the flag (requestStop).
+--   * A monitor loop running inside the play-server DM polls the flag at 1Hz
+--     and calls StudioTestService:EndTest when it flips true, then resets it.
+--   * The edit DM then waits up to ~2.5s for the flag to be reset, which
+--     tells us a play-server actually consumed the request (no false-positive
+--     success when nothing was running).
+--
+-- Why this is simpler than the previous edit-proxy registration:
+--   * Doesn't depend on the MCP server tracking peer roles at all.
+--   * Survives MCP server restarts: monitor loop is local to the play-server
+--     plugin lifetime, not to any HTTP/registration state.
+--   * No need for cross-DM LogService.MessageOut reflection (which we verified
+--     does not work edit -> play-server anyway).
+--
+-- Pattern mirrors the official Roblox Studio MCP
+-- (Roblox/studio-rust-mcp-server, plugin/src/Utils/GameStopUtil.luau).
+local StudioTestService = game:GetService("StudioTestService")
+local SETTING_KEY = "MCP_STOP_PLAY_SIGNAL"
+local POLL_INTERVAL_SEC = 1
+local WAIT_FOR_CONSUMPTION_TIMEOUT_SEC = 2.5
+local WAIT_POLL_SEC = 0.1
+local pluginRef
+local function init(p)
+	pluginRef = p
+end
+local function startMonitor()
+	if not pluginRef then
+		warn("[MCP] StopPlayMonitor.startMonitor called before init; skipping")
+		return nil
+	end
+	-- Clear any stale value left from a prior session. If a real stop request
+	-- is in-flight when this runs, the requesting edit DM will set it again
+	-- within its 2.5s wait window.
+	pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, false)
+	end)
+	task.spawn(function()
+		while true do
+			local okGet, val = pcall(function()
+				return pluginRef:GetSetting(SETTING_KEY)
+			end)
+			if okGet and val == true then
+				pcall(function()
+					return pluginRef:SetSetting(SETTING_KEY, false)
+				end)
+				pcall(function()
+					return StudioTestService:EndTest("stopped_by_mcp")
+				end)
+			end
+			task.wait(POLL_INTERVAL_SEC)
+		end
+	end)
+end
+local function requestStop()
+	if not pluginRef then
+		return false
+	end
+	local ok = pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, true)
+	end)
+	return ok
+end
+local function waitForConsumption()
+	if not pluginRef then
+		return false
+	end
+	local start = tick()
+	while tick() - start < WAIT_FOR_CONSUMPTION_TIMEOUT_SEC do
+		local okGet, val = pcall(function()
+			return pluginRef:GetSetting(SETTING_KEY)
+		end)
+		if okGet and val ~= true then
+			return true
+		end
+		task.wait(WAIT_POLL_SEC)
+	end
+	return false
+end
+local function clearPending()
+	if not pluginRef then
+		return nil
+	end
+	pcall(function()
+		return pluginRef:SetSetting(SETTING_KEY, false)
+	end)
+end
+return {
+	init = init,
+	startMonitor = startMonitor,
+	requestStop = requestStop,
+	waitForConsumption = waitForConsumption,
+	clearPending = clearPending,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7046,7 +7125,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7576,11 +7655,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="27">
+    <Item class="Folder" referent="28">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -9654,7 +9733,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -9921,15 +10000,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="28">
+    <Item class="Folder" referent="29">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="29">
+      <Item class="Folder" referent="30">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {

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

@@ -9,12 +9,10 @@ import MemoryHandlers from "./handlers/MemoryHandlers";
 // in ReplicatedStorage; each player gets a proxy "client" registration on the
 // MCP side, polled and dispatched by the server peer.
 //
-// The same server peer also registers an "edit" proxy that intercepts
-// /api/stop-playtest specifically - StudioTestService:EndTest only works from
-// the play server DM, so the real edit DM cannot satisfy stop requests on its
-// own. MCP returns the same pending request to multiple pollers until someone
-// /responds, so non-stop edit-targeted requests fall through to the actual
-// edit DM untouched.
+// (Previously the server peer also registered an "edit-proxy" role to
+// intercept /api/stop-playtest and call StudioTestService:EndTest. That hack
+// is gone: stop now uses StopPlayMonitor with plugin:SetSetting cross-DM
+// signaling, which works regardless of MCP server state.)
 
 const MCP_URL = "http://localhost:58741";
 const BROKER_NAME = "__MCPClientBroker";
@@ -219,49 +217,10 @@ function registerProxy(player: Player, rf: RemoteFunction) {
 	task.spawn(pollProxy, proxyId, player, rf);
 }
 
-function startEditProxyLoop() {
-	task.spawn(() => {
-		const proxyId = HttpService.GenerateGUID(false);
-		const [ok, res] = postJson("/ready", { instanceId: proxyId, role: "edit-proxy" });
-		if (!ok || !res || !res.Success) {
-			warn("[MCPFork] edit-proxy register failed");
-			return;
-		}
-		while (true) {
-			const [okPoll, pollRes] = pcall(() =>
-				HttpService.RequestAsync({
-					Url: `${MCP_URL}/poll?instanceId=${proxyId}`,
-					Method: "GET",
-					Headers: { "Content-Type": "application/json" },
-				}),
-			);
-			if (okPoll && pollRes && (pollRes.Success || pollRes.StatusCode === 503)) {
-				const [okJson, body] = pcall(() => HttpService.JSONDecode(pollRes.Body) as PollResponseBody);
-				if (okJson && body) {
-					// Re-register if the server lost our edit-proxy registration.
-					if (body.knownInstance === false) {
-						reRegisterProxy(proxyId, "edit-proxy");
-					}
-					if (
-						body.request &&
-						body.request.endpoint === "/api/stop-playtest" &&
-						body.requestId !== undefined
-					) {
-						const sts = game.GetService("StudioTestService") as Instance & {
-							EndTest(reason: string): void;
-						};
-						const [endOk, endErr] = pcall(() => sts.EndTest("stopped_by_mcp"));
-						const response = endOk
-							? { success: true, message: "Playtest stopped via edit-proxy/EndTest" }
-							: { success: false, error: `EndTest failed: ${tostring(endErr)}` };
-						postJson("/response", { requestId: body.requestId, response });
-					}
-				}
-			}
-			task.wait(0.15);
-		}
-	});
-}
+// (Removed: startEditProxyLoop. The play-server DM no longer registers an
+// "edit-proxy" peer with the MCP server. stop_playtest now uses a cross-DM
+// plugin:SetSetting flag consumed by StopPlayMonitor in the play-server DM,
+// which doesn't depend on MCP server state or peer registration at all.)
 
 function setupServerBroker() {
 	let rf = ReplicatedStorage.FindFirstChild(BROKER_NAME) as RemoteFunction | undefined;
@@ -288,7 +247,6 @@ function setupServerBroker() {
 		}
 		proxyByPlayer.clear();
 	});
-	startEditProxyLoop();
 }
 
 export = {

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

@@ -0,0 +1,87 @@
+// Cross-DM stop_playtest signaling via plugin:SetSetting.
+//
+// `plugin:SetSetting` / `plugin:GetSetting` is a per-plugin persistent store
+// that's shared across every DataModel the plugin runs in (edit, play-server,
+// play-clients). We use it as a one-bit flag for "please call EndTest in the
+// play-server DM":
+//
+//   * The edit DM's stopPlaytest handler writes the flag (requestStop).
+//   * A monitor loop running inside the play-server DM polls the flag at 1Hz
+//     and calls StudioTestService:EndTest when it flips true, then resets it.
+//   * The edit DM then waits up to ~2.5s for the flag to be reset, which
+//     tells us a play-server actually consumed the request (no false-positive
+//     success when nothing was running).
+//
+// Why this is simpler than the previous edit-proxy registration:
+//   * Doesn't depend on the MCP server tracking peer roles at all.
+//   * Survives MCP server restarts: monitor loop is local to the play-server
+//     plugin lifetime, not to any HTTP/registration state.
+//   * No need for cross-DM LogService.MessageOut reflection (which we verified
+//     does not work edit -> play-server anyway).
+//
+// Pattern mirrors the official Roblox Studio MCP
+// (Roblox/studio-rust-mcp-server, plugin/src/Utils/GameStopUtil.luau).
+
+const StudioTestService = game.GetService("StudioTestService");
+
+const SETTING_KEY = "MCP_STOP_PLAY_SIGNAL";
+const POLL_INTERVAL_SEC = 1;
+const WAIT_FOR_CONSUMPTION_TIMEOUT_SEC = 2.5;
+const WAIT_POLL_SEC = 0.1;
+
+let pluginRef: Plugin | undefined;
+
+function init(p: Plugin): void {
+	pluginRef = p;
+}
+
+function startMonitor(): void {
+	if (!pluginRef) {
+		warn("[MCP] StopPlayMonitor.startMonitor called before init; skipping");
+		return;
+	}
+	// Clear any stale value left from a prior session. If a real stop request
+	// is in-flight when this runs, the requesting edit DM will set it again
+	// within its 2.5s wait window.
+	pcall(() => pluginRef!.SetSetting(SETTING_KEY, false));
+	task.spawn(() => {
+		while (true) {
+			const [okGet, val] = pcall(() => pluginRef!.GetSetting(SETTING_KEY));
+			if (okGet && val === true) {
+				pcall(() => pluginRef!.SetSetting(SETTING_KEY, false));
+				pcall(() => StudioTestService.EndTest("stopped_by_mcp"));
+			}
+			task.wait(POLL_INTERVAL_SEC);
+		}
+	});
+}
+
+function requestStop(): boolean {
+	if (!pluginRef) return false;
+	const [ok] = pcall(() => pluginRef!.SetSetting(SETTING_KEY, true));
+	return ok;
+}
+
+function waitForConsumption(): boolean {
+	if (!pluginRef) return false;
+	const start = tick();
+	while (tick() - start < WAIT_FOR_CONSUMPTION_TIMEOUT_SEC) {
+		const [okGet, val] = pcall(() => pluginRef!.GetSetting(SETTING_KEY));
+		if (okGet && val !== true) return true;
+		task.wait(WAIT_POLL_SEC);
+	}
+	return false;
+}
+
+function clearPending(): void {
+	if (!pluginRef) return;
+	pcall(() => pluginRef!.SetSetting(SETTING_KEY, false));
+}
+
+export = {
+	init,
+	startMonitor,
+	requestStop,
+	waitForConsumption,
+	clearPending,
+};

package/studio-plugin/src/modules/handlers/TestHandlers.ts

@@ -1,11 +1,15 @@
 import { HttpService, LogService } from "@rbxts/services";
 import { installBridges, cleanupBridges } from "../EvalBridges";
+import StopPlayMonitor from "../StopPlayMonitor";
 
 const StudioTestService = game.GetService("StudioTestService");
 const ServerScriptService = game.GetService("ServerScriptService");
 const ScriptEditorService = game.GetService("ScriptEditorService");
 
-const STOP_SIGNAL = "__MCP_STOP__";
+// NAV_SIGNAL flows from the edit DM to the play-server DM via the injected
+// __MCP_CommandListener Script + LogService.MessageOut. Stop signaling moved
+// off this path entirely (see StopPlayMonitor) because cross-DM MessageOut
+// reflection from edit -> play-server does not work in practice.
 const NAV_SIGNAL = "__MCP_NAV__";
 const NAV_RESULT = "__MCP_NAV_RESULT__";
 
@@ -25,16 +29,13 @@ let navResultCallback: ((json: string) => void) | undefined;
 
 function buildCommandListenerSource(): string {
 	return `local LogService = game:GetService("LogService")
-local StudioTestService = game:GetService("StudioTestService")
 local PathfindingService = game:GetService("PathfindingService")
 local Players = game:GetService("Players")
 local HttpService = game:GetService("HttpService")
 local NAV_SIG = "${NAV_SIGNAL}"
 local NAV_RES = "${NAV_RESULT}"
 LogService.MessageOut:Connect(function(msg)
-	if msg == "${STOP_SIGNAL}" then
-		pcall(function() StudioTestService:EndTest("stopped_by_mcp") end)
-	elseif string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then
+	if string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then
 		local json = string.sub(msg, #NAV_SIG + 2)
 		task.spawn(function()
 			local ok, d = pcall(function() return HttpService:JSONDecode(json) end)
@@ -135,7 +136,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 	cleanupStopListener();
 
 	logConnection = LogService.MessageOut.Connect((message, messageType) => {
-		if (message === STOP_SIGNAL) return;
 		if (message.sub(1, NAV_SIGNAL.size()) === NAV_SIGNAL) return;
 		if (message.sub(1, NAV_RESULT.size() + 1) === `${NAV_RESULT}:`) {
 			if (navResultCallback) {
@@ -193,32 +193,40 @@ function startPlaytest(requestData: Record<string, unknown>) {
 	});
 
 	const msg = numPlayers !== undefined
-		? `Playtest started in ${mode} mode with ${numPlayers} player(s)`
-		: `Playtest started in ${mode} mode`;
+		? `Playtest started in ${mode} mode with ${numPlayers} player(s).`
+		: `Playtest started in ${mode} mode.`;
 
 	const response: Record<string, unknown> = {
 		success: true,
 		message: msg,
-		evalBridges: bridgeInstall.installed ? "installed" : `failed: ${bridgeInstall.error}`,
 	};
+	// Only mention eval bridges when they failed — when they're fine, the
+	// detail is noise. eval_server_runtime / eval_client_runtime will surface
+	// their own clear errors if the caller tries to use them after a failed
+	// install.
+	if (!bridgeInstall.installed) {
+		response.evalBridgesError = bridgeInstall.error;
+	}
 
 	return response;
 }
 
 function stopPlaytest(_requestData: Record<string, unknown>) {
-	// Server-side routing (tools/index.ts:stopPlaytest) sends /api/stop-playtest
-	// to the role="edit-proxy" instance whenever one is registered. This handler
-	// is only reached when there's no edit-proxy - i.e. no active playtest, or
-	// the play DMs haven't completed plugin auto-activation yet. Calling
-	// StudioTestService:EndTest from the edit DM is illegal ("can only be
-	// called from the server DataModel of a running Studio play session"), so
-	// don't try - return a clean "no active playtest" response instead.
-	return {
-		error: "No active playtest to stop (edit-proxy not registered).",
-		hint:
-			"If a playtest is running, the play-server DM may not have completed plugin auto-activation yet. " +
-			"Wait a moment and retry, or call execute_luau target=server with StudioTestService:EndTest as a manual fallback.",
-	};
+	// Signal the play-server DM's StopPlayMonitor via plugin:SetSetting (a
+	// cross-DM persistent store). The monitor polls at 1Hz, sees the flag,
+	// calls StudioTestService:EndTest, then resets the flag. We wait up to
+	// 2.5s for the reset to confirm a play DM actually consumed the request,
+	// which avoids returning success when nothing is running.
+	if (!StopPlayMonitor.requestStop()) {
+		return { error: "Plugin not ready. Try again in a moment." };
+	}
+	if (StopPlayMonitor.waitForConsumption()) {
+		return { success: true, message: "Playtest stopped." };
+	}
+	// Clean up the pending flag so a future playtest's monitor doesn't fire
+	// EndTest on its own startup against a stale signal.
+	StopPlayMonitor.clearPending();
+	return { error: "No active playtest to stop." };
 }
 
 function getPlaytestOutput(_requestData: Record<string, unknown>) {

package/studio-plugin/src/server/index.server.ts

@@ -3,12 +3,18 @@ import UI from "../modules/UI";
 import Communication from "../modules/Communication";
 import ClientBroker from "../modules/ClientBroker";
 import RuntimeLogBuffer from "../modules/RuntimeLogBuffer";
+import StopPlayMonitor from "../modules/StopPlayMonitor";
 
 // Attach the per-peer LogService.MessageOut listener as early as possible so
 // boot-time prints from the user's place scripts are captured. Powers the
 // get_runtime_logs MCP tool. Idempotent; safe to call before UI.init().
 RuntimeLogBuffer.install();
 
+// Share the plugin reference with the stop-play signaling module so both the
+// edit DM (write the flag) and the play-server DM (read+act on the flag) can
+// access plugin:SetSetting/GetSetting.
+StopPlayMonitor.init(plugin);
+
 UI.init(plugin);
 const elements = UI.getElements();
 
@@ -67,6 +73,10 @@ task.delay(2, () => {
 	}
 	if (role === "server") {
 		ClientBroker.setupServerBroker();
+		// The play-server DM is the only one where StudioTestService:EndTest is
+		// legal, so the stop-play monitor lives here. Reads MCP_STOP_PLAY_SIGNAL
+		// at 1Hz and calls EndTest when the edit DM sets it.
+		StopPlayMonitor.startMonitor();
 	} else if (role === "client") {
 		ClientBroker.setupClientBroker();
 	}