@chrrxs/robloxstudio-mcp-inspector 2.8.1 → 2.9.1

package/studio-plugin/MCPPlugin.rbxmx

@@ -770,11 +770,239 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="Folder" referent="4">
+      <Item class="ModuleScript" referent="4">
+        <Properties>
+          <string name="Name">EvalBridges</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+-- Game-VM eval bridges, ported from chrrxs/roblox-mcp-primitives.
+--
+-- Our standard `execute_luau target=server/client-N` runs in the plugin VM
+-- with a fresh ModuleScript per call. That gives a clean sandbox but means
+-- `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).
+--   - 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.
+--
+-- 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.
+-- TestHandlers cleans them up from the edit DM when ExecutePlayModeAsync
+-- returns (test ended for any reason: stop_playtest, manual close, EndTest).
+--
+-- Archivable handling: ExecutePlayModeAsync's deep-clone SKIPS instances
+-- with Archivable=false (verified empirically in v2.9.0 testing - bridges
+-- never reached the play DMs because we'd set them to false). We now keep
+-- Archivable=true so the clone works, and rely on cleanupBridges() to
+-- remove the scripts from the edit DM when the test ends. The only failure
+-- mode is the user saving DURING an active playtest, which would persist
+-- the bridges to the .rbxl - that's a no-op next session because
+-- installBridges() always calls cleanupBridges() first to clear stale
+-- instances. The RemoteFunction/BindableFunction that the bridge scripts
+-- CREATE at runtime stay Archivable=false (they're runtime-only and should
+-- never appear in a save).
+local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local ServerScriptService = _services.ServerScriptService
+local StarterPlayer = _services.StarterPlayer
+local ScriptEditorService = game:GetService("ScriptEditorService")
+local function getStarterPlayerScripts()
+	return StarterPlayer:FindFirstChild("StarterPlayerScripts")
+end
+local SERVER_SCRIPT_NAME = "__MCP_ServerEvalBridge"
+local CLIENT_SCRIPT_NAME = "__MCP_ClientEvalBridge"
+-- Public so the eval_*_runtime tool wrappers can reference the same names.
+local BRIDGE_NAMES = {
+	serverScript = SERVER_SCRIPT_NAME,
+	clientScript = CLIENT_SCRIPT_NAME,
+	serverRemote = "__MCP_ServerEvalRemote",
+	serverLocal = "__MCP_ServerEvalLocal",
+	clientLocal = "__MCP_ClientEvalBridge",
+}
+-- Embedded Luau. The double `${...}` references our exported names so a
+-- rename here propagates to both the script source and the tool wrappers.
+local SERVER_BRIDGE_SOURCE = `\
+-- Auto-installed by @chrrxs/robloxstudio-mcp at start_playtest, removed at\
+-- 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")\
+\
+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)\
+end\
+`
+local CLIENT_BRIDGE_SOURCE = `\
+-- Auto-installed by @chrrxs/robloxstudio-mcp at start_playtest, removed at\
+-- stop_playtest. Provides shared-require-cache eval on the client peer for\
+-- the eval_client_runtime MCP tool.\
+\
+local ReplicatedStorage = game:GetService("ReplicatedStorage")\
+local RunService = game:GetService("RunService")\
+\
+if not RunService:IsStudio() then\
+	return\
+end\
+\
+local prevBf = ReplicatedStorage:FindFirstChild("{BRIDGE_NAMES.clientLocal}")\
+if prevBf then prevBf:Destroy() end\
+\
+local bf = Instance.new("BindableFunction")\
+bf.Name = "{BRIDGE_NAMES.clientLocal}"\
+bf.Archivable = false\
+bf.Parent = ReplicatedStorage\
+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 function setSource(scriptInst, source)
+	-- ScriptEditorService is the cleaner API and integrates with Studio's
+	-- edit history; fall back to direct Source mutation (allowed in plugin
+	-- context with PluginSecurity) if the edit service rejects the call.
+	local seOk = pcall(function()
+		ScriptEditorService:UpdateSourceAsync(scriptInst, function()
+			return source
+		end)
+	end)
+	if not seOk then
+		scriptInst.Source = source
+	end
+end
+local function findBridges()
+	local sps = getStarterPlayerScripts()
+	return {
+		server = ServerScriptService:FindFirstChild(SERVER_SCRIPT_NAME),
+		client = if sps then sps:FindFirstChild(CLIENT_SCRIPT_NAME) else nil,
+	}
+end
+local function cleanupBridges()
+	local _binding = findBridges()
+	local server = _binding.server
+	local client = _binding.client
+	if server then
+		pcall(function()
+			return server:Destroy()
+		end)
+	end
+	if client then
+		pcall(function()
+			return client:Destroy()
+		end)
+	end
+end
+local function installBridges()
+	-- Defensive: clear any stale bridges from a prior unclean exit before
+	-- inserting fresh. The injected script also self-cleans its
+	-- ReplicatedStorage/ServerScriptService children at startup, but the
+	-- containing Script/LocalScript objects themselves we must clear here.
+	cleanupBridges()
+	local ok, err = pcall(function()
+		local serverScript = Instance.new("Script")
+		serverScript.Name = SERVER_SCRIPT_NAME
+		-- Archivable=true so ExecutePlayModeAsync's deep-clone includes the
+		-- script. cleanupBridges() removes it from the edit DM when the
+		-- playtest ends.
+		setSource(serverScript, SERVER_BRIDGE_SOURCE)
+		serverScript.Parent = ServerScriptService
+		local sps = getStarterPlayerScripts()
+		if not sps then
+			error("StarterPlayer.StarterPlayerScripts not found - cannot install client eval bridge")
+		end
+		local clientScript = Instance.new("LocalScript")
+		clientScript.Name = CLIENT_SCRIPT_NAME
+		setSource(clientScript, CLIENT_BRIDGE_SOURCE)
+		clientScript.Parent = sps
+	end)
+	if not ok then
+		return {
+			installed = false,
+			error = tostring(err),
+		}
+	end
+	return {
+		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>
+        </Properties>
+      </Item>
+      <Item class="Folder" referent="5">
         <Properties>
           <string name="Name">handlers</string>
         </Properties>
-        <Item class="ModuleScript" referent="5">
+        <Item class="ModuleScript" referent="6">
           <Properties>
             <string name="Name">AssetHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1060,7 +1288,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="6">
+        <Item class="ModuleScript" referent="7">
           <Properties>
             <string name="Name">BuildHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1625,7 +1853,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="7">
+        <Item class="ModuleScript" referent="8">
           <Properties>
             <string name="Name">CaptureHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1791,7 +2019,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="8">
+        <Item class="ModuleScript" referent="9">
           <Properties>
             <string name="Name">InputHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1945,7 +2173,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="9">
+        <Item class="ModuleScript" referent="10">
           <Properties>
             <string name="Name">InstanceHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2452,7 +2680,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="10">
+        <Item class="ModuleScript" referent="11">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2911,13 +3139,56 @@ local function executeLuau(requestData)
 		table.insert(output, _arg0)
 		oldWarn(unpack(args))
 	end
+	-- Try loadstring first (preserves print/warn interception). When
+	-- ServerScriptService.LoadStringEnabled=false AND the plugin runs in a
+	-- peer where the engine respects that gate (notably the play-server DM
+	-- in some Studio configurations), loadstring either returns nil with a
+	-- "loadstring() is not available" message OR throws that same message
+	-- directly. Both paths must trigger the ModuleScript + require
+	-- fallback. The fallback can't intercept print/warn since the
+	-- ModuleScript runs in its own environment, so the output array stays
+	-- empty in that branch - the playtest log buffer already captures
+	-- prints separately via LogService.MessageOut.
+	local runViaModuleScript = function()
+		local m = Instance.new("ModuleScript")
+		m.Name = "__MCPExecLuauPayload"
+		local okSet, setErr = pcall(function()
+			m.Source = code
+		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
+			error(tostring(reqResult))
+		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(code)
 		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 here as a second-chance fallback.
+	if not success and isLoadstringUnavailable(result) then
+		success, result = pcall(runViaModuleScript)
+	end
 	env.print = oldPrint
 	env.warn = oldWarn
 	if success then
@@ -3035,7 +3306,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="11">
+        <Item class="ModuleScript" referent="12">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3287,7 +3558,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="12">
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -4314,7 +4585,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5010,7 +5281,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5018,6 +5289,10 @@ local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
 local _services = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services")
 local HttpService = _services.HttpService
 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")
@@ -5174,6 +5449,14 @@ local function startPlaytest(requestData)
 	if not injected then
 		warn(`[MCP] Failed to inject stop listener: {injErr}`)
 	end
+	-- Auto-install the game-VM eval bridges (ServerEvalBridge + ClientEvalBridge)
+	-- 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
 	if numPlayers ~= nil and mode == "run" then
 		local TestService = game:GetService("TestService")
 		TestService.NumberOfPlayers = math.clamp(numPlayers, 1, 8)
@@ -5196,12 +5479,22 @@ local function startPlaytest(requestData)
 		end
 		testRunning = false
 		cleanupStopListener()
+		cleanupBridges()
 	end)
 	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s)` else `Playtest started in {mode} mode`
-	return {
+	local response = {
 		success = true,
 		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)
 	-- Server-side routing (tools/index.ts:stopPlaytest) sends /api/stop-playtest
@@ -5307,7 +5600,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="15">
+      <Item class="ModuleScript" referent="16">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5337,11 +5630,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="16">
+      <Item class="ModuleScript" referent="17">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.8.1"
+local CURRENT_VERSION = "2.9.1"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -5433,7 +5726,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="17">
+      <Item class="ModuleScript" referent="18">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6153,7 +6446,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="18">
+      <Item class="ModuleScript" referent="19">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6683,11 +6976,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="22">
+    <Item class="Folder" referent="23">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="19">
+      <Item class="ModuleScript" referent="20">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -8761,7 +9054,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -9028,15 +9321,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="23">
+    <Item class="Folder" referent="24">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="24">
+      <Item class="Folder" referent="25">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {