@chrrxs/robloxstudio-mcp 2.16.4 → 2.17.1

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,7 +30,22 @@ 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)
+local function applyRememberedServerUrl()
+	local rememberedServerUrl = ServerUrlSettings.readServerUrl()
+	if rememberedServerUrl == nil then
+		return nil
+	end
+	local conn = State.getActiveConnection()
+	conn.serverUrl = rememberedServerUrl
+	local port = ServerUrlSettings.extractPort(rememberedServerUrl)
+	if port ~= nil then
+		conn.port = port
+	end
+	ClientBroker.setServerUrl(rememberedServerUrl)
+end
+applyRememberedServerUrl()
 UI.init(plugin)
 local elements = UI.getElements()
 local ICON_DISCONNECTED = "rbxassetid://125921838360800"
@@ -92,17 +108,13 @@ task.delay(2, function()
 						_condition = ClientBroker.DEFAULT_MCP_URL
 					end
 					local inheritedServerUrl = _condition
-					conn.serverUrl = inheritedServerUrl
-					elements.urlInput.Text = inheritedServerUrl
-					local portStr = string.match(conn.serverUrl, ":(%d+)$")
-					if portStr ~= 0 and portStr == portStr and portStr ~= "" and portStr then
-						local _condition_1 = tonumber(portStr)
-						if _condition_1 == nil then
-							_condition_1 = conn.port
-						end
-						conn.port = _condition_1
+					conn.serverUrl = ServerUrlSettings.normalizeServerUrl(inheritedServerUrl)
+					elements.urlInput.Text = conn.serverUrl
+					local port = ServerUrlSettings.extractPort(conn.serverUrl)
+					if port ~= nil then
+						conn.port = port
 					end
-					ClientBroker.setServerUrl(inheritedServerUrl)
+					ClientBroker.setServerUrl(conn.serverUrl)
 				end
 				-- Defensive default: in invisible play-DM UIs, the input field
 				-- may not be populated by the time we activate.
@@ -147,6 +159,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 +229,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 +420,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 +672,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 +763,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,13 +794,11 @@ 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,
 	["/api/multiplayer-test-leave-client"] = TestHandlers.multiplayerTestLeaveClient,
 	["/api/multiplayer-test-end"] = TestHandlers.multiplayerTestEnd,
-	["/api/character-navigation"] = TestHandlers.characterNavigation,
 	["/api/export-build"] = BuildHandlers.exportBuild,
 	["/api/import-build"] = BuildHandlers.importBuild,
 	["/api/import-scene"] = BuildHandlers.importScene,
@@ -791,6 +812,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,
@@ -948,6 +971,7 @@ function sendReady(conn)
 			end
 		end
 		lastReadyInstanceId = if _condition then readyData.instanceId else instanceId
+		ServerUrlSettings.rememberServerUrl(conn.serverUrl)
 		local _condition_1 = assignedRole
 		if _condition_1 == nil then
 			_condition_1 = detectRole()
@@ -1158,19 +1182,19 @@ local function activatePlugin(connIndex)
 	conn.consecutiveFailures = 0
 	conn.currentRetryDelay = 0.5
 	if idx == State.getActiveTabIndex() then
-		conn.serverUrl = ui.urlInput.Text
-		local portStr = string.match(conn.serverUrl, ":(%d+)$")
-		if portStr ~= 0 and portStr == portStr and portStr ~= "" and portStr then
-			local _condition_1 = tonumber(portStr)
-			if _condition_1 == nil then
-				_condition_1 = conn.port
-			end
-			conn.port = _condition_1
+		local normalizedUrl = ServerUrlSettings.normalizeServerUrl(ui.urlInput.Text)
+		conn.serverUrl = if normalizedUrl ~= "" then normalizedUrl else conn.serverUrl
+		if conn.serverUrl == "" then
+			conn.serverUrl = ClientBroker.DEFAULT_MCP_URL
+		end
+		ui.urlInput.Text = conn.serverUrl
+		local port = ServerUrlSettings.extractPort(conn.serverUrl)
+		if port ~= nil then
+			conn.port = port
 		end
 		UI.updateTabLabel(idx)
 		UI.updateUIState()
 	end
-	ServerUrlSettings.rememberServerUrl(conn.serverUrl)
 	UI.updateTabDot(idx)
 	if not conn.heartbeatConnection then
 		conn.heartbeatConnection = RunService.Heartbeat:Connect(function()
@@ -1411,9 +1435,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.16.4" is replaced with the package version at package time
+	-- "2.17.1" 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.4`
+	return `{tostring(h)}-2.17.1`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -1857,6 +1881,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 +2963,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 +3178,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 +3332,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 +3532,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 +4039,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 +4065,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 +4133,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 +4672,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 +4924,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
@@ -5347,64 +5889,6 @@ local function compareInstances(requestData)
 		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
-		end
-		return {
-			entries = finalEntries,
-			count = #finalEntries,
-			totalAvailable = #allEntries,
-		}
-	end)
-	if success then
-		return result
-	end
-	return {
-		error = `Failed to get output log: {result}`,
-	}
-end
 return {
 	getFileTree = getFileTree,
 	searchFiles = searchFiles,
@@ -5419,12 +5903,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 +6156,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
@@ -5859,6 +6342,9 @@ local function setScriptSource(requestData)
 		ScriptEditorService:UpdateSourceAsync(instance, function()
 			return sourceToSet
 		end)
+		if readScriptSource(instance) ~= sourceToSet then
+			error("UpdateSourceAsync completed without updating the script source")
+		end
 		return {
 			success = true,
 			instancePath = instancePath,
@@ -6335,41 +6821,504 @@ local function findAndReplaceInScripts(requestData)
 				table.insert(changes, _arg0)
 			end
 		end
-		for _, child in instance:GetChildren() do
-			if hitLimit then
-				return nil
-			end
-			processInstance(child)
+		for _, child in instance:GetChildren() do
+			if hitLimit then
+				return nil
+			end
+			processInstance(child)
+		end
+	end
+	processInstance(startInstance)
+	if recordingId ~= nil then
+		finishRecording(recordingId, #changes > 0)
+	end
+	return {
+		success = true,
+		dryRun = dryRun,
+		pattern = searchPattern,
+		replacement = replacement,
+		totalReplacements = totalReplacements,
+		scriptsSearched = scriptsSearched,
+		scriptsModified = #changes,
+		changes = changes,
+		truncated = hitLimit,
+	}
+end
+return {
+	getScriptSource = getScriptSource,
+	setScriptSource = setScriptSource,
+	editScriptLines = editScriptLines,
+	insertScriptLines = insertScriptLines,
+	deleteScriptLines = deleteScriptLines,
+	findAndReplaceInScripts = findAndReplaceInScripts,
+}
+]]></string>
+          </Properties>
+        </Item>
+        <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
-	processInstance(startInstance)
-	if recordingId ~= nil then
-		finishRecording(recordingId, #changes > 0)
+	local requestedAt = tick()
+	while rawJson == nil and tick() - requestedAt < 5 do
+		task.wait(0.05)
 	end
-	return {
-		success = true,
-		dryRun = dryRun,
-		pattern = searchPattern,
-		replacement = replacement,
-		totalReplacements = totalReplacements,
-		scriptsSearched = scriptsSearched,
-		scriptsModified = #changes,
-		changes = changes,
-		truncated = hitLimit,
-	}
+	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 {
-	getScriptSource = getScriptSource,
-	setScriptSource = setScriptSource,
-	editScriptLines = editScriptLines,
-	insertScriptLines = insertScriptLines,
-	deleteScriptLines = deleteScriptLines,
-	findAndReplaceInScripts = findAndReplaceInScripts,
+	captureScriptProfiler = captureScriptProfiler,
 }
 ]]></string>
           </Properties>
         </Item>
-        <Item class="ModuleScript" referent="19">
+        <Item class="ModuleScript" referent="21">
           <Properties>
             <string name="Name">SerializationHandlers</string>
             <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
@@ -6555,33 +7504,18 @@ 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
 local TS = require(script.Parent.Parent.Parent.include.RuntimeLib)
 local _services = TS.import(script, script.Parent.Parent.Parent, "node_modules", "@rbxts", "services")
 local HttpService = _services.HttpService
-local LogService = _services.LogService
 local Players = _services.Players
 local RunService = _services.RunService
 local StopPlayMonitor = TS.import(script, script.Parent.Parent, "StopPlayMonitor")
 local StudioTestService = game:GetService("StudioTestService")
-local ServerScriptService = game:GetService("ServerScriptService")
-local ScriptEditorService = game:GetService("ScriptEditorService")
--- NAV_SIGNAL flows from the edit DM to the play-server DM via the injected
--- __MCP_CommandListener Script + LogService.MessageOut. Stop signaling moved
--- off this path entirely (see StopPlayMonitor) because cross-DM MessageOut
--- reflection from edit -> play-server does not work in practice.
-local NAV_SIGNAL = "__MCP_NAV__"
-local NAV_RESULT = "__MCP_NAV_RESULT__"
 local testRunning = false
-local outputBuffer = {}
-local logConnection
-local testResult
-local testError
-local stopListenerScript
-local navResultCallback
 local multiplayerState = {
 	phase = "idle",
 }
@@ -6639,94 +7573,6 @@ local function normalizeNumPlayers(value)
 	end
 	return n
 end
-local function buildCommandListenerSource()
-	return `local LogService = game:GetService("LogService")\
-local PathfindingService = game:GetService("PathfindingService")\
-local Players = game:GetService("Players")\
-local HttpService = game:GetService("HttpService")\
-local NAV_SIG = "{NAV_SIGNAL}"\
-local NAV_RES = "{NAV_RESULT}"\
-LogService.MessageOut:Connect(function(msg)\
-	if string.sub(msg, 1, #NAV_SIG + 1) == NAV_SIG .. ":" then\
-		local json = string.sub(msg, #NAV_SIG + 2)\
-		task.spawn(function()\
-			local ok, d = pcall(function() return HttpService:JSONDecode(json) end)\
-			if not ok or not d then\
-				print(NAV_RES .. ':\{"success":false,"error":"parse_error"\}')\
-				return\
-			end\
-			local ps = Players:GetPlayers()\
-			if #ps == 0 then\
-				print(NAV_RES .. ':\{"success":false,"error":"no_players"\}')\
-				return\
-			end\
-			local char = ps[1].Character or ps[1].CharacterAdded:Wait()\
-			local hum = char:FindFirstChildOfClass("Humanoid")\
-			local root = char:FindFirstChild("HumanoidRootPart")\
-			if not hum or not root then\
-				print(NAV_RES .. ':\{"success":false,"error":"no_humanoid"\}')\
-				return\
-			end\
-			local target\
-			if d.instancePath then\
-				local parts = string.split(d.instancePath, ".")\
-				local cur = game\
-				for i = 2, #parts do\
-					cur = cur:FindFirstChild(parts[i])\
-					if not cur then\
-						print(NAV_RES .. ':\{"success":false,"error":"instance_not_found"\}')\
-						return\
-					end\
-				end\
-				if cur:IsA("BasePart") then target = cur.Position\
-				elseif cur:IsA("Model") and cur.PrimaryPart then target = cur.PrimaryPart.Position\
-				else target = cur:GetPivot().Position end\
-			else\
-				target = Vector3.new(d.x or 0, d.y or 0, d.z or 0)\
-			end\
-			local path = PathfindingService:CreatePath(\{AgentRadius=2,AgentHeight=5,AgentCanJump=true\})\
-			local pok = pcall(function() path:ComputeAsync(root.Position, target) end)\
-			local method = "direct"\
-			if pok and path.Status == Enum.PathStatus.Success then\
-				method = "pathfinding"\
-				for _, wp in ipairs(path:GetWaypoints()) do\
-					hum:MoveTo(wp.Position)\
-					if wp.Action == Enum.PathWaypointAction.Jump then hum.Jump = true end\
-					hum.MoveToFinished:Wait()\
-				end\
-			else\
-				hum:MoveTo(target)\
-				hum.MoveToFinished:Wait()\
-			end\
-			local fp = root.Position\
-			print(NAV_RES .. ':\{"success":true,"method":"' .. method .. '","position":[' .. fp.X .. ',' .. fp.Y .. ',' .. fp.Z .. ']\}')\
-		end)\
-	end\
-end)`
-end
-local function injectStopListener()
-	local listener = Instance.new("Script")
-	listener.Name = "__MCP_CommandListener"
-	listener.Parent = ServerScriptService
-	local source = buildCommandListenerSource()
-	local seOk = pcall(function()
-		ScriptEditorService:UpdateSourceAsync(listener, function()
-			return source
-		end)
-	end)
-	if not seOk then
-		listener.Source = source
-	end
-	stopListenerScript = listener
-end
-local function cleanupStopListener()
-	if stopListenerScript then
-		pcall(function()
-			return stopListenerScript:Destroy()
-		end)
-		stopListenerScript = nil
-	end
-end
 local function startPlaytest(requestData)
 	local mode = requestData.mode
 	local numPlayers = requestData.numPlayers
@@ -6746,11 +7592,6 @@ 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
-		cleanupStopListener()
 		-- Runtime eval bridges are created by the play server/client plugin
 		-- peers and disappear with the play DataModels.
 	end
@@ -6760,41 +7601,6 @@ local function startPlaytest(requestData)
 		}
 	end
 	testRunning = true
-	outputBuffer = {}
-	testResult = nil
-	testError = nil
-	cleanupStopListener()
-	logConnection = LogService.MessageOut:Connect(function(message, messageType)
-		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
-			if navResultCallback then
-				local _fn = navResultCallback
-				local _message_2 = message
-				local _arg0 = #NAV_RESULT + 2
-				_fn(string.sub(_message_2, _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()
-	end)
-	if not injected then
-		warn(`[robloxstudio-mcp] Failed to inject stop listener: {injErr}`)
-	end
 	task.spawn(function()
 		local ok, result = pcall(function()
 			if mode == "play" then
@@ -6802,17 +7608,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
 		testRunning = false
-		cleanupStopListener()
 	end)
 	local response = {
 		success = true,
@@ -6887,20 +7686,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 {
@@ -7085,89 +7870,20 @@ local function multiplayerTestEnd(requestData)
 		value = value,
 	}
 end
-local function characterNavigation(requestData)
-	if not testRunning then
-		return {
-			error = "Playtest must be running. Start a playtest in 'play' mode first.",
-		}
-	end
-	local position = requestData.position
-	local instancePath = requestData.instancePath
-	local _condition = (requestData.waitForCompletion)
-	if _condition == nil then
-		_condition = true
-	end
-	local waitForCompletion = _condition
-	local _condition_1 = (requestData.timeout)
-	if _condition_1 == nil then
-		_condition_1 = 25
-	end
-	local timeout = _condition_1
-	if not position and not (instancePath ~= "" and instancePath) then
-		return {
-			error = "Either position [x, y, z] or instancePath is required",
-		}
-	end
-	local navData
-	if position then
-		navData = HttpService:JSONEncode({
-			x = position[1],
-			y = position[2],
-			z = position[3],
-		})
-	else
-		navData = HttpService:JSONEncode({
-			instancePath = instancePath,
-		})
-	end
-	warn(`{NAV_SIGNAL}:{navData}`)
-	if not waitForCompletion then
-		return {
-			success = true,
-			message = "Navigation command sent",
-		}
-	end
-	local result
-	navResultCallback = function(json)
-		result = json
-	end
-	local startTime = tick()
-	while not (result ~= "" and result) and tick() - startTime < timeout do
-		task.wait(0.2)
-	end
-	navResultCallback = nil
-	if result ~= "" and result then
-		local ok, parsed = pcall(function()
-			return HttpService:JSONDecode(result)
-		end)
-		if ok then
-			return parsed
-		end
-		return {
-			success = true,
-			rawResult = result,
-		}
-	end
-	return {
-		error = `Navigation timed out after {timeout} seconds`,
-	}
-end
 return {
 	startPlaytest = startPlaytest,
 	stopPlaytest = stopPlaytest,
-	getPlaytestOutput = getPlaytestOutput,
 	multiplayerTestStart = multiplayerTestStart,
 	multiplayerTestState = multiplayerTestState,
 	multiplayerTestAddPlayers = multiplayerTestAddPlayers,
 	multiplayerTestLeaveClient = multiplayerTestLeaveClient,
 	multiplayerTestEnd = multiplayerTestEnd,
-	characterNavigation = characterNavigation,
 }
 ]]></string>
           </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 +7964,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 +8398,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 +8428,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 +8496,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 +8549,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 +8594,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 +8708,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
@@ -7969,11 +8716,37 @@ local TS = require(script.Parent.Parent.include.RuntimeLib)
 local _services = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services")
 local HttpService = _services.HttpService
 local ServerStorage = _services.ServerStorage
-local SETTING_KEY_PREFIX = "MCP_SERVER_URL_"
+local LEGACY_SETTING_KEY_PREFIX = "MCP_SERVER_URL_"
+local SETTING_KEY_PREFIX = "MCP_LAST_SUCCESSFUL_SERVER_URL_"
+local GLOBAL_SETTING_KEY = "MCP_LAST_SUCCESSFUL_SERVER_URL_GLOBAL_V1"
 local pluginRef
 local function init(p)
 	pluginRef = p
 end
+local function normalizeServerUrl(serverUrl)
+	local _condition = serverUrl
+	if _condition == nil then
+		_condition = ""
+	end
+	local normalized = (string.gsub((string.gsub(_condition, "^%s+", "")), "%s+$", ""))
+	if normalized == "" then
+		return ""
+	end
+	if (string.match(normalized, "^%a[%w+.-]*://")) == nil then
+		normalized = `http://{normalized}`
+	end
+	while #normalized > 0 and string.sub(normalized, -1) == "/" and (string.match(normalized, "^%a[%w+.-]*://$")) == nil do
+		normalized = string.sub(normalized, 1, -2)
+	end
+	return normalized
+end
+local function extractPort(serverUrl)
+	local portStr = string.match(serverUrl, ":(%d+)$")
+	if portStr == nil then
+		return nil
+	end
+	return tonumber(portStr)
+end
 local function addUnique(values, value)
 	local _values = values
 	local _value = value
@@ -8003,15 +8776,39 @@ end
 local function settingKey(instanceId)
 	return SETTING_KEY_PREFIX .. instanceId
 end
+local function legacySettingKey(instanceId)
+	return LEGACY_SETTING_KEY_PREFIX .. instanceId
+end
+local function readSettingString(key)
+	if not pluginRef then
+		return nil
+	end
+	local ok, value = pcall(function()
+		return pluginRef:GetSetting(key)
+	end)
+	if not ok or not (type(value) == "string") then
+		return nil
+	end
+	local normalized = normalizeServerUrl(value)
+	return if normalized ~= "" then normalized else nil
+end
+local function writeSettingString(key, serverUrl)
+	if not pluginRef then
+		return nil
+	end
+	pcall(function()
+		return pluginRef:SetSetting(key, serverUrl)
+	end)
+end
 local function rememberServerUrl(serverUrl)
-	if not pluginRef or serverUrl == "" then
+	local normalized = normalizeServerUrl(serverUrl)
+	if not pluginRef or normalized == "" then
 		return nil
 	end
+	writeSettingString(GLOBAL_SETTING_KEY, normalized)
 	for _, instanceId in computeInstanceIds() do
-		local key = settingKey(instanceId)
-		pcall(function()
-			return pluginRef:SetSetting(key, serverUrl)
-		end)
+		writeSettingString(settingKey(instanceId), normalized)
+		writeSettingString(legacySettingKey(instanceId), normalized)
 	end
 end
 local function readServerUrl()
@@ -8019,29 +8816,38 @@ local function readServerUrl()
 		return nil
 	end
 	for _, instanceId in computeInstanceIds() do
-		local key = settingKey(instanceId)
-		local ok, value = pcall(function()
-			return pluginRef:GetSetting(key)
-		end)
-		if ok and type(value) == "string" and value ~= "" then
-			return value
+		local remembered = readSettingString(settingKey(instanceId))
+		if remembered ~= nil then
+			return remembered
+		end
+	end
+	local globalRemembered = readSettingString(GLOBAL_SETTING_KEY)
+	if globalRemembered ~= nil then
+		return globalRemembered
+	end
+	for _, instanceId in computeInstanceIds() do
+		local legacyRemembered = readSettingString(legacySettingKey(instanceId))
+		if legacyRemembered ~= nil then
+			return legacyRemembered
 		end
 	end
 	return nil
 end
 return {
 	init = init,
+	normalizeServerUrl = normalizeServerUrl,
+	extractPort = extractPort,
 	rememberServerUrl = rememberServerUrl,
 	readServerUrl = readServerUrl,
 }
 ]]></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.4"
+local CURRENT_VERSION = "2.17.1"
 local PLUGIN_VARIANT = "inspector"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -8135,7 +8941,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,13 +9239,14 @@ 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
 local TS = require(script.Parent.Parent.include.RuntimeLib)
 local TweenService = TS.import(script, script.Parent.Parent, "node_modules", "@rbxts", "services").TweenService
 local State = TS.import(script, script.Parent, "State")
+local ServerUrlSettings = TS.import(script, script.Parent, "ServerUrlSettings")
 local elements = nil
 local pulseAnimation
 local buttonHover = false
@@ -8878,7 +9685,7 @@ local function init(pluginRef)
 	urlInput.Size = UDim2.new(1, 0, 0, 26)
 	urlInput.BackgroundColor3 = C.bg
 	urlInput.BorderSizePixel = 0
-	urlInput.Text = "http://localhost:58741"
+	urlInput.Text = State.getActiveConnection().serverUrl
 	urlInput.TextColor3 = C.label
 	urlInput.TextSize = 11
 	urlInput.Font = Enum.Font.GothamMedium
@@ -8899,14 +9706,16 @@ local function init(pluginRef)
 		if not conn or conn.isActive then
 			return nil
 		end
-		conn.serverUrl = urlInput.Text
-		local portStr = string.match(conn.serverUrl, ":(%d+)$")
-		if portStr ~= 0 and portStr == portStr and portStr ~= "" and portStr then
-			local _condition = tonumber(portStr)
-			if _condition == nil then
-				_condition = conn.port
-			end
-			conn.port = _condition
+		local normalizedUrl = ServerUrlSettings.normalizeServerUrl(urlInput.Text)
+		if normalizedUrl == "" then
+			urlInput.Text = conn.serverUrl
+			return nil
+		end
+		conn.serverUrl = normalizedUrl
+		urlInput.Text = normalizedUrl
+		local port = ServerUrlSettings.extractPort(conn.serverUrl)
+		if port ~= nil then
+			conn.port = port
 		end
 		updateTabLabel(State.getActiveTabIndex())
 	end)
@@ -9204,11 +10013,37 @@ 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
 local ScriptEditorService = game:GetService("ScriptEditorService")
+local LUAU_KEYWORDS = {
+	["and"] = true,
+	["break"] = true,
+	["continue"] = true,
+	["do"] = true,
+	["else"] = true,
+	["elseif"] = true,
+	["end"] = true,
+	["export"] = true,
+	["false"] = true,
+	["for"] = true,
+	["function"] = true,
+	["if"] = true,
+	["in"] = true,
+	["local"] = true,
+	["nil"] = true,
+	["not"] = true,
+	["or"] = true,
+	["repeat"] = true,
+	["return"] = true,
+	["then"] = true,
+	["true"] = true,
+	["type"] = true,
+	["until"] = true,
+	["while"] = true,
+}
 local function safeCall(func, ...)
 	local args = { ... }
 	local success, result = pcall(func, unpack(args))
@@ -9219,6 +10054,194 @@ local function safeCall(func, ...)
 		return nil
 	end
 end
+local function isSimplePathSegment(segment)
+	local _condition = (string.match(segment, "^[%a_][%w_]*$")) ~= nil
+	if _condition then
+		local _segment = segment
+		_condition = not (LUAU_KEYWORDS[_segment] ~= nil)
+	end
+	return _condition
+end
+local function quotePathSegment(segment)
+	local escaped = (string.gsub(segment, "\\", "\\\\"))
+	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 unescapePathSegment(segment)
+	local chars = {}
+	local i = 1
+	while i <= #segment do
+		local _segment = segment
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_segment, _i, _i_1)
+		if ch == "\\" and i < #segment then
+			local _segment_1 = segment
+			local _arg0 = i + 1
+			local _arg1 = i + 1
+			local nextChar = string.sub(_segment_1, _arg0, _arg1)
+			if nextChar == "n" then
+				table.insert(chars, "\n")
+			elseif nextChar == "r" then
+				table.insert(chars, "\r")
+			elseif nextChar == "t" then
+				table.insert(chars, "\t")
+			else
+				table.insert(chars, nextChar)
+			end
+			i += 2
+		else
+			table.insert(chars, ch)
+			i += 1
+		end
+	end
+	return table.concat(chars, "")
+end
+local function isCanonicalBracketStart(path, index)
+	local _path = path
+	local _arg0 = index + 1
+	local _arg1 = index + 1
+	local quote = string.sub(_path, _arg0, _arg1)
+	local _condition = (quote == '"' or quote == "'")
+	if _condition then
+		local _path_1 = path
+		local _arg0_1 = index - 1
+		local _arg1_1 = index - 1
+		_condition = string.sub(_path_1, _arg0_1, _arg1_1) ~= "."
+	end
+	return _condition
+end
+local function parseInstancePath(path)
+	local i = 1
+	local len = #path
+	local parts = {}
+	local current = ""
+	if path == "" or path == "game" then
+		return parts
+	end
+	if string.sub(path, 1, 5) == "game." then
+		i = 6
+	elseif string.sub(path, 1, 5) == "game[" then
+		i = 5
+	end
+	while i <= len do
+		local _path = path
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_path, _i, _i_1)
+		if ch == "." then
+			if current ~= "" then
+				local _current = current
+				table.insert(parts, _current)
+				current = ""
+				i += 1
+			else
+				local _condition = i > 1
+				if _condition then
+					local _path_1 = path
+					local _arg0 = i - 1
+					local _arg1 = i - 1
+					_condition = string.sub(_path_1, _arg0, _arg1) == "."
+					if _condition then
+						_condition = i < len
+						if _condition then
+							local _path_2 = path
+							local _arg0_1 = i + 1
+							local _arg1_1 = i + 1
+							_condition = string.sub(_path_2, _arg0_1, _arg1_1) ~= "["
+						end
+					end
+				end
+				if _condition then
+					-- Back-compat for previously emitted paths such as
+					-- game.ServerScriptService..dir.ReproScript, where ".dir"
+					-- was an actual instance name.
+					current = "."
+					i += 1
+				else
+					i += 1
+				end
+			end
+		elseif ch == "[" and i < len and isCanonicalBracketStart(path, i) then
+			if current ~= "" then
+				local _current = current
+				table.insert(parts, _current)
+				current = ""
+			end
+			local _path_1 = path
+			local _arg0 = i + 1
+			local _arg1 = i + 1
+			local quote = string.sub(_path_1, _arg0, _arg1)
+			if quote ~= '"' and quote ~= "'" then
+				return nil
+			end
+			local j = i + 2
+			local raw = ""
+			while j <= len do
+				local _path_2 = path
+				local _j = j
+				local _j_1 = j
+				local c = string.sub(_path_2, _j, _j_1)
+				if c == "\\" then
+					if j >= len then
+						return nil
+					end
+					local _path_3 = path
+					local _arg0_1 = j + 1
+					local _arg1_1 = j + 1
+					raw ..= c .. string.sub(_path_3, _arg0_1, _arg1_1)
+					j += 2
+				elseif c == quote then
+					break
+				else
+					raw ..= c
+					j += 1
+				end
+			end
+			local _condition = j > len
+			if not _condition then
+				local _path_2 = path
+				local _j = j
+				local _j_1 = j
+				_condition = string.sub(_path_2, _j, _j_1) ~= quote
+				if not _condition then
+					local _path_3 = path
+					local _arg0_1 = j + 1
+					local _arg1_1 = j + 1
+					_condition = string.sub(_path_3, _arg0_1, _arg1_1) ~= "]"
+				end
+			end
+			if _condition then
+				return nil
+			end
+			local _arg0_1 = unescapePathSegment(raw)
+			table.insert(parts, _arg0_1)
+			i = j + 2
+		else
+			current ..= ch
+			i += 1
+		end
+	end
+	if current ~= "" then
+		local _current = current
+		table.insert(parts, _current)
+	end
+	return parts
+end
+local function getRootSegment(instance)
+	if instance.Parent == game then
+		local ok, service = pcall(function()
+			return game:GetService(instance.ClassName)
+		end)
+		if ok and service == instance then
+			return instance.ClassName
+		end
+	end
+	return instance.Name
+end
 local function getInstancePath(instance)
 	if not instance or instance == game then
 		return "game"
@@ -9226,23 +10249,40 @@ local function getInstancePath(instance)
 	local pathParts = {}
 	local current = instance
 	while current and current ~= game do
-		local _name = current.Name
-		table.insert(pathParts, 1, _name)
+		local _arg0 = getRootSegment(current)
+		table.insert(pathParts, 1, _arg0)
 		current = current.Parent
 	end
-	return `game.{table.concat(pathParts, ".")}`
+	local path = "game"
+	for _, part in pathParts do
+		if isSimplePathSegment(part) then
+			path ..= `.{part}`
+		else
+			path ..= `[{quotePathSegment(part)}]`
+		end
+	end
+	return path
+end
+local function getRootInstance(segment)
+	local ok, service = pcall(function()
+		return game:GetService(segment)
+	end)
+	if ok and service then
+		return service
+	end
+	return game:FindFirstChild(segment)
 end
 local function getInstanceByPath(path)
-	if path == "game" or path == "" then
-		return game
+	local parts = parseInstancePath(path)
+	if parts == nil then
+		return nil
 	end
-	local cleaned = (string.gsub(path, "^game%.", ""))
-	local parts = {}
-	for part in string.gmatch(cleaned, "[^%.]+") do
-		table.insert(parts, part)
+	if #parts == 0 then
+		return game
 	end
-	local current = game
-	for _, part in parts do
+	local current = getRootInstance(parts[1])
+	for i = 1, #parts - 1 do
+		local part = parts[i + 1]
 		if not current then
 			return nil
 		end
@@ -9734,11 +10774,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 +12852,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 +13119,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({}, {