merge: 최신 main을 국가 메시지 편집기 보완에 통합한다

app/game-frontend/src/components/directory/DirectoryTooltip.vue

@@ -29,8 +29,6 @@ defineProps<{
 }
 .directory-tooltip--enabled {
     cursor: help;
-    text-decoration: underline dotted rgb(150 210 255 / 85%);
-    text-underline-offset: 2px;
 }
 .directory-tooltip--enabled:focus-visible {
     border-radius: 2px;

app/game-frontend/src/components/main/CommandListPanel.vue

@@ -3,6 +3,7 @@ import { computed, onUnmounted, ref, watch } from 'vue';
 import { addMinutes } from 'date-fns';
 import ReservedCommandEditor from '../command/ReservedCommandEditor.vue';
 import { formatLocalDateTime, formatLocalTimeSeconds } from '../../utils/legacyDateTime';
+import { projectServerClock, sampleServerClock, type SampledServerClock } from '../../utils/serverClockProjection';
 import type {
     CommandMapData,
     CommandMapLayout,
@@ -15,12 +16,15 @@ const props = defineProps<{
     commandTable: CommandTable | null;
     loading: boolean;
     reservedGeneralTurns: Array<{ index: number; action: string; args?: unknown }> | null;
-    general: { id: number; turnTime?: string } | null;
+    general: { id: number; turnTime?: string; nextTurnMonthOffset?: 0 | 1 } | null;
     currentYear?: number;
     currentMonth?: number;
     turnTermMinutes?: number;
     serverTime?: string;
+    serverWallTime?: string;
     clockMode?: 'realtime' | 'manual';
+    clockRunning?: boolean;
+    clockStartsAt?: string | null;
     autorunLimit?: number | null;
     storageKey?: string;
     mapData?: CommandMapData | null;
@@ -41,13 +45,19 @@ const labelMap = computed(() => {
     return result;
 });
 
+const firstReservedMonth = computed(
+    () =>
+        (props.currentYear ?? 0) * 12 +
+        (props.currentMonth ?? 1) -
+        1 +
+        (props.general?.nextTurnMonthOffset ?? 0)
+);
+
 const rows = computed<ReservedCommandRow[]>(() => {
     const base = props.general?.turnTime ? new Date(props.general.turnTime) : null;
     const term = props.turnTermMinutes ?? 0;
-    const baseYear = props.currentYear ?? 0;
-    const baseMonth = props.currentMonth ?? 1;
     return (props.reservedGeneralTurns ?? []).map((turn, offset) => {
-        const absoluteMonth = baseYear * 12 + baseMonth - 1 + offset;
+        const absoluteMonth = firstReservedMonth.value + offset;
         const date = base && Number.isFinite(base.getTime()) ? addMinutes(base, offset * term) : null;
         return {
             ...turn,
@@ -67,9 +77,7 @@ const rows = computed<ReservedCommandRow[]>(() => {
 
 const autonomousUntil = computed(() => {
     if (props.autorunLimit == null) return null;
-    const baseYear = props.currentYear ?? 0;
-    const baseMonth = props.currentMonth ?? 1;
-    const currentAbsoluteMonth = baseYear * 12 + baseMonth - 1;
+    const currentAbsoluteMonth = firstReservedMonth.value;
     const lastAutonomousMonth = props.autorunLimit - 1;
     if (lastAutonomousMonth < currentAbsoluteMonth) return null;
 
@@ -86,32 +94,34 @@ const autonomousUntil = computed(() => {
 });
 
 const currentServerTime = ref('--:--:--');
-let sampledServerTimeMs: number | null = null;
-let sampledClientTimeMs = 0;
+const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000;
+let serverClockSample: SampledServerClock | null = null;
 let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
 
 const updateServerClock = () => {
     if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
     serverClockTimer = undefined;
-    if (sampledServerTimeMs === null) {
+    if (serverClockSample === null) {
         currentServerTime.value = '--:--:--';
         return;
     }
-    const projectedTime = new Date(
-        props.clockMode === 'manual' ? sampledServerTimeMs : sampledServerTimeMs + Date.now() - sampledClientTimeMs
-    );
+    const { clientElapsedMs, time: projectedTime } = projectServerClock(serverClockSample);
     currentServerTime.value = formatLocalTimeSeconds(projectedTime);
-    if (props.clockMode !== 'manual') {
-        serverClockTimer = setTimeout(updateServerClock, 1_000 - projectedTime.getMilliseconds());
+    if (serverClockSample.clockMode !== 'manual' && serverClockSample.startDelayMs !== null) {
+        const untilStartMs = serverClockSample.startDelayMs - clientElapsedMs;
+        serverClockTimer = setTimeout(
+            updateServerClock,
+            untilStartMs > 0
+                ? Math.min(untilStartMs, MAX_SERVER_CLOCK_TIMER_DELAY_MS)
+                : 1_000 - projectedTime.getMilliseconds()
+        );
     }
 };
 
 watch(
-    () => [props.serverTime, props.clockMode] as const,
-    ([serverTime]) => {
-        const parsed = serverTime ? new Date(serverTime).getTime() : Number.NaN;
-        sampledServerTimeMs = Number.isFinite(parsed) ? parsed : null;
-        sampledClientTimeMs = Date.now();
+    () => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
+    ([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
+        serverClockSample = sampleServerClock({ serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt });
         updateServerClock();
     },
     { immediate: true }

app/game-frontend/src/components/main/GeneralBattleSummary.vue

@@ -7,6 +7,7 @@ export type GeneralBattleSummaryData = {
     available?: boolean;
     experience?: number | null;
     dedicationText?: string | null;
+    bill?: number | null;
     warnum?: number | null;
     wins?: number | null;
     losses?: number | null;
@@ -62,8 +63,13 @@ const killRate = computed(() => {
         <template v-else>
             <span>명성</span><strong>{{ numberText(summary.experience) }}</strong> <span>계급</span
             ><strong>{{ summary.dedicationText || '-' }}</strong>
-            <span class="battle-general-extra__empty" aria-hidden="true"></span>
-            <strong class="battle-general-extra__empty" aria-hidden="true"></strong>
+            <template v-if="summary.bill !== undefined">
+                <span>봉급</span><strong>{{ numberText(summary.bill) }}</strong>
+            </template>
+            <template v-else>
+                <span class="battle-general-extra__empty" aria-hidden="true"></span>
+                <strong class="battle-general-extra__empty" aria-hidden="true"></strong>
+            </template>
             <span>전투</span
             ><strong>{{ numberText(summary.warnum) }}<template v-if="summary.warnum != null">회</template></strong>
             <span>계략</span><strong>{{ numberText(summary.strategies) }}</strong>

app/game-frontend/src/components/main/MainFrontStatus.vue

@@ -1,10 +1,26 @@
 <script setup lang="ts">
 import { formatServerDateTime } from '@sammo-ts/common/time/ServerDateTime';
-import { computed } from 'vue';
+import { computed, onUnmounted, ref, watch } from 'vue';
 import { resolveTournamentStageName } from '../../utils/tournamentStatus';
+import {
+    GAME_SERVER_ACTIVITY_FRESHNESS_MS,
+    gameServerActivity,
+    isRecentGameServerActivity,
+} from '../../utils/gameServerActivity';
+import {
+    millisecondsUntilNextMinute,
+    projectServerClock,
+    sampleServerClock,
+    type SampledServerClock,
+} from '../../utils/serverClockProjection';
 
 const props = defineProps<{
     tournamentStage: number;
+    serverTime?: string;
+    serverWallTime?: string;
+    clockMode?: 'realtime' | 'manual';
+    clockRunning?: boolean;
+    clockStartsAt?: string | null;
     status: {
         onlineUserCount: number;
         onlineNations: string;
@@ -20,16 +36,75 @@ const props = defineProps<{
 }>();
 
 const tournamentStatus = computed(() => resolveTournamentStageName(props.tournamentStage));
-const lastExecutedStatus = computed(() =>
-    formatServerDateTime(props.status?.lastExecuted, { format: 'monthDayTime', fallback: '기록 없음' })
+const currentServerTime = ref('기록 없음');
+const hasServerClock = ref(false);
+const serverClockFresh = ref(false);
+const serverClockTitle = computed(() => {
+    if (!hasServerClock.value) return '서버 시각을 아직 받지 못했습니다.';
+    if (!serverClockFresh.value) return '최근 45초 동안 서버 통신이 없어 시각 갱신을 멈췄습니다.';
+    return undefined;
+});
+
+let serverClockSample: SampledServerClock | null = null;
+let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
+
+const updateServerClock = () => {
+    if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
+    serverClockTimer = undefined;
+    if (serverClockSample === null) {
+        currentServerTime.value = '기록 없음';
+        hasServerClock.value = false;
+        serverClockFresh.value = false;
+        return;
+    }
+
+    const now = Date.now();
+    const projection = projectServerClock(serverClockSample, now);
+    currentServerTime.value = formatServerDateTime(projection.time, {
+        format: 'monthDayTime',
+        fallback: '기록 없음',
+    });
+    hasServerClock.value = true;
+
+    const lastContactAt = gameServerActivity.lastContactAt.value;
+    serverClockFresh.value = isRecentGameServerActivity(lastContactAt, now);
+    if (!serverClockFresh.value || lastContactAt === null) return;
+
+    const nextDelays = [lastContactAt + GAME_SERVER_ACTIVITY_FRESHNESS_MS - now + 1];
+    if (serverClockSample.clockMode !== 'manual' && serverClockSample.startDelayMs !== null) {
+        const untilStartMs = serverClockSample.startDelayMs - projection.clientElapsedMs;
+        nextDelays.push(untilStartMs > 0 ? untilStartMs : millisecondsUntilNextMinute(projection.time));
+    }
+    serverClockTimer = setTimeout(updateServerClock, Math.max(1, Math.min(...nextDelays)));
+};
+
+watch(
+    () => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
+    ([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
+        serverClockSample = sampleServerClock({ serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt });
+        updateServerClock();
+    },
+    { immediate: true }
 );
+watch(() => gameServerActivity.lastContactAt.value, updateServerClock);
+
+onUnmounted(() => {
+    if (serverClockTimer !== undefined) clearTimeout(serverClockTimer);
+});
 </script>
 
 <template>
     <section class="front-status" aria-label="접속 현황과 국가 방침">
-        <div class="activity-status" aria-label="동작 시각, 토너먼트와 설문 진행 현황">
-            <div class="status-row execution-status" :class="{ 'execution-status--empty': !status?.lastExecuted }">
-                동작 시각: {{ lastExecutedStatus }}
+        <div class="activity-status" aria-label="현재 시각, 토너먼트와 설문 진행 현황">
+            <div
+                class="status-row execution-status"
+                :class="{
+                    'execution-status--empty': !hasServerClock,
+                    'execution-status--stale': hasServerClock && !serverClockFresh,
+                }"
+                :title="serverClockTitle"
+            >
+                현재 시각: {{ currentServerTime }}
             </div>
             <div class="status-row tournament-status">
                 <RouterLink to="/tournament">
@@ -120,6 +195,10 @@ const lastExecutedStatus = computed(() =>
     color: magenta;
 }
 
+.execution-status--stale {
+    color: magenta;
+}
+
 .vote-label {
     color: cyan;
 }

app/game-frontend/src/components/main/NationBasicCard.vue

@@ -284,7 +284,6 @@ const displayChiefName = (chief: NationChief | undefined): string => {
 
 .strategic.has-tooltip {
     overflow: visible;
-    text-decoration: underline dashed red;
 }
 
 .cooldown-tooltip {

app/game-frontend/src/components/ui/RichTooltip.vue

@@ -97,8 +97,6 @@ watch(
 
 .rich-tooltip-trigger--enabled {
     cursor: help;
-    text-decoration: underline dotted rgb(150 210 255 / 85%);
-    text-underline-offset: 2px;
 }
 
 .rich-tooltip-trigger--enabled:focus-visible {

app/game-frontend/src/stores/mainDashboard.ts

@@ -21,6 +21,7 @@ import {
 import { createBroadcastTabCoordinator, type BroadcastTabCoordinator } from '../utils/broadcastTabCoordinator';
 import { resolveWithReadModelSnapshotFallback } from '../utils/readModelDeltaRecovery';
 import { createRealtimeRequestOptions } from '../utils/realtimeAccessGrant';
+import { markGameServerContact } from '../utils/gameServerActivity';
 
 const REALTIME_FULL_REFRESH_MIN_INTERVAL_MS = 5_000;
 
@@ -1097,10 +1098,12 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
             onPayload: (message) => {
                 if (!isRealtimeParticipant()) return;
                 if (message.kind === 'patch') {
+                    markGameServerContact();
                     applyDashboardPatch(message.patch);
                     return;
                 }
                 realtimeStatus.value = message.status;
+                if (message.status === 'connected') markGameServerContact();
             },
         });
         realtimeCoordinator.start();
@@ -1153,6 +1156,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
         realtimeSource = source;
 
         source.addEventListener('open', () => {
+            markGameServerContact();
             realtimeStatus.value = 'connected';
             realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });
         });
@@ -1166,6 +1170,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
             if (!payload || payload.type !== 'readModelInvalidated') {
                 return;
             }
+            markGameServerContact();
             readModelRefreshQueue.request(payload.invalidation, payload.refreshGrant);
         });
         source.addEventListener('messagesInvalidated', (event) => {
@@ -1174,6 +1179,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
             if (!payload || payload.type !== 'messagesInvalidated') {
                 return;
             }
+            markGameServerContact();
             void refreshMessages(payload.refreshGrant);
         });
 
@@ -1182,14 +1188,17 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
         for (const legacyEventType of ['turnCompleted', 'readModelChanged'] as const) {
             source.addEventListener(legacyEventType, () => {
                 if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
+                markGameServerContact();
                 realtimeRefreshQueue.request();
             });
         }
         source.addEventListener('messageCreated', () => {
             if (realtimeCoordinator !== null && !realtimeCoordinator.isLeader()) return;
+            markGameServerContact();
             void refreshMessages();
         });
         source.addEventListener('ping', () => {
+            markGameServerContact();
             if (realtimeEnabled.value) {
                 realtimeStatus.value = 'connected';
                 realtimeCoordinator?.postFromLeader({ kind: 'status', status: 'connected' });

app/game-frontend/src/utils/gameServerActivity.ts

@@ -0,0 +1,34 @@
+import { readonly, ref, type Ref } from 'vue';
+
+export const GAME_SERVER_ACTIVITY_FRESHNESS_MS = 45_000;
+
+export type GameServerActivityTracker = {
+    lastContactAt: Readonly<Ref<number | null>>;
+    markContact: (contactAt?: number) => void;
+};
+
+export const createGameServerActivityTracker = (): GameServerActivityTracker => {
+    const lastContactAt = ref<number | null>(null);
+
+    return {
+        lastContactAt: readonly(lastContactAt),
+        markContact(contactAt = Date.now()) {
+            if (!Number.isFinite(contactAt)) return;
+            lastContactAt.value = contactAt;
+        },
+    };
+};
+
+export const isRecentGameServerActivity = (
+    lastContactAt: number | null,
+    now = Date.now(),
+    freshnessMs = GAME_SERVER_ACTIVITY_FRESHNESS_MS
+): boolean =>
+    lastContactAt !== null &&
+    Number.isFinite(lastContactAt) &&
+    Number.isFinite(now) &&
+    Math.max(0, now - lastContactAt) <= freshnessMs;
+
+export const gameServerActivity = createGameServerActivityTracker();
+
+export const markGameServerContact = (contactAt = Date.now()) => gameServerActivity.markContact(contactAt);

app/game-frontend/src/utils/serverClockProjection.ts

@@ -0,0 +1,67 @@
+export type ServerClockProjectionInput = {
+    serverTime?: string;
+    serverWallTime?: string;
+    clockMode?: 'realtime' | 'manual';
+    clockRunning?: boolean;
+    clockStartsAt?: string | null;
+};
+
+export type SampledServerClock = {
+    serverTimeMs: number;
+    sampledClientTimeMs: number;
+    clockMode: 'realtime' | 'manual';
+    startDelayMs: number | null;
+};
+
+const parseInstant = (value?: string | null): number | null => {
+    if (!value) return null;
+    const parsed = new Date(value).getTime();
+    return Number.isFinite(parsed) ? parsed : null;
+};
+
+export const sampleServerClock = (
+    input: ServerClockProjectionInput,
+    sampledClientTimeMs = Date.now()
+): SampledServerClock | null => {
+    const serverTimeMs = parseInstant(input.serverTime);
+    if (serverTimeMs === null) return null;
+
+    let startDelayMs: number | null;
+    if (input.clockMode === 'manual') {
+        startDelayMs = null;
+    } else if (input.clockRunning !== false) {
+        startDelayMs = 0;
+    } else {
+        const serverWallTimeMs = parseInstant(input.serverWallTime);
+        const clockStartsAtMs = parseInstant(input.clockStartsAt);
+        startDelayMs =
+            serverWallTimeMs !== null && clockStartsAtMs !== null
+                ? Math.max(0, clockStartsAtMs - serverWallTimeMs)
+                : null;
+    }
+
+    return {
+        serverTimeMs,
+        sampledClientTimeMs,
+        clockMode: input.clockMode ?? 'realtime',
+        startDelayMs,
+    };
+};
+
+export const projectServerClock = (sample: SampledServerClock, clientTimeMs = Date.now()) => {
+    const clientElapsedMs = Math.max(0, clientTimeMs - sample.sampledClientTimeMs);
+    const elapsedGameMs =
+        sample.clockMode === 'manual' || sample.startDelayMs === null
+            ? 0
+            : Math.max(0, clientElapsedMs - sample.startDelayMs);
+
+    return {
+        clientElapsedMs,
+        time: new Date(sample.serverTimeMs + elapsedGameMs),
+    };
+};
+
+export const millisecondsUntilNextMinute = (time: Date): number => {
+    const remainder = ((time.getTime() % 60_000) + 60_000) % 60_000;
+    return remainder === 0 ? 60_000 : 60_000 - remainder;
+};

app/game-frontend/src/utils/trpc.ts

@@ -3,6 +3,7 @@ import { REALTIME_ACCESS_GRANT_HEADER } from '@sammo-ts/common/realtime/types';
 import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
 import type { AppRouter } from '@sammo-ts/game-api';
 import { resolveBatchRealtimeAccessGrant } from './realtimeAccessGrant';
+import { markGameServerContact } from './gameServerActivity';
 
 const getGameToken = (): string | null => {
     if (typeof window === 'undefined') {
@@ -17,6 +18,11 @@ export const trpc = createTRPCProxyClient<AppRouter>({
         httpBatchLink({
             url: import.meta.env.VITE_GAME_API_URL ?? '/api/trpc',
             ...trpcJsonBodyHttpClientOptions,
+            async fetch(input, init) {
+                const result = await globalThis.fetch(input, init);
+                markGameServerContact();
+                return result;
+            },
             headers({ opList }) {
                 const token = getGameToken();
                 const refreshGrant = resolveBatchRealtimeAccessGrant(opList);

app/game-frontend/src/views/BattleCenterView.vue

@@ -291,6 +291,7 @@ onMounted(() => {
                                       available: true,
                                       experience: selectedGeneral.experience,
                                       dedicationText: selectedGeneral.progression.dedicationText,
+                                      bill: selectedGeneral.bill,
                                       warnum: selectedGeneral.warnum,
                                       wins: selectedGeneral.battleStats.kills,
                                       losses: selectedGeneral.battleStats.deaths,

app/game-frontend/src/views/JoinView.vue

@@ -1733,7 +1733,6 @@ onUnmounted(() => {
 .npc-tooltip {
     position: relative;
     cursor: help;
-    text-decoration: underline dotted;
 }
 
 .npc-tooltip [role='tooltip'] {

app/game-frontend/src/views/MainView.vue

@@ -243,7 +243,15 @@ watch(
         </div>
 
         <div data-main-target="policy">
-            <MainFrontStatus :status="frontStatus" :tournament-stage="tournamentStage" />
+            <MainFrontStatus
+                :status="frontStatus"
+                :tournament-stage="tournamentStage"
+                :server-time="lobbyInfo?.serverTime"
+                :server-wall-time="lobbyInfo?.serverWallTime"
+                :clock-mode="lobbyInfo?.clockMode"
+                :clock-running="lobbyInfo?.clockRunning"
+                :clock-starts-at="lobbyInfo?.clockStartsAt"
+            />
         </div>
 
         <aside v-if="surveyNotice" class="survey-notice" role="status" aria-live="polite">
@@ -267,7 +275,10 @@ watch(
                             :current-month="lobbyInfo?.month"
                             :turn-term-minutes="lobbyInfo?.turnTerm"
                             :server-time="lobbyInfo?.serverTime"
+                            :server-wall-time="lobbyInfo?.serverWallTime"
                             :clock-mode="lobbyInfo?.clockMode"
+                            :clock-running="lobbyInfo?.clockRunning"
+                            :clock-starts-at="lobbyInfo?.clockStartsAt"
                             :autorun-limit="reservedGeneralAutorunLimit"
                             :map-data="worldMap"
                             :map-layout="mapLayout"
@@ -437,7 +448,10 @@ watch(
                     :current-month="lobbyInfo?.month"
                     :turn-term-minutes="lobbyInfo?.turnTerm"
                     :server-time="lobbyInfo?.serverTime"
+                    :server-wall-time="lobbyInfo?.serverWallTime"
                     :clock-mode="lobbyInfo?.clockMode"
+                    :clock-running="lobbyInfo?.clockRunning"
+                    :clock-starts-at="lobbyInfo?.clockStartsAt"
                     :autorun-limit="reservedGeneralAutorunLimit"
                     :map-data="worldMap"
                     :map-layout="mapLayout"

app/game-frontend/src/views/MyPageView.vue

@@ -421,6 +421,7 @@ onMounted(() => {
                                   available: true,
                                   experience: data.general.experience,
                                   dedicationText: data.general.progression?.dedicationText,
+                                  bill: data.general.bill,
                                   warnum: data.general.records.battles,
                                   wins: data.general.records.wins,
                                   losses: data.general.records.losses,