M5: genre-neutral authoritative narrative state, with review corrections
Replaces AI-DnD's RPG relative-delta world state with the genre-neutral typed
narrative state of ADR 010: explicit, absolute, allowlisted events proposed by
the model, validated by the application, applied to one authoritative document,
and snapshotted per position so restore stays a row read.
This commit includes the corrective pass that followed the independent review
in planning/reports/M5-IMPLEMENTATION-REPORT.md. The invariant it exists to
hold is:
visible active transcript position == stored head == authoritative state
Narrator editing (D10, STORY-BRANCH-SEMANTICS §§14-15)
A narrator edit no longer rewrites a row. It returns to the state before the
turn, takes the reader's exact text as the accepted narration, re-derives the
state that text implies, and becomes a new active continuation — while the
original narration keeps its words, its live flag and its whole future as
retained history. At the tip the correction is another take; with story below
it, it forks. No new history machinery: this is the existing fork/take/head
path with the reader's text in place of a generated reply. The §14A refusal
is therefore gone for narrator turns, and remains only for player input.
Pre-M5 positions
Migration 88 backfills the empty narrative document onto every action written
before M5, and a missing snapshot now restores the empty document instead of
leaving the previous position's state standing. Restoring to an old Save
Point no longer leaves a later position's entities and facts on screen.
Narrator context
Replayed history carries prose only; the machine-readable block is no longer
reconstructed into past turns, where it contradicted the authoritative state
in the same prompt. A fact withdrawn by a manual correction is now named as
no longer true, with the reader's reason, rather than silently dropped.
Also
- state_changes joins the action-list bulk read, removing one query per row.
- Extraction takes only the application's own protocol payload: an ordinary
```json or ```python block in a story survives, and a mangled proposal
still does not reach the reader.
Planning: ADR 013 records the authoritative document shape; §§14-15/14A, D10,
C04 and BUILD-MILESTONES are updated to describe what exists. Debt is recorded
against M8 (scenario editor UX) and M9 (export of the audit trail).
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PWU4gTfLYY6Qq9U7aa9Qw2
This commit is contained in:
co-authored by
Claude Opus 5
parent
62a997f364
commit
b7005e6fdd
@@ -33,7 +33,7 @@ from app.database import Base, SessionLocal, engine, get_db
|
||||
from app.main import app
|
||||
from app.routers import adventures
|
||||
|
||||
from fakes import GOLD_SCHEMA, ScriptedProvider, gold_replies, gold_reply
|
||||
from fakes import GOLD_SCHEMA, ScriptedProvider, gold_replies, gold_reply, tally_of, tally_reply
|
||||
|
||||
SCHEMA = GOLD_SCHEMA
|
||||
|
||||
@@ -170,10 +170,11 @@ def _branch_rows(adv_id) -> list[models.Branch]:
|
||||
db.close()
|
||||
|
||||
|
||||
def _script_state(adv_id) -> dict:
|
||||
def _tally(adv_id) -> int:
|
||||
"""The narrative-state instrument, as it stands at the active head."""
|
||||
db = SessionLocal()
|
||||
try:
|
||||
return (db.get(models.Adventure, adv_id).world_state or {}).get("player", {})
|
||||
return tally_of(db.get(models.Adventure, adv_id).narrative_state)
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
@@ -250,29 +251,29 @@ def test_the_head_comes_back_on_the_branch_it_was_left_on(client):
|
||||
def test_a_switch_in_the_copy_restores_what_that_branch_left_behind(client):
|
||||
"""This test justifies why the bundle carries after-snapshots.
|
||||
|
||||
The gold script adds ten a turn, so the stored gold total counts the
|
||||
turns behind it. A bundle that carried the actions but not the
|
||||
outcomes would import a tree that reads correctly but switches to the
|
||||
wrong state.
|
||||
Each line ends on its own recorded total. A bundle that carried the actions
|
||||
but not the outcomes would import a tree that reads correctly and then
|
||||
switches to the wrong state — which is exactly what M5's snapshot column
|
||||
had to be added to the bundle to prevent.
|
||||
"""
|
||||
original = _forked_story(client)
|
||||
# Play one more turn on the fork, so the two tips end up at
|
||||
# genuinely different totals. Turn for turn, both branches earn the
|
||||
# same gold, so a switch that restored nothing would still look right.
|
||||
ScriptedProvider.replies = [gold_reply("Further still.")]
|
||||
# Play one more turn on the fork, so the two tips end up at genuinely
|
||||
# different totals. If both lines ended on the same number, a switch that
|
||||
# restored nothing would still look right.
|
||||
ScriptedProvider.replies = [tally_reply("Further still.", 70)]
|
||||
_play(client, original, "press on")
|
||||
|
||||
per_branch = []
|
||||
for branch in _branches(client, original):
|
||||
_switch(client, original, branch["id"])
|
||||
per_branch.append(_script_state(original).get("gold"))
|
||||
per_branch.append(_tally(original))
|
||||
assert len(set(per_branch)) == len(per_branch), "the tips are at different totals"
|
||||
|
||||
copy = _imported(client, _export(client, original))
|
||||
restored = []
|
||||
for branch in _branches(client, copy):
|
||||
_switch(client, copy, branch["id"])
|
||||
restored.append(_script_state(copy).get("gold"))
|
||||
restored.append(_tally(copy))
|
||||
assert restored == per_branch
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user