From 0a0046c2f31020adb667702b014c6e686c49538f Mon Sep 17 00:00:00 2001
From: johndoe6345789 <john.doe6345789@gmail.com>
Date: Sun, 18 Jan 2026 18:18:58 +0000
Subject: [PATCH] Fix persistence queue flush ordering

---
 src/store/middleware/persistenceMiddleware.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/store/middleware/persistenceMiddleware.ts b/src/store/middleware/persistenceMiddleware.ts
index 7d20c2e..355ebca 100644
--- a/src/store/middleware/persistenceMiddleware.ts
+++ b/src/store/middleware/persistenceMiddleware.ts
@@ -41,6 +41,7 @@ type PendingOperation = {
 class PersistenceQueue {
   private queue: Map<string, PendingOperation> = new Map()
   private processing = false
+  private pendingFlush = false
   private debounceTimers: Map<string, ReturnType<typeof setTimeout>> = new Map()
 
   enqueue(operation: PendingOperation, debounceMs: number) {
@@ -62,7 +63,12 @@ class PersistenceQueue {
   }
 
   async processQueue() {
-    if (this.processing || this.queue.size === 0) return
+    if (this.processing) {
+      this.pendingFlush = true
+      return
+    }
+
+    if (this.queue.size === 0) return
 
     this.processing = true
 
@@ -97,6 +103,11 @@ class PersistenceQueue {
       }
     } finally {
       this.processing = false
+      const needsFlush = this.pendingFlush || this.queue.size > 0
+      this.pendingFlush = false
+      if (needsFlush) {
+        await this.processQueue()
+      }
     }
   }