@chrrxs/robloxstudio-mcp 2.16.1 → 2.16.3

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -432,6 +432,31 @@ end
 local proxyByPlayer = {}
 local proxyRegisterFailuresByPlayer = {}
 local serverBrokerStarted = false
+local function unregisterProxy(player, entry)
+	local _condition = entry
+	if _condition == nil then
+		local _player = player
+		_condition = proxyByPlayer[_player]
+	end
+	local proxy = _condition
+	if not proxy then
+		return nil
+	end
+	local _player = player
+	proxyByPlayer[_player] = nil
+	local _player_1 = player
+	proxyRegisterFailuresByPlayer[_player_1] = nil
+	postJson("/disconnect", {
+		pluginSessionId = proxy.pluginSessionId,
+	})
+end
+local function disconnectAllProxies()
+	for player, entry in proxyByPlayer do
+		unregisterProxy(player, entry)
+	end
+	table.clear(proxyByPlayer)
+	table.clear(proxyRegisterFailuresByPlayer)
+end
 local function pollProxy(proxyId, player, rf)
 	while true do
 		local _condition = player.Parent ~= nil
@@ -442,6 +467,10 @@ local function pollProxy(proxyId, player, rf)
 		if not _condition then
 			break
 		end
+		if not RunService:IsRunning() then
+			unregisterProxy(player)
+			break
+		end
 		local ok, res = pcall(function()
 			return HttpService:RequestAsync({
 				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
@@ -575,25 +604,10 @@ local function setupServerBroker()
 		task.spawn(registerProxy, p, broker)
 	end
 	Players.PlayerRemoving:Connect(function(p)
-		local _p = p
-		local entry = proxyByPlayer[_p]
-		if entry then
-			local _p_1 = p
-			proxyByPlayer[_p_1] = nil
-			local _p_2 = p
-			proxyRegisterFailuresByPlayer[_p_2] = nil
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
+		unregisterProxy(p)
 	end)
 	game:BindToClose(function()
-		for _, entry in proxyByPlayer do
-			postJson("/disconnect", {
-				pluginSessionId = entry.pluginSessionId,
-			})
-		end
-		table.clear(proxyByPlayer)
+		disconnectAllProxies()
 	end)
 end
 return {
@@ -601,6 +615,7 @@ return {
 	DEFAULT_MCP_URL = DEFAULT_MCP_URL,
 	getServerUrl = getServerUrl,
 	setServerUrl = setServerUrl,
+	disconnectAllProxies = disconnectAllProxies,
 	forkRole = forkRole,
 	setupClientBroker = setupClientBroker,
 	setupServerBroker = setupServerBroker,
@@ -636,6 +651,7 @@ local SerializationHandlers = TS.import(script, script.Parent, "handlers", "Seri
 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")
+local ClientBroker = TS.import(script, script.Parent, "ClientBroker")
 local ServerUrlSettings = TS.import(script, script.Parent, "ServerUrlSettings")
 local HttpDiagnostics = TS.import(script, script.Parent, "HttpDiagnostics")
 -- Per-plugin-load random GUID. Used as the /poll URL param so the server
@@ -662,21 +678,24 @@ local function computeInstanceId()
 	end)
 	return `anon:{fresh}`
 end
-local instanceId = computeInstanceId()
 local assignedRole
 local duplicateInstanceRole = false
 local hasVersionMismatch = false
 local lastVersionMismatchWarningKey
+local lastReadyInstanceId
 local readyFailureLogKeys = {}
 -- Cache the published place name from MarketplaceService:GetProductInfo so
 -- /ready can carry a friendly identifier (e.g. "Natural Disasters") distinct
 -- from game.Name (the DataModel name, often "Place1" in edit). We only fetch
 -- once per plugin load; the published name doesn't change mid-session.
 local cachedPlaceName
+local cachedPlaceNamePlaceId
 local function resolvePlaceName()
-	if cachedPlaceName ~= nil then
+	if cachedPlaceName ~= nil and cachedPlaceNamePlaceId == game.PlaceId then
 		return cachedPlaceName
 	end
+	cachedPlaceName = nil
+	cachedPlaceNamePlaceId = game.PlaceId
 	if game.PlaceId == 0 then
 		cachedPlaceName = game.Name
 		return cachedPlaceName
@@ -705,6 +724,7 @@ local function detectRole()
 	end
 	return "client"
 end
+local initialRole = detectRole()
 local routeMap = {
 	["/api/file-tree"] = QueryHandlers.getFileTree,
 	["/api/search-files"] = QueryHandlers.searchFiles,
@@ -820,28 +840,36 @@ end
 -- Without this, every poll during the brief window where the server has just
 -- restarted but hasn't seen our re-ready yet would fire a duplicate /ready.
 local lastReadyPostAt = 0
--- game.Name is sometimes "Place1" at plugin-load time and only settles to
--- the real DataModel name (e.g. "Game" once playtest spawns the play DM)
--- after Studio finishes wiring things up. Re-fire /ready when it changes so
--- get_connected_instances doesn't show a stale dataModelName forever. Set
--- up once per plugin load — the connection passed in is whichever was
--- active when activatePlugin was first called.
+-- game.Name and game.PlaceId can both settle after plugin load. PlaceId also
+-- changes when an unpublished file is published while MCP is already active.
+-- Re-fire /ready so the bridge can migrate anon:<uuid> to place:<PlaceId>.
 local nameChangeConn
+local placeIdChangeConn
 local sendReady
-local function ensureNameChangeWatcher(conn)
-	if nameChangeConn then
-		return nil
+local function ensureIdentityWatcher(conn)
+	if not nameChangeConn then
+		local okSig, signal = pcall(function()
+			return game:GetPropertyChangedSignal("Name")
+		end)
+		if okSig and signal then
+			nameChangeConn = signal:Connect(function()
+				-- sendReady has its own 2s throttle, so rapid burst changes coalesce.
+				sendReady(conn)
+			end)
+		end
 	end
-	local okSig, signal = pcall(function()
-		return game:GetPropertyChangedSignal("Name")
-	end)
-	if not okSig or not signal then
-		return nil
+	if not placeIdChangeConn then
+		local okSig, signal = pcall(function()
+			return game:GetPropertyChangedSignal("PlaceId")
+		end)
+		if okSig and signal then
+			placeIdChangeConn = signal:Connect(function()
+				cachedPlaceName = nil
+				cachedPlaceNamePlaceId = nil
+				sendReady(conn)
+			end)
+		end
 	end
-	nameChangeConn = signal:Connect(function()
-		-- sendReady has its own 2s throttle, so rapid burst changes coalesce.
-		sendReady(conn)
-	end)
 end
 function sendReady(conn)
 	if duplicateInstanceRole then
@@ -852,6 +880,7 @@ function sendReady(conn)
 		return nil
 	end
 	lastReadyPostAt = now
+	local instanceId = computeInstanceId()
 	task.spawn(function()
 		local readyOk, readyResult = pcall(function()
 			return HttpService:RequestAsync({
@@ -910,11 +939,20 @@ function sendReady(conn)
 		if _value ~= "" and _value then
 			assignedRole = readyData.assignedRole
 		end
-		local _condition = assignedRole
-		if _condition == nil then
-			_condition = detectRole()
+		local _condition = parseOk
+		if _condition then
+			local _instanceId = readyData.instanceId
+			_condition = type(_instanceId) == "string"
+			if _condition then
+				_condition = readyData.instanceId ~= ""
+			end
 		end
-		local connectedRole = _condition
+		lastReadyInstanceId = if _condition then readyData.instanceId else instanceId
+		local _condition_1 = assignedRole
+		if _condition_1 == nil then
+			_condition_1 = detectRole()
+		end
+		local connectedRole = _condition_1
 		if readyFailureLogKeys[readyLogKey] ~= nil then
 			readyFailureLogKeys[readyLogKey] = nil
 			print(`[robloxstudio-mcp] /ready connected for {instanceId}/{connectedRole} via {conn.serverUrl}`)
@@ -1104,6 +1142,7 @@ local function pollForRequests(connIndex)
 		end
 	end
 end
+local deactivatePlugin
 local function activatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
@@ -1136,6 +1175,17 @@ local function activatePlugin(connIndex)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
 			local now = tick()
+			if initialRole == "server" and not RunService:IsRunning() then
+				ClientBroker.disconnectAllProxies()
+				deactivatePlugin(idx)
+				return nil
+			end
+			local currentInstanceId = computeInstanceId()
+			if lastReadyInstanceId ~= nil and currentInstanceId ~= lastReadyInstanceId then
+				cachedPlaceName = nil
+				cachedPlaceNamePlaceId = nil
+				sendReady(conn)
+			end
 			local currentInterval = if conn.consecutiveFailures > 5 then conn.currentRetryDelay else conn.pollInterval
 			if now - conn.lastPoll > currentInterval then
 				conn.lastPoll = now
@@ -1151,11 +1201,10 @@ local function activatePlugin(connIndex)
 	if not RunService:IsRunning() then
 		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.
-	ensureNameChangeWatcher(conn)
+	-- Watch identity fields so stale name or anon instance ids are refreshed.
+	ensureIdentityWatcher(conn)
 end
-local function deactivatePlugin(connIndex)
+function deactivatePlugin(connIndex)
 	local _condition = connIndex
 	if _condition == nil then
 		_condition = State.getActiveTabIndex()
@@ -1362,9 +1411,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.16.1" is replaced with the package version at package time
+	-- "2.16.3" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.16.1`
+	return `{tostring(h)}-2.16.3`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -7925,19 +7974,31 @@ local pluginRef
 local function init(p)
 	pluginRef = p
 end
-local function computeInstanceId()
+local function addUnique(values, value)
+	local _values = values
+	local _value = value
+	if not (table.find(_values, _value) ~= nil) then
+		local _values_1 = values
+		local _value_1 = value
+		table.insert(_values_1, _value_1)
+	end
+end
+local function computeInstanceIds()
+	local ids = {}
 	if game.PlaceId ~= 0 then
-		return `place:{tostring(game.PlaceId)}`
+		addUnique(ids, `place:{tostring(game.PlaceId)}`)
 	end
 	local existing = ServerStorage:GetAttribute("__MCPPlaceId")
 	if type(existing) == "string" and existing ~= "" then
-		return `anon:{existing}`
+		addUnique(ids, `anon:{existing}`)
+	elseif game.PlaceId == 0 then
+		local fresh = HttpService:GenerateGUID(false)
+		pcall(function()
+			return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
+		end)
+		addUnique(ids, `anon:{fresh}`)
 	end
-	local fresh = HttpService:GenerateGUID(false)
-	pcall(function()
-		return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
-	end)
-	return `anon:{fresh}`
+	return ids
 end
 local function settingKey(instanceId)
 	return SETTING_KEY_PREFIX .. instanceId
@@ -7946,21 +8007,25 @@ local function rememberServerUrl(serverUrl)
 	if not pluginRef or serverUrl == "" then
 		return nil
 	end
-	local key = settingKey(computeInstanceId())
-	pcall(function()
-		return pluginRef:SetSetting(key, serverUrl)
-	end)
+	for _, instanceId in computeInstanceIds() do
+		local key = settingKey(instanceId)
+		pcall(function()
+			return pluginRef:SetSetting(key, serverUrl)
+		end)
+	end
 end
 local function readServerUrl()
 	if not pluginRef then
 		return nil
 	end
-	local key = settingKey(computeInstanceId())
-	local ok, value = pcall(function()
-		return pluginRef:GetSetting(key)
-	end)
-	if ok and type(value) == "string" and value ~= "" then
-		return value
+	for _, instanceId in computeInstanceIds() do
+		local key = settingKey(instanceId)
+		local ok, value = pcall(function()
+			return pluginRef:GetSetting(key)
+		end)
+		if ok and type(value) == "string" and value ~= "" then
+			return value
+		end
 	end
 	return nil
 end
@@ -7976,7 +8041,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.16.1"
+local CURRENT_VERSION = "2.16.3"
 local PLUGIN_VARIANT = "inspector"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8078,6 +8143,9 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 -- Cross-DM stop_playtest signaling via plugin:SetSetting, scoped by
 -- per-instance setting key so the same Studio process can host playtests
 -- for multiple places without one place's stop_playtest yanking another's.
+-- During publish-after-connect, both "anon:<uuid>" and "place:<PlaceId>"
+-- can refer to the same Studio place, so stop requests are mirrored across
+-- both keys while the monitor waits for a matching result on either key.
 --
 -- `plugin:SetSetting` / `plugin:GetSetting` is a per-plugin persistent store
 -- shared across every DataModel the plugin runs in (edit DMs, play-server
@@ -8125,23 +8193,48 @@ end
 -- agree on the place identifier (published places: placeId; unpublished:
 -- UUID on ServerStorage's __MCPPlaceId attribute, travels with the .rbxl
 -- into the play DM).
-local function computeInstanceId()
+local function addUnique(values, value)
+	local _values = values
+	local _value = value
+	if not (table.find(_values, _value) ~= nil) then
+		local _values_1 = values
+		local _value_1 = value
+		table.insert(_values_1, _value_1)
+	end
+end
+local function computeInstanceIds()
+	local ids = {}
 	if game.PlaceId ~= 0 then
-		return `place:{tostring(game.PlaceId)}`
+		addUnique(ids, `place:{tostring(game.PlaceId)}`)
 	end
 	local existing = ServerStorage:GetAttribute("__MCPPlaceId")
 	if type(existing) == "string" and existing ~= "" then
-		return `anon:{existing}`
+		addUnique(ids, `anon:{existing}`)
+	elseif game.PlaceId == 0 then
+		local fresh = HttpService:GenerateGUID(false)
+		pcall(function()
+			return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
+		end)
+		addUnique(ids, `anon:{fresh}`)
 	end
-	local fresh = HttpService:GenerateGUID(false)
-	pcall(function()
-		return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
-	end)
-	return `anon:{fresh}`
+	return ids
 end
 local function settingKey(instanceId)
 	return SETTING_KEY_PREFIX .. instanceId
 end
+local function settingKeys()
+	local _exp = computeInstanceIds()
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(instanceId)
+		return settingKey(instanceId)
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	return _newValue
+end
 local function readSetting(key)
 	if not pluginRef then
 		return nil
@@ -8227,7 +8320,7 @@ local function handleStopRequest(key, request)
 		return nil
 	end
 	if endTestIssued then
-		writeResult(key, request, true)
+		writeResult(key, request, false, "StudioTestService:EndTest was already issued for this play session, but the runtime DataModel is still alive.")
 		return nil
 	end
 	if not RunService:IsRunning() or not RunService:IsServer() then
@@ -8248,18 +8341,19 @@ local function startMonitor()
 		warn("[robloxstudio-mcp] StopPlayMonitor.startMonitor called before init; skipping")
 		return nil
 	end
-	local myKey = settingKey(computeInstanceId())
 	task.spawn(function()
 		while true do
-			local value = readSetting(myKey)
-			if value == true then
-				-- Legacy boolean requests are ambiguous and may be stale from
-				-- a prior crashed session. New stop requests use token payloads.
-				writeSetting(myKey, false)
-			else
-				local payload = decodePayload(value)
-				if payload then
-					handleStopRequest(myKey, payload)
+			for _, myKey in settingKeys() do
+				local value = readSetting(myKey)
+				if value == true then
+					-- Legacy boolean requests are ambiguous and may be stale from
+					-- a prior crashed session. New stop requests use token payloads.
+					writeSetting(myKey, false)
+				else
+					local payload = decodePayload(value)
+					if payload then
+						handleStopRequest(myKey, payload)
+					end
 				end
 			end
 			task.wait(POLL_INTERVAL_SEC)
@@ -8272,13 +8366,16 @@ local function requestStop()
 			ok = false,
 		}
 	end
-	local myKey = settingKey(computeInstanceId())
 	local requestId = HttpService:GenerateGUID(false)
-	local ok = writePayload(myKey, {
+	local payload = {
 		kind = "request",
 		id = requestId,
 		requestedAt = tick(),
-	})
+	}
+	local ok = false
+	for _, myKey in settingKeys() do
+		ok = writePayload(myKey, payload) or ok
+	end
 	return {
 		ok = ok,
 		requestId = if ok then requestId else nil,
@@ -8292,16 +8389,17 @@ local function waitForConsumption(requestId)
 			error = "Plugin reference is not initialized.",
 		}
 	end
-	local myKey = settingKey(computeInstanceId())
 	local start = tick()
 	while tick() - start < WAIT_FOR_CONSUMPTION_TIMEOUT_SEC do
-		local payload = decodePayload(readSetting(myKey))
-		if payload and payload.kind == "result" and payload.id == requestId then
-			return {
-				ok = payload.ok == true,
-				consumed = true,
-				error = payload.error,
-			}
+		for _, myKey in settingKeys() do
+			local payload = decodePayload(readSetting(myKey))
+			if payload and payload.kind == "result" and payload.id == requestId then
+				return {
+					ok = payload.ok == true,
+					consumed = true,
+					error = payload.error,
+				}
+			end
 		end
 		task.wait(WAIT_POLL_SEC)
 	end
@@ -8315,14 +8413,15 @@ local function clearPending(requestId)
 	if not pluginRef then
 		return nil
 	end
-	local myKey = settingKey(computeInstanceId())
-	if requestId ~= nil then
-		local payload = decodePayload(readSetting(myKey))
-		if payload and payload.id ~= requestId then
-			return nil
+	for _, myKey in settingKeys() do
+		if requestId ~= nil then
+			local payload = decodePayload(readSetting(myKey))
+			if payload and payload.id ~= requestId then
+				continue
+			end
 		end
+		writeSetting(myKey, false)
 	end
-	writeSetting(myKey, false)
 end
 return {
 	init = init,