A computer-implemented method performed by a client synchronization service running on a client device for converging a server state of content items stored on a server of a content management system and a file system state of corresponding content items in a local file system of the client device, the computer-implemented method comprising: detecting, by a file system interface, a change at the local file system of the client device that is not reflected in a local tree that represents a last known state of the local file system, wherein the client synchronization service communicates with the file system interface and the file system interface updates the local tree based on the change; generating a first file event associated with a content item based on the detected change at the local file system of the client device; adding the first file event to a set of observed file events; determining that the first file event in the set of observed file events violates one or more local tree constraints in a set of local tree constraints; performing a remediation associated with the one or more violated local tree constraints, wherein the remediation is at least one executable action configured to satisfy the one or more violated local tree constraints for the first file event; after performing the remediation associated with the one or more violated local tree constraint until no more violations of the local tree constraints exist, updating the local tree based on the set of observed file events; determining that the server state at the content management system and the last known state of the local file system are out of sync, wherein the determining is based on a difference between the local tree and a sync tree representing a known synced state between the server state and the last known state of the local file system; generating, based on the difference, a set of operations for the content items stored on the server of the content management system, wherein the set of operations is configured to operate on the content items stored on the server of the content management system to converge the server state and the last known state of the local file system; and executing the set of operations to converge the server state and the file system state. detecting, by a file system interface, a change at the local file system of the client device that is not reflected in a local tree that represents a last known state of the local file system, wherein the client synchronization service communicates with the file system interface and the file system interface updates the local tree based on the change; generating a first file event associated with a content item based on the detected change at the local file system of the client device; adding the first file event to a set of observed file events; determining that the first file event in the set of observed file events violates one or more local tree constraints in a set of local tree constraints; performing a remediation associated with the one or more violated local tree constraints, wherein the remediation is at least one executable action configured to satisfy the one or more violated local tree constraints for the first file event; after performing the remediation associated with the one or more violated local tree constraint until no more violations of the local tree constraints exist, updating the local tree based on the set of observed file events; determining that the server state at the content management system and the last known state of the local file system are out of sync, wherein the determining is based on a difference between the local tree and a sync tree representing a known synced state between the server state and the last known state of the local file system; generating, based on the difference, a set of operations for the content items stored on the server of the content management system, wherein the set of operations is configured to operate on the content items stored on the server of the content management system to converge the server state and the last known state of the local file system; and executing the set of operations to converge the server state and the file system state.