@chrrxs/robloxstudio-mcp 3.0.3 → 3.0.5

package/studio-plugin/MCPPlugin.rbxmx

@@ -16,6 +16,7 @@ local cleanupEditBridgeArtifacts = _EvalBridges.cleanupEditBridgeArtifacts
 local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
+local StudioEventStream = TS.import(script, script, "modules", "StudioEventStream")
 local BreakpointHandlers = TS.import(script, script, "modules", "handlers", "BreakpointHandlers")
 local RenderMonitor = TS.import(script, script, "modules", "RenderMonitor")
 -- Track render-loop liveness so input/screenshot tools can report "window
@@ -32,8 +33,9 @@ RuntimeLogBuffer.install()
 StopPlayMonitor.init(plugin)
 BreakpointHandlers.init(plugin)
 ServerUrlSettings.init(plugin)
+local startupRole = ClientBroker.forkRole()
 local function applyRememberedServerUrl()
-	if ClientBroker.forkRole() == "client" then
+	if startupRole == "client" then
 		return nil
 	end
 	local rememberedServerUrl = ServerUrlSettings.readServerUrl()
@@ -49,6 +51,15 @@ local function applyRememberedServerUrl()
 	ClientBroker.setServerUrl(rememberedServerUrl)
 end
 applyRememberedServerUrl()
+-- Play DataModels do not reliably fire Plugin.Unloading before Studio tears
+-- down their VM. Close the persistent WebStreamClient while BindToClose still
+-- gives this server peer a live execution context; otherwise each play cycle
+-- can retain one native event stream until Studio itself is restarted. The
+-- transport releases that native stream before yielding to unregister the
+-- logical server peer.
+if startupRole == "server" then
+	game:BindToClose(StudioEventStream.suspendForShutdown)
+end
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://75876056391496"
@@ -91,7 +102,7 @@ task.delay(TOOLBAR_REGISTRATION_DELAY_SECONDS, registerToolbarButton)
 -- play peers' plugin instances load without ever registering. Run after a
 -- short delay so the UI/State have a chance to initialize first.
 task.delay(2, function()
-	local role = ClientBroker.forkRole()
+	local role = startupRole
 	if role == "edit" then
 		cleanupEditBridgeArtifacts()
 	else
@@ -133,7 +144,10 @@ task.delay(2, function()
 		-- The play-server DM is the only one where StudioTestService:EndTest is
 		-- legal, so the stop-play monitor lives here. It consumes tokenized
 		-- stop requests from plugin settings and acknowledges EndTest results.
-		StopPlayMonitor.startMonitor()
+		StopPlayMonitor.startMonitor({
+			beforeEndTest = StudioEventStream.suspendForShutdown,
+			afterEndTestFailure = StudioEventStream.resumeAfterShutdownFailure,
+		})
 	elseif role == "client" then
 		ClientBroker.setupClientBroker()
 	end
@@ -880,12 +894,12 @@ local routeMap = {
 	["/api/get-memory-breakdown"] = MemoryHandlers.getMemoryBreakdown,
 	["/api/get-scene-analysis"] = SceneAnalysisHandlers.getSceneAnalysis,
 }
-local function processRequest(request)
+local function processRequest(request, context)
 	local endpoint = request.endpoint
 	local data = request.data or {}
 	local handler = routeMap[endpoint]
 	if handler then
-		return handler(data)
+		return handler(data, context)
 	else
 		return {
 			error = `Unknown endpoint: {endpoint}`,
@@ -905,7 +919,7 @@ local function getConnectionStatus()
 	end
 	return "connecting"
 end
-local function dispatchStreamRequest(request)
+local function dispatchStreamRequest(request, context)
 	if request.logicalSessionId ~= PluginSession.id then
 		return ClientBroker.dispatchClientRequest(request.logicalSessionId, request.target, request.endpoint, request.data)
 	end
@@ -922,7 +936,7 @@ local function dispatchStreamRequest(request)
 	return processRequest({
 		endpoint = request.endpoint,
 		data = request.data,
-	})
+	}, context)
 end
 local function handleReady(response)
 	local conn = State.getActiveConnection()
@@ -1154,6 +1168,81 @@ return {
         </Properties>
       </Item>
       <Item class="ModuleScript" referent="5">
+        <Properties>
+          <string name="Name">CooperativeJobRunner</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local DEADLINE_EXCEEDED = "__RSMCP_COOPERATIVE_JOB_DEADLINE_EXCEEDED__"
+local CANCELLED = "__RSMCP_COOPERATIVE_JOB_CANCELLED__"
+local MAX_SLICE_SECONDS = 0.008
+local CLOCK_CHECK_INTERVAL = 64
+local activeJobs = {}
+local function runExclusive(key, execution, work)
+	local _key = key
+	local activeRequestId = activeJobs[_key]
+	if activeRequestId ~= nil then
+		return {
+			error = "plugin_busy",
+			activeRequestId = activeRequestId,
+		}
+	end
+	local _key_1 = key
+	local _requestId = execution.requestId
+	activeJobs[_key_1] = _requestId
+	local sliceStartedAt = os.clock()
+	local operationsUntilClockCheck = 0
+	local control = {
+		checkpoint = function(self)
+			local _result = execution.isCancelled
+			if _result ~= nil then
+				_result = _result()
+			end
+			if _result then
+				error(CANCELLED, 0)
+			end
+			if operationsUntilClockCheck > 0 then
+				operationsUntilClockCheck -= 1
+				return nil
+			end
+			operationsUntilClockCheck = CLOCK_CHECK_INTERVAL - 1
+			local now = os.clock()
+			if execution.deadlineAt ~= nil and now >= execution.deadlineAt then
+				error(DEADLINE_EXCEEDED, 0)
+			end
+			if now - sliceStartedAt >= MAX_SLICE_SECONDS then
+				task.wait()
+				sliceStartedAt = os.clock()
+			end
+		end,
+	}
+	local ok, result = pcall(function()
+		return work(control)
+	end)
+	local _key_2 = key
+	activeJobs[_key_2] = nil
+	if not ok then
+		if result == DEADLINE_EXCEEDED then
+			return {
+				error = "deadline_exceeded",
+				requestId = execution.requestId,
+			}
+		end
+		if result == CANCELLED then
+			return {
+				error = "cancelled",
+				requestId = execution.requestId,
+			}
+		end
+		error(result, 0)
+	end
+	return result
+end
+return {
+	runExclusive = runExclusive,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="6">
         <Properties>
           <string name="Name">EvalBridges</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1273,9 +1362,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "3.0.3" is replaced with the package version at package time
+	-- "3.0.5" 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.3`
+	return `{tostring(h)}-3.0.5`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1428,11 +1517,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="Folder" referent="6">
+      <Item class="Folder" referent="7">
         <Properties>
           <string name="Name">handlers</string>
         </Properties>
-        <Item class="ModuleScript" referent="7">
+        <Item class="ModuleScript" referent="8">
           <Properties>
             <string name="Name">AssetHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -1873,7 +1962,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="8">
+        <Item class="ModuleScript" referent="9">
           <Properties>
             <string name="Name">BreakpointHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2391,7 +2480,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="9">
+        <Item class="ModuleScript" referent="10">
           <Properties>
             <string name="Name">CaptureHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2635,7 +2724,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="10">
+        <Item class="ModuleScript" referent="11">
           <Properties>
             <string name="Name">EvalRuntimeHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2789,7 +2878,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="11">
+        <Item class="ModuleScript" referent="12">
           <Properties>
             <string name="Name">GenerateModelHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2994,7 +3083,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="12">
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">InputHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3194,7 +3283,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">LogHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3220,7 +3309,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">MemoryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3288,7 +3377,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="15">
+        <Item class="ModuleScript" referent="16">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3619,7 +3708,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="16">
+        <Item class="ModuleScript" referent="17">
           <Properties>
             <string name="Name">MicroProfilerHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5372,7 +5461,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="17">
+        <Item class="ModuleScript" referent="18">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5457,12 +5546,14 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="18">
+        <Item class="ModuleScript" referent="19">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
 local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
 local Utils = TS.import(script, script.Parent.Parent, "Utils")
+local CooperativeJobRunner = TS.import(script, script.Parent.Parent, "CooperativeJobRunner")
+local ScriptSearch = TS.import(script, script.Parent.Parent, "ScriptSearch")
 local _binding = Utils
 local getInstancePath = _binding.getInstancePath
 local getInstanceByPath = _binding.getInstanceByPath
@@ -6055,265 +6146,46 @@ local function getProjectStructure(requestData)
 	result.timestamp = tick()
 	return result
 end
--- Split a Lua pattern on TOP-LEVEL "|" into alternatives. Lua patterns have no
--- alternation operator, so "foo|bar" would otherwise be matched as the literal
--- text "foo|bar" and silently never hit. "%|" stays a literal pipe, and "%bxy"
--- keeps both balanced-match delimiter characters.
-local function splitLuaAlternation(pattern)
-	local parts = {}
-	local current = ""
-	local i = 1
-	local n = #pattern
-	local inCharClass = false
-	while i <= n do
-		local c = string.sub(pattern, i, i)
-		if c == "%" then
-			if string.sub(pattern, i + 1, i + 1) == "b" then
-				current ..= string.sub(pattern, i, math.min(i + 3, n))
-				i += 4
-				continue
-			end
-			-- Preserve an escape pair (e.g. %|, %., %d) intact.
-			current ..= string.sub(pattern, i, i + 1)
-			i += 2
-		elseif c == "[" then
-			inCharClass = true
-			current ..= c
-			i += 1
-		elseif c == "]" then
-			inCharClass = false
-			current ..= c
-			i += 1
-		elseif c == "|" and not inCharClass then
-			local _current = current
-			table.insert(parts, _current)
-			current = ""
-			i += 1
-		else
-			current ..= c
-			i += 1
-		end
-	end
-	local _current = current
-	table.insert(parts, _current)
-	return parts
-end
--- Return the earliest match across alternatives (mirrors regex alternation).
-local function findFirstPattern(line, alternatives)
-	local bestStart
-	local bestEnd
-	for _, alt in alternatives do
-		if alt == "" then
-			continue
-		end
-		local s, e = string.find(line, alt)
-		if s ~= nil and (bestStart == nil or s < bestStart) then
-			bestStart = s
-			bestEnd = e
+local scriptSearch = ScriptSearch.createScriptSearch({
+	resolveRoot = function(self, path)
+		return getInstanceByPath(path)
+	end,
+	getChildren = function(self, instance)
+		return instance:GetChildren()
+	end,
+	readScript = function(self, instance, classFilter)
+		if not instance:IsA("LuaSourceContainer") or (classFilter ~= nil and instance.ClassName ~= classFilter) then
+			return nil
 		end
-	end
-	return { bestStart, bestEnd }
-end
-local function grepScripts(requestData)
-	local pattern = requestData.pattern
-	if not (pattern ~= "" and pattern) then
-		return {
-			error = "pattern is required",
-		}
-	end
-	local _condition = (requestData.usePattern)
-	if _condition == nil then
-		_condition = false
-	end
-	local usePattern = _condition
-	if usePattern and requestData.caseSensitive == false then
-		return {
-			error = "Case-insensitive Lua pattern search is not supported. Omit caseSensitive or pass caseSensitive: true with usePattern: true, or use literal search.",
+		local snapshot = {
+			instancePath = getInstancePath(instance),
+			name = instance.Name,
+			className = instance.ClassName,
+			source = readScriptSource(instance),
 		}
-	end
-	local _result
-	if usePattern then
-		_result = true
-	else
-		local _condition_1 = (requestData.caseSensitive)
-		if _condition_1 == nil then
-			_condition_1 = false
+		if instance:IsA("BaseScript") then
+			snapshot.enabled = instance.Enabled
 		end
-		_result = _condition_1
-	end
-	local caseSensitive = _result
-	local _condition_1 = (requestData.contextLines)
-	if _condition_1 == nil then
-		_condition_1 = 0
-	end
-	local contextLines = _condition_1
-	local _condition_2 = (requestData.maxResults)
-	if _condition_2 == nil then
-		_condition_2 = 100
-	end
-	local maxResults = _condition_2
-	local _condition_3 = (requestData.maxResultsPerScript)
-	if _condition_3 == nil then
-		_condition_3 = 0
-	end
-	local maxResultsPerScript = _condition_3
-	local _condition_4 = (requestData.filesOnly)
-	if _condition_4 == nil then
-		_condition_4 = false
-	end
-	local filesOnly = _condition_4
-	local _condition_5 = (requestData.path)
-	if _condition_5 == nil then
-		_condition_5 = ""
-	end
-	local searchPath = _condition_5
-	local classFilter = requestData.classFilter
-	local startInstance = if searchPath ~= "" then getInstanceByPath(searchPath) else game
-	if not startInstance then
-		return {
-			error = `Path not found: {searchPath}`,
-		}
+		return snapshot
+	end,
+})
+local function grepScripts(requestData, execution)
+	local result = CooperativeJobRunner.runExclusive("script-source-search", execution, function(control)
+		return scriptSearch.search(requestData, control)
+	end)
+	if result.error == "plugin_busy" then
+		local _object = table.clone(result)
+		setmetatable(_object, nil)
+		_object.message = "Another grep_scripts request is already running in this Studio DataModel. Retry after it completes."
+		return _object
 	end
-	-- Prepare pattern for matching
-	local searchPattern = if caseSensitive then pattern else string.lower(pattern)
-	-- Pre-split top-level "|" alternation once (pattern mode only).
-	local patternAlternatives = if usePattern then splitLuaAlternation(searchPattern) else nil
-	local results = {}
-	local totalMatches = 0
-	local scriptsSearched = 0
-	local hitLimit = false
-	local function searchInstance(instance)
-		if hitLimit then
-			return nil
-		end
-		if instance:IsA("LuaSourceContainer") then
-			-- Apply class filter
-			if classFilter ~= "" and classFilter then
-				local _exp = string.lower(instance.ClassName)
-				local _arg0 = string.lower(classFilter)
-				local _value = (string.find(_exp, _arg0))
-				if not (_value ~= 0 and _value == _value and _value) then
-					return nil
-				end
-			end
-			scriptsSearched += 1
-			local source = readScriptSource(instance)
-			local lines = Utils.splitLines(source)
-			local scriptMatches = {}
-			local scriptMatchCount = 0
-			for i = 0, #lines - 1 do
-				if hitLimit then
-					break
-				end
-				if maxResultsPerScript > 0 and scriptMatchCount >= maxResultsPerScript then
-					break
-				end
-				local line = lines[i + 1]
-				local searchLine = if caseSensitive then line else string.lower(line)
-				local matchStart
-				local matchEnd
-				if usePattern then
-					local _binding_1 = findFirstPattern(searchLine, patternAlternatives)
-					matchStart = _binding_1[1]
-					matchEnd = _binding_1[2]
-				else
-					matchStart, matchEnd = string.find(searchLine, searchPattern, 1, true)
-				end
-				if matchStart ~= nil then
-					scriptMatchCount += 1
-					totalMatches += 1
-					if totalMatches > maxResults then
-						hitLimit = true
-						break
-					end
-					if not filesOnly then
-						-- Gather context lines
-						local before = {}
-						local after = {}
-						if contextLines > 0 then
-							local beforeStart = math.max(0, i - contextLines)
-							do
-								local j = beforeStart
-								local _shouldIncrement = false
-								while true do
-									if _shouldIncrement then
-										j += 1
-									else
-										_shouldIncrement = true
-									end
-									if not (j < i) then
-										break
-									end
-									local _arg0 = lines[j + 1]
-									table.insert(before, _arg0)
-								end
-							end
-							local afterEnd = math.min(#lines - 1, i + contextLines)
-							do
-								local j = i + 1
-								local _shouldIncrement = false
-								while true do
-									if _shouldIncrement then
-										j += 1
-									else
-										_shouldIncrement = true
-									end
-									if not (j <= afterEnd) then
-										break
-									end
-									local _arg0 = lines[j + 1]
-									table.insert(after, _arg0)
-								end
-							end
-						end
-						local _arg0 = {
-							line = i + 1,
-							column = matchStart,
-							text = line,
-							before = before,
-							after = after,
-						}
-						table.insert(scriptMatches, _arg0)
-					end
-				end
-			end
-			if scriptMatchCount > 0 then
-				local scriptResult = {
-					instancePath = getInstancePath(instance),
-					name = instance.Name,
-					className = instance.ClassName,
-					matches = scriptMatches,
-				}
-				if instance:IsA("BaseScript") then
-					scriptResult.enabled = instance.Enabled
-				end
-				table.insert(results, scriptResult)
-			end
-		end
-		for _, child in instance:GetChildren() do
-			if hitLimit then
-				return nil
-			end
-			searchInstance(child)
-		end
+	if result.error == "deadline_exceeded" then
+		local _object = table.clone(result)
+		setmetatable(_object, nil)
+		_object.message = "grep_scripts exceeded its bridge deadline before the scan completed."
+		return _object
 	end
-	searchInstance(startInstance)
-	return {
-		results = results,
-		pattern = pattern,
-		totalMatches = if hitLimit then `>{maxResults}` else totalMatches,
-		scriptsSearched = scriptsSearched,
-		scriptsMatched = #results,
-		truncated = hitLimit,
-		options = {
-			caseSensitive = caseSensitive,
-			contextLines = contextLines,
-			usePattern = usePattern,
-			filesOnly = filesOnly,
-			maxResults = maxResults,
-			maxResultsPerScript = maxResultsPerScript,
-		},
-	}
+	return result
 end
 return {
 	getFileTree = getFileTree,
@@ -6329,7 +6201,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="19">
+        <Item class="ModuleScript" referent="20">
           <Properties>
             <string name="Name">SceneAnalysisHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6578,7 +6450,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="20">
+        <Item class="ModuleScript" referent="21">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7250,7 +7122,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="21">
+        <Item class="ModuleScript" referent="22">
           <Properties>
             <string name="Name">ScriptProfilerHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7713,7 +7585,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="22">
+        <Item class="ModuleScript" referent="23">
           <Properties>
             <string name="Name">SerializationHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7899,7 +7771,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="23">
+        <Item class="ModuleScript" referent="24">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8278,7 +8150,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">HttpDiagnostics</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8359,7 +8231,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">LuauExec</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8793,7 +8665,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">PluginSession</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8885,7 +8757,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8915,7 +8787,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="28">
+      <Item class="ModuleScript" referent="29">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8983,7 +8855,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="29">
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9238,7 +9110,334 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="30">
+      <Item class="ModuleScript" referent="31">
+        <Properties>
+          <string name="Name">ScriptSearch</string>
+          <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local function splitLuaAlternation(pattern)
+	local parts = {}
+	local current = ""
+	local index = 1
+	local inCharacterClass = false
+	while index <= #pattern do
+		local character = string.sub(pattern, index, index)
+		if character == "%" then
+			if string.sub(pattern, index + 1, index + 1) == "b" then
+				current ..= string.sub(pattern, index, math.min(index + 3, #pattern))
+				index += 4
+			else
+				current ..= string.sub(pattern, index, index + 1)
+				index += 2
+			end
+		elseif character == "[" then
+			inCharacterClass = true
+			current ..= character
+			index += 1
+		elseif character == "]" then
+			inCharacterClass = false
+			current ..= character
+			index += 1
+		elseif character == "|" and not inCharacterClass then
+			local _current = current
+			table.insert(parts, _current)
+			current = ""
+			index += 1
+		else
+			current ..= character
+			index += 1
+		end
+	end
+	local _current = current
+	table.insert(parts, _current)
+	return parts
+end
+local function findFirstPattern(line, alternatives, control)
+	local earliest
+	for _, alternative in alternatives do
+		control:checkpoint()
+		if alternative == "" then
+			continue
+		end
+		local start = string.find(line, alternative)
+		if start ~= nil and (earliest == nil or start < earliest) then
+			earliest = start
+		end
+	end
+	return earliest
+end
+local function readLine(source, start)
+	local boundary = string.find(source, "[\r\n]", start)
+	if boundary == nil then
+		return { string.sub(source, start), nil }
+	end
+	local nextStart = boundary + 1
+	if string.sub(source, boundary, boundary) == "\r" and string.sub(source, nextStart, nextStart) == "\n" then
+		nextStart += 1
+	end
+	return { string.sub(source, start, boundary - 1), if nextStart <= #source then nextStart else nil }
+end
+local MAX_RESULTS = 10_000
+local LITERAL_CHUNK_BYTES = 64 * 1024
+local MAX_PATTERN_BYTES = 4096
+local MAX_CONTEXT_LINES = 100
+local function sourceCanMatchLiteral(source, pattern, caseSensitive, control)
+	if #source == 0 then
+		return false
+	end
+	local overlapBytes = math.max(#pattern - 1, 0)
+	local chunkStart = 1
+	while chunkStart <= #source do
+		control:checkpoint()
+		local chunkEnd = math.min(#source, chunkStart + LITERAL_CHUNK_BYTES + overlapBytes - 1)
+		local chunk = string.sub(source, chunkStart, chunkEnd)
+		local candidate = if caseSensitive then chunk else string.lower(chunk)
+		if (string.find(candidate, pattern, 1, true)) ~= nil then
+			return true
+		end
+		if chunkEnd >= #source then
+			return false
+		end
+		chunkStart += LITERAL_CHUNK_BYTES
+	end
+	return false
+end
+local function createScriptSearch(corpus)
+	local function search(requestData, control)
+		local requestedPattern = requestData.pattern
+		if not (type(requestedPattern) == "string") or requestedPattern == "" then
+			return {
+				error = "pattern is required",
+			}
+		end
+		if #requestedPattern > MAX_PATTERN_BYTES then
+			return {
+				error = "invalid_request",
+				message = `pattern must contain between 1 and {MAX_PATTERN_BYTES} bytes`,
+			}
+		end
+		local pattern = requestedPattern
+		for _, optionName in { "usePattern", "caseSensitive", "filesOnly" } do
+			local option = requestData[optionName]
+			if option ~= nil and not (type(option) == "boolean") then
+				return {
+					error = "invalid_request",
+					message = `{optionName} must be a boolean`,
+				}
+			end
+		end
+		local _condition = (requestData.usePattern)
+		if _condition == nil then
+			_condition = false
+		end
+		local usePattern = _condition
+		if usePattern and requestData.caseSensitive == false then
+			return {
+				error = "Case-insensitive Lua pattern search is not supported.",
+			}
+		end
+		local _result
+		if usePattern then
+			_result = true
+		else
+			local _condition_1 = (requestData.caseSensitive)
+			if _condition_1 == nil then
+				_condition_1 = false
+			end
+			_result = _condition_1
+		end
+		local caseSensitive = _result
+		local _condition_1 = (requestData.filesOnly)
+		if _condition_1 == nil then
+			_condition_1 = false
+		end
+		local filesOnly = _condition_1
+		local requestedContextLines = requestData.contextLines
+		if requestedContextLines ~= nil and (not (type(requestedContextLines) == "number") or math.floor(requestedContextLines) ~= requestedContextLines or requestedContextLines < 0 or requestedContextLines > MAX_CONTEXT_LINES) then
+			return {
+				error = "invalid_request",
+				message = `contextLines must be an integer between 0 and {MAX_CONTEXT_LINES}`,
+			}
+		end
+		local _condition_2 = requestedContextLines
+		if _condition_2 == nil then
+			_condition_2 = 0
+		end
+		local contextLines = _condition_2
+		local requestedMaxResults = requestData.maxResults
+		if requestedMaxResults ~= nil and (not (type(requestedMaxResults) == "number") or math.floor(requestedMaxResults) ~= requestedMaxResults or requestedMaxResults < 1 or requestedMaxResults > MAX_RESULTS) then
+			return {
+				error = "invalid_request",
+				message = `maxResults must be an integer between 1 and {MAX_RESULTS}`,
+			}
+		end
+		local _condition_3 = requestedMaxResults
+		if _condition_3 == nil then
+			_condition_3 = 100
+		end
+		local maxResults = _condition_3
+		local requestedMaxResultsPerScript = requestData.maxResultsPerScript
+		if requestedMaxResultsPerScript ~= nil and (not (type(requestedMaxResultsPerScript) == "number") or math.floor(requestedMaxResultsPerScript) ~= requestedMaxResultsPerScript or requestedMaxResultsPerScript < 0 or requestedMaxResultsPerScript > MAX_RESULTS) then
+			return {
+				error = "invalid_request",
+				message = `maxResultsPerScript must be an integer between 0 and {MAX_RESULTS}`,
+			}
+		end
+		local _condition_4 = requestedMaxResultsPerScript
+		if _condition_4 == nil then
+			_condition_4 = 0
+		end
+		local maxResultsPerScript = _condition_4
+		local classFilter = requestData.classFilter
+		local _condition_5 = (requestData.path)
+		if _condition_5 == nil then
+			_condition_5 = ""
+		end
+		local searchPath = _condition_5
+		local root = corpus:resolveRoot(searchPath)
+		if root == nil then
+			return {
+				error = `Path not found: {searchPath}`,
+			}
+		end
+		local searchPattern = if caseSensitive then pattern else string.lower(pattern)
+		local patternAlternatives = if usePattern then splitLuaAlternation(searchPattern) else nil
+		local results = {}
+		local stack = { root }
+		local totalMatches = 0
+		local scriptsSearched = 0
+		local hitLimit = false
+		while #stack > 0 and not hitLimit do
+			control:checkpoint()
+			-- ▼ Array.pop ▼
+			local _length = #stack
+			local _result_1 = stack[_length]
+			stack[_length] = nil
+			-- ▲ Array.pop ▲
+			local instance = _result_1
+			local snapshot = corpus:readScript(instance, classFilter)
+			if snapshot ~= nil and (classFilter == nil or snapshot.className == classFilter) then
+				scriptsSearched += 1
+				local scriptMatches = {}
+				local before = {}
+				local pendingAfter = {}
+				local scriptMatchCount = 0
+				local lineNumber = 1
+				local lineStart = 1
+				local canMatch = usePattern or sourceCanMatchLiteral(snapshot.source, searchPattern, caseSensitive, control)
+				if canMatch then
+					while lineStart ~= nil and not hitLimit do
+						control:checkpoint()
+						local _binding = readLine(snapshot.source, lineStart)
+						local line = _binding[1]
+						local nextLineStart = _binding[2]
+						for _, pending in pendingAfter do
+							if pending.remaining > 0 then
+								local _exp = pending.match.after
+								table.insert(_exp, line)
+								pending.remaining -= 1
+							end
+						end
+						while #pendingAfter > 0 and pendingAfter[1].remaining == 0 do
+							table.remove(pendingAfter, 1)
+						end
+						local candidate = if caseSensitive then line else string.lower(line)
+						local matchStart = if usePattern then findFirstPattern(candidate, patternAlternatives, control) else (string.find(candidate, searchPattern, 1, true))
+						if matchStart ~= nil and (maxResultsPerScript == 0 or scriptMatchCount < maxResultsPerScript) then
+							scriptMatchCount += 1
+							totalMatches += 1
+							if totalMatches > maxResults then
+								hitLimit = true
+								break
+							end
+							if not filesOnly then
+								local _object = {
+									line = lineNumber,
+									column = matchStart,
+									text = line,
+								}
+								local _left = "before"
+								local _array = {}
+								local _length_1 = #_array
+								table.move(before, 1, #before, _length_1 + 1, _array)
+								_object[_left] = _array
+								_object.after = {}
+								local lineMatch = _object
+								table.insert(scriptMatches, lineMatch)
+								if contextLines > 0 then
+									local _arg0 = {
+										match = lineMatch,
+										remaining = contextLines,
+									}
+									table.insert(pendingAfter, _arg0)
+								end
+							end
+						end
+						if maxResultsPerScript > 0 and scriptMatchCount >= maxResultsPerScript and #pendingAfter == 0 then
+							break
+						end
+						if contextLines > 0 then
+							table.insert(before, line)
+							while #before > contextLines do
+								table.remove(before, 1)
+							end
+						end
+						lineStart = nextLineStart
+						if nextLineStart == nil then
+							break
+						end
+						lineNumber += 1
+					end
+				end
+				if scriptMatchCount > 0 then
+					local scriptResult = {
+						instancePath = snapshot.instancePath,
+						name = snapshot.name,
+						className = snapshot.className,
+						matches = scriptMatches,
+					}
+					if snapshot.enabled ~= nil then
+						scriptResult.enabled = snapshot.enabled
+					end
+					table.insert(results, scriptResult)
+				end
+			end
+			local children = {}
+			for _, child in corpus:getChildren(instance) do
+				table.insert(children, child)
+			end
+			for index = #children - 1, 0, -1 do
+				local _arg0 = children[index + 1]
+				table.insert(stack, _arg0)
+			end
+		end
+		return {
+			results = results,
+			pattern = pattern,
+			totalMatches = if hitLimit then `>{maxResults}` else totalMatches,
+			scriptsSearched = scriptsSearched,
+			scriptsMatched = #results,
+			truncated = hitLimit,
+			options = {
+				caseSensitive = caseSensitive,
+				contextLines = contextLines,
+				usePattern = usePattern,
+				filesOnly = filesOnly,
+				maxResults = maxResults,
+				maxResultsPerScript = maxResultsPerScript,
+			},
+		}
+	end
+	return {
+		search = search,
+	}
+end
+return {
+	createScriptSearch = createScriptSearch,
+}
+]]></string>
+        </Properties>
+      </Item>
+      <Item class="ModuleScript" referent="32">
         <Properties>
           <string name="Name">ServerUrlSettings</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9377,11 +9576,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="31">
+      <Item class="ModuleScript" referent="33">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "3.0.3"
+local CURRENT_VERSION = "3.0.5"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
 local function createConnection(port)
@@ -9411,7 +9610,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="32">
+      <Item class="ModuleScript" referent="34">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9461,6 +9660,7 @@ local WAIT_POLL_SEC = 0.1
 local REQUEST_TTL_SEC = 12.0
 local pluginRef
 local endTestIssued = false
+local transportLifecycle
 local function init(p)
 	pluginRef = p
 end
@@ -9604,15 +9804,29 @@ local function handleStopRequest(key, request)
 		return nil
 	end
 	endTestIssued = true
+	local lifecycle = transportLifecycle
+	if lifecycle ~= nil then
+		local closeOk, closeError = pcall(lifecycle.beforeEndTest)
+		if not closeOk then
+			warn(`[robloxstudio-mcp] Failed to close the play-server transport before EndTest: {tostring(closeError)}`)
+		end
+	end
 	local endOk, endErr = pcall(function()
 		return StudioTestService:EndTest("stopped_by_mcp")
 	end)
 	writeResult(key, request, endOk, if endOk then nil else tostring(endErr))
 	if not endOk then
 		endTestIssued = false
+		if lifecycle ~= nil then
+			local restoreOk, restoreError = pcall(lifecycle.afterEndTestFailure)
+			if not restoreOk then
+				warn(`[robloxstudio-mcp] Failed to restore the play-server transport after EndTest failed: {tostring(restoreError)}`)
+			end
+		end
 	end
 end
-local function startMonitor()
+local function startMonitor(lifecycle)
+	transportLifecycle = lifecycle
 	if not pluginRef then
 		warn("[robloxstudio-mcp] StopPlayMonitor.startMonitor called before init; skipping")
 		return nil
@@ -9702,7 +9916,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="33">
+      <Item class="ModuleScript" referent="35">
         <Properties>
           <string name="Name">StudioEventStream</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9718,12 +9932,13 @@ local MAX_TERMINAL_RESPONSES = 256
 local STREAM_SILENCE_TIMEOUT_SECONDS = 20
 local options
 local active = false
+local shutdownSuspended = false
 local generation = 0
 local reconnectAttempt = 0
 local streamClient
 local streamConnections = {}
 local lastValidEventAt = 0
-local inFlightRequestIds = {}
+local inFlightRequests = {}
 local pendingResponses = {}
 local terminalResponseIds = {}
 local terminalResponseOrder = {}
@@ -9780,6 +9995,21 @@ local function decodeMessage(message)
 		_object[_left_2] = if type(_pluginVariant) == "string" then envelope.pluginVariant else nil
 		return _object
 	end
+	if envelope.kind == "cancel" then
+		local _requestId = envelope.requestId
+		local _condition = not (type(_requestId) == "string")
+		if not _condition then
+			_condition = (envelope.reason ~= "timeout" and envelope.reason ~= "aborted" and envelope.reason ~= "connection_closed")
+		end
+		if _condition then
+			return nil
+		end
+		return {
+			kind = "cancel",
+			requestId = envelope.requestId,
+			reason = envelope.reason,
+		}
+	end
 	if envelope.kind == "request" then
 		local _requestId = envelope.requestId
 		local _condition = not (type(_requestId) == "string")
@@ -9792,6 +10022,13 @@ local function decodeMessage(message)
 				if not _condition then
 					local _endpoint = envelope.endpoint
 					_condition = not (type(_endpoint) == "string")
+					if not _condition then
+						local _remainingMs = envelope.remainingMs
+						_condition = not (type(_remainingMs) == "number")
+						if not _condition then
+							_condition = envelope.remainingMs < 0
+						end
+					end
 				end
 			end
 		end
@@ -9810,6 +10047,7 @@ local function decodeMessage(message)
 			target = envelope.target,
 			endpoint = envelope.endpoint,
 			data = data,
+			remainingMs = envelope.remainingMs,
 		}
 	end
 	return nil
@@ -9827,6 +10065,21 @@ local function closeCurrentStream()
 		end)
 	end
 end
+local function disconnectSession(currentOptions)
+	pcall(function()
+		return HttpService:RequestAsync({
+			Url = `{currentOptions.serverUrl}/disconnect`,
+			Method = "POST",
+			Headers = {
+				["Content-Type"] = "application/json",
+			},
+			Body = HttpService:JSONEncode({
+				pluginSessionId = PluginSession.id,
+				timestamp = tick(),
+			}),
+		})
+	end)
+end
 local function responseRetryDelay(attempt)
 	return math.min(INITIAL_RESPONSE_RETRY_DELAY_SECONDS * math.pow(2, math.max(attempt - 1, 0)), MAX_RESPONSE_RETRY_DELAY_SECONDS)
 end
@@ -9977,6 +10230,21 @@ local function encodeResponse(requestId, response)
 		error = `Plugin response serialization failed: {tostring(encoded)}`,
 	})
 end
+local function cancelRequest(event)
+	local _requestId = event.requestId
+	local inFlight = inFlightRequests[_requestId]
+	if inFlight ~= nil then
+		inFlight.cancelled = true
+	end
+	local _requestId_1 = event.requestId
+	local pending = pendingResponses[_requestId_1]
+	if pending ~= nil then
+		pending.retryToken += 1
+		local _requestId_2 = event.requestId
+		pendingResponses[_requestId_2] = nil
+	end
+	rememberTerminalResponse(event.requestId)
+end
 local function dispatchRequest(request)
 	local _requestId = request.requestId
 	local _condition = terminalResponseIds[_requestId] ~= nil
@@ -9985,7 +10253,7 @@ local function dispatchRequest(request)
 		_condition = pendingResponses[_requestId_1] ~= nil
 		if not _condition then
 			local _requestId_2 = request.requestId
-			_condition = inFlightRequestIds[_requestId_2] ~= nil
+			_condition = inFlightRequests[_requestId_2] ~= nil
 		end
 	end
 	if _condition then
@@ -9995,12 +10263,48 @@ local function dispatchRequest(request)
 	if not active or dispatchOptions == nil then
 		return nil
 	end
+	local inFlight = {
+		cancelled = false,
+	}
+	local context = {
+		requestId = request.requestId,
+		deadlineAt = os.clock() + request.remainingMs / 1000,
+		isCancelled = function()
+			return inFlight.cancelled
+		end,
+	}
 	local _requestId_1 = request.requestId
-	inFlightRequestIds[_requestId_1] = true
+	inFlightRequests[_requestId_1] = inFlight
 	task.spawn(function()
+		local _condition_1 = inFlight.cancelled
+		if not _condition_1 then
+			local _requestId_2 = request.requestId
+			_condition_1 = terminalResponseIds[_requestId_2] ~= nil
+		end
+		if _condition_1 then
+			local _requestId_2 = request.requestId
+			if inFlightRequests[_requestId_2] == inFlight then
+				local _requestId_3 = request.requestId
+				inFlightRequests[_requestId_3] = nil
+			end
+			return nil
+		end
 		local dispatchOk, response = pcall(function()
-			return dispatchOptions.dispatchRequest(request)
+			return dispatchOptions.dispatchRequest(request, context)
 		end)
+		local _condition_2 = inFlight.cancelled
+		if not _condition_2 then
+			local _requestId_2 = request.requestId
+			_condition_2 = terminalResponseIds[_requestId_2] ~= nil
+		end
+		if _condition_2 then
+			local _requestId_2 = request.requestId
+			if inFlightRequests[_requestId_2] == inFlight then
+				local _requestId_3 = request.requestId
+				inFlightRequests[_requestId_3] = nil
+			end
+			return nil
+		end
 		local responseData = if dispatchOk then response else {
 			error = tostring(response),
 		}
@@ -10013,7 +10317,7 @@ local function dispatchRequest(request)
 		local _requestId_2 = request.requestId
 		pendingResponses[_requestId_2] = entry
 		local _requestId_3 = request.requestId
-		inFlightRequestIds[_requestId_3] = nil
+		inFlightRequests[_requestId_3] = nil
 		postPendingResponse(request.requestId, entry)
 	end)
 end
@@ -10232,6 +10536,10 @@ function connect(expectedGeneration)
 				end)
 				return nil
 			end
+			if event.kind == "cancel" then
+				cancelRequest(event)
+				return nil
+			end
 			if event.kind == "request" then
 				dispatchRequest(event)
 				return nil
@@ -10260,11 +10568,12 @@ function connect(expectedGeneration)
 end
 local stop
 local function start(newOptions)
-	if active then
+	if active or shutdownSuspended then
 		stop()
 	end
 	options = newOptions
 	active = true
+	shutdownSuspended = false
 	reconnectAttempt = 0
 	generation += 1
 	connect(generation)
@@ -10278,42 +10587,64 @@ function refresh()
 	reconnectAttempt = 0
 	connect(generation)
 end
+-- EndTest can tear down a play DataModel without giving Plugin.Unloading a
+-- usable execution window. Release the native WebStreamClient before the
+-- yielding unregister request, but retain local request state and connection
+-- options so a failed EndTest can register again and reconnect.
+local function suspendForShutdown()
+	local currentOptions = options
+	if not active or currentOptions == nil then
+		return nil
+	end
+	active = false
+	shutdownSuspended = true
+	generation += 1
+	reconnectAttempt = 0
+	closeCurrentStream()
+	disconnectSession(currentOptions)
+end
+local function resumeAfterShutdownFailure()
+	if not shutdownSuspended or options == nil then
+		return nil
+	end
+	shutdownSuspended = false
+	active = true
+	generation += 1
+	reconnectAttempt = 0
+	connect(generation)
+end
 function stop()
-	if not active then
+	if not active and not shutdownSuspended then
 		return nil
 	end
 	local currentOptions = options
 	active = false
+	shutdownSuspended = false
 	generation += 1
+	for _, inFlight in inFlightRequests do
+		inFlight.cancelled = true
+	end
+	table.clear(inFlightRequests)
+	table.clear(pendingResponses)
 	closeCurrentStream()
 	table.clear(readyFailureLogKeys)
 	options = nil
 	reconnectAttempt = 0
 	if currentOptions ~= nil then
-		pcall(function()
-			return HttpService:RequestAsync({
-				Url = `{currentOptions.serverUrl}/disconnect`,
-				Method = "POST",
-				Headers = {
-					["Content-Type"] = "application/json",
-				},
-				Body = HttpService:JSONEncode({
-					pluginSessionId = PluginSession.id,
-					timestamp = tick(),
-				}),
-			})
-		end)
+		disconnectSession(currentOptions)
 	end
 end
 return {
 	start = start,
 	refresh = refresh,
+	suspendForShutdown = suspendForShutdown,
+	resumeAfterShutdownFailure = resumeAfterShutdownFailure,
 	stop = stop,
 }
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="34">
+      <Item class="ModuleScript" referent="36">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -10865,7 +11196,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="35">
+      <Item class="ModuleScript" referent="37">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -11149,21 +11480,11 @@ local function splitLines(source)
 	end
 	local normalized = (string.gsub((string.gsub(_condition, "\r\n", "\n")), "\r", "\n"))
 	local endsWithNewline = string.sub(normalized, -1) == "\n"
-	local lines = {}
-	local start = 1
-	while true do
-		local newlinePos = string.find(normalized, "\n", start, true)
-		if newlinePos ~= nil then
-			local _arg0 = string.sub(normalized, start, newlinePos - 1)
-			table.insert(lines, _arg0)
-			start = newlinePos + 1
-		else
-			local remainder = string.sub(normalized, start)
-			if remainder ~= "" or not endsWithNewline then
-				table.insert(lines, remainder)
-			end
-			break
-		end
+	local lines = string.split(normalized, "\n")
+	-- split() includes a final empty field for a trailing newline. Keep the
+	-- existing splitLines contract, which tracks that newline separately.
+	if endsWithNewline and lines[#lines] == "" then
+		lines[#lines] = nil
 	end
 	if #lines == 0 then
 		table.insert(lines, "")
@@ -11178,15 +11499,21 @@ local function joinLines(lines, hadTrailingNewline)
 	return source
 end
 local function readScriptSource(instance)
-	local ok, result = pcall(function()
+	local editorOk, editorSource = pcall(function()
+		return ScriptEditorService:GetEditorSource(instance)
+	end)
+	if editorOk then
+		return editorSource
+	end
+	local documentOk, documentSource = pcall(function()
 		local doc = ScriptEditorService:FindScriptDocument(instance)
 		if doc then
 			return doc:GetText()
 		end
 		return nil
 	end)
-	if ok and result ~= nil then
-		return result
+	if documentOk and documentSource ~= nil then
+		return documentSource
 	end
 	-- @rbxts/types does not expose PluginSecurity Source reads.
 	local readableScript = instance
@@ -11710,11 +12037,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="40">
+    <Item class="Folder" referent="42">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="36">
+      <Item class="ModuleScript" referent="38">
         <Properties>
           <string name="Name">LibMP</string>
           <string name="Source"><![CDATA[-- =============================================================================
@@ -168098,7 +168425,7 @@ return LibMP
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="37">
+      <Item class="ModuleScript" referent="39">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -170172,7 +170499,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="38">
+      <Item class="ModuleScript" referent="40">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -170439,15 +170766,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="41">
+    <Item class="Folder" referent="43">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="42">
+      <Item class="Folder" referent="44">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="39">
+      <Item class="ModuleScript" referent="41">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {