From fa9fe7153930b03d88c3942411977884a7968ae1 Mon Sep 17 00:00:00 2001
From: hided62 <hided62@gmail.com>
Date: Fri, 28 Aug 2026 15:55:39 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=98=88=EC=95=BD=20=EB=AA=85=EB=A0=B9?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EA=B0=9C=EC=84=A0?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=99=84=EB=A3=8C=20=EC=BD=9C=EB=B0=B1=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../e2e/commandArguments.spec.ts              |  5 ++-
 .../components/chief/ChiefCommandEditor.vue   | 10 ++++-
 .../command/ReservedCommandEditor.vue         | 42 +++++++++----------
 .../src/components/main/CommandListPanel.vue  | 10 ++++-
 app/game-frontend/src/stores/mainDashboard.ts |  6 ++-
 .../src/views/ChiefCenterView.vue             | 11 ++++-
 app/game-frontend/src/views/MainView.vue      |  8 +++-
 7 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/app/game-frontend/e2e/commandArguments.spec.ts b/app/game-frontend/e2e/commandArguments.spec.ts
index 9da88f8a..4058bb39 100644
--- a/app/game-frontend/e2e/commandArguments.spec.ts
+++ b/app/game-frontend/e2e/commandArguments.spec.ts
@@ -2518,10 +2518,13 @@ test('keeps the entered command visible and reports a server validation error',
     await page.getByRole('button', { name: '1턴 명령 입력', exact: true }).click();
     await page.getByTestId('command-picker').getByRole('button', { name: /화계/ }).click();
     await page.getByTestId('command-argument-form').locator('select').selectOption('2');
-    await page.getByTestId('command-picker').getByRole('button', { name: '입력', exact: true }).click();
+    const submit = page.getByTestId('command-picker').getByRole('button', { name: '입력', exact: true });
+    await submit.click();
 
     await expect(page.getByRole('alert')).toContainText('대상 도시를 선택할 수 없습니다.');
     await expect(page.getByTestId('command-argument-form').locator('select')).toHaveValue('2');
+    await expect(submit).toBeEnabled();
+    await expect(page.getByTestId('command-picker').getByRole('button', { name: '저장 중', exact: true })).toHaveCount(0);
 });
 
 test('keeps Ref command briefs and autonomous-action state after a turn mutation', async ({ page, context }) => {
diff --git a/app/game-frontend/src/components/chief/ChiefCommandEditor.vue b/app/game-frontend/src/components/chief/ChiefCommandEditor.vue
index dcb8b051..ec9e5aaa 100644
--- a/app/game-frontend/src/components/chief/ChiefCommandEditor.vue
+++ b/app/game-frontend/src/components/chief/ChiefCommandEditor.vue
@@ -9,6 +9,8 @@ import type {
     ReservedCommandRow,
 } from '../command/types';
 
+type ReservationCompletion = (success: boolean) => void;
+
 const props = defineProps<{
     officerLevelText: string;
     name: string | null;
@@ -26,10 +28,14 @@ const props = defineProps<{
 const commandRows = computed(() => props.rows.map((row) => ({ ...row, action: row.actionCode ?? row.action })));
 
 const emit = defineEmits<{
-    (event: 'reserve-bulk', entries: CommandPatternEntry[]): void;
+    (event: 'reserve-bulk', entries: CommandPatternEntry[], complete?: ReservationCompletion): void;
     (event: 'shift', amount: number): void;
     (event: 'repeat', amount: number): void;
 }>();
+
+const reserveBulk = (entries: CommandPatternEntry[], complete?: ReservationCompletion) => {
+    emit('reserve-bulk', entries, complete);
+};
 </script>
 
 <template>
@@ -47,7 +53,7 @@ const emit = defineEmits<{
         :current-time="props.rows[0]?.time"
         :map-data="props.mapData"
         :map-layout="props.mapLayout"
-        @reserve-bulk="emit('reserve-bulk', $event)"
+        @reserve-bulk="reserveBulk"
         @shift="emit('shift', $event)"
         @repeat="emit('repeat', $event)"
     />
diff --git a/app/game-frontend/src/components/command/ReservedCommandEditor.vue b/app/game-frontend/src/components/command/ReservedCommandEditor.vue
index 04893e81..0e2beed8 100644
--- a/app/game-frontend/src/components/command/ReservedCommandEditor.vue
+++ b/app/game-frontend/src/components/command/ReservedCommandEditor.vue
@@ -56,7 +56,7 @@ const props = withDefaults(
 );
 
 const emit = defineEmits<{
-    (event: 'reserve-bulk', entries: CommandPatternEntry[]): void;
+    (event: 'reserve-bulk', entries: CommandPatternEntry[], complete?: (success: boolean) => void): void;
     (event: 'shift', amount: number): void;
     (event: 'repeat', amount: number): void;
 }>();
@@ -79,7 +79,9 @@ const commandArgs = ref<Record<string, unknown>>({});
 const commandArgsValid = ref(false);
 const expanded = ref(false);
 const menuRevision = ref(0);
-const pendingReservation = ref<CommandPatternEntry | null>(null);
+const pendingReservation = ref<{ requestId: number; entry: CommandPatternEntry } | null>(null);
+let reservationRequestId = 0;
+
 const editorElement = ref<HTMLElement | null>(null);
 const pickerElement = ref<HTMLElement | null>(null);
 const collapsedRowCount = 15;
@@ -109,24 +111,6 @@ watch([editMode, activeCategory], () => {
     if (editMode.value) quickTarget.value = null;
 });
 
-watch(
-    () => props.rows,
-    (rows) => {
-        const pending = pendingReservation.value;
-        if (!pending) return;
-        const saved = pending.turnList.every((index) => {
-            const row = rows[index];
-            return row?.action === pending.action && JSON.stringify(row.args ?? {}) === JSON.stringify(pending.args);
-        });
-        if (!saved) return;
-        storage.value?.pushRecent({ ...pending, turnList: [0] });
-        pendingReservation.value = null;
-        releaseSelection();
-        closePicker();
-    },
-    { deep: true }
-);
-
 const scopedTable = computed<CommandTable | null>(() => {
     if (!props.commandTable) return null;
     return {
@@ -276,11 +260,23 @@ const selectCommand = (commandKey: string) => {
 };
 const submitCommand = () => {
     const command = selectedCommand.value;
-    if (!command || !commandArgsValid.value) return;
+    if (!command || !commandArgsValid.value || pendingReservation.value) return;
     const turnList = quickTarget.value === null ? selectedIndices() : [quickTarget.value];
     const entry = { turnList, action: command.key, args: { ...commandArgs.value }, label: command.name };
-    emit('reserve-bulk', [entry]);
-    pendingReservation.value = entry;
+    const requestId = ++reservationRequestId;
+    pendingReservation.value = { requestId, entry };
+
+    emit('reserve-bulk', [entry], (success) => {
+        const pending = pendingReservation.value;
+        if (!pending || pending.requestId !== requestId) return;
+
+        pendingReservation.value = null;
+        if (!success) return;
+
+        storage.value?.pushRecent({ ...entry, turnList: [0] });
+        releaseSelection();
+        closePicker();
+    });
 };
 const returnToCommandList = () => {
     selectedCommand.value = null;
diff --git a/app/game-frontend/src/components/main/CommandListPanel.vue b/app/game-frontend/src/components/main/CommandListPanel.vue
index 1e9561c7..b6eb1f98 100644
--- a/app/game-frontend/src/components/main/CommandListPanel.vue
+++ b/app/game-frontend/src/components/main/CommandListPanel.vue
@@ -14,6 +14,8 @@ import type {
     ReservedCommandRow,
 } from '../command/types';
 
+type ReservationCompletion = (success: boolean) => void;
+
 const props = defineProps<{
     commandTable: CommandTable | null;
     loading: boolean;
@@ -35,11 +37,15 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-    (event: 'set-general-turns', entries: CommandPatternEntry[]): void;
+    (event: 'set-general-turns', entries: CommandPatternEntry[], complete?: ReservationCompletion): void;
     (event: 'shift-general-turns', amount: number): void;
     (event: 'repeat-general-turns', amount: number): void;
 }>();
 
+const reserveBulk = (entries: CommandPatternEntry[], complete?: ReservationCompletion) => {
+    emit('set-general-turns', entries, complete);
+};
+
 const editModeStorageKey = generalTurnEditorModeStorageKey(
     gameFrontendRuntimeConfig.profile,
     gameFrontendRuntimeConfig.appBasePath
@@ -154,7 +160,7 @@ onUnmounted(() => {
         :autonomous-until="autonomousUntil"
         :mobile="props.mobile"
         :max-push-turn="12"
-        @reserve-bulk="emit('set-general-turns', $event)"
+        @reserve-bulk="reserveBulk"
         @shift="emit('shift-general-turns', $event)"
         @repeat="emit('repeat-general-turns', $event)"
     />
diff --git a/app/game-frontend/src/stores/mainDashboard.ts b/app/game-frontend/src/stores/mainDashboard.ts
index 5af8e874..6d6bb582 100644
--- a/app/game-frontend/src/stores/mainDashboard.ts
+++ b/app/game-frontend/src/stores/mainDashboard.ts
@@ -1041,9 +1041,9 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
 
     const setGeneralTurns = async (
         entries: Array<{ turnList: number[]; action: string; args: Record<string, unknown> }>
-    ) => {
+    ): Promise<boolean> => {
         const id = generalId.value;
-        if (!id || !entries.length) return;
+        if (!id || !entries.length) return false;
         try {
             const result = await trpc.turns.reserved.setGeneralBulk.mutate({
                 generalId: id,
@@ -1053,6 +1053,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
             reservedGeneralTurns.value = result.turns;
             reservedGeneralRevision.value = result.revision;
             reservedGeneralAutorunLimit.value = result.autorunLimit ?? null;
+            return true;
         } catch (err) {
             error.value = resolveErrorMessage(err);
             const snapshot = await trpc.turns.reserved.getGeneral.query({ generalId: id }).catch(() => null);
@@ -1061,6 +1062,7 @@ export const useMainDashboardStore = defineStore('mainDashboard', () => {
                 reservedGeneralRevision.value = snapshot.revision;
                 reservedGeneralAutorunLimit.value = snapshot.autorunLimit ?? null;
             }
+            return false;
         }
     };
 
diff --git a/app/game-frontend/src/views/ChiefCenterView.vue b/app/game-frontend/src/views/ChiefCenterView.vue
index a86a9b11..696806ba 100644
--- a/app/game-frontend/src/views/ChiefCenterView.vue
+++ b/app/game-frontend/src/views/ChiefCenterView.vue
@@ -11,6 +11,8 @@ import { formatOfficerLevelText } from '../utils/nationFormat';
 import { formatReservedCommandBrief } from '../components/command/reservedCommandBrief';
 import type { CommandMapData, CommandMapLayout, CommandPatternEntry, CommandTable } from '../components/command/types';
 
+type ReservationCompletion = (success: boolean) => void;
+
 type ChiefTurn = {
     index: number;
     action: string;
@@ -284,8 +286,11 @@ const shiftTurns = async (amount: number) => {
     }
 };
 
-const reserveTurns = async (entries: CommandPatternEntry[]) => {
-    if (!data.value || !isEditingAllowed.value) return;
+const reserveTurns = async (entries: CommandPatternEntry[], complete?: ReservationCompletion) => {
+    if (!data.value || !isEditingAllowed.value) {
+        complete?.(false);
+        return;
+    }
     try {
         const result = await trpc.turns.reserved.setNationBulk.mutate({
             generalId: data.value.me.id,
@@ -293,9 +298,11 @@ const reserveTurns = async (entries: CommandPatternEntry[]) => {
             expectedRevision: selectedChief.value?.revision ?? 0,
         });
         updateMyTurns(result.turns, result.revision);
+        complete?.(true);
     } catch (err) {
         await loadChiefCenter();
         error.value = resolveErrorMessage(err);
+        complete?.(false);
     }
 };
 
diff --git a/app/game-frontend/src/views/MainView.vue b/app/game-frontend/src/views/MainView.vue
index a648f840..04397073 100644
--- a/app/game-frontend/src/views/MainView.vue
+++ b/app/game-frontend/src/views/MainView.vue
@@ -183,8 +183,12 @@ const shiftGeneralTurns = (amount: number) => {
     void dashboard.shiftGeneralTurns(amount);
 };
 
-const reserveGeneralTurns = (entries: CommandPatternEntry[]) => {
-    void dashboard.setGeneralTurns(entries);
+const reserveGeneralTurns = async (
+    entries: CommandPatternEntry[],
+    complete?: (success: boolean) => void
+) => {
+    const success = await dashboard.setGeneralTurns(entries);
+    complete?.(success);
 };
 
 const repeatGeneralTurns = (amount: number) => {