@chrrxs/robloxstudio-mcp 3.1.6 → 3.2.0

package/studio-plugin/MCPPlugin.rbxmx

@@ -17,6 +17,7 @@ local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
 local StudioWebSocket = TS.import(script, script, "modules", "StudioWebSocket")
+local PluginSession = TS.import(script, script, "modules", "PluginSession")
 local BreakpointHandlers = TS.import(script, script, "modules", "handlers", "BreakpointHandlers")
 local RenderMonitor = TS.import(script, script, "modules", "RenderMonitor")
 -- Track render-loop liveness so input/screenshot tools can report "window
@@ -33,6 +34,14 @@ RuntimeLogBuffer.install()
 StopPlayMonitor.init(plugin)
 BreakpointHandlers.init(plugin)
 ServerUrlSettings.init(plugin)
+-- Before anything reads place keys: an edit session removes MCP attributes
+-- that older plugin versions saved into the place, and hands its topology to
+-- playtest DataModels through plugin settings instead.
+PluginSession.init(plugin, {
+	getServerUrl = function()
+		return State.getActiveConnection().serverUrl
+	end,
+})
 local startupRole = ClientBroker.forkRole()
 local function applyRememberedServerUrl()
 	if startupRole == "client" then
@@ -111,14 +120,22 @@ local function autoActivatePeer()
 			warn(`[robloxstudio-mcp] Runtime eval bridge install failed: {result.error}`)
 		end
 	end
+	if role == "server" then
+		-- Yields until this playtest server knows which edit session (or
+		-- multiplayer group) it belongs to, so it registers under that identity.
+		PluginSession.resolveRuntimeTopology()
+	end
 	if role == "edit" or role == "server" then
 		local activationOk, activationError = pcall(function()
 			local conn = State.getActiveConnection()
 			if not conn.isActive then
 				if role == "server" then
-					local _condition = ServerUrlSettings.readServerUrl()
+					local _condition = PluginSession.getInheritedServerUrl()
 					if _condition == nil then
-						_condition = ClientBroker.DEFAULT_MCP_URL
+						_condition = ServerUrlSettings.readServerUrl()
+						if _condition == nil then
+							_condition = ClientBroker.DEFAULT_MCP_URL
+						end
 					end
 					local inheritedServerUrl = _condition
 					conn.serverUrl = ServerUrlSettings.normalizeServerUrl(inheritedServerUrl)
@@ -1942,9 +1959,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.1.6" is replaced with the package version at package time
+	-- "3.2.0" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-3.1.6`
+	return `{tostring(h)}-3.2.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -2549,13 +2566,12 @@ return {
 local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
 local Utils = TS.import(script, script.Parent.Parent, "Utils")
 local PeerRole = TS.import(script, script.Parent.Parent, "PeerRole")
+local PluginSession = TS.import(script, script.Parent.Parent, "PluginSession")
 local _binding = Utils
 local getInstanceByPath = _binding.getInstanceByPath
 local HttpService = game:GetService("HttpService")
-local ServerStorage = game:GetService("ServerStorage")
 local LOG_PREFIX = "Breakpoint"
 local REGISTRY_KEY_PREFIX = "MCP_BREAKPOINTS_V1_"
-local MCP_PLACE_ID_ATTRIBUTE = "__MCPPlaceId"
 local pluginRef
 local loadedRegistryKey
 local loadedRegistryFromSettings = false
@@ -2566,20 +2582,6 @@ end
 local function breakpointKey(scriptPath, line)
 	return `{scriptPath}:{line}`
 end
-local function computePlaceKey()
-	if game.PlaceId ~= 0 then
-		return `place:{tostring(game.PlaceId)}`
-	end
-	local existing = ServerStorage:GetAttribute(MCP_PLACE_ID_ATTRIBUTE)
-	if type(existing) == "string" and existing ~= "" then
-		return `anon:{existing}`
-	end
-	local fresh = HttpService:GenerateGUID(false)
-	pcall(function()
-		return ServerStorage:SetAttribute(MCP_PLACE_ID_ATTRIBUTE, fresh)
-	end)
-	return `anon:{fresh}`
-end
 local function detectRole()
 	return PeerRole.detect()
 end
@@ -2592,10 +2594,11 @@ local function requestedRole(requestData)
 	return if _condition then requestData.__mcp_target_role else detectRole()
 end
 local function registryScope(requestData)
-	local placeKey = computePlaceKey()
 	local role = requestedRole(requestData)
+	local legacyPlaceKey = PluginSession.getLegacyPlaceKey()
 	return {
-		key = `{REGISTRY_KEY_PREFIX}{placeKey}:{role}`,
+		key = `{REGISTRY_KEY_PREFIX}{PluginSession.getPlaceKey()}:{role}`,
+		legacyKey = if legacyPlaceKey ~= nil then `{REGISTRY_KEY_PREFIX}{legacyPlaceKey}:{role}` else nil,
 	}
 end
 local function readSetting(key)
@@ -2654,7 +2657,11 @@ local function loadRegistry(requestData)
 		return scope
 	end
 	loadedRegistryFromSettings = true
-	local stored = readSetting(scope.key)
+	local _condition = readSetting(scope.key)
+	if _condition == nil then
+		_condition = (if scope.legacyKey ~= nil then readSetting(scope.legacyKey) else nil)
+	end
+	local stored = _condition
 	if stored == nil then
 		return scope
 	end
@@ -5474,6 +5481,18 @@ local function captureMicroProfiler(requestData)
 	local threadIds = session:FetchThreadIds() or {}
 	local frameMin = session:GetFrameIdMin()
 	local frameMax = session:GetFrameIdMax()
+	-- Frame IDs start at 1. Studio cuts a frame only when it renders, so a capture
+	-- without frames means nothing was drawn, not that the workload was idle.
+	if frameMax <= 0 then
+		session:Dispose()
+		return {
+			error = "micro_profiler_no_frames",
+			message = "Studio rendered no frames during the capture, so MicroProfiler recorded no data. Studio draws frames only while its window can be displayed, which stops when the display turns off (for example after the power-saving timeout) or Studio is minimized. Wake the display or restore Studio, then retry.",
+			duration_ms = durationMs,
+			buffer_bytes = buffer.len(snapshot),
+			backend = backend,
+		}
+	end
 	local startFrame = math.max(frameMin, frameMax - frameWindow + 1)
 	local framesConsidered = if frameMax >= startFrame then frameMax - startFrame + 1 else 0
 	local groupCache = {}
@@ -9033,15 +9052,15 @@ local function startPlaytest(requestData)
 		}
 	end
 	testRunning = true
-	local topologyMarkerToken = PluginSession.prepareSharedTopology()
+	local preparedTest = PluginSession.prepareSoloTest()
 	task.spawn(function()
 		local ok, result = pcall(function()
 			if mode == "play" then
-				return StudioTestService:ExecutePlayModeAsync({})
+				return StudioTestService:ExecutePlayModeAsync(preparedTest.testArgs)
 			end
-			return StudioTestService:ExecuteRunModeAsync({})
+			return StudioTestService:ExecuteRunModeAsync(preparedTest.testArgs)
 		end)
-		PluginSession.clearTopologyMarker(topologyMarkerToken)
+		PluginSession.finishTest(preparedTest.token)
 		if not ok then
 			warn(`[robloxstudio-mcp] Playtest ended with error: {result}`)
 		end
@@ -9159,13 +9178,13 @@ local function multiplayerTestStart(requestData)
 		testArgs = testArgs,
 		startedAt = tick(),
 	}
-	local topologyMarkerToken = PluginSession.prepareMultiplayerTopology(testId)
+	local topologyToken = PluginSession.prepareMultiplayerTest(testId)
 	task.spawn(function()
 		multiplayerState.phase = "running"
 		local ok, result = pcall(function()
 			return StudioTestService:ExecuteMultiplayerTestAsync(numPlayers, testArgs)
 		end)
-		PluginSession.clearTopologyMarker(topologyMarkerToken)
+		PluginSession.finishTest(topologyToken)
 		multiplayerState.completedAt = tick()
 		multiplayerState.ok = ok
 		if ok then
@@ -9868,6 +9887,187 @@ return {
         </Properties>
       </Item>
       <Item class="ModuleScript" referent="29">
+        <Properties>
+          <string name="Name">PlaytestTickets</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local TS = require(script.Parent.Parent.include.RuntimeLib)
+local HttpService = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services").HttpService
+-- Hands topology from an edit DataModel to the runtime DataModels of its
+-- playtest through plugin settings, so nothing MCP-owned has to be saved into
+-- the place that Studio copies. Plugin settings are one store shared by every
+-- Studio window running this plugin, and a window can silently overwrite
+-- another window's write. Tickets are therefore re-published on a heartbeat and
+-- ignored once that heartbeat stops.
+local BOARD_KEY = "MCP_PLAYTEST_TICKETS_V1"
+local CLAIM_KEY_PREFIX = "MCP_PLAYTEST_CLAIM_V1_"
+local STALE_AFTER_MS = 5_000
+local function nowMs()
+	return DateTime.now().UnixTimestampMillis
+end
+local function readSetting(store, key)
+	local ok, value = pcall(function()
+		return store:GetSetting(key)
+	end)
+	return if ok then value else nil
+end
+local function writeSetting(store, key, value)
+	pcall(function()
+		return store:SetSetting(key, value)
+	end)
+end
+local function optionalString(value)
+	local _value = value
+	local _condition = type(_value) == "string"
+	if _condition then
+		_condition = value ~= ""
+	end
+	return if _condition then value else nil
+end
+local function decodeTicket(value)
+	local _value = value
+	if not (type(_value) == "table") then
+		return nil
+	end
+	local data = value
+	local id = data.id
+	local placeId = data.placeId
+	local placeKey = data.placeKey
+	local dataModelName = data.dataModelName
+	local postedAt = data.postedAt
+	local heartbeatAt = data.heartbeatAt
+	if not (type(id) == "string") or id == "" then
+		return nil
+	end
+	if not (type(placeId) == "number") or not (type(placeKey) == "string") or not (type(dataModelName) == "string") then
+		return nil
+	end
+	if not (type(postedAt) == "number") or not (type(heartbeatAt) == "number") then
+		return nil
+	end
+	local instanceId = optionalString(data.instanceId)
+	local groupId = optionalString(data.groupId)
+	if instanceId == nil and groupId == nil then
+		return nil
+	end
+	return {
+		id = id,
+		instanceId = instanceId,
+		groupId = groupId,
+		placeId = placeId,
+		placeKey = placeKey,
+		dataModelName = dataModelName,
+		serverUrl = optionalString(data.serverUrl),
+		postedAt = postedAt,
+		heartbeatAt = heartbeatAt,
+	}
+end
+local function isFresh(ticket, now)
+	return math.abs(now - ticket.heartbeatAt) <= STALE_AFTER_MS
+end
+local function readBoard(store)
+	local raw = readSetting(store, BOARD_KEY)
+	if not (type(raw) == "string") then
+		return {}
+	end
+	local ok, tickets = pcall(function()
+		local decoded = HttpService:JSONDecode(raw)
+		local valid = {}
+		if not (type(decoded) == "table") then
+			return valid
+		end
+		for _, entry in decoded do
+			local ticket = decodeTicket(entry)
+			if ticket ~= nil then
+				table.insert(valid, ticket)
+			end
+		end
+		return valid
+	end)
+	return if ok then tickets else {}
+end
+local function writeBoard(store, tickets)
+	if tickets[1] == nil then
+		writeSetting(store, BOARD_KEY, nil)
+		return nil
+	end
+	local ok, encoded = pcall(function()
+		return HttpService:JSONEncode(tickets)
+	end)
+	if ok and type(encoded) == "string" then
+		writeSetting(store, BOARD_KEY, encoded)
+	end
+end
+--* Publishes or refreshes a ticket and prunes tickets whose owners stopped refreshing them. 
+local function publish(store, ticket)
+	local now = nowMs()
+	local board = {}
+	for _, existing in readBoard(store) do
+		if existing.id ~= ticket.id and isFresh(existing, now) then
+			table.insert(board, existing)
+		end
+	end
+	local _object = table.clone(ticket)
+	setmetatable(_object, nil)
+	_object.heartbeatAt = now
+	table.insert(board, _object)
+	writeBoard(store, board)
+end
+local function withdraw(store, ticketId)
+	local now = nowMs()
+	local board = {}
+	local changed = false
+	for _, existing in readBoard(store) do
+		if existing.id == ticketId or not isFresh(existing, now) then
+			changed = true
+		else
+			table.insert(board, existing)
+		end
+	end
+	if changed then
+		writeBoard(store, board)
+	end
+end
+local function liveTickets(store)
+	local now = nowMs()
+	local _exp = readBoard(store)
+	-- ▼ ReadonlyArray.filter ▼
+	local _newValue = {}
+	local _callback = function(ticket)
+		return isFresh(ticket, now)
+	end
+	local _length = 0
+	for _k, _v in _exp do
+		if _callback(_v, _k - 1, _exp) == true then
+			_length += 1
+			_newValue[_length] = _v
+		end
+	end
+	-- ▲ ReadonlyArray.filter ▲
+	return _newValue
+end
+local function readClaim(store, ticketId)
+	return optionalString(readSetting(store, CLAIM_KEY_PREFIX .. ticketId))
+end
+local function writeClaim(store, ticketId, claimant)
+	writeSetting(store, CLAIM_KEY_PREFIX .. ticketId, claimant)
+end
+local function clearClaim(store, ticketId)
+	writeSetting(store, CLAIM_KEY_PREFIX .. ticketId, nil)
+end
+return {
+	nowMs = nowMs,
+	decodeTicket = decodeTicket,
+	publish = publish,
+	withdraw = withdraw,
+	liveTickets = liveTickets,
+	readClaim = readClaim,
+	writeClaim = writeClaim,
+	clearClaim = clearClaim,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">PluginSession</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9880,101 +10080,525 @@ local ServerStorage = _services.ServerStorage
 local State = TS.import(script, script.Parent, "State")
 local PeerRole = TS.import(script, script.Parent, "PeerRole")
 local TopologyId = TS.import(script, script.Parent, "TopologyId")
+local PlaytestTickets = TS.import(script, script.Parent, "PlaytestTickets")
 local CoreGui = game:GetService("CoreGui")
-local MCP_PLACE_ID_ATTRIBUTE = "__MCPPlaceId"
+local StudioTestService = game:GetService("StudioTestService")
+local LEGACY_PLACE_ID_ATTRIBUTE = "__MCPPlaceId"
 local TOPOLOGY_MODE_ATTRIBUTE = "__MCPTopologyMode"
 local TOPOLOGY_INSTANCE_ID_ATTRIBUTE = "__MCPTopologyInstanceId"
 local TOPOLOGY_GROUP_ID_ATTRIBUTE = "__MCPTopologyGroupId"
 local TOPOLOGY_TOKEN_ATTRIBUTE = "__MCPTopologyToken"
+-- Older plugin versions saved these into places. Nothing MCP-owned belongs in a
+-- saved or published DataModel, so edit sessions remove them on load.
+local LEGACY_TOPOLOGY_ATTRIBUTES = { TOPOLOGY_MODE_ATTRIBUTE, TOPOLOGY_INSTANCE_ID_ATTRIBUTE, TOPOLOGY_GROUP_ID_ATTRIBUTE, TOPOLOGY_TOKEN_ATTRIBUTE }
 local SESSION_IDENTITY_NAME = "__MCPSessionIdentity"
+-- Attributes on the CoreGui identity value: CoreGui survives plugin reloads but
+-- is never saved with the place or copied into playtest DataModels.
+local PLAY_RECORD_ATTRIBUTE = "PlayRecord"
+local RUNTIME_TOPOLOGY_ATTRIBUTE = "RuntimeTopology"
+-- MCP-started solo and Run playtests carry their topology in StudioTestService
+-- test args, which never touch the DataModel.
+local TEST_ARGS_TOPOLOGY_KEY = "__mcpTopology"
+local TICKET_HEARTBEAT_SEC = 1
+local UNCLAIMED_TICKET_LIFETIME_MS = 120_000
+local RESOLVE_POLL_SEC = 0.25
+-- A runtime claims a ticket only after it has been the single match for this
+-- long, so a second window's Play starting at the same moment is noticed.
+local TICKET_SETTLE_SEC = 1
+local NO_TICKET_TIMEOUT_SEC = 5
+local AMBIGUOUS_TICKET_TIMEOUT_SEC = 15
+-- A prepared MCP playtest that never started (its handler died) must not stop
+-- later Play-button runs from posting tickets.
+local ARMED_PLAY_TTL_SEC = 30
+--* The edit's current playtest, kept in CoreGui so a plugin reload can finish it. 
 local peerId = TopologyId.createPeerId()
 local isEditSession = PeerRole.detect() == "edit"
 local existingSessionIdentity = CoreGui:FindFirstChild(SESSION_IDENTITY_NAME)
-local sessionInstanceId
-local createdSessionIdentity = false
+local sessionIdentity
 if existingSessionIdentity ~= nil and existingSessionIdentity:IsA("StringValue") and not existingSessionIdentity.Archivable and (string.match(existingSessionIdentity.Value, "^instance:[0-9a-z][0-9a-z][0-9a-z]%-[0-9a-z][0-9a-z][0-9a-z]$")) ~= nil then
-	sessionInstanceId = existingSessionIdentity.Value
+	sessionIdentity = existingSessionIdentity
 else
 	local _result = existingSessionIdentity
 	if _result ~= nil then
 		_result:Destroy()
 	end
-	sessionInstanceId = TopologyId.createInstanceId()
-	local sessionIdentity = Instance.new("StringValue")
+	sessionIdentity = Instance.new("StringValue")
 	sessionIdentity.Name = SESSION_IDENTITY_NAME
-	sessionIdentity.Value = sessionInstanceId
+	sessionIdentity.Value = TopologyId.createInstanceId()
 	sessionIdentity.Archivable = false
 	sessionIdentity.Parent = CoreGui
-	createdSessionIdentity = true
 end
-local inheritedInstanceId
+local sessionInstanceId = sessionIdentity.Value
+local settingsStore
+local serverUrlProvider
+local legacyPlaceKey
+local runtimeTopology
+local runtimeResolutionStarted = false
+local heartbeatTicketId
 local cachedPlaceName
 local cachedPlaceNamePlaceId
-local function getMarkerMode()
-	local mode = ReplicatedStorage:GetAttribute(TOPOLOGY_MODE_ATTRIBUTE)
-	return if mode == "shared" or mode == "multiplayer" then mode else nil
-end
 local function getInstanceId()
-	if inheritedInstanceId ~= nil then
-		return inheritedInstanceId
+	local _result = runtimeTopology
+	if _result ~= nil then
+		_result = _result.instanceId
 	end
-	if not isEditSession and getMarkerMode() == "shared" then
-		local sharedInstanceId = ReplicatedStorage:GetAttribute(TOPOLOGY_INSTANCE_ID_ATTRIBUTE)
-		if type(sharedInstanceId) == "string" and sharedInstanceId ~= "" then
-			inheritedInstanceId = sharedInstanceId
-			return sharedInstanceId
-		end
+	local _condition = _result
+	if _condition == nil then
+		_condition = sessionInstanceId
 	end
-	return sessionInstanceId
+	return _condition
 end
+local readPlayRecord
 local function getMultiplayerGroupId()
-	if getMarkerMode() ~= "multiplayer" then
-		return nil
+	if not isEditSession then
+		local _result = runtimeTopology
+		if _result ~= nil then
+			_result = _result.groupId
+		end
+		return _result
+	end
+	local _result = readPlayRecord()
+	if _result ~= nil then
+		_result = _result.ticket
+		if _result ~= nil then
+			_result = _result.groupId
+		end
 	end
-	local groupId = ReplicatedStorage:GetAttribute(TOPOLOGY_GROUP_ID_ATTRIBUTE)
-	return if type(groupId) == "string" and groupId ~= "" then groupId else nil
+	return _result
 end
 local function getPlaceKey()
+	local _inherited = runtimeTopology
+	if _inherited ~= nil then
+		_inherited = _inherited.placeKey
+	end
+	local inherited = _inherited
+	if inherited ~= nil then
+		return inherited
+	end
 	if game.PlaceId ~= 0 then
 		return `place:{tostring(game.PlaceId)}`
 	end
-	local existing = ServerStorage:GetAttribute(MCP_PLACE_ID_ATTRIBUTE)
-	if type(existing) == "string" and existing ~= "" then
-		return `anon:{existing}`
+	return `name:{game.Name}`
+end
+local function getLegacyPlaceKey()
+	return legacyPlaceKey
+end
+local function getInheritedServerUrl()
+	local _result = runtimeTopology
+	if _result ~= nil then
+		_result = _result.serverUrl
+	end
+	return _result
+end
+local function removeAttribute(target, name)
+	if target:GetAttribute(name) == nil then
+		return nil
 	end
-	local fresh = HttpService:GenerateGUID(false)
 	pcall(function()
-		return ServerStorage:SetAttribute(MCP_PLACE_ID_ATTRIBUTE, fresh)
+		return target:SetAttribute(name, nil)
+	end)
+end
+local function removeSavedSessionState()
+	local savedPlaceId = ServerStorage:GetAttribute(LEGACY_PLACE_ID_ATTRIBUTE)
+	if type(savedPlaceId) == "string" and savedPlaceId ~= "" then
+		legacyPlaceKey = `anon:{savedPlaceId}`
+	end
+	removeAttribute(ServerStorage, LEGACY_PLACE_ID_ATTRIBUTE)
+	for _, name in LEGACY_TOPOLOGY_ATTRIBUTES do
+		removeAttribute(ReplicatedStorage, name)
+	end
+end
+local function optionalString(value)
+	local _value = value
+	local _condition = type(_value) == "string"
+	if _condition then
+		_condition = value ~= ""
+	end
+	return if _condition then value else nil
+end
+function readPlayRecord()
+	local raw = sessionIdentity:GetAttribute(PLAY_RECORD_ATTRIBUTE)
+	if not (type(raw) == "string") then
+		return nil
+	end
+	local ok, decoded = pcall(function()
+		return HttpService:JSONDecode(raw)
+	end)
+	if not ok or not (type(decoded) == "table") then
+		return nil
+	end
+	local data = decoded
+	local phase = if data.phase == "armed" or data.phase == "active" then data.phase else nil
+	if phase == nil then
+		return nil
+	end
+	local armedAt = data.armedAt
+	local ticketState = data.ticketState
+	return {
+		phase = phase,
+		token = optionalString(data.token),
+		armedAt = if type(armedAt) == "number" then armedAt else nil,
+		ticket = PlaytestTickets.decodeTicket(data.ticket),
+		ticketState = if ticketState == "posted" or ticketState == "claimed" or ticketState == "expired" then ticketState else nil,
+	}
+end
+local function writePlayRecord(record)
+	if record == nil then
+		sessionIdentity:SetAttribute(PLAY_RECORD_ATTRIBUTE, nil)
+		return nil
+	end
+	local ok, encoded = pcall(function()
+		return HttpService:JSONEncode(record)
+	end)
+	if ok and type(encoded) == "string" then
+		sessionIdentity:SetAttribute(PLAY_RECORD_ATTRIBUTE, encoded)
+	end
+end
+local function createTicket(instanceId, groupId)
+	local now = PlaytestTickets.nowMs()
+	local _object = {
+		id = HttpService:GenerateGUID(false),
+		instanceId = instanceId,
+		groupId = groupId,
+		placeId = game.PlaceId,
+		placeKey = getPlaceKey(),
+		dataModelName = game.Name,
+	}
+	local _left = "serverUrl"
+	local _result = serverUrlProvider
+	if _result ~= nil then
+		_result = _result()
+	end
+	_object[_left] = _result
+	_object.postedAt = now
+	_object.heartbeatAt = now
+	return _object
+end
+local refreshTicket
+local function startTicketHeartbeat(ticketId)
+	if heartbeatTicketId == ticketId then
+		return nil
+	end
+	heartbeatTicketId = ticketId
+	task.delay(TICKET_HEARTBEAT_SEC, function()
+		return refreshTicket(ticketId)
 	end)
-	return `anon:{fresh}`
 end
-local function setTopologyMarker(mode, instanceId, groupId)
+function refreshTicket(ticketId)
+	if heartbeatTicketId ~= ticketId then
+		return nil
+	end
+	local store = settingsStore
+	local record = readPlayRecord()
+	local _ticket = record
+	if _ticket ~= nil then
+		_ticket = _ticket.ticket
+	end
+	local ticket = _ticket
+	if store == nil or record == nil or ticket == nil or ticket.id ~= ticketId or record.ticketState ~= "posted" then
+		heartbeatTicketId = nil
+		return nil
+	end
+	if PlaytestTickets.readClaim(store, ticketId) ~= nil then
+		-- Keep the claim itself until Play ends: the runtime verifies it.
+		PlaytestTickets.withdraw(store, ticketId)
+		record.ticketState = "claimed"
+		writePlayRecord(record)
+		heartbeatTicketId = nil
+		return nil
+	end
+	if PlaytestTickets.nowMs() - ticket.postedAt > UNCLAIMED_TICKET_LIFETIME_MS then
+		PlaytestTickets.withdraw(store, ticketId)
+		record.ticketState = "expired"
+		writePlayRecord(record)
+		heartbeatTicketId = nil
+		return nil
+	end
+	PlaytestTickets.publish(store, ticket)
+	task.delay(TICKET_HEARTBEAT_SEC, function()
+		return refreshTicket(ticketId)
+	end)
+end
+local function retirePlayRecord(record)
+	local store = settingsStore
+	local ticket = record.ticket
+	if store == nil or ticket == nil then
+		return nil
+	end
+	PlaytestTickets.withdraw(store, ticket.id)
+	PlaytestTickets.clearClaim(store, ticket.id)
+end
+local function beginPlay()
+	local store = settingsStore
+	if store == nil then
+		return nil
+	end
+	local record = readPlayRecord()
+	if record ~= nil then
+		if record.phase == "active" then
+			return nil
+		end
+		local _exp = os.clock()
+		local _condition = record.armedAt
+		if _condition == nil then
+			_condition = 0
+		end
+		if _exp - _condition <= ARMED_PLAY_TTL_SEC then
+			record.phase = "active"
+			writePlayRecord(record)
+			return nil
+		end
+		retirePlayRecord(record)
+	end
+	local ticket = createTicket(sessionInstanceId, nil)
+	writePlayRecord({
+		phase = "active",
+		ticket = ticket,
+		ticketState = "posted",
+	})
+	PlaytestTickets.publish(store, ticket)
+	startTicketHeartbeat(ticket.id)
+end
+local function finishPlay()
+	local record = readPlayRecord()
+	-- An armed record belongs to an MCP playtest whose Play has not begun yet.
+	if record == nil or record.phase ~= "active" then
+		return nil
+	end
+	retirePlayRecord(record)
+	writePlayRecord(nil)
+end
+local function armPlay(record)
+	local existing = readPlayRecord()
+	if existing ~= nil then
+		retirePlayRecord(existing)
+	end
+	writePlayRecord(record)
+end
+local function prepareSoloTest()
+	local token = HttpService:GenerateGUID(false)
+	armPlay({
+		phase = "armed",
+		token = token,
+		armedAt = os.clock(),
+	})
+	local _object = {
+		token = token,
+	}
+	local _left = "testArgs"
+	local _object_1 = {}
+	local _left_1 = TEST_ARGS_TOPOLOGY_KEY
+	local _object_2 = {
+		instanceId = sessionInstanceId,
+		placeKey = getPlaceKey(),
+	}
+	local _left_2 = "serverUrl"
+	local _result = serverUrlProvider
+	if _result ~= nil then
+		_result = _result()
+	end
+	_object_2[_left_2] = _result
+	_object_1[_left_1] = _object_2
+	_object[_left] = _object_1
+	return _object
+end
+--[[
+	*
+	 * Multiplayer test args belong to the user's game code, so the group reaches
+	 * the test server through a ticket instead.
+	 
+]]
+local function prepareMultiplayerTest(groupId)
 	local token = HttpService:GenerateGUID(false)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_MODE_ATTRIBUTE, nil)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_INSTANCE_ID_ATTRIBUTE, instanceId)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_GROUP_ID_ATTRIBUTE, groupId)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_TOKEN_ATTRIBUTE, token)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_MODE_ATTRIBUTE, mode)
+	local ticket = createTicket(nil, groupId)
+	armPlay({
+		phase = "armed",
+		token = token,
+		armedAt = os.clock(),
+		ticket = ticket,
+		ticketState = "posted",
+	})
+	local store = settingsStore
+	if store ~= nil then
+		PlaytestTickets.publish(store, ticket)
+		startTicketHeartbeat(ticket.id)
+	end
 	return token
 end
-local function prepareSharedTopology()
-	return setTopologyMarker("shared", sessionInstanceId, nil)
+local function finishTest(token)
+	local record = readPlayRecord()
+	if record == nil or record.token ~= token then
+		return nil
+	end
+	retirePlayRecord(record)
+	writePlayRecord(nil)
+end
+local function onEditModeChanged()
+	if StudioTestService.EditModeActive then
+		finishPlay()
+	else
+		beginPlay()
+	end
+end
+local function matchingTickets(store)
+	local samePlace = {}
+	local nameMatched = false
+	for _, ticket in PlaytestTickets.liveTickets(store) do
+		if ticket.placeId ~= game.PlaceId then
+			continue
+		end
+		local claimant = PlaytestTickets.readClaim(store, ticket.id)
+		if claimant ~= nil and claimant ~= peerId then
+			continue
+		end
+		table.insert(samePlace, ticket)
+		if ticket.dataModelName == game.Name then
+			nameMatched = true
+		end
+	end
+	-- Runtime DataModel names are expected to match their edit, but only narrow
+	-- on the name when it actually distinguishes a candidate.
+	local _result
+	if nameMatched then
+		-- ▼ ReadonlyArray.filter ▼
+		local _newValue = {}
+		local _callback = function(ticket)
+			return ticket.dataModelName == game.Name
+		end
+		local _length = 0
+		for _k, _v in samePlace do
+			if _callback(_v, _k - 1, samePlace) == true then
+				_length += 1
+				_newValue[_length] = _v
+			end
+		end
+		-- ▲ ReadonlyArray.filter ▲
+		_result = _newValue
+	else
+		_result = samePlace
+	end
+	return _result
+end
+--[[
+	*
+	 * Waits for exactly one matching ticket and claims it. Returns nothing when no
+	 * edit posts a ticket, or when several windows of the same place started Play
+	 * together: the runtime then keeps its own identity rather than guessing.
+	 
+]]
+local function claimTicket(store)
+	local startedAt = os.clock()
+	local candidateSeen = false
+	local settlingId
+	local settlingSince = 0
+	while true do
+		local now = os.clock()
+		local candidates = matchingTickets(store)
+		local first = candidates[1]
+		local only = if first ~= nil and candidates[2] == nil then first else nil
+		if first ~= nil then
+			candidateSeen = true
+		end
+		if only == nil then
+			settlingId = nil
+		elseif settlingId ~= only.id then
+			settlingId = only.id
+			settlingSince = now
+		elseif now - settlingSince >= TICKET_SETTLE_SEC then
+			PlaytestTickets.writeClaim(store, only.id, peerId)
+			task.wait(RESOLVE_POLL_SEC)
+			if PlaytestTickets.readClaim(store, only.id) == peerId then
+				return only
+			end
+			settlingId = nil
+			continue
+		end
+		local timeout = if candidateSeen then AMBIGUOUS_TICKET_TIMEOUT_SEC else NO_TICKET_TIMEOUT_SEC
+		if now - startedAt >= timeout then
+			return nil
+		end
+		task.wait(RESOLVE_POLL_SEC)
+	end
+end
+local function topologyFromTestArgs()
+	local ok, args = pcall(function()
+		return StudioTestService:GetTestArgs()
+	end)
+	if not ok or not (type(args) == "table") then
+		return nil
+	end
+	local testArgs = args
+	local envelope = testArgs[TEST_ARGS_TOPOLOGY_KEY]
+	if not (type(envelope) == "table") then
+		return nil
+	end
+	local topology = envelope
+	local instanceId = optionalString(topology.instanceId)
+	if instanceId == nil then
+		return nil
+	end
+	return {
+		instanceId = instanceId,
+		placeKey = optionalString(topology.placeKey),
+		serverUrl = optionalString(topology.serverUrl),
+	}
+end
+local function readRememberedRuntimeTopology()
+	local raw = sessionIdentity:GetAttribute(RUNTIME_TOPOLOGY_ATTRIBUTE)
+	if not (type(raw) == "string") then
+		return nil
+	end
+	local ok, decoded = pcall(function()
+		return HttpService:JSONDecode(raw)
+	end)
+	if not ok or not (type(decoded) == "table") then
+		return nil
+	end
+	local data = decoded
+	return {
+		instanceId = optionalString(data.instanceId),
+		groupId = optionalString(data.groupId),
+		placeKey = optionalString(data.placeKey),
+		serverUrl = optionalString(data.serverUrl),
+	}
 end
-local function prepareMultiplayerTopology(groupId)
-	return setTopologyMarker("multiplayer", nil, groupId)
+local function adoptRuntimeTopology(topology)
+	runtimeTopology = topology
+	local ok, encoded = pcall(function()
+		return HttpService:JSONEncode(topology)
+	end)
+	if ok and type(encoded) == "string" then
+		sessionIdentity:SetAttribute(RUNTIME_TOPOLOGY_ATTRIBUTE, encoded)
+	end
 end
-local function clearTopologyMarker(token)
-	if ReplicatedStorage:GetAttribute(TOPOLOGY_TOKEN_ATTRIBUTE) ~= token then
+--[[
+	*
+	 * Resolves which edit session this playtest server belongs to. Yields; call it
+	 * before the server peer registers with MCP.
+	 
+]]
+local function resolveRuntimeTopology()
+	if isEditSession or runtimeTopology ~= nil or runtimeResolutionStarted then
+		return nil
+	end
+	if PeerRole.detect() ~= "server" then
 		return nil
 	end
-	if isEditSession then
-		prepareSharedTopology()
+	runtimeResolutionStarted = true
+	local fromArgs = topologyFromTestArgs()
+	if fromArgs ~= nil then
+		adoptRuntimeTopology(fromArgs)
 		return nil
 	end
-	ReplicatedStorage:SetAttribute(TOPOLOGY_MODE_ATTRIBUTE, nil)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_INSTANCE_ID_ATTRIBUTE, nil)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_GROUP_ID_ATTRIBUTE, nil)
-	ReplicatedStorage:SetAttribute(TOPOLOGY_TOKEN_ATTRIBUTE, nil)
+	local store = settingsStore
+	local ticket = if store ~= nil then claimTicket(store) else nil
+	-- Record a fallback too, so a plugin reload keeps this server's own identity.
+	adoptRuntimeTopology(if ticket == nil then {} else {
+		instanceId = ticket.instanceId,
+		groupId = ticket.groupId,
+		placeKey = ticket.placeKey,
+		serverUrl = ticket.serverUrl,
+	})
 end
 local function getRole()
 	return PeerRole.detect()
@@ -10031,32 +10655,69 @@ local function createReadyPayload(readyPeerId, role, instanceId, multiplayerGrou
 		timestamp = tick(),
 	}
 end
--- CoreGui survives plugin reloads without saving or replicating this identity.
--- Preserve active test markers on reload; fresh edits replace saved place markers.
-if isEditSession then
-	if createdSessionIdentity or getMarkerMode() == nil then
-		prepareSharedTopology()
+local function resumePlayRecord()
+	local record = readPlayRecord()
+	if record == nil then
+		return nil
+	end
+	if StudioTestService.EditModeActive then
+		-- The Play ended while the plugin was reloading.
+		if record.phase == "active" then
+			finishPlay()
+		end
+	elseif record.phase == "armed" then
+		beginPlay()
+	end
+	local current = readPlayRecord()
+	local _ticket = current
+	if _ticket ~= nil then
+		_ticket = _ticket.ticket
+	end
+	local ticket = _ticket
+	local _result = current
+	if _result ~= nil then
+		_result = _result.ticketState
+	end
+	local _condition = _result == "posted"
+	if _condition then
+		_condition = ticket ~= nil
+	end
+	if _condition then
+		startTicketHeartbeat(ticket.id)
 	end
-else
-	getInstanceId()
+end
+local function init(store, options)
+	settingsStore = store
+	serverUrlProvider = options.getServerUrl
+	if not isEditSession then
+		runtimeTopology = readRememberedRuntimeTopology()
+		return nil
+	end
+	removeSavedSessionState()
+	StudioTestService:GetPropertyChangedSignal("EditModeActive"):Connect(onEditModeChanged)
+	resumePlayRecord()
 end
 return {
 	peerId = peerId,
+	init = init,
+	resolveRuntimeTopology = resolveRuntimeTopology,
 	getInstanceId = getInstanceId,
 	getMultiplayerGroupId = getMultiplayerGroupId,
 	getPlaceKey = getPlaceKey,
+	getLegacyPlaceKey = getLegacyPlaceKey,
+	getInheritedServerUrl = getInheritedServerUrl,
 	getRole = getRole,
 	getPlaceName = getPlaceName,
 	invalidatePlaceName = invalidatePlaceName,
-	prepareSharedTopology = prepareSharedTopology,
-	prepareMultiplayerTopology = prepareMultiplayerTopology,
-	clearTopologyMarker = clearTopologyMarker,
+	prepareSoloTest = prepareSoloTest,
+	finishTest = finishTest,
+	prepareMultiplayerTest = prepareMultiplayerTest,
 	createReadyPayload = createReadyPayload,
 }
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="30">
+      <Item class="ModuleScript" referent="31">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -10086,7 +10747,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="31">
+      <Item class="ModuleScript" referent="32">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -10154,7 +10815,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="32">
+      <Item class="ModuleScript" referent="33">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -10390,7 +11051,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="33">
+      <Item class="ModuleScript" referent="34">
         <Properties>
           <string name="Name">ScriptSearch</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -10717,14 +11378,12 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="34">
+      <Item class="ModuleScript" referent="35">
         <Properties>
           <string name="Name">ServerUrlSettings</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
 local TS = require(script.Parent.Parent.include.RuntimeLib)
-local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
-local HttpService = _services.HttpService
-local ServerStorage = _services.ServerStorage
+local PluginSession = TS.import(script, script.Parent, "PluginSession")
 local SETTING_KEY_PREFIX = "MCP_LAST_SUCCESSFUL_SERVER_URL_"
 local GLOBAL_SETTING_KEY = "MCP_LAST_SUCCESSFUL_SERVER_URL_GLOBAL_V1"
 local pluginRef
@@ -10764,30 +11423,12 @@ local function addUnique(values, value)
 		table.insert(_values_1, _value_1)
 	end
 end
-local function computePlaceKeys(options)
-	local placeKeys = {}
-	if game.PlaceId ~= 0 then
-		addUnique(placeKeys, `place:{tostring(game.PlaceId)}`)
-	end
-	local existing = ServerStorage:GetAttribute("__MCPPlaceId")
-	if type(existing) == "string" and existing ~= "" then
-		addUnique(placeKeys, `anon:{existing}`)
-	else
-		local _condition = game.PlaceId == 0
-		if _condition then
-			local _result = options
-			if _result ~= nil then
-				_result = _result.createAnonymous
-			end
-			_condition = _result == true
-		end
-		if _condition then
-			local fresh = HttpService:GenerateGUID(false)
-			pcall(function()
-				return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
-			end)
-			addUnique(placeKeys, `anon:{fresh}`)
-		end
+local function computePlaceKeys()
+	local placeKeys = { PluginSession.getPlaceKey() }
+	-- Unpublished places used to be keyed by a saved __MCPPlaceId attribute.
+	local legacyPlaceKey = PluginSession.getLegacyPlaceKey()
+	if legacyPlaceKey ~= nil then
+		addUnique(placeKeys, legacyPlaceKey)
 	end
 	return placeKeys
 end
@@ -10821,19 +11462,14 @@ local function rememberServerUrl(serverUrl)
 		return nil
 	end
 	writeSettingString(GLOBAL_SETTING_KEY, normalized)
-	for _, placeKey in computePlaceKeys({
-		createAnonymous = true,
-	}) do
-		writeSettingString(settingKey(placeKey), normalized)
-	end
+	writeSettingString(settingKey(PluginSession.getPlaceKey()), normalized)
 end
 local function readServerUrl()
 	if not pluginRef then
 		return nil
 	end
-	-- Reading settings should not mint a place key. Client play DataModels have
-	-- their own ServerStorage; creating a key there would not match the
-	-- edit/server place-scoped setting.
+	-- The legacy key is read only, so a place remembered by an older plugin
+	-- version keeps its server URL until the current key is written.
 	for _, placeKey in computePlaceKeys() do
 		local remembered = readSettingString(settingKey(placeKey))
 		if remembered ~= nil then
@@ -10856,11 +11492,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="35">
+      <Item class="ModuleScript" referent="36">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "3.1.6"
+local CURRENT_VERSION = "3.2.0"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
 local SENSITIVE_DIAGNOSTIC_TERMS = { "token", "authorization", "bearer", "password", "cookie", "secret" }
@@ -10998,14 +11634,14 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="36">
+      <Item class="ModuleScript" referent="37">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
 local TS = require(script.Parent.Parent.include.RuntimeLib)
--- Cross-DataModel stop_playtest signaling via plugin settings. Solo edit and
--- runtime peers share one process instanceId through PluginSession's topology
--- marker, so only the intended Studio process can consume the request.
+-- Cross-DataModel stop_playtest signaling via plugin settings. A solo play
+-- server inherits its edit's instanceId from PluginSession (test args or a
+-- plugin-settings ticket), so only the intended Studio process consumes it.
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
 local HttpService = _services.HttpService
 local RunService = _services.RunService
@@ -11284,7 +11920,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="37">
+      <Item class="ModuleScript" referent="38">
         <Properties>
           <string name="Name">StudioWebSocket</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -12408,7 +13044,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="38">
+      <Item class="ModuleScript" referent="39">
         <Properties>
           <string name="Name">TopologyId</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -12453,7 +13089,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="39">
+      <Item class="ModuleScript" referent="40">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -12978,7 +13614,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="40">
+      <Item class="ModuleScript" referent="41">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -13821,11 +14457,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="45">
+    <Item class="Folder" referent="46">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="41">
+      <Item class="ModuleScript" referent="42">
         <Properties>
           <string name="Name">LibMP</string>
           <string name="Source"><![CDATA[-- =============================================================================
@@ -170209,7 +170845,7 @@ return LibMP
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="42">
+      <Item class="ModuleScript" referent="43">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -172283,7 +172919,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="43">
+      <Item class="ModuleScript" referent="44">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -172550,15 +173186,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="46">
+    <Item class="Folder" referent="47">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="47">
+      <Item class="Folder" referent="48">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="44">
+      <Item class="ModuleScript" referent="45">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {