@chrrxs/robloxstudio-mcp 2.15.1 → 2.16.0

package/studio-plugin/MCPPlugin.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://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", 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 Integration")
+	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,
+	})
+	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()
@@ -105,6 +125,7 @@ local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandl
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
 local CaptureHandlers = TS.import(script, script.Parent, "handlers", "CaptureHandlers")
 local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandlers")
+local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
 local LuauExec = TS.import(script, script.Parent, "LuauExec")
 local State = TS.import(script, script.Parent, "State")
 local StudioTestService = game:GetService("StudioTestService")
@@ -167,6 +188,7 @@ local BROKER_OWNER_ATTRIBUTE = "__MCPBrokerOwner"
 -- cache / etc. lives there) so the server peer alone can't satisfy them.
 local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 	["/api/execute-luau"] = true,
+	["/api/eval-runtime"] = true,
 	["/api/get-runtime-logs"] = true,
 	["/api/get-memory-breakdown"] = true,
 	["/api/get-scene-analysis"] = true,
@@ -247,8 +269,8 @@ local function handleGetRuntimeLogs(data)
 	local since = d.since
 	local tail = d.tail
 	local filter = d.filter
-	-- "client" is the generic peer tag; MCP-side aggregator overrides with
-	-- the specific role (e.g. "client-1") on target=all fan-out.
+	-- "client" is the generic capture tag; MCP-side aggregation overrides it
+	-- with the specific role (e.g. "client-1") for capturedBy.
 	return RuntimeLogBuffer.query({
 		since = since,
 		tail = tail,
@@ -366,6 +388,9 @@ local function setupClientBroker()
 		if payload and payload.endpoint == "/api/execute-luau" then
 			return handleExecuteLuau(payload.data)
 		end
+		if payload and payload.endpoint == "/api/eval-runtime" then
+			return EvalRuntimeHandlers.evalRuntime(payload.data or {})
+		end
 		-- Legacy: raw execute-luau payload at the top level.
 		return handleExecuteLuau(payload)
 	end
@@ -547,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")
@@ -562,6 +587,7 @@ local LogHandlers = TS.import(script, script.Parent, "handlers", "LogHandlers")
 local SerializationHandlers = TS.import(script, script.Parent, "handlers", "SerializationHandlers")
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
+local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
 -- Per-plugin-load random GUID. Used as the /poll URL param so the server
 -- can tell our polls apart from any other plugin's polls. Not user-facing —
 -- MCP tools and the LLM operate on instanceId (the place identifier).
@@ -668,6 +694,7 @@ local routeMap = {
 	["/api/get-tagged"] = MetadataHandlers.getTagged,
 	["/api/get-selection"] = MetadataHandlers.getSelection,
 	["/api/execute-luau"] = MetadataHandlers.executeLuau,
+	["/api/eval-runtime"] = EvalRuntimeHandlers.evalRuntime,
 	["/api/undo"] = MetadataHandlers.undo,
 	["/api/redo"] = MetadataHandlers.redo,
 	["/api/bulk-set-attributes"] = MetadataHandlers.bulkSetAttributes,
@@ -1049,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.
@@ -1181,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")
@@ -1242,9 +1247,10 @@ bf.Archivable = false\
 bf.Parent = ServerScriptService\
 bf.OnInvoke = function(payload)\
 	if typeof(payload) ~= "Instance" or not payload:IsA("ModuleScript") then\
-		return false, "payload must be a ModuleScript instance"\
+		return \{ ok = false, value = "payload must be a ModuleScript instance" \}\
 	end\
-	return pcall(require, payload)\
+	local ok, value = pcall(require, payload)\
+	return \{ ok = ok, value = value \}\
 end\
 `
 local CLIENT_BRIDGE_SOURCE = `\
@@ -1268,18 +1274,17 @@ 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"\
+		return \{ ok = false, value = "payload must be a ModuleScript instance" \}\
 	end\
-	return pcall(require, payload)\
+	local ok, value = pcall(require, payload)\
+	return \{ ok = ok, value = value \}\
 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}`
@@ -1287,9 +1292,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.15.1" 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.1`
+	return `{tostring(h)}-2.16.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1305,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
@@ -1327,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 playerScripts
+end
+local function clientRuntimeBridgeReady()
+	local playerScripts = getPlayerScripts()
+	if not playerScripts then
+		return false
 	end
-	return installBridges()
+	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
-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 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 {
@@ -1386,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>
@@ -2466,6 +2518,160 @@ return {
           </Properties>
         </Item>
         <Item class="ModuleScript" referent="9">
+          <Properties>
+            <string name="Name">EvalRuntimeHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
+local _services = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services")
+local LogService = _services.LogService
+local ReplicatedStorage = _services.ReplicatedStorage
+local RunService = _services.RunService
+local ServerScriptService = _services.ServerScriptService
+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 {
+			error = "eval_*_runtime requires a running playtest.",
+		}
+	end
+	if RunService:IsServer() then
+		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 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 in the runtime client peer, including for manually-started playtests.",
+	}
+end
+local function evalRuntime(requestData)
+	local code = requestData.code
+	if not (code ~= "" and code) or code == "" then
+		return {
+			error = "Code is required",
+		}
+	end
+	local config = getBridgeConfig()
+	if config.error ~= nil then
+		return {
+			bridge = "missing",
+			error = config.error,
+		}
+	end
+	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} Runtime bridge was installed but did not become ready.`,
+		}
+	end
+	local m = Instance.new("ModuleScript")
+	m.Name = PAYLOAD_INSTANCE_NAME
+	local userLines = LuauExec.countLines(code)
+	local wrapped = LuauExec.buildWrapper(code, PAYLOAD_INSTANCE_NAME)
+	local okSet, setErr = pcall(function()
+		m.Source = wrapped
+	end)
+	if not okSet then
+		m:Destroy()
+		return {
+			bridge = "ok",
+			ok = false,
+			error = `ModuleScript Source set failed: {tostring(setErr)}`,
+		}
+	end
+	m.Parent = game:GetService("Workspace")
+	local historyStart = #LogService:GetLogHistory()
+	local invokeOk, invokeResult = pcall(function()
+		return bridge:Invoke(m)
+	end)
+	m:Destroy()
+	if not invokeOk then
+		return {
+			bridge = "ok",
+			ok = false,
+			error = tostring(invokeResult),
+		}
+	end
+	if not (type(invokeResult) == "table") then
+		return {
+			bridge = "ok",
+			ok = false,
+			error = `Eval bridge returned invalid result: {tostring(invokeResult)}`,
+		}
+	end
+	local bridgeResult = invokeResult
+	if bridgeResult.ok ~= true then
+		return {
+			bridge = "ok",
+			ok = false,
+			error = LuauExec.recoverPayloadRequireError(bridgeResult.value, userLines, PAYLOAD_INSTANCE_NAME, historyStart),
+		}
+	end
+	local inner = bridgeResult.value
+	if not (type(inner) == "table") then
+		return {
+			bridge = "ok",
+			ok = true,
+			result = if inner == nil then nil else LuauExec.formatReturnValue(inner),
+		}
+	end
+	local r = inner
+	local ok = r.ok == true
+	local _object = {
+		bridge = "ok",
+		ok = ok,
+		result = if ok and r.value ~= nil then LuauExec.formatReturnValue(r.value) else nil,
+		error = if not ok then tostring(r.value) else nil,
+	}
+	local _left = "output"
+	local _condition = r.output
+	if _condition == nil then
+		_condition = {}
+	end
+	_object[_left] = _condition
+	return _object
+end
+return {
+	evalRuntime = evalRuntime,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="10">
           <Properties>
             <string name="Name">InputHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2665,7 +2871,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="10">
+        <Item class="ModuleScript" referent="11">
           <Properties>
             <string name="Name">InstanceHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3172,7 +3378,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="11">
+        <Item class="ModuleScript" referent="12">
           <Properties>
             <string name="Name">LogHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3182,16 +3388,15 @@ local function getRuntimeLogs(requestData)
 	local since = requestData.since
 	local tail = requestData.tail
 	local filter = requestData.filter
-	-- Plugin-side peer tag is generic ("edit"|"server"|"client"). The MCP-side
-	-- aggregator overrides it with the specific instance role (e.g. "client-1")
-	-- during fan-out for target=all, so this value is only authoritative for
-	-- the single-peer query path.
-	local peer = RuntimeLogBuffer.detectPeer()
+	-- This is the buffer that captured the LogService event, not necessarily
+	-- the script-origin peer. Ordinary playtests share/reflect logs across
+	-- edit/server/client LogService buffers.
+	local capturedBy = RuntimeLogBuffer.detectPeer()
 	return RuntimeLogBuffer.query({
 		since = since,
 		tail = tail,
 		filter = filter,
-	}, peer)
+	}, capturedBy)
 end
 return {
 	getRuntimeLogs = getRuntimeLogs,
@@ -3199,7 +3404,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="12">
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">MemoryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3267,7 +3472,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3806,7 +4011,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -4058,7 +4263,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="15">
+        <Item class="ModuleScript" referent="16">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5100,7 +5305,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="16">
+        <Item class="ModuleScript" referent="17">
           <Properties>
             <string name="Name">SceneAnalysisHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5349,7 +5554,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="17">
+        <Item class="ModuleScript" referent="18">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6045,7 +6250,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="18">
+        <Item class="ModuleScript" referent="19">
           <Properties>
             <string name="Name">SerializationHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6231,7 +6436,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="19">
+        <Item class="ModuleScript" referent="20">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6241,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")
@@ -6430,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 {
@@ -6475,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
@@ -6501,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)
@@ -6610,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,
@@ -6637,7 +6816,6 @@ local function multiplayerTestStart(requestData)
 			multiplayerState.result = nil
 			multiplayerState.error = tostring(result)
 		end
-		ensureBridgesInstalled()
 	end)
 	local response = {
 		success = true,
@@ -6647,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)
@@ -6864,7 +7039,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">LuauExec</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6873,10 +7048,12 @@ return {
 -- and the play-client peer (ClientBroker.handleExecuteLuau). Three things this
 -- module owns:
 --
---   1. The IIFE wrapper that captures print/warn, runs user code in xpcall,
---      and always returns { ok, value, output } so the ModuleScript itself
---      always returns exactly one value (otherwise `print("hi")` with no
---      return would fail with "Module code did not return exactly one value").
+--   1. The IIFE wrapper that captures print/warn, wraps require() so nested
+--      ModuleScript load failures can recover the real LogService diagnostic,
+--      runs user code in xpcall, and always returns { ok, value, output } so
+--      the ModuleScript itself always returns exactly one value (otherwise
+--      `print("hi")` with no return would fail with "Module code did not
+--      return exactly one value").
 --
 --   2. The loadstring-then-ModuleScript-require fallback, with the parse-error
 --      recovery hack that pulls the real diagnostic from LogService.
@@ -6894,14 +7071,14 @@ return {
 local HttpService = game:GetService("HttpService")
 local LogService = game:GetService("LogService")
 local PAYLOAD_INSTANCE_NAME = "__MCPExecLuauPayload"
-local PAYLOAD_PATH_PREFIX = `Workspace.{PAYLOAD_INSTANCE_NAME}:`
+local REQUIRE_GENERIC_ERROR = "Requested module experienced an error while loading"
 -- Number of lines the wrapper emits BEFORE the first line of user code.
 -- Used both inside the wrapper (Luau __mcp_LINE_OFFSET) and on the TS side
 -- (remapPayloadLines, for compile errors recovered from LogService) so user
 -- code errors report user-relative line numbers instead of the inflated
--- "line 23" the wrapper would otherwise expose. If you reorder buildWrapper's
--- prefix lines, update this constant — there's a self-check below.
-local WRAPPER_LINE_OFFSET = 23
+-- "line 49" the wrapper would otherwise expose. If you reorder buildWrapper's
+-- prefix lines, update this constant.
+local WRAPPER_LINE_OFFSET = 84
 -- Count source lines so the wrapper can filter traceback frames that fall
 -- outside the user code range (the wrapper's own preamble/postamble lines).
 local function countLines(s)
@@ -6926,20 +7103,31 @@ local function countLines(s)
 	end
 	return n
 end
-local function buildWrapper(code)
+local function luaPatternEscape(s)
+	local escaped = string.gsub(s, "([^%w])", "%%%1")
+	return escaped
+end
+local function buildWrapper(code, payloadInstanceName)
+	if payloadInstanceName == nil then
+		payloadInstanceName = PAYLOAD_INSTANCE_NAME
+	end
 	-- If you reorder the prefix lines below, update WRAPPER_LINE_OFFSET to
 	-- match the number of lines emitted BEFORE the ${code} substitution.
 	-- The constant is mirrored inside the wrapper (__mcp_LINE_OFFSET) and
 	-- used by remapPayloadLines on the TS side.
 	local userLines = countLines(code)
+	local payloadPattern = luaPatternEscape(payloadInstanceName)
 	return `return ((function()\
 \tlocal __mcp_traceback\
 \tlocal __mcp_remap\
 \tlocal __mcp_LINE_OFFSET = {WRAPPER_LINE_OFFSET}\
 \tlocal __mcp_USER_LINES = {userLines}\
+\tlocal __mcp_LogService = game:GetService("LogService")\
+\tlocal __mcp_REQUIRE_GENERIC = "{REQUIRE_GENERIC_ERROR}"\
 \tlocal __mcp_output = \{\}\
 \tlocal __mcp_real_print = print\
 \tlocal __mcp_real_warn = warn\
+\tlocal __mcp_real_require = require\
 \tlocal print = function(...)\
 \t\t__mcp_real_print(...)\
 \t\tlocal args = \{...\}\
@@ -6954,6 +7142,64 @@ local function buildWrapper(code)
 \t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end\
 \t\ttable.insert(__mcp_output, "[warn] " .. table.concat(parts, "\\t"))\
 \tend\
+\tlocal function __mcp_is_stack_noise(msg)\
+\t\treturn msg == "Stack Begin" or msg == "Stack End" or string.sub(msg, 1, 8) == "Script '"\
+\tend\
+\tlocal function __mcp_is_actionable_require_log(entry)\
+\t\tif not entry or entry.messageType ~= Enum.MessageType.MessageError then return false end\
+\t\tlocal msg = tostring(entry.message)\
+\t\treturn msg ~= __mcp_REQUIRE_GENERIC and not __mcp_is_stack_noise(msg)\
+\tend\
+\tlocal function __mcp_entry_mentions_module(entry, module_path)\
+\t\tif not entry or not module_path or module_path == "" then return false end\
+\t\treturn string.find(tostring(entry.message), module_path, 1, true) ~= nil\
+\tend\
+\tlocal function __mcp_prior_module_error(hist, module_path)\
+\t\tif not module_path or module_path == "" then return nil end\
+\t\tfor i = #hist, 1, -1 do\
+\t\t\tlocal entry = hist[i]\
+\t\t\tif __mcp_entry_mentions_module(entry, module_path) then\
+\t\t\t\tif __mcp_is_actionable_require_log(entry) then\
+\t\t\t\t\treturn tostring(entry.message)\
+\t\t\t\tend\
+\t\t\t\tfor j = i - 1, math.max(1, i - 6), -1 do\
+\t\t\t\t\tlocal previous = hist[j]\
+\t\t\t\t\tif __mcp_is_actionable_require_log(previous) then\
+\t\t\t\t\t\treturn tostring(previous.message)\
+\t\t\t\t\tend\
+\t\t\t\tend\
+\t\t\tend\
+\t\tend\
+\t\treturn nil\
+\tend\
+\tlocal function __mcp_recover_require_error(err, history_start, module)\
+\t\tlocal err_msg = tostring(err)\
+\t\tif err_msg ~= __mcp_REQUIRE_GENERIC then return err_msg end\
+\t\tlocal module_path\
+\t\tif typeof(module) == "Instance" then\
+\t\t\tlocal ok_path, path = pcall(function()\
+\t\t\t\treturn module:GetFullName()\
+\t\t\tend)\
+\t\t\tif ok_path then module_path = path end\
+\t\tend\
+\t\ttask.wait(0.05)\
+\t\tlocal hist = __mcp_LogService:GetLogHistory()\
+\t\tfor i = #hist, history_start + 1, -1 do\
+\t\t\tlocal entry = hist[i]\
+\t\t\tif __mcp_is_actionable_require_log(entry) then\
+\t\t\t\treturn tostring(entry.message)\
+\t\t\tend\
+\t\tend\
+\t\tlocal prior = __mcp_prior_module_error(hist, module_path)\
+\t\tif prior then return prior end\
+\t\treturn err_msg\
+\tend\
+\tlocal function require(module)\
+\t\tlocal history_start = #__mcp_LogService:GetLogHistory()\
+\t\tlocal ok, value = pcall(__mcp_real_require, module)\
+\t\tif ok then return value end\
+\t\terror(__mcp_recover_require_error(value, history_start, module), 0)\
+\tend\
 \tlocal function __mcp_run()\
 {code}\
 \tend\
@@ -6964,15 +7210,20 @@ local function buildWrapper(code)
 \t\t-- Subtract LINE_OFFSET to get the user-relative number, then clamp.\
 \t\t-- Clamping matters for unclosed constructs ("local x = (") where the\
 \t\t-- parser keeps reading into wrapper postamble and reports a payload\
-\t\t-- line past user EOF. Without clamping the message says "user_code:49"\
-\t\t-- for one-line input, framing the wrapper as user code.\
+\t\t-- line past user EOF. Without clamping, that frames wrapper postamble\
+\t\t-- as user code.\
 \t\tlocal function __mcp_user_line(payload_n)\
 \t\t\tlocal user_n = payload_n - __mcp_LINE_OFFSET\
 \t\t\tif user_n < 1 then return "1" end\
 \t\t\tif user_n > __mcp_USER_LINES then return tostring(__mcp_USER_LINES) .. " (at end of input)" end\
 \t\t\treturn tostring(user_n)\
 \t\tend\
-\t\ts = string.gsub(s, "__MCPExecLuauPayload:(%d+)", function(num)\
+\t\ts = string.gsub(s, "Workspace%.{payloadPattern}:(%d+)", function(num)\
+\t\t\tlocal n = tonumber(num)\
+\t\t\tif n then return "user_code:" .. __mcp_user_line(n) end\
+\t\t\treturn "user_code:" .. num\
+\t\tend)\
+\t\ts = string.gsub(s, "{payloadPattern}:(%d+)", function(num)\
 \t\t\tlocal n = tonumber(num)\
 \t\t\tif n then return "user_code:" .. __mcp_user_line(n) end\
 \t\t\treturn "user_code:" .. num\
@@ -7022,7 +7273,10 @@ end
 -- pulling the real compile-error diagnostic out of LogService — that error
 -- references the payload module's line number directly, and never passes
 -- through the IIFE's runtime wrapper.
-local function remapPayloadLines(s, userLines)
+local function remapPayloadLines(s, userLines, payloadInstanceName)
+	if payloadInstanceName == nil then
+		payloadInstanceName = PAYLOAD_INSTANCE_NAME
+	end
 	-- Mirror of the Lua __mcp_remap inside the wrapper, for paths that
 	-- don't pass through the IIFE (compile errors recovered from
 	-- LogService, the immediate loadstring compileError surface). Same
@@ -7040,8 +7294,9 @@ local function remapPayloadLines(s, userLines)
 		end
 		return tostring(u)
 	end
+	local payloadPattern = luaPatternEscape(payloadInstanceName)
 	local out = s
-	local a = string.gsub(out, "__MCPExecLuauPayload:(%d+)", function(num)
+	local a = string.gsub(out, `Workspace%.{payloadPattern}:(%d+)`, function(num)
 		local n = tonumber(num)
 		if n ~= nil then
 			return `user_code:{userLine(n)}`
@@ -7049,7 +7304,7 @@ local function remapPayloadLines(s, userLines)
 		return `user_code:{num}`
 	end)
 	out = a
-	local b = string.gsub(out, '%[string "[^"]+"%]:(%d+)', function(num)
+	local b = string.gsub(out, `{payloadPattern}:(%d+)`, function(num)
 		local n = tonumber(num)
 		if n ~= nil then
 			return `user_code:{userLine(n)}`
@@ -7057,8 +7312,16 @@ local function remapPayloadLines(s, userLines)
 		return `user_code:{num}`
 	end)
 	out = b
-	return out
+	local c = string.gsub(out, '%[string "[^"]+"%]:(%d+)', function(num)
+		local n = tonumber(num)
+		if n ~= nil then
+			return `user_code:{userLine(n)}`
+		end
+		return `user_code:{num}`
+	end)
+	return c
 end
+local recoverPayloadRequireError
 local function runViaModuleScript(wrapped, userLines)
 	local m = Instance.new("ModuleScript")
 	m.Name = PAYLOAD_INSTANCE_NAME
@@ -7078,26 +7341,11 @@ local function runViaModuleScript(wrapped, userLines)
 	end)
 	m:Destroy()
 	if not okReq then
-		local errMsg = tostring(reqResult)
-		-- pcall(require, m) collapses parse/compile failures into the canned
-		-- engine string. The real diagnostic was emitted to LogService on the
-		-- next engine frame — give it ~50ms to land then scan backward.
-		if errMsg == "Requested module experienced an error while loading" then
-			task.wait(0.05)
-			local hist = LogService:GetLogHistory()
-			for i = #hist - 1, 0, -1 do
-				local e = hist[i + 1]
-				if e.messageType == Enum.MessageType.MessageError and string.sub(e.message, 1, #PAYLOAD_PATH_PREFIX) == PAYLOAD_PATH_PREFIX then
-					errMsg = e.message
-					break
-				end
-			end
-		end
 		-- Compile errors reference the payload module's line number directly
 		-- — remap + clamp to user-relative line numbers so `local x = 1 +`
 		-- reports :1: instead of :23:, and reports the clamp annotation
 		-- when the parser ran off the end of user code into wrapper code.
-		error(remapPayloadLines(errMsg, userLines), 0)
+		error(recoverPayloadRequireError(reqResult, userLines, PAYLOAD_INSTANCE_NAME), 0)
 	end
 	return reqResult
 end
@@ -7124,6 +7372,44 @@ local function formatReturnValue(value)
 	end
 	return tostring(value)
 end
+function recoverPayloadRequireError(err, userLines, payloadInstanceName, historyStart)
+	if payloadInstanceName == nil then
+		payloadInstanceName = PAYLOAD_INSTANCE_NAME
+	end
+	if historyStart == nil then
+		historyStart = 0
+	end
+	local errMsg = tostring(err)
+	-- pcall(require, m) collapses parse/compile failures into the canned
+	-- engine string. The real diagnostic is emitted to LogService on the
+	-- next engine frame — give it ~50ms to land then scan backward.
+	if errMsg == REQUIRE_GENERIC_ERROR then
+		task.wait(0.05)
+		local payloadPathPrefix = `Workspace.{payloadInstanceName}:`
+		local hist = LogService:GetLogHistory()
+		local start = math.max(0, historyStart)
+		do
+			local i = #hist - 1
+			local _shouldIncrement = false
+			while true do
+				if _shouldIncrement then
+					i -= 1
+				else
+					_shouldIncrement = true
+				end
+				if not (i >= start) then
+					break
+				end
+				local e = hist[i + 1]
+				if e.messageType == Enum.MessageType.MessageError and string.sub(e.message, 1, #payloadPathPrefix) == payloadPathPrefix then
+					errMsg = e.message
+					break
+				end
+			end
+		end
+	end
+	return remapPayloadLines(errMsg, userLines, payloadInstanceName)
+end
 local function execute(code)
 	if not (code ~= "" and code) or code == "" then
 		return {
@@ -7177,12 +7463,17 @@ local function execute(code)
 	}
 end
 return {
+	buildWrapper = buildWrapper,
+	countLines = countLines,
 	execute = execute,
+	formatReturnValue = formatReturnValue,
+	recoverPayloadRequireError = recoverPayloadRequireError,
+	remapPayloadLines = remapPayloadLines,
 }
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7212,7 +7503,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7280,12 +7571,12 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
 local TS = require(script.Parent.Parent.include.RuntimeLib)
--- Per-peer in-memory ring buffer for LogService.MessageOut events.
+-- Per-capture in-memory ring buffer for LogService.MessageOut events.
 -- Powers the get_runtime_logs MCP tool. Replaces the out-of-tree LogBuffer
 -- primitives + StringValue approach from chrrxs/roblox-mcp-primitives.
 --
@@ -7295,12 +7586,12 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- DataModel. The buffer is bounded by a message-byte budget; oldest entries
 -- drop when over budget.
 --
--- Peer-tag caveat: returned entries reflect which peer's plugin CAPTURED the
+-- Capture caveat: returned entries reflect which plugin buffer CAPTURED the
 -- entry, NOT which peer's script originated the print. LogService reflects
--- prints across peers in Studio Play (a server print ends up in both the
--- server and client LogService:GetLogHistory()) and origin is empirically
--- undetectable from inside MessageOut. The MCP-side aggregator handles
--- cross-peer dedup via a 2s timestamp window.
+-- prints across peers in ordinary Studio Play (a server print can appear in
+-- server and client LogService:GetLogHistory()). The MCP-side aggregator
+-- exposes that as capturedBy, and only promotes it to origin peer in
+-- StudioTestService multiplayer sessions where peer attribution is reliable.
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
 local LogService = _services.LogService
 local RunService = _services.RunService
@@ -7364,7 +7655,7 @@ local function detectPeer()
 	end
 	return "client"
 end
-local function query(opts, peer)
+local function query(opts, capturedBy)
 	local _result
 	if opts.since ~= nil then
 		-- ▼ ReadonlyArray.filter ▼
@@ -7435,7 +7726,7 @@ local function query(opts, peer)
 	end
 	local last = if #entries > 0 then entries[#entries] else nil
 	local _object = {
-		peer = peer,
+		capturedBy = capturedBy,
 		entries = result,
 		totalDropped = totalDropped,
 	}
@@ -7461,11 +7752,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.15.1"
+local CURRENT_VERSION = "2.16.0"
 local PLUGIN_VARIANT = "main"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -7559,7 +7850,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7704,7 +7995,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8475,7 +8766,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9005,11 +9296,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="31">
+    <Item class="Folder" referent="32">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="28">
+      <Item class="ModuleScript" referent="29">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -11083,7 +11374,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="29">
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -11350,15 +11641,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="32">
+    <Item class="Folder" referent="33">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="33">
+      <Item class="Folder" referent="34">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="30">
+      <Item class="ModuleScript" referent="31">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {