@chrrxs/robloxstudio-mcp 2.15.2 → 2.16.1

package/studio-plugin/MCPPlugin.rbxmx

@@ -10,6 +10,10 @@ local State = TS.import(script, script, "modules", "State")
 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 ServerUrlSettings = TS.import(script, script, "modules", "ServerUrlSettings")
+local _EvalBridges = TS.import(script, script, "modules", "EvalBridges")
+local cleanupLegacyEditBridges = _EvalBridges.cleanupLegacyEditBridges
+local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
 local RenderMonitor = TS.import(script, script, "modules", "RenderMonitor")
@@ -25,18 +29,30 @@ RuntimeLogBuffer.install()
 -- edit DM (write the flag) and the play-server DM (read+act on the flag) can
 -- access plugin:SetSetting/GetSetting.
 StopPlayMonitor.init(plugin)
+ServerUrlSettings.init(plugin)
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://75876056391496"
 local ICON_CONNECTING = "rbxassetid://71302583919560"
 local ICON_CONNECTED = "rbxassetid://130958234173611"
-local toolbar = plugin:CreateToolbar("MCP Integration")
-local button = toolbar:CreateButton("MCP Server", "Connect to MCP Server for AI Integration", ICON_DISCONNECTED)
-UI.setToolbarButton(button, {
-	disconnected = ICON_DISCONNECTED,
-	connecting = ICON_CONNECTING,
-	connected = ICON_CONNECTED,
-})
+local TOOLBAR_REGISTRATION_DELAY_SECONDS = 1
+local toolbarButtonRegistered = false
+local function registerToolbarButton()
+	if toolbarButtonRegistered then
+		return nil
+	end
+	toolbarButtonRegistered = true
+	local toolbar = plugin:CreateToolbar("MCP Integration")
+	local button = toolbar:CreateButton("MCP Server", "Connect to MCP Server for AI Integration", ICON_DISCONNECTED)
+	UI.setToolbarButton(button, {
+		disconnected = ICON_DISCONNECTED,
+		connecting = ICON_CONNECTING,
+		connected = ICON_CONNECTED,
+	})
+	button.Click:Connect(function()
+		elements.screenGui.Enabled = not elements.screenGui.Enabled
+	end)
+end
 elements.connectButton.Activated:Connect(function()
 	local conn = State.getActiveConnection()
 	if conn and conn.isActive then
@@ -45,29 +61,54 @@ elements.connectButton.Activated:Connect(function()
 		Communication.activatePlugin(State.getActiveTabIndex())
 	end
 end)
-button.Click:Connect(function()
-	elements.screenGui.Enabled = not elements.screenGui.Enabled
-end)
 plugin.Unloading:Connect(function()
 	Communication.deactivateAll()
 end)
 UI.updateUIState()
 Communication.checkForUpdates()
+task.delay(TOOLBAR_REGISTRATION_DELAY_SECONDS, registerToolbarButton)
 -- Auto-activate per peer. The boshyxd plugin only registers with MCP when the
 -- user clicks Connect in its UI, but that UI is invisible in play DMs - so
 -- 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()
+	if role == "edit" then
+		cleanupLegacyEditBridges()
+	else
+		local result = ensureRuntimeBridgeInstalled()
+		if not result.installed then
+			warn(`[robloxstudio-mcp] Runtime eval bridge install failed: {result.error}`)
+		end
+	end
 	if role == "edit" or role == "server" then
 		pcall(function()
 			local idx = State.getActiveTabIndex()
 			local conn = State.getConnection(idx)
 			if conn and not conn.isActive then
+				if role == "server" then
+					local _condition = ServerUrlSettings.readServerUrl()
+					if _condition == nil then
+						_condition = ClientBroker.DEFAULT_MCP_URL
+					end
+					local inheritedServerUrl = _condition
+					conn.serverUrl = inheritedServerUrl
+					elements.urlInput.Text = inheritedServerUrl
+					local portStr = string.match(conn.serverUrl, ":(%d+)$")
+					if portStr ~= 0 and portStr == portStr and portStr ~= "" and portStr then
+						local _condition_1 = tonumber(portStr)
+						if _condition_1 == nil then
+							_condition_1 = conn.port
+						end
+						conn.port = _condition_1
+					end
+					ClientBroker.setServerUrl(inheritedServerUrl)
+				end
 				-- Defensive default: in invisible play-DM UIs, the input field
 				-- may not be populated by the time we activate.
 				if conn.serverUrl == nil or conn.serverUrl == "" then
-					conn.serverUrl = ClientBroker.MCP_URL
+					conn.serverUrl = ClientBroker.DEFAULT_MCP_URL
+					elements.urlInput.Text = conn.serverUrl
 				end
 				Communication.activatePlugin(idx)
 			end
@@ -76,8 +117,8 @@ task.delay(2, function()
 	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.
+		-- legal, so the stop-play monitor lives here. It consumes tokenized
+		-- stop requests from plugin settings and acknowledges EndTest results.
 		StopPlayMonitor.startMonitor()
 	elseif role == "client" then
 		ClientBroker.setupClientBroker()
@@ -108,6 +149,7 @@ local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandler
 local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
 local LuauExec = TS.import(script, script.Parent, "LuauExec")
 local State = TS.import(script, script.Parent, "State")
+local HttpDiagnostics = TS.import(script, script.Parent, "HttpDiagnostics")
 local StudioTestService = game:GetService("StudioTestService")
 -- Mirror of Communication.computeInstanceId() — duplicated here because the
 -- client broker runs in the play-server DM where it can't easily import from
@@ -160,7 +202,8 @@ end
 -- 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 DEFAULT_MCP_URL = "http://localhost:58741"
+local mcpUrl = DEFAULT_MCP_URL
 local BROKER_NAME = "__MCPClientBroker"
 local BROKER_OWNER_ATTRIBUTE = "__MCPBrokerOwner"
 -- Endpoints the server-peer broker is allowed to forward to the client peer.
@@ -221,7 +264,7 @@ end
 function postJson(endpoint, body)
 	return pcall(function()
 		return HttpService:RequestAsync({
-			Url = `{MCP_URL}{endpoint}`,
+			Url = `{mcpUrl}{endpoint}`,
 			Method = "POST",
 			Headers = {
 				["Content-Type"] = "application/json",
@@ -230,6 +273,17 @@ function postJson(endpoint, body)
 		})
 	end)
 end
+local function formatPostJsonFailure(endpoint, ok, res)
+	return HttpDiagnostics.formatRequestFailure(`{mcpUrl}{endpoint}`, ok, res)
+end
+local function setServerUrl(serverUrl)
+	if serverUrl ~= nil and serverUrl ~= "" then
+		mcpUrl = serverUrl
+	end
+end
+local function getServerUrl()
+	return mcpUrl
+end
 local function handleExecuteLuau(data)
 	local code = data and (data.code)
 	if type(code) == "string" == false or code == "" then
@@ -376,6 +430,7 @@ local function setupClientBroker()
 	end
 end
 local proxyByPlayer = {}
+local proxyRegisterFailuresByPlayer = {}
 local serverBrokerStarted = false
 local function pollProxy(proxyId, player, rf)
 	while true do
@@ -389,7 +444,7 @@ local function pollProxy(proxyId, player, rf)
 		end
 		local ok, res = pcall(function()
 			return HttpService:RequestAsync({
-				Url = `{MCP_URL}/poll?pluginSessionId={proxyId}`,
+				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
 				Method = "GET",
 				Headers = {
 					["Content-Type"] = "application/json",
@@ -468,7 +523,9 @@ local function registerProxy(player, rf)
 		pluginVariant = State.PLUGIN_VARIANT,
 	})
 	if not ok or not res or not res.Success then
-		warn(`[robloxstudio-mcp] proxy register failed for {player.Name}`)
+		local _player_1 = player
+		proxyRegisterFailuresByPlayer[_player_1] = true
+		warn(`[robloxstudio-mcp] proxy register failed for {player.Name}: {formatPostJsonFailure("/ready", ok, res)}`)
 		return nil
 	end
 	local body = HttpService:JSONDecode(res.Body)
@@ -483,11 +540,17 @@ local function registerProxy(player, rf)
 		role = assigned,
 	}
 	proxyByPlayer[_player_1] = _arg1
+	local _player_2 = player
+	if proxyRegisterFailuresByPlayer[_player_2] ~= nil then
+		local _player_3 = player
+		proxyRegisterFailuresByPlayer[_player_3] = nil
+		print(`[robloxstudio-mcp] proxy registered for {player.Name} as {assigned} via {mcpUrl}`)
+	end
 	task.spawn(pollProxy, proxyId, player, rf)
 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,
+-- plugin:SetSetting request consumed by StopPlayMonitor in the play-server DM,
 -- which doesn't depend on MCP server state or peer registration at all.)
 local function setupServerBroker()
 	if serverBrokerStarted then
@@ -517,6 +580,8 @@ local function setupServerBroker()
 		if entry then
 			local _p_1 = p
 			proxyByPlayer[_p_1] = nil
+			local _p_2 = p
+			proxyRegisterFailuresByPlayer[_p_2] = nil
 			postJson("/disconnect", {
 				pluginSessionId = entry.pluginSessionId,
 			})
@@ -532,7 +597,10 @@ local function setupServerBroker()
 	end)
 end
 return {
-	MCP_URL = MCP_URL,
+	MCP_URL = DEFAULT_MCP_URL,
+	DEFAULT_MCP_URL = DEFAULT_MCP_URL,
+	getServerUrl = getServerUrl,
+	setServerUrl = setServerUrl,
 	forkRole = forkRole,
 	setupClientBroker = setupClientBroker,
 	setupServerBroker = setupServerBroker,
@@ -552,7 +620,7 @@ local ServerStorage = _services.ServerStorage
 local State = TS.import(script, script.Parent, "State")
 local Utils = TS.import(script, script.Parent, "Utils")
 local UI = TS.import(script, script.Parent, "UI")
-local ensureBridgesInstalled = TS.import(script, script.Parent, "EvalBridges").ensureBridgesInstalled
+local cleanupLegacyEditBridges = TS.import(script, script.Parent, "EvalBridges").cleanupLegacyEditBridges
 local QueryHandlers = TS.import(script, script.Parent, "handlers", "QueryHandlers")
 local PropertyHandlers = TS.import(script, script.Parent, "handlers", "PropertyHandlers")
 local InstanceHandlers = TS.import(script, script.Parent, "handlers", "InstanceHandlers")
@@ -568,6 +636,8 @@ 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 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
 -- can tell our polls apart from any other plugin's polls. Not user-facing —
 -- MCP tools and the LLM operate on instanceId (the place identifier).
@@ -597,6 +667,7 @@ local assignedRole
 local duplicateInstanceRole = false
 local hasVersionMismatch = false
 local lastVersionMismatchWarningKey
+local readyFailureLogKeys = {}
 -- Cache the published place name from MarketplaceService:GetProductInfo so
 -- /ready can carry a friendly identifier (e.g. "Natural Disasters") distinct
 -- from game.Name (the DataModel name, often "Place1" in edit). We only fetch
@@ -804,31 +875,49 @@ function sendReady(conn)
 				}),
 			})
 		end)
+		local readyUrl = `{conn.serverUrl}/ready`
+		local readyRole = detectRole()
+		local readyLogKey = `{conn.serverUrl}|{instanceId}|{readyRole}`
 		if not readyOk then
+			readyFailureLogKeys[readyLogKey] = true
+			warn(`[robloxstudio-mcp] /ready failed for {instanceId}/{readyRole}: {HttpDiagnostics.formatRequestFailure(readyUrl, readyOk, readyResult)}`)
 			return nil
 		end
-		-- 409 = duplicate_instance_role. Surface in UI and stop polling.
-		if readyResult.StatusCode == 409 then
-			duplicateInstanceRole = true
-			conn.isActive = false
-			local ui = UI.getElements()
-			if State.getActiveTabIndex() == 0 then
-				ui.statusLabel.Text = "Duplicate instance"
-				ui.statusLabel.TextColor3 = Color3.fromRGB(239, 68, 68)
-				ui.detailStatusLabel.Text = "Another Studio is already connected as this place + role"
-				ui.detailStatusLabel.TextColor3 = Color3.fromRGB(239, 68, 68)
-			end
-			warn(`[MCPPlugin] Another Studio is already connected as ({instanceId}, {detectRole()}). Close the other Studio window or this one.`)
+		if not readyResult.Success then
+			local reason = HttpDiagnostics.formatRequestFailure(readyUrl, true, readyResult)
+			readyFailureLogKeys[readyLogKey] = true
+			-- 409 = duplicate_instance_role. Surface in UI and stop polling.
+			if readyResult.StatusCode == 409 then
+				duplicateInstanceRole = true
+				conn.isActive = false
+				local ui = UI.getElements()
+				if State.getActiveTabIndex() == 0 then
+					ui.statusLabel.Text = "Duplicate instance"
+					ui.statusLabel.TextColor3 = Color3.fromRGB(239, 68, 68)
+					ui.detailStatusLabel.Text = reason
+					ui.detailStatusLabel.TextColor3 = Color3.fromRGB(239, 68, 68)
+				end
+				warn(`[robloxstudio-mcp] /ready rejected for {instanceId}/{readyRole}: {reason}`)
+				return nil
+			end
+			warn(`[robloxstudio-mcp] /ready rejected for {instanceId}/{readyRole}: {reason}`)
 			return nil
 		end
-		if readyResult.Success then
-			local parseOk, readyData = pcall(function()
-				return HttpService:JSONDecode(readyResult.Body)
-			end)
-			local _value = parseOk and readyData.assignedRole
-			if _value ~= "" and _value then
-				assignedRole = readyData.assignedRole
-			end
+		local parseOk, readyData = pcall(function()
+			return HttpService:JSONDecode(readyResult.Body)
+		end)
+		local _value = parseOk and readyData.assignedRole
+		if _value ~= "" and _value then
+			assignedRole = readyData.assignedRole
+		end
+		local _condition = assignedRole
+		if _condition == nil then
+			_condition = detectRole()
+		end
+		local connectedRole = _condition
+		if readyFailureLogKeys[readyLogKey] ~= nil then
+			readyFailureLogKeys[readyLogKey] = nil
+			print(`[robloxstudio-mcp] /ready connected for {instanceId}/{connectedRole} via {conn.serverUrl}`)
 		end
 	end)
 end
@@ -874,7 +963,7 @@ local function pollForRequests(connIndex)
 			local warningKey = `{State.CURRENT_VERSION}:{serverVersion}`
 			if lastVersionMismatchWarningKey ~= warningKey then
 				lastVersionMismatchWarningKey = warningKey
-				warn(`[MCPPlugin] Version mismatch: Studio plugin v{State.CURRENT_VERSION} / MCP v{serverVersion}. Run npx -y @chrrxs/robloxstudio-mcp@latest --auto-install-plugin and restart Studio.`)
+				warn(`[robloxstudio-mcp] Version mismatch: Studio plugin v{State.CURRENT_VERSION} / MCP v{serverVersion}. Run npx -y @chrrxs/robloxstudio-mcp@latest --auto-install-plugin and restart Studio.`)
 			end
 			UI.showBanner("version-mismatch", `Plugin v{State.CURRENT_VERSION} / MCP v{serverVersion} mismatch`)
 		elseif hasVersionMismatch then
@@ -1042,6 +1131,7 @@ local function activatePlugin(connIndex)
 		UI.updateTabLabel(idx)
 		UI.updateUIState()
 	end
+	ServerUrlSettings.rememberServerUrl(conn.serverUrl)
 	UI.updateTabDot(idx)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
@@ -1056,18 +1146,10 @@ local function activatePlugin(connIndex)
 	-- Initial /ready; pollForRequests will also re-fire ready if the server
 	-- later reports knownInstance=false (process restart, etc).
 	sendReady(conn)
-	-- Keep the eval bridges present in the edit DM so that ANY playtest —
-	-- including one the dev starts manually via the Studio Play button —
-	-- clones them into the play DMs and eval_*_runtime works with no setup
-	-- roundtrip. Only the edit DM installs; play DMs already have the cloned
-	-- copies. Idempotent, so reconnects don't re-dirty the place.
+	-- Remove legacy edit-mode eval bridge scripts from older plugin builds.
+	-- Current bridges are created only in running play DataModels.
 	if not RunService:IsRunning() then
-		task.spawn(function()
-			local result = ensureBridgesInstalled()
-			if not result.installed then
-				warn(`[MCPPlugin] Eval bridge install failed: {result.error}`)
-			end
-		end)
+		task.spawn(cleanupLegacyEditBridges)
 	end
 	-- Watch for game.Name updates so a stale "Place1" captured at first
 	-- /ready gets refreshed once Studio settles on the real DM name.
@@ -1188,29 +1270,15 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- ServerScriptService.LoadStringEnabled, so eval_server_runtime works even
 -- when LoadStringEnabled=false (the default in fresh places).
 --
--- Lifecycle: the bridges live PERMANENTLY in the edit DM. Communication
--- installs them (ensureBridgesInstalled) when the plugin connects in edit,
--- and TestHandlers.startPlaytest force-refreshes them right before
--- ExecutePlayModeAsync. ExecutePlayModeAsync clones the DataModel into the
--- play DMs, so the scripts come along and run there. We keep them in the edit
--- DM after a playtest ends (rather than cleaning up) so that a playtest the
--- dev starts MANUALLY via the Studio Play button — not the MCP start_playtest
--- tool — also gets the bridges cloned in. This is intentionally a little
--- intrusive (two helper scripts visible in Explorer) in exchange for a
--- zero-roundtrip eval_*_runtime experience for devs working 1:1 with an agent.
---
--- Archivable handling: ExecutePlayModeAsync's deep-clone SKIPS instances
--- with Archivable=false (verified empirically in v2.9.0 testing - bridges
--- never reached the play DMs because we'd set them to false). We now keep
--- Archivable=true so the clone works, and rely on cleanupBridges() to
--- remove the scripts from the edit DM when the test ends. The only failure
--- mode is the user saving DURING an active playtest, which would persist
--- the bridges to the .rbxl - that's a no-op next session because
--- installBridges() always calls cleanupBridges() first to clear stale
--- instances. The RemoteFunction/BindableFunction that the bridge scripts
--- CREATE at runtime stay Archivable=false (they're runtime-only and should
--- never appear in a save).
+-- Lifecycle: bridge scripts are created only in running play DataModels.
+-- The server plugin peer creates the Script in runtime ServerScriptService;
+-- each client plugin peer creates its LocalScript in that client's
+-- PlayerScripts. Nothing is installed into the edit DataModel anymore.
+-- Runtime-created scripts disappear naturally when the playtest stops.
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local Players = _services.Players
+local ReplicatedStorage = _services.ReplicatedStorage
+local RunService = _services.RunService
 local ServerScriptService = _services.ServerScriptService
 local StarterPlayer = _services.StarterPlayer
 local ScriptEditorService = game:GetService("ScriptEditorService")
@@ -1283,12 +1351,10 @@ bf.OnInvoke = function(payload)\
 end\
 `
 -- Stamp written onto each installed bridge Script so we can tell whether the
--- bridge currently in the DM was produced by THIS plugin build. It's a djb2
--- hash of the actual bridge source plus the plugin version, so ANY change to
--- the source (or a version bump) yields a new stamp — which makes
--- ensureBridgesInstalled() force a refresh on the next plugin load instead of
--- keeping a stale bridge that happens to still be present (e.g. one saved into
--- the .rbxl from an older build).
+-- runtime bridge currently in the play DM was produced by THIS plugin build.
+-- It's a djb2 hash of the actual bridge source plus the plugin version, so ANY
+-- change to the source (or a version bump) yields a new stamp and triggers a
+-- runtime refresh instead of keeping a stale bridge.
 local STAMP_ATTR = "__MCPBridgeStamp"
 local function computeBridgeStamp()
 	local combined = `{SERVER_BRIDGE_SOURCE}|{CLIENT_BRIDGE_SOURCE}`
@@ -1296,9 +1362,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.15.2" is replaced with the package version at package time
+	-- "2.16.1" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.15.2`
+	return `{tostring(h)}-2.16.1`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1314,15 +1380,26 @@ local function setSource(scriptInst, source)
 		scriptInst.Source = source
 	end
 end
-local function findBridges()
+local function findLegacyEditBridges()
 	local sps = getStarterPlayerScripts()
 	return {
 		server = ServerScriptService:FindFirstChild(SERVER_SCRIPT_NAME),
 		client = if sps then sps:FindFirstChild(CLIENT_SCRIPT_NAME) else nil,
 	}
 end
-local function cleanupBridges()
-	local _binding = findBridges()
+local function destroyIfPresent(parent, name)
+	local existing = parent:FindFirstChild(name)
+	if existing then
+		pcall(function()
+			return existing:Destroy()
+		end)
+	end
+end
+local function cleanupLegacyEditBridges()
+	if RunService:IsRunning() then
+		return nil
+	end
+	local _binding = findLegacyEditBridges()
 	local server = _binding.server
 	local client = _binding.client
 	if server then
@@ -1336,54 +1413,79 @@ local function cleanupBridges()
 		end)
 	end
 end
--- Idempotent variant: install only if the bridge scripts aren't already
--- present in the edit DM. Used to keep the bridges always available (so a
--- playtest the dev starts manually — not via the MCP start_playtest tool —
--- still clones them into the play DMs). Cheap no-op when already installed,
--- which avoids re-dirtying the place on every plugin reconnect.
-local installBridges
-local function ensureBridgesInstalled()
-	local _binding = findBridges()
-	local server = _binding.server
-	local client = _binding.client
-	if server and client then
-		-- Both present — but only skip the reinstall if they were produced by
-		-- THIS build. A mismatched/absent stamp means a stale bridge (older
-		-- plugin, or one persisted in the saved place), so force a refresh.
-		local sStamp = server:GetAttribute(STAMP_ATTR)
-		local cStamp = client:GetAttribute(STAMP_ATTR)
-		if sStamp == BRIDGE_STAMP and cStamp == BRIDGE_STAMP then
-			return {
-				installed = true,
-			}
-		end
+local function serverRuntimeBridgeReady()
+	local scriptInst = ServerScriptService:FindFirstChild(SERVER_SCRIPT_NAME)
+	local bindable = ServerScriptService:FindFirstChild(BRIDGE_NAMES.serverLocal)
+	return scriptInst ~= nil and scriptInst:GetAttribute(STAMP_ATTR) == BRIDGE_STAMP and bindable ~= nil and bindable:IsA("BindableFunction")
+end
+local function getPlayerScripts()
+	local localPlayer = Players.LocalPlayer
+	if not localPlayer then
+		return nil
+	end
+	local playerScripts = localPlayer:FindFirstChild("PlayerScripts")
+	if not playerScripts then
+		playerScripts = localPlayer:WaitForChild("PlayerScripts", 5)
 	end
-	return installBridges()
+	return playerScripts
 end
-function installBridges()
-	-- Defensive: clear any stale bridges from a prior unclean exit before
-	-- inserting fresh. The injected script also self-cleans its
-	-- ReplicatedStorage/ServerScriptService children at startup, but the
-	-- containing Script/LocalScript objects themselves we must clear here.
-	cleanupBridges()
+local function clientRuntimeBridgeReady()
+	local playerScripts = getPlayerScripts()
+	if not playerScripts then
+		return false
+	end
+	local scriptInst = playerScripts:FindFirstChild(CLIENT_SCRIPT_NAME)
+	local bindable = ReplicatedStorage:FindFirstChild(BRIDGE_NAMES.clientLocal)
+	return scriptInst ~= nil and scriptInst:GetAttribute(STAMP_ATTR) == BRIDGE_STAMP and bindable ~= nil and bindable:IsA("BindableFunction")
+end
+local function installServerRuntimeBridge()
+	if serverRuntimeBridgeReady() then
+		return {
+			installed = true,
+		}
+	end
 	local ok, err = pcall(function()
+		destroyIfPresent(ServerScriptService, SERVER_SCRIPT_NAME)
+		destroyIfPresent(ServerScriptService, BRIDGE_NAMES.serverLocal)
 		local serverScript = Instance.new("Script")
 		serverScript.Name = SERVER_SCRIPT_NAME
-		-- Archivable=true so ExecutePlayModeAsync's deep-clone includes the
-		-- script. cleanupBridges() removes it from the edit DM when the
-		-- playtest ends.
+		serverScript.Archivable = false
 		setSource(serverScript, SERVER_BRIDGE_SOURCE)
 		serverScript:SetAttribute(STAMP_ATTR, BRIDGE_STAMP)
 		serverScript.Parent = ServerScriptService
-		local sps = getStarterPlayerScripts()
-		if not sps then
-			error("StarterPlayer.StarterPlayerScripts not found - cannot install client eval bridge")
-		end
+	end)
+	if not ok then
+		return {
+			installed = false,
+			error = tostring(err),
+		}
+	end
+	return {
+		installed = true,
+	}
+end
+local function installClientRuntimeBridge()
+	if clientRuntimeBridgeReady() then
+		return {
+			installed = true,
+		}
+	end
+	local playerScripts = getPlayerScripts()
+	if not playerScripts then
+		return {
+			installed = false,
+			error = "Players.LocalPlayer.PlayerScripts not found - cannot install client eval bridge",
+		}
+	end
+	local ok, err = pcall(function()
+		destroyIfPresent(playerScripts, CLIENT_SCRIPT_NAME)
+		destroyIfPresent(ReplicatedStorage, BRIDGE_NAMES.clientLocal)
 		local clientScript = Instance.new("LocalScript")
 		clientScript.Name = CLIENT_SCRIPT_NAME
+		clientScript.Archivable = false
 		setSource(clientScript, CLIENT_BRIDGE_SOURCE)
 		clientScript:SetAttribute(STAMP_ATTR, BRIDGE_STAMP)
-		clientScript.Parent = sps
+		clientScript.Parent = playerScripts
 	end)
 	if not ok then
 		return {
@@ -1395,10 +1497,21 @@ function installBridges()
 		installed = true,
 	}
 end
+local function ensureRuntimeBridgeInstalled()
+	if not RunService:IsRunning() then
+		return {
+			installed = false,
+			error = "Eval bridges are installed only in running play DataModels",
+		}
+	end
+	if RunService:IsServer() then
+		return installServerRuntimeBridge()
+	end
+	return installClientRuntimeBridge()
+end
 return {
-	cleanupBridges = cleanupBridges,
-	ensureBridgesInstalled = ensureBridgesInstalled,
-	installBridges = installBridges,
+	cleanupLegacyEditBridges = cleanupLegacyEditBridges,
+	ensureRuntimeBridgeInstalled = ensureRuntimeBridgeInstalled,
 	BRIDGE_NAMES = BRIDGE_NAMES,
 }
 ]]></string>
@@ -2484,9 +2597,27 @@ local LogService = _services.LogService
 local ReplicatedStorage = _services.ReplicatedStorage
 local RunService = _services.RunService
 local ServerScriptService = _services.ServerScriptService
-local BRIDGE_NAMES = TS.import(script, script.Parent.Parent, "EvalBridges").BRIDGE_NAMES
+local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
+local BRIDGE_NAMES = _EvalBridges.BRIDGE_NAMES
+local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local LuauExec = TS.import(script, script.Parent.Parent, "LuauExec")
 local PAYLOAD_INSTANCE_NAME = "__MCPEvalPayload"
+local function findBridge(config)
+	local bridge = config.service:FindFirstChild(config.bridgeName)
+	return if bridge and bridge:IsA("BindableFunction") then bridge else nil
+end
+local function waitForBridge(config, timeoutSec)
+	if timeoutSec == nil then
+		timeoutSec = 2
+	end
+	local deadline = tick() + timeoutSec
+	local bridge = findBridge(config)
+	while not bridge and tick() < deadline do
+		task.wait(0.05)
+		bridge = findBridge(config)
+	end
+	return bridge
+end
 local function getBridgeConfig()
 	if not RunService:IsRunning() then
 		return {
@@ -2497,13 +2628,13 @@ local function getBridgeConfig()
 		return {
 			service = ServerScriptService,
 			bridgeName = BRIDGE_NAMES.serverLocal,
-			missingError = "ServerEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+			missingError = "ServerEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime server peer, including for manually-started playtests.",
 		}
 	end
 	return {
 		service = ReplicatedStorage,
 		bridgeName = BRIDGE_NAMES.clientLocal,
-		missingError = "ClientEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+		missingError = "ClientEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime client peer, including for manually-started playtests.",
 	}
 end
 local function evalRuntime(requestData)
@@ -2520,11 +2651,21 @@ local function evalRuntime(requestData)
 			error = config.error,
 		}
 	end
-	local bridge = config.service:FindFirstChild(config.bridgeName)
-	if not bridge or not bridge:IsA("BindableFunction") then
+	local bridge = findBridge(config)
+	if not bridge then
+		local install = ensureRuntimeBridgeInstalled()
+		if not install.installed then
+			return {
+				bridge = "missing",
+				error = `{config.missingError} Runtime bridge install failed: {install.error}`,
+			}
+		end
+		bridge = waitForBridge(config)
+	end
+	if not bridge then
 		return {
 			bridge = "missing",
-			error = config.missingError,
+			error = `{config.missingError} Runtime bridge was installed but did not become ready.`,
 		}
 	end
 	local m = Instance.new("ModuleScript")
@@ -6375,9 +6516,6 @@ local HttpService = _services.HttpService
 local LogService = _services.LogService
 local Players = _services.Players
 local RunService = _services.RunService
-local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
-local installBridges = _EvalBridges.installBridges
-local ensureBridgesInstalled = _EvalBridges.ensureBridgesInstalled
 local StopPlayMonitor = TS.import(script, script.Parent.Parent, "StopPlayMonitor")
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
@@ -6564,9 +6702,8 @@ local function startPlaytest(requestData)
 			logConnection = nil
 		end
 		cleanupStopListener()
-		-- Note: eval bridges are intentionally NOT cleaned up — they live
-		-- permanently in the edit DM so manual playtests also get them. See
-		-- EvalBridges.ts lifecycle comment.
+		-- Runtime eval bridges are created by the play server/client plugin
+		-- peers and disappear with the play DataModels.
 	end
 	if testRunning then
 		return {
@@ -6607,15 +6744,7 @@ local function startPlaytest(requestData)
 		return injectStopListener()
 	end)
 	if not injected then
-		warn(`[MCP] Failed to inject stop listener: {injErr}`)
-	end
-	-- Force-refresh the game-VM eval bridges (ServerEvalBridge + ClientEvalBridge)
-	-- right before cloning so the play DMs get the current source. They also
-	-- live permanently in the edit DM (installed on connect) so manually-started
-	-- playtests get them too; here we just ensure they're fresh.
-	local bridgeInstall = installBridges()
-	if not bridgeInstall.installed then
-		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
+		warn(`[robloxstudio-mcp] Failed to inject stop listener: {injErr}`)
 	end
 	task.spawn(function()
 		local ok, result = pcall(function()
@@ -6635,35 +6764,25 @@ local function startPlaytest(requestData)
 		end
 		testRunning = false
 		cleanupStopListener()
-		-- Eval bridges persist in the edit DM (see EvalBridges.ts) — do not
-		-- clean up here, so the next manual playtest still gets them.
-		ensureBridgesInstalled()
 	end)
 	local response = {
 		success = true,
 		message = `Playtest started in {mode} mode.`,
 	}
-	-- 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)
-	-- 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
+	-- Signal the play-server DM's StopPlayMonitor via plugin:SetSetting.
+	-- The monitor acknowledges with the matching request id only after its
+	-- StudioTestService:EndTest call returns from pcall.
+	local stopRequest = StopPlayMonitor.requestStop()
+	if not stopRequest.ok or stopRequest.requestId == nil then
 		return {
 			error = "Plugin not ready. Try again in a moment.",
 		}
 	end
-	if not StopPlayMonitor.waitForConsumption() then
+	local consumption = StopPlayMonitor.waitForConsumption(stopRequest.requestId)
+	if not consumption.ok then
 		-- Two distinct failure modes collapse here, distinguished by whether
 		-- THIS edit DM has a playtest tracked:
 		--
@@ -6675,19 +6794,28 @@ local function stopPlaytest(_requestData)
 		--   from the caller's perspective — playtest may actually have ended).
 		--   Tell the caller it's a timing issue and they can retry.
 		--
-		-- Either way clean up the pending flag so a future playtest's monitor
+		-- Either way clean up the pending request so a future playtest's monitor
 		-- doesn't fire EndTest on startup against a stale signal.
-		StopPlayMonitor.clearPending()
+		StopPlayMonitor.clearPending(stopRequest.requestId)
 		if testRunning then
 			return {
-				error = "Playtest stop signal sent but consumption confirmation timed out. " .. "The playtest may have ended anyway; check get_connected_instances.",
+				error = "Playtest stop signal failed or was not acknowledged. " .. "The playtest may have ended anyway; check get_connected_instances.",
+				detail = consumption.error,
+			}
+		end
+		if consumption.consumed then
+			return {
+				error = "Playtest stop request reached the play server, but EndTest failed.",
+				detail = consumption.error,
 			}
 		end
 		return {
 			error = "No active playtest to stop.",
+			detail = consumption.error,
 		}
 	end
-	-- Flag was consumed (EndTest called). ExecutePlayModeAsync in our
+	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
@@ -6744,10 +6872,6 @@ local function multiplayerTestStart(requestData)
 	end
 	local testArgs = if requestData.testArgs ~= nil then requestData.testArgs else {}
 	local testId = HttpService:GenerateGUID(false)
-	local bridgeInstall = installBridges()
-	if not bridgeInstall.installed then
-		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
-	end
 	multiplayerState = {
 		phase = "starting",
 		testId = testId,
@@ -6771,7 +6895,6 @@ local function multiplayerTestStart(requestData)
 			multiplayerState.result = nil
 			multiplayerState.error = tostring(result)
 		end
-		ensureBridgesInstalled()
 	end)
 	local response = {
 		success = true,
@@ -6781,9 +6904,6 @@ local function multiplayerTestStart(requestData)
 		numPlayers = numPlayers,
 		testArgs = testArgs,
 	}
-	if not bridgeInstall.installed then
-		response.evalBridgesError = bridgeInstall.error
-	end
 	return response
 end
 local function multiplayerTestState(_requestData)
@@ -6999,6 +7119,87 @@ return {
         </Item>
       </Item>
       <Item class="ModuleScript" referent="21">
+        <Properties>
+          <string name="Name">HttpDiagnostics</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+local HttpService = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services").HttpService
+local function encodeForLog(value)
+	local ok, encoded = pcall(function()
+		return HttpService:JSONEncode(value)
+	end)
+	return if ok then encoded else tostring(value)
+end
+local function formatBody(body)
+	if body == "" then
+		return ""
+	end
+	local ok, decoded = pcall(function()
+		return HttpService:JSONDecode(body)
+	end)
+	if ok and type(decoded) == "table" then
+		local data = decoded
+		local parts = {}
+		local _error = data.error
+		local _condition = type(_error) == "string"
+		if _condition then
+			_condition = data.error ~= ""
+		end
+		if _condition then
+			local _arg0 = `error={data.error}`
+			table.insert(parts, _arg0)
+		end
+		local _message = data.message
+		local _condition_1 = type(_message) == "string"
+		if _condition_1 then
+			_condition_1 = data.message ~= ""
+		end
+		if _condition_1 then
+			local _arg0 = `message={data.message}`
+			table.insert(parts, _arg0)
+		end
+		if data.missingFields ~= nil then
+			local _arg0 = `missingFields={encodeForLog(data.missingFields)}`
+			table.insert(parts, _arg0)
+		end
+		if data.request ~= nil then
+			local _arg0 = `request={encodeForLog(data.request)}`
+			table.insert(parts, _arg0)
+		end
+		if data.existing ~= nil then
+			local _arg0 = `existing={encodeForLog(data.existing)}`
+			table.insert(parts, _arg0)
+		end
+		if data.details ~= nil then
+			local _arg0 = `details={encodeForLog(data.details)}`
+			table.insert(parts, _arg0)
+		end
+		if #parts > 0 then
+			return table.concat(parts, " ")
+		end
+	end
+	return `body={body}`
+end
+local function formatRequestFailure(url, ok, res)
+	if not ok then
+		return `RequestAsync threw for {url}: {tostring(res)}`
+	end
+	if res == nil then
+		return `RequestAsync returned no response for {url}`
+	end
+	local response = res
+	local statusMessage = if response.StatusMessage ~= "" then ` {response.StatusMessage}` else ""
+	local body = formatBody(response.Body)
+	local suffix = if body ~= "" then `: {body}` else ""
+	return `HTTP {response.StatusCode}{statusMessage} from {url}{suffix}`
+end
+return {
+	formatRequestFailure = formatRequestFailure,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">LuauExec</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7432,7 +7633,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7462,7 +7663,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7530,7 +7731,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7711,11 +7912,71 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
+        <Properties>
+          <string name="Name">ServerUrlSettings</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local HttpService = _services.HttpService
+local ServerStorage = _services.ServerStorage
+local SETTING_KEY_PREFIX = "MCP_SERVER_URL_"
+local pluginRef
+local function init(p)
+	pluginRef = p
+end
+local function computeInstanceId()
+	if game.PlaceId ~= 0 then
+		return `place:{tostring(game.PlaceId)}`
+	end
+	local existing = ServerStorage:GetAttribute("__MCPPlaceId")
+	if type(existing) == "string" and existing ~= "" then
+		return `anon:{existing}`
+	end
+	local fresh = HttpService:GenerateGUID(false)
+	pcall(function()
+		return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
+	end)
+	return `anon:{fresh}`
+end
+local function settingKey(instanceId)
+	return SETTING_KEY_PREFIX .. instanceId
+end
+local function rememberServerUrl(serverUrl)
+	if not pluginRef or serverUrl == "" then
+		return nil
+	end
+	local key = settingKey(computeInstanceId())
+	pcall(function()
+		return pluginRef:SetSetting(key, serverUrl)
+	end)
+end
+local function readServerUrl()
+	if not pluginRef then
+		return nil
+	end
+	local key = settingKey(computeInstanceId())
+	local ok, value = pcall(function()
+		return pluginRef:GetSetting(key)
+	end)
+	if ok and type(value) == "string" and value ~= "" then
+		return value
+	end
+	return nil
+end
+return {
+	init = init,
+	rememberServerUrl = rememberServerUrl,
+	readServerUrl = readServerUrl,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.15.2"
+local CURRENT_VERSION = "2.16.1"
 local PLUGIN_VARIANT = "main"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -7809,7 +8070,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7821,16 +8082,16 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- `plugin:SetSetting` / `plugin:GetSetting` is a per-plugin persistent store
 -- shared across every DataModel the plugin runs in (edit DMs, play-server
 -- DMs, play-client DMs). For each connected place we use a dedicated key
--- "MCP_STOP_PLAY_<instanceId>" as a single-bit mailbox:
+-- "MCP_STOP_PLAY_<instanceId>" as a tiny request/result mailbox:
 --
---   * The edit DM's stopPlaytest handler writes `true` into its own key
+--   * The edit DM's handler writes a tokenized stop request into its own key
 --     (computed from its placeId / ServerStorage anon UUID).
 --   * Each play-server DM's monitor loop polls the key matching its own
---     instanceId at 0.1Hz; on `true` it clears the key and calls
---     StudioTestService:EndTest. Play-server DMs for other places never
---     touch this key.
---   * The edit DM waits up to ~8s for its key to be cleared, confirming a
---     matching play-server actually consumed the request.
+--     instanceId at 1Hz. On a fresh token, it calls StudioTestService:EndTest
+--     and writes a matching result token. Play-server DMs for other places
+--     never touch this key.
+--   * The edit DM waits up to ~8s for its result token, confirming a matching
+--     play-server actually consumed the request.
 --
 -- Earlier versions used a single shared boolean flag, which let any
 -- play-server DM in the same Studio process consume any place's stop
@@ -7838,20 +8099,24 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- below is the fix.
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
 local HttpService = _services.HttpService
+local RunService = _services.RunService
 local ServerStorage = _services.ServerStorage
 local StudioTestService = game:GetService("StudioTestService")
 local SETTING_KEY_PREFIX = "MCP_STOP_PLAY_"
--- Monitor checks the key at this cadence. 0.1s keeps worst-case detection
--- lag tight so the consumption-confirmation window doesn't have to absorb
--- polling jitter on top of EndTest's teardown time.
-local POLL_INTERVAL_SEC = 0.1
+-- Keep this conservative. plugin:GetSetting is backed by Studio's plugin
+-- settings store, and this monitor runs during every play session, including
+-- manually-started Play. The official reference implementation polls at 1s.
+local POLL_INTERVAL_SEC = 1
 -- Total time we wait for the matching play-server DM to consume the
 -- signal. Must cover: monitor detection (<= POLL_INTERVAL_SEC) +
 -- StudioTestService:EndTest teardown (several seconds on heavier places).
--- 8s is comfortable; the tighter poll above keeps real cases well under.
+-- 8s is intentionally shorter than the MCP request timeout but long enough
+-- for the 1s monitor cadence plus ordinary Studio teardown latency.
 local WAIT_FOR_CONSUMPTION_TIMEOUT_SEC = 8.0
 local WAIT_POLL_SEC = 0.1
+local REQUEST_TTL_SEC = 12.0
 local pluginRef
+local endTestIssued = false
 local function init(p)
 	pluginRef = p
 end
@@ -7877,32 +8142,125 @@ end
 local function settingKey(instanceId)
 	return SETTING_KEY_PREFIX .. instanceId
 end
+local function readSetting(key)
+	if not pluginRef then
+		return nil
+	end
+	local ok, value = pcall(function()
+		return pluginRef:GetSetting(key)
+	end)
+	return if ok then value else nil
+end
+local function writeSetting(key, value)
+	if not pluginRef then
+		return false
+	end
+	local ok = pcall(function()
+		return pluginRef:SetSetting(key, value)
+	end)
+	return ok
+end
+local function decodePayload(value)
+	local decoded = value
+	local _value = value
+	if type(_value) == "string" then
+		local ok, result = pcall(function()
+			return HttpService:JSONDecode(value)
+		end)
+		if not ok then
+			return nil
+		end
+		decoded = result
+	end
+	local _decoded = decoded
+	if not (type(_decoded) == "table") then
+		return nil
+	end
+	local payload = decoded
+	local _kind = payload.kind
+	local _condition = not (type(_kind) == "string")
+	if not _condition then
+		local _id = payload.id
+		_condition = not (type(_id) == "string")
+	end
+	if _condition then
+		return nil
+	end
+	return payload
+end
+local function writePayload(key, payload)
+	local encodedOk, encoded = pcall(function()
+		return HttpService:JSONEncode(payload)
+	end)
+	if not encodedOk or not (type(encoded) == "string") then
+		return false
+	end
+	return writeSetting(key, encoded)
+end
+local function writeResult(key, request, ok, errText)
+	writePayload(key, {
+		kind = "result",
+		id = request.id,
+		requestedAt = request.requestedAt,
+		consumedAt = tick(),
+		ok = ok,
+		error = errText,
+	})
+end
+local function handleStopRequest(key, request)
+	local _condition = request.kind ~= "request"
+	if not _condition then
+		local _id = request.id
+		_condition = not (type(_id) == "string")
+	end
+	if _condition then
+		return nil
+	end
+	local _requestedAt = request.requestedAt
+	if not (type(_requestedAt) == "number") then
+		writeSetting(key, false)
+		return nil
+	end
+	local age = tick() - request.requestedAt
+	if age < -5 or age > REQUEST_TTL_SEC then
+		writeSetting(key, false)
+		return nil
+	end
+	if endTestIssued then
+		writeResult(key, request, true)
+		return nil
+	end
+	if not RunService:IsRunning() or not RunService:IsServer() then
+		writeResult(key, request, false, "StopPlayMonitor is not running in the server DataModel.")
+		return nil
+	end
+	endTestIssued = true
+	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
+	end
+end
 local function startMonitor()
 	if not pluginRef then
-		warn("[MCP] StopPlayMonitor.startMonitor called before init; skipping")
+		warn("[robloxstudio-mcp] StopPlayMonitor.startMonitor called before init; skipping")
 		return nil
 	end
 	local myKey = settingKey(computeInstanceId())
-	-- 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
-	-- write again within its consumption-confirmation window.
-	pcall(function()
-		return pluginRef:SetSetting(myKey, false)
-	end)
 	task.spawn(function()
 		while true do
-			local okGet, val = pcall(function()
-				return pluginRef:GetSetting(myKey)
-			end)
-			if okGet and val == true then
-				-- Consume the flag first so requestStop's
-				-- waitForConsumption returns success, then end the test.
-				pcall(function()
-					return pluginRef:SetSetting(myKey, false)
-				end)
-				pcall(function()
-					return StudioTestService:EndTest("stopped_by_mcp")
-				end)
+			local value = readSetting(myKey)
+			if value == true then
+				-- Legacy boolean requests are ambiguous and may be stale from
+				-- a prior crashed session. New stop requests use token payloads.
+				writeSetting(myKey, false)
+			else
+				local payload = decodePayload(value)
+				if payload then
+					handleStopRequest(myKey, payload)
+				end
 			end
 			task.wait(POLL_INTERVAL_SEC)
 		end
@@ -7910,39 +8268,61 @@ local function startMonitor()
 end
 local function requestStop()
 	if not pluginRef then
-		return false
+		return {
+			ok = false,
+		}
 	end
 	local myKey = settingKey(computeInstanceId())
-	local ok = pcall(function()
-		return pluginRef:SetSetting(myKey, true)
-	end)
-	return ok
+	local requestId = HttpService:GenerateGUID(false)
+	local ok = writePayload(myKey, {
+		kind = "request",
+		id = requestId,
+		requestedAt = tick(),
+	})
+	return {
+		ok = ok,
+		requestId = if ok then requestId else nil,
+	}
 end
-local function waitForConsumption()
+local function waitForConsumption(requestId)
 	if not pluginRef then
-		return false
+		return {
+			ok = false,
+			consumed = false,
+			error = "Plugin reference is not initialized.",
+		}
 	end
 	local myKey = settingKey(computeInstanceId())
 	local start = tick()
 	while tick() - start < WAIT_FOR_CONSUMPTION_TIMEOUT_SEC do
-		local okGet, val = pcall(function()
-			return pluginRef:GetSetting(myKey)
-		end)
-		if okGet and val ~= true then
-			return true
+		local payload = decodePayload(readSetting(myKey))
+		if payload and payload.kind == "result" and payload.id == requestId then
+			return {
+				ok = payload.ok == true,
+				consumed = true,
+				error = payload.error,
+			}
 		end
 		task.wait(WAIT_POLL_SEC)
 	end
-	return false
+	return {
+		ok = false,
+		consumed = false,
+		error = "Timed out waiting for the play-server DataModel to acknowledge stop_playtest.",
+	}
 end
-local function clearPending()
+local function clearPending(requestId)
 	if not pluginRef then
 		return nil
 	end
 	local myKey = settingKey(computeInstanceId())
-	pcall(function()
-		return pluginRef:SetSetting(myKey, false)
-	end)
+	if requestId ~= nil then
+		local payload = decodePayload(readSetting(myKey))
+		if payload and payload.id ~= requestId then
+			return nil
+		end
+	end
+	writeSetting(myKey, false)
 end
 return {
 	init = init,
@@ -7954,7 +8334,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="29">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8725,7 +9105,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="28">
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9255,11 +9635,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="32">
+    <Item class="Folder" referent="34">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="29">
+      <Item class="ModuleScript" referent="31">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -11333,7 +11713,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="30">
+      <Item class="ModuleScript" referent="32">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -11600,15 +11980,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="33">
+    <Item class="Folder" referent="35">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="34">
+      <Item class="Folder" referent="36">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="31">
+      <Item class="ModuleScript" referent="33">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {