@chrrxs/robloxstudio-mcp 2.15.1 → 2.15.2

package/dist/index.js

@@ -2570,223 +2570,10 @@ function encodeImageFromRgbaResponse(response, format, quality) {
     mimeType: "image/jpeg"
   };
 }
-function luaLongQuote(s) {
-  let level = 0;
-  while (s.includes(`]${"=".repeat(level)}]`))
-    level++;
-  const eq = "=".repeat(level);
-  return `[${eq}[
-${s}
-]${eq}]`;
-}
-function evalCountLines(s) {
-  return s.split("\n").length;
-}
-function buildModuleScriptInvokeWrapper(opts) {
-  const userLines = evalCountLines(opts.userCode);
-  const wrapped = `return ((function()
-	local __mcp_traceback
-	local __mcp_remap
-	local __mcp_LINE_OFFSET = ${EVAL_WRAPPER_LINE_OFFSET}
-	local __mcp_USER_LINES = ${userLines}
-	local __mcp_output = {}
-	local __mcp_real_print = print
-	local __mcp_real_warn = warn
-	local print = function(...)
-		__mcp_real_print(...)
-		local args = {...}
-		local parts = table.create(#args)
-		for i, a in ipairs(args) do parts[i] = tostring(a) end
-		table.insert(__mcp_output, table.concat(parts, "\\t"))
-	end
-	local warn = function(...)
-		__mcp_real_warn(...)
-		local args = {...}
-		local parts = table.create(#args)
-		for i, a in ipairs(args) do parts[i] = tostring(a) end
-		table.insert(__mcp_output, "[warn] " .. table.concat(parts, "\\t"))
-	end
-	local function __mcp_run()
-${opts.userCode}
-	end
-	__mcp_remap = function(s)
-		-- Two chunk-name formats can reference our payload: the
-		-- ModuleScript path "Workspace.__MCPEvalPayload:N" and the
-		-- loadstring chunk "[string \\"return ((function()...\\"]:N" (if
-		-- the IIFE happens to compile via loadstring). Normalize both to
-		-- "user_code:N" with the offset stripped AND clamped to user
-		-- range, otherwise unclosed constructs report nonsense lines deep
-		-- in the wrapper. Strip the "Workspace." parent prefix too so the
-		-- final output reads "user_code:N" not "Workspace.user_code:N".
-		local function __mcp_user_line(payload_n)
-			local user_n = payload_n - __mcp_LINE_OFFSET
-			if user_n < 1 then return "1" end
-			if user_n > __mcp_USER_LINES then return tostring(__mcp_USER_LINES) .. " (at end of input)" end
-			return tostring(user_n)
-		end
-		s = string.gsub(s, "Workspace%.__MCPEvalPayload:(%d+)", function(num)
-			local n = tonumber(num)
-			if n then return "user_code:" .. __mcp_user_line(n) end
-			return "user_code:" .. num
-		end)
-		s = string.gsub(s, "__MCPEvalPayload:(%d+)", function(num)
-			local n = tonumber(num)
-			if n then return "user_code:" .. __mcp_user_line(n) end
-			return "user_code:" .. num
-		end)
-		s = string.gsub(s, '%[string "[^"]+"%]:(%d+)', function(num)
-			local n = tonumber(num)
-			if n then return "user_code:" .. __mcp_user_line(n) end
-			return "user_code:" .. num
-		end)
-		return s
-	end
-	__mcp_traceback = function(err)
-		local raw = debug.traceback(tostring(err), 2)
-		local kept = {}
-		for line in string.gmatch(raw, "[^\\n]+") do
-			local num_str = string.match(line, "__MCPEvalPayload:(%d+)")
-				or string.match(line, '%[string "[^"]+"%]:(%d+)')
-			local n = num_str and tonumber(num_str)
-			-- Strip "in function '__mcp_run'" annotation BEFORE filtering:
-			-- user-code frames all carry that suffix (their source is
-			-- hosted inside __mcp_run), so a naive "__mcp_" filter would
-			-- drop every user frame and leave only the error header.
-			line = (string.gsub(line, " in function '__mcp_run'", ""))
-			local skip = string.find(line, "MCPPlugin", 1, true)
-				or string.find(line, "__mcp_", 1, true)
-				or string.find(line, "in function 'xpcall'", 1, true)
-			-- Drop wrapper preamble/postamble frames whose line falls
-			-- outside the user-code range \u2014 those are wrapper internals.
-			if n and (n <= __mcp_LINE_OFFSET or n > __mcp_LINE_OFFSET + __mcp_USER_LINES) then
-				skip = true
-			end
-			if not skip then
-				table.insert(kept, __mcp_remap(line))
-			end
-		end
-		return table.concat(kept, "\\n")
-	end
-	local ok, errOrValue = xpcall(__mcp_run, __mcp_traceback)
-	return { ok = ok, value = errOrValue, output = __mcp_output }
-end)())`;
-  return `
-local HttpService = game:GetService("HttpService")
-local bf = game:GetService("${opts.service}"):FindFirstChild("${opts.bridgeName}")
-if not bf then
-	return HttpService:JSONEncode({
-		bridge = "missing",
-		error = ${luaLongQuote(opts.missingError)},
-	})
-end
--- Outer-scope mirror of the in-IIFE __mcp_remap. Applied to parser errors
--- we pull out of LogService (those never pass through the IIFE) and to
--- the canned engine error string. Same offset as the IIFE's
--- __mcp_LINE_OFFSET; covers both chunk-name formats.
-local __mcp_USER_LINES_OUTER = ${userLines}
-local function __mcp_outer_user_line(payload_n)
-	local user_n = payload_n - ${EVAL_WRAPPER_LINE_OFFSET}
-	if user_n < 1 then return "1" end
-	if user_n > __mcp_USER_LINES_OUTER then return tostring(__mcp_USER_LINES_OUTER) .. " (at end of input)" end
-	return tostring(user_n)
-end
-local function __mcp_outer_remap(s)
-	s = string.gsub(s, "Workspace%.__MCPEvalPayload:(%d+)", function(num)
-		local n = tonumber(num)
-		if n then return "user_code:" .. __mcp_outer_user_line(n) end
-		return "user_code:" .. num
-	end)
-	s = string.gsub(s, "__MCPEvalPayload:(%d+)", function(num)
-		local n = tonumber(num)
-		if n then return "user_code:" .. __mcp_outer_user_line(n) end
-		return "user_code:" .. num
-	end)
-	s = string.gsub(s, '%[string "[^"]+"%]:(%d+)', function(num)
-		local n = tonumber(num)
-		if n then return "user_code:" .. __mcp_outer_user_line(n) end
-		return "user_code:" .. num
-	end)
-	return s
-end
--- JSON-encode tables; otherwise tostring. Cycles or non-serializable
--- values fall back to tostring instead of erroring. This is what makes
--- eval_server_runtime / eval_client_runtime return structured table data
--- (matching execute_luau) instead of "table: 0xaddr".
-local function __mcp_format(v)
-	if typeof(v) == "table" then
-		local ok, encoded = pcall(function() return HttpService:JSONEncode(v) end)
-		if ok then return encoded end
-	end
-	return tostring(v)
-end
-local USER_CODE = ${luaLongQuote(wrapped)}
-local m = Instance.new("ModuleScript")
-m.Name = "__MCPEvalPayload"
-local okSet, setErr = pcall(function() m.Source = USER_CODE end)
-if not okSet then
-	m:Destroy()
-	return HttpService:JSONEncode({ bridge = "ok", ok = false, error = "ModuleScript Source set failed: " .. tostring(setErr) })
-end
-m.Parent = workspace
-local bridgeOk, inner = bf:Invoke(m)
-m:Destroy()
-if not bridgeOk then
-	local errMsg = tostring(inner)
-	-- pcall(require, payload) collapses parse/compile failures into the
-	-- canned engine string below. The real parser diagnostic was emitted
-	-- to LogService just before. Walk GetLogHistory backward for the most
-	-- recent ERR entry tagged at our payload path and substitute.
-	if errMsg == "Requested module experienced an error while loading" then
-		-- The parser diagnostic is emitted to LogService on the next
-		-- engine frame, not synchronously with pcall(require). task.wait(0)
-		-- yields too early; 50ms is enough to let the frame complete and
-		-- the message land in GetLogHistory.
-		task.wait(0.05)
-		local LogService = game:GetService("LogService")
-		local hist = LogService:GetLogHistory()
-		for i = #hist, 1, -1 do
-			local e = hist[i]
-			if e.messageType == Enum.MessageType.MessageError and string.sub(e.message, 1, 27) == "Workspace.__MCPEvalPayload:" then
-				errMsg = e.message
-				break
-			end
-		end
-	end
-	return HttpService:JSONEncode({ bridge = "ok", ok = false, error = __mcp_outer_remap(errMsg) })
-end
--- inner is the {ok, value, output} table from our IIFE. Defensive: if it's
--- somehow not a table (caller bypassed the wrapper), fall back to old shape.
-if typeof(inner) ~= "table" then
-	return HttpService:JSONEncode({
-		bridge = "ok",
-		ok = true,
-		result = if inner == nil then nil else __mcp_format(inner),
-	})
-end
-return HttpService:JSONEncode({
-	bridge = "ok",
-	ok = inner.ok == true,
-	result = if inner.ok and inner.value ~= nil then __mcp_format(inner.value) else nil,
-	error = if not inner.ok then tostring(inner.value) else nil,
-	output = inner.output or {},
-})
-`;
-}
-function parseBridgeResponse(response) {
-  const r = response;
-  if (r && typeof r.returnValue === "string") {
-    try {
-      const parsed = JSON.parse(r.returnValue);
-      return JSON.stringify(parsed);
-    } catch {
-    }
-  }
-  return JSON.stringify(response);
-}
 function sleep(ms) {
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
-var SERVER_LOCAL_NAME, CLIENT_LOCAL_NAME, EVAL_WRAPPER_LINE_OFFSET, RobloxStudioTools;
+var RobloxStudioTools;
 var init_tools = __esm({
   "../core/dist/tools/index.js"() {
     "use strict";
@@ -2797,9 +2584,6 @@ var init_tools = __esm({
     init_roblox_cookie_client();
     init_jpeg_encoder();
     init_png_encoder();
-    SERVER_LOCAL_NAME = "__MCP_ServerEvalLocal";
-    CLIENT_LOCAL_NAME = "__MCP_ClientEvalBridge";
-    EVAL_WRAPPER_LINE_OFFSET = 23;
     RobloxStudioTools = class _RobloxStudioTools {
       client;
       bridge;
@@ -3476,18 +3260,12 @@ ${code}`
         if (!code) {
           throw new Error("Code is required for eval_server_runtime");
         }
-        const wrapper = buildModuleScriptInvokeWrapper({
-          service: "ServerScriptService",
-          bridgeName: SERVER_LOCAL_NAME,
-          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.",
-          userCode: code
-        });
-        const response = await this._callSingle("/api/execute-luau", { code: wrapper }, "server", instance_id);
+        const response = await this._callSingle("/api/eval-runtime", { code }, "server", instance_id);
         return {
           content: [
             {
               type: "text",
-              text: parseBridgeResponse(response)
+              text: JSON.stringify(response)
             }
           ]
         };
@@ -3500,18 +3278,12 @@ ${code}`
         if (!clientTarget.startsWith("client-")) {
           throw new Error(`eval_client_runtime requires target=client-N (got: ${clientTarget})`);
         }
-        const wrapper = buildModuleScriptInvokeWrapper({
-          service: "ReplicatedStorage",
-          bridgeName: CLIENT_LOCAL_NAME,
-          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.",
-          userCode: code
-        });
-        const response = await this._callSingle("/api/execute-luau", { code: wrapper }, clientTarget, instance_id);
+        const response = await this._callSingle("/api/eval-runtime", { code }, clientTarget, instance_id);
         return {
           content: [
             {
               type: "text",
-              text: parseBridgeResponse(response)
+              text: JSON.stringify(response)
             }
           ]
         };
@@ -3529,11 +3301,19 @@ ${code}`
         if (!resolved.ok)
           throw new RoutingFailure(resolved.error);
         if (resolved.mode === "single") {
+          const originPeerReliable2 = await this._isMultiplayerTestRunning(resolved.targetInstanceId);
           const response = await this.client.request("/api/get-runtime-logs", data, resolved.targetInstanceId, resolved.targetRole);
-          response.peer = resolved.targetRole;
+          response.capturedBy = resolved.targetRole;
+          delete response.peer;
+          response.originPeerReliable = originPeerReliable2;
+          response.peerAttribution = originPeerReliable2 ? "guaranteed_multiplayer" : "unavailable_shared_logservice";
+          if (originPeerReliable2)
+            response.peer = resolved.targetRole;
           if (Array.isArray(response.entries)) {
             for (const e of response.entries) {
-              if (e.peer !== void 0)
+              e.capturedBy = resolved.targetRole;
+              delete e.peer;
+              if (originPeerReliable2)
                 e.peer = resolved.targetRole;
             }
           }
@@ -3542,35 +3322,38 @@ ${code}`
           };
         }
         const targets = resolved.targets.filter((t) => t.targetRole !== "edit-proxy");
+        const originPeerReliable = targets.length > 0 ? await this._isMultiplayerTestRunning(targets[0].targetInstanceId) : false;
         const responses = await Promise.allSettled(targets.map(async (t) => {
           const r = await this.client.request("/api/get-runtime-logs", data, t.targetInstanceId, t.targetRole);
-          return { ...r, peer: t.targetRole };
+          return { ...r, capturedBy: t.targetRole };
         }));
         const merged = [];
-        const perPeerNextSince = {};
-        const perPeerErrors = {};
+        const perCaptureNextSince = {};
+        const perCaptureErrors = {};
         let totalDropped = 0;
         for (const r of responses) {
           if (r.status !== "fulfilled")
             continue;
           const v = r.value;
-          const peer = v.peer ?? "unknown";
+          const capturedBy = v.capturedBy ?? "unknown";
           if (v.error) {
-            perPeerErrors[peer] = v.error;
+            perCaptureErrors[capturedBy] = v.error;
             continue;
           }
           if (v.nextSince !== void 0)
-            perPeerNextSince[peer] = v.nextSince;
+            perCaptureNextSince[capturedBy] = v.nextSince;
           totalDropped += v.totalDropped ?? 0;
           for (const e of v.entries ?? []) {
-            merged.push({ ...e, peer });
+            const entry = { ...e };
+            delete entry.peer;
+            merged.push({ ...entry, capturedBy });
           }
         }
         merged.sort((a, b) => a.ts !== b.ts ? a.ts - b.ts : a.seq - b.seq);
         const DEDUP_WINDOW = 2;
         const deduped = [];
         for (const e of merged) {
-          const isDup = deduped.some((d) => d.message === e.message && d.level === e.level && Math.abs(d.ts - e.ts) <= DEDUP_WINDOW && d.peer !== e.peer);
+          const isDup = deduped.some((d) => d.message === e.message && d.level === e.level && Math.abs(d.ts - e.ts) <= DEDUP_WINDOW && d.capturedBy !== e.capturedBy);
           if (!isDup)
             deduped.push(e);
         }
@@ -3578,13 +3361,21 @@ ${code}`
         if (tail !== void 0 && deduped.length > tail) {
           final = deduped.slice(deduped.length - tail);
         }
+        const finalEntries = originPeerReliable ? final.map((e) => ({ ...e, peer: e.capturedBy })) : final;
         const body = {
-          entries: final,
+          entries: finalEntries,
           totalDropped,
-          perPeerNextSince
+          perCaptureNextSince,
+          originPeerReliable,
+          peerAttribution: originPeerReliable ? "guaranteed_multiplayer" : "unavailable_shared_logservice"
         };
-        if (Object.keys(perPeerErrors).length > 0) {
-          body.perPeerErrors = perPeerErrors;
+        if (originPeerReliable) {
+          body.perPeerNextSince = perCaptureNextSince;
+        }
+        if (Object.keys(perCaptureErrors).length > 0) {
+          body.perCaptureErrors = perCaptureErrors;
+          if (originPeerReliable)
+            body.perPeerErrors = perCaptureErrors;
         }
         return {
           content: [{ type: "text", text: JSON.stringify(body) }]
@@ -6318,17 +6109,17 @@ var init_definitions = __esm({
       {
         name: "get_runtime_logs",
         category: "read",
-        description: "Read the in-memory log buffer captured by the plugin on each peer's LogService.MessageOut. Each peer (edit, server, client-N) captures ~64 KB of recent prints; oldest entries drop when over budget. Drop-oldest semantics preserve the recent tail, unlike get_console_output's 10 KB drop-newest cap. Caveat: peer tag reflects which peer's plugin captured the entry, not which peer's script originated it - LogService reflects prints across peers in Studio Play and origin is undetectable from inside MessageOut. target=all (default) merges all peers and dedups same-message-and-level entries captured within 2s across different peers.",
+        description: "Read the in-memory log buffers captured by Studio plugin peers. Each buffer captures ~64 KB of recent LogService.MessageOut entries; oldest entries drop when over budget. Entries include capturedBy for the plugin buffer that observed the log. In ordinary Studio play/run sessions, LogService reflects logs across edit/server/client, so script-origin peer is not reliable and entries omit peer. In StudioTestService multiplayer sessions only, peer attribution is reliable and entries also include peer. target=all (default) merges buffers and dedups same-message-and-level entries captured within 2s across different buffers.",
         inputSchema: {
           type: "object",
           properties: {
             target: {
               type: "string",
-              description: 'Peer to read from: "edit", "server", "client-N", or "all" (default). "all" merges all peers and dedups cross-peer reflections within a 2s window.'
+              description: 'Capture buffer to read from: "edit", "server", "client-N", or "all" (default). "all" merges buffers and dedups cross-buffer reflections within a 2s window.'
             },
             since: {
               type: "number",
-              description: "Return only entries with seq > since. Pass back the previous response's nextSince (single-peer) or perPeerNextSince entry (target=all) for incremental polling."
+              description: "Return only entries with seq > since. Pass back the previous response's nextSince (single target) or perCaptureNextSince entry (target=all) for incremental polling."
             },
             tail: {
               type: "number",
@@ -7351,7 +7142,7 @@ function handleVariantConflict({ pluginsFolder, otherAssetName, replace, log = c
   warn(`
 [install-plugin] WARNING: ${otherAssetName} is already present in ${pluginsFolder}.
 Only one MCP plugin variant should be present. If both variants are in the Studio Plugins folder, Studio loads both and runtime routing can become unpredictable.
-Re-run with --replace-variant to remove ${otherAssetName}, or delete it manually.
+Delete ${otherAssetName} manually or use the default CLI installer behavior to replace it.
 `);
 }
 var init_install_plugin_helpers = __esm({
@@ -7473,6 +7264,27 @@ function bundledAssetPath() {
   ];
   return candidates.find((candidate) => existsSync3(candidate)) ?? null;
 }
+function packageVersion() {
+  const currentDir = dirname2(fileURLToPath(import.meta.url));
+  const pkg = JSON.parse(readFileSync3(join3(currentDir, "..", "package.json"), "utf8"));
+  if (!pkg.version) {
+    throw new Error("Package version not found");
+  }
+  return pkg.version;
+}
+function bundledPluginVersion(source) {
+  const match = readFileSync3(source, "utf8").match(/local CURRENT_VERSION = "([^"]+)"/);
+  return match ? match[1] : null;
+}
+function assertBundledPluginVersion(source) {
+  const expected = packageVersion();
+  const actual = bundledPluginVersion(source);
+  if (actual !== expected) {
+    throw new Error(
+      `Bundled ${ASSET_NAME} version ${actual ?? "unknown"} does not match package version ${expected}. Run npm run build:plugin before starting with --auto-install-plugin.`
+    );
+  }
+}
 function filesMatch(a, b) {
   if (!existsSync3(b)) return false;
   const aBytes = readFileSync3(a);
@@ -7482,11 +7294,12 @@ function filesMatch(a, b) {
 async function installBundledPlugin(options = {}) {
   const log = options.log ?? console.log;
   const warn = options.warn ?? console.warn;
-  const replaceVariant = options.replaceVariant ?? process.argv.includes("--replace-variant");
+  const replaceVariant = options.replaceVariant ?? true;
   const source = bundledAssetPath();
   if (!source) {
     throw new Error(`Bundled ${ASSET_NAME} not found in package`);
   }
+  assertBundledPluginVersion(source);
   const pluginsFolder = prepareInstall({ replaceVariant, log, warn });
   const dest = join3(pluginsFolder, ASSET_NAME);
   if (filesMatch(source, dest)) return;
@@ -7495,10 +7308,22 @@ async function installBundledPlugin(options = {}) {
 }
 async function installPlugin(options = {}) {
   const dev = options.dev ?? process.argv.includes("--dev");
-  const replaceVariant = options.replaceVariant ?? process.argv.includes("--replace-variant");
+  const replaceVariant = options.replaceVariant ?? true;
   const log = options.log ?? console.log;
   const warn = options.warn ?? console.warn;
   const pluginsFolder = prepareInstall({ replaceVariant, log, warn });
+  const bundled = bundledAssetPath();
+  if (bundled) {
+    assertBundledPluginVersion(bundled);
+    const dest2 = join3(pluginsFolder, ASSET_NAME);
+    if (filesMatch(bundled, dest2)) {
+      log(`${ASSET_NAME} already installed.`);
+      return;
+    }
+    copyFileSync(bundled, dest2);
+    log(`Installed bundled ${ASSET_NAME} to ${dest2}`);
+    return;
+  }
   log(dev ? "Fetching latest dev prerelease..." : "Fetching latest release...");
   const release = dev ? await findDevRelease() : await fetchJson(`https://api.github.com/repos/${REPO}/releases/latest`);
   const asset = release.assets?.find((a) => a.name === ASSET_NAME);
@@ -7528,7 +7353,7 @@ init_dist();
 import { createRequire } from "module";
 if (process.argv.includes("--install-plugin")) {
   const { installPlugin: installPlugin2 } = await Promise.resolve().then(() => (init_install_plugin(), install_plugin_exports));
-  installPlugin2().catch((err) => {
+  await installPlugin2().catch((err) => {
     console.error(err instanceof Error ? err.message : String(err));
     process.exitCode = 1;
   });
@@ -7536,7 +7361,6 @@ if (process.argv.includes("--install-plugin")) {
   if (process.argv.includes("--auto-install-plugin")) {
     const { installBundledPlugin: installBundledPlugin2 } = await Promise.resolve().then(() => (init_install_plugin(), install_plugin_exports));
     await installBundledPlugin2({
-      replaceVariant: process.argv.includes("--replace-variant"),
       log: (message) => console.error(`[install-plugin] ${message}`),
       warn: (message) => console.error(message)
     }).catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrrxs/robloxstudio-mcp",
-  "version": "2.15.1",
+  "version": "2.15.2",
   "description": "MCP server for testing, debugging, and controlling Roblox Studio from AI coding tools",
   "main": "dist/index.js",
   "type": "module",