Reapply "Deflake project settings override on desktop (#4370)" (#4450)

This reverts commit b11040c23c.

src/components/SettingsAuthProvider.tsx

@@ -41,6 +41,7 @@ import { reportRejection } from 'lib/trap'
 import { getAppSettingsFilePath } from 'lib/desktop'
 import { isDesktop } from 'lib/isDesktop'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
+import { codeManager } from 'lib/singletons'
 import { createRouteCommands } from 'lib/commandBarConfigs/routeCommandConfig'
 
 type MachineContext<T extends AnyStateMachine> = {
@@ -201,13 +202,13 @@ export const SettingsAuthProviderBase = ({
             console.error('Error executing AST after settings change', e)
           }
         },
-        persistSettings: ({ context, event }) => {
+        async persistSettings({ context, event }) {
           // Without this, when a user changes the file, it'd
           // create a detection loop with the file-system watcher.
           if (event.doNotPersist) return
 
-          // eslint-disable-next-line @typescript-eslint/no-floating-promises
-          saveSettings(context, loadedProject?.project?.path)
+          codeManager.writeCausedByAppCheckedInFileTreeFileSystemWatcher = true
+          return saveSettings(context, loadedProject?.project?.path)
         },
       },
     }),
@@ -221,7 +222,7 @@ export const SettingsAuthProviderBase = ({
   }, [])
 
   useFileSystemWatcher(
-    async () => {
+    async (eventType: string) => {
       // If there is a projectPath but it no longer exists it means
       // it was exterally removed. If we let the code past this condition
       // execute it will recreate the directory due to code in
@@ -235,6 +236,9 @@ export const SettingsAuthProviderBase = ({
         }
       }
 
+      // Only reload if there are changes. Ignore everything else.
+      if (eventType !== 'change') return
+
       const data = await loadAndValidateSettings(loadedProject?.project?.path)
       settingsSend({
         type: 'Set all settings',