@chrrxs/robloxstudio-mcp 2.8.0 → 2.9.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -154,7 +154,6 @@ local function setupClientBroker()
 		}
 		return _arg0
 	end
-	print("[MCPFork] client broker ready")
 end
 local proxyByPlayer = {}
 local function pollProxy(proxyId, player, rf)
@@ -238,7 +237,6 @@ local function registerProxy(player, rf)
 		role = assigned,
 	}
 	proxyByPlayer[_player_1] = _arg1
-	print(`[MCPFork] proxy {assigned} -> {player.Name}`)
 	task.spawn(pollProxy, proxyId, player, rf)
 end
 local function startEditProxyLoop()
@@ -246,13 +244,12 @@ local function startEditProxyLoop()
 		local proxyId = HttpService:GenerateGUID(false)
 		local ok, res = postJson("/ready", {
 			instanceId = proxyId,
-			role = "edit",
+			role = "edit-proxy",
 		})
 		if not ok or not res or not res.Success then
 			warn("[MCPFork] edit-proxy register failed")
 			return nil
 		end
-		print("[MCPFork] edit-proxy ready (stop-playtest interceptor)")
 		while true do
 			local okPoll, pollRes = pcall(function()
 				return HttpService:RequestAsync({
@@ -323,7 +320,6 @@ local function setupServerBroker()
 		table.clear(proxyByPlayer)
 	end)
 	startEditProxyLoop()
-	print("[MCPFork] server broker ready")
 end
 return {
 	MCP_URL = MCP_URL,
@@ -774,11 +770,227 @@ 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).
+-- Both scripts have Archivable=false so a user save doesn't persist them.
+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
+		serverScript.Archivable = false
+		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
+		clientScript.Archivable = false
+		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
@@ -1064,7 +1276,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
@@ -1629,7 +1841,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
@@ -1795,7 +2007,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
@@ -1949,7 +2161,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
@@ -2456,7 +2668,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
@@ -3039,7 +3251,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
@@ -3291,7 +3503,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
@@ -4318,7 +4530,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
@@ -5014,7 +5226,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
@@ -5022,6 +5234,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")
@@ -5178,6 +5394,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)
@@ -5200,39 +5424,34 @@ 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)
-	-- Stop requests are normally intercepted by the server-peer edit-proxy in
-	-- modules/ClientBroker - that proxy runs inside the play server DM, the
-	-- only DM where StudioTestService:EndTest is legal. If we reach this
-	-- handler the broker either hasn't started yet or there's no active
-	-- playtest. Try EndTest directly as a fallback (works for manually
-	-- started playtests where the server-peer plugin happens to be polling).
-	local endTest = StudioTestService
-	local endOk, endErr = pcall(function()
-		endTest:EndTest("stopped_by_mcp")
-	end)
-	if endOk then
-		local _object = {
-			success = true,
-		}
-		local _left = "output"
-		local _array = {}
-		local _length = #_array
-		table.move(outputBuffer, 1, #outputBuffer, _length + 1, _array)
-		_object[_left] = _array
-		_object.outputCount = #outputBuffer
-		_object.message = "Playtest stopped via StudioTestService."
-		return _object
-	end
+	-- Server-side routing (tools/index.ts:stopPlaytest) sends /api/stop-playtest
+	-- to the role="edit-proxy" instance whenever one is registered. This handler
+	-- is only reached when there's no edit-proxy - i.e. no active playtest, or
+	-- the play DMs haven't completed plugin auto-activation yet. Calling
+	-- StudioTestService:EndTest from the edit DM is illegal ("can only be
+	-- called from the server DataModel of a running Studio play session"), so
+	-- don't try - return a clean "no active playtest" response instead.
 	return {
-		error = `stopPlaytest fell through to edit DM (broker should have handled it). EndTest reported: {tostring(endErr)}`,
+		error = "No active playtest to stop (edit-proxy not registered).",
+		hint = "If a playtest is running, the play-server DM may not have completed plugin auto-activation yet. " .. "Wait a moment and retry, or call execute_luau target=server with StudioTestService:EndTest as a manual fallback.",
 	}
 end
 local function getPlaytestOutput(_requestData)
@@ -5326,7 +5545,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
@@ -5356,11 +5575,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.0"
+local CURRENT_VERSION = "2.9.0"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -5452,7 +5671,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
@@ -5674,7 +5893,7 @@ local function updateTabLabel(connIndex)
 end
 local function init(pluginRef)
 	local CURRENT_VERSION = State.CURRENT_VERSION
-	local screenGui = pluginRef:CreateDockWidgetPluginGuiAsync("MCPServerInterface", DockWidgetPluginGuiInfo.new(Enum.InitialDockState.Float, false, false, 300, 260, 260, 200))
+	local screenGui = pluginRef:CreateDockWidgetPluginGuiAsync("MCPServerInterface", DockWidgetPluginGuiInfo.new(Enum.InitialDockState.Float, false, true, 300, 260, 260, 200))
 	screenGui.Title = `MCP Server v{CURRENT_VERSION}`
 	local mainFrame = Instance.new("Frame")
 	mainFrame.Size = UDim2.new(1, 0, 1, 0)
@@ -6172,7 +6391,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
@@ -6702,11 +6921,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[--[[
@@ -8780,7 +8999,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)
@@ -9047,15 +9266,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({}, {

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

@@ -94,7 +94,6 @@ function setupClientBroker() {
 		}
 		return identity<ExecuteResult>({ success: false, error: tostring(result) });
 	};
-	print("[MCPFork] client broker ready");
 }
 
 const proxyByPlayer = new Map<Player, ProxyEntry>();
@@ -141,19 +140,17 @@ function registerProxy(player: Player, rf: RemoteFunction) {
 	const body = HttpService.JSONDecode(res.Body) as ReadyResponseBody;
 	const assigned = body.assignedRole ?? "client";
 	proxyByPlayer.set(player, { instanceId: proxyId, role: assigned });
-	print(`[MCPFork] proxy ${assigned} -> ${player.Name}`);
 	task.spawn(pollProxy, proxyId, player, rf);
 }
 
 function startEditProxyLoop() {
 	task.spawn(() => {
 		const proxyId = HttpService.GenerateGUID(false);
-		const [ok, res] = postJson("/ready", { instanceId: proxyId, role: "edit" });
+		const [ok, res] = postJson("/ready", { instanceId: proxyId, role: "edit-proxy" });
 		if (!ok || !res || !res.Success) {
 			warn("[MCPFork] edit-proxy register failed");
 			return;
 		}
-		print("[MCPFork] edit-proxy ready (stop-playtest interceptor)");
 		while (true) {
 			const [okPoll, pollRes] = pcall(() =>
 				HttpService.RequestAsync({
@@ -210,7 +207,6 @@ function setupServerBroker() {
 		proxyByPlayer.clear();
 	});
 	startEditProxyLoop();
-	print("[MCPFork] server broker ready");
 }
 
 export = {