@@ -1,6 +1,6 @@
 import type { PHP, UniversalPHP } from '@php-wasm/universal';
 import { __private__dont__use } from '@php-wasm/universal';
-import { Semaphore, basename, joinPaths } from '@php-wasm/util';
+import { Semaphore, basename, isParentOf, joinPaths } from '@php-wasm/util';
 import { logger } from '@php-wasm/logger';
 
 export type EmscriptenFS = any;
@@ -108,28 +108,51 @@ export type FilesystemOperation =
 	| DeleteOperation
 	| RenameOperation;
 
+export type FSJournalOptions = {
+	excludePaths?: string[];
+	excludeNames?: string[];
+};
+
 export function journalFSEvents(
 	php: PHP,
 	fsRoot: string,
-	onEntry: (entry: FilesystemOperation) => void = () => {}
+	onEntry: (entry: FilesystemOperation) => void = () => {},
+	{ excludePaths = [], excludeNames = [] }: FSJournalOptions = {}
 ) {
+	const shouldRecord = (path: string) =>
+		isParentOf(fsRoot, path) &&
+		!excludePaths.some((excluded) => isParentOf(excluded, path)) &&
+		(!excludeNames.length || !excludeNames.includes(basename(path)));
+
 	function bindToCurrentRuntime() {
 		fsRoot = normalizePath(fsRoot);
 		const FS = php[__private__dont__use].FS;
 		const FSHooks = createFSHooks(FS, (entry: FilesystemOperation) => {
-			// Only journal entries inside the specified root directory.
-			if (entry.path.startsWith(fsRoot)) {
+			const recordSource = shouldRecord(entry.path);
+			if (entry.operation !== 'RENAME') {
+				if (recordSource) {
+					onEntry(entry);
+				}
+				return;
+			}
+			const recordDestination = shouldRecord(entry.toPath);
+			if (recordSource && recordDestination) {
 				onEntry(entry);
-			} else if (
-				entry.operation === 'RENAME' &&
-				entry.toPath.startsWith(fsRoot)
-			) {
+			} else if (recordSource) {
+				onEntry({
+					operation: 'DELETE',
+					path: entry.path,
+					nodeType: entry.nodeType,
+				});
+			} else if (recordDestination) {
 				for (const op of recordExistingPath(
 					php,
 					entry.path,
 					entry.toPath
 				)) {
-					onEntry(op);
+					if (shouldRecord(op.path)) {
+						onEntry(op);
+					}
 				}
 			}
 		});
 
@@ -4,4 +4,4 @@ export {
 	hydrateUpdateFileOps,
 	normalizeFilesystemOperations,
 } from './fs-journal';
-export type { FilesystemOperation } from './fs-journal';
+export type { FilesystemOperation, FSJournalOptions } from './fs-journal';
@@ -145,8 +145,8 @@ export async function bootPlaygroundRemote() {
 		async cli(argv, options) {
 			return await phpWorkerApi.cli(argv, options);
 		},
-		async journalFSEvents(root: string, callback) {
-			return phpWorkerApi.journalFSEvents(root, callback);
+		async journalFSEvents(root: string, callback, options) {
+			return phpWorkerApi.journalFSEvents(root, callback, options);
 		},
 		async replayFSJournal(events: FilesystemOperation[]) {
 			return phpWorkerApi.replayFSJournal(events);
 
@@ -1,4 +1,7 @@
-import type { FilesystemOperation } from '@php-wasm/fs-journal';
+import type {
+	FilesystemOperation,
+	FSJournalOptions,
+} from '@php-wasm/fs-journal';
 import { journalFSEvents, replayFSJournal } from '@php-wasm/fs-journal';
 import type { EmscriptenDownloadMonitor } from '@php-wasm/progress';
 import { setURLScope } from '@php-wasm/scopes';
@@ -575,9 +578,15 @@ export abstract class PlaygroundWorkerEndpoint extends PHPWorker {
 
 	async journalFSEvents(
 		root: string,
-		callback: (op: FilesystemOperation) => void
+		callback: (op: FilesystemOperation) => void,
+		options?: FSJournalOptions
 	) {
-		return journalFSEvents(this.__internal_getPHP()!, root, callback);
+		return journalFSEvents(
+			this.__internal_getPHP()!,
+			root,
+			callback,
+			options
+		);
 	}
 
 	async replayFSJournal(events: FilesystemOperation[]) {
 
@@ -1,20 +1,23 @@
 import type { FilesystemOperation } from '@php-wasm/fs-journal';
 import type { PlaygroundClient } from '@wp-playground/client';
+import { joinPaths } from '@php-wasm/util';
 
 export async function journalFSOperations(
 	playground: PlaygroundClient,
 	onEntry: (op: FilesystemOperation) => void
 ) {
-	await playground.journalFSEvents(
-		'/wordpress/wp-content',
-		async (entry: FilesystemOperation) => {
-			if (
-				entry.path.endsWith('/.ht.sqlite') ||
-				entry.path.endsWith('/.ht.sqlite-journal')
-			) {
-				return;
-			}
-			onEntry(entry);
-		}
+	const wpContentPath = joinPaths(
+		await playground.documentRoot,
+		'wp-content'
 	);
+	// SQL is synchronized separately. Storage paths and locks belong to each site.
+	await playground.journalFSEvents(wpContentPath, onEntry, {
+		excludePaths: [joinPaths(wpContentPath, 'database')],
+		excludeNames: [
+			'.ht.sqlite',
+			'.ht.sqlite-journal',
+			'.ht.sqlite-wal',
+			'.ht.sqlite-shm',
+		],
+	});
 }
@@ -42,7 +42,7 @@ export async function setupPlaygroundSync(
 	journalSQLQueries(playground, (query: SQLJournalEntry) => {
 		localChanges.sql.push(query);
 	});
-	journalFSOperations(playground, (op: FilesystemOperation) => {
+	await journalFSOperations(playground, (op: FilesystemOperation) => {
 		localChanges.fs.push(op);
 	});