@chrrxs/robloxstudio-mcp-inspector 2.16.3 → 2.17.0

package/studio-plugin/MCPInspectorPlugin.rbxmx

@@ -16,6 +16,7 @@ local cleanupLegacyEditBridges = _EvalBridges.cleanupLegacyEditBridges
 local ensureRuntimeBridgeInstalled = _EvalBridges.ensureRuntimeBridgeInstalled
 local RuntimeLogBuffer = TS.import(script, script, "modules", "RuntimeLogBuffer")
 local StopPlayMonitor = TS.import(script, script, "modules", "StopPlayMonitor")
+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
 -- minimized / not rendering" instead of silently no-op'ing. No-op in the
@@ -29,6 +30,7 @@ RuntimeLogBuffer.install()
 -- edit DM (write the flag) and the play-server DM (read+act on the flag) can
 -- access plugin:SetSetting/GetSetting.
 StopPlayMonitor.init(plugin)
+BreakpointHandlers.init(plugin)
 ServerUrlSettings.init(plugin)
 UI.init(plugin)
 local elements = UI.getElements()
@@ -147,6 +149,8 @@ local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "Scen
 local CaptureHandlers = TS.import(script, script.Parent, "handlers", "CaptureHandlers")
 local InputHandlers = TS.import(script, script.Parent, "handlers", "InputHandlers")
 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")
 local LuauExec = TS.import(script, script.Parent, "LuauExec")
 local State = TS.import(script, script.Parent, "State")
 local HttpDiagnostics = TS.import(script, script.Parent, "HttpDiagnostics")
@@ -215,6 +219,8 @@ local CLIENT_BROKER_ALLOWED_ENDPOINTS = {
 	["/api/get-runtime-logs"] = true,
 	["/api/get-memory-breakdown"] = true,
 	["/api/get-scene-analysis"] = true,
+	["/api/breakpoints"] = true,
+	["/api/capture-script-profiler"] = true,
 	["/api/multiplayer-test-state"] = true,
 	["/api/multiplayer-test-leave-client"] = true,
 	["/api/capture-begin"] = true,
@@ -404,6 +410,12 @@ local function setupClientBroker()
 		if payload and payload.endpoint == "/api/get-scene-analysis" then
 			return SceneAnalysisHandlers.getSceneAnalysis(payload.data or {})
 		end
+		if payload and payload.endpoint == "/api/breakpoints" then
+			return BreakpointHandlers.breakpoints(payload.data or {})
+		end
+		if payload and payload.endpoint == "/api/capture-script-profiler" then
+			return ScriptProfilerHandlers.captureScriptProfiler(payload.data or {})
+		end
 		if payload and payload.endpoint == "/api/multiplayer-test-state" then
 			return handleMultiplayerTestState()
 		end
@@ -650,6 +662,8 @@ local LogHandlers = TS.import(script, script.Parent, "handlers", "LogHandlers")
 local SerializationHandlers = TS.import(script, script.Parent, "handlers", "SerializationHandlers")
 local MemoryHandlers = TS.import(script, script.Parent, "handlers", "MemoryHandlers")
 local SceneAnalysisHandlers = TS.import(script, script.Parent, "handlers", "SceneAnalysisHandlers")
+local BreakpointHandlers = TS.import(script, script.Parent, "handlers", "BreakpointHandlers")
+local ScriptProfilerHandlers = TS.import(script, script.Parent, "handlers", "ScriptProfilerHandlers")
 local EvalRuntimeHandlers = TS.import(script, script.Parent, "handlers", "EvalRuntimeHandlers")
 local ClientBroker = TS.import(script, script.Parent, "ClientBroker")
 local ServerUrlSettings = TS.import(script, script.Parent, "ServerUrlSettings")
@@ -739,7 +753,6 @@ local routeMap = {
 	["/api/grep-scripts"] = QueryHandlers.grepScripts,
 	["/api/get-descendants"] = QueryHandlers.getDescendants,
 	["/api/compare-instances"] = QueryHandlers.compareInstances,
-	["/api/get-output-log"] = QueryHandlers.getOutputLog,
 	["/api/set-property"] = PropertyHandlers.setProperty,
 	["/api/set-properties"] = PropertyHandlers.setProperties,
 	["/api/mass-set-property"] = PropertyHandlers.massSetProperty,
@@ -771,7 +784,6 @@ local routeMap = {
 	["/api/bulk-set-attributes"] = MetadataHandlers.bulkSetAttributes,
 	["/api/start-playtest"] = TestHandlers.startPlaytest,
 	["/api/stop-playtest"] = TestHandlers.stopPlaytest,
-	["/api/get-playtest-output"] = TestHandlers.getPlaytestOutput,
 	["/api/multiplayer-test-start"] = TestHandlers.multiplayerTestStart,
 	["/api/multiplayer-test-state"] = TestHandlers.multiplayerTestState,
 	["/api/multiplayer-test-add-players"] = TestHandlers.multiplayerTestAddPlayers,
@@ -791,6 +803,8 @@ local routeMap = {
 	["/api/simulate-keyboard-input"] = InputHandlers.simulateKeyboardInput,
 	["/api/find-and-replace-in-scripts"] = ScriptHandlers.findAndReplaceInScripts,
 	["/api/get-runtime-logs"] = LogHandlers.getRuntimeLogs,
+	["/api/breakpoints"] = BreakpointHandlers.breakpoints,
+	["/api/capture-script-profiler"] = ScriptProfilerHandlers.captureScriptProfiler,
 	["/api/export-rbxm"] = SerializationHandlers.exportRbxm,
 	["/api/import-rbxm"] = SerializationHandlers.importRbxm,
 	["/api/get-memory-breakdown"] = MemoryHandlers.getMemoryBreakdown,
@@ -1411,9 +1425,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.16.3" is replaced with the package version at package time
+	-- "2.17.0" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.16.3`
+	return `{tostring(h)}-2.17.0`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1857,6 +1871,524 @@ return {
           </Properties>
         </Item>
         <Item class="ModuleScript" referent="7">
+          <Properties>
+            <string name="Name">BreakpointHandlers</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 _binding = Utils
+local getInstanceByPath = _binding.getInstanceByPath
+local HttpService = game:GetService("HttpService")
+local RunService = game:GetService("RunService")
+local ServerStorage = game:GetService("ServerStorage")
+local LOG_PREFIX = "Breakpoint"
+local REGISTRY_KEY_PREFIX = "MCP_BREAKPOINTS_V1_"
+local MCP_PLACE_ID_ATTRIBUTE = "__MCPPlaceId"
+local pluginRef
+local loadedRegistryKey
+local loadedRegistryFromSettings = false
+local breakpoints = {}
+local function init(p)
+	pluginRef = p
+end
+local function breakpointKey(scriptPath, line)
+	return `{scriptPath}:{line}`
+end
+local function computeInstanceId()
+	if game.PlaceId ~= 0 then
+		return `place:{tostring(game.PlaceId)}`
+	end
+	local existing = ServerStorage:GetAttribute(MCP_PLACE_ID_ATTRIBUTE)
+	if type(existing) == "string" and existing ~= "" then
+		return `anon:{existing}`
+	end
+	local fresh = HttpService:GenerateGUID(false)
+	pcall(function()
+		return ServerStorage:SetAttribute(MCP_PLACE_ID_ATTRIBUTE, fresh)
+	end)
+	return `anon:{fresh}`
+end
+local function detectRole()
+	if not RunService:IsRunning() then
+		return "edit"
+	end
+	if RunService:IsServer() then
+		return "server"
+	end
+	return "client"
+end
+local function requestedRole(requestData)
+	local ___mcp_target_role = requestData.__mcp_target_role
+	local _condition = type(___mcp_target_role) == "string"
+	if _condition then
+		_condition = requestData.__mcp_target_role ~= ""
+	end
+	return if _condition then requestData.__mcp_target_role else detectRole()
+end
+local function registryScope(requestData)
+	local ___mcp_instance_id = requestData.__mcp_instance_id
+	local _condition = type(___mcp_instance_id) == "string"
+	if _condition then
+		_condition = requestData.__mcp_instance_id ~= ""
+	end
+	local instanceId = if _condition then requestData.__mcp_instance_id else computeInstanceId()
+	local role = requestedRole(requestData)
+	return {
+		key = `{REGISTRY_KEY_PREFIX}{instanceId}:{role}`,
+	}
+end
+local function readSetting(key)
+	if not pluginRef then
+		return nil
+	end
+	local ok, value = pcall(function()
+		return pluginRef:GetSetting(key)
+	end)
+	return if ok then value else nil
+end
+local function writeSetting(key, value)
+	if not pluginRef then
+		return false
+	end
+	local ok = pcall(function()
+		return pluginRef:SetSetting(key, value)
+	end)
+	return ok
+end
+local function decodePersistedBreakpointEntry(value)
+	local _value = value
+	if not (type(_value) == "table") then
+		return nil
+	end
+	local data = value
+	local _script_path = data.script_path
+	local _condition = not (type(_script_path) == "string")
+	if not _condition then
+		_condition = data.script_path == ""
+	end
+	if _condition then
+		return nil
+	end
+	local _line = data.line
+	local _condition_1 = not (type(_line) == "number")
+	if not _condition_1 then
+		_condition_1 = data.line < 1
+	end
+	if _condition_1 then
+		return nil
+	end
+	return {
+		script_path = data.script_path,
+		line = math.floor(data.line),
+	}
+end
+local function loadRegistry(requestData)
+	local scope = registryScope(requestData)
+	if loadedRegistryKey ~= scope.key then
+		table.clear(breakpoints)
+		loadedRegistryKey = scope.key
+		loadedRegistryFromSettings = false
+	end
+	if loadedRegistryFromSettings then
+		return scope
+	end
+	loadedRegistryFromSettings = true
+	local stored = readSetting(scope.key)
+	if stored == nil then
+		return scope
+	end
+	local decoded = stored
+	if type(stored) == "string" then
+		local ok, result = pcall(function()
+			return HttpService:JSONDecode(stored)
+		end)
+		if not ok then
+			return scope
+		end
+		decoded = result
+	end
+	local _decoded = decoded
+	if not (type(_decoded) == "table") then
+		return scope
+	end
+	table.clear(breakpoints)
+	for _, item in decoded do
+		local entry = decodePersistedBreakpointEntry(item)
+		if entry then
+			local _arg0 = breakpointKey(entry.script_path, entry.line)
+			breakpoints[_arg0] = entry
+		end
+	end
+	return scope
+end
+local function persistRegistry(scope)
+	if not pluginRef then
+		return {
+			ok = false,
+			error = "Plugin settings are unavailable; managed breakpoint registry is memory-only.",
+		}
+	end
+	local out = {}
+	for _, entry in breakpoints do
+		local _arg0 = {
+			script_path = entry.script_path,
+			line = entry.line,
+		}
+		table.insert(out, _arg0)
+	end
+	local encodedOk, encoded = pcall(function()
+		return HttpService:JSONEncode(out)
+	end)
+	if not encodedOk or not (type(encoded) == "string") then
+		return {
+			ok = false,
+			error = `Failed to encode managed breakpoint registry: {tostring(encoded)}`,
+		}
+	end
+	if not writeSetting(scope.key, encoded) then
+		return {
+			ok = false,
+			error = "Failed to persist managed breakpoint registry with plugin:SetSetting.",
+		}
+	end
+	local stored = readSetting(scope.key)
+	if stored ~= encoded then
+		return {
+			ok = false,
+			error = "Failed to verify managed breakpoint registry persistence after plugin:SetSetting.",
+		}
+	end
+	return {
+		ok = true,
+	}
+end
+local function attachPersistenceWarning(response, persist)
+	if not persist.ok then
+		response.managed_registry_persisted = false
+		response.registry_error = persist.error
+	end
+	return response
+end
+local function serviceError(message)
+	local _object = {
+		error = "script_debugger_unavailable",
+	}
+	local _left = "message"
+	local _condition = message
+	if _condition == nil then
+		_condition = "ScriptDebuggerService is unavailable. Enable the Studio Debugger Luau API beta feature and restart Studio."
+	end
+	_object[_left] = _condition
+	_object.betaFeatureRequired = true
+	return _object
+end
+local function operationError(errorCode, operation, raw)
+	return {
+		error = errorCode,
+		message = `{operation} failed. The breakpoints tool requires the Studio Debugger Luau API beta feature. ` .. "Enable it in Studio Beta Features and restart/reload Studio, then retry.",
+		rawMessage = tostring(raw),
+		betaFeatureRequired = true,
+	}
+end
+local function getService()
+	local provider = game
+	local ok, service = pcall(function()
+		return provider:GetService("ScriptDebuggerService")
+	end)
+	if not ok or not service then
+		return serviceError(`ScriptDebuggerService unavailable: {tostring(service)}`)
+	end
+	return service
+end
+local function luauStringLiteral(value)
+	local escaped = (string.gsub(value, "\\", "\\\\"))
+	escaped = (string.gsub(escaped, "\n", "\\n"))
+	escaped = (string.gsub(escaped, "\r", "\\r"))
+	escaped = (string.gsub(escaped, "\t", "\\t"))
+	escaped = (string.gsub(escaped, '"', '\\"'))
+	return `"{escaped}"`
+end
+local function buildLogMessage(scriptPath, line, logMessage)
+	local prefix = { luauStringLiteral(LOG_PREFIX), luauStringLiteral(`{scriptPath}:{line}`) }
+	local _logMessage = logMessage
+	local _condition = type(_logMessage) == "string"
+	if _condition then
+		_condition = logMessage ~= ""
+	end
+	if _condition then
+		local _logMessage_1 = logMessage
+		table.insert(prefix, _logMessage_1)
+	end
+	return table.concat(prefix, ", ")
+end
+local function listBreakpoints(requestData)
+	loadRegistry(requestData)
+	local out = {}
+	for _, entry in breakpoints do
+		table.insert(out, entry)
+	end
+	return {
+		breakpoints = out,
+		count = #out,
+	}
+end
+local function setBreakpoint(requestData)
+	local scope = loadRegistry(requestData)
+	local serviceOrError = getService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	local scriptPath = requestData.script_path
+	local lineRaw = requestData.line
+	if not (type(scriptPath) == "string") or scriptPath == "" or not (type(lineRaw) == "number") then
+		return {
+			error = "invalid_args",
+			message = "breakpoints action=set requires script_path and line",
+		}
+	end
+	local requestedLine = math.floor(lineRaw)
+	if requestedLine < 1 then
+		return {
+			error = "invalid_line",
+			message = "line must be a 1-based positive number",
+		}
+	end
+	local instance = getInstanceByPath(scriptPath)
+	if not instance then
+		return {
+			error = "script_not_found",
+			script_path = scriptPath,
+		}
+	end
+	if not instance:IsA("LuaSourceContainer") then
+		return {
+			error = "not_a_script",
+			message = `{scriptPath} is {instance.ClassName}, not a LuaSourceContainer`,
+			script_path = scriptPath,
+		}
+	end
+	local _log_message = requestData.log_message
+	local rawLogMessage = if type(_log_message) == "string" then requestData.log_message else nil
+	local hasLogMessage = rawLogMessage ~= nil and rawLogMessage ~= ""
+	local _continue_execution = requestData.continue_execution
+	local continueExecution = if type(_continue_execution) == "boolean" then requestData.continue_execution else hasLogMessage
+	local _enabled = requestData.enabled
+	local enabled = if type(_enabled) == "boolean" then requestData.enabled else true
+	local effectiveLogMessage = if hasLogMessage or continueExecution then buildLogMessage(scriptPath, requestedLine, rawLogMessage) else nil
+	local spec = {
+		Line = requestedLine,
+		Enabled = enabled,
+		ContinueExecution = continueExecution,
+	}
+	local _condition = requestData.condition
+	local _condition_1 = type(_condition) == "string"
+	if _condition_1 then
+		_condition_1 = requestData.condition ~= ""
+	end
+	if _condition_1 then
+		spec.Condition = requestData.condition
+	end
+	if effectiveLogMessage ~= nil then
+		spec.LogMessage = effectiveLogMessage
+	end
+	local ok, result = pcall(function()
+		return service:AddBreakpoint(instance, spec)
+	end)
+	if not ok then
+		return operationError("add_breakpoint_failed", "ScriptDebuggerService:AddBreakpoint", result)
+	end
+	local breakpointResult = result
+	local _line = breakpointResult.Line
+	local actualLine = if type(_line) == "number" then breakpointResult.Line else requestedLine
+	local _verified = breakpointResult.Verified
+	local verified = if type(_verified) == "boolean" then breakpointResult.Verified else nil
+	local _message = breakpointResult.Message
+	local message = if type(_message) == "string" then breakpointResult.Message else nil
+	local entry = {
+		script_path = scriptPath,
+		line = actualLine,
+		requested_line = if actualLine ~= requestedLine then requestedLine else nil,
+		enabled = enabled,
+		condition = spec.Condition,
+		log_message = rawLogMessage,
+		continue_execution = continueExecution,
+		verified = if verified == false then false else nil,
+		message = message,
+		created_at = DateTime.now().UnixTimestampMillis,
+	}
+	local _arg0 = breakpointKey(scriptPath, actualLine)
+	breakpoints[_arg0] = entry
+	return attachPersistenceWarning({
+		ok = true,
+		breakpoint = entry,
+	}, persistRegistry(scope))
+end
+local function removeBreakpoint(requestData)
+	local scope = loadRegistry(requestData)
+	local serviceOrError = getService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	local scriptPath = requestData.script_path
+	local lineRaw = requestData.line
+	if not (type(scriptPath) == "string") or scriptPath == "" or not (type(lineRaw) == "number") then
+		return {
+			error = "invalid_args",
+			message = "breakpoints action=remove requires script_path and line",
+		}
+	end
+	local line = math.floor(lineRaw)
+	if line < 1 then
+		return {
+			error = "invalid_line",
+			message = "line must be a 1-based positive number",
+		}
+	end
+	local instance = getInstanceByPath(scriptPath)
+	if not instance then
+		return {
+			error = "script_not_found",
+			script_path = scriptPath,
+		}
+	end
+	if not instance:IsA("LuaSourceContainer") then
+		return {
+			error = "not_a_script",
+			message = `{scriptPath} is {instance.ClassName}, not a LuaSourceContainer`,
+			script_path = scriptPath,
+		}
+	end
+	local ok, removed = pcall(function()
+		return service:RemoveBreakpoint(instance, line)
+	end)
+	if not ok then
+		return operationError("remove_breakpoint_failed", "ScriptDebuggerService:RemoveBreakpoint", removed)
+	end
+	local _arg0 = breakpointKey(scriptPath, line)
+	breakpoints[_arg0] = nil
+	return attachPersistenceWarning({
+		ok = true,
+		removed = removed,
+		script_path = scriptPath,
+		line = line,
+	}, persistRegistry(scope))
+end
+local function clearManagedBreakpoints(requestData)
+	local scope = loadRegistry(requestData)
+	local serviceOrError = getService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	local cleared = 0
+	local errors = {}
+	for key, entry in breakpoints do
+		local instance = getInstanceByPath(entry.script_path)
+		if not instance or not instance:IsA("LuaSourceContainer") then
+			breakpoints[key] = nil
+			cleared += 1
+			continue
+		end
+		local ok, removedOrError = pcall(function()
+			return service:RemoveBreakpoint(instance, entry.line)
+		end)
+		if ok then
+			breakpoints[key] = nil
+			cleared += 1
+		else
+			local _arg0 = {
+				script_path = entry.script_path,
+				line = entry.line,
+				error = tostring(removedOrError),
+			}
+			table.insert(errors, _arg0)
+		end
+	end
+	if #errors > 0 then
+		return {
+			ok = false,
+			cleared = cleared,
+			errors = errors,
+		}
+	end
+	return attachPersistenceWarning({
+		ok = true,
+		cleared = cleared,
+	}, persistRegistry(scope))
+end
+local function clearAllBreakpoints(requestData)
+	local scope = loadRegistry(requestData)
+	local serviceOrError = getService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	-- ▼ ReadonlyMap.size ▼
+	local _size = 0
+	for _ in breakpoints do
+		_size += 1
+	end
+	-- ▲ ReadonlyMap.size ▲
+	local managedCount = _size
+	local ok, err = pcall(function()
+		return service:ClearBreakpoints()
+	end)
+	if not ok then
+		return operationError("clear_breakpoints_failed", "ScriptDebuggerService:ClearBreakpoints", err)
+	end
+	table.clear(breakpoints)
+	return attachPersistenceWarning({
+		ok = true,
+		cleared_managed = managedCount,
+	}, persistRegistry(scope))
+end
+local function clearBreakpoints(requestData)
+	if requestData.clear_all == true then
+		return clearAllBreakpoints(requestData)
+	end
+	return clearManagedBreakpoints(requestData)
+end
+local function breakpointsTool(requestData)
+	local action = requestData.action
+	if not (type(action) == "string") or action == "" then
+		return {
+			error = "invalid_args",
+			message = "breakpoints requires action=set|remove|clear|list",
+		}
+	end
+	repeat
+		if action == "set" then
+			return setBreakpoint(requestData)
+		end
+		if action == "remove" then
+			return removeBreakpoint(requestData)
+		end
+		if action == "clear" then
+			return clearBreakpoints(requestData)
+		end
+		if action == "list" then
+			return listBreakpoints(requestData)
+		end
+		return {
+			error = "unknown_action",
+			message = `breakpoints action must be one of: set, remove, clear, list (got {action})`,
+		}
+	until true
+end
+return {
+	breakpoints = breakpointsTool,
+	init = init,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="8">
           <Properties>
             <string name="Name">BuildHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2421,7 +2953,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="8">
+        <Item class="ModuleScript" referent="9">
           <Properties>
             <string name="Name">CaptureHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2636,7 +3168,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="9">
+        <Item class="ModuleScript" referent="10">
           <Properties>
             <string name="Name">EvalRuntimeHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2790,7 +3322,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="10">
+        <Item class="ModuleScript" referent="11">
           <Properties>
             <string name="Name">InputHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -2990,7 +3522,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="11">
+        <Item class="ModuleScript" referent="12">
           <Properties>
             <string name="Name">InstanceHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3497,7 +4029,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="12">
+        <Item class="ModuleScript" referent="13">
           <Properties>
             <string name="Name">LogHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3523,7 +4055,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="13">
+        <Item class="ModuleScript" referent="14">
           <Properties>
             <string name="Name">MemoryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -3591,7 +4123,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="14">
+        <Item class="ModuleScript" referent="15">
           <Properties>
             <string name="Name">MetadataHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -4130,7 +4662,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="15">
+        <Item class="ModuleScript" referent="16">
           <Properties>
             <string name="Name">PropertyHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -4382,7 +4914,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="16">
+        <Item class="ModuleScript" referent="17">
           <Properties>
             <string name="Name">QueryHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5330,79 +5862,21 @@ local function compareInstances(requestData)
 					b = valB,
 				}
 			end
-		elseif okA then
-			table.insert(onlyA, prop)
-		elseif okB then
-			table.insert(onlyB, prop)
-		end
-	end
-	return {
-		instancePathA = instancePathA,
-		instancePathB = instancePathB,
-		classNameA = instA.ClassName,
-		classNameB = instB.ClassName,
-		matching = matching,
-		differing = differing,
-		onlyA = onlyA,
-		onlyB = onlyB,
-	}
-end
-local function getOutputLog(requestData)
-	local _condition = (requestData.maxEntries)
-	if _condition == nil then
-		_condition = 100
-	end
-	local maxEntries = _condition
-	local messageTypeFilter = requestData.messageType
-	local success, result = pcall(function()
-		local LogService = game:GetService("LogService")
-		local history = LogService:GetLogHistory()
-		local allEntries = {}
-		for _, entry in history do
-			local msgType = tostring(entry.messageType)
-			local _condition_1 = messageTypeFilter
-			if _condition_1 ~= "" and _condition_1 then
-				_condition_1 = msgType ~= messageTypeFilter
-			end
-			if _condition_1 ~= "" and _condition_1 then
-				continue
-			end
-			local _arg0 = {
-				message = entry.message,
-				messageType = msgType,
-				timestamp = entry.timestamp,
-			}
-			table.insert(allEntries, _arg0)
-		end
-		local startIdx = math.max(0, #allEntries - maxEntries)
-		local finalEntries = {}
-		do
-			local i = startIdx
-			local _shouldIncrement = false
-			while true do
-				if _shouldIncrement then
-					i += 1
-				else
-					_shouldIncrement = true
-				end
-				if not (i < #allEntries) then
-					break
-				end
-				local _arg0 = allEntries[i + 1]
-				table.insert(finalEntries, _arg0)
-			end
+		elseif okA then
+			table.insert(onlyA, prop)
+		elseif okB then
+			table.insert(onlyB, prop)
 		end
-		return {
-			entries = finalEntries,
-			count = #finalEntries,
-			totalAvailable = #allEntries,
-		}
-	end)
-	if success then
-		return result
 	end
 	return {
-		error = `Failed to get output log: {result}`,
+		instancePathA = instancePathA,
+		instancePathB = instancePathB,
+		classNameA = instA.ClassName,
+		classNameB = instB.ClassName,
+		matching = matching,
+		differing = differing,
+		onlyA = onlyA,
+		onlyB = onlyB,
 	}
 end
 return {
@@ -5419,12 +5893,11 @@ return {
 	grepScripts = grepScripts,
 	getDescendants = getDescendants,
 	compareInstances = compareInstances,
-	getOutputLog = getOutputLog,
 }
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="17">
+        <Item class="ModuleScript" referent="18">
           <Properties>
             <string name="Name">SceneAnalysisHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -5673,7 +6146,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="18">
+        <Item class="ModuleScript" referent="19">
           <Properties>
             <string name="Name">ScriptHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6369,7 +6842,470 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="19">
+        <Item class="ModuleScript" referent="20">
+          <Properties>
+            <string name="Name">ScriptProfilerHandlers</string>
+            <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
+local HttpService = game:GetService("HttpService")
+local Players = game:GetService("Players")
+local RunService = game:GetService("RunService")
+local DEFAULT_DURATION_MS = 1000
+local MIN_DURATION_MS = 100
+local MAX_DURATION_MS = 15000
+local DEFAULT_FREQUENCY = 1000
+local DEFAULT_MAX_FUNCTIONS = 20
+local function getProfilerService()
+	local provider = game
+	local ok, service = pcall(function()
+		return provider:GetService("ScriptProfilerService")
+	end)
+	if not ok or not service then
+		return {
+			error = "script_profiler_unavailable",
+			message = `ScriptProfilerService is unavailable: {tostring(service)}`,
+		}
+	end
+	return service
+end
+local function normalizeDurationMs(value)
+	local _value = value
+	if not (type(_value) == "number") then
+		return DEFAULT_DURATION_MS
+	end
+	return math.clamp(math.floor(value), MIN_DURATION_MS, MAX_DURATION_MS)
+end
+local function normalizeFrequency(value)
+	local _value = value
+	if not (type(_value) == "number") then
+		return DEFAULT_FREQUENCY
+	end
+	return math.clamp(math.floor(value), 1, 10000)
+end
+local function normalizeMaxFunctions(value)
+	local _value = value
+	if not (type(_value) == "number") then
+		return DEFAULT_MAX_FUNCTIONS
+	end
+	return math.clamp(math.floor(value), 1, 100)
+end
+local function normalizeMinTotalUs(requestData)
+	local value = requestData.min_total_us
+	if type(value) == "number" then
+		return math.max(0, value)
+	end
+	return 0
+end
+local function stringContains(haystack, needle)
+	return (string.find(string.lower(haystack), string.lower(needle), 1, true)) ~= nil
+end
+local function localPlayer()
+	local player = Players.LocalPlayer
+	local started = tick()
+	while not player and tick() - started < 5 do
+		task.wait(0.05)
+		player = Players.LocalPlayer
+	end
+	return player
+end
+local function functionDisplayName(func)
+	local _name = func.Name
+	local _condition = type(_name) == "string"
+	if _condition then
+		_condition = func.Name ~= ""
+	end
+	if _condition then
+		return func.Name
+	end
+	local _source = func.Source
+	local _condition_1 = type(_source) == "string"
+	if _condition_1 then
+		_condition_1 = func.Source ~= ""
+	end
+	if _condition_1 then
+		local _line = func.Line
+		local _condition_2 = type(_line) == "number"
+		if _condition_2 then
+			_condition_2 = func.Line > 0
+		end
+		if _condition_2 then
+			return `{func.Source}:{func.Line}`
+		end
+		return func.Source
+	end
+	return "<anonymous>"
+end
+local function flagsOf(func)
+	local _flags = func.Flags
+	return if type(_flags) == "number" then func.Flags else 0
+end
+local function isNativeFunction(func)
+	return bit32.band(flagsOf(func), 1) ~= 0
+end
+local function isPluginFunction(func)
+	if bit32.band(flagsOf(func), 2) ~= 0 then
+		return true
+	end
+	local _source = func.Source
+	local _condition = type(_source) == "string"
+	if _condition then
+		_condition = (string.find(func.Source, "MCPPlugin", 1, true)) ~= nil
+	end
+	return _condition
+end
+local function isDebugLabel(func, filter)
+	if filter == nil then
+		return false
+	end
+	local _name = func.Name
+	local _condition = not (type(_name) == "string")
+	if not _condition then
+		_condition = func.Name == ""
+	end
+	if _condition then
+		return false
+	end
+	local _source = func.Source
+	local _condition_1 = not (type(_source) == "string")
+	if not _condition_1 then
+		_condition_1 = func.Source == "" or func.Source == "[C]" or func.Source == "GC"
+	end
+	if _condition_1 then
+		return false
+	end
+	if func.Line ~= nil and func.Line ~= 0 then
+		return false
+	end
+	if isNativeFunction(func) or isPluginFunction(func) then
+		return false
+	end
+	return stringContains(func.Name, filter) or stringContains(func.Source, filter)
+end
+local function pctOfCapture(row, durationMs)
+	local captureUs = durationMs * 1000
+	if captureUs <= 0 then
+		return nil
+	end
+	return math.floor((row.total_us / captureUs) * 10000 + 0.5) / 100
+end
+local function compactFunction(row, rank, durationMs)
+	local out = {
+		rank = rank,
+		function_index = row.function_index,
+		name = row.name,
+		total_us = math.floor(row.total_us + 0.5),
+	}
+	local pct = pctOfCapture(row, durationMs)
+	if pct ~= nil then
+		out.pct_of_capture = pct
+	end
+	if row.source ~= nil then
+		out.source = row.source
+	end
+	if row.line ~= nil then
+		out.line = row.line
+	end
+	if row.is_native == true then
+		out.is_native = true
+	end
+	if row.is_plugin == true then
+		out.is_plugin = true
+	end
+	if row.is_debug_label == true then
+		out.is_debug_label = true
+	end
+	return out
+end
+local function summarizeProfile(rawJson, profile, requestData, durationMs, frequency, eventPlayerName)
+	local _functions = profile.Functions
+	local funcs = if type(_functions) == "table" then profile.Functions else {}
+	local _nodes = profile.Nodes
+	local nodes = if type(_nodes) == "table" then profile.Nodes else {}
+	local _categories = profile.Categories
+	local categories = if type(_categories) == "table" then profile.Categories else {}
+	local maxFunctions = normalizeMaxFunctions(requestData.max_functions)
+	local minTotalUs = normalizeMinTotalUs(requestData)
+	local includeNative = requestData.include_native == true
+	local includePlugin = requestData.include_plugin == true
+	local _filter = requestData.filter
+	local _condition = type(_filter) == "string"
+	if _condition then
+		_condition = requestData.filter ~= ""
+	end
+	local filter = if _condition then requestData.filter else nil
+	local rows = {}
+	local debugRows = {}
+	local omittedNative = 0
+	local omittedPlugin = 0
+	local omittedBelowThreshold = 0
+	local omittedByFilter = 0
+	for i = 0, #funcs - 1 do
+		local func = funcs[i + 1]
+		if not (type(func) == "table") then
+			continue
+		end
+		local info = func
+		local _totalDuration = info.TotalDuration
+		local totalUs = if type(_totalDuration) == "number" then info.TotalDuration else 0
+		local name = functionDisplayName(info)
+		local _object = {
+			function_index = i + 1,
+			name = name,
+		}
+		local _left = "source"
+		local _source = info.Source
+		_object[_left] = if type(_source) == "string" then info.Source else nil
+		local _left_1 = "line"
+		local _line = info.Line
+		_object[_left_1] = if type(_line) == "number" then info.Line else nil
+		_object.total_us = totalUs
+		_object.is_native = if isNativeFunction(info) then true else nil
+		_object.is_plugin = if isPluginFunction(info) then true else nil
+		_object.is_debug_label = if isDebugLabel(info, filter) then true else nil
+		local row = _object
+		if not includeNative and row.is_native == true then
+			omittedNative += 1
+			continue
+		end
+		if not includePlugin and row.is_plugin == true then
+			omittedPlugin += 1
+			continue
+		end
+		if totalUs < minTotalUs then
+			omittedBelowThreshold += 1
+			continue
+		end
+		if filter ~= nil then
+			local _exp = row.name
+			local _condition_1 = row.source
+			if _condition_1 == nil then
+				_condition_1 = ""
+			end
+			local text = `{_exp} {_condition_1}`
+			if not stringContains(text, filter) then
+				omittedByFilter += 1
+				continue
+			end
+		end
+		table.insert(rows, row)
+		if row.is_debug_label == true then
+			table.insert(debugRows, row)
+		end
+	end
+	table.sort(rows, function(a, b)
+		return a.total_us > b.total_us
+	end)
+	table.sort(debugRows, function(a, b)
+		return a.total_us > b.total_us
+	end)
+	local topFunctions = {}
+	do
+		local i = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i < math.min(maxFunctions, #rows)) then
+				break
+			end
+			local _arg0 = compactFunction(rows[i + 1], i + 1, durationMs)
+			table.insert(topFunctions, _arg0)
+		end
+	end
+	local debugLabels = {}
+	do
+		local i = 0
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i < math.min(maxFunctions, #debugRows)) then
+				break
+			end
+			local _arg0 = compactFunction(debugRows[i + 1], i + 1, durationMs)
+			table.insert(debugLabels, _arg0)
+		end
+	end
+	local categoryNames = {}
+	for i = 0, #categories - 1 do
+		local category = categories[i + 1]
+		if type(category) == "table" then
+			local name = category.Name
+			if type(name) == "string" then
+				table.insert(categoryNames, name)
+			end
+		end
+	end
+	local omitted = {}
+	local hasOmitted = false
+	if omittedNative > 0 then
+		omitted.native = omittedNative
+		hasOmitted = true
+	end
+	if omittedPlugin > 0 then
+		omitted.plugin = omittedPlugin
+		hasOmitted = true
+	end
+	if omittedBelowThreshold > 0 then
+		omitted.below_min_total_us = omittedBelowThreshold
+		hasOmitted = true
+	end
+	if omittedByFilter > 0 then
+		omitted.filtered_out = omittedByFilter
+		hasOmitted = true
+	end
+	local _object = {
+		ok = true,
+		duration_ms = durationMs,
+		frequency = frequency,
+	}
+	local _left = "applied"
+	local _object_1 = {}
+	local _left_1 = "filter"
+	local _condition_1 = filter
+	if _condition_1 == nil then
+		_condition_1 = nil
+	end
+	_object_1[_left_1] = _condition_1
+	_object_1.min_total_us = minTotalUs
+	_object_1.include_native = includeNative
+	_object_1.include_plugin = includePlugin
+	_object_1.max_functions = maxFunctions
+	_object_1.sort = "total_us_desc"
+	_object[_left] = _object_1
+	_object.json_bytes = #rawJson
+	_object.counts = {
+		categories = #categories,
+		nodes = #nodes,
+		functions = #funcs,
+	}
+	_object.top_functions = topFunctions
+	_object.debug_labels = debugLabels
+	local result = _object
+	if #categoryNames > 0 then
+		result.categories = categoryNames
+	end
+	if hasOmitted then
+		result.omitted = omitted
+	end
+	if profile.Version ~= nil then
+		result.version = profile.Version
+	end
+	if profile.SessionStartTime ~= nil or profile.SessionEndTime ~= nil then
+		result.session = {
+			start_time = profile.SessionStartTime,
+			end_time = profile.SessionEndTime,
+		}
+	end
+	if eventPlayerName ~= nil then
+		result.player = eventPlayerName
+	end
+	if requestData.__mcp_include_raw_json == true then
+		result.raw_json = rawJson
+	end
+	return result
+end
+local function captureScriptProfiler(requestData)
+	if not RunService:IsRunning() then
+		return {
+			error = "runtime_target_required",
+			message = 'Script profiler capture requires a running playtest target such as target=\"server\" or target=\"client-1\".',
+		}
+	end
+	local serviceOrError = getProfilerService()
+	local _value = serviceOrError.IsA
+	if not (_value ~= 0 and _value == _value and _value ~= "" and _value) then
+		return serviceOrError
+	end
+	local service = serviceOrError
+	local durationMs = normalizeDurationMs(requestData.duration_ms)
+	local frequency = normalizeFrequency(requestData.frequency)
+	local isServer = RunService:IsServer()
+	local isClient = RunService:IsClient() and not isServer
+	local player = if isClient then localPlayer() else nil
+	if not isServer and not player then
+		return {
+			error = "client_player_unavailable",
+			message = "Could not resolve Players.LocalPlayer for client profiling.",
+		}
+	end
+	local rawJson
+	local eventPlayerName
+	local connection = service.OnNewData:Connect(function(playerArg, jsonString)
+		if rawJson ~= nil then
+			return nil
+		end
+		rawJson = jsonString
+		if playerArg then
+			eventPlayerName = playerArg.Name
+		end
+	end)
+	local startOk, startErr = pcall(function()
+		if isServer then
+			service:ServerStart(frequency)
+		else
+			service:ClientStart(player, frequency)
+		end
+	end)
+	if not startOk then
+		connection:Disconnect()
+		return {
+			error = "script_profiler_start_failed",
+			message = tostring(startErr),
+		}
+	end
+	task.wait(durationMs / 1000)
+	local stopOk, stopErr = pcall(function()
+		if isServer then
+			service:ServerStop()
+			service:ServerRequestData()
+		else
+			service:ClientStop(player)
+			service:ClientRequestData(player)
+		end
+	end)
+	if not stopOk then
+		connection:Disconnect()
+		return {
+			error = "script_profiler_stop_failed",
+			message = tostring(stopErr),
+		}
+	end
+	local requestedAt = tick()
+	while rawJson == nil and tick() - requestedAt < 5 do
+		task.wait(0.05)
+	end
+	connection:Disconnect()
+	if rawJson == nil then
+		return {
+			error = "script_profiler_data_timeout",
+			message = "ScriptProfilerService did not emit OnNewData after requesting profiler data.",
+		}
+	end
+	local decodeOk, decoded = pcall(function()
+		return HttpService:JSONDecode(rawJson)
+	end)
+	if not decodeOk then
+		return {
+			error = "script_profiler_decode_failed",
+			message = tostring(decoded),
+			json_bytes = #rawJson,
+		}
+	end
+	return summarizeProfile(rawJson, decoded, requestData, durationMs, frequency, eventPlayerName)
+end
+return {
+	captureScriptProfiler = captureScriptProfiler,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <Item class="ModuleScript" referent="21">
           <Properties>
             <string name="Name">SerializationHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6555,7 +7491,7 @@ return {
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="20">
+        <Item class="ModuleScript" referent="22">
           <Properties>
             <string name="Name">TestHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6576,10 +7512,7 @@ local ScriptEditorService = game:GetService("ScriptEditorService")
 local NAV_SIGNAL = "__MCP_NAV__"
 local NAV_RESULT = "__MCP_NAV_RESULT__"
 local testRunning = false
-local outputBuffer = {}
-local logConnection
-local testResult
-local testError
+local navLogConnection
 local stopListenerScript
 local navResultCallback
 local multiplayerState = {
@@ -6727,6 +7660,12 @@ local function cleanupStopListener()
 		stopListenerScript = nil
 	end
 end
+local function disconnectNavLogListener()
+	if navLogConnection then
+		navLogConnection:Disconnect()
+		navLogConnection = nil
+	end
+end
 local function startPlaytest(requestData)
 	local mode = requestData.mode
 	local numPlayers = requestData.numPlayers
@@ -6746,10 +7685,7 @@ local function startPlaytest(requestData)
 	-- Reset it so subsequent starts don't hit a false "already running".
 	if testRunning and not RunService:IsRunning() then
 		testRunning = false
-		if logConnection then
-			logConnection:Disconnect()
-			logConnection = nil
-		end
+		disconnectNavLogListener()
 		cleanupStopListener()
 		-- Runtime eval bridges are created by the play server/client plugin
 		-- peers and disappear with the play DataModels.
@@ -6760,34 +7696,19 @@ local function startPlaytest(requestData)
 		}
 	end
 	testRunning = true
-	outputBuffer = {}
-	testResult = nil
-	testError = nil
 	cleanupStopListener()
-	logConnection = LogService.MessageOut:Connect(function(message, messageType)
+	disconnectNavLogListener()
+	navLogConnection = LogService.MessageOut:Connect(function(message)
 		local _message = message
-		local _arg1 = #NAV_SIGNAL
-		if string.sub(_message, 1, _arg1) == NAV_SIGNAL then
-			return nil
-		end
-		local _message_1 = message
-		local _arg1_1 = #NAV_RESULT + 1
-		if string.sub(_message_1, 1, _arg1_1) == `{NAV_RESULT}:` then
+		local _arg1 = #NAV_RESULT + 1
+		if string.sub(_message, 1, _arg1) == `{NAV_RESULT}:` then
 			if navResultCallback then
 				local _fn = navResultCallback
-				local _message_2 = message
+				local _message_1 = message
 				local _arg0 = #NAV_RESULT + 2
-				_fn(string.sub(_message_2, _arg0))
+				_fn(string.sub(_message_1, _arg0))
 			end
-			return nil
 		end
-		local _outputBuffer = outputBuffer
-		local _arg0 = {
-			message = message,
-			messageType = messageType.Name,
-			timestamp = tick(),
-		}
-		table.insert(_outputBuffer, _arg0)
 	end)
 	local injected, injErr = pcall(function()
 		return injectStopListener()
@@ -6802,15 +7723,10 @@ local function startPlaytest(requestData)
 			end
 			return StudioTestService:ExecuteRunModeAsync({})
 		end)
-		if ok then
-			testResult = result
-		else
-			testError = tostring(result)
-		end
-		if logConnection then
-			logConnection:Disconnect()
-			logConnection = nil
+		if not ok then
+			warn(`[robloxstudio-mcp] Playtest ended with error: {result}`)
 		end
+		disconnectNavLogListener()
 		testRunning = false
 		cleanupStopListener()
 	end)
@@ -6887,20 +7803,6 @@ local function stopPlaytest(_requestData)
 		message = "Playtest stopped.",
 	}
 end
-local function getPlaytestOutput(_requestData)
-	local _object = {
-		isRunning = testRunning,
-	}
-	local _left = "output"
-	local _array = {}
-	local _length = #_array
-	table.move(outputBuffer, 1, #outputBuffer, _length + 1, _array)
-	_object[_left] = _array
-	_object.outputCount = #outputBuffer
-	_object.testResult = if testResult ~= nil then tostring(testResult) else nil
-	_object.testError = testError
-	return _object
-end
 local function multiplayerTestStart(requestData)
 	if RunService:IsRunning() then
 		return {
@@ -7155,7 +8057,6 @@ end
 return {
 	startPlaytest = startPlaytest,
 	stopPlaytest = stopPlaytest,
-	getPlaytestOutput = getPlaytestOutput,
 	multiplayerTestStart = multiplayerTestStart,
 	multiplayerTestState = multiplayerTestState,
 	multiplayerTestAddPlayers = multiplayerTestAddPlayers,
@@ -7167,7 +8068,7 @@ return {
           </Properties>
         </Item>
       </Item>
-      <Item class="ModuleScript" referent="21">
+      <Item class="ModuleScript" referent="23">
         <Properties>
           <string name="Name">HttpDiagnostics</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7248,7 +8149,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="22">
+      <Item class="ModuleScript" referent="24">
         <Properties>
           <string name="Name">LuauExec</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7682,7 +8583,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="23">
+      <Item class="ModuleScript" referent="25">
         <Properties>
           <string name="Name">Recording</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7712,7 +8613,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="24">
+      <Item class="ModuleScript" referent="26">
         <Properties>
           <string name="Name">RenderMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7780,7 +8681,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="25">
+      <Item class="ModuleScript" referent="27">
         <Properties>
           <string name="Name">RuntimeLogBuffer</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -7833,6 +8734,43 @@ local function dropOldestUntilFits(incomingBytes)
 		totalDropped += 1
 	end
 end
+local function pushEntry(msg, t, ts)
+	if ts == nil then
+		ts = nowSec()
+	end
+	local bytes = #msg
+	dropOldestUntilFits(bytes)
+	local _arg0 = {
+		seq = nextSeq,
+		ts = ts,
+		level = levelTag(t),
+		message = msg,
+	}
+	table.insert(entries, _arg0)
+	nextSeq += 1
+	totalBytes += bytes
+end
+local function seedRuntimeHistory()
+	if not RunService:IsRunning() then
+		return nil
+	end
+	local ok, history = pcall(function()
+		return LogService:GetLogHistory()
+	end)
+	if not ok then
+		return nil
+	end
+	for _, entry in history do
+		local _message = entry.message
+		if not (type(_message) == "string") then
+			continue
+		end
+		local _exp = entry.message
+		local _exp_1 = entry.messageType
+		local _timestamp = entry.timestamp
+		pushEntry(_exp, _exp_1, if type(_timestamp) == "number" then entry.timestamp else nil)
+	end
+end
 local function install()
 	if installed then
 		return nil
@@ -7841,18 +8779,12 @@ local function install()
 		return nil
 	end
 	installed = true
+	-- Play peers can emit startup logs before the plugin finishes loading.
+	-- Seed from per-DataModel LogHistory so get_runtime_logs can still see
+	-- those early messages; skip edit mode to avoid stale prior-session logs.
+	seedRuntimeHistory()
 	LogService.MessageOut:Connect(function(msg, t)
-		local bytes = #msg
-		dropOldestUntilFits(bytes)
-		local _arg0 = {
-			seq = nextSeq,
-			ts = nowSec(),
-			level = levelTag(t),
-			message = msg,
-		}
-		table.insert(entries, _arg0)
-		nextSeq += 1
-		totalBytes += bytes
+		pushEntry(msg, t)
 	end)
 end
 local function detectPeer()
@@ -7961,7 +8893,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="26">
+      <Item class="ModuleScript" referent="28">
         <Properties>
           <string name="Name">ServerUrlSettings</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8037,11 +8969,11 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="27">
+      <Item class="ModuleScript" referent="29">
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.16.3"
+local CURRENT_VERSION = "2.17.0"
 local PLUGIN_VARIANT = "inspector"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8135,7 +9067,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="28">
+      <Item class="ModuleScript" referent="30">
         <Properties>
           <string name="Name">StopPlayMonitor</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -8433,7 +9365,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="29">
+      <Item class="ModuleScript" referent="31">
         <Properties>
           <string name="Name">UI</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9204,7 +10136,7 @@ return {
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="30">
+      <Item class="ModuleScript" referent="32">
         <Properties>
           <string name="Name">Utils</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -9734,11 +10666,11 @@ return {
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="34">
+    <Item class="Folder" referent="36">
       <Properties>
         <string name="Name">include</string>
       </Properties>
-      <Item class="ModuleScript" referent="31">
+      <Item class="ModuleScript" referent="33">
         <Properties>
           <string name="Name">Promise</string>
           <string name="Source"><![CDATA[--[[
@@ -11812,7 +12744,7 @@ return Promise
 ]]></string>
         </Properties>
       </Item>
-      <Item class="ModuleScript" referent="32">
+      <Item class="ModuleScript" referent="34">
         <Properties>
           <string name="Name">RuntimeLib</string>
           <string name="Source"><![CDATA[local Promise = require(script.Parent.Promise)
@@ -12079,15 +13011,15 @@ return TS
         </Properties>
       </Item>
     </Item>
-    <Item class="Folder" referent="35">
+    <Item class="Folder" referent="37">
       <Properties>
         <string name="Name">node_modules</string>
       </Properties>
-      <Item class="Folder" referent="36">
+      <Item class="Folder" referent="38">
         <Properties>
           <string name="Name">@rbxts</string>
         </Properties>
-      <Item class="ModuleScript" referent="33">
+      <Item class="ModuleScript" referent="35">
         <Properties>
           <string name="Name">services</string>
           <string name="Source"><![CDATA[return setmetatable({}, {