@chrrxs/robloxstudio-mcp 2.9.1 → 2.10.1

package/studio-plugin/MCPPlugin.rbxmx

@@ -10,10 +10,23 @@ 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 RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
+-- Attach the per-peer LogService.MessageOut listener as early as possible so
+-- boot-time prints from the user's place scripts are captured. Powers the
+-- get_runtime_logs MCP tool. Idempotent; safe to call before UI.init().
+RuntimeLogBuffer.install()
 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", "rbxassetid://10734944444")
+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,
+})
 elements.connectButton.Activated:Connect(function()
 	local conn = State.getActiveConnection()
 	if conn and conn.isActive then
@@ -72,6 +85,7 @@ local HttpService = _services.HttpService
 local Players = _services.Players
 local ReplicatedStorage = _services.ReplicatedStorage
 local RunService = _services.RunService
+local RuntimeLogBuffer = TS.import(script, script.Parent, "RuntimeLogBuffer")
 -- 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
@@ -87,6 +101,37 @@ local RunService = _services.RunService
 -- edit DM untouched.
 local MCP_URL = "http://localhost:58741"
 local BROKER_NAME = "__MCPClientBroker"
+-- Endpoints the server-peer broker is allowed to forward to the client peer.
+-- Each requires the client peer's plugin VM (because the buffer / require
+-- cache / etc. lives there) so the server peer alone can't satisfy them.
+local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
+	["/api/execute-luau"] = true,
+	["/api/get-runtime-logs"] = true,
+}
+-- Throttle re-ready calls per proxyId so a brief window of unknownInstance
+-- polls doesn't cause a re-register stampede.
+local lastReadyByProxy = {}
+local postJson
+local function reRegisterProxy(proxyId, role)
+	local now = tick()
+	local _proxyId = proxyId
+	local _condition = lastReadyByProxy[_proxyId]
+	if _condition == nil then
+		_condition = 0
+	end
+	local last = _condition
+	if now - last < 2 then
+		return nil
+	end
+	local _proxyId_1 = proxyId
+	lastReadyByProxy[_proxyId_1] = now
+	pcall(function()
+		return postJson("/ready", {
+			instanceId = proxyId,
+			role = role,
+		})
+	end)
+end
 local function forkRole()
 	if not RunService:IsRunning() then
 		return "edit"
@@ -96,7 +141,7 @@ local function forkRole()
 	end
 	return "client"
 end
-local function postJson(endpoint, body)
+function postJson(endpoint, body)
 	return pcall(function()
 		return HttpService:RequestAsync({
 			Url = `{MCP_URL}{endpoint}`,
@@ -108,6 +153,56 @@ local function postJson(endpoint, body)
 		})
 	end)
 end
+local function handleExecuteLuau(data)
+	local code = data and (data.code)
+	if type(code) == "string" == false or code == "" then
+		return {
+			success = false,
+			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),
+	}
+end
+local function handleGetRuntimeLogs(data)
+	local d = data or {}
+	local since = d.since
+	local tail = d.tail
+	local filter = d.filter
+	-- "client" is the generic peer tag; MCP-side aggregator overrides with
+	-- the specific role (e.g. "client-1") on target=all fan-out.
+	return RuntimeLogBuffer.query({
+		since = since,
+		tail = tail,
+		filter = filter,
+	}, "client")
+end
 local function setupClientBroker()
 	local rf = ReplicatedStorage:WaitForChild(BROKER_NAME, 10)
 	if not rf or not rf:IsA("RemoteFunction") then
@@ -115,44 +210,20 @@ local function setupClientBroker()
 		return nil
 	end
 	rf.OnClientInvoke = function(payload)
-		local code = payload and payload.code
-		if type(code) == "string" == false or code == "" then
-			return {
-				success = false,
-				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()
-			local _arg0 = {
-				success = false,
-				error = `Source set failed: {tostring(setErr)}`,
-			}
-			return _arg0
+		-- Two payload shapes in the wild:
+		-- - {endpoint, data} from v2.10+ server-peer broker (this is the new
+		--   discriminated form that lets us dispatch on endpoint)
+		-- - {code} from pre-v2.10 server-peer broker (raw execute-luau payload)
+		-- The shapes coexist gracefully because we fall back to execute-luau
+		-- when endpoint is missing.
+		if payload and payload.endpoint == "/api/get-runtime-logs" then
+			return handleGetRuntimeLogs(payload.data)
 		end
-		m.Parent = game.Workspace
-		local okReq, result = pcall(function()
-			return require(m)
-		end)
-		m:Destroy()
-		if okReq then
-			local _arg0 = {
-				success = true,
-				returnValue = if result ~= nil then tostring(result) else nil,
-				message = "Code executed successfully",
-			}
-			return _arg0
+		if payload and payload.endpoint == "/api/execute-luau" then
+			return handleExecuteLuau(payload.data)
 		end
-		local _arg0 = {
-			success = false,
-			error = tostring(result),
-		}
-		return _arg0
+		-- Legacy: raw execute-luau payload at the top level.
+		return handleExecuteLuau(payload)
 	end
 end
 local proxyByPlayer = {}
@@ -179,33 +250,47 @@ local function pollProxy(proxyId, player, rf)
 			local okJson, body = pcall(function()
 				return HttpService:JSONDecode(res.Body)
 			end)
-			if okJson and body and body.request and body.requestId ~= nil then
-				local request = body.request
-				local response
-				if request.endpoint == "/api/execute-luau" then
-					local okInvoke, invokeRes = pcall(function()
-						return rf:InvokeClient(player, request.data)
-					end)
-					if okInvoke then
-						response = if invokeRes ~= nil then invokeRes else {
-							success = false,
-							error = "nil response",
+			if okJson and body then
+				-- Server lost our proxy registration (process restart, etc.) -
+				-- re-register so the next poll cycle starts routing again.
+				if body.knownInstance == false then
+					reRegisterProxy(proxyId, "client")
+				end
+				if body.request and body.requestId ~= nil then
+					local request = body.request
+					local response
+					local _endpoint = request.endpoint
+					if CLIENT_BROKER_ALLOWED_ENDPOINTS[_endpoint] ~= nil then
+						-- Forward as a discriminated envelope so the client-side
+						-- OnClientInvoke knows which endpoint it's serving.
+						local envelope = {
+							endpoint = request.endpoint,
+							data = request.data,
 						}
+						local okInvoke, invokeRes = pcall(function()
+							return rf:InvokeClient(player, envelope)
+						end)
+						if okInvoke then
+							response = if invokeRes ~= nil then invokeRes else {
+								success = false,
+								error = "nil response",
+							}
+						else
+							response = {
+								success = false,
+								error = `InvokeClient failed: {tostring(invokeRes)}`,
+							}
+						end
 					else
 						response = {
-							success = false,
-							error = `InvokeClient failed: {tostring(invokeRes)}`,
+							error = `Client-proxy does not forward {tostring(request.endpoint)}. ` .. `Allowed: /api/execute-luau, /api/get-runtime-logs.`,
 						}
 					end
-				else
-					response = {
-						error = `Client-proxy only supports /api/execute-luau, got: {tostring(request.endpoint)}`,
-					}
+					postJson("/response", {
+						requestId = body.requestId,
+						response = response,
+					})
 				end
-				postJson("/response", {
-					requestId = body.requestId,
-					response = response,
-				})
 			end
 		end
 		task.wait(0.5)
@@ -264,22 +349,28 @@ local function startEditProxyLoop()
 				local okJson, body = pcall(function()
 					return HttpService:JSONDecode(pollRes.Body)
 				end)
-				if okJson and body and body.request and body.request.endpoint == "/api/stop-playtest" and body.requestId ~= nil then
-					local sts = game:GetService("StudioTestService")
-					local endOk, endErr = pcall(function()
-						return sts:EndTest("stopped_by_mcp")
-					end)
-					local response = if endOk then {
-						success = true,
-						message = "Playtest stopped via edit-proxy/EndTest",
-					} else {
-						success = false,
-						error = `EndTest failed: {tostring(endErr)}`,
-					}
-					postJson("/response", {
-						requestId = body.requestId,
-						response = response,
-					})
+				if okJson and body then
+					-- Re-register if the server lost our edit-proxy registration.
+					if body.knownInstance == false then
+						reRegisterProxy(proxyId, "edit-proxy")
+					end
+					if body.request and body.request.endpoint == "/api/stop-playtest" and body.requestId ~= nil then
+						local sts = game:GetService("StudioTestService")
+						local endOk, endErr = pcall(function()
+							return sts:EndTest("stopped_by_mcp")
+						end)
+						local response = if endOk then {
+							success = true,
+							message = "Playtest stopped via edit-proxy/EndTest",
+						} else {
+							success = false,
+							error = `EndTest failed: {tostring(endErr)}`,
+						}
+						postJson("/response", {
+							requestId = body.requestId,
+							response = response,
+						})
+					end
 				end
 			end
 			task.wait(0.15)
@@ -351,6 +442,7 @@ local BuildHandlers = TS.import(script, script.Parent, "handlers", "BuildHandler
 local AssetHandlers = TS.import(script, script.Parent, "handlers", "AssetHandlers")
 local CaptureHandlers = TS.import(script, script.Parent, "handlers", "CaptureHandlers")
 local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandlers")
+local LogHandlers = TS.import(script, script.Parent, "handlers", "LogHandlers")
 local instanceId = HttpService:GenerateGUID(false)
 local assignedRole
 local function detectRole()
@@ -419,6 +511,7 @@ local routeMap = {
 	["/api/simulate-mouse-input"] = InputHandlers.simulateMouseInput,
 	["/api/simulate-keyboard-input"] = InputHandlers.simulateKeyboardInput,
 	["/api/find-and-replace-in-scripts"] = ScriptHandlers.findAndReplaceInScripts,
+	["/api/get-runtime-logs"] = LogHandlers.getRuntimeLogs,
 }
 local function processRequest(request)
 	local endpoint = request.endpoint
@@ -460,6 +553,43 @@ local function getConnectionStatus(connIndex)
 	end
 	return "connecting"
 end
+-- Throttle for re-issuing /ready after the server reports knownInstance=false.
+-- 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)
+	local now = tick()
+	if now - lastReadyPostAt < 2 then
+		return nil
+	end
+	lastReadyPostAt = now
+	task.spawn(function()
+		local readyOk, readyResult = pcall(function()
+			return HttpService:RequestAsync({
+				Url = `{conn.serverUrl}/ready`,
+				Method = "POST",
+				Headers = {
+					["Content-Type"] = "application/json",
+				},
+				Body = HttpService:JSONEncode({
+					instanceId = instanceId,
+					role = detectRole(),
+					pluginReady = true,
+					timestamp = tick(),
+				}),
+			})
+		end)
+		if readyOk and 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
+		end
+	end)
+end
 local function pollForRequests(connIndex)
 	local conn = State.getConnection(connIndex)
 	if not conn or not conn.isActive then
@@ -481,6 +611,9 @@ local function pollForRequests(connIndex)
 	conn.isPolling = false
 	local ui = UI.getElements()
 	UI.updateTabDot(connIndex)
+	if connIndex == State.getActiveTabIndex() then
+		UI.updateToolbarIcon()
+	end
 	if success and (result.Success or result.StatusCode == 503) then
 		conn.consecutiveFailures = 0
 		conn.currentRetryDelay = 0.5
@@ -489,6 +622,14 @@ local function pollForRequests(connIndex)
 		local mcpConnected = data.mcpConnected == true
 		conn.lastHttpOk = true
 		conn.lastMcpOk = mcpConnected
+		-- Server tells us when its in-memory instances map doesn't have us
+		-- (e.g. after an MCP process restart). Re-issue /ready immediately so
+		-- target=server/client-N start routing again. The throttle inside
+		-- sendReady() prevents duplicate registrations while the server
+		-- catches up.
+		if data.knownInstance == false then
+			sendReady(conn)
+		end
 		if connIndex == State.getActiveTabIndex() then
 			local el = ui
 			el.step1Dot.BackgroundColor3 = Color3.fromRGB(34, 197, 94)
@@ -629,7 +770,6 @@ local function activatePlugin(connIndex)
 	conn.isActive = true
 	conn.consecutiveFailures = 0
 	conn.currentRetryDelay = 0.5
-	ui.screenGui.Enabled = true
 	if idx == State.getActiveTabIndex() then
 		conn.serverUrl = ui.urlInput.Text
 		local portStr = string.match(conn.serverUrl, ":(%d+)$")
@@ -644,42 +784,19 @@ local function activatePlugin(connIndex)
 		UI.updateUIState()
 	end
 	UI.updateTabDot(idx)
-	task.spawn(function()
-		if not conn.heartbeatConnection then
-			conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
-				local now = tick()
-				local currentInterval = if conn.consecutiveFailures > 5 then conn.currentRetryDelay else conn.pollInterval
-				if now - conn.lastPoll > currentInterval then
-					conn.lastPoll = now
-					pollForRequests(idx)
-				end
-			end)
-		end
-		local readyOk, readyResult = pcall(function()
-			return HttpService:RequestAsync({
-				Url = `{conn.serverUrl}/ready`,
-				Method = "POST",
-				Headers = {
-					["Content-Type"] = "application/json",
-				},
-				Body = HttpService:JSONEncode({
-					instanceId = instanceId,
-					role = detectRole(),
-					pluginReady = true,
-					timestamp = tick(),
-				}),
-			})
-		end)
-		if readyOk and 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
+	if not conn.heartbeatConnection then
+		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
+			local now = tick()
+			local currentInterval = if conn.consecutiveFailures > 5 then conn.currentRetryDelay else conn.pollInterval
+			if now - conn.lastPoll > currentInterval then
+				conn.lastPoll = now
+				pollForRequests(idx)
 			end
-		end
-	end)
+		end)
+	end
+	-- Initial /ready; pollForRequests will also re-fire ready if the server
+	-- later reports knownInstance=false (process restart, etc).
+	sendReady(conn)
 end
 local function deactivatePlugin(connIndex)
 	local _condition = connIndex
@@ -782,15 +899,22 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- `require(SomeModule)` returns a fresh copy, not the one the running game
 -- scripts hold. So runtime-mutated module state is invisible to probes.
 --
--- These bridges fix that by living inside the user's game scripts:
---   - Server: a Script in ServerScriptService that creates a BindableFunction
---     (for our server-peer plugin to invoke directly) plus a RemoteFunction
---     (kept for parity with the upstream primitive's client-callable shape).
+-- These bridges fix that by living inside the user's game scripts. Both
+-- peers use the same symmetric shape:
+--   - Server: a Script in ServerScriptService that creates a BindableFunction.
+--     Plugin (server peer) invokes it with a fresh ModuleScript payload;
+--     require() runs inside the Script VM so it shares the running server's
+--     require cache.
 --   - Client: a LocalScript in StarterPlayer.StarterPlayerScripts that
 --     creates a BindableFunction. Plugin invokes it with a fresh ModuleScript
 --     payload; require() runs inside the LocalScript VM so it shares the
 --     game's require cache.
 --
+-- Why ModuleScript+require on both sides (no loadstring): require'd modules
+-- run with the security level they were created at and don't need
+-- ServerScriptService.LoadStringEnabled, so eval_server_runtime works even
+-- when LoadStringEnabled=false (the default in fresh places).
+--
 -- Lifecycle: TestHandlers.startPlaytest inserts both scripts into the EDIT
 -- DM right before ExecutePlayModeAsync. ExecutePlayModeAsync clones the
 -- DataModel into the play DMs, so the scripts come along and run there.
@@ -821,7 +945,6 @@ local CLIENT_SCRIPT_NAME = "__MCP_ClientEvalBridge"
 local BRIDGE_NAMES = {
 	serverScript = SERVER_SCRIPT_NAME,
 	clientScript = CLIENT_SCRIPT_NAME,
-	serverRemote = "__MCP_ServerEvalRemote",
 	serverLocal = "__MCP_ServerEvalLocal",
 	clientLocal = "__MCP_ClientEvalBridge",
 }
@@ -832,7 +955,6 @@ local SERVER_BRIDGE_SOURCE = `\
 -- stop_playtest. Provides shared-require-cache eval on the server peer for\
 -- the eval_server_runtime MCP tool.\
 \
-local ReplicatedStorage = game:GetService("ReplicatedStorage")\
 local ServerScriptService = game:GetService("ServerScriptService")\
 local RunService = game:GetService("RunService")\
 \
@@ -840,49 +962,18 @@ if not RunService:IsStudio() then\
 	return\
 end\
 \
-local function evalCode(source)\
-	if type(source) ~= "string" then\
-		return false, "source must be a string"\
-	end\
-	local fn, compileErr = loadstring(source, "MCPServerEval")\
-	if not fn then\
-		local errStr = tostring(compileErr or "loadstring returned nil")\
-		-- Roblox returns nil from loadstring when LoadStringEnabled=false.\
-		-- Surface a clear, actionable error.\
-		if string.find(errStr, "not enabled", 1, true)\
-			or string.find(errStr, "disabled", 1, true)\
-			or errStr == "loadstring returned nil"\
-		then\
-			return false,\
-				"ServerScriptService.LoadStringEnabled is false. eval_server_runtime requires it. "\
-				.. "Enable it in Studio (ServerScriptService > Properties > LoadStringEnabled = true) "\
-				.. "and restart the playtest."\
-		end\
-		return false, errStr\
-	end\
-	return pcall(fn)\
-end\
-\
--- Defensive cleanup of stale instances from a prior session.\
-local prevRf = ReplicatedStorage:FindFirstChild("{BRIDGE_NAMES.serverRemote}")\
-if prevRf then prevRf:Destroy() end\
 local prevBf = ServerScriptService:FindFirstChild("{BRIDGE_NAMES.serverLocal}")\
 if prevBf then prevBf:Destroy() end\
 \
-local rf = Instance.new("RemoteFunction")\
-rf.Name = "{BRIDGE_NAMES.serverRemote}"\
-rf.Archivable = false\
-rf.Parent = ReplicatedStorage\
-rf.OnServerInvoke = function(_player, source)\
-	return evalCode(source)\
-end\
-\
 local bf = Instance.new("BindableFunction")\
 bf.Name = "{BRIDGE_NAMES.serverLocal}"\
 bf.Archivable = false\
 bf.Parent = ServerScriptService\
-bf.OnInvoke = function(source)\
-	return evalCode(source)\
+bf.OnInvoke = function(payload)\
+	if typeof(payload) ~= "Instance" or not payload:IsA("ModuleScript") then\
+		return false, "payload must be a ModuleScript instance"\
+	end\
+	return pcall(require, payload)\
 end\
 `
 local CLIENT_BRIDGE_SOURCE = `\
@@ -979,20 +1070,9 @@ local function installBridges()
 		installed = true,
 	}
 end
--- Heuristic check so start_playtest can surface a warning when
--- LoadStringEnabled is false (eval_server_runtime won't work in that mode).
--- We can't import the runtime LoadStringEnabled value cleanly without
--- pulling in the type — read defensively.
-local function loadStringEnabled()
-	local ok, value = pcall(function()
-		return ServerScriptService.LoadStringEnabled
-	end)
-	return ok and value == true
-end
 return {
 	cleanupBridges = cleanupBridges,
 	installBridges = installBridges,
-	loadStringEnabled = loadStringEnabled,
 	BRIDGE_NAMES = BRIDGE_NAMES,
 }
 ]]></string>
@@ -2681,6 +2761,33 @@ return {
           </Properties>
         </Item>
         <Item class="ModuleScript" referent="11">
+          <Properties>
+            <string name="Name">LogHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
+local RuntimeLogBuffer = TS.import(script, script.Parent.Parent, "RuntimeLogBuffer")
+local function getRuntimeLogs(requestData)
+	local since = requestData.since
+	local tail = requestData.tail
+	local filter = requestData.filter
+	-- Plugin-side peer tag is generic ("edit"|"server"|"client"). The MCP-side
+	-- aggregator overrides it with the specific instance role (e.g. "client-1")
+	-- during fan-out for target=all, so this value is only authoritative for
+	-- the single-peer query path.
+	local peer = RuntimeLogBuffer.detectPeer()
+	return RuntimeLogBuffer.query({
+		since = since,
+		tail = tail,
+		filter = filter,
+	}, peer)
+end
+return {
+	getRuntimeLogs = getRuntimeLogs,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="12">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3152,8 +3259,19 @@ local function executeLuau(requestData)
 	local runViaModuleScript = function()
 		local m = Instance.new("ModuleScript")
 		m.Name = "__MCPExecLuauPayload"
+		-- Wrap user code in an IIFE so require() always gets exactly one
+		-- return value. Without this, code like `print("x")` errors with
+		-- "Module code did not return exactly one value" because top-level
+		-- ModuleScripts must return exactly one value.
+		--
+		-- The DOUBLE parens around the call are load-bearing: in Luau,
+		-- `return f()` propagates whatever multi-value tuple f returns,
+		-- including zero values. Outer parens adjust the call to exactly
+		-- one value (the first, or nil). So `return ((f)())` always
+		-- returns exactly one value, regardless of what f does.
+		local wrapped = `return ((function()\n{code}\nend)())`
 		local okSet, setErr = pcall(function()
-			m.Source = code
+			m.Source = wrapped
 		end)
 		if not okSet then
 			m:Destroy()
@@ -3306,7 +3424,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="12">
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3558,7 +3676,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3666,8 +3784,23 @@ local function searchFiles(requestData)
 	}
 end
 local function getPlaceInfo(_requestData)
+	local dataModelName = game.Name
+	local placeName = dataModelName
+	if game.PlaceId > 0 then
+		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
+				placeName = name
+			end
+		end
+	end
 	return {
-		placeName = game.Name,
+		placeName = placeName,
+		dataModelName = dataModelName,
 		placeId = game.PlaceId,
 		gameId = game.GameId,
 		jobId = game.JobId,
@@ -4585,7 +4718,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5281,7 +5414,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="15">
+        <Item class="ModuleScript" referent="16">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5292,7 +5425,6 @@ local LogService = _services.LogService
 local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
 local installBridges = _EvalBridges.installBridges
 local cleanupBridges = _EvalBridges.cleanupBridges
-local loadStringEnabled = _EvalBridges.loadStringEnabled
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
 local ScriptEditorService = game:GetService("ScriptEditorService")
@@ -5453,7 +5585,6 @@ local function startPlaytest(requestData)
 	-- so eval_server_runtime / eval_client_runtime work without manual setup.
 	-- Bridges are cleaned up from the edit DM after the play DMs tear down.
 	local bridgeInstall = installBridges()
-	local hasLoadString = loadStringEnabled()
 	if not bridgeInstall.installed then
 		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
 	end
@@ -5487,13 +5618,6 @@ local function startPlaytest(requestData)
 		message = msg,
 		evalBridges = if bridgeInstall.installed then "installed" else `failed: {bridgeInstall.error}`,
 	}
-	-- Surface loadstring availability up-front so callers know whether
-	-- eval_server_runtime will work before they try it. eval_client_runtime
-	-- doesn't need loadstring (it uses ModuleScript+require), so this only
-	-- affects the server bridge.
-	if not hasLoadString then
-		response.serverEvalNote = "ServerScriptService.LoadStringEnabled is false. eval_server_runtime will not work " .. "until you enable it (ServerScriptService > Properties > LoadStringEnabled = true) " .. "and restart the playtest. eval_client_runtime is unaffected."
-	end
 	return response
 end
 local function stopPlaytest(_requestData)
@@ -5600,7 +5724,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="16">
+      <Item class="ModuleScript" referent="17">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5630,11 +5754,192 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="17">
+      <Item class="ModuleScript" referent="18">
+        <Properties>
+          <string name="Name">RuntimeLogBuffer</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+-- Per-peer in-memory ring buffer for LogService.MessageOut events.
+-- Powers the get_runtime_logs MCP tool. Replaces the out-of-tree LogBuffer
+-- primitives + StringValue approach from chrrxs/roblox-mcp-primitives.
+--
+-- Each peer's plugin attaches a MessageOut listener at plugin load (edit DM,
+-- play-server DM, play-client DM all run their own copy of this module).
+-- Captured entries live in plugin module-state; nothing is parented to the
+-- DataModel. The buffer is bounded by a message-byte budget; oldest entries
+-- drop when over budget.
+--
+-- Peer-tag caveat: returned entries reflect which peer's plugin CAPTURED the
+-- entry, NOT which peer's script originated the print. LogService reflects
+-- prints across peers in Studio Play (a server print ends up in both the
+-- server and client LogService:GetLogHistory()) and origin is empirically
+-- undetectable from inside MessageOut. The MCP-side aggregator handles
+-- cross-peer dedup via a 2s timestamp window.
+local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local LogService = _services.LogService
+local RunService = _services.RunService
+local MAX_BYTES = 64 * 1024
+local HARD_ENTRY_CAP = 50_000
+local entries = {}
+local totalBytes = 0
+local totalDropped = 0
+local nextSeq = 1
+local installed = false
+local function levelTag(t)
+	if t == Enum.MessageType.MessageWarning then
+		return "WARN"
+	end
+	if t == Enum.MessageType.MessageError then
+		return "ERR"
+	end
+	if t == Enum.MessageType.MessageInfo then
+		return "INFO"
+	end
+	return "OUT"
+end
+local function nowSec()
+	return DateTime.now().UnixTimestampMillis / 1000
+end
+local function dropOldestUntilFits(incomingBytes)
+	while #entries > 0 and (totalBytes + incomingBytes > MAX_BYTES or #entries >= HARD_ENTRY_CAP) do
+		local dropped = table.remove(entries, 1)
+		totalBytes -= #dropped.message
+		totalDropped += 1
+	end
+end
+local function install()
+	if installed then
+		return nil
+	end
+	if not RunService:IsStudio() then
+		return nil
+	end
+	installed = true
+	LogService.MessageOut:Connect(function(msg, t)
+		local bytes = #msg
+		dropOldestUntilFits(bytes)
+		local _arg0 = {
+			seq = nextSeq,
+			ts = nowSec(),
+			level = levelTag(t),
+			message = msg,
+		}
+		table.insert(entries, _arg0)
+		nextSeq += 1
+		totalBytes += bytes
+	end)
+end
+local function detectPeer()
+	if not RunService:IsRunning() then
+		return "edit"
+	end
+	if RunService:IsServer() then
+		return "server"
+	end
+	return "client"
+end
+local function query(opts, peer)
+	local _result
+	if opts.since ~= nil then
+		-- ▼ ReadonlyArray.filter ▼
+		local _newValue = {}
+		local _callback = function(e)
+			return e.seq > (opts.since)
+		end
+		local _length = 0
+		for _k, _v in entries do
+			if _callback(_v, _k - 1, entries) == true then
+				_length += 1
+				_newValue[_length] = _v
+			end
+		end
+		-- ▲ ReadonlyArray.filter ▲
+		_result = _newValue
+	else
+		local _array = {}
+		local _length = #_array
+		table.move(entries, 1, #entries, _length + 1, _array)
+		_result = _array
+	end
+	local result = _result
+	if opts.filter ~= nil then
+		-- Plain substring search (4th arg = true). Pattern matching here was
+		-- surprising in practice - Lua magic chars in messages would silently
+		-- not match (e.g. filter="MARK-EDIT" against "MARK-EDIT-001" fails
+		-- because '-' means "0+" in Lua patterns). Substring search matches
+		-- most users' mental model of "filter messages containing this text".
+		local needle = opts.filter
+		-- ▼ ReadonlyArray.filter ▼
+		local _newValue = {}
+		local _callback = function(e)
+			local start = string.find(e.message, needle, 1, true)
+			return start ~= nil
+		end
+		local _length = 0
+		for _k, _v in result do
+			if _callback(_v, _k - 1, result) == true then
+				_length += 1
+				_newValue[_length] = _v
+			end
+		end
+		-- ▲ ReadonlyArray.filter ▲
+		result = _newValue
+	end
+	if opts.tail ~= nil and #result > opts.tail then
+		-- roblox-ts arrays don't expose .slice; manual tail copy.
+		local tailed = {}
+		local start = #result - opts.tail
+		do
+			local i = start
+			local _shouldIncrement = false
+			while true do
+				if _shouldIncrement then
+					i += 1
+				else
+					_shouldIncrement = true
+				end
+				if not (i < #result) then
+					break
+				end
+				local _arg0 = result[i + 1]
+				table.insert(tailed, _arg0)
+			end
+		end
+		result = tailed
+	end
+	local last = if #entries > 0 then entries[#entries] else nil
+	local _object = {
+		peer = peer,
+		entries = result,
+		totalDropped = totalDropped,
+	}
+	local _left = "nextSince"
+	local _result_1
+	if last then
+		_result_1 = last.seq
+	else
+		local _condition = opts.since
+		if _condition == nil then
+			_condition = 0
+		end
+		_result_1 = _condition
+	end
+	_object[_left] = _result_1
+	return _object
+end
+return {
+	install = install,
+	detectPeer = detectPeer,
+	query = query,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="19">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.9.1"
+local CURRENT_VERSION = "2.10.1"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -5726,7 +6031,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="18">
+      <Item class="ModuleScript" referent="20">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5736,6 +6041,34 @@ local State = TS.import(script, script.Parent, "State")
 local elements = nil
 local pulseAnimation
 local buttonHover = false
+local toolbarButton
+local toolbarIcons
+local lastToolbarIcon
+local updateToolbarIcon
+local function setToolbarButton(btn, icons)
+	toolbarButton = btn
+	toolbarIcons = icons
+	lastToolbarIcon = nil
+	updateToolbarIcon()
+end
+function updateToolbarIcon()
+	if not toolbarButton or not toolbarIcons then
+		return nil
+	end
+	local conn = State.getActiveConnection()
+	local nextIcon
+	if not conn or not conn.isActive then
+		nextIcon = toolbarIcons.disconnected
+	elseif conn.lastHttpOk and conn.lastMcpOk then
+		nextIcon = toolbarIcons.connected
+	else
+		nextIcon = toolbarIcons.connecting
+	end
+	if nextIcon ~= lastToolbarIcon then
+		toolbarButton.Icon = nextIcon
+		lastToolbarIcon = nextIcon
+	end
+end
 local tabButtons = {}
 local TWEEN_QUICK = TweenInfo.new(0.15, Enum.EasingStyle.Quad, Enum.EasingDirection.Out)
 local function tweenProp(instance, props)
@@ -6314,6 +6647,7 @@ local function init(pluginRef)
 	refreshTabBar()
 end
 function updateUIState()
+	updateToolbarIcon()
 	local conn = State.getActiveConnection()
 	if not conn then
 		return nil
@@ -6439,6 +6773,8 @@ return {
 	updateTabLabel = updateTabLabel,
 	stopPulseAnimation = stopPulseAnimation,
 	startPulseAnimation = startPulseAnimation,
+	setToolbarButton = setToolbarButton,
+	updateToolbarIcon = updateToolbarIcon,
 	getElements = function()
 		return elements
 	end,
@@ -6446,7 +6782,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="19">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6976,11 +7312,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="23">
+    <Item class="Folder" referent="25">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -9054,7 +9390,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -9321,15 +9657,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="24">
+    <Item class="Folder" referent="26">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="25">
+      <Item class="Folder" referent="27">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {