@chrrxs/robloxstudio-mcp 2.15.0 → 2.15.2

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

@@ -4,7 +4,9 @@ import MemoryHandlers from "./handlers/MemoryHandlers";
 import SceneAnalysisHandlers from "./handlers/SceneAnalysisHandlers";
 import CaptureHandlers from "./handlers/CaptureHandlers";
 import InputHandlers from "./handlers/InputHandlers";
+import EvalRuntimeHandlers from "./handlers/EvalRuntimeHandlers";
 import LuauExec from "./LuauExec";
+import State from "./State";
 
 interface StudioTestServiceMultiplayer extends StudioTestService {
 	CanLeaveTest(): boolean;
@@ -86,6 +88,7 @@ interface BrokerEnvelope {
 // cache / etc. lives there) so the server peer alone can't satisfy them.
 const CLIENT_BROKER_ALLOWED_ENDPOINTS = new Set<string>([
 	"/api/execute-luau",
+	"/api/eval-runtime",
 	"/api/get-runtime-logs",
 	"/api/get-memory-breakdown",
 	"/api/get-scene-analysis",
@@ -134,6 +137,8 @@ function reRegisterProxy(proxyId: string, role: string): void {
 			placeName: resolvePlaceName(),
 			dataModelName: game.Name,
 			isRunning: RunService.IsRunning(),
+			pluginVersion: State.CURRENT_VERSION,
+			pluginVariant: State.PLUGIN_VARIANT,
 		}),
 	);
 }
@@ -172,8 +177,8 @@ function handleGetRuntimeLogs(data: Record<string, unknown> | undefined): unknow
 	const since = d.since as number | undefined;
 	const tail = d.tail as number | undefined;
 	const filter = d.filter as string | undefined;
-	// "client" is the generic peer tag; MCP-side aggregator overrides with
-	// the specific role (e.g. "client-1") on target=all fan-out.
+	// "client" is the generic capture tag; MCP-side aggregation overrides it
+	// with the specific role (e.g. "client-1") for capturedBy.
 	return RuntimeLogBuffer.query({ since, tail, filter }, "client");
 }
 
@@ -263,6 +268,9 @@ function setupClientBroker() {
 		if (payload && payload.endpoint === "/api/execute-luau") {
 			return handleExecuteLuau(payload.data);
 		}
+		if (payload && payload.endpoint === "/api/eval-runtime") {
+			return EvalRuntimeHandlers.evalRuntime(payload.data ?? {});
+		}
 		// Legacy: raw execute-luau payload at the top level.
 		return handleExecuteLuau(payload as Record<string, unknown> | undefined);
 	};
@@ -329,6 +337,8 @@ function registerProxy(player: Player, rf: RemoteFunction) {
 		placeName: resolvePlaceName(),
 		dataModelName: game.Name,
 		isRunning: RunService.IsRunning(),
+		pluginVersion: State.CURRENT_VERSION,
+		pluginVariant: State.PLUGIN_VARIANT,
 	});
 	if (!ok || !res || !res.Success) {
 		warn(`[robloxstudio-mcp] proxy register failed for ${player.Name}`);

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

@@ -17,6 +17,7 @@ import LogHandlers from "./handlers/LogHandlers";
 import SerializationHandlers from "./handlers/SerializationHandlers";
 import MemoryHandlers from "./handlers/MemoryHandlers";
 import SceneAnalysisHandlers from "./handlers/SceneAnalysisHandlers";
+import EvalRuntimeHandlers from "./handlers/EvalRuntimeHandlers";
 import { Connection, RequestPayload, PollResponse, ReadyResponse } from "../types";
 
 // Per-plugin-load random GUID. Used as the /poll URL param so the server
@@ -47,6 +48,8 @@ function computeInstanceId(): string {
 const instanceId = computeInstanceId();
 let assignedRole: string | undefined;
 let duplicateInstanceRole = false;
+let hasVersionMismatch = false;
+let lastVersionMismatchWarningKey: string | undefined;
 
 // Cache the published place name from MarketplaceService:GetProductInfo so
 // /ready can carry a friendly identifier (e.g. "Natural Disasters") distinct
@@ -127,6 +130,7 @@ const routeMap: Record<string, Handler> = {
 	"/api/get-tagged": MetadataHandlers.getTagged,
 	"/api/get-selection": MetadataHandlers.getSelection,
 	"/api/execute-luau": MetadataHandlers.executeLuau,
+	"/api/eval-runtime": EvalRuntimeHandlers.evalRuntime,
 	"/api/undo": MetadataHandlers.undo,
 	"/api/redo": MetadataHandlers.redo,
 	"/api/bulk-set-attributes": MetadataHandlers.bulkSetAttributes,
@@ -238,6 +242,8 @@ function sendReady(conn: Connection): void {
 					placeName: resolvePlaceName(),
 					dataModelName: game.Name,
 					isRunning: RunService.IsRunning(),
+					pluginVersion: State.CURRENT_VERSION,
+					pluginVariant: State.PLUGIN_VARIANT,
 					pluginReady: true,
 					timestamp: tick(),
 				}),
@@ -301,6 +307,19 @@ function pollForRequests(connIndex: number) {
 		const mcpConnected = data.mcpConnected === true;
 		conn.lastHttpOk = true;
 		conn.lastMcpOk = mcpConnected;
+		const serverVersion = data.serverVersion ?? "unknown";
+		if (data.versionMismatch === true) {
+			hasVersionMismatch = true;
+			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.`);
+			}
+			UI.showBanner("version-mismatch", `Plugin v${State.CURRENT_VERSION} / MCP v${serverVersion} mismatch`);
+		} else if (hasVersionMismatch) {
+			hasVersionMismatch = false;
+			UI.hideBanner("version-mismatch");
+		}
 
 		// Server tells us when its in-memory instances map doesn't have us
 		// (e.g. after an MCP process restart). Re-issue /ready immediately so
@@ -539,11 +558,9 @@ function checkForUpdates() {
 			if (ok && data?.version) {
 				const latestVersion = data.version;
 				if (Utils.compareVersions(State.CURRENT_VERSION, latestVersion) < 0) {
-					const ui = UI.getElements();
-					ui.updateBannerText.Text = `v${latestVersion} available - github.com/chrrxs/robloxstudio-mcp`;
-					ui.updateBanner.Visible = true;
-					ui.contentFrame.Position = new UDim2(0, 8, 0, 92);
-					ui.contentFrame.Size = new UDim2(1, -16, 1, -100);
+					if (!hasVersionMismatch) {
+						UI.showBanner("update", `v${latestVersion} available - github.com/chrrxs/robloxstudio-mcp`);
+					}
 				}
 			}
 		}

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

@@ -86,9 +86,10 @@ bf.Archivable = false
 bf.Parent = ServerScriptService
 bf.OnInvoke = function(payload)
 	if typeof(payload) ~= "Instance" or not payload:IsA("ModuleScript") then
-		return false, "payload must be a ModuleScript instance"
+		return { ok = false, value = "payload must be a ModuleScript instance" }
 	end
-	return pcall(require, payload)
+	local ok, value = pcall(require, payload)
+	return { ok = ok, value = value }
 end
 `;
 
@@ -113,9 +114,10 @@ bf.Archivable = false
 bf.Parent = ReplicatedStorage
 bf.OnInvoke = function(payload)
 	if typeof(payload) ~= "Instance" or not payload:IsA("ModuleScript") then
-		return false, "payload must be a ModuleScript instance"
+		return { ok = false, value = "payload must be a ModuleScript instance" }
 	end
-	return pcall(require, payload)
+	local ok, value = pcall(require, payload)
+	return { ok = ok, value = value }
 end
 `;
 
@@ -224,4 +226,3 @@ export function installBridges(): { installed: boolean; error?: string } {
 	}
 	return { installed: true };
 }
-

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

@@ -3,10 +3,12 @@
 // and the play-client peer (ClientBroker.handleExecuteLuau). Three things this
 // module owns:
 //
-//   1. The IIFE wrapper that captures print/warn, runs user code in xpcall,
-//      and always returns { ok, value, output } so the ModuleScript itself
-//      always returns exactly one value (otherwise `print("hi")` with no
-//      return would fail with "Module code did not return exactly one value").
+//   1. The IIFE wrapper that captures print/warn, wraps require() so nested
+//      ModuleScript load failures can recover the real LogService diagnostic,
+//      runs user code in xpcall, and always returns { ok, value, output } so
+//      the ModuleScript itself always returns exactly one value (otherwise
+//      `print("hi")` with no return would fail with "Module code did not
+//      return exactly one value").
 //
 //   2. The loadstring-then-ModuleScript-require fallback, with the parse-error
 //      recovery hack that pulls the real diagnostic from LogService.
@@ -40,15 +42,15 @@ interface ExecuteResult {
 }
 
 const PAYLOAD_INSTANCE_NAME = "__MCPExecLuauPayload";
-const PAYLOAD_PATH_PREFIX = `Workspace.${PAYLOAD_INSTANCE_NAME}:`;
+const REQUIRE_GENERIC_ERROR = "Requested module experienced an error while loading";
 
 // Number of lines the wrapper emits BEFORE the first line of user code.
 // Used both inside the wrapper (Luau __mcp_LINE_OFFSET) and on the TS side
 // (remapPayloadLines, for compile errors recovered from LogService) so user
 // code errors report user-relative line numbers instead of the inflated
-// "line 23" the wrapper would otherwise expose. If you reorder buildWrapper's
-// prefix lines, update this constant — there's a self-check below.
-const WRAPPER_LINE_OFFSET = 23;
+// "line 49" the wrapper would otherwise expose. If you reorder buildWrapper's
+// prefix lines, update this constant.
+const WRAPPER_LINE_OFFSET = 84;
 
 // Count source lines so the wrapper can filter traceback frames that fall
 // outside the user code range (the wrapper's own preamble/postamble lines).
@@ -61,20 +63,29 @@ function countLines(s: string): number {
 	return n;
 }
 
-function buildWrapper(code: string): string {
+function luaPatternEscape(s: string): string {
+	const [escaped] = string.gsub(s, "([^%w])", "%%%1");
+	return escaped;
+}
+
+function buildWrapper(code: string, payloadInstanceName = PAYLOAD_INSTANCE_NAME): string {
 	// If you reorder the prefix lines below, update WRAPPER_LINE_OFFSET to
 	// match the number of lines emitted BEFORE the ${code} substitution.
 	// The constant is mirrored inside the wrapper (__mcp_LINE_OFFSET) and
 	// used by remapPayloadLines on the TS side.
 	const userLines = countLines(code);
+	const payloadPattern = luaPatternEscape(payloadInstanceName);
 	return `return ((function()
 \tlocal __mcp_traceback
 \tlocal __mcp_remap
 \tlocal __mcp_LINE_OFFSET = ${WRAPPER_LINE_OFFSET}
 \tlocal __mcp_USER_LINES = ${userLines}
+\tlocal __mcp_LogService = game:GetService("LogService")
+\tlocal __mcp_REQUIRE_GENERIC = "${REQUIRE_GENERIC_ERROR}"
 \tlocal __mcp_output = {}
 \tlocal __mcp_real_print = print
 \tlocal __mcp_real_warn = warn
+\tlocal __mcp_real_require = require
 \tlocal print = function(...)
 \t\t__mcp_real_print(...)
 \t\tlocal args = {...}
@@ -89,6 +100,64 @@ function buildWrapper(code: string): string {
 \t\tfor i, a in ipairs(args) do parts[i] = tostring(a) end
 \t\ttable.insert(__mcp_output, "[warn] " .. table.concat(parts, "\\t"))
 \tend
+\tlocal function __mcp_is_stack_noise(msg)
+\t\treturn msg == "Stack Begin" or msg == "Stack End" or string.sub(msg, 1, 8) == "Script '"
+\tend
+\tlocal function __mcp_is_actionable_require_log(entry)
+\t\tif not entry or entry.messageType ~= Enum.MessageType.MessageError then return false end
+\t\tlocal msg = tostring(entry.message)
+\t\treturn msg ~= __mcp_REQUIRE_GENERIC and not __mcp_is_stack_noise(msg)
+\tend
+\tlocal function __mcp_entry_mentions_module(entry, module_path)
+\t\tif not entry or not module_path or module_path == "" then return false end
+\t\treturn string.find(tostring(entry.message), module_path, 1, true) ~= nil
+\tend
+\tlocal function __mcp_prior_module_error(hist, module_path)
+\t\tif not module_path or module_path == "" then return nil end
+\t\tfor i = #hist, 1, -1 do
+\t\t\tlocal entry = hist[i]
+\t\t\tif __mcp_entry_mentions_module(entry, module_path) then
+\t\t\t\tif __mcp_is_actionable_require_log(entry) then
+\t\t\t\t\treturn tostring(entry.message)
+\t\t\t\tend
+\t\t\t\tfor j = i - 1, math.max(1, i - 6), -1 do
+\t\t\t\t\tlocal previous = hist[j]
+\t\t\t\t\tif __mcp_is_actionable_require_log(previous) then
+\t\t\t\t\t\treturn tostring(previous.message)
+\t\t\t\t\tend
+\t\t\t\tend
+\t\t\tend
+\t\tend
+\t\treturn nil
+\tend
+\tlocal function __mcp_recover_require_error(err, history_start, module)
+\t\tlocal err_msg = tostring(err)
+\t\tif err_msg ~= __mcp_REQUIRE_GENERIC then return err_msg end
+\t\tlocal module_path
+\t\tif typeof(module) == "Instance" then
+\t\t\tlocal ok_path, path = pcall(function()
+\t\t\t\treturn module:GetFullName()
+\t\t\tend)
+\t\t\tif ok_path then module_path = path end
+\t\tend
+\t\ttask.wait(0.05)
+\t\tlocal hist = __mcp_LogService:GetLogHistory()
+\t\tfor i = #hist, history_start + 1, -1 do
+\t\t\tlocal entry = hist[i]
+\t\t\tif __mcp_is_actionable_require_log(entry) then
+\t\t\t\treturn tostring(entry.message)
+\t\t\tend
+\t\tend
+\t\tlocal prior = __mcp_prior_module_error(hist, module_path)
+\t\tif prior then return prior end
+\t\treturn err_msg
+\tend
+\tlocal function require(module)
+\t\tlocal history_start = #__mcp_LogService:GetLogHistory()
+\t\tlocal ok, value = pcall(__mcp_real_require, module)
+\t\tif ok then return value end
+\t\terror(__mcp_recover_require_error(value, history_start, module), 0)
+\tend
 \tlocal function __mcp_run()
 ${code}
 \tend
@@ -99,15 +168,20 @@ ${code}
 \t\t-- Subtract LINE_OFFSET to get the user-relative number, then clamp.
 \t\t-- Clamping matters for unclosed constructs ("local x = (") where the
 \t\t-- parser keeps reading into wrapper postamble and reports a payload
-\t\t-- line past user EOF. Without clamping the message says "user_code:49"
-\t\t-- for one-line input, framing the wrapper as user code.
+\t\t-- line past user EOF. Without clamping, that frames wrapper postamble
+\t\t-- as user code.
 \t\tlocal function __mcp_user_line(payload_n)
 \t\t\tlocal user_n = payload_n - __mcp_LINE_OFFSET
 \t\t\tif user_n < 1 then return "1" end
 \t\t\tif user_n > __mcp_USER_LINES then return tostring(__mcp_USER_LINES) .. " (at end of input)" end
 \t\t\treturn tostring(user_n)
 \t\tend
-\t\ts = string.gsub(s, "__MCPExecLuauPayload:(%d+)", function(num)
+\t\ts = string.gsub(s, "Workspace%.${payloadPattern}:(%d+)", function(num)
+\t\t\tlocal n = tonumber(num)
+\t\t\tif n then return "user_code:" .. __mcp_user_line(n) end
+\t\t\treturn "user_code:" .. num
+\t\tend)
+\t\ts = string.gsub(s, "${payloadPattern}:(%d+)", function(num)
 \t\t\tlocal n = tonumber(num)
 \t\t\tif n then return "user_code:" .. __mcp_user_line(n) end
 \t\t\treturn "user_code:" .. num
@@ -158,7 +232,7 @@ end)())`;
 // pulling the real compile-error diagnostic out of LogService — that error
 // references the payload module's line number directly, and never passes
 // through the IIFE's runtime wrapper.
-function remapPayloadLines(s: string, userLines: number): string {
+function remapPayloadLines(s: string, userLines: number, payloadInstanceName = PAYLOAD_INSTANCE_NAME): string {
 	// Mirror of the Lua __mcp_remap inside the wrapper, for paths that
 	// don't pass through the IIFE (compile errors recovered from
 	// LogService, the immediate loadstring compileError surface). Same
@@ -172,20 +246,26 @@ function remapPayloadLines(s: string, userLines: number): string {
 		if (u > userLines) return `${tostring(userLines)} (at end of input)`;
 		return tostring(u);
 	};
+	const payloadPattern = luaPatternEscape(payloadInstanceName);
 	let out = s;
-	const [a] = string.gsub(out, "__MCPExecLuauPayload:(%d+)", (num: string) => {
+	const [a] = string.gsub(out, `Workspace%.${payloadPattern}:(%d+)`, (num: string) => {
 		const n = tonumber(num);
 		if (n !== undefined) return `user_code:${userLine(n)}`;
 		return `user_code:${num}`;
 	});
 	out = a;
-	const [b] = string.gsub(out, '%[string "[^"]+"%]:(%d+)', (num: string) => {
+	const [b] = string.gsub(out, `${payloadPattern}:(%d+)`, (num: string) => {
 		const n = tonumber(num);
 		if (n !== undefined) return `user_code:${userLine(n)}`;
 		return `user_code:${num}`;
 	});
 	out = b;
-	return out;
+	const [c] = string.gsub(out, '%[string "[^"]+"%]:(%d+)', (num: string) => {
+		const n = tonumber(num);
+		if (n !== undefined) return `user_code:${userLine(n)}`;
+		return `user_code:${num}`;
+	});
+	return c;
 }
 
 function runViaModuleScript(wrapped: string, userLines: number): WrapperResult {
@@ -205,29 +285,11 @@ function runViaModuleScript(wrapped: string, userLines: number): WrapperResult {
 	const [okReq, reqResult] = pcall(() => require(m));
 	m.Destroy();
 	if (!okReq) {
-		let errMsg = tostring(reqResult);
-		// pcall(require, m) collapses parse/compile failures into the canned
-		// engine string. The real diagnostic was emitted to LogService on the
-		// next engine frame — give it ~50ms to land then scan backward.
-		if (errMsg === "Requested module experienced an error while loading") {
-			task.wait(0.05);
-			const hist = LogService.GetLogHistory();
-			for (let i = hist.size() - 1; i >= 0; i--) {
-				const e = hist[i];
-				if (
-					e.messageType === Enum.MessageType.MessageError &&
-					string.sub(e.message, 1, PAYLOAD_PATH_PREFIX.size()) === PAYLOAD_PATH_PREFIX
-				) {
-					errMsg = e.message;
-					break;
-				}
-			}
-		}
 		// Compile errors reference the payload module's line number directly
 		// — remap + clamp to user-relative line numbers so `local x = 1 +`
 		// reports :1: instead of :23:, and reports the clamp annotation
 		// when the parser ran off the end of user code into wrapper code.
-		error(remapPayloadLines(errMsg, userLines), 0);
+		error(recoverPayloadRequireError(reqResult, userLines, PAYLOAD_INSTANCE_NAME), 0);
 	}
 	return reqResult as unknown as WrapperResult;
 }
@@ -250,6 +312,35 @@ function formatReturnValue(value: unknown): string {
 	return tostring(value);
 }
 
+function recoverPayloadRequireError(
+	err: unknown,
+	userLines: number,
+	payloadInstanceName = PAYLOAD_INSTANCE_NAME,
+	historyStart = 0,
+): string {
+	let errMsg = tostring(err);
+	// pcall(require, m) collapses parse/compile failures into the canned
+	// engine string. The real diagnostic is emitted to LogService on the
+	// next engine frame — give it ~50ms to land then scan backward.
+	if (errMsg === REQUIRE_GENERIC_ERROR) {
+		task.wait(0.05);
+		const payloadPathPrefix = `Workspace.${payloadInstanceName}:`;
+		const hist = LogService.GetLogHistory();
+		const start = math.max(0, historyStart);
+		for (let i = hist.size() - 1; i >= start; i--) {
+			const e = hist[i];
+			if (
+				e.messageType === Enum.MessageType.MessageError &&
+				string.sub(e.message, 1, payloadPathPrefix.size()) === payloadPathPrefix
+			) {
+				errMsg = e.message;
+				break;
+			}
+		}
+	}
+	return remapPayloadLines(errMsg, userLines, payloadInstanceName);
+}
+
 function execute(code: string): ExecuteResult {
 	if (!code || code === "") {
 		return { success: false, error: "code is required" };
@@ -302,4 +393,11 @@ function execute(code: string): ExecuteResult {
 	};
 }
 
-export = { execute };
+export = {
+	buildWrapper,
+	countLines,
+	execute,
+	formatReturnValue,
+	recoverPayloadRequireError,
+	remapPayloadLines,
+};

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

@@ -1,4 +1,4 @@
-// Per-peer in-memory ring buffer for LogService.MessageOut events.
+// Per-capture in-memory ring buffer for LogService.MessageOut events.
 // Powers the get_runtime_logs MCP tool. Replaces the out-of-tree LogBuffer
 // primitives + StringValue approach from chrrxs/roblox-mcp-primitives.
 //
@@ -8,12 +8,12 @@
 // DataModel. The buffer is bounded by a message-byte budget; oldest entries
 // drop when over budget.
 //
-// Peer-tag caveat: returned entries reflect which peer's plugin CAPTURED the
+// Capture caveat: returned entries reflect which plugin buffer CAPTURED the
 // entry, NOT which peer's script originated the print. LogService reflects
-// prints across peers in Studio Play (a server print ends up in both the
-// server and client LogService:GetLogHistory()) and origin is empirically
-// undetectable from inside MessageOut. The MCP-side aggregator handles
-// cross-peer dedup via a 2s timestamp window.
+// prints across peers in ordinary Studio Play (a server print can appear in
+// server and client LogService:GetLogHistory()). The MCP-side aggregator
+// exposes that as capturedBy, and only promotes it to origin peer in
+// StudioTestService multiplayer sessions where peer attribution is reliable.
 
 import { LogService, RunService } from "@rbxts/services";
 
@@ -88,13 +88,13 @@ interface QueryOptions {
 }
 
 interface QueryResult {
-	peer: string;
+	capturedBy: string;
 	entries: RuntimeLogEntry[];
 	totalDropped: number;
 	nextSince: number;
 }
 
-function query(opts: QueryOptions, peer: string): QueryResult {
+function query(opts: QueryOptions, capturedBy: string): QueryResult {
 	let result = opts.since !== undefined
 		? entries.filter((e) => e.seq > (opts.since as number))
 		: [...entries];
@@ -124,7 +124,7 @@ function query(opts: QueryOptions, peer: string): QueryResult {
 
 	const last = entries.size() > 0 ? entries[entries.size() - 1] : undefined;
 	return {
-		peer,
+		capturedBy,
 		entries: result,
 		totalDropped,
 		nextSince: last ? last.seq : (opts.since ?? 0),

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

@@ -1,6 +1,7 @@
 import { Connection } from "../types";
 
 const CURRENT_VERSION = "__VERSION__";
+const PLUGIN_VARIANT = "__PLUGIN_VARIANT__";
 const MAX_CONNECTIONS = 5;
 const BASE_PORT = 58741;
 let activeTabIndex = 0;
@@ -81,6 +82,7 @@ function getConnections(): Connection[] {
 
 export = {
 	CURRENT_VERSION,
+	PLUGIN_VARIANT,
 	MAX_CONNECTIONS,
 	BASE_PORT,
 	connections,

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

@@ -38,6 +38,7 @@ interface ToolbarIcons {
 let toolbarButton: PluginToolbarButton | undefined;
 let toolbarIcons: ToolbarIcons | undefined;
 let lastToolbarIcon: string | undefined;
+let activeBannerKind: string | undefined;
 
 function setToolbarButton(btn: PluginToolbarButton, icons: ToolbarIcons) {
 	toolbarButton = btn;
@@ -77,6 +78,23 @@ function tweenProp(instance: Instance, props: Record<string, unknown>) {
 	TweenService.Create(instance, TWEEN_QUICK, props as unknown as { [key: string]: unknown }).Play();
 }
 
+function showBanner(kind: string, text: string) {
+	activeBannerKind = kind;
+	elements.updateBannerText.Text = text;
+	elements.updateBanner.Visible = true;
+	elements.contentFrame.Position = new UDim2(0, 8, 0, 92);
+	elements.contentFrame.Size = new UDim2(1, -16, 1, -100);
+}
+
+function hideBanner(kind?: string) {
+	if (kind !== undefined && activeBannerKind !== kind) return;
+	activeBannerKind = undefined;
+	elements.updateBanner.Visible = false;
+	elements.updateBannerText.Text = "";
+	elements.contentFrame.Position = new UDim2(0, 8, 0, 66);
+	elements.contentFrame.Size = new UDim2(1, -16, 1, -74);
+}
+
 const C = {
 	bg: Color3.fromRGB(14, 14, 14),
 	card: Color3.fromRGB(22, 22, 22),
@@ -759,5 +777,7 @@ export = {
 	startPulseAnimation,
 	setToolbarButton,
 	updateToolbarIcon,
+	showBanner,
+	hideBanner,
 	getElements: () => elements,
 };

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

@@ -0,0 +1,121 @@
+import { LogService, ReplicatedStorage, RunService, ServerScriptService } from "@rbxts/services";
+import { BRIDGE_NAMES } 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 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 (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+		};
+	}
+	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 (including for manually-started playtests); if a playtest is running and you still see this, reconnect the plugin in the edit window so the bridge reinstalls, then start the playtest again.",
+	};
+}
+
+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 };
+	}
+
+	const bridge = config.service.FindFirstChild(config.bridgeName);
+	if (!bridge || !bridge.IsA("BindableFunction")) {
+		return { bridge: "missing", error: config.missingError };
+	}
+
+	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 };