merge: 최신 main을 턴 입력기 연월 경계 수정에 통합한다

app/game-api/test/auctionWorker.test.ts

@@ -57,8 +57,11 @@ describe('auction worker clock-shift race', () => {
         const now = new Date('2026-07-30T12:00:00.000Z');
         const time = {
             now,
+            wallNow: now,
             tick: 36_000_000,
             mode: 'manual' as const,
+            running: false,
+            startsAt: null,
             dateToTick: () => 72_000_000,
         };
         const closeAt = new Date('2099-01-01T00:00:00.000Z');

app/game-api/test/gameClock.test.ts

@@ -0,0 +1,52 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import type { DatabaseClient } from '../src/context.js';
+import { loadCurrentGameTime } from '../src/services/gameClock.js';
+
+const buildDatabase = (mode: 'realtime' | 'manual' = 'realtime'): DatabaseClient =>
+    ({
+        worldState: {
+            findFirst: vi.fn(async () => ({
+                clockBaseTime: new Date('2026-08-21T09:50:00.000Z'),
+                clockTick: 36_000_000n,
+                clockMode: mode,
+                clockWallAnchor: new Date('2026-08-21T11:00:00.000Z'),
+                tickSeconds: 600,
+            })),
+        },
+    }) as unknown as DatabaseClient;
+
+describe('current game time projection', () => {
+    it('holds a realtime clock at its persisted tick until the future wall anchor', async () => {
+        const db = buildDatabase();
+
+        const preopen = await loadCurrentGameTime(db, new Date('2026-08-21T10:30:00.000Z'));
+        expect(preopen).toMatchObject({
+            now: new Date('2026-08-21T10:00:00.000Z'),
+            wallNow: new Date('2026-08-21T10:30:00.000Z'),
+            tick: 36_000_000,
+            mode: 'realtime',
+            running: false,
+            startsAt: new Date('2026-08-21T11:00:00.000Z'),
+        });
+
+        const opened = await loadCurrentGameTime(db, new Date('2026-08-21T11:00:05.000Z'));
+        expect(opened).toMatchObject({
+            now: new Date('2026-08-21T10:00:05.000Z'),
+            tick: 36_300_000,
+            running: true,
+            startsAt: null,
+        });
+    });
+
+    it('keeps a manual clock stopped without scheduling an automatic start', async () => {
+        const result = await loadCurrentGameTime(buildDatabase('manual'), new Date('2026-08-21T12:00:00.000Z'));
+
+        expect(result).toMatchObject({
+            now: new Date('2026-08-21T10:00:00.000Z'),
+            tick: 36_000_000,
+            running: false,
+            startsAt: null,
+        });
+    });
+});

app/game-api/test/inGameMenuPermissions.test.ts

@@ -297,6 +297,7 @@ describe('in-game my information ownership', () => {
                     statUpgradeLimit: 20,
                     dex: [350, 1_375, 3_500, 7_125, 12_650],
                 },
+                bill: 1_000,
             },
             city: {
                 population: 322_886,
@@ -433,6 +434,7 @@ describe('in-game my information ownership', () => {
                     stats: { attack: 100, defence: 150, speed: 7, avoid: 10, magicCoef: 0, cost: 9, rice: 9 },
                 },
                 progression: { experienceLevel: 4, dedicationLevel: 2, dedicationText: '29품관' },
+                bill: 800,
                 itemNames: { horse: '노새(+3)' },
                 itemInfo: { horse: '통솔 +3' },
             },
@@ -855,6 +857,7 @@ describe('battle-center general and user permissions', () => {
                         statUpgradeLimit: 20,
                         dex: [0, 0, 0, 0, 0],
                     },
+                    bill: 600,
                     serviceYears: 3,
                     battleStats: {
                         kills: 5,

app/game-api/test/lobbyRouter.test.ts

@@ -68,6 +68,32 @@ describe('lobby season state', () => {
 
         expect(result.serverTime).toBe('2026-08-15T02:00:00.000Z');
         expect(result.clockMode).toBe('manual');
+        expect(result.clockRunning).toBe(false);
+        expect(result.clockStartsAt).toBeNull();
+        expect(new Date(result.serverWallTime).getTime()).not.toBeNaN();
+    });
+
+    it('exposes the future realtime wall anchor without advancing the preopen clock', async () => {
+        const wallAnchor = new Date('2099-08-21T11:00:00.000Z');
+        const result = await appRouter
+            .createCaller(
+                buildContext(
+                    {},
+                    {
+                        baseTime: new Date('2026-08-21T09:00:00.000Z'),
+                        tick: 36_000_000n,
+                        mode: 'realtime',
+                        wallAnchor,
+                    }
+                )
+            )
+            .lobby.info();
+
+        expect(result.serverTime).toBe('2026-08-21T10:00:00.000Z');
+        expect(result.clockMode).toBe('realtime');
+        expect(result.clockRunning).toBe(false);
+        expect(result.clockStartsAt).toBe(wallAnchor.toISOString());
+        expect(new Date(result.serverWallTime).getTime()).toBeLessThan(wallAnchor.getTime());
     });
 
     it('preserves zero as the first official game index', async () => {

app/game-api/test/troopRouter.test.ts

@@ -77,10 +77,12 @@ const buildContext = (options: {
     auth?: GameSessionTokenPayload | null;
     requestId?: string;
     transaction?: ReturnType<typeof vi.fn>;
+    turns?: Array<{ generalId: number; turnIdx: number; actionCode: string }>;
     result: Awaited<ReturnType<TurnDaemonTransport['requestCommand']>>;
 }) => {
     const me = options.me ?? buildGeneral();
     const requestCommand = vi.fn(async () => options.result);
+    const generalTurnFindMany = vi.fn(async () => options.turns ?? []);
     const db = {
         ...(options.transaction ? { $transaction: options.transaction } : {}),
         general: {
@@ -110,7 +112,7 @@ const buildContext = (options: {
         },
         city: { findMany: vi.fn(async () => [{ id: 1, name: '북평' }]) },
         worldState: { findFirst: vi.fn(async () => ({ config: { const: { upgradeLimit: 20 } } })) },
-        generalTurn: { findMany: vi.fn(async () => []) },
+        generalTurn: { findMany: generalTurnFindMany },
     };
     const accessTokenStore = new RedisAccessTokenStore(
         {
@@ -134,7 +136,7 @@ const buildContext = (options: {
         flushStore: new InMemoryFlushStore(),
         gameTokenSecret: 'test-secret',
     };
-    return { context, requestCommand };
+    return { context, requestCommand, generalTurnFindMany };
 };
 
 describe('troop router permissions and mutations', () => {
@@ -175,6 +177,30 @@ describe('troop router permissions and mutations', () => {
         });
     });
 
+    it('returns only the first five Ref-redacted troop command labels without exposing action codes', async () => {
+        const fixture = buildContext({
+            me: buildGeneral({ troopId: 1 }),
+            turns: [
+                { generalId: 1, turnIdx: 0, actionCode: 'che_집합' },
+                { generalId: 1, turnIdx: 1, actionCode: 'che_이동' },
+                { generalId: 1, turnIdx: 2, actionCode: 'che_징병' },
+                { generalId: 1, turnIdx: 3, actionCode: '휴식' },
+                { generalId: 1, turnIdx: 4, actionCode: 'che_화계' },
+            ],
+            result: null,
+        });
+
+        const result = await appRouter.createCaller(fixture.context).troop.getList();
+
+        expect(result.troops[0]?.reservedCommands).toEqual(['집합', '-', '-', '-', '-']);
+        expect(JSON.stringify(result.troops)).not.toContain('che_');
+        expect(fixture.generalTurnFindMany).toHaveBeenCalledWith({
+            where: { generalId: { in: [1] }, turnIdx: { lt: 5 } },
+            select: { generalId: true, turnIdx: true, actionCode: true },
+            orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }],
+        });
+    });
+
     it('creates a troop only for the general owned by the authenticated user', async () => {
         const { context, requestCommand } = buildContext({
             result: { type: 'troopCreate', ok: true, generalId: 1, troopId: 1, troopName: '백마대' },