feat: 시계 reconciliation 워커와 명령 경계 완성

app/game-engine/test/clockReconciliation.integration.test.ts

@@ -0,0 +1,364 @@
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+import { GameClock } from '@sammo-ts/common';
+import {
+    createGamePostgresConnector,
+    createRedisConnector,
+    type GamePrismaClient,
+    type RedisConnector,
+} from '@sammo-ts/infra';
+
+import { reconcileClockSuspension, startClockSuspension } from '../src/turn/clockReconciliation.js';
+import { applyNextClockProjection } from '../src/turn/clockProjectionOutbox.js';
+
+const enabled =
+    process.env.CLOCK_RECONCILIATION_INTEGRATION === '1' &&
+    Boolean(process.env.DATABASE_URL) &&
+    Boolean(process.env.REDIS_URL);
+const describeIntegration = enabled ? describe : describe.skip;
+
+describeIntegration('durable clock reconciliation', () => {
+    let db: GamePrismaClient;
+    let disconnect: (() => Promise<void>) | undefined;
+    let redis: RedisConnector;
+
+    beforeAll(async () => {
+        const connector = createGamePostgresConnector({ url: process.env.DATABASE_URL! });
+        db = connector.prisma;
+        disconnect = connector.disconnect;
+        redis = createRedisConnector({ url: process.env.REDIS_URL! });
+        await redis.connect();
+    });
+
+    afterAll(async () => {
+        await redis.disconnect();
+        await disconnect?.();
+    });
+
+    beforeEach(async () => {
+        await redis.client.flushDb();
+        await db.$transaction([
+            db.clockProjectionOutbox.deleteMany(),
+            db.clockReconciliationParticipant.deleteMany(),
+            db.clockSuspension.deleteMany(),
+            db.inputEvent.deleteMany(),
+            db.vote.deleteMany(),
+            db.voteComment.deleteMany(),
+            db.votePoll.deleteMany(),
+            db.message.deleteMany(),
+            db.auctionBid.deleteMany(),
+            db.auction.deleteMany(),
+            db.npcSelectionToken.deleteMany(),
+            db.selectPoolEntry.deleteMany(),
+            db.general.deleteMany(),
+            db.turnDaemonLease.deleteMany(),
+            db.worldState.deleteMany(),
+        ]);
+    });
+
+    it('preserves every remaining deadline and occurrence across a 65m17.250s exact gap', async () => {
+        const baseTime = new Date('2026-01-01T00:00:00.000Z');
+        const futureAnchor = new Date(Date.now() + 3_600_000);
+        const initialTick = 1_000_000;
+        const lastTurnTick = 900_000;
+        const clock = new GameClock({
+            baseTime,
+            tick: initialTick,
+            mode: 'realtime',
+            wallAnchor: futureAnchor,
+            turnSeconds: 600,
+            phase: 'RUNNING',
+            revision: 1,
+        });
+        const generalTicks = [initialTick + 1_234, initialTick + 36_000_123];
+        const auctionCloseTick = initialTick + 72_000_777;
+        const messageOccurrenceTick = initialTick - 500;
+        const messageExpiryTick = initialTick + 90_000_999;
+        const voteStartTick = initialTick - 200;
+        const voteEndTick = initialTick + 18_000_321;
+        const poolTick = initialTick + 2_000_111;
+        const npcValidTick = initialTick + 3_000_222;
+        const npcMoreTick = initialTick + 1_000_333;
+
+        const world = await db.worldState.create({
+            data: {
+                scenarioCode: 'clock-test',
+                currentYear: 180,
+                currentMonth: 1,
+                tickSeconds: 600,
+                clockBaseTime: baseTime,
+                clockTick: BigInt(initialTick),
+                clockMode: 'realtime',
+                clockWallAnchor: futureAnchor,
+                lastTurnTick: BigInt(lastTurnTick),
+                clockPhase: 'RUNNING',
+                clockRevision: 1n,
+                deadlineGeneration: 7n,
+                meta: {
+                    lastTurnTime: clock.tickToDate(lastTurnTick).toISOString(),
+                    starttime: clock.tickToDate(initialTick + 100).toISOString(),
+                },
+            },
+        });
+        await db.general.createMany({
+            data: generalTicks.map((turnTick, index) => ({
+                id: index + 1,
+                name: `general-${index + 1}`,
+                turnTick: BigInt(turnTick),
+                turnTime: clock.tickToDate(turnTick),
+                recentWarTick: BigInt(initialTick - 100 - index),
+                recentWarTime: clock.tickToDate(initialTick - 100 - index),
+            })),
+        });
+        await db.auction.create({
+            data: {
+                type: 'BUY_RICE',
+                hostGeneralId: 1,
+                status: 'FINALIZING',
+                openTick: BigInt(initialTick - 300),
+                closeTick: BigInt(auctionCloseTick),
+                closeAt: clock.tickToDate(auctionCloseTick),
+            },
+        });
+        await db.message.create({
+            data: {
+                mailbox: 1,
+                type: 'private',
+                src: 1,
+                dest: 2,
+                time: clock.tickToDate(messageOccurrenceTick),
+                timeTick: BigInt(messageOccurrenceTick),
+                validUntil: clock.tickToDate(messageExpiryTick),
+                validUntilTick: BigInt(messageExpiryTick),
+                message: {},
+            },
+        });
+        await db.votePoll.create({
+            data: {
+                title: 'clock vote',
+                options: ['yes', 'no'],
+                revealMode: 'AFTER_VOTE',
+                openerGeneralId: 1,
+                openerName: 'general-1',
+                startAt: clock.tickToDate(voteStartTick),
+                startTick: BigInt(voteStartTick),
+                endAt: clock.tickToDate(voteEndTick),
+                endTick: BigInt(voteEndTick),
+            },
+        });
+        await db.selectPoolEntry.create({
+            data: {
+                uniqueName: 'clock-pool',
+                reservedUntil: clock.tickToDate(poolTick),
+                reservedUntilTick: BigInt(poolTick),
+                info: {},
+            },
+        });
+        await db.npcSelectionToken.create({
+            data: {
+                ownerUserId: 'clock-user',
+                validUntil: clock.tickToDate(npcValidTick),
+                validUntilTick: BigInt(npcValidTick),
+                pickMoreFrom: clock.tickToDate(npcMoreTick),
+                pickMoreFromTick: BigInt(npcMoreTick),
+                pickResult: [],
+                nonce: 1,
+            },
+        });
+
+        const authority = { kind: 'OFFLINE' as const, profileName: 'clock-test', reason: 'integration fixture' };
+        const suspended = await startClockSuspension({
+            db,
+            suspensionId: 'clock-gap-65m17s250',
+            source: 'MAINTENANCE',
+            authority,
+        });
+        expect(suspended.cutTick).toBe(initialTick);
+        expect((await db.worldState.findUniqueOrThrow({ where: { id: world.id } })).clockPhase).toBe('SUSPENDED');
+
+        const resumeWallAt = new Date(suspended.cutWallAt.getTime() + 65 * 60_000 + 17_250);
+        const reconciled = await reconcileClockSuspension({
+            db,
+            suspensionId: suspended.suspensionId,
+            authority,
+            testResumeWallAt: resumeWallAt,
+        });
+        expect(reconciled).toMatchObject({
+            phase: 'RECONCILING',
+            sourceRevision: 1,
+            targetRevision: 2,
+            deadlineGeneration: 8,
+            gapTicks: 235_035_000,
+            shiftTicks: 235_035_000,
+            alignedTick: 236_035_000,
+        });
+
+        const [afterWorld, generals, auction, message, vote, pool, token, ledger, outboxes] = await Promise.all([
+            db.worldState.findUniqueOrThrow({ where: { id: world.id } }),
+            db.general.findMany({ orderBy: { id: 'asc' } }),
+            db.auction.findFirstOrThrow(),
+            db.message.findFirstOrThrow(),
+            db.votePoll.findFirstOrThrow(),
+            db.selectPoolEntry.findFirstOrThrow(),
+            db.npcSelectionToken.findFirstOrThrow(),
+            db.clockSuspension.findUniqueOrThrow({ where: { id: suspended.suspensionId } }),
+            db.clockProjectionOutbox.findMany(),
+        ]);
+        const alignedTick = BigInt(reconciled.alignedTick);
+        expect(afterWorld).toMatchObject({
+            clockPhase: 'RECONCILING',
+            clockRevision: 2n,
+            deadlineGeneration: 8n,
+            clockTick: alignedTick,
+            lastTurnTick: BigInt(lastTurnTick + reconciled.shiftTicks),
+        });
+        expect(generals.map((general) => general.turnTick! - alignedTick)).toEqual(
+            generalTicks.map((tick) => BigInt(tick - initialTick))
+        );
+        expect(auction.closeTick! - alignedTick).toBe(BigInt(auctionCloseTick - initialTick));
+        expect(message.validUntilTick! - alignedTick).toBe(BigInt(messageExpiryTick - initialTick));
+        expect(vote.endTick! - alignedTick).toBe(BigInt(voteEndTick - initialTick));
+        expect(pool.reservedUntilTick! - alignedTick).toBe(BigInt(poolTick - initialTick));
+        expect(token.validUntilTick! - alignedTick).toBe(BigInt(npcValidTick - initialTick));
+        expect(token.pickMoreFromTick! - alignedTick).toBe(BigInt(npcMoreTick - initialTick));
+        expect(generals.map((general) => general.recentWarTick)).toEqual([
+            BigInt(initialTick - 100),
+            BigInt(initialTick - 101),
+        ]);
+        expect(auction.openTick).toBe(BigInt(initialTick - 300));
+        expect(message.timeTick).toBe(BigInt(messageOccurrenceTick));
+        expect(vote.startTick).toBe(BigInt(voteStartTick));
+        expect(ledger.status).toBe('RECONCILING');
+        expect(outboxes).toHaveLength(1);
+        expect(outboxes[0]).toMatchObject({ status: 'PENDING', targetRevision: 2n });
+
+        const retried = await reconcileClockSuspension({
+            db,
+            suspensionId: suspended.suspensionId,
+            authority,
+            testResumeWallAt: new Date(resumeWallAt.getTime() + 10_000),
+        });
+        expect(retried).toEqual(reconciled);
+        expect(await db.clockProjectionOutbox.count()).toBe(1);
+        const keepParticipants = await db.clockReconciliationParticipant.findMany({ where: { policy: 'KEEP' } });
+        expect(keepParticipants.every((participant) => participant.beforeChecksum === participant.afterChecksum)).toBe(
+            true
+        );
+
+        await redis.client.set('sammo:clock-test:clock:active-revision', '1');
+        expect(
+            await applyNextClockProjection({ db, redis: redis.client, workerId: 'clock-projection-success' })
+        ).toBe('APPLIED');
+        expect(await redis.client.get('sammo:clock-test:clock:active-revision')).toBe('2');
+        expect(await redis.client.get('sammo:clock-test:clock:deadline-generation')).toBe('8');
+        expect(await redis.client.get('sammo:clock-test:clock:phase')).toBe('RUNNING');
+        expect(await redis.client.zRangeWithScores('sammo:clock-test:auction:timer', 0, -1)).toEqual([
+            { value: String(auction.id), score: Number(auction.closeTick) },
+        ]);
+        expect(await db.worldState.findUniqueOrThrow({ where: { id: world.id } })).toMatchObject({
+            clockPhase: 'RUNNING',
+            clockRevision: 2n,
+        });
+        expect(await db.clockProjectionOutbox.findFirstOrThrow()).toMatchObject({ status: 'APPLIED' });
+    });
+
+    it('rejects a live offline fence and preserves a turn deadline across an exact 24-hour gap', async () => {
+        const baseTime = new Date('2026-02-01T00:00:00.000Z');
+        const futureAnchor = new Date(Date.now() + 3_600_000);
+        const initialTick = 5 * 36_000_000;
+        const turnTick = initialTick + 17_000_007;
+        const clock = new GameClock({
+            baseTime,
+            tick: initialTick,
+            mode: 'realtime',
+            wallAnchor: futureAnchor,
+            turnSeconds: 3_600,
+            phase: 'RUNNING',
+        });
+        await db.worldState.create({
+            data: {
+                scenarioCode: 'clock-day-test',
+                currentYear: 180,
+                currentMonth: 1,
+                tickSeconds: 3_600,
+                clockBaseTime: baseTime,
+                clockTick: BigInt(initialTick),
+                clockMode: 'realtime',
+                clockWallAnchor: futureAnchor,
+                lastTurnTick: BigInt(initialTick),
+                clockPhase: 'RUNNING',
+                clockRevision: 3n,
+                deadlineGeneration: 2n,
+            },
+        });
+        await db.general.create({
+            data: { id: 1, name: 'day-general', turnTick: BigInt(turnTick), turnTime: clock.tickToDate(turnTick) },
+        });
+        await db.turnDaemonLease.create({
+            data: {
+                profile: 'clock-day-test',
+                ownerId: 'other-daemon',
+                fencingEpoch: 9n,
+                leaseUntil: new Date(Date.now() + 60_000),
+            },
+        });
+        const authority = {
+            kind: 'OFFLINE' as const,
+            profileName: 'clock-day-test',
+            reason: '24-hour integration fixture',
+        };
+        await expect(
+            startClockSuspension({
+                db,
+                suspensionId: 'clock-gap-24h',
+                source: 'MAINTENANCE',
+                authority,
+            })
+        ).rejects.toThrow('daemon lease to be offline');
+        await db.turnDaemonLease.delete({ where: { profile: 'clock-day-test' } });
+        const suspended = await startClockSuspension({
+            db,
+            suspensionId: 'clock-gap-24h',
+            source: 'MAINTENANCE',
+            authority,
+        });
+        const reconciled = await reconcileClockSuspension({
+            db,
+            suspensionId: suspended.suspensionId,
+            authority,
+            testResumeWallAt: new Date(suspended.cutWallAt.getTime() + 24 * 60 * 60_000),
+        });
+
+        expect(reconciled).toMatchObject({
+            sourceRevision: 3,
+            targetRevision: 4,
+            gapTicks: 24 * 36_000_000,
+            shiftTicks: 24 * 36_000_000,
+            alignedTick: initialTick + 24 * 36_000_000,
+        });
+        const shifted = await db.general.findUniqueOrThrow({ where: { id: 1 } });
+        expect(shifted.turnTick! - BigInt(reconciled.alignedTick)).toBe(BigInt(turnTick - initialTick));
+
+        await redis.client.set('sammo:clock-day-test:clock:active-revision', '3');
+        const redisThenCrash = {
+            get: redis.client.get.bind(redis.client),
+            eval: async (script: string, options: { keys: string[]; arguments: string[] }) => {
+                await redis.client.eval(script, options);
+                throw new Error('fixture crash after Redis commit');
+            },
+        };
+        await expect(
+            applyNextClockProjection({ db, redis: redisThenCrash, workerId: 'clock-projection-crash' })
+        ).rejects.toThrow('fixture crash after Redis commit');
+        expect(await redis.client.get('sammo:clock-day-test:clock:active-revision')).toBe('4');
+        expect(await db.worldState.findFirstOrThrow()).toMatchObject({ clockPhase: 'RECONCILING' });
+        expect(await db.clockProjectionOutbox.findFirstOrThrow()).toMatchObject({ status: 'FAILED', attempts: 1 });
+
+        await db.clockProjectionOutbox.updateMany({ data: { availableAt: new Date(0) } });
+        expect(
+            await applyNextClockProjection({ db, redis: redis.client, workerId: 'clock-projection-restart' })
+        ).toBe('RECOVERED');
+        expect(await db.worldState.findFirstOrThrow()).toMatchObject({ clockPhase: 'RUNNING', clockRevision: 4n });
+        expect(await db.clockProjectionOutbox.findFirstOrThrow()).toMatchObject({ status: 'APPLIED', attempts: 2 });
+    });
+});

app/game-engine/test/databaseCommandQueue.integration.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type { TurnDaemonCommand } from '@sammo-ts/common';
 import { createGamePostgresConnector } from '@sammo-ts/infra';
@@ -25,6 +25,12 @@ integration('database command queue', () => {
         });
     });
 
+    beforeEach(async () => {
+        await db.inputEvent.deleteMany({ where: { requestId: { startsWith: 'integration:engine:' } } });
+        await db.clockSuspension.deleteMany({ where: { id: 'integration-queue-revision-8-9' } });
+        await db.worldState.updateMany({ data: { clockPhase: 'RUNNING' } });
+    });
+
     afterAll(async () => {
         await db.inputEvent.deleteMany({
             where: { requestId: { startsWith: 'integration:engine:' } },
@@ -229,4 +235,119 @@ integration('database command queue', () => {
         expect(handle).toHaveBeenCalledOnce();
         expect(mutation).not.toHaveBeenCalled();
     });
+
+    it('dequeues gameplay only in an executable phase and records the processing clock generation', async () => {
+        const existingWorld = await db.worldState.findFirst({ orderBy: { id: 'asc' } });
+        const world = existingWorld
+            ? await db.worldState.update({
+                  where: { id: existingWorld.id },
+                  data: { clockPhase: 'SUSPENDED', clockRevision: 9n, deadlineGeneration: 4n, clockTick: 123n },
+              })
+            : await db.worldState.create({
+                  data: {
+                      scenarioCode: 'queue-clock-test',
+                      currentYear: 180,
+                      currentMonth: 1,
+                      tickSeconds: 600,
+                      clockPhase: 'SUSPENDED',
+                      clockRevision: 9n,
+                      deadlineGeneration: 4n,
+                      clockTick: 123n,
+                  },
+              });
+        const gameplayId = 'integration:engine:clock-gated-gameplay';
+        const statusId = 'integration:engine:clock-gated-status';
+        const staleId = 'integration:engine:clock-gated-stale';
+        await db.inputEvent.createMany({
+            data: [
+                {
+                    requestId: gameplayId,
+                    target: 'ENGINE',
+                    eventType: 'vacation',
+                    actorUserId: 'user-7',
+                    acceptedGameTick: 100n,
+                    acceptedClockRevision: 9n,
+                    acceptedDeadlineGeneration: 4n,
+                    payload: { type: 'vacation', requestId: gameplayId, userId: 'user-7', generalId: 7 },
+                },
+                {
+                    requestId: statusId,
+                    target: 'ENGINE',
+                    eventType: 'getStatus',
+                    acceptedGameTick: 100n,
+                    acceptedClockRevision: 9n,
+                    acceptedDeadlineGeneration: 4n,
+                    payload: { type: 'getStatus', requestId: statusId },
+                },
+                {
+                    requestId: staleId,
+                    target: 'ENGINE',
+                    eventType: 'vacation',
+                    actorUserId: 'user-8',
+                    acceptedGameTick: 90n,
+                    acceptedClockRevision: 8n,
+                    acceptedDeadlineGeneration: 3n,
+                    payload: { type: 'vacation', requestId: staleId, userId: 'user-8', generalId: 8 },
+                },
+            ],
+        });
+        const queue = new DatabaseTurnDaemonCommandQueue(db);
+
+        expect(await queue.drain()).toEqual([{ type: 'getStatus', requestId: statusId }]);
+        expect(await db.inputEvent.findUniqueOrThrow({ where: { requestId: gameplayId } })).toMatchObject({
+            status: 'PENDING',
+            processingClockRevision: null,
+        });
+        await db.worldState.update({ where: { id: world.id }, data: { clockPhase: 'RUNNING' } });
+
+        expect(await queue.drain()).toEqual([
+            { type: 'vacation', requestId: gameplayId, userId: 'user-7', generalId: 7 },
+        ]);
+        expect(await db.inputEvent.findUniqueOrThrow({ where: { requestId: gameplayId } })).toMatchObject({
+            status: 'PROCESSING',
+            processingGameTick: 100n,
+            processingClockRevision: 9n,
+            processingDeadlineGeneration: 4n,
+        });
+        expect(await db.inputEvent.findUniqueOrThrow({ where: { requestId: staleId } })).toMatchObject({
+            status: 'PENDING',
+            processingClockRevision: null,
+        });
+        await db.clockSuspension.deleteMany({ where: { id: 'integration-queue-revision-8-9' } });
+        await db.clockSuspension.create({
+            data: {
+                id: 'integration-queue-revision-8-9',
+                worldStateId: world.id,
+                source: 'MAINTENANCE',
+                policy: 'EXACT',
+                status: 'APPLIED',
+                sourceRevision: 8n,
+                targetRevision: 9n,
+                cutTick: 90n,
+                cutWallAt: new Date(),
+                resumeWallAt: new Date(),
+                rateTicksPerSecond: 60_000,
+                gapTicks: 33n,
+                shiftTicks: 33n,
+                alignedTick: 123n,
+            },
+        });
+        expect(await queue.drain()).toEqual([
+            {
+                type: 'vacation',
+                requestId: staleId,
+                userId: 'user-8',
+                generalId: 8,
+                processingGameTick: 123,
+            },
+        ]);
+        expect(await db.inputEvent.findUniqueOrThrow({ where: { requestId: staleId } })).toMatchObject({
+            status: 'PROCESSING',
+            acceptedGameTick: 90n,
+            acceptedClockRevision: 8n,
+            processingGameTick: 123n,
+            processingClockRevision: 9n,
+            processingDeadlineGeneration: 4n,
+        });
+    });
 });

app/game-engine/test/runtimeClockShift.test.ts

@@ -448,6 +448,21 @@ describe('runtime clock shift projection', () => {
             return {};
         });
         const db = {
+            $transaction: async (operation: (transaction: GamePrismaClient) => Promise<unknown>) => operation(db),
+            $executeRaw: vi.fn(async () => 1),
+            $queryRaw: vi.fn(async () => [{ wallNow: new Date('2026-07-30T10:00:00.000Z') }]),
+            worldState: {
+                findFirst: vi.fn(async () => ({
+                    clockBaseTime: new Date('2026-07-30T10:00:00.000Z'),
+                    clockTick: 0n,
+                    clockMode: 'realtime',
+                    clockWallAnchor: new Date('2026-07-30T10:00:00.000Z'),
+                    tickSeconds: 600,
+                    clockPhase: 'RUNNING',
+                    clockRevision: 1n,
+                    deadlineGeneration: 1n,
+                })),
+            },
             inputEvent: {
                 create: inputEventCreate,
                 findUniqueOrThrow: vi.fn(async () =>
@@ -567,6 +582,21 @@ describe('runtime game settings projection', () => {
         let eventStatus: 'PENDING' | 'SUCCEEDED' = 'PENDING';
         let created = false;
         const db = {
+            $transaction: async (operation: (transaction: GamePrismaClient) => Promise<unknown>) => operation(db),
+            $executeRaw: vi.fn(async () => 1),
+            $queryRaw: vi.fn(async () => [{ wallNow: new Date('2026-07-30T10:00:00.000Z') }]),
+            worldState: {
+                findFirst: vi.fn(async () => ({
+                    clockBaseTime: new Date('2026-07-30T10:00:00.000Z'),
+                    clockTick: 0n,
+                    clockMode: 'realtime',
+                    clockWallAnchor: new Date('2026-07-30T10:00:00.000Z'),
+                    tickSeconds: 600,
+                    clockPhase: 'RUNNING',
+                    clockRevision: 1n,
+                    deadlineGeneration: 1n,
+                })),
+            },
             inputEvent: {
                 create: vi.fn(async () => {
                     if (created) throw { code: 'P2002' };

app/game-engine/test/runtimeClockShiftPersistence.integration.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 import { createGamePostgresConnector, type GamePrisma, type GamePrismaClient } from '@sammo-ts/infra';
 import { GAME_TICKS_PER_TURN } from '@sammo-ts/common';
@@ -77,38 +77,32 @@ integration('runtime clock shift persistence', () => {
     let db: GamePrismaClient;
     let closeDb: (() => Promise<void>) | undefined;
 
+    const cleanupFixtures = async (): Promise<void> => {
+        await db.inputEvent.deleteMany({ where: { requestId: { in: [requestId, runtimeSettingsRequestId] } } });
+        await db.votePoll.deleteMany({ where: { openerGeneralId: generalIds[2] } });
+        await db.message.deleteMany({ where: { mailbox: generalIds[2] } });
+        await db.logEntry.deleteMany({ where: { text: runtimeSettingsLogText } });
+        await db.auction.deleteMany({ where: { hostGeneralId: { in: [...generalIds] } } });
+        await db.selectPoolEntry.deleteMany({ where: { uniqueName: backlogPoolUniqueName } });
+        await db.general.deleteMany({ where: { id: { in: [...generalIds] } } });
+        await db.worldState.deleteMany({
+            where: {
+                scenarioCode: { in: ['runtime-clock-shift', 'runtime-game-settings', 'realtime-backlog-rebase'] },
+            },
+        });
+    };
+
     beforeAll(async () => {
         const connector = createGamePostgresConnector({ url: databaseUrl! });
         await connector.connect();
         db = connector.prisma;
         closeDb = () => connector.disconnect();
-        await db.inputEvent.deleteMany({ where: { requestId: { in: [requestId, runtimeSettingsRequestId] } } });
-        await db.votePoll.deleteMany({ where: { openerGeneralId: generalIds[2] } });
-        await db.message.deleteMany({ where: { mailbox: generalIds[2] } });
-        await db.logEntry.deleteMany({ where: { text: runtimeSettingsLogText } });
-        await db.auction.deleteMany({ where: { hostGeneralId: { in: [...generalIds] } } });
-        await db.selectPoolEntry.deleteMany({ where: { uniqueName: backlogPoolUniqueName } });
-        await db.general.deleteMany({ where: { id: { in: [...generalIds] } } });
-        await db.worldState.deleteMany({
-            where: {
-                scenarioCode: { in: ['runtime-clock-shift', 'runtime-game-settings', 'realtime-backlog-rebase'] },
-            },
-        });
     });
 
+    beforeEach(cleanupFixtures);
+
     afterAll(async () => {
-        await db.inputEvent.deleteMany({ where: { requestId: { in: [requestId, runtimeSettingsRequestId] } } });
-        await db.votePoll.deleteMany({ where: { openerGeneralId: generalIds[2] } });
-        await db.message.deleteMany({ where: { mailbox: generalIds[2] } });
-        await db.logEntry.deleteMany({ where: { text: runtimeSettingsLogText } });
-        await db.auction.deleteMany({ where: { hostGeneralId: { in: [...generalIds] } } });
-        await db.selectPoolEntry.deleteMany({ where: { uniqueName: backlogPoolUniqueName } });
-        await db.general.deleteMany({ where: { id: { in: [...generalIds] } } });
-        await db.worldState.deleteMany({
-            where: {
-                scenarioCode: { in: ['runtime-clock-shift', 'runtime-game-settings', 'realtime-backlog-rebase'] },
-            },
-        });
+        await cleanupFixtures();
         await closeDb?.();
     });
 
@@ -469,6 +463,7 @@ integration('runtime clock shift persistence', () => {
                 clockBaseTime: base,
                 clockTick: 0,
                 clockMode: 'manual',
+                clockPhase: 'MANUAL',
                 clockWallAnchor: base,
                 lastTurnTick: 0,
                 config: { turnTermMinutes: 10, blockGeneralCreate: 0 },