diff --git a/src/EventStore.Core.XUnit.Tests/Services/Storage/Indexing/IndexCheckpointWriterTests.cs b/src/EventStore.Core.XUnit.Tests/Services/Storage/Indexing/IndexCheckpointWriterTests.cs
new file mode 100644
index 000000000..68cc70330
--- /dev/null
+++ b/src/EventStore.Core.XUnit.Tests/Services/Storage/Indexing/IndexCheckpointWriterTests.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Core.Data;
+using EventStore.Core.Services.Storage.Indexing;
+using EventStore.Core.TransactionLog.LogRecords;
+using Xunit;
+
+namespace EventStore.Core.XUnit.Tests.Services.Storage.Indexing;
+
+public class IndexCheckpointWriterTests
+{
+	[Fact]
+	public async Task read_delegates_to_store()
+	{
+		var expected = new IndexCheckpoint(10, 5);
+		var store = new FakeIndexCheckpointStore { Checkpoint = expected };
+		var writer = new IndexCheckpointWriter(store);
+
+		var checkpoint = await writer.Read(CancellationToken.None);
+
+		Assert.Equal(expected, checkpoint);
+		Assert.Equal(1, store.ReadCalls);
+	}
+
+	[Fact]
+	public async Task commit_before_tracking_is_no_op()
+	{
+		var store = new FakeIndexCheckpointStore();
+		var writer = new IndexCheckpointWriter(store);
+
+		await writer.Commit(CancellationToken.None);
+
+		Assert.Equal(0, store.WriteCalls);
+		Assert.Null(await store.Read(CancellationToken.None));
+	}
+
+	[Fact]
+	public async Task tracking_then_commit_writes_commit_and_prepare_positions()
+	{
+		var store = new InMemoryIndexCheckpointStore();
+		var writer = new IndexCheckpointWriter(store);
+
+		writer.Track(CreateResolvedEvent(commitPosition: 20, preparePosition: 15));
+		await writer.Commit(CancellationToken.None);
+
+		var checkpoint = await store.Read(CancellationToken.None);
+
+		Assert.Equal(new IndexCheckpoint(20, 15), checkpoint);
+	}
+
+	[Fact]
+	public async Task later_tracked_positions_win()
+	{
+		var store = new InMemoryIndexCheckpointStore();
+		var writer = new IndexCheckpointWriter(store);
+
+		writer.Track(CreateResolvedEvent(commitPosition: 10, preparePosition: 5));
+		writer.Track(CreateResolvedEvent(commitPosition: 20, preparePosition: 15));
+		await writer.Commit(CancellationToken.None);
+
+		var checkpoint = await store.Read(CancellationToken.None);
+
+		Assert.Equal(new IndexCheckpoint(20, 15), checkpoint);
+	}
+
+	[Fact]
+	public void track_without_original_position_throws()
+	{
+		var writer = new IndexCheckpointWriter(new InMemoryIndexCheckpointStore());
+		var resolvedEvent = CreateResolvedEvent(
+			commitPosition: 10,
+			preparePosition: 5,
+			isSelfCommitted: false).WithoutPosition();
+
+		var exception = Assert.Throws<InvalidOperationException>(() => writer.Track(resolvedEvent));
+
+		Assert.Contains("original position", exception.Message, StringComparison.OrdinalIgnoreCase);
+	}
+
+	[Fact]
+	public void constructor_rejects_null_store()
+	{
+		var exception = Assert.Throws<ArgumentNullException>(() => new IndexCheckpointWriter(null));
+
+		Assert.Equal("store", exception.ParamName);
+	}
+
+	[Fact]
+	public async Task read_passes_cancellation_token_to_store()
+	{
+		using var cancellation = new CancellationTokenSource();
+		await cancellation.CancelAsync();
+		var store = new FakeIndexCheckpointStore { CancelRead = true };
+		var writer = new IndexCheckpointWriter(store);
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => writer.Read(cancellation.Token).AsTask());
+
+		Assert.Equal(cancellation.Token, store.LastReadToken);
+	}
+
+	[Fact]
+	public async Task commit_passes_cancellation_token_to_store()
+	{
+		using var cancellation = new CancellationTokenSource();
+		await cancellation.CancelAsync();
+		var store = new FakeIndexCheckpointStore { CancelWrite = true };
+		var writer = new IndexCheckpointWriter(store);
+
+		writer.Track(CreateResolvedEvent(commitPosition: 10, preparePosition: 5));
+
+		await Assert.ThrowsAsync<OperationCanceledException>(() => writer.Commit(cancellation.Token).AsTask());
+
+		Assert.Equal(cancellation.Token, store.LastWriteToken);
+	}
+
+	private static ResolvedEvent CreateResolvedEvent(long commitPosition, long preparePosition, bool isSelfCommitted = true)
+	{
+		var flags = PrepareFlags.SingleWrite | PrepareFlags.Data;
+		if (isSelfCommitted)
+		{
+			flags |= PrepareFlags.IsCommitted;
+		}
+
+		var record = new EventRecord(
+			eventNumber: 0,
+			logPosition: preparePosition,
+			correlationId: Guid.NewGuid(),
+			eventId: Guid.NewGuid(),
+			transactionPosition: commitPosition,
+			transactionOffset: 0,
+			eventStreamId: "stream-1",
+			expectedVersion: -1,
+			timeStamp: DateTime.UtcNow,
+			flags: flags,
+			eventType: "event-type",
+			data: Array.Empty<byte>(),
+			metadata: Array.Empty<byte>());
+
+		return ResolvedEvent.ForUnresolvedEvent(record, commitPosition);
+	}
+
+	private sealed class FakeIndexCheckpointStore : IIndexCheckpointStore
+	{
+		public IndexCheckpoint? Checkpoint { get; set; }
+		public bool CancelRead { get; init; }
+		public bool CancelWrite { get; init; }
+		public int ReadCalls { get; private set; }
+		public int WriteCalls { get; private set; }
+		public CancellationToken LastReadToken { get; private set; }
+		public CancellationToken LastWriteToken { get; private set; }
+
+		public ValueTask<IndexCheckpoint?> Read(CancellationToken token)
+		{
+			ReadCalls++;
+			LastReadToken = token;
+
+			if (CancelRead)
+			{
+				token.ThrowIfCancellationRequested();
+			}
+
+			return ValueTask.FromResult(Checkpoint);
+		}
+
+		public ValueTask Write(IndexCheckpoint checkpoint, CancellationToken token)
+		{
+			WriteCalls++;
+			LastWriteToken = token;
+			Checkpoint = checkpoint;
+
+			if (CancelWrite)
+			{
+				token.ThrowIfCancellationRequested();
+			}
+
+			return ValueTask.CompletedTask;
+		}
+	}
+}
diff --git a/src/EventStore.Core/Services/Storage/Indexing/IndexCheckpointWriter.cs b/src/EventStore.Core/Services/Storage/Indexing/IndexCheckpointWriter.cs
new file mode 100644
index 000000000..d48b5fcb6
--- /dev/null
+++ b/src/EventStore.Core/Services/Storage/Indexing/IndexCheckpointWriter.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using EventStore.Core.Data;
+
+namespace EventStore.Core.Services.Storage.Indexing;
+
+public sealed class IndexCheckpointWriter
+{
+	private readonly IIndexCheckpointStore _store;
+	private readonly object _lock = new();
+	private IndexCheckpoint? _pendingCheckpoint;
+
+	public IndexCheckpointWriter(IIndexCheckpointStore store)
+	{
+		_store = store ?? throw new ArgumentNullException(nameof(store));
+	}
+
+	public ValueTask<IndexCheckpoint?> Read(CancellationToken token) => _store.Read(token);
+
+	public void Track(ResolvedEvent resolvedEvent)
+	{
+		if (!resolvedEvent.OriginalPosition.HasValue)
+		{
+			throw new InvalidOperationException(
+				"Cannot track index checkpoint progress for an event without an original position.");
+		}
+
+		var position = resolvedEvent.OriginalPosition.Value;
+		var checkpoint = new IndexCheckpoint(position.CommitPosition, position.PreparePosition);
+
+		lock (_lock)
+		{
+			_pendingCheckpoint = checkpoint;
+		}
+	}
+
+	public async ValueTask Commit(CancellationToken token)
+	{
+		IndexCheckpoint checkpoint;
+
+		lock (_lock)
+		{
+			if (_pendingCheckpoint is not { } pending)
+			{
+				return;
+			}
+
+			checkpoint = pending;
+		}
+
+		await _store.Write(checkpoint, token);
+
+		lock (_lock)
+		{
+			if (_pendingCheckpoint == checkpoint)
+			{
+				_pendingCheckpoint = null;
+			}
+		}
+	}
+}