Non-limiting examples of the present disclosure describe file repair of a file stored across multiple data stores. An inconsistency associated with a file stored across two or more data stores on a client device is identified. A repair action is determined from a plurality of different repair actions based on attributes associated with the inconsistency identified. A repair queue entry is created in a persisted repair queue, the repair queue entry used for execution of the repair action. The repair action is executed as scheduled within the persisted repair queue when pre-requisite checks are satisfied and a persisted repair history for execution of repair actions indicates that no conflicting repair action exists. The persisted repair history and the persisted repair queue are updated based on the execution of the repair action. Other examples are also described.