From bd8377d87bf6a21181af556fffb150f92f2c9dc2 Mon Sep 17 00:00:00 2001
From: Quintine <15965533+Quintine@users.noreply.github.com>
Date: Mon, 16 Nov 2026 21:49:48 +1100
Subject: [PATCH] Support current battle choice promises and persistent notices
---
app/page.tsx | 52 +++--
components/actionable-notice.tsx | 18 ++
components/turn-action-fields.tsx | 38 +++-
components/turn-action-promises.tsx | 9 +-
docs/CURRENT_STATUS.md | 10 +
docs/RULE_DECISIONS.md | 9 +
docs/TRUTHTRANCE_TURN_ACTIONS.md | 16 ++
game/engine.ts | 49 ++++-
game/reference.ts | 1 +
game/truthtrance.ts | 13 +-
game/turn-action-promises.ts | 90 +++++++-
lib/actionable-notices.ts | 20 ++
tests/actionable-notice-queue.test.tsx | 49 +++++
...-turn-action-battle-choice-runtime.test.ts | 193 ++++++++++++++++++
...urn-action-battle-choice-controls.test.tsx | 75 +++++++
tests/turn-action-battle-choice-quote.test.ts | 74 +++++++
16 files changed, 684 insertions(+), 32 deletions(-)
create mode 100644 components/actionable-notice.tsx
create mode 100644 lib/actionable-notices.ts
create mode 100644 tests/actionable-notice-queue.test.tsx
create mode 100644 tests/truth-turn-action-battle-choice-runtime.test.ts
create mode 100644 tests/turn-action-battle-choice-controls.test.tsx
create mode 100644 tests/turn-action-battle-choice-quote.test.ts
diff --git a/app/page.tsx b/app/page.tsx
index f2368be5..50fd9f51 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,6 +1,7 @@
'use client';
-import { useState, useEffect, useCallback, useRef } from 'react';
+import { useState, useEffect, useCallback, useReducer, useRef } from 'react';
import { TableTalk } from '@/components/table-talk';
+import { ActionableNotice } from '@/components/actionable-notice';
import { RemovedRoomNotice } from '@/components/removed-room-notice';
import { GameTable } from '@/components/game-table';
import { SeatConfirmation, type SeatConfirmationKind } from '@/components/seat-confirmation';
@@ -10,6 +11,7 @@ import { TwoPlayerControls } from '@/components/two-player-controls';
import { FactionAllocation } from '@/components/faction-allocation';
import { FactionSwap } from '@/components/faction-swap';
import { randomId } from '@/lib/random-id';
+import { initialActionableNotices, updateActionableNotices } from '@/lib/actionable-notices';
import {
SeatHandoverSetup,
SeatHandoverClaim,
@@ -87,7 +89,10 @@ export default function Home() {
const [expansions, setExpansions] = useState([]);
const [name, setName] = useState('');
const [code, setCode] = useState('');
- const [notice, setNotice] = useState('');
+ const [noticeQueue, updateNoticeQueue] = useReducer(updateActionableNotices, initialActionableNotices);
+ const notice = noticeQueue.items[0] ?? null;
+ const setNotice = useCallback((text: string) => updateNoticeQueue({type:'enqueue',text}), []);
+ const dismissNotice = useCallback((id: number) => updateNoticeQueue({type:'dismiss',id}), []);
const [seatConfirmation, setSeatConfirmation] = useState(null);
const [entryConfirmation, setEntryConfirmation] = useState<{ kind: 'create' | 'join'; code: string } | null>(null);
const seatClaimUncertain = useRef(false);
@@ -113,7 +118,7 @@ export default function Home() {
removedRooms.current.add(room);
++epoch.current;
recovery.current = null; botAttempt.current = null;
- setRemovedRoom(room); setNeedsReconcile(false); setBotRecovery(false); setConnection(''); setNotice('');
+ setRemovedRoom(room); setNeedsReconcile(false); setBotRecovery(false); setConnection('');
}, []);
useEffect(() => subscribeRoomRemoval(markRoomRemoved), [markRoomRemoved]);
// This function is deliberately GET-only, including WebMCP reads and recovery.
@@ -352,7 +357,7 @@ export default function Home() {
return () => {
live = false;
};
- }, [refresh]);
+ }, [refresh, setNotice]);
useEffect(() => {
if (!roomCode || removedRoom === roomCode) return;
@@ -399,7 +404,6 @@ export default function Home() {
return;
const requestEpoch = ++epoch.current;
mutationPending.current = true;
- setNotice('');
setBusy(true);
try {
const data = await requestJson(roomEntryUrl(attempt), {
@@ -535,7 +539,6 @@ export default function Home() {
setEntryConfirmation(null);
setRemovedRoom(null);
setRestoreFailed(false);
- setNotice('');
window.history.replaceState(null, '', '/');
}
@@ -575,7 +578,6 @@ export default function Home() {
requestEpoch = epoch.current;
mutationPending.current = true;
setBusy(true);
- setNotice('');
try {
const data = await requestJson(`/api/rooms/${room}`, {
method: 'POST',
@@ -633,7 +635,6 @@ export default function Home() {
setGame(null);
setRestoring(true);
setRestoreFailed(false);
- setNotice('');
void refresh(room, true).catch((error: Error) => {
if (activeRoom.current === room && activeSeat.current === seat) {
setRestoreFailed(true);
@@ -649,7 +650,6 @@ export default function Home() {
const requestEpoch = epoch.current;
mutationPending.current = true;
setBusy(true);
- setNotice('');
let responseReceived = false;
try {
const data = await requestJson(`/api/rooms/${attempt.room}`, {
@@ -727,7 +727,6 @@ export default function Home() {
const data = await refresh(room, true);
if (restoreFailed && activeRoom.current === room) {
setRestoreFailed(false);
- setNotice('');
}
if (resumeBots) await advanceBots(data, true);
} catch (error) {
@@ -799,7 +798,6 @@ export default function Home() {
setNeedsReconcile(false);
setRestoreFailed(false);
setConnection('');
- setNotice('');
return true;
}
useEffect(() => {
@@ -837,6 +835,7 @@ export default function Home() {
if (showHandover)
return (
+
window.location.reload()}
onRestored={(view) => {
@@ -930,14 +929,14 @@ export default function Home() {
/>
- {!roomUnavailable && (notice || connection || needsReconcile || botRecovery) && (
-
);
// A first request is progress, not recovery. Keep the actionable recovery
@@ -1027,6 +1024,7 @@ export default function Home() {
{entryAttempt.kind === 'create' ? 'Creating your room…' : 'Joining the room…'}
Please wait.
+
);
@@ -1063,7 +1061,7 @@ export default function Home() {
not start a new attempt. No request is retried automatically.
{entryProblem && {entryProblem}
}
- {notice && {notice}}
+
{entryAttempt && (