Merge branch 'codex/p0-general-turn-lifecycle'

# Conflicts:
#	app/game-engine/src/turn/databaseHooks.ts
#	app/game-engine/src/turn/inMemoryWorld.ts
#	app/game-engine/src/turn/reservedTurnHandler.ts
#	packages/infra/src/turnEngineDb.ts

packages/infra/src/db.ts

@@ -6,6 +6,7 @@ export interface DatabaseClient {
     $executeRaw: GamePrismaClient['$executeRaw'];
     worldState: GamePrisma.WorldStateDelegate;
     general: GamePrisma.GeneralDelegate;
+    generalAccessLog: GamePrisma.GeneralAccessLogDelegate;
     city: GamePrisma.CityDelegate;
     nation: GamePrisma.NationDelegate;
     diplomacy: GamePrisma.DiplomacyDelegate;

packages/infra/src/turnEngineDb.ts

@@ -16,6 +16,7 @@ export interface TurnEngineWorldStateRow {
 
 export interface TurnEngineGeneralRow {
     id: number;
+    userId: string | null;
     name: string;
     nationId: number;
     cityId: number;
@@ -43,6 +44,9 @@ export interface TurnEngineGeneralRow {
     age: number;
     npcState: number;
     lastTurn: JsonValue;
+    bornYear: number;
+    deadYear: number;
+    affinity: number | null;
     meta: JsonValue;
     turnTime: Date;
     recentWarTime: Date | null;
@@ -142,6 +146,7 @@ export interface TurnEngineWorldStateCreateInput {
 }
 
 export interface TurnEngineGeneralUpdateInput {
+    userId: string | null;
     name: string;
     nationId: number;
     cityId: number;
@@ -268,6 +273,7 @@ export interface TurnEngineNationUpdateInput {
     name: string;
     color: string;
     capitalCityId: number | null;
+    chiefGeneralId: number | null;
     gold: number;
     rice: number;
     level: number;