Skip to content

Block stale OpenWorlds surfaces from play #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
100yenadmin merged 1 commit into from
Jun 3, 2026
Merged

Block stale OpenWorlds surfaces from play #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions viewer/openworlds/screen-table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,10 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
const appHealth = appStatus?.health || {};
const appFailureBucket = appReadiness.failure_bucket || appHealth.failure_bucket || "";
const appFailureDetail = appReadiness.failure_detail || appHealth.failure_detail || "";
const surfaceStatusBlocksPlay = surfaceStatus !== "ready";
const surfaceStatusBlockReason = surfaceStatus === "loading"
? "The live session surface is still loading."
: `Session surface unavailable: ${surfaceStatus}`;
const appStatusBlocksPlay = Boolean(
appStatus &&
appReadiness.ready_for_play === false &&
Expand All @@ -528,6 +532,8 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
? "No Dungeon Master provider is connected."
: "The live move lane is not ready."
);
const livePlayBlocked = surfaceStatusBlocksPlay || appStatusBlocksPlay;
const livePlayBlockReason = surfaceStatusBlocksPlay ? surfaceStatusBlockReason : appStatusBlockReason;

const loadSurface = React.useCallback(async (isCancelled = () => false) => {
const params = new URLSearchParams();
Expand Down Expand Up @@ -690,8 +696,8 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {

const postMove = async (move, label, actionId) => {
const enabledAction = actionId ? enabledActionById(actionId) : null;
if (!move || !canAct || appStatusBlocksPlay || pendingActive || (actionId && !enabledAction)) {
toast({ kind: "danger", title: "Action unavailable", body: pendingActive ? "The Dungeon Master is still narrating — one move at a time." : appStatusBlocksPlay ? appStatusBlockReason : readOnlyReason });
if (!move || !canAct || livePlayBlocked || pendingActive || (actionId && !enabledAction)) {
toast({ kind: "danger", title: "Action unavailable", body: pendingActive ? "The Dungeon Master is still narrating — one move at a time." : livePlayBlocked ? livePlayBlockReason : readOnlyReason });
return;
}
if (submittingRef.current) return; // already submitting this turn — drop the rapid double-fire
Expand Down Expand Up @@ -776,13 +782,13 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
// Route the click to the right handler so a stuck turn actually retries instead of no-op'ing.
const onDeclareClick = () => (pendingStuck ? retryStuck() : sendAction());
const declareNeedsDraft = !pendingStuck && !draftText;
const declareDisabled = !composerAction?.available || pendingActive || appStatusBlocksPlay || declareNeedsDraft;
const declareDisabled = !composerAction?.available || pendingActive || livePlayBlocked || declareNeedsDraft;
const declareTitle = !composerAction?.available
? `${composerMode.label} is unavailable: ${composerAction?.disabled_reason || readOnlyReason}`
: pendingActive
? (pendingFirstBeat ? "The Dungeon Master is composing your opening scene." : "The Dungeon Master is still narrating.")
: appStatusBlocksPlay
? appStatusBlockReason
: livePlayBlocked
? livePlayBlockReason
: pendingStuck
? "Re-send your last action to the Dungeon Master, or type a new one first."
: declareNeedsDraft
Expand All @@ -792,8 +798,8 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
? `${composerMode.label} unavailable`
: pendingActive
? "Wait for the Dungeon Master before declaring"
: appStatusBlocksPlay
? "Start or resume provider before declaring"
: livePlayBlocked
? "Reconnect live session before declaring"
: pendingStuck
? "Try action again"
: declareNeedsDraft
Expand Down Expand Up @@ -1026,7 +1032,7 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
actionId={a.id}
selected={COMPOSER_MODE_BY_UI[a.ui] === composerModeId}
tone={a.available ? "" : "crimson"}
disabled={!a.available || pendingActive || appStatusBlocksPlay}
disabled={!a.available || pendingActive || livePlayBlocked}
onClick={() => invokeAction(a)}
/>
))}
Expand All @@ -1047,7 +1053,7 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
hint={ACTION_HINTS[a.id]}
actionId={a.id}
tone={a.available ? "royal" : "crimson"}
disabled={!a.available || pendingActive || appStatusBlocksPlay}
disabled={!a.available || pendingActive || livePlayBlocked}
onClick={() => invokeAction(a)}
/>
))}
Expand Down Expand Up @@ -1075,10 +1081,10 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
</span>
<div style={{ flex: 1 }} />
{/* #337: dice buttons explain themselves on hover — a newbie didn't know d20/d12/d8/d6 ask the DM for a check. */}
<button type="button" data-worldos-testid="dice-button" data-worldos-die="20" aria-label="Roll d20" onClick={() => requestRoll(20)} title={DICE_HINT(20)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || appStatusBlocksPlay}>{window.OpenWorldsIcon?.has?.("dice.d20") && <window.OpenWorldsIcon id="dice.d20" size={13} />} d20</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="12" aria-label="Roll d12" onClick={() => requestRoll(12)} title={DICE_HINT(12)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || appStatusBlocksPlay}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d12</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="8" aria-label="Roll d8" onClick={() => requestRoll(8)} title={DICE_HINT(8)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || appStatusBlocksPlay}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d8</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="6" aria-label="Roll d6" onClick={() => requestRoll(6)} title={DICE_HINT(6)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || appStatusBlocksPlay}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d6</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="20" aria-label="Roll d20" onClick={() => requestRoll(20)} title={DICE_HINT(20)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || livePlayBlocked}>{window.OpenWorldsIcon?.has?.("dice.d20") && <window.OpenWorldsIcon id="dice.d20" size={13} />} d20</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="12" aria-label="Roll d12" onClick={() => requestRoll(12)} title={DICE_HINT(12)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || livePlayBlocked}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d12</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="8" aria-label="Roll d8" onClick={() => requestRoll(8)} title={DICE_HINT(8)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || livePlayBlocked}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d8</button>
<button type="button" data-worldos-testid="dice-button" data-worldos-die="6" aria-label="Roll d6" onClick={() => requestRoll(6)} title={DICE_HINT(6)} className="btn ghost sm" disabled={!actionById("check")?.available || pendingActive || livePlayBlocked}>{window.OpenWorldsIcon?.has?.("dice.roll") && <window.OpenWorldsIcon id="dice.roll" size={13} />} d6</button>
</div>
{/* #337: one-line hint under the action bar so a first-timer knows free-text + Declare is the core loop, distinct from the quick-action buttons. */}
<div className="body-xs muted" style={{ marginBottom: 6 }}>
Expand All @@ -1092,9 +1098,9 @@ function ScreenTable({ onNavigate, state, setState, liveSession }) {
value={input}
onChange={(e) => setInput(e.target.value)}
onKeyDown={(e) => e.key === "Enter" && onDeclareClick()}
disabled={pendingActive || appStatusBlocksPlay}
disabled={pendingActive || livePlayBlocked}
title={composerMode.inputTitle || DECLARE_HINT}
placeholder={pendingFirstBeat ? "The Dungeon Master is composing your opening scene…" : pendingActive ? "The Dungeon Master is narrating…" : pendingStuck ? "The DM seemed stuck — try again." : appStatusBlocksPlay ? "Start or resume a DM provider to play…" : (canAct ? composerMode.placeholder : `Read-only: ${readOnlyReason}`)}
placeholder={pendingFirstBeat ? "The Dungeon Master is composing your opening scene…" : pendingActive ? "The Dungeon Master is narrating…" : pendingStuck ? "The DM seemed stuck — try again." : livePlayBlocked ? "Reconnect the live session to play…" : (canAct ? composerMode.placeholder : `Read-only: ${readOnlyReason}`)}
style={{ ...inkInput, fontFamily: "var(--f-body)", fontSize: 16, opacity: pendingActive ? 0.6 : 1 }}
/>
<BrassButton onClick={onDeclareClick} title={declareTitle} disabled={declareDisabled} testId="move-submit" ariaLabel={declareAriaLabel}>{pendingFirstBeat ? "Composing…" : pendingActive ? "Narrating…" : pendingStuck ? "Try again" : "Declare"}</BrassButton>
Expand Down
16 changes: 10 additions & 6 deletions viewer/tests/test_openworlds_static.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,13 @@ def test_openworlds_table_blocks_moves_when_app_status_play_lane_not_ready(self)
self.assertIn("appReadiness.ready_for_play === false", source)
self.assertIn("Start or resume a provider-backed session from Chronicles", source)
self.assertIn("data-worldos-status-scope=\"app-status\"", source)
self.assertIn("appStatusBlocksPlay ? appStatusBlockReason : readOnlyReason", source)
self.assertIn("disabled={!a.available || pendingActive || appStatusBlocksPlay}", source)
self.assertIn("disabled={pendingActive || appStatusBlocksPlay}", source)
self.assertIn("const declareDisabled = !composerAction?.available || pendingActive || appStatusBlocksPlay || declareNeedsDraft", source)
self.assertIn("const surfaceStatusBlocksPlay = surfaceStatus !== \"ready\"", source)
self.assertIn("const livePlayBlocked = surfaceStatusBlocksPlay || appStatusBlocksPlay", source)
self.assertIn("livePlayBlocked ? livePlayBlockReason : readOnlyReason", source)
self.assertIn("disabled={!a.available || pendingActive || livePlayBlocked}", source)
self.assertIn("disabled={pendingActive || livePlayBlocked}", source)
self.assertIn("const declareDisabled = !composerAction?.available || pendingActive || livePlayBlocked || declareNeedsDraft", source)
self.assertIn('"Reconnect live session before declaring"', source)
self.assertIn("disabled={declareDisabled}", source)

def test_openworlds_table_bounds_and_anchors_the_chronicle(self):
Expand Down Expand Up @@ -927,14 +930,15 @@ def test_openworlds_table_action_buttons_select_declare_mode(self):
self.assertIn("kind: composerMode.kind", source)
self.assertIn("composerMode.placeholder", source)
self.assertIn("const declareNeedsDraft = !pendingStuck && !draftText", source)
self.assertIn("const declareDisabled = !composerAction?.available || pendingActive || appStatusBlocksPlay || declareNeedsDraft", source)
self.assertIn("const declareDisabled = !composerAction?.available || pendingActive || livePlayBlocked || declareNeedsDraft", source)
self.assertIn('title={declareTitle}', source)
self.assertIn('ariaLabel={declareAriaLabel}', source)
self.assertIn('!composerAction?.available', source)
self.assertIn('pendingActive', source)
self.assertIn('appStatusBlocksPlay', source)
self.assertIn('livePlayBlocked', source)
self.assertIn('"Wait for the Dungeon Master before declaring"', source)
self.assertIn('"Start or resume provider before declaring"', source)
self.assertIn('"Reconnect live session before declaring"', source)

def test_openworlds_table_immediate_actions_reset_stale_composer_mode(self):
# Fresh-player blocker: if Say was selected, clicking an immediate action like Continue
Expand Down
Loading