merge: 최신 main 변경을 Web Push 작업에 반영한다

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

@@ -87,16 +87,18 @@ const buildWorld = (
 describe('monthly scout block actions', () => {
     it('blocks joining for all nations and globally locks policy changes', async () => {
         const world = buildWorld(0);
+        world.addNation(buildNation(0, 0));
         await createScoutBlockHandler({ actionName: 'BlockScoutAction', getWorld: () => world })(
             [true],
             { year: 200, month: 1, startyear: 190, currentEventID: 1, turnTime: new Date() },
             event
         );
 
-        expect(world.listNations().map((nation) => nation.meta)).toEqual([
-            { scout: 1, marker: 1 },
-            { scout: 1, marker: 2 },
-        ]);
+        expect(Object.fromEntries(world.listNations().map((nation) => [nation.id, nation.meta]))).toEqual({
+            0: { scout: 0, marker: 0 },
+            1: { scout: 1, marker: 1 },
+            2: { scout: 1, marker: 2 },
+        });
         expect(world.getState().meta.block_change_scout).toBe(true);
     });
 

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

@@ -11,6 +11,7 @@ import type { TurnEvent, TurnWorldSnapshot, TurnWorldState } from '../src/turn/t
 const databaseUrl = process.env.INPUT_EVENT_DATABASE_URL;
 const integration = describe.skipIf(!databaseUrl);
 const nationIds = [990_081, 990_082] as const;
+const neutralNationId = 0;
 
 const buildNation = (id: number): Nation => ({
     id,
@@ -49,7 +50,7 @@ integration('monthly scout block persistence', () => {
                 OR: [{ srcNationId: { in: [...nationIds] } }, { destNationId: { in: [...nationIds] } }],
             },
         });
-        await db.nation.deleteMany({ where: { id: { in: [...nationIds] } } });
+        await db.nation.deleteMany({ where: { id: { in: [neutralNationId, ...nationIds] } } });
     });
 
     afterAll(async () => {
@@ -58,12 +59,13 @@ integration('monthly scout block persistence', () => {
                 OR: [{ srcNationId: { in: [...nationIds] } }, { destNationId: { in: [...nationIds] } }],
             },
         });
-        await db.nation.deleteMany({ where: { id: { in: [...nationIds] } } });
+        await db.nation.deleteMany({ where: { id: { in: [neutralNationId, ...nationIds] } } });
         await closeDb?.();
     });
 
     it('persists every nation scout flag and the global policy lock in one flush', async () => {
-        const nations = nationIds.map(buildNation);
+        const neutralNation = { ...buildNation(neutralNationId), name: '재야', level: 0 };
+        const nations = [neutralNation, ...nationIds.map(buildNation)];
         await db.nation.createMany({
             data: nations.map((nation) => ({
                 id: nation.id,
@@ -146,6 +148,9 @@ integration('monthly scout block persistence', () => {
                 { power: 0, scout: 1 },
                 { power: 0, scout: 1 },
             ]);
+            expect(await db.nation.findUniqueOrThrow({ where: { id: neutralNationId } })).toMatchObject({
+                meta: { scout: 0 },
+            });
             expect(await db.worldState.findUniqueOrThrow({ where: { id: row.id } })).toMatchObject({
                 meta: { block_change_scout: true },
             });

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

@@ -41,7 +41,9 @@ const buildSnapshot = (): TurnWorldSnapshot => ({
         buildGeneral(2, 2, 99_999, 99_999),
     ],
     cities: [],
-    nations: [1, 2, 3].map((id) => ({
+    // Core persists a synthetic id=0 row that Ref's nation-power loop never
+    // sees. The registrar fallback must therefore still consume three rolls.
+    nations: [0, 1, 2, 3].map((id) => ({
         id,
         name: `Nation_${id}`,
         color: '#000000',
@@ -151,7 +153,7 @@ describe('neutral auction monthly registrar', () => {
             loadNeutralAuctionCounts: async () => [],
         });
         const snapshot = buildSnapshot();
-        snapshot.nations = snapshot.nations.slice(0, 2);
+        snapshot.nations = snapshot.nations.slice(1, 3);
         snapshot.generals = [buildGeneral(1, 0, 5_000, 7_000), buildGeneral(2, 0, 6_000, 8_000)];
         const state: TurnWorldState = {
             id: 1,