merge: 최신 main을 사령부 모바일 호환에 통합

app/game-api/src/battleSim/schema.ts

@@ -1,5 +1,7 @@
 import { z } from 'zod';
 
+import { isAvailableNationTraitKey } from '@sammo-ts/logic';
+
 import type { BattleSimRequestPayload } from './types.js';
 
 const zBattleSimGeneral = z.object({
@@ -71,7 +73,7 @@ const zBattleSimCity = z.object({
 });
 
 const zBattleSimNation = z.object({
-    type: z.string().min(1),
+    type: z.string().refine(isAvailableNationTraitKey),
     tech: z.number().min(0),
     level: z.number().int().min(0),
     capital: z.number().int().min(0),

app/game-api/src/battleSim/simulatorOptions.ts

@@ -1,4 +1,5 @@
 import {
+    AVAILABLE_NATION_TRAIT_KEYS,
     ITEM_KEYS,
     EVENT_DOMESTIC_TRAIT_KEYS,
     loadEventDomesticTraitModules,
@@ -6,7 +7,6 @@ import {
     loadNationTraitModules,
     loadPersonalityTraitModules,
     loadWarTraitModules,
-    NATION_TRAIT_KEYS,
     PERSONALITY_TRAIT_KEYS,
     WAR_TRAIT_KEYS,
     type ItemModule,
@@ -110,7 +110,7 @@ export const loadBattleSimTraitOptions = async (): Promise<{
 }> => {
     if (!cachedTraitOptions) {
         cachedTraitOptions = Promise.all([
-            loadNationTraitModules([...NATION_TRAIT_KEYS]),
+            loadNationTraitModules([...AVAILABLE_NATION_TRAIT_KEYS]),
             loadEventDomesticTraitModules([...EVENT_DOMESTIC_TRAIT_KEYS]),
             loadWarTraitModules([...WAR_TRAIT_KEYS]),
             loadPersonalityTraitModules([...PERSONALITY_TRAIT_KEYS]),

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

@@ -117,7 +117,7 @@ const buildBattleRequest = () => ({
         conflict: '{}',
     },
     attackerNation: {
-        type: 'test',
+        type: 'che_도적',
         tech: 1000,
         level: 1,
         capital: 1,
@@ -193,7 +193,7 @@ const buildBattleRequest = () => ({
         conflict: '{}',
     },
     defenderNation: {
-        type: 'test',
+        type: 'che_도적',
         tech: 1000,
         level: 1,
         capital: 2,
@@ -309,6 +309,27 @@ describe('battle router orchestration', () => {
         expect(battleSim.simulateCalls).toBe(0);
     });
 
+    it('rejects the neutral storage nation type before preparing or queuing a simulation', async () => {
+        const battleSim = new QueuedBattleSimTransport();
+        const state: WorldStateRow = {
+            id: 1,
+            scenarioCode: 'default',
+            currentYear: 200,
+            currentMonth: 1,
+            tickSeconds: 600,
+            config: {},
+            meta: {},
+            updatedAt: new Date('2026-01-01T00:00:00Z'),
+        };
+        const caller = appRouter.createCaller(buildContext({ state, battleSim }));
+        const request = buildBattleRequest();
+        request.attackerNation.type = 'che_중립';
+
+        await expect(caller.battle.prepareSimulation(request)).rejects.toMatchObject({ code: 'BAD_REQUEST' });
+        await expect(caller.battle.simulate(request)).rejects.toMatchObject({ code: 'BAD_REQUEST' });
+        expect(battleSim.simulateCalls).toBe(0);
+    });
+
     it('returns queued then completed results via transport', async () => {
         const battleSim = new QueuedBattleSimTransport();
         const state: WorldStateRow = {

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

@@ -0,0 +1,16 @@
+import { describe, expect, it } from 'vitest';
+
+import { AVAILABLE_NATION_TRAIT_KEYS } from '@sammo-ts/logic';
+
+import { loadBattleSimTraitOptions } from '../src/battleSim/simulatorOptions.js';
+
+describe('selectable trait options', () => {
+    it('uses the Ref available nation-type list for founding and battle simulation inputs', async () => {
+        const options = await loadBattleSimTraitOptions();
+
+        expect(options.nationTypes.map((entry) => entry.key)).toEqual(AVAILABLE_NATION_TRAIT_KEYS);
+        expect(options.nationTypes).not.toEqual(
+            expect.arrayContaining([expect.objectContaining({ key: 'che_중립' })])
+        );
+    });
+});