test(cache): remove conflict timing assumptions

Co-Authored-By: GPT-5 Codex <noreply@openai.com>

Author: kriszyp

resources/Table.ts

@@ -5650,6 +5650,18 @@ export function makeTable(options) {
 		const metadataFlags = existingEntry?.metadataFlags;
 
 		const existingVersion = existingEntry?.version;
+		const existingRecord = existingEntry?.value;
+		const inheritedTimestamp = context?.timestamp || context?.transaction?.timestamp;
+		const monotonicTimestamp = () =>
+			isRocksDB ? (primaryStore as RocksDatabase).getMonotonicTimestamp() : getNextMonotonicTime();
+		const nextExistingVersion =
+			existingVersion == null
+				? 0
+				: existingVersion + Math.max(Math.abs(existingVersion) * Number.EPSILON, Number.MIN_VALUE);
+		const sourceTimestamp =
+			inheritedTimestamp && (existingVersion == null || inheritedTimestamp > existingVersion)
+				? inheritedTimestamp
+				: Math.max(monotonicTimestamp(), nextExistingVersion);
 		let whenResolved, timer;
 		// We start by locking the record so that there is only one resolution happening at once;
 		// if there is already a resolution in process, we want to use the results of that resolution
@@ -5688,17 +5700,9 @@ export function makeTable(options) {
 		// lock acquired — this request will actually load from source
 		setLoadedFromSource(target, true);
 
-		const existingRecord = existingEntry?.value;
-		const inheritedTimestamp = context?.timestamp || context?.transaction?.timestamp;
-		const monotonicTimestamp = () =>
-			isRocksDB ? (primaryStore as RocksDatabase).getMonotonicTimestamp() : getNextMonotonicTime();
-		const sourceTimestamp =
-			inheritedTimestamp && (existingVersion == null || inheritedTimestamp > existingVersion)
-				? inheritedTimestamp
-				: Math.max(monotonicTimestamp(), existingVersion == null ? 0 : existingVersion + 0.000488);
 		// it is important to remember that this is _NOT_ part of the current transaction; nothing is changing
-		// with the canonical data, we are simply fulfilling our local copy of the canonical data, but still don't
-		// want a timestamp later than the current transaction
+		// with the canonical data, we are simply fulfilling our local copy of the canonical data. We preserve the
+		// request timestamp unless advancing it is required to replace an existing version.
 		// we create a new context for the source, we want to determine the timestamp and don't want to
 		// attribute this to the current user
 		const sourceContext = {

unitTests/resources/caching.test.js

@@ -505,7 +505,7 @@ describe('Caching', () => {
 		await waitFor(() => conflictSourceRequest?.id === id);
 		const sourceTimestamp = conflictSourceRequest.timestamp;
 		assert.equal(typeof sourceTimestamp, 'number');
-		await ConflictCachingTable.put(id, { id, name: 'authoritative' });
+		await ConflictCachingTable.put(id, { id, name: 'authoritative' }, { timestamp: sourceTimestamp + 1 });
 		await waitFor(() => ConflictCachingTable.primaryStore.getSync(id)?.name === 'authoritative');
 		const authoritativeVersion = ConflictCachingTable.primaryStore.getEntry(id).version;
 		conflictSourceRequest.respond({ id, name: 'source' });
@@ -523,15 +523,16 @@ describe('Caching', () => {
 		const existingVersion = ConflictCachingTable.primaryStore.getEntry(id).version;
 		await ConflictCachingTable.invalidate(id);
 		await waitFor(() => ConflictCachingTable.primaryStore.getEntry(id)?.metadataFlags);
+		const invalidatedVersion = ConflictCachingTable.primaryStore.getEntry(id).version;
 		conflictSourceRequest = null;
 		const fill = ConflictCachingTable.get(id, { timestamp: existingVersion - 1000 });
 		await waitFor(() => conflictSourceRequest?.id === id);
-		assert(conflictSourceRequest.timestamp > existingVersion);
+		assert(conflictSourceRequest.timestamp > invalidatedVersion);
 		conflictSourceRequest.respond({ id, name: 'refreshed' });
 		assert.equal((await fill).name, 'refreshed');
 		await waitFor(() => !ConflictCachingTable.primaryStore.hasLock(id));
 		assert.equal(ConflictCachingTable.primaryStore.getSync(id).name, 'refreshed');
-		assert(ConflictCachingTable.primaryStore.getEntry(id).version > existingVersion);
+		assert(ConflictCachingTable.primaryStore.getEntry(id).version > invalidatedVersion);
 	});
 
 	it('first source fill replaces an older raced record and its index entries', async function () {
@@ -541,7 +542,7 @@ describe('Caching', () => {
 		await waitFor(() => conflictSourceRequest?.id === id);
 		const sourceTimestamp = conflictSourceRequest.timestamp;
 		const createdAt = new Date(sourceTimestamp - 0.0001);
-		await ConflictCachingTable.put(id, { id, name: 'older', createdAt });
+		await ConflictCachingTable.put(id, { id, name: 'older', createdAt }, { timestamp: sourceTimestamp - 1 });
 		await waitFor(() => ConflictCachingTable.primaryStore.getSync(id)?.name === 'older');
 		const racedEntry = ConflictCachingTable.primaryStore.getEntry(id);
 		assert(racedEntry.version < sourceTimestamp);
@@ -574,7 +575,7 @@ describe('Caching', () => {
 		const fill = ConflictCachingTable.get(id, { timestamp: nextConflictTimestamp() });
 		await waitFor(() => conflictSourceRequest?.id === id);
 		const sourceTimestamp = conflictSourceRequest.timestamp;
-		await ConflictCachingTable.put(id, { id, name: 'raced' });
+		await ConflictCachingTable.put(id, { id, name: 'raced' }, { timestamp: sourceTimestamp - 1 });
 		await waitFor(() => ConflictCachingTable.primaryStore.getSync(id)?.name === 'raced');
 		assert(ConflictCachingTable.primaryStore.getEntry(id).version < sourceTimestamp);
 		const racedVersion = ConflictCachingTable.primaryStore.getEntry(id).version;
@@ -591,7 +592,7 @@ describe('Caching', () => {
 		const fill = ConflictCachingTable.get(id, { timestamp: nextConflictTimestamp() });
 		await waitFor(() => conflictSourceRequest?.id === id);
 		const sourceTimestamp = conflictSourceRequest.timestamp;
-		await ConflictCachingTable.put(id, { id, name: 'older-delete' });
+		await ConflictCachingTable.put(id, { id, name: 'older-delete' }, { timestamp: sourceTimestamp - 1 });
 		await waitFor(() => ConflictCachingTable.primaryStore.getSync(id)?.name === 'older-delete');
 		assert(ConflictCachingTable.primaryStore.getEntry(id).version < sourceTimestamp);
 		const racedVersion = ConflictCachingTable.primaryStore.getEntry(id).version;