@chrrxs/robloxstudio-mcp 3.0.0 → 3.0.2

package/studio-plugin/MCPPlugin.rbxmx

@@ -271,6 +271,7 @@ local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandl
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
 local CaptureHandlers = TS.import(script, script.Parent, "handlers", "CaptureHandlers")
 local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandlers")
+local MetadataHandlers = TS.import(script, script.Parent, "handlers", "MetadataHandlers")
 local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
 local BreakpointHandlers = TS.import(script, script.Parent, "handlers", "BreakpointHandlers")
 local ScriptProfilerHandlers = TS.import(script, script.Parent, "handlers", "ScriptProfilerHandlers")
@@ -351,6 +352,7 @@ local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 	["/api/capture-begin"] = true,
 	["/api/simulate-mouse-input"] = true,
 	["/api/simulate-keyboard-input"] = true,
+	["/api/focus-viewport"] = true,
 }
 -- Throttle re-ready calls per proxyId so a brief window of unknownInstance
 -- polls doesn't cause a re-register stampede.
@@ -559,6 +561,9 @@ local function setupClientBroker()
 		if payload and payload.endpoint == "/api/simulate-keyboard-input" then
 			return InputHandlers.simulateKeyboardInput(payload.data or {})
 		end
+		if payload and payload.endpoint == "/api/focus-viewport" then
+			return MetadataHandlers.focusViewport(payload.data or {})
+		end
 		if payload and payload.endpoint == "/api/execute-luau" then
 			return handleExecuteLuau(payload.data)
 		end
@@ -611,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)
@@ -669,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)
@@ -826,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
@@ -885,6 +917,8 @@ local routeMap = {
 	["/api/delete-script-lines"] = ScriptHandlers.deleteScriptLines,
 	["/api/get-attributes"] = MetadataHandlers.getAttributes,
 	["/api/get-selection"] = MetadataHandlers.getSelection,
+	["/api/set-selection"] = MetadataHandlers.setSelection,
+	["/api/focus-viewport"] = MetadataHandlers.focusViewport,
 	["/api/execute-luau"] = MetadataHandlers.executeLuau,
 	["/api/eval-runtime"] = EvalRuntimeHandlers.evalRuntime,
 	["/api/start-playtest"] = TestHandlers.startPlaytest,
@@ -1108,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()
@@ -1126,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
@@ -1216,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)
@@ -1280,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
@@ -1328,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()
@@ -1521,9 +1575,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.0.0" 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.0`
+	return `{tostring(h)}-3.0.2`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -3593,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
@@ -3638,6 +3695,180 @@ local function getSelection(_requestData)
 		message = `{#selection} object(s) selected`,
 	}
 end
+-- The counterpart to getSelection: this sets it. Selecting what the agent just
+-- built shows the user the result and puts the instance under Studio's own
+-- move/scale handles, which is why it is a tool and not left to execute_luau.
+local function setSelection(requestData)
+	local rawPaths = requestData.paths
+	if not (type(rawPaths) == "table") then
+		return {
+			error = "paths is required (an empty array clears in set mode)",
+		}
+	end
+	local _condition = (requestData.mode)
+	if _condition == nil then
+		_condition = "set"
+	end
+	local mode = _condition
+	if mode ~= "set" and mode ~= "add" and mode ~= "remove" then
+		return {
+			error = `mode must be "set", "add" or "remove" (got: {mode})`,
+		}
+	end
+	local paths = rawPaths
+	if #paths == 0 and mode ~= "set" then
+		return {
+			error = `paths cannot be empty in {mode} mode`,
+		}
+	end
+	local targets = {}
+	local missing = {}
+	for _, entry in paths do
+		if not (type(entry) == "string") or entry == "" then
+			return {
+				error = "paths must contain non-empty instance path strings",
+			}
+		end
+		local instance = getInstanceByPath(entry)
+		if instance then
+			table.insert(targets, instance)
+		else
+			table.insert(missing, entry)
+		end
+	end
+	local clearsSelection = mode == "set" and #paths == 0
+	if #targets == 0 and not clearsSelection then
+		return {
+			error = "No matching instances found for any path",
+			missingPaths = missing,
+		}
+	end
+	local ok, err = pcall(function()
+		if mode == "add" then
+			Selection:Add(targets)
+		elseif mode == "remove" then
+			Selection:Remove(targets)
+		else
+			Selection:Set(targets)
+		end
+	end)
+	if not ok then
+		return {
+			error = `Selection.{mode} failed: {tostring(err)}`,
+		}
+	end
+	return {
+		success = true,
+		mode = mode,
+		selected = #targets,
+		missingPaths = missing,
+		message = if clearsSelection then "Selection cleared" elseif mode == "remove" then `Deselected {#targets} object(s)` else `{#targets} object(s) {if mode == "add" then "added to" else "in"} the selection`,
+	}
+end
+-- Aims the Studio camera at an instance and frames it from a sensible angle.
+-- This completes the screenshot loop capture_screenshot documents: build,
+-- focus, screenshot. Framing distance comes from the bounding box and the
+-- camera's own field of view so any subject fills a similar share of frame.
+local function focusViewport(requestData)
+	local instancePath = requestData.path
+	if not (instancePath ~= "" and instancePath) then
+		return {
+			error = "path is required (the instance to frame)",
+		}
+	end
+	local instance = getInstanceByPath(instancePath)
+	if not instance then
+		return {
+			error = `Instance not found: {instancePath}`,
+		}
+	end
+	local workspace = game:GetService("Workspace")
+	local camera = workspace.CurrentCamera
+	if not camera then
+		return {
+			error = "Workspace.CurrentCamera is unavailable right now",
+		}
+	end
+	local _condition = tonumber(requestData.padding)
+	if _condition == nil then
+		_condition = 1
+	end
+	local padding = _condition
+	if padding <= 0 or padding > 10 then
+		return {
+			error = "padding must be greater than 0 and at most 10",
+		}
+	end
+	local compassOverride = if requestData.from == nil then nil else tonumber(requestData.from)
+	if requestData.from ~= nil and compassOverride == nil then
+		return {
+			error = "from must be a compass angle in degrees",
+		}
+	end
+	local elevationOverride = if requestData.angleY == nil then nil else tonumber(requestData.angleY)
+	if requestData.angleY ~= nil and (elevationOverride == nil or elevationOverride < -89 or elevationOverride > 89) then
+		return {
+			error = "angleY must be between -89 and 89",
+		}
+	end
+	local ok, err = pcall(function()
+		local boundsCF
+		local boundsSize
+		if instance:IsA("Model") then
+			boundsCF, boundsSize = instance:GetBoundingBox()
+		elseif instance:IsA("BasePart") then
+			boundsCF = instance.CFrame
+			boundsSize = instance.Size
+		else
+			return error(`Cannot frame a {instance.ClassName}: it has no 3D bounding box. Frame a part or model instead.`)
+		end
+		local center = boundsCF.Position
+		local direction = camera.CFrame.LookVector * (-1)
+		local currentHorizontal = Vector3.new(direction.X, 0, direction.Z)
+		local horizontalDirection = if currentHorizontal.Magnitude < 0.001 then Vector3.new(1, 0, 0) else currentHorizontal.Unit
+		if compassOverride ~= nil then
+			local yaw = math.rad(compassOverride)
+			horizontalDirection = Vector3.new(math.cos(yaw), 0, math.sin(yaw))
+		end
+		local vertical = direction.Y
+		local horizontalMagnitude = math.sqrt(math.max(0, 1 - vertical * vertical))
+		if elevationOverride ~= nil then
+			local pitch = math.rad(elevationOverride)
+			vertical = math.sin(pitch)
+			horizontalMagnitude = math.cos(pitch)
+		end
+		local _horizontalDirection = horizontalDirection
+		local _horizontalMagnitude = horizontalMagnitude
+		local _vector3 = Vector3.new(0, vertical, 0)
+		direction = (_horizontalDirection * _horizontalMagnitude + _vector3).Unit
+		camera.CameraType = Enum.CameraType.Scriptable
+		local _direction = direction
+		local _arg0 = math.max(boundsSize.Magnitude, 1)
+		camera.CFrame = CFrame.lookAt(center + (_direction * _arg0), center)
+		camera.Focus = CFrame.new(center)
+		camera:ZoomToExtents(boundsCF, boundsSize)
+		if padding ~= 1 then
+			local fittedOffset = camera.CFrame.Position - center
+			local _arg0_1 = fittedOffset * padding
+			camera.CFrame = CFrame.lookAt(center + _arg0_1, center)
+		end
+		camera.Focus = CFrame.new(center)
+	end)
+	if not ok then
+		return {
+			error = `focus failed: {tostring(err)}`,
+		}
+	end
+	return {
+		success = true,
+		path = getInstancePath(instance),
+		cameraPosition = {
+			X = camera.CFrame.Position.X,
+			Y = camera.CFrame.Position.Y,
+			Z = camera.CFrame.Position.Z,
+		},
+	}
+end
 local function executeLuau(requestData)
 	local code = requestData.code
 	if not (code ~= "" and code) or code == "" then
@@ -3654,6 +3885,8 @@ end
 return {
 	getAttributes = getAttributes,
 	getSelection = getSelection,
+	setSelection = setSelection,
+	focusViewport = focusViewport,
 	executeLuau = executeLuau,
 }
 ]]></string>
@@ -3674,6 +3907,8 @@ local DEFAULT_MAX_TIMERS_PER_GROUP = 5
 local DEFAULT_MAX_RELATED_TIMERS = 3
 local DEFAULT_MAX_EVENTS = 250000
 local MAX_EVENTS = 1000000
+local COOPERATIVE_CLOCK_CHECK_INTERVAL = 128
+local MAX_COOPERATIVE_SLICE_SECONDS = 0.008
 local DEFAULT_FRAME_WINDOW = 240
 local BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
 local PAD_BYTE = (string.byte("="))
@@ -3690,6 +3925,87 @@ local FOCUS_GROUP_MASKS = {
 	jobs = { "Jobs" },
 }
 local cachedLibMP
+-- Sampling the clock avoids a timing call for every event while still bounding
+-- each VM resumption. Sorting uses the same checkpoint so no full sort is atomic.
+local function createCooperativeCheckpoint()
+	local operationsSinceClockCheck = 0
+	local sliceStartedAt = os.clock()
+	return function()
+		operationsSinceClockCheck += 1
+		if operationsSinceClockCheck < COOPERATIVE_CLOCK_CHECK_INTERVAL then
+			return nil
+		end
+		operationsSinceClockCheck = 0
+		if os.clock() - sliceStartedAt < MAX_COOPERATIVE_SLICE_SECONDS then
+			return nil
+		end
+		task.wait()
+		sliceStartedAt = os.clock()
+	end
+end
+local function cooperativeSort(values, comesBefore, checkpoint)
+	local count = #values
+	if count < 2 then
+		return nil
+	end
+	local function siftDown(start, lastIndex)
+		local root = start
+		while root * 2 + 1 <= lastIndex do
+			checkpoint()
+			local candidate = root
+			local left = root * 2 + 1
+			if comesBefore(values[candidate + 1], values[left + 1]) then
+				candidate = left
+			end
+			local right = left + 1
+			if right <= lastIndex and comesBefore(values[candidate + 1], values[right + 1]) then
+				candidate = right
+			end
+			if candidate == root then
+				return nil
+			end
+			local value = values[root + 1]
+			values[root + 1] = values[candidate + 1]
+			values[candidate + 1] = value
+			root = candidate
+		end
+	end
+	do
+		local start = math.floor((count - 2) / 2)
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				start -= 1
+			else
+				_shouldIncrement = true
+			end
+			if not (start >= 0) then
+				break
+			end
+			siftDown(start, count - 1)
+			checkpoint()
+		end
+	end
+	do
+		local lastIndex = count - 1
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				lastIndex -= 1
+			else
+				_shouldIncrement = true
+			end
+			if not (lastIndex > 0) then
+				break
+			end
+			local value = values[1]
+			values[1] = values[lastIndex + 1]
+			values[lastIndex + 1] = value
+			checkpoint()
+			siftDown(0, lastIndex - 1)
+		end
+	end
+end
 local function normalizeDurationMs(value)
 	local _value = value
 	if not (type(_value) == "number") then
@@ -3817,7 +4133,7 @@ local function addFrameRaw(map, frameId, raw)
 	local _arg1 = _condition + raw
 	_map[_exp] = _arg1
 end
-local function summarizeFrameImpact(frameRawById, analyzedFrames)
+local function summarizeFrameImpact(frameRawById, analyzedFrames, checkpoint)
 	local _condition = frameRawById == nil
 	if not _condition then
 		-- ▼ ReadonlyMap.size ▼
@@ -3842,6 +4158,7 @@ local function summarizeFrameImpact(frameRawById, analyzedFrames)
 	local maxUs = 0
 	local maxFrameId = 0
 	for frameId, raw in frameRawById do
+		checkpoint()
 		local us = rawToUs(raw)
 		table.insert(values, us)
 		totalUs += us
@@ -3850,9 +4167,9 @@ local function summarizeFrameImpact(frameRawById, analyzedFrames)
 			maxFrameId = frameId
 		end
 	end
-	table.sort(values, function(a, b)
+	cooperativeSort(values, function(a, b)
 		return a < b
-	end)
+	end, checkpoint)
 	return {
 		active_frame_count = #values,
 		active_frame_pct = percent(#values, analyzedFrames),
@@ -3863,7 +4180,7 @@ local function summarizeFrameImpact(frameRawById, analyzedFrames)
 		max_frame_id = maxFrameId,
 	}
 end
-local function encodeBase64(buf)
+local function encodeBase64(buf, checkpoint)
 	local len = buffer.len(buf)
 	local fullTriples = math.floor(len / 3)
 	local remaining = len - fullTriples * 3
@@ -3892,6 +4209,7 @@ local function encodeBase64(buf)
 			buffer.writeu8(out, di + 3, B64[bit32.band(b2, 63) + 1])
 			si += 3
 			di += 4
+			checkpoint()
 		end
 	end
 	if remaining == 2 then
@@ -4002,7 +4320,7 @@ local function recommendedToolsForGroups(groups, targetRole)
 	end
 	return tools
 end
-local function collectFrameSummary(session, startFrame, frameMax)
+local function collectFrameSummary(session, startFrame, frameMax, checkpoint)
 	local frameRows = {}
 	local durations = {}
 	local incompleteFrames = 0
@@ -4020,6 +4338,7 @@ local function collectFrameSummary(session, startFrame, frameMax)
 			if not (frameId <= frameMax) then
 				break
 			end
+			checkpoint()
 			local ok, descOrErr = safeCall(function()
 				return session:GetFrameDesc(frameId)
 			end)
@@ -4059,15 +4378,16 @@ local function collectFrameSummary(session, startFrame, frameMax)
 			_frameId = frameId
 		end
 	end
-	table.sort(durations, function(a, b)
+	cooperativeSort(durations, function(a, b)
 		return a < b
-	end)
-	table.sort(frameRows, function(a, b)
+	end, checkpoint)
+	cooperativeSort(frameRows, function(a, b)
 		return (a.duration_us) > (b.duration_us)
-	end)
+	end, checkpoint)
 	local totalUs = 0
 	for _, duration in durations do
 		totalUs += duration
+		checkpoint()
 	end
 	local topFrames = {}
 	do
@@ -4381,6 +4701,7 @@ local function captureMicroProfiler(requestData)
 			backend = backend,
 		}
 	end
+	local checkpoint = createCooperativeCheckpoint()
 	local stacks = {}
 	local aggregates = {}
 	local timerThreadAggregates = {}
@@ -4396,7 +4717,11 @@ local function captureMicroProfiler(requestData)
 	local sampledFrameMax
 	local lastProcessedFrameId
 	local lastProcessedTimestampRaw
-	while eventsSampled < maxEvents and iterator:Step() do
+	while eventsSampled < maxEvents do
+		checkpoint()
+		if not iterator:Step() then
+			break
+		end
 		eventsSampled += 1
 		local state = iterator:GetState()
 		if not state then
@@ -4437,6 +4762,7 @@ local function captureMicroProfiler(requestData)
 			exitEvents += 1
 			local entry
 			while #stack > 0 do
+				checkpoint()
 				-- ▼ Array.pop ▼
 				local _length = #stack
 				local _result = stack[_length]
@@ -4514,7 +4840,7 @@ local function captureMicroProfiler(requestData)
 		_condition_2 = frameMax
 	end
 	local analysisFrameMax = _condition_2
-	local frameSummary = collectFrameSummary(session, analysisFrameMin, analysisFrameMax)
+	local frameSummary = collectFrameSummary(session, analysisFrameMin, analysisFrameMax, checkpoint)
 	local _frames = frameSummary.frames
 	local _condition_3 = type(_frames) == "number"
 	if _condition_3 then
@@ -4563,6 +4889,7 @@ local function captureMicroProfiler(requestData)
 	local omittedBelowThreshold = 0
 	local omittedByFilter = 0
 	for timerId, aggregate in aggregates do
+		checkpoint()
 		local info = getTimerInfo(timerId)
 		local totalUs = rawToUs(aggregate.inclusive_raw)
 		if not includeIdle and isIdleTimer(info) then
@@ -4627,7 +4954,7 @@ local function captureMicroProfiler(requestData)
 		if maxToAvg ~= nil then
 			row.max_to_avg = maxToAvg
 		end
-		local timerFrameImpact = summarizeFrameImpact(timerFrameAggregates[timerId], analysisFrameCount)
+		local timerFrameImpact = summarizeFrameImpact(timerFrameAggregates[timerId], analysisFrameCount, checkpoint)
 		for key, value in pairs(timerFrameImpact) do
 			row[key] = value
 		end
@@ -4653,12 +4980,14 @@ local function captureMicroProfiler(requestData)
 			end
 			for frameId, raw in timerFrames do
 				addFrameRaw(groupFrames, frameId, raw)
+				checkpoint()
 			end
 		end
 		local perThread = timerThreadAggregates[timerId]
 		if perThread ~= nil then
 			local timerThreadSummaryRows = {}
 			for threadId, threadAggregate in perThread do
+				checkpoint()
 				local threadAggregateRow = threadAggregates[threadId]
 				if threadAggregateRow == nil then
 					threadAggregateRow = {
@@ -4717,9 +5046,9 @@ local function captureMicroProfiler(requestData)
 				}
 				table.insert(timerThreadSummaryRows, _arg0)
 			end
-			table.sort(timerThreadSummaryRows, function(a, b)
+			cooperativeSort(timerThreadSummaryRows, function(a, b)
 				return (a.inclusive_us) > (b.inclusive_us)
-			end)
+			end, checkpoint)
 			if maxRelatedTimers > 0 and #timerThreadSummaryRows > 0 then
 				local topTimerThreads = {}
 				do
@@ -4742,13 +5071,14 @@ local function captureMicroProfiler(requestData)
 			end
 		end
 	end
-	table.sort(rows, function(a, b)
+	cooperativeSort(rows, function(a, b)
 		return (a.inclusive_us) > (b.inclusive_us)
-	end)
+	end, checkpoint)
 	local edgeRows = {}
 	local parentRelationsByChild = {}
 	local childRelationsByParent = {}
 	for _, edge in edgeAggregates do
+		checkpoint()
 		local _parent_timer_id = edge.parent_timer_id
 		local parentRow = rowsByTimerId[_parent_timer_id]
 		local _child_timer_id = edge.child_timer_id
@@ -4819,21 +5149,24 @@ local function captureMicroProfiler(requestData)
 		}
 		table.insert(_childRelations, _arg0_1)
 	end
-	table.sort(edgeRows, function(a, b)
+	cooperativeSort(edgeRows, function(a, b)
 		return (a.inclusive_us) > (b.inclusive_us)
-	end)
+	end, checkpoint)
 	if maxRelatedTimers > 0 then
 		for _, relationRows in parentRelationsByChild do
-			table.sort(relationRows, function(a, b)
+			checkpoint()
+			cooperativeSort(relationRows, function(a, b)
 				return (a.inclusive_us) > (b.inclusive_us)
-			end)
+			end, checkpoint)
 		end
 		for _, relationRows in childRelationsByParent do
-			table.sort(relationRows, function(a, b)
+			checkpoint()
+			cooperativeSort(relationRows, function(a, b)
 				return (a.inclusive_us) > (b.inclusive_us)
-			end)
+			end, checkpoint)
 		end
 		for _, row in rows do
+			checkpoint()
 			local timerId = row.timer_id
 			local parents = parentRelationsByChild[timerId]
 			local children = childRelationsByParent[timerId]
@@ -4900,10 +5233,11 @@ local function captureMicroProfiler(requestData)
 	local rowsByExclusive = {}
 	for _, row in rows do
 		table.insert(rowsByExclusive, row)
+		checkpoint()
 	end
-	table.sort(rowsByExclusive, function(a, b)
+	cooperativeSort(rowsByExclusive, function(a, b)
 		return (a.exclusive_us) > (b.exclusive_us)
-	end)
+	end, checkpoint)
 	local topTimersByExclusive = {}
 	do
 		local i = 0
@@ -4942,6 +5276,7 @@ local function captureMicroProfiler(requestData)
 	end
 	local threadRows = {}
 	for threadId, aggregate in threadAggregates do
+		checkpoint()
 		local info = getThreadInfo(threadId)
 		local inclusiveUs = rawToUs(aggregate.inclusive_raw)
 		local exclusiveUs = rawToUs(aggregate.exclusive_raw)
@@ -4959,9 +5294,9 @@ local function captureMicroProfiler(requestData)
 			pct_of_analyzed_wall = percent(inclusiveUs, analysisDurationUs),
 		}
 		local timerRows = threadTimerRows[threadId] or {}
-		table.sort(timerRows, function(a, b)
+		cooperativeSort(timerRows, function(a, b)
 			return (a.inclusive_us) > (b.inclusive_us)
-		end)
+		end, checkpoint)
 		local topThreadTimers = {}
 		do
 			local i = 0
@@ -4984,9 +5319,9 @@ local function captureMicroProfiler(requestData)
 		end
 		table.insert(threadRows, row)
 	end
-	table.sort(threadRows, function(a, b)
+	cooperativeSort(threadRows, function(a, b)
 		return (a.inclusive_us) > (b.inclusive_us)
-	end)
+	end, checkpoint)
 	local topThreads = {}
 	do
 		local i = 0
@@ -5007,15 +5342,16 @@ local function captureMicroProfiler(requestData)
 	end
 	local groupRows = {}
 	for _, aggregate in groupAggregates do
+		checkpoint()
 		local _group = aggregate.group
 		local _condition_5 = groupTimerRows[_group]
 		if _condition_5 == nil then
 			_condition_5 = {}
 		end
 		local timerRows = _condition_5
-		table.sort(timerRows, function(a, b)
+		cooperativeSort(timerRows, function(a, b)
 			return (a.inclusive_us) > (b.inclusive_us)
-		end)
+		end, checkpoint)
 		local topGroupTimers = {}
 		do
 			local i = 0
@@ -5058,7 +5394,7 @@ local function captureMicroProfiler(requestData)
 			pct_of_analyzed_wall = percent(inclusiveUs, analysisDurationUs),
 		}
 		local _group_1 = aggregate.group
-		local groupFrameImpact = summarizeFrameImpact(groupFrameAggregates[_group_1], analysisFrameCount)
+		local groupFrameImpact = summarizeFrameImpact(groupFrameAggregates[_group_1], analysisFrameCount, checkpoint)
 		for key, value in pairs(groupFrameImpact) do
 			groupRow[key] = value
 		end
@@ -5067,9 +5403,9 @@ local function captureMicroProfiler(requestData)
 		end
 		table.insert(groupRows, groupRow)
 	end
-	table.sort(groupRows, function(a, b)
+	cooperativeSort(groupRows, function(a, b)
 		return (a.inclusive_us) > (b.inclusive_us)
-	end)
+	end, checkpoint)
 	local topGroups = {}
 	do
 		local i = 0
@@ -5091,10 +5427,11 @@ local function captureMicroProfiler(requestData)
 	local groupRowsByExclusive = {}
 	for _, row in groupRows do
 		table.insert(groupRowsByExclusive, row)
+		checkpoint()
 	end
-	table.sort(groupRowsByExclusive, function(a, b)
+	cooperativeSort(groupRowsByExclusive, function(a, b)
 		return (a.exclusive_us) > (b.exclusive_us)
-	end)
+	end, checkpoint)
 	local topGroupsByExclusive = {}
 	do
 		local i = 0
@@ -5126,6 +5463,7 @@ local function captureMicroProfiler(requestData)
 	local openStackEntriesAtEnd = 0
 	for _, stack in stacks do
 		openStackEntriesAtEnd += #stack
+		checkpoint()
 	end
 	local iteratorFinished = eventsSampled < maxEvents
 	local partialReasons = {}
@@ -5148,21 +5486,25 @@ local function captureMicroProfiler(requestData)
 		for _, row in rows do
 			local _arg0 = pickFields(row, timerFields)
 			table.insert(timerIndex, _arg0)
+			checkpoint()
 		end
 		local groupIndex = {}
 		for _, row in groupRows do
 			local _arg0 = pickFields(row, groupFields)
 			table.insert(groupIndex, _arg0)
+			checkpoint()
 		end
 		local threadIndex = {}
 		for _, row in threadRows do
 			local _arg0 = pickFields(row, threadFields)
 			table.insert(threadIndex, _arg0)
+			checkpoint()
 		end
 		local edgeIndex = {}
 		for _, row in edgeRows do
 			local _arg0 = pickFields(row, edgeFields)
 			table.insert(edgeIndex, _arg0)
+			checkpoint()
 		end
 		comparisonIndex = {
 			timers = timerIndex,
@@ -5291,7 +5633,7 @@ local function captureMicroProfiler(requestData)
 		result.snapshot_object_size_bytes = session:GetObjSize()
 	end
 	if includeRawBuffer then
-		result.raw_snapshot_base64 = encodeBase64(snapshot)
+		result.raw_snapshot_base64 = encodeBase64(snapshot, checkpoint)
 	end
 	iterator:Dispose()
 	session:Dispose()
@@ -5860,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
@@ -5900,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 = {}
@@ -5975,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)
@@ -6527,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
@@ -6664,7 +6998,7 @@ end
 local function setScriptSource(requestData)
 	local instancePath = requestData.instancePath
 	local newSource = requestData.source
-	if not (instancePath ~= "" and instancePath) or not (newSource ~= "" and newSource) then
+	if not (instancePath ~= "" and instancePath) or not (type(newSource) == "string") then
 		return {
 			error = "Instance path and source are required",
 		}
@@ -6680,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)
@@ -6704,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)
@@ -6750,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 {
@@ -6848,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 {
@@ -9272,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.0"
+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,
@@ -9303,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>