@chrrxs/robloxstudio-mcp 2.16.0 → 2.16.2

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

@@ -7,6 +7,7 @@ import InputHandlers from "./handlers/InputHandlers";
 import EvalRuntimeHandlers from "./handlers/EvalRuntimeHandlers";
 import LuauExec from "./LuauExec";
 import State from "./State";
+import HttpDiagnostics from "./HttpDiagnostics";
 
 interface StudioTestServiceMultiplayer extends StudioTestService {
 	CanLeaveTest(): boolean;
@@ -64,7 +65,8 @@ function resolvePlaceName(): string {
 // is gone: stop now uses StopPlayMonitor with plugin:SetSetting cross-DM
 // signaling, which works regardless of MCP server state.)
 
-const MCP_URL = "http://localhost:58741";
+const DEFAULT_MCP_URL = "http://localhost:58741";
+let mcpUrl = DEFAULT_MCP_URL;
 const BROKER_NAME = "__MCPClientBroker";
 const BROKER_OWNER_ATTRIBUTE = "__MCPBrokerOwner";
 
@@ -152,7 +154,7 @@ function forkRole(): "edit" | "server" | "client" {
 function postJson(endpoint: string, body: Record<string, unknown>) {
 	return pcall(() =>
 		HttpService.RequestAsync({
-			Url: `${MCP_URL}${endpoint}`,
+			Url: `${mcpUrl}${endpoint}`,
 			Method: "POST",
 			Headers: { "Content-Type": "application/json" },
 			Body: HttpService.JSONEncode(body),
@@ -160,6 +162,20 @@ function postJson(endpoint: string, body: Record<string, unknown>) {
 	);
 }
 
+function formatPostJsonFailure(endpoint: string, ok: boolean, res: unknown): string {
+	return HttpDiagnostics.formatRequestFailure(`${mcpUrl}${endpoint}`, ok, res);
+}
+
+function setServerUrl(serverUrl: string | undefined): void {
+	if (serverUrl !== undefined && serverUrl !== "") {
+		mcpUrl = serverUrl;
+	}
+}
+
+function getServerUrl(): string {
+	return mcpUrl;
+}
+
 function handleExecuteLuau(data: Record<string, unknown> | undefined) {
 	const code = data && (data.code as string | undefined);
 	if (typeIs(code, "string") === false || code === "") {
@@ -277,13 +293,14 @@ function setupClientBroker() {
 }
 
 const proxyByPlayer = new Map<Player, ProxyEntry>();
+const proxyRegisterFailuresByPlayer = new Set<Player>();
 let serverBrokerStarted = false;
 
 function pollProxy(proxyId: string, player: Player, rf: RemoteFunction) {
 	while (player.Parent !== undefined && proxyByPlayer.has(player)) {
 		const [ok, res] = pcall(() =>
 			HttpService.RequestAsync({
-				Url: `${MCP_URL}/poll?pluginSessionId=${proxyId}`,
+				Url: `${mcpUrl}/poll?pluginSessionId=${proxyId}`,
 				Method: "GET",
 				Headers: { "Content-Type": "application/json" },
 			}),
@@ -341,18 +358,23 @@ function registerProxy(player: Player, rf: RemoteFunction) {
 		pluginVariant: State.PLUGIN_VARIANT,
 	});
 	if (!ok || !res || !res.Success) {
-		warn(`[robloxstudio-mcp] proxy register failed for ${player.Name}`);
+		proxyRegisterFailuresByPlayer.add(player);
+		warn(`[robloxstudio-mcp] proxy register failed for ${player.Name}: ${formatPostJsonFailure("/ready", ok, res)}`);
 		return;
 	}
 	const body = HttpService.JSONDecode(res.Body) as ReadyResponseBody;
 	const assigned = body.assignedRole ?? "client";
 	proxyByPlayer.set(player, { pluginSessionId: proxyId, role: assigned });
+	if (proxyRegisterFailuresByPlayer.has(player)) {
+		proxyRegisterFailuresByPlayer.delete(player);
+		print(`[robloxstudio-mcp] proxy registered for ${player.Name} as ${assigned} via ${mcpUrl}`);
+	}
 	task.spawn(pollProxy, proxyId, player, rf);
 }
 
 // (Removed: startEditProxyLoop. The play-server DM no longer registers an
 // "edit-proxy" peer with the MCP server. stop_playtest now uses a cross-DM
-// plugin:SetSetting flag consumed by StopPlayMonitor in the play-server DM,
+// plugin:SetSetting request consumed by StopPlayMonitor in the play-server DM,
 // which doesn't depend on MCP server state or peer registration at all.)
 
 function setupServerBroker() {
@@ -377,6 +399,7 @@ function setupServerBroker() {
 		const entry = proxyByPlayer.get(p);
 		if (entry) {
 			proxyByPlayer.delete(p);
+			proxyRegisterFailuresByPlayer.delete(p);
 			postJson("/disconnect", { pluginSessionId: entry.pluginSessionId });
 		}
 	});
@@ -389,7 +412,10 @@ function setupServerBroker() {
 }
 
 export = {
-	MCP_URL,
+	MCP_URL: DEFAULT_MCP_URL,
+	DEFAULT_MCP_URL,
+	getServerUrl,
+	setServerUrl,
 	forkRole,
 	setupClientBroker,
 	setupServerBroker,

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

@@ -18,6 +18,8 @@ import SerializationHandlers from "./handlers/SerializationHandlers";
 import MemoryHandlers from "./handlers/MemoryHandlers";
 import SceneAnalysisHandlers from "./handlers/SceneAnalysisHandlers";
 import EvalRuntimeHandlers from "./handlers/EvalRuntimeHandlers";
+import ServerUrlSettings from "./ServerUrlSettings";
+import HttpDiagnostics from "./HttpDiagnostics";
 import { Connection, RequestPayload, PollResponse, ReadyResponse } from "../types";
 
 // Per-plugin-load random GUID. Used as the /poll URL param so the server
@@ -45,20 +47,24 @@ 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
 // /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.
 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;
@@ -206,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 {
@@ -228,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({
@@ -249,30 +266,47 @@ function sendReady(conn: Connection): void {
 				}),
 			});
 		});
-		if (!readyOk) return;
-		// 409 = duplicate_instance_role. Surface in UI and stop polling.
-		if (readyResult.StatusCode === 409) {
-			duplicateInstanceRole = true;
-			conn.isActive = false;
-			const ui = UI.getElements();
-			if (State.getActiveTabIndex() === 0) {
-				ui.statusLabel.Text = "Duplicate instance";
-				ui.statusLabel.TextColor3 = Color3.fromRGB(239, 68, 68);
-				ui.detailStatusLabel.Text = "Another Studio is already connected as this place + role";
-				ui.detailStatusLabel.TextColor3 = Color3.fromRGB(239, 68, 68);
-			}
-			warn(
-				`[MCPPlugin] Another Studio is already connected as (${instanceId}, ${detectRole()}). Close the other Studio window or this one.`,
-			);
+		const readyUrl = `${conn.serverUrl}/ready`;
+		const readyRole = detectRole();
+		const readyLogKey = `${conn.serverUrl}|${instanceId}|${readyRole}`;
+		if (!readyOk) {
+			readyFailureLogKeys.add(readyLogKey);
+			warn(`[robloxstudio-mcp] /ready failed for ${instanceId}/${readyRole}: ${HttpDiagnostics.formatRequestFailure(readyUrl, readyOk, readyResult)}`);
 			return;
 		}
-		if (readyResult.Success) {
-			const [parseOk, readyData] = pcall(
-				() => HttpService.JSONDecode(readyResult.Body) as ReadyResponse,
-			);
-			if (parseOk && readyData.assignedRole) {
-				assignedRole = readyData.assignedRole;
+		if (!readyResult.Success) {
+			const reason = HttpDiagnostics.formatRequestFailure(readyUrl, true, readyResult);
+			readyFailureLogKeys.add(readyLogKey);
+			// 409 = duplicate_instance_role. Surface in UI and stop polling.
+			if (readyResult.StatusCode === 409) {
+				duplicateInstanceRole = true;
+				conn.isActive = false;
+				const ui = UI.getElements();
+				if (State.getActiveTabIndex() === 0) {
+					ui.statusLabel.Text = "Duplicate instance";
+					ui.statusLabel.TextColor3 = Color3.fromRGB(239, 68, 68);
+					ui.detailStatusLabel.Text = reason;
+					ui.detailStatusLabel.TextColor3 = Color3.fromRGB(239, 68, 68);
+				}
+				warn(`[robloxstudio-mcp] /ready rejected for ${instanceId}/${readyRole}: ${reason}`);
+				return;
 			}
+			warn(`[robloxstudio-mcp] /ready rejected for ${instanceId}/${readyRole}: ${reason}`);
+			return;
+		}
+		const [parseOk, readyData] = pcall(
+			() => HttpService.JSONDecode(readyResult.Body) as ReadyResponse,
+		);
+		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);
+			print(`[robloxstudio-mcp] /ready connected for ${instanceId}/${connectedRole} via ${conn.serverUrl}`);
 		}
 	});
 }
@@ -313,7 +347,7 @@ function pollForRequests(connIndex: number) {
 			const warningKey = `${State.CURRENT_VERSION}:${serverVersion}`;
 			if (lastVersionMismatchWarningKey !== warningKey) {
 				lastVersionMismatchWarningKey = warningKey;
-				warn(`[MCPPlugin] Version mismatch: Studio plugin v${State.CURRENT_VERSION} / MCP v${serverVersion}. Run npx -y @chrrxs/robloxstudio-mcp@latest --auto-install-plugin and restart Studio.`);
+				warn(`[robloxstudio-mcp] Version mismatch: Studio plugin v${State.CURRENT_VERSION} / MCP v${serverVersion}. Run npx -y @chrrxs/robloxstudio-mcp@latest --auto-install-plugin and restart Studio.`);
 			}
 			UI.showBanner("version-mismatch", `Plugin v${State.CURRENT_VERSION} / MCP v${serverVersion} mismatch`);
 		} else if (hasVersionMismatch) {
@@ -470,11 +504,18 @@ function activatePlugin(connIndex?: number) {
 		UI.updateTabLabel(idx);
 		UI.updateUIState();
 	}
+	ServerUrlSettings.rememberServerUrl(conn.serverUrl);
 	UI.updateTabDot(idx);
 
 	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;
@@ -493,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/HttpDiagnostics.ts

@@ -0,0 +1,50 @@
+import { HttpService } from "@rbxts/services";
+
+interface FailureBody {
+	error?: string;
+	message?: string;
+	missingFields?: unknown;
+	request?: unknown;
+	existing?: unknown;
+	details?: unknown;
+}
+
+function encodeForLog(value: unknown): string {
+	const [ok, encoded] = pcall(() => HttpService.JSONEncode(value));
+	return ok ? encoded : tostring(value);
+}
+
+function formatBody(body: string): string {
+	if (body === "") return "";
+	const [ok, decoded] = pcall(() => HttpService.JSONDecode(body));
+	if (ok && typeIs(decoded, "table")) {
+		const data = decoded as FailureBody;
+		const parts: string[] = [];
+		if (typeIs(data.error, "string") && data.error !== "") parts.push(`error=${data.error}`);
+		if (typeIs(data.message, "string") && data.message !== "") parts.push(`message=${data.message}`);
+		if (data.missingFields !== undefined) parts.push(`missingFields=${encodeForLog(data.missingFields)}`);
+		if (data.request !== undefined) parts.push(`request=${encodeForLog(data.request)}`);
+		if (data.existing !== undefined) parts.push(`existing=${encodeForLog(data.existing)}`);
+		if (data.details !== undefined) parts.push(`details=${encodeForLog(data.details)}`);
+		if (parts.size() > 0) return parts.join(" ");
+	}
+	return `body=${body}`;
+}
+
+function formatRequestFailure(url: string, ok: boolean, res: unknown): string {
+	if (!ok) {
+		return `RequestAsync threw for ${url}: ${tostring(res)}`;
+	}
+	if (res === undefined) {
+		return `RequestAsync returned no response for ${url}`;
+	}
+	const response = res as RequestAsyncResponse;
+	const statusMessage = response.StatusMessage !== "" ? ` ${response.StatusMessage}` : "";
+	const body = formatBody(response.Body);
+	const suffix = body !== "" ? `: ${body}` : "";
+	return `HTTP ${response.StatusCode}${statusMessage} from ${url}${suffix}`;
+}
+
+export = {
+	formatRequestFailure,
+};

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

@@ -0,0 +1,61 @@
+import { HttpService, ServerStorage } from "@rbxts/services";
+
+const SETTING_KEY_PREFIX = "MCP_SERVER_URL_";
+
+let pluginRef: Plugin | undefined;
+
+function init(p: Plugin): void {
+	pluginRef = p;
+}
+
+function addUnique(values: string[], value: string): void {
+	if (!values.includes(value)) {
+		values.push(value);
+	}
+}
+
+function computeInstanceIds(): string[] {
+	const ids: string[] = [];
+	if (game.PlaceId !== 0) {
+		addUnique(ids, `place:${tostring(game.PlaceId)}`);
+	}
+	const existing = ServerStorage.GetAttribute("__MCPPlaceId");
+	if (typeIs(existing, "string") && existing !== "") {
+		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}`);
+	}
+	return ids;
+}
+
+function settingKey(instanceId: string): string {
+	return SETTING_KEY_PREFIX + instanceId;
+}
+
+function rememberServerUrl(serverUrl: string): void {
+	if (!pluginRef || serverUrl === "") return;
+	for (const instanceId of computeInstanceIds()) {
+		const key = settingKey(instanceId);
+		pcall(() => pluginRef!.SetSetting(key, serverUrl));
+	}
+}
+
+function readServerUrl(): string | undefined {
+	if (!pluginRef) return undefined;
+	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;
+}
+
+export = {
+	init,
+	rememberServerUrl,
+	readServerUrl,
+};