Update PR

* Update PR

Author: abraunegg

src/main.d

@@ -1359,8 +1359,8 @@ int main(string[] cliArgs) {
 						}
 
 						// Handle any local filesystem events that occurred while the sync was running.
-						// Remote -> local generated events are drained inside the standard sync path
-						// immediately after online reconciliation, and inside oneDriveOnlineCallback().
+						// Remote-generated and genuine concurrent local events are both processed at
+						// each reconciliation boundary; database/hash checks suppress harmless echoes.
 						processInotifyEvents(true);
 
 						// Detail the outcome of the sync process
@@ -1680,8 +1680,12 @@ void oneDriveOnlineCallback() {
 		}
 	}
 	if (appConfig.getValueBool("monitor")) {
-		// Drain inotify events generated by online -> local reconciliation.
-		processInotifyEvents(false, true);
+		// Process every queued inotify event after online -> local reconciliation.
+		// The database and local filesystem have already been updated by the remote
+		// reconciliation, so self-generated events are naturally filtered by the
+		// existing database/hash checks. Genuine concurrent local events must not be
+		// consumed and discarded here.
+		processInotifyEvents(true);
 	}
 }
 
@@ -1735,8 +1739,10 @@ void performStandardSyncProcess(string localPath, Monitor filesystemMonitor = nu
 		// Download data from OneDrive last
 		syncEngineInstance.syncOneDriveAccountToLocalDisk();
 		if (appConfig.getValueBool("monitor")) {
-			// Cancel out any inotify events from downloading data
-			processInotifyEvents(false, true);
+			// Process all queued inotify events. Events caused by the completed remote
+			// reconciliation are filtered by current database/hash state; concurrent
+			// local activity must remain actionable.
+			processInotifyEvents(true);
 		}
 
 		// At this point, we have done a sync from:
@@ -1754,8 +1760,10 @@ void performStandardSyncProcess(string localPath, Monitor filesystemMonitor = nu
 		// Download data from OneDrive first
 		syncEngineInstance.syncOneDriveAccountToLocalDisk();
 		if (appConfig.getValueBool("monitor")) {
-			// Cancel out any inotify events from downloading data
-			processInotifyEvents(false, true);
+			// Process all queued inotify events. Events caused by the completed remote
+			// reconciliation are filtered by current database/hash state; concurrent
+			// local activity must remain actionable.
+			processInotifyEvents(true);
 		}
 
 		// Perform the local database consistency check, picking up locally modified data and uploading this to OneDrive
@@ -1788,8 +1796,10 @@ void performStandardSyncProcess(string localPath, Monitor filesystemMonitor = nu
 					// If 'appConfig.fullScanTrueUpRequired' is true, we do not use the 'deltaLink' if we are in --monitor mode, thus forcing a full scan true up
 					syncEngineInstance.syncOneDriveAccountToLocalDisk();
 					if (appConfig.getValueBool("monitor")) {
-						// Cancel out any inotify events from downloading data
-						processInotifyEvents(false, true);
+						// Process all queued inotify events after the final online true-up.
+						// Never consume concurrent local changes merely because remote work
+						// also generated filesystem notifications.
+						processInotifyEvents(true);
 					}
 				} else {
 					// exitHandlerTriggered triggered

src/monitor.d

@@ -30,7 +30,7 @@ import clientSideFiltering;
 
 // Relevant inotify events
 version(FreeBSD) {
-	 private immutable uint32_t mask = IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVE;
+	 private immutable uint32_t mask = IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVE | IN_IGNORED | IN_Q_OVERFLOW;
 } else {
 	 private immutable uint32_t mask = IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVE | IN_IGNORED | IN_Q_OVERFLOW;
 }

src/sync.d

@@ -1227,6 +1227,8 @@ class SyncEngine {
 		JSONValue deltaChanges;
 		long responseBundleCount;
 		long jsonItemsReceived = 0;
+		bool preserveEstablishedDeltaLink = false;
+		string establishedDeltaLinkBeforeFullScan = null;
 
 		// Reset jsonItemsToProcess & processedCount
 		jsonItemsToProcess = [];
@@ -1321,8 +1323,25 @@ class SyncEngine {
 
 			// Do we need to perform a Full Scan True Up? Is 'appConfig.fullScanTrueUpRequired' set to 'true'?
 			if (appConfig.fullScanTrueUpRequired) {
+				// A tokenless /delta response is a snapshot of the current live state. It does not
+				// contain the deletion history represented by an established incremental deltaLink.
+				// Preserve that checkpoint so the next incremental pass still receives every change
+				// that occurred before or during this full-scan true-up.
+				establishedDeltaLinkBeforeFullScan = getDeltaLinkFromCache(deltaLinkInfo, driveIdToQuery);
+				if (establishedDeltaLinkBeforeFullScan.empty) {
+					establishedDeltaLinkBeforeFullScan = itemDB.getDeltaLink(driveIdToQuery, itemIdToQuery);
+				}
+				preserveEstablishedDeltaLink = !establishedDeltaLinkBeforeFullScan.empty;
+				
 				addLogEntry("Performing a full scan of online data to ensure consistent local state");
-				if (debugLogging) {addLogEntry("Setting currentDeltaLink = null", ["debug"]);}
+				if (debugLogging) {
+					if (preserveEstablishedDeltaLink) {
+						addLogEntry("Preserving the established incremental deltaLink across this tokenless full scan", ["debug"]);
+					} else {
+						addLogEntry("No established incremental deltaLink exists; the tokenless full-scan checkpoint may be used to initialise delta tracking", ["debug"]);
+					}
+					addLogEntry("Setting currentDeltaLink = null", ["debug"]);
+				}
 				currentDeltaLink = null;
 			} else {
 				// Try and get the current Delta Link from the internal cache, this saves a DB I/O call
@@ -1460,10 +1479,17 @@ class SyncEngine {
 						}
 					}
 
-					// Update deltaLinkCache
-					deltaLinkCache.driveId = driveIdToQuery;
-					deltaLinkCache.itemId = itemIdToQuery;
-					deltaLinkCache.latestDeltaLink = currentDeltaLink;
+					// A scheduled tokenless full scan must not replace an established incremental
+					// checkpoint. The snapshot omits historical deletion tombstones, so advancing to
+					// its checkpoint can permanently skip changes that occurred around the scan.
+					if (preserveEstablishedDeltaLink) {
+						if (debugLogging) {addLogEntry("Not staging the tokenless full-scan deltaLink; the established incremental checkpoint remains authoritative", ["debug"]);}
+					} else {
+						// Update deltaLinkCache
+						deltaLinkCache.driveId = driveIdToQuery;
+						deltaLinkCache.itemId = itemIdToQuery;
+						deltaLinkCache.latestDeltaLink = currentDeltaLink;
+					}
 				}
 
 				// We have a valid deltaChanges JSON array. This means we have at least 200+ JSON items to process.