@chrrxs/robloxstudio-mcp-inspector 2.17.0 → 2.17.1

package/studio-plugin/MCPPlugin.rbxmx

@@ -32,6 +32,20 @@ RuntimeLogBuffer.install()
 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://75876056391496"
@@ -94,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.
@@ -789,7 +799,6 @@ local routeMap = {
 	["/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,
@@ -962,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()
@@ -1172,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()
@@ -1425,9 +1435,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.17.0" 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.17.0`
+	return `{tostring(h)}-2.17.1`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -6332,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,
@@ -7498,23 +7511,11 @@ return {
 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 navLogConnection
-local stopListenerScript
-local navResultCallback
 local multiplayerState = {
 	phase = "idle",
 }
@@ -7572,100 +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 disconnectNavLogListener()
-	if navLogConnection then
-		navLogConnection:Disconnect()
-		navLogConnection = nil
-	end
-end
 local function startPlaytest(requestData)
 	local mode = requestData.mode
 	local numPlayers = requestData.numPlayers
@@ -7685,8 +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
-		disconnectNavLogListener()
-		cleanupStopListener()
 		-- Runtime eval bridges are created by the play server/client plugin
 		-- peers and disappear with the play DataModels.
 	end
@@ -7696,26 +7601,6 @@ local function startPlaytest(requestData)
 		}
 	end
 	testRunning = true
-	cleanupStopListener()
-	disconnectNavLogListener()
-	navLogConnection = LogService.MessageOut:Connect(function(message)
-		local _message = message
-		local _arg1 = #NAV_RESULT + 1
-		if string.sub(_message, 1, _arg1) == `{NAV_RESULT}:` then
-			if navResultCallback then
-				local _fn = navResultCallback
-				local _message_1 = message
-				local _arg0 = #NAV_RESULT + 2
-				_fn(string.sub(_message_1, _arg0))
-			end
-		end
-	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
@@ -7726,9 +7611,7 @@ local function startPlaytest(requestData)
 		if not ok then
 			warn(`[robloxstudio-mcp] Playtest ended with error: {result}`)
 		end
-		disconnectNavLogListener()
 		testRunning = false
-		cleanupStopListener()
 	end)
 	local response = {
 		success = true,
@@ -7987,73 +7870,6 @@ 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,
@@ -8062,7 +7878,6 @@ return {
 	multiplayerTestAddPlayers = multiplayerTestAddPlayers,
 	multiplayerTestLeaveClient = multiplayerTestLeaveClient,
 	multiplayerTestEnd = multiplayerTestEnd,
-	characterNavigation = characterNavigation,
 }
 ]]></string>
           </Properties>
@@ -8901,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
@@ -8935,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()
@@ -8951,18 +8816,27 @@ 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,
 }
@@ -8973,7 +8847,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.17.0"
+local CURRENT_VERSION = "2.17.1"
 local PLUGIN_VARIANT = "main"
 local MAX_CONNECTIONS = 5
 local BASE_PORT = 58741
@@ -9372,6 +9246,7 @@ return {
 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
@@ -9810,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
@@ -9831,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)
@@ -10141,6 +10018,32 @@ return {
           <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))
@@ -10151,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"
@@ -10158,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