goldsync 0.1.11

package/assets/GoldSync.rbxmx

@@ -0,0 +1,2516 @@
+<roblox version="4">
+  <Item class="Folder" referent="0">
+    <Properties>
+      <string name="Name">GoldSync</string>
+    </Properties>
+    <Item class="Script" referent="1">
+      <Properties>
+        <string name="Name">GoldSync</string>
+        <token name="RunContext">3</token>
+        <string name="Source"><![CDATA[local ChangeHistoryService = game:GetService("ChangeHistoryService")
+local HttpService = game:GetService("HttpService")
+local ReflectionService = game:GetService("ReflectionService")
+local SerializationService = game:GetService("SerializationService")
+local ServerStorage = game:GetService("ServerStorage")
+local Selection = game:GetService("Selection")
+local StudioService = game:GetService("StudioService")
+
+local ENDPOINT = "http://127.0.0.1:34873"
+local SESSION_MARKER_NAME = "__GoldSyncSession"
+local CLIENT_HEADERS = {
+	["X-GoldSync-Client"] = "studio-plugin",
+}
+local SETTINGS_PREFIX = "GoldSync:v2:"
+local UI_SETTINGS_PREFIX = "GoldSync:ui:v1:"
+local VERSION = "0.1.11"
+local REQUEST_INTERVAL_SECONDS = 0.15
+local REQUEST_RETRY_DELAYS = { 1, 2, 4 }
+
+local showSynced = plugin:GetSetting(UI_SETTINGS_PREFIX .. "showSynced") ~= false
+local autoExpandConflicts = plugin:GetSetting(UI_SETTINGS_PREFIX .. "autoExpandConflicts") ~= false
+local visualDepth = math.clamp(tonumber(plugin:GetSetting(UI_SETTINGS_PREFIX .. "visualDepth")) or 3, 0, 5)
+
+local toolbar = plugin:CreateToolbar("GoldSync")
+local toolbarButton = toolbar:CreateButton(
+	"GoldSync",
+	"GoldSync v" .. VERSION .. " · Two-way native RBXM asset sync",
+	"rbxassetid://127943421516268"
+)
+toolbarButton.ClickableWhenViewportHidden = true
+
+local widgetInfo = DockWidgetPluginGuiInfo.new(
+	Enum.InitialDockState.Right,
+	false,
+	false,
+	360,
+	300,
+	280,
+	180
+)
+local widget = plugin:CreateDockWidgetPluginGui("GoldSyncWidget", widgetInfo)
+widget.Title = "GoldSync v" .. VERSION
+
+local inspectorInfo = DockWidgetPluginGuiInfo.new(Enum.InitialDockState.Right, false, false, 620, 500, 420, 280)
+local inspectorWidget = plugin:CreateDockWidgetPluginGui("GoldSyncConflictInspector", inspectorInfo)
+inspectorWidget.Title = "GoldSync Conflict Inspector"
+
+local inspectorContent = Instance.new("ScrollingFrame")
+inspectorContent.AutomaticCanvasSize = Enum.AutomaticSize.Y
+inspectorContent.BackgroundColor3 = Color3.fromRGB(30, 30, 34)
+inspectorContent.BorderSizePixel = 0
+inspectorContent.CanvasSize = UDim2.new()
+inspectorContent.ScrollBarThickness = 7
+inspectorContent.Size = UDim2.fromScale(1, 1)
+inspectorContent.Parent = inspectorWidget
+
+local inspectorPadding = Instance.new("UIPadding")
+inspectorPadding.PaddingBottom = UDim.new(0, 10)
+inspectorPadding.PaddingLeft = UDim.new(0, 10)
+inspectorPadding.PaddingRight = UDim.new(0, 10)
+inspectorPadding.PaddingTop = UDim.new(0, 10)
+inspectorPadding.Parent = inspectorContent
+
+local inspectorLayout = Instance.new("UIListLayout")
+inspectorLayout.Padding = UDim.new(0, 7)
+inspectorLayout.SortOrder = Enum.SortOrder.LayoutOrder
+inspectorLayout.Parent = inspectorContent
+
+local inspectorTitle = Instance.new("TextLabel")
+inspectorTitle.BackgroundTransparency = 1
+inspectorTitle.Font = Enum.Font.BuilderSansBold
+inspectorTitle.LayoutOrder = 1
+inspectorTitle.Size = UDim2.new(1, 0, 0, 28)
+inspectorTitle.Text = "No conflict workspace open"
+inspectorTitle.TextColor3 = Color3.fromRGB(240, 240, 245)
+inspectorTitle.TextSize = 18
+inspectorTitle.TextXAlignment = Enum.TextXAlignment.Left
+inspectorTitle.Parent = inspectorContent
+
+local inspectorSummary = Instance.new("TextLabel")
+inspectorSummary.AutomaticSize = Enum.AutomaticSize.Y
+inspectorSummary.BackgroundTransparency = 1
+inspectorSummary.Font = Enum.Font.BuilderSans
+inspectorSummary.LayoutOrder = 2
+inspectorSummary.Size = UDim2.new(1, 0, 0, 18)
+inspectorSummary.Text = "Open Merge Workspace from a conflicted root."
+inspectorSummary.TextColor3 = Color3.fromRGB(180, 180, 190)
+inspectorSummary.TextSize = 13
+inspectorSummary.TextWrapped = true
+inspectorSummary.TextXAlignment = Enum.TextXAlignment.Left
+inspectorSummary.Parent = inspectorContent
+
+local inspectorEntries = {}
+local inspectorRendered = 0
+local inspectorGeneration = 0
+local inspectorState
+local renderInspector
+
+local content = Instance.new("ScrollingFrame")
+content.Name = "Content"
+content.AutomaticCanvasSize = Enum.AutomaticSize.Y
+content.BackgroundColor3 = Color3.fromRGB(30, 30, 34)
+content.BorderSizePixel = 0
+content.CanvasSize = UDim2.new()
+content.ScrollBarThickness = 6
+content.Size = UDim2.fromScale(1, 1)
+content.Parent = widget
+
+local padding = Instance.new("UIPadding")
+padding.PaddingBottom = UDim.new(0, 10)
+padding.PaddingLeft = UDim.new(0, 10)
+padding.PaddingRight = UDim.new(0, 10)
+padding.PaddingTop = UDim.new(0, 10)
+padding.Parent = content
+
+local layout = Instance.new("UIListLayout")
+layout.Padding = UDim.new(0, 8)
+layout.SortOrder = Enum.SortOrder.LayoutOrder
+layout.Parent = content
+
+local header = Instance.new("Frame")
+header.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+header.BorderSizePixel = 0
+header.LayoutOrder = 1
+header.Size = UDim2.new(1, 0, 0, 58)
+header.Parent = content
+Instance.new("UICorner", header).CornerRadius = UDim.new(0, 6)
+
+local pluginIcon = Instance.new("ImageLabel")
+pluginIcon.BackgroundTransparency = 1
+pluginIcon.Image = "rbxassetid://127943421516268"
+pluginIcon.Position = UDim2.new(0, 8, 0.5, -20)
+pluginIcon.Size = UDim2.fromOffset(40, 40)
+pluginIcon.Parent = header
+
+local heading = Instance.new("TextLabel")
+heading.BackgroundTransparency = 1
+heading.Font = Enum.Font.BuilderSansBold
+heading.Position = UDim2.new(0, 56, 0, 7)
+heading.Size = UDim2.new(1, -64, 0, 22)
+heading.Text = "GoldSync · v" .. VERSION
+heading.TextColor3 = Color3.fromRGB(245, 245, 248)
+heading.TextSize = 18
+heading.TextXAlignment = Enum.TextXAlignment.Left
+heading.Parent = header
+
+local connectionDot = Instance.new("TextLabel")
+connectionDot.BackgroundTransparency = 1
+connectionDot.Font = Enum.Font.BuilderSansBold
+connectionDot.Position = UDim2.new(0, 56, 0, 30)
+connectionDot.Size = UDim2.fromOffset(12, 18)
+connectionDot.Text = "●"
+connectionDot.TextColor3 = Color3.fromRGB(180, 180, 190)
+connectionDot.TextSize = 9
+connectionDot.Parent = header
+
+local connectionStatus = Instance.new("TextLabel")
+connectionStatus.BackgroundTransparency = 1
+connectionStatus.Font = Enum.Font.BuilderSansBold
+connectionStatus.Position = UDim2.new(0, 70, 0, 29)
+connectionStatus.Size = UDim2.new(1, -78, 0, 20)
+connectionStatus.Text = "Waiting for daemon"
+connectionStatus.TextColor3 = Color3.fromRGB(180, 180, 190)
+connectionStatus.TextSize = 12
+connectionStatus.TextTruncate = Enum.TextTruncate.AtEnd
+connectionStatus.TextXAlignment = Enum.TextXAlignment.Left
+connectionStatus.Parent = header
+
+local controls = Instance.new("Frame")
+controls.BackgroundTransparency = 1
+controls.LayoutOrder = 2
+controls.Size = UDim2.new(1, 0, 0, 28)
+controls.Parent = content
+
+local searchBox = Instance.new("TextBox")
+searchBox.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+searchBox.BorderSizePixel = 0
+searchBox.ClearTextOnFocus = false
+searchBox.Font = Enum.Font.BuilderSans
+searchBox.PlaceholderColor3 = Color3.fromRGB(130, 130, 140)
+searchBox.PlaceholderText = "Search files and instances..."
+searchBox.Size = UDim2.new(1, -132, 1, 0)
+searchBox.Text = ""
+searchBox.TextColor3 = Color3.fromRGB(235, 235, 240)
+searchBox.TextSize = 12
+searchBox.TextXAlignment = Enum.TextXAlignment.Left
+searchBox.Parent = controls
+Instance.new("UICorner", searchBox).CornerRadius = UDim.new(0, 4)
+local searchPadding = Instance.new("UIPadding", searchBox)
+searchPadding.PaddingLeft = UDim.new(0, 8)
+searchPadding.PaddingRight = UDim.new(0, 8)
+
+local unsyncedButton = Instance.new("TextButton")
+unsyncedButton.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+unsyncedButton.BorderSizePixel = 0
+unsyncedButton.Font = Enum.Font.BuilderSansBold
+unsyncedButton.Position = UDim2.new(1, -126, 0, 0)
+unsyncedButton.Size = UDim2.fromOffset(92, 28)
+unsyncedButton.Text = "Unsynced · 0"
+unsyncedButton.TextColor3 = Color3.fromRGB(190, 190, 198)
+unsyncedButton.TextSize = 11
+unsyncedButton.Parent = controls
+Instance.new("UICorner", unsyncedButton).CornerRadius = UDim.new(0, 4)
+
+local settingsButton = Instance.new("TextButton")
+settingsButton.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+settingsButton.BorderSizePixel = 0
+settingsButton.Font = Enum.Font.BuilderSansBold
+settingsButton.Position = UDim2.new(1, -28, 0, 0)
+settingsButton.Size = UDim2.fromOffset(28, 28)
+settingsButton.Text = "⚙"
+settingsButton.TextColor3 = Color3.fromRGB(210, 210, 218)
+settingsButton.TextSize = 15
+settingsButton.Parent = controls
+Instance.new("UICorner", settingsButton).CornerRadius = UDim.new(0, 4)
+
+local settingsPanel = Instance.new("Frame")
+settingsPanel.AutomaticSize = Enum.AutomaticSize.Y
+settingsPanel.BackgroundColor3 = Color3.fromRGB(36, 36, 42)
+settingsPanel.BorderSizePixel = 0
+settingsPanel.LayoutOrder = 3
+settingsPanel.Size = UDim2.new(1, 0, 0, 0)
+settingsPanel.Visible = false
+settingsPanel.Parent = content
+Instance.new("UICorner", settingsPanel).CornerRadius = UDim.new(0, 5)
+local settingsPadding = Instance.new("UIPadding", settingsPanel)
+settingsPadding.PaddingBottom = UDim.new(0, 6)
+settingsPadding.PaddingLeft = UDim.new(0, 6)
+settingsPadding.PaddingRight = UDim.new(0, 6)
+settingsPadding.PaddingTop = UDim.new(0, 6)
+local settingsLayout = Instance.new("UIListLayout", settingsPanel)
+settingsLayout.Padding = UDim.new(0, 4)
+
+local showSyncedButton = Instance.new("TextButton")
+showSyncedButton.BackgroundColor3 = Color3.fromRGB(48, 48, 56)
+showSyncedButton.BorderSizePixel = 0
+showSyncedButton.Font = Enum.Font.BuilderSans
+showSyncedButton.Size = UDim2.new(1, 0, 0, 26)
+showSyncedButton.TextColor3 = Color3.fromRGB(230, 230, 235)
+showSyncedButton.TextSize = 12
+showSyncedButton.TextXAlignment = Enum.TextXAlignment.Left
+showSyncedButton.Parent = settingsPanel
+Instance.new("UICorner", showSyncedButton).CornerRadius = UDim.new(0, 4)
+local showSyncedPadding = Instance.new("UIPadding", showSyncedButton)
+showSyncedPadding.PaddingLeft = UDim.new(0, 8)
+
+local autoExpandButton = showSyncedButton:Clone()
+autoExpandButton.Parent = settingsPanel
+
+local depthRow = Instance.new("Frame")
+depthRow.BackgroundColor3 = Color3.fromRGB(48, 48, 56)
+depthRow.BorderSizePixel = 0
+depthRow.Size = UDim2.new(1, 0, 0, 26)
+depthRow.Parent = settingsPanel
+Instance.new("UICorner", depthRow).CornerRadius = UDim.new(0, 4)
+
+local depthLabel = Instance.new("TextLabel")
+depthLabel.BackgroundTransparency = 1
+depthLabel.Font = Enum.Font.BuilderSans
+depthLabel.Position = UDim2.new(0, 8, 0, 0)
+depthLabel.Size = UDim2.new(1, -64, 1, 0)
+depthLabel.TextColor3 = Color3.fromRGB(230, 230, 235)
+depthLabel.TextSize = 12
+depthLabel.TextXAlignment = Enum.TextXAlignment.Left
+depthLabel.Parent = depthRow
+
+local depthMinus = Instance.new("TextButton")
+depthMinus.BackgroundTransparency = 1
+depthMinus.Font = Enum.Font.BuilderSansBold
+depthMinus.Position = UDim2.new(1, -52, 0, 0)
+depthMinus.Size = UDim2.new(0, 26, 1, 0)
+depthMinus.Text = "−"
+depthMinus.TextColor3 = Color3.fromRGB(180, 180, 190)
+depthMinus.TextSize = 16
+depthMinus.Parent = depthRow
+
+local depthPlus = depthMinus:Clone()
+depthPlus.Position = UDim2.new(1, -26, 0, 0)
+depthPlus.Text = "+"
+depthPlus.Parent = depthRow
+
+local statusBanner = Instance.new("TextLabel")
+statusBanner.AutomaticSize = Enum.AutomaticSize.Y
+statusBanner.BackgroundColor3 = Color3.fromRGB(66, 38, 40)
+statusBanner.BorderSizePixel = 0
+statusBanner.Font = Enum.Font.BuilderSans
+statusBanner.LayoutOrder = 4
+statusBanner.Size = UDim2.new(1, 0, 0, 0)
+statusBanner.Text = ""
+statusBanner.TextColor3 = Color3.fromRGB(255, 205, 205)
+statusBanner.TextSize = 11
+statusBanner.TextWrapped = true
+statusBanner.TextXAlignment = Enum.TextXAlignment.Left
+statusBanner.Visible = false
+statusBanner.Parent = content
+Instance.new("UICorner", statusBanner).CornerRadius = UDim.new(0, 5)
+local statusBannerPadding = Instance.new("UIPadding", statusBanner)
+statusBannerPadding.PaddingBottom = UDim.new(0, 7)
+statusBannerPadding.PaddingLeft = UDim.new(0, 8)
+statusBannerPadding.PaddingRight = UDim.new(0, 8)
+statusBannerPadding.PaddingTop = UDim.new(0, 7)
+
+local directionLegend = Instance.new("TextLabel")
+directionLegend.BackgroundTransparency = 1
+directionLegend.Font = Enum.Font.BuilderSans
+directionLegend.LayoutOrder = 5
+directionLegend.Size = UDim2.new(1, 0, 0, 18)
+directionLegend.Text = "→  Studio to file      ←  File to Studio"
+directionLegend.TextColor3 = Color3.fromRGB(145, 145, 155)
+directionLegend.TextSize = 11
+directionLegend.TextXAlignment = Enum.TextXAlignment.Right
+directionLegend.Parent = content
+
+local rootsContainer = Instance.new("Frame")
+rootsContainer.AutomaticSize = Enum.AutomaticSize.Y
+rootsContainer.BackgroundTransparency = 1
+rootsContainer.LayoutOrder = 6
+rootsContainer.Size = UDim2.new(1, 0, 0, 0)
+rootsContainer.Parent = content
+
+local rootsLayout = Instance.new("UIListLayout")
+rootsLayout.Padding = UDim.new(0, 8)
+rootsLayout.SortOrder = Enum.SortOrder.LayoutOrder
+rootsLayout.Parent = rootsContainer
+
+local running = true
+local bulkRunning = false
+local requestLocked = false
+local requestWaiters = {}
+local lastRequestAt = 0
+local serverConfig
+local states = {}
+local groups = {}
+local refreshConfig
+local updateGroupSummaries
+local refreshStatusSummary
+local refreshUnsyncedButton
+local upload
+local pull
+local deleteSnapshot
+local openGitConflict
+local resolveGitConflict
+local applyTreeFilter
+local resetInstanceTrees
+
+local function collectSplitPaths(root, depth)
+	local paths = {}
+	local function visit(instance, remainingDepth, relativePath)
+		if remainingDepth == 0 then
+			table.insert(paths, relativePath)
+			return
+		end
+		for _, child in instance:GetChildren() do
+			local childPath = table.clone(relativePath)
+			table.insert(childPath, child.Name)
+			visit(child, remainingDepth - 1, childPath)
+		end
+	end
+	visit(root, depth, {})
+	return paths
+end
+
+local function acquireRequestLock()
+	if requestLocked then
+		local waiter = Instance.new("BindableEvent")
+		table.insert(requestWaiters, waiter)
+		waiter.Event:Wait()
+		waiter:Destroy()
+	end
+	requestLocked = true
+end
+
+local function releaseRequestLock()
+	local waiter = table.remove(requestWaiters, 1)
+	if waiter then
+		waiter:Fire()
+	else
+		requestLocked = false
+	end
+end
+
+local function request(method, path, body, headers)
+	local requestHeaders = table.clone(CLIENT_HEADERS)
+	local sessionMarker = ServerStorage:FindFirstChild(SESSION_MARKER_NAME)
+	if sessionMarker and sessionMarker.ClassName == "StringValue" and sessionMarker.Value ~= "" then
+		requestHeaders["X-GoldSync-Session"] = sessionMarker.Value
+	end
+	if headers then
+		for key, value in headers do
+			requestHeaders[key] = value
+		end
+	end
+
+	acquireRequestLock()
+	local requestError
+	for attempt = 1, #REQUEST_RETRY_DELAYS + 1 do
+		local delayUntilRequest = REQUEST_INTERVAL_SECONDS - (os.clock() - lastRequestAt)
+		if delayUntilRequest > 0 then
+			task.wait(delayUntilRequest)
+		end
+		local success, response = pcall(function()
+			return HttpService:RequestAsync({
+				Url = ENDPOINT .. path,
+				Method = method,
+				Headers = requestHeaders,
+				Body = body,
+			})
+		end)
+		lastRequestAt = os.clock()
+		if success then
+			releaseRequestLock()
+			return response, nil
+		end
+		requestError = tostring(response)
+		if not string.find(requestError, "Number of requests exceeded limit", 1, true)
+			or attempt > #REQUEST_RETRY_DELAYS
+		then
+			break
+		end
+		task.wait(REQUEST_RETRY_DELAYS[attempt])
+	end
+	releaseRequestLock()
+	return nil, requestError
+end
+
+local function responseError(response)
+	if response.Body ~= "" then
+		local success, decoded = pcall(HttpService.JSONDecode, HttpService, response.Body)
+		if success and type(decoded) == "table" and type(decoded.error) == "string" then
+			return decoded.error
+		end
+	end
+	return string.format("HTTP %d · %s", response.StatusCode, tostring(response.StatusMessage))
+end
+
+local function resolveRoot(studioPath)
+	local current = game:GetService(studioPath[1])
+	for index = 2, #studioPath do
+		current = current:FindFirstChild(studioPath[index])
+		if not current then
+			return nil
+		end
+	end
+	return current
+end
+
+local function resolveParent(studioPath)
+	local current = game:GetService(studioPath[1])
+	for index = 2, #studioPath - 1 do
+		current = current:FindFirstChild(studioPath[index])
+		if not current then
+			return nil
+		end
+	end
+	return current
+end
+
+local function applyClassIcon(image, className)
+	local success, icon = pcall(function()
+		return StudioService:GetClassIcon(className)
+	end)
+	if success then
+		for property, value in icon do
+			image[property] = value
+		end
+	end
+end
+
+local function addButtonHover(button)
+	button.MouseEnter:Connect(function()
+		button.BackgroundColor3 = Color3.fromRGB(58, 58, 68)
+		button.BackgroundTransparency = 0
+	end)
+	button.MouseLeave:Connect(function()
+		button.BackgroundTransparency = 1
+	end)
+	Instance.new("UICorner", button).CornerRadius = UDim.new(0, 3)
+end
+
+local function findCode(root)
+	if root:IsA("BaseScript") then
+		return root
+	end
+	for _, descendant in root:GetDescendants() do
+		if descendant:IsA("BaseScript") then
+			return descendant
+		end
+	end
+	return nil
+end
+
+local function setStatus(state, text, color)
+	local previousStatusKind = state.statusKind
+	state.status.Text = text
+	state.status.TextColor3 = color or Color3.fromRGB(180, 180, 190)
+	state.dot.TextColor3 = color or Color3.fromRGB(180, 180, 190)
+	state.searchQuery = nil
+	state.statusKind = if string.sub(text, 1, 6) == "Synced"
+		then "synced"
+		elseif string.find(text, "syncing")
+			or string.find(text, "Serializing")
+			or string.find(text, "Loading")
+			or string.find(text, "Saving")
+			or string.find(text, "applying")
+		then "working"
+		elseif string.find(text, "Rojo") and string.find(text, "offline") then "paused"
+		else "issue"
+	if updateGroupSummaries then
+		if previousStatusKind ~= state.statusKind then
+			updateGroupSummaries()
+		elseif refreshStatusSummary then
+			refreshStatusSummary()
+		end
+	end
+end
+
+local propertyNamesByClass = {}
+local propertySetsByClass = {}
+
+local function buildInstanceMap(root)
+	local byKey = { [""] = root }
+	local keyByInstance = { [root] = "" }
+	local displayByKey = { [""] = root.Name }
+	local function visit(parent, parentKey, displayPath)
+		local occurrences = {}
+		for _, child in parent:GetChildren() do
+			local identity = child.ClassName .. "\0" .. child.Name
+			occurrences[identity] = (occurrences[identity] or 0) + 1
+			local key = parentKey .. "\1" .. identity .. "\0" .. occurrences[identity]
+			local childDisplayPath = displayPath .. "." .. child.Name
+			byKey[key] = child
+			keyByInstance[child] = key
+			displayByKey[key] = childDisplayPath
+			visit(child, key, childDisplayPath)
+		end
+	end
+	visit(root, "", root.Name)
+	return byKey, keyByInstance, displayByKey
+end
+
+local function comparableValue(value, keyByInstance)
+	if typeof(value) == "Instance" then
+		return "Instance:" .. (keyByInstance[value] or value:GetFullName())
+	end
+	return typeof(value) .. ":" .. tostring(value)
+end
+
+local function displayValue(value)
+	if #value <= 240 then
+		return value
+	end
+	return string.sub(value, 1, 237) .. "..."
+end
+
+local function getSerializedPropertyNames(className)
+	if propertyNamesByClass[className] then
+		return propertyNamesByClass[className]
+	end
+	local names = {}
+	local success, properties = pcall(function()
+		return ReflectionService:GetPropertiesOfClass(className)
+	end)
+	if success then
+		for _, property in properties do
+			if property.Serialized and property.Name ~= "UniqueId" and property.Name ~= "HistoryId" then
+				table.insert(names, property.Name)
+			end
+		end
+		table.sort(names)
+	end
+	propertyNamesByClass[className] = names
+	return names
+end
+
+local function getSerializedPropertySet(className)
+	if propertySetsByClass[className] then
+		return propertySetsByClass[className]
+	end
+	local properties = {}
+	for _, propertyName in getSerializedPropertyNames(className) do
+		properties[propertyName] = true
+	end
+	propertySetsByClass[className] = properties
+	return properties
+end
+
+local function readProperty(instance, propertyName)
+	if not instance then
+		return false, nil
+	end
+	return pcall(function()
+		return instance[propertyName]
+	end)
+end
+
+local function addInspectorEntry(entry)
+	table.insert(inspectorEntries, entry)
+end
+
+local function compareConflictWorkspace(state, versions, resultRoot)
+	inspectorGeneration += 1
+	inspectorState = state
+	local generation = inspectorGeneration
+	table.clear(inspectorEntries)
+	inspectorRendered = 0
+	inspectorTitle.Text = table.concat(state.manifest.studioPath, ".")
+	inspectorSummary.Text = "Scanning serialized properties..."
+	inspectorWidget.Enabled = true
+
+	local maps = {}
+	for _, stage in { "base", "ours", "theirs" } do
+		if versions[stage] then
+			local byKey, keyByInstance, displayByKey = buildInstanceMap(versions[stage])
+			maps[stage] = { byKey = byKey, keyByInstance = keyByInstance, displayByKey = displayByKey }
+		end
+	end
+	local resultByKey, resultKeyByInstance, resultDisplayByKey = buildInstanceMap(resultRoot)
+	maps.result = { byKey = resultByKey, keyByInstance = resultKeyByInstance, displayByKey = resultDisplayByKey }
+
+	local allKeys = {}
+	for _, stage in { "base", "ours", "theirs" } do
+		if maps[stage] then
+			for key in maps[stage].byKey do
+				allKeys[key] = true
+			end
+		end
+	end
+	local sortedKeys = {}
+	for key in allKeys do
+		table.insert(sortedKeys, key)
+	end
+	table.sort(sortedKeys)
+
+	local scanned = 0
+	for _, key in sortedKeys do
+		if generation ~= inspectorGeneration or not state.conflictWorkspace then
+			return
+		end
+		local base = maps.base and maps.base.byKey[key]
+		local ours = maps.ours and maps.ours.byKey[key]
+		local theirs = maps.theirs and maps.theirs.byKey[key]
+		local result = maps.result.byKey[key]
+		local displayPath = (maps.ours and maps.ours.displayByKey[key])
+			or (maps.theirs and maps.theirs.displayByKey[key])
+			or (maps.base and maps.base.displayByKey[key])
+			or resultDisplayByKey[key]
+		local basePresence = base and base.ClassName or "<deleted>"
+		local oursPresence = ours and ours.ClassName or "<deleted>"
+		local theirsPresence = theirs and theirs.ClassName or "<deleted>"
+		if basePresence ~= oursPresence or basePresence ~= theirsPresence then
+			local status = if oursPresence ~= basePresence and theirsPresence ~= basePresence
+				then (if oursPresence == theirsPresence then "same" else "conflict")
+				elseif oursPresence ~= basePresence then "ours"
+				else "theirs"
+			addInspectorEntry({
+				path = displayPath,
+				property = "(instance)",
+				baseText = basePresence,
+				oursText = oursPresence,
+				theirsText = theirsPresence,
+				status = status,
+				resultInstance = result,
+			})
+		elseif base and ours and theirs and base.ClassName == ours.ClassName and base.ClassName == theirs.ClassName then
+			for _, propertyName in getSerializedPropertyNames(base.ClassName) do
+				local baseReadable, baseValue = readProperty(base, propertyName)
+				local oursReadable, oursValue = readProperty(ours, propertyName)
+				local theirsReadable, theirsValue = readProperty(theirs, propertyName)
+				if baseReadable and oursReadable and theirsReadable then
+					local baseText = comparableValue(baseValue, maps.base.keyByInstance)
+					local oursText = comparableValue(oursValue, maps.ours.keyByInstance)
+					local theirsText = comparableValue(theirsValue, maps.theirs.keyByInstance)
+					local oursChanged = oursText ~= baseText
+					local theirsChanged = theirsText ~= baseText
+					if oursChanged or theirsChanged then
+						local status = if oursChanged and theirsChanged
+							then (if oursText == theirsText then "same" else "conflict")
+							elseif oursChanged then "ours"
+							else "theirs"
+						addInspectorEntry({
+							path = displayPath,
+							property = propertyName,
+							baseText = baseText,
+							oursText = oursText,
+							theirsText = theirsText,
+							status = status,
+							oursValue = oursValue,
+							theirsValue = theirsValue,
+							oursKeyByInstance = maps.ours.keyByInstance,
+							theirsKeyByInstance = maps.theirs.keyByInstance,
+							resultByKey = resultByKey,
+							resultInstance = result,
+						})
+					end
+				end
+			end
+		end
+		scanned += 1
+		if scanned % 100 == 0 then
+			inspectorSummary.Text = string.format("Scanning... %d instances, %d changes", scanned, #inspectorEntries)
+			task.wait()
+		end
+	end
+
+	local conflicts = 0
+	for _, entry in inspectorEntries do
+		if entry.status == "conflict" then
+			conflicts += 1
+		end
+	end
+	inspectorSummary.Text = string.format(
+		"%d changed properties/instances; %d true conflicts. Blue = yours, yellow = theirs, red = both, green = same.",
+		#inspectorEntries,
+		conflicts
+	)
+	renderInspector()
+end
+
+renderInspector = function()
+	for _, child in inspectorContent:GetChildren() do
+		if child ~= inspectorPadding and child ~= inspectorLayout and child ~= inspectorTitle and child ~= inspectorSummary then
+			child:Destroy()
+		end
+	end
+	local count = math.min(#inspectorEntries, inspectorRendered + 100)
+	inspectorRendered = count
+	for index = 1, count do
+		local entry = inspectorEntries[index]
+		local colors = {
+			ours = Color3.fromRGB(48, 91, 132),
+			theirs = Color3.fromRGB(123, 96, 38),
+			conflict = Color3.fromRGB(126, 52, 57),
+			same = Color3.fromRGB(45, 104, 67),
+		}
+		local row = Instance.new("Frame")
+		row.AutomaticSize = Enum.AutomaticSize.Y
+		row.BackgroundColor3 = colors[entry.status]
+		row.BorderSizePixel = 0
+		row.LayoutOrder = 10 + index
+		row.Size = UDim2.new(1, 0, 0, 0)
+		row.Parent = inspectorContent
+		Instance.new("UICorner", row).CornerRadius = UDim.new(0, 5)
+		local rowPadding = Instance.new("UIPadding", row)
+		rowPadding.PaddingBottom = UDim.new(0, 7)
+		rowPadding.PaddingLeft = UDim.new(0, 8)
+		rowPadding.PaddingRight = UDim.new(0, 8)
+		rowPadding.PaddingTop = UDim.new(0, 7)
+		local rowLayout = Instance.new("UIListLayout", row)
+		rowLayout.Padding = UDim.new(0, 4)
+		local pathButton = Instance.new("TextButton")
+		pathButton.AutomaticSize = Enum.AutomaticSize.Y
+		pathButton.BackgroundTransparency = 1
+		pathButton.Font = Enum.Font.BuilderSansBold
+		pathButton.Size = UDim2.new(1, 0, 0, 18)
+		pathButton.Text = entry.path .. "  •  " .. entry.property
+		pathButton.TextColor3 = Color3.fromRGB(250, 250, 252)
+		pathButton.TextSize = 13
+		pathButton.TextWrapped = true
+		pathButton.TextXAlignment = Enum.TextXAlignment.Left
+		pathButton.Parent = row
+		pathButton.Activated:Connect(function()
+			if entry.resultInstance then
+				Selection:Set({ entry.resultInstance })
+			end
+		end)
+		local values = Instance.new("TextLabel")
+		values.AutomaticSize = Enum.AutomaticSize.Y
+		values.BackgroundTransparency = 1
+		values.Font = Enum.Font.Code
+		values.Size = UDim2.new(1, 0, 0, 18)
+		values.Text = "Base: "
+			.. displayValue(entry.baseText)
+			.. "\nYours: "
+			.. displayValue(entry.oursText)
+			.. "\nTheirs: "
+			.. displayValue(entry.theirsText)
+		values.TextColor3 = Color3.fromRGB(232, 232, 238)
+		values.TextSize = 11
+		values.TextWrapped = true
+		values.TextXAlignment = Enum.TextXAlignment.Left
+		values.Parent = row
+		if entry.property ~= "(instance)" and entry.resultInstance then
+			local actions = Instance.new("Frame")
+			actions.BackgroundTransparency = 1
+			actions.Size = UDim2.new(1, 0, 0, 24)
+			actions.Parent = row
+			local actionsLayout = Instance.new("UIListLayout", actions)
+			actionsLayout.FillDirection = Enum.FillDirection.Horizontal
+			actionsLayout.Padding = UDim.new(0, 6)
+			for buttonIndex, side in { "ours", "theirs" } do
+				local button = Instance.new("TextButton")
+				button.BackgroundColor3 = Color3.fromRGB(50, 50, 58)
+				button.BorderSizePixel = 0
+				button.Font = Enum.Font.BuilderSansBold
+				button.Size = UDim2.new(0.5, -3, 1, 0)
+				button.Text = if side == "ours" then "Use Yours" else "Use Theirs"
+				button.TextColor3 = Color3.fromRGB(245, 245, 248)
+				button.TextSize = 11
+				button.LayoutOrder = buttonIndex
+				button.Parent = actions
+				Instance.new("UICorner", button).CornerRadius = UDim.new(0, 4)
+				button.Activated:Connect(function()
+					local value = entry[side .. "Value"]
+					if typeof(value) == "Instance" then
+						value = entry.resultByKey[entry[side .. "KeyByInstance"][value]]
+					end
+					local applied = pcall(function()
+						entry.resultInstance[entry.property] = value
+					end)
+					if applied then
+						Selection:Set({ entry.resultInstance })
+					end
+				end)
+			end
+		end
+	end
+	if inspectorRendered < #inspectorEntries then
+		local more = Instance.new("TextButton")
+		more.BackgroundColor3 = Color3.fromRGB(70, 70, 80)
+		more.BorderSizePixel = 0
+		more.Font = Enum.Font.BuilderSansBold
+		more.LayoutOrder = 1000000
+		more.Size = UDim2.new(1, 0, 0, 32)
+		more.Text = string.format("Load 100 more (%d remaining)", #inspectorEntries - inspectorRendered)
+		more.TextColor3 = Color3.fromRGB(240, 240, 245)
+		more.TextSize = 12
+		more.Parent = inspectorContent
+		Instance.new("UICorner", more).CornerRadius = UDim.new(0, 5)
+		more.Activated:Connect(renderInspector)
+	end
+end
+
+local function disconnectRoot(state)
+	for _, connection in state.rootConnections do
+		connection:Disconnect()
+	end
+	table.clear(state.rootConnections)
+	for instance, connections in state.instanceConnections do
+		for _, connection in connections do
+			connection:Disconnect()
+		end
+		state.instanceConnections[instance] = nil
+	end
+end
+
+local function markDirty(state)
+	if state.suppress or state.conflict or state.deleting or not state.root then
+		return
+	end
+	state.dirty = true
+	state.generation += 1
+	local generation = state.generation
+	setStatus(state, "Studio changed; syncing...", Color3.fromRGB(244, 194, 92))
+	task.delay((serverConfig and serverConfig.debounceMs or 600) / 1000, function()
+		if running and state.generation == generation and state.dirty and not state.conflict and not state.deleting then
+			upload(state, false)
+		end
+	end)
+end
+
+local function watchInstance(state, instance)
+	if state.instanceConnections[instance] then
+		return
+	end
+	local connections = {
+		instance.AttributeChanged:Connect(function()
+			markDirty(state)
+		end),
+	}
+	if instance:IsA("ValueBase") then
+		for _, propertyName in getSerializedPropertyNames(instance.ClassName) do
+			local connected, connection = pcall(function()
+				return instance:GetPropertyChangedSignal(propertyName):Connect(function()
+					markDirty(state)
+				end)
+			end)
+			if connected then
+				table.insert(connections, connection)
+			end
+		end
+	else
+		local serializedProperties = getSerializedPropertySet(instance.ClassName)
+		table.insert(connections, instance.Changed:Connect(function(propertyName)
+			if serializedProperties[propertyName] then
+				markDirty(state)
+			end
+		end))
+	end
+	state.instanceConnections[instance] = connections
+end
+
+local function watchRoot(state, root)
+	disconnectRoot(state)
+	state.root = root
+	watchInstance(state, root)
+	for _, descendant in root:GetDescendants() do
+		watchInstance(state, descendant)
+	end
+	table.insert(state.rootConnections, root.DescendantAdded:Connect(function(descendant)
+		watchInstance(state, descendant)
+		markDirty(state)
+	end))
+	table.insert(state.rootConnections, root.DescendantRemoving:Connect(function(descendant)
+		local connections = state.instanceConnections[descendant]
+		if connections then
+			for _, connection in connections do
+				connection:Disconnect()
+			end
+			state.instanceConnections[descendant] = nil
+		end
+		markDirty(state)
+	end))
+	table.insert(state.rootConnections, root.AncestryChanged:Connect(function()
+		if not state.suppress and resolveRoot(state.manifest.studioPath) ~= root then
+			deleteSnapshot(state)
+		end
+	end))
+end
+
+local function rememberHash(state, hash)
+	state.lastHash = hash
+	plugin:SetSetting(
+		SETTINGS_PREFIX .. serverConfig.projectId .. ":" .. serverConfig.workspaceId .. ":" .. state.manifest.id .. ":hash",
+		hash
+	)
+end
+
+local function forgetHash(state)
+	state.lastHash = nil
+	plugin:SetSetting(
+		SETTINGS_PREFIX .. serverConfig.projectId .. ":" .. serverConfig.workspaceId .. ":" .. state.manifest.id .. ":hash",
+		nil
+	)
+end
+
+deleteSnapshot = function(state)
+	if state.uploading or state.pulling or state.deleting then
+		return
+	end
+	state.generation += 1
+	state.dirty = false
+	if state.manifest.gitConflict or not state.lastHash then
+		state.conflict = true
+		setStatus(state, "Root removed; resolve the existing file conflict manually.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if not serverConfig.rojoConnected then
+		state.conflict = true
+		setStatus(state, "Root removed while Rojo is offline.", Color3.fromRGB(244, 194, 92))
+		return
+	end
+
+	state.deleting = true
+	setStatus(state, "Deleting file snapshot...", Color3.fromRGB(115, 182, 255))
+	local response, requestError = request("DELETE", "/v1/roots/" .. state.manifest.id .. "/snapshot", nil, {
+		["If-Match"] = state.lastHash,
+	})
+	state.deleting = false
+	if not response then
+		state.conflict = true
+		setStatus(state, "Daemon unavailable: " .. requestError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if response.StatusCode == 409 then
+		local reason = responseError(response)
+		state.conflict = string.find(reason, "snapshot changed", 1, true) ~= nil
+		setStatus(
+			state,
+			if state.conflict then "Conflict: file changed before Studio deleted it." else "Paused — " .. reason,
+			if state.conflict then Color3.fromRGB(245, 106, 106) else Color3.fromRGB(244, 194, 92)
+		)
+		return
+	end
+	if not response.Success then
+		state.conflict = true
+		setStatus(state, "Delete failed (HTTP " .. response.StatusCode .. ")", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	disconnectRoot(state)
+	state.root = nil
+	state.manifest = HttpService:JSONDecode(response.Body)
+	state.conflict = false
+	forgetHash(state)
+	setStatus(state, "Deleted Studio → file", Color3.fromRGB(102, 214, 139))
+end
+
+upload = function(state, overwrite)
+	if state.uploading or state.pulling or state.deleting then
+		return
+	end
+	if state.manifest.gitConflict then
+		setStatus(state, "Resolve the Git conflict before syncing.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if not serverConfig.rojoConnected then
+		setStatus(state, "Paused — Rojo is offline.", Color3.fromRGB(244, 194, 92))
+		return
+	end
+	local root = resolveRoot(state.manifest.studioPath)
+	if not root then
+		state.conflict = true
+		setStatus(state, "Studio root is missing. Pull to restore it.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	local scriptInstance = findCode(root)
+	if scriptInstance then
+		state.conflict = true
+		setStatus(state, "Blocked: contains code at " .. scriptInstance:GetFullName(), Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	state.uploading = true
+	setStatus(state, "Serializing Studio root...", Color3.fromRGB(115, 182, 255))
+	local serialized, serializationError
+	local success, result = pcall(function()
+		return SerializationService:SerializeInstancesAsync({ root })
+	end)
+	if success then
+		serialized = result
+	else
+		serializationError = tostring(result)
+	end
+	if not serialized then
+		state.uploading = false
+		setStatus(state, "Serialization failed: " .. serializationError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local expectedHash = "*"
+	if overwrite then
+		expectedHash = state.manifest.exists and state.manifest.hash or "*"
+	elseif state.lastHash then
+		expectedHash = state.lastHash
+	end
+	local response, requestError = request("PUT", "/v1/roots/" .. state.manifest.id .. "/snapshot", buffer.tostring(serialized), {
+		["Content-Type"] = "application/octet-stream",
+		["If-Match"] = expectedHash,
+	})
+	state.uploading = false
+	if not response then
+		setStatus(state, "Daemon unavailable: " .. requestError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if response.StatusCode == 409 then
+		local reason = responseError(response)
+		state.conflict = string.find(reason, "snapshot changed", 1, true) ~= nil
+		setStatus(
+			state,
+			if state.conflict then "Conflict: disk changed too. Push or Pull." else "Paused — " .. reason,
+			if state.conflict then Color3.fromRGB(245, 106, 106) else Color3.fromRGB(244, 194, 92)
+		)
+		return
+	end
+	if not response.Success then
+		setStatus(state, "Upload failed (HTTP " .. response.StatusCode .. ")", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local manifest = HttpService:JSONDecode(response.Body)
+	state.manifest = manifest
+	state.dirty = false
+	state.conflict = false
+	rememberHash(state, manifest.hash)
+	watchRoot(state, root)
+	setStatus(state, "Synced Studio → file", Color3.fromRGB(102, 214, 139))
+end
+
+pull = function(state)
+	if state.uploading or state.pulling or state.deleting then
+		return
+	end
+	if state.manifest.gitConflict then
+		setStatus(state, "Resolve the Git conflict before syncing.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if not serverConfig.rojoConnected then
+		setStatus(state, "Paused — Rojo is offline.", Color3.fromRGB(244, 194, 92))
+		return
+	end
+	if not state.manifest.exists then
+		setStatus(state, "No file snapshot exists. Push Studio first.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	local parent = resolveParent(state.manifest.studioPath)
+	if not parent then
+		setStatus(state, "Studio parent path is missing.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	local currentRoot = resolveRoot(state.manifest.studioPath)
+	local currentScript = currentRoot and findCode(currentRoot)
+	if currentScript then
+		state.conflict = true
+		setStatus(state, "Blocked: Studio root contains code at " .. currentScript:GetFullName(), Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	state.pulling = true
+	setStatus(state, "Loading file snapshot...", Color3.fromRGB(115, 182, 255))
+	local response, requestError = request("GET", "/v1/roots/" .. state.manifest.id .. "/snapshot")
+	if not response then
+		state.pulling = false
+		setStatus(state, "Daemon unavailable: " .. requestError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if not response.Success then
+		state.pulling = false
+		setStatus(state, "Download failed (HTTP " .. response.StatusCode .. ")", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local success, instances = pcall(function()
+		return SerializationService:DeserializeInstancesAsync(buffer.fromstring(response.Body))
+	end)
+	if not success then
+		state.pulling = false
+		setStatus(state, "Invalid RBXM: " .. tostring(instances), Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if #instances ~= 1 then
+		for _, instance in instances do
+			instance:Destroy()
+		end
+		state.pulling = false
+		setStatus(state, "Blocked: snapshot must contain exactly one root.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local replacement = instances[1]
+	local expectedName = state.manifest.studioPath[#state.manifest.studioPath]
+	local scriptInstance = findCode(replacement)
+	if replacement.Name ~= expectedName or scriptInstance then
+		replacement:Destroy()
+		state.pulling = false
+		if scriptInstance then
+			setStatus(state, "Blocked: file snapshot contains code.", Color3.fromRGB(245, 106, 106))
+		else
+			setStatus(state, "Blocked: root must be named " .. expectedName, Color3.fromRGB(245, 106, 106))
+		end
+		return
+	end
+
+	state.suppress = true
+	disconnectRoot(state)
+	local previous = resolveRoot(state.manifest.studioPath)
+	ChangeHistoryService:SetWaypoint("GoldSync before Pull")
+	local applied, applyError = pcall(function()
+		replacement.Parent = parent
+	end)
+	if not applied then
+		replacement:Destroy()
+		state.suppress = false
+		state.pulling = false
+		if previous then
+			watchRoot(state, previous)
+		end
+		setStatus(state, "Could not apply snapshot: " .. tostring(applyError), Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if previous then
+		previous:Destroy()
+	end
+	ChangeHistoryService:SetWaypoint("GoldSync Pull " .. expectedName)
+	state.root = replacement
+	state.dirty = false
+	state.conflict = false
+	state.pulling = false
+	rememberHash(state, state.manifest.hash)
+	watchRoot(state, replacement)
+	state.suppress = false
+	setStatus(state, "Synced file → Studio", Color3.fromRGB(102, 214, 139))
+end
+
+local function deserializeConflictStage(state, stage)
+	if not state.manifest.conflictStages[stage] then
+		return nil
+	end
+	local response, requestError = request("GET", "/v1/roots/" .. state.manifest.id .. "/conflict/" .. stage)
+	if not response then
+		return nil, requestError
+	end
+	if not response.Success then
+		return nil, "HTTP " .. response.StatusCode
+	end
+	local success, instances = pcall(function()
+		return SerializationService:DeserializeInstancesAsync(buffer.fromstring(response.Body))
+	end)
+	if not success then
+		return nil, tostring(instances)
+	end
+	if #instances ~= 1 then
+		for _, instance in instances do
+			instance:Destroy()
+		end
+		return nil, "snapshot must contain exactly one root"
+	end
+	if findCode(instances[1]) then
+		instances[1]:Destroy()
+		return nil, "snapshot contains code"
+	end
+	return instances[1]
+end
+
+local function destroyConflictWorkspace(state)
+	if inspectorState == state then
+		inspectorGeneration += 1
+		inspectorState = nil
+		table.clear(inspectorEntries)
+		inspectorRendered = 0
+		inspectorTitle.Text = "No conflict workspace open"
+		inspectorSummary.Text = "Open Merge Workspace from a conflicted root."
+		renderInspector()
+	end
+	if state.conflictWorkspace then
+		local parent = state.conflictWorkspace.Parent
+		state.conflictWorkspace:Destroy()
+		state.conflictWorkspace = nil
+		if parent and #parent:GetChildren() == 0 then
+			parent:Destroy()
+		end
+	end
+	state.mergeButton.Text = "Open Merge Workspace"
+	state.mergeButton.Size = UDim2.fromScale(1, 1)
+	state.diffButton.Visible = false
+end
+
+openGitConflict = function(state)
+	if state.uploading or state.pulling or not state.manifest.gitConflict then
+		return
+	end
+	if state.conflictWorkspace and state.conflictWorkspace.Parent then
+		Selection:Set({ state.conflictWorkspace })
+		setStatus(state, "Edit ServerStorage.GoldSync Conflicts." .. state.manifest.id .. ".Result, then click Resolve Result.", Color3.fromRGB(244, 194, 92))
+		return
+	elseif state.conflictWorkspace then
+		state.conflictWorkspace = nil
+	end
+
+	state.pulling = true
+	setStatus(state, "Loading Git conflict versions...", Color3.fromRGB(115, 182, 255))
+	local versions = {}
+	for _, stage in { "base", "ours", "theirs" } do
+		local instance, stageError = deserializeConflictStage(state, stage)
+		if stageError then
+			for _, loaded in versions do
+				loaded:Destroy()
+			end
+			state.pulling = false
+			setStatus(state, "Could not load " .. stage .. ": " .. stageError, Color3.fromRGB(245, 106, 106))
+			return
+		end
+		if instance then
+			versions[stage] = instance
+		end
+	end
+
+	local resultStage = if versions.ours then "ours" else "theirs"
+	if not versions[resultStage] then
+		for _, loaded in versions do
+			loaded:Destroy()
+		end
+		state.pulling = false
+		setStatus(state, "Conflict has no usable version.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	local resultRoot, resultError = deserializeConflictStage(state, resultStage)
+	if not resultRoot then
+		for _, loaded in versions do
+			loaded:Destroy()
+		end
+		state.pulling = false
+		setStatus(state, "Could not create Result: " .. resultError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local workspaces = ServerStorage:FindFirstChild("GoldSync Conflicts")
+	if not workspaces then
+		workspaces = Instance.new("Folder")
+		workspaces.Name = "GoldSync Conflicts"
+		workspaces.Archivable = false
+		workspaces.Parent = ServerStorage
+	end
+	local existing = workspaces:FindFirstChild(state.manifest.id)
+	if existing then
+		existing:Destroy()
+	end
+
+	local workspace = Instance.new("Folder")
+	workspace.Name = state.manifest.id
+	workspace.Archivable = false
+	workspace:SetAttribute("GoldSyncWorkspaceId", serverConfig.workspaceId)
+	workspace.Parent = workspaces
+	for _, stage in { "base", "ours", "theirs" } do
+		local versionFolder = Instance.new("Folder")
+		versionFolder.Name = if stage == "base" then "Base" elseif stage == "ours" then "Yours" else "Theirs"
+		versionFolder.Parent = workspace
+		if versions[stage] then
+			versions[stage].Parent = versionFolder
+		else
+			versionFolder:SetAttribute("Deleted", true)
+		end
+	end
+	local resultFolder = Instance.new("Folder")
+	resultFolder.Name = "Result"
+	resultFolder.Parent = workspace
+	resultRoot.Parent = resultFolder
+
+	state.conflictWorkspace = workspace
+	state.pulling = false
+	state.mergeButton.Text = "Resolve Result"
+	state.mergeButton.Size = UDim2.new(0.5, -3, 1, 0)
+	state.diffButton.Visible = true
+	Selection:Set({ workspace })
+	setStatus(state, "Edit Result in ServerStorage.GoldSync Conflicts, then click Resolve Result.", Color3.fromRGB(244, 194, 92))
+	task.spawn(compareConflictWorkspace, state, versions, resultRoot)
+end
+
+resolveGitConflict = function(state)
+	local workspace = state.conflictWorkspace
+	if not workspace or state.uploading or state.pulling then
+		return
+	end
+	local resultChildren = workspace.Result:GetChildren()
+	if #resultChildren ~= 1 then
+		setStatus(state, "Result must contain exactly one root.", Color3.fromRGB(245, 106, 106))
+		return
+	end
+	local resultRoot = resultChildren[1]
+	local expectedName = state.manifest.studioPath[#state.manifest.studioPath]
+	if resultRoot.Name ~= expectedName or findCode(resultRoot) then
+		setStatus(state, "Result must be a code-free root named " .. expectedName .. ".", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	state.uploading = true
+	setStatus(state, "Saving merged result...", Color3.fromRGB(115, 182, 255))
+	local success, serialized = pcall(function()
+		return SerializationService:SerializeInstancesAsync({ resultRoot })
+	end)
+	if not success then
+		state.uploading = false
+		setStatus(state, "Serialization failed: " .. tostring(serialized), Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	local response, requestError = request(
+		"PUT",
+		"/v1/roots/" .. state.manifest.id .. "/conflict/resolve",
+		buffer.tostring(serialized),
+		{
+			["Content-Type"] = "application/octet-stream",
+			["X-GoldSync-Conflict-Token"] = state.manifest.conflictToken,
+		}
+	)
+	state.uploading = false
+	if not response then
+		setStatus(state, "Daemon unavailable: " .. requestError, Color3.fromRGB(245, 106, 106))
+		return
+	end
+	if not response.Success then
+		setStatus(state, "Resolve failed (HTTP " .. response.StatusCode .. ")", Color3.fromRGB(245, 106, 106))
+		return
+	end
+
+	destroyConflictWorkspace(state)
+	state.conflict = false
+	setStatus(state, "Git conflict resolved; applying result...", Color3.fromRGB(102, 214, 139))
+	refreshConfig()
+end
+
+local function setGroupExpanded(group, expanded)
+	group.expanded = expanded
+	group.children.Visible = expanded
+	group.disclosure.Text = if expanded then "▾" else "▸"
+	group.name.Text = group.label .. group.summary
+end
+
+local function pathStartsWith(prefix, fullPath)
+	if #prefix > #fullPath then
+		return false
+	end
+	for index, segment in prefix do
+		if fullPath[index] ~= segment then
+			return false
+		end
+	end
+	return true
+end
+
+local function createGroup(path, order)
+	local key = table.concat(path, "\0")
+	if groups[key] then
+		return groups[key]
+	end
+	local parentGroup
+	if #path > 1 then
+		local parentPath = table.clone(path)
+		table.remove(parentPath)
+		parentGroup = createGroup(parentPath, order)
+	end
+
+	local section = Instance.new("Frame")
+	section.AutomaticSize = Enum.AutomaticSize.Y
+	section.BackgroundTransparency = 1
+	section.LayoutOrder = order
+	section.Size = UDim2.new(1, 0, 0, 0)
+	section.Parent = if parentGroup then parentGroup.list else rootsContainer
+	if parentGroup then
+		local connector = Instance.new("Frame")
+		connector.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+		connector.BorderSizePixel = 0
+		connector.Position = UDim2.new(0, -8, 0, 11)
+		connector.Size = UDim2.fromOffset(35, 1)
+		connector.Parent = section
+	end
+
+	local sectionLayout = Instance.new("UIListLayout")
+	sectionLayout.Padding = UDim.new(0, 2)
+	sectionLayout.Parent = section
+
+	local header = Instance.new("Frame")
+	header.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+	header.BackgroundTransparency = 1
+	header.BorderSizePixel = 0
+	header.LayoutOrder = 1
+	header.Size = UDim2.new(1, 0, 0, 24)
+	header.Parent = section
+
+	local disclosure = Instance.new("TextButton")
+	disclosure.BackgroundTransparency = 1
+	disclosure.Font = Enum.Font.BuilderSansBold
+	disclosure.Size = UDim2.new(0, 18, 1, 0)
+	disclosure.TextColor3 = Color3.fromRGB(180, 180, 188)
+	disclosure.TextSize = 12
+	disclosure.Parent = header
+	addButtonHover(disclosure)
+
+	local icon = Instance.new("ImageLabel")
+	icon.BackgroundTransparency = 1
+	icon.Position = UDim2.new(0, 19, 0.5, -8)
+	icon.Size = UDim2.fromOffset(16, 16)
+	icon.Parent = header
+	local parentInstance = resolveRoot(path)
+	applyClassIcon(icon, if parentInstance then parentInstance.ClassName else "Folder")
+
+	local name = Instance.new("TextButton")
+	name.BackgroundTransparency = 1
+	name.Font = Enum.Font.BuilderSansBold
+	name.Position = UDim2.new(0, 39, 0, 0)
+	name.Size = UDim2.new(1, -101, 1, 0)
+	name.TextColor3 = Color3.fromRGB(226, 226, 232)
+	name.TextSize = 13
+	name.TextXAlignment = Enum.TextXAlignment.Left
+	name.Parent = header
+
+	local statusDot = Instance.new("TextLabel")
+	statusDot.BackgroundTransparency = 1
+	statusDot.Font = Enum.Font.BuilderSansBold
+	statusDot.Position = UDim2.new(1, -60, 0, 0)
+	statusDot.Size = UDim2.new(0, 12, 1, 0)
+	statusDot.Text = "●"
+	statusDot.TextColor3 = Color3.fromRGB(180, 180, 190)
+	statusDot.TextSize = 9
+	statusDot.Parent = header
+
+	local bulkPush = Instance.new("TextButton")
+	bulkPush.BackgroundTransparency = 1
+	bulkPush.Font = Enum.Font.BuilderSansBold
+	bulkPush.Position = UDim2.new(1, -48, 0, 0)
+	bulkPush.Size = UDim2.new(0, 24, 1, 0)
+	bulkPush.Text = "→"
+	bulkPush.TextColor3 = Color3.fromRGB(115, 182, 255)
+	bulkPush.TextSize = 16
+	bulkPush.Visible = false
+	bulkPush.Parent = header
+	addButtonHover(bulkPush)
+
+	local bulkPull = Instance.new("TextButton")
+	bulkPull.BackgroundTransparency = 1
+	bulkPull.Font = Enum.Font.BuilderSansBold
+	bulkPull.Position = UDim2.new(1, -24, 0, 0)
+	bulkPull.Size = UDim2.new(0, 24, 1, 0)
+	bulkPull.Text = "←"
+	bulkPull.TextColor3 = Color3.fromRGB(115, 182, 255)
+	bulkPull.TextSize = 16
+	bulkPull.Visible = false
+	bulkPull.Parent = header
+	addButtonHover(bulkPull)
+
+	header.MouseEnter:Connect(function()
+		header.BackgroundTransparency = 0
+	end)
+	header.MouseLeave:Connect(function()
+		header.BackgroundTransparency = 1
+	end)
+
+	local children = Instance.new("Frame")
+	children.AutomaticSize = Enum.AutomaticSize.Y
+	children.BackgroundTransparency = 1
+	children.LayoutOrder = 2
+	children.Size = UDim2.new(1, 0, 0, 0)
+	children.Visible = false
+	children.Parent = section
+	local guide = Instance.new("Frame")
+	guide.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+	guide.BorderSizePixel = 0
+	guide.Position = UDim2.new(0, 6, 0, 0)
+	guide.Size = UDim2.fromOffset(1, 0)
+	guide.Parent = children
+
+	local childList = Instance.new("Frame")
+	childList.AutomaticSize = Enum.AutomaticSize.Y
+	childList.BackgroundTransparency = 1
+	childList.Position = UDim2.new(0, 14, 0, 0)
+	childList.Size = UDim2.new(1, -14, 0, 0)
+	childList.Parent = children
+	local childrenLayout = Instance.new("UIListLayout", childList)
+	childrenLayout.Padding = UDim.new(0, 2)
+	childrenLayout.SortOrder = Enum.SortOrder.LayoutOrder
+	childrenLayout:GetPropertyChangedSignal("AbsoluteContentSize"):Connect(function()
+		guide.Size = UDim2.fromOffset(1, childrenLayout.AbsoluteContentSize.Y)
+	end)
+
+	local group = {
+		key = key,
+		label = path[#path],
+		path = table.clone(path),
+		section = section,
+		header = header,
+		disclosure = disclosure,
+		name = name,
+		statusDot = statusDot,
+		bulkPush = bulkPush,
+		bulkPull = bulkPull,
+		children = children,
+		list = childList,
+		expanded = false,
+		hasDirectRoots = false,
+		summary = "",
+	}
+	groups[key] = group
+	setGroupExpanded(group, #path <= 2)
+	disclosure.Activated:Connect(function()
+		setGroupExpanded(group, not group.expanded)
+	end)
+	name.Activated:Connect(function()
+		setGroupExpanded(group, not group.expanded)
+	end)
+	bulkPush.Activated:Connect(function()
+		if bulkRunning then
+			return
+		end
+		bulkRunning = true
+		for _, state in states do
+			if pathStartsWith(group.path, state.manifest.studioPath) and not state.manifest.gitConflict then
+				upload(state, true)
+			end
+		end
+		bulkRunning = false
+	end)
+	bulkPull.Activated:Connect(function()
+		if bulkRunning then
+			return
+		end
+		bulkRunning = true
+		for _, state in states do
+			if pathStartsWith(group.path, state.manifest.studioPath) and not state.manifest.gitConflict then
+				pull(state)
+			end
+		end
+		bulkRunning = false
+	end)
+	return group
+end
+
+local function setRootExpanded(state, expanded)
+	state.expanded = expanded
+	state.row.BackgroundTransparency = 1
+	state.file.Visible = expanded
+	state.status.Visible = expanded
+	state.buttons.Visible = expanded
+	state.infoButton.TextColor3 = if expanded then Color3.fromRGB(235, 235, 240) else Color3.fromRGB(150, 150, 160)
+end
+
+updateGroupSummaries = function()
+	for _, group in groups do
+		local total = 0
+		local synced = 0
+		local issues = 0
+		local pending = 0
+		local paused = 0
+		for _, state in states do
+			if pathStartsWith(group.path, state.manifest.studioPath) then
+				total += 1
+				if state.statusKind == "synced" then
+					synced += 1
+				elseif state.statusKind == "issue" then
+					issues += 1
+				elseif state.statusKind == "paused" then
+					paused += 1
+				else
+					pending += 1
+				end
+			end
+		end
+		group.summary = string.format("   (%d/%d) synced", synced, total)
+		if issues > 0 then
+			group.summary ..= string.format(" · %d need attention", issues)
+		elseif pending > 0 then
+			group.summary ..= string.format(" · %d pending", pending)
+		elseif paused > 0 then
+			group.summary ..= string.format(" · %d paused", paused)
+		end
+		if total == 0 then
+			group.section.Visible = false
+		else
+			group.section.Visible = true
+			group.bulkPush.Visible = true
+			group.bulkPull.Visible = true
+			group.statusDot.TextColor3 = if issues > 0
+				then Color3.fromRGB(245, 106, 106)
+				elseif synced == total then Color3.fromRGB(102, 214, 139)
+				elseif pending > 0 or paused > 0 then Color3.fromRGB(244, 194, 92)
+				else Color3.fromRGB(180, 180, 190)
+			group.bulkPush.Active = serverConfig.rojoConnected
+			group.bulkPull.Active = serverConfig.rojoConnected
+			group.bulkPush.AutoButtonColor = serverConfig.rojoConnected
+			group.bulkPull.AutoButtonColor = serverConfig.rojoConnected
+			local arrowColor = if serverConfig.rojoConnected
+				then Color3.fromRGB(115, 182, 255)
+				else Color3.fromRGB(95, 95, 105)
+			group.bulkPush.TextColor3 = arrowColor
+			group.bulkPull.TextColor3 = arrowColor
+			setGroupExpanded(group, group.expanded or (issues > 0 and autoExpandConflicts))
+		end
+	end
+	if refreshUnsyncedButton then
+		refreshUnsyncedButton()
+	end
+	if refreshStatusSummary then
+		refreshStatusSummary()
+	end
+end
+
+refreshUnsyncedButton = function()
+	local unsynced = 0
+	for _, state in states do
+		if state.statusKind ~= "synced" then
+			unsynced += 1
+		end
+	end
+	unsyncedButton.Text = (if showSynced then "" else "✓ ") .. string.format("Unsynced · %d", unsynced)
+	unsyncedButton.BackgroundColor3 = if showSynced
+		then Color3.fromRGB(40, 40, 46)
+		else Color3.fromRGB(78, 66, 38)
+	unsyncedButton.TextColor3 = if showSynced
+		then Color3.fromRGB(190, 190, 198)
+		else Color3.fromRGB(255, 218, 126)
+end
+
+refreshStatusSummary = function()
+	local issues = {}
+	local working = {}
+	for _, state in states do
+		local entry = {
+			path = table.concat(state.manifest.studioPath, "."),
+			status = state.status.Text,
+		}
+		if state.statusKind == "issue" then
+			table.insert(issues, entry)
+		elseif state.statusKind == "working" then
+			table.insert(working, entry)
+		end
+	end
+	local entries = if #issues > 0 then issues else working
+	if #entries == 0 then
+		statusBanner.Visible = false
+		return
+	end
+	table.sort(entries, function(left, right)
+		return left.path < right.path
+	end)
+	local lines = {
+		if #issues > 0
+			then string.format("%d need attention", #issues)
+			else string.format("%d still syncing", #working),
+	}
+	for index = 1, math.min(#entries, 3) do
+		local entry = entries[index]
+		table.insert(lines, entry.path .. " — " .. entry.status)
+	end
+	if #entries > 3 then
+		table.insert(lines, string.format("+%d more", #entries - 3))
+	end
+	statusBanner.BackgroundColor3 = if #issues > 0
+		then Color3.fromRGB(66, 38, 40)
+		else Color3.fromRGB(66, 56, 34)
+	statusBanner.TextColor3 = if #issues > 0
+		then Color3.fromRGB(255, 205, 205)
+		else Color3.fromRGB(255, 224, 145)
+	statusBanner.Text = table.concat(lines, "\n")
+	statusBanner.Visible = true
+end
+
+local function createInstanceNode(instance, parent, depth, order)
+	local section = Instance.new("Frame")
+	section.AutomaticSize = Enum.AutomaticSize.Y
+	section.BackgroundTransparency = 1
+	section.LayoutOrder = order
+	section.Size = UDim2.new(1, 0, 0, 0)
+	section.Parent = parent
+	local sectionLayout = Instance.new("UIListLayout", section)
+	sectionLayout.Padding = UDim.new(0, 2)
+
+	local connector = Instance.new("Frame")
+	connector.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+	connector.BorderSizePixel = 0
+	connector.Position = UDim2.new(0, -8, 0, 11)
+	connector.Size = UDim2.fromOffset(35, 1)
+	connector.Parent = section
+
+	local header = Instance.new("Frame")
+	header.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+	header.BackgroundTransparency = 1
+	header.LayoutOrder = 1
+	header.Size = UDim2.new(1, 0, 0, 22)
+	header.Parent = section
+	header.MouseEnter:Connect(function()
+		header.BackgroundTransparency = 0
+	end)
+	header.MouseLeave:Connect(function()
+		header.BackgroundTransparency = 1
+	end)
+
+	local disclosure = Instance.new("TextButton")
+	disclosure.BackgroundTransparency = 1
+	disclosure.Font = Enum.Font.BuilderSansBold
+	disclosure.Size = UDim2.new(0, 18, 1, 0)
+	disclosure.Text = "▸"
+	disclosure.TextColor3 = Color3.fromRGB(170, 170, 180)
+	disclosure.TextSize = 11
+	disclosure.Visible = depth < visualDepth and #instance:GetChildren() > 0
+	disclosure.Parent = header
+	addButtonHover(disclosure)
+
+	local icon = Instance.new("ImageLabel")
+	icon.BackgroundTransparency = 1
+	icon.Position = UDim2.new(0, 19, 0.5, -8)
+	icon.Size = UDim2.fromOffset(16, 16)
+	icon.Parent = header
+	applyClassIcon(icon, instance.ClassName)
+
+	local name = Instance.new("TextButton")
+	name.BackgroundTransparency = 1
+	name.Font = Enum.Font.BuilderSans
+	name.Position = UDim2.new(0, 39, 0, 0)
+	name.Size = UDim2.new(1, -39, 1, 0)
+	name.Text = instance.Name
+	name.TextColor3 = Color3.fromRGB(218, 218, 225)
+	name.TextSize = 12
+	name.TextTruncate = Enum.TextTruncate.AtEnd
+	name.TextXAlignment = Enum.TextXAlignment.Left
+	name.Parent = header
+	name.Activated:Connect(function()
+		if instance.Parent then
+			Selection:Set({ instance })
+		end
+	end)
+
+	local children = Instance.new("Frame")
+	children.AutomaticSize = Enum.AutomaticSize.Y
+	children.BackgroundTransparency = 1
+	children.LayoutOrder = 2
+	children.Size = UDim2.new(1, 0, 0, 0)
+	children.Visible = false
+	children.Parent = section
+	local guide = Instance.new("Frame")
+	guide.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+	guide.BorderSizePixel = 0
+	guide.Position = UDim2.new(0, 6, 0, 0)
+	guide.Size = UDim2.fromOffset(1, 0)
+	guide.Parent = children
+	local childList = Instance.new("Frame")
+	childList.AutomaticSize = Enum.AutomaticSize.Y
+	childList.BackgroundTransparency = 1
+	childList.Position = UDim2.new(0, 14, 0, 0)
+	childList.Size = UDim2.new(1, -14, 0, 0)
+	childList.Parent = children
+	local childLayout = Instance.new("UIListLayout", childList)
+	childLayout.Padding = UDim.new(0, 2)
+	childLayout.SortOrder = Enum.SortOrder.LayoutOrder
+	childLayout:GetPropertyChangedSignal("AbsoluteContentSize"):Connect(function()
+		guide.Size = UDim2.fromOffset(1, childLayout.AbsoluteContentSize.Y)
+	end)
+
+	local expanded = false
+	disclosure.Activated:Connect(function()
+		expanded = not expanded
+		disclosure.Text = if expanded then "▾" else "▸"
+		children.Visible = expanded
+		for _, child in childList:GetChildren() do
+			if child ~= childLayout then
+				child:Destroy()
+			end
+		end
+		if expanded then
+			local childInstances = instance:GetChildren()
+			table.sort(childInstances, function(left, right)
+				return string.lower(left.Name) < string.lower(right.Name)
+			end)
+			for childOrder, child in childInstances do
+				createInstanceNode(child, childList, depth + 1, childOrder)
+			end
+		end
+	end)
+end
+
+local function resetStateContents(state)
+	for _, child in state.contentsList:GetChildren() do
+		if child ~= state.contentsLayout then
+			child:Destroy()
+		end
+	end
+	state.contentsLoaded = false
+	state.contentsExpanded = false
+	state.contents.Visible = false
+	state.contentDisclosure.Text = "▸"
+	local root = resolveRoot(state.manifest.studioPath)
+	state.contentDisclosure.Visible = visualDepth > 0 and root ~= nil and #root:GetChildren() > 0
+end
+
+resetInstanceTrees = function()
+	for _, state in states do
+		resetStateContents(state)
+	end
+end
+
+local function toggleRootContents(state)
+	if visualDepth == 0 then
+		return
+	end
+	state.contentsExpanded = not state.contentsExpanded
+	state.contents.Visible = state.contentsExpanded
+	state.contentDisclosure.Text = if state.contentsExpanded then "▾" else "▸"
+	for _, child in state.contentsList:GetChildren() do
+		if child ~= state.contentsLayout then
+			child:Destroy()
+		end
+	end
+	state.contentsLoaded = false
+	if not state.contentsExpanded then
+		return
+	end
+	local root = resolveRoot(state.manifest.studioPath)
+	if not root then
+		return
+	end
+	local children = root:GetChildren()
+	table.sort(children, function(left, right)
+		return string.lower(left.Name) < string.lower(right.Name)
+	end)
+	for order, child in children do
+		createInstanceNode(child, state.contentsList, 1, order)
+	end
+	state.contentsLoaded = true
+end
+
+local function createRootRow(manifest, order)
+	local parentPath = table.clone(manifest.studioPath)
+	table.remove(parentPath)
+	local group = createGroup(parentPath, order)
+	group.hasDirectRoots = true
+	group.bulkPush.Visible = true
+	group.bulkPull.Visible = true
+	local row = Instance.new("Frame")
+	row.AutomaticSize = Enum.AutomaticSize.Y
+	row.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+	row.BackgroundTransparency = 1
+	row.BorderSizePixel = 0
+	row.LayoutOrder = order
+	row.Size = UDim2.new(1, 0, 0, 0)
+	row.Parent = group.list
+	local connector = Instance.new("Frame")
+	connector.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+	connector.BorderSizePixel = 0
+	connector.Position = UDim2.new(0, -8, 0, 11)
+	connector.Size = UDim2.fromOffset(35, 1)
+	connector.Parent = row
+
+	local corner = Instance.new("UICorner")
+	corner.CornerRadius = UDim.new(0, 6)
+	corner.Parent = row
+
+	local rowPadding = Instance.new("UIPadding")
+	rowPadding.PaddingBottom = UDim.new(0, 5)
+	rowPadding.PaddingLeft = UDim.new(0, 6)
+	rowPadding.PaddingRight = UDim.new(0, 6)
+	rowPadding.PaddingTop = UDim.new(0, 5)
+	rowPadding.Parent = row
+
+	local rowLayout = Instance.new("UIListLayout")
+	rowLayout.Padding = UDim.new(0, 5)
+	rowLayout.SortOrder = Enum.SortOrder.LayoutOrder
+	rowLayout.Parent = row
+
+	local titleLine = Instance.new("Frame")
+	titleLine.BackgroundColor3 = Color3.fromRGB(40, 40, 46)
+	titleLine.BackgroundTransparency = 1
+	titleLine.LayoutOrder = 1
+	titleLine.Size = UDim2.new(1, 0, 0, 22)
+	titleLine.Parent = row
+
+	local contentDisclosure = Instance.new("TextButton")
+	contentDisclosure.BackgroundTransparency = 1
+	contentDisclosure.Font = Enum.Font.BuilderSansBold
+	contentDisclosure.Size = UDim2.new(0, 18, 1, 0)
+	contentDisclosure.Text = "▸"
+	contentDisclosure.TextColor3 = Color3.fromRGB(170, 170, 180)
+	contentDisclosure.TextSize = 11
+	contentDisclosure.Visible = false
+	contentDisclosure.Parent = titleLine
+	addButtonHover(contentDisclosure)
+
+	local icon = Instance.new("ImageLabel")
+	icon.BackgroundTransparency = 1
+	icon.Position = UDim2.new(0, 19, 0.5, -8)
+	icon.Size = UDim2.fromOffset(16, 16)
+	icon.Parent = titleLine
+	local rootInstance = resolveRoot(manifest.studioPath)
+	applyClassIcon(icon, if rootInstance then rootInstance.ClassName else "Model")
+
+	local title = Instance.new("TextButton")
+	title.BackgroundTransparency = 1
+	title.Font = Enum.Font.BuilderSansBold
+	title.Position = UDim2.new(0, 39, 0, 0)
+	title.Size = UDim2.new(1, -109, 1, 0)
+	title.Text = manifest.studioPath[#manifest.studioPath]
+	title.TextColor3 = Color3.fromRGB(235, 235, 240)
+	title.TextSize = 13
+	title.TextXAlignment = Enum.TextXAlignment.Left
+	title.Parent = titleLine
+
+	local dot = Instance.new("TextLabel")
+	dot.BackgroundTransparency = 1
+	dot.Font = Enum.Font.BuilderSansBold
+	dot.Position = UDim2.new(1, -70, 0, 0)
+	dot.Size = UDim2.new(0, 12, 1, 0)
+	dot.Text = "●"
+	dot.TextColor3 = Color3.fromRGB(180, 180, 190)
+	dot.TextSize = 9
+	dot.Parent = titleLine
+
+	local infoButton = Instance.new("TextButton")
+	infoButton.BackgroundTransparency = 1
+	infoButton.Font = Enum.Font.BuilderSansBold
+	infoButton.Position = UDim2.new(1, -58, 0, 0)
+	infoButton.Size = UDim2.new(0, 18, 1, 0)
+	infoButton.Text = "•••"
+	infoButton.TextColor3 = Color3.fromRGB(150, 150, 160)
+	infoButton.TextSize = 10
+	infoButton.Parent = titleLine
+	addButtonHover(infoButton)
+
+	local miniPush = Instance.new("TextButton")
+	miniPush.BackgroundTransparency = 1
+	miniPush.Font = Enum.Font.BuilderSansBold
+	miniPush.Position = UDim2.new(1, -40, 0, 0)
+	miniPush.Size = UDim2.new(0, 20, 1, 0)
+	miniPush.Text = "→"
+	miniPush.TextColor3 = Color3.fromRGB(115, 182, 255)
+	miniPush.TextSize = 15
+	miniPush.Parent = titleLine
+	addButtonHover(miniPush)
+
+	local miniPull = Instance.new("TextButton")
+	miniPull.BackgroundTransparency = 1
+	miniPull.Font = Enum.Font.BuilderSansBold
+	miniPull.Position = UDim2.new(1, -20, 0, 0)
+	miniPull.Size = UDim2.new(0, 20, 1, 0)
+	miniPull.Text = "←"
+	miniPull.TextColor3 = Color3.fromRGB(115, 182, 255)
+	miniPull.TextSize = 15
+	miniPull.Parent = titleLine
+	addButtonHover(miniPull)
+
+	titleLine.MouseEnter:Connect(function()
+		titleLine.BackgroundTransparency = 0
+	end)
+	titleLine.MouseLeave:Connect(function()
+		titleLine.BackgroundTransparency = 1
+	end)
+
+	local file = Instance.new("TextLabel")
+	file.BackgroundTransparency = 1
+	file.Font = Enum.Font.Code
+	file.LayoutOrder = 2
+	file.Size = UDim2.new(1, 0, 0, 18)
+	file.Text = manifest.file
+	file.TextColor3 = Color3.fromRGB(145, 145, 155)
+	file.TextSize = 11
+	file.TextTruncate = Enum.TextTruncate.AtEnd
+	file.TextXAlignment = Enum.TextXAlignment.Left
+	file.Visible = false
+	file.Parent = row
+
+	local status = Instance.new("TextLabel")
+	status.AutomaticSize = Enum.AutomaticSize.Y
+	status.BackgroundTransparency = 1
+	status.Font = Enum.Font.BuilderSans
+	status.LayoutOrder = 3
+	status.Size = UDim2.new(1, 0, 0, 18)
+	status.Text = "Checking..."
+	status.TextColor3 = Color3.fromRGB(180, 180, 190)
+	status.TextSize = 12
+	status.TextWrapped = true
+	status.TextXAlignment = Enum.TextXAlignment.Left
+	status.Visible = false
+	status.Parent = row
+
+	local buttons = Instance.new("Frame")
+	buttons.BackgroundTransparency = 1
+	buttons.LayoutOrder = 4
+	buttons.Size = UDim2.new(1, 0, 0, 26)
+	buttons.Visible = false
+	buttons.Parent = row
+
+	local buttonsLayout = Instance.new("UIListLayout")
+	buttonsLayout.FillDirection = Enum.FillDirection.Horizontal
+	buttonsLayout.Padding = UDim.new(0, 6)
+	buttonsLayout.Parent = buttons
+
+	local pushButton = Instance.new("TextButton")
+	pushButton.BackgroundColor3 = Color3.fromRGB(70, 70, 80)
+	pushButton.BorderSizePixel = 0
+	pushButton.Font = Enum.Font.BuilderSansBold
+	pushButton.Size = UDim2.new(0.5, -3, 1, 0)
+	pushButton.Text = "Push Studio"
+	pushButton.TextColor3 = Color3.fromRGB(240, 240, 245)
+	pushButton.TextSize = 12
+	pushButton.Parent = buttons
+	Instance.new("UICorner", pushButton).CornerRadius = UDim.new(0, 4)
+
+	local pullButton = Instance.new("TextButton")
+	pullButton.BackgroundColor3 = Color3.fromRGB(70, 70, 80)
+	pullButton.BorderSizePixel = 0
+	pullButton.Font = Enum.Font.BuilderSansBold
+	pullButton.Size = UDim2.new(0.5, -3, 1, 0)
+	pullButton.Text = "Pull File"
+	pullButton.TextColor3 = Color3.fromRGB(240, 240, 245)
+	pullButton.TextSize = 12
+	pullButton.Parent = buttons
+	Instance.new("UICorner", pullButton).CornerRadius = UDim.new(0, 4)
+
+	local mergeButton = Instance.new("TextButton")
+	mergeButton.BackgroundColor3 = Color3.fromRGB(151, 92, 41)
+	mergeButton.BorderSizePixel = 0
+	mergeButton.Font = Enum.Font.BuilderSansBold
+	mergeButton.Size = UDim2.fromScale(1, 1)
+	mergeButton.Text = "Open Merge Workspace"
+	mergeButton.TextColor3 = Color3.fromRGB(255, 245, 230)
+	mergeButton.TextSize = 12
+	mergeButton.Visible = false
+	mergeButton.Parent = buttons
+	Instance.new("UICorner", mergeButton).CornerRadius = UDim.new(0, 4)
+
+	local diffButton = Instance.new("TextButton")
+	diffButton.BackgroundColor3 = Color3.fromRGB(48, 91, 132)
+	diffButton.BorderSizePixel = 0
+	diffButton.Font = Enum.Font.BuilderSansBold
+	diffButton.Size = UDim2.new(0.5, -3, 1, 0)
+	diffButton.Text = "Property Diff"
+	diffButton.TextColor3 = Color3.fromRGB(240, 247, 255)
+	diffButton.TextSize = 12
+	diffButton.Visible = false
+	diffButton.Parent = buttons
+	Instance.new("UICorner", diffButton).CornerRadius = UDim.new(0, 4)
+
+	local contents = Instance.new("Frame")
+	contents.AutomaticSize = Enum.AutomaticSize.Y
+	contents.BackgroundTransparency = 1
+	contents.LayoutOrder = 5
+	contents.Size = UDim2.new(1, 0, 0, 0)
+	contents.Visible = false
+	contents.Parent = row
+	local contentsGuide = Instance.new("Frame")
+	contentsGuide.BackgroundColor3 = Color3.fromRGB(72, 72, 82)
+	contentsGuide.BorderSizePixel = 0
+	contentsGuide.Position = UDim2.new(0, 6, 0, 0)
+	contentsGuide.Size = UDim2.fromOffset(1, 0)
+	contentsGuide.Parent = contents
+	local contentsList = Instance.new("Frame")
+	contentsList.AutomaticSize = Enum.AutomaticSize.Y
+	contentsList.BackgroundTransparency = 1
+	contentsList.Position = UDim2.new(0, 14, 0, 0)
+	contentsList.Size = UDim2.new(1, -14, 0, 0)
+	contentsList.Parent = contents
+	local contentsLayout = Instance.new("UIListLayout", contentsList)
+	contentsLayout.Padding = UDim.new(0, 2)
+	contentsLayout.SortOrder = Enum.SortOrder.LayoutOrder
+	contentsLayout:GetPropertyChangedSignal("AbsoluteContentSize"):Connect(function()
+		contentsGuide.Size = UDim2.fromOffset(1, contentsLayout.AbsoluteContentSize.Y)
+	end)
+
+	local savedHash = plugin:GetSetting(
+		SETTINGS_PREFIX .. serverConfig.projectId .. ":" .. serverConfig.workspaceId .. ":" .. manifest.id .. ":hash"
+	) or plugin:GetSetting(SETTINGS_PREFIX .. serverConfig.projectId .. ":" .. manifest.id .. ":hash")
+	local state = {
+		manifest = manifest,
+		group = group,
+		row = row,
+		title = title,
+		icon = icon,
+		iconClass = if rootInstance then rootInstance.ClassName else "Model",
+		contentDisclosure = contentDisclosure,
+		contents = contents,
+		contentsList = contentsList,
+		contentsLayout = contentsLayout,
+		contentsLoaded = false,
+		contentsExpanded = false,
+		searchQuery = nil,
+		searchMatches = true,
+		dot = dot,
+		infoButton = infoButton,
+		miniPush = miniPush,
+		miniPull = miniPull,
+		file = file,
+		status = status,
+		buttons = buttons,
+		pushButton = pushButton,
+		pullButton = pullButton,
+		mergeButton = mergeButton,
+		diffButton = diffButton,
+		root = nil,
+		rootConnections = {},
+		instanceConnections = {},
+		dirty = false,
+		generation = 0,
+		suppress = false,
+		conflict = false,
+		uploading = false,
+		pulling = false,
+		deleting = false,
+		conflictWorkspace = nil,
+		expanded = false,
+		lastHash = if type(savedHash) == "string" then savedHash else nil,
+	}
+	states[manifest.id] = state
+	contentDisclosure.Activated:Connect(function()
+		toggleRootContents(state)
+	end)
+	infoButton.Activated:Connect(function()
+		setRootExpanded(state, not state.expanded)
+	end)
+	title.Activated:Connect(function()
+		local root = resolveRoot(state.manifest.studioPath)
+		if root then
+			Selection:Set({ root })
+		end
+	end)
+	miniPush.Activated:Connect(function()
+		upload(state, true)
+	end)
+	miniPull.Activated:Connect(function()
+		pull(state)
+	end)
+	pushButton.Activated:Connect(function()
+		upload(state, true)
+	end)
+	pullButton.Activated:Connect(function()
+		pull(state)
+	end)
+	mergeButton.Activated:Connect(function()
+		if state.conflictWorkspace then
+			resolveGitConflict(state)
+		else
+			openGitConflict(state)
+		end
+	end)
+	diffButton.Activated:Connect(function()
+		if state.conflictWorkspace then
+			inspectorWidget.Enabled = true
+		end
+	end)
+	return state
+end
+
+local function reconcile(state, manifest)
+	state.manifest = manifest
+	if manifest.gitConflict then
+		state.conflict = true
+		state.pushButton.Visible = false
+		state.pullButton.Visible = false
+		state.miniPush.Visible = false
+		state.miniPull.Visible = false
+		state.mergeButton.Visible = true
+		setStatus(state, "Git conflict — resolve in VS Code or open the optional merge workspace.", Color3.fromRGB(245, 106, 106))
+		if autoExpandConflicts then
+			setGroupExpanded(state.group, true)
+			setRootExpanded(state, true)
+		end
+		return
+	end
+	state.pushButton.Visible = true
+	state.pullButton.Visible = true
+	state.miniPush.Visible = true
+	state.miniPull.Visible = true
+	state.mergeButton.Visible = false
+	state.pushButton.Active = serverConfig.rojoConnected
+	state.pullButton.Active = serverConfig.rojoConnected
+	state.miniPush.Active = serverConfig.rojoConnected
+	state.miniPull.Active = serverConfig.rojoConnected
+	state.pushButton.AutoButtonColor = serverConfig.rojoConnected
+	state.pullButton.AutoButtonColor = serverConfig.rojoConnected
+	state.miniPush.AutoButtonColor = serverConfig.rojoConnected
+	state.miniPull.AutoButtonColor = serverConfig.rojoConnected
+	state.miniPush.TextColor3 = if serverConfig.rojoConnected
+		then Color3.fromRGB(115, 182, 255)
+		else Color3.fromRGB(95, 95, 105)
+	state.miniPull.TextColor3 = state.miniPush.TextColor3
+	if state.conflictWorkspace then
+		destroyConflictWorkspace(state)
+	end
+	if not serverConfig.rojoConnected then
+		setStatus(state, "Paused — Rojo offline; conflict viewer remains available.", Color3.fromRGB(244, 194, 92))
+		return
+	end
+	local root = resolveRoot(manifest.studioPath)
+	if state.contentRoot ~= root then
+		state.contentRoot = root
+		state.searchQuery = nil
+		resetStateContents(state)
+	elseif root then
+		state.contentDisclosure.Visible = visualDepth > 0 and #root:GetChildren() > 0
+	end
+	if root and state.iconClass ~= root.ClassName then
+		state.iconClass = root.ClassName
+		applyClassIcon(state.icon, root.ClassName)
+	end
+	if root and state.root ~= root then
+		watchRoot(state, root)
+	end
+
+	if not manifest.exists then
+		if manifest.deleted and not root then
+			state.conflict = false
+			setStatus(state, "Deleted", Color3.fromRGB(102, 214, 139))
+		elseif state.lastHash then
+			state.conflict = true
+			setStatus(state, "File was deleted. Push to recreate it.", Color3.fromRGB(245, 106, 106))
+		elseif root then
+			upload(state, false)
+		else
+			setStatus(state, "Both Studio root and file are missing.", Color3.fromRGB(245, 106, 106))
+		end
+		return
+	end
+
+	if not root then
+		if not state.conflict and not state.deleting then
+			deleteSnapshot(state)
+		end
+		return
+	end
+	if not state.lastHash then
+		state.conflict = true
+		setStatus(state, "First sync needs Push or Pull once.", Color3.fromRGB(244, 194, 92))
+		return
+	end
+	if manifest.hash ~= state.lastHash then
+		if state.dirty or state.uploading then
+			state.conflict = true
+			setStatus(state, "Conflict: Studio and file both changed.", Color3.fromRGB(245, 106, 106))
+		else
+			pull(state)
+		end
+		return
+	end
+	if not state.dirty and not state.uploading and not state.pulling then
+		state.conflict = false
+		setStatus(state, "Synced", Color3.fromRGB(102, 214, 139))
+	end
+end
+
+local function refreshSettingsLabels()
+	showSyncedButton.Text = (if showSynced then "✓  " else "    ") .. "Show synced files"
+	autoExpandButton.Text = (if autoExpandConflicts then "✓  " else "    ") .. "Auto-expand conflicts"
+	depthLabel.Text = string.format("Internal browse depth: %d", visualDepth)
+	refreshUnsyncedButton()
+end
+
+applyTreeFilter = function()
+	local query = string.lower(searchBox.Text)
+	for _, state in states do
+		if state.searchQuery ~= query then
+			local searchable = string.lower(
+				table.concat(state.manifest.studioPath, ".") .. " " .. state.manifest.file .. " " .. state.status.Text
+			)
+			local matches = query == "" or string.find(searchable, query, 1, true) ~= nil
+			if not matches then
+				local root = resolveRoot(state.manifest.studioPath)
+				if root then
+					for _, descendant in root:GetDescendants() do
+						if string.find(string.lower(descendant.Name .. " " .. descendant.ClassName), query, 1, true) then
+							matches = true
+							break
+						end
+					end
+				end
+			end
+			state.searchQuery = query
+			state.searchMatches = matches
+		end
+		state.row.Visible = state.searchMatches and (showSynced or state.statusKind ~= "synced")
+	end
+	for _, group in groups do
+		local hasVisibleDescendant = false
+		for _, state in states do
+			if state.row.Visible and pathStartsWith(group.path, state.manifest.studioPath) then
+				hasVisibleDescendant = true
+				break
+			end
+		end
+		group.section.Visible = hasVisibleDescendant
+		if query ~= "" and hasVisibleDescendant then
+			setGroupExpanded(group, true)
+		end
+	end
+end
+
+addButtonHover(settingsButton)
+addButtonHover(showSyncedButton)
+addButtonHover(autoExpandButton)
+addButtonHover(depthMinus)
+addButtonHover(depthPlus)
+unsyncedButton.MouseEnter:Connect(function()
+	unsyncedButton.BackgroundColor3 = if showSynced
+		then Color3.fromRGB(58, 58, 68)
+		else Color3.fromRGB(94, 78, 42)
+end)
+unsyncedButton.MouseLeave:Connect(refreshUnsyncedButton)
+refreshSettingsLabels()
+
+settingsButton.Activated:Connect(function()
+	settingsPanel.Visible = not settingsPanel.Visible
+end)
+unsyncedButton.Activated:Connect(function()
+	showSynced = not showSynced
+	plugin:SetSetting(UI_SETTINGS_PREFIX .. "showSynced", showSynced)
+	refreshSettingsLabels()
+	applyTreeFilter()
+end)
+showSyncedButton.Activated:Connect(function()
+	showSynced = not showSynced
+	plugin:SetSetting(UI_SETTINGS_PREFIX .. "showSynced", showSynced)
+	refreshSettingsLabels()
+	applyTreeFilter()
+end)
+autoExpandButton.Activated:Connect(function()
+	autoExpandConflicts = not autoExpandConflicts
+	plugin:SetSetting(UI_SETTINGS_PREFIX .. "autoExpandConflicts", autoExpandConflicts)
+	refreshSettingsLabels()
+end)
+depthMinus.Activated:Connect(function()
+	visualDepth = math.max(0, visualDepth - 1)
+	plugin:SetSetting(UI_SETTINGS_PREFIX .. "visualDepth", visualDepth)
+	refreshSettingsLabels()
+	resetInstanceTrees()
+end)
+depthPlus.Activated:Connect(function()
+	visualDepth = math.min(5, visualDepth + 1)
+	plugin:SetSetting(UI_SETTINGS_PREFIX .. "visualDepth", visualDepth)
+	refreshSettingsLabels()
+	resetInstanceTrees()
+end)
+
+local searchGeneration = 0
+searchBox:GetPropertyChangedSignal("Text"):Connect(function()
+	searchGeneration += 1
+	local generation = searchGeneration
+	task.delay(0.15, function()
+		if generation == searchGeneration then
+			applyTreeFilter()
+		end
+	end)
+end)
+
+refreshConfig = function()
+	local response, requestError = request("GET", "/v1/config")
+	if not response or not response.Success then
+		local reason = requestError or (if response then responseError(response) else nil) or "connect Rojo to start syncing"
+		if serverConfig then
+			serverConfig.rojoConnected = false
+		end
+		connectionStatus.Text = "Offline · " .. reason
+		connectionStatus.TextColor3 = Color3.fromRGB(245, 106, 106)
+		connectionDot.TextColor3 = connectionStatus.TextColor3
+		return false
+	end
+
+	local decoded = HttpService:JSONDecode(response.Body)
+	if serverConfig
+		and (serverConfig.projectId ~= decoded.projectId or serverConfig.workspaceId ~= decoded.workspaceId)
+	then
+		for _, state in states do
+			disconnectRoot(state)
+			destroyConflictWorkspace(state)
+		end
+		table.clear(states)
+		for _, child in rootsContainer:GetChildren() do
+			if child ~= rootsLayout then
+				child:Destroy()
+			end
+		end
+		table.clear(groups)
+	end
+	serverConfig = decoded
+	if decoded.rojoConnected then
+		connectionStatus.Text = "Connected · " .. decoded.name
+		connectionStatus.TextColor3 = Color3.fromRGB(102, 214, 139)
+	else
+		connectionStatus.Text = "Rojo offline · connect Rojo to start syncing"
+		connectionStatus.TextColor3 = Color3.fromRGB(244, 194, 92)
+	end
+	connectionDot.TextColor3 = connectionStatus.TextColor3
+
+	local existingSplitPaths = {}
+	for _, manifest in decoded.roots do
+		if manifest.splitRootId then
+			existingSplitPaths[manifest.splitRootId .. "\0" .. table.concat(manifest.studioPath, "\0")] = true
+		end
+	end
+	for _, splitRoot in decoded.splitRoots do
+		local root = resolveRoot(splitRoot.studioPath)
+		if root then
+			local missingPaths = {}
+			for _, relativePath in collectSplitPaths(root, splitRoot.splitDepth) do
+				local fullPath = table.clone(splitRoot.studioPath)
+				for _, segment in relativePath do
+					table.insert(fullPath, segment)
+				end
+				if not existingSplitPaths[splitRoot.id .. "\0" .. table.concat(fullPath, "\0")] then
+					table.insert(missingPaths, relativePath)
+				end
+			end
+			if #missingPaths > 0 then
+				request("POST", "/v1/splits/" .. splitRoot.id .. "/discover", HttpService:JSONEncode({ paths = missingPaths }), {
+					["Content-Type"] = "application/json",
+				})
+			end
+		end
+	end
+
+	for order, manifest in decoded.roots do
+		local state = states[manifest.id] or createRootRow(manifest, order)
+		reconcile(state, manifest)
+	end
+	local currentIds = {}
+	for _, manifest in decoded.roots do
+		currentIds[manifest.id] = true
+	end
+	local staleIds = {}
+	for id in states do
+		if not currentIds[id] then
+			table.insert(staleIds, id)
+		end
+	end
+	for _, id in staleIds do
+		local state = states[id]
+		disconnectRoot(state)
+		destroyConflictWorkspace(state)
+		state.row:Destroy()
+		states[id] = nil
+	end
+	updateGroupSummaries()
+	applyTreeFilter()
+	return true
+end
+
+toolbarButton.Click:Connect(function()
+	widget.Enabled = not widget.Enabled
+	if widget.Enabled then
+		refreshConfig()
+	end
+end)
+widget:GetPropertyChangedSignal("Enabled"):Connect(function()
+	toolbarButton:SetActive(widget.Enabled)
+end)
+
+plugin.Unloading:Connect(function()
+	running = false
+	for _, state in states do
+		disconnectRoot(state)
+		destroyConflictWorkspace(state)
+	end
+end)
+
+task.spawn(function()
+	while running do
+		refreshConfig()
+		task.wait((serverConfig and serverConfig.pollIntervalMs or 750) / 1000)
+	end
+end)
+]]></string>
+      </Properties>
+    </Item>
+  </Item>
+</roblox>