Fix postcommit callbacks being skipped (#1132)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Rojo Changelog
 
+## Unreleased
+
+* Fixed a bug where the last sync timestamp was not updating correctly in the plugin ([#1132])
+
+[#1132]: https://github.com/rojo-rbx/rojo/pull/1132
+
 ## 7.6.0 - October 10th, 2025
 * Added flag to `rojo init` to skip initializing a git repository ([#1122])
 * Added fallback method for when an Instance can't be synced through normal means ([#1030])

plugin/src/App/init.lua

@@ -602,44 +602,30 @@ function App:startSession()
 		})
 	end)
 	self.cleanupPostcommit = serveSession:hookPostcommit(function(patch, instanceMap, unappliedPatch)
-		-- Update tree with unapplied metadata
-		self:setState(function(prevState)
-			return {
-				patchTree = PatchTree.updateMetadata(prevState.patchTree, patch, instanceMap, unappliedPatch),
-			}
-		end)
-	end)
-
-	serveSession:hookPostcommit(function(patch, _instanceMap, unapplied)
 		local now = DateTime.now().UnixTimestamp
-		local old = self.state.patchData
+		self:setState(function(prevState)
+			local oldPatchData = prevState.patchData
+			local newPatchData = {
+				patch = patch,
+				unapplied = unappliedPatch,
+				timestamp = now,
+			}
 
 			if PatchSet.isEmpty(patch) then
-			-- Ignore empty patch, but update timestamp
+				-- Keep existing patch info, but use new timestamp
-			self:setState({
+				newPatchData.patch = oldPatchData.patch
-				patchData = {
+				newPatchData.unapplied = oldPatchData.unapplied
-					patch = old.patch,
+			elseif now - oldPatchData.timestamp < 2 then
-					unapplied = old.unapplied,
+				-- Patches that apply in the same second are combined for human clarity
-					timestamp = now,
+				newPatchData.patch = PatchSet.assign(PatchSet.newEmpty(), oldPatchData.patch, patch)
-				},
+				newPatchData.unapplied = PatchSet.assign(PatchSet.newEmpty(), oldPatchData.unapplied, unappliedPatch)
-			})
-			return
 			end
 
-		if now - old.timestamp < 2 then
+			return {
-			-- Patches that apply in the same second are
+				patchTree = PatchTree.updateMetadata(prevState.patchTree, patch, instanceMap, unappliedPatch),
-			-- considered to be part of the same change for human clarity
+				patchData = newPatchData,
-			patch = PatchSet.assign(PatchSet.newEmpty(), old.patch, patch)
+			}
-			unapplied = PatchSet.assign(PatchSet.newEmpty(), old.unapplied, unapplied)
+		end)
-		end
-
-		self:setState({
-			patchData = {
-				patch = patch,
-				unapplied = unapplied,
-				timestamp = now,
-			},
-		})
 	end)
 
 	serveSession:onStatusChanged(function(status, details)

plugin/src/ServeSession.lua

@@ -349,18 +349,11 @@ function ServeSession:__applyPatch(patch)
 		error(unappliedPatch)
 	end
 
-	if PatchSet.isEmpty(unappliedPatch) then
+	if Settings:get("enableSyncFallback") and not PatchSet.isEmpty(unappliedPatch) then
-		if historyRecording then
+		-- Some changes did not apply, let's try replacing them instead
-			ChangeHistoryService:FinishRecording(historyRecording, Enum.FinishRecordingOperation.Commit)
-		end
-		return
-	end
-
 		local addedIdList = PatchSet.addedIdList(unappliedPatch)
 		local updatedIdList = PatchSet.updatedIdList(unappliedPatch)
 
-	local actualUnappliedPatches = PatchSet.newEmpty()
-	if Settings:get("enableSyncFallback") then
 		Log.debug("ServeSession:__replaceInstances(unappliedPatch.added)")
 		Timer.start("ServeSession:__replaceInstances(unappliedPatch.added)")
 		local addSuccess, unappliedAddedRefs = self:__replaceInstances(addedIdList)
@@ -371,20 +364,18 @@ function ServeSession:__applyPatch(patch)
 		local updateSuccess, unappliedUpdateRefs = self:__replaceInstances(updatedIdList)
 		Timer.stop()
 
+		-- Update the unapplied patch to reflect which Instances were replaced successfully
 		if addSuccess then
 			table.clear(unappliedPatch.added)
-			PatchSet.assign(actualUnappliedPatches, unappliedAddedRefs)
+			PatchSet.assign(unappliedPatch, unappliedAddedRefs)
 		end
 		if updateSuccess then
 			table.clear(unappliedPatch.updated)
-			PatchSet.assign(actualUnappliedPatches, unappliedUpdateRefs)
+			PatchSet.assign(unappliedPatch, unappliedUpdateRefs)
 		end
-	else
-		Log.debug("Skipping ServeSession:__replaceInstances because of setting")
 	end
-	PatchSet.assign(actualUnappliedPatches, unappliedPatch)
 
-	if not PatchSet.isEmpty(actualUnappliedPatches) then
+	if not PatchSet.isEmpty(unappliedPatch) then
 		Log.debug(
 			"Could not apply all changes requested by the Rojo server:\n{}",
 			PatchSet.humanSummary(self.__instanceMap, unappliedPatch)
@@ -396,7 +387,7 @@ function ServeSession:__applyPatch(patch)
 	-- guaranteed to be called after the commit
 	for _, callback in self.__postcommitCallbacks do
 		task.spawn(function()
-			local success, err = pcall(callback, patch, self.__instanceMap, actualUnappliedPatches)
+			local success, err = pcall(callback, patch, self.__instanceMap, unappliedPatch)
 			if not success then
 				Log.warn("Postcommit hook errored: {}", err)
 			end