@chrrxs/robloxstudio-mcp-inspector 2.10.0 → 2.10.1

package/dist/index.js

@@ -1212,6 +1212,37 @@ function luaLongQuote(s) {
 ${s}
 ]${eq}]`;
 }
+function buildModuleScriptInvokeWrapper(opts) {
+  const wrapped = `return ((function()
+${opts.userCode}
+end)())`;
+  return `
+local HttpService = game:GetService("HttpService")
+local bf = game:GetService("${opts.service}"):FindFirstChild("${opts.bridgeName}")
+if not bf then
+	return HttpService:JSONEncode({
+		bridge = "missing",
+		error = ${luaLongQuote(opts.missingError)},
+	})
+end
+local USER_CODE = ${luaLongQuote(wrapped)}
+local m = Instance.new("ModuleScript")
+m.Name = "__MCPEvalPayload"
+local okSet, setErr = pcall(function() m.Source = USER_CODE end)
+if not okSet then
+	m:Destroy()
+	return HttpService:JSONEncode({ bridge = "ok", ok = false, result = "ModuleScript Source set failed: " .. tostring(setErr) })
+end
+m.Parent = workspace
+local ok, result = bf:Invoke(m)
+m:Destroy()
+return HttpService:JSONEncode({
+	bridge = "ok",
+	ok = ok,
+	result = if result == nil then nil else tostring(result),
+})
+`;
+}
 function parseBridgeResponse(response) {
   const r = response;
   if (r && typeof r.returnValue === "string") {
@@ -1771,23 +1802,12 @@ ${code}`
         if (!code) {
           throw new Error("Code is required for eval_server_runtime");
         }
-        const wrapper = `
-local HttpService = game:GetService("HttpService")
-local bf = game:GetService("ServerScriptService"):FindFirstChild("${SERVER_LOCAL_NAME}")
-if not bf then
-	return HttpService:JSONEncode({
-		bridge = "missing",
-		error = "ServerEvalBridge not installed. Bridges are auto-installed at start_playtest and removed at stop_playtest. Start a playtest before calling eval_server_runtime.",
-	})
-end
-local USER_CODE = ${luaLongQuote(code)}
-local ok, result = bf:Invoke(USER_CODE)
-return HttpService:JSONEncode({
-	bridge = "ok",
-	ok = ok,
-	result = if result == nil then nil else tostring(result),
-})
-`;
+        const wrapper = buildModuleScriptInvokeWrapper({
+          service: "ServerScriptService",
+          bridgeName: SERVER_LOCAL_NAME,
+          missingError: "ServerEvalBridge not installed. Bridges are auto-installed at start_playtest and removed at stop_playtest. Start a playtest before calling eval_server_runtime.",
+          userCode: code
+        });
         const response = await this.client.request("/api/execute-luau", { code: wrapper }, "server");
         return {
           content: [
@@ -1806,32 +1826,12 @@ return HttpService:JSONEncode({
         if (!clientTarget.startsWith("client-")) {
           throw new Error(`eval_client_runtime requires target=client-N (got: ${clientTarget})`);
         }
-        const wrapper = `
-local HttpService = game:GetService("HttpService")
-local bf = game:GetService("ReplicatedStorage"):FindFirstChild("${CLIENT_LOCAL_NAME}")
-if not bf then
-	return HttpService:JSONEncode({
-		bridge = "missing",
-		error = "ClientEvalBridge not installed. Bridges are auto-installed at start_playtest and removed at stop_playtest. Start a playtest before calling eval_client_runtime.",
-	})
-end
-local USER_CODE = ${luaLongQuote(code)}
-local m = Instance.new("ModuleScript")
-m.Name = "__MCPEvalPayload"
-local okSet, setErr = pcall(function() m.Source = USER_CODE end)
-if not okSet then
-	m:Destroy()
-	return HttpService:JSONEncode({ bridge = "ok", ok = false, result = "ModuleScript Source set failed: " .. tostring(setErr) })
-end
-m.Parent = workspace
-local ok, result = bf:Invoke(m)
-m:Destroy()
-return HttpService:JSONEncode({
-	bridge = "ok",
-	ok = ok,
-	result = if result == nil then nil else tostring(result),
-})
-`;
+        const wrapper = buildModuleScriptInvokeWrapper({
+          service: "ReplicatedStorage",
+          bridgeName: CLIENT_LOCAL_NAME,
+          missingError: "ClientEvalBridge not installed. Bridges are auto-installed at start_playtest and removed at stop_playtest. Start a playtest before calling eval_client_runtime.",
+          userCode: code
+        });
         const response = await this.client.request("/api/execute-luau", { code: wrapper }, clientTarget);
         return {
           content: [
@@ -3909,7 +3909,7 @@ var init_definitions = __esm({
       {
         name: "eval_server_runtime",
         category: "write",
-        description: "Execute Luau on the server peer in the running game's Script VM (shares require cache with user game scripts). Use this instead of execute_luau target=server when you need to see runtime-mutated module state. Auto-installed at start_playtest, removed at stop_playtest. Requires ServerScriptService.LoadStringEnabled=true.",
+        description: "Execute Luau on the server peer in the running game's Script VM (shares require cache with user game scripts). Use this instead of execute_luau target=server when you need to see runtime-mutated module state. Auto-installed at start_playtest, removed at stop_playtest.",
         inputSchema: {
           type: "object",
           properties: {
@@ -3924,7 +3924,7 @@ var init_definitions = __esm({
       {
         name: "eval_client_runtime",
         category: "write",
-        description: "Execute Luau on a client peer in the running game's LocalScript VM (shares require cache with user game scripts). Use this instead of execute_luau target=client-N when you need to see runtime-mutated module state. Auto-installed at start_playtest, removed at stop_playtest. Does not require LoadStringEnabled.",
+        description: "Execute Luau on a client peer in the running game's LocalScript VM (shares require cache with user game scripts). Use this instead of execute_luau target=client-N when you need to see runtime-mutated module state. Auto-installed at start_playtest, removed at stop_playtest.",
         inputSchema: {
           type: "object",
           properties: {

package/package.json

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

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -17,8 +17,16 @@ local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer"
 RuntimeLogBuffer.install()
 UI.init(plugin)
 local elements = UI.getElements()
+local ICON_DISCONNECTED = "rbxassetid://125921838360800"
+local ICON_CONNECTING = "rbxassetid://125921838360800"
+local ICON_CONNECTED = "rbxassetid://125921838360800"
 local toolbar = plugin:CreateToolbar("MCP Inspector")
-local button = toolbar:CreateButton("MCP Inspector", "Connect to MCP Inspector (read-only) for AI Integration", "rbxassetid://125921838360800")
+local button = toolbar:CreateButton("MCP Inspector", "Connect to MCP Inspector (read-only) 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
@@ -603,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
@@ -759,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+)$")
@@ -889,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.
@@ -928,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",
 }
@@ -939,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")\
 \
@@ -947,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 = `\
@@ -1086,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>
@@ -3811,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,
@@ -5437,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")
@@ -5598,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
@@ -5632,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)
@@ -5960,7 +5939,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.10.0"
+local CURRENT_VERSION = "2.10.1"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6062,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)
@@ -6640,6 +6647,7 @@ local function init(pluginRef)
 	refreshTabBar()
 end
 function updateUIState()
+	updateToolbarIcon()
 	local conn = State.getActiveConnection()
 	if not conn then
 		return nil
@@ -6765,6 +6773,8 @@ return {
 	updateTabLabel = updateTabLabel,
 	stopPulseAnimation = stopPulseAnimation,
 	startPulseAnimation = startPulseAnimation,
+	setToolbarButton = setToolbarButton,
+	updateToolbarIcon = updateToolbarIcon,
 	getElements = function()
 		return elements
 	end,

package/studio-plugin/MCPPlugin.rbxmx

@@ -17,8 +17,16 @@ local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer"
 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
@@ -603,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
@@ -759,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+)$")
@@ -889,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.
@@ -928,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",
 }
@@ -939,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")\
 \
@@ -947,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 = `\
@@ -1086,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>
@@ -3811,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,
@@ -5437,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")
@@ -5598,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
@@ -5632,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)
@@ -5960,7 +5939,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.10.0"
+local CURRENT_VERSION = "2.10.1"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6062,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)
@@ -6640,6 +6647,7 @@ local function init(pluginRef)
 	refreshTabBar()
 end
 function updateUIState()
+	updateToolbarIcon()
 	local conn = State.getActiveConnection()
 	if not conn then
 		return nil
@@ -6765,6 +6773,8 @@ return {
 	updateTabLabel = updateTabLabel,
 	stopPulseAnimation = stopPulseAnimation,
 	startPulseAnimation = startPulseAnimation,
+	setToolbarButton = setToolbarButton,
+	updateToolbarIcon = updateToolbarIcon,
 	getElements = function()
 		return elements
 	end,

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

@@ -181,6 +181,7 @@ function pollForRequests(connIndex: number) {
 
 	const ui = UI.getElements();
 	UI.updateTabDot(connIndex);
+	if (connIndex === State.getActiveTabIndex()) UI.updateToolbarIcon();
 
 	if (success && (result.Success || result.StatusCode === 503)) {
 		conn.consecutiveFailures = 0;
@@ -333,7 +334,6 @@ function activatePlugin(connIndex?: number) {
 	conn.isActive = true;
 	conn.consecutiveFailures = 0;
 	conn.currentRetryDelay = 0.5;
-	ui.screenGui.Enabled = true;
 
 	if (idx === State.getActiveTabIndex()) {
 		conn.serverUrl = ui.urlInput.Text;

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

@@ -5,15 +5,22 @@
 // `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.
@@ -47,7 +54,6 @@ const CLIENT_SCRIPT_NAME = "__MCP_ClientEvalBridge";
 export const BRIDGE_NAMES = {
 	serverScript: SERVER_SCRIPT_NAME,
 	clientScript: CLIENT_SCRIPT_NAME,
-	serverRemote: "__MCP_ServerEvalRemote",
 	serverLocal: "__MCP_ServerEvalLocal",
 	clientLocal: "__MCP_ClientEvalBridge",
 } as const;
@@ -59,7 +65,6 @@ const 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")
 
@@ -67,49 +72,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
 `;
 
@@ -202,14 +176,3 @@ export function installBridges(): { installed: boolean; error?: string } {
 	return { installed: true };
 }
 
-// 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.
-export function loadStringEnabled(): boolean {
-	const [ok, value] = pcall(
-		() => (ServerScriptService as unknown as { LoadStringEnabled: boolean }).LoadStringEnabled,
-	);
-	return ok && value === true;
-}
-

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

@@ -30,6 +30,39 @@ let elements: UIElements = undefined!;
 let pulseAnimation: Tween | undefined;
 let buttonHover = false;
 
+interface ToolbarIcons {
+	disconnected: string;
+	connecting: string;
+	connected: string;
+}
+let toolbarButton: PluginToolbarButton | undefined;
+let toolbarIcons: ToolbarIcons | undefined;
+let lastToolbarIcon: string | undefined;
+
+function setToolbarButton(btn: PluginToolbarButton, icons: ToolbarIcons) {
+	toolbarButton = btn;
+	toolbarIcons = icons;
+	lastToolbarIcon = undefined;
+	updateToolbarIcon();
+}
+
+function updateToolbarIcon() {
+	if (!toolbarButton || !toolbarIcons) return;
+	const conn = State.getActiveConnection();
+	let nextIcon: string;
+	if (!conn || !conn.isActive) {
+		nextIcon = toolbarIcons.disconnected;
+	} else if (conn.lastHttpOk && conn.lastMcpOk) {
+		nextIcon = toolbarIcons.connected;
+	} else {
+		nextIcon = toolbarIcons.connecting;
+	}
+	if (nextIcon !== lastToolbarIcon) {
+		(toolbarButton as unknown as { Icon: string }).Icon = nextIcon;
+		lastToolbarIcon = nextIcon;
+	}
+}
+
 interface TabButton {
 	frame: Frame;
 	label: TextLabel;
@@ -596,6 +629,7 @@ function init(pluginRef: Plugin) {
 }
 
 function updateUIState() {
+	updateToolbarIcon();
 	const conn = State.getActiveConnection();
 	if (!conn) return;
 	const el = elements;
@@ -723,5 +757,7 @@ export = {
 	updateTabLabel,
 	stopPulseAnimation,
 	startPulseAnimation,
+	setToolbarButton,
+	updateToolbarIcon,
 	getElements: () => elements,
 };

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

@@ -96,8 +96,23 @@ function searchFiles(requestData: Record<string, unknown>) {
 }
 
 function getPlaceInfo(_requestData: Record<string, unknown>) {
+	const dataModelName = game.Name;
+	let placeName = dataModelName;
+
+	if (game.PlaceId > 0) {
+		const MarketplaceService = game.GetService("MarketplaceService");
+		const [ok, info] = pcall(() => MarketplaceService.GetProductInfo(game.PlaceId));
+		if (ok && info !== undefined) {
+			const name = (info as { Name?: string }).Name;
+			if (typeIs(name, "string") && name !== "") {
+				placeName = name;
+			}
+		}
+	}
+
 	return {
-		placeName: game.Name,
+		placeName,
+		dataModelName,
 		placeId: game.PlaceId,
 		gameId: game.GameId,
 		jobId: game.JobId,

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

@@ -1,5 +1,5 @@
 import { HttpService, LogService } from "@rbxts/services";
-import { installBridges, cleanupBridges, loadStringEnabled } from "../EvalBridges";
+import { installBridges, cleanupBridges } from "../EvalBridges";
 
 const StudioTestService = game.GetService("StudioTestService");
 const ServerScriptService = game.GetService("ServerScriptService");
@@ -159,7 +159,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 	// 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.
 	const bridgeInstall = installBridges();
-	const hasLoadString = loadStringEnabled();
 	if (!bridgeInstall.installed) {
 		warn(`[MCP] Eval bridge install failed: ${bridgeInstall.error}`);
 	}
@@ -203,17 +202,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 		evalBridges: bridgeInstall.installed ? "installed" : `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 (!hasLoadString) {
-		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.";
-	}
-
 	return response;
 }
 

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

@@ -13,8 +13,13 @@ UI.init(plugin);
 const elements = UI.getElements();
 
 
+const ICON_DISCONNECTED = "rbxassetid://__BUTTON_ICON_DISCONNECTED__";
+const ICON_CONNECTING = "rbxassetid://__BUTTON_ICON_CONNECTING__";
+const ICON_CONNECTED = "rbxassetid://__BUTTON_ICON_CONNECTED__";
+
 const toolbar = plugin.CreateToolbar("__TOOLBAR_NAME__");
-const button = toolbar.CreateButton("__BUTTON_TITLE__", "__BUTTON_TOOLTIP__", "rbxassetid://__BUTTON_ICON_ID__");
+const button = toolbar.CreateButton("__BUTTON_TITLE__", "__BUTTON_TOOLTIP__", ICON_DISCONNECTED);
+UI.setToolbarButton(button, { disconnected: ICON_DISCONNECTED, connecting: ICON_CONNECTING, connected: ICON_CONNECTED });
 
 
 elements.connectButton.Activated.Connect(() => {