@chrrxs/robloxstudio-mcp 2.15.2 → 2.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrrxs/robloxstudio-mcp",
-  "version": "2.15.2",
+  "version": "2.16.0",
   "description": "MCP server for testing, debugging, and controlling Roblox Studio from AI coding tools",
   "main": "dist/index.js",
   "type": "module",

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -10,6 +10,9 @@ 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 _EvalBridges = TS.import(script, script, "modules", "EvalBridges")
+local cleanupLegacyEditBridges = _EvalBridges.cleanupLegacyEditBridges
+local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
 local RenderMonitor = TS.import(script, script, "modules", "RenderMonitor")
@@ -30,13 +33,24 @@ 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", ICON_DISCONNECTED)
-UI.setToolbarButton(button, {
-	disconnected = ICON_DISCONNECTED,
-	connecting = ICON_CONNECTING,
-	connected = ICON_CONNECTED,
-})
+local TOOLBAR_REGISTRATION_DELAY_SECONDS = 1
+local toolbarButtonRegistered = false
+local function registerToolbarButton()
+	if toolbarButtonRegistered then
+		return nil
+	end
+	toolbarButtonRegistered = true
+	local toolbar = plugin:CreateToolbar("MCP Inspector")
+	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,
+	})
+	button.Click:Connect(function()
+		elements.screenGui.Enabled = not elements.screenGui.Enabled
+	end)
+end
 elements.connectButton.Activated:Connect(function()
 	local conn = State.getActiveConnection()
 	if conn and conn.isActive then
@@ -45,20 +59,26 @@ elements.connectButton.Activated:Connect(function()
 		Communication.activatePlugin(State.getActiveTabIndex())
 	end
 end)
-button.Click:Connect(function()
-	elements.screenGui.Enabled = not elements.screenGui.Enabled
-end)
 plugin.Unloading:Connect(function()
 	Communication.deactivateAll()
 end)
 UI.updateUIState()
 Communication.checkForUpdates()
+task.delay(TOOLBAR_REGISTRATION_DELAY_SECONDS, registerToolbarButton)
 -- Auto-activate per peer. The boshyxd plugin only registers with MCP when the
 -- user clicks Connect in its UI, but that UI is invisible in play DMs - so
 -- play peers' plugin instances load without ever registering. Run after a
 -- short delay so the UI/State have a chance to initialize first.
 task.delay(2, function()
 	local role = ClientBroker.forkRole()
+	if role == "edit" then
+		cleanupLegacyEditBridges()
+	else
+		local result = ensureRuntimeBridgeInstalled()
+		if not result.installed then
+			warn(`[MCPPlugin] Runtime eval bridge install failed: {result.error}`)
+		end
+	end
 	if role == "edit" or role == "server" then
 		pcall(function()
 			local idx = State.getActiveTabIndex()
@@ -552,7 +572,7 @@ local ServerStorage = _services.ServerStorage
 local State = TS.import(script, script.Parent, "State")
 local Utils = TS.import(script, script.Parent, "Utils")
 local UI = TS.import(script, script.Parent, "UI")
-local ensureBridgesInstalled = TS.import(script, script.Parent, "EvalBridges").ensureBridgesInstalled
+local cleanupLegacyEditBridges = TS.import(script, script.Parent, "EvalBridges").cleanupLegacyEditBridges
 local QueryHandlers = TS.import(script, script.Parent, "handlers", "QueryHandlers")
 local PropertyHandlers = TS.import(script, script.Parent, "handlers", "PropertyHandlers")
 local InstanceHandlers = TS.import(script, script.Parent, "handlers", "InstanceHandlers")
@@ -1056,18 +1076,10 @@ local function activatePlugin(connIndex)
 	-- Initial /ready; pollForRequests will also re-fire ready if the server
 	-- later reports knownInstance=false (process restart, etc).
 	sendReady(conn)
-	-- Keep the eval bridges present in the edit DM so that ANY playtest —
-	-- including one the dev starts manually via the Studio Play button —
-	-- clones them into the play DMs and eval_*_runtime works with no setup
-	-- roundtrip. Only the edit DM installs; play DMs already have the cloned
-	-- copies. Idempotent, so reconnects don't re-dirty the place.
+	-- Remove legacy edit-mode eval bridge scripts from older plugin builds.
+	-- Current bridges are created only in running play DataModels.
 	if not RunService:IsRunning() then
-		task.spawn(function()
-			local result = ensureBridgesInstalled()
-			if not result.installed then
-				warn(`[MCPPlugin] Eval bridge install failed: {result.error}`)
-			end
-		end)
+		task.spawn(cleanupLegacyEditBridges)
 	end
 	-- Watch for game.Name updates so a stale "Place1" captured at first
 	-- /ready gets refreshed once Studio settles on the real DM name.
@@ -1188,29 +1200,15 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- ServerScriptService.LoadStringEnabled, so eval_server_runtime works even
 -- when LoadStringEnabled=false (the default in fresh places).
 --
--- Lifecycle: the bridges live PERMANENTLY in the edit DM. Communication
--- installs them (ensureBridgesInstalled) when the plugin connects in edit,
--- and TestHandlers.startPlaytest force-refreshes them right before
--- ExecutePlayModeAsync. ExecutePlayModeAsync clones the DataModel into the
--- play DMs, so the scripts come along and run there. We keep them in the edit
--- DM after a playtest ends (rather than cleaning up) so that a playtest the
--- dev starts MANUALLY via the Studio Play button — not the MCP start_playtest
--- tool — also gets the bridges cloned in. This is intentionally a little
--- intrusive (two helper scripts visible in Explorer) in exchange for a
--- zero-roundtrip eval_*_runtime experience for devs working 1:1 with an agent.
---
--- 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).
+-- Lifecycle: bridge scripts are created only in running play DataModels.
+-- The server plugin peer creates the Script in runtime ServerScriptService;
+-- each client plugin peer creates its LocalScript in that client's
+-- PlayerScripts. Nothing is installed into the edit DataModel anymore.
+-- Runtime-created scripts disappear naturally when the playtest stops.
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
+local Players = _services.Players
+local ReplicatedStorage = _services.ReplicatedStorage
+local RunService = _services.RunService
 local ServerScriptService = _services.ServerScriptService
 local StarterPlayer = _services.StarterPlayer
 local ScriptEditorService = game:GetService("ScriptEditorService")
@@ -1283,12 +1281,10 @@ bf.OnInvoke = function(payload)\
 end\
 `
 -- Stamp written onto each installed bridge Script so we can tell whether the
--- bridge currently in the DM was produced by THIS plugin build. It's a djb2
--- hash of the actual bridge source plus the plugin version, so ANY change to
--- the source (or a version bump) yields a new stamp — which makes
--- ensureBridgesInstalled() force a refresh on the next plugin load instead of
--- keeping a stale bridge that happens to still be present (e.g. one saved into
--- the .rbxl from an older build).
+-- runtime bridge currently in the play DM was produced by THIS plugin build.
+-- It's a djb2 hash of the actual bridge source plus the plugin version, so ANY
+-- change to the source (or a version bump) yields a new stamp and triggers a
+-- runtime refresh instead of keeping a stale bridge.
 local STAMP_ATTR = "__MCPBridgeStamp"
 local function computeBridgeStamp()
 	local combined = `{SERVER_BRIDGE_SOURCE}|{CLIENT_BRIDGE_SOURCE}`
@@ -1296,9 +1292,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.15.2" is replaced with the package version at package time
+	-- "2.16.0" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.15.2`
+	return `{tostring(h)}-2.16.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1314,15 +1310,26 @@ local function setSource(scriptInst, source)
 		scriptInst.Source = source
 	end
 end
-local function findBridges()
+local function findLegacyEditBridges()
 	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 function destroyIfPresent(parent, name)
+	local existing = parent:FindFirstChild(name)
+	if existing then
+		pcall(function()
+			return existing:Destroy()
+		end)
+	end
+end
+local function cleanupLegacyEditBridges()
+	if RunService:IsRunning() then
+		return nil
+	end
+	local _binding = findLegacyEditBridges()
 	local server = _binding.server
 	local client = _binding.client
 	if server then
@@ -1336,54 +1343,79 @@ local function cleanupBridges()
 		end)
 	end
 end
--- Idempotent variant: install only if the bridge scripts aren't already
--- present in the edit DM. Used to keep the bridges always available (so a
--- playtest the dev starts manually — not via the MCP start_playtest tool —
--- still clones them into the play DMs). Cheap no-op when already installed,
--- which avoids re-dirtying the place on every plugin reconnect.
-local installBridges
-local function ensureBridgesInstalled()
-	local _binding = findBridges()
-	local server = _binding.server
-	local client = _binding.client
-	if server and client then
-		-- Both present — but only skip the reinstall if they were produced by
-		-- THIS build. A mismatched/absent stamp means a stale bridge (older
-		-- plugin, or one persisted in the saved place), so force a refresh.
-		local sStamp = server:GetAttribute(STAMP_ATTR)
-		local cStamp = client:GetAttribute(STAMP_ATTR)
-		if sStamp == BRIDGE_STAMP and cStamp == BRIDGE_STAMP then
-			return {
-				installed = true,
-			}
-		end
+local function serverRuntimeBridgeReady()
+	local scriptInst = ServerScriptService:FindFirstChild(SERVER_SCRIPT_NAME)
+	local bindable = ServerScriptService:FindFirstChild(BRIDGE_NAMES.serverLocal)
+	return scriptInst ~= nil and scriptInst:GetAttribute(STAMP_ATTR) == BRIDGE_STAMP and bindable ~= nil and bindable:IsA("BindableFunction")
+end
+local function getPlayerScripts()
+	local localPlayer = Players.LocalPlayer
+	if not localPlayer then
+		return nil
+	end
+	local playerScripts = localPlayer:FindFirstChild("PlayerScripts")
+	if not playerScripts then
+		playerScripts = localPlayer:WaitForChild("PlayerScripts", 5)
 	end
-	return installBridges()
+	return playerScripts
 end
-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 function clientRuntimeBridgeReady()
+	local playerScripts = getPlayerScripts()
+	if not playerScripts then
+		return false
+	end
+	local scriptInst = playerScripts:FindFirstChild(CLIENT_SCRIPT_NAME)
+	local bindable = ReplicatedStorage:FindFirstChild(BRIDGE_NAMES.clientLocal)
+	return scriptInst ~= nil and scriptInst:GetAttribute(STAMP_ATTR) == BRIDGE_STAMP and bindable ~= nil and bindable:IsA("BindableFunction")
+end
+local function installServerRuntimeBridge()
+	if serverRuntimeBridgeReady() then
+		return {
+			installed = true,
+		}
+	end
 	local ok, err = pcall(function()
+		destroyIfPresent(ServerScriptService, SERVER_SCRIPT_NAME)
+		destroyIfPresent(ServerScriptService, BRIDGE_NAMES.serverLocal)
 		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.
+		serverScript.Archivable = false
 		setSource(serverScript, SERVER_BRIDGE_SOURCE)
 		serverScript:SetAttribute(STAMP_ATTR, BRIDGE_STAMP)
 		serverScript.Parent = ServerScriptService
-		local sps = getStarterPlayerScripts()
-		if not sps then
-			error("StarterPlayer.StarterPlayerScripts not found - cannot install client eval bridge")
-		end
+	end)
+	if not ok then
+		return {
+			installed = false,
+			error = tostring(err),
+		}
+	end
+	return {
+		installed = true,
+	}
+end
+local function installClientRuntimeBridge()
+	if clientRuntimeBridgeReady() then
+		return {
+			installed = true,
+		}
+	end
+	local playerScripts = getPlayerScripts()
+	if not playerScripts then
+		return {
+			installed = false,
+			error = "Players.LocalPlayer.PlayerScripts not found - cannot install client eval bridge",
+		}
+	end
+	local ok, err = pcall(function()
+		destroyIfPresent(playerScripts, CLIENT_SCRIPT_NAME)
+		destroyIfPresent(ReplicatedStorage, BRIDGE_NAMES.clientLocal)
 		local clientScript = Instance.new("LocalScript")
 		clientScript.Name = CLIENT_SCRIPT_NAME
+		clientScript.Archivable = false
 		setSource(clientScript, CLIENT_BRIDGE_SOURCE)
 		clientScript:SetAttribute(STAMP_ATTR, BRIDGE_STAMP)
-		clientScript.Parent = sps
+		clientScript.Parent = playerScripts
 	end)
 	if not ok then
 		return {
@@ -1395,10 +1427,21 @@ function installBridges()
 		installed = true,
 	}
 end
+local function ensureRuntimeBridgeInstalled()
+	if not RunService:IsRunning() then
+		return {
+			installed = false,
+			error = "Eval bridges are installed only in running play DataModels",
+		}
+	end
+	if RunService:IsServer() then
+		return installServerRuntimeBridge()
+	end
+	return installClientRuntimeBridge()
+end
 return {
-	cleanupBridges = cleanupBridges,
-	ensureBridgesInstalled = ensureBridgesInstalled,
-	installBridges = installBridges,
+	cleanupLegacyEditBridges = cleanupLegacyEditBridges,
+	ensureRuntimeBridgeInstalled = ensureRuntimeBridgeInstalled,
 	BRIDGE_NAMES = BRIDGE_NAMES,
 }
 ]]></string>
@@ -2484,9 +2527,27 @@ local LogService = _services.LogService
 local ReplicatedStorage = _services.ReplicatedStorage
 local RunService = _services.RunService
 local ServerScriptService = _services.ServerScriptService
-local BRIDGE_NAMES = TS.import(script, script.Parent.Parent, "EvalBridges").BRIDGE_NAMES
+local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
+local BRIDGE_NAMES = _EvalBridges.BRIDGE_NAMES
+local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local LuauExec = TS.import(script, script.Parent.Parent, "LuauExec")
 local PAYLOAD_INSTANCE_NAME = "__MCPEvalPayload"
+local function findBridge(config)
+	local bridge = config.service:FindFirstChild(config.bridgeName)
+	return if bridge and bridge:IsA("BindableFunction") then bridge else nil
+end
+local function waitForBridge(config, timeoutSec)
+	if timeoutSec == nil then
+		timeoutSec = 2
+	end
+	local deadline = tick() + timeoutSec
+	local bridge = findBridge(config)
+	while not bridge and tick() < deadline do
+		task.wait(0.05)
+		bridge = findBridge(config)
+	end
+	return bridge
+end
 local function getBridgeConfig()
 	if not RunService:IsRunning() then
 		return {
@@ -2497,13 +2558,13 @@ local function getBridgeConfig()
 		return {
 			service = ServerScriptService,
 			bridgeName = BRIDGE_NAMES.serverLocal,
-			missingError = "ServerEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+			missingError = "ServerEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime server peer, including for manually-started playtests.",
 		}
 	end
 	return {
 		service = ReplicatedStorage,
 		bridgeName = BRIDGE_NAMES.clientLocal,
-		missingError = "ClientEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+		missingError = "ClientEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime client peer, including for manually-started playtests.",
 	}
 end
 local function evalRuntime(requestData)
@@ -2520,11 +2581,21 @@ local function evalRuntime(requestData)
 			error = config.error,
 		}
 	end
-	local bridge = config.service:FindFirstChild(config.bridgeName)
-	if not bridge or not bridge:IsA("BindableFunction") then
+	local bridge = findBridge(config)
+	if not bridge then
+		local install = ensureRuntimeBridgeInstalled()
+		if not install.installed then
+			return {
+				bridge = "missing",
+				error = `{config.missingError} Runtime bridge install failed: {install.error}`,
+			}
+		end
+		bridge = waitForBridge(config)
+	end
+	if not bridge then
 		return {
 			bridge = "missing",
-			error = config.missingError,
+			error = `{config.missingError} Runtime bridge was installed but did not become ready.`,
 		}
 	end
 	local m = Instance.new("ModuleScript")
@@ -6375,9 +6446,6 @@ local HttpService = _services.HttpService
 local LogService = _services.LogService
 local Players = _services.Players
 local RunService = _services.RunService
-local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
-local installBridges = _EvalBridges.installBridges
-local ensureBridgesInstalled = _EvalBridges.ensureBridgesInstalled
 local StopPlayMonitor = TS.import(script, script.Parent.Parent, "StopPlayMonitor")
 local StudioTestService = game:GetService("StudioTestService")
 local ServerScriptService = game:GetService("ServerScriptService")
@@ -6564,9 +6632,8 @@ local function startPlaytest(requestData)
 			logConnection = nil
 		end
 		cleanupStopListener()
-		-- Note: eval bridges are intentionally NOT cleaned up — they live
-		-- permanently in the edit DM so manual playtests also get them. See
-		-- EvalBridges.ts lifecycle comment.
+		-- Runtime eval bridges are created by the play server/client plugin
+		-- peers and disappear with the play DataModels.
 	end
 	if testRunning then
 		return {
@@ -6609,14 +6676,6 @@ local function startPlaytest(requestData)
 	if not injected then
 		warn(`[MCP] Failed to inject stop listener: {injErr}`)
 	end
-	-- Force-refresh the game-VM eval bridges (ServerEvalBridge + ClientEvalBridge)
-	-- right before cloning so the play DMs get the current source. They also
-	-- live permanently in the edit DM (installed on connect) so manually-started
-	-- playtests get them too; here we just ensure they're fresh.
-	local bridgeInstall = installBridges()
-	if not bridgeInstall.installed then
-		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
-	end
 	task.spawn(function()
 		local ok, result = pcall(function()
 			if mode == "play" then
@@ -6635,21 +6694,11 @@ local function startPlaytest(requestData)
 		end
 		testRunning = false
 		cleanupStopListener()
-		-- Eval bridges persist in the edit DM (see EvalBridges.ts) — do not
-		-- clean up here, so the next manual playtest still gets them.
-		ensureBridgesInstalled()
 	end)
 	local response = {
 		success = true,
 		message = `Playtest started in {mode} mode.`,
 	}
-	-- Only mention eval bridges when they failed — when they're fine, the
-	-- detail is noise. eval_server_runtime / eval_client_runtime will surface
-	-- their own clear errors if the caller tries to use them after a failed
-	-- install.
-	if not bridgeInstall.installed then
-		response.evalBridgesError = bridgeInstall.error
-	end
 	return response
 end
 local function stopPlaytest(_requestData)
@@ -6744,10 +6793,6 @@ local function multiplayerTestStart(requestData)
 	end
 	local testArgs = if requestData.testArgs ~= nil then requestData.testArgs else {}
 	local testId = HttpService:GenerateGUID(false)
-	local bridgeInstall = installBridges()
-	if not bridgeInstall.installed then
-		warn(`[MCP] Eval bridge install failed: {bridgeInstall.error}`)
-	end
 	multiplayerState = {
 		phase = "starting",
 		testId = testId,
@@ -6771,7 +6816,6 @@ local function multiplayerTestStart(requestData)
 			multiplayerState.result = nil
 			multiplayerState.error = tostring(result)
 		end
-		ensureBridgesInstalled()
 	end)
 	local response = {
 		success = true,
@@ -6781,9 +6825,6 @@ local function multiplayerTestStart(requestData)
 		numPlayers = numPlayers,
 		testArgs = testArgs,
 	}
-	if not bridgeInstall.installed then
-		response.evalBridgesError = bridgeInstall.error
-	end
 	return response
 end
 local function multiplayerTestState(_requestData)
@@ -7715,7 +7756,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.15.2"
+local CURRENT_VERSION = "2.16.0"
 local PLUGIN_VARIANT = "inspector"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741