Merge remote-tracking branch 'origin/main' into feature/game-action-feedback-20260812

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

@@ -46,6 +46,7 @@ const {
     messages,
     boardAccess,
     reservedGeneralTurns,
+    reservedGeneralAutorunLimit,
     globalRecords,
     generalRecords,
     worldHistory,
@@ -218,6 +219,7 @@ watch(
                         :current-year="lobbyInfo?.year"
                         :current-month="lobbyInfo?.month"
                         :turn-term-minutes="lobbyInfo?.turnTerm"
+                        :autorun-limit="reservedGeneralAutorunLimit"
                         @set-general-turns="reserveGeneralTurns"
                         @shift-general-turns="shiftGeneralTurns"
                         @repeat-general-turns="repeatGeneralTurns"
@@ -341,6 +343,7 @@ watch(
                     :current-year="lobbyInfo?.year"
                     :current-month="lobbyInfo?.month"
                     :turn-term-minutes="lobbyInfo?.turnTerm"
+                    :autorun-limit="reservedGeneralAutorunLimit"
                     @set-general-turns="reserveGeneralTurns"
                     @shift-general-turns="shiftGeneralTurns"
                     @repeat-general-turns="repeatGeneralTurns"
@@ -571,6 +574,7 @@ button {
 .layout-desktop {
     display: grid;
     grid-template-columns: repeat(10, minmax(0, 1fr));
+    grid-template-rows: 520px minmax(125px, auto) auto;
     gap: 0;
     align-items: start;
 }
@@ -584,32 +588,30 @@ button {
 
 .layout-desktop > [data-main-target='commands'] {
     grid-column: 8 / 11;
-    grid-row: 1;
-    height: 645px;
+    grid-row: 1 / 3;
+    min-height: 645px;
     width: 290px;
     margin-left: 10px;
-    overflow-y: auto;
+    overflow: visible;
 }
 
 .layout-desktop > [data-main-target='city'] {
     grid-column: 1 / 8;
-    grid-row: 1;
+    grid-row: 2;
+    align-self: stretch;
     min-height: 125px;
-    margin-top: 520px;
 }
 
 .layout-desktop > [data-main-target='nation'] {
     grid-column: 1 / 6;
-    grid-row: 1;
+    grid-row: 3;
     min-height: 193px;
-    margin-top: 645px;
 }
 
 .layout-desktop > [data-main-target='general'] {
     grid-column: 6 / 11;
-    grid-row: 1;
+    grid-row: 3;
     min-height: 193px;
-    margin-top: 645px;
 }
 
 .layout-desktop > [data-main-target],
@@ -719,8 +721,8 @@ button {
 }
 
 .layout-mobile [data-main-target='commands'] {
-    height: 645px;
-    overflow-y: auto;
+    min-height: 645px;
+    overflow: visible;
 }
 
 .layout-mobile [data-main-target='nation'],

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

@@ -35,6 +35,7 @@ const history = ref<HistoryData | null>(null);
 const selectedYearMonth = ref<number | null>(null);
 const settingsOpen = ref(false);
 const rankingBottom = ref(localStorage.getItem('yearbook-ranking-bottom') === 'true');
+let historyRequestId = 0;
 const serverID = computed(() => {
     const value = route.query.serverID;
     const raw = Array.isArray(value) ? value[0] : value;
@@ -71,19 +72,27 @@ const loadHistory = async (): Promise<void> => {
     if (selectedYearMonth.value === null) {
         return;
     }
+    const requestId = ++historyRequestId;
     loading.value = true;
     errorMessage.value = '';
     try {
         const { year, month } = parseYearMonth(selectedYearMonth.value);
         const result = await trpc.yearbook.getHistory.query({ year, month, serverID: serverID.value });
+        if (requestId !== historyRequestId) {
+            return;
+        }
         if ('data' in result) {
             history.value = result.data;
         }
     } catch (error) {
-        history.value = null;
+        if (requestId !== historyRequestId) {
+            return;
+        }
         errorMessage.value = error instanceof Error ? error.message : '연감 데이터를 불러오지 못했습니다.';
     } finally {
-        loading.value = false;
+        if (requestId === historyRequestId) {
+            loading.value = false;
+        }
     }
 };
 
@@ -129,7 +138,13 @@ onMounted(async () => {
             <strong>연 감</strong>
             <button class="legacy-button close-button" type="button" @click="closePage">창 닫기</button>
             <span class="settings-menu">
-                <button class="legacy-button legacy-button--navigation" type="button" @click="settingsOpen = !settingsOpen">⚙ 설정⌄</button>
+                <button
+                    class="legacy-button legacy-button--navigation"
+                    type="button"
+                    @click="settingsOpen = !settingsOpen"
+                >
+                    ⚙ 설정⌄
+                </button>
                 <button v-if="settingsOpen" class="settings-item" type="button" @click="toggleRankingPosition">
                     국가 순서 위치 변경(모바일 전용)
                 </button>
@@ -164,9 +179,9 @@ onMounted(async () => {
         <div v-if="errorMessage" class="yearbook-message error" role="alert">{{ errorMessage }}</div>
         <div v-else-if="loading && !history" class="yearbook-message">불러오는 중...</div>
 
-        <section v-if="history" :class="['history-grid', { 'ranking-bottom': rankingBottom }]">
+        <section v-if="history" :class="['history-grid', { 'ranking-bottom': rankingBottom }]" :aria-busy="loading">
             <div class="map-position">
-                <MapViewer :map-data="history.map" :map-layout="mapLayout" :loading="loading" />
+                <MapViewer :map-data="history.map" :map-layout="mapLayout" :loading="loading && !history" />
             </div>
             <aside class="nation-position">
                 <table>