@chrrxs/robloxstudio-mcp 2.16.1 → 2.16.2

package/studio-plugin/MCPPlugin.rbxmx

@@ -662,21 +662,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
@@ -820,28 +823,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 +863,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 +922,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}`)
@@ -1136,6 +1157,12 @@ local function activatePlugin(connIndex)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
 			local now = tick()
+			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,9 +1178,8 @@ 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)
 	local _condition = connIndex
@@ -1362,9 +1388,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.2" 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.2`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -7925,19 +7951,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 +7984,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 +8018,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.2"
 local PLUGIN_VARIANT = "main"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8078,6 +8120,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 +8170,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
@@ -8248,18 +8318,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 +8343,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 +8366,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 +8390,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,

package/studio-plugin/src/modules/Communication.ts

@@ -47,11 +47,11 @@ function computeInstanceId(): string {
 	return `anon:${fresh}`;
 }
 
-const instanceId = computeInstanceId();
 let assignedRole: string | undefined;
 let duplicateInstanceRole = false;
 let hasVersionMismatch = false;
 let lastVersionMismatchWarningKey: string | undefined;
+let lastReadyInstanceId: string | undefined;
 const readyFailureLogKeys = new Set<string>();
 
 // Cache the published place name from MarketplaceService:GetProductInfo so
@@ -59,9 +59,12 @@ const readyFailureLogKeys = new Set<string>();
 // 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.
 let cachedPlaceName: string | undefined;
+let cachedPlaceNamePlaceId: number | undefined;
 
 function resolvePlaceName(): string {
-	if (cachedPlaceName !== undefined) return cachedPlaceName;
+	if (cachedPlaceName !== undefined && cachedPlaceNamePlaceId === game.PlaceId) return cachedPlaceName;
+	cachedPlaceName = undefined;
+	cachedPlaceNamePlaceId = game.PlaceId;
 	if (game.PlaceId === 0) {
 		cachedPlaceName = game.Name;
 		return cachedPlaceName;
@@ -209,21 +212,31 @@ function getConnectionStatus(connIndex: number): string {
 // restarted but hasn't seen our re-ready yet would fire a duplicate /ready.
 let 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>.
 let nameChangeConn: RBXScriptConnection | undefined;
-function ensureNameChangeWatcher(conn: Connection): void {
-	if (nameChangeConn) return;
-	const [okSig, signal] = pcall(() => game.GetPropertyChangedSignal("Name"));
-	if (!okSig || !signal) return;
-	nameChangeConn = signal.Connect(() => {
-		// sendReady has its own 2s throttle, so rapid burst changes coalesce.
-		sendReady(conn);
-	});
+let placeIdChangeConn: RBXScriptConnection | undefined;
+function ensureIdentityWatcher(conn: Connection): void {
+	if (!nameChangeConn) {
+		const [okSig, signal] = pcall(() => game.GetPropertyChangedSignal("Name"));
+		if (okSig && signal) {
+			nameChangeConn = signal.Connect(() => {
+				// sendReady has its own 2s throttle, so rapid burst changes coalesce.
+				sendReady(conn);
+			});
+		}
+	}
+	if (!placeIdChangeConn) {
+		const [okSig, signal] = pcall(() => game.GetPropertyChangedSignal("PlaceId"));
+		if (okSig && signal) {
+			placeIdChangeConn = signal.Connect(() => {
+				cachedPlaceName = undefined;
+				cachedPlaceNamePlaceId = undefined;
+				sendReady(conn);
+			});
+		}
+	}
 }
 
 function sendReady(conn: Connection): void {
@@ -231,6 +244,7 @@ function sendReady(conn: Connection): void {
 	const now = tick();
 	if (now - lastReadyPostAt < 2) return; // throttle to ≤1 /ready every 2s
 	lastReadyPostAt = now;
+	const instanceId = computeInstanceId();
 	task.spawn(() => {
 		const [readyOk, readyResult] = pcall(() => {
 			return HttpService.RequestAsync({
@@ -286,6 +300,9 @@ function sendReady(conn: Connection): void {
 		if (parseOk && readyData.assignedRole) {
 			assignedRole = readyData.assignedRole;
 		}
+		lastReadyInstanceId = parseOk && typeIs(readyData.instanceId, "string") && readyData.instanceId !== ""
+			? readyData.instanceId
+			: instanceId;
 		const connectedRole = assignedRole ?? detectRole();
 		if (readyFailureLogKeys.has(readyLogKey)) {
 			readyFailureLogKeys.delete(readyLogKey);
@@ -493,6 +510,12 @@ function activatePlugin(connIndex?: number) {
 	if (!conn.heartbeatConnection) {
 		conn.heartbeatConnection = RunService.Heartbeat.Connect(() => {
 			const now = tick();
+			const currentInstanceId = computeInstanceId();
+			if (lastReadyInstanceId !== undefined && currentInstanceId !== lastReadyInstanceId) {
+				cachedPlaceName = undefined;
+				cachedPlaceNamePlaceId = undefined;
+				sendReady(conn);
+			}
 			const currentInterval = conn.consecutiveFailures > 5 ? conn.currentRetryDelay : conn.pollInterval;
 			if (now - conn.lastPoll > currentInterval) {
 				conn.lastPoll = now;
@@ -511,9 +534,8 @@ function activatePlugin(connIndex?: number) {
 		task.spawn(cleanupLegacyEditBridges);
 	}
 
-	// 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);
 }
 
 function deactivatePlugin(connIndex?: number) {

package/studio-plugin/src/modules/ServerUrlSettings.ts

@@ -8,17 +8,26 @@ function init(p: Plugin): void {
 	pluginRef = p;
 }
 
-function computeInstanceId(): string {
+function addUnique(values: string[], value: string): void {
+	if (!values.includes(value)) {
+		values.push(value);
+	}
+}
+
+function computeInstanceIds(): string[] {
+	const ids: string[] = [];
 	if (game.PlaceId !== 0) {
-		return `place:${tostring(game.PlaceId)}`;
+		addUnique(ids, `place:${tostring(game.PlaceId)}`);
 	}
 	const existing = ServerStorage.GetAttribute("__MCPPlaceId");
 	if (typeIs(existing, "string") && existing !== "") {
-		return `anon:${existing as string}`;
+		addUnique(ids, `anon:${existing as string}`);
+	} else if (game.PlaceId === 0) {
+		const fresh = HttpService.GenerateGUID(false);
+		pcall(() => ServerStorage.SetAttribute("__MCPPlaceId", fresh));
+		addUnique(ids, `anon:${fresh}`);
 	}
-	const fresh = HttpService.GenerateGUID(false);
-	pcall(() => ServerStorage.SetAttribute("__MCPPlaceId", fresh));
-	return `anon:${fresh}`;
+	return ids;
 }
 
 function settingKey(instanceId: string): string {
@@ -27,16 +36,20 @@ function settingKey(instanceId: string): string {
 
 function rememberServerUrl(serverUrl: string): void {
 	if (!pluginRef || serverUrl === "") return;
-	const key = settingKey(computeInstanceId());
-	pcall(() => pluginRef!.SetSetting(key, serverUrl));
+	for (const instanceId of computeInstanceIds()) {
+		const key = settingKey(instanceId);
+		pcall(() => pluginRef!.SetSetting(key, serverUrl));
+	}
 }
 
 function readServerUrl(): string | undefined {
 	if (!pluginRef) return undefined;
-	const key = settingKey(computeInstanceId());
-	const [ok, value] = pcall(() => pluginRef!.GetSetting(key));
-	if (ok && typeIs(value, "string") && value !== "") {
-		return value as string;
+	for (const instanceId of computeInstanceIds()) {
+		const key = settingKey(instanceId);
+		const [ok, value] = pcall(() => pluginRef!.GetSetting(key));
+		if (ok && typeIs(value, "string") && value !== "") {
+			return value as string;
+		}
 	}
 	return undefined;
 }