@chrrxs/robloxstudio-mcp 2.15.1 → 2.16.0

package/studio-plugin/src/modules/handlers/EvalRuntimeHandlers.ts

@@ -0,0 +1,149 @@
+import { LogService, ReplicatedStorage, RunService, ServerScriptService } from "@rbxts/services";
+import { BRIDGE_NAMES, ensureRuntimeBridgeInstalled } from "../EvalBridges";
+import LuauExec from "../LuauExec";
+
+const PAYLOAD_INSTANCE_NAME = "__MCPEvalPayload";
+
+interface BridgeInvokeResult {
+	ok?: boolean;
+	value?: unknown;
+}
+
+interface WrapperResult {
+	ok?: boolean;
+	value?: unknown;
+	output?: unknown;
+}
+
+function findBridge(config: { service: Instance; bridgeName: string }): BindableFunction | undefined {
+	const bridge = config.service.FindFirstChild(config.bridgeName);
+	return bridge && bridge.IsA("BindableFunction") ? bridge : undefined;
+}
+
+function waitForBridge(config: { service: Instance; bridgeName: string }, timeoutSec = 2): BindableFunction | undefined {
+	const deadline = tick() + timeoutSec;
+	let bridge = findBridge(config);
+	while (!bridge && tick() < deadline) {
+		task.wait(0.05);
+		bridge = findBridge(config);
+	}
+	return bridge;
+}
+
+function getBridgeConfig() {
+	if (!RunService.IsRunning()) {
+		return {
+			error: "eval_*_runtime requires a running playtest.",
+		};
+	}
+	if (RunService.IsServer()) {
+		return {
+			service: ServerScriptService,
+			bridgeName: BRIDGE_NAMES.serverLocal,
+			missingError: "ServerEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime server peer, including for manually-started playtests.",
+		};
+	}
+	return {
+		service: ReplicatedStorage,
+		bridgeName: BRIDGE_NAMES.clientLocal,
+		missingError: "ClientEvalBridge not found. The bridge runs inside the play DM, so a playtest must be running. The bridge installs automatically in the runtime client peer, including for manually-started playtests.",
+	};
+}
+
+function evalRuntime(requestData: Record<string, unknown>) {
+	const code = requestData.code as string;
+	if (!code || code === "") return { error: "Code is required" };
+
+	const config = getBridgeConfig();
+	if (config.error !== undefined) {
+		return { bridge: "missing", error: config.error };
+	}
+
+	let bridge = findBridge(config);
+	if (!bridge) {
+		const install = ensureRuntimeBridgeInstalled();
+		if (!install.installed) {
+			return {
+				bridge: "missing",
+				error: `${config.missingError} Runtime bridge install failed: ${install.error}`,
+			};
+		}
+		bridge = waitForBridge(config);
+	}
+	if (!bridge) {
+		return {
+			bridge: "missing",
+			error: `${config.missingError} Runtime bridge was installed but did not become ready.`,
+		};
+	}
+
+	const m = new Instance("ModuleScript");
+	m.Name = PAYLOAD_INSTANCE_NAME;
+	const userLines = LuauExec.countLines(code);
+	const wrapped = LuauExec.buildWrapper(code, PAYLOAD_INSTANCE_NAME);
+
+	const [okSet, setErr] = pcall(() => {
+		(m as unknown as { Source: string }).Source = wrapped;
+	});
+	if (!okSet) {
+		m.Destroy();
+		return {
+			bridge: "ok",
+			ok: false,
+			error: `ModuleScript Source set failed: ${tostring(setErr)}`,
+		};
+	}
+
+	m.Parent = game.GetService("Workspace");
+	const historyStart = LogService.GetLogHistory().size();
+	const [invokeOk, invokeResult] = pcall(() => bridge.Invoke(m) as BridgeInvokeResult);
+	m.Destroy();
+
+	if (!invokeOk) {
+		return {
+			bridge: "ok",
+			ok: false,
+			error: tostring(invokeResult),
+		};
+	}
+
+	if (!typeIs(invokeResult, "table")) {
+		return {
+			bridge: "ok",
+			ok: false,
+			error: `Eval bridge returned invalid result: ${tostring(invokeResult)}`,
+		};
+	}
+
+	const bridgeResult = invokeResult as BridgeInvokeResult;
+	if (bridgeResult.ok !== true) {
+		return {
+			bridge: "ok",
+			ok: false,
+			error: LuauExec.recoverPayloadRequireError(bridgeResult.value, userLines, PAYLOAD_INSTANCE_NAME, historyStart),
+		};
+	}
+
+	const inner = bridgeResult.value;
+	if (!typeIs(inner, "table")) {
+		return {
+			bridge: "ok",
+			ok: true,
+			result: inner === undefined ? undefined : LuauExec.formatReturnValue(inner),
+		};
+	}
+
+	const r = inner as WrapperResult;
+	const ok = r.ok === true;
+	return {
+		bridge: "ok",
+		ok,
+		result: ok && r.value !== undefined ? LuauExec.formatReturnValue(r.value) : undefined,
+		error: !ok ? tostring(r.value) : undefined,
+		output: r.output ?? [],
+	};
+}
+
+export = {
+	evalRuntime,
+};

package/studio-plugin/src/modules/handlers/LogHandlers.ts

@@ -4,12 +4,11 @@ function getRuntimeLogs(requestData: Record<string, unknown>): unknown {
 	const since = requestData.since as number | undefined;
 	const tail = requestData.tail as number | undefined;
 	const filter = requestData.filter as string | undefined;
-	// Plugin-side peer tag is generic ("edit"|"server"|"client"). The MCP-side
-	// aggregator overrides it with the specific instance role (e.g. "client-1")
-	// during fan-out for target=all, so this value is only authoritative for
-	// the single-peer query path.
-	const peer = RuntimeLogBuffer.detectPeer();
-	return RuntimeLogBuffer.query({ since, tail, filter }, peer);
+	// This is the buffer that captured the LogService event, not necessarily
+	// the script-origin peer. Ordinary playtests share/reflect logs across
+	// edit/server/client LogService buffers.
+	const capturedBy = RuntimeLogBuffer.detectPeer();
+	return RuntimeLogBuffer.query({ since, tail, filter }, capturedBy);
 }
 
 export = { getRuntimeLogs };

package/studio-plugin/src/modules/handlers/TestHandlers.ts

@@ -1,5 +1,4 @@
 import { HttpService, LogService, Players, RunService } from "@rbxts/services";
-import { installBridges, ensureBridgesInstalled } from "../EvalBridges";
 import StopPlayMonitor from "../StopPlayMonitor";
 
 interface StudioTestServiceMultiplayer extends StudioTestService {
@@ -200,9 +199,8 @@ function startPlaytest(requestData: Record<string, unknown>) {
 			logConnection = undefined;
 		}
 		cleanupStopListener();
-		// Note: eval bridges are intentionally NOT cleaned up — they live
-		// permanently in the edit DM so manual playtests also get them. See
-		// EvalBridges.ts lifecycle comment.
+		// Runtime eval bridges are created by the play server/client plugin
+		// peers and disappear with the play DataModels.
 	}
 
 	if (testRunning) {
@@ -236,15 +234,6 @@ function startPlaytest(requestData: Record<string, unknown>) {
 		warn(`[MCP] Failed to inject stop listener: ${injErr}`);
 	}
 
-	// Force-refresh the game-VM eval bridges (ServerEvalBridge + ClientEvalBridge)
-	// right before cloning so the play DMs get the current source. They also
-	// live permanently in the edit DM (installed on connect) so manually-started
-	// playtests get them too; here we just ensure they're fresh.
-	const bridgeInstall = installBridges();
-	if (!bridgeInstall.installed) {
-		warn(`[MCP] Eval bridge install failed: ${bridgeInstall.error}`);
-	}
-
 	task.spawn(() => {
 		const [ok, result] = pcall(() => {
 			if (mode === "play") {
@@ -266,22 +255,12 @@ function startPlaytest(requestData: Record<string, unknown>) {
 		testRunning = false;
 
 		cleanupStopListener();
-		// Eval bridges persist in the edit DM (see EvalBridges.ts) — do not
-		// clean up here, so the next manual playtest still gets them.
-		ensureBridgesInstalled();
 	});
 
 	const response: Record<string, unknown> = {
 		success: true,
 		message: `Playtest started in ${mode} mode.`,
 	};
-	// Only mention eval bridges when they failed — when they're fine, the
-	// detail is noise. eval_server_runtime / eval_client_runtime will surface
-	// their own clear errors if the caller tries to use them after a failed
-	// install.
-	if (!bridgeInstall.installed) {
-		response.evalBridgesError = bridgeInstall.error;
-	}
 
 	return response;
 }
@@ -370,11 +349,6 @@ function multiplayerTestStart(requestData: Record<string, unknown>) {
 	const testArgs = requestData.testArgs !== undefined ? requestData.testArgs : {};
 	const testId = HttpService.GenerateGUID(false);
 
-	const bridgeInstall = installBridges();
-	if (!bridgeInstall.installed) {
-		warn(`[MCP] Eval bridge install failed: ${bridgeInstall.error}`);
-	}
-
 	multiplayerState = {
 		phase: "starting",
 		testId,
@@ -400,8 +374,6 @@ function multiplayerTestStart(requestData: Record<string, unknown>) {
 			multiplayerState.result = undefined;
 			multiplayerState.error = tostring(result);
 		}
-
-		ensureBridgesInstalled();
 	});
 
 	const response: Record<string, unknown> = {
@@ -412,9 +384,6 @@ function multiplayerTestStart(requestData: Record<string, unknown>) {
 		numPlayers,
 		testArgs,
 	};
-	if (!bridgeInstall.installed) {
-		response.evalBridgesError = bridgeInstall.error;
-	}
 	return response;
 }
 

package/studio-plugin/src/server/index.server.ts

@@ -2,6 +2,7 @@ import State from "../modules/State";
 import UI from "../modules/UI";
 import Communication from "../modules/Communication";
 import ClientBroker from "../modules/ClientBroker";
+import { cleanupLegacyEditBridges, ensureRuntimeBridgeInstalled } from "../modules/EvalBridges";
 import RuntimeLogBuffer from "../modules/RuntimeLogBuffer";
 import StopPlayMonitor from "../modules/StopPlayMonitor";
 import * as RenderMonitor from "../modules/RenderMonitor";
@@ -28,10 +29,24 @@ const elements = UI.getElements();
 const ICON_DISCONNECTED = "rbxassetid://__BUTTON_ICON_DISCONNECTED__";
 const ICON_CONNECTING = "rbxassetid://__BUTTON_ICON_CONNECTING__";
 const ICON_CONNECTED = "rbxassetid://__BUTTON_ICON_CONNECTED__";
+const TOOLBAR_REGISTRATION_DELAY_SECONDS = 1;
 
-const toolbar = plugin.CreateToolbar("__TOOLBAR_NAME__");
-const button = toolbar.CreateButton("__BUTTON_TITLE__", "__BUTTON_TOOLTIP__", ICON_DISCONNECTED);
-UI.setToolbarButton(button, { disconnected: ICON_DISCONNECTED, connecting: ICON_CONNECTING, connected: ICON_CONNECTED });
+let toolbarButtonRegistered = false;
+
+function registerToolbarButton() {
+	if (toolbarButtonRegistered) {
+		return;
+	}
+	toolbarButtonRegistered = true;
+
+	const toolbar = plugin.CreateToolbar("__TOOLBAR_NAME__");
+	const button = toolbar.CreateButton("__BUTTON_TITLE__", "__BUTTON_TOOLTIP__", ICON_DISCONNECTED);
+	UI.setToolbarButton(button, { disconnected: ICON_DISCONNECTED, connecting: ICON_CONNECTING, connected: ICON_CONNECTED });
+
+	button.Click.Connect(() => {
+		elements.screenGui.Enabled = !elements.screenGui.Enabled;
+	});
+}
 
 
 elements.connectButton.Activated.Connect(() => {
@@ -44,11 +59,6 @@ elements.connectButton.Activated.Connect(() => {
 });
 
 
-button.Click.Connect(() => {
-	elements.screenGui.Enabled = !elements.screenGui.Enabled;
-});
-
-
 plugin.Unloading.Connect(() => {
 	Communication.deactivateAll();
 });
@@ -56,6 +66,7 @@ plugin.Unloading.Connect(() => {
 
 UI.updateUIState();
 Communication.checkForUpdates();
+task.delay(TOOLBAR_REGISTRATION_DELAY_SECONDS, registerToolbarButton);
 
 // Auto-activate per peer. The boshyxd plugin only registers with MCP when the
 // user clicks Connect in its UI, but that UI is invisible in play DMs - so
@@ -63,6 +74,14 @@ Communication.checkForUpdates();
 // short delay so the UI/State have a chance to initialize first.
 task.delay(2, () => {
 	const role = ClientBroker.forkRole();
+	if (role === "edit") {
+		cleanupLegacyEditBridges();
+	} else {
+		const result = ensureRuntimeBridgeInstalled();
+		if (!result.installed) {
+			warn(`[MCPPlugin] Runtime eval bridge install failed: ${result.error}`);
+		}
+	}
 	if (role === "edit" || role === "server") {
 		pcall(() => {
 			const idx = State.getActiveTabIndex();