Fix keyset pagination with monotonic UUIDv7-like task IDs#1215

Merged

stephentoub merged 24 commits intomainfrom

copilot/fix-keyset-pagination-issue

Jan 30, 2026

Commits on Jan 30, 2026

Initial plan
Copilot
committed
Fix sporadic test failure by using monotonically increasing task IDs

Copilot
and
eiriktsarpalis
committed
Fix keyset pagination by sorting before applying cursor filter

Copilot
and
eiriktsarpalis
committed
Refactor keyset pagination code styling per review feedback

Copilot
and
eiriktsarpalis
committed
Add TimeProvider support and test for identical timestamp handling

Copilot
and
eiriktsarpalis
committed
Revert TimeProvider NuGet dependency, use conditional compilation for test-only TimeProvider support

Copilot
and
eiriktsarpalis
committed
Add comment explaining CS0436 suppression for linked InMemoryMcpTaskStore

Copilot
and
eiriktsarpalis
committed
Use conditional namespace to avoid CS0436 type conflicts

Copilot
and
eiriktsarpalis
committed
Use monotonic UUID v7 for task IDs with polyfill for older targets

Copilot
and
eiriktsarpalis
committed
Move UUID v7 polyfill to Common/Polyfills/System/GuidPolyfills.cs

Copilot
and
eiriktsarpalis
committed
Revert ListTasksAsync changes, use monotonic GUID with TimeProvider support, add new test

Copilot
and
eiriktsarpalis
committed
Move UUID v7 generation logic back to GuidPolyfills class

Copilot
and
eiriktsarpalis
committed
Simplify pagination cursor to use only TaskId since UUID v7 is monotonically increasing

Copilot
and
eiriktsarpalis
committed
Rename polyfill to CreateVersion7(DateTimeOffset) to match .NET 9 API

Copilot
and
stephentoub
committed
Revert to CreateMonotonicUuid name and document why CreateVersion7 can't be used

Copilot
and
stephentoub
committed
Refactor GuidPolyfills to GuidHelpers with simplified monotonic counter

Copilot
and
stephentoub
committed
Simplify GUID creation using unsafe pointer manipulation

Copilot
and
stephentoub
committed
Fix test project duplicate compile for GuidHelpers.cs on net472

Copilot
and
stephentoub
committed
Scope unsafe block to only the pointer manipulation lines

Copilot
and
stephentoub
committed
Clarify comment that this is UUIDv7-like format, not RFC-compliant

Copilot
and
eiriktsarpalis
committed
Move AllowUnsafeBlocks to specific project csproj files

Copilot
and
eiriktsarpalis
committed
Use two longs (ticks + counter) for monotonic ID generation instead of UUIDv7-like format

Copilot
and
eiriktsarpalis
committed
Rename GuidHelpers to IdHelpers since it no longer generates GUIDs

Copilot
and
stephentoub
committed
Update src/ModelContextProtocol.Core/ModelContextProtocol.Core.csproj
stephentoub
authored

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix keyset pagination with monotonic UUIDv7-like task IDs#1215

Fix keyset pagination with monotonic UUIDv7-like task IDs#1215
stephentoub merged 24 commits intomainfrom
copilot/fix-keyset-pagination-issue

Commits on Jan 30, 2026

Initial plan

Fix sporadic test failure by using monotonically increasing task IDs

Fix keyset pagination by sorting before applying cursor filter

Refactor keyset pagination code styling per review feedback

Add TimeProvider support and test for identical timestamp handling

Revert TimeProvider NuGet dependency, use conditional compilation for test-only TimeProvider support

Add comment explaining CS0436 suppression for linked InMemoryMcpTaskStore

Use conditional namespace to avoid CS0436 type conflicts

Use monotonic UUID v7 for task IDs with polyfill for older targets

Move UUID v7 polyfill to Common/Polyfills/System/GuidPolyfills.cs

Revert ListTasksAsync changes, use monotonic GUID with TimeProvider support, add new test

Move UUID v7 generation logic back to GuidPolyfills class

Simplify pagination cursor to use only TaskId since UUID v7 is monotonically increasing

Rename polyfill to CreateVersion7(DateTimeOffset) to match .NET 9 API

Revert to CreateMonotonicUuid name and document why CreateVersion7 can't be used

Refactor GuidPolyfills to GuidHelpers with simplified monotonic counter

Simplify GUID creation using unsafe pointer manipulation

Fix test project duplicate compile for GuidHelpers.cs on net472

Scope unsafe block to only the pointer manipulation lines

Clarify comment that this is UUIDv7-like format, not RFC-compliant

Move AllowUnsafeBlocks to specific project csproj files

Use two longs (ticks + counter) for monotonic ID generation instead of UUIDv7-like format

Rename GuidHelpers to IdHelpers since it no longer generates GUIDs

Update src/ModelContextProtocol.Core/ModelContextProtocol.Core.csproj