@chrrxs/robloxstudio-mcp 2.11.4 → 2.12.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -94,8 +94,50 @@ local HttpService = _services.HttpService
 local Players = _services.Players
 local ReplicatedStorage = _services.ReplicatedStorage
 local RunService = _services.RunService
+local ServerStorage = _services.ServerStorage
 local RuntimeLogBuffer = TS.import(script, script.Parent, "RuntimeLogBuffer")
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
+local LuauExec = TS.import(script, script.Parent, "LuauExec")
+-- Mirror of Communication.computeInstanceId() — duplicated here because the
+-- client broker runs in the play-server DM where it can't easily import from
+-- the edit-side module, and the place identifier must match what the edit-DM
+-- plugin reports. Both use the same algorithm against the shared DataModel.
+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 cachedPlaceName
+local function resolvePlaceName()
+	if cachedPlaceName ~= nil then
+		return cachedPlaceName
+	end
+	if game.PlaceId == 0 then
+		cachedPlaceName = game.Name
+		return cachedPlaceName
+	end
+	local MarketplaceService = game:GetService("MarketplaceService")
+	local ok, info = pcall(function()
+		return MarketplaceService:GetProductInfo(game.PlaceId)
+	end)
+	if ok and info ~= nil then
+		local name = info.Name
+		if type(name) == "string" and name ~= "" then
+			cachedPlaceName = name
+			return cachedPlaceName
+		end
+	end
+	return game.Name
+end
 -- The client peer cannot reach the MCP HTTP server - Roblox forbids
 -- HttpService:RequestAsync from the client DM even under PluginSecurity, and
 -- HttpEnabled reads as false there regardless of identity. So the server peer
@@ -136,8 +178,13 @@ local function reRegisterProxy(proxyId, role)
 	lastReadyByProxy[_proxyId_1] = now
 	pcall(function()
 		return postJson("/ready", {
-			instanceId = proxyId,
+			pluginSessionId = proxyId,
+			instanceId = computeInstanceId(),
 			role = role,
+			placeId = game.PlaceId,
+			placeName = resolvePlaceName(),
+			dataModelName = game.Name,
+			isRunning = RunService:IsRunning(),
 		})
 	end)
 end
@@ -170,34 +217,11 @@ local function handleExecuteLuau(data)
 			error = "code is required",
 		}
 	end
-	local m = Instance.new("ModuleScript")
-	m.Name = "__MCPClientEval"
-	local okSet, setErr = pcall(function()
-		m.Source = code
-	end)
-	if not okSet then
-		m:Destroy()
-		return {
-			success = false,
-			error = `Source set failed: {tostring(setErr)}`,
-		}
-	end
-	m.Parent = game.Workspace
-	local okReq, result = pcall(function()
-		return require(m)
-	end)
-	m:Destroy()
-	if okReq then
-		return {
-			success = true,
-			returnValue = if result ~= nil then tostring(result) else nil,
-			message = "Code executed successfully",
-		}
-	end
-	return {
-		success = false,
-		error = tostring(result),
-	}
+	-- Shared with edit/server (MetadataHandlers.executeLuau). Adds the IIFE
+	-- wrapper (so `print("hi")` with no return doesn't fail the
+	-- ModuleScript's "must return one value" rule) and JSON-encodes table
+	-- returns instead of yielding "table: 0xaddr".
+	return LuauExec.execute(code)
 end
 local function handleGetRuntimeLogs(data)
 	local d = data or {}
@@ -251,7 +275,7 @@ local function pollProxy(proxyId, player, rf)
 		end
 		local ok, res = pcall(function()
 			return HttpService:RequestAsync({
-				Url = `{MCP_URL}/poll?instanceId={proxyId}`,
+				Url = `{MCP_URL}/poll?pluginSessionId={proxyId}`,
 				Method = "GET",
 				Headers = {
 					["Content-Type"] = "application/json",
@@ -315,8 +339,13 @@ local function registerProxy(player, rf)
 	end
 	local proxyId = HttpService:GenerateGUID(false)
 	local ok, res = postJson("/ready", {
-		instanceId = proxyId,
+		pluginSessionId = proxyId,
+		instanceId = computeInstanceId(),
 		role = "client",
+		placeId = game.PlaceId,
+		placeName = resolvePlaceName(),
+		dataModelName = game.Name,
+		isRunning = RunService:IsRunning(),
 	})
 	if not ok or not res or not res.Success then
 		warn(`[MCPFork] proxy register failed for {player.Name}`)
@@ -330,7 +359,7 @@ local function registerProxy(player, rf)
 	local assigned = _condition
 	local _player_1 = player
 	local _arg1 = {
-		instanceId = proxyId,
+		pluginSessionId = proxyId,
 		role = assigned,
 	}
 	proxyByPlayer[_player_1] = _arg1
@@ -361,14 +390,14 @@ local function setupServerBroker()
 			local _p_1 = p
 			proxyByPlayer[_p_1] = nil
 			postJson("/disconnect", {
-				instanceId = entry.instanceId,
+				pluginSessionId = entry.pluginSessionId,
 			})
 		end
 	end)
 	game:BindToClose(function()
 		for _, entry in proxyByPlayer do
 			postJson("/disconnect", {
-				instanceId = entry.instanceId,
+				pluginSessionId = entry.pluginSessionId,
 			})
 		end
 		table.clear(proxyByPlayer)
@@ -391,6 +420,7 @@ 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 RunService = _services.RunService
+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")
@@ -407,8 +437,61 @@ local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandler
 local LogHandlers = TS.import(script, script.Parent, "handlers", "LogHandlers")
 local SerializationHandlers = TS.import(script, script.Parent, "handlers", "SerializationHandlers")
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
-local instanceId = HttpService:GenerateGUID(false)
+-- 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).
+local pluginSessionId = HttpService:GenerateGUID(false)
+-- Place-level identifier shared by every plugin running in DataModels of
+-- the same place file (edit DM + playtest server DM + playtest clients).
+-- Format: "place:<PlaceId>" when published, "anon:<UUID>" for unpublished
+-- places where the UUID lives on ServerStorage's __MCPPlaceId attribute
+-- and travels with the .rbxl.
+local MCP_PLACE_ID_ATTRIBUTE = "__MCPPlaceId"
+local function computeInstanceId()
+	if game.PlaceId ~= 0 then
+		return `place:{tostring(game.PlaceId)}`
+	end
+	local existing = ServerStorage:GetAttribute(MCP_PLACE_ID_ATTRIBUTE)
+	if type(existing) == "string" and existing ~= "" then
+		return `anon:{existing}`
+	end
+	local fresh = HttpService:GenerateGUID(false)
+	pcall(function()
+		return ServerStorage:SetAttribute(MCP_PLACE_ID_ATTRIBUTE, fresh)
+	end)
+	return `anon:{fresh}`
+end
+local instanceId = computeInstanceId()
 local assignedRole
+local duplicateInstanceRole = false
+-- 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
+-- once per plugin load; the published name doesn't change mid-session.
+local cachedPlaceName
+local function resolvePlaceName()
+	if cachedPlaceName ~= nil then
+		return cachedPlaceName
+	end
+	if game.PlaceId == 0 then
+		cachedPlaceName = game.Name
+		return cachedPlaceName
+	end
+	local MarketplaceService = game:GetService("MarketplaceService")
+	local ok, info = pcall(function()
+		return MarketplaceService:GetProductInfo(game.PlaceId)
+	end)
+	if ok and info ~= nil then
+		local name = info.Name
+		if type(name) == "string" and name ~= "" then
+			cachedPlaceName = name
+			return cachedPlaceName
+		end
+	end
+	-- Don't cache failures — could be transient (offline, rate-limited).
+	-- Next /ready will retry. Return game.Name as fallback.
+	return game.Name
+end
 local function detectRole()
 	if not RunService:IsRunning() then
 		return "edit"
@@ -524,7 +607,33 @@ end
 -- Without this, every poll during the brief window where the server has just
 -- restarted but hasn't seen our re-ready yet would fire a duplicate /ready.
 local lastReadyPostAt = 0
-local function sendReady(conn)
+-- game.Name is sometimes "Place1" at plugin-load time and only settles to
+-- the real DataModel name (e.g. "Game" once playtest spawns the play DM)
+-- after Studio finishes wiring things up. Re-fire /ready when it changes so
+-- get_connected_instances doesn't show a stale dataModelName forever. Set
+-- up once per plugin load — the connection passed in is whichever was
+-- active when activatePlugin was first called.
+local nameChangeConn
+local sendReady
+local function ensureNameChangeWatcher(conn)
+	if nameChangeConn then
+		return nil
+	end
+	local okSig, signal = pcall(function()
+		return game:GetPropertyChangedSignal("Name")
+	end)
+	if not okSig or not signal then
+		return nil
+	end
+	nameChangeConn = signal:Connect(function()
+		-- sendReady has its own 2s throttle, so rapid burst changes coalesce.
+		sendReady(conn)
+	end)
+end
+function sendReady(conn)
+	if duplicateInstanceRole then
+		return nil
+	end
 	local now = tick()
 	if now - lastReadyPostAt < 2 then
 		return nil
@@ -539,14 +648,36 @@ local function sendReady(conn)
 					["Content-Type"] = "application/json",
 				},
 				Body = HttpService:JSONEncode({
+					pluginSessionId = pluginSessionId,
 					instanceId = instanceId,
 					role = detectRole(),
+					placeId = game.PlaceId,
+					placeName = resolvePlaceName(),
+					dataModelName = game.Name,
+					isRunning = RunService:IsRunning(),
 					pluginReady = true,
 					timestamp = tick(),
 				}),
 			})
 		end)
-		if readyOk and readyResult.Success then
+		if not readyOk then
+			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.`)
+			return nil
+		end
+		if readyResult.Success then
 			local parseOk, readyData = pcall(function()
 				return HttpService:JSONDecode(readyResult.Body)
 			end)
@@ -568,7 +699,7 @@ local function pollForRequests(connIndex)
 	conn.isPolling = true
 	local success, result = pcall(function()
 		return HttpService:RequestAsync({
-			Url = `{conn.serverUrl}/poll?instanceId={instanceId}`,
+			Url = `{conn.serverUrl}/poll?pluginSessionId={pluginSessionId}`,
 			Method = "GET",
 			Headers = {
 				["Content-Type"] = "application/json",
@@ -764,6 +895,9 @@ local function activatePlugin(connIndex)
 	-- Initial /ready; pollForRequests will also re-fire ready if the server
 	-- later reports knownInstance=false (process restart, etc).
 	sendReady(conn)
+	-- Watch for game.Name updates so a stale "Place1" captured at first
+	-- /ready gets refreshed once Studio settles on the real DM name.
+	ensureNameChangeWatcher(conn)
 end
 local function deactivatePlugin(connIndex)
 	local _condition = connIndex
@@ -789,7 +923,7 @@ local function deactivatePlugin(connIndex)
 				["Content-Type"] = "application/json",
 			},
 			Body = HttpService:JSONEncode({
-				instanceId = instanceId,
+				pluginSessionId = pluginSessionId,
 				timestamp = tick(),
 			}),
 		})
@@ -2827,11 +2961,10 @@ return {
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
 local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
-local _services = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services")
-local CollectionService = _services.CollectionService
-local LogService = _services.LogService
+local CollectionService = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services").CollectionService
 local Utils = TS.import(script, script.Parent.Parent, "Utils")
 local Recording = TS.import(script, script.Parent.Parent, "Recording")
+local LuauExec = TS.import(script, script.Parent.Parent, "LuauExec")
 local ChangeHistoryService = game:GetService("ChangeHistoryService")
 local Selection = game:GetService("Selection")
 local _binding = Utils
@@ -3257,137 +3390,11 @@ local function executeLuau(requestData)
 			error = "Code is required",
 		}
 	end
-	-- Both execution paths (loadstring + ModuleScript-require fallback) run
-	-- the SAME wrapped source so they return a uniform { ok, value, output }
-	-- shape. Two problems the wrapper solves at once:
-	--
-	--   1. pcall(require, m) swallows the real error and returns Roblox's
-	--      generic "Requested module experienced an error while loading"
-	--      message. Wrapping user code in xpcall INSIDE the IIFE keeps the
-	--      ModuleScript itself returning successfully — the real error +
-	--      traceback live in the returned table.
-	--
-	--   2. The ModuleScript path runs in its own environment, so a plugin-
-	--      side getfenv print/warn override never reached user prints. A
-	--      lexical local print/warn inside the IIFE captures user prints
-	--      regardless of which path executes. We also call the real global
-	--      print/warn so messages still flow to Studio's output and
-	--      LogService.MessageOut (which powers get_runtime_logs).
-	--
-	-- Prints from required sub-modules don't reach this capture (they have
-	-- their own env) — those go through the runtime log buffer.
-	local wrapped = `return ((function()\
-\tlocal __mcp_output = \{\}\
-\tlocal __mcp_real_print = print\
-\tlocal __mcp_real_warn = warn\
-\tlocal print = function(...)\
-\t\t__mcp_real_print(...)\
-\t\tlocal args = \{...\}\
-\t\tlocal parts = table.create(#args)\
-\t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end\
-\t\ttable.insert(__mcp_output, table.concat(parts, "\\t"))\
-\tend\
-\tlocal warn = function(...)\
-\t\t__mcp_real_warn(...)\
-\t\tlocal args = \{...\}\
-\t\tlocal parts = table.create(#args)\
-\t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end\
-\t\ttable.insert(__mcp_output, "[warn] " .. table.concat(parts, "\\t"))\
-\tend\
-\tlocal function __mcp_run()\
-{code}\
-\tend\
-\tlocal ok, errOrValue = xpcall(__mcp_run, debug.traceback)\
-\treturn \{ ok = ok, value = errOrValue, output = __mcp_output \}\
-end)())`
-	local runViaModuleScript = function()
-		local m = Instance.new("ModuleScript")
-		m.Name = "__MCPExecLuauPayload"
-		local okSet, setErr = pcall(function()
-			m.Source = wrapped
-		end)
-		if not okSet then
-			m:Destroy()
-			error(`ModuleScript Source set failed: {tostring(setErr)}`)
-		end
-		m.Parent = game:GetService("Workspace")
-		local okReq, reqResult = pcall(function()
-			return require(m)
-		end)
-		m:Destroy()
-		if not okReq then
-			local errMsg = tostring(reqResult)
-			-- pcall(require, m) collapses parse/compile failures into the
-			-- canned engine string below. Walk LogService backward for the
-			-- real diagnostic, which was emitted to MessageOut just before.
-			if errMsg == "Requested module experienced an error while loading" then
-				-- The parser diagnostic is emitted to LogService on the next
-				-- engine frame, not synchronously with pcall(require). task.wait(0)
-				-- yields too early; 50ms is enough to let the frame complete and
-				-- the message land in GetLogHistory.
-				task.wait(0.05)
-				local hist = LogService:GetLogHistory()
-				for i = #hist - 1, 0, -1 do
-					local e = hist[i + 1]
-					if e.messageType == Enum.MessageType.MessageError and string.sub(e.message, 1, 31) == "Workspace.__MCPExecLuauPayload:" then
-						errMsg = e.message
-						break
-					end
-				end
-			end
-			error(errMsg)
-		end
-		return reqResult
-	end
-	local isLoadstringUnavailable = function(err)
-		local errStr = tostring(err)
-		local matchStart = string.find(errStr, "not available", 1, true)
-		return matchStart ~= nil
-	end
-	local success, result = pcall(function()
-		local fn, compileError = loadstring(wrapped)
-		if not fn then
-			if isLoadstringUnavailable(compileError) then
-				return runViaModuleScript()
-			end
-			error(`Compile error: {compileError}`)
-		end
-		return fn()
-	end)
-	-- loadstring throws (not returns nil) in some plugin contexts when
-	-- LoadStringEnabled=false. Catch that as a second-chance fallback.
-	if not success and isLoadstringUnavailable(result) then
-		success, result = pcall(runViaModuleScript)
-	end
-	if not success then
-		-- Outer pcall failed - the wrapper itself didn't even run (e.g. compile
-		-- error in the user code, or ModuleScript setup error). 'result' is the
-		-- raw error string from pcall.
-		return {
-			success = false,
-			error = tostring(result),
-			output = {},
-			message = "Code execution failed",
-		}
-	end
-	-- Wrapper executed - unpack { ok, value, output }.
-	local r = result
-	local capturedOutput = r.output
-	local output = if capturedOutput ~= nil then capturedOutput else ({})
-	if r.ok == true then
-		return {
-			success = true,
-			returnValue = if r.value ~= nil then tostring(r.value) else nil,
-			output = output,
-			message = "Code executed successfully",
-		}
-	end
-	return {
-		success = false,
-		error = if r.value ~= nil then tostring(r.value) else "(unknown error)",
-		output = output,
-		message = "Code execution failed",
-	}
+	-- All wrapping, print/warn capture, loadstring fallback, JSON-encoding
+	-- of table returns, and parse-error recovery live in LuauExec so the
+	-- edit/server (this handler) and the play-client (ClientBroker) take
+	-- the same code path and produce identical output shapes.
+	return LuauExec.execute(code)
 end
 local function undo(_requestData)
 	local success, result = pcall(function()
@@ -5900,9 +5907,25 @@ local function stopPlaytest(_requestData)
 		}
 	end
 	if not StopPlayMonitor.waitForConsumption() then
-		-- Clean up the pending flag so a future playtest's monitor doesn't fire
-		-- EndTest on its own startup against a stale signal.
+		-- Two distinct failure modes collapse here, distinguished by whether
+		-- THIS edit DM has a playtest tracked:
+		--
+		-- - testRunning=false: no playtest was running from this edit DM
+		--   (true negative). Return "no active playtest" — fine to retry only
+		--   after actually starting a playtest.
+		-- - testRunning=true: a playtest IS running but the cross-DM signal
+		--   didn't propagate within the consumption timeout (false negative
+		--   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
+		-- doesn't fire EndTest on startup against a stale signal.
 		StopPlayMonitor.clearPending()
+		if testRunning then
+			return {
+				error = "Playtest stop signal sent but consumption confirmation timed out. " .. "The playtest may have ended anyway; check get_connected_instances.",
+			}
+		end
 		return {
 			error = "No active playtest to stop.",
 		}
@@ -6022,6 +6045,324 @@ return {
         </Item>
       </Item>
       <Item class="ModuleScript" referent="19">
+        <Properties>
+          <string name="Name">LuauExec</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+-- eslint-disable 
+-- Shared execute_luau machinery for edit/server (MetadataHandlers.executeLuau)
+-- and the play-client peer (ClientBroker.handleExecuteLuau). Three things this
+-- module owns:
+--
+--   1. The IIFE wrapper that captures print/warn, runs user code in xpcall,
+--      and always returns { ok, value, output } so the ModuleScript itself
+--      always returns exactly one value (otherwise `print("hi")` with no
+--      return would fail with "Module code did not return exactly one value").
+--
+--   2. The loadstring-then-ModuleScript-require fallback, with the parse-error
+--      recovery hack that pulls the real diagnostic from LogService.
+--
+--   3. Return-value formatting: tables get HttpService:JSONEncode'd so the
+--      caller sees `{"x":1,"y":2}` instead of `table: 0xaddr`; primitives
+--      pass through tostring. The encode is pcall'd so cycles or
+--      non-serializable values gracefully fall back to tostring.
+--
+-- Before this module existed, the client peer used a stripped-down
+-- require-only execution path that lacked both the wrapper and the JSON
+-- formatting, producing two well-known papercuts:
+--   - `print("hi")` (no return) failed with "Module code did not return..."
+--   - Returning a table yielded `table: 0xaddr` instead of structured data.
+local HttpService = game:GetService("HttpService")
+local LogService = game:GetService("LogService")
+local PAYLOAD_INSTANCE_NAME = "__MCPExecLuauPayload"
+local PAYLOAD_PATH_PREFIX = `Workspace.{PAYLOAD_INSTANCE_NAME}:`
+-- Number of lines the wrapper emits BEFORE the first line of user code.
+-- Used both inside the wrapper (Luau __mcp_LINE_OFFSET) and on the TS side
+-- (remapPayloadLines, for compile errors recovered from LogService) so user
+-- code errors report user-relative line numbers instead of the inflated
+-- "line 23" the wrapper would otherwise expose. If you reorder buildWrapper's
+-- prefix lines, update this constant — there's a self-check below.
+local WRAPPER_LINE_OFFSET = 23
+-- Count source lines so the wrapper can filter traceback frames that fall
+-- outside the user code range (the wrapper's own preamble/postamble lines).
+local function countLines(s)
+	local n = 1
+	local size = #s
+	do
+		local i = 1
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i <= size) then
+				break
+			end
+			if string.sub(s, i, i) == "\n" then
+				n += 1
+			end
+		end
+	end
+	return n
+end
+local function buildWrapper(code)
+	-- If you reorder the prefix lines below, update WRAPPER_LINE_OFFSET to
+	-- match the number of lines emitted BEFORE the ${code} substitution.
+	-- The constant is mirrored inside the wrapper (__mcp_LINE_OFFSET) and
+	-- used by remapPayloadLines on the TS side.
+	local userLines = countLines(code)
+	return `return ((function()\
+\tlocal __mcp_traceback\
+\tlocal __mcp_remap\
+\tlocal __mcp_LINE_OFFSET = {WRAPPER_LINE_OFFSET}\
+\tlocal __mcp_USER_LINES = {userLines}\
+\tlocal __mcp_output = \{\}\
+\tlocal __mcp_real_print = print\
+\tlocal __mcp_real_warn = warn\
+\tlocal print = function(...)\
+\t\t__mcp_real_print(...)\
+\t\tlocal args = \{...\}\
+\t\tlocal parts = table.create(#args)\
+\t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end\
+\t\ttable.insert(__mcp_output, table.concat(parts, "\\t"))\
+\tend\
+\tlocal warn = function(...)\
+\t\t__mcp_real_warn(...)\
+\t\tlocal args = \{...\}\
+\t\tlocal parts = table.create(#args)\
+\t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end\
+\t\ttable.insert(__mcp_output, "[warn] " .. table.concat(parts, "\\t"))\
+\tend\
+\tlocal function __mcp_run()\
+{code}\
+\tend\
+\t__mcp_remap = function(s)\
+\t\t-- Two chunk-name formats can reference our payload:\
+\t\t--   * "Workspace.__MCPExecLuauPayload:N" — ModuleScript:require fallback path\
+\t\t--   * "[string \\"return ((function()...\\"]:N" — loadstring() (default in plugin)\
+\t\t-- Subtract LINE_OFFSET to get the user-relative number, then clamp.\
+\t\t-- Clamping matters for unclosed constructs ("local x = (") where the\
+\t\t-- parser keeps reading into wrapper postamble and reports a payload\
+\t\t-- line past user EOF. Without clamping the message says "user_code:49"\
+\t\t-- for one-line input, framing the wrapper as user code.\
+\t\tlocal function __mcp_user_line(payload_n)\
+\t\t\tlocal user_n = payload_n - __mcp_LINE_OFFSET\
+\t\t\tif user_n < 1 then return "1" end\
+\t\t\tif user_n > __mcp_USER_LINES then return tostring(__mcp_USER_LINES) .. " (at end of input)" end\
+\t\t\treturn tostring(user_n)\
+\t\tend\
+\t\ts = string.gsub(s, "__MCPExecLuauPayload:(%d+)", function(num)\
+\t\t\tlocal n = tonumber(num)\
+\t\t\tif n then return "user_code:" .. __mcp_user_line(n) end\
+\t\t\treturn "user_code:" .. num\
+\t\tend)\
+\t\ts = string.gsub(s, '%[string "[^"]+"%]:(%d+)', function(num)\
+\t\t\tlocal n = tonumber(num)\
+\t\t\tif n then return "user_code:" .. __mcp_user_line(n) end\
+\t\t\treturn "user_code:" .. num\
+\t\tend)\
+\t\treturn s\
+\tend\
+\t__mcp_traceback = function(err)\
+\t\tlocal raw = debug.traceback(tostring(err), 2)\
+\t\tlocal kept = \{\}\
+\t\tfor line in string.gmatch(raw, "[^\\n]+") do\
+\t\t\t-- Extract referenced line number (either chunk-name format).\
+\t\t\tlocal num_str = string.match(line, "__MCPExecLuauPayload:(%d+)")\
+\t\t\t\tor string.match(line, '%[string "[^"]+"%]:(%d+)')\
+\t\t\tlocal n = num_str and tonumber(num_str)\
+\t\t\t-- Strip the "in function '__mcp_run'" annotation before doing\
+\t\t\t-- any filtering, because user-code frames carry that suffix —\
+\t\t\t-- the entire user payload is hosted inside __mcp_run, so EVERY\
+\t\t\t-- user frame would otherwise match a naive "__mcp_" filter and\
+\t\t\t-- get dropped. Strip first, then apply filters.\
+\t\t\tline = (string.gsub(line, " in function '__mcp_run'", ""))\
+\t\t\tlocal skip = string.find(line, "MCPPlugin", 1, true)\
+\t\t\t\tor string.find(line, "__mcp_", 1, true)\
+\t\t\t\tor string.find(line, "in function 'xpcall'", 1, true)\
+\t\t\t-- Frame lines pointing at wrapper preamble/postamble (outside\
+\t\t\t-- user range) are wrapper internals — drop them. Lines without\
+\t\t\t-- a payload-chunk line number (the traceback header / engine\
+\t\t\t-- C frames) are kept; remap is a no-op for them.\
+\t\t\tif n and (n <= __mcp_LINE_OFFSET or n > __mcp_LINE_OFFSET + __mcp_USER_LINES) then\
+\t\t\t\tskip = true\
+\t\t\tend\
+\t\t\tif not skip then\
+\t\t\t\ttable.insert(kept, __mcp_remap(line))\
+\t\t\tend\
+\t\tend\
+\t\treturn table.concat(kept, "\\n")\
+\tend\
+\tlocal ok, errOrValue = xpcall(__mcp_run, __mcp_traceback)\
+\treturn \{ ok = ok, value = errOrValue, output = __mcp_output \}\
+end)())`
+end
+-- TS-side mirror of the Lua __mcp_remap. Used by runViaModuleScript when
+-- pulling the real compile-error diagnostic out of LogService — that error
+-- references the payload module's line number directly, and never passes
+-- through the IIFE's runtime wrapper.
+local function remapPayloadLines(s, userLines)
+	-- Mirror of the Lua __mcp_remap inside the wrapper, for paths that
+	-- don't pass through the IIFE (compile errors recovered from
+	-- LogService, the immediate loadstring compileError surface). Same
+	-- two-format coverage plus the same clamp: unclosed user constructs
+	-- let the parser consume wrapper postamble, so the raw payload line
+	-- is sometimes well past user EOF — clamp to [1, userLines] and
+	-- annotate so the error doesn't say "user_code:49" for one-line input.
+	local userLine = function(payload)
+		local u = payload - WRAPPER_LINE_OFFSET
+		if u < 1 then
+			return "1"
+		end
+		if u > userLines then
+			return `{tostring(userLines)} (at end of input)`
+		end
+		return tostring(u)
+	end
+	local out = s
+	local a = string.gsub(out, "__MCPExecLuauPayload:(%d+)", function(num)
+		local n = tonumber(num)
+		if n ~= nil then
+			return `user_code:{userLine(n)}`
+		end
+		return `user_code:{num}`
+	end)
+	out = a
+	local b = string.gsub(out, '%[string "[^"]+"%]:(%d+)', function(num)
+		local n = tonumber(num)
+		if n ~= nil then
+			return `user_code:{userLine(n)}`
+		end
+		return `user_code:{num}`
+	end)
+	out = b
+	return out
+end
+local function runViaModuleScript(wrapped, userLines)
+	local m = Instance.new("ModuleScript")
+	m.Name = PAYLOAD_INSTANCE_NAME
+	local okSet, setErr = pcall(function()
+		m.Source = wrapped
+	end)
+	if not okSet then
+		m:Destroy()
+		-- error(..., 0) suppresses the "user_MCPPlugin.rbxmx.MCPPlugin.modules.LuauExec:N:"
+		-- prefix that error() would otherwise prepend, keeping the visible
+		-- message focused on the user-actionable error rather than our path.
+		error(`ModuleScript Source set failed: {tostring(setErr)}`, 0)
+	end
+	m.Parent = game:GetService("Workspace")
+	local okReq, reqResult = pcall(function()
+		return require(m)
+	end)
+	m:Destroy()
+	if not okReq then
+		local errMsg = tostring(reqResult)
+		-- pcall(require, m) collapses parse/compile failures into the canned
+		-- engine string. The real diagnostic was emitted to LogService on the
+		-- next engine frame — give it ~50ms to land then scan backward.
+		if errMsg == "Requested module experienced an error while loading" then
+			task.wait(0.05)
+			local hist = LogService:GetLogHistory()
+			for i = #hist - 1, 0, -1 do
+				local e = hist[i + 1]
+				if e.messageType == Enum.MessageType.MessageError and string.sub(e.message, 1, #PAYLOAD_PATH_PREFIX) == PAYLOAD_PATH_PREFIX then
+					errMsg = e.message
+					break
+				end
+			end
+		end
+		-- Compile errors reference the payload module's line number directly
+		-- — remap + clamp to user-relative line numbers so `local x = 1 +`
+		-- reports :1: instead of :23:, and reports the clamp annotation
+		-- when the parser ran off the end of user code into wrapper code.
+		error(remapPayloadLines(errMsg, userLines), 0)
+	end
+	return reqResult
+end
+local function isLoadstringUnavailable(err)
+	local errStr = tostring(err)
+	local matchStart = string.find(errStr, "not available", 1, true)
+	return matchStart ~= nil
+end
+-- Returns a string suitable for `returnValue`. Tables get JSON-encoded so
+-- the caller sees structured data instead of "table: 0xaddr". Anything that
+-- JSONEncode chokes on (cycles, Roblox userdata) falls back to tostring.
+local function formatReturnValue(value)
+	if value == nil then
+		return ""
+	end
+	local _value = value
+	if type(_value) == "table" then
+		local ok, encoded = pcall(function()
+			return HttpService:JSONEncode(value)
+		end)
+		if ok then
+			return encoded
+		end
+	end
+	return tostring(value)
+end
+local function execute(code)
+	if not (code ~= "" and code) or code == "" then
+		return {
+			success = false,
+			error = "code is required",
+		}
+	end
+	local wrapped = buildWrapper(code)
+	local userLines = countLines(code)
+	local success, result = pcall(function()
+		local fn, compileError = loadstring(wrapped)
+		if not fn then
+			if isLoadstringUnavailable(compileError) then
+				return runViaModuleScript(wrapped, userLines)
+			end
+			error(`Compile error: {remapPayloadLines(tostring(compileError), userLines)}`, 0)
+		end
+		return fn()
+	end)
+	-- loadstring can throw (not return nil) when ServerScriptService.
+	-- LoadStringEnabled is false; treat that as a second-chance fallback.
+	if not success and isLoadstringUnavailable(result) then
+		success, result = pcall(function()
+			return runViaModuleScript(wrapped, userLines)
+		end)
+	end
+	if not success then
+		return {
+			success = false,
+			error = tostring(result),
+			output = {},
+			message = "Code execution failed",
+		}
+	end
+	local r = result
+	local capturedOutput = r.output
+	local output = if capturedOutput ~= nil then capturedOutput else ({})
+	if r.ok == true then
+		return {
+			success = true,
+			returnValue = if r.value ~= nil then formatReturnValue(r.value) else nil,
+			output = output,
+			message = "Code executed successfully",
+		}
+	end
+	return {
+		success = false,
+		error = if r.value ~= nil then tostring(r.value) else "(unknown error)",
+		output = output,
+		message = "Code execution failed",
+	}
+end
+return {
+	execute = execute,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="20">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6051,7 +6392,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6232,11 +6573,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.11.4"
+local CURRENT_VERSION = "2.12.0"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6328,61 +6669,96 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="23">
         <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.
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+-- Cross-DM stop_playtest signaling via plugin:SetSetting, scoped by
+-- per-instance setting key so the same Studio process can host playtests
+-- for multiple places without one place's stop_playtest yanking another's.
 --
 -- `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":
+-- 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:
 --
---   * 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).
+--   * The edit DM's stopPlaytest handler writes `true` 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.
 --
--- 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).
+-- Earlier versions used a single shared boolean flag, which let any
+-- play-server DM in the same Studio process consume any place's stop
+-- request — silently yanking teammates' playtests. The per-key scoping
+-- below is the fix.
+local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local HttpService = _services.HttpService
+local ServerStorage = _services.ServerStorage
 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 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
+-- 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.
+local WAIT_FOR_CONSUMPTION_TIMEOUT_SEC = 8.0
 local WAIT_POLL_SEC = 0.1
 local pluginRef
 local function init(p)
 	pluginRef = p
 end
+-- Mirror of Communication.computeInstanceId(). Duplicated here because
+-- StopPlayMonitor runs in both edit and play-server DMs, and both must
+-- agree on the place identifier (published places: placeId; unpublished:
+-- UUID on ServerStorage's __MCPPlaceId attribute, travels with the .rbxl
+-- into the play DM).
+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 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.
+	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(SETTING_KEY, false)
+		return pluginRef:SetSetting(myKey, false)
 	end)
 	task.spawn(function()
 		while true do
 			local okGet, val = pcall(function()
-				return pluginRef:GetSetting(SETTING_KEY)
+				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(SETTING_KEY, false)
+					return pluginRef:SetSetting(myKey, false)
 				end)
 				pcall(function()
 					return StudioTestService:EndTest("stopped_by_mcp")
@@ -6396,8 +6772,9 @@ local function requestStop()
 	if not pluginRef then
 		return false
 	end
+	local myKey = settingKey(computeInstanceId())
 	local ok = pcall(function()
-		return pluginRef:SetSetting(SETTING_KEY, true)
+		return pluginRef:SetSetting(myKey, true)
 	end)
 	return ok
 end
@@ -6405,10 +6782,11 @@ local function waitForConsumption()
 	if not pluginRef then
 		return false
 	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(SETTING_KEY)
+			return pluginRef:GetSetting(myKey)
 		end)
 		if okGet and val ~= true then
 			return true
@@ -6421,8 +6799,9 @@ local function clearPending()
 	if not pluginRef then
 		return nil
 	end
+	local myKey = settingKey(computeInstanceId())
 	pcall(function()
-		return pluginRef:SetSetting(SETTING_KEY, false)
+		return pluginRef:SetSetting(myKey, false)
 	end)
 end
 return {
@@ -6435,7 +6814,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7186,7 +7565,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7716,11 +8095,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="28">
+    <Item class="Folder" referent="29">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -9794,7 +10173,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -10061,15 +10440,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="29">
+    <Item class="Folder" referent="30">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="30">
+      <Item class="Folder" referent="31">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {