JesseMarkowitzandClaude Opus 5
62a997f364
Closes M4. The review's three findings are fixed, the durability rule the specification always implied is now enforced, and M3's and M4's browser behaviour has been verified in a real browser for the first time. B-1 -- the Save Point list was an N+1 that loaded whole Action rows, narration included, to answer "does a row exist here". It is now one bulk two-column coordinate query plus one lineage: 53 SELECTs for 25 Save Points became 5, and the count no longer grows with the list. The clause is an OR of exact (branch, depth) pairs rather than two IN lists, because the cross product would report a Save Point resolved on the strength of another one's depth existing on this one's branch. A test builds exactly that trap. B-2 -- reclassified during closeout from "missing warning" to a behaviour defect, and fixed as one. STORY-BRANCH-SEMANTICS §19 says a named checkpoint remains until explicitly deleted, and §28 already required future cleanup to retain checkpoint-referenced paths; a cascade that silently removed Save Points with a branch violated both, and a warning would only have documented the violation. A branch a Save Point names can no longer be deleted. The request is refused with the offending Save Points named, the user deletes them explicitly -- which deletes no story -- and the branch then goes. The scope is the subtree, because deleting a branch takes its descendants. Both delete controls disable and explain. Recorded as a new §19.1; models.py, TECHNICAL-DESIGN §8.8 and DATA-MODEL §8 had all recorded the cascade as the rule and now record the refusal. An earlier pass in this same closeout had kept the cascade and added a warning. That was the wrong fix and its tests were replaced rather than left standing, since they pinned the defect. B-3 -- the D11/L03 automation never left one process, so it could not distinguish durable state from a live Python object. It now spawns real server processes, kills the first, and reads the campaign back with the second. C-5 -- creating a Save Point takes the campaign's turn lock. "Save where I am" has to name one committed position, and the head is what a turn in flight is about to move. Rename and Delete deliberately do not take it. The architecture is untouched: a Save Point is still name + note + (branch, depth), and restore is still coordinate -> head.move_to_node -> head.move_to -> attempts.restore_state. No second restore path, no state copied into a checkpoint, no fork on restore. Browser verification -- the first in this project, and it covers both milestones. Firefox 154.0.1 through geckodriver over the W3C WebDriver protocol, driving the rendered DOM: 47/47 checks, twice, on independent databases, no console errors. M3's Undo/Redo enable states, transcript movement, Retry and the take pager, divergence retiring Redo; M4's whole Save Point lifecycle, both confirmations, and the new branch-delete refusal including its recovery. No dependency was added: the WebDriver client is stdlib HTTP. No application defect was found by the browser. Four failures occurred, all in the harness -- a wrong SPA route, a wait comparing transcript length when the empty-story placeholder is longer than the first turn, a fixture deleting the branch it was reading, and a reload assertion that sampled once instead of waiting. The last was checked against the app before being called a harness bug. Tests: 698 backend pass (was 680), 60 M4, 94 M3 history, 66 export/ migrations, 93 security/local-only. Frontend lint and build clean, Docker build clean, loopback binding unchanged. No assertion weakened, no skip added. Planning: STORY-BRANCH-SEMANTICS §19.1 is the only behavioural change and it strengthens §19. V1-ACCEPTANCE-TESTS records D11-D14, I04, L03 and the E-series, keeping automated, live-runtime and browser evidence distinct, and weakens no pass condition. DATA-MODEL records the coordinate with the retry measurement that settles it. BROWSER-UX-SPEC rules for Moment over Turn. BUILD-MILESTONES marks M4 COMPLETE, closes M3's browser condition, and lists what M5 inherits. VERSION adds v2.6. No new ADR: ADR 005 already decides that history is preserved rather than overwritten, and §19.1 is that decision applied to checkpoint-referenced history. M4 is closed. M5 may now be briefed; it has not been started. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PWU4gTfLYY6Qq9U7aa9Qw2
64 lines
2.2 KiB
Python
64 lines
2.2 KiB
Python
"""The storyteller, run as a real OS process for `test_process_restart.py`.
|
|
|
|
Not a test module, and named so pytest does not collect it: it is the program
|
|
the test starts, twice, against one database file.
|
|
|
|
The model is replaced with a deterministic fake before the app is imported, so
|
|
the process needs no Ollama, no network and no configuration. Everything else —
|
|
the engine, the migrations, the routers, the session lifecycle — is the real
|
|
application, which is the whole point of spawning a process at all.
|
|
|
|
python _restart_server.py <db_path> <port>
|
|
"""
|
|
import itertools
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
HERE = Path(__file__).resolve().parent
|
|
sys.path.insert(0, str(HERE.parent)) # backend/, so `app` imports
|
|
sys.path.insert(0, str(HERE)) # tests/, so `fakes` imports
|
|
|
|
db_path, port = sys.argv[1], int(sys.argv[2])
|
|
os.environ["AIDND_DB_PATH"] = db_path
|
|
# A developer's shell may point these at Postgres, and `app.database` prefers
|
|
# either over the SQLite path. The suite's conftest clears them for the same
|
|
# reason; a spawned process does not inherit that, so clear them here too.
|
|
os.environ.pop("AIDND_DATABASE_URL", None)
|
|
os.environ.pop("DATABASE_URL", None)
|
|
|
|
from fakes import GOLD_PER_TURN, gold_reply # noqa: E402
|
|
|
|
_turn = itertools.count(1)
|
|
|
|
|
|
class DeterministicProvider:
|
|
"""Banks one turn's worth of gold per reply, numbered so text is checkable.
|
|
|
|
The same instrumentation `test_head_cursor.py` and `test_save_points.py`
|
|
use, for the same reason: it makes "the state at this position" a number the
|
|
test can assert rather than a paragraph it has to interpret. M5 replaces the
|
|
machinery underneath; what this measures is where the story is being read.
|
|
"""
|
|
|
|
last_usage = None
|
|
|
|
def __init__(self, *a, **k):
|
|
pass
|
|
|
|
async def generate(self, parts, *, temperature, max_tokens):
|
|
yield ("text", gold_reply(f"Beat {next(_turn)}."))
|
|
|
|
|
|
from app.routers.adventures import turns # noqa: E402
|
|
|
|
turns.OpenAICompatibleProvider = DeterministicProvider
|
|
|
|
from app.main import app # noqa: E402
|
|
|
|
if __name__ == "__main__":
|
|
import uvicorn
|
|
|
|
# Loopback only, as every supported start path does.
|
|
uvicorn.run(app, host="127.0.0.1", port=port, log_level="warning")
|