I posted some ideas on solutions or improvements a while back.
Thinking a bit more, if we are using the fswatcher then we know about the renames, does it make sense that when the watcher identifies a rename ST could scan the renamed file and confirm it’s the same as what’s in the index and if so, transmit a rename instruction? There wluld have to be some verification that everything is in sync and we don’t end up with conflict files being created if there’s some “confusion”. But it would seem like on the surface we should be able to keep stuff in sync if we transmitted what the watcher stated actually happened. Unless the watcher can’t be trusted.