@learncard/lca-api-service 1.4.0 → 1.5.1

package/test/models/authSubjectIndexes.spec.ts

@@ -0,0 +1,132 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const collection = vi.hoisted(() => ({
+    indexes: vi.fn(),
+    dropIndex: vi.fn(async () => undefined),
+    createIndex: vi.fn(async () => 'index'),
+    findOneAndUpdate: vi.fn(),
+}));
+
+vi.mock('@mongo', () => ({ default: { collection: () => collection } }));
+
+const createAuthSubjectIndexes = async (): Promise<void> => {
+    const model = await import('../../src/models/AuthSubject');
+    await model.createAuthSubjectIndexes();
+};
+
+beforeEach(() => {
+    vi.resetModules();
+    collection.indexes.mockReset().mockResolvedValue([{ name: '_id_', key: { _id: 1 } }]);
+    collection.dropIndex.mockReset().mockResolvedValue(undefined);
+    collection.createIndex.mockReset().mockResolvedValue('index');
+    collection.findOneAndUpdate.mockReset().mockResolvedValue({ subject: 'subject' });
+    vi.spyOn(console, 'error').mockImplementation(() => undefined);
+});
+afterEach(() => vi.restoreAllMocks());
+
+describe('createAuthSubjectIndexes', () => {
+    it('indexes subject without uniqueness so linked sign-in methods can share it', async () => {
+        await createAuthSubjectIndexes();
+
+        expect(collection.createIndex).toHaveBeenCalledWith({ subject: 1 });
+        expect(collection.createIndex).not.toHaveBeenCalledWith(
+            { subject: 1 },
+            expect.objectContaining({ unique: true })
+        );
+    });
+
+    it('keeps identityKey unique', async () => {
+        await createAuthSubjectIndexes();
+
+        expect(collection.createIndex).toHaveBeenCalledWith({ identityKey: 1 }, { unique: true });
+    });
+
+    it('drops a pre-existing unique subject index before recreating it', async () => {
+        collection.indexes.mockResolvedValue([
+            { name: '_id_', key: { _id: 1 } },
+            { name: 'subject_1', key: { subject: 1 }, unique: true },
+        ]);
+
+        await createAuthSubjectIndexes();
+
+        expect(collection.dropIndex).toHaveBeenCalledWith('subject_1');
+        expect(collection.dropIndex.mock.invocationCallOrder[0]).toBeLessThan(
+            collection.createIndex.mock.invocationCallOrder[0] ?? Infinity
+        );
+    });
+
+    it('leaves a non-unique subject index alone', async () => {
+        collection.indexes.mockResolvedValue([{ name: 'subject_1', key: { subject: 1 } }]);
+
+        await createAuthSubjectIndexes();
+
+        expect(collection.dropIndex).not.toHaveBeenCalled();
+    });
+
+    it('treats a missing collection as having no indexes', async () => {
+        collection.indexes.mockRejectedValue(Object.assign(new Error('ns'), { code: 26 }));
+
+        await createAuthSubjectIndexes();
+
+        expect(collection.createIndex).toHaveBeenCalledTimes(2);
+    });
+
+    it('tolerates the legacy index disappearing concurrently', async () => {
+        collection.indexes.mockResolvedValue([
+            { name: 'subject_1', key: { subject: 1 }, unique: true },
+        ]);
+        collection.dropIndex.mockRejectedValueOnce(Object.assign(new Error('gone'), { code: 27 }));
+
+        await expect(createAuthSubjectIndexes()).resolves.toBeUndefined();
+    });
+});
+
+describe('AuthSubject index readiness', () => {
+    it.each(['subject', 'identityKey'])(
+        'rejects all waiters when %s indexing fails, then retries',
+        async failedIndex => {
+            const { createIndex, findOneAndUpdate } = collection;
+            const { ensureAuthSubjectIndexes, getOrCreateAuthSubject } =
+                await import('../../src/models/AuthSubject');
+            const failure = new Error('index unavailable');
+            let rejectIndex!: (error: Error) => void;
+            const pendingIndex = new Promise<string>((_resolve, reject) => {
+                rejectIndex = reject;
+            });
+            if (failedIndex === 'identityKey') createIndex.mockResolvedValueOnce('subject');
+            createIndex.mockImplementationOnce(() => pendingIndex);
+
+            const ready = ensureAuthSubjectIndexes();
+            expect(ensureAuthSubjectIndexes()).toBe(ready);
+            const waiters = Promise.allSettled([
+                ready,
+                getOrCreateAuthSubject('email:test@example.com', { emailVerified: true }),
+                getOrCreateAuthSubject('email:test@example.com', { emailVerified: true }),
+            ]);
+            rejectIndex(failure);
+            expect(await waiters).toEqual(
+                Array.from({ length: 3 }, () => ({ status: 'rejected', reason: failure }))
+            );
+            expect(findOneAndUpdate).not.toHaveBeenCalled();
+
+            createIndex.mockClear();
+            const completed: string[] = [];
+            createIndex.mockImplementation(async (key: Record<string, number>) => {
+                completed.push(Object.keys(key)[0]!);
+                return 'index';
+            });
+            findOneAndUpdate.mockImplementation(async () => {
+                expect(completed).toEqual(['subject', 'identityKey']);
+                return { subject: 'subject' };
+            });
+            await getOrCreateAuthSubject('email:test@example.com', { emailVerified: true });
+            expect(createIndex.mock.calls).toEqual([
+                [{ subject: 1 }],
+                [{ identityKey: 1 }, { unique: true }],
+            ]);
+            expect(findOneAndUpdate).toHaveBeenCalledOnce();
+            await ensureAuthSubjectIndexes();
+            expect(createIndex).toHaveBeenCalledTimes(2);
+        }
+    );
+});

package/test/models/escrow.spec.ts

@@ -1,6 +1,10 @@
+import { randomUUID } from 'crypto';
 import { beforeAll, afterAll, beforeEach, describe, it, expect } from 'vitest';
 import { client } from '@mongo';
+import { EscrowEnvelopeValidator } from '@models';
+import vectors from '../../../../../packages/sss-key-manager/src/__fixtures__/escrow-vectors.json';
 import {
+    type EscrowHold,
     createUserKeysIndexes,
     getUserKeysCollection,
     upsertUserKeyByAuthProvider,
@@ -13,32 +17,34 @@ import {
     getEscrowHoldsCollection,
     createEscrowHold,
     cancelEscrowHold,
+    cancelEscrowHoldByCancelToken,
     completeEscrowHold,
     expireStaleEscrowHolds,
     ESCROW_HOLD_STALE_WINDOW_MS,
     generateEscrowResumeToken,
     hashEscrowResumeToken,
     findPendingEscrowHoldByAuthProvider,
+    findEscrowHoldById,
+    findEscrowHoldsDueForReminder,
+    claimEscrowHoldForReminder,
+    recordEscrowHoldNotification,
+    rotateEscrowCancelToken,
     reserveEscrowPinAttempt,
     refundEscrowPinAttempt,
+    rewrapEscrowBlobByAuthProvider,
+    findUserKeysWithEscrowBlobKeyId,
     type EscrowBlob,
     type AuthProviderMapping,
 } from '@models';
 
 const provider: AuthProviderMapping = { type: 'firebase', id: 'escrow-model-test' };
-const blob: EscrowBlob = {
-    envelope: {
-        version: 1,
-        algorithm: 'P-256-HKDF-SHA256-AES-256-GCM',
-        keyId: 'test',
-        ephemeralPublicKey: 'key',
-        salt: 'salt',
-        iv: 'iv',
-        ciphertext: '$literal-data',
-    },
-    enclaveKeyId: 'test',
+const firstVector = vectors.blobs[0];
+if (!firstVector) throw new Error('escrow-vectors.json has no blobs');
+const blob: Omit<EscrowBlob, 'enrollmentEpoch' | 'blobHash'> = {
+    envelope: EscrowEnvelopeValidator.parse(firstVector.envelope),
+    enclaveKeyId: firstVector.envelope.keyId,
     enclaveMode: 'software',
-    measurements: {},
+    measurements: { pcr0: '$literal-data' },
     shareVersion: 1,
     createdAt: new Date(),
 };
@@ -47,6 +53,23 @@ const createHold = (
     releasePolicy: 'hold' | 'pin' = 'hold'
 ): ReturnType<typeof createEscrowHold> =>
     createEscrowHold({
+        holdRecord: {
+            hold: {
+                holdId: randomUUID(),
+                did: 'did:key:test',
+                shareVersion: 1,
+                blobHash: 'ab'.repeat(32),
+                enrollmentEpoch: 1,
+                releasePolicy: 'hold',
+                clientEphemeralPublicKey: 'public-key',
+                createdLo: 0,
+                createdHi: 0,
+                policyVersion: 1,
+                signature: 'test-signature',
+            },
+            holdDurationMs: 0,
+            ledgerSeq: 0,
+        },
         authProvider: provider,
         primaryDid: 'did:key:test',
         shareVersion: 1,
@@ -135,6 +158,62 @@ describe('escrow model invariants', () => {
             (await findUserKeyByAuthProvider(provider.type, provider.id))?.escrowPin?.failedAttempts
         ).toBe(1);
     });
+    it('validates required opaque hold records before insert', async () => {
+        const valid = await createHold();
+        expect(valid._id).toBe(valid.holdRecord.hold.holdId);
+        await cancelEscrowHold(valid._id, 'did');
+        const input = {
+            ...valid,
+            holdRecord: {
+                ...valid.holdRecord,
+                hold: { ...valid.holdRecord.hold, holdId: randomUUID(), signedExtension: 'keep' },
+                signedExtension: 'keep',
+            },
+        };
+        const opaque = await createEscrowHold(input);
+        expect(opaque.holdRecord).toEqual(input.holdRecord);
+        await cancelEscrowHold(opaque._id, 'did');
+        for (const holdRecord of [
+            undefined,
+            {},
+            { ...valid.holdRecord, ledgerSeq: 'invalid' },
+            { ...valid.holdRecord, hold: { ...valid.holdRecord.hold, enrollmentEpoch: 0 } },
+        ]) {
+            // Simulate untyped/legacy input at the runtime schema boundary.
+            await expect(
+                createEscrowHold({ ...input, holdRecord } as unknown as Parameters<
+                    typeof createEscrowHold
+                >[0])
+            ).rejects.toThrow('Invalid escrow hold');
+        }
+    });
+    it('computes the Rust-order fixed blob hash and increments epochs atomically', async () => {
+        const first = await setEscrowBlobByAuthProvider(provider, blob, 1);
+        expect(first?.escrowBlob?.enrollmentEpoch).toBe(1);
+        expect(first?.escrowBlob?.blobHash).toBe(
+            '8090217ef11060bfa380c4a4b26d76a64811216176ecb60749652fabf3b09425'
+        );
+        const results = await Promise.all([
+            setEscrowBlobByAuthProvider(provider, blob, 1),
+            setEscrowBlobByAuthProvider(provider, blob, 1),
+        ]);
+        expect(results.map(result => result?.escrowBlob?.enrollmentEpoch).sort()).toEqual([2, 3]);
+        expect(results[0]?.escrowBlob?.measurements.pcr0).toBe('$literal-data');
+        await expect(
+            setEscrowBlobByAuthProvider(
+                provider,
+                { ...blob, envelope: { ...blob.envelope, ciphertext: '' } },
+                1
+            )
+        ).rejects.toThrow('Invalid escrow payload');
+        expect(
+            await setEscrowBlobByAuthProvider(provider, { ...blob, enclaveKeyId: 'other' }, 1)
+        ).toBeNull();
+        expect(
+            (await findUserKeyByAuthProvider(provider.type, provider.id))?.escrowBlob
+                ?.enrollmentEpoch
+        ).toBe(3);
+    });
     it('atomically replaces escrow without duplicate methods and preserves literal values', async () => {
         await setEscrowBlobByAuthProvider(provider, blob, 1);
         const result = await setEscrowBlobByAuthProvider(provider, blob, 1);
@@ -144,11 +223,118 @@ describe('escrow model invariants', () => {
             confirmationStatus: 'confirmed',
             shareVersion: 1,
         });
-        expect(result?.escrowBlob).toEqual(blob);
+        expect(result?.escrowBlob).toEqual({
+            ...blob,
+            enrollmentEpoch: 2,
+            blobHash: expect.stringMatching(/^[0-9a-f]{64}$/),
+        });
         expect(
             await setEscrowBlobByAuthProvider(provider, { ...blob, shareVersion: 2 }, 2)
         ).toBeNull();
     });
+    it('rewraps a previous-key blob onto the current key (P9.3): same epoch and version, escrowPin untouched', async () => {
+        const stored = await setEscrowBlobByAuthProvider(provider, blob, 1, {
+            salt: Buffer.alloc(16).toString('base64'),
+        });
+        const oldBlob = stored!.escrowBlob!;
+        const oldPin = stored!.escrowPin!;
+        const newEnvelope: EscrowBlob['envelope'] = {
+            ...blob.envelope,
+            keyId: 'current',
+            ciphertext: Buffer.alloc(32, 1).toString('base64'),
+        };
+        const rewrapped = await rewrapEscrowBlobByAuthProvider(
+            provider,
+            oldBlob,
+            oldPin,
+            newEnvelope,
+            {
+                enclaveKeyId: 'current',
+                enclaveMode: 'software',
+                measurements: {},
+            }
+        );
+        expect(rewrapped?.escrowBlob).toEqual({
+            envelope: newEnvelope,
+            enclaveKeyId: 'current',
+            enclaveMode: 'software',
+            measurements: {},
+            shareVersion: oldBlob.shareVersion,
+            enrollmentEpoch: oldBlob.enrollmentEpoch,
+            blobHash: expect.stringMatching(/^[0-9a-f]{64}$/),
+            createdAt: expect.any(Date),
+        });
+        expect(rewrapped?.escrowBlob?.blobHash).not.toBe(oldBlob.blobHash);
+        // escrowPin is byte-identical to what was read before the rewrap — the
+        // model never touches it, and the CAS filter proves it wasn't touched
+        // by anything else concurrently either.
+        expect(rewrapped?.escrowPin).toEqual(oldPin);
+        // Lost race: presenting the now-stale oldBlob/oldPin again is a no-op,
+        // not an error — a later job run should simply re-observe and retry.
+        expect(
+            await rewrapEscrowBlobByAuthProvider(provider, oldBlob, oldPin, newEnvelope, {
+                enclaveKeyId: 'current',
+                enclaveMode: 'software',
+                measurements: {},
+            })
+        ).toBeNull();
+    });
+    it('rewrapEscrowBlobByAuthProvider: concurrent runs never double-write; a mid-run re-enroll wins the race', async () => {
+        const stored = await setEscrowBlobByAuthProvider(provider, blob, 1, {
+            salt: Buffer.alloc(16).toString('base64'),
+        });
+        const oldBlob = stored!.escrowBlob!;
+        const oldPin = stored!.escrowPin!;
+        const attempt = (ciphertext: string): ReturnType<typeof rewrapEscrowBlobByAuthProvider> =>
+            rewrapEscrowBlobByAuthProvider(
+                provider,
+                oldBlob,
+                oldPin,
+                { ...blob.envelope, keyId: 'current', ciphertext },
+                { enclaveKeyId: 'current', enclaveMode: 'software', measurements: {} }
+            );
+        const [first, second] = await Promise.all([
+            attempt(Buffer.alloc(32, 2).toString('base64')),
+            attempt(Buffer.alloc(32, 3).toString('base64')),
+        ]);
+        expect([first, second].filter(result => result !== null)).toHaveLength(1);
+        // A concurrent re-enrollment (a NEW escrowBlob, different from oldBlob)
+        // between read and write also wins the race against a stale rewrap.
+        const reenrolled = await setEscrowBlobByAuthProvider(provider, blob, 1);
+        expect(reenrolled?.escrowBlob?.envelope.keyId).toBe(blob.enclaveKeyId);
+        expect(
+            await rewrapEscrowBlobByAuthProvider(
+                provider,
+                oldBlob,
+                oldPin,
+                {
+                    ...blob.envelope,
+                    keyId: 'current',
+                    ciphertext: Buffer.alloc(32, 4).toString('base64'),
+                },
+                { enclaveKeyId: 'current', enclaveMode: 'software', measurements: {} }
+            )
+        ).toBeNull();
+    });
+    it('findUserKeysWithEscrowBlobKeyId: matches given keyIds, excludes opted-out accounts', async () => {
+        const stored = await setEscrowBlobByAuthProvider(provider, blob, 1);
+        expect(
+            (await findUserKeysWithEscrowBlobKeyId([blob.enclaveKeyId], 10)).map(
+                u => u.authProviders[0]?.id
+            )
+        ).toContain(provider.id);
+        expect(await findUserKeysWithEscrowBlobKeyId(['nonexistent-key'], 10)).toEqual([]);
+        await clearEscrowByAuthProvider(provider, { optOut: true });
+        await getUserKeysCollection().updateOne(
+            { 'authProviders.id': provider.id },
+            { $set: { escrowBlob: stored!.escrowBlob! } }
+        );
+        expect(
+            (await findUserKeysWithEscrowBlobKeyId([blob.enclaveKeyId], 10)).some(
+                u => u.authProviders[0]?.id === provider.id
+            )
+        ).toBe(false);
+    });
     it('clears with and without opting out; explicit opt-in permits enrollment again', async () => {
         await setEscrowBlobByAuthProvider(provider, blob, 1);
         const cleared = await clearEscrowByAuthProvider(provider, { optOut: false });
@@ -207,4 +393,180 @@ describe('escrow model invariants', () => {
         expect(hashEscrowResumeToken(token)).toMatch(/^[0-9a-f]{64}$/);
         expect(hashEscrowResumeToken(token)).not.toBe(token);
     });
+    it('cancels via link token exactly once, rejecting wrong, reused, or hash-less holds', async () => {
+        const cancelTokenHash = 'a'.repeat(64);
+        const hold = await createEscrowHold({
+            holdRecord: {
+                hold: {
+                    holdId: randomUUID(),
+                    did: 'did:key:test',
+                    shareVersion: 1,
+                    blobHash: 'ab'.repeat(32),
+                    enrollmentEpoch: 1,
+                    releasePolicy: 'hold',
+                    clientEphemeralPublicKey: 'public-key',
+                    createdLo: 0,
+                    createdHi: 0,
+                    policyVersion: 1,
+                    signature: 'test-signature',
+                },
+                holdDurationMs: 0,
+                ledgerSeq: 0,
+            },
+            authProvider: provider,
+            primaryDid: 'did:key:test',
+            shareVersion: 1,
+            identityProofType: 'auth-token',
+            requestedAt: new Date(),
+            releaseAfter: new Date(),
+            releasePolicy: 'hold',
+            clientEphemeralPublicKey: 'public-key',
+            resumeTokenHash: hashEscrowResumeToken(generateEscrowResumeToken()),
+            cancelTokenHash,
+        });
+        expect(await cancelEscrowHoldByCancelToken(hold._id, 'b'.repeat(64))).toBeNull();
+        const cancelled = await cancelEscrowHoldByCancelToken(hold._id, cancelTokenHash);
+        expect(cancelled).toMatchObject({ status: 'cancelled', cancelledBy: 'link' });
+        expect(cancelled?.cancelTokenUsedAt).toBeInstanceOf(Date);
+        expect(cancelled?.cancelReason).toBeUndefined();
+        // Burned: the hash still matches, but cancelTokenUsedAt no longer $exists-fails the filter.
+        expect(await cancelEscrowHoldByCancelToken(hold._id, cancelTokenHash)).toBeNull();
+        // A pending hold with no cancelTokenHash at all never matches an exact-hash filter.
+        const noToken = await createHold();
+        expect(await cancelEscrowHoldByCancelToken(noToken._id, cancelTokenHash)).toBeNull();
+    });
+    it('records notifications by appending to the array without disturbing other fields', async () => {
+        const hold = await createHold();
+        await recordEscrowHoldNotification(hold._id, 'started');
+        let stored = await findEscrowHoldById(hold._id);
+        expect(stored?.notifications).toHaveLength(1);
+        expect(stored?.notifications[0]).toMatchObject({ kind: 'started' });
+        expect(stored?.notifications[0]?.sentAt).toBeInstanceOf(Date);
+        expect(stored?.status).toBe('pending');
+        await recordEscrowHoldNotification(hold._id, 'cancelled');
+        stored = await findEscrowHoldById(hold._id);
+        expect(stored?.notifications.map(entry => entry.kind)).toEqual(['started', 'cancelled']);
+        // A missing hold id is a no-op, never a throw.
+        await expect(
+            recordEscrowHoldNotification('does-not-exist', 'completed')
+        ).resolves.toBeUndefined();
+    });
+    it('rotates the cancel token only for pending holds, leaving terminal holds untouched', async () => {
+        const originalHash = 'a'.repeat(64);
+        const hold = await createEscrowHold({
+            holdRecord: {
+                hold: {
+                    holdId: randomUUID(),
+                    did: 'did:key:test',
+                    shareVersion: 1,
+                    blobHash: 'ab'.repeat(32),
+                    enrollmentEpoch: 1,
+                    releasePolicy: 'hold',
+                    clientEphemeralPublicKey: 'public-key',
+                    createdLo: 0,
+                    createdHi: 0,
+                    policyVersion: 1,
+                    signature: 'test-signature',
+                },
+                holdDurationMs: 0,
+                ledgerSeq: 0,
+            },
+            authProvider: provider,
+            primaryDid: 'did:key:test',
+            shareVersion: 1,
+            identityProofType: 'auth-token',
+            requestedAt: new Date(),
+            releaseAfter: new Date(),
+            releasePolicy: 'hold',
+            clientEphemeralPublicKey: 'public-key',
+            resumeTokenHash: hashEscrowResumeToken(generateEscrowResumeToken()),
+            cancelTokenHash: originalHash,
+        });
+
+        const token = await rotateEscrowCancelToken(hold._id);
+        expect(token).toMatch(/^[0-9a-f]{64}$/);
+        const rotated = await findEscrowHoldById(hold._id);
+        expect(rotated?.cancelTokenHash).toMatch(/^[0-9a-f]{64}$/);
+        expect(rotated?.cancelTokenHash).toBe(originalHash);
+        expect(rotated?.cancelTokenHashes).toHaveLength(1);
+        expect(await rotateEscrowCancelToken(hold._id)).toBe(token);
+        expect((await findEscrowHoldById(hold._id))?.cancelTokenHashes).toHaveLength(1);
+
+        // Cancelling burns the pending-only precondition: further rotation is a no-op.
+        const cancelled = await cancelEscrowHold(hold._id, 'did');
+        const hashAfterCancel = cancelled?.cancelTokenHash;
+        expect(await rotateEscrowCancelToken(hold._id)).toBeNull();
+        expect((await findEscrowHoldById(hold._id))?.cancelTokenHash).toBe(hashAfterCancel);
+
+        const completedHold = await createHold();
+        await completeEscrowHold(completedHold._id);
+        expect(await rotateEscrowCancelToken(completedHold._id)).toBeNull();
+        expect((await findEscrowHoldById(completedHold._id))?.cancelTokenHash).toBeUndefined();
+
+        expect(await rotateEscrowCancelToken('does-not-exist')).toBeNull();
+    });
+    it('finds only pending hold-policy holds due within 24h and claims each at most once', async () => {
+        const now = new Date();
+        const hour = 60 * 60 * 1000;
+        // Each candidate needs its own authProvider: the partial unique index
+        // allows only one pending hold-policy hold per (authProvider, policy).
+        const createHoldFor = (releaseAfter: Date, releasePolicy: 'hold' | 'pin' = 'hold') =>
+            createEscrowHold({
+                holdRecord: {
+                    hold: {
+                        holdId: randomUUID(),
+                        did: 'did:key:test',
+                        shareVersion: 1,
+                        blobHash: 'ab'.repeat(32),
+                        enrollmentEpoch: 1,
+                        releasePolicy: 'hold',
+                        clientEphemeralPublicKey: 'public-key',
+                        createdLo: 0,
+                        createdHi: 0,
+                        policyVersion: 1,
+                        signature: 'test-signature',
+                    },
+                    holdDurationMs: 0,
+                    ledgerSeq: 0,
+                },
+                authProvider: { type: 'firebase', id: `escrow-reminder-${randomUUID()}` },
+                primaryDid: 'did:key:test',
+                shareVersion: 1,
+                identityProofType: 'auth-token',
+                requestedAt: new Date(),
+                releaseAfter,
+                releasePolicy,
+                clientEphemeralPublicKey: 'public-key',
+                resumeTokenHash: hashEscrowResumeToken(generateEscrowResumeToken()),
+            });
+
+        const dueSoon = await createHoldFor(new Date(now.getTime() + 23 * hour));
+        const dueLate = await createHoldFor(new Date(now.getTime() + 25 * hour));
+        const alreadyReminded = await createHoldFor(new Date(now.getTime() + hour));
+        await recordEscrowHoldNotification(alreadyReminded._id, 'reminder');
+        const pinHold = await createHoldFor(now, 'pin');
+        const completedHold = await createHoldFor(new Date(now.getTime() + 2 * hour));
+        await completeEscrowHold(completedHold._id);
+
+        const due = await findEscrowHoldsDueForReminder(now, 200);
+        const dueIds = due.map(hold => hold._id);
+        expect(dueIds).toContain(dueSoon._id);
+        expect(dueIds).not.toContain(dueLate._id);
+        expect(dueIds).not.toContain(alreadyReminded._id);
+        expect(dueIds).not.toContain(pinHold._id);
+        expect(dueIds).not.toContain(completedHold._id);
+
+        // Two concurrent claims for the same hold: MongoDB serializes the
+        // findOneAndUpdate CAS, so exactly one observes the pre-push state.
+        const [first, second] = await Promise.all([
+            claimEscrowHoldForReminder(dueSoon._id, now),
+            claimEscrowHoldForReminder(dueSoon._id, now),
+        ]);
+        const winners = [first, second].filter((claim): claim is EscrowHold => claim !== null);
+        expect(winners).toHaveLength(1);
+        expect(winners[0]?.notifications.filter(entry => entry.kind === 'reminder')).toHaveLength(
+            0
+        );
+        expect(await claimEscrowHoldForReminder(dueSoon._id, now)).toBeNull();
+    });
 });

package/test/notifications.spec.ts

@@ -390,6 +390,10 @@ describe('Notifications', () => {
 
         it('records exactly one E2E push attempt per delivery window', async () => {
             vi.stubEnv('IS_E2E_TEST', 'true');
+            // Earlier notification cases also write E2E attempts into this cache.
+            // Isolate this window-count assertion just as we clean up afterward.
+            const previousKeys = await cache.keys('e2e:push-attempt:*');
+            if (previousKeys?.length) await cache.delete(previousKeys);
 
             try {
                 await expect(sendRefresh('window-1', 1)).resolves.toBe(true);