@chrrxs/robloxstudio-mcp 3.0.1 → 3.0.2

package/package.json

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

package/studio-plugin/MCPPlugin.rbxmx

@@ -616,15 +616,33 @@ local function pollProxy(proxyId, player, rf)
 			unregisterProxy(player)
 			break
 		end
+		local nextPollDelay = 0.5
 		local ok, res = pcall(function()
-			return HttpService:RequestAsync({
-				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}`,
+			local requestOptions = {
+				Url = `{mcpUrl}/poll?pluginSessionId={proxyId}&pollMode=long`,
 				Method = "GET",
 				Headers = {
 					["Content-Type"] = "application/json",
 				},
-			})
+				Timeout = State.POLL_REQUEST_TIMEOUT_SECONDS,
+			}
+			return HttpService:RequestAsync(requestOptions)
 		end)
+		-- RequestAsync may yield for the full long-poll window. Never apply a
+		-- stale response to a player whose proxy was removed or replaced.
+		local _player = player
+		local currentProxy = proxyByPlayer[_player]
+		local _condition_1 = player.Parent == nil
+		if not _condition_1 then
+			local _result = currentProxy
+			if _result ~= nil then
+				_result = _result.pluginSessionId
+			end
+			_condition_1 = _result ~= proxyId
+		end
+		if _condition_1 then
+			break
+		end
 		if ok and res and (res.Success or res.StatusCode == 503) then
 			local okJson, body = pcall(function()
 				return HttpService:JSONDecode(res.Body)
@@ -674,9 +692,17 @@ local function pollProxy(proxyId, player, rf)
 						response = response,
 					})
 				end
+				if res.Success and body.pollMode == "long" and body.knownInstance ~= false and body.request == nil then
+					nextPollDelay = 0
+				end
 			end
 		end
-		task.wait(0.5)
+		if nextPollDelay > 0 then
+			task.wait(nextPollDelay)
+		else
+			-- Yield one scheduler turn before replacing a completed long poll.
+			task.wait()
+		end
 	end
 end
 local function registerProxy(player, rf)
@@ -831,6 +857,7 @@ local lastVersionMismatchWarningKey
 local lastReadyInstanceId
 local readyFailureLogKeys = {}
 local retryingDuplicateReady = false
+local pollEpoch = 0
 -- 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
@@ -1115,16 +1142,24 @@ local function pollForRequests()
 	if conn.isPolling then
 		return nil
 	end
+	local epoch = pollEpoch
 	conn.isPolling = true
 	local success, result = pcall(function()
-		return HttpService:RequestAsync({
-			Url = `{conn.serverUrl}/poll?pluginSessionId={pluginSessionId}`,
+		local requestOptions = {
+			Url = `{conn.serverUrl}/poll?pluginSessionId={pluginSessionId}&pollMode=long`,
 			Method = "GET",
 			Headers = {
 				["Content-Type"] = "application/json",
 			},
-		})
+			Timeout = State.POLL_REQUEST_TIMEOUT_SECONDS,
+		}
+		return HttpService:RequestAsync(requestOptions)
 	end)
+	-- A held request can finish after deactivate/reactivate. Only the current
+	-- lifecycle epoch may mutate connection state or clear a newer poll's lock.
+	if epoch ~= pollEpoch or not conn.isActive then
+		return nil
+	end
 	conn.isPolling = false
 	local ui = UI.getElements()
 	UI.updateToolbarIcon()
@@ -1133,6 +1168,12 @@ local function pollForRequests()
 		conn.currentRetryDelay = 0.5
 		conn.lastSuccessfulConnection = tick()
 		local data = HttpService:JSONDecode(result.Body)
+		conn.lastPoll = tick()
+		if result.Success and data.pollMode == "long" and data.knownInstance ~= false and data.request == nil then
+			-- The server held this request until work or timeout, so immediately
+			-- replace it instead of reintroducing the legacy 500 ms idle gap.
+			conn.lastPoll = 0
+		end
 		local mcpConnected = data.mcpConnected == true
 		conn.lastHttpOk = true
 		conn.lastMcpOk = mcpConnected
@@ -1223,6 +1264,7 @@ local function pollForRequests()
 			end)
 		end
 	elseif conn.isActive then
+		conn.lastPoll = tick()
 		conn.consecutiveFailures += 1
 		if conn.consecutiveFailures > 1 then
 			conn.currentRetryDelay = math.min(conn.currentRetryDelay * conn.retryBackoffMultiplier, conn.maxRetryDelay)
@@ -1287,6 +1329,9 @@ local deactivatePlugin
 local function activatePlugin()
 	local conn = State.getActiveConnection()
 	local ui = UI.getElements()
+	pollEpoch += 1
+	conn.isPolling = false
+	conn.lastPoll = 0
 	conn.isActive = true
 	conn.consecutiveFailures = 0
 	conn.currentRetryDelay = 0.5
@@ -1335,6 +1380,8 @@ local function activatePlugin()
 end
 function deactivatePlugin()
 	local conn = State.getActiveConnection()
+	pollEpoch += 1
+	conn.isPolling = false
 	conn.isActive = false
 	conn.lastMcpOk = false
 	UI.updateUIState()
@@ -1528,9 +1575,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.0.1" is replaced with the package version at package time
+	-- "3.0.2" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-3.0.1`
+	return `{tostring(h)}-3.0.2`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -3600,11 +3647,14 @@ local function getAttributes(requestData)
 			}
 			count += 1
 		end
-		return {
+		local response = {
 			instancePath = instancePath,
-			attributes = serializedAttributes,
 			count = count,
 		}
+		if count > 0 then
+			response.attributes = serializedAttributes
+		end
+		return response
 	end)
 	if success then
 		return result
@@ -6152,7 +6202,6 @@ local function getProjectStructure(requestData)
 			name = instance.Name,
 			className = instance.ClassName,
 			path = getInstancePath(instance),
-			children = {},
 		}
 		if instance:IsA("LuaSourceContainer") then
 			node.hasSource = true
@@ -6192,7 +6241,7 @@ local function getProjectStructure(requestData)
 			-- ▲ ReadonlyArray.filter ▲
 			children = _newValue
 		end
-		local nodeChildren = node.children
+		local nodeChildren = {}
 		local childCount = #children
 		if childCount > 20 and depth < maxDepth then
 			local classGroups = {}
@@ -6267,6 +6316,9 @@ local function getProjectStructure(requestData)
 				table.insert(nodeChildren, _arg0)
 			end
 		end
+		if #nodeChildren > 0 then
+			node.children = nodeChildren
+		end
 		return node
 	end
 	local result = getStructure(startInstance, 0)
@@ -6819,16 +6871,6 @@ local finishRecording = _binding_1.finishRecording
 local SOURCE_TRUNCATE_CHAR_BUDGET = 25000
 local SOURCE_TRUNCATE_LINE_BUDGET = 400
 local SOURCE_TRUNCATE_TO_LINES = 300
-local function normalizeEscapes(s)
-	local result = s
-	result = (string.gsub(result, "\\\\", "\x01"))
-	result = (string.gsub(result, "\\n", "\n"))
-	result = (string.gsub(result, "\\t", "\t"))
-	result = (string.gsub(result, "\\r", "\r"))
-	result = (string.gsub(result, '\\"', '"'))
-	result = (string.gsub(result, "\x01", "\\"))
-	return result
-end
 local function getTopServiceName(instance)
 	local topServiceInst = instance
 	while topServiceInst.Parent and topServiceInst.Parent ~= game do
@@ -6972,7 +7014,8 @@ local function setScriptSource(requestData)
 			error = `Instance is not a script-like object: {instance.ClassName}`,
 		}
 	end
-	local sourceToSet = normalizeEscapes(newSource)
+	-- Communication has already JSON-decoded the poll payload; source text is exact at this boundary.
+	local sourceToSet = newSource
 	local recordingId = beginRecording(`Set script source: {instance.Name}`)
 	local readSuccess, readResult = pcall(function()
 		return #readScriptSource(instance)
@@ -6996,40 +7039,9 @@ local function setScriptSource(requestData)
 			message = `Script source updated successfully ({if applyResult.method == "UpdateSourceAsync" then "editor-safe" else "direct assignment"})`,
 		}
 	end
-	local replaceSuccess, replaceResult = pcall(function()
-		local parent = instance.Parent
-		local name = instance.Name
-		local className = instance.ClassName
-		local wasBaseScript = instance:IsA("BaseScript")
-		local enabled = if wasBaseScript then instance.Enabled else nil
-		local newScript = Instance.new(className)
-		newScript.Name = name
-		-- @rbxts/types does not expose PluginSecurity Source writes.
-		local writableNewScript = newScript
-		writableNewScript.Source = sourceToSet
-		if readScriptSource(newScript) ~= sourceToSet then
-			error("Replacement script source did not match the requested source")
-		end
-		if wasBaseScript and enabled ~= nil then
-			local newBaseScript = newScript
-			newBaseScript.Enabled = enabled
-		end
-		newScript.Parent = parent
-		instance:Destroy()
-		return {
-			success = true,
-			instancePath = getInstancePath(newScript),
-			method = "replace",
-			message = "Script replaced successfully with new source",
-		}
-	end)
-	if replaceSuccess then
-		finishRecording(recordingId, true)
-		return replaceResult
-	end
 	finishRecording(recordingId, false)
 	return {
-		error = `Failed to set script source. {applyResult.error} Replace method failed: {replaceResult}`,
+		error = `Failed to set script source: {applyResult.error}`,
 	}
 end
 local function editScriptLines(requestData)
@@ -7042,8 +7054,6 @@ local function editScriptLines(requestData)
 			error = "Instance path, old_string, and new_string are required",
 		}
 	end
-	oldString = normalizeEscapes(oldString)
-	newString = normalizeEscapes(newString)
 	local instance = getInstanceByPath(instancePath)
 	if not instance then
 		return {
@@ -7140,7 +7150,6 @@ local function insertScriptLines(requestData)
 			error = "Instance path and newContent are required",
 		}
 	end
-	newContent = normalizeEscapes(newContent)
 	local instance = getInstanceByPath(instancePath)
 	if not instance then
 		return {
@@ -9564,9 +9573,10 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "3.0.1"
+local CURRENT_VERSION = "3.0.2"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
+local POLL_REQUEST_TIMEOUT_SECONDS = 20
 local function createConnection(port)
 	return {
 		port = port,
@@ -9595,6 +9605,7 @@ return {
 	CURRENT_VERSION = CURRENT_VERSION,
 	PLUGIN_VARIANT = PLUGIN_VARIANT,
 	BASE_PORT = BASE_PORT,
+	POLL_REQUEST_TIMEOUT_SECONDS = POLL_REQUEST_TIMEOUT_SECONDS,
 	getActiveConnection = getActiveConnection,
 }
 ]]></string>