refactor: enforce package boundaries

app/game-api/src/router/general/index.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
-import { LogCategory, LogScope } from '@sammo-ts/infra';
+import { LogCategory, LogScope } from '@sammo-ts/logic';
 import { asRecord } from '@sammo-ts/common';
 
 import type { GameApiContext } from '../../context.js';

app/game-api/src/router/join/index.ts

@@ -21,7 +21,7 @@ import {
     ConflictingTurnDaemonCommandError,
     RejectedNpcPossessionCommandError,
 } from '../../daemon/databaseTransport.js';
-import { NpcPossessionError, reserveNpcPossessionCandidates } from '@sammo-ts/game-engine';
+import { NpcPossessionError, reserveNpcPossessionCandidates } from '@sammo-ts/game-engine/turn/npcPossessionService.js';
 import { resolveNationScoutMessage } from '../nation/shared.js';
 
 const resolveSelectionCommandResult = (

app/game-api/src/router/nation/endpoints/getBattleCenter.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 
-import { LogCategory } from '@sammo-ts/infra';
+import { LogCategory } from '@sammo-ts/logic';
 
 import { accessAuthedProcedure } from '../../../trpc.js';
 import { getMyGeneral } from '../../shared/general.js';

app/game-api/src/router/nation/endpoints/getGeneralLog.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
-import { LogCategory, LogScope } from '@sammo-ts/infra';
+import { LogCategory, LogScope } from '@sammo-ts/logic';
 
 import { authedProcedure } from '../../../trpc.js';
 import { getMyGeneral } from '../../shared/general.js';

app/game-api/src/router/nation/endpoints/getNationInfo.ts

@@ -1,8 +1,15 @@
 import { TRPCError } from '@trpc/server';
 
 import { asRecord } from '@sammo-ts/common';
-import { LogCategory, LogScope } from '@sammo-ts/infra';
-import { getGoldIncome, getOutcome, getRiceIncome, getWallIncome, getWarGoldIncome } from '@sammo-ts/logic';
+import {
+    getGoldIncome,
+    getOutcome,
+    getRiceIncome,
+    getWallIncome,
+    getWarGoldIncome,
+    LogCategory,
+    LogScope,
+} from '@sammo-ts/logic';
 
 import { authedProcedure } from '../../../trpc.js';
 import { getMyGeneral } from '../../shared/general.js';

app/game-api/src/router/nation/endpoints/getSecretGeneralList.ts

@@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server';
 
 import { asRecord } from '@sammo-ts/common';
 
-import { loadUnitSetDefinitionByName } from '../../../battleSim/unitSetLoader.js';
+import { loadUnitSetDefinitionByName } from '@sammo-ts/game-engine/scenario/unitSetLoader.js';
 import { accessAuthedProcedure } from '../../../trpc.js';
 import { getMyGeneral } from '../../shared/general.js';
 import { assertNationAccess, resolveNationPermission } from '../shared.js';

app/game-api/src/router/npc/index.ts

@@ -5,7 +5,7 @@ import { asRecord, isRecord } from '@sammo-ts/common';
 import { findCrewTypeById, getTechCost } from '@sammo-ts/logic/world/unitSet.js';
 
 import { accessAuthedInputProcedure, authedProcedure, router } from '../../trpc.js';
-import { loadUnitSetDefinitionByName } from '../../battleSim/unitSetLoader.js';
+import { loadUnitSetDefinitionByName } from '@sammo-ts/game-engine/scenario/unitSetLoader.js';
 import type { GameApiContext } from '../../context.js';
 import { getMyGeneral } from '../shared/general.js';
 import { resolveSecretPermission } from '../shared/secretPermission.js';

app/game-api/src/router/public/index.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import { asNumber, asRecord } from '@sammo-ts/common';
-import { LogCategory, LogScope } from '@sammo-ts/infra';
+import { LogCategory, LogScope } from '@sammo-ts/logic';
 import { z } from 'zod';
 
 import type { GameApiContext } from '../../context.js';

app/game-api/src/router/world/index.ts

@@ -6,7 +6,7 @@ import { accessAuthedProcedure, authedProcedure, procedure, router } from '../..
 import { asRecord, isRecord } from '@sammo-ts/common';
 import { loadWorldMap } from '../../maps/worldMap.js';
 import { loadMapLayout } from '../../maps/mapLayout.js';
-import { loadUnitSetDefinitionByName } from '../../battleSim/unitSetLoader.js';
+import { loadUnitSetDefinitionByName } from '@sammo-ts/game-engine/scenario/unitSetLoader.js';
 import { getMyGeneral, getOwnedGeneral } from '../shared/general.js';
 import { getGeneralDirectory, getNationDirectory } from './directory.js';
 

app/game-api/src/router/yearbook/index.ts

@@ -3,7 +3,7 @@ import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
 
 import { asRecord, isRecord } from '@sammo-ts/common';
-import { LogCategory, LogScope } from '@sammo-ts/infra';
+import { LogCategory, LogScope } from '@sammo-ts/logic';
 
 import type { GameApiContext } from '../../context.js';
 import { loadPublicMap, type BaseMapResult } from '../../maps/worldMap.js';