@chrrxs/robloxstudio-mcp 2.13.0 → 2.15.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -102,9 +102,11 @@ local RunService = _services.RunService
 local ServerStorage = _services.ServerStorage
 local RuntimeLogBuffer = TS.import(script, script.Parent, "RuntimeLogBuffer")
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
+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 LuauExec = TS.import(script, script.Parent, "LuauExec")
+local StudioTestService = game:GetService("StudioTestService")
 -- Mirror of Communication.computeInstanceId() — duplicated here because the
 -- client broker runs in the play-server DM where it can't easily import from
 -- the edit-side module, and the place identifier must match what the edit-DM
@@ -158,6 +160,7 @@ end
 -- signaling, which works regardless of MCP server state.)
 local MCP_URL = "http://localhost:58741"
 local BROKER_NAME = "__MCPClientBroker"
+local BROKER_OWNER_ATTRIBUTE = "__MCPBrokerOwner"
 -- Endpoints the server-peer broker is allowed to forward to the client peer.
 -- Each requires the client peer's plugin VM (because the buffer / require
 -- cache / etc. lives there) so the server peer alone can't satisfy them.
@@ -165,6 +168,9 @@ local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 	["/api/execute-luau"] = true,
 	["/api/get-runtime-logs"] = true,
 	["/api/get-memory-breakdown"] = true,
+	["/api/get-scene-analysis"] = true,
+	["/api/multiplayer-test-state"] = true,
+	["/api/multiplayer-test-leave-client"] = true,
 	["/api/capture-begin"] = true,
 	["/api/simulate-mouse-input"] = true,
 	["/api/simulate-keyboard-input"] = true,
@@ -246,10 +252,81 @@ local function handleGetRuntimeLogs(data)
 		filter = filter,
 	}, "client")
 end
+local function handleMultiplayerTestState()
+	local argsOk, args = pcall(function()
+		return StudioTestService:GetTestArgs()
+	end)
+	local canLeaveOk, canLeave = pcall(function()
+		return StudioTestService:CanLeaveTest()
+	end)
+	local _exp = Players:GetPlayers()
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(player)
+		return {
+			name = player.Name,
+			userId = player.UserId,
+			displayName = player.DisplayName,
+		}
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	local players = _newValue
+	table.sort(players, function(a, b)
+		return a.name < b.name
+	end)
+	return {
+		success = true,
+		peer = "client",
+		isRunning = RunService:IsRunning(),
+		isRunMode = RunService:IsRunMode(),
+		editModeActive = StudioTestService.EditModeActive,
+		testArgsOk = argsOk,
+		testArgs = if argsOk then args else nil,
+		testArgsError = if argsOk then nil else tostring(args),
+		players = players,
+		playerCount = #players,
+		localPlayer = if Players.LocalPlayer then Players.LocalPlayer.Name else nil,
+		canLeaveOk = canLeaveOk,
+		canLeave = if canLeaveOk then canLeave else false,
+		canLeaveError = if canLeaveOk then nil else tostring(canLeave),
+	}
+end
+local function handleMultiplayerTestLeaveClient()
+	local canLeaveOk, canLeave = pcall(function()
+		return StudioTestService:CanLeaveTest()
+	end)
+	if not canLeaveOk then
+		return {
+			error = tostring(canLeave),
+			canLeaveOk = false,
+		}
+	end
+	if not canLeave then
+		return {
+			error = "This client cannot leave the current test session.",
+			canLeaveOk = true,
+			canLeave = false,
+		}
+	end
+	local localPlayer = if Players.LocalPlayer then Players.LocalPlayer.Name else nil
+	task.defer(function()
+		pcall(function()
+			return StudioTestService:LeaveTest()
+		end)
+	end)
+	return {
+		success = true,
+		message = "Client leave requested.",
+		localPlayer = localPlayer,
+	}
+end
 local function setupClientBroker()
 	local rf = ReplicatedStorage:WaitForChild(BROKER_NAME, 10)
 	if not rf or not rf:IsA("RemoteFunction") then
-		warn(`[MCPFork] client: {BROKER_NAME} not found`)
+		warn(`[robloxstudio-mcp] client: {BROKER_NAME} not found`)
 		return nil
 	end
 	rf.OnClientInvoke = function(payload)
@@ -265,6 +342,15 @@ local function setupClientBroker()
 		if payload and payload.endpoint == "/api/get-memory-breakdown" then
 			return MemoryHandlers.getMemoryBreakdown(payload.data or {})
 		end
+		if payload and payload.endpoint == "/api/get-scene-analysis" then
+			return SceneAnalysisHandlers.getSceneAnalysis(payload.data or {})
+		end
+		if payload and payload.endpoint == "/api/multiplayer-test-state" then
+			return handleMultiplayerTestState()
+		end
+		if payload and payload.endpoint == "/api/multiplayer-test-leave-client" then
+			return handleMultiplayerTestLeaveClient()
+		end
 		if payload and payload.endpoint == "/api/capture-begin" then
 			return CaptureHandlers.captureBegin()
 		end
@@ -282,6 +368,7 @@ local function setupClientBroker()
 	end
 end
 local proxyByPlayer = {}
+local serverBrokerStarted = false
 local function pollProxy(proxyId, player, rf)
 	while true do
 		local _condition = player.Parent ~= nil
@@ -371,7 +458,7 @@ local function registerProxy(player, rf)
 		isRunning = RunService:IsRunning(),
 	})
 	if not ok or not res or not res.Success then
-		warn(`[MCPFork] proxy register failed for {player.Name}`)
+		warn(`[robloxstudio-mcp] proxy register failed for {player.Name}`)
 		return nil
 	end
 	local body = HttpService:JSONDecode(res.Body)
@@ -393,12 +480,20 @@ end
 -- plugin:SetSetting flag consumed by StopPlayMonitor in the play-server DM,
 -- which doesn't depend on MCP server state or peer registration at all.)
 local function setupServerBroker()
+	if serverBrokerStarted then
+		return nil
+	end
 	local rf = ReplicatedStorage:FindFirstChild(BROKER_NAME)
 	if not rf then
 		rf = Instance.new("RemoteFunction")
 		rf.Name = BROKER_NAME
 		rf.Parent = ReplicatedStorage
 	end
+	if rf:GetAttribute(BROKER_OWNER_ATTRIBUTE) ~= nil then
+		return nil
+	end
+	rf:SetAttribute(BROKER_OWNER_ATTRIBUTE, HttpService:GenerateGUID(false))
+	serverBrokerStarted = true
 	local broker = rf
 	Players.PlayerAdded:Connect(function(p)
 		return registerProxy(p, broker)
@@ -461,6 +556,7 @@ local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandler
 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")
 -- 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).
@@ -571,6 +667,11 @@ local routeMap = {
 	["/api/start-playtest"] = TestHandlers.startPlaytest,
 	["/api/stop-playtest"] = TestHandlers.stopPlaytest,
 	["/api/get-playtest-output"] = TestHandlers.getPlaytestOutput,
+	["/api/multiplayer-test-start"] = TestHandlers.multiplayerTestStart,
+	["/api/multiplayer-test-state"] = TestHandlers.multiplayerTestState,
+	["/api/multiplayer-test-add-players"] = TestHandlers.multiplayerTestAddPlayers,
+	["/api/multiplayer-test-leave-client"] = TestHandlers.multiplayerTestLeaveClient,
+	["/api/multiplayer-test-end"] = TestHandlers.multiplayerTestEnd,
 	["/api/character-navigation"] = TestHandlers.characterNavigation,
 	["/api/export-build"] = BuildHandlers.exportBuild,
 	["/api/import-build"] = BuildHandlers.importBuild,
@@ -588,6 +689,7 @@ local routeMap = {
 	["/api/export-rbxm"] = SerializationHandlers.exportRbxm,
 	["/api/import-rbxm"] = SerializationHandlers.importRbxm,
 	["/api/get-memory-breakdown"] = MemoryHandlers.getMemoryBreakdown,
+	["/api/get-scene-analysis"] = SceneAnalysisHandlers.getSceneAnalysis,
 }
 local function processRequest(request)
 	local endpoint = request.endpoint
@@ -1161,9 +1263,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.13.0" is replaced with the package version at package time
+	-- "2.15.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.13.0`
+	return `{tostring(h)}-2.15.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -4975,6 +5077,255 @@ return {
           </Properties>
         </Item>
         <Item class="ModuleScript" referent="16">
+          <Properties>
+            <string name="Name">SceneAnalysisHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local MODE_CONFIGS = {
+	instance_composition = {
+		method = "GetInstanceCompositionAsync",
+		query = function(service)
+			return service:GetInstanceCompositionAsync()
+		end,
+	},
+	script_memory = {
+		method = "GetScriptMemoryAsync",
+		query = function(service)
+			return service:GetScriptMemoryAsync()
+		end,
+	},
+	unparented_instances = {
+		method = "GetUnparentedInstancesAsync",
+		query = function(service)
+			return service:GetUnparentedInstancesAsync()
+		end,
+	},
+	triangle_composition = {
+		method = "GetTriangleCompositionAsync",
+		query = function(service)
+			return service:GetTriangleCompositionAsync()
+		end,
+		sortByTriangles = true,
+	},
+	animation_memory = {
+		method = "GetAnimationMemoryAsync",
+		query = function(service)
+			return service:GetAnimationMemoryAsync()
+		end,
+	},
+	audio_memory = {
+		method = "GetAudioMemoryAsync",
+		query = function(service)
+			return service:GetAudioMemoryAsync()
+		end,
+	},
+}
+local ALL_MODES = { "instance_composition", "script_memory", "unparented_instances", "triangle_composition", "animation_memory", "audio_memory" }
+local function betaDisabledError()
+	return {
+		error = "scene_analysis_not_enabled",
+		message = "SceneAnalysisService is not enabled. Enable Scene Analysis in Studio Beta Features and restart Studio.",
+		betaFeatureRequired = true,
+	}
+end
+local function isBetaDisabledError(value)
+	local _value = value
+	local _condition = type(_value) == "string"
+	if _condition then
+		_condition = (string.find(value, "SceneAnalysisService is not enabled", 1, true)) ~= nil
+	end
+	return _condition
+end
+local function getSceneAnalysisService()
+	local provider = game
+	local ok, service = pcall(function()
+		return provider:GetService("SceneAnalysisService")
+	end)
+	if not ok or not service then
+		return {
+			error = "scene_analysis_unavailable",
+			message = `SceneAnalysisService is unavailable: {tostring(service)}`,
+		}
+	end
+	return service
+end
+local function normalizeMode(mode)
+	if mode == nil or mode == "all" then
+		return "all"
+	end
+	local _mode = mode
+	local _condition = not (type(_mode) == "string")
+	if not _condition then
+		_condition = MODE_CONFIGS[mode] == nil
+	end
+	if _condition then
+		return {
+			error = "invalid_mode",
+			message = `mode must be one of: all, {table.concat(ALL_MODES, ", ")}`,
+		}
+	end
+	return mode
+end
+local function normalizeTopN(topN)
+	local _topN = topN
+	if not (type(_topN) == "number") then
+		return 10
+	end
+	return math.clamp(math.floor(topN), 1, 100)
+end
+local function countLeaves(node)
+	local children = node.Children
+	if children and #children > 0 then
+		local total = 0
+		for _, child in children do
+			total += countLeaves(child)
+		end
+		return total
+	end
+	return 1
+end
+local function flattenLeaves(node, out)
+	local children = node.Children
+	if children and #children > 0 then
+		for _, child in children do
+			flattenLeaves(child, out)
+		end
+		return nil
+	end
+	local _out = out
+	local _node = node
+	table.insert(_out, _node)
+end
+local function compactEntry(node)
+	local entry = {
+		name = node.Name,
+	}
+	if node.Size ~= nil then
+		entry.size = node.Size
+	end
+	if node.Sizes ~= nil then
+		entry.sizes = node.Sizes
+	end
+	if node.AssetId ~= nil then
+		entry.asset_id = node.AssetId
+	end
+	return entry
+end
+local function compactRoot(node, leafCount)
+	local children = node.Children
+	local root = {
+		name = node.Name,
+		child_count = if children then #children else 0,
+		leaf_count = leafCount,
+	}
+	if node.Size ~= nil then
+		root.size = node.Size
+	end
+	if node.Sizes ~= nil then
+		root.sizes = node.Sizes
+	end
+	return root
+end
+local function metric(node, sortByTriangles)
+	if sortByTriangles then
+		local sizes = node.Sizes
+		local triangles = if sizes then sizes.Triangles else nil
+		local _condition = triangles
+		if _condition == nil then
+			_condition = 0
+		end
+		return _condition
+	end
+	local _condition = node.Size
+	if _condition == nil then
+		_condition = 0
+	end
+	return _condition
+end
+local function summarizeMode(mode, config, service, topN, raw)
+	local started = os.clock()
+	local ok, result = pcall(function()
+		return config.query(service)
+	end)
+	local elapsedMs = math.floor((os.clock() - started) * 1000)
+	if not ok then
+		if isBetaDisabledError(result) then
+			return betaDisabledError()
+		end
+		return {
+			error = "scene_analysis_query_failed",
+			mode = mode,
+			method = config.method,
+			message = tostring(result),
+		}
+	end
+	local tree = result
+	local leaves = {}
+	flattenLeaves(tree, leaves)
+	table.sort(leaves, function(a, b)
+		return metric(a, config.sortByTriangles == true) > metric(b, config.sortByTriangles == true)
+	end)
+	local top = {}
+	do
+		local i = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i < math.min(topN, #leaves)) then
+				break
+			end
+			local _arg0 = compactEntry(leaves[i + 1])
+			table.insert(top, _arg0)
+		end
+	end
+	local body = {
+		mode = mode,
+		method = config.method,
+		elapsed_ms = elapsedMs,
+		root = compactRoot(tree, #leaves),
+		top = top,
+	}
+	if raw then
+		body.tree = tree
+	end
+	return body
+end
+local function getSceneAnalysis(requestData)
+	local mode = normalizeMode(requestData.mode)
+	if not (type(mode) == "string") then
+		return mode
+	end
+	local serviceOrError = getSceneAnalysisService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	local topN = normalizeTopN(requestData.topN)
+	local raw = requestData.raw == true
+	if mode ~= "all" then
+		return summarizeMode(mode, MODE_CONFIGS[mode], service, topN, raw)
+	end
+	local body = {}
+	for _, m in ALL_MODES do
+		local result = summarizeMode(m, MODE_CONFIGS[m], service, topN, raw)
+		if result.error == "scene_analysis_not_enabled" then
+			return result
+		end
+		body[m] = result
+	end
+	return body
+end
+return {
+	getSceneAnalysis = getSceneAnalysis,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="17">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5670,7 +6021,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="17">
+        <Item class="ModuleScript" referent="18">
           <Properties>
             <string name="Name">SerializationHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5856,7 +6207,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="18">
+        <Item class="ModuleScript" referent="19">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5864,6 +6215,7 @@ 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 Players = _services.Players
 local RunService = _services.RunService
 local _EvalBridges = TS.import(script, script.Parent.Parent, "EvalBridges")
 local installBridges = _EvalBridges.installBridges
@@ -5885,6 +6237,63 @@ local testResult
 local testError
 local stopListenerScript
 local navResultCallback
+local multiplayerState = {
+	phase = "idle",
+}
+local function detectPeerRole()
+	if not RunService:IsRunning() then
+		return "edit"
+	end
+	if RunService:IsServer() then
+		return "server"
+	end
+	return "client"
+end
+local function getPlayersSnapshot()
+	local _exp = Players:GetPlayers()
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(player)
+		return {
+			name = player.Name,
+			userId = player.UserId,
+			displayName = player.DisplayName,
+		}
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	local players = _newValue
+	table.sort(players, function(a, b)
+		return a.name < b.name
+	end)
+	return players
+end
+local function cloneMultiplayerState()
+	return {
+		phase = multiplayerState.phase,
+		testId = multiplayerState.testId,
+		numPlayers = multiplayerState.numPlayers,
+		testArgs = multiplayerState.testArgs,
+		startedAt = multiplayerState.startedAt,
+		completedAt = multiplayerState.completedAt,
+		ok = multiplayerState.ok,
+		result = multiplayerState.result,
+		error = multiplayerState.error,
+	}
+end
+local function normalizeNumPlayers(value)
+	local _value = value
+	if not (type(_value) == "number") then
+		return nil
+	end
+	local n = math.floor(value)
+	if n ~= value or n < 1 or n > 8 then
+		return nil
+	end
+	return n
+end
 local function buildCommandListenerSource()
 	return `local LogService = game:GetService("LogService")\
 local PathfindingService = game:GetService("PathfindingService")\
@@ -5981,6 +6390,11 @@ local function startPlaytest(requestData)
 			error = 'mode must be "play" or "run"',
 		}
 	end
+	if numPlayers ~= nil then
+		return {
+			error = "start_playtest is single-player only. Use multiplayer_test_start for multi-client StudioTestService sessions.",
+		}
+	end
 	-- Self-heal: if testRunning is stuck true but Studio reports no active
 	-- playtest, the previous start_playtest's task.spawn was orphaned
 	-- (plugin reload mid-test, Studio entered some inconsistent state, etc).
@@ -6045,10 +6459,6 @@ local function startPlaytest(requestData)
 	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)
-	end
 	task.spawn(function()
 		local ok, result = pcall(function()
 			if mode == "play" then
@@ -6071,10 +6481,9 @@ local function startPlaytest(requestData)
 		-- clean up here, so the next manual playtest still gets them.
 		ensureBridgesInstalled()
 	end)
-	local msg = if numPlayers ~= nil then `Playtest started in {mode} mode with {numPlayers} player(s).` else `Playtest started in {mode} mode.`
 	local response = {
 		success = true,
-		message = msg,
+		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
@@ -6157,6 +6566,198 @@ local function getPlaytestOutput(_requestData)
 	_object.testError = testError
 	return _object
 end
+local function multiplayerTestStart(requestData)
+	if RunService:IsRunning() then
+		return {
+			error = "multiplayer_test_start must be called on the edit DataModel. Route with target=edit.",
+		}
+	end
+	local numPlayers = normalizeNumPlayers(requestData.numPlayers)
+	if numPlayers == nil then
+		return {
+			error = "numPlayers must be an integer from 1 to 8",
+		}
+	end
+	if multiplayerState.phase == "starting" or multiplayerState.phase == "running" then
+		return {
+			error = "A multiplayer Studio test is already running",
+			state = cloneMultiplayerState(),
+		}
+	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,
+		numPlayers = numPlayers,
+		testArgs = testArgs,
+		startedAt = tick(),
+	}
+	task.spawn(function()
+		multiplayerState.phase = "running"
+		local ok, result = pcall(function()
+			return StudioTestService:ExecuteMultiplayerTestAsync(numPlayers, testArgs)
+		end)
+		multiplayerState.completedAt = tick()
+		multiplayerState.ok = ok
+		if ok then
+			multiplayerState.phase = "completed"
+			multiplayerState.result = result
+			multiplayerState.error = nil
+		else
+			multiplayerState.phase = "failed"
+			multiplayerState.result = nil
+			multiplayerState.error = tostring(result)
+		end
+		ensureBridgesInstalled()
+	end)
+	local response = {
+		success = true,
+		message = `Multiplayer Studio test starting with {numPlayers} player(s).`,
+		testId = testId,
+		phase = multiplayerState.phase,
+		numPlayers = numPlayers,
+		testArgs = testArgs,
+	}
+	if not bridgeInstall.installed then
+		response.evalBridgesError = bridgeInstall.error
+	end
+	return response
+end
+local function multiplayerTestState(_requestData)
+	local peer = detectPeerRole()
+	local response = {
+		success = true,
+		peer = peer,
+		isRunning = RunService:IsRunning(),
+		isRunMode = RunService:IsRunMode(),
+		editModeActive = StudioTestService.EditModeActive,
+	}
+	if peer == "edit" then
+		response.session = cloneMultiplayerState()
+		return response
+	end
+	local argsOk, args = pcall(function()
+		return StudioTestService:GetTestArgs()
+	end)
+	response.testArgsOk = argsOk
+	response.testArgs = if argsOk then args else nil
+	if not argsOk then
+		response.testArgsError = tostring(args)
+	end
+	local players = getPlayersSnapshot()
+	response.players = players
+	response.playerCount = #players
+	if peer == "client" then
+		response.localPlayer = if Players.LocalPlayer then Players.LocalPlayer.Name else nil
+		local canLeaveOk, canLeave = pcall(function()
+			return StudioTestService:CanLeaveTest()
+		end)
+		response.canLeaveOk = canLeaveOk
+		response.canLeave = if canLeaveOk then canLeave else false
+		if not canLeaveOk then
+			response.canLeaveError = tostring(canLeave)
+		end
+	end
+	return response
+end
+local function multiplayerTestAddPlayers(requestData)
+	if not RunService:IsRunning() or not RunService:IsServer() then
+		return {
+			error = "multiplayer_test_add_players must be called on the running server peer. Route with target=server.",
+		}
+	end
+	local numPlayers = normalizeNumPlayers(requestData.numPlayers)
+	if numPlayers == nil then
+		return {
+			error = "numPlayers must be an integer from 1 to 8",
+		}
+	end
+	local before = #Players:GetPlayers()
+	local ok, result = pcall(function()
+		return StudioTestService:AddPlayers(numPlayers)
+	end)
+	if not ok then
+		return {
+			error = tostring(result),
+		}
+	end
+	local _exp = tick()
+	local _condition = (requestData.timeout)
+	if _condition == nil then
+		_condition = 10
+	end
+	local deadline = _exp + _condition
+	while #Players:GetPlayers() < before + numPlayers and tick() < deadline do
+		task.wait(0.1)
+	end
+	local players = getPlayersSnapshot()
+	return {
+		success = true,
+		message = `Requested {numPlayers} additional player(s).`,
+		playerCount = #players,
+		players = players,
+	}
+end
+local function multiplayerTestLeaveClient(_requestData)
+	if not RunService:IsRunning() or RunService:IsServer() then
+		return {
+			error = "multiplayer_test_leave_client must be called on a running client peer. Route with target=client-N.",
+		}
+	end
+	local canLeaveOk, canLeave = pcall(function()
+		return StudioTestService:CanLeaveTest()
+	end)
+	if not canLeaveOk then
+		return {
+			error = tostring(canLeave),
+			canLeaveOk = false,
+		}
+	end
+	if not canLeave then
+		return {
+			error = "This client cannot leave the current test session.",
+			canLeaveOk = true,
+			canLeave = false,
+		}
+	end
+	local localPlayer = if Players.LocalPlayer then Players.LocalPlayer.Name else nil
+	task.defer(function()
+		pcall(function()
+			return StudioTestService:LeaveTest()
+		end)
+	end)
+	return {
+		success = true,
+		message = "Client leave requested.",
+		localPlayer = localPlayer,
+	}
+end
+local function multiplayerTestEnd(requestData)
+	if not RunService:IsRunning() or not RunService:IsServer() then
+		return {
+			error = "multiplayer_test_end must be called on the running server peer. Route with target=server.",
+		}
+	end
+	local value = if requestData.value ~= nil then requestData.value else "ended_by_mcp"
+	local ok, result = pcall(function()
+		return StudioTestService:EndTest(value)
+	end)
+	if not ok then
+		return {
+			error = tostring(result),
+		}
+	end
+	return {
+		success = true,
+		message = "Multiplayer Studio test end requested.",
+		value = value,
+	}
+end
 local function characterNavigation(requestData)
 	if not testRunning then
 		return {
@@ -6228,13 +6829,18 @@ return {
 	startPlaytest = startPlaytest,
 	stopPlaytest = stopPlaytest,
 	getPlaytestOutput = getPlaytestOutput,
+	multiplayerTestStart = multiplayerTestStart,
+	multiplayerTestState = multiplayerTestState,
+	multiplayerTestAddPlayers = multiplayerTestAddPlayers,
+	multiplayerTestLeaveClient = multiplayerTestLeaveClient,
+	multiplayerTestEnd = multiplayerTestEnd,
 	characterNavigation = characterNavigation,
 }
 ]]></string>
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="19">
+      <Item class="ModuleScript" referent="20">
         <Properties>
           <string name="Name">LuauExec</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6552,7 +7158,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="20">
+      <Item class="ModuleScript" referent="21">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6582,7 +7188,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="22">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6650,7 +7256,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6831,11 +7437,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.13.0"
+local CURRENT_VERSION = "2.15.0"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
 local activeTabIndex = 0
@@ -6927,7 +7533,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7072,7 +7678,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7823,7 +8429,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8353,11 +8959,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="30">
+    <Item class="Folder" referent="31">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -10431,7 +11037,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="28">
+      <Item class="ModuleScript" referent="29">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -10698,15 +11304,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="31">
+    <Item class="Folder" referent="32">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="32">
+      <Item class="Folder" referent="33">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="29">
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {