From 03e47feef1a458e16c8e7b314e51355f7348ff1a Mon Sep 17 00:00:00 2001
From: hided62 <hided62@gmail.com>
Date: Thu, 3 Sep 2026 17:57:17 +0000
Subject: [PATCH] fix(game-api): separate engine message responses

---
 app/game-api/src/router/messages/index.ts | 75 ++++++++++++++++-------
 app/game-api/test/messagesRouter.test.ts  |  6 +-
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/app/game-api/src/router/messages/index.ts b/app/game-api/src/router/messages/index.ts
index 3ab42bde..67ac79d5 100644
--- a/app/game-api/src/router/messages/index.ts
+++ b/app/game-api/src/router/messages/index.ts
@@ -1,6 +1,9 @@
+import { randomUUID } from 'node:crypto';
+
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
-import { asRecord } from '@sammo-ts/common';
+import { asRecord, ChangeJournal } from '@sammo-ts/common';
+import { writeReadModelChangeJournal } from '@sammo-ts/infra';
 import type { UserSanctions } from '@sammo-ts/common/auth/gameToken';
 import { isMessageAccessBlocked } from '@sammo-ts/common/auth/sanctions';
 
@@ -9,7 +12,9 @@ import {
     accessLimitAuthedInputProcedure,
     accessWallAuthedInputProcedure,
     authedProcedure,
+    engineAuthedProcedure,
     router,
+    scopeApiInputEventRequestId,
     wallAuthedProcedure,
 } from '../../trpc.js';
 import {
@@ -32,6 +37,7 @@ import {
 import { getOwnedGeneral } from '../shared/general.js';
 import { resolveNationPermission } from '../nation/shared.js';
 import { respondToDiplomaticMessage } from '../../messages/diplomaticResponse.js';
+import { executeInputEvent } from '../../inputEventBoundary.js';
 
 const zMessageType = z.enum(['private', 'public', 'national', 'diplomacy']);
 
@@ -315,7 +321,7 @@ export const messagesRouter = router({
             markMessageMailboxes(ctx, [message.mailbox, ...(receiverMailbox === null ? [] : [receiverMailbox])]);
             return { ok: true, deletedIds };
         }),
-    respond: authedProcedure
+    respond: engineAuthedProcedure
         .input(
             z.object({
                 generalId: z.number().int().positive(),
@@ -346,29 +352,54 @@ export const messagesRouter = router({
                 }
                 return { result: commandResult.ok, reason: commandResult.reason };
             }
-            const result = await respondToDiplomaticMessage({
+            const ownsChangeJournal = !ctx.changeJournal;
+            const changeJournal = ctx.changeJournal ?? new ChangeJournal();
+            let journalPersisted = false;
+            const response = await executeInputEvent({
                 db: ctx.db,
-                actor: general,
-                messageId: input.messageId,
-                response: input.response,
+                requestId: scopeApiInputEventRequestId(ctx.requestId ?? randomUUID(), 'messages.respond.diplomatic', 0),
+                eventType: 'messages.respond.diplomatic',
+                payload: input,
+                actorUserId: ctx.auth?.user.id,
+                execute: async (transaction) => {
+                    const transactionContext = { ...ctx, db: transaction, changeJournal };
+                    const transactionGeneral = ownsChangeJournal
+                        ? await getOwnedGeneral(transactionContext, input.generalId)
+                        : general;
+                    const result = await respondToDiplomaticMessage({
+                        db: transaction,
+                        actor: transactionGeneral,
+                        messageId: input.messageId,
+                        response: input.response,
+                    });
+                    markMessageMailboxes(transactionContext, result.affectedMailboxes);
+                    for (const generalId of result.affectedGeneralRecordIds) {
+                        changeJournal.mark('records.general', generalId);
+                    }
+                    for (const nationId of result.affectedNationIds) {
+                        changeJournal.mark('nation.content', nationId);
+                    }
+                    for (const cityId of result.affectedCityIds) {
+                        changeJournal.mark('city.content', cityId);
+                    }
+                    if (result.affectedCityIds.length > 0) {
+                        changeJournal.mark('map.world');
+                    }
+                    if (result.affectedNationIds.length > 0 || result.affectedCityIds.length > 0) {
+                        changeJournal.mark('dashboard.global');
+                    }
+                    if (ownsChangeJournal) {
+                        journalPersisted = Boolean(
+                            await writeReadModelChangeJournal(transaction, changeJournal.snapshot())
+                        );
+                    }
+                    return { result: result.result, reason: result.reason };
+                },
             });
-            markMessageMailboxes(ctx, result.affectedMailboxes);
-            for (const generalId of result.affectedGeneralRecordIds) {
-                ctx.changeJournal?.mark('records.general', generalId);
+            if (journalPersisted) {
+                ctx.readModelOutbox?.wake();
             }
-            for (const nationId of result.affectedNationIds) {
-                ctx.changeJournal?.mark('nation.content', nationId);
-            }
-            for (const cityId of result.affectedCityIds) {
-                ctx.changeJournal?.mark('city.content', cityId);
-            }
-            if (result.affectedCityIds.length > 0) {
-                ctx.changeJournal?.mark('map.world');
-            }
-            if (result.affectedNationIds.length > 0 || result.affectedCityIds.length > 0) {
-                ctx.changeJournal?.mark('dashboard.global');
-            }
-            return { result: result.result, reason: result.reason };
+            return response;
         }),
     getOld: authedProcedure
         .input(
diff --git a/app/game-api/test/messagesRouter.test.ts b/app/game-api/test/messagesRouter.test.ts
index c359ad47..f16cedad 100644
--- a/app/game-api/test/messagesRouter.test.ts
+++ b/app/game-api/test/messagesRouter.test.ts
@@ -801,8 +801,11 @@ describe('messages router missing-flow compatibility', () => {
                 action,
                 reason: 'success',
             }));
+            const transaction = vi.fn(async () => {
+                throw new Error('ENGINE message response must not enter the API input-event transaction.');
+            });
             const { caller } = buildContext(
-                { $queryRaw: vi.fn(async () => [messageRow]) },
+                { $queryRaw: vi.fn(async () => [messageRow]), $transaction: transaction },
                 { turnDaemon: { requestCommand } }
             );
 
@@ -822,6 +825,7 @@ describe('messages router missing-flow compatibility', () => {
                     response: true,
                 })
             );
+            expect(transaction).not.toHaveBeenCalled();
         }
     );