goldsync 0.1.13 → 0.1.15

package/README.md

@@ -73,6 +73,10 @@ Place `goldsync.project.json` at the game repository root:
 
 A `file` root becomes one RBXM. A `directory` root creates separate files for descendants at `splitDepth`. Split at complete models, effects, or UI components—not individual parts or attachments. Never map the same hierarchy in Rojo, and do not include scripts inside a GoldSync root.
 
+Directory roots can contain more specific roots. Discovery skips branches owned by those roots, including existing files on disk. For example, split `ReplicatedStorage.Assets` at depth 1 and add another depth-1 directory root for `ReplicatedStorage.Assets.Effects`. New asset categories and individual effects are discovered automatically, without creating an overlapping `Effects.rbxm`. Existing explicit file roots can stay in place to preserve their sync history. File roots cannot contain other roots because their snapshots include the entire subtree.
+
+When upgrading an existing project, put the new parent directory roots in the optional top-level `discoveryRoots` array, using the same fields as directory roots. Older GoldSync versions ignore that array, so they cannot create overlapping snapshots before the service is restarted with nested-root support. Existing roots and files remain unchanged.
+
 GoldSync reads the Rojo project name and fallback `servePort` from `default.project.json`. It automatically detects `rojo serve --port` overrides and verifies the listener's project name before connecting. That active Rojo session selects the GoldSync workspace, so Studio place IDs and names do not need configuration. Set `rojo.projectFile` only when the repository uses another project file.
 
 Map GoldSync's generated live-session marker in the Rojo project tree:

package/assets/GoldSync.rbxmx

@@ -22,7 +22,7 @@ local CLIENT_HEADERS = {
 }
 local SETTINGS_PREFIX = "GoldSync:v2:"
 local UI_SETTINGS_PREFIX = "GoldSync:ui:v1:"
-local VERSION = "0.1.13"
+local VERSION = "0.1.15"
 local REQUEST_INTERVAL_SECONDS = 0.15
 local REQUEST_RETRY_DELAYS = { 1, 2, 4 }
 
@@ -340,6 +340,8 @@ local lastRequestAt = 0
 local serverConfig
 local states = {}
 local groups = {}
+local batchingStatusUpdates = false
+local splitRootConnections = {}
 local refreshConfig
 local updateGroupSummaries
 local refreshStatusSummary
@@ -369,6 +371,31 @@ local function collectSplitPaths(root, depth)
 	return paths
 end
 
+local function collectSplitInstances(root, depth)
+	local current = { root }
+	for _ = 1, depth do
+		local nextLevel = {}
+		for _, parent in current do
+			for _, child in parent:GetChildren() do
+				table.insert(nextLevel, child)
+			end
+		end
+		current = nextLevel
+	end
+	return current
+end
+
+local function isAtSplitDepth(root, instance, depth)
+	local current = instance
+	for _ = 1, depth do
+		if not current or current == root then
+			return false
+		end
+		current = current.Parent
+	end
+	return current == root
+end
+
 local function acquireRequestLock()
 	if requestLocked then
 		local waiter = Instance.new("BindableEvent")
@@ -464,6 +491,131 @@ local function resolveParent(studioPath)
 	return current
 end
 
+local function disconnectSplitRoot(id)
+	local watched = splitRootConnections[id]
+	if not watched then
+		return
+	end
+	for _, connection in watched.connections do
+		connection:Disconnect()
+	end
+	for _, connection in watched.nameConnections do
+		connection:Disconnect()
+	end
+	splitRootConnections[id] = nil
+end
+
+local function disconnectSplitRoots()
+	local ids = {}
+	for id in splitRootConnections do
+		table.insert(ids, id)
+	end
+	for _, id in ids do
+		disconnectSplitRoot(id)
+	end
+end
+
+local function discoverSplitRoot(splitRoot, root)
+	if not serverConfig or splitRootConnections[splitRoot.id] == nil then
+		return
+	end
+	local existingPaths = {}
+	for _, manifest in serverConfig.roots do
+		if manifest.splitRootId == splitRoot.id then
+			existingPaths[table.concat(manifest.studioPath, "\0")] = true
+		end
+	end
+	local missingPaths = {}
+	for _, relativePath in collectSplitPaths(root, splitRoot.splitDepth) do
+		local excluded = false
+		for _, excludedPath in splitRoot.excludedPaths or {} do
+			local matches = true
+			for index, segment in excludedPath do
+				if relativePath[index] ~= segment then
+					matches = false
+					break
+				end
+			end
+			if matches then
+				excluded = true
+				break
+			end
+		end
+		if excluded then
+			continue
+		end
+
+		local fullPath = table.clone(splitRoot.studioPath)
+		for _, segment in relativePath do
+			table.insert(fullPath, segment)
+		end
+		if not existingPaths[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
+
+local function watchSplitRoot(splitRoot)
+	local root = resolveRoot(splitRoot.studioPath)
+	local watched = splitRootConnections[splitRoot.id]
+	if watched and watched.root == root then
+		return
+	end
+	disconnectSplitRoot(splitRoot.id)
+	if not root then
+		return
+	end
+
+	local entry = {
+		root = root,
+		generation = 0,
+		connections = {},
+		nameConnections = {},
+	}
+	splitRootConnections[splitRoot.id] = entry
+	local function scheduleDiscovery()
+		entry.generation += 1
+		local generation = entry.generation
+		task.delay(0.1, function()
+			if running and splitRootConnections[splitRoot.id] == entry and entry.generation == generation then
+				discoverSplitRoot(splitRoot, root)
+			end
+		end)
+	end
+	local function watchName(instance)
+		if entry.nameConnections[instance] or not isAtSplitDepth(root, instance, splitRoot.splitDepth) then
+			return
+		end
+		entry.nameConnections[instance] = instance:GetPropertyChangedSignal("Name"):Connect(scheduleDiscovery)
+	end
+	for _, instance in collectSplitInstances(root, splitRoot.splitDepth) do
+		watchName(instance)
+	end
+	table.insert(entry.connections, root.DescendantAdded:Connect(function(descendant)
+		watchName(descendant)
+		scheduleDiscovery()
+	end))
+	table.insert(entry.connections, root.DescendantRemoving:Connect(function(descendant)
+		local connection = entry.nameConnections[descendant]
+		if connection then
+			connection:Disconnect()
+			entry.nameConnections[descendant] = nil
+		end
+		scheduleDiscovery()
+	end))
+	table.insert(entry.connections, root.AncestryChanged:Connect(function()
+		if resolveRoot(splitRoot.studioPath) ~= root then
+			disconnectSplitRoot(splitRoot.id)
+		end
+	end))
+	discoverSplitRoot(splitRoot, root)
+end
+
 local function applyClassIcon(image, className)
 	local success, icon = pcall(function()
 		return StudioService:GetClassIcon(className)
@@ -499,12 +651,8 @@ local function findCode(root)
 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"
+	local statusColor = color or Color3.fromRGB(180, 180, 190)
+	local statusKind = if string.sub(text, 1, 6) == "Synced"
 		then "synced"
 		elseif string.find(text, "syncing")
 			or string.find(text, "Serializing")
@@ -514,7 +662,16 @@ local function setStatus(state, text, color)
 		then "working"
 		elseif string.find(text, "Rojo") and string.find(text, "offline") then "paused"
 		else "issue"
-	if updateGroupSummaries then
+	if state.status.Text == text and state.status.TextColor3 == statusColor and state.statusKind == statusKind then
+		return
+	end
+	local previousStatusKind = state.statusKind
+	state.status.Text = text
+	state.status.TextColor3 = statusColor
+	state.dot.TextColor3 = statusColor
+	state.searchQuery = nil
+	state.statusKind = statusKind
+	if updateGroupSummaries and not batchingStatusUpdates then
 		if previousStatusKind ~= state.statusKind then
 			updateGroupSummaries()
 		elseif refreshStatusSummary then
@@ -1414,14 +1571,6 @@ local function createGroup(path, order)
 	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)
@@ -1434,6 +1583,14 @@ local function createGroup(path, order)
 	header.LayoutOrder = 1
 	header.Size = UDim2.new(1, 0, 0, 24)
 	header.Parent = section
+	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 = header
+	end
 
 	local disclosure = Instance.new("TextButton")
 	disclosure.BackgroundTransparency = 1
@@ -1726,7 +1883,6 @@ local function createInstanceNode(instance, parent, depth, order)
 	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)
@@ -1734,6 +1890,7 @@ local function createInstanceNode(instance, parent, depth, order)
 	header.LayoutOrder = 1
 	header.Size = UDim2.new(1, 0, 0, 22)
 	header.Parent = section
+	connector.Parent = header
 	header.MouseEnter:Connect(function()
 		header.BackgroundTransparency = 0
 	end)
@@ -1894,7 +2051,6 @@ local function createRootRow(manifest, order)
 	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)
@@ -1902,8 +2058,6 @@ local function createRootRow(manifest, order)
 
 	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
 
@@ -1918,6 +2072,7 @@ local function createRootRow(manifest, order)
 	titleLine.LayoutOrder = 1
 	titleLine.Size = UDim2.new(1, 0, 0, 22)
 	titleLine.Parent = row
+	connector.Parent = titleLine
 
 	local contentDisclosure = Instance.new("TextButton")
 	contentDisclosure.BackgroundTransparency = 1
@@ -2393,6 +2548,19 @@ searchBox:GetPropertyChangedSignal("Text"):Connect(function()
 	end)
 end)
 
+local function manifestChanged(previous, current)
+	return not previous
+		or previous.hash ~= current.hash
+		or previous.exists ~= current.exists
+		or previous.deleted ~= current.deleted
+		or previous.revision ~= current.revision
+		or previous.gitConflict ~= current.gitConflict
+		or previous.conflictToken ~= current.conflictToken
+		or previous.file ~= current.file
+		or previous.splitRootId ~= current.splitRootId
+		or table.concat(previous.studioPath, "\0") ~= table.concat(current.studioPath, "\0")
+end
+
 refreshConfig = function()
 	local response, requestError = request("GET", "/v1/config")
 	if not response or not response.Success then
@@ -2407,13 +2575,15 @@ refreshConfig = function()
 	end
 
 	local decoded = HttpService:JSONDecode(response.Body)
-	if serverConfig
+	local projectChanged = serverConfig
 		and (serverConfig.projectId ~= decoded.projectId or serverConfig.workspaceId ~= decoded.workspaceId)
-	then
+	local connectionChanged = serverConfig and serverConfig.rojoConnected ~= decoded.rojoConnected
+	if projectChanged then
 		for _, state in states do
 			disconnectRoot(state)
 			destroyConflictWorkspace(state)
 		end
+		disconnectSplitRoots()
 		table.clear(states)
 		for _, child in rootsContainer:GetChildren() do
 			if child ~= rootsLayout then
@@ -2432,36 +2602,38 @@ refreshConfig = function()
 	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
+	local currentSplitRootIds = {}
 	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
+		currentSplitRootIds[splitRoot.id] = true
+		watchSplitRoot(splitRoot)
+	end
+	local staleSplitRootIds = {}
+	for id in splitRootConnections do
+		if not currentSplitRootIds[id] then
+			table.insert(staleSplitRootIds, id)
 		end
 	end
+	for _, id in staleSplitRootIds do
+		disconnectSplitRoot(id)
+	end
 
+	local treeChanged = projectChanged == true or connectionChanged == true
+	batchingStatusUpdates = true
 	for order, manifest in decoded.roots do
-		local state = states[manifest.id] or createRootRow(manifest, order)
-		reconcile(state, manifest)
+		local state = states[manifest.id]
+		local created = state == nil
+		if created then
+			state = createRootRow(manifest, order)
+		end
+		local resolvedRoot = resolveRoot(manifest.studioPath)
+		local rootChanged = state.observedRoot ~= resolvedRoot
+		state.observedRoot = resolvedRoot
+		if created or connectionChanged or rootChanged or manifestChanged(state.manifest, manifest) then
+			reconcile(state, manifest)
+			treeChanged = true
+		else
+			state.manifest = manifest
+		end
 	end
 	local currentIds = {}
 	for _, manifest in decoded.roots do
@@ -2479,9 +2651,13 @@ refreshConfig = function()
 		destroyConflictWorkspace(state)
 		state.row:Destroy()
 		states[id] = nil
+		treeChanged = true
+	end
+	batchingStatusUpdates = false
+	if treeChanged then
+		updateGroupSummaries()
+		applyTreeFilter()
 	end
-	updateGroupSummaries()
-	applyTreeFilter()
 	return true
 end
 
@@ -2497,6 +2673,7 @@ end)
 
 plugin.Unloading:Connect(function()
 	running = false
+	disconnectSplitRoots()
 	for _, state in states do
 		disconnectRoot(state)
 		destroyConflictWorkspace(state)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goldsync",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Automatic native Roblox asset synchronization for Rojo projects.",
   "author": "tay",
   "license": "SEE LICENSE IN LICENSE.txt",

package/src/config.mjs

@@ -86,6 +86,10 @@ export async function loadConfig(configPath) {
   if (!Array.isArray(raw.roots) || raw.roots.length === 0) {
     throw new Error("roots must contain at least one sync root");
   }
+  if (raw.discoveryRoots !== undefined && (!Array.isArray(raw.discoveryRoots)
+    || raw.discoveryRoots.some((root) => !root || root.splitDepth === undefined))) {
+    throw new Error("discoveryRoots must contain directory roots with splitDepth");
+  }
   const maxPathDepth = raw.maxPathDepth ?? 3;
   if (!Number.isInteger(maxPathDepth) || maxPathDepth < 2 || maxPathDepth > 10) {
     throw new Error("maxPathDepth must be an integer between 2 and 10");
@@ -95,8 +99,8 @@ export async function loadConfig(configPath) {
   const studioPaths = new Set();
   const files = new Set();
   const splitRoots = [];
-  const roots = raw.roots.flatMap((root, index) => {
-    const label = `roots[${index}]`;
+  const roots = [...raw.roots, ...(raw.discoveryRoots ?? [])].flatMap((root, index) => {
+    const label = index < raw.roots.length ? `roots[${index}]` : `discoveryRoots[${index - raw.roots.length}]`;
     const id = requireString(root.id, `${label}.id`);
     if (!ID_PATTERN.test(id)) {
       throw new Error(`${label}.id must contain lowercase letters, numbers, or hyphens`);
@@ -145,6 +149,22 @@ export async function loadConfig(configPath) {
     }];
   });
 
+  const configuredRoots = [...roots, ...splitRoots];
+  for (const root of roots) {
+    if (configuredRoots.some((other) => other !== root
+      && other.studioPath.length > root.studioPath.length
+      && root.studioPath.every((segment, index) => other.studioPath[index] === segment))) {
+      throw new Error(`file root ${root.id} contains another sync root; use a directory root instead`);
+    }
+  }
+  for (const root of splitRoots) {
+    root.excludedPaths = configuredRoots
+      .filter((other) => other !== root
+        && other.studioPath.length > root.studioPath.length
+        && root.studioPath.every((segment, index) => other.studioPath[index] === segment))
+      .map((other) => other.studioPath.slice(root.studioPath.length, root.studioPath.length + root.splitDepth));
+  }
+
   return {
     version: 1,
     name: requireString(raw.name, "name"),

package/src/server.mjs

@@ -161,6 +161,7 @@ export class GoldSyncServer {
           id: root.id,
           studioPath: root.studioPath,
           splitDepth: root.splitDepth,
+          excludedPaths: root.excludedPaths ?? [],
         })),
         roots: this.store.getManifests().map((manifest) => {
           const conflict = conflicts.get(manifest.id);

package/src/store.mjs

@@ -140,7 +140,12 @@ export class SnapshotStore {
     }
     let changed = false;
     for (const relativePath of relativePaths) {
-      changed = (await this.addRoot(this.makeSplitRoot(splitRoot, relativePath))) || changed;
+      const root = this.makeSplitRoot(splitRoot, relativePath);
+      if ((splitRoot.excludedPaths ?? []).some((excluded) =>
+        excluded.every((segment, index) => relativePath[index] === segment))) {
+        continue;
+      }
+      changed = (await this.addRoot(root)) || changed;
     }
     if (changed) {
       await this.persistState();