test: bump schema_version assertion to 13 (0012 embeddings + 0013 branches)

The Phase 1 single-bot ``record_turn_memory`` lingered next to the
unified ``record_turn_memory_for_present`` introduced in T84. Only test
fixtures still called the legacy entry point.

- Remove ``record_turn_memory`` from ``chat/services/memory_write.py``.
- Update the two test_memory_write.py callers to use
  ``record_turn_memory_for_present(..., guest_bot_id=None)``, which
  produces the same ``[you=1, host=1, guest=0]`` witness mask.

The unified API returns ``dict[bot_id, (event_id, memory_id)]``; tests
extract the host entry. No production callers were affected.

CLAUDE.md

@@ -174,13 +174,7 @@ Deferred to Phase 2: second bot, group node, scene configurations, witness filte
 
 ### Phase 1.5 cleanup backlog
 
-Small follow-ups identified during Phase 1 reviews. Pick up at any time; none are blocking.
+All items shipped — see Phase 2.5 status below.
-
-- **`open_db` refactor.** `chat/web/bots.py:get_conn()` duplicates the context-manager body to add `check_same_thread=False`. Extend `open_db(path, *, check_same_thread=True)` and have `get_conn` call it directly — eliminates the duplicated PRAGMA setup and ensures any future PRAGMA tweak only happens in one place.
-- **Regenerate broadcasts `turn_html` over SSE.** Currently a refresh is needed (see T29 limitation above). Mirror the broadcast logic from `chat/web/turns.py:post_turn` after the new `assistant_turn` lands.
-- **`bot_reset` purges orphaned "you" activity rows** (see limitation above). Either delete `activity` rows by chat-membership or accept the noise indefinitely; the projection-layer fix is one extra `DELETE FROM activity WHERE entity_id='you' AND container_id IN (SELECT id FROM containers WHERE chat_id IN (...))` clause inside `_apply_bot_reset`.
-- **Drawer edits for the deferred v1 fields**: edge_trust slider, edge_summary textarea, memory pov_summary textarea, knowledge_facts add/remove. The `manual_edit` projector already supports `edge_trust` / `edge_summary` / `memory_pov_summary` target_kinds — only the routes are missing. Knowledge_facts needs a new dispatch branch.
-- **NICE trim order in prompt assembly** drops previous-scene first instead of last (T18 review). Greedy-cuts heuristic vs spec listing order; revisit if v1 play surfaces a real regression.
 
 ## Phase 2 status
 
@@ -194,15 +188,102 @@ Phase 2 shipped end-to-end across **13 tasks** (T36–T48 wave). The multi-entit
 
 ### Phase 2.5 / 3 backlog
 
-Carry-overs from Phase 2 reviews and implementer notes. None are blocking; pick up at any time.
+All items shipped — see Phase 2.5 status below.
 
-- **Interjection regenerate**: regenerate currently only acts on the addressee turn. Phase 2.5 should extend regenerate to cover the interjection turn too.
+## Phase 2.5 status
-- **Classifier-based addressee detection**: substring match is brittle (e.g., names that are common English words, or names appearing inside a quoted aside). A small classifier call could disambiguate.
+
-- **LLM-merged group meta-summary**: current `group_node.summary` is a naive concat of host + guest per-POV summaries. Phase 2.5 should polish with an LLM-merged group view.
+Phase 2.5 cleanup shipped end-to-end across 8 tasks (T68–T75). Two CLAUDE.md backlogs (Phase 1.5 cleanup, Phase 2.5/3) are now empty; deferred follow-ups discovered during execution are tracked in a new "Phase 2.6 / 3 backlog" section below.
-- **First-meeting gate**: the drawer's "have they met?" textarea fires every time. Phase 2.5 should check whether the host→guest edge already exists and offer a "they already know each other" toggle to skip re-seeding.
+
-- **Witness flag editing**: drawer doesn't allow editing memory witness flags (read-only). Phase 2.5+ may expose this.
+- **`open_db` with check_same_thread parameter (T68)**: refactored `chat/db/connection.py` so `chat/web/bots.py:get_conn` no longer duplicates the PRAGMA setup. Default behavior preserved.
-- **Significance for interjection memories**: the interjection's `memory_written` event doesn't enqueue a `SignificanceJob` (per the T44 implementer note). Phase 2.5 should wire this in so interjection memories are scored alongside primary turns.
+- **`bot_reset` cross-chat cleanup (T69)**: now purges orphaned "you" activity rows. Note: this also fixed a latent FK constraint crash that was lurking in the projector — `activity.container_id` is FK-referenced and the prior code would have crashed on any reset of a bot whose chat had a non-NULL `container_id` "you" activity row. The bug was masked because no prior test seeded such a row.
-- **Stale guest reference defensive degrade in `post_turn`**: T44 added a degrade-to-1:1 when `chat.guest_bot_id` points at a deleted bot. T47 fixes the root cause (resets clear the reference); the degrade can probably be removed but is harmless.
+- **LLM-merged group meta-summary (T70)**: replaces Phase 2 T45's naive concat with a classifier merge call. Falls back to the naive concat on classifier failure.
-- **Scene close on cancel**: scene close runs even when the primary turn is cancelled. Behavior may be intentional but could be argued either way; revisit if it surfaces a real UX regression.
+- **`prompt.py` polish (T71)**: witness role parametric (`host` vs `guest` derived from chat membership); single `ACTIVITIES:` block with bullet-level trim; NICE trim order kept with documented rationale (greedy cheapest-impact-first beats spec-listing order in practice).
-- **Dual `ACTIVITIES:` block**: T43's prompt assembly adds a second `ACTIVITIES:` block for guest activity. Cleaner would be a single block with three bullets and per-bullet trim.
+- **Drawer polish (T72)**: deferred v1 edits (edge_trust slider, edge_summary textarea, memory pov_summary textarea, knowledge_facts add/remove) + first-meeting gate (Add-guest form disables prose textarea when host→guest edge already exists; "re-seed anyway" toggle re-enables) + witness flag inline-edit (per-memory checkboxes for [you, host, guest] flags). Two new `manual_edit` projector branches: `edge_knowledge_fact` and `memory_witness`.
-- **Witness role hardcoded in prompt assembly**: `chat/services/prompt.py:436` hardcodes `witness_role="host"` regardless of which bot is speaking. Phase 2.5 should derive the role from chat membership (e.g. `"host" if speaker_bot_id == chat.host_bot_id else "guest"`) so guest-as-speaker prompts retrieve the right memory slice. Test contract pinned in `tests/test_witness_filter_multi.py`.
+- **Regenerate polish (T73)**: regenerate now broadcasts `turn_html_replace` over SSE (NEW event distinct from `turn_html` to avoid breaking the existing append-semantic consumer); regenerate covers interjection turns (re-detects + re-streams or supersedes); defensive stale-guest degrade removed.
+- **Turn-flow polish + addressee service (T74)**: classifier-based addressee detection (substring helper kept as no-guest fast path); SignificanceJob enqueued for interjection memories; scene-close-on-cancel pinned with comment + regression test (close detection is genuinely user-prose-only); defensive stale-guest degrade removed.
+
+### Phase 2.6 / 3 backlog
+
+All items shipped — see Phase 3.5 status below.
+
+## Phase 3 status
+
+Phase 3 shipped end-to-end across 19 tasks (T49–T67). Events with full lifecycle, time skips, active threads, significance refinements, and meanwhile scenes are functional. Schema baseline is now version 11 (migrations 0009 events, 0010 threads, 0011 meanwhile_scenes). Test count grew from ~247 (Phase 2) to ~315 (+68 new tests across the wave).
+
+- **Wave 1 — schema + lifecycle handlers (parallel)**:
+  - **T49** `events` table + lifecycle handlers (`event_planned`, `event_started`, `event_completed`, `event_cancelled`, `event_expired`).
+  - **T50** `time_skip` event handlers (elision and jump variants).
+  - **T51** `threads` table + handlers (`thread_opened`, `thread_updated`, `thread_closed`).
+- **Wave 2 — detection / narration services (parallel)**:
+  - **T52** event-lifecycle detection service (planned→active→completed transitions inferred from narration).
+  - **T53** skip narration service (elision + jump prose).
+  - **T54** synthesized-memories service for jump skips (LLM-summarized intervening time).
+  - **T55** thread-detection service (open/update/close inferred from recent dialogue).
+- **Wave 3 — promotion + ranking (parallel)**:
+  - **T56** event-completion promotion service (objects → inventory, knowledge → edge knowledge, relationship deltas → edge summary; everything else stays in the closed event).
+  - **T57** significance-aware retrieval ranking — SQL-side `SIGNIFICANCE_RANK_BIAS` plus the existing Python composite re-rank.
+  - **T58** scene compression keeps key quotes when significance ≥ 2; thread emission piggybacks on scene close.
+- **Wave 4 — drawer UX (single)**:
+  - **T59** drawer additions: events panel, threads panel, skip controls.
+- **Wave 5a — prompt + turn flow integration (parallel)**:
+  - **T60** prompt assembly includes active events + open threads in the speaker's prompt.
+  - **T61** turn flow invokes event-detection + completion promotion alongside existing post-turn fan-out.
+- **Wave 5b — natural-language skip surface (single)**:
+  - **T62** classifier-driven skip command at the user-input layer; shared skip controllers extracted into `chat/web/skip.py`.
+- **Wave 6a — meanwhile schema (single)**:
+  - **T63** meanwhile-scene schema + state (scene config 4: host+guest, no "you").
+- **Wave 6b — meanwhile turn flow (parallel)**:
+  - **T64** meanwhile turn flow (host+guest, no "you" in the prompt or witness writes).
+  - **T65** meanwhile summary digest surfaces to the next "you"-present scene.
+- **Wave 7 — integration + docs (parallel)**:
+  - **T66** cross-feature integration tests covering events × skips × threads × meanwhile.
+  - **T67** documentation (this section).
+
+### Phase 3.5 / 4 backlog
+
+All items shipped — see Phase 3.5 status below.
+
+## Phase 3.5 status
+
+Phase 3.5 cleanup shipped end-to-end across 12 tasks (T76–T87). Two CLAUDE.md backlogs (Phase 2.6/3, Phase 3.5/4) are now empty; deferred follow-ups discovered during execution are tracked in a new "Phase 3.6 / 4 backlog" section below. Test count grew from 315 (Phase 3) to 343 (+28 new tests).
+
+- **Wave 1 — trivial polish (parallel)**:
+  - **T76** `narrate_skip` `timeout_s` plumbed through to `client.generate`.
+  - **T77** `AddresseeDecision.confidence` typed as `Literal["high","medium","low"]`.
+  - **T78** `search_memories` docstring notes SQL-side significance bias (`SIGNIFICANCE_RANK_BIAS`).
+  - **T79** `_witness_role_for` defensive `host_bot_id is None` handling (returns `"host"` for Phase-1 chats).
+- **Wave 2 — scene_summarize polish (single)**:
+  - **T80** five T58 follow-ups: re-close suffix bloat guard, transcript scoping by scene, swallowed-exception logging in `detect_threads`, chat-clock `closed_at`, and three new tests covering T58 gaps (200-char truncation, `thread_updated`/`thread_closed` candidate paths, try/except fallback).
+- **Wave 3 — typed exception (single)**:
+  - **T81** `ChatNotFoundError` replaces string-prefix sniff in skip routes; mapped to 404 (vs 400 for other `ValueError` cases).
+- **Wave 4 — turn-flow wiring (single)**:
+  - **T82** `consume_pending_meanwhile_digests` wired into `post_turn` (closes T66 gap; meanwhile digests no longer pile up); natural-language skip dispatch now runs scene close detection first.
+- **Wave 5 — regenerate polish (single)**:
+  - **T83** five sub-fixes — cancel/stop hook (regenerate registers stream task in `_in_flight_tasks`); DRY extraction of `read_recent_dialogue` and `gather_prior_edges` into `chat/services/turn_common.py`; chat-scoped sibling-assistant-turn lookup; lifecycle-rollback warning log on regenerate; ordering-symmetry comment between post_turn and regenerate event-detection paths.
+- **Wave 6 — final polish (parallel)**:
+  - **T84** unified `record_turn_memory` API with `you_present` kwarg; `record_meanwhile_memory` becomes a thin wrapper.
+  - **T85** JSON-build audit (no findings) + meanwhile cancel route-level test.
+  - **T86** frontend `turn_html_replace` SSE handler + turn_id stamping on rendered HTML so the in-place swap actually works.
+
+### Phase 3.6 / 4 backlog
+
+New follow-ups discovered during Phase 3.5 reviews and execution. None are blocking; pick up at any time.
+
+#### From T80 review
+
+- **`read_recent_dialogue` chat-id pushdown**: helper filters `chat_id` post-fetch in Python. Could push the `json_extract(payload_json, '$.chat_id') = ?` predicate into SQL (matching T83.3's pattern) for tighter LIMIT semantics. Currently a chat-with-many-other-chats can have its 50-row LIMIT consumed by foreign rows.
+- **Lifecycle warning wording in regenerate**: T83.4's warning log lists ALL lifecycle event ids that exist after the original `assistant_turn` id, not just ones produced by the superseded turn. For the typical "regenerate the most recent" flow these are identical, but if a user regenerates an OLDER turn, the warning will list intervening-turn lifecycle events that legitimately stand. Tighten warning wording to "lifecycle transitions at-or-after turn X" (operator-friendly); a code-level fix would require a schema change to add explicit back-reference from lifecycle events to their producing turn.
+
+#### From T84 review
+
+- **`record_turn_memory` legacy single-bot function** still exists alongside the unified `record_turn_memory_for_present`. Could be consolidated in a follow-up.
+
+#### From T86 fix-up
+
+- **Test fixtures + `tests/test_phase3_integration.py`** that seed turns directly via `append_event`+`project` may need updating once any new test asserts the rendered HTML carries the new turn ids end-to-end. Existing tests pass because they don't read the stamped attribute, but they're brittle if the contract evolves.
+
+#### Deferred items (carry-over)
+
+- **Scene-close-on-cancel UX revisit** (Phase 2.5 carry-over): T74.3 pinned the existing behavior; revisit if real play-testing surfaces a regression.
+- **Cross-feature canned-queue brittleness**: meanwhile-scene close test required a canned response for T65's digest call after T64+T65 merge. Future close-path additions will keep extending the queue. Consider a structured fixture builder rather than positional canned arrays. NOT addressed in Phase 3.5.
+- **Lifecycle-transition rollback in regenerate**: T83.4 added a warning log; actual rollback (with proper schema linkage from lifecycle event back to producing turn) is Phase 4 work.

chat/db/connection.py

@@ -5,9 +5,9 @@ from pathlib import Path
 
 
 @contextmanager
-def open_db(path: Path):
+def open_db(path: Path, *, check_same_thread: bool = True):
     path.parent.mkdir(parents=True, exist_ok=True)
-    conn = sqlite3.connect(path)
+    conn = sqlite3.connect(path, check_same_thread=check_same_thread)
     conn.execute("PRAGMA journal_mode=WAL")
     conn.execute("PRAGMA foreign_keys=ON")
     try:

chat/db/migrations/0009_events.sql

@@ -0,0 +1,14 @@
+CREATE TABLE events (
+    id INTEGER PRIMARY KEY,
+    event_id TEXT NOT NULL UNIQUE,
+    chat_id TEXT NOT NULL,
+    kind TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'planned',
+    props_json TEXT NOT NULL DEFAULT '{}',
+    planned_for TEXT,
+    started_at TEXT,
+    completed_at TEXT,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+CREATE INDEX events_chat_idx ON events(chat_id, status);

chat/db/migrations/0010_threads.sql

@@ -0,0 +1,14 @@
+CREATE TABLE threads (
+    id INTEGER PRIMARY KEY,
+    thread_id TEXT NOT NULL UNIQUE,
+    chat_id TEXT NOT NULL,
+    title TEXT NOT NULL,
+    summary TEXT NOT NULL DEFAULT '',
+    status TEXT NOT NULL DEFAULT 'open',
+    opened_at TEXT NOT NULL DEFAULT (datetime('now')),
+    closed_at TEXT,
+    last_referenced_scene_id INTEGER,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+CREATE INDEX threads_chat_status_idx ON threads(chat_id, status);

chat/db/migrations/0011_meanwhile_scenes.sql

@@ -0,0 +1,27 @@
+-- T63: Meanwhile scene support — extend scenes with a present-set discriminator
+-- and a parent link (you-scene -> meanwhile child), plus a pending-digest queue.
+--
+-- Existing scenes table (0007) has columns:
+--   id, chat_id, container_id, started_at, ended_at, significance,
+--   participants_json
+-- It has no `status` / `closed_at` columns. We treat `ended_at IS NULL` as
+-- "active" and `ended_at IS NOT NULL` as "closed" — consistent with the
+-- existing scene_opened/scene_closed handlers.
+
+ALTER TABLE scenes ADD COLUMN present_set_kind TEXT NOT NULL DEFAULT 'you_host';
+ALTER TABLE scenes ADD COLUMN parent_scene_id INTEGER;
+
+CREATE INDEX scenes_present_set_idx
+    ON scenes(chat_id, present_set_kind, ended_at);
+
+CREATE TABLE meanwhile_digest_pending (
+    id INTEGER PRIMARY KEY,
+    scene_id INTEGER NOT NULL,
+    chat_id TEXT NOT NULL,
+    summary TEXT NOT NULL,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    consumed_at TEXT
+);
+
+CREATE INDEX meanwhile_digest_chat_idx
+    ON meanwhile_digest_pending(chat_id) WHERE consumed_at IS NULL;

chat/db/migrations/0012_embeddings.sql

@@ -0,0 +1,14 @@
+-- Embeddings stored as JSON arrays (pure-Python cosine at query time).
+-- Phase 4.5+ may swap to sqlite-vec when the host Python supports
+-- loadable extensions; the schema is intentionally simple to make that
+-- migration straightforward.
+CREATE TABLE embeddings (
+    memory_id INTEGER PRIMARY KEY,
+    vector_json TEXT NOT NULL,   -- JSON array of floats, length = dim
+    model TEXT NOT NULL,
+    dim INTEGER NOT NULL,
+    indexed_at TEXT NOT NULL DEFAULT (datetime('now')),
+    FOREIGN KEY (memory_id) REFERENCES memories(id)
+);
+
+CREATE INDEX embeddings_model_idx ON embeddings(model);

chat/db/migrations/0013_branches.sql

@@ -0,0 +1,17 @@
+CREATE TABLE branches (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL UNIQUE,
+    origin_event_id INTEGER NOT NULL,
+    head_event_id INTEGER NOT NULL,
+    chat_id TEXT,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    is_active INTEGER NOT NULL DEFAULT 0
+);
+
+-- Exactly one row may have is_active = 1 at any time.
+CREATE UNIQUE INDEX branches_active_idx ON branches(is_active) WHERE is_active = 1;
+
+-- Bootstrap the main branch. origin_event_id=0 + head_event_id=0 are
+-- placeholder seeds; the orchestrator updates head as new events land.
+INSERT INTO branches (name, origin_event_id, head_event_id, is_active)
+VALUES ('main', 0, 0, 1);

chat/services/addressee.py

@@ -0,0 +1,110 @@
+"""Addressee classifier service (T74.1).
+
+Phase 2 (T44) detected the addressee — host vs. guest — with a simple
+case-insensitive whole-word substring match against the bots' names.
+That worked for the obvious case ("BotB, what do you think?") but lost
+the long tail: pronouns, paraphrases, indirect address, narrative
+focus on a particular party. T74.1 swaps the substring helper for a
+classifier call that reads the prose holistically.
+
+The substring helper in :mod:`chat.web.turns` is kept as a fast-path
+for the no-guest case (only one bot present means there is nothing to
+classify) and as a non-breaking fallback for the regenerate path. The
+multi-entity branch in :func:`chat.web.turns.post_turn` calls
+:func:`detect_addressee` from this module.
+
+Failure mode: classifier flake or low-confidence response degrades to
+the host (the default speaker per Phase 2's host-keeps-the-floor
+bias). The decision carries ``confidence`` and ``reason`` so callers
+that want to log degraded decisions can distinguish a real "host" call
+from a fallback.
+"""
+
+from __future__ import annotations
+
+from typing import Literal
+
+from pydantic import BaseModel
+
+from chat.llm.classify import classify
+from chat.llm.client import LLMClient
+
+
+class AddresseeDecision(BaseModel):
+    """Which present bot the user is addressing.
+
+    ``addressee_id`` is the chosen bot's id. ``confidence`` is one of
+    ``"high"`` / ``"medium"`` / ``"low"`` — callers may treat ``"low"``
+    as a soft fallback to the host. ``reason`` is a short free-form
+    string. The classifier-failure fallback uses ``reason="fallback"``
+    so it's distinguishable from a real low-confidence call.
+    """
+
+    addressee_id: str
+    confidence: Literal["high", "medium", "low"] = "medium"
+    reason: str = ""
+
+
+_SYSTEM = (
+    "Given a user's turn prose and the names of present bots, decide "
+    "which bot the user is addressing. If the user is speaking to no "
+    "specific bot (descriptive narration, action without dialogue), "
+    "default to the host. Output strict JSON matching the schema. "
+    "The addressee_id MUST be one of the ids supplied in the user "
+    "message — do not invent ids."
+)
+
+
+async def detect_addressee(
+    client: LLMClient,
+    *,
+    classifier_model: str,
+    user_prose: str,
+    host_id: str,
+    host_name: str,
+    guest_id: str | None,
+    guest_name: str | None,
+    timeout_s: float = 30.0,
+) -> AddresseeDecision:
+    """Classify which present bot the user is addressing.
+
+    Defaults to host on classifier failure or when the classifier picks
+    an id that isn't one of the supplied ids. The caller is expected to
+    only invoke this in the multi-entity case (a guest is present);
+    when no guest is present the substring fast-path in
+    :mod:`chat.web.turns` is used instead and this function is not
+    called.
+    """
+    fallback = AddresseeDecision(
+        addressee_id=host_id, confidence="low", reason="fallback"
+    )
+    user = (
+        f"Host: {host_name} (id={host_id})\n"
+        + (
+            f"Guest: {guest_name} (id={guest_id})\n"
+            if guest_id is not None
+            else ""
+        )
+        + f"\nUser prose:\n{user_prose}"
+    )
+    decision = await classify(
+        client,
+        model=classifier_model,
+        system=_SYSTEM,
+        user=user,
+        schema=AddresseeDecision,
+        default=fallback,
+        timeout_s=timeout_s,
+    )
+    # Defensive: if the classifier returned an id outside the supplied
+    # set, treat it as a fallback to the host. This catches pathological
+    # outputs that pass schema validation but pick a phantom id.
+    valid_ids = {host_id}
+    if guest_id is not None:
+        valid_ids.add(guest_id)
+    if decision.addressee_id not in valid_ids:
+        return fallback
+    return decision
+
+
+__all__ = ["AddresseeDecision", "detect_addressee"]

chat/services/event_lifecycle.py

@@ -0,0 +1,72 @@
+"""Event-lifecycle detection (T52).
+
+After each turn, classify whether any active events transitioned
+(started, completed, cancelled). Conservative bias — most turns
+return empty. T61 turn flow appends one event_started/completed/
+cancelled per transition via append_and_apply.
+"""
+
+from __future__ import annotations
+from pydantic import BaseModel, Field
+
+from chat.llm.classify import classify
+from chat.llm.client import LLMClient
+
+
+class EventTransition(BaseModel):
+    event_id: str
+    new_status: str  # "active" | "completed" | "cancelled"
+    reason: str = ""
+
+
+class EventLifecycleDecision(BaseModel):
+    transitions: list[EventTransition] = Field(default_factory=list)
+
+
+_SYSTEM = (
+    "You decide whether any active events transitioned this turn. "
+    "STRONGLY default to empty transitions — most turns do NOT resolve "
+    "or start a known event. Output only transitions that the narrative "
+    "text clearly resolves or starts. Each transition MUST reference an "
+    "event_id from the active_events list. new_status is one of "
+    "'active' (planned -> active), 'completed', or 'cancelled'. "
+    "Output strict JSON matching the schema."
+)
+
+
+async def detect_event_transitions(
+    client: LLMClient,
+    *,
+    classifier_model: str,
+    narrative_text: str,
+    active_events: list[dict],   # [{event_id, kind, status, props}, ...]
+    timeout_s: float = 30.0,
+) -> EventLifecycleDecision:
+    """Classify event transitions for the latest turn. Empty active_events
+    short-circuits without an LLM call."""
+    if not active_events:
+        return EventLifecycleDecision()
+
+    user_lines = ["Active events:"]
+    for ev in active_events:
+        user_lines.append(
+            f"- event_id={ev['event_id']} kind={ev['kind']} "
+            f"status={ev['status']} props={ev.get('props', {})}"
+        )
+    user_lines.append("")
+    user_lines.append("Latest narrative:")
+    user_lines.append(narrative_text.strip())
+    user = "\n".join(user_lines)
+
+    return await classify(
+        client,
+        model=classifier_model,
+        system=_SYSTEM,
+        user=user,
+        schema=EventLifecycleDecision,
+        default=EventLifecycleDecision(),
+        timeout_s=timeout_s,
+    )
+
+
+__all__ = ["EventTransition", "EventLifecycleDecision", "detect_event_transitions"]

chat/services/event_promotion.py

@@ -0,0 +1,149 @@
+"""Event-completion promotion (T56).
+
+When an event reaches ``status='completed'``, read its ``props_json``
+and emit promotion events into the appropriate state stores.
+Synchronous, no LLM. Skips when the event status is not ``completed``
+(cancelled / expired terminate the event without promoting).
+
+Props recognized:
+
+- ``acquired_objects: list[str]`` — emits a ``manual_edit`` with
+  ``target_kind="memory_pov_summary"`` per object on the host's memory
+  row, recording the acquisition. Phase 3 is a stub: it requires both
+  ``host_bot_id`` and ``host_memory_id`` (an existing memories.id) to
+  be present in props; missing either skips that object cleanly.
+  Phase 4 will introduce a real inventory schema.
+
+- ``knowledge_facts: list[{owner_id, target_id, fact}]`` — emits an
+  ``edge_update`` event on the directed ``owner_id -> target_id`` edge
+  with the fact appended to ``knowledge_facts``. The ``edge_update``
+  projector accepts ``knowledge_facts`` as a list and extends the
+  edge's stored ``knowledge_json``.
+
+- ``relationship_change: {summary, source_id, target_id}`` — emits a
+  ``manual_edit`` with ``target_kind="edge_summary"`` overwriting the
+  edge's ``summary`` field on the directed pair.
+
+Anything else stays in the closed event record (the projector kept
+the row; no further promotion).
+"""
+
+from __future__ import annotations
+
+from sqlite3 import Connection
+
+from chat.eventlog.log import append_and_apply
+from chat.state.events import get_event
+
+
+def promote_completed_event(
+    conn: Connection,
+    *,
+    event_id: str,
+    chat_id: str,
+    chat_clock_at: str | None,
+) -> dict:
+    """Read the completed event's props and emit promotion events.
+
+    Returns a dict of counts keyed by promoted artifact:
+    ``{"acquired_objects", "knowledge_facts", "relationship_change"}``.
+    Skips silently if the event row is missing or its status is not
+    ``completed`` — cancelled / expired events terminate without any
+    promotion.
+    """
+    counts = {
+        "acquired_objects": 0,
+        "knowledge_facts": 0,
+        "relationship_change": 0,
+    }
+
+    event = get_event(conn, event_id)
+    if event is None or event["status"] != "completed":
+        return counts
+
+    props = event.get("props") or {}
+
+    # acquired_objects: each becomes a memory_pov_summary edit (Phase 3
+    # stub). The manual_edit projector requires a valid memory rowid as
+    # ``target_id`` (it does ``int(target_id)``), so skip cleanly when
+    # neither a host_bot_id nor a host_memory_id is supplied.
+    host_bot_id = props.get("host_bot_id")
+    host_memory_id = props.get("host_memory_id")
+    for obj in props.get("acquired_objects", []) or []:
+        if host_bot_id is None or host_memory_id is None:
+            continue
+        append_and_apply(
+            conn,
+            kind="manual_edit",
+            payload={
+                "target_kind": "memory_pov_summary",
+                "target_id": host_memory_id,
+                "owner_id": host_bot_id,
+                "chat_id": chat_id,
+                "prior_value": "",
+                "new_value": f"Acquired: {obj}",
+                "source": "event_promotion",
+                "event_id": event_id,
+                "chat_clock_at": chat_clock_at,
+            },
+        )
+        counts["acquired_objects"] += 1
+
+    # knowledge_facts: each becomes an edge_update appending the fact.
+    for fact_entry in props.get("knowledge_facts", []) or []:
+        owner_id = fact_entry.get("owner_id")
+        target_id = fact_entry.get("target_id")
+        fact = fact_entry.get("fact", "")
+        if not owner_id or not target_id or not fact:
+            continue
+        append_and_apply(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": owner_id,
+                "target_id": target_id,
+                "chat_id": chat_id,
+                "affinity_delta": 0,
+                "trust_delta": 0,
+                "knowledge_facts": [fact],
+                "last_interaction_at": chat_clock_at,
+                "last_interaction_chat_id": chat_id,
+                "source": "event_promotion",
+                "event_id": event_id,
+            },
+        )
+        counts["knowledge_facts"] += 1
+
+    # relationship_change: edge_summary manual_edit on the directed pair.
+    # The manual_edit projector for ``edge_summary`` keys on a
+    # ``target_id`` dict ``{source_id, target_id}`` (see
+    # chat/state/manual_edit.py); we shape the payload to match.
+    rc = props.get("relationship_change") or {}
+    if rc:
+        source_id = rc.get("source_id")
+        rc_target_id = rc.get("target_id")
+        summary = rc.get("summary", "")
+        if source_id and rc_target_id and summary:
+            append_and_apply(
+                conn,
+                kind="manual_edit",
+                payload={
+                    "target_kind": "edge_summary",
+                    "target_id": {
+                        "source_id": source_id,
+                        "target_id": rc_target_id,
+                    },
+                    "chat_id": chat_id,
+                    "prior_value": "",
+                    "new_value": summary,
+                    "source": "event_promotion",
+                    "event_id": event_id,
+                    "chat_clock_at": chat_clock_at,
+                },
+            )
+            counts["relationship_change"] += 1
+
+    return counts
+
+
+__all__ = ["promote_completed_event"]

chat/services/memory_write.py

@@ -22,62 +22,6 @@ from sqlite3 import Connection
 from chat.eventlog.log import append_and_apply
 
 
-def record_turn_memory(
-    conn: Connection,
-    *,
-    chat_id: str,
-    host_bot_id: str,
-    narrative_text: str,
-    scene_id: int | None = None,
-    chat_clock_at: str | None = None,
-    source: str = "direct",
-    significance: int = 1,
-) -> tuple[int, int | None]:
-    """Append a ``memory_written`` event for the host bot's POV of this turn.
-
-    Uses :func:`chat.eventlog.log.append_and_apply` (not raw
-    :func:`append_event`) so the new memory row is projected immediately
-    without re-running prior non-idempotent handlers (e.g. ``edge_update``
-    deltas).
-
-    Returns ``(event_id, memory_id)``. ``event_id`` is the row id of the
-    just-appended ``memory_written`` event in ``event_log``. ``memory_id``
-    is the autoincrement PK of the corresponding ``memories`` row — these
-    are *different* numbers (event_log and memories use independent
-    rowid sequences) so callers needing to update significance or pin
-    state must use ``memory_id``. Falls back to ``None`` if the projected
-    row can't be located, which shouldn't happen but keeps the return
-    shape stable.
-    """
-    payload: dict = {
-        "owner_id": host_bot_id,
-        "chat_id": chat_id,
-        "pov_summary": narrative_text,
-        "witness_you": 1,
-        "witness_host": 1,
-        "witness_guest": 0,
-        "source": source,
-        "reliability": 1.0,
-        "significance": significance,
-        "pinned": 0,
-        "auto_pinned": 0,
-    }
-    if scene_id is not None:
-        payload["scene_id"] = scene_id
-    if chat_clock_at is not None:
-        payload["chat_clock_at"] = chat_clock_at
-
-    event_id = append_and_apply(conn, kind="memory_written", payload=payload)
-    row = conn.execute(
-        "SELECT id FROM memories "
-        "WHERE owner_id = ? AND chat_id = ? "
-        "ORDER BY id DESC LIMIT 1",
-        (host_bot_id, chat_id),
-    ).fetchone()
-    memory_id = row[0] if row else None
-    return event_id, memory_id
-
-
 def _write_one_memory(
     conn: Connection,
     *,
@@ -134,17 +78,34 @@ def record_turn_memory_for_present(
     chat_clock_at: str | None = None,
     source: str = "direct",
     significance: int = 1,
+    you_present: bool = True,
 ) -> dict[str, tuple[int, int | None]]:
-    """Write a ``memory_written`` event for each present bot witness.
+    """Single entry-point for per-turn memory writes (T84).
 
-    Host is always written. Guest is written iff ``guest_bot_id is not
+    Writes one ``memory_written`` event per present bot witness. Host is
-    None``. Witness flags are ``[you=1, host=1, guest=1]`` when a guest
+    always written. Guest is written iff ``guest_bot_id is not None``.
-    is present, ``[you=1, host=1, guest=0]`` otherwise.
+
+    Witness flags depend on ``you_present``:
+
+    - ``you_present=True`` (default — Phase 1/2/3 you-scenes): the user
+      is a witness. Mask is ``[you=1, host=1, guest=1]`` when a guest is
+      present, ``[you=1, host=1, guest=0]`` otherwise.
+    - ``you_present=False`` (Phase 3 meanwhile scenes): the user is
+      absent. Mask is ``[you=0, host=1, guest=1]`` for both bots. Both
+      ``host_bot_id`` and ``guest_bot_id`` are required — a meanwhile
+      scene by definition has both bots, so passing ``guest_bot_id=None``
+      with ``you_present=False`` is a programming error and raises
+      :class:`ValueError`.
 
     Returns a mapping ``{bot_id: (event_id, memory_id)}`` so callers can
     look up the freshly-projected memory id per owner without re-querying
     the database.
     """
+    if not you_present and guest_bot_id is None:
+        raise ValueError("you_present=False requires guest_bot_id")
+
+    witness_you = 1 if you_present else 0
+    witness_host = 1
     witness_guest = 1 if guest_bot_id is not None else 0
 
     result: dict[str, tuple[int, int | None]] = {}
@@ -153,8 +114,8 @@ def record_turn_memory_for_present(
         owner_id=host_bot_id,
         chat_id=chat_id,
         narrative_text=narrative_text,
-        witness_you=1,
+        witness_you=witness_you,
-        witness_host=1,
+        witness_host=witness_host,
         witness_guest=witness_guest,
         scene_id=scene_id,
         chat_clock_at=chat_clock_at,
@@ -167,8 +128,8 @@ def record_turn_memory_for_present(
             owner_id=guest_bot_id,
             chat_id=chat_id,
             narrative_text=narrative_text,
-            witness_you=1,
+            witness_you=witness_you,
-            witness_host=1,
+            witness_host=witness_host,
             witness_guest=1,
             scene_id=scene_id,
             chat_clock_at=chat_clock_at,
@@ -176,3 +137,36 @@ def record_turn_memory_for_present(
             significance=significance,
         )
     return result
+
+
+def record_meanwhile_memory(
+    conn: Connection,
+    *,
+    chat_id: str,
+    host_bot_id: str,
+    guest_bot_id: str,
+    narrative_text: str,
+    scene_id: int | None = None,
+    chat_clock_at: str | None = None,
+    source: str = "direct",
+    significance: int = 1,
+) -> dict[str, tuple[int, int | None]]:
+    """Backward-compat thin wrapper for meanwhile memory writes (T64, T84).
+
+    Equivalent to calling :func:`record_turn_memory_for_present` with
+    ``you_present=False``. Kept so existing call sites in
+    :mod:`chat.web.meanwhile` continue to work without churn. New code
+    should prefer the unified entry-point directly.
+    """
+    return record_turn_memory_for_present(
+        conn,
+        chat_id=chat_id,
+        host_bot_id=host_bot_id,
+        guest_bot_id=guest_bot_id,
+        narrative_text=narrative_text,
+        scene_id=scene_id,
+        chat_clock_at=chat_clock_at,
+        source=source,
+        significance=significance,
+        you_present=False,
+    )

chat/services/prompt.py

@@ -37,8 +37,11 @@ import tiktoken
 from chat.llm.client import Message
 from chat.state.edges import get_edge, list_edges_for
 from chat.state.entities import get_bot, get_you
+from chat.state.events import list_active_events
 from chat.state.group_node import get_group_node
+from chat.state.meanwhile import list_pending_meanwhile_digests
 from chat.state.memory import search_memories
+from chat.state.threads import list_open_threads
 from chat.state.world import (
     active_scene,
     get_activity,
@@ -227,6 +230,101 @@ def _build_group_node_block(group_node: dict | None) -> str | None:
     return "\n".join(lines)
 
 
+def _props_excerpt(props: dict | None, limit: int = 80) -> str:
+    """Return a one-line excerpt of an event's ``props`` dict.
+
+    Renders ``key=value`` pairs separated by ", " (deterministic by dict
+    insertion order) and truncates to ~``limit`` characters with a
+    trailing ellipsis. Returns empty string for falsy/empty props so the
+    caller can omit the line entirely.
+    """
+    if not props:
+        return ""
+    pieces: list[str] = []
+    for k, v in props.items():
+        pieces.append(f"{k}={v}")
+    rendered = ", ".join(pieces)
+    if len(rendered) > limit:
+        # Reserve 1 char for the ellipsis so the total never exceeds limit.
+        rendered = rendered[: max(0, limit - 1)] + "…"
+    return rendered
+
+
+def _build_active_events_block(events: list[dict]) -> str | None:
+    """Render the ``Active events:`` block for Phase 3 Task 60.
+
+    One bullet per event. The sub-label depends on status:
+      - ``planned`` → ``(planned for {planned_for})``
+      - ``active``  → ``(active, started_at={started_at})``
+    A second indented line carries a one-line excerpt of the event's
+    ``props`` (truncated ~80 chars) when non-empty. Returns ``None`` when
+    there are no active events so the caller can omit the entire block.
+    """
+    if not events:
+        return None
+    lines = ["Active events:"]
+    for ev in events:
+        kind = ev.get("kind") or "?"
+        status = ev.get("status") or ""
+        if status == "active":
+            started = ev.get("started_at") or ""
+            lines.append(f"- {kind} (active, started_at={started})")
+        else:
+            planned = ev.get("planned_for") or ""
+            lines.append(f"- {kind} (planned for {planned})")
+        excerpt = _props_excerpt(ev.get("props"))
+        if excerpt:
+            lines.append(f"  {excerpt}")
+    return "\n".join(lines)
+
+
+def _build_meanwhile_digests_block(digests: list[dict]) -> str | None:
+    """Render the ``Meanwhile while you were away:`` block for T65.
+
+    One bullet per pending digest, formatted as ``- {summary}`` with the
+    summary truncated to ~200 characters per spec. Returns ``None`` when
+    there are no pending digests so the caller can omit the entire block.
+
+    The block is rendered ONLY when the prompt is for a regular you-scene
+    (``present_set_kind != "host_guest"``); the caller filters before
+    constructing the digests list.
+    """
+    if not digests:
+        return None
+    lines = ["Meanwhile while you were away:"]
+    for d in digests:
+        summary = d.get("summary") or ""
+        if len(summary) > 200:
+            summary = summary[:199] + "…"
+        if summary:
+            lines.append(f"- {summary}")
+    if len(lines) == 1:
+        return None
+    return "\n".join(lines)
+
+
+def _build_open_threads_block(threads: list[dict]) -> str | None:
+    """Render the ``Open threads:`` block for Phase 3 Task 60.
+
+    One bullet per thread, formatted as ``- {title}: {summary}`` with the
+    summary truncated to ~120 characters. Returns ``None`` when there are
+    no open threads so the caller can omit the entire block.
+    """
+    if not threads:
+        return None
+    lines = ["Open threads:"]
+    for t in threads:
+        title = t.get("title") or "?"
+        summary = t.get("summary") or ""
+        if len(summary) > 120:
+            summary = summary[:119] + "…"
+        if summary:
+            lines.append(f"- {title}: {summary}")
+        else:
+            lines.append(f"- {title}")
+    return "\n".join(lines)
+
+
 def _closing_instruction(speaker_name: str, addressee_name: str) -> str:
     return (
         f"Continue the scene as {speaker_name}, in their voice, responding "
@@ -273,6 +371,25 @@ def _resolve_previous_scene_summary(
     return mem[0]
 
 
+def _witness_role_for(speaker_bot_id: str, host_bot_id: str | None) -> str:
+    """Return the witness POV role for the speaker's memory query.
+
+    The host bot of a chat queries memories with ``witness_role="host"``;
+    the guest bot queries with ``witness_role="guest"``. Phase 2 T46
+    pinned the contract on ``search_memories``; this helper applies it
+    at the call site so a guest-as-speaker doesn't silently retrieve
+    memories under the wrong POV mask.
+
+    When ``host_bot_id`` is ``None`` (degenerate case from a half-seeded
+    chat or Phase-1 path), the speaker is treated as the host so the
+    query falls back to the host POV mask rather than silently masking
+    the speaker's own memories as a guest.
+    """
+    if host_bot_id is None or speaker_bot_id == host_bot_id:
+        return "host"
+    return "guest"
+
+
 def _resolve_addressee(
     conn: Connection, addressee: str, you: dict | None
 ) -> tuple[str, str]:
@@ -309,6 +426,7 @@ def assemble_narrative_prompt(
     budget_hard: int = 8000,
     encoding_name: str = "cl100k_base",
     guest_id: str | None = None,
+    present_set_kind: str = "you_host",
 ) -> list[Message]:
     """Assemble the narrative prompt for ``speaker_bot_id`` to respond.
 
@@ -347,6 +465,14 @@ def assemble_narrative_prompt(
     you = get_you(conn)
     addressee_id, addressee_name = _resolve_addressee(conn, addressee, you)
 
+    # T64: meanwhile-mode marker. When present_set_kind == "host_guest"
+    # the user ("you") is NOT a witness in the scene — bots speak only to
+    # each other. The local flag below is consumed by the activity-block
+    # builder (skip the "you" bullet entirely) and the other-edges filter
+    # (drop any speaker -> "you" rendering). Default "you_host" preserves
+    # the Phase 1/2/3 behavior for normal turns.
+    _exclude_you = present_set_kind == "host_guest"
+
     # ---- Build all components as text strings ------------------------------
 
     speaker_identity = _build_speaker_identity(bot)
@@ -356,34 +482,58 @@ def assemble_narrative_prompt(
         addressee_name,
     )
 
-    # Activity for present entities. Core (MUST): you + speaker bot.
+    # Activity for present entities — single ACTIVITIES: block with up
-    # Phase 2 (SHOULD-tier): when a third party (guest) is present in
+    # to three bullets (you, speaker, guest). The block itself is
-    # the chat, append their activity in a separate block so it can be
+    # MUST-tier and survives all trims, but bullet-level trim drops
-    # trimmed independently under tight budget.
+    # bullets in the order guest -> you, keeping the speaker bullet
-    activities: list[dict] = []
+    # (the speaker's own current activity is the load-bearing slice).
-    you_act = get_activity(conn, "you")
+    #
-    if you_act is not None:
+    # T71.2 chose Option B from the polish plan: pre-truncate the
-        you_act = dict(you_act)
+    # bullets list at trim time before _build_activity_block runs,
-        you_act["_display_name"] = (you or {}).get("name") or "you"
+    # rather than introducing a granular tier mode in the trim
-        activities.append(you_act)
+    # machinery. The single-block render avoids the dual-ACTIVITIES:
+    # header that Phase 2 T43 introduced (read by some LLMs as a
+    # duplicate-section bug).
+    you_activity: dict | None = None
+    if not _exclude_you:
+        you_act = get_activity(conn, "you")
+        if you_act is not None:
+            you_activity = dict(you_act)
+            you_activity["_display_name"] = (you or {}).get("name") or "you"
+
+    speaker_activity: dict | None = None
     bot_act = get_activity(conn, speaker_bot_id)
     if bot_act is not None:
-        bot_act = dict(bot_act)
+        speaker_activity = dict(bot_act)
-        bot_act["_display_name"] = bot["name"]
+        speaker_activity["_display_name"] = bot["name"]
-        activities.append(bot_act)
-    activity_block = _build_activity_block(activities)
 
-    # SHOULD-tier guest activity extension (Phase 2 / Task 43).
+    guest_activity: dict | None = None
-    guest_activity_block: str | None = None
     if guest_id is not None:
         guest_act = get_activity(conn, guest_id)
         if guest_act is not None:
-            guest_act = dict(guest_act)
+            guest_activity = dict(guest_act)
             guest_bot = get_bot(conn, guest_id)
-            guest_act["_display_name"] = (
+            guest_activity["_display_name"] = (
                 guest_bot["name"] if guest_bot else guest_id
             )
-            guest_activity_block = _build_activity_block([guest_act])
+
+    def _activity_block_for(
+        *, include_you: bool, include_guest: bool
+    ) -> str | None:
+        """Render the single ACTIVITIES: block with the requested bullets.
+
+        Speaker bullet is always included (it's the MUST-tier baseline);
+        ``you`` and ``guest`` bullets are toggled by the caller during
+        trim. Returns None when no bullets remain.
+        """
+        bullets: list[dict] = []
+        if include_you and you_activity is not None:
+            bullets.append(you_activity)
+        if speaker_activity is not None:
+            bullets.append(speaker_activity)
+        if include_guest and guest_activity is not None:
+            bullets.append(guest_activity)
+        return _build_activity_block(bullets)
 
     # SHOULD-tier group-node block (Phase 2 / Task 43): rendered only
     # when the group_node row is present AND it covers all three of
@@ -401,6 +551,43 @@ def assemble_narrative_prompt(
             if required.issubset(members):
                 group_node_block = _build_group_node_block(gn)
 
+    # SHOULD-tier active events + open threads (Phase 3 / Task 60).
+    # Auto-detect both from the chat_id per the Phase 2 T43 precedent —
+    # no new function parameter. Both blocks are omit-when-empty so a
+    # Phase 1 chat with no events/threads renders identically to before.
+    active_events_block = _build_active_events_block(
+        list_active_events(conn, chat_id)
+    )
+    open_threads_block = _build_open_threads_block(
+        list_open_threads(conn, chat_id)
+    )
+
+    # SHOULD-tier meanwhile digest (Phase 3 / Task 65). Only surfaces
+    # when the prompt is for a regular you-scene (NOT for a meanwhile
+    # child scene — the absent player is the audience, not the bots
+    # currently mid-meanwhile). We distinguish via the chat's active
+    # scene's ``present_set_kind``; a missing scene row defaults to a
+    # you-scene render so the block can still surface during the
+    # post-meanwhile-close transition before the next scene opens.
+    #
+    # Consumption is INTENTIONALLY left to the post_turn flow (a
+    # ``consume_pending_meanwhile_digests`` helper, see below) rather
+    # than emitted inline here. Surfacing has no side-effects; the
+    # caller appends ``meanwhile_digest_consumed`` after the response
+    # streams. This keeps prompt assembly pure and deterministic — the
+    # Phase 1 invariant T29's regenerate flow relies on.
+    meanwhile_digests_block: str | None = None
+    active_scene_kind: str | None = None
+    if chat.get("active_scene_id"):
+        active_sc = get_scene(conn, chat["active_scene_id"])
+        if active_sc:
+            active_scene_kind = active_sc.get("present_set_kind")
+    if active_scene_kind != "host_guest":
+        pending_digests = list_pending_meanwhile_digests(conn, chat_id)
+        meanwhile_digests_block = _build_meanwhile_digests_block(
+            pending_digests
+        )
+
     container = None
     if chat.get("active_scene_id"):
         scene = get_scene(conn, chat["active_scene_id"])
@@ -412,9 +599,15 @@ def assemble_narrative_prompt(
         container = get_container(conn, scene["container_id"])
     scene_block = _build_scene_block(chat, container, scene)
 
-    # Other edges: speaker → non-addressee.
+    # Other edges: speaker → non-addressee. In meanwhile mode (host_guest)
+    # the speaker -> "you" edge is filtered out as well — "you" isn't
+    # part of the present set, so surfacing the speaker's relationship
+    # to the user inside a private bot-to-bot beat would leak context
+    # the bots aren't supposed to be drawing on right now.
     all_outgoing = list_edges_for(conn, speaker_bot_id)
     other_edges_raw = [e for e in all_outgoing if e.get("target_id") != addressee_id]
+    if _exclude_you:
+        other_edges_raw = [e for e in other_edges_raw if e.get("target_id") != "you"]
     for e in other_edges_raw:
         tid = e.get("target_id")
         if tid == "you":
@@ -433,7 +626,12 @@ def assemble_narrative_prompt(
         memory_summaries = []
         if query:
             try:
-                hits = search_memories(conn, speaker_bot_id, "host", query, k=4)
+                witness_role = _witness_role_for(
+                    speaker_bot_id, chat.get("host_bot_id")
+                )
+                hits = search_memories(
+                    conn, speaker_bot_id, witness_role, query, k=4
+                )
                 memory_summaries = [h["pov_summary"] for h in hits]
             except Exception:
                 memory_summaries = []
@@ -452,11 +650,18 @@ def assemble_narrative_prompt(
     last4 = dialogue_full[-4:] if dialogue_full else []
     must_dialogue_block = _build_dialogue_block(last4, earlier_summary=None)
 
+    # MUST-tier ACTIVITIES floor: the speaker bullet alone (you and
+    # guest bullets are dropped first under bullet-level trim before
+    # the block bottoms out at speaker-only).
+    must_activity_block = _activity_block_for(
+        include_you=False, include_guest=False
+    )
+
     must_blocks: list[str | None] = [
         speaker_identity,
         edge_to_addressee,
         scene_block,
-        activity_block,
+        must_activity_block,
         must_dialogue_block,
         closing,
     ]
@@ -481,8 +686,12 @@ def assemble_narrative_prompt(
         include_previous_scene: bool,
         include_memories_top_k: int,
         dialogue_keep: int,
+        include_you_activity: bool = True,
         include_guest_activity: bool = True,
         include_group_node: bool = True,
+        include_active_events: bool = True,
+        include_open_threads: bool = True,
+        include_meanwhile_digests: bool = True,
     ) -> tuple[str, int, list[dict]]:
         # dialogue: keep the last `dialogue_keep` turns verbatim; older
         # turns become an "earlier:" placeholder line.
@@ -503,14 +712,27 @@ def assemble_narrative_prompt(
             if include_previous_scene else None
         )
 
+        # Single ACTIVITIES: block, bullet-level trim (T71.2). Guest
+        # bullet drops first, then the you bullet; speaker bullet is the
+        # MUST-tier floor and always present when an activity row exists.
+        activity_block = _activity_block_for(
+            include_you=include_you_activity,
+            include_guest=include_guest_activity,
+        )
+
         body = _join_blocks([
             speaker_identity,
             edge_to_addressee,
             other_edges_block if include_other_edges else None,
             scene_block,
             activity_block,
-            guest_activity_block if include_guest_activity else None,
             group_node_block if include_group_node else None,
+            active_events_block if include_active_events else None,
+            open_threads_block if include_open_threads else None,
+            (
+                meanwhile_digests_block
+                if include_meanwhile_digests else None
+            ),
             prev_block,
             memories_block,
             dialogue_block,
@@ -527,25 +749,37 @@ def assemble_narrative_prompt(
     nice_memories_k = min(4, len(memory_summaries))
     include_prev = previous_scene_summary is not None
     include_other = other_edges_block is not None
-    include_guest_activity = guest_activity_block is not None
+    include_you_activity = you_activity is not None
+    include_guest_activity = guest_activity is not None
     include_group_node = group_node_block is not None
+    include_active_events = active_events_block is not None
+    include_open_threads = open_threads_block is not None
+    include_meanwhile_digests = meanwhile_digests_block is not None
 
     def _build(*, prev: bool, mem_k: int, dlg: int, other: bool,
-               guest_act: bool, group: bool) -> tuple[str, int]:
+               you_act: bool, guest_act: bool, group: bool,
+               events: bool, threads: bool,
+               digests: bool) -> tuple[str, int]:
         body, total, _ = assemble(
             include_other_edges=other,
             include_previous_scene=prev,
             include_memories_top_k=mem_k,
             dialogue_keep=dlg,
+            include_you_activity=you_act,
             include_guest_activity=guest_act,
             include_group_node=group,
+            include_active_events=events,
+            include_open_threads=threads,
+            include_meanwhile_digests=digests,
         )
         return body, total
 
     body, total = _build(
         prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-        other=include_other, guest_act=include_guest_activity,
+        other=include_other, you_act=include_you_activity,
-        group=include_group_node,
+        guest_act=include_guest_activity, group=include_group_node,
+        events=include_active_events, threads=include_open_threads,
+        digests=include_meanwhile_digests,
     )
 
     # If under soft, we're done.
@@ -554,12 +788,34 @@ def assemble_narrative_prompt(
 
     # Drop NICE in order: previous scene → memories beyond top-2 →
     # older dialogue turns (collapse to 4).
+    #
+    # T71.3 — order rationale: the §6.3 spec lists NICE-tier members
+    # with previous-scene LAST, which read as a literal trim order
+    # during T18 review. We deliberately keep the greedy order shown
+    # here (previous-scene FIRST) for two reasons:
+    #
+    #   1. Cheapest-impact-first: a per-POV previous-scene summary is
+    #      a single short paragraph that loses very little narrative
+    #      continuity when dropped, while the older dialogue turns it
+    #      is competing with carry the speaker's last few beats — those
+    #      ground the next response far more concretely.
+    #   2. Greedy lookahead is more expensive than the marginal
+    #      narrative loss. Dropping previous-scene typically clears
+    #      the soft-budget slack in one step; trying memories or
+    #      dialogue first would routinely require multiple recompute
+    #      passes through the assembler.
+    #
+    # The pin test test_nice_trim_order_documented locks this order so
+    # a future refactor can't quietly invert it without surfacing the
+    # decision.
     if include_prev:
         include_prev = False
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
         if total <= budget_soft:
             return _emit(body, user_turn_prose)
@@ -568,8 +824,10 @@ def assemble_narrative_prompt(
         nice_memories_k = 2
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
         if total <= budget_soft:
             return _emit(body, user_turn_prose)
@@ -578,8 +836,10 @@ def assemble_narrative_prompt(
         nice_dialogue_keep = baseline_keep
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
         if total <= budget_soft:
             return _emit(body, user_turn_prose)
@@ -589,35 +849,93 @@ def assemble_narrative_prompt(
         nice_memories_k = max(0, nice_memories_k - 1)
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
+        )
+
+    # Drop SHOULD-tier extras in order:
+    #   1. meanwhile digests block (T65: SHOULD-tier; refers to a past
+    #      meanwhile scene — least critical to the speaker's immediate
+    #      voice, so dropped first among SHOULD)
+    #   2. open threads block  (T60: SHOULD-tier; least critical to the
+    #      speaker's immediate voice — drop next among SHOULD)
+    #   3. active events block (T60: same tier, drops next)
+    #   4. guest activity bullet (T71.2: bullet-level trim within the
+    #      single ACTIVITIES: block — guest goes first per Task 43 spec)
+    #   5. group node block
+    #   6. you activity bullet (still SHOULD-tier; speaker bullet is the
+    #      MUST-tier floor and never dropped)
+    #   7. other edges
+    if include_meanwhile_digests and total > budget_hard:
+        include_meanwhile_digests = False
+        body, total = _build(
+            prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
+            other=include_other, you_act=include_you_activity,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
+        )
+
+    if include_open_threads and total > budget_hard:
+        include_open_threads = False
+        body, total = _build(
+            prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
+            other=include_other, you_act=include_you_activity,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
+        )
+
+    if include_active_events and total > budget_hard:
+        include_active_events = False
+        body, total = _build(
+            prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
+            other=include_other, you_act=include_you_activity,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
 
-    # Drop SHOULD-tier blocks in order: guest activity → group node →
-    # other edges. (Guest activity goes first per Task 43 spec — it's
-    # the most expendable additive context.)
     if include_guest_activity and total > budget_hard:
         include_guest_activity = False
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
 
     if include_group_node and total > budget_hard:
         include_group_node = False
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
+        )
+
+    if include_you_activity and total > budget_hard:
+        include_you_activity = False
+        body, total = _build(
+            prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
+            other=include_other, you_act=include_you_activity,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
 
     if include_other and total > budget_hard:
         include_other = False
         body, total = _build(
             prev=include_prev, mem_k=nice_memories_k, dlg=nice_dialogue_keep,
-            other=include_other, guest_act=include_guest_activity,
+            other=include_other, you_act=include_you_activity,
-            group=include_group_node,
+            guest_act=include_guest_activity, group=include_group_node,
+            events=include_active_events, threads=include_open_threads,
+            digests=include_meanwhile_digests,
         )
 
     if total > budget_hard:
@@ -643,4 +961,38 @@ def _emit(system_body: str, user_turn_prose: str | None) -> list[Message]:
     return msgs
 
 
-__all__ = ["assemble_narrative_prompt"]
+def consume_pending_meanwhile_digests(conn: Connection, chat_id: str) -> int:
+    """Mark every pending meanwhile digest for ``chat_id`` as consumed.
+
+    Called by the post_turn flow AFTER the assistant response streams,
+    once for the first you-turn that surfaced any pending digests. We
+    keep this side-effect out of :func:`assemble_narrative_prompt` so
+    prompt assembly stays pure (T29's regenerate flow rebuilds prompts
+    repeatedly without state mutation).
+
+    Returns the number of digests consumed (0 when none were pending).
+    """
+    from datetime import datetime, timezone
+
+    from chat.eventlog.log import append_and_apply
+
+    pending = list_pending_meanwhile_digests(conn, chat_id)
+    if not pending:
+        return 0
+    now = datetime.now(timezone.utc).isoformat()
+    for d in pending:
+        append_and_apply(
+            conn,
+            kind="meanwhile_digest_consumed",
+            payload={
+                "digest_id": d["id"],
+                "consumed_at": now,
+            },
+        )
+    return len(pending)
+
+
+__all__ = [
+    "assemble_narrative_prompt",
+    "consume_pending_meanwhile_digests",
+]

chat/services/regenerate.py

@@ -26,6 +26,7 @@ Phase 1 simplifications (per the plan's "bound it" guidance):
   so affinity/trust/knowledge reflect the new output.
 - The route does not broadcast a fresh ``turn_html`` SSE event; T34
   polishes UI swaps. The user refreshes the page to see the new turn.
+  *(T73.1 closed this gap — see Phase 2.5 changes below.)*
 
 Phase 2 changes (T44):
 
@@ -42,22 +43,56 @@ Phase 2 changes (T44):
   is not invoked here. If the prior turn fired an interjection it
   remains attached to the original assistant_turn (which is superseded
   alongside the regenerated turn) — Phase 2.5 will revisit.
+
+Phase 2.5 changes:
+
+- T73.1: After the new ``assistant_turn`` lands we publish a
+  ``turn_html_replace`` SSE event carrying the rendered HTML for the
+  regenerated turn plus the original assistant_turn's event_id as
+  ``supersedes_id`` so connected tabs can swap the prior DOM node
+  in-place. We use a NEW event name (rather than re-using ``turn_html``)
+  because the existing HTMX ``sse-swap="turn_html"`` consumer expects a
+  raw-HTML body and an *append* semantic; ``turn_html_replace`` is a
+  JSON payload (sse.py auto-serialises when extra keys accompany
+  ``data``) so the front-end JS can read ``supersedes_id`` and replace
+  the right node.
+- T73.2: Interjection regeneration. When the original assistant_turn
+  group included an interjection beat we redo BOTH the primary and the
+  interjection — re-running ``detect_interjection`` against the new
+  primary text. If the classifier returns False this time we supersede
+  the original interjection without appending a replacement.
+- T73.3: The defensive degrade-to-1:1 for stale ``guest_bot_id``
+  references was removed — Phase 2 T47 fixed the root cause (resets
+  clear the reference) so the guard is dead code.
 """
 
 from __future__ import annotations
 
+import asyncio
 import json
+import logging
 from sqlite3 import Connection
 
 from chat.config import Settings
 from chat.eventlog.log import append_and_apply, append_event
+from chat.services.event_lifecycle import detect_event_transitions
+from chat.services.event_promotion import promote_completed_event
+from chat.services.interjection import detect_interjection
 from chat.services.memory_write import record_turn_memory_for_present
 from chat.services.multi_state_update import compute_state_updates_for_present
 from chat.services.prompt import assemble_narrative_prompt
+from chat.services.turn_common import (
+    gather_prior_edges,
+    read_recent_dialogue,
+)
 from chat.state.edges import get_edge
 from chat.state.entities import get_bot, get_you
+from chat.state.events import list_active_events
 from chat.state.world import active_scene, get_chat
 from chat.web.pubsub import publish
+from chat.web.render import render_turn_html
+
+_log = logging.getLogger(__name__)
 
 
 async def regenerate_assistant_turn(
@@ -77,6 +112,19 @@ async def regenerate_assistant_turn(
 
     Raises :class:`ValueError` when the chat or the assistant_turn event
     cannot be found — the FastAPI route translates this to 404.
+
+    .. note::
+       **Lifecycle-rollback limitation (T83.4, Phase 4 follow-up).**
+       When the superseded turn already produced lifecycle transitions
+       (``event_started`` / ``event_completed`` / ``event_cancelled``),
+       this function does NOT roll those rows back before re-running
+       ``detect_event_transitions`` against the regenerated text. A
+       regenerate-after-completion can therefore double-emit promotion
+       artifacts if the new text re-completes the same event. Phase 3.5
+       only documents the gap and emits a WARNING log naming the
+       affected event_log ids; the actual undo pass is invasive
+       (re-projection / inverse-handler dispatch) and is deferred to
+       Phase 4. See the ``# T83.4`` block below for the warning emit.
     """
     chat = get_chat(conn, chat_id)
     if chat is None:
@@ -90,13 +138,13 @@ async def regenerate_assistant_turn(
 
     # Phase 2: surface the guest (if any) so the prompt assembler and
     # downstream multi-entity passes see the same shape post_turn does.
+    # Phase 2 T47 made bot_reset cascade-clear ``chat.guest_bot_id`` when
+    # the referenced bot is purged (verified by tests/test_reset.py), so
+    # we trust the column here: it's either a valid bot id or NULL.
     guest_bot_id = chat.get("guest_bot_id")
-    guest_bot: dict | None = None
+    guest_bot: dict | None = (
-    if guest_bot_id is not None:
+        get_bot(conn, guest_bot_id) if guest_bot_id is not None else None
-        guest_bot = get_bot(conn, guest_bot_id)
+    )
-        if guest_bot is None:
-            # Stale guest reference — degrade to single-bot regenerate.
-            guest_bot_id = None
 
     # 1. Locate the original assistant_turn event.
     row = conn.execute(
@@ -108,6 +156,81 @@ async def regenerate_assistant_turn(
         raise ValueError("assistant_turn event not found")
     original_assistant_payload = json.loads(row[0])
     original_user_turn_id = original_assistant_payload.get("user_turn_id")
+
+    # T83.4: scan for downstream lifecycle transitions emitted by the
+    # superseded turn — they're not being rolled back (see method
+    # docstring). Heuristic: any ``event_started`` / ``event_completed``
+    # / ``event_cancelled`` event_log row with id strictly greater than
+    # the original assistant_turn's id was emitted as part of (or after)
+    # that turn's processing. Lifecycle events don't carry ``chat_id``
+    # in their payload (their payload references an ``event_id`` FK to
+    # the ``events`` table, which holds chat_id), so we join through
+    # ``events`` to scope to this chat.
+    #
+    # A WARNING log surfaces the affected event ids so operators can
+    # spot double-emit cases until the Phase 4 rollback pass lands.
+    unrolled_lifecycle = conn.execute(
+        "SELECT el.id, el.kind FROM event_log AS el "
+        "JOIN events AS ev "
+        "  ON ev.event_id = json_extract(el.payload_json, '$.event_id') "
+        "WHERE el.kind IN ("
+        "    'event_started', 'event_completed', 'event_cancelled'"
+        "  ) "
+        "  AND ev.chat_id = ? "
+        "  AND el.id > ? "
+        "ORDER BY el.id ASC",
+        (chat_id, original_assistant_event_id),
+    ).fetchall()
+    if unrolled_lifecycle:
+        # T90.2: phrased as "at-or-after turn <id>" rather than "from
+        # superseded turn" because regenerating an OLDER turn lists
+        # intervening-turn transitions that legitimately stand on their
+        # own — those weren't authored by the superseded turn itself.
+        _log.warning(
+            "regenerate_assistant_turn: %d lifecycle transition(s) "
+            "at-or-after turn %s are NOT being rolled back (Phase 4 "
+            "follow-up). Affected event ids: %s",
+            len(unrolled_lifecycle),
+            original_assistant_event_id,
+            [r[0] for r in unrolled_lifecycle],
+        )
+
+    # 1a. Look up any sibling interjection beat in the same turn group
+    # (T73.2). The original group is (primary + optional interjection),
+    # both pinned to the same ``user_turn_id``. The interjection has a
+    # populated ``interjection_of`` field in its payload — its speaker is
+    # the silent witness (the bot that wasn't the primary addressee).
+    # Filter on ``superseded_by IS NULL`` so prior regenerates of this
+    # group don't reappear as siblings.
+    #
+    # T83.3: push the chat_id filter into SQL via ``json_extract`` so
+    # the query doesn't scan every assistant_turn row across the whole
+    # database. ``LIMIT 50`` bounds worst-case work even when chat_id
+    # isn't selective (e.g. a single chat with many turns) — we only
+    # need the one matching sibling. Mirrors the SQL pattern in
+    # ``chat.web.meanwhile._last_meanwhile_speaker``.
+    original_interjection_event_id: int | None = None
+    original_interjection_payload: dict | None = None
+    if original_user_turn_id is not None:
+        sibling_cur = conn.execute(
+            "SELECT id, payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' "
+            "  AND id != ? "
+            "  AND superseded_by IS NULL "
+            "  AND json_extract(payload_json, '$.chat_id') = ? "
+            "ORDER BY id DESC "
+            "LIMIT 50",
+            (original_assistant_event_id, chat_id),
+        )
+        for sib_id, sib_payload_json in sibling_cur.fetchall():
+            sib_payload = json.loads(sib_payload_json)
+            if sib_payload.get("user_turn_id") != original_user_turn_id:
+                continue
+            if not sib_payload.get("interjection_of"):
+                continue
+            original_interjection_event_id = sib_id
+            original_interjection_payload = sib_payload
+            break
     # Phase 2 v2 regenerates only the addressee turn — preserve whichever
     # bot the original turn was attributed to, falling back to the host
     # for legacy rows that pre-date multi-entity support.
@@ -154,33 +277,30 @@ async def regenerate_assistant_turn(
     # assistant_turn explicitly (we haven't superseded it yet — that
     # update lands at the end so the new event_id is known) and use the
     # standard ``superseded_by IS NULL AND hidden = 0`` filter so any
-    # prior regenerates also drop out.
+    # prior regenerates also drop out. T83.2: shared helper handles the
+    # SQL + filtering; we post-process to map speaker ids to display
+    # names for the prompt.
     you_entity = get_you(conn) or {"name": "you", "persona": ""}
     you_name = you_entity.get("name", "you")
-    cur = conn.execute(
+    raw_recent = read_recent_dialogue(
-        "SELECT id, kind, payload_json FROM event_log "
+        conn,
-        "WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn') "
+        chat_id,
-        "  AND id != ? "
+        limit=20,
-        "  AND superseded_by IS NULL AND hidden = 0 "
+        exclude_event_id=original_assistant_event_id,
-        "ORDER BY id DESC LIMIT 20",
-        (original_assistant_event_id,),
     )
-    rows = list(reversed(cur.fetchall()))
     recent: list[dict] = []
-    for _eid, kind, payload_json in rows:
+    for entry in raw_recent:
-        p = json.loads(payload_json)
+        spk = entry.get("speaker", "bot")
-        if p.get("chat_id") != chat_id:
+        if spk == "you":
+            recent.append({"speaker": you_name, "text": entry.get("text", "")})
             continue
-        if kind in ("user_turn", "user_turn_edit"):
+        if spk == host_bot_id:
-            recent.append({"speaker": you_name, "text": p.get("prose", "")})
-        else:
-            spk = p.get("speaker_id", "bot")
             spk_name = host_bot.get("name", "bot")
-            if spk == host_bot_id:
+        elif guest_bot is not None and spk == guest_bot.get("id"):
-                spk_name = host_bot.get("name", "bot")
+            spk_name = guest_bot.get("name", "bot")
-            elif guest_bot is not None and spk == guest_bot.get("id"):
+        else:
-                spk_name = guest_bot.get("name", "bot")
+            spk_name = host_bot.get("name", "bot")
-            recent.append({"speaker": spk_name, "text": p.get("text", "")})
+        recent.append({"speaker": spk_name, "text": entry.get("text", "")})
 
     # 4. Assemble the narrative prompt. ``recent`` already excludes the
     # current user prose, which we pass through ``user_turn_prose``.
@@ -196,19 +316,37 @@ async def regenerate_assistant_turn(
         guest_id=guest_bot_id,
     )
 
-    # 5. Stream the new narrative.
+    # 5. Stream the new narrative. T83.1: register the streaming Task in
+    # the chat-keyed in-flight registry so POST /chats/<id>/turns/cancel
+    # can call ``.cancel()`` on a mid-regenerate stream. We import the
+    # underscore name from turns.py deliberately — same single-process
+    # registry the cancel route reads, mirrors the meanwhile registration
+    # pattern in chat/web/meanwhile.py.
+    from chat.web.turns import _in_flight_tasks  # noqa: PLC0415
+
     accumulated: list[str] = []
-    async for chunk in client.stream(
+
-        messages,
+    async def _stream_primary() -> None:
-        model=settings.narrative_model,
+        async for chunk in client.stream(
-        max_tokens=settings.narrative_max_tokens,
+            messages,
-        temperature=settings.narrative_temperature,
+            model=settings.narrative_model,
-    ):
+            max_tokens=settings.narrative_max_tokens,
-        accumulated.append(chunk)
+            temperature=settings.narrative_temperature,
-        await publish(
+        ):
-            chat_id,
+            accumulated.append(chunk)
-            {"event": "token", "text": chunk, "speaker_id": speaker_bot_id},
+            await publish(
-        )
+                chat_id,
+                {"event": "token", "text": chunk, "speaker_id": speaker_bot_id},
+            )
+
+    stream_task = asyncio.create_task(_stream_primary())
+    _in_flight_tasks[chat_id] = stream_task
+    try:
+        await stream_task
+    finally:
+        # Always unregister so a subsequent turn / regenerate can register
+        # a fresh task. Mirrors the cleanup in turns.py::post_turn.
+        _in_flight_tasks.pop(chat_id, None)
     new_text = "".join(accumulated)
 
     # 6. Append the new assistant_turn event. ``user_turn_id`` points at
@@ -238,6 +376,30 @@ async def regenerate_assistant_turn(
         (new_assistant_event_id, original_assistant_event_id),
     )
 
+    # 7a. Broadcast a turn_html_replace SSE event so connected tabs can
+    # swap the prior assistant_turn DOM node in-place (T73.1, Phase 1.5
+    # backlog #2). Uses a separate event name from post_turn's
+    # ``turn_html`` (which is append-only) because regenerate is a
+    # *replace* operation — see module docstring for the rationale.
+    speaker_name_for_render = (
+        speaker_bot.get("name", "bot") if speaker_bot is not None else "bot"
+    )
+    new_turn_html = render_turn_html(
+        speaker_name_for_render,
+        new_text,
+        role="bot",
+        event_id=new_assistant_event_id,
+    )
+    await publish(
+        chat_id,
+        {
+            "event": "turn_html_replace",
+            "data": new_turn_html,
+            "turn_id": new_assistant_event_id,
+            "supersedes_id": original_assistant_event_id,
+        },
+    )
+
     # 8. Re-run downstream classifier passes (memory write + state update
     # for every directed pair across present entities). Significance is
     # intentionally skipped on regenerate (the prior score remains
@@ -279,17 +441,8 @@ async def regenerate_assistant_turn(
         present_names[guest_bot_id] = guest_bot.get("name", "bot")
         personas[guest_bot_id] = guest_bot.get("persona") or ""
 
-    prior_edges: dict[tuple[str, str], dict] = {}
+    # T83.2: shared helper builds the directed-pair edge dict.
-    for src in present_ids:
+    prior_edges = gather_prior_edges(conn, present_ids)
-        for tgt in present_ids:
-            if src == tgt:
-                continue
-            edge = get_edge(conn, src, tgt) or {
-                "affinity": 50,
-                "trust": 50,
-                "summary": "",
-            }
-            prior_edges[(src, tgt)] = edge
 
     state_updates = await compute_state_updates_for_present(
         client,
@@ -317,6 +470,298 @@ async def regenerate_assistant_turn(
             },
         )
 
+    # 9. Interjection regenerate branch (T73.2). When the original
+    # assistant_turn group included a follow-on interjection beat we need
+    # to revisit that beat against the regenerated primary. Three outcomes:
+    #
+    #   - No original interjection: nothing to do; we already short-circuit
+    #     above by leaving ``original_interjection_event_id`` as None.
+    #   - Original interjection + classifier returns True: stream a fresh
+    #     interjection from the silent witness, append it (with
+    #     ``interjection_of`` linking to the new primary speaker), and
+    #     supersede the original interjection's row. Also re-run memory
+    #     + state-update so the second beat moves edges + writes memories.
+    #   - Original interjection + classifier returns False: supersede the
+    #     original interjection without appending a replacement. The
+    #     regenerated group becomes "primary only" because the new primary
+    #     no longer warrants a follow-on. No memory / state work needed
+    #     for the absent beat.
+    #
+    # ``superseded_by`` on the original interjection's row points at the
+    # *new primary* in the no-replacement case (rather than NULL or a
+    # nonexistent id) so the row is consistently hidden by the standard
+    # ``superseded_by IS NULL`` timeline filter and the back-pointer
+    # leads somewhere meaningful for an "originally said …" affordance.
+    if original_interjection_event_id is not None and guest_bot is not None:
+        # Identify the silent witness from the original interjection's
+        # speaker_id (which is the bot that interjected last time). When
+        # we regenerate we keep the *same pair of present entities*, so
+        # the silent witness is whichever bot isn't the new primary
+        # speaker — derive it from present rather than reusing the prior
+        # speaker_id verbatim, in case the regenerated primary swapped
+        # who held the floor.
+        if speaker_bot_id == host_bot_id:
+            silent_witness = guest_bot
+        else:
+            silent_witness = host_bot
+        silent_witness_id = silent_witness.get("id")
+
+        edge_w_to_addr = get_edge(conn, silent_witness_id, speaker_bot_id) or {
+            "affinity": 50,
+            "trust": 50,
+            "summary": "",
+        }
+        edge_w_to_you = get_edge(conn, silent_witness_id, "you") or {
+            "affinity": 50,
+            "trust": 50,
+            "summary": "",
+        }
+
+        decision = await detect_interjection(
+            client,
+            classifier_model=settings.classifier_model,
+            addressee_name=speaker_bot.get("name", "bot"),
+            addressee_just_said=new_text,
+            silent_witness_name=silent_witness.get("name", "bot"),
+            silent_witness_persona=silent_witness.get("persona") or "",
+            silent_witness_edge_to_addressee=edge_w_to_addr,
+            silent_witness_edge_to_you=edge_w_to_you,
+            you_just_said=prose_for_prompt or "",
+            timeout_s=settings.classifier_timeout_s,
+        )
+
+        if decision.should_interject:
+            # Re-read recent so the just-appended primary is in the
+            # prompt. T83.2: shared helper + the same id->name mapping
+            # as the primary read above.
+            raw_interject = read_recent_dialogue(conn, chat_id, limit=20)
+            interject_recent: list[dict] = []
+            for entry in raw_interject:
+                spk = entry.get("speaker", "bot")
+                if spk == "you":
+                    interject_recent.append(
+                        {"speaker": you_name, "text": entry.get("text", "")}
+                    )
+                    continue
+                if spk == host_bot_id:
+                    spk_name = host_bot.get("name", "bot")
+                elif spk == guest_bot.get("id"):
+                    spk_name = guest_bot.get("name", "bot")
+                else:
+                    spk_name = "bot"
+                interject_recent.append(
+                    {"speaker": spk_name, "text": entry.get("text", "")}
+                )
+            if interject_recent and interject_recent[-1].get("speaker") == you_name:
+                interject_recent = interject_recent[:-1]
+
+            interject_messages = assemble_narrative_prompt(
+                conn,
+                chat_id=chat_id,
+                speaker_bot_id=silent_witness_id,
+                addressee=speaker_bot_id,
+                user_turn_prose=prose_for_prompt or None,
+                recent_dialogue=interject_recent,
+                budget_soft=settings.narrative_budget_soft,
+                budget_hard=settings.narrative_budget_hard,
+                guest_id=guest_bot_id,
+            )
+
+            interject_accumulated: list[str] = []
+
+            async def _stream_interjection() -> None:
+                async for chunk in client.stream(
+                    interject_messages,
+                    model=settings.narrative_model,
+                    max_tokens=settings.narrative_max_tokens,
+                    temperature=settings.narrative_temperature,
+                ):
+                    interject_accumulated.append(chunk)
+                    await publish(
+                        chat_id,
+                        {
+                            "event": "token",
+                            "text": chunk,
+                            "speaker_id": silent_witness_id,
+                        },
+                    )
+
+            # T83.1: register the interjection sub-stream in the same
+            # in-flight registry so /turns/cancel collapses it too.
+            interject_task = asyncio.create_task(_stream_interjection())
+            _in_flight_tasks[chat_id] = interject_task
+            try:
+                await interject_task
+            finally:
+                _in_flight_tasks.pop(chat_id, None)
+            interject_text = "".join(interject_accumulated)
+
+            new_interjection_event_id = append_event(
+                conn,
+                kind="assistant_turn",
+                payload={
+                    "chat_id": chat_id,
+                    "speaker_id": silent_witness_id,
+                    "text": interject_text,
+                    "truncated": False,
+                    "user_turn_id": (
+                        new_user_event_id
+                        if new_user_event_id is not None
+                        else original_user_turn_id
+                    ),
+                    "regenerated_from": original_interjection_event_id,
+                    "interjection_of": speaker_bot_id,
+                },
+            )
+
+            # Supersede the original interjection by the new one.
+            conn.execute(
+                "UPDATE event_log SET superseded_by = ? WHERE id = ?",
+                (new_interjection_event_id, original_interjection_event_id),
+            )
+
+            # Broadcast a replace event so connected tabs swap the prior
+            # interjection node in-place (mirrors T73.1's primary swap).
+            interject_html = render_turn_html(
+                silent_witness.get("name", "bot"),
+                interject_text,
+                role="bot",
+                event_id=new_interjection_event_id,
+            )
+            await publish(
+                chat_id,
+                {
+                    "event": "turn_html_replace",
+                    "data": interject_html,
+                    "turn_id": new_interjection_event_id,
+                    "supersedes_id": original_interjection_event_id,
+                },
+            )
+
+            # Memory write for the new interjection beat (one event per
+            # present witness).
+            record_turn_memory_for_present(
+                conn,
+                chat_id=chat_id,
+                host_bot_id=host_bot_id,
+                guest_bot_id=guest_bot_id,
+                narrative_text=interject_text,
+                scene_id=scene["id"] if scene else None,
+                chat_clock_at=chat.get("time"),
+            )
+
+            # Re-run the multi-pair state-update with the post-interjection
+            # dialogue tail so deltas land on the post-primary baseline.
+            recent_post_interject = recent_for_update + [
+                {
+                    "speaker": silent_witness.get("name", "bot"),
+                    "text": interject_text,
+                }
+            ]
+            # T83.2: shared helper handles the directed-pair edge dict.
+            prior_edges_post = gather_prior_edges(conn, present_ids)
+
+            state_updates_post = await compute_state_updates_for_present(
+                client,
+                classifier_model=settings.classifier_model,
+                present_ids=present_ids,
+                present_names=present_names,
+                personas=personas,
+                prior_edges=prior_edges_post,
+                recent_dialogue=recent_post_interject,
+                timeout_s=settings.classifier_timeout_s,
+            )
+            for src_id, tgt_id, update in state_updates_post:
+                append_and_apply(
+                    conn,
+                    kind="edge_update",
+                    payload={
+                        "source_id": src_id,
+                        "target_id": tgt_id,
+                        "chat_id": chat_id,
+                        "affinity_delta": update.affinity_delta,
+                        "trust_delta": update.trust_delta,
+                        "knowledge_facts": update.knowledge_facts,
+                        "last_interaction_at": last_at,
+                        "last_interaction_chat_id": chat_id,
+                    },
+                )
+        else:
+            # Classifier said "no follow-on this time" — supersede the
+            # original interjection without a replacement. Point the
+            # back-pointer at the new primary so the row is consistently
+            # hidden by the standard timeline filter.
+            conn.execute(
+                "UPDATE event_log SET superseded_by = ? WHERE id = ?",
+                (new_assistant_event_id, original_interjection_event_id),
+            )
+
+    # 9a. Event-lifecycle detection (Phase 3, T61). T83.5 cosmetic
+    # ordering: mirrors ``chat.web.turns.post_turn``'s 8a block — runs
+    # AFTER the interjection branch (and AFTER the post-interjection
+    # state-update + memory passes) so the classifier sees the same
+    # narrative-text input post_turn does. Numbering uses ``9a`` to
+    # match post_turn's ``8a`` shape (the interjection branch is step 9
+    # in regenerate vs step 8 in post_turn; lifecycle is the immediate
+    # follow-on in both). Behaviour identical to the prior ``step 10``
+    # placement — the block was already structurally last in regenerate
+    # because there's no scene-close pass here.
+    #
+    # Classify whether any active events transitioned in the regenerated
+    # narrative and append the corresponding event_started /
+    # event_completed / event_cancelled. ``promote_completed_event``
+    # runs inline after a completion so promotion artifacts land in the
+    # same regenerate path.
+    #
+    # T83.4 follow-up: when a regenerate replaces a turn that had
+    # already produced event transitions, those original transitions
+    # are NOT undone here (Phase 4 work). A WARNING log earlier in this
+    # function names the affected event_log ids — see the T83.4 block
+    # near the function entry.
+    new_active_events = list_active_events(conn, chat_id)
+    if new_active_events:
+        lifecycle_decision = await detect_event_transitions(
+            client,
+            classifier_model=settings.classifier_model,
+            narrative_text=new_text,
+            active_events=new_active_events,
+            timeout_s=settings.classifier_timeout_s,
+        )
+        for transition in lifecycle_decision.transitions:
+            if transition.new_status == "active":
+                append_and_apply(
+                    conn,
+                    kind="event_started",
+                    payload={
+                        "event_id": transition.event_id,
+                        "started_at": chat.get("time"),
+                    },
+                )
+            elif transition.new_status == "completed":
+                append_and_apply(
+                    conn,
+                    kind="event_completed",
+                    payload={
+                        "event_id": transition.event_id,
+                        "completed_at": chat.get("time"),
+                    },
+                )
+                promote_completed_event(
+                    conn,
+                    event_id=transition.event_id,
+                    chat_id=chat_id,
+                    chat_clock_at=chat.get("time"),
+                )
+            elif transition.new_status == "cancelled":
+                append_and_apply(
+                    conn,
+                    kind="event_cancelled",
+                    payload={
+                        "event_id": transition.event_id,
+                        "completed_at": chat.get("time"),
+                    },
+                )
+
     return new_text
 
 

chat/services/scene_summarize.py

@@ -29,6 +29,9 @@ keeps moving.
 from __future__ import annotations
 
 import json
+import logging
+import uuid
+from datetime import datetime, timezone
 from sqlite3 import Connection
 
 from pydantic import BaseModel, Field
@@ -37,6 +40,8 @@ from chat.eventlog.log import append_and_apply
 from chat.llm.classify import classify
 from chat.llm.client import LLMClient
 
+_log = logging.getLogger(__name__)
+
 
 class ScenePOVSummary(BaseModel):
     """Classifier output: one witness's view of a closing scene.
@@ -121,7 +126,11 @@ async def summarize_scene(
 
 
 def _read_recent_dialogue(
-    conn: Connection, chat_id: str, *, limit: int = 50
+    conn: Connection,
+    chat_id: str,
+    *,
+    limit: int = 50,
+    since_event_id: int | None = None,
 ) -> list[dict]:
     """Pull the last ``limit`` user/assistant turns for ``chat_id``.
 
@@ -130,14 +139,29 @@ def _read_recent_dialogue(
     the most recent turns of the chat. Superseded and hidden rows are
     filtered out so regenerated turns (T29) don't bleed into the
     summary.
+
+    T80.2: ``since_event_id`` clamps the result to event_log rows whose
+    ``id >= since_event_id`` so callers needing a scene-scoped view (e.g.
+    thread detection on close) don't pull turns that landed before the
+    closing scene's ``scene_opened`` event.
     """
-    cur = conn.execute(
+    if since_event_id is None:
-        "SELECT kind, payload_json FROM event_log "
+        cur = conn.execute(
-        "WHERE kind IN ('user_turn', 'assistant_turn') "
+            "SELECT kind, payload_json FROM event_log "
-        "  AND superseded_by IS NULL AND hidden = 0 "
+            "WHERE kind IN ('user_turn', 'assistant_turn') "
-        "ORDER BY id DESC LIMIT ?",
+            "  AND superseded_by IS NULL AND hidden = 0 "
-        (limit,),
+            "ORDER BY id DESC LIMIT ?",
-    )
+            (limit,),
+        )
+    else:
+        cur = conn.execute(
+            "SELECT kind, payload_json FROM event_log "
+            "WHERE kind IN ('user_turn', 'assistant_turn') "
+            "  AND superseded_by IS NULL AND hidden = 0 "
+            "  AND id >= ? "
+            "ORDER BY id DESC LIMIT ?",
+            (since_event_id, limit),
+        )
     rows = list(reversed(cur.fetchall()))
     out: list[dict] = []
     for kind, payload_json in rows:
@@ -156,6 +180,65 @@ def _read_recent_dialogue(
     return out
 
 
+def _scene_opened_event_id(
+    conn: Connection, chat_id: str, scene_id: int
+) -> int | None:
+    """Return the event_log id of the ``scene_opened`` (or
+    ``meanwhile_scene_started``) event that created scene row
+    ``scene_id``. Used by T80.2 to lower-bound dialogue reads to a
+    single scene's transcript.
+
+    ``meanwhile_scene_started`` carries an explicit ``scene_id`` so we
+    match on that directly. ``scene_opened`` doesn't, so we walk the
+    chat's scene rows in id order and zip against the chat's scene-open
+    events in id order — the projector creates one scene row per
+    scene-open event, so positions correspond.
+
+    Returns ``None`` when no matching event is found; callers should
+    treat that as "fall back to chat-wide" rather than over-filter.
+    """
+    # Fast path for meanwhile children (explicit scene_id in payload).
+    for ev_id, payload_json in conn.execute(
+        "SELECT id, payload_json FROM event_log "
+        "WHERE kind = 'meanwhile_scene_started' "
+        "  AND superseded_by IS NULL AND hidden = 0",
+    ).fetchall():
+        try:
+            p = json.loads(payload_json)
+        except (TypeError, ValueError):
+            continue
+        if p.get("chat_id") == chat_id and p.get("scene_id") == scene_id:
+            return ev_id
+    # Fallback for parent you-scenes: zip chat-scoped scene-open events
+    # against chat-scoped scene rows in id order.
+    chat_scene_ids = [
+        r[0]
+        for r in conn.execute(
+            "SELECT id FROM scenes WHERE chat_id = ? ORDER BY id ASC",
+            (chat_id,),
+        ).fetchall()
+    ]
+    if scene_id not in chat_scene_ids:
+        return None
+    chat_open_evs: list[int] = []
+    for ev_id, _kind, payload_json in conn.execute(
+        "SELECT id, kind, payload_json FROM event_log "
+        "WHERE kind IN ('scene_opened', 'meanwhile_scene_started') "
+        "  AND superseded_by IS NULL AND hidden = 0 "
+        "ORDER BY id ASC",
+    ).fetchall():
+        try:
+            p = json.loads(payload_json)
+        except (TypeError, ValueError):
+            continue
+        if p.get("chat_id") == chat_id:
+            chat_open_evs.append(ev_id)
+    idx = chat_scene_ids.index(scene_id)
+    if idx < len(chat_open_evs):
+        return chat_open_evs[idx]
+    return None
+
+
 async def _summarize_and_apply_for_witness(
     conn: Connection,
     client: LLMClient,
@@ -167,6 +250,7 @@ async def _summarize_and_apply_for_witness(
     you_name: str,
     dialogue: list[dict],
     timeout_s: float,
+    key_quotes_suffix: str = "",
 ) -> ScenePOVSummary:
     """Run :func:`summarize_scene` for one bot witness and apply the
     three projected updates (memory pov_summary rewrite, edge summary
@@ -175,6 +259,10 @@ async def _summarize_and_apply_for_witness(
     Tolerant of missing pieces in the same way Phase 1 was: no memory
     row -> skip the rewrite; no edge row -> skip the edge_summary write
     (the empty-default classifier output simply yields no rewrites).
+
+    ``key_quotes_suffix`` is appended verbatim to the per-POV summary
+    text before the rewrite lands (T58.1) — empty string is the no-op
+    default for low-significance scenes.
     """
     from chat.state.edges import get_edge
     from chat.state.entities import get_bot
@@ -206,6 +294,11 @@ async def _summarize_and_apply_for_witness(
             # Empty default -> skip the memory rewrite; the seeded
             # per-turn pov_summary stays in place.
             continue
+        # T80.1: a prior close may have already appended a Key quotes
+        # suffix to this row's pov_summary. Strip it here so the fresh
+        # rewrite replaces the existing suffix rather than stacking a
+        # second one on top.
+        new_value = _strip_key_quotes_suffix(pov.summary) + key_quotes_suffix
         append_and_apply(
             conn,
             kind="manual_edit",
@@ -213,7 +306,7 @@ async def _summarize_and_apply_for_witness(
                 "target_kind": "memory_pov_summary",
                 "target_id": int(memory_id),
                 "prior_value": prior_pov,
-                "new_value": pov.summary,
+                "new_value": new_value,
             },
         )
 
@@ -255,6 +348,69 @@ async def _summarize_and_apply_for_witness(
     return pov
 
 
+# T80.1: header marker shared by the suffix builder and the
+# witness-write strip step. Any text starting with this marker is treated
+# as a previously-appended Key quotes suffix and stripped before reuse so
+# repeated scene closes don't compose recursive bloat.
+_KEY_QUOTES_HEADER = "\n\nKey quotes:\n"
+
+
+def _strip_key_quotes_suffix(text: str) -> str:
+    """Remove a previously-appended Key quotes suffix from ``text``.
+
+    Returns ``text`` unchanged when the marker is absent, or the prefix
+    up to (but not including) the marker when present. Used in two
+    places: (1) when sourcing quote text from a memory row that may
+    already carry the suffix from a prior close, and (2) when computing
+    the per-POV rewrite's prior_value so the new write replaces — rather
+    than stacks on — the old suffix.
+    """
+    if not text:
+        return text
+    idx = text.find(_KEY_QUOTES_HEADER)
+    if idx >= 0:
+        return text[:idx]
+    return text
+
+
+def _build_key_quotes_suffix(conn: Connection, scene_id: int) -> str:
+    """If the scene's max-turn-significance is >= 2, build the
+    "Key quotes:" suffix from the top-3 highest-significance memory rows
+    (per requirements §11.1). Otherwise return the empty string so the
+    per-POV summaries collapse fully (low-significance scenes lose all
+    raw text in favor of the classifier rewrite).
+
+    Quote source is each memory's current ``pov_summary`` — the raw
+    per-turn narrative seeded by T21, since this helper is called BEFORE
+    the per-POV rewrite. Texts are truncated to 200 chars to bound
+    memory row growth across many witnesses.
+
+    T80.1: candidate text is run through :func:`_strip_key_quotes_suffix`
+    first so a re-close (whose source memories already carry a suffix from
+    the prior close) doesn't quote a quote.
+    """
+    row = conn.execute(
+        "SELECT MAX(significance) FROM memories WHERE scene_id = ?",
+        (scene_id,),
+    ).fetchone()
+    max_sig = (row[0] if row else None) or 0
+    if max_sig < 2:
+        return ""
+    cur = conn.execute(
+        "SELECT pov_summary FROM memories WHERE scene_id = ? "
+        "ORDER BY significance DESC, id ASC LIMIT 3",
+        (scene_id,),
+    )
+    quotes = [
+        _strip_key_quotes_suffix(r[0] or "")[:200]
+        for r in cur.fetchall()
+    ]
+    if not quotes:
+        return ""
+    lines = "\n".join(f'- "{q}"' for q in quotes)
+    return f"\n\nKey quotes:\n{lines}"
+
+
 async def apply_scene_close_summary(
     conn: Connection,
     client: LLMClient,
@@ -296,9 +452,11 @@ async def apply_scene_close_summary(
     """
     # Local imports to keep the module-level surface tight and avoid
     # any chance of a circular dep through chat.state.*.
+    from chat.services.thread_detection import detect_threads
     from chat.state.entities import get_bot, get_you
     from chat.state.group_node import get_group_node
-    from chat.state.world import get_chat
+    from chat.state.threads import list_open_threads
+    from chat.state.world import get_chat, get_scene
 
     you_entity = get_you(conn) or {"name": "you", "persona": ""}
     you_name = you_entity.get("name", "you") or "you"
@@ -306,8 +464,22 @@ async def apply_scene_close_summary(
     chat = get_chat(conn, chat_id) or {}
     guest_bot_id = chat.get("guest_bot_id")
 
+    # T65: detect meanwhile child scenes via the migration-0011
+    # ``present_set_kind`` column. The mechanism is a single field read
+    # — meanwhile scenes carry ``"host_guest"``, regular you-scenes
+    # carry the default ``"you_host"``. We read this once up front so
+    # both the dialogue source and the post-summary digest emission
+    # branches can reference it.
+    closing_scene = get_scene(conn, scene_id) or {}
+    is_meanwhile = closing_scene.get("present_set_kind") == "host_guest"
+
     dialogue = _read_recent_dialogue(conn, chat_id)
 
+    # T58.1: build the "Key quotes:" suffix BEFORE the per-POV rewrites
+    # land — quote source is the raw seeded pov_summary text on each
+    # memory row, which the rewrite about to fire would clobber.
+    key_quotes_suffix = _build_key_quotes_suffix(conn, scene_id)
+
     host_pov = await _summarize_and_apply_for_witness(
         conn,
         client,
@@ -318,6 +490,7 @@ async def apply_scene_close_summary(
         you_name=you_name,
         dialogue=dialogue,
         timeout_s=timeout_s,
+        key_quotes_suffix=key_quotes_suffix,
     )
 
     guest_pov: ScenePOVSummary | None = None
@@ -332,28 +505,210 @@ async def apply_scene_close_summary(
             you_name=you_name,
             dialogue=dialogue,
             timeout_s=timeout_s,
+            key_quotes_suffix=key_quotes_suffix,
         )
 
-    # Group node update: naive per-POV concat for v2. Only fires when
+    # Group node update: T70 runs a third classifier call to merge the
-    # both POVs ran (i.e. the guest is present) and a group_node row
+    # two per-POV summaries into a coherent group-level view + a brief
-    # exists for this chat.
+    # group-dynamic note. Falls back to the Phase 2 naive concat on
+    # classifier failure (see :func:`merge_group_summary`). Only fires
+    # when both POVs ran (i.e. the guest is present) and a group_node
+    # row exists for this chat.
     if guest_pov is not None and get_group_node(conn, chat_id) is not None:
         host_bot = get_bot(conn, host_bot_id) or {"name": host_bot_id}
         guest_bot = get_bot(conn, guest_bot_id) or {"name": guest_bot_id}
         host_name = host_bot.get("name", host_bot_id) or host_bot_id
         guest_name = guest_bot.get("name", guest_bot_id) or guest_bot_id
-        group_summary = (
+        merged = await merge_group_summary(
-            f"{host_name}: {host_pov.summary}\n\n"
+            client,
-            f"{guest_name}: {guest_pov.summary}"
+            classifier_model=classifier_model,
+            host_name=host_name,
+            host_pov_summary=host_pov.summary,
+            guest_name=guest_name,
+            guest_pov_summary=guest_pov.summary,
+            timeout_s=timeout_s,
         )
         append_and_apply(
             conn,
             kind="group_node_updated",
             payload={
                 "chat_id": chat_id,
-                "summary": group_summary,
+                "summary": merged.summary,
-                "dynamic": "",
+                "dynamic": merged.dynamic,
             },
         )
 
+    # T65: when the closing scene was a meanwhile child (host_guest
+    # present set), generate an omniscient briefing for the absent
+    # "you" and queue it as a pending digest. We reuse summarize_scene
+    # with a narrator persona so the digest text is shaped by the same
+    # classifier — only the ``summary`` field is consumed downstream.
+    # Emitted AFTER per-POV summaries land so witness memories carry
+    # their own POV text first; this mirrors how group_node_updated is
+    # ordered relative to the per-POV writes above.
+    if is_meanwhile:
+        digest_pov = await summarize_scene(
+            client,
+            model=classifier_model,
+            bot_name="Narrator",
+            bot_persona=_MEANWHILE_DIGEST_PERSONA,
+            you_name=you_name,
+            prior_edge_summary="",
+            dialogue=dialogue,
+            timeout_s=timeout_s,
+        )
+        if digest_pov.summary:
+            append_and_apply(
+                conn,
+                kind="meanwhile_digest_created",
+                payload={
+                    "chat_id": chat_id,
+                    "scene_id": scene_id,
+                    "summary": digest_pov.summary,
+                },
+            )
+
+    # T58.2: thread detection on close. Failure-tolerant: classify()
+    # returns the empty default on retry-exhaustion, and the broad except
+    # below protects the close pipeline from any other classifier/mock
+    # flap.
+    #
+    # T80.2: thread detection runs against a SCENE-SCOPED transcript,
+    # not the chat-wide last-50 turns used by the per-POV summaries.
+    # Mis-attributing threads when scene boundaries fall inside the last
+    # 50 turns would otherwise close threads opened in a prior scene.
+    scene_open_ev_id = _scene_opened_event_id(conn, chat_id, scene_id)
+    if scene_open_ev_id is not None:
+        scene_dialogue = _read_recent_dialogue(
+            conn, chat_id, since_event_id=scene_open_ev_id
+        )
+    else:
+        scene_dialogue = dialogue
+    try:
+        thread_result = await detect_threads(
+            client,
+            classifier_model=classifier_model,
+            scene_transcript=scene_dialogue,
+            open_threads=list_open_threads(conn, chat_id),
+            timeout_s=timeout_s,
+        )
+    except Exception as exc:
+        # T80.3: log the swallowed exception at DEBUG so a
+        # programmer-error flap (e.g. wrong kwarg name) surfaces in
+        # local logs without breaking the close pipeline.
+        _log.debug("detect_threads failed: %s", exc, exc_info=True)
+        from chat.services.thread_detection import ThreadDetectionResult
+
+        thread_result = ThreadDetectionResult()
+    for cand in thread_result.candidates:
+        if cand.action == "open":
+            new_thread_id = f"thr_{uuid.uuid4().hex[:12]}"
+            append_and_apply(
+                conn,
+                kind="thread_opened",
+                payload={
+                    "thread_id": new_thread_id,
+                    "chat_id": chat_id,
+                    "title": cand.title,
+                    "summary": cand.summary,
+                },
+            )
+        elif cand.action == "update" and cand.existing_thread_id:
+            append_and_apply(
+                conn,
+                kind="thread_updated",
+                payload={
+                    "thread_id": cand.existing_thread_id,
+                    "summary": cand.summary,
+                    "last_referenced_scene_id": scene_id,
+                },
+            )
+        elif cand.action == "close" and cand.existing_thread_id:
+            # T80.4: chat-clock time, not wall clock — the rest of the
+            # close pipeline (memories, edges, scene_closed payloads)
+            # uses chat["time"] so threads must agree. Falls back to
+            # UTC now only when the chat row has no clock yet (defensive
+            # — chat_state always seeds "time" via chat_created).
+            chat_clock_at = chat.get("time") or datetime.now(
+                timezone.utc
+            ).isoformat()
+            append_and_apply(
+                conn,
+                kind="thread_closed",
+                payload={
+                    "thread_id": cand.existing_thread_id,
+                    "closed_at": chat_clock_at,
+                },
+            )
+
     return host_pov
+
+
+class GroupMetaSummary(BaseModel):
+    """Classifier output: a merged group-level view of a closed scene.
+
+    Defaults are an empty no-op so callers can use the schema's default
+    as a sentinel; in practice :func:`merge_group_summary` builds an
+    explicit naive-concat fallback rather than returning these defaults
+    directly so existing Phase 2 behavior is preserved on classifier
+    failure.
+    """
+
+    summary: str = ""
+    dynamic: str = ""
+
+
+_GROUP_MERGE_SYSTEM = (
+    "Given two per-POV scene summaries from a 3-entity scene (you + "
+    "host + guest), produce a coherent group-level summary capturing "
+    "the shared events as both witnesses experienced them, plus a "
+    "brief 'dynamic' note describing the trio's group dynamic during "
+    "the scene. Output strict JSON matching schema."
+)
+
+
+# T65: meanwhile-scene digest. The "you" player was absent during this
+# scene; the digest is a short neutral briefing they'll read on the next
+# you-scene resume. Reuses the ScenePOVSummary schema so the same
+# `summarize_scene` helper can be called with a different persona — only
+# the ``summary`` field is used downstream.
+_MEANWHILE_DIGEST_PERSONA = (
+    "an omniscient narrator briefing the absent player in 2-3 neutral "
+    "sentences on what happened while they were away — no editorializing, "
+    "no second-person address"
+)
+
+
+async def merge_group_summary(
+    client: LLMClient,
+    *,
+    classifier_model: str,
+    host_name: str,
+    host_pov_summary: str,
+    guest_name: str,
+    guest_pov_summary: str,
+    timeout_s: float = 30.0,
+) -> GroupMetaSummary:
+    """Merge two per-POV scene summaries into a coherent group-level
+    summary + group-dynamic note. Falls back to the naive concat (the
+    existing behavior) on classifier failure."""
+    user = (
+        f"{host_name} (host) POV summary:\n{host_pov_summary}\n\n"
+        f"{guest_name} (guest) POV summary:\n{guest_pov_summary}"
+    )
+    fallback = GroupMetaSummary(
+        summary=(
+            f"{host_name}: {host_pov_summary}\n\n"
+            f"{guest_name}: {guest_pov_summary}"
+        ),
+        dynamic="",
+    )
+    return await classify(
+        client,
+        model=classifier_model,
+        system=_GROUP_MERGE_SYSTEM,
+        user=user,
+        schema=GroupMetaSummary,
+        default=fallback,
+        timeout_s=timeout_s,
+    )

chat/services/skip_narration.py

@@ -0,0 +1,132 @@
+"""Skip narration service (T53).
+
+Generates brief transition prose for elision and jump skips.
+
+Skips come in two flavors that read very differently:
+
+* **Elision** — collapses an in-progress activity into its expected
+  end-state in 1-2 sentences, narrated from the speaker bot's POV.
+  Example: "skip ahead to when we arrive" while the characters are
+  driving — output describes pulling into the lot.
+* **Jump** — bridges a longer fiction-time delta ("next morning", "a
+  week later") in 2-3 sentences, setting the scene at the new time.
+
+Output is free-form prose, not structured JSON, so this service calls
+``client.generate`` directly rather than going through the classifier
+path used by, e.g., :mod:`chat.services.scene_summarize`. A
+deterministic template fallback fires on any LLM failure so the skip
+flow keeps moving even when the model is down — important because
+skips are a UI-blocking operation; we'd rather show a parenthetical
+sentence than hang the chat indefinitely.
+"""
+
+from __future__ import annotations
+
+from chat.llm.client import LLMClient, Message
+
+
+_ELISION_SYSTEM = (
+    "You write a brief 1-2 sentence transition that elides the time "
+    "between an in-progress activity and its expected end-state, "
+    "narrated from the speaker's POV. Keep it grounded and concrete. "
+    "Do not invent new events or characters."
+)
+
+_JUMP_SYSTEM = (
+    "You write a brief 2-3 sentence transition narrating a jump in "
+    "fiction time (e.g., 'next morning', 'a week later'), narrated "
+    "from the speaker's POV. Set the scene at the new time. Keep it "
+    "grounded — no invented major events. If a landing-state hint is "
+    "provided, weave it in naturally."
+)
+
+
+async def narrate_skip(
+    client: LLMClient,
+    *,
+    narrative_model: str,
+    skip_kind: str,
+    speaker_bot: dict,
+    you_name: str,
+    current_time: str,
+    new_time: str,
+    current_activity: str,
+    landing_state_hint: str = "",
+    timeout_s: float = 60.0,
+) -> str:
+    """Generate brief transition prose for a time skip.
+
+    ``skip_kind`` is ``"elision"`` or ``"jump"``; any other value short-
+    circuits to the deterministic fallback (defensive — callers
+    shouldn't be inventing new kinds without updating this service).
+
+    Returns plain text. Never raises: any LLM error, an empty/blank
+    result, or an unknown ``skip_kind`` falls back to a parenthetical
+    template like ``"(next morning: having coffee in the kitchen.)"``
+    so the skip UI always has *something* to render.
+    """
+    fallback = _build_fallback(
+        skip_kind=skip_kind,
+        new_time=new_time,
+        current_activity=current_activity,
+        landing_state_hint=landing_state_hint,
+    )
+
+    if skip_kind not in ("elision", "jump"):
+        return fallback
+
+    system = _ELISION_SYSTEM if skip_kind == "elision" else _JUMP_SYSTEM
+    user = (
+        f"Speaker: {speaker_bot.get('name', 'speaker')}\n"
+        f"Persona: {speaker_bot.get('persona', '')}\n"
+        f"Other party: {you_name}\n"
+        f"Current time: {current_time}\n"
+        f"New time: {new_time}\n"
+        f"Current activity: {current_activity}\n"
+    )
+    if landing_state_hint:
+        user += f"Landing state hint: {landing_state_hint}\n"
+
+    try:
+        result = await client.generate(
+            [
+                Message(role="system", content=system),
+                Message(role="user", content=user),
+            ],
+            model=narrative_model,
+            max_tokens=200,
+            temperature=0.7,
+            timeout_s=timeout_s,
+        )
+        text = (result or "").strip()
+        if not text:
+            return fallback
+        return text
+    except Exception:
+        # Any failure — network blip, timeout, mock raising in tests —
+        # collapses to the deterministic template so the skip pipeline
+        # is never blocked on the LLM being available.
+        return fallback
+
+
+def _build_fallback(
+    *,
+    skip_kind: str,
+    new_time: str,
+    current_activity: str,
+    landing_state_hint: str,
+) -> str:
+    """Deterministic parenthetical narration used when the LLM fails.
+
+    Both flavors render the same shape today: ``(<new_time>:
+    <detail>.)``. They're separated as branches to make it easy to
+    diverge later (e.g. an elision-specific template) without churning
+    the call site or the public signature.
+    """
+    detail = landing_state_hint or current_activity or "moments later"
+    if skip_kind == "elision":
+        return f"({new_time}: {detail}.)"
+    return f"({new_time}: {detail}.)"
+
+
+__all__ = ["narrate_skip"]

chat/services/synthesized_memories.py

@@ -0,0 +1,74 @@
+"""Synthesized-memories service (T54).
+
+When the user jump-skips with 'anything notable happen?' prose, parse
+that prose into 1-N synthesized memories per present bot. Each memory
+carries source="synthesized" and reliability=0.7 (lower than direct).
+Caller (T62 skip flow) writes the memories via record_turn_memory_for_present.
+"""
+
+from __future__ import annotations
+
+from pydantic import BaseModel, Field
+
+from chat.llm.classify import classify
+from chat.llm.client import LLMClient
+
+
+class SynthesizedMemory(BaseModel):
+    text: str
+    significance: int = 1   # 0..3, default 1
+    affinity_delta: int = 0
+    trust_delta: int = 0
+
+
+class SynthesizedDigest(BaseModel):
+    memories: list[SynthesizedMemory] = Field(default_factory=list)
+
+
+_SYSTEM = (
+    "You parse a short user-supplied prose describing 'anything notable' "
+    "that happened during a time skip into 1-N synthesized memories from "
+    "a single bot's POV. Each memory has: text (one factual sentence "
+    "from that bot's perspective), significance (0-3, default 1; only "
+    "use 2 or 3 for genuinely scene-level or relationship-altering "
+    "events), affinity_delta and trust_delta (-10..+10, default 0; "
+    "use small adjustments only when prose explicitly describes a shift). "
+    "Empty/whitespace prose returns an empty memories list. Output "
+    "strict JSON matching the schema."
+)
+
+
+async def synthesize_memories(
+    client: LLMClient,
+    *,
+    classifier_model: str,
+    prose: str,
+    bot_name: str,
+    bot_persona: str,
+    you_name: str,
+    timeout_s: float = 30.0,
+) -> SynthesizedDigest:
+    """Parse 'anything notable' prose into structured memories from a
+    single bot's POV. Empty/whitespace prose short-circuits to an
+    empty digest (no LLM call)."""
+    if not prose or not prose.strip():
+        return SynthesizedDigest()
+
+    user = (
+        f"Bot: {bot_name}\n"
+        f"Persona: {bot_persona}\n"
+        f"Other party: {you_name}\n\n"
+        f"Prose:\n{prose.strip()}"
+    )
+    return await classify(
+        client,
+        model=classifier_model,
+        system=_SYSTEM,
+        user=user,
+        schema=SynthesizedDigest,
+        default=SynthesizedDigest(),
+        timeout_s=timeout_s,
+    )
+
+
+__all__ = ["SynthesizedMemory", "SynthesizedDigest", "synthesize_memories"]

chat/services/thread_detection.py

@@ -0,0 +1,89 @@
+"""Thread-detection service (T55).
+
+On scene close, classify the transcript into thread open/update/close
+candidates. Returns ThreadCandidate list; caller (T58 scene compression)
+emits one thread_opened/thread_updated/thread_closed event per candidate.
+"""
+
+from __future__ import annotations
+
+from pydantic import BaseModel, Field
+
+from chat.llm.classify import classify
+from chat.llm.client import LLMClient
+
+
+class ThreadCandidate(BaseModel):
+    action: str  # "open" | "update" | "close"
+    title: str = ""        # required for "open"; ignored otherwise
+    summary: str = ""
+    existing_thread_id: str | None = None  # required for "update" / "close"
+
+
+class ThreadDetectionResult(BaseModel):
+    candidates: list[ThreadCandidate] = Field(default_factory=list)
+
+
+_SYSTEM = (
+    "You analyze a closed scene's transcript to identify narrative "
+    "threads (unresolved arcs, dangling questions, promises made, "
+    "open obligations). Choose actions:\n"
+    "- 'open': a NEW thread the scene introduced. Provide title (short "
+    "noun phrase) + summary (one sentence).\n"
+    "- 'update': an EXISTING open thread that the scene developed. "
+    "Provide existing_thread_id + new summary.\n"
+    "- 'close': an EXISTING open thread that the scene resolved. "
+    "Provide existing_thread_id; summary may capture the resolution.\n"
+    "Conservative bias: most scenes do NOT open new threads. Only "
+    "produce candidates when the transcript clearly justifies them. "
+    "Output strict JSON matching the schema."
+)
+
+
+async def detect_threads(
+    client: LLMClient,
+    *,
+    classifier_model: str,
+    scene_transcript: list[dict],   # [{speaker, text}, ...]
+    open_threads: list[dict],       # [{thread_id, title, summary}, ...]
+    timeout_s: float = 30.0,
+) -> ThreadDetectionResult:
+    """Classify scene close into thread open/update/close candidates."""
+    if not scene_transcript:
+        return ThreadDetectionResult()
+
+    transcript_lines = [
+        f"{turn.get('speaker', 'unknown')}: {turn.get('text', '')}"
+        for turn in scene_transcript
+    ]
+    threads_lines = []
+    if open_threads:
+        threads_lines.append("Currently open threads:")
+        for t in open_threads:
+            threads_lines.append(
+                f"- thread_id={t['thread_id']} "
+                f"title={t.get('title', '')} "
+                f"summary={t.get('summary', '')}"
+            )
+    else:
+        threads_lines.append("No currently open threads.")
+
+    user = (
+        "Scene transcript:\n"
+        + "\n".join(transcript_lines)
+        + "\n\n"
+        + "\n".join(threads_lines)
+    )
+
+    return await classify(
+        client,
+        model=classifier_model,
+        system=_SYSTEM,
+        user=user,
+        schema=ThreadDetectionResult,
+        default=ThreadDetectionResult(),
+        timeout_s=timeout_s,
+    )
+
+
+__all__ = ["ThreadCandidate", "ThreadDetectionResult", "detect_threads"]

chat/services/turn_common.py

@@ -0,0 +1,131 @@
+"""Shared helpers for turn flows (T83.2).
+
+Both ``chat.web.turns.post_turn`` and
+``chat.services.regenerate.regenerate_assistant_turn`` need to:
+
+1. Pull a chronological tail of user-side and assistant_turn events for
+   prompt assembly + state-update inputs.
+2. Build a directed-edge dict over a fixed set of "present" entity ids
+   for the multi-pair state-update pass (with the schema 50/50 default
+   filled in for missing rows).
+
+Before T83.2 each call site had its own copy of these blocks. The two
+copies drifted on details (T73.1 added ``user_turn_edit`` handling to
+turns.py; regenerate.py had a slightly different recent-window query).
+This module is the single source so a future change to either lands in
+both flows by construction.
+
+Note on overlap with ``chat.services.scene_summarize._read_recent_dialogue``:
+that helper has a ``since_event_id`` clamp (T80.2 thread-detection
+scope) and intentionally does NOT include ``user_turn_edit`` events —
+its callers want the *original* prose, not edits. Deduplicating it
+into here would either (a) require a new flag on the shared helper for
+``user_turn_edit`` inclusion, or (b) silently change scene_summarize's
+read shape. Both feel more invasive than the duplication is bad, so
+that helper is left alone for now.
+"""
+
+from __future__ import annotations
+
+import json
+from sqlite3 import Connection
+
+from chat.state.edges import get_edge
+
+
+def read_recent_dialogue(
+    conn: Connection,
+    chat_id: str,
+    *,
+    limit: int = 50,
+    exclude_event_id: int | None = None,
+) -> list[dict]:
+    """Pull the last ``limit`` user-side / assistant_turn events for
+    ``chat_id`` as ``[{"speaker": <id-or-"you">, "text": <prose>}]``,
+    chronologically ordered (oldest first).
+
+    Filters: ``superseded_by IS NULL AND hidden = 0`` — regenerated
+    rows drop out so the timeline reflects the current state. Includes
+    ``user_turn``, ``user_turn_edit`` (T29 edited prose substitutes for
+    the original — the original is marked superseded above), and
+    ``assistant_turn`` rows.
+
+    ``exclude_event_id`` is an optional event_log id to skip — used by
+    regenerate to drop the original assistant_turn from its prompt
+    context window before that row has been marked superseded (the
+    supersede UPDATE lands at the end so the new event_id is known).
+
+    T90.1: the chat_id filter is pushed into SQL via ``json_extract`` so
+    ``LIMIT N`` always returns N rows scoped to the requested chat. The
+    previous implementation filtered chat_id post-fetch in Python, which
+    let foreign-chat rows fill the LIMIT and yield fewer than N relevant
+    rows in busy multi-chat databases.
+    """
+    if exclude_event_id is None:
+        cur = conn.execute(
+            "SELECT id, kind, payload_json FROM event_log "
+            "WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn') "
+            "  AND superseded_by IS NULL AND hidden = 0 "
+            "  AND json_extract(payload_json, '$.chat_id') = ? "
+            "ORDER BY id DESC LIMIT ?",
+            (chat_id, limit),
+        )
+    else:
+        cur = conn.execute(
+            "SELECT id, kind, payload_json FROM event_log "
+            "WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn') "
+            "  AND id != ? "
+            "  AND superseded_by IS NULL AND hidden = 0 "
+            "  AND json_extract(payload_json, '$.chat_id') = ? "
+            "ORDER BY id DESC LIMIT ?",
+            (exclude_event_id, chat_id, limit),
+        )
+    rows = list(reversed(cur.fetchall()))
+    out: list[dict] = []
+    for row_id, kind, payload_json in rows:
+        p = json.loads(payload_json)
+        if kind in ("user_turn", "user_turn_edit"):
+            out.append(
+                {
+                    "speaker": "you",
+                    "text": p.get("prose", ""),
+                    "event_id": row_id,
+                }
+            )
+        else:
+            out.append(
+                {
+                    "speaker": p.get("speaker_id", "bot"),
+                    "text": p.get("text", ""),
+                    "event_id": row_id,
+                }
+            )
+    return out
+
+
+def gather_prior_edges(
+    conn: Connection, present_ids: list[str]
+) -> dict[tuple[str, str], dict]:
+    """Build ``{(src, tgt): {affinity, trust, summary}}`` for every
+    directed pair where both ``src`` and ``tgt`` are in ``present_ids``
+    and ``src != tgt``.
+
+    Missing rows fall back to the schema default 50/50 baseline (mirrors
+    the Phase 1 single-pair flow). Used by post_turn and regenerate to
+    seed the multi-pair state-update classifier.
+    """
+    prior_edges: dict[tuple[str, str], dict] = {}
+    for src in present_ids:
+        for tgt in present_ids:
+            if src == tgt:
+                continue
+            edge = get_edge(conn, src, tgt) or {
+                "affinity": 50,
+                "trust": 50,
+                "summary": "",
+            }
+            prior_edges[(src, tgt)] = edge
+    return prior_edges
+
+
+__all__ = ["read_recent_dialogue", "gather_prior_edges"]

chat/services/turn_parse.py

@@ -16,6 +16,16 @@ nested quotes, mixed punctuation), so v1 delegates the segmentation to
 the classifier. The configurable ``Settings.ooc_marker`` is *not* read
 here: the classifier figures OOC out from ``((`` ``))`` regardless of
 config-time choice; marker-based stripping is a downstream concern.
+
+T62 extends the parser with an ``intent`` field so the turn flow can
+short-circuit time-skip phrases before the regular narrative path.
+``intent`` defaults to ``"narrative"``; the classifier may set it to
+``"skip_elision"`` when prose like "skip to when we arrive" or
+``"skip_jump"`` when prose like "next morning" / "a week later" is
+detected. ``landing_state_hint`` carries the residual descriptor for
+elision skips (the "to when we ..." phrase). Existing callers that
+don't read ``intent`` continue to work because the default keeps the
+narrative path intact.
 """
 
 from __future__ import annotations
@@ -39,9 +49,19 @@ class TurnSegment(BaseModel):
 
 
 class ParsedTurn(BaseModel):
-    """A turn split into ordered, typed segments."""
+    """A turn split into ordered, typed segments.
+
+    ``intent`` distinguishes a regular narrative beat (the default) from
+    a natural-language time-skip command (T62). ``landing_state_hint``
+    captures the descriptor following "skip to when we ..." for elision
+    skips so the downstream skip controller can pass it to the
+    narration helper. Both fields are optional and default-empty so
+    older fixtures and tests that don't supply them keep working.
+    """
 
     segments: list[TurnSegment]
+    intent: str = "narrative"  # "narrative" | "skip_elision" | "skip_jump"
+    landing_state_hint: str = ""
 
 
 _SYSTEM_PROMPT = (
@@ -52,13 +72,24 @@ _SYSTEM_PROMPT = (
     "- ((text in double parens)) is an OOC (out-of-character) segment — "
     "the author talking to the system, not the in-fiction bot.\n\n"
     "Output a JSON object with shape "
-    '{"segments": [{"kind": "...", "text": "..."}, ...]} '
+    '{"segments": [{"kind": "...", "text": "..."}, ...], '
-    "where each ``kind`` is exactly one of: dialogue, action, ooc. "
+    '"intent": "...", "landing_state_hint": "..."} '
-    "Preserve the original substring text as ``text``: do not rewrite, "
+    "where each segment ``kind`` is exactly one of: dialogue, action, "
-    "translate, or normalize punctuation — strip only the marker "
+    "ooc. Preserve the original substring text as ``text``: do not "
-    "characters (asterisks, surrounding quotes, double parens) so "
+    "rewrite, translate, or normalize punctuation — strip only the "
-    "``text`` is the inner content. Emit segments in the order they "
+    "marker characters (asterisks, surrounding quotes, double parens) "
-    "appear in the input."
+    "so ``text`` is the inner content. Emit segments in the order they "
+    "appear in the input.\n\n"
+    "``intent`` is exactly one of: narrative, skip_elision, skip_jump. "
+    "Default to ``narrative``. Use ``skip_elision`` when the prose is a "
+    "directive to fast-forward an in-progress activity to a near-term "
+    "landing state — e.g. 'skip to when we arrive', 'fast-forward to "
+    "after dinner'. Use ``skip_jump`` when the prose denotes a longer "
+    "fiction-time bridge — e.g. 'next morning', 'a week later', 'the "
+    "following day'.\n"
+    "``landing_state_hint`` is a short descriptor of the landing state "
+    "for ``skip_elision`` (e.g. 'we arrive at the park'). Empty string "
+    "for ``skip_jump`` and ``narrative``."
 )
 
 

chat/state/branches.py

@@ -0,0 +1,133 @@
+"""Branches projector + readers (T89, Phase 4).
+
+A branch is a named fork of the event log. The 'main' branch is bootstrapped
+by migration 0013 with is_active=1. Subsequent branches reference an
+origin_event_id (the event they forked from). Phase 4 enables creation
+and switching; the read-side filter (event readers consulting is_active)
+is a Phase 4.5 follow-up — for now branches are metadata-only and the
+existing event readers remain branch-agnostic.
+"""
+
+from __future__ import annotations
+from sqlite3 import Connection
+
+from chat.eventlog.projector import on
+from chat.eventlog.log import Event
+
+
+@on("branch_created")
+def _apply_branch_created(conn: Connection, e: Event) -> None:
+    """Insert a new branch row with is_active=0. Idempotent via INSERT OR IGNORE."""
+    p = e.payload
+    conn.execute(
+        "INSERT OR IGNORE INTO branches "
+        "(name, origin_event_id, head_event_id, chat_id, is_active) "
+        "VALUES (?, ?, ?, ?, 0)",
+        (
+            p["name"],
+            int(p["origin_event_id"]),
+            int(p.get("head_event_id", p["origin_event_id"])),
+            p.get("chat_id"),
+        ),
+    )
+
+
+@on("branch_switched")
+def _apply_branch_switched(conn: Connection, e: Event) -> None:
+    """Set is_active=1 on the named branch and is_active=0 on all others.
+
+    Atomic via two UPDATEs ordered to avoid the unique-active-index race.
+    """
+    p = e.payload
+    name = p["name"]
+    # Clear ALL is_active flags first (avoids the unique-index trip).
+    conn.execute("UPDATE branches SET is_active = 0 WHERE is_active = 1")
+    conn.execute(
+        "UPDATE branches SET is_active = 1 WHERE name = ?",
+        (name,),
+    )
+
+
+@on("branch_head_updated")
+def _apply_branch_head_updated(conn: Connection, e: Event) -> None:
+    """Update head_event_id on the named branch."""
+    p = e.payload
+    conn.execute(
+        "UPDATE branches SET head_event_id = ? WHERE name = ?",
+        (int(p["head_event_id"]), p["name"]),
+    )
+
+
+def get_branch(conn: Connection, name: str) -> dict | None:
+    row = conn.execute(
+        "SELECT id, name, origin_event_id, head_event_id, chat_id, "
+        "       created_at, is_active "
+        "FROM branches WHERE name = ?",
+        (name,),
+    ).fetchone()
+    if not row:
+        return None
+    return {
+        "id": row[0],
+        "name": row[1],
+        "origin_event_id": row[2],
+        "head_event_id": row[3],
+        "chat_id": row[4],
+        "created_at": row[5],
+        "is_active": bool(row[6]),
+    }
+
+
+def list_branches(conn: Connection, chat_id: str | None = None) -> list[dict]:
+    if chat_id is None:
+        rows = conn.execute(
+            "SELECT id, name, origin_event_id, head_event_id, chat_id, "
+            "       created_at, is_active "
+            "FROM branches ORDER BY id ASC"
+        ).fetchall()
+    else:
+        rows = conn.execute(
+            "SELECT id, name, origin_event_id, head_event_id, chat_id, "
+            "       created_at, is_active "
+            "FROM branches WHERE chat_id = ? OR chat_id IS NULL "
+            "ORDER BY id ASC",
+            (chat_id,),
+        ).fetchall()
+    return [
+        {
+            "id": r[0],
+            "name": r[1],
+            "origin_event_id": r[2],
+            "head_event_id": r[3],
+            "chat_id": r[4],
+            "created_at": r[5],
+            "is_active": bool(r[6]),
+        }
+        for r in rows
+    ]
+
+
+def active_branch(conn: Connection) -> dict | None:
+    row = conn.execute(
+        "SELECT id, name, origin_event_id, head_event_id, chat_id, "
+        "       created_at, is_active "
+        "FROM branches WHERE is_active = 1"
+    ).fetchone()
+    if not row:
+        return None
+    return {
+        "id": row[0],
+        "name": row[1],
+        "origin_event_id": row[2],
+        "head_event_id": row[3],
+        "chat_id": row[4],
+        "created_at": row[5],
+        "is_active": bool(row[6]),
+    }
+
+
+__all__ = [
+    "get_branch",
+    "list_branches",
+    "active_branch",
+]

chat/state/embeddings.py

@@ -0,0 +1,105 @@
+"""Embeddings projector + readers (T88, Phase 4).
+
+Embeddings are stored as JSON-serialized float arrays in a regular
+SQLite table. Cosine similarity is computed in Python at query time
+(see chat/services/vector_search.py / T92). This deliberately avoids
+the sqlite-vec extension dependency — the host Python build doesn't
+support enable_load_extension. Phase 4.5+ may revisit if memory counts
+grow beyond pure-Python feasibility (~few thousand per query).
+"""
+
+from __future__ import annotations
+import json
+from sqlite3 import Connection
+
+from chat.eventlog.projector import on
+from chat.eventlog.log import Event
+
+
+@on("embedding_indexed")
+def _apply_embedding_indexed(conn: Connection, e: Event) -> None:
+    """Insert or replace the embedding for a memory.
+
+    Idempotent: re-projection or re-indexing replaces the prior vector.
+    """
+    p = e.payload
+    vector = p["vector"]
+    conn.execute(
+        "INSERT OR REPLACE INTO embeddings "
+        "(memory_id, vector_json, model, dim, indexed_at) "
+        "VALUES (?, ?, ?, ?, datetime('now'))",
+        (
+            int(p["memory_id"]),
+            json.dumps(list(vector)),
+            p["model"],
+            int(p.get("dim") or len(vector)),
+        ),
+    )
+
+
+@on("embedding_deindexed")
+def _apply_embedding_deindexed(conn: Connection, e: Event) -> None:
+    """Remove the embedding for a memory (used by reset cascade)."""
+    p = e.payload
+    conn.execute(
+        "DELETE FROM embeddings WHERE memory_id = ?",
+        (int(p["memory_id"]),),
+    )
+
+
+def get_embedding(conn: Connection, memory_id: int) -> dict | None:
+    row = conn.execute(
+        "SELECT memory_id, vector_json, model, dim, indexed_at "
+        "FROM embeddings WHERE memory_id = ?",
+        (memory_id,),
+    ).fetchone()
+    if not row:
+        return None
+    return {
+        "memory_id": row[0],
+        "vector": json.loads(row[1]),
+        "model": row[2],
+        "dim": row[3],
+        "indexed_at": row[4],
+    }
+
+
+def list_embeddings_for_owner(conn: Connection, owner_id: str) -> list[dict]:
+    """Return all embeddings for memories owned by ``owner_id``.
+
+    Used by vector search at query time (T92). The join carries the
+    fields the cosine ranker needs to assemble result rows without a
+    second round-trip: the POV summary text, significance, and witness
+    flags. The ``memories`` table has no separate ``text`` column —
+    ``pov_summary`` is the canonical narrative text per
+    ``chat/services/memory_write.py``.
+    """
+    rows = conn.execute(
+        "SELECT e.memory_id, e.vector_json, e.model, e.dim, "
+        "       m.pov_summary, m.significance, "
+        "       m.witness_you, m.witness_host, m.witness_guest "
+        "FROM embeddings e "
+        "JOIN memories m ON m.id = e.memory_id "
+        "WHERE m.owner_id = ?",
+        (owner_id,),
+    ).fetchall()
+    return [
+        {
+            "memory_id": r[0],
+            "vector": json.loads(r[1]),
+            "model": r[2],
+            "dim": r[3],
+            "pov_summary": r[4],
+            "significance": r[5],
+            "witness_you": r[6],
+            "witness_host": r[7],
+            "witness_guest": r[8],
+        }
+        for r in rows
+    ]
+
+
+__all__ = [
+    "get_embedding",
+    "list_embeddings_for_owner",
+]

chat/state/entities.py

@@ -48,6 +48,17 @@ def _apply_bot_reset(conn: Connection, e: Event) -> None:
             "SELECT id FROM chats WHERE host_bot_id = ?", (bot_id,)
         ).fetchall()
     ]
+    # T69: purge orphaned "you" activity rows pointing at containers in this
+    # bot's chats BEFORE the containers/chats themselves are deleted, otherwise
+    # the subqueries find nothing and the FK constraint on activity.container_id
+    # blocks the container delete.
+    conn.execute(
+        "DELETE FROM activity WHERE entity_id = 'you' "
+        "AND container_id IN (SELECT id FROM containers WHERE chat_id IN ("
+        "    SELECT id FROM chats WHERE host_bot_id = ?"
+        "))",
+        (bot_id,),
+    )
     for chat_id in chat_ids:
         conn.execute("DELETE FROM scenes WHERE chat_id = ?", (chat_id,))
         conn.execute("DELETE FROM containers WHERE chat_id = ?", (chat_id,))
@@ -74,8 +85,6 @@ def _apply_bot_reset(conn: Connection, e: Event) -> None:
         (bot_id,),
     )
     # NOTE: bots row itself is preserved (identity, kickoff_prose intact).
-    # NOTE: "you" activity (entity_id="you") may linger from a deleted chat;
-    # acceptable for v1 — Phase 1.5 cleanup if needed.
 
 
 def get_bot(conn: Connection, bot_id: str) -> dict | None:

chat/state/events.py

@@ -0,0 +1,127 @@
+from __future__ import annotations
+import json
+from sqlite3 import Connection
+
+from chat.eventlog.projector import on
+from chat.eventlog.log import Event
+
+
+_TERMINAL_STATUSES = {"completed", "cancelled", "expired"}
+
+
+@on("event_planned")
+def _apply_event_planned(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "INSERT OR IGNORE INTO events "
+        "(event_id, chat_id, kind, status, props_json, planned_for) "
+        "VALUES (?, ?, ?, 'planned', ?, ?)",
+        (
+            p["event_id"],
+            p["chat_id"],
+            p["kind"],
+            json.dumps(p.get("props", {})),
+            p.get("planned_for"),
+        ),
+    )
+
+
+@on("event_started")
+def _apply_event_started(conn: Connection, e: Event) -> None:
+    p = e.payload
+    # Idempotent: only transition from non-terminal status.
+    conn.execute(
+        "UPDATE events SET status = 'active', started_at = ?, updated_at = datetime('now') "
+        "WHERE event_id = ? AND status NOT IN ('completed','cancelled','expired')",
+        (p.get("started_at"), p["event_id"]),
+    )
+
+
+@on("event_completed")
+def _apply_event_completed(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "UPDATE events SET status = 'completed', completed_at = ?, updated_at = datetime('now') "
+        "WHERE event_id = ? AND status NOT IN ('completed','cancelled','expired')",
+        (p.get("completed_at"), p["event_id"]),
+    )
+
+
+@on("event_cancelled")
+def _apply_event_cancelled(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "UPDATE events SET status = 'cancelled', completed_at = ?, updated_at = datetime('now') "
+        "WHERE event_id = ? AND status NOT IN ('completed','cancelled','expired')",
+        (p.get("completed_at"), p["event_id"]),
+    )
+
+
+@on("event_expired")
+def _apply_event_expired(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "UPDATE events SET status = 'expired', completed_at = ?, updated_at = datetime('now') "
+        "WHERE event_id = ? AND status NOT IN ('completed','cancelled','expired')",
+        (p.get("completed_at"), p["event_id"]),
+    )
+
+
+def get_event(conn: Connection, event_id: str) -> dict | None:
+    row = conn.execute(
+        "SELECT event_id, chat_id, kind, status, props_json, planned_for, "
+        "started_at, completed_at, created_at, updated_at "
+        "FROM events WHERE event_id = ?",
+        (event_id,),
+    ).fetchone()
+    if not row:
+        return None
+    return {
+        "event_id": row[0],
+        "chat_id": row[1],
+        "kind": row[2],
+        "status": row[3],
+        "props": json.loads(row[4]),
+        "planned_for": row[5],
+        "started_at": row[6],
+        "completed_at": row[7],
+        "created_at": row[8],
+        "updated_at": row[9],
+    }
+
+
+def list_active_events(conn: Connection, chat_id: str) -> list[dict]:
+    rows = conn.execute(
+        "SELECT event_id, chat_id, kind, status, props_json, planned_for, "
+        "started_at, completed_at, created_at, updated_at "
+        "FROM events WHERE chat_id = ? AND status IN ('planned','active') "
+        "ORDER BY id ASC",
+        (chat_id,),
+    ).fetchall()
+    return [
+        {
+            "event_id": r[0], "chat_id": r[1], "kind": r[2], "status": r[3],
+            "props": json.loads(r[4]),
+            "planned_for": r[5], "started_at": r[6], "completed_at": r[7],
+            "created_at": r[8], "updated_at": r[9],
+        }
+        for r in rows
+    ]
+
+
+def list_events_in_status(conn: Connection, chat_id: str, status: str) -> list[dict]:
+    rows = conn.execute(
+        "SELECT event_id, chat_id, kind, status, props_json, planned_for, "
+        "started_at, completed_at, created_at, updated_at "
+        "FROM events WHERE chat_id = ? AND status = ? ORDER BY id ASC",
+        (chat_id, status),
+    ).fetchall()
+    return [
+        {
+            "event_id": r[0], "chat_id": r[1], "kind": r[2], "status": r[3],
+            "props": json.loads(r[4]),
+            "planned_for": r[5], "started_at": r[6], "completed_at": r[7],
+            "created_at": r[8], "updated_at": r[9],
+        }
+        for r in rows
+    ]

chat/state/manual_edit.py

@@ -6,7 +6,7 @@ be reversed by emitting an inverse ``manual_edit`` later. This module
 applies the new value to the appropriate target table; the snapshot of
 ``prior_value`` is taken by the route handler before this fires.
 
-Phase 1 covers four target kinds:
+Phase 1 covers five target kinds:
 - ``edge_affinity`` and ``edge_trust`` — slider edits on a specific edge,
   clamped to 0..100.
 - ``memory_significance`` — dropdown edit, clamped to 0..3.
@@ -17,8 +17,18 @@ Phase 1 covers four target kinds:
   field. Driven by T27 from the classifier's ``relationship_summary``
   output combined with the prior summary.
 
-Other §6.4 editable fields (activity verb / attention / posture,
+T72.1 (Phase 2.5) adds one list-shaped edit:
-knowledge_facts list manipulation) are deferred to Phase 1.5.
+- ``edge_knowledge_fact`` — add/remove a single fact on an edge's
+  ``knowledge_json`` list. Payload carries an ``action`` of ``"add"`` or
+  ``"remove"`` and a ``fact`` string; remove matches the first occurrence
+  by string equality so the route handler doesn't have to track fact
+  indices across re-renders.
+
+T72.3 adds a per-flag witness toggle:
+- ``memory_witness`` — flip one of ``witness_you`` / ``witness_host`` /
+  ``witness_guest`` on a memory row. Payload's ``new_value`` is a dict
+  ``{"flag": "you"|"host"|"guest", "value": 0|1}`` and ``prior_value``
+  mirrors the same shape so an inverse edit can restore the flag.
 
 Pin toggles intentionally use the existing ``memory_pin_changed`` event
 (registered in :mod:`chat.state.memory`) rather than ``manual_edit`` so
@@ -27,11 +37,14 @@ the projection writes both ``pinned`` and ``auto_pinned`` atomically.
 
 from __future__ import annotations
 
+import json
 from sqlite3 import Connection
 
 from chat.eventlog.log import Event
 from chat.eventlog.projector import on
 
+_VALID_WITNESS_FLAGS = {"you", "host", "guest"}
+
 
 def _clamp(value: int, lo: int, hi: int) -> int:
     return max(lo, min(hi, value))
@@ -87,5 +100,43 @@ def _apply_manual_edit(conn: Connection, e: Event) -> None:
                 target_id["target_id"],
             ),
         )
+    elif kind == "edge_knowledge_fact":
+        # T72.1: add or remove a single fact on an edge's knowledge list.
+        # ``target_id`` is the {"source_id", "target_id"} edge pair;
+        # ``new_value`` carries ``{"action": "add"|"remove", "fact": str}``.
+        # Remove matches by string equality (first occurrence) so callers
+        # don't have to thread a fact_index through re-rendered drawers.
+        action = new_value["action"]
+        fact = str(new_value["fact"])
+        row = conn.execute(
+            "SELECT knowledge_json FROM edges "
+            "WHERE source_id = ? AND target_id = ?",
+            (target_id["source_id"], target_id["target_id"]),
+        ).fetchone()
+        if row is not None:
+            knowledge = json.loads(row[0])
+            if action == "add":
+                knowledge.append(fact)
+            elif action == "remove" and fact in knowledge:
+                knowledge.remove(fact)
+            conn.execute(
+                "UPDATE edges SET knowledge_json = ? "
+                "WHERE source_id = ? AND target_id = ?",
+                (
+                    json.dumps(knowledge),
+                    target_id["source_id"],
+                    target_id["target_id"],
+                ),
+            )
+    elif kind == "memory_witness":
+        # T72.3: toggle one of the three witness flags on a memory row.
+        # ``new_value`` is the dict ``{"flag", "value"}``; ``prior_value``
+        # mirrors the same shape so an inverse edit restores the flag.
+        flag = new_value["flag"]
+        if flag in _VALID_WITNESS_FLAGS:
+            conn.execute(
+                f"UPDATE memories SET witness_{flag} = ? WHERE id = ?",
+                (1 if int(new_value["value"]) else 0, int(target_id)),
+            )
     # Unknown target_kind: silently no-op for v1. Future kinds (activity
-    # fields, knowledge_facts list manipulation) extend the dispatch above.
+    # fields, etc.) extend the dispatch above.

chat/state/meanwhile.py

@@ -0,0 +1,164 @@
+"""Meanwhile-scene projection (T63).
+
+A "meanwhile" scene is a 2-bot scene where ``present_set = {host_bot_id,
+guest_bot_id}`` and "you" is absent. It runs alongside an active you-scene
+(its parent) so bots can have private interactions whose outcome later
+surfaces back to the you-scene as a pending digest.
+
+The underlying ``scenes`` table (migration 0007) has no explicit ``status``
+column; "active" is encoded as ``ended_at IS NULL`` and "closed" as
+``ended_at IS NOT NULL``. This module preserves that convention and adds
+two new columns introduced by migration 0011:
+
+- ``present_set_kind`` — ``'you_host'`` (default) for normal scenes,
+  ``'host_guest'`` for meanwhile child scenes.
+- ``parent_scene_id`` — the you-scene a meanwhile child hangs off of.
+
+Pending meanwhile digests live in their own table
+(``meanwhile_digest_pending``) and are consumed when their summary is
+surfaced in the next you-scene's prompt.
+"""
+from __future__ import annotations
+import json
+from sqlite3 import Connection
+
+from chat.eventlog.projector import on
+from chat.eventlog.log import Event
+
+
+@on("meanwhile_scene_started")
+def _apply_meanwhile_scene_started(conn: Connection, e: Event) -> None:
+    """Insert a new scenes row for the meanwhile child.
+
+    The caller supplies an explicit ``scene_id`` so subsequent events
+    (close, digest) can reference it without round-tripping through
+    ``lastrowid``.
+    """
+    p = e.payload
+    conn.execute(
+        "INSERT INTO scenes ("
+        "id, chat_id, started_at, ended_at, significance, "
+        "participants_json, present_set_kind, parent_scene_id"
+        ") VALUES (?, ?, ?, NULL, 0, ?, 'host_guest', ?)",
+        (
+            p["scene_id"],
+            p["chat_id"],
+            p.get("started_at"),
+            # participants_json mirrors the present_set: host + guest bot.
+            # json.dumps ensures bot ids with quotes/backslashes can't corrupt the JSON literal.
+            json.dumps([p["host_bot_id"], p["guest_bot_id"]]),
+            p["parent_scene_id"],
+        ),
+    )
+
+
+@on("meanwhile_scene_closed")
+def _apply_meanwhile_scene_closed(conn: Connection, e: Event) -> None:
+    """Mark the meanwhile scene closed by stamping ``ended_at``."""
+    p = e.payload
+    conn.execute(
+        "UPDATE scenes SET ended_at = ? "
+        "WHERE id = ? AND present_set_kind = 'host_guest' "
+        "AND ended_at IS NULL",
+        (p.get("closed_at"), p["scene_id"]),
+    )
+
+
+@on("meanwhile_digest_created")
+def _apply_meanwhile_digest_created(conn: Connection, e: Event) -> None:
+    """Queue a digest for surfacing to the next you-scene's prompt."""
+    p = e.payload
+    conn.execute(
+        "INSERT INTO meanwhile_digest_pending (scene_id, chat_id, summary) "
+        "VALUES (?, ?, ?)",
+        (p["scene_id"], p["chat_id"], p["summary"]),
+    )
+
+
+@on("meanwhile_digest_consumed")
+def _apply_meanwhile_digest_consumed(conn: Connection, e: Event) -> None:
+    """Mark a pending digest as consumed (idempotent on re-projection)."""
+    p = e.payload
+    conn.execute(
+        "UPDATE meanwhile_digest_pending SET consumed_at = ? "
+        "WHERE id = ? AND consumed_at IS NULL",
+        (p.get("consumed_at"), p["digest_id"]),
+    )
+
+
+def _scene_row_to_dict(row: tuple) -> dict:
+    """Shape a meanwhile-scene row.
+
+    ``status`` is derived from ``ended_at`` for callers that prefer the
+    higher-level vocabulary; ``closed_at`` aliases ``ended_at`` for the
+    same reason. The underlying column remains ``ended_at``.
+    """
+    ended_at = row[5]
+    return {
+        "id": row[0],
+        "chat_id": row[1],
+        "started_at": row[2],
+        "present_set_kind": row[3],
+        "parent_scene_id": row[4],
+        "closed_at": ended_at,
+        "status": "closed" if ended_at is not None else "active",
+    }
+
+
+def list_meanwhile_scenes(
+    conn: Connection, chat_id: str, status: str = "active"
+) -> list[dict]:
+    """Return meanwhile scenes for ``chat_id`` filtered by derived status."""
+    if status == "active":
+        ended_clause = "s.ended_at IS NULL"
+    elif status == "closed":
+        ended_clause = "s.ended_at IS NOT NULL"
+    else:
+        raise ValueError(f"unknown status: {status!r}")
+    rows = conn.execute(
+        "SELECT s.id, s.chat_id, s.started_at, s.present_set_kind, "
+        "s.parent_scene_id, s.ended_at "
+        "FROM scenes s "
+        "WHERE s.chat_id = ? AND s.present_set_kind = 'host_guest' "
+        f"AND {ended_clause} "
+        "ORDER BY s.id ASC",
+        (chat_id,),
+    ).fetchall()
+    return [_scene_row_to_dict(r) for r in rows]
+
+
+def get_parent_scene(conn: Connection, scene_id: int) -> dict | None:
+    """Given a meanwhile scene id, return its parent (you-scene) row."""
+    row = conn.execute(
+        "SELECT s.id, s.chat_id, s.started_at, s.present_set_kind, "
+        "s.parent_scene_id, s.ended_at "
+        "FROM scenes s JOIN scenes m ON m.parent_scene_id = s.id "
+        "WHERE m.id = ?",
+        (scene_id,),
+    ).fetchone()
+    if row is None:
+        return None
+    return _scene_row_to_dict(row)
+
+
+def list_pending_meanwhile_digests(
+    conn: Connection, chat_id: str
+) -> list[dict]:
+    """Return digests for ``chat_id`` that haven't been consumed yet."""
+    rows = conn.execute(
+        "SELECT id, scene_id, chat_id, summary, created_at "
+        "FROM meanwhile_digest_pending "
+        "WHERE chat_id = ? AND consumed_at IS NULL "
+        "ORDER BY id ASC",
+        (chat_id,),
+    ).fetchall()
+    return [
+        {
+            "id": r[0],
+            "scene_id": r[1],
+            "chat_id": r[2],
+            "summary": r[3],
+            "created_at": r[4],
+        }
+        for r in rows
+    ]

chat/state/memory.py

@@ -94,6 +94,14 @@ def get_pinned(conn: Connection, owner_id: str) -> list[dict]:
 _SIGNIFICANCE_WEIGHT = 0.3
 _RECENCY_WEIGHT = 0.5
 
+# T57 (Phase 3, §11.1): significance multiplier applied to the SQL ORDER BY in
+# ``search_memories`` so that the FTS over-fetch already prefers
+# higher-significance rows for tied / near-tied BM25 ranks. Module-level so it
+# can be tuned without a code change. BM25 ``rank`` is lower-is-better, so the
+# bias is *subtracted* from rank in the ASC ordering — equivalent to multiplying
+# a higher-is-better score by a positive constant per the spec wording.
+SIGNIFICANCE_RANK_BIAS = 0.5
+
 
 def search_memories(
     conn: Connection,
@@ -117,6 +125,16 @@ def search_memories(
     so that stronger candidates yield smaller composite scores; the result is
     sorted ascending and truncated to ``k``. The unmodified ``fts_rank`` and a
     debug-friendly ``composite_score`` are kept on each returned dict.
+
+    The result ordering applies TWO independent significance boosts:
+
+    * **SQL-side** — ``ORDER BY (rank - significance * SIGNIFICANCE_RANK_BIAS)``
+      pushes higher-significance memories ahead in the FTS5 candidate set so
+      the over-fetch already prefers them for tied / near-tied BM25 ranks
+      (T57, §11.1).
+    * **Python-side** — a composite re-rank with ``_SIGNIFICANCE_WEIGHT``
+      reinforces the ordering after candidate retrieval, alongside the
+      recency boost above.
     """
     if witness_role not in _VALID_WITNESS_ROLES:
         raise ValueError(
@@ -137,10 +155,15 @@ def search_memories(
         "JOIN memories m ON m.id = memories_fts.rowid "
         f"WHERE m.owner_id = ? AND m.{witness_col} = 1 "
         "AND memories_fts MATCH ? "
-        "ORDER BY memories_fts.rank "
+        # T57: significance multiplier biases the FTS over-fetch order. BM25
+        # ``rank`` is lower-is-better, so subtracting ``significance * BIAS``
+        # surfaces higher-significance rows above lower-significance rows with
+        # equal/near-equal match strength. Equivalent to ``score × constant``
+        # per §11.1 once the rank is inverted to a higher-is-better score.
+        "ORDER BY (memories_fts.rank - m.significance * ?) ASC "
         "LIMIT ?"
     )
-    cur = conn.execute(sql, (owner_id, query, over_fetch))
+    cur = conn.execute(sql, (owner_id, query, SIGNIFICANCE_RANK_BIAS, over_fetch))
     rows = cur.fetchall()
     if not rows:
         return []

chat/state/threads.py

@@ -0,0 +1,123 @@
+from __future__ import annotations
+from sqlite3 import Connection
+
+from chat.eventlog.projector import on
+from chat.eventlog.log import Event
+
+
+@on("thread_opened")
+def _apply_thread_opened(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "INSERT OR IGNORE INTO threads "
+        "(thread_id, chat_id, title, summary, status) "
+        "VALUES (?, ?, ?, ?, 'open')",
+        (
+            p["thread_id"],
+            p["chat_id"],
+            p["title"],
+            p.get("summary", ""),
+        ),
+    )
+
+
+@on("thread_updated")
+def _apply_thread_updated(conn: Connection, e: Event) -> None:
+    p = e.payload
+    # Idempotent: closed threads ignore subsequent updates.
+    conn.execute(
+        "UPDATE threads SET summary = ?, last_referenced_scene_id = ?, "
+        "updated_at = datetime('now') "
+        "WHERE thread_id = ? AND status = 'open'",
+        (
+            p.get("summary", ""),
+            p.get("last_referenced_scene_id"),
+            p["thread_id"],
+        ),
+    )
+
+
+@on("thread_closed")
+def _apply_thread_closed(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "UPDATE threads SET status = 'closed', closed_at = ?, "
+        "updated_at = datetime('now') "
+        "WHERE thread_id = ? AND status = 'open'",
+        (p.get("closed_at"), p["thread_id"]),
+    )
+
+
+def get_thread(conn: Connection, thread_id: str) -> dict | None:
+    row = conn.execute(
+        "SELECT thread_id, chat_id, title, summary, status, "
+        "opened_at, closed_at, last_referenced_scene_id, "
+        "created_at, updated_at "
+        "FROM threads WHERE thread_id = ?",
+        (thread_id,),
+    ).fetchone()
+    if not row:
+        return None
+    return {
+        "thread_id": row[0],
+        "chat_id": row[1],
+        "title": row[2],
+        "summary": row[3],
+        "status": row[4],
+        "opened_at": row[5],
+        "closed_at": row[6],
+        "last_referenced_scene_id": row[7],
+        "created_at": row[8],
+        "updated_at": row[9],
+    }
+
+
+def list_open_threads(conn: Connection, chat_id: str) -> list[dict]:
+    rows = conn.execute(
+        "SELECT thread_id, chat_id, title, summary, status, "
+        "opened_at, closed_at, last_referenced_scene_id, "
+        "created_at, updated_at "
+        "FROM threads WHERE chat_id = ? AND status = 'open' "
+        "ORDER BY id ASC",
+        (chat_id,),
+    ).fetchall()
+    return [
+        {
+            "thread_id": r[0], "chat_id": r[1], "title": r[2],
+            "summary": r[3], "status": r[4],
+            "opened_at": r[5], "closed_at": r[6],
+            "last_referenced_scene_id": r[7],
+            "created_at": r[8], "updated_at": r[9],
+        }
+        for r in rows
+    ]
+
+
+def list_threads(conn: Connection, chat_id: str, status: str | None = None) -> list[dict]:
+    if status is None:
+        rows = conn.execute(
+            "SELECT thread_id, chat_id, title, summary, status, "
+            "opened_at, closed_at, last_referenced_scene_id, "
+            "created_at, updated_at "
+            "FROM threads WHERE chat_id = ? ORDER BY id ASC",
+            (chat_id,),
+        ).fetchall()
+    else:
+        rows = conn.execute(
+            "SELECT thread_id, chat_id, title, summary, status, "
+            "opened_at, closed_at, last_referenced_scene_id, "
+            "created_at, updated_at "
+            "FROM threads WHERE chat_id = ? AND status = ? "
+            "ORDER BY id ASC",
+            (chat_id, status),
+        ).fetchall()
+    return [
+        {
+            "thread_id": r[0], "chat_id": r[1], "title": r[2],
+            "summary": r[3], "status": r[4],
+            "opened_at": r[5], "closed_at": r[6],
+            "last_referenced_scene_id": r[7],
+            "created_at": r[8], "updated_at": r[9],
+        }
+        for r in rows
+    ]

chat/state/world.py

@@ -29,6 +29,34 @@ def _apply_chat_created(conn: Connection, e: Event) -> None:
     )
 
 
+@on("time_skip_elision")
+def _apply_time_skip_elision(conn: Connection, e: Event) -> None:
+    p = e.payload
+    conn.execute(
+        "UPDATE chat_state SET time = ? WHERE chat_id = ?",
+        (p["new_time"], p["chat_id"]),
+    )
+
+
+@on("time_skip_jump")
+def _apply_time_skip_jump(conn: Connection, e: Event) -> None:
+    p = e.payload
+    chat_id = p["chat_id"]
+    conn.execute(
+        "UPDATE chat_state SET time = ? WHERE chat_id = ?",
+        (p["new_time"], chat_id),
+    )
+    if p.get("reset_activity", False):
+        # Activity rows are keyed by entity_id with a container_id FK.
+        # Each chat owns its containers, so deleting activity rows whose
+        # container_id belongs to this chat clears every present entity.
+        conn.execute(
+            "DELETE FROM activity "
+            "WHERE container_id IN (SELECT id FROM containers WHERE chat_id = ?)",
+            (chat_id,),
+        )
+
+
 @on("guest_added")
 def _apply_guest_added(conn: Connection, e: Event) -> None:
     p = e.payload

chat/templates/_drawer.html

@@ -41,6 +41,121 @@
         {% endif %}
       </div>
     {% endfor %}
+
+    <details class="skip-controls">
+      <summary>Elision skip</summary>
+      <form class="inline-edit"
+            hx-post="/chats/{{ chat.id }}/drawer/skip/elision"
+            hx-target="#drawer" hx-swap="innerHTML">
+        <label>
+          Landing state hint:
+          <input type="text" name="landing_state_hint"
+                 placeholder="e.g. arriving at the office">
+        </label>
+        <label>
+          New time (ISO 8601):
+          <input type="text" name="new_time" required
+                 placeholder="2026-04-26T20:30:00+00:00">
+        </label>
+        <button type="submit">Skip ahead</button>
+      </form>
+    </details>
+
+    <details class="skip-controls">
+      <summary>Jump skip</summary>
+      <form class="inline-edit"
+            hx-post="/chats/{{ chat.id }}/drawer/skip/jump"
+            hx-target="#drawer" hx-swap="innerHTML">
+        <label>
+          New time (ISO 8601):
+          <input type="text" name="new_time" required
+                 placeholder="2026-04-27T08:00:00+00:00">
+        </label>
+        <label>
+          Anything notable happen? (optional)
+          <textarea name="notable_prose" rows="3"
+                    placeholder="leave blank to jump without synthesizing memories"></textarea>
+        </label>
+        <label>
+          <input type="checkbox" name="reset_activity" value="1">
+          Reset activity at landing
+        </label>
+        <button type="submit">Jump ahead</button>
+      </form>
+    </details>
+  </section>
+
+  <section class="drawer-section">
+    <h3>Events</h3>
+    {% if active_events %}
+      <ul class="event-list">
+        {% for ev in active_events %}
+          <li class="event-row">
+            <strong>{{ ev.kind }}</strong>
+            <span class="muted"> ({{ ev.status }})</span>
+            {% if ev.planned_for %}
+              <p class="muted">planned for: {{ ev.planned_for }}</p>
+            {% endif %}
+            {% if ev.props %}
+              <p class="muted">{{ ev.props|tojson }}</p>
+            {% endif %}
+            <form class="inline-edit"
+                  hx-post="/chats/{{ chat.id }}/drawer/event/cancel/{{ ev.event_id }}"
+                  hx-target="#drawer" hx-swap="innerHTML">
+              <button type="submit">Cancel</button>
+            </form>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      <p class="muted">No active events.</p>
+    {% endif %}
+    <details>
+      <summary>Plan event</summary>
+      <form class="inline-edit"
+            hx-post="/chats/{{ chat.id }}/drawer/event/plan"
+            hx-target="#drawer" hx-swap="innerHTML">
+        <label>
+          Kind:
+          <input type="text" name="kind" required
+                 placeholder="e.g. dinner_reservation">
+        </label>
+        <label>
+          Planned for (ISO 8601):
+          <input type="text" name="planned_for" required
+                 placeholder="2026-04-26T19:00:00+00:00">
+        </label>
+        <label>
+          Props (JSON):
+          <textarea name="props_json" rows="3"
+                    placeholder='{"location": "Bistro X"}'>{}</textarea>
+        </label>
+        <button type="submit">Plan event</button>
+      </form>
+    </details>
+  </section>
+
+  <section class="drawer-section">
+    <h3>Threads</h3>
+    {% if open_threads %}
+      <ul class="thread-list">
+        {% for th in open_threads %}
+          <li class="thread-row">
+            <strong>{{ th.title }}</strong>
+            {% if th.summary %}
+              <p>{{ th.summary }}</p>
+            {% endif %}
+            <form class="inline-edit"
+                  hx-post="/chats/{{ chat.id }}/drawer/thread/close/{{ th.thread_id }}"
+                  hx-target="#drawer" hx-swap="innerHTML">
+              <button type="submit">Close</button>
+            </form>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      <p class="muted">No open threads.</p>
+    {% endif %}
   </section>
 
   {% if guest_bot %}
@@ -100,24 +215,71 @@
   <section class="drawer-section">
     <h3>Add guest</h3>
     {% if available_guests %}
-      <form class="inline-edit"
+      {% set first_guest_id = available_guests[0].id %}
+      {% set first_existing = existing_guest_edges.get(first_guest_id, False) %}
+      <form class="inline-edit add-guest-form"
             hx-post="/chats/{{ chat.id }}/drawer/guest/add"
             hx-target="#drawer" hx-swap="innerHTML">
         <label>
           Bot:
-          <select name="guest_bot_id" required>
+          <select name="guest_bot_id" required class="add-guest-select">
             {% for b in available_guests %}
-              <option value="{{ b.id }}">{{ b.name }}</option>
+              <option value="{{ b.id }}"
+                      data-existing-edge="{{ 'true' if existing_guest_edges.get(b.id) else 'false' }}">
+                {{ b.name }}{% if existing_guest_edges.get(b.id) %} (already met){% endif %}
+              </option>
             {% endfor %}
           </select>
         </label>
+        <p class="muted add-guest-existing-note"
+           {% if not first_existing %}hidden{% endif %}>
+          they already know each other (edge exists from a prior chat)
+        </p>
+        <label class="add-guest-reseed-label"
+               {% if not first_existing %}hidden{% endif %}>
+          <input type="checkbox" name="reseed" value="1" class="add-guest-reseed">
+          re-seed anyway
+        </label>
         <label>
           Have they met before? Describe how (leave blank if not):
           <textarea name="relationship_prose" rows="3"
+                    class="add-guest-prose"
+                    {% if first_existing %}disabled{% endif %}
                     placeholder="e.g. Old college friends who studied physics together."></textarea>
         </label>
         <button type="submit">Add guest</button>
       </form>
+      <script>
+        (function () {
+          var form = document.currentScript.previousElementSibling;
+          while (form && !form.classList.contains('add-guest-form')) {
+            form = form.previousElementSibling;
+          }
+          if (!form) return;
+          var sel = form.querySelector('.add-guest-select');
+          var prose = form.querySelector('.add-guest-prose');
+          var reseed = form.querySelector('.add-guest-reseed');
+          var note = form.querySelector('.add-guest-existing-note');
+          var reseedLabel = form.querySelector('.add-guest-reseed-label');
+          function refresh() {
+            var opt = sel.options[sel.selectedIndex];
+            var existing = opt && opt.getAttribute('data-existing-edge') === 'true';
+            if (existing) {
+              note.removeAttribute('hidden');
+              reseedLabel.removeAttribute('hidden');
+              prose.disabled = !reseed.checked;
+            } else {
+              note.setAttribute('hidden', '');
+              reseedLabel.setAttribute('hidden', '');
+              reseed.checked = false;
+              prose.disabled = false;
+            }
+          }
+          sel.addEventListener('change', refresh);
+          reseed.addEventListener('change', refresh);
+          refresh();
+        })();
+      </script>
     {% else %}
       <p class="muted">No other bots authored yet.</p>
     {% endif %}
@@ -156,19 +318,95 @@
           </label>
           <button type="submit">Save</button>
         </form>
-        {% if edge_b2y.summary %}<p class="muted">{{ edge_b2y.summary }}</p>{% endif %}
+        <form class="inline-edit"
-        {% if edge_b2y.knowledge %}
+              hx-post="/chats/{{ chat.id }}/drawer/edge/trust"
-          <details><summary>Knowledge ({{ edge_b2y.knowledge|length }})</summary>
+              hx-target="#drawer" hx-swap="innerHTML">
-            <ul>{% for fact in edge_b2y.knowledge %}<li>{{ fact }}</li>{% endfor %}</ul>
+          <input type="hidden" name="source_id" value="{{ host_bot.id }}">
-          </details>
+          <input type="hidden" name="target_id" value="you">
-        {% endif %}
+          <label>
+            Trust:
+            <input type="range" name="new_value" min="0" max="100"
+                   value="{{ edge_b2y.trust }}"
+                   oninput="this.nextElementSibling.value = this.value">
+            <output>{{ edge_b2y.trust }}</output>
+          </label>
+          <button type="submit">Save</button>
+        </form>
+        <form class="inline-edit"
+              hx-post="/chats/{{ chat.id }}/drawer/edge/summary"
+              hx-target="#drawer" hx-swap="innerHTML">
+          <input type="hidden" name="source_id" value="{{ host_bot.id }}">
+          <input type="hidden" name="target_id" value="you">
+          <label>
+            Summary:
+            <textarea name="new_summary" rows="3" maxlength="2000">{{ edge_b2y.summary or "" }}</textarea>
+          </label>
+          <button type="submit">Save summary</button>
+        </form>
+        <details>
+          <summary>Knowledge ({{ (edge_b2y.knowledge or [])|length }})</summary>
+          {% if edge_b2y.knowledge %}
+            <ul>
+              {% for fact in edge_b2y.knowledge %}
+                <li>
+                  {{ fact }}
+                  <form class="inline-edit"
+                        hx-post="/chats/{{ chat.id }}/drawer/edge/knowledge-facts"
+                        hx-target="#drawer" hx-swap="innerHTML">
+                    <input type="hidden" name="source_id" value="{{ host_bot.id }}">
+                    <input type="hidden" name="target_id" value="you">
+                    <input type="hidden" name="action" value="remove">
+                    <input type="hidden" name="fact" value="{{ fact }}">
+                    <button type="submit">Remove</button>
+                  </form>
+                </li>
+              {% endfor %}
+            </ul>
+          {% endif %}
+          <form class="inline-edit"
+                hx-post="/chats/{{ chat.id }}/drawer/edge/knowledge-facts"
+                hx-target="#drawer" hx-swap="innerHTML">
+            <input type="hidden" name="source_id" value="{{ host_bot.id }}">
+            <input type="hidden" name="target_id" value="you">
+            <input type="hidden" name="action" value="add">
+            <label>
+              Add fact:
+              <input type="text" name="fact" maxlength="500" required>
+            </label>
+            <button type="submit">Add</button>
+          </form>
+        </details>
       </div>
     {% endif %}
     {% if edge_y2b %}
       <div class="edge-row">
         <strong>you &rarr; {{ host_bot.name }}</strong>
         <p>Affinity: {{ edge_y2b.affinity }}/100 &middot; Trust: {{ edge_y2b.trust }}/100</p>
-        {% if edge_y2b.summary %}<p class="muted">{{ edge_y2b.summary }}</p>{% endif %}
+        <form class="inline-edit"
+              hx-post="/chats/{{ chat.id }}/drawer/edge/trust"
+              hx-target="#drawer" hx-swap="innerHTML">
+          <input type="hidden" name="source_id" value="you">
+          <input type="hidden" name="target_id" value="{{ host_bot.id }}">
+          <label>
+            Trust:
+            <input type="range" name="new_value" min="0" max="100"
+                   value="{{ edge_y2b.trust }}"
+                   oninput="this.nextElementSibling.value = this.value">
+            <output>{{ edge_y2b.trust }}</output>
+          </label>
+          <button type="submit">Save</button>
+        </form>
+        <form class="inline-edit"
+              hx-post="/chats/{{ chat.id }}/drawer/edge/summary"
+              hx-target="#drawer" hx-swap="innerHTML">
+          <input type="hidden" name="source_id" value="you">
+          <input type="hidden" name="target_id" value="{{ host_bot.id }}">
+          <label>
+            Summary:
+            <textarea name="new_summary" rows="3" maxlength="2000">{{ edge_y2b.summary or "" }}</textarea>
+          </label>
+          <button type="submit">Save summary</button>
+        </form>
       </div>
     {% endif %}
     {% if not edge_b2y and not edge_y2b %}
@@ -224,6 +462,33 @@
               <input type="hidden" name="pinned" value="{{ 0 if m.pinned else 1 }}">
               <button type="submit">{{ 'Unpin' if m.pinned else 'Pin' }}</button>
             </form>
+            <div class="witness-row">
+              {% for flag in ['you', 'host', 'guest'] %}
+                {% set witnessed = m['witness_' ~ flag] %}
+                <form class="inline-edit"
+                      hx-post="/chats/{{ chat.id }}/drawer/memory/witness"
+                      hx-target="#drawer" hx-swap="innerHTML">
+                  <input type="hidden" name="memory_id" value="{{ m.id }}">
+                  <input type="hidden" name="flag" value="{{ flag }}">
+                  <input type="hidden" name="new_value" value="{{ 0 if witnessed else 1 }}">
+                  <label>
+                    <input type="checkbox" {% if witnessed %}checked{% endif %}
+                           onchange="this.form.requestSubmit()">
+                    {{ flag }}
+                  </label>
+                </form>
+              {% endfor %}
+            </div>
+            <details>
+              <summary>Edit POV summary</summary>
+              <form class="inline-edit"
+                    hx-post="/chats/{{ chat.id }}/drawer/memory/pov-summary"
+                    hx-target="#drawer" hx-swap="innerHTML">
+                <input type="hidden" name="memory_id" value="{{ m.id }}">
+                <textarea name="new_summary" rows="3" maxlength="2000">{{ m.pov_summary }}</textarea>
+                <button type="submit">Save</button>
+              </form>
+            </details>
           </li>
         {% endfor %}
       </ul>

chat/templates/chat.html

@@ -17,7 +17,7 @@
     <p class="muted">No turns yet. Start typing below.</p>
     {% else %}
       {% for turn in turns %}
-        <div class="turn turn-{{ turn.role }}">
+        <div{% if turn.event_id is not none %} id="turn-{{ turn.event_id }}"{% endif %} class="turn turn-{{ turn.role }}">
           <strong>{{ turn.speaker }}</strong>
           {{ turn.text|render_prose|safe }}
         </div>
@@ -119,6 +119,39 @@ document.querySelector('.drawer-toggle')?.addEventListener('click', (e) => {
     }
   });
 
+  // T86: live-swap regenerated turns. The backend (chat/services/
+  // regenerate.py) broadcasts a ``turn_html_replace`` SSE frame after
+  // appending the new assistant_turn — JSON payload of shape
+  // ``{data: <html>, turn_id: <new_id>, supersedes_id: <old_id>}``.
+  // We replace the prior turn's DOM node in-place when we can locate
+  // it by id, otherwise fall back to appending so a tab opened mid-
+  // regenerate still shows the new turn. The renderer
+  // (chat/web/render.py::render_turn_html) and the Jinja loop above
+  // both stamp ``id="turn-<event_id>"`` on each turn DIV, so the
+  // primary in-place swap path is the live one — the append fallback
+  // only kicks in when a tab opened AFTER the regenerate started (no
+  // prior turn DOM node to replace).
+  shell.addEventListener('htmx:sseMessage', (e) => {
+    if (e.detail.type !== 'turn_html_replace') return;
+    let data;
+    try { data = JSON.parse(e.detail.data); } catch (_) { return; }
+    const html = (data && data.data) || '';
+    const trimmed = html.trim();
+    if (!trimmed) return;
+    const oldNode = document.getElementById('turn-' + data.supersedes_id);
+    if (oldNode) {
+      const tmpl = document.createElement('template');
+      tmpl.innerHTML = trimmed;
+      const newNode = tmpl.content.firstChild;
+      if (newNode) oldNode.replaceWith(newNode);
+    } else {
+      // Fallback: append if the prior turn isn't in the DOM (e.g. user
+      // opened the tab AFTER the regenerate started, or the renderer
+      // hasn't yet stamped per-turn ids — see comment above).
+      timeline.insertAdjacentHTML('beforeend', trimmed);
+    }
+  });
+
   // SSE connection lost — show a banner and unlock so the user can
   // retry. The server commits the partial as truncated when its
   // request.is_disconnected() poll trips (T19).

chat/web/bots.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
-import sqlite3
 from pathlib import Path
 from fastapi import APIRouter, Depends, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, HTMLResponse
 from fastapi.templating import Jinja2Templates
 
+from chat.db.connection import open_db
 from chat.eventlog.log import append_event
 from chat.eventlog.projector import project
 from chat.state.entities import list_bots
@@ -19,15 +19,8 @@ REQUIRED_FIELDS = ("id", "name", "persona", "initial_relationship_to_you", "kick
 def get_conn(request: Request):
     settings = request.app.state.settings
     db_path: Path = settings.db_path
-    db_path.parent.mkdir(parents=True, exist_ok=True)
+    with open_db(db_path, check_same_thread=False) as conn:
-    conn = sqlite3.connect(db_path, check_same_thread=False)
-    conn.execute("PRAGMA journal_mode=WAL")
-    conn.execute("PRAGMA foreign_keys=ON")
-    try:
         yield conn
-        conn.commit()
-    finally:
-        conn.close()
 
 
 def _split_voice_samples(text: str) -> list[str]:

chat/web/chat.py

@@ -52,12 +52,30 @@ async def chat_detail(chat_id: str, request: Request, conn=Depends(get_conn)):
     raw_turns = _read_recent_dialogue(conn, chat_id, limit=200)
     turns: list[dict] = []
     for t in raw_turns:
+        # event_id is forwarded so the Jinja loop can stamp
+        # ``id="turn-<event_id>"`` on each rendered turn — the
+        # ``turn_html_replace`` SSE handler in chat.html relies on this
+        # id to swap a regenerated turn in-place (T86 follow-up).
         if t["speaker"] == "you":
-            turns.append({"role": "you", "speaker": "you", "text": t["text"]})
+            turns.append(
+                {
+                    "role": "you",
+                    "speaker": "you",
+                    "text": t["text"],
+                    "event_id": t.get("event_id"),
+                }
+            )
         else:
             bot = get_bot(conn, t["speaker"])
             label = bot["name"] if bot else t["speaker"]
-            turns.append({"role": "bot", "speaker": label, "text": t["text"]})
+            turns.append(
+                {
+                    "role": "bot",
+                    "speaker": label,
+                    "text": t["text"],
+                    "event_id": t.get("event_id"),
+                }
+            )
 
     return TEMPLATES.TemplateResponse(
         request,

chat/web/drawer.py

@@ -1,4 +1,4 @@
-"""Chat drawer — read view (T24) and inline edits (T25).
+"""Chat drawer — read view (T24) and inline edits (T25, T72).
 
 The GET endpoint renders an HTML partial showing the current scene +
 container, per-entity activity, host <-> you edges, pinned memories with
@@ -13,18 +13,22 @@ returning the refreshed drawer partial so HTMX can swap it in:
 * pin toggle on a memory (emits ``memory_pin_changed`` with
   ``auto_pinned=0`` so a manual pin is not subject to auto-eviction).
 
+T72 (Phase 2.5) extends the inline-edit set to cover the remaining
+§6.4 editable fields whose state-layer support already lands in the
+``manual_edit`` projector: edge trust slider, edge summary textarea,
+memory POV summary textarea, and per-edge knowledge-fact add/remove. It
+also exposes a witness-flag toggle (``you/host/guest``) per memory row
+and a "first-meeting gate" on the Add-guest form so an existing edge
+isn't quietly overwritten by a re-seed.
+
 Each ``manual_edit`` payload snapshots the prior value alongside the new
 one so a later inverse edit can restore state (§6.4 final paragraph).
-
-Other §6.4 editable fields (activity verb/attention/posture, edge_trust,
-edge summary, knowledge_facts list, memory pov_summary) are deferred to
-a Phase 1.5 follow-up — the dispatch in :mod:`chat.state.manual_edit`
-already accepts more ``target_kind`` values, so adding their routes is a
-mechanical extension.
 """
 
 from __future__ import annotations
 
+import json
+import uuid
 from pathlib import Path
 
 from fastapi import APIRouter, Depends, Form, HTTPException, Request
@@ -36,11 +40,19 @@ from chat.services.relationship_seed import seed_inter_bot_edges
 from chat.services.scene_summarize import apply_scene_close_summary
 from chat.state.edges import get_edge
 from chat.state.entities import get_bot, get_you, list_bots
+from chat.state.events import list_active_events
 from chat.state.group_node import get_group_node
 from chat.state.memory import get_pinned
+from chat.state.threads import list_open_threads
 from chat.state.world import active_scene, get_activity, get_chat, get_container
 from chat.web.bots import get_conn
 from chat.web.kickoff import get_llm_client
+from chat.web.skip import (
+    ChatNotFoundError,
+    _now_iso,
+    process_elision_skip,
+    process_jump_skip,
+)
 
 TEMPLATES = Jinja2Templates(
     directory=str(Path(__file__).resolve().parent.parent / "templates")
@@ -55,6 +67,13 @@ PIN_CAP = 8
 # Recent-memories list is bounded to keep the drawer cheap to render.
 RECENT_LIMIT = 10
 
+# T72.1 caps on free-form textarea edits. Edge summaries and per-POV
+# memory summaries are drawer-driven prose — bound them so a stray paste
+# can't blow up the projected row size or the SSE drawer refresh payload.
+EDGE_SUMMARY_MAX = 2000
+MEMORY_POV_SUMMARY_MAX = 2000
+KNOWLEDGE_FACT_MAX = 500
+
 
 @router.get("/chats/{chat_id}/drawer", response_class=HTMLResponse)
 async def drawer(chat_id: str, request: Request, conn=Depends(get_conn)):
@@ -104,14 +123,25 @@ async def drawer(chat_id: str, request: Request, conn=Depends(get_conn)):
         available_guests = [
             b for b in list_bots(conn) if b["id"] != chat["host_bot_id"]
         ]
+    # T72.2 first-meeting gate: pre-compute whether a host->candidate edge
+    # already exists. Template renders the prose textarea disabled and the
+    # POST handler skips ``seed_inter_bot_edges`` (preserving the existing
+    # edge content) unless the user explicitly toggles "re-seed anyway".
+    existing_guest_edges = {
+        b["id"]: get_edge(conn, chat["host_bot_id"], b["id"]) is not None
+        for b in available_guests
+    }
     group_node = get_group_node(conn, chat_id)
 
     # Recent memories from host's POV (witness_host = 1), most recent first.
     # Raw query keeps this read self-contained — no projector helper exposes
-    # "latest N for an owner" yet and the drawer is the only consumer.
+    # "latest N for an owner" yet and the drawer is the only consumer. The
+    # three witness flags ride along so T72.3's per-row checkboxes can
+    # render the current state without a second query per memory.
     recent_rows = conn.execute(
         """
-        SELECT id, pov_summary, significance, pinned, created_at
+        SELECT id, pov_summary, significance, pinned, created_at,
+               witness_you, witness_host, witness_guest
         FROM memories
         WHERE owner_id = ? AND witness_host = 1
         ORDER BY id DESC
@@ -126,12 +156,19 @@ async def drawer(chat_id: str, request: Request, conn=Depends(get_conn)):
             "significance": r[2],
             "pinned": r[3],
             "created_at": r[4],
+            "witness_you": r[5],
+            "witness_host": r[6],
+            "witness_guest": r[7],
         }
         for r in recent_rows
     ]
 
     pinned = get_pinned(conn, chat["host_bot_id"])
 
+    # T59: active events + open threads for the new drawer sections.
+    active_events = list_active_events(conn, chat_id)
+    open_threads = list_open_threads(conn, chat_id)
+
     return TEMPLATES.TemplateResponse(
         request,
         "_drawer.html",
@@ -152,10 +189,13 @@ async def drawer(chat_id: str, request: Request, conn=Depends(get_conn)):
             "edge_y2g": edge_y2g,
             "edge_g2y": edge_g2y,
             "available_guests": available_guests,
+            "existing_guest_edges": existing_guest_edges,
             "group_node": group_node,
             "recent_memories": recent_memories,
             "pinned": pinned,
             "pin_cap": PIN_CAP,
+            "active_events": active_events,
+            "open_threads": open_threads,
         },
     )
 
@@ -342,6 +382,281 @@ async def toggle_memory_pin(
     return await drawer(chat_id, request, conn)
 
 
+# --- T72.1 deferred v1 drawer edits --------------------------------------
+#
+# These four endpoints round out the §6.4 editable surface — the
+# ``manual_edit`` projector already dispatches ``edge_trust``,
+# ``edge_summary``, and ``memory_pov_summary`` (T25); ``edge_knowledge_fact``
+# is a new dispatch branch added alongside this commit. Each route follows
+# the T25 pattern: snapshot the prior value, append + apply ``manual_edit``,
+# then re-render the drawer partial.
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/edge/trust",
+    response_class=HTMLResponse,
+)
+async def edit_edge_trust(
+    chat_id: str,
+    request: Request,
+    source_id: str = Form(...),
+    target_id: str = Form(...),
+    new_value: int = Form(...),
+    conn=Depends(get_conn),
+):
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    if not 0 <= int(new_value) <= 100:
+        raise HTTPException(
+            status_code=400,
+            detail=f"trust must be in [0, 100], got {new_value}",
+        )
+
+    edge = get_edge(conn, source_id, target_id)
+    if edge is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"edge not found: {source_id}->{target_id}",
+        )
+
+    prior = int(edge["trust"])
+    append_and_apply(
+        conn,
+        kind="manual_edit",
+        payload={
+            "target_kind": "edge_trust",
+            "target_id": {"source_id": source_id, "target_id": target_id},
+            "prior_value": prior,
+            "new_value": int(new_value),
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/edge/summary",
+    response_class=HTMLResponse,
+)
+async def edit_edge_summary(
+    chat_id: str,
+    request: Request,
+    source_id: str = Form(...),
+    target_id: str = Form(...),
+    new_summary: str = Form(...),
+    conn=Depends(get_conn),
+):
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    if len(new_summary) > EDGE_SUMMARY_MAX:
+        raise HTTPException(
+            status_code=400,
+            detail=(
+                f"edge summary exceeds {EDGE_SUMMARY_MAX} chars "
+                f"(got {len(new_summary)})"
+            ),
+        )
+
+    edge = get_edge(conn, source_id, target_id)
+    if edge is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"edge not found: {source_id}->{target_id}",
+        )
+
+    prior = edge.get("summary") or ""
+    append_and_apply(
+        conn,
+        kind="manual_edit",
+        payload={
+            "target_kind": "edge_summary",
+            "target_id": {"source_id": source_id, "target_id": target_id},
+            "prior_value": prior,
+            "new_value": new_summary,
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/memory/pov-summary",
+    response_class=HTMLResponse,
+)
+async def edit_memory_pov_summary(
+    chat_id: str,
+    request: Request,
+    memory_id: int = Form(...),
+    new_summary: str = Form(...),
+    conn=Depends(get_conn),
+):
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    if len(new_summary) > MEMORY_POV_SUMMARY_MAX:
+        raise HTTPException(
+            status_code=400,
+            detail=(
+                f"memory pov_summary exceeds {MEMORY_POV_SUMMARY_MAX} chars "
+                f"(got {len(new_summary)})"
+            ),
+        )
+
+    # 404 when the memory either doesn't exist or belongs to a different
+    # chat — the drawer never surfaces cross-chat memories so editing one
+    # would be a path-traversal-style mistake.
+    row = conn.execute(
+        "SELECT pov_summary FROM memories WHERE id = ? AND chat_id = ?",
+        (int(memory_id), chat_id),
+    ).fetchone()
+    if row is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"memory not found in chat: {memory_id}",
+        )
+
+    prior = row[0] or ""
+    append_and_apply(
+        conn,
+        kind="manual_edit",
+        payload={
+            "target_kind": "memory_pov_summary",
+            "target_id": int(memory_id),
+            "prior_value": prior,
+            "new_value": new_summary,
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/edge/knowledge-facts",
+    response_class=HTMLResponse,
+)
+async def edit_edge_knowledge_facts(
+    chat_id: str,
+    request: Request,
+    source_id: str = Form(...),
+    target_id: str = Form(...),
+    action: str = Form(...),
+    fact: str = Form(...),
+    conn=Depends(get_conn),
+):
+    """Add or remove a single knowledge_fact on an edge.
+
+    Remove semantics are by string match (first occurrence) — the drawer
+    re-renders after every edit so threading a stable index through is
+    fragile when concurrent ``edge_update`` events can append more facts
+    between renders. The projector is a no-op when the fact isn't found,
+    keeping the route idempotent for stale form submissions.
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    if action not in ("add", "remove"):
+        raise HTTPException(
+            status_code=400,
+            detail=f"action must be 'add' or 'remove', got {action!r}",
+        )
+
+    if len(fact) > KNOWLEDGE_FACT_MAX:
+        raise HTTPException(
+            status_code=400,
+            detail=(
+                f"fact exceeds {KNOWLEDGE_FACT_MAX} chars (got {len(fact)})"
+            ),
+        )
+    if not fact.strip():
+        raise HTTPException(status_code=400, detail="fact must not be empty")
+
+    edge = get_edge(conn, source_id, target_id)
+    if edge is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"edge not found: {source_id}->{target_id}",
+        )
+
+    prior = list(edge.get("knowledge") or [])
+    append_and_apply(
+        conn,
+        kind="manual_edit",
+        payload={
+            "target_kind": "edge_knowledge_fact",
+            "target_id": {"source_id": source_id, "target_id": target_id},
+            "prior_value": prior,
+            "new_value": {"action": action, "fact": fact},
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+# --- T72.3 witness flag inline-edit --------------------------------------
+#
+# Witness flags decide which entities can recall a memory (§7 retrieval).
+# Editing them is rare but high-impact — flipping ``witness_guest`` from 0
+# to 1 makes the memory available to the guest's prompt context. The route
+# follows the T25 / T72.1 pattern: snapshot prior, append + apply
+# ``manual_edit`` with a ``{flag, value}`` payload, refresh the partial.
+
+
+_VALID_WITNESS_FLAGS = ("you", "host", "guest")
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/memory/witness",
+    response_class=HTMLResponse,
+)
+async def edit_memory_witness(
+    chat_id: str,
+    request: Request,
+    memory_id: int = Form(...),
+    flag: str = Form(...),
+    new_value: int = Form(...),
+    conn=Depends(get_conn),
+):
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    if flag not in _VALID_WITNESS_FLAGS:
+        raise HTTPException(
+            status_code=400,
+            detail=(
+                f"flag must be one of {list(_VALID_WITNESS_FLAGS)}, "
+                f"got {flag!r}"
+            ),
+        )
+
+    row = conn.execute(
+        f"SELECT witness_{flag} FROM memories "
+        "WHERE id = ? AND chat_id = ?",
+        (int(memory_id), chat_id),
+    ).fetchone()
+    if row is None:
+        raise HTTPException(
+            status_code=404,
+            detail=f"memory not found in chat: {memory_id}",
+        )
+
+    prior_int = int(row[0])
+    new_int = 1 if int(new_value) else 0
+    append_and_apply(
+        conn,
+        kind="manual_edit",
+        payload={
+            "target_kind": "memory_witness",
+            "target_id": int(memory_id),
+            "prior_value": {"flag": flag, "value": prior_int},
+            "new_value": {"flag": flag, "value": new_int},
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
 # --- T42 guest add/remove -------------------------------------------------
 #
 # Adding a guest fans out into up to four events: a ``guest_added`` to flip
@@ -381,6 +696,7 @@ async def add_guest(
     request: Request,
     guest_bot_id: str = Form(...),
     relationship_prose: str = Form(""),
+    reseed: str = Form(""),
     conn=Depends(get_conn),
     client=Depends(get_llm_client),
 ):
@@ -412,17 +728,32 @@ async def add_guest(
             detail=f"host bot not found: {chat['host_bot_id']}",
         )
 
-    settings = request.app.state.settings
+    # T72.2 first-meeting gate: when an edge already exists from a prior
-    seed = await seed_inter_bot_edges(
+    # chat, the textarea is rendered disabled. Submission without the
-        client,
+    # explicit "re-seed anyway" toggle skips ``seed_inter_bot_edges``
-        classifier_model=settings.classifier_model,
+    # entirely so the existing edge content (affinity, trust, knowledge,
-        bot_a_id=chat["host_bot_id"],
+    # summaries) survives. ``guest_added`` and ``group_node_initialized``
-        bot_a_name=host_bot["name"],
+    # still fire so the chat picks up the new participant.
-        bot_b_id=guest_bot_id,
+    existing_edge = (
-        bot_b_name=guest_bot["name"],
+        get_edge(conn, chat["host_bot_id"], guest_bot_id) is not None
-        relationship_prose=relationship_prose,
-        timeout_s=settings.classifier_timeout_s,
     )
+    reseed_requested = reseed.lower() in ("1", "true", "on", "yes")
+    skip_seed = existing_edge and not reseed_requested
+
+    settings = request.app.state.settings
+    if skip_seed:
+        seed = None
+    else:
+        seed = await seed_inter_bot_edges(
+            client,
+            classifier_model=settings.classifier_model,
+            bot_a_id=chat["host_bot_id"],
+            bot_a_name=host_bot["name"],
+            bot_b_id=guest_bot_id,
+            bot_b_name=guest_bot["name"],
+            relationship_prose=relationship_prose,
+            timeout_s=settings.classifier_timeout_s,
+        )
 
     append_and_apply(
         conn,
@@ -437,7 +768,7 @@ async def add_guest(
     # per-direction summary is set via the per-pov scene-close path
     # (T27), not direct edge_update. We therefore drop seed.*_summary
     # here; the deltas + knowledge_facts are what materializes.
-    if not _seed_is_default(seed):
+    if seed is not None and not _seed_is_default(seed):
         append_and_apply(
             conn,
             kind="edge_update",
@@ -524,3 +855,226 @@ async def remove_guest(
     )
 
     return await drawer(chat_id, request, conn)
+
+
+# --- T59 events / threads / skip controls --------------------------------
+#
+# Five drawer-driven endpoints that emit Phase 3 event-log entries:
+#
+# * ``event_planned`` / ``event_cancelled`` for the events panel — props
+#   arrive as a JSON-encoded form field so the user can author arbitrary
+#   structured side-info without a custom HTMX widget per kind.
+# * ``time_skip_elision`` / ``time_skip_jump`` for the skip panel —
+#   each emits the projector event AND an ``assistant_turn`` carrying the
+#   narration prose from :mod:`chat.services.skip_narration`. Jump skips
+#   ALSO write per-bot synthesized memories from any user-supplied
+#   ``notable_prose`` via :func:`synthesize_memories` +
+#   :func:`record_turn_memory_for_present`.
+# * ``thread_closed`` for the threads panel.
+#
+# Skip narration is appended via plain ``append_event`` (assistant_turn
+# has no projector handler — it's a transcript-only kind, see
+# :func:`chat.web.turns._read_recent_dialogue`). The user will see the
+# new turn on the next chat-detail page load; we do NOT broadcast via
+# ``publish`` here because the SSE channel is scoped to the chat-detail
+# page and the drawer partial is the response body — adding cross-cutting
+# SSE here would require dragging the publish import + chat-channel state
+# into the drawer module without a meaningful UX gain (the drawer only
+# rerenders itself on these submissions).
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/event/plan",
+    response_class=HTMLResponse,
+)
+async def plan_event(
+    chat_id: str,
+    request: Request,
+    kind: str = Form(...),
+    planned_for: str = Form(...),
+    props_json: str = Form("{}"),
+    conn=Depends(get_conn),
+):
+    """Append an ``event_planned`` row from the drawer's "Plan event" form.
+
+    ``props_json`` is parsed into a dict before being attached to the
+    payload so the projector can treat it as structured data. Bad JSON
+    yields ``400`` — the form template renders an inline error in that
+    case so the user can fix-and-resubmit without losing their input.
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    try:
+        props = json.loads(props_json) if props_json.strip() else {}
+    except json.JSONDecodeError as exc:
+        raise HTTPException(
+            status_code=400, detail=f"props_json must be valid JSON: {exc}"
+        )
+    if not isinstance(props, dict):
+        raise HTTPException(
+            status_code=400, detail="props_json must encode a JSON object"
+        )
+
+    event_id = f"evt_{uuid.uuid4().hex[:12]}"
+    append_and_apply(
+        conn,
+        kind="event_planned",
+        payload={
+            "event_id": event_id,
+            "chat_id": chat_id,
+            "kind": kind,
+            "props": props,
+            "planned_for": planned_for,
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/event/cancel/{event_id}",
+    response_class=HTMLResponse,
+)
+async def cancel_event(
+    chat_id: str,
+    event_id: str,
+    request: Request,
+    conn=Depends(get_conn),
+):
+    """Append an ``event_cancelled`` row for ``event_id``.
+
+    ``completed_at`` is sourced from the chat clock (so cancellations
+    timeline-align with the rest of the fiction) with a UTC-now fallback
+    when the clock isn't set. The projector is idempotent on terminal
+    statuses so a stale double-submit is harmless.
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    completed_at = chat.get("time") or _now_iso()
+    append_and_apply(
+        conn,
+        kind="event_cancelled",
+        payload={
+            "event_id": event_id,
+            "completed_at": completed_at,
+        },
+    )
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/skip/elision",
+    response_class=HTMLResponse,
+)
+async def skip_elision(
+    chat_id: str,
+    request: Request,
+    landing_state_hint: str = Form(""),
+    new_time: str = Form(...),
+    conn=Depends(get_conn),
+    client=Depends(get_llm_client),
+):
+    """Elision skip: collapse in-progress activity into its end-state.
+
+    Thin HTTP wrapper around :func:`chat.web.skip.process_elision_skip`
+    (T62 extracted the controller). Validation failures surface as
+    ``400`` and the route still returns the refreshed drawer partial on
+    success so HTMX swaps in the new chat clock.
+    """
+    settings = request.app.state.settings
+    try:
+        await process_elision_skip(
+            conn,
+            client,
+            settings,
+            chat_id=chat_id,
+            new_time=new_time,
+            landing_state_hint=landing_state_hint,
+        )
+    except ChatNotFoundError as exc:
+        # Missing chat row: typed exception (T81) replaces the prior
+        # ``str(exc).startswith("chat not found")`` prefix sniff.
+        raise HTTPException(status_code=404, detail=str(exc))
+    except ValueError as exc:
+        # Input-validation failure (malformed or backwards new_time).
+        raise HTTPException(status_code=400, detail=str(exc))
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/skip/jump",
+    response_class=HTMLResponse,
+)
+async def skip_jump(
+    chat_id: str,
+    request: Request,
+    new_time: str = Form(...),
+    notable_prose: str = Form(""),
+    reset_activity: str = Form(""),
+    conn=Depends(get_conn),
+    client=Depends(get_llm_client),
+):
+    """Jump skip: bridge a longer fiction-time delta.
+
+    Thin HTTP wrapper around :func:`chat.web.skip.process_jump_skip`
+    (T62 extracted the controller). ``reset_activity`` is parsed
+    permissively here ("1" / "true" / "on" / "yes" — same shape as the
+    add-guest reseed flag) since HTML checkboxes typically post the
+    literal "1" or omit the field entirely.
+    """
+    reset_flag = reset_activity.lower() in ("1", "true", "on", "yes")
+    settings = request.app.state.settings
+    try:
+        await process_jump_skip(
+            conn,
+            client,
+            settings,
+            chat_id=chat_id,
+            new_time=new_time,
+            notable_prose=notable_prose,
+            reset_activity=reset_flag,
+        )
+    except ChatNotFoundError as exc:
+        # Missing chat row: typed exception (T81) replaces the prior
+        # ``str(exc).startswith("chat not found")`` prefix sniff.
+        raise HTTPException(status_code=404, detail=str(exc))
+    except ValueError as exc:
+        # Input-validation failure (malformed or backwards new_time).
+        raise HTTPException(status_code=400, detail=str(exc))
+    return await drawer(chat_id, request, conn)
+
+
+@router.post(
+    "/chats/{chat_id}/drawer/thread/close/{thread_id}",
+    response_class=HTMLResponse,
+)
+async def close_thread(
+    chat_id: str,
+    thread_id: str,
+    request: Request,
+    conn=Depends(get_conn),
+):
+    """Append a ``thread_closed`` row for ``thread_id``.
+
+    Mirrors :func:`cancel_event` — chat-clock-or-now timestamp, projector
+    handles idempotency. The drawer's open-threads list is sourced from
+    ``list_open_threads`` which filters by ``status='open'`` so a stale
+    double-submit is a no-op visually.
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise HTTPException(status_code=404, detail=f"chat not found: {chat_id}")
+
+    closed_at = chat.get("time") or _now_iso()
+    append_and_apply(
+        conn,
+        kind="thread_closed",
+        payload={
+            "thread_id": thread_id,
+            "closed_at": closed_at,
+        },
+    )
+    return await drawer(chat_id, request, conn)

chat/web/meanwhile.py

@@ -0,0 +1,403 @@
+"""Meanwhile-mode turn controller (T64).
+
+A meanwhile scene is a private 2-bot scene running alongside an active
+you-scene (its parent). The user manually advances it by POSTing to the
+existing ``/chats/<id>/turns`` endpoint; the route detects an active
+meanwhile scene at the start of ``post_turn`` and dispatches here.
+
+Unlike the normal turn flow, "you" is NOT a witness to the scene. The
+controller mirrors ``post_turn`` shape but with:
+
+- Speaker alternation derived from the latest meanwhile ``assistant_turn``
+  scoped to this scene_id (host first, then alternating).
+- Prompt assembly with ``present_set_kind="host_guest"`` so the prompt
+  builder drops the "you" activity bullet and any speaker -> "you" edge.
+- Memory writes via ``record_meanwhile_memory`` — both bots get rows
+  with witness flags ``[you=0, host=1, guest=1]``.
+- State updates over exactly 2 directed pairs (host <-> guest); no
+  you-related pairs fire.
+- The ``assistant_turn`` payload carries ``meanwhile_scene_id`` and
+  ``present_set_kind="host_guest"`` so downstream filters (alternation
+  lookup, drawer rendering, scene-close detection) can scope to the
+  meanwhile slice without conflating it with the parent you-scene's
+  history.
+
+Scene-close detection for meanwhile scenes is not auto-fired here —
+T65 covers the close + digest pipeline. The controller's job ends
+after the post-turn classifier passes land.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import json
+
+from chat.config import Settings
+from chat.eventlog.log import append_and_apply, append_event
+from chat.llm.client import LLMClient
+from chat.services.memory_write import record_meanwhile_memory
+from chat.services.multi_state_update import compute_state_updates_for_present
+from chat.services.prompt import assemble_narrative_prompt
+from chat.services.turn_parse import parse_turn
+from chat.state.edges import get_edge
+from chat.state.entities import get_bot
+from chat.state.meanwhile import list_meanwhile_scenes
+from chat.state.world import get_chat
+from chat.web.pubsub import publish
+from chat.web.render import render_turn_html as _render_turn_html
+
+
+def _strip_ooc_for_prompt(parsed) -> str:
+    """Mirror of the helper in turns.py — concatenate non-OOC segments."""
+    keep = [s.text for s in parsed.segments if s.kind != "ooc"]
+    return " ".join(keep).strip()
+
+
+def _read_recent_meanwhile_dialogue(
+    conn, chat_id: str, scene_id: int, limit: int = 50
+) -> list[dict]:
+    """Return the meanwhile scene's prior turns shaped as
+    ``{"speaker": <id>, "text": <prose>}``.
+
+    Pulls ``user_turn`` rows for the chat (the user-side prose driving
+    this meanwhile scene rides through the same chat) plus only those
+    ``assistant_turn`` rows whose ``meanwhile_scene_id`` matches the
+    given scene id. Other meanwhile scenes on the same chat — and the
+    parent you-scene's assistant_turns — are excluded so the prompt
+    context stays scoped to the private beat.
+
+    Filters chat_id (and meanwhile_scene_id for assistant_turn) via
+    ``json_extract`` in SQL so SQLite stops at the first ``limit`` rows
+    that already match — avoids an unbounded scan as ``event_log``
+    grows. The user-side rows match on chat_id only since they aren't
+    tagged with a scene id (they ride the chat-wide log).
+    """
+    cur = conn.execute(
+        "SELECT id, kind, payload_json FROM event_log "
+        "WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn') "
+        "  AND superseded_by IS NULL AND hidden = 0 "
+        "  AND json_extract(payload_json, '$.chat_id') = ? "
+        "  AND ("
+        "    kind IN ('user_turn', 'user_turn_edit') "
+        "    OR json_extract(payload_json, '$.meanwhile_scene_id') = ?"
+        "  ) "
+        "ORDER BY id DESC LIMIT ?",
+        (chat_id, scene_id, limit),
+    )
+    rows = cur.fetchall()
+    rows.reverse()
+    out: list[dict] = []
+    for _row_id, kind, payload_json in rows:
+        p = json.loads(payload_json)
+        if kind in ("user_turn", "user_turn_edit"):
+            out.append({"speaker": "you", "text": p.get("prose", "")})
+        else:
+            out.append(
+                {
+                    "speaker": p.get("speaker_id", "bot"),
+                    "text": p.get("text", ""),
+                }
+            )
+    return out
+
+
+def _last_meanwhile_speaker(conn, chat_id: str, scene_id: int) -> str | None:
+    """Return the speaker_id of the latest assistant_turn linked to
+    ``scene_id`` for ``chat_id``, or ``None`` if no prior turn exists.
+
+    Used to alternate the speaker across consecutive meanwhile turns —
+    the OTHER bot speaks next. Pushes both filters into SQL via
+    ``json_extract`` and bounds with ``LIMIT 1`` so SQLite stops at the
+    first match instead of scanning the whole assistant_turn slice.
+    """
+    row = conn.execute(
+        "SELECT json_extract(payload_json, '$.speaker_id') AS speaker "
+        "FROM event_log "
+        "WHERE kind = 'assistant_turn' "
+        "  AND superseded_by IS NULL AND hidden = 0 "
+        "  AND json_extract(payload_json, '$.chat_id') = ? "
+        "  AND json_extract(payload_json, '$.meanwhile_scene_id') = ? "
+        "ORDER BY id DESC "
+        "LIMIT 1",
+        (chat_id, scene_id),
+    ).fetchone()
+    return row[0] if row else None
+
+
+async def process_meanwhile_turn(
+    conn,
+    client: LLMClient,
+    settings: Settings,
+    *,
+    chat_id: str,
+    prose: str,
+) -> dict:
+    """Run one meanwhile turn end-to-end.
+
+    Returns a small dict shape ``{"assistant_text": ..., "speaker_id":
+    ..., "scene_id": ..., "user_turn_id": ..., "assistant_event_id":
+    ...}`` so callers can introspect the produced beat (HTTP route maps
+    to a ``204``; future SSE rebroadcast may use the dict directly).
+
+    Raises ``ValueError`` when there is no active meanwhile scene on
+    ``chat_id`` — the caller (turns.py) only dispatches here after a
+    positive ``list_meanwhile_scenes`` lookup, but the defensive raise
+    keeps the controller usable in isolation.
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise ValueError(f"chat not found: {chat_id}")
+
+    scenes = list_meanwhile_scenes(conn, chat_id, status="active")
+    if not scenes:
+        raise ValueError(f"no active meanwhile scene on chat: {chat_id}")
+    scene = scenes[0]
+    scene_id = scene["id"]
+
+    host_bot_id = chat["host_bot_id"]
+    guest_bot_id = chat.get("guest_bot_id")
+    if guest_bot_id is None:
+        # A meanwhile scene without a guest is a schema violation —
+        # the projector requires both ids on meanwhile_scene_started.
+        raise ValueError(
+            f"meanwhile scene {scene_id} on chat {chat_id} lacks a guest"
+        )
+
+    host_bot = get_bot(conn, host_bot_id)
+    guest_bot = get_bot(conn, guest_bot_id)
+    if host_bot is None or guest_bot is None:
+        raise ValueError(
+            f"meanwhile bots missing: host={host_bot_id} guest={guest_bot_id}"
+        )
+
+    # 1. Parse the user prose with the classifier — same shape as the
+    # normal turn flow so OOC-stripping, segment-typing, etc. all work.
+    parsed = await parse_turn(
+        client, model=settings.classifier_model, prose=prose
+    )
+    prompt_prose = _strip_ooc_for_prompt(parsed)
+
+    # 2. Append user_turn — kept on the chat-wide log so the user can
+    # see their own prose in the timeline. Tagged with the meanwhile
+    # scene_id so future renderers can group it with the right scene.
+    user_turn_event_id = append_event(
+        conn,
+        kind="user_turn",
+        payload={
+            "chat_id": chat_id,
+            "prose": prose,
+            "segments": [s.model_dump() for s in parsed.segments],
+            "meanwhile_scene_id": scene_id,
+        },
+    )
+
+    # 3. Alternate the speaker. First turn -> host speaks; each
+    # subsequent turn -> the OTHER bot from the previous beat. Lookup
+    # is scoped by ``meanwhile_scene_id`` so unrelated assistant_turns
+    # on the same chat don't perturb the alternation.
+    last_speaker = _last_meanwhile_speaker(conn, chat_id, scene_id)
+    if last_speaker is None or last_speaker == guest_bot_id:
+        speaker_bot = host_bot
+        addressee_bot = guest_bot
+    else:
+        speaker_bot = guest_bot
+        addressee_bot = host_bot
+
+    # 4. Placeholder marker so SSE observers see "in flight". No
+    # projector handler is registered for this kind — it's transcript-
+    # only, same as the normal turn flow.
+    append_event(
+        conn,
+        kind="assistant_turn_started",
+        payload={
+            "chat_id": chat_id,
+            "speaker_id": speaker_bot["id"],
+            "user_turn_id": user_turn_event_id,
+            "meanwhile_scene_id": scene_id,
+        },
+    )
+
+    # 5. Build the narrative prompt. ``present_set_kind="host_guest"``
+    # tells the assembler to drop the "you" activity bullet and any
+    # speaker -> "you" edge — both irrelevant inside a private beat.
+    # Addressee is the OTHER bot, not "you".
+    recent_dialogue = _read_recent_meanwhile_dialogue(conn, chat_id, scene_id)
+    if recent_dialogue and recent_dialogue[-1].get("speaker") == "you":
+        recent_dialogue = recent_dialogue[:-1]
+    messages = assemble_narrative_prompt(
+        conn,
+        chat_id=chat_id,
+        speaker_bot_id=speaker_bot["id"],
+        addressee=addressee_bot["id"],
+        user_turn_prose=prompt_prose if prompt_prose else None,
+        recent_dialogue=recent_dialogue,
+        budget_soft=settings.narrative_budget_soft,
+        budget_hard=settings.narrative_budget_hard,
+        guest_id=guest_bot_id,
+        present_set_kind="host_guest",
+    )
+
+    # 6. Stream + accumulate. Same SSE pattern as the normal flow —
+    # tokens publish under the speaker's id so the UI can label the
+    # right bubble. Register the streaming task in the chat-keyed
+    # in-flight registry so POST /chats/<id>/turns/cancel can call
+    # ``.cancel()`` on it; without this, the Stop button is a no-op for
+    # meanwhile beats. We import the underscore name from turns.py
+    # deliberately — it's the same single-process registry the cancel
+    # route reads, and exposing it via a public alias would require
+    # touching every existing call site for no behavioural gain.
+    from chat.web.turns import _in_flight_tasks  # noqa: PLC0415
+
+    accumulated: list[str] = []
+    truncated = False
+    cancelled = False
+
+    async def _stream() -> None:
+        async for chunk in client.stream(
+            messages,
+            model=settings.narrative_model,
+            max_tokens=settings.narrative_max_tokens,
+            temperature=settings.narrative_temperature,
+        ):
+            accumulated.append(chunk)
+            await publish(
+                chat_id,
+                {
+                    "event": "token",
+                    "text": chunk,
+                    "speaker_id": speaker_bot["id"],
+                },
+            )
+
+    stream_task = asyncio.create_task(_stream())
+    _in_flight_tasks[chat_id] = stream_task
+    try:
+        await stream_task
+    except asyncio.CancelledError:
+        truncated = True
+        cancelled = True
+    except Exception:
+        truncated = True
+    finally:
+        # Always unregister so a subsequent turn can register a fresh
+        # task. Mirrors the cleanup in turns.py::post_turn.
+        _in_flight_tasks.pop(chat_id, None)
+
+    text = "".join(accumulated)
+
+    # 7. Append assistant_turn — tagged with meanwhile_scene_id so the
+    # next turn's alternation lookup can find it, and present_set_kind
+    # so downstream renderers / digesters can filter scope.
+    assistant_event_id = append_event(
+        conn,
+        kind="assistant_turn",
+        payload={
+            "chat_id": chat_id,
+            "speaker_id": speaker_bot["id"],
+            "text": text,
+            "truncated": truncated,
+            "user_turn_id": user_turn_event_id,
+            "meanwhile_scene_id": scene_id,
+            "present_set_kind": "host_guest",
+        },
+    )
+
+    # 8. Per-turn memory writes — both bots get a row with witness flags
+    # [you=0, host=1, guest=1]. Skipped on cancellation so we don't
+    # record memory for a partial beat the user never read.
+    if not cancelled and text.strip():
+        record_meanwhile_memory(
+            conn,
+            chat_id=chat_id,
+            host_bot_id=host_bot_id,
+            guest_bot_id=guest_bot_id,
+            narrative_text=text,
+            scene_id=scene_id,
+            chat_clock_at=chat.get("time"),
+        )
+
+        # 9. Post-turn state-update — exactly 2 directed pairs over the
+        # bot pair. No you-related pairs fire (you isn't present).
+        present_ids = [host_bot_id, guest_bot_id]
+        present_names = {
+            host_bot_id: host_bot["name"],
+            guest_bot_id: guest_bot["name"],
+        }
+        personas = {
+            host_bot_id: host_bot.get("persona") or "",
+            guest_bot_id: guest_bot.get("persona") or "",
+        }
+        prior_edges: dict[tuple[str, str], dict] = {}
+        for src in present_ids:
+            for tgt in present_ids:
+                if src == tgt:
+                    continue
+                edge = get_edge(conn, src, tgt) or {
+                    "affinity": 50,
+                    "trust": 50,
+                    "summary": "",
+                }
+                prior_edges[(src, tgt)] = edge
+
+        state_updates = await compute_state_updates_for_present(
+            client,
+            classifier_model=settings.classifier_model,
+            present_ids=present_ids,
+            present_names=present_names,
+            personas=personas,
+            prior_edges=prior_edges,
+            recent_dialogue=recent_dialogue,
+            timeout_s=settings.classifier_timeout_s,
+        )
+        last_at = chat.get("time")
+        for src_id, tgt_id, update in state_updates:
+            append_and_apply(
+                conn,
+                kind="edge_update",
+                payload={
+                    "source_id": src_id,
+                    "target_id": tgt_id,
+                    "chat_id": chat_id,
+                    "affinity_delta": update.affinity_delta,
+                    "trust_delta": update.trust_delta,
+                    "knowledge_facts": update.knowledge_facts,
+                    "last_interaction_at": last_at,
+                    "last_interaction_chat_id": chat_id,
+                },
+            )
+
+    # 10. SSE broadcast for the timeline UI — completion event + an HTML
+    # fragment for the HTMX SSE swap. Same pattern as the normal turn
+    # flow so the rendered transcript shows the meanwhile beat inline.
+    await publish(
+        chat_id,
+        {
+            "event": "assistant_turn_complete",
+            "speaker_id": speaker_bot["id"],
+            "text": text,
+            "truncated": truncated,
+        },
+    )
+    turn_html = _render_turn_html(
+        speaker_bot["name"],
+        text,
+        role="bot",
+        event_id=assistant_event_id,
+    )
+    await publish(chat_id, {"event": "turn_html", "data": turn_html})
+
+    if cancelled:
+        # Re-raise after the partial-turn has been recorded so callers
+        # see the cancel propagate (mirrors normal turn flow).
+        raise asyncio.CancelledError
+
+    return {
+        "assistant_text": text,
+        "speaker_id": speaker_bot["id"],
+        "scene_id": scene_id,
+        "user_turn_id": user_turn_event_id,
+        "assistant_event_id": assistant_event_id,
+    }
+
+
+__all__ = ["process_meanwhile_turn"]

chat/web/render.py

@@ -84,7 +84,13 @@ def render_prose(text: str) -> str:
     return "".join(f"<p>{p}</p>" for p in paragraphs)
 
 
-def render_turn_html(speaker: str, text: str, role: str = "bot") -> str:
+def render_turn_html(
+    speaker: str,
+    text: str,
+    role: str = "bot",
+    *,
+    event_id: int | None = None,
+) -> str:
     """Render a full transcript turn as ``<div class="turn …">…</div>``.
 
     Used by both the SSE fragment publisher in :mod:`chat.web.turns`
@@ -94,12 +100,19 @@ def render_turn_html(speaker: str, text: str, role: str = "bot") -> str:
     ``role`` selects the CSS class (``turn-you`` vs ``turn-bot``); the
     speaker label and role name are HTML-escaped defensively even though
     they currently come from trusted server-side state.
+
+    ``event_id`` (T86 follow-up) stamps ``id="turn-<event_id>"`` on the
+    wrapper div so the chat-page ``turn_html_replace`` SSE handler can
+    locate the prior turn node by id and swap it in-place. When omitted
+    the id attribute is dropped so SSE-only fragments without a stable
+    event id (legacy callers) still render cleanly.
     """
     speaker_html = html.escape(speaker)
     role_html = html.escape(role)
     body_html = render_prose(text)
+    id_attr = f' id="turn-{int(event_id)}"' if event_id is not None else ""
     return (
-        f'<div class="turn turn-{role_html}">'
+        f'<div{id_attr} class="turn turn-{role_html}">'
         f"<strong>{speaker_html}</strong>"
         f"{body_html}"
         f"</div>"

chat/web/skip.py

@@ -0,0 +1,302 @@
+"""Shared skip-flow controllers (T62).
+
+Both the drawer skip routes (T59) and the natural-language skip parse
+(T62) call into these controllers. Keep the controllers free of HTTP
+concerns — they take ``conn`` + ``client`` + ``settings`` and structured
+args, append events, and return a small result dict the caller can map
+to whatever response shape it owes (drawer partial, 204, 422, etc.).
+
+``ValueError`` is the controller-level signal for caller-mappable
+validation failure (bad ISO timestamp, backwards skip). The drawer
+routes translate it to ``HTTP 400``; the natural-language path either
+swallows it (the parser handed us a degenerate hint) or surfaces it the
+same way. Anything else (LLM failure, unexpected exception) propagates
+uncaught — :func:`narrate_skip` already has its own deterministic
+fallback for the routine LLM-down case, so a real exception here means
+something we want to see.
+
+The two controllers mirror the drawer T59 logic closely so the v1
+guarantees (``time_skip_*`` lands first → memory writes ride the
+post-skip clock → narration ``assistant_turn`` is appended last) hold
+identically across the two entry points.
+"""
+
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from sqlite3 import Connection
+
+from chat.config import Settings
+from chat.eventlog.log import append_and_apply, append_event
+from chat.llm.client import LLMClient
+from chat.services.memory_write import record_turn_memory_for_present
+from chat.services.skip_narration import narrate_skip
+from chat.services.synthesized_memories import synthesize_memories
+from chat.state.entities import get_bot, get_you
+from chat.state.world import get_activity, get_chat
+
+
+class ChatNotFoundError(Exception):
+    """Raised when a ``chat_id`` doesn't resolve to a chat row.
+
+    Distinguishes the missing-chat case from generic input-validation
+    failures (which still raise :class:`ValueError`). HTTP callers map
+    this to ``404`` and ``ValueError`` to ``400`` — replacing the
+    earlier ``str(exc).startswith("chat not found")`` prefix sniff
+    (T81) with a typed dispatch.
+    """
+
+
+def _parse_iso_time(value: str) -> datetime | None:
+    """Permissive ISO 8601 parser shared with the drawer routes (T59).
+
+    ``datetime.fromisoformat`` doesn't accept a trailing ``Z`` until
+    Python 3.11; we normalize it to ``+00:00`` so older interpreters
+    parse the same set of strings the drawer accepts.
+    """
+    if not value:
+        return None
+    try:
+        v = value.strip()
+        if v.endswith("Z"):
+            v = v[:-1] + "+00:00"
+        return datetime.fromisoformat(v)
+    except (TypeError, ValueError):
+        return None
+
+
+def _validate_new_time(chat: dict, new_time: str) -> None:
+    """Raise ``ValueError`` if ``new_time`` is unparseable or backwards.
+
+    The drawer route maps the raised error to ``HTTP 400``; the
+    natural-language path may also surface it as a ``400``. Centralizing
+    the rule here means both entry points enforce the same invariant
+    (no causality-corrupting backwards jumps).
+    """
+    new_dt = _parse_iso_time(new_time)
+    if new_dt is None:
+        raise ValueError(f"new_time must be ISO 8601, got {new_time!r}")
+    cur_dt = _parse_iso_time(chat.get("time") or "")
+    if cur_dt is not None and new_dt < cur_dt:
+        raise ValueError(
+            "new_time must not be earlier than the current chat clock"
+        )
+
+
+async def process_elision_skip(
+    conn: Connection,
+    client: LLMClient,
+    settings: Settings,
+    *,
+    chat_id: str,
+    new_time: str,
+    landing_state_hint: str = "",
+) -> dict:
+    """Run an elision skip end-to-end.
+
+    Validates ``new_time`` against the current chat clock, appends a
+    ``time_skip_elision`` event (chat clock advances), generates a
+    transition narration via :func:`narrate_skip`, and appends an
+    ``assistant_turn`` carrying the narration. ``narrate_skip`` has its
+    own deterministic fallback so this never blocks on the model.
+
+    Returns ``{"assistant_text": ..., "speaker_id": ..., "skip_event_id":
+    ..., "assistant_event_id": ...}`` so callers can introspect the
+    generated turn (e.g. for SSE rebroadcast or test assertions).
+
+    Raises :class:`ChatNotFoundError` when the chat row is missing
+    (HTTP ``404``) and ``ValueError`` on input-validation failure
+    (HTTP ``400``). Splitting the two lets the drawer route dispatch
+    on type instead of sniffing the error string (T81).
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise ChatNotFoundError(f"chat not found: {chat_id}")
+
+    _validate_new_time(chat, new_time)
+
+    host_bot = get_bot(conn, chat["host_bot_id"]) or {
+        "id": chat["host_bot_id"],
+        "name": "host",
+        "persona": "",
+    }
+    you_entity = get_you(conn) or {"name": "you"}
+
+    # The drawer route reaches into the host bot's current activity to
+    # surface the verb to the narration helper — we do the same so both
+    # entry points produce the same prose for the same chat state.
+    bot_activity = get_activity(conn, chat["host_bot_id"]) or {}
+    current_activity = (bot_activity.get("action") or {}).get("verb") or ""
+
+    narration = await narrate_skip(
+        client,
+        narrative_model=settings.narrative_model,
+        skip_kind="elision",
+        speaker_bot=host_bot,
+        you_name=you_entity.get("name") or "you",
+        current_time=chat.get("time") or "",
+        new_time=new_time,
+        current_activity=current_activity,
+        landing_state_hint=landing_state_hint,
+        timeout_s=settings.classifier_timeout_s,
+    )
+
+    skip_event_id = append_and_apply(
+        conn,
+        kind="time_skip_elision",
+        payload={"chat_id": chat_id, "new_time": new_time},
+    )
+    speaker_id = host_bot.get("id") or chat["host_bot_id"]
+    assistant_event_id = append_event(
+        conn,
+        kind="assistant_turn",
+        payload={
+            "chat_id": chat_id,
+            "speaker_id": speaker_id,
+            "text": narration,
+            "truncated": False,
+        },
+    )
+
+    return {
+        "assistant_text": narration,
+        "speaker_id": speaker_id,
+        "skip_event_id": skip_event_id,
+        "assistant_event_id": assistant_event_id,
+    }
+
+
+async def process_jump_skip(
+    conn: Connection,
+    client: LLMClient,
+    settings: Settings,
+    *,
+    chat_id: str,
+    new_time: str,
+    notable_prose: str = "",
+    reset_activity: bool = False,
+) -> dict:
+    """Run a jump skip end-to-end.
+
+    Same validations as :func:`process_elision_skip`. Emits
+    ``time_skip_jump`` *before* synthesizing memories so per-bot writes
+    record the post-jump chat clock (mirroring how a regular turn's
+    memory carries the chat clock). When ``notable_prose`` is non-empty,
+    runs :func:`synthesize_memories` once per present bot witness, then
+    fans the resulting memories out via
+    :func:`record_turn_memory_for_present` with ``source="synthesized"``.
+    Finally appends the narration ``assistant_turn``.
+
+    Returns ``{"assistant_text": ..., "speaker_id": ..., "skip_event_id":
+    ..., "assistant_event_id": ...}``.
+
+    Raises :class:`ChatNotFoundError` on missing chat (caller maps to
+    ``404``) and ``ValueError`` on input-validation failure (caller maps
+    to ``400``).
+    """
+    chat = get_chat(conn, chat_id)
+    if chat is None:
+        raise ChatNotFoundError(f"chat not found: {chat_id}")
+
+    _validate_new_time(chat, new_time)
+
+    host_bot = get_bot(conn, chat["host_bot_id"]) or {
+        "id": chat["host_bot_id"],
+        "name": "host",
+        "persona": "",
+    }
+    you_entity = get_you(conn) or {"name": "you"}
+    you_name = you_entity.get("name") or "you"
+    guest_bot_id = chat.get("guest_bot_id")
+    guest_bot = get_bot(conn, guest_bot_id) if guest_bot_id else None
+
+    # Emit time_skip_jump up front so subsequent memory writes ride the
+    # post-jump chat clock (matches the drawer T59 behavior pinned by
+    # test_post_skip_jump_with_notable_prose_writes_synthesized_memories).
+    skip_event_id = append_and_apply(
+        conn,
+        kind="time_skip_jump",
+        payload={
+            "chat_id": chat_id,
+            "new_time": new_time,
+            "reset_activity": reset_activity,
+        },
+    )
+
+    # Synthesize per-bot memories when prose is non-empty. The helper
+    # short-circuits on whitespace prose, but gating the loop here keeps
+    # the canned-LLM-queue accounting predictable for tests.
+    if notable_prose.strip():
+        present_bots: list[dict] = [host_bot]
+        if guest_bot is not None:
+            present_bots.append(guest_bot)
+        for bot in present_bots:
+            digest = await synthesize_memories(
+                client,
+                classifier_model=settings.classifier_model,
+                prose=notable_prose,
+                bot_name=bot.get("name") or "",
+                bot_persona=bot.get("persona") or "",
+                you_name=you_name,
+                timeout_s=settings.classifier_timeout_s,
+            )
+            for mem in digest.memories:
+                # ``record_turn_memory_for_present`` writes one row per
+                # present bot per call — we already iterate by bot here,
+                # so guest_bot_id=None avoids double-writing the guest's
+                # row when bot==guest.
+                record_turn_memory_for_present(
+                    conn,
+                    chat_id=chat_id,
+                    host_bot_id=bot["id"],
+                    guest_bot_id=None,
+                    narrative_text=mem.text,
+                    chat_clock_at=new_time,
+                    source="synthesized",
+                    significance=mem.significance,
+                )
+
+    narration = await narrate_skip(
+        client,
+        narrative_model=settings.narrative_model,
+        skip_kind="jump",
+        speaker_bot=host_bot,
+        you_name=you_name,
+        current_time=chat.get("time") or "",
+        new_time=new_time,
+        current_activity="",
+        landing_state_hint=notable_prose,
+        timeout_s=settings.classifier_timeout_s,
+    )
+    speaker_id = host_bot.get("id") or chat["host_bot_id"]
+    assistant_event_id = append_event(
+        conn,
+        kind="assistant_turn",
+        payload={
+            "chat_id": chat_id,
+            "speaker_id": speaker_id,
+            "text": narration,
+            "truncated": False,
+        },
+    )
+
+    return {
+        "assistant_text": narration,
+        "speaker_id": speaker_id,
+        "skip_event_id": skip_event_id,
+        "assistant_event_id": assistant_event_id,
+    }
+
+
+def _now_iso() -> str:
+    """UTC ISO timestamp used by callers as a chat-clock fallback."""
+    return datetime.now(timezone.utc).isoformat()
+
+
+__all__ = [
+    "ChatNotFoundError",
+    "process_elision_skip",
+    "process_jump_skip",
+    "_now_iso",
+    "_parse_iso_time",
+]

chat/web/turns.py

@@ -51,26 +51,46 @@ import html
 import json
 import re
 
+from datetime import timedelta
+
 from fastapi import APIRouter, Depends, Form, HTTPException, Request
-from fastapi.responses import HTMLResponse, RedirectResponse, Response
+from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse, Response
 
 from chat.eventlog.log import append_and_apply, append_event
+from chat.services.addressee import detect_addressee
 from chat.services.background import SignificanceJob
+from chat.services.event_lifecycle import detect_event_transitions
+from chat.services.event_promotion import promote_completed_event
 from chat.services.interjection import detect_interjection
 from chat.services.memory_write import record_turn_memory_for_present
 from chat.services.multi_state_update import compute_state_updates_for_present
-from chat.services.prompt import assemble_narrative_prompt
+from chat.services.prompt import (
+    assemble_narrative_prompt,
+    consume_pending_meanwhile_digests,
+)
 from chat.services.rewind import compute_rewind_preview, execute_rewind
 from chat.services.scene_close import detect_scene_close
 from chat.services.scene_summarize import apply_scene_close_summary
+from chat.services.turn_common import (
+    gather_prior_edges,
+    read_recent_dialogue,
+)
 from chat.services.turn_parse import ParsedTurn, parse_turn
 from chat.state.edges import get_edge
 from chat.state.entities import get_bot, get_you
+from chat.state.events import list_active_events
+from chat.state.meanwhile import list_meanwhile_scenes
 from chat.state.world import active_scene, get_chat, get_container
 from chat.web.bots import get_conn
 from chat.web.kickoff import get_llm_client
+from chat.web.meanwhile import process_meanwhile_turn
 from chat.web.pubsub import publish
 from chat.web.render import render_turn_html as _render_turn_html
+from chat.web.skip import (
+    ChatNotFoundError,
+    _parse_iso_time,
+    process_elision_skip,
+)
 
 router = APIRouter()
 
@@ -97,38 +117,13 @@ def _strip_ooc_for_prompt(parsed: ParsedTurn) -> str:
 def _read_recent_dialogue(conn, chat_id: str, limit: int = 200) -> list[dict]:
     """Return user-side and assistant_turn events for ``chat_id``.
 
-    Includes ``user_turn``, ``user_turn_edit`` (T29 edited prose), and
+    T83.2: thin delegate over
-    ``assistant_turn``. Ordered oldest-first; superseded/hidden rows are
+    :func:`chat.services.turn_common.read_recent_dialogue` so post_turn
-    skipped so regenerated turns (T29) drop out of the rendered timeline.
+    and regenerate share one implementation. The wrapper survives so
-    Each entry is shaped ``{"speaker": <id-or-"you">, "text": <prose>}``
+    the chat-detail template and other callers in this module don't all
-    for the prompt assembler and the chat-detail template.
+    have to update at once.
     """
-    cur = conn.execute(
+    return read_recent_dialogue(conn, chat_id, limit=limit)
-        "SELECT id, kind, payload_json FROM event_log "
-        "WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn') "
-        "  AND superseded_by IS NULL AND hidden = 0 "
-        "ORDER BY id DESC LIMIT ?",
-        (limit,),
-    )
-    rows = cur.fetchall()
-    rows.reverse()  # back to chronological order
-    out: list[dict] = []
-    for _row_id, kind, payload_json in rows:
-        p = json.loads(payload_json)
-        if p.get("chat_id") != chat_id:
-            continue
-        if kind in ("user_turn", "user_turn_edit"):
-            # Edited prose substitutes for the original user_turn (the
-            # original is marked superseded_by and filtered above).
-            out.append({"speaker": "you", "text": p.get("prose", "")})
-        else:
-            out.append(
-                {
-                    "speaker": p.get("speaker_id", "bot"),
-                    "text": p.get("text", ""),
-                }
-            )
-    return out
 
 
 def _detect_addressee_id(
@@ -195,17 +190,8 @@ def _gather_state_update_inputs(
         present_names[guest_bot["id"]] = guest_bot["name"]
         personas[guest_bot["id"]] = guest_bot.get("persona") or ""
 
-    prior_edges: dict[tuple[str, str], dict] = {}
+    # T83.2: directed-edge gather is shared with regenerate.py.
-    for src in present_ids:
+    prior_edges = gather_prior_edges(conn, present_ids)
-        for tgt in present_ids:
-            if src == tgt:
-                continue
-            edge = get_edge(conn, src, tgt) or {
-                "affinity": 50,
-                "trust": 50,
-                "summary": "",
-            }
-            prior_edges[(src, tgt)] = edge
     return present_ids, present_names, personas, prior_edges
 
 
@@ -235,20 +221,150 @@ async def post_turn(
     guest_bot = None
     guest_bot_id = chat.get("guest_bot_id")
     if guest_bot_id is not None:
+        # T47's bot_reset cascade clears guest_bot_id from any chat that
+        # referenced the deleted bot, so by the time we read it here it's
+        # either None or a live bot id. The previous defensive
+        # degrade-to-1:1 block (T44) was rendered dead by T47 and removed
+        # in T74.4 — get_bot now returns a real row.
         guest_bot = get_bot(conn, guest_bot_id)
-        # If the chat references a deleted guest we degrade to single-bot
-        # rather than 404 — the chat is still usable as a 1:1.
-        if guest_bot is None:
-            guest_bot_id = None
 
     settings = request.app.state.settings
 
+    # 0. Meanwhile-mode short-circuit (T64). When an active meanwhile
+    # scene is running on this chat, the turn flow is entirely between
+    # the two bots — "you" is absent. The meanwhile controller mirrors
+    # the post_turn shape but with no-you semantics: present_set_kind
+    # ``host_guest`` in the prompt assembler, ``record_meanwhile_memory``
+    # for witness flags, only 2 directed pairs in the state update, and
+    # the assistant_turn payload tagged with ``meanwhile_scene_id`` so
+    # alternation lookups can scope to this scene specifically. The
+    # T62 skip-intent dispatch and the regular narrative path below
+    # are skipped — a meanwhile beat is its own self-contained flow.
+    if list_meanwhile_scenes(conn, chat_id, status="active"):
+        try:
+            await process_meanwhile_turn(
+                conn,
+                client,
+                settings,
+                chat_id=chat_id,
+                prose=prose,
+            )
+        except ValueError as exc:
+            raise HTTPException(status_code=400, detail=str(exc))
+        return Response(status_code=204)
+
     # 1. Parse turn (classifier).
     parsed = await parse_turn(
         client, model=settings.classifier_model, prose=prose
     )
     prompt_prose = _strip_ooc_for_prompt(parsed)
 
+    # 1a. Skip-command short-circuit (T62). The parser may classify the
+    # prose as a time-skip directive — in which case the regular
+    # narrative path (addressee detection, narrative stream, post-turn
+    # state-update + scene-close passes) is skipped entirely. Elision
+    # runs through the shared controller in :mod:`chat.web.skip`; jump
+    # is drawer-only for Phase 3 (the natural-language path returns
+    # 422 directing the user to the drawer's jump form, where they can
+    # supply structured ``notable_prose`` and a target time). Anything
+    # not matching these intents falls through to the narrative branch.
+    intent = getattr(parsed, "intent", "narrative") or "narrative"
+    if intent == "skip_jump":
+        # Drawer-only jump for Phase 3: parsing a free-form fiction-time
+        # delta out of natural language ("next morning" -> ?) is fragile
+        # enough that we'd rather route the user to the drawer form,
+        # where they pick a concrete ISO time and an optional notable-
+        # prose field. 422 = "request shape is understood, but the
+        # required structured input lives on a different surface".
+        return JSONResponse(
+            {
+                "error": (
+                    "Jump skip requires the drawer's jump form for "
+                    "notable_prose."
+                )
+            },
+            status_code=422,
+        )
+
+    if intent == "skip_elision":
+        # T82.2: run scene-close detection on the user's prose BEFORE
+        # the skip controller fires. Prose like "fade out, skip an hour"
+        # carries both a close signal and a skip directive; we want the
+        # close summary to capture the closing scene's final beat (and
+        # promote per-POV memories) before the time advances. Order
+        # matters: scene close -> skip narration -> time advance.
+        #
+        # When there's no active scene (or the prose carries no close
+        # signal) ``detect_scene_close`` returns the safe
+        # ``should_close=False`` default and we drop straight to the
+        # skip controller — same behavior as today, no extra cost.
+        skip_scene = active_scene(conn, chat_id)
+        if skip_scene is not None:
+            container = None
+            if skip_scene.get("container_id") is not None:
+                container = get_container(conn, skip_scene["container_id"])
+            container_name = container["name"] if container else "unknown"
+            close_decision = await detect_scene_close(
+                client,
+                model=settings.classifier_model,
+                prose=prose,
+                current_container_name=container_name,
+            )
+            if close_decision.should_close:
+                append_and_apply(
+                    conn,
+                    kind="scene_closed",
+                    payload={
+                        "scene_id": skip_scene["id"],
+                        "ended_at": chat.get("time"),
+                        "significance": 0,
+                    },
+                )
+                await apply_scene_close_summary(
+                    conn,
+                    client,
+                    classifier_model=settings.classifier_model,
+                    chat_id=chat_id,
+                    scene_id=skip_scene["id"],
+                    host_bot_id=host_bot["id"],
+                    timeout_s=settings.classifier_timeout_s,
+                )
+
+        # Derive ``new_time`` from the chat clock. Phase 3 stub: bump by
+        # 1 hour. The drawer's elision form is the structured path when
+        # the author wants a specific landing time; here the goal is
+        # "elide the dull bit" and any sensible forward step is fine —
+        # ``narrate_skip`` weaves the landing-state hint into the
+        # transition prose so the prose carries the semantic time, not
+        # the timestamp itself.
+        cur_dt = _parse_iso_time(chat.get("time") or "")
+        new_time = (
+            (cur_dt + timedelta(hours=1)).isoformat()
+            if cur_dt is not None
+            else (chat.get("time") or "")
+        )
+        try:
+            await process_elision_skip(
+                conn,
+                client,
+                settings,
+                chat_id=chat_id,
+                new_time=new_time,
+                landing_state_hint=getattr(parsed, "landing_state_hint", "")
+                or "",
+            )
+        except ChatNotFoundError as exc:
+            # Defensive: chat existence is checked above, so this only
+            # fires on a TOCTOU race where the chat row is deleted
+            # mid-request. T81 split the typed missing-chat case out of
+            # the generic ValueError so we keep the 404 mapping here.
+            raise HTTPException(status_code=404, detail=str(exc))
+        except ValueError as exc:
+            # Bad new_time is a stub-derivation bug rather than user
+            # input — surface as 400 with the controller message.
+            raise HTTPException(status_code=400, detail=str(exc))
+        return Response(status_code=204)
+
     # 2. Append user_turn event.
     user_turn_event_id = append_event(
         conn,
@@ -262,8 +378,25 @@ async def post_turn(
 
     # 3. Determine the addressee. Done before assistant_turn_started so the
     # placeholder reflects the bot the user is actually talking to (host
-    # in 1:1, host-or-guest in multi-entity).
+    # in 1:1, host-or-guest in multi-entity). T74.1 routes the multi-entity
-    addressee_id = _detect_addressee_id(prose, host_bot, guest_bot)
+    # case through the addressee classifier; the no-guest case still uses
+    # the substring fast-path because there is nothing to classify when
+    # only one bot is present (and a classifier round-trip there would
+    # just be throughput overhead).
+    if guest_bot is None:
+        addressee_id = _detect_addressee_id(prose, host_bot, guest_bot)
+    else:
+        decision = await detect_addressee(
+            client,
+            classifier_model=settings.classifier_model,
+            user_prose=prose,
+            host_id=host_bot["id"],
+            host_name=host_bot["name"],
+            guest_id=guest_bot["id"],
+            guest_name=guest_bot["name"],
+            timeout_s=settings.classifier_timeout_s,
+        )
+        addressee_id = decision.addressee_id
     addressee_bot = (
         guest_bot if (guest_bot is not None and addressee_id == guest_bot["id"])
         else host_bot
@@ -350,7 +483,11 @@ async def post_turn(
 
     # 7. Append the assistant_turn with the final text. (See note above on
     # why we skip ``project`` for these transcript-only event kinds.)
-    append_event(
+    # Capture the returned event id so we can stamp ``id="turn-<n>"`` on
+    # the SSE-emitted HTML fragment — the chat-page ``turn_html_replace``
+    # handler relies on the id to swap regenerated turns in-place
+    # (T86 follow-up).
+    primary_assistant_event_id = append_event(
         conn,
         kind="assistant_turn",
         payload={
@@ -450,6 +587,7 @@ async def post_turn(
     interjection_text: str | None = None
     interjection_speaker_id: str | None = None
     interjection_truncated = False
+    interjection_event_id: int | None = None
     if (
         guest_bot is not None
         and not cancelled
@@ -537,7 +675,9 @@ async def post_turn(
 
             interjection_text = "".join(interject_accumulated)
 
-            append_event(
+            # Capture the event id (T86 follow-up) so the SSE fragment
+            # below carries ``id="turn-<n>"`` for in-place swap.
+            interjection_event_id = append_event(
                 conn,
                 kind="assistant_turn",
                 payload={
@@ -598,7 +738,7 @@ async def post_turn(
 
                 # Memory write for the interjection beat — a second pair
                 # of memory_written events (host + guest POVs).
-                record_turn_memory_for_present(
+                interject_memory_results = record_turn_memory_for_present(
                     conn,
                     chat_id=chat_id,
                     host_bot_id=host_bot["id"],
@@ -608,6 +748,103 @@ async def post_turn(
                     chat_clock_at=chat.get("time"),
                 )
 
+                # T74.2: enqueue a significance pass for the interjection
+                # memory. Mirrors the primary-turn enqueue pattern above —
+                # we score on the host's memory id since the prose is
+                # identical across both POVs (per-POV rewrite happens at
+                # scene close in T45). Without this enqueue the
+                # interjection beat lands in memory but never gets scored,
+                # so it can never auto-pin even when it carries a pivotal
+                # moment.
+                interject_host_event = interject_memory_results.get(
+                    host_bot["id"]
+                )
+                interject_host_memory_id = (
+                    interject_host_event[1] if interject_host_event else None
+                )
+                if (
+                    worker is not None
+                    and interject_host_memory_id is not None
+                ):
+                    worker.enqueue(
+                        SignificanceJob(
+                            memory_id=interject_host_memory_id,
+                            narrative_text=interjection_text,
+                            prior_dialogue=recent_post_interject,
+                            host_bot_id=host_bot["id"],
+                        )
+                    )
+
+    # 8a. Event-lifecycle detection (Phase 3, T61). Runs after the post-turn
+    # classifier passes (memory write + state update + optional
+    # interjection) and BEFORE scene-close detection. The classifier reads
+    # ``primary_text`` against the chat's currently-active events and
+    # returns a (usually empty) list of transitions. Each transition lands
+    # an ``event_started`` / ``event_completed`` / ``event_cancelled``
+    # event via ``append_and_apply`` so the events projection updates
+    # synchronously. A completion is followed inline by
+    # ``promote_completed_event`` so any structured artifacts the event
+    # carries (knowledge_facts, relationship_change, acquired_objects)
+    # land in state in the same turn — see chat/services/event_promotion.
+    #
+    # ``detect_event_transitions`` short-circuits when ``active_events``
+    # is empty (per T52), so chats without active events don't pay a
+    # classifier round-trip and existing fixtures need no extra canned
+    # slots.
+    active_events = list_active_events(conn, chat_id)
+    if active_events:
+        lifecycle_decision = await detect_event_transitions(
+            client,
+            classifier_model=settings.classifier_model,
+            narrative_text=primary_text,
+            active_events=active_events,
+            timeout_s=settings.classifier_timeout_s,
+        )
+        for transition in lifecycle_decision.transitions:
+            if transition.new_status == "active":
+                append_and_apply(
+                    conn,
+                    kind="event_started",
+                    payload={
+                        "event_id": transition.event_id,
+                        "started_at": chat.get("time"),
+                    },
+                )
+            elif transition.new_status == "completed":
+                append_and_apply(
+                    conn,
+                    kind="event_completed",
+                    payload={
+                        "event_id": transition.event_id,
+                        "completed_at": chat.get("time"),
+                    },
+                )
+                # Run promotion inline so the artifact-emitting events
+                # (edge_update / manual_edit) land synchronously after
+                # the completion. ``promote_completed_event`` is
+                # synchronous (no await) and skips silently when the
+                # event row's status isn't 'completed' — a safety net
+                # for races, not expected to trigger in practice.
+                promote_completed_event(
+                    conn,
+                    event_id=transition.event_id,
+                    chat_id=chat_id,
+                    chat_clock_at=chat.get("time"),
+                )
+            elif transition.new_status == "cancelled":
+                append_and_apply(
+                    conn,
+                    kind="event_cancelled",
+                    payload={
+                        "event_id": transition.event_id,
+                        "completed_at": chat.get("time"),
+                    },
+                )
+            # Any other ``new_status`` value falls through silently —
+            # the lifecycle service constrains the schema to the three
+            # valid transitions, and a defensive no-op here keeps the
+            # turn flow tolerant of unexpected outputs.
+
     # 9. Scene-close detection (Plan §7.2, T26). Runs AFTER assistant_turn
     # and the optional interjection so the bots' responses are part of
     # the closing scene's final beat — closing before narrative would
@@ -623,6 +860,15 @@ async def post_turn(
     # close in the same chat) — we have nothing to close. T13 (kickoff)
     # is the only scene-opener path in v1; Phase 2-3 will handle
     # automatic re-opening with the next container.
+    #
+    # T74.3: this branch deliberately runs even when ``cancelled`` is
+    # True. Close detection consumes only the user's prose (which is
+    # fully appended to the event_log BEFORE streaming starts) and the
+    # current container name; it does NOT consume the bot's output.
+    # A user who types "we're done here, fade out" and then hits Stop
+    # mid-stream still meant to close the scene — the cancelled bot
+    # beat doesn't invalidate that intent. Pinned by
+    # test_cancelled_turn_still_closes_scene_when_user_prose_signals_close.
     if scene is not None and prose.strip():
         container = None
         if scene.get("container_id") is not None:
@@ -663,6 +909,15 @@ async def post_turn(
                 timeout_s=settings.classifier_timeout_s,
             )
 
+    # 9a. Consume any pending meanwhile digests now that the assistant_turn
+    # (which surfaced them in its prompt via T65's helper) has landed. The
+    # spec's "first you-turn AFTER meanwhile close consumes the digest"
+    # semantics are preserved by running this AFTER scene-close detection
+    # — anything pending right now belongs to the prompt we just answered,
+    # so it's safe to mark consumed and the NEXT turn starts clean.
+    # Idempotent: re-calling produces zero events when nothing's pending.
+    consume_pending_meanwhile_digests(conn, chat_id)
+
     # 10. Broadcast a JSON completion event (for JS consumers) and an HTML
     # fragment event (for HTMX SSE swap-into-timeline). One pair per
     # written assistant_turn so the timeline ends up with both the
@@ -677,7 +932,10 @@ async def post_turn(
         },
     )
     primary_html = _render_turn_html(
-        addressee_bot["name"], primary_text, role="bot"
+        addressee_bot["name"],
+        primary_text,
+        role="bot",
+        event_id=primary_assistant_event_id,
     )
     await publish(
         chat_id, {"event": "turn_html", "data": primary_html}
@@ -701,7 +959,10 @@ async def post_turn(
             },
         )
         interject_html = _render_turn_html(
-            interject_speaker_name, interjection_text, role="bot"
+            interject_speaker_name,
+            interjection_text,
+            role="bot",
+            event_id=interjection_event_id,
         )
         await publish(
             chat_id, {"event": "turn_html", "data": interject_html}

docs/plans/2026-04-26-v1-requirements-design.md

@@ -510,6 +510,8 @@ Written per witness when a scene closes. Different details, different interpreta
 
 ### Phase 3 — events, skips, threads
 
+**Status: shipped 2026-04-26** (T49–T67, 19 tasks across 8 waves; schema baseline now version 11; +68 tests). See "Phase 3 status" in CLAUDE.md for the per-task breakdown.
+
 - Events with lifecycles and scoped props.
 - Time skips: elision and jump.
 - Active threads.

docs/plans/2026-04-26-v3.5-phase3.5-cleanup.md

@@ -0,0 +1,709 @@
+# Roleplay Engine — Phase 3.5 Cleanup Plan
+
+> **For Claude:** REQUIRED SUB-SKILL: Use `superpowers-extended-cc:executing-plans` to implement this plan task-by-task. Use the parallel-dispatch pattern documented under "Parallel-Execution Strategy" for waves that fan out to multiple subagents.
+
+**Goal:** Burn down the combined Phase 2.6/3 + Phase 3.5/4 backlog tracked in [`CLAUDE.md`](../../CLAUDE.md). 17 follow-up items consolidated into 12 tasks (file-disjoint where possible) across 7 waves so several can run in parallel.
+
+**Architecture:** No new architecture, no schema migrations, no new event kinds. Every change here is either a polish on an existing service/route, a refactor for DRY/typing/observability, or a UI affordance for state that already exists (frontend `turn_html_replace` consumer).
+
+**Tech Stack:** Same as Phase 3. No new dependencies.
+
+**Source-of-truth references:**
+
+- Backlog list: [`CLAUDE.md`](../../CLAUDE.md) §"Phase 2.6 / 3 backlog" (7 items, 6 actionable + 1 deferred) + §"Phase 3.5 / 4 backlog" (~13 items grouped by source review) = 17 items net.
+- Conventions: [`CLAUDE.md`](../../CLAUDE.md) §"Behavioral defaults" + §"Phase 3 status".
+- Phase 2.5 cleanup plan (style, file-bundling pattern): [2026-04-26-v2.5-phase2.5-cleanup.md](2026-04-26-v2.5-phase2.5-cleanup.md).
+
+When a task says "see §X", that's the requirements doc unless stated otherwise.
+
+---
+
+## Pre-flight
+
+**Branch:** create `phase-3.5` from the latest `main` after Phase 3 has merged (it has — main is at `753cec3`):
+
+```bash
+git checkout main && git pull && git checkout -b phase-3.5
+```
+
+**Schema baseline:** Phase 3 leaves the DB at version 11. Phase 3.5 adds **no migrations**. Schema-version assertion in `tests/test_world.py` stays at 11.
+
+**Pinned non-negotiables (carried forward):**
+
+- State changes go through the event log. Use `append_and_apply(conn, kind, payload)` for the live path; `apply_event` only after a fresh `append_event` returning the new id.
+- Witness filter every memory read at SQL level (hard `WHERE` constraint; never a soft signal).
+- Edges are directed; `botA → botB` and `botB → botA` are independent records.
+- Per-POV scene summaries — never write omniscient narration.
+- TDD: every task starts with a failing test (or a regression test pinning existing contract before refactor).
+- One commit per task minimum. Tasks that bundle multiple backlog items SHOULD split commits within the task — one commit per item — so review can bisect cleanly.
+
+**Verification before claiming done:** Use `superpowers-extended-cc:verification-before-completion` — run the test command, paste actual output. Don't assume green.
+
+---
+
+## Backlog item → task mapping
+
+17 items consolidated into 12 tasks by **file ownership** (so each wave's tasks stay file-disjoint). Bundled tasks split commits internally.
+
+| # | Backlog item | Source | Task |
+|---|--------------|--------|------|
+| 1 | `narrate_skip` `timeout_s` not piped through | T53 review | **T76** |
+| 2 | `AddresseeDecision.confidence` should be `Literal[...]` | T74 review (Phase 2.5 carry-over) | **T77** |
+| 3 | `search_memories` docstring missing SQL-bias note | T57 review | **T78** |
+| 4 | `_witness_role_for` defensive coding for `host_bot_id is None` | T71 review (Phase 2.5 carry-over) | **T79** |
+| 5 | Scene close re-close suffix bloat risk | T58 review | **T80** |
+| 6 | Thread detection transcript scoping (chat-wide vs scene-scoped) | T58 review | **T80** |
+| 7 | Swallowed `Exception` in `detect_threads` try/except — log at debug | T58 review | **T80** |
+| 8 | Scene close `closed_at` clock divergence | T58 review | **T80** |
+| 9 | T58 test coverage gaps (truncation, update/close, fallback) | T58 review | **T80** |
+| 10 | Error-message prefix sniff for 404 vs 400 routing in skip routes | T62 review | **T81** |
+| 11 | `consume_pending_meanwhile_digests` not wired into `post_turn` | T66 integration tests | **T82** |
+| 12 | Skip command bypasses scene close detection | T62 review | **T82** |
+| 13 | Cancel/stop hook for in-flight regenerate streams | T73 review (Phase 2.5 carry-over) | **T83** |
+| 14 | DRY: regenerate vs post_turn (recent-dialogue + prior-edges duplication) | T73 review (Phase 2.5 carry-over) | **T83** |
+| 15 | Sibling-discovery query optimization in regenerate.py | T73 review (Phase 2.5 carry-over) | **T83** |
+| 16 | Regenerate doesn't roll back lifecycle transitions from superseded turn | T61 review | **T83** |
+| 17 | Asymmetry in event-detection ordering (turns.py vs regenerate.py) | T61 review | **T83** |
+| 18 | `record_meanwhile_memory` / `record_turn_memory_for_present` unified API | T64 review | **T84** |
+| 19 | `participants_json` JSON-build audit (other state modules) | T63 review | **T85** |
+| 20 | Stop-button cancellation route-level coverage for meanwhile turns | T64 review | **T85** |
+| 21 | Frontend handler for `turn_html_replace` SSE event | T73.1 review (Phase 2.5 carry-over) | **T86** |
+| — | Docs sweep — remove shipped items, capture residuals | (this plan) | **T87** |
+
+**Deferred (not in this plan):**
+
+- **Cross-feature canned-queue brittleness** (Wave 6b cross-feature): would require a structured-fixture refactor across 3+ test files. Tracking but not in scope here — open as its own work if it surfaces a real test-maintenance pain.
+- **Scene-close-on-cancel UX revisit** (T74.3): pinned to existing behavior; no action needed unless real play surfaces a regression.
+
+---
+
+## Parallel-Execution Strategy
+
+Same pattern as Phases 2.5 and 3. Seven waves: parallel within each wave (file-disjoint), serial across waves.
+
+### How to dispatch a wave in parallel
+
+Use the **Agent tool with `isolation: "worktree"`** so each subagent gets its own git worktree. (If the controlling session's working directory is **not** the chat repo, create worktrees manually with `git worktree add .worktrees/<wave>-<task> -b <wave>/<task> phase-3.5` from inside the chat repo and pass the worktree path explicitly into each subagent prompt.)
+
+In a single message, dispatch all tasks in the wave:
+
+```
+Agent({
+  description: "Wave 1 — T76 narrate_skip timeout_s",
+  subagent_type: "general-purpose",
+  isolation: "worktree",
+  prompt: "<full task text from below>",
+})
+Agent({ ...T77... })
+Agent({ ...T78... })
+Agent({ ...T79... })
+```
+
+### After a wave completes
+
+1. Each subagent returns its worktree path and commit SHA(s).
+2. **Run a spec + code-quality reviewer subagent on each completed task.** Combined review acceptable for purely mechanical fixes (T76–T79). Separate spec + quality reviewers for bundled tasks (T80, T82, T83).
+3. **Merge the wave into `phase-3.5`** in any order (file-disjointness guarantees no conflict). Use `--no-ff`.
+4. **Run the full test suite** on the merged `phase-3.5`. If red, the wave's mutual-independence assumption was violated — bisect, fix, re-merge.
+5. **Push `phase-3.5`** to gitea.
+6. Optionally clean up worktrees: `git worktree remove .worktrees/<branch>` and `git branch -D <branch>`.
+
+### Conflict prevention checklist
+
+For each parallel wave, verify the **Files** sections of all tasks have **no overlapping paths**. Hot files in this plan: `chat/web/turns.py` (T82 only), `chat/services/regenerate.py` (T83 only), `chat/web/skip.py` + `chat/web/drawer.py` (T81 only). Each is owned by exactly one task.
+
+### Failure recovery
+
+If one subagent fails: cancel it, merge the others' successful work, re-dispatch the failed task as a single follow-up. Don't block the wave.
+
+### Why each wave is parallel-safe
+
+| Wave | Tasks | Hot files touched | Disjoint? |
+|------|-------|-------------------|-----------|
+| 1 | T76, T77, T78, T79 | 4 different services/state files; no overlap | ✅ |
+| 2 | T80 | `chat/services/scene_summarize.py` | (single task) |
+| 3 | T81 | `chat/web/skip.py` + `chat/web/drawer.py` (typed exception) | (single task) |
+| 4 | T82 | `chat/web/turns.py` | (single task) |
+| 5 | T83 | `chat/services/regenerate.py` (+ optional new shared-helpers module) | (single task) |
+| 6 | T84, T85, T86 | `chat/services/memory_write.py` (T84); audit + tests (T85); frontend HTML/JS (T86) | ✅ |
+| 7 | T87 | `CLAUDE.md` | (single task) |
+
+---
+
+## Task overview
+
+```
+Wave 1 ─┬─ T76: narrate_skip timeout_s plumbed through (skip_narration.py)
+        ├─ T77: AddresseeDecision.confidence as Literal (addressee.py)
+        ├─ T78: search_memories docstring SQL-bias note (memory.py)
+        └─ T79: _witness_role_for defensive None handling (prompt.py)
+
+Wave 2 ─── T80: scene_summarize.py polish bundle (5 T58 items)
+
+Wave 3 ─── T81: typed exception for skip controllers (skip.py + drawer.py)
+
+Wave 4 ─── T82: turns.py wiring (consume_pending_meanwhile_digests + skip-bypass scene close)
+
+Wave 5 ─── T83: regenerate.py polish bundle (cancel hook + DRY + sibling query +
+                lifecycle rollback + ordering asymmetry)
+
+Wave 6 ─┬─ T84: memory_write.py unified record-memory API
+        ├─ T85: JSON-build audit + meanwhile stop-button route-level test
+        └─ T86: frontend turn_html_replace SSE handler
+
+Wave 7 ─── T87: docs sweep — prune CLAUDE.md backlogs, capture residuals
+```
+
+Critical path: 7 sequential merge points. Total tasks: 12. Wall-clock parallelism advantage: Waves 1 and 6 dispatch concurrently (4-way and 3-way respectively). Waves 2, 3, 4, 5, 7 are single-task by hot-file constraint.
+
+---
+
+## Wave 1 — Independent small fixes (parallel, 4 tasks)
+
+All 4 tasks are tiny (1-line + tests). Fully file-disjoint.
+
+### Task 76: `narrate_skip` timeout_s plumbed through
+
+**Files:**
+- Modify: `chat/services/skip_narration.py`
+- Modify: `tests/test_skip_narration.py` (add 1 test)
+
+**Spec:** `narrate_skip(timeout_s=60.0)` accepts the parameter but doesn't pass it to `client.generate(...)`. Per T53 review — fix:
+
+```python
+# Inside narrate_skip:
+result = await client.generate(
+    [
+        Message(role="system", content=system),
+        Message(role="user", content=user),
+    ],
+    model=narrative_model,
+    max_tokens=200,
+    temperature=0.7,
+    timeout_s=timeout_s,   # NEW: pipe through
+)
+```
+
+If the underlying `client.generate` doesn't honor `timeout_s` (Featherless client signature accepts `**params` so it'll ride through harmlessly), this is a no-op at runtime but documents intent. Read `chat/llm/featherless.py::FeatherlessClient.generate` to confirm.
+
+**Test added:** `test_narrate_skip_passes_timeout_through` — capture the kwargs passed to `client.generate` via a custom mock that records them; assert `timeout_s` is present with the expected value.
+
+**Commit:** `fix: plumb narrate_skip timeout_s through to client.generate (T76)`.
+
+---
+
+### Task 77: `AddresseeDecision.confidence` as Literal type
+
+**Files:**
+- Modify: `chat/services/addressee.py`
+- Modify: `tests/test_addressee.py` (existing tests should still pass; add 1 test for the typed validation)
+
+**Spec:** Per T74 review (Phase 2.5 carry-over). `AddresseeDecision.confidence` is currently `str` with a comment noting valid values. Tighten to `Literal["high", "medium", "low"]`:
+
+```python
+from typing import Literal
+
+class AddresseeDecision(BaseModel):
+    addressee_id: str
+    confidence: Literal["high", "medium", "low"] = "medium"
+    reason: str = ""
+```
+
+Pydantic will reject classifier output with values outside the literal set, falling back via the `default=` in `classify(...)`. The existing fallback path returns `confidence="low"` so no behavior change for legitimate calls.
+
+**Test added:** `test_invalid_confidence_value_falls_back_to_default` — feed canned classifier output with `"confidence": "VERY_HIGH"`; assert the result is the default fallback (Pydantic validation failed → `classify` falls back).
+
+**Commit:** `fix: AddresseeDecision.confidence as Literal[high|medium|low] (T77)`.
+
+---
+
+### Task 78: `search_memories` docstring mentions SQL-bias
+
+**Files:**
+- Modify: `chat/state/memory.py` — extend the `search_memories` docstring with a one-liner about `SIGNIFICANCE_RANK_BIAS`.
+- No test changes needed (docstring-only).
+
+**Spec:** Per T57 review. The current `search_memories` docstring describes only the Python-side composite re-rank with `_SIGNIFICANCE_WEIGHT`. T57 added a SQL-side `SIGNIFICANCE_RANK_BIAS` constant. Add to the docstring:
+
+```
+... (existing prose) ...
+
+The result ordering applies TWO independent significance boosts:
+- SQL-side: ``ORDER BY (rank - significance * SIGNIFICANCE_RANK_BIAS)``
+  pushes higher-significance memories ahead in the FTS5 candidate set.
+- Python-side: a composite re-rank with `_SIGNIFICANCE_WEIGHT` reinforces
+  the ordering after candidate retrieval.
+```
+
+**Commit:** `docs: search_memories docstring mentions SQL-side significance bias (T78)`.
+
+---
+
+### Task 79: `_witness_role_for` defensive None handling
+
+**Files:**
+- Modify: `chat/services/prompt.py`
+- Modify: `tests/test_prompt.py` (add 1 test)
+
+**Spec:** Per T71 review (Phase 2.5 carry-over). Current `_witness_role_for(speaker_bot_id, host_bot_id)` returns `"host" if speaker_bot_id == host_bot_id else "guest"`. When `host_bot_id` is `None` (degenerate case — can happen if a chat row is half-seeded in a test), this returns `"guest"` even though the speaker is logically the host. Defensive fix:
+
+```python
+def _witness_role_for(speaker_bot_id: str, host_bot_id: str | None) -> str:
+    """..."""
+    if host_bot_id is None or speaker_bot_id == host_bot_id:
+        return "host"
+    return "guest"
+```
+
+**Test added:** `test_witness_role_for_none_host_returns_host` — call helper with `host_bot_id=None`; assert returns `"host"`.
+
+**Commit:** `fix: _witness_role_for defensive None handling (T79)`.
+
+---
+
+## Wave 2 — `scene_summarize.py` polish bundle (single task)
+
+T80 bundles 5 backlog items (4 fixes + 1 test gap) all touching `chat/services/scene_summarize.py` and its test file. Single task by hot-file constraint; split into 5 commits internally for clean review bisection.
+
+### Task 80: scene_summarize.py polish
+
+**Files:**
+- Modify: `chat/services/scene_summarize.py`
+- Modify: `tests/test_per_pov_summary.py`
+
+**Spec:** Five sub-fixes per the T58 review.
+
+#### 80.1 — Re-close suffix bloat guard
+
+**Problem:** `_build_key_quotes_suffix` reads from `memories.pov_summary`. If a scene close runs twice (replay, manual re-close, idempotent retry), the second pass reads the rewritten text plus the previous "Key quotes:" suffix and appends a second one — recursive bloat.
+
+**Fix (recommended option):** source quotes from `event_log` `assistant_turn`/`user_turn` text instead of `memories.pov_summary`. The event-log text is immutable per turn, so re-close produces identical key-quote text.
+
+Implementation: in `_build_key_quotes_suffix(conn, scene_id)`, replace the SELECT from `memories` with a JOIN that pulls turn text from `event_log` filtered by scene_id (via `payload_json` JSON extraction), keeping the significance-from-memories filter.
+
+If event-log queries prove too expensive or fragile, fall back to: at the start of `_build_key_quotes_suffix`, strip any existing `"\n\nKey quotes:\n"` suffix from each `pov_summary` before computing the new one. Document the choice in a code comment.
+
+**Test added:** `test_scene_close_re_run_does_not_double_suffix` — close a scene with significance ≥ 2; assert each pov_summary contains "Key quotes:" exactly ONCE. Then call `apply_scene_close_summary` again on the same scene; assert each pov_summary STILL contains "Key quotes:" exactly ONCE (no second append).
+
+**Commit:** `fix: guard scene close key-quote suffix against re-close bloat (T80.1)`.
+
+#### 80.2 — Thread detection transcript scoping
+
+**Problem:** `_read_recent_dialogue` returns chat-wide history with no `scene_id` filter. Feeding chat-wide history to `detect_threads` will misattribute threads to the closing scene when a scene boundary falls inside the last 50 turns.
+
+**Fix:** add a `scene_started_at` lookup at the top of `apply_scene_close_summary`. Filter the transcript to turns where the event_log row's `created_at` (or `chat_clock_at`) is `>= scene_started_at`. Read `chat/state/world.py::get_scene` for the started_at column.
+
+If `get_scene` doesn't expose `started_at`, query directly: `SELECT started_at FROM scenes WHERE id = ?`.
+
+**Test added:** `test_thread_detection_uses_scene_scoped_transcript` — seed a scene with 3 turns. Then close the scene. Then start a new scene and seed 3 more turns. Then close the second scene. Mock `detect_threads` to capture its `scene_transcript` arg. Assert the second close's transcript contains ONLY the 3 second-scene turns (not the first scene's turns).
+
+**Commit:** `fix: scope thread detection transcript to closing scene (T80.2)`.
+
+#### 80.3 — Log swallowed exceptions in `detect_threads` try/except
+
+**Problem:** T58's `try/except Exception:` around `detect_threads` swallows programmer errors silently.
+
+**Fix:** add a `logging.getLogger(__name__).debug("detect_threads failed: %s", exc, exc_info=True)` (or appropriate level) inside the except block. Use the standard library `logging` module (it's already configured by Phase 1's `chat.app`).
+
+**Test added:** `test_detect_threads_failure_is_logged` — patch `detect_threads` to raise `RuntimeError("test")`. Use `caplog` (pytest fixture) to capture log output. Assert the log contains the error message.
+
+**Commit:** `fix: log swallowed exceptions in detect_threads try/except (T80.3)`.
+
+#### 80.4 — Scene close `closed_at` chat-clock semantics
+
+**Problem:** T58 uses `datetime.now(timezone.utc).isoformat()` for `closed_at` on emitted events instead of chat-clock time. Diverges from chat-clock semantics elsewhere.
+
+**Fix:** read `chat["time"]` at the top of `apply_scene_close_summary` (already loaded for per-POV writes via `chat_clock_at`). Pass `chat_clock_at` through to `thread_closed` events' `closed_at` field instead of `datetime.now(...)`.
+
+**Test added:** `test_thread_closed_uses_chat_clock_time` — seed a chat with `chat["time"] = "2026-04-26T10:00:00+00:00"`. Mock `detect_threads` to return one `ThreadCandidate(action="close", existing_thread_id="thr_x")`. Close the scene. Inspect the emitted `thread_closed` event payload — assert `closed_at == "2026-04-26T10:00:00+00:00"`, NOT a `datetime.now(...)` value.
+
+**Commit:** `fix: thread_closed uses chat-clock time, not wall clock (T80.4)`.
+
+#### 80.5 — T58 test coverage gaps
+
+**Spec:** Per T58 review, these specific scenarios lack coverage. Add tests:
+
+1. `test_key_quote_truncation_at_200_chars` — seed a memory with significance 2 and a 500-char `pov_summary`. Close scene. Assert the key-quote bullet for that memory is exactly 200 chars (or 199 + ellipsis, depending on the truncation impl).
+
+2. `test_thread_detection_update_candidate_emits_thread_updated` — mock `detect_threads` to return `ThreadCandidate(action="update", existing_thread_id="thr_x", summary="updated")`. Close. Assert a `thread_updated` event landed.
+
+3. `test_thread_detection_close_candidate_emits_thread_closed` — same setup with `action="close"`. Assert a `thread_closed` event landed.
+
+(The `try/except` fallback test from 80.3 covers the exception path; no separate test needed.)
+
+**Commit:** `test: T58 coverage gaps (truncation, update/close paths) (T80.5)`.
+
+#### Verification gates for T80
+
+- All 5 sub-fix commits cleanly split per `git show`.
+- All 13 existing per_pov_summary tests still pass.
+- 5+ new tests pass.
+- Full suite green.
+- `git diff phase-3.5 --stat` shows ONLY `chat/services/scene_summarize.py` and `tests/test_per_pov_summary.py`.
+
+---
+
+## Wave 3 — Typed exception for skip controllers (single task)
+
+### Task 81: `ChatNotFoundError` for skip route routing
+
+**Files:**
+- Modify: `chat/web/skip.py` — define a typed exception and raise it instead of generic `ValueError("chat not found")`.
+- Modify: `chat/web/drawer.py` — replace string-prefix sniff with `except ChatNotFoundError: 404`.
+- Modify: `tests/test_drawer_events_threads_skip.py` (add 1 test).
+
+**Spec:** Per T62 review. Drawer skip routes use `str(exc).startswith("chat not found")` to distinguish 404 from 400. Fragile if error wording changes. Replace with a typed exception subclass.
+
+```python
+# chat/web/skip.py top:
+class ChatNotFoundError(Exception):
+    """Raised when a chat_id doesn't resolve. Maps to 404 in HTTP routes."""
+
+# Inside process_elision_skip / process_jump_skip:
+chat = get_chat(conn, chat_id)
+if chat is None:
+    raise ChatNotFoundError(f"chat {chat_id!r} not found")
+
+# Other validation failures still raise ValueError (mapped to 400).
+```
+
+```python
+# chat/web/drawer.py skip routes:
+try:
+    result = await process_elision_skip(...)
+except ChatNotFoundError:
+    raise HTTPException(status_code=404, detail="chat not found")
+except ValueError as exc:
+    raise HTTPException(status_code=400, detail=str(exc))
+```
+
+**Test added:** `test_skip_route_raises_404_via_typed_exception` — POST to `/chats/nonexistent/drawer/skip/elision`; assert response 404. (Existing tests should still pass — they check 404 for missing chats and 400 for validation errors.)
+
+**Commit:** `fix: typed ChatNotFoundError replaces string-prefix sniff in skip routes (T81)`.
+
+---
+
+## Wave 4 — `turns.py` wiring (single task)
+
+### Task 82: post_turn meanwhile-digest consumption + skip-command scene close
+
+**Files:**
+- Modify: `chat/web/turns.py`
+- Modify: `tests/test_turn_flow.py` (add 2 tests)
+- Modify: `tests/test_phase3_integration.py` (T66 test 4 currently calls `consume_pending_meanwhile_digests` directly — update it to assert the helper is now invoked AUTOMATICALLY by post_turn)
+
+**Spec:** Two related fixes both touching `post_turn`.
+
+#### 82.1 — Wire `consume_pending_meanwhile_digests` into post_turn
+
+**Problem (T66):** `chat/services/prompt.py::consume_pending_meanwhile_digests` is defined but never called. Meanwhile digests stay pending forever in production.
+
+**Fix:** call the helper at the END of `post_turn` (after the assistant_turn lands and all classifier passes finish, BEFORE the response returns). The helper appends `meanwhile_digest_consumed` events for each pending digest, marking them as surfaced. Idempotent — re-calling produces zero events.
+
+Place the call only when the chat has just-surfaced digests. The simplest pattern: always call after the primary turn — the helper short-circuits when nothing's pending. (Cost: 1 trivial DB query per turn.)
+
+```python
+from chat.services.prompt import consume_pending_meanwhile_digests
+
+# Near the end of post_turn, before publish/return:
+consume_pending_meanwhile_digests(conn, chat_id)
+```
+
+**Test added:** `test_post_turn_consumes_pending_meanwhile_digests` — seed a pending digest. POST a turn. Assert: a `meanwhile_digest_consumed` event landed in event_log AND `list_pending_meanwhile_digests` is now empty.
+
+**Update existing T66 test 4:** the integration test currently calls `consume_pending_meanwhile_digests` directly to drive the consumption side-effect. After T82, the consumption happens automatically inside post_turn. Remove the explicit call in the test (or assert the count even without calling explicitly).
+
+**Commit:** `fix: post_turn consumes pending meanwhile digests (T82.1)`.
+
+#### 82.2 — Skip command runs scene close detection
+
+**Problem (T62):** A user typing "skip an hour" via natural-language skip causes the skip path to bypass scene close detection. The user's prose may have signaled close intent ("fade out, skip an hour") but the skip path returns 204 without checking.
+
+**Fix:** in the natural-language skip dispatch (T62 `intent="skip_elision"` branch), call `detect_scene_close` BEFORE the skip controller runs. If close is detected, append `scene_closed` first, then run the skip flow.
+
+Order matters: scene close → skip narration → time advance. The narration should reflect the new scene start at the new time.
+
+```python
+if parsed.intent == "skip_elision":
+    # Run scene close detection first - the user may have signaled close.
+    if scene := active_scene(conn, chat_id):
+        close_decision = await detect_scene_close(client, classifier_model=..., 
+                                                  prose=parsed.prose, ...)
+        if close_decision.should_close:
+            append_and_apply(conn, kind="scene_closed", payload={"scene_id": scene["id"], ...})
+            await apply_scene_close_summary(conn, client, ...)
+    # ... existing skip dispatch ...
+```
+
+**Test added:** `test_natural_language_skip_with_close_signal_closes_scene` — user prose "fade out, skip to morning". Mock `detect_scene_close` to return True. Mock `narrate_skip`. Assert: `scene_closed` event lands AND `time_skip_elision` event lands AND ordering is `scene_closed` BEFORE `time_skip_elision`.
+
+**Commit:** `fix: natural-language skip runs scene close detection (T82.2)`.
+
+#### Verification gates for T82
+
+- 2 new tests pass.
+- All existing turn_flow + phase3_integration tests still pass (T66 test 4 may need a small update; document in commit).
+- Full suite green.
+- `git diff phase-3.5 --stat`: only `chat/web/turns.py`, `tests/test_turn_flow.py`, `tests/test_phase3_integration.py`.
+
+---
+
+## Wave 5 — `regenerate.py` polish bundle (single task)
+
+T83 bundles 5 regenerate-related backlog items. All touch `chat/services/regenerate.py`. Single task by hot-file constraint; 5 internal commits.
+
+### Task 83: regenerate.py polish
+
+**Files:**
+- Modify: `chat/services/regenerate.py`
+- Optional: create `chat/services/turn_common.py` (new shared-helpers module for 83.2 DRY extraction)
+- Modify: `chat/web/turns.py` (only if 83.2 extracts shared helpers — minimal)
+- Modify: `tests/test_regenerate.py` (add 5+ tests)
+
+**Spec:** Five sub-fixes per the T73 + T61 reviews.
+
+#### 83.1 — Cancel/stop hook for in-flight regenerate streams
+
+**Problem:** `post_turn` registers stream tasks in `_in_flight_tasks` so `/turns/cancel` cancels them. Regenerate doesn't.
+
+**Fix:** mirror the registration pattern from `post_turn` (Phase 2.5 T74.4 documented this). Wrap the regenerate stream in `asyncio.create_task(...)`, register in `_in_flight_tasks[chat_id]`, await, unregister in `finally`.
+
+**Test added:** `test_regenerate_registers_task_in_in_flight_tasks` — mid-stream snapshot pattern (mirror Phase 3 T64.fix-up's `_SnapshotMock`). Assert the chat_id is registered during streaming.
+
+**Commit:** `feat: regenerate registers stream task in _in_flight_tasks for cancellation (T83.1)`.
+
+#### 83.2 — DRY: extract recent-dialogue + prior-edges helpers
+
+**Problem:** Recent-dialogue assembly + prior-edges block are duplicated between `chat/services/regenerate.py` and `chat/web/turns.py`. Diff drift risk.
+
+**Fix:** create `chat/services/turn_common.py` with:
+
+```python
+def read_recent_dialogue(conn, chat_id: str, limit: int = 50) -> list[dict]:
+    """Pull the last N user_turn + assistant_turn rows for the chat as
+    structured [{speaker, text}, ...]. Filters superseded_by IS NULL
+    AND hidden = 0. Used by post_turn AND regenerate AND scene_summarize."""
+
+def gather_prior_edges(conn, chat_id: str, present_ids: list[str]) -> dict[tuple, dict]:
+    """Build {(src, tgt): {affinity, trust, summary}} dict for all directed
+    pairs where both endpoints are in present_ids."""
+```
+
+Update `chat/web/turns.py::post_turn` to use the new helpers. Update `chat/services/regenerate.py::regenerate_assistant_turn` to use them too. Existing tests should pass unchanged.
+
+**Test added:** `tests/test_turn_common.py` (NEW file) with 2-3 tests: dialogue read filters superseded; prior_edges builds correct keys.
+
+**Commit:** `refactor: extract turn_common helpers from regenerate + turns (T83.2)`.
+
+#### 83.3 — Sibling-discovery query optimization
+
+**Problem (T73):** `regenerate.py`'s sibling-assistant-turn lookup scans ALL non-superseded `assistant_turn` rows globally with no `chat_id` predicate.
+
+**Fix:** add a `json_extract(payload_json, '$.chat_id') = ?` predicate in the SQL query, plus `LIMIT 50` for safety. Mirror Phase 3 T64's `_last_meanwhile_speaker` SQL pattern.
+
+**Test added:** `test_regenerate_sibling_lookup_scoped_to_chat` — seed two chats both with regenerate-able turn groups. Regenerate in chat A. Assert the sibling lookup didn't return any chat-B rows (verify via SQL query interception or by ensuring cross-chat sibling pollution wouldn't break).
+
+**Commit:** `perf: scope regenerate sibling-lookup to chat_id (T83.3)`.
+
+#### 83.4 — Lifecycle-transition rollback on regenerate
+
+**Problem (T61):** Regenerate doesn't roll back lifecycle transitions from the superseded turn. `event_started`/`event_completed` rows from a superseded turn remain. May double-emit promotion artifacts.
+
+**Fix (Phase 3.5 first cut — minimal):** at the START of regenerate, scan the superseded turn's downstream events. For any `event_started`/`event_completed`/`event_cancelled` linked to the superseded turn (via `superseded_by` chain on the original assistant_turn AND a back-pointer in the lifecycle event payload), revert the projected state by appending compensating events:
+
+- Original was `event_started` for evt_x → emit `event_started_undone` (NEW event kind?) OR mark the original superseded.
+- Original was `event_completed` → similarly.
+
+**This is too invasive for one Phase 3.5 commit.** Instead, the simpler Phase 3.5 fix: **document the limitation explicitly** in the regenerate flow with a TODO + add an `assert` or warning when regenerate detects prior lifecycle transitions on the superseded turn. Real rollback support is a Phase 4 item.
+
+**Test added:** `test_regenerate_with_prior_lifecycle_logs_warning` — seed a turn that emits `event_completed`. Regenerate. Assert a warning log entry mentions the un-rolled-back transition.
+
+**Commit:** `chore: document regenerate lifecycle-rollback limitation (T83.4)`.
+
+(If the implementer judges that proper rollback IS feasible in the time available, they can implement it instead — but the safe Phase 3.5 default is documentation + warning. The choice is the implementer's; report which path was taken.)
+
+#### 83.5 — Event-detection ordering symmetry
+
+**Problem (T61):** `post_turn` runs lifecycle BETWEEN interjection and scene-close; `regenerate.py` runs lifecycle at the END. Benign because regenerate has no scene-close path, but worth tidying.
+
+**Fix:** move the event-detection block in `regenerate.py` to mirror `post_turn`'s position (between interjection regenerate and the function's tail). Cosmetic — no behavior change.
+
+**Test:** verify all existing regenerate tests still pass after the move.
+
+**Commit:** `refactor: regenerate event-detection ordering mirrors post_turn (T83.5)`.
+
+#### Verification gates for T83
+
+- 5 internal commits visible.
+- All 6 existing regenerate tests still pass.
+- All 10+ existing turn_flow tests still pass.
+- 5+ new tests pass.
+- Full suite green.
+- `git diff phase-3.5 --stat`: `chat/services/regenerate.py`, `chat/services/turn_common.py` (if extracted), `chat/web/turns.py` (only if helper-call sites updated), `tests/test_regenerate.py`, `tests/test_turn_common.py` (if new).
+
+---
+
+## Wave 6 — Final polish (parallel, 3 tasks)
+
+### Task 84: Unified record-memory API
+
+**Files:**
+- Modify: `chat/services/memory_write.py`
+- Modify: `tests/test_memory_write.py` (add tests)
+- Modify: `chat/web/meanwhile.py` (call site update — minimal)
+
+**Spec:** Per T64 review. `record_meanwhile_memory` and `record_turn_memory_for_present` share private `_write_one_memory` but expose two separate public APIs. Unify:
+
+```python
+def record_turn_memory(
+    conn,
+    *,
+    chat_id: str,
+    host_bot_id: str,
+    guest_bot_id: str | None,
+    narrative_text: str,
+    scene_id: int | None = None,
+    chat_clock_at: str | None = None,
+    source: str = "direct",
+    significance: int = 1,
+    you_present: bool = True,   # NEW: False for meanwhile turns
+) -> dict[str, tuple[int, int | None]]:
+    """Single entry-point for memory writes. When you_present is True,
+    witnesses are [you=1, host=1, guest if present]. When False (meanwhile),
+    witnesses are [you=0, host=1, guest=1] and host_bot_id + guest_bot_id
+    are both required."""
+```
+
+`record_meanwhile_memory` becomes a thin wrapper (kept for backward compat) that calls `record_turn_memory(..., you_present=False)`. `record_turn_memory_for_present` is renamed/aliased to `record_turn_memory` for the same reason.
+
+Update `chat/web/meanwhile.py` to call the unified function with `you_present=False`. Verify the existing meanwhile turn tests still pass.
+
+**Tests added:** 2 new tests in `tests/test_memory_write.py`:
+- `test_record_turn_memory_you_present_false_writes_meanwhile_witness_mask` — assert witness `[0, 1, 1]`.
+- `test_record_turn_memory_you_present_true_default_writes_normal_witness_mask` — assert `[1, 1, 0|1]`.
+
+**Commit:** `refactor: unified record_turn_memory API with you_present kwarg (T84)`.
+
+---
+
+### Task 85: JSON-build audit + meanwhile stop-button route-level test
+
+**Files:**
+- Audit: read all `chat/state/*.py` for f-string JSON construction. NO PRODUCTION CHANGES unless an issue is found.
+- Modify (only if issue found): the affected state module.
+- Modify: `tests/test_meanwhile_turn_flow.py` (add stop-button route-level test).
+
+**Spec:** Two unrelated minor follow-ups bundled by being small.
+
+#### 85.1 — JSON-build audit (T63)
+
+T63 originally used f-string interpolation for `participants_json` (fixed during review). Audit other state modules for the same pattern. Grep:
+
+```bash
+grep -rn 'f["\']\[' chat/state/ chat/services/ chat/eventlog/
+```
+
+For each f-string that constructs a JSON string from user-controllable data, replace with `json.dumps(...)`. If NONE found (likely — most code already uses `json.dumps`), add a one-line note in the commit body confirming the audit.
+
+If issues are found, fix them and add tests asserting JSON validity for inputs containing quote/backslash characters.
+
+**Commit:** `chore: audit JSON-string construction sites; replace any f-string usages with json.dumps (T85.1)` (or "audit confirms no issues").
+
+#### 85.2 — Meanwhile stop-button route-level test
+
+T64's fix-up registered stream tasks in `_in_flight_tasks`. There's a unit test pinning registration but no test that drives `/turns/cancel` against a meanwhile turn.
+
+**Test added:** `test_meanwhile_turn_can_be_cancelled_via_route` — start a meanwhile turn (POST /turns), capture the in-flight task, immediately POST /turns/cancel, assert the task transitions to cancelled state and the assistant_turn payload has `truncated=True`.
+
+This test may be tricky to write reliably (timing). If the existing `_SnapshotMock` pattern doesn't support mid-stream cancel injection, document the limitation and add a smaller test that just verifies the cancel endpoint works on the chat (asserts no tasks remaining after cancel).
+
+**Commit:** `test: meanwhile turn cancellation via /turns/cancel route (T85.2)`.
+
+---
+
+### Task 86: Frontend `turn_html_replace` SSE handler
+
+**Files:**
+- Modify: `chat/templates/chat.html` (or wherever the chat page's SSE consumer lives) — add a JS event handler for `turn_html_replace`.
+- Optional: `chat/static/app.css` (if styling needs adjustment for replaced turns).
+- Modify: `tests/test_streaming_ux.py` (add 1 test).
+
+**Spec:** Per Phase 2.5 T73.1 (carry-over). Regenerate's backend broadcasts a `turn_html_replace` SSE event but no live tab swaps the prior turn. Wire the JS:
+
+```html
+<!-- In chat.html, near the existing SSE setup: -->
+<script>
+const sse = new EventSource('/chats/{{ chat.id }}/events');
+
+// Existing: turn_html appends new turn HTML.
+sse.addEventListener('turn_html', (ev) => {
+  const turnsContainer = document.getElementById('turns');
+  turnsContainer.insertAdjacentHTML('beforeend', ev.data);
+});
+
+// NEW: turn_html_replace swaps an existing turn's DOM in place.
+sse.addEventListener('turn_html_replace', (ev) => {
+  const data = JSON.parse(ev.data);
+  // data: {html, turn_id, supersedes_id}
+  const oldNode = document.getElementById(`turn-${data.supersedes_id}`);
+  if (oldNode) {
+    const tmpl = document.createElement('template');
+    tmpl.innerHTML = data.html.trim();
+    oldNode.replaceWith(tmpl.content.firstChild);
+  } else {
+    // Fallback: append if the prior turn isn't in the DOM (edge case).
+    document.getElementById('turns').insertAdjacentHTML('beforeend', data.html);
+  }
+});
+</script>
+```
+
+(Adapt the actual template structure — read `chat/templates/chat.html` first to see the existing SSE setup. The `turn-{id}` DOM-id pattern needs to be consistent with how the backend renders turn HTML — verify by checking `chat/web/render.py`.)
+
+**Test added:** Hard to write a true browser-driven test in pytest. The simplest pin: a unit test that asserts the rendered HTML for a regenerate response contains the `turn_html_replace` SSE event AND the event payload contains the expected `supersedes_id`. (Already exists in T73.1 tests — don't duplicate.) Optionally add a Selenium/playwright test if the project has frontend testing infrastructure.
+
+If pytest-only is the available coverage, document the manual smoke step in CLAUDE.md ("multi-tab regenerate" smoke test) and rely on backend pin tests + manual verification.
+
+**Commit:** `feat: frontend turn_html_replace SSE handler (T86)`.
+
+---
+
+## Wave 7 — Docs sweep (single task)
+
+### Task 87: CLAUDE.md backlog burn-down
+
+**Files:**
+- Modify: `CLAUDE.md`
+
+**Spec:** Walk through the Phase 2.6/3 backlog and Phase 3.5/4 backlog sections. For each item shipped in T76–T86, remove from backlog list. Add a new section "Phase 3.5 status" near the existing "Phase 3 status" listing what shipped. Add a new "Phase 3.6 / 4 backlog" section if any new items were discovered during T76–T86 reviews (likely some — the review cycle always surfaces fresh follow-ups).
+
+If any task during T76–T86 chose to defer a sub-item (e.g., T83.4 chose documentation over rollback impl), keep that sub-item in the new "Phase 3.6+ deferred" section with the rationale.
+
+Mark §13 Phase 3 deliverables in the requirements doc as **shipped** (already done in T67) — verify and don't re-mark.
+
+**Commit:** `docs: phase 3.5 status, prune shipped backlog items (T87)`.
+
+---
+
+## Wrap-up
+
+After Wave 7 lands:
+
+1. **Run full suite** on `phase-3.5`: should be ~330+ tests passing (315 from Phase 3 + ~15-25 new across the wave).
+2. **Manual smoke** (recommended before opening the PR):
+   - Multi-tab regenerate: open two tabs on the same chat; click Regenerate on one; verify the other tab swaps the regenerated turn live (T86).
+   - Trigger a meanwhile scene; close it; resume the main chat; verify the digest renders ONCE on the next you-turn AND is consumed automatically (T82.1).
+   - Type "fade out, skip an hour" — verify both scene close + skip fire in correct order (T82.2).
+   - Plan an event, complete it via a turn, then regenerate that turn — observe the warning log mentioning un-rolled-back lifecycle transitions (T83.4).
+3. **Push `phase-3.5`** to gitea.
+4. **Open PR** `phase-3.5 → main`.
+5. **Phase 3.6+ residuals** (track in CLAUDE.md): genuine lifecycle-rollback impl, structured fixture builder for canned-queue tests, scene-close-on-cancel revisit if play-testing surfaces a regression.
+
+---
+
+## Notes for the controller running this plan
+
+- **Don't dispatch Wave 5 until Wave 4 is merged AND green.** T82 (turns.py) + T83 (regenerate.py + optionally turns.py for shared-helper extraction) both touch `turns.py`. Sequential ordering prevents merge conflict.
+- **After each parallel wave**, run a code-review subagent. Combined spec+quality review is acceptable for trivial tasks (T76, T77, T78, T79). Separate spec + quality reviewers for bundled tasks (T80, T82, T83) — each bundles 4-5 sub-fixes.
+- **Token-spend rough estimate**: Phase 3.5 should be ~50-60% the size of Phase 3 (smaller scope, all reuse, no new schema). Per-task spend similar to Phase 2.5's bundled tasks.
+- **DO NOT break existing v1/v2/v3 surface contracts.** Every test file that was green at the start of Phase 3.5 must stay green at the end. The cross-feature integration tests (`tests/test_phase3_integration.py`) are particularly load-bearing — if any of T80/T82/T83 break them, that's a regression to investigate, NOT to suppress.

docs/plans/2026-04-26-v3.5-phase3.5-cleanup.md.tasks.json

@@ -0,0 +1,19 @@
+{
+  "planPath": "docs/plans/2026-04-26-v3.5-phase3.5-cleanup.md",
+  "tasks": [
+    {"id": 76, "subject": "T76: narrate_skip timeout_s plumbed through", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 77, "subject": "T77: AddresseeDecision.confidence as Literal", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 78, "subject": "T78: search_memories docstring SQL-bias note", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 79, "subject": "T79: _witness_role_for defensive None handling", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 80, "subject": "T80: scene_summarize.py polish bundle (re-close suffix + transcript scoping + log + clock + tests)", "status": "pending", "wave": 2, "parallelGroup": null},
+    {"id": 81, "subject": "T81: ChatNotFoundError replaces string-prefix sniff in skip routes", "status": "pending", "wave": 3, "parallelGroup": null},
+    {"id": 82, "subject": "T82: post_turn wiring (consume_pending_meanwhile_digests + skip command scene close)", "status": "pending", "wave": 4, "parallelGroup": null},
+    {"id": 83, "subject": "T83: regenerate.py polish (cancel hook + DRY + sibling query + lifecycle rollback note + ordering)", "status": "pending", "wave": 5, "parallelGroup": null, "blockedBy": [82]},
+    {"id": 84, "subject": "T84: unified record_turn_memory API with you_present kwarg", "status": "pending", "wave": 6, "parallelGroup": "wave-6", "blockedBy": [83]},
+    {"id": 85, "subject": "T85: JSON-build audit + meanwhile stop-button route-level test", "status": "pending", "wave": 6, "parallelGroup": "wave-6", "blockedBy": [83]},
+    {"id": 86, "subject": "T86: frontend turn_html_replace SSE handler", "status": "pending", "wave": 6, "parallelGroup": "wave-6", "blockedBy": [83]},
+    {"id": 87, "subject": "T87: docs sweep — prune CLAUDE.md backlogs, capture residuals", "status": "pending", "wave": 7, "parallelGroup": null, "blockedBy": [84, 85, 86]}
+  ],
+  "lastUpdated": "2026-04-26T00:00:00Z",
+  "notes": "12 tasks across 7 waves consolidating 17 backlog items (7 from Phase 2.6/3, 10 from Phase 3.5/4). Wave 1 (4-way parallel) and Wave 6 (3-way parallel) are file-disjoint. Waves 2, 3, 4, 5, 7 are single-task by hot-file constraint. Bundled tasks (T80, T82, T83) split into per-item sub-commits for clean review bisection. No schema migrations — schema baseline stays at version 11. Uses task ids T76-T87 to avoid id collision with prior phases (Phase 1: T0-T35, Phase 2: T36-T48, Phase 3: T49-T67, Phase 2.5: T68-T75)."
+}

docs/plans/2026-04-27-v4-phase4-implementation.md

@@ -0,0 +1,832 @@
+# Roleplay Engine — Phase 4 Implementation Plan
+
+> **For Claude:** REQUIRED SUB-SKILL: Use `superpowers-extended-cc:executing-plans` to implement this plan task-by-task. Use the parallel-dispatch pattern documented under "Parallel-Execution Strategy" for parallel waves.
+
+**Goal:** Land Phase 4 polish per requirements doc §13 + §14: vector retrieval, branching UI, drawer-edit on every field, backup tooling, significance review UI, surgical delete with cascade preview, hide-from-view soft delete, plus cross-chat search and the small Phase 3.6 carry-over fixes.
+
+**Architecture:** Builds on Phase 3.5's stable base. Two new tables (`embeddings`, `branches`) and one external dependency (sqlite-vec extension). Embedding generation runs as a deferred async job — NOT inline with turns — so the play loop stays fast even when the embedding endpoint is slow. Branching is data-model-only at first (events + selectors); UI grafts on top. Surgical delete + cascade preview reuses the existing rewind-and-supersede plumbing. Cross-chat search piggybacks on the existing FTS5 + (now) vector retrieval.
+
+**Tech Stack:**
+
+- **NEW dependency: `sqlite-vec`** (or `sqlite-vss` — Phase 4 picks; recommended `sqlite-vec` for simpler load semantics and active maintenance). Add to `pyproject.toml`.
+- **Embedding model selection** is part of T91 spec. Recommended default: a small model on Featherless (e.g., `BAAI/bge-small-en-v1.5` if available) or a local CPU-friendly model via `sentence-transformers`. Document choice in CLAUDE.md.
+- Same as Phase 3 otherwise (Python 3.11+, FastAPI, HTMX, SQLite).
+
+**Source-of-truth references:**
+
+- Phase 4 scope: requirements doc §13 "Phase 4 — polish" + §14 "Open / Deferred Decisions".
+- Behavioral details: §6 (prompt assembly + retrieval), §10 (rewind / regenerate / reset), §11 (compression + significance), §12 (snapshots).
+- Conventions: [`CLAUDE.md`](../../CLAUDE.md) §"Behavioral defaults" + §"Phase 3 status" + §"Phase 3.5 status".
+- Phase 3.5 cleanup plan (style, file-bundling pattern): [2026-04-26-v3.5-phase3.5-cleanup.md](2026-04-26-v3.5-phase3.5-cleanup.md).
+
+---
+
+## Pre-flight
+
+**Branch:** create `phase-4` from the latest `main` after Phase 3.5 has merged (it has — main is at `1b66a28`):
+
+```bash
+git checkout main && git pull && git checkout -b phase-4
+```
+
+**Schema baseline:** Phase 3.5 leaves the DB at version 11. Phase 4 adds two migrations: `0012_embeddings.sql` and `0013_branches.sql`. Final schema version: 13.
+
+**External dependency setup (BEFORE T88 dispatch):**
+
+The controlling agent should add `sqlite-vec` to `pyproject.toml` and run `pip install -e .` (or equivalent) so all worktrees pick up the new dependency. Confirm `sqlite_vec` imports cleanly:
+
+```bash
+python -c "import sqlite_vec; print(sqlite_vec.__version__)"
+```
+
+If `sqlite_vec` isn't on PyPI when this plan executes, fall back to `sqlite-vss` and adapt T88/T92 accordingly. Both expose vector-search SQL via a loadable extension.
+
+**Pinned non-negotiables (carried forward):**
+
+- State changes go through the event log. Use `append_and_apply(conn, kind, payload)` for the live path; `apply_event` only after a fresh `append_event` returning the new id.
+- Witness filter every memory read at SQL level (hard `WHERE` constraint; never a soft signal).
+- Per-POV scene summaries — never write omniscient narration.
+- TDD: every task starts with a failing test (or a regression test pinning existing contract before refactor).
+- One commit per task minimum. Tasks that bundle multiple sub-features SHOULD split commits internally.
+
+**Verification before claiming done:** Use `superpowers-extended-cc:verification-before-completion` — run the test command, paste actual output. Don't assume green.
+
+---
+
+## Phase 3.6 carry-overs folded in
+
+Three small items from Phase 3.6 backlog are bundled into Phase 4's Wave 1 trivial-fixes task (T90):
+
+1. `read_recent_dialogue` chat-id pushdown into SQL (T80 review nit)
+2. Lifecycle warning wording in regenerate (T83.4 — "at-or-after turn X" tightening)
+3. Legacy single-bot `record_turn_memory` consolidation (T84 review nit)
+
+Three items remain DEFERRED beyond Phase 4 (Phase 4.5 if needed):
+
+- Scene-close-on-cancel UX revisit (no action unless real play surfaces a regression).
+- Cross-feature canned-queue brittleness (structured fixture builder for tests — not blocking).
+- Full lifecycle-rollback in regenerate (warning log already shipped in T83.4; proper rollback needs schema-level back-references, deferred indefinitely).
+
+---
+
+## Parallel-Execution Strategy
+
+Same pattern as Phase 3.5. Eight waves: parallel within each wave (file-disjoint), serial across waves.
+
+### How to dispatch a wave in parallel
+
+Use the **Agent tool with `isolation: "worktree"`** so each subagent gets its own git worktree. (If the controlling session's working directory is **not** the chat repo, create worktrees manually with `git worktree add .worktrees/<wave>-<task> -b <wave>/<task> phase-4` from inside the chat repo.)
+
+Dispatch all tasks in a wave in a single message:
+
+```
+Agent({ description: "Wave 1 — T88 embeddings table", prompt: "...", isolation: "worktree" })
+Agent({ description: "Wave 1 — T89 branches table", ... })
+Agent({ description: "Wave 1 — T90 phase 3.6 carry-overs", ... })
+```
+
+### After a wave completes
+
+1. Each subagent returns its worktree path and commit SHA(s).
+2. **Run a spec + code-quality reviewer subagent on each completed task.** Combined review acceptable for trivial tasks (T90 carry-overs); separate spec + quality reviewers for vector-retrieval tasks (T91, T92, T96, T97) since the integration surface is wider.
+3. **Merge the wave into `phase-4`** in any order (file-disjointness guarantees no conflict). Use `--no-ff`.
+4. **Run the full test suite** on the merged `phase-4`. If red, the wave's mutual-independence assumption was violated — bisect, fix, re-merge.
+5. **Push `phase-4`** to gitea.
+6. Optionally clean up worktrees.
+
+### Conflict prevention checklist
+
+For each parallel wave, verify the **Files** sections of all tasks have **no overlapping paths**. Hot files in this plan: `chat/web/drawer.py` + `chat/templates/_drawer.html` (T98 only — bundled), `chat/state/memory.py` (T96 only), `chat/services/memory_write.py` (T90 + T97 — sequential), `chat/web/turns.py` (T98 only via delete affordance — sequential after T96).
+
+### Why each wave is parallel-safe
+
+| Wave | Tasks | Hot files touched | Disjoint? |
+|------|-------|-------------------|-----------|
+| 1 | T88, T89, T90 | new migrations + new state modules; T90 touches `turn_common.py` + `regenerate.py` + `memory_write.py` (additive only) | ✅ |
+| 2 | T91, T92, T93 | new service modules (embeddings, vector_search, cross_chat_search) | ✅ |
+| 3 | T94, T95 | new service modules (branching, delete_impact) | ✅ |
+| 4 | T96 | `chat/state/memory.py` (combined retrieval ranking) | (single task) |
+| 5 | T97 | `chat/services/memory_write.py` + new backfill script | (single task) |
+| 6 | T98 | `chat/web/drawer.py` + `chat/templates/_drawer.html` (drawer Phase 4 bundle) | (single task) |
+| 7 | T99, T100 | new files: `chat/web/snapshots.py` + `chat/templates/snapshots.html` (T99); `chat/web/search.py` + `chat/templates/search.html` + small chat.html top-bar addition (T100) | ✅ (disjoint) |
+| 8 | T101, T102 | new test file (T101); CLAUDE.md + design doc (T102) | ✅ |
+
+---
+
+## Task overview
+
+```
+Wave 1 ─┬─ T88: embeddings table + projector handlers
+        ├─ T89: branches table + projector handlers
+        └─ T90: Phase 3.6 carry-overs trio (chat-id SQL pushdown + lifecycle wording + legacy-fn consolidation)
+
+Wave 2 ─┬─ T91: embedding generation service (Featherless or local)
+        ├─ T92: vector search service via sqlite-vec
+        └─ T93: cross-chat search service (FTS over all owners)
+
+Wave 3 ─┬─ T94: branch_from_event service (event-log fork, branch metadata)
+        └─ T95: delete-impact computation service (cascade preview)
+
+Wave 4 ─── T96: combined FTS + vector retrieval ranking in search_memories
+
+Wave 5 ─── T97: memory_write enqueues embedding job + backfill script for existing memories
+
+Wave 6 ─── T98: drawer Phase 4 bundle — branching UI + significance review + hide-from-view + surgical delete + remaining v1 edits
+
+Wave 7 ─┬─ T99: snapshot UX (manual trigger, retention display, restore-from-snapshot UI)
+        └─ T100: cross-chat search UX (top-bar input + search results page)
+
+Wave 8 ─┬─ T101: cross-feature integration tests (vector × branching × delete × snapshot × search)
+        └─ T102: Phase 4 documentation update
+```
+
+Critical path: 8 sequential merge points. Total tasks: 15. Parallelism: Waves 1, 2, 3, 7, 8 dispatch concurrently (3-way and 2-way). Waves 4, 5, 6 are single-task by hot-file constraint.
+
+---
+
+## Wave 1 — Schema foundation + Phase 3.6 carry-overs (parallel)
+
+### Task 88: Embeddings table + projector handlers
+
+**Files:**
+
+- Create: `chat/db/migrations/0012_embeddings.sql`
+- Create: `chat/state/embeddings.py`
+- Create: `tests/test_embeddings_state.py`
+- Modify: `pyproject.toml` (add `sqlite-vec` dependency — controlling agent should pre-install before dispatch; the worktree commits the dependency declaration)
+
+**Spec:**
+
+Adds the `embeddings` table that stores per-memory embedding vectors for vector retrieval. Uses `sqlite-vec` virtual-table syntax for cosine-similarity search. Schema:
+
+```sql
+-- Load sqlite-vec extension at connection time (handled in chat/db/connection.py).
+-- Embeddings are stored as blobs in a vec0 virtual table for fast similarity search.
+
+CREATE VIRTUAL TABLE embeddings USING vec0(
+    memory_id INTEGER PRIMARY KEY,
+    embedding FLOAT[384]   -- 384-dim default; adjust per chosen model
+);
+
+-- Sidecar table for non-vector metadata (model used, dim, indexed_at).
+CREATE TABLE embeddings_meta (
+    memory_id INTEGER PRIMARY KEY,
+    model TEXT NOT NULL,
+    dim INTEGER NOT NULL,
+    indexed_at TEXT NOT NULL DEFAULT (datetime('now')),
+    FOREIGN KEY (memory_id) REFERENCES memories(id)
+);
+```
+
+(If `sqlite-vss` is chosen instead, replace `vec0` with `vss0` and adapt the dim declaration. Both have similar Python loading semantics.)
+
+**`chat/state/embeddings.py`:**
+
+- `@on("embedding_indexed")` payload `{memory_id, model, dim, vector: list[float]}`. Inserts into both `embeddings` and `embeddings_meta`. Idempotent via `INSERT OR REPLACE` (re-indexing a memory replaces the prior vector).
+- `@on("embedding_deindexed")` payload `{memory_id}`. Deletes from both tables. Used when a memory is purged via reset/cascade.
+- Reader `get_embedding_meta(conn, memory_id) -> dict | None` returns the meta row.
+
+The `chat/db/connection.py` `open_db` helper needs to load the sqlite-vec extension on each connection. Add:
+
+```python
+import sqlite_vec
+# Inside open_db, after connection is opened:
+conn.enable_load_extension(True)
+sqlite_vec.load(conn)
+conn.enable_load_extension(False)
+```
+
+This is a small modification to `connection.py`. Include it in T88's diff.
+
+**Tests:** 3 minimum.
+
+1. `test_embedding_indexed_inserts_row`: append `bot_authored`, `chat_created`, `memory_written` (creates a memory), then `embedding_indexed` with `vector=[0.1] * 384`. Project. Assert `embeddings_meta` row exists for that memory_id with the right model.
+2. `test_embedding_deindexed_removes_row`: same setup; index then de-index; assert row is gone.
+3. `test_vector_similarity_search_returns_nearest`: index two memories with distinct vectors; query for nearest neighbor of one vector; assert correct memory_id returned. Uses `sqlite-vec`'s `MATCH '...'` syntax (verify against actual sqlite-vec docs; adapt if needed).
+
+If running tests requires sqlite-vec to be loaded, the test fixture may need to skip / xfail when the extension isn't installed. Use `pytest.importorskip("sqlite_vec")` at the top of the test file.
+
+**Commit:** `feat: embeddings table + projector handlers via sqlite-vec (T88)`.
+
+**Notes:**
+
+- Schema version after migration alone: 12. T89 adds 0013, taking final to 13. The schema_version assertion in `tests/test_world.py` updates to 13 in the wave-merge step.
+- The `connection.py` change is small but cross-cutting — affects every `open_db` call. Verify the existing 343 tests still pass after the change.
+
+---
+
+### Task 89: Branches table + projector handlers
+
+**Files:**
+
+- Create: `chat/db/migrations/0013_branches.sql`
+- Create: `chat/state/branches.py`
+- Create: `tests/test_branches_state.py`
+
+**Spec:**
+
+Adds the `branches` table that records named alternate event-log forks. A branch is metadata: a name, an `origin_event_id` (the event we forked from), and a `head_event_id` (the latest event in this branch). The event log itself is unchanged — the branch table just **labels** linear ranges of event ids.
+
+```sql
+CREATE TABLE branches (
+    id INTEGER PRIMARY KEY,
+    name TEXT NOT NULL UNIQUE,
+    origin_event_id INTEGER NOT NULL,
+    head_event_id INTEGER NOT NULL,
+    chat_id TEXT,
+    created_at TEXT NOT NULL DEFAULT (datetime('now')),
+    is_active INTEGER NOT NULL DEFAULT 0
+);
+
+-- Exactly one row may have is_active = 1 at any time.
+CREATE UNIQUE INDEX branches_active_idx ON branches(is_active) WHERE is_active = 1;
+```
+
+The "main" branch is implicit and bootstrapped by the migration: `INSERT INTO branches (name, origin_event_id, head_event_id, is_active) VALUES ('main', 0, 0, 1);`. Subsequent branches reference an `origin_event_id` (the event that the branch forked from).
+
+`chat/state/branches.py`:
+
+- `@on("branch_created")` payload `{name, origin_event_id, chat_id?, head_event_id}`. Inserts a new row with `is_active=0`. Idempotent re-insertion via `INSERT OR IGNORE`.
+- `@on("branch_switched")` payload `{name}`. Sets `is_active=1` on the named branch and `is_active=0` on all others. Atomic via a single UPDATE.
+- `@on("branch_head_updated")` payload `{name, head_event_id}`. Updates `head_event_id` on the named branch. Used by the orchestrator when new events extend the branch.
+- Readers: `get_branch(conn, name)`, `list_branches(conn, chat_id=None)`, `active_branch(conn)`.
+
+**Tests:** 3 minimum.
+
+1. `test_branch_created_inserts_row`: append `branch_created` with name="experiment", origin_event_id=42; project; assert `get_branch(conn, "experiment")` returns the row.
+2. `test_branch_switched_atomic`: seed two branches; switch from one to the other; assert exactly one is active.
+3. `test_main_branch_bootstrapped_by_migration`: open a fresh DB, apply migrations; assert `active_branch(conn)["name"] == "main"`.
+
+**Commit:** `feat: branches table + projector handlers (T89)`.
+
+**Notes:**
+
+- Schema version after this migration alone: 13. Combined with T88: 13 (since T88 was 12, T89 stacks). Wave-merge bumps `tests/test_world.py` schema_version assertion to 13.
+- This task does NOT yet teach the orchestrator to consult `is_active` — the existing event_log queries assume a single timeline. T98 (drawer branching UI) will enable user-driven switches, but the actual "follow only the active branch" filter on event reads is a follow-up (Phase 4.5 nit; document in T102 docs sweep).
+
+---
+
+### Task 90: Phase 3.6 carry-overs trio
+
+**Files:**
+
+- Modify: `chat/services/turn_common.py` (push chat_id filter into SQL)
+- Modify: `chat/services/regenerate.py` (lifecycle warning wording tightening)
+- Modify: `chat/services/memory_write.py` (consolidate legacy `record_turn_memory` into the unified API or delete it)
+- Modify: `tests/test_turn_common.py`, `tests/test_regenerate.py`, `tests/test_memory_write.py`
+
+**Spec:** Three small Phase 3.6 carry-over fixes bundled because each is 1-line + 1-test.
+
+#### 90.1 — `read_recent_dialogue` chat-id SQL pushdown
+
+Per T80 review nit. Currently `read_recent_dialogue` filters chat_id post-fetch in Python. Push into SQL for tighter LIMIT semantics:
+
+```sql
+SELECT id, kind, payload_json
+FROM event_log
+WHERE kind IN ('user_turn', 'user_turn_edit', 'assistant_turn')
+  AND superseded_by IS NULL
+  AND hidden = 0
+  AND json_extract(payload_json, '$.chat_id') = ?
+ORDER BY id DESC
+LIMIT ?
+```
+
+Then the post-fetch loop becomes a simple reverse + slice — no chat_id check needed.
+
+**Test added:** `test_read_recent_dialogue_limit_respects_chat_scope` — seed two chats with 60 turns each; query chat_a with `limit=50`; assert returned rows are exactly 50 chat_a rows (not 50 cross-chat rows that filter down to <50 after Python).
+
+**Commit:** `perf: read_recent_dialogue pushes chat-id filter into SQL (T90.1)`.
+
+#### 90.2 — Lifecycle warning wording tightening
+
+Per T83.4 review nit. Current warning lists "lifecycle transitions from superseded turn are NOT being rolled back". When user regenerates an OLDER turn (T29 supports this), the warning lists intervening-turn transitions that legitimately stand. Tighten wording to "lifecycle transitions at-or-after turn X" so operators reading logs aren't misled.
+
+Change is one log message string. Test asserts the new wording appears.
+
+**Commit:** `chore: clarify regenerate lifecycle warning wording (T90.2)`.
+
+#### 90.3 — Legacy `record_turn_memory` consolidation
+
+Per T84 review nit. The original Phase 1 single-bot `record_turn_memory` function still exists alongside the unified `record_turn_memory_for_present`. Either:
+
+- (a) Remove the legacy function entirely; update any remaining callers to use the unified API.
+- (b) Convert it to a thin wrapper for backward compat.
+
+Pick (a) if there are zero remaining callers; (b) if any callers exist. Read the codebase to confirm. The mock-data seed scripts may still use the legacy fn.
+
+**Commit:** `refactor: consolidate legacy record_turn_memory into unified API (T90.3)`.
+
+**TDD process for T90:**
+
+1. Read all 3 affected files + their tests.
+2. Implement 90.1 with test; commit.
+3. Implement 90.2 with test; commit.
+4. Implement 90.3 with test; commit.
+5. Run full suite — should be 343 + 3 = 346 (or +2 if 90.3 had no behavioral change).
+
+---
+
+## Wave 2 — Embedding & search services (parallel)
+
+Three new service modules. Fully file-disjoint.
+
+### Task 91: Embedding generation service
+
+**Files:**
+
+- Create: `chat/services/embeddings.py`
+- Create: `tests/test_embeddings.py`
+
+**Spec:** Wraps the embedding API call. Signature:
+
+```python
+class EmbeddingResult(BaseModel):
+    vector: list[float]
+    model: str
+    dim: int
+
+async def generate_embedding(
+    client: LLMClient,    # or a separate embedding-specific client
+    *,
+    text: str,
+    model: str,
+    timeout_s: float = 30.0,
+) -> EmbeddingResult:
+    """Generate an embedding vector for the given text. Falls back to a
+    zero-vector with model='fallback' on failure (so callers get a deterministic
+    sentinel they can detect and skip indexing)."""
+```
+
+**Implementation:** call the embedding endpoint (Featherless OpenAI-compatible `/v1/embeddings`, or a local `sentence-transformers` model). Add a new method `client.embed(text, model)` to `LLMClient` Protocol (and to `MockLLMClient` and `FeatherlessClient`).
+
+**Embedding model choice:**
+
+Default to a small CPU-friendly model accessible through the existing Featherless setup:
+
+- If Featherless has `BAAI/bge-small-en-v1.5` or similar 384-dim model: use that.
+- If not: fall back to local `sentence-transformers/all-MiniLM-L6-v2` (384-dim, runs CPU). Add `sentence-transformers` to `pyproject.toml`.
+- Document choice in CLAUDE.md (T102 docs sweep).
+
+The 384 dim is hardcoded in T88's migration. If a different model with different dim is chosen, update T88's schema accordingly BEFORE T88 dispatches.
+
+**Tests:** 3 minimum.
+
+1. `test_generate_embedding_returns_vector_of_correct_dim`: mock embedding response with a 384-element vector; assert returned `vector` length is 384.
+2. `test_generate_embedding_returns_correct_model_metadata`: assert `result.model` matches the input.
+3. `test_generate_embedding_falls_back_on_failure`: mock the client to raise; assert the result is a 384-element zero vector with `model="fallback"`.
+
+**Commit:** `feat: embedding generation service (T91)`.
+
+---
+
+### Task 92: Vector search service via sqlite-vec
+
+**Files:**
+
+- Create: `chat/services/vector_search.py`
+- Create: `tests/test_vector_search.py`
+
+**Spec:** Wraps sqlite-vec's `MATCH` syntax for cosine-similarity search over the `embeddings` virtual table. Witness-filter aware (joins through `memories` table for the witness check).
+
+```python
+def vector_search(
+    conn,
+    *,
+    owner_id: str,
+    witness_role: str,    # "you" | "host" | "guest"
+    query_vector: list[float],
+    k: int = 4,
+) -> list[dict]:
+    """Return top-K memories by cosine similarity to query_vector,
+    witness-filtered for the requesting bot's POV. Returns same row
+    shape as state.memory.search_memories for combined-ranking
+    compatibility."""
+```
+
+SQL pattern (sqlite-vec):
+
+```sql
+SELECT m.id, m.text, m.pov_summary, m.significance, e.distance
+FROM embeddings e
+JOIN memories m ON m.id = e.memory_id
+WHERE e.embedding MATCH ?
+  AND k = ?
+  AND m.owner_id = ?
+  AND m.witness_<role> = 1
+ORDER BY e.distance ASC
+LIMIT ?
+```
+
+(Adapt to actual sqlite-vec syntax — use `vec0` MATCH semantics. The `witness_<role>` interpolation needs the same allowlist guard pattern as Phase 2.5 T72.3.)
+
+**Tests:** 3 minimum.
+
+1. `test_vector_search_returns_nearest_neighbors`: index 5 memories with synthetic vectors; query for nearest 3; assert correct order.
+2. `test_vector_search_respects_witness_filter`: index a memory with witness `[1, 1, 0]`; query with `witness_role="guest"`; assert empty result.
+3. `test_vector_search_respects_owner_filter`: index memories for two owners; assert query for owner_a doesn't return owner_b's memories.
+
+**Commit:** `feat: vector search service via sqlite-vec (T92)`.
+
+---
+
+### Task 93: Cross-chat search service
+
+**Files:**
+
+- Create: `chat/services/cross_chat_search.py`
+- Create: `tests/test_cross_chat_search.py`
+
+**Spec:** FTS5-based search across ALL chats and all owners (admin-style search; no witness filter). For "where did I last see this person mention X?" queries.
+
+```python
+def search_all_memories(
+    conn,
+    *,
+    query: str,
+    k: int = 20,
+) -> list[dict]:
+    """Search FTS across all owners and chats. Returns rows with
+    {memory_id, owner_id, chat_id, text, pov_summary, scene_id,
+    significance, ts}. Sorted by FTS rank."""
+```
+
+This is intentionally NOT witness-filtered — it's a power-user search surface. The UI (T100) prompts the user to acknowledge they're seeing memories across POVs.
+
+**Tests:** 3 minimum.
+
+1. `test_search_all_memories_returns_matches_across_owners`: seed 2 owners with overlapping keyword; search; assert both owner's matches appear.
+2. `test_search_all_memories_orders_by_fts_rank`: seed memories with varying FTS-match strength; assert order.
+3. `test_search_all_memories_respects_k_limit`.
+
+**Commit:** `feat: cross-chat search service (FTS5 over all owners) (T93)`.
+
+---
+
+## Wave 3 — Branching + delete services (parallel)
+
+Two new service modules. Fully file-disjoint.
+
+### Task 94: branch_from_event service
+
+**Files:**
+
+- Create: `chat/services/branching.py`
+- Create: `tests/test_branching.py`
+
+**Spec:**
+
+```python
+def branch_from_event(
+    conn,
+    *,
+    name: str,
+    origin_event_id: int,
+    chat_id: str | None = None,
+) -> int:
+    """Create a new named branch forking from origin_event_id.
+    Emits a branch_created event. Returns the new branch's row id.
+    Raises ValueError if name already exists."""
+
+def switch_active_branch(conn, *, name: str) -> None:
+    """Make the named branch active. Emits branch_switched. Subsequent
+    event reads should consult is_active to filter."""
+
+def list_branches_with_metadata(conn, chat_id: str | None = None) -> list[dict]:
+    """List branches with: name, origin_event_id, head_event_id, is_active,
+    event_count (number of events between origin and head, inclusive),
+    created_at."""
+```
+
+Tests cover: basic create, duplicate-name raises, switch updates `is_active` exclusively, list returns metadata.
+
+**Commit:** `feat: branching service (T94)`.
+
+---
+
+### Task 95: Delete-impact computation service
+
+**Files:**
+
+- Create: `chat/services/delete_impact.py`
+- Create: `tests/test_delete_impact.py`
+
+**Spec:** Computes the cascade impact of deleting a single event_log row (or a turn group: user_turn + assistant_turn + interjection if any). Returns a structured `ImpactReport` for the UI to render.
+
+```python
+class DeletedItem(BaseModel):
+    kind: str           # "memory" | "edge_update" | "scene_close" | etc.
+    description: str    # human-readable
+    target_id: int | str | None
+
+class ImpactReport(BaseModel):
+    target_event_id: int
+    cascading: list[DeletedItem]
+    notes: list[str]    # warnings, e.g. "this turn opened scene_X which has 3 subsequent turns"
+
+def compute_delete_impact(conn, *, target_event_id: int) -> ImpactReport:
+    """Walk the event log forward from target_event_id and identify
+    everything that depends on this event: child memory_written events,
+    edge_update events with this turn as source, scene_closed events
+    triggered by this turn, etc. Also identify subsequent turns that
+    REFERENCE this event (regenerated_from chains, etc.).
+    
+    Does NOT mutate the database. Pure computation for preview."""
+```
+
+The actual delete (truncate + supersede) is the existing rewind path from Phase 1 T31. T95 just builds the preview.
+
+**Tests:** 4 minimum.
+
+1. `test_impact_for_simple_turn_lists_memory_and_edges`: seed a chat with a turn that wrote 1 memory + 2 edge_updates. Compute impact. Assert the 3 items appear in `cascading`.
+2. `test_impact_for_scene_opening_turn_warns_about_subsequent_turns`: seed a turn that opened a scene + 5 subsequent turns. Assert `notes` mentions the dependency.
+3. `test_impact_for_regenerated_turn_lists_supersede_chain`: seed a turn that's been regenerated (has `superseded_by`). Compute impact for the original. Assert the chain appears.
+4. `test_impact_does_not_mutate_database`: snapshot event_log before + after; assert byte-identical.
+
+**Commit:** `feat: delete-impact computation service (T95)`.
+
+---
+
+## Wave 4 — Combined retrieval ranking (single)
+
+### Task 96: Combined FTS + vector retrieval ranking
+
+**Files:**
+
+- Modify: `chat/state/memory.py` — extend `search_memories` to optionally include vector hits
+- Modify: `tests/test_memory_search.py` — add 4 tests
+
+**Spec:**
+
+`search_memories` currently does FTS5 + Python-side significance/recency re-rank. Phase 4 adds:
+
+- An optional `query_vector: list[float] | None = None` kwarg.
+- When `query_vector` is provided, run `vector_search` (T92) for top-K-vector candidates.
+- Merge with FTS top-K candidates via reciprocal-rank fusion (RRF) or a simpler sum-of-ranks scheme — implementer's choice. Document the merge formula.
+- Final result is top-K from the fused set, with the existing significance + recency boosts applied as a final pass.
+
+When `query_vector` is None: existing behavior unchanged. Phase 1/2/3 callers that don't pass `query_vector` see no change.
+
+**Implementation note:** the embedding for the query (the speaker's recent context) must be generated by the caller (Wave 5 T97 wires the prompt-assembly pipeline to call `generate_embedding` on the dialogue tail). T96 only handles the search side — assumes the vector is pre-computed.
+
+**Tests:** 4 added.
+
+1. `test_search_memories_without_query_vector_uses_fts_only`: regression — call without `query_vector`; assert the existing FTS+rerank behavior.
+2. `test_search_memories_with_query_vector_includes_vector_hits`: index 5 memories where 1 is FTS-only-matching, 1 is vector-only-matching, 3 are unrelated. Pass both `query=...` and `query_vector=...`. Assert both the FTS hit and the vector hit appear in results.
+3. `test_search_memories_fusion_significance_bias_still_applies`: confirm the existing significance bias rerank still works on top of fused results.
+4. `test_search_memories_fusion_handles_empty_vector_results`: pass a vector for a memory that has no embeddings indexed; assert FTS-only results still come back.
+
+**Commit:** `feat: combined FTS + vector retrieval ranking (T96)`.
+
+---
+
+## Wave 5 — Memory write hook + backfill (single)
+
+### Task 97: Embedding generation hook + backfill script
+
+**Files:**
+
+- Modify: `chat/services/memory_write.py` — after each `memory_written` event, enqueue a background embedding job
+- Create: `chat/services/embedding_worker.py` — async worker that consumes the queue and emits `embedding_indexed` events
+- Create: `scripts/backfill_embeddings.py` — one-time script that walks all existing memories and embeds them
+- Modify: `chat/app.py` — wire the embedding worker into the lifespan startup
+- Modify: `tests/test_memory_write.py` — add 2 tests for the enqueue hook
+- Create: `tests/test_embedding_worker.py` — 3 tests for the worker drain logic
+
+**Spec:**
+
+After each successful `memory_written` event, enqueue an embedding job. The worker dequeues and:
+
+1. Reads the memory text (via `get_memory(conn, memory_id)`).
+2. Calls `generate_embedding(client, text=memory.text, model=settings.embedding_model)`.
+3. Appends `embedding_indexed` event with the result. (Skip if `result.model == "fallback"` — leave the memory un-indexed; will retry later via backfill.)
+
+The worker pattern mirrors Phase 1's `chat/services/significance.py` SignificanceWorker. Reuse its queue + lifecycle pattern.
+
+**Backfill script:**
+
+```bash
+.venv/bin/python scripts/backfill_embeddings.py [--limit N] [--dry-run]
+```
+
+Walks all memories where no `embeddings_meta` row exists. For each, generates an embedding and emits `embedding_indexed`. Useful for the initial migration after Phase 4 lands AND for periodic re-runs if an embedding model changes.
+
+**Tests:**
+
+`tests/test_memory_write.py`:
+1. `test_record_turn_memory_enqueues_embedding_job`: monkeypatch the worker's enqueue method; record_turn_memory_for_present; assert the worker received a job per memory.
+
+`tests/test_embedding_worker.py`:
+1. `test_worker_drains_jobs_and_emits_indexed_events`: enqueue 3 jobs with mock embeddings; run worker; assert 3 `embedding_indexed` events landed.
+2. `test_worker_skips_fallback_results`: mock the embedding service to return a fallback result; assert NO `embedding_indexed` event landed for that job.
+3. `test_worker_handles_concurrent_jobs_serially`: pin the Featherless 2-conn cap behavior (worker calls embed sequentially under the existing semaphore).
+
+**Commit (split):**
+
+- `feat: embedding worker drains queue and emits embedding_indexed events (T97.1)`
+- `feat: memory_write enqueues embedding job after each memory_written (T97.2)`
+- `feat: backfill_embeddings script for existing memories (T97.3)`
+
+**Verification gates:**
+
+- All Phase 1/2/3/3.5 memory tests still pass (regression critical).
+- New tests pass.
+- Manual smoke: run `scripts/backfill_embeddings.py --dry-run` against a seeded DB and verify expected count.
+
+---
+
+## Wave 6 — Drawer Phase 4 bundle (single task)
+
+### Task 98: Drawer Phase 4 features
+
+**Files:**
+
+- Modify: `chat/web/drawer.py` (add many new POST routes and GET extensions)
+- Modify: `chat/templates/_drawer.html` (add 5 new sections)
+- Create: `tests/test_drawer_phase4.py`
+
+**Spec:** Drawer affordances for 5 Phase 4 features. Single task by hot-file constraint; split into 5 commits internally.
+
+#### 98.1 — Branching UI
+
+GET drawer extension: `list_branches_with_metadata(conn)` → render in a "Branches" section (active branch highlighted + count of events).
+
+POST routes:
+- `/drawer/branch/create` — form `{name, origin_event_id}` → `branch_from_event` service.
+- `/drawer/branch/switch` — form `{name}` → `switch_active_branch`.
+- `/drawer/branch/from-turn/{event_id}` — convenience: branch from a specific turn (used by per-turn UI affordance).
+
+#### 98.2 — Significance review panel
+
+GET extension: significance distribution per chat (`SELECT significance, COUNT(*) GROUP BY significance`) → render histogram.
+
+POST route:
+- `/drawer/memory/significance/{memory_id}` — form `{new_value}` (already supported via T22 `manual_edit` `target_kind=memory_significance`); just add the UI form.
+
+Bulk re-rate is a Phase 4.5 polish — not in scope here. Just per-memory edit + distribution display.
+
+#### 98.3 — Hide-from-view toggle
+
+POST route:
+- `/drawer/turn/hide/{event_id}` — form `{hidden: bool}` → emits a `manual_edit` with `target_kind="turn_hidden"`.
+
+NEW `manual_edit` projector branch for `turn_hidden`: sets `event_log.hidden = ?` for the target event. Reuses the existing `hidden` column.
+
+UI affordance: per-turn checkbox in the chat surface or drawer (per-turn list with hide toggle).
+
+#### 98.4 — Surgical delete with cascade preview
+
+GET extension:
+- `/drawer/turn/delete-preview/{event_id}` → returns the `ImpactReport` (T95) rendered as a modal.
+
+POST route:
+- `/drawer/turn/delete/{event_id}` — invokes the rewind-and-truncate path (Phase 1 T31's `rewind_to_turn`) restricted to the target turn group.
+
+Important: this reuses the existing pre-rewind snapshot path so the action is undoable.
+
+#### 98.5 — Remaining v1 edits
+
+Audit: are any v1 fields STILL not editable from the drawer? Phase 2.5 T72.1 added edge_trust/edge_summary/memory_pov_summary/edge_knowledge_facts. T72.3 added witness flags. Anything left?
+
+Likely candidates: scene `narrative_anchor`, scene `weather`, container `properties` JSON. Add edit forms for any that surface during the audit. If none, this sub-fix is a no-op.
+
+**Tests:** 8+ in `tests/test_drawer_phase4.py` (one per sub-feature × happy path; plus 1 for the cascade-preview rendering).
+
+**Commits (5):**
+
+- `feat: drawer branching UI (T98.1)`
+- `feat: drawer significance review panel (T98.2)`
+- `feat: drawer hide-from-view toggle + manual_edit turn_hidden branch (T98.3)`
+- `feat: drawer surgical delete with cascade preview (T98.4)`
+- `feat: drawer remaining v1 field edits (T98.5)` (or "no-op audit" if nothing left)
+
+---
+
+## Wave 7 — Snapshot + cross-chat search UX (parallel)
+
+### Task 99: Snapshot UX
+
+**Files:**
+
+- Create: `chat/web/snapshots.py` (new route module)
+- Create: `chat/templates/snapshots.html` (snapshot list page)
+- Modify: `chat/templates/layout.html` (add "Snapshots" nav link)
+- Create: `tests/test_snapshot_ux.py`
+
+**Spec:** Surface the existing snapshot infrastructure (Phase 1 T20 wrote snapshots; Phase 4 makes them visible).
+
+GET `/snapshots` — list all snapshots (periodic + pre-rewind) with metadata: kind, created_at, event_log_size, file_size_bytes.
+
+POST `/snapshots/take` — manually trigger a snapshot now.
+
+POST `/snapshots/restore/{snapshot_id}` — restore from snapshot (with hard confirmation).
+
+GET `/snapshots/{snapshot_id}/preview` — show what's in the snapshot vs. current state.
+
+**Tests:** 4 minimum (list, take, restore, preview).
+
+**Commit:** `feat: snapshot UX (manual trigger, list, restore) (T99)`.
+
+---
+
+### Task 100: Cross-chat search UX
+
+**Files:**
+
+- Create: `chat/web/search.py` (new route module)
+- Create: `chat/templates/search.html` (search results page)
+- Modify: `chat/templates/layout.html` (add top-bar search input)
+- Create: `tests/test_search_ux.py`
+
+**Spec:** Top-bar search box submits to `/search?q=...`. Results page shows up to 50 matches across all chats and all owners (uses T93's `search_all_memories`). Each result shows: chat name, owner bot name, scene context, memory text excerpt with FTS highlight, "Open chat at this turn" link.
+
+**Tests:** 3 minimum.
+1. Search returns results from multiple chats.
+2. Empty query returns empty result set.
+3. Result links navigate to the right chat anchor.
+
+**Commit:** `feat: cross-chat search UX (top-bar input + results page) (T100)`.
+
+---
+
+## Wave 8 — Polish (parallel)
+
+### Task 101: Cross-feature integration tests
+
+**Files:**
+
+- Create: `tests/test_phase4_integration.py`
+
+**Spec:** End-to-end multi-feature flows. 5 tests minimum.
+
+1. **Vector retrieval feedback loop**: write a memory → embedding worker indexes it → search retrieves it via vector path.
+2. **Branch + diverge**: create branch B from turn 10 → switch to B → play 3 new turns → switch back to main → assert main's turn 11+ are still intact.
+3. **Surgical delete**: compute impact for a turn → confirm → assert event log truncated correctly + pre-rewind snapshot saved.
+4. **Hide + retrieval**: hide a turn → assert it doesn't appear in `read_recent_dialogue` (existing `hidden = 0` filter) → unhide → assert it reappears.
+5. **Cross-chat search**: write memories in 3 chats → search for keyword present in all 3 → assert all 3 appear in results.
+
+**Commit:** `test: phase 4 cross-feature integration coverage (T101)`.
+
+---
+
+### Task 102: Phase 4 documentation update
+
+**Files:**
+
+- Modify: `CLAUDE.md` (add "Phase 4 status" section; update behavioral defaults; add "Phase 4.5 / 5 backlog" with carry-overs)
+- Modify: `docs/plans/2026-04-26-v1-requirements-design.md` (annotate §13 Phase 4 as **Status: shipped 2026-04-27**)
+
+**Spec:**
+
+Mirror the Phase 3 / 3.5 status sections. Document:
+
+- **Vector retrieval**: sqlite-vec virtual table, embedding worker async pipeline, combined FTS + vector ranking via RRF.
+- **Branching**: forks the event log; UI in drawer; `is_active` flag plus orchestrator filter (caveat — see backlog if filter not yet wired into all readers).
+- **Drawer-edit on every field**: branching, significance review, hide-from-view, surgical delete with preview, plus any audit findings.
+- **Backup tooling**: snapshots panel surfaces existing infra.
+- **Significance review UI**: distribution + per-memory edit.
+- **Surgical delete + cascade preview**: piggybacks on rewind path; impact report from T95.
+- **Hide-from-view soft delete**: `manual_edit` `turn_hidden` branch.
+- **Cross-chat search**: top-bar + results page over T93's service.
+
+**Phase 4.5 / 5 backlog candidates** (reflect any discovered during execution):
+
+- Branching read-side filter — if T89's `is_active` isn't yet consulted by every event reader, this is the work to do.
+- Bulk significance re-rate (per T98.2 deferral).
+- Snapshot retention policy UI controls (per Phase 1 T19 deferred).
+- Auto-pin override UI (per Phase 2 design).
+- Embedding model swap migration tooling (when changing embedding model, need to re-embed everything).
+- Vector index optimization (HNSW vs flat — Phase 5 if needed).
+- Carry-overs that remained deferred from Phase 3.6: scene-close-on-cancel UX revisit, canned-queue brittleness fixture builder, full lifecycle rollback in regenerate.
+
+**Commit:** `docs: phase 4 status, behavioral defaults, deferred items (T102)`.
+
+---
+
+## Wrap-up
+
+After Wave 8 lands:
+
+1. **Run full suite** on `phase-4`: should be ~390+ tests passing (343 from Phase 3.5 + ~50 new).
+2. **Manual smoke** (recommended before opening the PR):
+   - Run `scripts/backfill_embeddings.py` against a seeded DB to verify vector indexing works.
+   - Search for a phrase that's substring-distinct but semantically similar to a memory; verify vector path returns it (FTS would miss).
+   - Create a branch from an old turn; switch; play a few turns; switch back.
+   - Trigger surgical delete on a turn; verify the impact preview matches what actually gets removed.
+   - Hide a turn; verify it disappears from the chat surface; unhide.
+   - Use top-bar search to find a phrase; verify cross-chat results appear.
+   - Click the "Snapshots" nav link; trigger a manual snapshot; verify it appears.
+3. **Push `phase-4`** to gitea.
+4. **Open PR** `phase-4 → main`.
+
+---
+
+## Notes for the controller running this plan
+
+- **External dependency**: `sqlite-vec` (or `sqlite-vss`) MUST be added to `pyproject.toml` and installed BEFORE Wave 1 dispatches. The migration in T88 expects the extension to be loadable.
+- **Embedding model choice**: pin in T91 spec before dispatch. The 384 dim is hardcoded in T88's migration; if a different dim is used, update T88 first.
+- **After each parallel wave**, run a code-review subagent. Combined spec+quality acceptable for trivial tasks (T90 carry-overs); separate spec + quality reviewers for vector-retrieval and integration tasks (T91, T96, T97, T98, T101) — surface area is larger.
+- **Don't dispatch Wave 5 until Wave 4 merged green.** T97 (memory_write enqueue) calls into the embedding-aware worker; the worker uses T91's `generate_embedding`. Both must be merged into `phase-4` first.
+- **Don't dispatch Wave 6 until Wave 5 merged green.** T98 (drawer) wires UI affordances over services from earlier waves.
+- **Token-spend rough estimate**: Phase 4 should be ~70-80% the size of Phase 3 (similar scope, larger per-task because vector + branching are non-trivial). Per-task spend similar to Phase 3's larger tasks (T59, T64).
+- **DO NOT break existing v1/v2/v3/v3.5 surface contracts.** Every test file that was green at the start of Phase 4 must stay green at the end. The cross-feature integration tests from Phase 3 (`tests/test_phase3_integration.py`) are particularly load-bearing.

docs/plans/2026-04-27-v4-phase4-implementation.md.tasks.json

@@ -0,0 +1,22 @@
+{
+  "planPath": "docs/plans/2026-04-27-v4-phase4-implementation.md",
+  "tasks": [
+    {"id": 88, "subject": "T88: embeddings table + projector handlers (sqlite-vec)", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 89, "subject": "T89: branches table + projector handlers", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 90, "subject": "T90: phase 3.6 carry-overs (chat-id pushdown + lifecycle wording + legacy fn consolidation)", "status": "pending", "wave": 1, "parallelGroup": "wave-1"},
+    {"id": 91, "subject": "T91: embedding generation service", "status": "pending", "wave": 2, "parallelGroup": "wave-2", "blockedBy": [88]},
+    {"id": 92, "subject": "T92: vector search service via sqlite-vec", "status": "pending", "wave": 2, "parallelGroup": "wave-2", "blockedBy": [88]},
+    {"id": 93, "subject": "T93: cross-chat search service (FTS5 over all owners)", "status": "pending", "wave": 2, "parallelGroup": "wave-2"},
+    {"id": 94, "subject": "T94: branch_from_event service", "status": "pending", "wave": 3, "parallelGroup": "wave-3", "blockedBy": [89]},
+    {"id": 95, "subject": "T95: delete-impact computation service", "status": "pending", "wave": 3, "parallelGroup": "wave-3"},
+    {"id": 96, "subject": "T96: combined FTS + vector retrieval ranking in search_memories", "status": "pending", "wave": 4, "parallelGroup": null, "blockedBy": [91, 92]},
+    {"id": 97, "subject": "T97: memory_write enqueues embedding job + backfill script", "status": "pending", "wave": 5, "parallelGroup": null, "blockedBy": [91, 96]},
+    {"id": 98, "subject": "T98: drawer Phase 4 bundle (branching + sig review + hide + surgical delete + remaining edits)", "status": "pending", "wave": 6, "parallelGroup": null, "blockedBy": [94, 95, 97]},
+    {"id": 99, "subject": "T99: snapshot UX (manual trigger + list + restore + preview)", "status": "pending", "wave": 7, "parallelGroup": "wave-7"},
+    {"id": 100, "subject": "T100: cross-chat search UX (top-bar + results page)", "status": "pending", "wave": 7, "parallelGroup": "wave-7", "blockedBy": [93]},
+    {"id": 101, "subject": "T101: cross-feature integration tests (vector × branching × delete × snapshot × search)", "status": "pending", "wave": 8, "parallelGroup": "wave-8", "blockedBy": [98, 99, 100]},
+    {"id": 102, "subject": "T102: Phase 4 documentation update", "status": "pending", "wave": 8, "parallelGroup": "wave-8", "blockedBy": [98, 99, 100]}
+  ],
+  "lastUpdated": "2026-04-27T00:00:00Z",
+  "notes": "15 tasks across 8 waves. Adds vector retrieval (sqlite-vec), branching UI, drawer-edit on every field, backup tooling, significance review UI, surgical delete with cascade preview, hide-from-view, and cross-chat search. Phase 3.6 carry-overs (3 small fixes) bundled into T90. External dependency: sqlite-vec must be installed BEFORE Wave 1 dispatch. Embedding model choice (default: 384-dim small model) pinned in T91 spec before dispatch — schema 0012 hardcodes 384 dim. Two new schema migrations (0012 embeddings, 0013 branches), final schema version 13. Uses task ids T88-T102."
+}

tests/test_addressee.py

@@ -0,0 +1,134 @@
+"""Addressee classifier service tests (T74.1).
+
+Covers :func:`chat.services.addressee.detect_addressee`:
+
+- Classifier picks the guest -> ``addressee_id == guest_id``.
+- Classifier picks the host -> ``addressee_id == host_id``.
+- Classifier flakes (3 bad-JSON responses, exhausting the built-in
+  retry budget in :func:`chat.llm.classify.classify`) -> fallback to
+  the host with ``reason="fallback"``.
+"""
+
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from chat.llm.mock import MockLLMClient
+from chat.services.addressee import AddresseeDecision, detect_addressee
+
+
+@pytest.mark.asyncio
+async def test_classifier_picks_guest():
+    """Classifier returns the guest id verbatim — caller propagates it."""
+    canned = [
+        json.dumps(
+            {
+                "addressee_id": "bot_b",
+                "confidence": "high",
+                "reason": "user named BotB",
+            }
+        )
+    ]
+    client = MockLLMClient(canned=canned)
+
+    result = await detect_addressee(
+        client,
+        classifier_model="test-model",
+        user_prose="BotB, what do you think?",
+        host_id="bot_a",
+        host_name="BotA",
+        guest_id="bot_b",
+        guest_name="BotB",
+    )
+
+    assert isinstance(result, AddresseeDecision)
+    assert result.addressee_id == "bot_b"
+    assert result.confidence == "high"
+
+
+@pytest.mark.asyncio
+async def test_classifier_picks_host():
+    """Classifier returns the host id — caller propagates it."""
+    canned = [
+        json.dumps(
+            {
+                "addressee_id": "bot_a",
+                "confidence": "medium",
+                "reason": "narration aimed at host",
+            }
+        )
+    ]
+    client = MockLLMClient(canned=canned)
+
+    result = await detect_addressee(
+        client,
+        classifier_model="test-model",
+        user_prose="I lean back and stretch.",
+        host_id="bot_a",
+        host_name="BotA",
+        guest_id="bot_b",
+        guest_name="BotB",
+    )
+
+    assert result.addressee_id == "bot_a"
+    assert result.confidence == "medium"
+
+
+@pytest.mark.asyncio
+async def test_classifier_failure_falls_back_to_host():
+    """Three bad-JSON responses exhaust the retry budget and the
+    classifier-failure fallback returns ``host_id`` with
+    ``reason="fallback"``."""
+    canned = ["not json", "still not json", "garbage"]
+    client = MockLLMClient(canned=canned)
+
+    result = await detect_addressee(
+        client,
+        classifier_model="test-model",
+        user_prose="anything",
+        host_id="bot_a",
+        host_name="BotA",
+        guest_id="bot_b",
+        guest_name="BotB",
+    )
+
+    assert result.addressee_id == "bot_a"
+    assert result.reason == "fallback"
+    assert result.confidence == "low"
+
+
+@pytest.mark.asyncio
+async def test_invalid_confidence_value_falls_back_to_default():
+    """Pydantic rejects ``confidence`` values outside the literal set
+    (``high`` / ``medium`` / ``low``). After the retry budget is
+    exhausted, classify returns the configured fallback default —
+    here that's ``confidence="low"`` with ``reason="fallback"``.
+    """
+    canned = [
+        json.dumps(
+            {
+                "addressee_id": "bot_a",
+                "confidence": "VERY_HIGH",
+                "reason": "out-of-range value",
+            }
+        ),
+        "still_bad",
+        "still_bad",
+    ]
+    client = MockLLMClient(canned=canned)
+
+    result = await detect_addressee(
+        client,
+        classifier_model="test-model",
+        user_prose="anything",
+        host_id="bot_a",
+        host_name="BotA",
+        guest_id="bot_b",
+        guest_name="BotB",
+    )
+
+    assert result.addressee_id == "bot_a"
+    assert result.confidence == "low"
+    assert result.reason == "fallback"

tests/test_branches_state.py

@@ -0,0 +1,141 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+import chat.state.branches  # registers handlers
+from chat.state.branches import active_branch, get_branch, list_branches
+
+
+def test_main_branch_bootstrapped_by_migration(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        active = active_branch(conn)
+        assert active is not None
+        assert active["name"] == "main"
+        assert active["is_active"] is True
+        assert active["origin_event_id"] == 0
+        assert active["head_event_id"] == 0
+
+
+def test_branch_created_inserts_row(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="branch_created",
+            payload={
+                "name": "experiment",
+                "origin_event_id": 42,
+                "chat_id": "chat_a",
+            },
+        )
+        project(conn)
+
+        b = get_branch(conn, "experiment")
+        assert b is not None
+        assert b["name"] == "experiment"
+        assert b["origin_event_id"] == 42
+        # head defaults to origin when not specified
+        assert b["head_event_id"] == 42
+        assert b["chat_id"] == "chat_a"
+        assert b["is_active"] is False
+
+        # main remains active
+        active = active_branch(conn)
+        assert active is not None
+        assert active["name"] == "main"
+
+
+def test_branch_switched_atomic(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="branch_created",
+            payload={
+                "name": "experiment",
+                "origin_event_id": 5,
+                "chat_id": "chat_a",
+            },
+        )
+        append_event(
+            conn,
+            kind="branch_switched",
+            payload={"name": "experiment"},
+        )
+        project(conn)
+
+        active = active_branch(conn)
+        assert active is not None
+        assert active["name"] == "experiment"
+
+        main = get_branch(conn, "main")
+        assert main is not None
+        assert main["is_active"] is False
+
+        # switch back
+        append_event(
+            conn,
+            kind="branch_switched",
+            payload={"name": "main"},
+        )
+        project(conn)
+
+        active2 = active_branch(conn)
+        assert active2 is not None
+        assert active2["name"] == "main"
+
+        experiment = get_branch(conn, "experiment")
+        assert experiment is not None
+        assert experiment["is_active"] is False
+
+
+def test_branch_head_updated_changes_head(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="branch_created",
+            payload={
+                "name": "experiment",
+                "origin_event_id": 10,
+                "head_event_id": 10,
+                "chat_id": "chat_a",
+            },
+        )
+        append_event(
+            conn,
+            kind="branch_head_updated",
+            payload={"name": "experiment", "head_event_id": 20},
+        )
+        project(conn)
+
+        b = get_branch(conn, "experiment")
+        assert b is not None
+        assert b["head_event_id"] == 20
+
+
+def test_list_branches_returns_all(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="branch_created",
+            payload={
+                "name": "experiment",
+                "origin_event_id": 1,
+                "chat_id": "chat_a",
+            },
+        )
+        project(conn)
+
+        names = [b["name"] for b in list_branches(conn)]
+        assert "main" in names
+        assert "experiment" in names

tests/test_drawer_edits_extended.py

@@ -0,0 +1,403 @@
+"""T72: deferred v1 drawer edits + witness flag inline-edit.
+
+T25 shipped affinity / significance / pin. T72.1 fills in the rest of the
+§6.4 editable surface whose ``manual_edit`` projector dispatch was already
+in place (or, for ``edge_knowledge_fact``, added alongside the route):
+
+* ``POST /chats/{chat_id}/drawer/edge/trust`` — slider 0..100.
+* ``POST /chats/{chat_id}/drawer/edge/summary`` — textarea, capped 2000.
+* ``POST /chats/{chat_id}/drawer/memory/pov-summary`` — textarea, capped.
+* ``POST /chats/{chat_id}/drawer/edge/knowledge-facts`` — add/remove fact.
+
+T72.3 layers a witness-flag toggle on top:
+
+* ``POST /chats/{chat_id}/drawer/memory/witness`` — ``manual_edit`` with
+  ``target_kind`` = ``memory_witness`` and a ``{flag, value}`` payload.
+
+Each test asserts (a) the ``manual_edit`` event lands in the log,
+(b) the projected table reflects the new value, and (c) the response is
+the refreshed drawer partial.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import pytest
+from fastapi.testclient import TestClient
+
+from chat.app import app
+from chat.db.connection import open_db
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+
+
+@pytest.fixture
+def client(tmp_path, monkeypatch):
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    db = tmp_path / "test.db"
+    monkeypatch.setenv("CHAT_DB_PATH", str(db))
+    with TestClient(app) as c:
+        if hasattr(app.state, "background_worker"):
+            app.state.background_worker.enabled = False
+        yield c
+
+
+def _seed(db: Path) -> None:
+    """Seed a chat with one host bot, one host->you edge with a fact and
+    summary already set, and one memory authored by ``bot_a`` witnessed by
+    all three roles. Tests reach into projected state to verify edits.
+    """
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_a",
+                "name": "BotA",
+                "persona": "...",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "",
+                "kickoff_prose": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        # Materialise edge bot_a -> you with a knowledge_fact already on it
+        # so the remove path has something to consume.
+        append_event(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": "bot_a",
+                "target_id": "you",
+                "chat_id": "chat_bot_a",
+                "affinity_delta": 0,
+                "knowledge_facts": ["studied physics together"],
+            },
+        )
+        append_event(
+            conn,
+            kind="memory_written",
+            payload={
+                "owner_id": "bot_a",
+                "chat_id": "chat_bot_a",
+                "pov_summary": "Original summary text.",
+                "witness_you": 1,
+                "witness_host": 1,
+                "witness_guest": 0,
+                "significance": 1,
+            },
+        )
+        project(conn)
+
+
+# --- T72.1 tests ----------------------------------------------------------
+
+
+def test_edit_edge_trust_emits_manual_edit_and_updates(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/trust",
+        data={"source_id": "bot_a", "target_id": "you", "new_value": "73"},
+    )
+    assert response.status_code == 200
+    # Refresh shows the new trust value somewhere in the partial.
+    assert "73" in response.text
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "edge_trust"
+        assert payload["prior_value"] == 50
+        assert payload["new_value"] == 73
+        assert payload["target_id"] == {
+            "source_id": "bot_a",
+            "target_id": "you",
+        }
+
+        from chat.state.edges import get_edge
+
+        edge = get_edge(conn, "bot_a", "you")
+        assert edge["trust"] == 73
+
+
+def test_edit_edge_trust_400_on_out_of_range(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/trust",
+        data={"source_id": "bot_a", "target_id": "you", "new_value": "150"},
+    )
+    assert response.status_code == 400
+
+
+def test_edit_edge_summary_emits_manual_edit_and_updates(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/summary",
+        data={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "new_summary": "BotA respects you and shares lab notes.",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "edge_summary"
+        assert payload["new_value"].startswith("BotA respects")
+        assert payload["target_id"] == {
+            "source_id": "bot_a",
+            "target_id": "you",
+        }
+
+        summary = conn.execute(
+            "SELECT summary FROM edges "
+            "WHERE source_id = ? AND target_id = ?",
+            ("bot_a", "you"),
+        ).fetchone()[0]
+        assert "respects" in summary
+
+    # And the refreshed partial echoes the new summary back.
+    assert "respects" in response.text
+
+
+def test_edit_edge_summary_400_on_overflow(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/summary",
+        data={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "new_summary": "x" * 2001,
+        },
+    )
+    assert response.status_code == 400
+
+
+def test_edit_memory_pov_summary_emits_manual_edit_and_updates(
+    client, tmp_path
+):
+    _seed(tmp_path / "test.db")
+    with open_db(tmp_path / "test.db") as conn:
+        memory_id = conn.execute("SELECT id FROM memories LIMIT 1").fetchone()[0]
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/memory/pov-summary",
+        data={
+            "memory_id": str(memory_id),
+            "new_summary": "Cleaner per-POV restatement of the moment.",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "memory_pov_summary"
+        assert payload["prior_value"] == "Original summary text."
+        assert payload["new_value"].startswith("Cleaner per-POV")
+        assert payload["target_id"] == memory_id
+
+        pov = conn.execute(
+            "SELECT pov_summary FROM memories WHERE id = ?", (memory_id,)
+        ).fetchone()[0]
+        assert pov.startswith("Cleaner per-POV")
+
+    assert "Cleaner per-POV" in response.text
+
+
+def test_edit_memory_pov_summary_404_when_wrong_chat(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    with open_db(tmp_path / "test.db") as conn:
+        memory_id = conn.execute("SELECT id FROM memories LIMIT 1").fetchone()[0]
+        # Re-home the memory to a different chat to confirm the route's
+        # cross-chat guard fires.
+        conn.execute(
+            "UPDATE memories SET chat_id = 'other_chat' WHERE id = ?",
+            (memory_id,),
+        )
+        conn.commit()
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/memory/pov-summary",
+        data={"memory_id": str(memory_id), "new_summary": "..."},
+    )
+    assert response.status_code == 404
+
+
+def test_edit_edge_knowledge_facts_add_emits_event_and_appends(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/knowledge-facts",
+        data={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "action": "add",
+            "fact": "lent you a textbook",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "edge_knowledge_fact"
+        assert payload["new_value"] == {
+            "action": "add",
+            "fact": "lent you a textbook",
+        }
+        # Prior value snapshots the entire knowledge list before the edit.
+        assert payload["prior_value"] == ["studied physics together"]
+
+        from chat.state.edges import get_edge
+
+        edge = get_edge(conn, "bot_a", "you")
+        assert "lent you a textbook" in edge["knowledge"]
+        assert "studied physics together" in edge["knowledge"]
+
+    assert "lent you a textbook" in response.text
+
+
+def test_edit_edge_knowledge_facts_remove_drops_matching_fact(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/knowledge-facts",
+        data={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "action": "remove",
+            "fact": "studied physics together",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        from chat.state.edges import get_edge
+
+        edge = get_edge(conn, "bot_a", "you")
+        assert "studied physics together" not in edge["knowledge"]
+
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "edge_knowledge_fact"
+        assert payload["new_value"]["action"] == "remove"
+
+
+def test_edit_edge_knowledge_facts_400_on_bad_action(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    response = client.post(
+        "/chats/chat_bot_a/drawer/edge/knowledge-facts",
+        data={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "action": "delete",
+            "fact": "x",
+        },
+    )
+    assert response.status_code == 400
+
+
+# --- T72.3 tests (witness flag inline-edit) -------------------------------
+
+
+def test_witness_flag_toggle_updates_memory_row(client, tmp_path):
+    """Memory seeded with witness [you=1, host=1, guest=0]; toggling
+    ``guest`` to 1 lands as ``witness_guest = 1`` after projection.
+    """
+    _seed(tmp_path / "test.db")
+    with open_db(tmp_path / "test.db") as conn:
+        memory_id = conn.execute("SELECT id FROM memories LIMIT 1").fetchone()[0]
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/memory/witness",
+        data={
+            "memory_id": str(memory_id),
+            "flag": "guest",
+            "new_value": "1",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        row = conn.execute(
+            "SELECT witness_you, witness_host, witness_guest "
+            "FROM memories WHERE id = ?",
+            (memory_id,),
+        ).fetchone()
+        assert row == (1, 1, 1)
+
+
+def test_witness_flag_toggle_emits_manual_edit_event(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    with open_db(tmp_path / "test.db") as conn:
+        memory_id = conn.execute("SELECT id FROM memories LIMIT 1").fetchone()[0]
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/memory/witness",
+        data={
+            "memory_id": str(memory_id),
+            "flag": "guest",
+            "new_value": "1",
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["target_kind"] == "memory_witness"
+        assert payload["target_id"] == memory_id
+        assert payload["prior_value"] == {"flag": "guest", "value": 0}
+        assert payload["new_value"] == {"flag": "guest", "value": 1}
+
+
+def test_witness_flag_toggle_400_on_bad_flag(client, tmp_path):
+    _seed(tmp_path / "test.db")
+    with open_db(tmp_path / "test.db") as conn:
+        memory_id = conn.execute("SELECT id FROM memories LIMIT 1").fetchone()[0]
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/memory/witness",
+        data={
+            "memory_id": str(memory_id),
+            "flag": "narrator",
+            "new_value": "1",
+        },
+    )
+    assert response.status_code == 400
+
+

tests/test_drawer_events_threads_skip.py

@@ -0,0 +1,489 @@
+"""T59: drawer events / threads / skip controls.
+
+Extends the chat drawer with three new sections (Events, Threads, Skip)
+and five new POST endpoints:
+
+* ``POST /chats/{chat_id}/drawer/event/plan`` — emits ``event_planned``.
+* ``POST /chats/{chat_id}/drawer/event/cancel/{event_id}`` — emits
+  ``event_cancelled``.
+* ``POST /chats/{chat_id}/drawer/skip/elision`` — validates new_time,
+  emits ``time_skip_elision`` plus an ``assistant_turn`` carrying the
+  narrated transition prose from :mod:`chat.services.skip_narration`.
+* ``POST /chats/{chat_id}/drawer/skip/jump`` — validates new_time, emits
+  ``time_skip_jump`` plus per-bot synthesized ``memory_written`` events
+  derived from the user-supplied "anything notable" prose, and an
+  ``assistant_turn`` carrying the narration.
+* ``POST /chats/{chat_id}/drawer/thread/close/{thread_id}`` — emits
+  ``thread_closed``.
+
+Each route returns the refreshed drawer partial (HTMX swap target) so
+the tests assert both the persisted event_log effect AND the rendered
+section content. Wire-up follows the T42 ``MockLLMClient`` pattern.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import pytest
+from fastapi.testclient import TestClient
+
+from chat.app import app
+from chat.db.connection import open_db
+from chat.eventlog.log import append_and_apply, append_event
+from chat.eventlog.projector import project
+from chat.llm.mock import MockLLMClient
+
+
+@pytest.fixture
+def client(tmp_path, monkeypatch):
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    db = tmp_path / "test.db"
+    monkeypatch.setenv("CHAT_DB_PATH", str(db))
+    with TestClient(app) as c:
+        if hasattr(app.state, "background_worker"):
+            app.state.background_worker.enabled = False
+        yield c
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": "...",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "",
+        "kickoff_prose": "",
+    }
+
+
+def _seed_chat(db: Path, *, with_scene: bool = True) -> None:
+    """Seed a chat hosted by ``bot_a`` (with ``bot_b`` authored as a
+    candidate guest) so the skip-jump path can write per-bot synthesized
+    memories when a guest is present.
+    """
+    with open_db(db) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB"))
+        append_event(
+            conn,
+            kind="you_authored",
+            payload={"name": "Me", "pronouns": "they/them", "persona": ""},
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        if with_scene:
+            append_event(
+                conn,
+                kind="scene_opened",
+                payload={
+                    "chat_id": "chat_bot_a",
+                    "container_id": None,
+                    "started_at": "2026-04-26T20:00:00+00:00",
+                    "participants": ["you", "bot_a"],
+                },
+            )
+        project(conn)
+
+
+def _override_llm(canned: list[str]):
+    """Wire a ``MockLLMClient`` into the drawer's LLM dependency."""
+    from chat.web.kickoff import get_llm_client
+
+    app.dependency_overrides[get_llm_client] = lambda: MockLLMClient(
+        canned=list(canned)
+    )
+
+
+# ---------------------------------------------------------------------------
+# 1. Empty drawer state — Events + Threads sections render but show
+#    empty-state copy (no row markup) when no events / threads exist.
+# ---------------------------------------------------------------------------
+
+
+def test_get_drawer_with_no_events_or_threads_omits_sections(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    response = client.get("/chats/chat_bot_a/drawer")
+    assert response.status_code == 200
+    body = response.text
+
+    # Sections render with empty-state copy — deterministic markers.
+    assert "<h3>Events</h3>" in body
+    assert "<h3>Threads</h3>" in body
+    assert "No active events" in body
+    assert "No open threads" in body
+    # Skip controls always render under Activity (gated by chat clock).
+    assert "Elision skip" in body
+    assert "Jump skip" in body
+
+
+# ---------------------------------------------------------------------------
+# 2. POST event/plan — event_planned lands and the drawer lists it.
+# ---------------------------------------------------------------------------
+
+
+def test_post_event_plan_appends_event_planned_and_renders(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/event/plan",
+        data={
+            "kind": "dinner_reservation",
+            "planned_for": "2026-04-26T19:00:00+00:00",
+            "props_json": json.dumps({"restaurant": "Bistro X"}),
+        },
+    )
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'event_planned'"
+        ).fetchall()
+        assert len(rows) == 1
+        payload = json.loads(rows[0][0])
+        assert payload["kind"] == "dinner_reservation"
+        assert payload["chat_id"] == "chat_bot_a"
+        assert payload["planned_for"] == "2026-04-26T19:00:00+00:00"
+        assert payload["props"] == {"restaurant": "Bistro X"}
+        assert payload["event_id"].startswith("evt_")
+
+    # Refreshed partial lists the new event by kind.
+    body = response.text
+    assert "dinner_reservation" in body
+
+
+def test_post_event_plan_invalid_props_json_returns_400(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    response = client.post(
+        "/chats/chat_bot_a/drawer/event/plan",
+        data={
+            "kind": "dinner_reservation",
+            "planned_for": "2026-04-26T19:00:00+00:00",
+            "props_json": "not valid json {",
+        },
+    )
+    assert response.status_code == 400
+
+
+# ---------------------------------------------------------------------------
+# 3. POST event/cancel — event_cancelled lands and the active list drops it.
+# ---------------------------------------------------------------------------
+
+
+def test_post_event_cancel_appends_event_cancelled(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    # Plan first via the route so the test exercises both sides.
+    plan_resp = client.post(
+        "/chats/chat_bot_a/drawer/event/plan",
+        data={
+            "kind": "doctor_visit",
+            "planned_for": "2026-04-27T09:00:00+00:00",
+            "props_json": "{}",
+        },
+    )
+    assert plan_resp.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        row = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'event_planned' "
+            "ORDER BY id DESC LIMIT 1"
+        ).fetchone()
+        event_id = json.loads(row[0])["event_id"]
+
+    cancel_resp = client.post(
+        f"/chats/chat_bot_a/drawer/event/cancel/{event_id}"
+    )
+    assert cancel_resp.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        cancelled = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'event_cancelled'"
+        ).fetchall()
+        assert len(cancelled) == 1
+        cp = json.loads(cancelled[0][0])
+        assert cp["event_id"] == event_id
+
+        # Active-events query should no longer surface this event.
+        from chat.state.events import list_active_events
+
+        assert list_active_events(conn, "chat_bot_a") == []
+
+
+# ---------------------------------------------------------------------------
+# 4. POST skip/elision — emits time_skip_elision + assistant_turn narration.
+# ---------------------------------------------------------------------------
+
+
+def test_post_skip_elision_advances_clock_and_emits_narration(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    canned_narration = "We pull up to the curb just before sunset."
+    _override_llm([canned_narration])
+    try:
+        response = client.post(
+            "/chats/chat_bot_a/drawer/skip/elision",
+            data={
+                "landing_state_hint": "arriving at the venue",
+                "new_time": "2026-04-26T20:30:00+00:00",
+            },
+        )
+        assert response.status_code == 200
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        from chat.state.world import get_chat
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"] == "2026-04-26T20:30:00+00:00"
+
+        skip_rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'time_skip_elision'"
+        ).fetchall()
+        assert len(skip_rows) == 1
+        sp = json.loads(skip_rows[0][0])
+        assert sp["chat_id"] == "chat_bot_a"
+        assert sp["new_time"] == "2026-04-26T20:30:00+00:00"
+
+        # An assistant_turn event landed with the narration text.
+        turn_rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'assistant_turn'"
+        ).fetchall()
+        assert len(turn_rows) == 1
+        tp = json.loads(turn_rows[0][0])
+        assert tp["chat_id"] == "chat_bot_a"
+        assert tp["text"].strip()  # non-empty narration
+        assert tp["speaker_id"] == "bot_a"
+
+
+def test_skip_route_404_via_typed_exception_class(client, tmp_path):
+    """T81: drawer skip routes 404 via :class:`ChatNotFoundError`.
+
+    Pre-T81, the route caught ``ValueError`` and recovered the 404 case
+    by sniffing ``str(exc).startswith("chat not found")`` — fragile if
+    the message ever changed wording. The controller now raises a typed
+    exception so the route dispatches on type. Asserting the 404 from
+    the unseeded chat exercises the typed branch end-to-end; importing
+    the class confirms it's a real subclass of ``Exception`` and not a
+    re-export of ``ValueError`` (which would defeat the type split).
+    """
+    # Don't seed any chat — the controller hits ``get_chat`` returning
+    # ``None`` and raises ``ChatNotFoundError``. The drawer route then
+    # maps that to ``404`` via the typed handler (no string sniff).
+    _override_llm([])
+    try:
+        response = client.post(
+            "/chats/nonexistent/drawer/skip/elision",
+            data={
+                "landing_state_hint": "x",
+                "new_time": "2026-04-26T20:30:00+00:00",
+            },
+        )
+        assert response.status_code == 404
+    finally:
+        app.dependency_overrides.clear()
+
+    # The exception class itself is importable, distinct from ValueError,
+    # and a proper Exception subclass — pinning the type-based dispatch
+    # so future refactors can't quietly collapse it back to a string sniff.
+    from chat.web.skip import ChatNotFoundError
+
+    assert ChatNotFoundError is not None
+    assert issubclass(ChatNotFoundError, Exception)
+    assert not issubclass(ChatNotFoundError, ValueError)
+
+
+def test_post_skip_elision_invalid_time_returns_400(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+    _override_llm([])
+    try:
+        # Garbled ISO timestamp.
+        bad_resp = client.post(
+            "/chats/chat_bot_a/drawer/skip/elision",
+            data={"landing_state_hint": "x", "new_time": "not-a-time"},
+        )
+        assert bad_resp.status_code == 400
+
+        # Backwards-in-time skip: chat seeded at 20:00, asking 19:00.
+        backwards_resp = client.post(
+            "/chats/chat_bot_a/drawer/skip/elision",
+            data={
+                "landing_state_hint": "x",
+                "new_time": "2026-04-26T19:00:00+00:00",
+            },
+        )
+        assert backwards_resp.status_code == 400
+    finally:
+        app.dependency_overrides.clear()
+
+
+# ---------------------------------------------------------------------------
+# 5. POST skip/jump — synthesized memories per present bot + narration.
+# ---------------------------------------------------------------------------
+
+
+def test_post_skip_jump_with_notable_prose_writes_synthesized_memories(
+    client, tmp_path
+):
+    _seed_chat(tmp_path / "test.db")
+
+    # Single host present (no guest) — exactly one synthesize call,
+    # one narration call. The synthesize digest carries two memories so
+    # we can assert N writes lands the right shape.
+    digest_json = json.dumps(
+        {
+            "memories": [
+                {
+                    "text": "We bumped into an old friend at the cafe.",
+                    "significance": 1,
+                    "affinity_delta": 0,
+                    "trust_delta": 0,
+                },
+                {
+                    "text": "It started raining on the walk home.",
+                    "significance": 1,
+                    "affinity_delta": 0,
+                    "trust_delta": 0,
+                },
+            ]
+        }
+    )
+    narration = "The afternoon slipped by quickly."
+    _override_llm([digest_json, narration])
+    try:
+        response = client.post(
+            "/chats/chat_bot_a/drawer/skip/jump",
+            data={
+                "new_time": "2026-04-27T08:00:00+00:00",
+                "notable_prose": (
+                    "We ran into an old friend, and it rained on the way back."
+                ),
+                "reset_activity": "1",
+            },
+        )
+        assert response.status_code == 200
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        from chat.state.world import get_chat
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"] == "2026-04-27T08:00:00+00:00"
+
+        jump_rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'time_skip_jump'"
+        ).fetchall()
+        assert len(jump_rows) == 1
+        jp = json.loads(jump_rows[0][0])
+        assert jp["chat_id"] == "chat_bot_a"
+        assert jp["new_time"] == "2026-04-27T08:00:00+00:00"
+        assert jp["reset_activity"] is True
+
+        # Two synthesized memories land for the lone host bot
+        # (record_turn_memory_for_present writes one row per present bot
+        # per call — host only here, so 2 memories x 1 bot = 2 events).
+        mem_rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'memory_written'"
+        ).fetchall()
+        synth_payloads = [
+            json.loads(r[0])
+            for r in mem_rows
+            if json.loads(r[0]).get("source") == "synthesized"
+        ]
+        assert len(synth_payloads) == 2
+        for p in synth_payloads:
+            assert p["owner_id"] == "bot_a"
+            assert p["chat_id"] == "chat_bot_a"
+
+        # And the assistant_turn narration landed.
+        turn_rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'assistant_turn'"
+        ).fetchall()
+        assert len(turn_rows) == 1
+        tp = json.loads(turn_rows[0][0])
+        assert tp["text"].strip()
+        assert tp["speaker_id"] == "bot_a"
+
+
+def test_post_skip_jump_with_empty_prose_skips_memory_writes(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    # Empty prose short-circuits in synthesize_memories before any LLM call,
+    # so the canned queue only needs the narration.
+    narration = "(next morning: still in the kitchen.)"
+    _override_llm([narration])
+    try:
+        response = client.post(
+            "/chats/chat_bot_a/drawer/skip/jump",
+            data={
+                "new_time": "2026-04-27T08:00:00+00:00",
+                "notable_prose": "   ",
+                "reset_activity": "",
+            },
+        )
+        assert response.status_code == 200
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        synth = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'memory_written' "
+            "AND payload_json LIKE '%synthesized%'"
+        ).fetchone()[0]
+        assert synth == 0
+
+
+# ---------------------------------------------------------------------------
+# 6. POST thread/close — thread_closed lands and the open list drops it.
+# ---------------------------------------------------------------------------
+
+
+def test_post_thread_close_appends_thread_closed(client, tmp_path):
+    _seed_chat(tmp_path / "test.db")
+
+    # Open a thread directly via append_and_apply so the test focuses on
+    # the close route's effect.
+    with open_db(tmp_path / "test.db") as conn:
+        append_and_apply(
+            conn,
+            kind="thread_opened",
+            payload={
+                "thread_id": "thr_alpha",
+                "chat_id": "chat_bot_a",
+                "title": "the missing key",
+                "summary": "Couldn't find the key.",
+            },
+        )
+
+    response = client.post("/chats/chat_bot_a/drawer/thread/close/thr_alpha")
+    assert response.status_code == 200
+
+    with open_db(tmp_path / "test.db") as conn:
+        closed = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'thread_closed'"
+        ).fetchall()
+        assert len(closed) == 1
+        cp = json.loads(closed[0][0])
+        assert cp["thread_id"] == "thr_alpha"
+
+        from chat.state.threads import list_open_threads
+
+        assert list_open_threads(conn, "chat_bot_a") == []

tests/test_drawer_guest.py

@@ -265,6 +265,162 @@ def test_drawer_remove_guest_clears_and_closes_scene(client, tmp_path):
         assert kinds.index("scene_closed") < kinds.index("guest_removed")
 
 
+# --- T72.2 first-meeting gate ----------------------------------------------
+
+
+def _seed_host_to_guest_edge(db: Path) -> None:
+    """Materialise a bot_a -> bot_b edge so the gate's check fires."""
+    from chat.eventlog.log import append_and_apply
+
+    with open_db(db) as conn:
+        append_and_apply(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": "bot_a",
+                "target_id": "bot_b",
+                "chat_id": "chat_bot_a",
+                "affinity_delta": 0,
+                "knowledge_facts": ["already met before"],
+            },
+        )
+
+
+def test_add_guest_form_disables_prose_when_edge_exists(client, tmp_path):
+    """When host->candidate edge already exists, the GET partial renders
+    the textarea disabled and surfaces the "already know each other"
+    message so the user knows submitting will skip the seed.
+    """
+    _seed_chat(tmp_path / "test.db")
+    _seed_host_to_guest_edge(tmp_path / "test.db")
+
+    response = client.get("/chats/chat_bot_a/drawer")
+    assert response.status_code == 200
+    body = response.text
+    # Note + disabled state both present. The textarea sits next to the
+    # ``add-guest-prose`` class so we can match it specifically.
+    assert "already know each other" in body
+    assert 'class="add-guest-prose"' in body
+    # The textarea for the first (auto-selected) candidate should be
+    # disabled in the initial markup since an edge exists.
+    assert "disabled" in body.split('class="add-guest-prose"', 1)[1].split(">", 1)[0]
+    # And the option carries the ``data-existing-edge="true"`` attribute
+    # the inline JS uses to flip state on subsequent select changes.
+    assert 'data-existing-edge="true"' in body
+
+
+def test_add_guest_with_existing_edge_skips_seed_call(client, tmp_path):
+    """Submitting the Add-guest form WITHOUT toggling re-seed must skip
+    ``seed_inter_bot_edges`` entirely. We assert this via an empty mock
+    queue: if the seed function had been called it would have consumed
+    a canned response (or raised because none was available).
+    """
+    _seed_chat(tmp_path / "test.db")
+    _seed_host_to_guest_edge(tmp_path / "test.db")
+
+    # Empty queue: any classifier call would raise inside MockLLMClient.
+    canned_queue: list[str] = []
+    _override_llm(canned_queue)
+    try:
+        response = client.post(
+            "/chats/chat_bot_a/drawer/guest/add",
+            data={
+                "guest_bot_id": "bot_b",
+                "relationship_prose": "ignored prose",
+                # NO reseed flag — gate should suppress the seed call.
+            },
+        )
+        assert response.status_code == 200
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        from chat.state.edges import get_edge
+        from chat.state.world import get_chat
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["guest_bot_id"] == "bot_b"
+
+        # The pre-seeded knowledge fact survives — proof the seed didn't run
+        # and overwrite the existing edge.
+        edge = get_edge(conn, "bot_a", "bot_b")
+        assert "already met before" in edge["knowledge"]
+
+        # Exactly one guest_added; no new edge_update events between
+        # bot_a and bot_b (the pre-seed edge_update from the test setup
+        # is the only edge_update on this pair).
+        added = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'guest_added'"
+        ).fetchone()[0]
+        assert added == 1
+
+        edge_updates = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'edge_update'"
+        ).fetchall()
+        # Only the pre-seed edge_update from _seed_host_to_guest_edge.
+        ab_updates = [
+            json.loads(p[0])
+            for p in edge_updates
+            if {
+                json.loads(p[0]).get("source_id"),
+                json.loads(p[0]).get("target_id"),
+            }
+            == {"bot_a", "bot_b"}
+        ]
+        assert len(ab_updates) == 1
+        assert ab_updates[0]["knowledge_facts"] == ["already met before"]
+
+
+def test_add_guest_with_existing_edge_and_reseed_runs_seed(client, tmp_path):
+    """Toggling ``re-seed anyway`` flips the gate off — the existing
+    flow runs (seed produces deltas, two ``edge_update`` events fire).
+    """
+    _seed_chat(tmp_path / "test.db")
+    _seed_host_to_guest_edge(tmp_path / "test.db")
+
+    canned = json.dumps(
+        {
+            "a_to_b_summary": "reconnected",
+            "a_to_b_knowledge_facts": ["new fact"],
+            "a_to_b_affinity_delta": 2,
+            "a_to_b_trust_delta": 1,
+            "b_to_a_summary": "reconnected",
+            "b_to_a_knowledge_facts": [],
+            "b_to_a_affinity_delta": 1,
+            "b_to_a_trust_delta": 0,
+        }
+    )
+    _override_llm([canned])
+    try:
+        response = client.post(
+            "/chats/chat_bot_a/drawer/guest/add",
+            data={
+                "guest_bot_id": "bot_b",
+                "relationship_prose": "fresh prose",
+                "reseed": "1",
+            },
+        )
+        assert response.status_code == 200
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        edge_updates = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'edge_update'"
+        ).fetchall()
+        # Pre-seed (1) + two from the re-seed = 3 edge_updates total.
+        ab_updates = [
+            json.loads(p[0])
+            for p in edge_updates
+            if {
+                json.loads(p[0]).get("source_id"),
+                json.loads(p[0]).get("target_id"),
+            }
+            == {"bot_a", "bot_b"}
+        ]
+        assert len(ab_updates) == 3
+
+
 def test_drawer_with_guest_renders_guest_and_group_sections(client, tmp_path):
     _seed_chat(tmp_path / "test.db")
     from chat.eventlog.log import append_and_apply

tests/test_embeddings_state.py

@@ -0,0 +1,218 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+import chat.state.memory  # registers memory_written handler
+import chat.state.embeddings  # registers embedding handlers
+from chat.state.embeddings import get_embedding, list_embeddings_for_owner
+
+
+def _base_memory(**overrides):
+    payload = {
+        "owner_id": "bot_a",
+        "chat_id": "chat_bot_a",
+        "scene_id": 1,
+        "pov_summary": "She laughed at his joke about owls.",
+        "witness_you": 1,
+        "witness_host": 1,
+        "witness_guest": 0,
+        "chat_clock_at": "2026-04-26T10:00:00",
+        "source": "direct",
+        "reliability": 1.0,
+        "significance": 1,
+        "pinned": 0,
+        "auto_pinned": 0,
+    }
+    payload.update(overrides)
+    return payload
+
+
+def _vec(n: int = 384, base: float = 0.1) -> list[float]:
+    """Return a length-n float vector with predictable values for assertions."""
+    return [round(base + i * 0.001, 6) for i in range(n)]
+
+
+def test_embedding_indexed_inserts_row(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="memory_written", payload=_base_memory())
+        project(conn)
+        memory_id = conn.execute("SELECT id FROM memories").fetchone()[0]
+
+        vector = _vec(384, base=0.1)
+        append_event(
+            conn,
+            kind="embedding_indexed",
+            payload={
+                "memory_id": memory_id,
+                "vector": vector,
+                "model": "test-model",
+                "dim": 384,
+            },
+        )
+        project(conn)
+
+        emb = get_embedding(conn, memory_id)
+        assert emb is not None
+        assert emb["memory_id"] == memory_id
+        assert emb["vector"] == vector
+        assert emb["model"] == "test-model"
+        assert emb["dim"] == 384
+        assert emb["indexed_at"] is not None
+
+
+def test_embedding_deindexed_removes_row(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="memory_written", payload=_base_memory())
+        project(conn)
+        memory_id = conn.execute("SELECT id FROM memories").fetchone()[0]
+
+        append_event(
+            conn,
+            kind="embedding_indexed",
+            payload={
+                "memory_id": memory_id,
+                "vector": _vec(),
+                "model": "test-model",
+                "dim": 384,
+            },
+        )
+        project(conn)
+        assert get_embedding(conn, memory_id) is not None
+
+        append_event(
+            conn,
+            kind="embedding_deindexed",
+            payload={"memory_id": memory_id},
+        )
+        project(conn)
+        assert get_embedding(conn, memory_id) is None
+
+
+def test_embedding_indexed_replaces_existing(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="memory_written", payload=_base_memory())
+        project(conn)
+        memory_id = conn.execute("SELECT id FROM memories").fetchone()[0]
+
+        vec_a = _vec(384, base=0.1)
+        vec_b = _vec(384, base=0.5)
+        append_event(
+            conn,
+            kind="embedding_indexed",
+            payload={
+                "memory_id": memory_id,
+                "vector": vec_a,
+                "model": "test-model",
+                "dim": 384,
+            },
+        )
+        project(conn)
+        first = get_embedding(conn, memory_id)
+        assert first is not None
+        assert first["vector"] == vec_a
+
+        append_event(
+            conn,
+            kind="embedding_indexed",
+            payload={
+                "memory_id": memory_id,
+                "vector": vec_b,
+                "model": "test-model",
+                "dim": 384,
+            },
+        )
+        project(conn)
+        second = get_embedding(conn, memory_id)
+        assert second is not None
+        assert second["vector"] == vec_b
+        # Still exactly one row for this memory.
+        count = conn.execute(
+            "SELECT COUNT(*) FROM embeddings WHERE memory_id = ?", (memory_id,)
+        ).fetchone()[0]
+        assert count == 1
+
+
+def test_list_embeddings_for_owner_returns_joined_rows(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        # Two memories for bot_a, one for bot_b.
+        append_event(
+            conn,
+            kind="memory_written",
+            payload=_base_memory(
+                owner_id="bot_a",
+                pov_summary="Alpha memory.",
+                significance=2,
+            ),
+        )
+        append_event(
+            conn,
+            kind="memory_written",
+            payload=_base_memory(
+                owner_id="bot_a",
+                pov_summary="Beta memory.",
+                significance=3,
+            ),
+        )
+        append_event(
+            conn,
+            kind="memory_written",
+            payload=_base_memory(
+                owner_id="bot_b",
+                pov_summary="Gamma memory.",
+                significance=1,
+            ),
+        )
+        project(conn)
+
+        rows = conn.execute(
+            "SELECT id, owner_id FROM memories ORDER BY id"
+        ).fetchall()
+        # Index every memory with a distinct vector so we can check ordering.
+        for i, (mid, _owner) in enumerate(rows):
+            append_event(
+                conn,
+                kind="embedding_indexed",
+                payload={
+                    "memory_id": mid,
+                    "vector": _vec(384, base=0.1 * (i + 1)),
+                    "model": "test-model",
+                    "dim": 384,
+                },
+            )
+        project(conn)
+
+        a_rows = list_embeddings_for_owner(conn, "bot_a")
+        assert len(a_rows) == 2
+        summaries = {r["pov_summary"] for r in a_rows}
+        assert summaries == {"Alpha memory.", "Beta memory."}
+        sigs = {r["significance"] for r in a_rows}
+        assert sigs == {2, 3}
+        for r in a_rows:
+            assert r["model"] == "test-model"
+            assert r["dim"] == 384
+            assert isinstance(r["vector"], list)
+            assert len(r["vector"]) == 384
+            assert r["witness_you"] == 1
+            assert r["witness_host"] == 1
+            assert r["witness_guest"] == 0
+
+        b_rows = list_embeddings_for_owner(conn, "bot_b")
+        assert len(b_rows) == 1
+        assert b_rows[0]["pov_summary"] == "Gamma memory."
+
+
+def test_get_embedding_returns_none_when_missing(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        assert get_embedding(conn, 999) is None

tests/test_event_lifecycle.py

@@ -0,0 +1,103 @@
+"""Tests for the event-lifecycle detection service (T52).
+
+Per Phase 3, after each narrated turn we ask a classifier whether any
+active events transitioned (started, completed, cancelled). The bias is
+strongly toward an empty result — most turns do NOT resolve or start a
+known event, and the turn-flow caller (T61) only appends an
+event_started/completed/cancelled record when this service yields one.
+
+These tests cover:
+
+* The classifier returning a single transition is honored end-to-end.
+* An empty ``active_events`` list short-circuits before any LLM call,
+  so callers that hold no live events pay zero classifier cost.
+* Three rounds of malformed JSON exhaust ``classify``'s retries and we
+  fall back to the empty default — graceful degradation per §3.3.
+"""
+
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from chat.llm.mock import MockLLMClient
+from chat.services.event_lifecycle import (
+    EventLifecycleDecision,
+    detect_event_transitions,
+)
+
+
+@pytest.mark.asyncio
+async def test_detects_one_transition_happy_path():
+    canned = json.dumps(
+        {
+            "transitions": [
+                {
+                    "event_id": "evt_1",
+                    "new_status": "completed",
+                    "reason": "they arrived at the park",
+                }
+            ]
+        }
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await detect_event_transitions(
+        mock,
+        classifier_model="x",
+        narrative_text="They walked through the park gate, finally there.",
+        active_events=[
+            {
+                "event_id": "evt_1",
+                "kind": "date_at_park",
+                "status": "active",
+                "props": {},
+            }
+        ],
+    )
+    assert isinstance(result, EventLifecycleDecision)
+    assert len(result.transitions) == 1
+    assert result.transitions[0].event_id == "evt_1"
+    assert result.transitions[0].new_status == "completed"
+    assert result.transitions[0].reason == "they arrived at the park"
+
+
+@pytest.mark.asyncio
+async def test_empty_active_events_short_circuits_without_classifier_call():
+    """No active events -> no classifier call.
+
+    The mock has an empty canned list; any ``generate`` call would raise
+    ``IndexError`` from ``list.pop(0)``. The test passing proves the
+    short-circuit holds.
+    """
+    mock = MockLLMClient(canned=[])
+    result = await detect_event_transitions(
+        mock,
+        classifier_model="x",
+        narrative_text="Just a quiet moment between them.",
+        active_events=[],
+    )
+    assert isinstance(result, EventLifecycleDecision)
+    assert result.transitions == []
+
+
+@pytest.mark.asyncio
+async def test_classifier_failure_returns_empty_default():
+    """``classify`` retries 3 times; after all fail it returns the empty
+    default so the turn flow keeps moving (§3.3 graceful degradation)."""
+    mock = MockLLMClient(canned=["bad", "bad", "bad"])
+    result = await detect_event_transitions(
+        mock,
+        classifier_model="x",
+        narrative_text="Some text the classifier will choke on.",
+        active_events=[
+            {
+                "event_id": "evt_1",
+                "kind": "date_at_park",
+                "status": "active",
+                "props": {},
+            }
+        ],
+    )
+    assert isinstance(result, EventLifecycleDecision)
+    assert result.transitions == []

tests/test_event_promotion.py

@@ -0,0 +1,256 @@
+"""Tests for the event-completion promotion service (T56).
+
+When an event reaches ``status='completed'``, the orchestrator promotes
+structured artifacts the event carried (``acquired_objects``,
+``knowledge_facts``, ``relationship_change``) into the appropriate
+state stores via downstream events. Cancelled / expired events do NOT
+promote — the closed event row is left in place but no follow-on
+events fire.
+"""
+
+from __future__ import annotations
+
+import json
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+from chat.services.event_promotion import promote_completed_event
+from chat.state.edges import get_edge
+import chat.state.edges  # noqa: F401  - register edge_update handler
+import chat.state.entities  # noqa: F401  - register handlers
+import chat.state.events  # noqa: F401  - register events handlers
+import chat.state.manual_edit  # noqa: F401  - register manual_edit handler
+import chat.state.world  # noqa: F401  - register handlers
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": "thoughtful, observant",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "coworker",
+        "kickoff_prose": "",
+    }
+
+
+def _chat_payload(chat_id: str = "chat_bot_a") -> dict:
+    return {
+        "id": chat_id,
+        "host_bot_id": "bot_a",
+        "guest_bot_id": "bot_b",
+        "initial_time": "2026-04-26T20:00:00+00:00",
+        "narrative_anchor": "Day 1 evening",
+        "weather": "clear",
+    }
+
+
+def _seed_chat(conn) -> None:
+    append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+    append_event(conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB"))
+    append_event(conn, kind="chat_created", payload=_chat_payload())
+
+
+def _seed_event(
+    conn,
+    *,
+    event_id: str,
+    props: dict,
+    terminal_kind: str = "event_completed",
+) -> None:
+    """Append event_planned, then a terminal transition (default completed)."""
+    append_event(
+        conn,
+        kind="event_planned",
+        payload={
+            "event_id": event_id,
+            "chat_id": "chat_bot_a",
+            "kind": "story_event",
+            "props": props,
+            "planned_for": "2026-04-30T18:00:00+00:00",
+        },
+    )
+    append_event(
+        conn,
+        kind=terminal_kind,
+        payload={
+            "event_id": event_id,
+            "completed_at": "2026-04-30T20:00:00+00:00",
+        },
+    )
+    project(conn)
+
+
+def _max_event_id(conn) -> int:
+    return conn.execute("SELECT COALESCE(MAX(id), 0) FROM event_log").fetchone()[0]
+
+
+def _events_after(conn, after_id: int, kind: str) -> list[dict]:
+    rows = conn.execute(
+        "SELECT id, kind, payload_json FROM event_log "
+        "WHERE id > ? AND kind = ? ORDER BY id ASC",
+        (after_id, kind),
+    ).fetchall()
+    return [
+        {"id": r[0], "kind": r[1], "payload": json.loads(r[2])} for r in rows
+    ]
+
+
+def test_empty_props_no_op(tmp_path):
+    """Completed event with empty props produces no promotion events."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        _seed_event(conn, event_id="evt_empty", props={})
+
+        before = _max_event_id(conn)
+        counts = promote_completed_event(
+            conn,
+            event_id="evt_empty",
+            chat_id="chat_bot_a",
+            chat_clock_at="2026-04-30T20:00:00+00:00",
+        )
+
+        assert counts == {
+            "acquired_objects": 0,
+            "knowledge_facts": 0,
+            "relationship_change": 0,
+        }
+        # No new edge_update or manual_edit rows after the promote call.
+        assert _events_after(conn, before, "edge_update") == []
+        assert _events_after(conn, before, "manual_edit") == []
+
+
+def test_knowledge_facts_emits_edge_update(tmp_path):
+    """A knowledge_facts entry promotes to an edge_update on the directed edge."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        _seed_event(
+            conn,
+            event_id="evt_kf",
+            props={
+                "knowledge_facts": [
+                    {
+                        "owner_id": "bot_a",
+                        "target_id": "you",
+                        "fact": "Maya prefers tea over coffee",
+                    }
+                ]
+            },
+        )
+
+        before = _max_event_id(conn)
+        counts = promote_completed_event(
+            conn,
+            event_id="evt_kf",
+            chat_id="chat_bot_a",
+            chat_clock_at="2026-04-30T20:00:00+00:00",
+        )
+
+        assert counts["knowledge_facts"] == 1
+        assert counts["acquired_objects"] == 0
+        assert counts["relationship_change"] == 0
+
+        # An edge_update event landed in the event_log AFTER the promote call.
+        new_edge_updates = _events_after(conn, before, "edge_update")
+        assert len(new_edge_updates) == 1
+        payload = new_edge_updates[0]["payload"]
+        assert payload["source_id"] == "bot_a"
+        assert payload["target_id"] == "you"
+        assert payload["knowledge_facts"] == ["Maya prefers tea over coffee"]
+
+        # And the projected edge has the fact applied.
+        edge = get_edge(conn, "bot_a", "you")
+        assert edge is not None
+        assert "Maya prefers tea over coffee" in edge["knowledge"]
+
+
+def test_relationship_change_emits_manual_edit(tmp_path):
+    """A relationship_change promotes to a manual_edit edge_summary."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        _seed_event(
+            conn,
+            event_id="evt_rc",
+            props={
+                "relationship_change": {
+                    "source_id": "bot_a",
+                    "target_id": "you",
+                    "summary": "they're now dating",
+                }
+            },
+        )
+
+        before = _max_event_id(conn)
+        counts = promote_completed_event(
+            conn,
+            event_id="evt_rc",
+            chat_id="chat_bot_a",
+            chat_clock_at="2026-04-30T20:00:00+00:00",
+        )
+
+        assert counts["relationship_change"] == 1
+        assert counts["knowledge_facts"] == 0
+        assert counts["acquired_objects"] == 0
+
+        new_manual_edits = _events_after(conn, before, "manual_edit")
+        # Filter to edge_summary only — Phase 3 stub may also emit
+        # memory_pov_summary entries for acquired_objects, but here there
+        # are none.
+        edge_summary_edits = [
+            m for m in new_manual_edits
+            if m["payload"].get("target_kind") == "edge_summary"
+        ]
+        assert len(edge_summary_edits) == 1
+        payload = edge_summary_edits[0]["payload"]
+        assert payload["target_kind"] == "edge_summary"
+        assert payload["target_id"] == {"source_id": "bot_a", "target_id": "you"}
+        assert payload["new_value"] == "they're now dating"
+
+
+def test_cancelled_event_does_not_promote(tmp_path):
+    """Cancelled events have promotable props ignored — no follow-on events."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        _seed_event(
+            conn,
+            event_id="evt_canx",
+            props={
+                "knowledge_facts": [
+                    {"owner_id": "bot_a", "target_id": "you", "fact": "x"}
+                ],
+                "relationship_change": {
+                    "source_id": "bot_a",
+                    "target_id": "you",
+                    "summary": "ignored",
+                },
+            },
+            terminal_kind="event_cancelled",
+        )
+
+        before = _max_event_id(conn)
+        counts = promote_completed_event(
+            conn,
+            event_id="evt_canx",
+            chat_id="chat_bot_a",
+            chat_clock_at="2026-04-30T20:00:00+00:00",
+        )
+
+        assert counts == {
+            "acquired_objects": 0,
+            "knowledge_facts": 0,
+            "relationship_change": 0,
+        }
+        assert _events_after(conn, before, "edge_update") == []
+        assert _events_after(conn, before, "manual_edit") == []

tests/test_events_state.py

@@ -0,0 +1,235 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_and_apply, append_event
+from chat.eventlog.projector import project
+import chat.state.entities  # registers handlers
+import chat.state.world  # registers handlers
+import chat.state.group_node  # registers handlers
+import chat.state.events  # registers handlers
+from chat.state.events import (
+    get_event,
+    list_active_events,
+    list_events_in_status,
+)
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": "thoughtful, observant",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "coworker",
+        "kickoff_prose": "",
+    }
+
+
+def _chat_payload(chat_id: str = "chat_bot_a") -> dict:
+    return {
+        "id": chat_id,
+        "host_bot_id": "bot_a",
+        "guest_bot_id": "bot_b",
+        "initial_time": "2026-04-26T20:00:00+00:00",
+        "narrative_anchor": "Day 1 evening",
+        "weather": "clear",
+    }
+
+
+def _seed_chat(conn) -> None:
+    append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+    append_event(conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB"))
+    append_event(conn, kind="chat_created", payload=_chat_payload())
+
+
+def test_event_planned_creates_row(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        append_event(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_abc",
+                "chat_id": "chat_bot_a",
+                "kind": "date_at_park",
+                "props": {"location": "park"},
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        ev = get_event(conn, "evt_abc")
+        assert ev is not None
+        assert ev["event_id"] == "evt_abc"
+        assert ev["chat_id"] == "chat_bot_a"
+        assert ev["kind"] == "date_at_park"
+        assert ev["status"] == "planned"
+        assert ev["props"]["location"] == "park"
+        assert ev["planned_for"] == "2026-04-30T18:00:00+00:00"
+        assert ev["started_at"] is None
+        assert ev["completed_at"] is None
+
+
+def test_event_started_then_completed_updates_status(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        append_event(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_abc",
+                "chat_id": "chat_bot_a",
+                "kind": "date_at_park",
+                "props": {},
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_abc",
+                "started_at": "2026-04-30T18:01:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_completed",
+            payload={
+                "event_id": "evt_abc",
+                "completed_at": "2026-04-30T20:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        ev = get_event(conn, "evt_abc")
+        assert ev is not None
+        assert ev["status"] == "completed"
+        assert ev["started_at"] == "2026-04-30T18:01:00+00:00"
+        assert ev["completed_at"] == "2026-04-30T20:00:00+00:00"
+
+
+def test_event_cancelled_terminal_subsequent_transitions_ignored(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        append_event(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_abc",
+                "chat_id": "chat_bot_a",
+                "kind": "date_at_park",
+                "props": {},
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_cancelled",
+            payload={
+                "event_id": "evt_abc",
+                "completed_at": "2026-04-30T17:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        ev = get_event(conn, "evt_abc")
+        assert ev is not None
+        assert ev["status"] == "cancelled"
+        assert ev["completed_at"] == "2026-04-30T17:00:00+00:00"
+
+        # Subsequent event_started must be no-oped because status is terminal.
+        # Use append_and_apply so we apply ONLY this new event without
+        # replaying earlier non-idempotent handlers (e.g. chat_created).
+        append_and_apply(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_abc",
+                "started_at": "2026-04-30T18:01:00+00:00",
+            },
+        )
+
+        ev2 = get_event(conn, "evt_abc")
+        assert ev2 is not None
+        assert ev2["status"] == "cancelled"
+        assert ev2["started_at"] is None
+        # completed_at unchanged from the cancelled transition
+        assert ev2["completed_at"] == "2026-04-30T17:00:00+00:00"
+
+
+def test_list_active_events_filters_to_planned_and_active(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_chat(conn)
+        # Four events: one planned, one active, one completed, one cancelled.
+        for ev_id, kind in [
+            ("evt_planned", "date_at_park"),
+            ("evt_active", "movie_night"),
+            ("evt_done", "dinner"),
+            ("evt_canx", "trip"),
+        ]:
+            append_event(
+                conn,
+                kind="event_planned",
+                payload={
+                    "event_id": ev_id,
+                    "chat_id": "chat_bot_a",
+                    "kind": kind,
+                    "props": {},
+                    "planned_for": "2026-04-30T18:00:00+00:00",
+                },
+            )
+        append_event(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_active",
+                "started_at": "2026-04-30T18:01:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_done",
+                "started_at": "2026-04-30T18:01:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_completed",
+            payload={
+                "event_id": "evt_done",
+                "completed_at": "2026-04-30T20:00:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="event_cancelled",
+            payload={
+                "event_id": "evt_canx",
+                "completed_at": "2026-04-30T17:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        active = list_active_events(conn, "chat_bot_a")
+        active_ids = {e["event_id"] for e in active}
+        assert active_ids == {"evt_planned", "evt_active"}
+
+        completed = list_events_in_status(conn, "chat_bot_a", "completed")
+        assert [e["event_id"] for e in completed] == ["evt_done"]
+
+        cancelled = list_events_in_status(conn, "chat_bot_a", "cancelled")
+        assert [e["event_id"] for e in cancelled] == ["evt_canx"]

tests/test_meanwhile_state.py

@@ -0,0 +1,269 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+import chat.state.entities  # registers handlers
+import chat.state.world  # registers handlers
+import chat.state.meanwhile  # registers handlers
+from chat.state.meanwhile import (
+    get_parent_scene,
+    list_meanwhile_scenes,
+    list_pending_meanwhile_digests,
+)
+from chat.state.world import active_scene
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": "thoughtful, observant",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "coworker",
+        "kickoff_prose": "",
+    }
+
+
+def _chat_payload(chat_id: str = "chat_bot_a") -> dict:
+    return {
+        "id": chat_id,
+        "host_bot_id": "bot_a",
+        "guest_bot_id": "bot_b",
+        "initial_time": "2026-04-26T20:00:00+00:00",
+        "narrative_anchor": "Day 1 evening",
+        "weather": "clear",
+    }
+
+
+def test_meanwhile_started_creates_scene_with_correct_present_set_kind(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA")
+        )
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB")
+        )
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        # Parent (you-scene) — uses existing scene_opened handler. Will get
+        # the default present_set_kind='you_host' from the new column.
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a", "bot_b"],
+            },
+        )
+        # Now the meanwhile child scene — bot_a + bot_b only.
+        append_event(
+            conn,
+            kind="meanwhile_scene_started",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "parent_scene_id": 1,
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "started_at": "2026-04-26T20:05:00+00:00",
+            },
+        )
+        project(conn)
+
+        meanwhile_scenes = list_meanwhile_scenes(
+            conn, "chat_bot_a", status="active"
+        )
+        assert len(meanwhile_scenes) == 1
+        m = meanwhile_scenes[0]
+        assert m["id"] == 2
+        assert m["chat_id"] == "chat_bot_a"
+        assert m["status"] == "active"
+        assert m["present_set_kind"] == "host_guest"
+        assert m["parent_scene_id"] == 1
+        assert m["started_at"] == "2026-04-26T20:05:00+00:00"
+        assert m["closed_at"] is None
+
+        # Parent linkage helper.
+        parent = get_parent_scene(conn, 2)
+        assert parent is not None
+        assert parent["id"] == 1
+        assert parent["present_set_kind"] == "you_host"
+
+
+def test_meanwhile_closed_marks_scene_closed(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA")
+        )
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB")
+        )
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a", "bot_b"],
+            },
+        )
+        append_event(
+            conn,
+            kind="meanwhile_scene_started",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "parent_scene_id": 1,
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "started_at": "2026-04-26T20:05:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="meanwhile_scene_closed",
+            payload={
+                "scene_id": 2,
+                "closed_at": "2026-04-26T20:15:00+00:00",
+            },
+        )
+        project(conn)
+
+        assert list_meanwhile_scenes(conn, "chat_bot_a", status="active") == []
+        closed = list_meanwhile_scenes(conn, "chat_bot_a", status="closed")
+        assert len(closed) == 1
+        assert closed[0]["id"] == 2
+        assert closed[0]["status"] == "closed"
+        assert closed[0]["closed_at"] == "2026-04-26T20:15:00+00:00"
+
+
+def test_active_you_scene_can_coexist_with_active_meanwhile_scene(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA")
+        )
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB")
+        )
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a", "bot_b"],
+            },
+        )
+        append_event(
+            conn,
+            kind="meanwhile_scene_started",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "parent_scene_id": 1,
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "started_at": "2026-04-26T20:05:00+00:00",
+            },
+        )
+        project(conn)
+
+        # The you-scene is still the active scene from the chat's POV.
+        you_scene = active_scene(conn, "chat_bot_a")
+        assert you_scene is not None
+        assert you_scene["id"] == 1
+
+        # And the meanwhile child is independently active.
+        meanwhile_scenes = list_meanwhile_scenes(
+            conn, "chat_bot_a", status="active"
+        )
+        assert len(meanwhile_scenes) == 1
+        assert meanwhile_scenes[0]["id"] == 2
+        assert meanwhile_scenes[0]["present_set_kind"] == "host_guest"
+
+        # Cross-check via raw query: one row per present_set_kind, both unended.
+        rows = conn.execute(
+            "SELECT id, present_set_kind FROM scenes "
+            "WHERE chat_id = ? AND ended_at IS NULL ORDER BY id",
+            ("chat_bot_a",),
+        ).fetchall()
+        kinds = sorted(r[1] for r in rows)
+        assert kinds == ["host_guest", "you_host"]
+
+
+def test_meanwhile_digest_created_and_consumed(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA")
+        )
+        append_event(
+            conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB")
+        )
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a", "bot_b"],
+            },
+        )
+        append_event(
+            conn,
+            kind="meanwhile_scene_started",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "parent_scene_id": 1,
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "started_at": "2026-04-26T20:05:00+00:00",
+            },
+        )
+        append_event(
+            conn,
+            kind="meanwhile_digest_created",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "summary": "BotA confides in BotB about the missing file.",
+            },
+        )
+        project(conn)
+
+        pending = list_pending_meanwhile_digests(conn, "chat_bot_a")
+        assert len(pending) == 1
+        digest_id = pending[0]["id"]
+        assert pending[0]["scene_id"] == 2
+        assert pending[0]["summary"].startswith("BotA confides")
+
+        # Use append_and_apply for the second beat: re-running project()
+        # would re-fire non-idempotent handlers (chat_created, scene_opened)
+        # whose INSERTs conflict on UNIQUE constraints.
+        from chat.eventlog.log import append_and_apply
+
+        append_and_apply(
+            conn,
+            kind="meanwhile_digest_consumed",
+            payload={
+                "digest_id": digest_id,
+                "consumed_at": "2026-04-26T20:30:00+00:00",
+            },
+        )
+
+        assert list_pending_meanwhile_digests(conn, "chat_bot_a") == []

tests/test_meanwhile_turn_flow.py

@@ -0,0 +1,742 @@
+"""Meanwhile-mode turn flow (T64).
+
+A meanwhile scene runs entirely between two bots — host + guest — with
+"you" absent. The user manually advances the scene by POSTing prose to
+the existing ``/chats/<id>/turns`` endpoint; the route detects the active
+meanwhile scene at the start of ``post_turn`` and dispatches to the
+``process_meanwhile_turn`` controller in ``chat/web/meanwhile.py``.
+
+Coverage:
+
+1. Memory writes for a meanwhile turn carry witness ``[you=0, host=1,
+   guest=1]`` for both the host's and the guest's per-POV memory rows.
+2. State updates after a meanwhile turn run for exactly 2 directed pairs
+   (host -> guest, guest -> host) — no you-related pairs fire.
+3. Speakers alternate across consecutive meanwhile turns: the host
+   speaks first (no prior meanwhile assistant_turn), the guest speaks
+   second (the prior turn's speaker was the host, so this turn's
+   speaker is the OTHER bot).
+4. Scene-close on a meanwhile scene writes per-POV summaries for host +
+   guest only — no "you" POV row is written, mirroring the no-you
+   present_set of the meanwhile scene.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+
+import pytest
+from fastapi.testclient import TestClient
+
+from chat.app import app
+from chat.db.connection import open_db
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+from chat.llm.mock import MockLLMClient
+import chat.state.meanwhile  # noqa: F401  (registers handlers)
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": f"persona for {name}",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "",
+        "kickoff_prose": "...",
+    }
+
+
+def _seed_meanwhile_chat(db_path: Path) -> None:
+    """Seed two bots, you, a chat with both wired in, an open parent
+    you-scene, AND an active meanwhile child scene with bot_a + bot_b.
+
+    Edges are seeded for both directed pairs between bot_a and bot_b at
+    schema-default 50/50 so post-turn state-update writes land cleanly.
+    Activities for both bots are recorded so the prompt assembler has
+    something to render.
+    """
+    with open_db(db_path) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_b", "BotB"))
+        append_event(
+            conn,
+            kind="you_authored",
+            payload={"name": "Me", "pronouns": "they/them", "persona": ""},
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="container_created",
+            payload={
+                "chat_id": "chat_bot_a",
+                "name": "office",
+                "type": "workplace",
+                "properties": {},
+            },
+        )
+        # Parent (you-scene) opens first.
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "container_id": 1,
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a", "bot_b"],
+            },
+        )
+        # Meanwhile child scene — bot_a + bot_b only, parent linked.
+        append_event(
+            conn,
+            kind="meanwhile_scene_started",
+            payload={
+                "scene_id": 2,
+                "chat_id": "chat_bot_a",
+                "parent_scene_id": 1,
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "started_at": "2026-04-26T20:05:00+00:00",
+            },
+        )
+        # Seed both directed edges between the bots so state-update
+        # writes land on initialized rows.
+        for src, tgt in [("bot_a", "bot_b"), ("bot_b", "bot_a")]:
+            append_event(
+                conn,
+                kind="edge_update",
+                payload={
+                    "source_id": src,
+                    "target_id": tgt,
+                    "chat_id": "chat_bot_a",
+                    "knowledge_facts": [],
+                },
+            )
+        for entity_id, verb in [("bot_a", "listening"), ("bot_b", "talking")]:
+            append_event(
+                conn,
+                kind="activity_change",
+                payload={
+                    "entity_id": entity_id,
+                    "posture": "sitting",
+                    "action": {
+                        "verb": verb,
+                        "interruptible": True,
+                        "required_attention": "low",
+                        "expected_duration": "ongoing",
+                    },
+                    "attention": "",
+                    "holding": [],
+                    "status": {},
+                },
+            )
+        project(conn)
+
+
+def _override_llm(canned: list[str]) -> MockLLMClient:
+    from chat.web.kickoff import get_llm_client
+
+    mock = MockLLMClient(canned=list(canned))
+    app.dependency_overrides[get_llm_client] = lambda: mock
+    return mock
+
+
+def _zero_state() -> str:
+    return json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+
+
+@pytest.fixture
+def app_state_setup(tmp_path, monkeypatch):
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    db = tmp_path / "test.db"
+    monkeypatch.setenv("CHAT_DB_PATH", str(db))
+    with TestClient(app) as c:
+        app.state.background_worker.enabled = False
+        yield c
+    app.dependency_overrides.clear()
+
+
+def test_meanwhile_turn_writes_memories_with_witness_0_1_1(
+    app_state_setup, tmp_path
+):
+    """A meanwhile turn writes one ``memory_written`` event per bot — host
+    and guest — with witness flags ``[you=0, host=1, guest=1]``. "You" is
+    not present in the scene, so the witness_you flag must be 0 for both
+    rows.
+
+    Canned queue (4 calls):
+      1. parse_turn (user prose classification)
+      2. narrative stream (host speaks first; no prior meanwhile turn)
+      3. state-update for bot_a -> bot_b
+      4. state-update for bot_b -> bot_a
+    """
+    _seed_meanwhile_chat(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they exchange a glance"}]}
+    )
+    canned = [
+        canned_parse,
+        "BotA leans in. *quietly* Tell me what you saw.",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "they exchange a glance"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'memory_written' "
+            "ORDER BY id"
+        ).fetchall()
+        payloads = [json.loads(r[0]) for r in rows]
+
+    assert len(payloads) == 2
+    owners = sorted(p["owner_id"] for p in payloads)
+    assert owners == ["bot_a", "bot_b"]
+    for p in payloads:
+        assert p["witness_you"] == 0, p
+        assert p["witness_host"] == 1, p
+        assert p["witness_guest"] == 1, p
+
+
+def test_meanwhile_turn_emits_2_edge_updates_only(app_state_setup, tmp_path):
+    """A meanwhile turn runs state-update for exactly 2 directed pairs:
+    host -> guest and guest -> host. No you-related pairs fire.
+    """
+    _seed_meanwhile_chat(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they whisper"}]}
+    )
+    canned = [
+        canned_parse,
+        "BotA whispers. *softly* I noticed something today.",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "they whisper"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        # Edge updates landed AFTER the assistant_turn (i.e. excluding
+        # the seed updates done before the request).
+        max_at = conn.execute(
+            "SELECT MAX(id) FROM event_log WHERE kind = 'assistant_turn'"
+        ).fetchone()[0]
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'edge_update' AND id > ? ORDER BY id",
+            (max_at,),
+        ).fetchall()
+        payloads = [json.loads(r[0]) for r in rows]
+
+    # Exactly 2 post-turn edge_update events.
+    assert len(payloads) == 2
+    pairs = sorted((p["source_id"], p["target_id"]) for p in payloads)
+    assert pairs == [("bot_a", "bot_b"), ("bot_b", "bot_a")]
+    # And NO you-related pair leaked in.
+    for p in payloads:
+        assert p["source_id"] != "you", p
+        assert p["target_id"] != "you", p
+
+
+def test_meanwhile_turn_alternates_speaker(app_state_setup, tmp_path):
+    """Successive meanwhile turns alternate which bot speaks.
+
+    The first turn has no prior meanwhile ``assistant_turn`` linked to
+    this scene, so the host speaks. The second turn finds the latest
+    such ``assistant_turn``'s speaker (the host) and picks the OTHER
+    bot, so the guest speaks. Each ``assistant_turn`` payload carries
+    ``meanwhile_scene_id`` so the alternation lookup is unambiguous.
+    """
+    _seed_meanwhile_chat(tmp_path / "test.db")
+    canned_parse_1 = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they pause"}]}
+    )
+    canned_1 = [
+        canned_parse_1,
+        "BotA speaks first. *quietly*",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned_1)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "they pause"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    canned_parse_2 = json.dumps(
+        {"segments": [{"kind": "narration", "text": "and again"}]}
+    )
+    canned_2 = [
+        canned_parse_2,
+        "BotB replies. *thoughtfully*",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned_2)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "and again"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' ORDER BY id"
+        ).fetchall()
+        payloads = [json.loads(r[0]) for r in rows]
+
+    assert len(payloads) == 2
+    # First turn — host speaks.
+    assert payloads[0]["speaker_id"] == "bot_a"
+    # Second turn — guest speaks (alternation).
+    assert payloads[1]["speaker_id"] == "bot_b"
+    # Both payloads tag this meanwhile scene id so the alternation
+    # lookup can scope to it specifically (not any other assistant_turn
+    # that might exist on the chat).
+    assert payloads[0]["meanwhile_scene_id"] == 2
+    assert payloads[1]["meanwhile_scene_id"] == 2
+    # Both also carry the present_set_kind discriminator for downstream
+    # filters (digest creation, drawer rendering).
+    assert payloads[0]["present_set_kind"] == "host_guest"
+    assert payloads[1]["present_set_kind"] == "host_guest"
+
+
+def test_meanwhile_scene_close_writes_per_pov_for_both_bots_only(
+    app_state_setup, tmp_path
+):
+    """When a meanwhile scene closes, per-POV summary rewrites land for
+    the host and the guest. No write fires for "you" — there is no
+    "you" memory store and no "you" POV in the meanwhile present set.
+    """
+    from chat.services.scene_summarize import apply_scene_close_summary
+    from chat.eventlog.log import append_and_apply
+
+    _seed_meanwhile_chat(tmp_path / "test.db")
+
+    # Run a meanwhile turn first so each bot has a memory row scoped to
+    # the meanwhile scene_id (=2). The per-POV rewrite targets these
+    # rows by ``scene_id``.
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they speak quietly"}]}
+    )
+    canned = [
+        canned_parse,
+        "BotA speaks. *quietly*",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "they speak quietly"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    # Close the meanwhile scene and run the close-summary pipeline.
+    # Two POV summaries (host + guest) — no "you" POV.
+    pov_payload_host = json.dumps(
+        {
+            "summary": "BotA reflects on the quiet moment with BotB.",
+            "knowledge_facts": [],
+            "relationship_summary": "",
+        }
+    )
+    pov_payload_guest = json.dumps(
+        {
+            "summary": "BotB notices BotA's reserved manner.",
+            "knowledge_facts": [],
+            "relationship_summary": "",
+        }
+    )
+    # T65 added a meanwhile digest summarize call after per-POV writes
+    # for meanwhile scenes. T58's thread detection is wrapped in try/except
+    # so its IndexError is swallowed gracefully.
+    digest_payload = json.dumps(
+        {
+            "summary": "While you were away, BotA and BotB talked quietly.",
+            "knowledge_facts": [],
+            "relationship_summary": "",
+        }
+    )
+    close_mock = MockLLMClient(
+        canned=[pov_payload_host, pov_payload_guest, digest_payload]
+    )
+
+    import asyncio as _asyncio
+
+    with open_db(tmp_path / "test.db") as conn:
+        # asyncio.run() can't nest under TestClient's loop, but the
+        # close pipeline is awaitable — drive it via a fresh loop here.
+        _loop = _asyncio.new_event_loop()
+        # Mark the meanwhile scene closed via the projector handler.
+        append_and_apply(
+            conn,
+            kind="meanwhile_scene_closed",
+            payload={
+                "scene_id": 2,
+                "closed_at": "2026-04-26T20:30:00+00:00",
+            },
+        )
+
+        # apply_scene_close_summary takes host_bot_id; here we tell it to
+        # operate on the meanwhile scene id (2). With no "you" memory
+        # row to rewrite (witness_you=0 means "you" doesn't have a
+        # memory for this scene), the call must produce per-POV writes
+        # ONLY for bot_a and bot_b.
+        try:
+            _loop.run_until_complete(
+                apply_scene_close_summary(
+                    conn,
+                    close_mock,
+                    classifier_model="x",
+                    chat_id="chat_bot_a",
+                    scene_id=2,
+                    host_bot_id="bot_a",
+                )
+            )
+        finally:
+            _loop.close()
+
+        # Per-POV memory rewrites: count manual_edits with target_kind
+        # ``memory_pov_summary`` whose target_id maps to a memory row
+        # scoped to scene 2.
+        edits = conn.execute(
+            "SELECT payload_json FROM event_log WHERE kind = 'manual_edit'"
+        ).fetchall()
+        pov_edits = []
+        for (raw,) in edits:
+            payload = json.loads(raw)
+            if payload.get("target_kind") != "memory_pov_summary":
+                continue
+            mem_row = conn.execute(
+                "SELECT owner_id, scene_id FROM memories WHERE id = ?",
+                (payload["target_id"],),
+            ).fetchone()
+            if mem_row is None or mem_row[1] != 2:
+                continue
+            pov_edits.append({"owner": mem_row[0], "new": payload["new_value"]})
+
+        # Verify the actual current pov_summary on each bot's memory row
+        # for scene 2 reflects the rewrite.
+        host_pov = conn.execute(
+            "SELECT pov_summary FROM memories WHERE owner_id = ? AND scene_id = ?",
+            ("bot_a", 2),
+        ).fetchone()
+        guest_pov = conn.execute(
+            "SELECT pov_summary FROM memories WHERE owner_id = ? AND scene_id = ?",
+            ("bot_b", 2),
+        ).fetchone()
+        # No "you" memory row should exist for the meanwhile scene —
+        # "you" was never a witness.
+        you_row = conn.execute(
+            "SELECT id FROM memories WHERE owner_id = 'you' AND scene_id = ?",
+            (2,),
+        ).fetchone()
+
+    # Exactly two memory_pov_summary rewrites — one per bot witness.
+    assert len(pov_edits) == 2
+    owners = sorted(e["owner"] for e in pov_edits)
+    assert owners == ["bot_a", "bot_b"]
+    assert host_pov is not None and "BotA reflects" in host_pov[0]
+    assert guest_pov is not None and "BotB notices" in guest_pov[0]
+    # No "you" POV row — meanwhile scenes don't surface a you-memory.
+    assert you_row is None
+
+
+def test_meanwhile_turn_registered_in_in_flight_tasks(
+    app_state_setup, tmp_path
+):
+    """A meanwhile turn registers its streaming task in the chat-keyed
+    ``_in_flight_tasks`` registry the cancel route reads from, and clears
+    the entry after the stream completes.
+
+    Without registration, ``POST /chats/<id>/turns/cancel`` would be a
+    silent no-op for meanwhile beats — the Stop button wouldn't actually
+    stop them. We pin the behaviour via a streaming mock that snapshots
+    ``_in_flight_tasks`` at the moment of its first yield (mid-flight),
+    then assert the entry is removed after the response returns.
+    """
+    from typing import AsyncIterator, Sequence
+
+    from chat.llm.client import Message
+    from chat.web.turns import _in_flight_tasks
+
+    _seed_meanwhile_chat(tmp_path / "test.db")
+
+    # Snapshot of (chat_id-present?, registered task object) captured
+    # at the first stream yield. The closure runs inside the streaming
+    # coroutine, so when it executes the task is alive and registered.
+    in_flight_snapshot: dict = {}
+
+    class _SnapshotMock(MockLLMClient):
+        async def stream(
+            self, messages: Sequence[Message], *, model: str, **params
+        ) -> AsyncIterator[str]:
+            text = self._canned.pop(0)
+            for i, ch in enumerate(text):
+                if i == 0:
+                    # Snapshot at first yield — the post_turn coroutine
+                    # is awaiting our generator and the streaming Task
+                    # is registered in _in_flight_tasks[chat_id].
+                    in_flight_snapshot["present"] = (
+                        "chat_bot_a" in _in_flight_tasks
+                    )
+                    in_flight_snapshot["task"] = _in_flight_tasks.get(
+                        "chat_bot_a"
+                    )
+                yield ch
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they exchange a glance"}]}
+    )
+    mock = _SnapshotMock(
+        canned=[
+            canned_parse,
+            "BotA leans in. *quietly*",
+            _zero_state(),
+            _zero_state(),
+        ]
+    )
+    from chat.web.kickoff import get_llm_client
+
+    app.dependency_overrides[get_llm_client] = lambda: mock
+    try:
+        # Pre-condition: registry is empty for this chat.
+        assert "chat_bot_a" not in _in_flight_tasks
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "they exchange a glance"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+
+    # Mid-flight: the streaming task was present in the registry, and
+    # the captured value was an asyncio.Task (not None / not some other
+    # placeholder).
+    import asyncio
+
+    assert in_flight_snapshot.get("present") is True, (
+        "_in_flight_tasks was empty at first yield — meanwhile stream "
+        "isn't registering its task"
+    )
+    assert isinstance(in_flight_snapshot.get("task"), asyncio.Task)
+    # Post-flight: the entry has been cleaned up so the next turn (or
+    # the cancel route) doesn't see a stale task.
+    assert "chat_bot_a" not in _in_flight_tasks
+
+
+def test_meanwhile_turn_cancellation_via_route(app_state_setup, tmp_path):
+    """T85.2: a cancellation that fires while a meanwhile beat is
+    streaming truncates the assistant_turn and skips the post-turn
+    memory + state-update writes — the same end-to-end shape the
+    /turns/cancel route produces.
+
+    Drives the cancel by hijacking ``client.stream`` to raise
+    CancelledError on its first iteration — the exact pattern proven
+    by ``test_cancelled_turn_still_closes_scene_when_user_prose_signals_close``
+    in ``tests/test_turn_flow.py``. This mirrors what
+    ``cancel_turn`` does in production (``task.cancel()`` schedules a
+    CancelledError on the next await); doing the raise inline avoids
+    the TestClient-loop-reentry problem that prevents driving a second
+    POST mid-stream from the same synchronous test thread, while
+    exercising the same code path: the meanwhile streamer's
+    ``except asyncio.CancelledError`` block at meanwhile.py:276 sets
+    ``cancelled=True`` + ``truncated=True``, the assistant_turn lands
+    with the partial, and the memory/state-update branch is skipped.
+
+    The ``_in_flight_tasks`` registration that wires the cancel route
+    to the meanwhile streamer is independently pinned by
+    ``test_meanwhile_turn_registered_in_in_flight_tasks`` above; this
+    test pins the downstream behavioural shape the registration
+    enables — together they cover the full Stop-button lifecycle for
+    meanwhile beats.
+
+    Behavioural pins:
+
+    * ``assistant_turn`` lands with ``truncated=True``,
+      ``meanwhile_scene_id=2``, ``speaker_id="bot_a"``.
+    * No ``memory_written`` events fire (cancel skips per-bot writes).
+    * No post-turn ``edge_update`` events fire (cancel skips state updates).
+    * ``_in_flight_tasks`` is empty post-flight.
+    """
+    from typing import AsyncIterator, Sequence
+
+    from chat.llm.client import Message
+    from chat.web.turns import _in_flight_tasks
+
+    _seed_meanwhile_chat(tmp_path / "test.db")
+
+    class _CancelOnStreamMock(MockLLMClient):
+        """Yields CancelledError on first iteration of ``stream`` —
+        simulates ``cancel_turn`` having fired ``task.cancel()`` on the
+        in-flight streaming task. ``generate`` is delegated to the
+        canned-queue base so parse_turn still resolves cleanly.
+        """
+
+        async def stream(
+            self, messages: Sequence[Message], *, model: str, **params
+        ) -> AsyncIterator[str]:
+            raise asyncio.CancelledError
+            yield  # pragma: no cover — keeps this an async generator.
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they exchange a glance"}]}
+    )
+    # Canned queue: only parse_turn — the narrative slot is never pulled
+    # because stream raises before consuming it, and post-turn
+    # state-update is skipped by the cancel branch.
+    mock = _CancelOnStreamMock(canned=[canned_parse])
+    from chat.web.kickoff import get_llm_client
+
+    app.dependency_overrides[get_llm_client] = lambda: mock
+    try:
+        # The meanwhile controller re-raises CancelledError after the
+        # partial assistant_turn is recorded (meanwhile.py:387). The
+        # outer post_turn route has no catch for CancelledError on the
+        # meanwhile path (turns.py:244-254 only catches ValueError), so
+        # the exception propagates up through Starlette. TestClient
+        # surfaces that as a 500 or a propagated exception depending on
+        # Starlette/asyncio versions; we don't pin the response.
+        try:
+            app_state_setup.post(
+                "/chats/chat_bot_a/turns",
+                data={"prose": "they exchange a glance"},
+            )
+        except BaseException:
+            pass
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        assistant_rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' ORDER BY id"
+        ).fetchall()
+        memory_count = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'memory_written'"
+        ).fetchone()[0]
+        # Edge updates AFTER the assistant_turn (i.e. excluding seeded ones).
+        max_at_row = conn.execute(
+            "SELECT MAX(id) FROM event_log WHERE kind = 'assistant_turn'"
+        ).fetchone()
+        max_at = max_at_row[0] if max_at_row[0] is not None else 0
+        post_turn_edge_updates = conn.execute(
+            "SELECT COUNT(*) FROM event_log "
+            "WHERE kind = 'edge_update' AND id > ?",
+            (max_at,),
+        ).fetchone()[0]
+
+    # The cancelled assistant_turn was still recorded with truncated=True,
+    # carrying whatever partial text accumulated before cancel propagated
+    # (zero text here since the cancel hits on the first iteration).
+    assert len(assistant_rows) == 1
+    payload = json.loads(assistant_rows[0][0])
+    assert payload["truncated"] is True, payload
+    assert payload["meanwhile_scene_id"] == 2
+    assert payload["speaker_id"] == "bot_a"
+
+    # No per-bot memory writes — cancellation short-circuits the memory
+    # + state-update branch (see chat/web/meanwhile.py:308).
+    assert memory_count == 0
+
+    # No post-turn edge_updates — same short-circuit.
+    assert post_turn_edge_updates == 0
+
+    # Post-flight: registry cleared so the cancel route won't try to
+    # re-cancel a defunct task on a follow-up POST.
+    assert "chat_bot_a" not in _in_flight_tasks
+
+
+def test_meanwhile_cancel_route_no_op_after_turn_completes(
+    app_state_setup, tmp_path
+):
+    """T85.2: POST ``/chats/<id>/turns/cancel`` AFTER a meanwhile turn
+    has fully completed is a silent 204 no-op — there is no in-flight
+    task to cancel, the registry is empty, and the route must not error.
+
+    Pins the cancel endpoint's robustness against the common-but-racy
+    sequence where the user clicks Stop just after the stream finished
+    (the SSE channel hasn't yet flipped the client-side ``isStreaming``
+    flag). This is a complement to the snapshot test: the snapshot test
+    pins that the registry IS populated mid-flight, this test pins that
+    it isn't AFTER and that the route copes gracefully.
+    """
+    from chat.web.turns import _in_flight_tasks
+
+    _seed_meanwhile_chat(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "they exchange a glance"}]}
+    )
+    canned = [
+        canned_parse,
+        "BotA leans in. *quietly*",
+        _zero_state(),
+        _zero_state(),
+    ]
+    mock = _override_llm(canned)
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "they exchange a glance"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    # Registry was cleaned up after the stream completed.
+    assert "chat_bot_a" not in _in_flight_tasks
+
+    # Cancel after-the-fact: 204, no error, registry stays empty.
+    cancel_response = app_state_setup.post(
+        "/chats/chat_bot_a/turns/cancel"
+    )
+    assert cancel_response.status_code == 204
+    assert "chat_bot_a" not in _in_flight_tasks

tests/test_memory_search.py

@@ -125,3 +125,37 @@ def test_search_invalid_witness_role_raises(tmp_path):
     with open_db(db) as conn:
         with pytest.raises(ValueError):
             search_memories(conn, "bot_a", "invalid_role", "anything", k=4)
+
+
+def test_higher_significance_outranks_equal_rank(tmp_path):
+    """T57: significance multiplier biases the SQL ORDER BY.
+
+    Two memories with IDENTICAL FTS-matching text yield (effectively) equal
+    BM25 ranks. The significance bias applied in the SQL ORDER BY must
+    surface the higher-significance row first.
+    """
+    db = tmp_path / "t.db"
+    _seed(
+        db,
+        memory_specs=[
+            # Identical pov_summary text -> FTS BM25 rank is the same for both.
+            {"pov_summary": "she swore an oath", "significance": 0},
+            {"pov_summary": "she swore an oath", "significance": 3},
+        ],
+    )
+    with open_db(db) as conn:
+        out = search_memories(conn, "bot_a", "host", "oath", k=5)
+        assert len(out) == 2
+        # Higher significance wins despite tied FTS rank.
+        assert out[0]["significance"] == 3
+        assert out[1]["significance"] == 0
+
+
+def test_significance_bias_is_constant_module_level():
+    """T57: pin ``SIGNIFICANCE_RANK_BIAS`` as a tunable module-level numeric."""
+    from chat.state.memory import SIGNIFICANCE_RANK_BIAS
+
+    assert isinstance(SIGNIFICANCE_RANK_BIAS, (int, float))
+    # Must be non-negative -- a negative bias would invert the desired
+    # "higher significance ranks higher" semantics.
+    assert SIGNIFICANCE_RANK_BIAS >= 0

tests/test_memory_write.py

@@ -22,7 +22,7 @@ from chat.db.migrate import apply_migrations
 from chat.eventlog.log import append_event
 from chat.eventlog.projector import project
 from chat.llm.mock import MockLLMClient
-from chat.services.memory_write import record_turn_memory, record_turn_memory_for_present
+from chat.services.memory_write import record_turn_memory_for_present
 import chat.state.entities  # noqa: F401  - register handlers
 import chat.state.memory  # noqa: F401
 import chat.state.world  # noqa: F401
@@ -64,14 +64,19 @@ def test_record_turn_memory_writes_event_and_projects(tmp_path):
     apply_migrations(db)
     _seed_minimal(db)
     with open_db(db) as conn:
-        eid, mid = record_turn_memory(
+        # T90.3: legacy ``record_turn_memory`` was removed; the unified
+        # ``record_turn_memory_for_present`` with ``guest_bot_id=None``
+        # produces the same single-bot witness mask [1,1,0].
+        result = record_turn_memory_for_present(
             conn,
             chat_id="chat_bot_a",
             host_bot_id="bot_a",
+            guest_bot_id=None,
             narrative_text="BotA looks up. 'You're back late.'",
             scene_id=None,
             chat_clock_at="2026-04-26T20:00:00+00:00",
         )
+        eid, mid = result["bot_a"]
         assert eid > 0
         assert mid is not None and mid > 0
 
@@ -111,12 +116,15 @@ def test_record_turn_memory_omits_optional_fields(tmp_path):
     _seed_minimal(db)
     with open_db(db) as conn:
         # Call without scene_id/chat_clock_at — should default to None.
-        eid, mid = record_turn_memory(
+        # T90.3: migrated from legacy ``record_turn_memory``.
+        result = record_turn_memory_for_present(
             conn,
             chat_id="chat_bot_a",
             host_bot_id="bot_a",
+            guest_bot_id=None,
             narrative_text="A simple memory.",
         )
+        eid, mid = result["bot_a"]
         assert eid > 0
         assert mid is not None and mid > 0
 
@@ -444,3 +452,91 @@ def test_record_for_present_dict_keys_match(tmp_path):
             narrative_text="Both bots witness this.",
         )
         assert set(result_with_guest.keys()) == {"bot_a", "bot_b"}
+
+
+# ---------------------------------------------------------------------------
+# T84: unified record_turn_memory_for_present API with you_present kwarg.
+# ---------------------------------------------------------------------------
+
+
+def test_record_turn_memory_you_present_false_writes_meanwhile_witness_mask(tmp_path):
+    """When ``you_present=False`` the witness mask should be
+    ``[you=0, host=1, guest=1]`` for both bots — the meanwhile shape."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    _seed_two_bots(db)
+    with open_db(db) as conn:
+        result = record_turn_memory_for_present(
+            conn,
+            chat_id="chat_ab",
+            host_bot_id="bot_a",
+            guest_bot_id="bot_b",
+            narrative_text="BotA and BotB confer privately.",
+            scene_id=None,
+            chat_clock_at="2026-04-26T20:00:00+00:00",
+            you_present=False,
+        )
+
+        assert set(result.keys()) == {"bot_a", "bot_b"}
+
+        rows = conn.execute(
+            "SELECT owner_id, witness_you, witness_host, witness_guest "
+            "FROM memories ORDER BY owner_id"
+        ).fetchall()
+        assert len(rows) == 2
+        for _owner, w_you, w_host, w_guest in rows:
+            assert w_you == 0
+            assert w_host == 1
+            assert w_guest == 1
+
+        # Two memory_written events were appended.
+        cur = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'memory_written'"
+        )
+        assert cur.fetchone()[0] == 2
+
+
+def test_record_turn_memory_you_present_true_default_writes_normal_witness_mask(tmp_path):
+    """Default ``you_present=True`` preserves Phase 2 behaviour:
+    ``witness_you=1`` for the host POV row."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    _seed_minimal(db)
+    with open_db(db) as conn:
+        # No explicit you_present arg — should default to True.
+        result = record_turn_memory_for_present(
+            conn,
+            chat_id="chat_bot_a",
+            host_bot_id="bot_a",
+            guest_bot_id=None,
+            narrative_text="BotA hums to herself.",
+        )
+        assert set(result.keys()) == {"bot_a"}
+
+        row = conn.execute(
+            "SELECT witness_you, witness_host, witness_guest "
+            "FROM memories WHERE owner_id = 'bot_a'"
+        ).fetchone()
+        assert row is not None
+        w_you, w_host, w_guest = row
+        assert w_you == 1
+        assert w_host == 1
+        assert w_guest == 0
+
+
+def test_record_turn_memory_you_present_false_requires_guest(tmp_path):
+    """Calling with ``you_present=False`` and no ``guest_bot_id`` is a
+    programming error — meanwhile scenes always have both bots."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    _seed_minimal(db)
+    with open_db(db) as conn:
+        with pytest.raises(ValueError, match="you_present=False requires guest_bot_id"):
+            record_turn_memory_for_present(
+                conn,
+                chat_id="chat_bot_a",
+                host_bot_id="bot_a",
+                guest_bot_id=None,
+                narrative_text="invalid",
+                you_present=False,
+            )

tests/test_open_db_threading.py

@@ -0,0 +1,57 @@
+from __future__ import annotations
+import sqlite3
+import threading
+
+from chat.db.connection import open_db
+
+
+def test_open_db_default_uses_check_same_thread_true(tmp_path):
+    """Default open_db must reject cross-thread use (safe default)."""
+    db = tmp_path / "t.db"
+    captured: list[BaseException | None] = []
+
+    with open_db(db) as conn:
+        conn.execute("CREATE TABLE t (x INTEGER)")
+
+        def worker():
+            try:
+                conn.execute("SELECT 1").fetchall()
+                captured.append(None)
+            except BaseException as e:  # noqa: BLE001
+                captured.append(e)
+
+        t = threading.Thread(target=worker)
+        t.start()
+        t.join()
+
+    assert len(captured) == 1
+    err = captured[0]
+    assert isinstance(err, sqlite3.ProgrammingError), (
+        f"expected sqlite3.ProgrammingError on cross-thread use, got {err!r}"
+    )
+
+
+def test_open_db_can_disable_check_same_thread(tmp_path):
+    """open_db(check_same_thread=False) must allow cross-thread use."""
+    db = tmp_path / "t.db"
+    captured: list[BaseException | None] = []
+    rows: list[object] = []
+
+    with open_db(db, check_same_thread=False) as conn:
+        conn.execute("CREATE TABLE t (x INTEGER)")
+        conn.execute("INSERT INTO t (x) VALUES (42)")
+
+        def worker():
+            try:
+                result = conn.execute("SELECT x FROM t").fetchall()
+                rows.extend(result)
+                captured.append(None)
+            except BaseException as e:  # noqa: BLE001
+                captured.append(e)
+
+        t = threading.Thread(target=worker)
+        t.start()
+        t.join()
+
+    assert captured == [None], f"worker thread raised: {captured}"
+    assert rows == [(42,)]

tests/test_prompt.py

@@ -12,14 +12,16 @@ import pytest
 
 from chat.db.connection import open_db
 from chat.db.migrate import apply_migrations
-from chat.eventlog.log import append_event
+from chat.eventlog.log import append_and_apply, append_event
 from chat.eventlog.projector import project
 import chat.state.entities  # noqa: F401  (registers handlers)
 import chat.state.edges  # noqa: F401
 import chat.state.memory  # noqa: F401
 import chat.state.world  # noqa: F401
+import chat.state.events  # noqa: F401
+import chat.state.threads  # noqa: F401
 from chat.llm.client import Message
-from chat.services.prompt import assemble_narrative_prompt
+from chat.services.prompt import _witness_role_for, assemble_narrative_prompt
 
 
 def _seed_basic(conn) -> None:
@@ -452,6 +454,273 @@ def test_assemble_when_speaker_is_guest_orients_edges_correctly(tmp_path):
     assert "68/100" in body
 
 
+def test_speaker_is_guest_uses_guest_witness_role(tmp_path, monkeypatch):
+    """T71.1: when the guest is the speaker, ``search_memories`` is
+    called with ``witness_role="guest"``, not the previously-hardcoded
+    ``"host"``. Pins the parametric witness role at the prompt call site
+    so guest-as-speaker honours the witness mask via Phase 2 T46.
+    """
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    captured: dict = {}
+
+    def _fake_search(conn, owner_id, witness_role, query, k=4):
+        captured["owner_id"] = owner_id
+        captured["witness_role"] = witness_role
+        captured["query"] = query
+        return []
+
+    # Patch the imported reference inside the prompt module so the
+    # production call site uses the fake.
+    import chat.services.prompt as prompt_mod
+    monkeypatch.setattr(prompt_mod, "search_memories", _fake_search)
+
+    with open_db(db) as conn:
+        _seed_with_guest(conn)
+        # Guest as speaker — must request memories with witness_role="guest".
+        assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_b",
+            recent_dialogue=[],
+            # retrieved_memory_summaries=None forces the search path.
+            retrieved_memory_summaries=None,
+        )
+    assert captured["owner_id"] == "bot_b"
+    assert captured["witness_role"] == "guest"
+
+
+def test_speaker_is_host_uses_host_witness_role(tmp_path, monkeypatch):
+    """T71.1 (regression): host-as-speaker still queries with
+    ``witness_role="host"``."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    captured: dict = {}
+
+    def _fake_search(conn, owner_id, witness_role, query, k=4):
+        captured["witness_role"] = witness_role
+        return []
+
+    import chat.services.prompt as prompt_mod
+    monkeypatch.setattr(prompt_mod, "search_memories", _fake_search)
+
+    with open_db(db) as conn:
+        _seed_with_guest(conn)
+        assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",  # host as speaker
+            recent_dialogue=[],
+            retrieved_memory_summaries=None,
+        )
+    assert captured["witness_role"] == "host"
+
+
+def test_single_activities_block_with_three_bullets_when_3_entities(tmp_path):
+    """T71.2: with you + host + guest present, the assembled prompt
+    contains exactly ONE ``ACTIVITIES:`` header and bullets for all
+    three entities (no duplicate header from the prior dual-block
+    rendering).
+    """
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_with_guest(conn)
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=[],
+            retrieved_memory_summaries=[],
+        )
+    body = msgs[0].content
+    # Exactly one ACTIVITIES: header.
+    assert body.count("ACTIVITIES:") == 1
+    # Bullets for all three entities (you=Sam, host=Aria, guest=Iris)
+    # — pin on the unique action verbs from the seed data.
+    assert "finishing emails" in body  # you bullet
+    assert "pretending to work" in body  # speaker (host) bullet
+    assert "smirking-distinctively" in body  # guest bullet
+
+
+def test_tight_budget_drops_guest_activity_bullet_first(tmp_path):
+    """T71.2: under tight budget the speaker bullet survives but the
+    guest activity bullet is the first ACTIVITIES: bullet to drop. The
+    block as a whole stays present (it's MUST-tier); only its body
+    contracts.
+    """
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_with_guest(conn)
+        dialogue = [
+            {"speaker": "you", "text": "line-16 hi there"},
+            {"speaker": "bot_a", "text": "line-17 hey"},
+            {"speaker": "you", "text": "line-18 quiet night"},
+            {"speaker": "bot_a", "text": "line-19 indeed"},
+        ]
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=dialogue,
+            retrieved_memory_summaries=[],
+            budget_soft=250,
+            budget_hard=340,
+        )
+    body = msgs[0].content
+    # Speaker bullet survives (MUST-tier floor).
+    assert "pretending to work" in body
+    assert "ACTIVITIES:" in body
+    # Guest bullet is dropped first under budget pressure.
+    assert "smirking-distinctively" not in body
+
+
+def test_nice_trim_order_documented(tmp_path):
+    """T71.3: pin the NICE-tier trim order so a future refactor can't
+    quietly invert it.
+
+    Order under NICE pressure is:
+      1. previous-scene summary (dropped FIRST)
+      2. memories beyond top-2
+      3. older dialogue turns (collapsed to last-4)
+
+    We size the budget so that all-NICE-included is over soft, but
+    dropping ONLY previous-scene gets us back under soft. The observed
+    behaviour we pin: previous-scene gone, memories/dialogue intact.
+    """
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    # Heavy previous-scene summary — large enough that dropping it
+    # alone clears the soft-budget overage. Defined out here so the
+    # marker is in scope for the assertions below.
+    prev_scene_blob = "PREVSCENE-MARKER " + ("filler " * 200)
+    with open_db(db) as conn:
+        # Append all events first, project once at the end (project is
+        # not idempotent — it replays every event in the log).
+        from chat.eventlog.log import append_event as _append
+        _append(conn, kind="bot_authored", payload={
+            "id": "bot_a",
+            "name": "Aria",
+            "persona": "reserved coworker who notices things",
+            "voice_samples": ["I — sorry, I didn't mean to."],
+            "traits": ["introverted"],
+            "backstory": "An archivist who joined the firm last spring.",
+            "initial_relationship_to_you": "coworker",
+            "kickoff_prose": "you stay late at the office",
+        })
+        _append(conn, kind="you_authored", payload={
+            "name": "Sam",
+            "pronouns": "they/them",
+            "persona": "tired analyst",
+        })
+        _append(conn, kind="chat_created", payload={
+            "id": "chat_bot_a",
+            "host_bot_id": "bot_a",
+            "guest_bot_id": None,
+            "initial_time": "2026-04-26T20:00:00+00:00",
+            "narrative_anchor": "Day 1 evening",
+            "weather": "clear",
+        })
+        _append(conn, kind="container_created", payload={
+            "chat_id": "chat_bot_a",
+            "name": "office bullpen",
+            "type": "workplace",
+            "properties": {"public": False, "moving": False, "audible_range": "room"},
+        })
+        _append(conn, kind="edge_update", payload={
+            "source_id": "bot_a",
+            "target_id": "you",
+            "affinity_delta": 12,
+            "trust_delta": 5,
+            "knowledge_facts": ["they work on the same floor"],
+        })
+        _append(conn, kind="activity_change", payload={
+            "entity_id": "you",
+            "container_id": 1,
+            "posture": "sitting at your desk",
+            "action": {"verb": "finishing emails"},
+            "attention": "the screen",
+        })
+        _append(conn, kind="activity_change", payload={
+            "entity_id": "bot_a",
+            "container_id": 1,
+            "posture": "sitting at her desk",
+            "action": {"verb": "pretending to work"},
+            "attention": "you, in glances",
+        })
+        _append(conn, kind="scene_opened", payload={
+            "chat_id": "chat_bot_a",
+            "container_id": 1,
+            "started_at": "2026-04-26T20:00:00+00:00",
+            "participants": ["you", "bot_a"],
+        })
+        # Close the seeded scene and write a per-POV summary memory so
+        # _resolve_previous_scene_summary returns a non-empty string.
+        _append(conn, kind="scene_closed", payload={
+            "scene_id": 1,
+            "ended_at": "2026-04-26T20:30:00+00:00",
+            "significance": 2,
+        })
+        _append(conn, kind="memory_written", payload={
+            "owner_id": "bot_a",
+            "chat_id": "chat_bot_a",
+            "scene_id": 1,
+            "pov_summary": prev_scene_blob,
+            "witness_you": 1,
+            "witness_host": 1,
+            "witness_guest": 0,
+            "source": "direct",
+            "reliability": 1.0,
+            "significance": 2,
+        })
+        project(conn)
+
+        # Six dialogue turns — last 4 plus 2 older. If older turns are
+        # dropped under NICE pressure, the unique markers for turns 0/1
+        # disappear; we'll assert they REMAIN to prove dialogue trim
+        # didn't fire.
+        dialogue = [
+            {"speaker": "you", "text": "DLG-OLD-00 hello"},
+            {"speaker": "bot_a", "text": "DLG-OLD-01 hi"},
+            {"speaker": "you", "text": "DLG-LAST-16 ok"},
+            {"speaker": "bot_a", "text": "DLG-LAST-17 sure"},
+            {"speaker": "you", "text": "DLG-LAST-18 night"},
+            {"speaker": "bot_a", "text": "DLG-LAST-19 indeed"},
+        ]
+        # Four small memories — if "memories beyond top-2" trim fires,
+        # MEM-C/MEM-D disappear; we'll assert they REMAIN to prove
+        # memories trim didn't fire either.
+        memories = ["MEM-A short", "MEM-B short", "MEM-C short", "MEM-D short"]
+
+        # Soft tuned so the all-NICE config (with the heavy previous
+        # scene summary) overflows, but dropping just previous-scene
+        # fits comfortably. Hard set high so SHOULD-tier never trims.
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=dialogue,
+            retrieved_memory_summaries=memories,
+            budget_soft=400,
+            budget_hard=8000,
+        )
+    body = msgs[0].content
+    # Previous-scene summary was the FIRST NICE drop — its unique
+    # marker must be absent.
+    assert "PREVSCENE-MARKER" not in body
+    # Memories beyond top-2 stayed (proves memories trim did NOT fire).
+    assert "MEM-A" in body
+    assert "MEM-B" in body
+    assert "MEM-C" in body
+    assert "MEM-D" in body
+    # Older dialogue turns stayed (proves dialogue trim did NOT fire).
+    assert "DLG-OLD-00" in body
+    assert "DLG-OLD-01" in body
+    # Last-4 dialogue turns of course present.
+    assert "DLG-LAST-19" in body
+
+
 def test_assemble_with_tight_budget_drops_guest_activity_first(tmp_path):
     """Under tight budget MUST blocks survive but SHOULD-tier guest
     activity is dropped first."""
@@ -494,3 +763,99 @@ def test_assemble_with_tight_budget_drops_guest_activity_first(tmp_path):
     import tiktoken
     enc = tiktoken.get_encoding("cl100k_base")
     assert len(enc.encode(body)) <= 340
+
+
+# ---------------------------------------------------------------------------
+# Task 60: Active events + open threads in prompt assembly
+# ---------------------------------------------------------------------------
+
+
+def test_assemble_with_no_events_or_threads_omits_blocks(tmp_path):
+    """Regression: with the basic 2-entity scenario (no events seeded, no
+    threads seeded), the assembled prompt must NOT contain the
+    ``Active events:`` or ``Open threads:`` headers — both blocks are
+    omit-when-empty."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_basic(conn)
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=[],
+            retrieved_memory_summaries=[],
+        )
+    body = msgs[0].content
+    assert "Active events:" not in body
+    assert "Open threads:" not in body
+
+
+def test_assemble_with_active_events_renders_block(tmp_path):
+    """Seed a planned event then transition it to active; the assembled
+    prompt should render the ``Active events:`` block listing the event
+    by kind."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_basic(conn)
+        # event_planned then event_started → status="active". Use
+        # append_and_apply because _seed_basic already projected; calling
+        # project() again would replay every prior event (and trip
+        # UNIQUE constraints on chat_created etc.).
+        append_and_apply(conn, kind="event_planned", payload={
+            "event_id": "evt_park",
+            "chat_id": "chat_bot_a",
+            "kind": "date_at_park",
+            "props": {"location": "Riverside Park", "vibe": "casual"},
+            "planned_for": "2026-04-30T18:00:00+00:00",
+        })
+        append_and_apply(conn, kind="event_started", payload={
+            "event_id": "evt_park",
+            "started_at": "2026-04-30T18:05:00+00:00",
+        })
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=[],
+            retrieved_memory_summaries=[],
+        )
+    body = msgs[0].content
+    assert "Active events:" in body
+    assert "date_at_park" in body
+
+
+def test_assemble_with_open_thread_renders_block(tmp_path):
+    """Seed a single open thread; the assembled prompt should render the
+    ``Open threads:`` block listing the thread by title."""
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_basic(conn)
+        # _seed_basic already projected; use append_and_apply for the
+        # post-seed event so we don't re-trigger UNIQUE constraint
+        # collisions on the prior chat_created/etc. events.
+        append_and_apply(conn, kind="thread_opened", payload={
+            "thread_id": "thr_job",
+            "chat_id": "chat_bot_a",
+            "title": "Maya's job hunt",
+            "summary": "Maya is looking for a new job",
+        })
+        msgs = assemble_narrative_prompt(
+            conn,
+            chat_id="chat_bot_a",
+            speaker_bot_id="bot_a",
+            recent_dialogue=[],
+            retrieved_memory_summaries=[],
+        )
+    body = msgs[0].content
+    assert "Open threads:" in body
+    assert "Maya's job hunt" in body
+
+
+def test_witness_role_for_none_host_returns_host():
+    assert _witness_role_for("bot_a", None) == "host"
+    # Sanity check: existing semantics preserved.
+    assert _witness_role_for("bot_a", "bot_a") == "host"
+    assert _witness_role_for("bot_a", "bot_b") == "guest"

tests/test_regenerate.py

@@ -271,3 +271,754 @@ def test_regenerate_404_when_assistant_turn_missing(client, tmp_path):
         assert response.status_code == 404
     finally:
         app.dependency_overrides.clear()
+
+
+def _seed_with_interjection_group(db_path):
+    """Seed a multi-entity scene with a (primary + interjection) group.
+
+    Returns ``(user_turn_id, primary_at_id, interjection_at_id)``.
+
+    The primary speaker is the host (bot_a); the silent witness who
+    interjected is the guest (bot_b). Mirrors the convention in
+    chat/web/turns.py — both assistant_turns share the same
+    ``user_turn_id`` and the interjection's payload carries
+    ``interjection_of=<primary speaker_id>``.
+    """
+    with open_db(db_path) as conn:
+        for bot_id, name, persona in (
+            ("bot_a", "BotA", "thoughtful"),
+            ("bot_b", "BotB", "loud"),
+        ):
+            append_event(
+                conn,
+                kind="bot_authored",
+                payload={
+                    "id": bot_id,
+                    "name": name,
+                    "persona": persona,
+                    "voice_samples": [],
+                    "traits": [],
+                    "backstory": "",
+                    "initial_relationship_to_you": "",
+                    "kickoff_prose": "",
+                },
+            )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_multi",
+                "host_bot_id": "bot_a",
+                "guest_bot_id": "bot_b",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        for src, tgt in (
+            ("bot_a", "you"),
+            ("you", "bot_a"),
+            ("bot_b", "you"),
+            ("you", "bot_b"),
+            ("bot_a", "bot_b"),
+            ("bot_b", "bot_a"),
+        ):
+            append_event(
+                conn,
+                kind="edge_update",
+                payload={
+                    "source_id": src,
+                    "target_id": tgt,
+                    "chat_id": "chat_multi",
+                },
+            )
+        for entity_id in ("you", "bot_a", "bot_b"):
+            append_event(
+                conn,
+                kind="activity_change",
+                payload={
+                    "entity_id": entity_id,
+                    "posture": "sitting",
+                    "action": {"verb": "talking"},
+                    "attention": "",
+                    "holding": [],
+                    "status": {},
+                },
+            )
+        ut_id = append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "chat_multi",
+                "prose": "hello",
+                "segments": [],
+            },
+        )
+        primary_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_multi",
+                "speaker_id": "bot_a",
+                "text": "Original primary.",
+                "truncated": False,
+                "user_turn_id": ut_id,
+            },
+        )
+        interjection_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_multi",
+                "speaker_id": "bot_b",
+                "text": "Original interjection!",
+                "truncated": False,
+                "user_turn_id": ut_id,
+                "interjection_of": "bot_a",
+            },
+        )
+        project(conn)
+        return ut_id, primary_id, interjection_id
+
+
+def test_regenerate_broadcasts_turn_html_over_sse(
+    tmp_path, monkeypatch
+):
+    """T73.1: regenerate publishes a ``turn_html_replace`` SSE event so
+    connected tabs swap the prior turn's DOM node in place.
+
+    The event carries:
+    - ``data``: rendered HTML for the new turn
+    - ``turn_id``: event_id of the new assistant_turn
+    - ``supersedes_id``: event_id of the original assistant_turn
+    """
+    import asyncio
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.services import regenerate as regenerate_module
+    from chat.services.regenerate import regenerate_assistant_turn
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    ut_id, at_id = _seed_with_one_turn(db_path)
+
+    published: list[tuple[str, dict]] = []
+
+    async def _capture(chat_id, event):
+        published.append((chat_id, event))
+
+    # Patch the imported reference inside the regenerate module so the
+    # service's call site goes through our spy.
+    monkeypatch.setattr(regenerate_module, "publish", _capture)
+
+    narrative_canned = "Refreshed reply."
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    canned = [narrative_canned, state_canned, state_canned]
+    mock_client = MockLLMClient(canned=list(canned))
+
+    settings = Settings(featherless_api_key="test")
+
+    with open_db(db_path) as conn:
+        new_text = asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_bot_a",
+                original_assistant_event_id=at_id,
+            )
+        )
+        assert new_text == narrative_canned
+
+        # Find the new assistant_turn event_id for cross-checking.
+        cur = conn.execute(
+            "SELECT id FROM event_log "
+            "WHERE kind = 'assistant_turn' AND id != ? "
+            "AND superseded_by IS NULL",
+            (at_id,),
+        ).fetchone()
+        new_at_id = cur[0]
+
+    # Filter out per-token publishes; we want the replace broadcast.
+    replace_calls = [
+        ev for (_cid, ev) in published if ev.get("event") == "turn_html_replace"
+    ]
+    assert len(replace_calls) == 1
+    payload = replace_calls[0]
+    assert payload["supersedes_id"] == at_id
+    assert payload["turn_id"] == new_at_id
+    # The HTML carries the new narrative text and the speaker name.
+    assert "Refreshed reply." in payload["data"]
+    assert "BotA" in payload["data"]
+    # Sanity: every publish targeted this chat.
+    for cid, _ev in published:
+        assert cid == "chat_bot_a"
+
+
+def test_regenerate_with_interjection_redoes_both_turns(tmp_path, monkeypatch):
+    """T73.2: when the original turn group included an interjection, both
+    the primary and the interjection are regenerated.
+
+    Setup: 3-entity scene (host BotA + guest BotB + you) with a prior
+    (primary by BotA + interjection by BotB) group. Mock the
+    interjection classifier to return ``should_interject=True`` so the
+    follow-on regenerates too.
+
+    Assert: 2 new assistant_turns exist for the same user_turn_id, the
+    second carrying ``interjection_of`` pointing at the new primary's
+    speaker_id. Both originals are superseded.
+    """
+    import asyncio
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.services import regenerate as regenerate_module
+    from chat.services.interjection import InterjectionDecision
+    from chat.services.regenerate import regenerate_assistant_turn
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    ut_id, primary_id, interjection_id = _seed_with_interjection_group(db_path)
+
+    # Stub detect_interjection so the classifier "fires" with new prose.
+    async def _stub_should_interject(*_args, **_kwargs):
+        return InterjectionDecision(should_interject=True, reason="fired")
+
+    monkeypatch.setattr(
+        regenerate_module, "detect_interjection", _stub_should_interject
+    )
+
+    # Canned queue:
+    #   1. New primary narrative stream.
+    #   2-7. Six state-update classifier calls (one per directed pair
+    #        across host/you/guest = 6 pairs) for the primary pass.
+    #   8.   New interjection narrative stream.
+    #   9-14. Six state-update classifier calls for the post-interjection
+    #         pass.
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    canned: list[str] = []
+    canned.append("New primary text.")
+    canned.extend([state_canned] * 6)
+    canned.append("New interjection text!")
+    canned.extend([state_canned] * 6)
+    mock_client = MockLLMClient(canned=list(canned))
+
+    settings = Settings(featherless_api_key="test")
+
+    with open_db(db_path) as conn:
+        new_text = asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_multi",
+                original_assistant_event_id=primary_id,
+            )
+        )
+        assert new_text == "New primary text."
+
+        # Both originals are superseded.
+        primary_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?", (primary_id,)
+        ).fetchone()[0]
+        interjection_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?",
+            (interjection_id,),
+        ).fetchone()[0]
+        assert primary_super is not None
+        assert interjection_super is not None
+
+        # Two NEW assistant_turn events exist (the regenerated primary
+        # and the regenerated interjection), both pinned to the same
+        # user_turn_id as the originals.
+        cur = conn.execute(
+            "SELECT id, payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' AND id NOT IN (?, ?) "
+            "ORDER BY id",
+            (primary_id, interjection_id),
+        ).fetchall()
+        assert len(cur) == 2
+        new_primary_id, new_primary_payload_json = cur[0]
+        new_interjection_id, new_interjection_payload_json = cur[1]
+        new_primary_payload = json.loads(new_primary_payload_json)
+        new_interjection_payload = json.loads(new_interjection_payload_json)
+
+        assert new_primary_payload["text"] == "New primary text."
+        assert new_primary_payload["speaker_id"] == "bot_a"
+        assert new_primary_payload["user_turn_id"] == ut_id
+        assert new_primary_payload["regenerated_from"] == primary_id
+        assert "interjection_of" not in new_primary_payload
+
+        assert new_interjection_payload["text"] == "New interjection text!"
+        assert new_interjection_payload["speaker_id"] == "bot_b"
+        assert new_interjection_payload["user_turn_id"] == ut_id
+        assert new_interjection_payload["regenerated_from"] == interjection_id
+        # interjection_of links to the new primary's speaker (matches
+        # the existing convention in chat/web/turns.py).
+        assert new_interjection_payload["interjection_of"] == "bot_a"
+
+        # The originals' supersede pointers reach the new ones.
+        assert primary_super == new_primary_id
+        assert interjection_super == new_interjection_id
+
+
+def test_regenerate_drops_interjection_when_classifier_returns_false(
+    tmp_path, monkeypatch
+):
+    """T73.2: when the original group included an interjection but the
+    classifier returns False this time, the new group is primary-only.
+
+    The original interjection is still superseded (we don't leave it
+    visible in the timeline alongside a regenerated primary it no longer
+    follows from), but no replacement assistant_turn is appended.
+    """
+    import asyncio
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.services import regenerate as regenerate_module
+    from chat.services.interjection import InterjectionDecision
+    from chat.services.regenerate import regenerate_assistant_turn
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    ut_id, primary_id, interjection_id = _seed_with_interjection_group(db_path)
+
+    async def _stub_no_interject(*_args, **_kwargs):
+        return InterjectionDecision(
+            should_interject=False, reason="quiet"
+        )
+
+    monkeypatch.setattr(
+        regenerate_module, "detect_interjection", _stub_no_interject
+    )
+
+    # Canned queue: primary narrative + 6 state-update calls. No
+    # interjection stream because the classifier short-circuits.
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    canned: list[str] = ["New primary text."] + [state_canned] * 6
+    mock_client = MockLLMClient(canned=list(canned))
+
+    settings = Settings(featherless_api_key="test")
+
+    with open_db(db_path) as conn:
+        new_text = asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_multi",
+                original_assistant_event_id=primary_id,
+            )
+        )
+        assert new_text == "New primary text."
+
+        # Original primary superseded by the new primary.
+        primary_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?", (primary_id,)
+        ).fetchone()[0]
+        # Original interjection ALSO superseded — we don't leave a
+        # dangling beat attached to a regenerated primary that no longer
+        # warrants a follow-on. Back-pointer goes to the new primary.
+        interjection_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?",
+            (interjection_id,),
+        ).fetchone()[0]
+        assert primary_super is not None
+        assert interjection_super is not None
+        assert interjection_super == primary_super  # both point at new primary
+
+        # Exactly ONE new assistant_turn — the primary; no replacement
+        # interjection.
+        cur = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' AND id NOT IN (?, ?) "
+            "AND superseded_by IS NULL",
+            (primary_id, interjection_id),
+        ).fetchall()
+        assert len(cur) == 1
+        new_primary_payload = json.loads(cur[0][0])
+        assert new_primary_payload["text"] == "New primary text."
+        assert "interjection_of" not in new_primary_payload
+
+
+def test_regenerate_with_prior_lifecycle_logs_warning(tmp_path, monkeypatch, caplog):
+    """T83.4: when the superseded assistant_turn already produced
+    lifecycle transitions (event_started / event_completed /
+    event_cancelled), regenerate emits a WARNING naming the un-rolled-
+    back transitions. Phase 3.5 documents the gap; the actual rollback
+    is Phase 4 work.
+    """
+    import asyncio
+    import logging
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.eventlog.log import append_and_apply
+    from chat.services.regenerate import regenerate_assistant_turn
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    _ut_id, at_id = _seed_with_one_turn(db_path)
+
+    # After the assistant_turn lands, simulate that the turn flow
+    # produced an event_completed transition. ``append_and_apply`` is
+    # the standard path so the events projection updates.
+    with open_db(db_path) as conn:
+        append_and_apply(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_x",
+                "chat_id": "chat_bot_a",
+                "kind": "story_event",
+                "props": {},
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+        append_and_apply(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_x",
+                "started_at": "2026-04-30T19:00:00+00:00",
+            },
+        )
+        completed_id = append_and_apply(
+            conn,
+            kind="event_completed",
+            payload={
+                "event_id": "evt_x",
+                "completed_at": "2026-04-30T19:30:00+00:00",
+            },
+        )
+    assert completed_id is not None
+
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    mock_client = MockLLMClient(
+        canned=["Refreshed reply.", state_canned, state_canned]
+    )
+    settings = Settings(featherless_api_key="test")
+
+    caplog.set_level(logging.WARNING, logger="chat.services.regenerate")
+
+    with open_db(db_path) as conn:
+        asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_bot_a",
+                original_assistant_event_id=at_id,
+            )
+        )
+
+    # The warning records the count and at least one of the affected
+    # event_log ids (event_started + event_completed = at minimum 2).
+    warnings = [
+        r for r in caplog.records if r.levelname == "WARNING"
+    ]
+    matching = [w for w in warnings if "lifecycle transition" in w.getMessage()]
+    assert matching, (
+        "expected a WARNING about un-rolled-back lifecycle transitions; "
+        f"got: {[w.getMessage() for w in warnings]}"
+    )
+    msg = matching[0].getMessage()
+    # Reference the original superseded turn's id and the event_completed
+    # row's id.
+    assert str(at_id) in msg
+    assert str(completed_id) in msg
+    # T90.2: wording was tightened from "from superseded turn" to
+    # "at-or-after turn <id>" — when regenerating an OLDER turn, the
+    # listed transitions may include legitimate intervening-turn ones
+    # that stand on their own. The new phrasing avoids implying the
+    # warning's target turn directly authored every listed transition.
+    assert "at-or-after turn" in msg
+    assert "from superseded turn" not in msg
+
+
+def test_regenerate_sibling_lookup_scoped_to_chat(tmp_path, monkeypatch):
+    """T83.3: regenerate's sibling-interjection lookup is scoped to the
+    chat being regenerated.
+
+    Setup: TWO chats, each with a primary + interjection turn group whose
+    rows happen to share the same ``user_turn_id`` value (the projector
+    assigns event_log ids monotonically across the whole database, so
+    when each chat is seeded back-to-back the chat A primary lands on a
+    different ``user_turn_id`` than chat B's — but in older versions the
+    sibling query had no chat predicate, so it could in principle latch
+    onto a row from a different chat if ids collided in some unusual
+    flow). We construct the seeding so chat B's interjection has the
+    SAME ``interjection_of`` value as the chat A primary's speaker_id —
+    pre-T83.3 the global query could have picked it up.
+
+    Assert: regenerating the chat A primary leaves chat B's rows
+    untouched (no supersede), and the regenerated chat A turn group's
+    interjection (the only one regenerate should regenerate) has its
+    ``regenerated_from`` pointing at the chat A original interjection,
+    not chat B's.
+    """
+    import asyncio
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.services import regenerate as regenerate_module
+    from chat.services.interjection import InterjectionDecision
+    from chat.services.regenerate import regenerate_assistant_turn
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    # Seed chat A's interjection group.
+    a_ut_id, a_primary_id, a_interjection_id = _seed_with_interjection_group(
+        db_path
+    )
+
+    # Seed chat B with the same shape but a different chat_id and bot
+    # ids, then add an interjection group whose ``interjection_of``
+    # points at "bot_a" so a global (unscoped) query could collide.
+    with open_db(db_path) as conn:
+        for bot_id, name in (("bot_c", "BotC"), ("bot_d", "BotD")):
+            append_event(
+                conn,
+                kind="bot_authored",
+                payload={
+                    "id": bot_id,
+                    "name": name,
+                    "persona": "",
+                    "voice_samples": [],
+                    "traits": [],
+                    "backstory": "",
+                    "initial_relationship_to_you": "",
+                    "kickoff_prose": "",
+                },
+            )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_other",
+                "host_bot_id": "bot_c",
+                "guest_bot_id": "bot_d",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        b_ut_id = append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "chat_other",
+                "prose": "different chat",
+                "segments": [],
+            },
+        )
+        b_primary_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_other",
+                "speaker_id": "bot_c",
+                "text": "Other primary.",
+                "truncated": False,
+                "user_turn_id": b_ut_id,
+            },
+        )
+        # The chat B interjection's ``interjection_of`` references
+        # "bot_a" — the chat A primary's speaker. Pre-T83.3 the global
+        # sibling query could mis-match this row.
+        b_interjection_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_other",
+                "speaker_id": "bot_d",
+                "text": "Cross-chat noise.",
+                "truncated": False,
+                "user_turn_id": b_ut_id,
+                "interjection_of": "bot_a",
+            },
+        )
+
+    # Stub the interjection classifier to return True so the regenerate
+    # actively walks the sibling-discovery path.
+    async def _stub_should_interject(*_args, **_kwargs):
+        return InterjectionDecision(should_interject=True, reason="fired")
+
+    monkeypatch.setattr(
+        regenerate_module, "detect_interjection", _stub_should_interject
+    )
+
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    canned: list[str] = (
+        ["New chat A primary."]
+        + [state_canned] * 6
+        + ["New chat A interjection."]
+        + [state_canned] * 6
+    )
+    mock_client = MockLLMClient(canned=list(canned))
+    settings = Settings(featherless_api_key="test")
+
+    with open_db(db_path) as conn:
+        new_text = asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_multi",
+                original_assistant_event_id=a_primary_id,
+            )
+        )
+        assert new_text == "New chat A primary."
+
+        # Chat B rows are untouched — neither superseded nor referenced.
+        b_primary_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?",
+            (b_primary_id,),
+        ).fetchone()[0]
+        b_interjection_super = conn.execute(
+            "SELECT superseded_by FROM event_log WHERE id = ?",
+            (b_interjection_id,),
+        ).fetchone()[0]
+        assert b_primary_super is None
+        assert b_interjection_super is None
+
+        # Chat A's regenerated interjection has its ``regenerated_from``
+        # pointing at chat A's original interjection — NOT chat B's.
+        cur = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' "
+            "  AND id NOT IN (?, ?, ?, ?) "
+            "  AND superseded_by IS NULL",
+            (a_primary_id, a_interjection_id, b_primary_id, b_interjection_id),
+        ).fetchall()
+        # Two new rows: regenerated primary + regenerated interjection.
+        assert len(cur) == 2
+        payloads = [json.loads(row[0]) for row in cur]
+        # Find the regenerated interjection (carries interjection_of).
+        new_interject_payloads = [
+            p for p in payloads if p.get("interjection_of")
+        ]
+        assert len(new_interject_payloads) == 1
+        assert new_interject_payloads[0]["regenerated_from"] == a_interjection_id
+        # Pin chat scope on every new row.
+        for p in payloads:
+            assert p["chat_id"] == "chat_multi"
+
+
+def test_regenerate_registers_task_in_in_flight_tasks(tmp_path, monkeypatch):
+    """T83.1: regenerate's streaming Task is registered in the chat-keyed
+    ``_in_flight_tasks`` dict so the /turns/cancel route can cancel a
+    mid-regenerate stream. Mirrors the meanwhile registration pattern
+    pinned by tests/test_meanwhile_turn_flow.py.
+
+    Snapshot pattern: a custom MockLLMClient subclass captures the
+    presence of the chat_id in ``_in_flight_tasks`` at the first stream
+    yield (when the regenerate coroutine is awaiting our generator and
+    the task is alive). Post-flight, the entry must be cleaned up so the
+    next regenerate / turn registers a fresh task.
+    """
+    import asyncio
+    from typing import AsyncIterator, Sequence
+
+    from chat.config import Settings
+    from chat.db.migrate import apply_migrations
+    from chat.llm.client import Message
+    from chat.services.regenerate import regenerate_assistant_turn
+    from chat.web.turns import _in_flight_tasks
+
+    db_path = tmp_path / "test.db"
+    cfg = tmp_path / "config.toml"
+    cfg.write_text('featherless_api_key = "test"\n')
+    monkeypatch.setenv("CHAT_CONFIG_PATH", str(cfg))
+    monkeypatch.setenv("CHAT_DB_PATH", str(db_path))
+    apply_migrations(db_path)
+
+    _ut_id, at_id = _seed_with_one_turn(db_path)
+
+    in_flight_snapshot: dict = {}
+
+    class _SnapshotMock(MockLLMClient):
+        async def stream(
+            self, messages: Sequence[Message], *, model: str, **params
+        ) -> AsyncIterator[str]:
+            text = self._canned.pop(0)
+            for i, ch in enumerate(text):
+                if i == 0:
+                    in_flight_snapshot["present"] = (
+                        "chat_bot_a" in _in_flight_tasks
+                    )
+                    in_flight_snapshot["task"] = _in_flight_tasks.get(
+                        "chat_bot_a"
+                    )
+                yield ch
+
+    state_canned = json.dumps(
+        {"affinity_delta": 0, "trust_delta": 0, "knowledge_facts": []}
+    )
+    mock_client = _SnapshotMock(
+        canned=["Refreshed reply.", state_canned, state_canned]
+    )
+
+    settings = Settings(featherless_api_key="test")
+
+    # Pre-condition: registry empty for this chat.
+    assert "chat_bot_a" not in _in_flight_tasks
+
+    with open_db(db_path) as conn:
+        new_text = asyncio.run(
+            regenerate_assistant_turn(
+                conn,
+                mock_client,
+                settings=settings,
+                chat_id="chat_bot_a",
+                original_assistant_event_id=at_id,
+            )
+        )
+        assert new_text == "Refreshed reply."
+
+    # Mid-flight: the streaming task was present in the registry, and
+    # the captured value was an asyncio.Task.
+    assert in_flight_snapshot.get("present") is True, (
+        "_in_flight_tasks was empty at first yield — regenerate stream "
+        "isn't registering its task"
+    )
+    assert isinstance(in_flight_snapshot.get("task"), asyncio.Task)
+    # Post-flight: the entry has been cleaned up.
+    assert "chat_bot_a" not in _in_flight_tasks

tests/test_render.py

@@ -85,3 +85,26 @@ def test_render_prose_mixed_full_message():
     assert '<em class="action">looks up</em>' in out
     # The apostrophe in ``she's`` is HTML-escaped to ``&#x27;``.
     assert '<span class="ooc">((she&#x27;s tired))</span>' in out
+
+
+def test_render_turn_html_stamps_event_id_when_provided():
+    """T86 follow-up: when ``event_id`` is supplied the wrapper DIV
+    carries ``id="turn-<event_id>"`` so the chat-page
+    ``turn_html_replace`` SSE handler can locate the prior turn DOM
+    node by id and swap it in-place. Without the id the handler's
+    ``getElementById('turn-' + supersedes_id)`` lookup misses and
+    the regenerated turn appends instead of replaces.
+    """
+    out = render_turn_html("BotA", "Hello.", role="bot", event_id=42)
+    assert 'id="turn-42"' in out
+    # The id must sit on the wrapper DIV, not somewhere nested inside.
+    assert out.startswith('<div id="turn-42" class="turn turn-bot">')
+
+
+def test_render_turn_html_omits_id_when_event_id_missing():
+    """Legacy callers (no ``event_id`` passed) get a clean DIV with no
+    id attribute — preserves the pre-T86 fragment shape.
+    """
+    out = render_turn_html("BotA", "Hello.", role="bot")
+    assert "id=" not in out
+    assert out.startswith('<div class="turn turn-bot">')

tests/test_reset.py

@@ -292,6 +292,189 @@ def test_reset_clears_guest_reference_in_other_chats(client, tmp_path):
         ).fetchone()[0] == 1
 
 
+def test_reset_purges_orphaned_you_activity_rows(client, tmp_path):
+    """T69: when a bot's chats are deleted, "you" activity rows tied to those
+    chats' containers should also be purged (otherwise they linger orphaned)."""
+    db = tmp_path / "test.db"
+    with open_db(db) as conn:
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_a",
+                "name": "BotA",
+                "persona": "thoughtful",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "coworker",
+                "kickoff_prose": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="container_created",
+            payload={
+                "chat_id": "chat_bot_a",
+                "name": "office",
+                "type": "workplace",
+                "properties": {},
+            },
+        )
+        append_event(
+            conn,
+            kind="activity_change",
+            payload={
+                "entity_id": "you",
+                "container_id": 1,
+                "posture": "standing",
+                "action": {"verb": "watching"},
+            },
+        )
+        project(conn)
+        # Sanity: the "you" activity row exists and points at the container.
+        assert conn.execute(
+            "SELECT COUNT(*) FROM activity WHERE entity_id = 'you'"
+        ).fetchone()[0] == 1
+
+    response = client.post(
+        "/bots/bot_a/reset",
+        data={"confirm_name": "BotA"},
+        follow_redirects=False,
+    )
+    assert response.status_code == 303
+
+    with open_db(db) as conn:
+        # The orphaned "you" activity row tied to bot_a's purged container is gone.
+        assert conn.execute(
+            "SELECT COUNT(*) FROM activity WHERE entity_id = 'you'"
+        ).fetchone()[0] == 0
+
+
+def test_reset_does_not_purge_you_activity_in_other_chats(client, tmp_path):
+    """T69: resetting bot_a must leave a "you" activity row pointing at
+    bot_b's container intact — only orphans from the reset bot's chats go."""
+    db = tmp_path / "test.db"
+    with open_db(db) as conn:
+        # bot_a + its chat + container.
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_a",
+                "name": "BotA",
+                "persona": "thoughtful",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "coworker",
+                "kickoff_prose": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="container_created",
+            payload={
+                "chat_id": "chat_bot_a",
+                "name": "office",
+                "type": "workplace",
+                "properties": {},
+            },
+        )
+        # bot_b + its chat + container.
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_b",
+                "name": "BotB",
+                "persona": "curious",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "friend",
+                "kickoff_prose": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_b",
+                "host_bot_id": "bot_b",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="container_created",
+            payload={
+                "chat_id": "chat_bot_b",
+                "name": "kitchen",
+                "type": "home",
+                "properties": {},
+            },
+        )
+        # The activity table is keyed on entity_id (PRIMARY KEY), so only one
+        # "you" row exists at a time. Point it at bot_b's container so reset of
+        # bot_a should NOT touch it.
+        append_event(
+            conn,
+            kind="activity_change",
+            payload={
+                "entity_id": "you",
+                "container_id": 2,  # kitchen, in chat_bot_b
+                "posture": "sitting",
+                "action": {"verb": "reading"},
+            },
+        )
+        project(conn)
+        # Sanity: the "you" activity row is in bot_b's container.
+        row = conn.execute(
+            "SELECT container_id FROM activity WHERE entity_id = 'you'"
+        ).fetchone()
+        assert row is not None and row[0] == 2
+
+    response = client.post(
+        "/bots/bot_a/reset",
+        data={"confirm_name": "BotA"},
+        follow_redirects=False,
+    )
+    assert response.status_code == 303
+
+    with open_db(db) as conn:
+        # The "you" activity in bot_b's container is preserved.
+        row = conn.execute(
+            "SELECT container_id FROM activity WHERE entity_id = 'you'"
+        ).fetchone()
+        assert row is not None
+        assert row[0] == 2
+
+
 def test_reset_purges_guest_memories_from_other_chats(client, tmp_path):
     db = tmp_path / "test.db"
     _seed_two_bots_with_guest_link(

tests/test_skip_narration.py

@@ -0,0 +1,160 @@
+"""Skip narration service tests (T53).
+
+The skip-narration service generates short transition prose between an
+in-progress moment and a post-skip moment. Two flavors:
+
+* ``elision`` — collapses an in-progress activity to its expected
+  end-state in 1-2 sentences (e.g. "skip ahead to when we arrive").
+* ``jump`` — bridges a longer fiction-time delta in 2-3 sentences
+  (e.g. "next morning", "a week later").
+
+Output is free-form prose, not structured JSON, so the service goes
+through ``client.generate`` directly rather than the classifier path.
+A deterministic template fallback fires on any LLM failure so the skip
+flow never blocks even when the model is down.
+"""
+
+from __future__ import annotations
+
+from typing import AsyncIterator, Sequence
+
+import pytest
+
+from chat.llm.client import Message
+from chat.llm.mock import MockLLMClient
+from chat.services.skip_narration import narrate_skip
+
+
+_SPEAKER = {
+    "id": "bot1",
+    "name": "Aria",
+    "persona": "thoughtful, observant",
+}
+
+
+@pytest.mark.asyncio
+async def test_narrate_elision_returns_classifier_output():
+    canned = (
+        "She closes her laptop and slings her bag over her shoulder. "
+        "The office shrinks behind her as she steps into the late "
+        "afternoon light."
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await narrate_skip(
+        mock,
+        narrative_model="x",
+        skip_kind="elision",
+        speaker_bot=_SPEAKER,
+        you_name="Me",
+        current_time="3:42 PM",
+        new_time="5:10 PM",
+        current_activity="finishing up at her desk",
+        landing_state_hint="walking out into the parking lot",
+    )
+    assert "office" in result or result == canned
+
+
+@pytest.mark.asyncio
+async def test_narrate_jump_returns_classifier_output():
+    canned = (
+        "Morning light spills through the kitchen window. The coffee "
+        "maker hums. She's already at the table, scrolling her phone."
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await narrate_skip(
+        mock,
+        narrative_model="x",
+        skip_kind="jump",
+        speaker_bot=_SPEAKER,
+        you_name="Me",
+        current_time="late evening",
+        new_time="next morning",
+        current_activity="winding down for the night",
+        landing_state_hint="having coffee in the kitchen",
+    )
+    assert result
+    lower = result.lower()
+    assert "morning" in lower or "coffee" in lower
+
+
+class _RaisingMock:
+    """Mock LLMClient whose ``generate`` always raises.
+
+    ``MockLLMClient.generate`` raises ``IndexError`` once the canned
+    list is empty, but the test wants a clear, unambiguous failure
+    regardless of canned-list state, so we ship a tiny dedicated mock
+    instead.
+    """
+
+    async def generate(
+        self, messages: Sequence[Message], *, model: str, **params
+    ) -> str:
+        raise RuntimeError("LLM is down")
+
+    async def stream(
+        self, messages: Sequence[Message], *, model: str, **params
+    ) -> AsyncIterator[str]:
+        raise RuntimeError("LLM is down")
+        yield  # pragma: no cover - make this a generator
+
+
+class _RecordingMock:
+    """Mock LLMClient that records the kwargs passed to ``generate``.
+
+    Used to assert that callers plumb through optional parameters like
+    ``timeout_s`` instead of swallowing them. Returns a fixed string so
+    the surrounding fallback path is not exercised.
+    """
+
+    def __init__(self) -> None:
+        self.captured_kwargs: dict | None = None
+
+    async def generate(
+        self, messages: Sequence[Message], *, model: str, **params
+    ) -> str:
+        self.captured_kwargs = dict(params)
+        return "ok"
+
+    async def stream(
+        self, messages: Sequence[Message], *, model: str, **params
+    ) -> AsyncIterator[str]:
+        raise RuntimeError("not used")
+        yield  # pragma: no cover - make this a generator
+
+
+@pytest.mark.asyncio
+async def test_narrate_skip_passes_timeout_through():
+    mock = _RecordingMock()
+    await narrate_skip(
+        mock,
+        narrative_model="x",
+        skip_kind="jump",
+        speaker_bot=_SPEAKER,
+        you_name="Me",
+        current_time="late evening",
+        new_time="next morning",
+        current_activity="winding down for the night",
+        landing_state_hint="having coffee in the kitchen",
+        timeout_s=12.5,
+    )
+    assert mock.captured_kwargs is not None
+    assert mock.captured_kwargs.get("timeout_s") == 12.5
+
+
+@pytest.mark.asyncio
+async def test_narrate_falls_back_on_generation_failure():
+    new_time = "next morning"
+    result = await narrate_skip(
+        _RaisingMock(),
+        narrative_model="x",
+        skip_kind="jump",
+        speaker_bot=_SPEAKER,
+        you_name="Me",
+        current_time="late evening",
+        new_time=new_time,
+        current_activity="winding down for the night",
+        landing_state_hint="having coffee in the kitchen",
+    )
+    # Fallback template includes the new_time so callers can see *what*
+    # we skipped to even when the LLM never answered.
+    assert new_time in result

tests/test_streaming_ux.py

@@ -174,3 +174,74 @@ def test_chat_html_includes_stop_streaming_script(client, tmp_path):
     assert "stop-streaming" in body or "isStreaming" in body
     # Cancel route reference must be wired so the Stop button can call it.
     assert "/turns/cancel" in body
+
+
+def test_chat_html_has_turn_html_replace_listener(client, tmp_path):
+    """T86: the chat shell wires a JS handler for the ``turn_html_replace``
+    SSE event so regenerate-driven swaps land in connected tabs without a
+    page refresh.
+
+    This is a presence / string-check test: it verifies the handler is
+    embedded in the rendered template but does NOT drive a real browser
+    (no headless runner is wired into this test environment). The end-to-
+    end behaviour — receiving the event over SSE and replacing the prior
+    turn's DOM node — is therefore not exercised here; a manual smoke
+    check or future browser-driven test would close that gap.
+    """
+    _seed_chat(tmp_path / "test.db")
+    response = client.get("/chats/chat_bot_a")
+    assert response.status_code == 200
+    body = response.text
+    # The handler must be wired against the SSE event name the backend
+    # publishes (chat.services.regenerate -> "turn_html_replace").
+    assert "turn_html_replace" in body
+    # Confirm the handler reads the JSON payload's ``supersedes_id`` so
+    # it can locate the prior turn node. The exact lookup mechanism may
+    # vary, but the field name is part of the contract with the backend.
+    assert "supersedes_id" in body
+
+
+def test_rendered_turn_html_includes_event_id(client, tmp_path):
+    """T86 follow-up: the chat-detail Jinja loop stamps
+    ``id="turn-<event_id>"`` on every rendered turn DIV. Without this id
+    the ``turn_html_replace`` SSE handler's ``getElementById`` lookup
+    misses, falls through to ``insertAdjacentHTML('beforeend', …)``, and
+    the regenerated turn appears APPENDED instead of swapped in-place
+    (rendering the primary handler path dead code — exactly the gap the
+    T86 reviewer flagged).
+
+    Seed a user_turn + assistant_turn, GET the chat page, and assert the
+    response body carries both turns' event ids on the wrapper DIVs.
+    """
+    db_path = tmp_path / "test.db"
+    _seed_chat(db_path)
+    with open_db(db_path) as conn:
+        ut_id = append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "chat_bot_a",
+                "prose": "hello bot",
+                "segments": [],
+            },
+        )
+        at_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_bot_a",
+                "speaker_id": "bot_a",
+                "text": "Hi there.",
+                "truncated": False,
+                "user_turn_id": ut_id,
+            },
+        )
+        conn.commit()
+
+    response = client.get("/chats/chat_bot_a")
+    assert response.status_code == 200
+    body = response.text
+    # Both seeded turns must carry ``id="turn-<event_id>"`` so the SSE
+    # in-place swap can find them.
+    assert f'id="turn-{ut_id}"' in body
+    assert f'id="turn-{at_id}"' in body

tests/test_synthesized_memories.py

@@ -0,0 +1,98 @@
+"""Tests for the synthesized-memories service (T54).
+
+When the user jump-skips ("a week later") they are prompted "anything
+notable happen?" If they answer with prose, this service parses it into
+1-N synthesized memories per present bot. Each memory carries
+``source="synthesized"`` and ``reliability=0.7`` (the caller — T62 skip
+flow — applies those tags when persisting; this service just produces
+the structured digest).
+
+These tests cover:
+
+* The happy path: a canned classifier response parses cleanly into a
+  populated :class:`SynthesizedDigest` with one memory.
+* Empty prose short-circuits before any classifier call — the mock has
+  no canned responses, so an accidental call would raise
+  ``IndexError``.
+* Classifier failure (3 bad responses, exhausting :func:`classify`'s
+  retry budget) falls back to an empty default digest.
+"""
+
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from chat.llm.mock import MockLLMClient
+from chat.services.synthesized_memories import (
+    SynthesizedDigest,
+    SynthesizedMemory,
+    synthesize_memories,
+)
+
+
+@pytest.mark.asyncio
+async def test_synthesize_parses_canned_prose():
+    canned = json.dumps(
+        {
+            "memories": [
+                {
+                    "text": "Maya started a new pottery class.",
+                    "significance": 1,
+                    "affinity_delta": 0,
+                    "trust_delta": 0,
+                }
+            ]
+        }
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await synthesize_memories(
+        mock,
+        classifier_model="x",
+        prose="we saw each other at her pottery class once",
+        bot_name="Maya",
+        bot_persona="warm potter, mid-30s",
+        you_name="Sam",
+    )
+    assert isinstance(result, SynthesizedDigest)
+    assert len(result.memories) == 1
+    mem = result.memories[0]
+    assert isinstance(mem, SynthesizedMemory)
+    assert mem.text == "Maya started a new pottery class."
+    assert mem.significance == 1
+    assert mem.affinity_delta == 0
+    assert mem.trust_delta == 0
+
+
+@pytest.mark.asyncio
+async def test_empty_prose_returns_empty_digest():
+    """Empty prose short-circuits — the classifier must not be called."""
+    mock = MockLLMClient(canned=[])
+    result = await synthesize_memories(
+        mock,
+        classifier_model="x",
+        prose="",
+        bot_name="Maya",
+        bot_persona="warm potter, mid-30s",
+        you_name="Sam",
+    )
+    assert result == SynthesizedDigest()
+    assert result.memories == []
+
+
+@pytest.mark.asyncio
+async def test_classifier_failure_returns_empty_default():
+    """Three bad responses exhaust the classifier's retry budget; the
+    service then returns the empty default digest."""
+    mock = MockLLMClient(canned=["bad", "bad", "bad"])
+    result = await synthesize_memories(
+        mock,
+        classifier_model="x",
+        prose="we saw each other at her pottery class once",
+        bot_name="Maya",
+        bot_persona="warm potter, mid-30s",
+        you_name="Sam",
+    )
+    assert result == SynthesizedDigest()
+    assert result.memories == []

tests/test_thread_detection.py

@@ -0,0 +1,128 @@
+"""Tests for the thread-detection service (T55).
+
+On scene close, the transcript is classified to detect open threads
+(unresolved arcs, dangling questions, promises made). The service can
+also signal **update** to an existing thread when the scene developed
+it, or **close** when the scene resolved it.
+
+These tests cover:
+
+* A new thread the scene introduced — action="open" with a fresh title.
+* An update to an existing thread — action="update" with
+  ``existing_thread_id`` referencing the prior thread.
+* Classifier failure — three bad responses degrade to an empty
+  candidates list (graceful degradation, §3.3).
+* Empty transcript short-circuits before any classifier call.
+"""
+
+from __future__ import annotations
+
+import json
+
+import pytest
+
+from chat.llm.mock import MockLLMClient
+from chat.services.thread_detection import (
+    ThreadCandidate,
+    ThreadDetectionResult,
+    detect_threads,
+)
+
+
+@pytest.mark.asyncio
+async def test_detects_new_thread_open():
+    canned = json.dumps(
+        {
+            "candidates": [
+                {
+                    "action": "open",
+                    "title": "Maya's job hunt",
+                    "summary": "Maya is looking for a new job",
+                    "existing_thread_id": None,
+                }
+            ]
+        }
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await detect_threads(
+        mock,
+        classifier_model="x",
+        scene_transcript=[
+            {"speaker": "Maya", "text": "I need to find a new job soon."},
+            {"speaker": "Sam", "text": "What kind of role are you looking for?"},
+        ],
+        open_threads=[],
+    )
+    assert isinstance(result, ThreadDetectionResult)
+    assert len(result.candidates) == 1
+    cand = result.candidates[0]
+    assert isinstance(cand, ThreadCandidate)
+    assert cand.action == "open"
+    assert cand.title == "Maya's job hunt"
+    assert cand.summary == "Maya is looking for a new job"
+    assert cand.existing_thread_id is None
+
+
+@pytest.mark.asyncio
+async def test_detects_update_to_existing_thread():
+    canned = json.dumps(
+        {
+            "candidates": [
+                {
+                    "action": "update",
+                    "title": "",
+                    "summary": "Maya interviewed at Acme today",
+                    "existing_thread_id": "thr_jobhunt",
+                }
+            ]
+        }
+    )
+    mock = MockLLMClient(canned=[canned])
+    result = await detect_threads(
+        mock,
+        classifier_model="x",
+        scene_transcript=[
+            {"speaker": "Maya", "text": "I had the Acme interview today."},
+            {"speaker": "Sam", "text": "How did it go?"},
+        ],
+        open_threads=[
+            {
+                "thread_id": "thr_jobhunt",
+                "title": "Maya's job hunt",
+                "summary": "Maya is looking for a new job",
+            }
+        ],
+    )
+    assert len(result.candidates) == 1
+    cand = result.candidates[0]
+    assert cand.action == "update"
+    assert cand.existing_thread_id == "thr_jobhunt"
+    assert cand.summary == "Maya interviewed at Acme today"
+
+
+@pytest.mark.asyncio
+async def test_classifier_failure_returns_empty():
+    """Three malformed classifier responses → empty candidates list."""
+    mock = MockLLMClient(canned=["not json", "still not json", "{bad"])
+    result = await detect_threads(
+        mock,
+        classifier_model="x",
+        scene_transcript=[
+            {"speaker": "Maya", "text": "Anything could happen here."},
+        ],
+        open_threads=[],
+    )
+    assert result.candidates == []
+
+
+@pytest.mark.asyncio
+async def test_empty_transcript_short_circuits():
+    """Empty transcript short-circuits — classifier must not be called."""
+    mock = MockLLMClient(canned=[])
+    result = await detect_threads(
+        mock,
+        classifier_model="x",
+        scene_transcript=[],
+        open_threads=[],
+    )
+    assert result.candidates == []

tests/test_threads_state.py

@@ -0,0 +1,181 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_and_apply, append_event
+from chat.eventlog.projector import project
+import chat.state.entities  # registers handlers
+import chat.state.world  # registers handlers
+import chat.state.threads  # registers handlers
+from chat.state.threads import get_thread, list_open_threads
+
+
+def _bot_payload(bot_id: str, name: str) -> dict:
+    return {
+        "id": bot_id,
+        "name": name,
+        "persona": "thoughtful, observant",
+        "voice_samples": [],
+        "traits": [],
+        "backstory": "",
+        "initial_relationship_to_you": "coworker",
+        "kickoff_prose": "",
+    }
+
+
+def _chat_payload(chat_id: str = "chat_bot_a") -> dict:
+    return {
+        "id": chat_id,
+        "host_bot_id": "bot_a",
+        "guest_bot_id": "bot_b",
+        "initial_time": "2026-04-26T20:00:00+00:00",
+        "narrative_anchor": "Day 1 evening",
+        "weather": "clear",
+    }
+
+
+def test_thread_opened_creates_row(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="thread_opened",
+            payload={
+                "thread_id": "thr_abc",
+                "chat_id": "chat_bot_a",
+                "title": "Maya's job hunt",
+                "summary": "Maya is looking for a new job",
+            },
+        )
+        project(conn)
+
+        t = get_thread(conn, "thr_abc")
+        assert t is not None
+        assert t["thread_id"] == "thr_abc"
+        assert t["chat_id"] == "chat_bot_a"
+        assert t["title"] == "Maya's job hunt"
+        assert t["summary"] == "Maya is looking for a new job"
+        assert t["status"] == "open"
+        assert t["closed_at"] is None
+        assert t["last_referenced_scene_id"] is None
+
+
+def test_thread_updated_changes_summary_and_last_referenced(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="thread_opened",
+            payload={
+                "thread_id": "thr_abc",
+                "chat_id": "chat_bot_a",
+                "title": "Maya's job hunt",
+                "summary": "Maya is looking for a new job",
+            },
+        )
+        append_event(
+            conn,
+            kind="thread_updated",
+            payload={
+                "thread_id": "thr_abc",
+                "summary": "Maya landed an interview at a startup",
+                "last_referenced_scene_id": 42,
+            },
+        )
+        project(conn)
+
+        t = get_thread(conn, "thr_abc")
+        assert t is not None
+        assert t["summary"] == "Maya landed an interview at a startup"
+        assert t["last_referenced_scene_id"] == 42
+        assert t["status"] == "open"
+
+
+def test_thread_closed_terminal(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        append_event(
+            conn,
+            kind="thread_opened",
+            payload={
+                "thread_id": "thr_abc",
+                "chat_id": "chat_bot_a",
+                "title": "Maya's job hunt",
+                "summary": "Maya is looking for a new job",
+            },
+        )
+        append_event(
+            conn,
+            kind="thread_closed",
+            payload={
+                "thread_id": "thr_abc",
+                "closed_at": "2026-04-26T21:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        t = get_thread(conn, "thr_abc")
+        assert t is not None
+        assert t["status"] == "closed"
+        assert t["closed_at"] == "2026-04-26T21:00:00+00:00"
+
+        # Subsequent updates to a closed thread are no-ops.
+        append_and_apply(
+            conn,
+            kind="thread_updated",
+            payload={
+                "thread_id": "thr_abc",
+                "summary": "should not be applied",
+            },
+        )
+
+        t2 = get_thread(conn, "thr_abc")
+        assert t2 is not None
+        assert t2["summary"] == "Maya is looking for a new job"
+        assert t2["status"] == "closed"
+
+
+def test_list_open_threads_filters_to_open_only(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        append_event(conn, kind="bot_authored", payload=_bot_payload("bot_a", "BotA"))
+        append_event(conn, kind="chat_created", payload=_chat_payload())
+        for tid, title in [
+            ("thr_1", "Arc 1"),
+            ("thr_2", "Arc 2"),
+            ("thr_3", "Arc 3"),
+        ]:
+            append_event(
+                conn,
+                kind="thread_opened",
+                payload={
+                    "thread_id": tid,
+                    "chat_id": "chat_bot_a",
+                    "title": title,
+                    "summary": "",
+                },
+            )
+        append_event(
+            conn,
+            kind="thread_closed",
+            payload={
+                "thread_id": "thr_3",
+                "closed_at": "2026-04-26T21:00:00+00:00",
+            },
+        )
+        project(conn)
+
+        open_threads = list_open_threads(conn, "chat_bot_a")
+        assert len(open_threads) == 2
+        ids = {t["thread_id"] for t in open_threads}
+        assert ids == {"thr_1", "thr_2"}

tests/test_time_skip_handlers.py

@@ -0,0 +1,132 @@
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+import chat.state.world  # registers handlers
+from chat.state.world import get_activity, get_chat
+
+
+def _chat_payload(**overrides):
+    payload = {
+        "id": "chat_bot_a",
+        "host_bot_id": "bot_a",
+        "guest_bot_id": None,
+        "initial_time": "2026-04-26T20:00:00+00:00",
+        "narrative_anchor": "Day 1 evening",
+        "weather": "clear",
+    }
+    payload.update(overrides)
+    return payload
+
+
+def _container_payload(**overrides):
+    payload = {
+        "chat_id": "chat_bot_a",
+        "name": "office",
+        "type": "workplace",
+        "properties": {
+            "public": True,
+            "moving": False,
+            "audible_range": "normal",
+            "slots": [],
+        },
+        "parent_id": None,
+    }
+    payload.update(overrides)
+    return payload
+
+
+def _activity_payload(**overrides):
+    payload = {
+        "entity_id": "bot_a",
+        "container_id": 1,
+        "slot": "desk_chair",
+        "posture": "sitting",
+        "action": {"verb": "writing email"},
+        "attention": "the screen",
+        "holding": ["pen"],
+        "status": {"hungry": False},
+    }
+    payload.update(overrides)
+    return payload
+
+
+def _seed_events(conn):
+    """Append seed events but do NOT project — caller appends more then projects once."""
+    append_event(conn, kind="chat_created", payload=_chat_payload())
+    append_event(conn, kind="container_created", payload=_container_payload())
+    append_event(conn, kind="activity_change", payload=_activity_payload())
+
+
+def test_elision_advances_chat_clock_only(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_events(conn)
+        append_event(conn, kind="time_skip_elision", payload={
+            "chat_id": "chat_bot_a",
+            "new_time": "2026-04-26T20:30:00+00:00",
+        })
+        project(conn)
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"] == "2026-04-26T20:30:00+00:00"
+
+        # Activity row preserved with the same fields it was seeded with.
+        a = get_activity(conn, "bot_a")
+        assert a is not None
+        assert a["entity_id"] == "bot_a"
+        assert a["container_id"] == 1
+        assert a["slot"] == "desk_chair"
+        assert a["posture"] == "sitting"
+        assert a["action"] == {"verb": "writing email"}
+        assert a["attention"] == "the screen"
+        assert a["holding"] == ["pen"]
+        assert a["status"] == {"hungry": False}
+
+
+def test_jump_with_reset_clears_activity(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_events(conn)
+        append_event(conn, kind="time_skip_jump", payload={
+            "chat_id": "chat_bot_a",
+            "new_time": "2026-04-27T08:00:00+00:00",
+            "reset_activity": True,
+        })
+        project(conn)
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"] == "2026-04-27T08:00:00+00:00"
+
+        count = conn.execute(
+            "SELECT COUNT(*) FROM activity "
+            "WHERE container_id IN (SELECT id FROM containers WHERE chat_id = ?)",
+            ("chat_bot_a",),
+        ).fetchone()[0]
+        assert count == 0
+        assert get_activity(conn, "bot_a") is None
+
+
+def test_jump_without_reset_preserves_activity(tmp_path):
+    db = tmp_path / "t.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        _seed_events(conn)
+        append_event(conn, kind="time_skip_jump", payload={
+            "chat_id": "chat_bot_a",
+            "new_time": "2026-04-27T08:00:00+00:00",
+            "reset_activity": False,
+        })
+        project(conn)
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"] == "2026-04-27T08:00:00+00:00"
+
+        a = get_activity(conn, "bot_a")
+        assert a is not None
+        assert a["posture"] == "sitting"
+        assert a["action"]["verb"] == "writing email"

tests/test_turn_common.py

@@ -0,0 +1,297 @@
+"""Shared turn helpers (T83.2).
+
+``chat.services.turn_common`` extracts two snippets that were duplicated
+between ``chat.web.turns`` and ``chat.services.regenerate``: the recent
+user-side / assistant_turn read, and the directed-pair edge gather for
+the multi-pair state-update pass. These tests pin the helpers' behavior
+independently of either call site.
+"""
+
+from __future__ import annotations
+
+from chat.db.connection import open_db
+from chat.db.migrate import apply_migrations
+from chat.eventlog.log import append_event
+from chat.eventlog.projector import project
+from chat.services.turn_common import gather_prior_edges, read_recent_dialogue
+
+
+def _seed_basic_chat(db_path):
+    """Seed bot + chat + a couple of edges + one round of user/assistant
+    turns. Returns ``(user_turn_id, assistant_turn_id)``.
+    """
+    apply_migrations(db_path)
+    with open_db(db_path) as conn:
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_a",
+                "name": "BotA",
+                "persona": "thoughtful",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "",
+                "kickoff_prose": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": "bot_a",
+                "target_id": "you",
+                "chat_id": "chat_a",
+                "affinity_delta": 7,
+                "trust_delta": 3,
+            },
+        )
+        append_event(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": "you",
+                "target_id": "bot_a",
+                "chat_id": "chat_a",
+                "affinity_delta": 2,
+                "trust_delta": 1,
+            },
+        )
+        ut_id = append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "chat_a",
+                "prose": "hello",
+                "segments": [],
+            },
+        )
+        at_id = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_a",
+                "speaker_id": "bot_a",
+                "text": "Original.",
+                "truncated": False,
+                "user_turn_id": ut_id,
+            },
+        )
+        project(conn)
+    return ut_id, at_id
+
+
+def test_read_recent_dialogue_returns_chronological_pairs(tmp_path):
+    """``read_recent_dialogue`` returns oldest-first ``{speaker, text}``
+    entries scoped to the requested chat. Speaker is "you" for user-side
+    rows and the assistant_turn's ``speaker_id`` for bot rows.
+    """
+    db = tmp_path / "test.db"
+    _seed_basic_chat(db)
+
+    with open_db(db) as conn:
+        out = read_recent_dialogue(conn, "chat_a", limit=10)
+
+    # Each entry now carries the source ``event_log.id`` as ``event_id``
+    # (T86 follow-up) so the chat-detail Jinja loop can stamp
+    # ``id="turn-<n>"`` on each rendered turn DIV — needed by the
+    # ``turn_html_replace`` SSE handler for in-place regenerate swaps.
+    speakers = [(e["speaker"], e["text"]) for e in out]
+    assert speakers == [
+        ("you", "hello"),
+        ("bot_a", "Original."),
+    ]
+    assert all("event_id" in e and isinstance(e["event_id"], int) for e in out)
+
+
+def test_read_recent_dialogue_filters_superseded_and_other_chats(tmp_path):
+    """Superseded rows drop out (regenerate-aware). Rows scoped to a
+    different chat are also filtered. ``exclude_event_id`` excludes a
+    specific row even when it isn't superseded yet (regenerate uses this
+    to drop the original assistant_turn before the supersede UPDATE
+    lands).
+    """
+    db = tmp_path / "test.db"
+    ut_id, at_id = _seed_basic_chat(db)
+
+    with open_db(db) as conn:
+        # Append a second user/assistant pair.
+        ut_id2 = append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "chat_a",
+                "prose": "how are you",
+                "segments": [],
+            },
+        )
+        at_id2 = append_event(
+            conn,
+            kind="assistant_turn",
+            payload={
+                "chat_id": "chat_a",
+                "speaker_id": "bot_a",
+                "text": "Second.",
+                "truncated": False,
+                "user_turn_id": ut_id2,
+            },
+        )
+        # And a row scoped to a different chat — must NOT appear.
+        append_event(
+            conn,
+            kind="user_turn",
+            payload={
+                "chat_id": "other_chat",
+                "prose": "should be filtered",
+                "segments": [],
+            },
+        )
+        # Mark the first assistant_turn as superseded — must drop out.
+        conn.execute(
+            "UPDATE event_log SET superseded_by = ? WHERE id = ?",
+            (at_id2, at_id),
+        )
+
+        out = read_recent_dialogue(conn, "chat_a", limit=10)
+        # First (superseded) assistant turn dropped; "other_chat" rows
+        # filtered; first user_turn still present.
+        speakers = [(e["speaker"], e["text"]) for e in out]
+        assert speakers == [
+            ("you", "hello"),
+            ("you", "how are you"),
+            ("bot_a", "Second."),
+        ]
+
+        # exclude_event_id drops at_id2 even though it's not superseded.
+        out2 = read_recent_dialogue(
+            conn, "chat_a", limit=10, exclude_event_id=at_id2
+        )
+        speakers2 = [(e["speaker"], e["text"]) for e in out2]
+        assert ("bot_a", "Second.") not in speakers2
+        assert ("you", "how are you") in speakers2
+
+    # Ensure ut_id is still part of the dataset (sanity for the seed).
+    assert ut_id is not None
+
+
+def test_read_recent_dialogue_limit_respects_chat_scope(tmp_path):
+    """T90.1: ``read_recent_dialogue`` must push the chat_id filter into
+    SQL so that ``LIMIT N`` returns N rows scoped to the requested chat —
+    not N globally-recent rows that may then be filtered down to fewer in
+    Python.
+
+    Setup: two chats with 60 turns each, interleaved. With the old
+    post-fetch filter, ``LIMIT 50`` would pull 50 globally-recent rows
+    (most or all from chat_b — the most recent inserts) and then drop
+    chat_b ones via the Python check, yielding far fewer than 50 chat_a
+    rows. After the SQL pushdown, ``LIMIT 50`` should return exactly 50
+    chat_a rows.
+    """
+    db = tmp_path / "test.db"
+    apply_migrations(db)
+    with open_db(db) as conn:
+        for chat_id, host_bot in (("chat_a", "bot_a"), ("chat_b", "bot_b")):
+            append_event(
+                conn,
+                kind="bot_authored",
+                payload={
+                    "id": host_bot,
+                    "name": host_bot,
+                    "persona": "...",
+                    "voice_samples": [],
+                    "traits": [],
+                    "backstory": "",
+                    "initial_relationship_to_you": "",
+                    "kickoff_prose": "",
+                },
+            )
+            append_event(
+                conn,
+                kind="chat_created",
+                payload={
+                    "id": chat_id,
+                    "host_bot_id": host_bot,
+                    "initial_time": "2026-04-26T20:00:00+00:00",
+                    "narrative_anchor": "Day 1",
+                    "weather": "",
+                },
+            )
+        # Interleave 60 user_turn rows in each chat — chat_b's go in last
+        # so they dominate the global tail.
+        for i in range(60):
+            append_event(
+                conn,
+                kind="user_turn",
+                payload={
+                    "chat_id": "chat_a",
+                    "prose": f"a-{i}",
+                    "segments": [],
+                },
+            )
+        for i in range(60):
+            append_event(
+                conn,
+                kind="user_turn",
+                payload={
+                    "chat_id": "chat_b",
+                    "prose": f"b-{i}",
+                    "segments": [],
+                },
+            )
+        project(conn)
+
+        out = read_recent_dialogue(conn, "chat_a", limit=50)
+
+    # All returned rows should belong to chat_a (texts a-* only).
+    assert len(out) == 50
+    for entry in out:
+        assert entry["text"].startswith("a-"), (
+            f"foreign chat row leaked: {entry!r}"
+        )
+
+
+def test_gather_prior_edges_fills_missing_with_default(tmp_path):
+    """``gather_prior_edges`` returns one entry per directed pair across
+    ``present_ids``. Missing rows fall back to the schema default
+    50/50 baseline; existing rows carry their stored values.
+    """
+    db = tmp_path / "test.db"
+    _seed_basic_chat(db)
+
+    with open_db(db) as conn:
+        out = gather_prior_edges(conn, ["bot_a", "you"])
+
+    # 2 entities -> 2 directed pairs (a->b and b->a, no self-pairs).
+    assert set(out.keys()) == {("bot_a", "you"), ("you", "bot_a")}
+    bot_to_you = out[("bot_a", "you")]
+    you_to_bot = out[("you", "bot_a")]
+    # Both edges seeded with deltas — they must reflect the projected
+    # affinity/trust (not the default 50/50).
+    assert bot_to_you["affinity"] == 57  # 50 + 7
+    assert bot_to_you["trust"] == 53  # 50 + 3
+    assert you_to_bot["affinity"] == 52
+    assert you_to_bot["trust"] == 51
+
+    # A pair with no row yet falls back to 50/50.
+    with open_db(db) as conn:
+        out_with_missing = gather_prior_edges(
+            conn, ["bot_a", "you", "ghost_bot"]
+        )
+    # 3 entities -> 6 directed pairs.
+    assert len(out_with_missing) == 6
+    fallback = out_with_missing[("bot_a", "ghost_bot")]
+    assert fallback["affinity"] == 50
+    assert fallback["trust"] == 50
+    assert fallback["summary"] == ""

tests/test_turn_flow.py

@@ -19,7 +19,7 @@ from fastapi.testclient import TestClient
 
 from chat.app import app
 from chat.db.connection import open_db
-from chat.eventlog.log import append_event
+from chat.eventlog.log import append_and_apply, append_event
 from chat.eventlog.projector import project
 from chat.llm.mock import MockLLMClient
 
@@ -405,14 +405,15 @@ def test_multi_bot_turn_no_interjection(app_state_setup, tmp_path):
     1 user_turn + 1 assistant_turn + 6 *post-turn* edge_updates + 2
     memory_written events. Single turn_html broadcast.
 
-    Canned queue (8 calls):
+    Canned queue (11 calls):
       1. parse_turn
-      2. narrative stream (primary, addressee = host because the prose
+      2. detect_addressee (T74.1) -> host
+      3. narrative stream (primary, addressee = host because the prose
          doesn't name the guest)
-      3-8. 6 state-update calls (one per directed pair across {you,
+      4-9. 6 state-update calls (one per directed pair across {you,
          bot_a, bot_b})
-      9. detect_interjection -> should_interject=False
+      10. detect_interjection -> should_interject=False
-      10. detect_scene_close -> should_close=False
+      11. detect_scene_close -> should_close=False
     """
     _seed_chat_with_guest(tmp_path / "test.db")
     canned_parse = json.dumps(
@@ -420,6 +421,9 @@ def test_multi_bot_turn_no_interjection(app_state_setup, tmp_path):
     )
     canned = [
         canned_parse,
+        json.dumps(
+            {"addressee_id": "bot_a", "confidence": "medium", "reason": "host"}
+        ),
         "Greetings.",
         _zero_state(), _zero_state(), _zero_state(),
         _zero_state(), _zero_state(), _zero_state(),
@@ -474,14 +478,15 @@ def test_multi_bot_turn_with_interjection(app_state_setup, tmp_path):
     1 user_turn + 2 assistant_turns + (6 + 6) post-turn edge_updates +
     4 memory_written events.
 
-    Canned queue (16 calls):
+    Canned queue (17 calls):
       1. parse_turn
-      2. narrative stream (primary)
+      2. detect_addressee (T74.1) -> host
-      3-8. 6 state-update calls (post-primary)
+      3. narrative stream (primary)
-      9. detect_interjection -> should_interject=True
+      4-9. 6 state-update calls (post-primary)
-      10. narrative stream (interjection)
+      10. detect_interjection -> should_interject=True
-      11-16. 6 state-update calls (post-interjection)
+      11. narrative stream (interjection)
-      17. detect_scene_close -> should_close=False
+      12-17. 6 state-update calls (post-interjection)
+      18. detect_scene_close -> should_close=False
     """
     _seed_chat_with_guest(tmp_path / "test.db")
     canned_parse = json.dumps(
@@ -489,6 +494,9 @@ def test_multi_bot_turn_with_interjection(app_state_setup, tmp_path):
     )
     canned = [
         canned_parse,
+        json.dumps(
+            {"addressee_id": "bot_a", "confidence": "medium", "reason": "host"}
+        ),
         "Primary beat.",
         _zero_state(), _zero_state(), _zero_state(),
         _zero_state(), _zero_state(), _zero_state(),
@@ -555,14 +563,15 @@ def test_multi_bot_turn_scene_close_writes_per_pov_summaries(
     rewrites fire for both bots (memory.pov_summary changes for each).
     Interjection short-circuits at False so the queue stays compact.
 
-    Canned queue (12 calls):
+    Canned queue (13 calls):
       1. parse_turn
-      2. narrative stream (primary)
+      2. detect_addressee (T74.1) -> host
-      3-8. 6 state-update calls
+      3. narrative stream (primary)
-      9. detect_interjection -> False (no follow-on stream)
+      4-9. 6 state-update calls
-      10. detect_scene_close -> True
+      10. detect_interjection -> False (no follow-on stream)
-      11. apply_scene_close_summary host POV
+      11. detect_scene_close -> True
-      12. apply_scene_close_summary guest POV
+      12. apply_scene_close_summary host POV
+      13. apply_scene_close_summary guest POV
     """
     _seed_chat_with_guest(tmp_path / "test.db")
     canned_parse = json.dumps(
@@ -588,6 +597,9 @@ def test_multi_bot_turn_scene_close_writes_per_pov_summaries(
     )
     canned = [
         canned_parse,
+        json.dumps(
+            {"addressee_id": "bot_a", "confidence": "medium", "reason": "host"}
+        ),
         "Goodnight.",
         _zero_state(), _zero_state(), _zero_state(),
         _zero_state(), _zero_state(), _zero_state(),
@@ -639,12 +651,20 @@ def test_multi_bot_turn_scene_close_writes_per_pov_summaries(
 
 
 def test_addressee_detection_routes_to_named_bot(app_state_setup, tmp_path):
-    """Prose that names the guest by name routes the primary turn to the
+    """T74.1: the multi-entity addressee call goes through the classifier;
-    guest. Interjection (when fired) makes the host the silent witness
+    when the classifier returns the guest, the primary turn routes there.
-    and the second assistant_turn carries the host as speaker.
+    Interjection (when fired) makes the host the silent witness and the
+    second assistant_turn carries the host as speaker.
 
-    Canned queue: same shape as the with-interjection test (16 calls)
+    Canned queue (with classifier-led addressee = guest):
-    plus the trailing scene_close decision.
+      1. parse_turn
+      2. detect_addressee -> bot_b (the guest)
+      3. narrative stream (primary, addressee = guest)
+      4-9. 6 state-update calls
+      10. detect_interjection -> True
+      11. interjection narrative stream
+      12-17. 6 state-update calls (post-interjection)
+      18. detect_scene_close -> False
     """
     _seed_chat_with_guest(tmp_path / "test.db")
     canned_parse = json.dumps(
@@ -652,6 +672,13 @@ def test_addressee_detection_routes_to_named_bot(app_state_setup, tmp_path):
     )
     canned = [
         canned_parse,
+        json.dumps(
+            {
+                "addressee_id": "bot_b",
+                "confidence": "high",
+                "reason": "user named BotB",
+            }
+        ),
         "BotB pondering.",
         _zero_state(), _zero_state(), _zero_state(),
         _zero_state(), _zero_state(), _zero_state(),
@@ -680,9 +707,857 @@ def test_addressee_detection_routes_to_named_bot(app_state_setup, tmp_path):
         primary_payload = json.loads(rows[0][0])
         interjection_payload = json.loads(rows[1][0])
 
-    # Primary speaker is the guest because the prose names BotB and not
+    # Primary speaker is the guest because the addressee classifier
-    # BotA (case-insensitive whole-word match).
+    # picked bot_b for the prose ("BotB, what do you think?").
     assert primary_payload["speaker_id"] == "bot_b"
     # Interjection follow-on goes to the silent witness — the host.
     assert interjection_payload["speaker_id"] == "bot_a"
     assert interjection_payload["interjection_of"] == "bot_b"
+
+
+def test_cancelled_turn_still_closes_scene_when_user_prose_signals_close(
+    app_state_setup, tmp_path
+):
+    """T74.3 regression: a cancelled primary stream still triggers scene
+    close when the user prose carries a hard close signal.
+
+    Rationale (also documented in turns.py near the close-detection
+    branch): close detection only consumes the user's prose, which is
+    fully appended to the event_log BEFORE streaming starts. The
+    cancelled bot beat doesn't invalidate the user's intent to close.
+
+    Implementation: install a MockLLMClient whose ``stream`` raises
+    CancelledError on the first iteration. The classifier calls (parse,
+    addressee, scene_close, per-POV summaries) are still served from
+    the canned queue. The post_turn route ultimately re-raises
+    CancelledError after recording the partial — TestClient surfaces
+    that as an exception, so we drive the request inside ``with
+    pytest.raises``. Despite the exception, the scene_closed event
+    must land in the event_log.
+    """
+    from typing import AsyncIterator, Sequence
+
+    _seed_chat_with_guest(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "narration", "text": "we are done here, fade out"}]}
+    )
+    pov_payload = json.dumps(
+        {
+            "summary": "BotA noticed the day winding down.",
+            "knowledge_facts": [],
+            "relationship_summary": "warmer",
+        }
+    )
+    pov_payload_guest = json.dumps(
+        {
+            "summary": "BotB watched the scene close.",
+            "knowledge_facts": [],
+            "relationship_summary": "warmer",
+        }
+    )
+    # Canned queue: parse + addressee + 6 state-updates +
+    # scene_close=True + 2 per-POV summaries. NO interjection slot
+    # because the cancel path short-circuits the interjection branch.
+    canned = [
+        canned_parse,
+        json.dumps(
+            {"addressee_id": "bot_a", "confidence": "medium", "reason": "host"}
+        ),
+        # NOTE: no narrative slot — the stream is hijacked below to
+        # raise CancelledError on first iteration; it never pulls a
+        # canned response.
+        _zero_state(), _zero_state(), _zero_state(),
+        _zero_state(), _zero_state(), _zero_state(),
+        json.dumps({"should_close": True, "reason": "fade out signaled"}),
+        pov_payload,
+        pov_payload_guest,
+    ]
+
+    class _CancelOnStreamMock:
+        """Mock LLM client that serves ``generate`` from a canned queue
+        and raises CancelledError on the FIRST iteration of ``stream``.
+
+        Mirrors :class:`chat.llm.mock.MockLLMClient` for ``generate`` but
+        diverges on ``stream`` to simulate a mid-stream cancel.
+        """
+
+        def __init__(self, canned: list[str]) -> None:
+            self._canned = list(canned)
+
+        async def generate(
+            self, messages: Sequence, *, model: str, **params
+        ) -> str:
+            return self._canned.pop(0)
+
+        async def stream(
+            self, messages: Sequence, *, model: str, **params
+        ) -> AsyncIterator[str]:
+            # Yield a CancelledError on first iteration to simulate the
+            # /turns/cancel route firing mid-stream.
+            raise asyncio.CancelledError
+            yield  # pragma: no cover — keeps this an async generator.
+
+    from chat.web.kickoff import get_llm_client
+
+    mock = _CancelOnStreamMock(canned=list(canned))
+    app.dependency_overrides[get_llm_client] = lambda: mock
+
+    try:
+        # FastAPI/Starlette handles the re-raised CancelledError as an
+        # internal failure — TestClient surfaces it as a 500 response.
+        # We don't assert on the status here; the regression is whether
+        # the scene_closed event still landed in the event_log.
+        try:
+            app_state_setup.post(
+                "/chats/chat_bot_a/turns",
+                data={"prose": "we are done here, fade out"},
+            )
+        except BaseException:
+            # Some Starlette/asyncio versions propagate the
+            # CancelledError out of the test client; that's fine — the
+            # partial-record + scene-close still ran before the raise.
+            pass
+    finally:
+        app.dependency_overrides.clear()
+
+    with open_db(tmp_path / "test.db") as conn:
+        scene_close_count = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'scene_closed'"
+        ).fetchone()[0]
+        assistant_payload = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' ORDER BY id"
+        ).fetchall()
+
+    # Scene close lands despite the cancel.
+    assert scene_close_count == 1
+    # The cancelled assistant_turn was still recorded (truncated=True).
+    assert len(assistant_payload) == 1
+    assert json.loads(assistant_payload[0][0])["truncated"] is True
+
+
+def test_interjection_enqueues_significance_job(app_state_setup, tmp_path):
+    """T74.2: when an interjection fires, the interjection memory is
+    enqueued for significance scoring just like the primary memory.
+
+    Capture enqueued ``SignificanceJob``s by replacing the background
+    worker's ``enqueue`` method with a list-append. Without T74.2, the
+    interjection memory would never be scored — only the primary's
+    enqueue would land. We therefore expect TWO jobs after a turn that
+    has both a primary and an interjection beat: one for the primary
+    memory, one for the interjection memory.
+    """
+    _seed_chat_with_guest(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "dialogue", "text": "tell me"}]}
+    )
+    canned = [
+        canned_parse,
+        json.dumps(
+            {"addressee_id": "bot_a", "confidence": "medium", "reason": "host"}
+        ),
+        "Primary beat.",
+        _zero_state(), _zero_state(), _zero_state(),
+        _zero_state(), _zero_state(), _zero_state(),
+        json.dumps({"should_interject": True, "reason": "jealous"}),
+        "Interjection beat!",
+        _zero_state(), _zero_state(), _zero_state(),
+        _zero_state(), _zero_state(), _zero_state(),
+        json.dumps({"should_close": False, "reason": "no signal"}),
+    ]
+    _override_llm(canned)
+
+    captured_jobs: list = []
+    worker = app.state.background_worker
+    # Re-enable enqueue capture even though the worker's loop is disabled
+    # — we want to count enqueues without the loop running classifier work.
+    worker.enabled = True
+    original_enqueue = worker.enqueue
+    worker.enqueue = captured_jobs.append  # type: ignore[assignment]
+
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "tell me"}
+        )
+        assert response.status_code == 204
+    finally:
+        worker.enqueue = original_enqueue  # type: ignore[assignment]
+        worker.enabled = False
+        app.dependency_overrides.clear()
+
+    # Expect 2 enqueues: 1 for the primary memory + 1 for the
+    # interjection memory.
+    assert len(captured_jobs) == 2
+
+    # Both jobs should reference distinct memory ids — the primary's
+    # host-POV memory and the interjection's host-POV memory.
+    memory_ids = [job.memory_id for job in captured_jobs]
+    assert len(set(memory_ids)) == 2
+    # The two narrative texts should be the two streamed beats.
+    narrative_texts = sorted(job.narrative_text for job in captured_jobs)
+    assert narrative_texts == ["Interjection beat!", "Primary beat."]
+
+
+# ---------------------------------------------------------------------------
+# Phase 3 (T61) — per-turn event-lifecycle detection + completion promotion.
+#
+# After the post-turn classifier passes (memory write, state update,
+# interjection check) and BEFORE scene-close detection, ``post_turn``
+# calls :func:`detect_event_transitions`. Each transition becomes one
+# of ``event_started`` / ``event_completed`` / ``event_cancelled``. A
+# completed event is followed inline by ``promote_completed_event`` so
+# the props it carries (knowledge_facts, etc.) land in state
+# synchronously.
+#
+# When no active events are seeded the classifier short-circuits without
+# an LLM call (per T52) — the canned queue therefore needs ZERO extra
+# slots in that case.
+# ---------------------------------------------------------------------------
+
+
+def test_turn_with_event_transition_appends_started_event(
+    app_state_setup, tmp_path
+):
+    """A planned event becomes active when the classifier reports a
+    ``new_status='active'`` transition for that event_id.
+
+    Canned queue (5 calls — single-bot, no scene seeded):
+      1. parse_turn
+      2. narrative stream
+      3. state-update bot_a -> you
+      4. state-update you -> bot_a
+      5. detect_event_transitions -> 1 transition (active)
+    """
+    _seed(tmp_path / "test.db")
+    # Seed a planned event so list_active_events returns 1 row. Use
+    # append_and_apply so we don't re-replay the prior chat_created event
+    # (whose handler is INSERT-not-IGNORE and would 409 on replay).
+    with open_db(tmp_path / "test.db") as conn:
+        append_and_apply(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_1",
+                "chat_id": "chat_bot_a",
+                "kind": "story_event",
+                "props": {},
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "dialogue", "text": "they arrived"}]}
+    )
+    canned_event_decision = json.dumps(
+        {
+            "transitions": [
+                {
+                    "event_id": "evt_1",
+                    "new_status": "active",
+                    "reason": "they arrived",
+                }
+            ]
+        }
+    )
+    mock = _override_llm(
+        [
+            canned_parse,
+            "They walk in.",
+            _zero_state(),
+            _zero_state(),
+            canned_event_decision,
+        ]
+    )
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "they arrived"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    # All 5 canned slots consumed.
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        # event_started landed in event_log.
+        rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'event_started' ORDER BY id"
+        ).fetchall()
+        assert len(rows) == 1
+        started_payload = json.loads(rows[0][0])
+        assert started_payload["event_id"] == "evt_1"
+        assert started_payload["started_at"] == "2026-04-26T20:00:00+00:00"
+
+        # The events projection row reflects the active status.
+        ev_row = conn.execute(
+            "SELECT status, started_at FROM events WHERE event_id = ?",
+            ("evt_1",),
+        ).fetchone()
+        assert ev_row is not None
+        assert ev_row[0] == "active"
+        assert ev_row[1] == "2026-04-26T20:00:00+00:00"
+
+
+def test_turn_with_event_completion_runs_promotion(app_state_setup, tmp_path):
+    """An active event with knowledge_facts in props completes; the
+    inline call to ``promote_completed_event`` emits the corresponding
+    ``edge_update``.
+    """
+    _seed(tmp_path / "test.db")
+    # Seed: planned -> started so the event is currently active. Props
+    # carry a knowledge_fact that promotion will turn into an edge_update.
+    # Use append_and_apply (not project) to avoid re-replaying chat_created.
+    with open_db(tmp_path / "test.db") as conn:
+        append_and_apply(
+            conn,
+            kind="event_planned",
+            payload={
+                "event_id": "evt_2",
+                "chat_id": "chat_bot_a",
+                "kind": "story_event",
+                "props": {
+                    "knowledge_facts": [
+                        {
+                            "owner_id": "bot_a",
+                            "target_id": "you",
+                            "fact": "Maya likes pottery",
+                        }
+                    ]
+                },
+                "planned_for": "2026-04-30T18:00:00+00:00",
+            },
+        )
+        append_and_apply(
+            conn,
+            kind="event_started",
+            payload={
+                "event_id": "evt_2",
+                "started_at": "2026-04-30T19:00:00+00:00",
+            },
+        )
+
+    # Snapshot the max event_log id so we can assert on rows AFTER the turn.
+    with open_db(tmp_path / "test.db") as conn:
+        before_id = conn.execute(
+            "SELECT COALESCE(MAX(id), 0) FROM event_log"
+        ).fetchone()[0]
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "dialogue", "text": "we wrap it up"}]}
+    )
+    canned_event_decision = json.dumps(
+        {
+            "transitions": [
+                {
+                    "event_id": "evt_2",
+                    "new_status": "completed",
+                    "reason": "wrapped",
+                }
+            ]
+        }
+    )
+    mock = _override_llm(
+        [
+            canned_parse,
+            "They wrap it up.",
+            _zero_state(),
+            _zero_state(),
+            canned_event_decision,
+        ]
+    )
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "we wrap it up"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        # event_completed landed.
+        completed_rows = conn.execute(
+            "SELECT id, payload_json FROM event_log "
+            "WHERE kind = 'event_completed' AND id > ? ORDER BY id",
+            (before_id,),
+        ).fetchall()
+        assert len(completed_rows) == 1
+        completed_payload = json.loads(completed_rows[0][1])
+        assert completed_payload["event_id"] == "evt_2"
+        completed_id = completed_rows[0][0]
+
+        # promote_completed_event ran inline AFTER event_completed: the
+        # follow-on edge_update carries the knowledge fact and is tagged
+        # with source=event_promotion.
+        promo_rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'edge_update' AND id > ? ORDER BY id",
+            (completed_id,),
+        ).fetchall()
+        promo_facts: list[str] = []
+        for (payload_json,) in promo_rows:
+            p = json.loads(payload_json)
+            if p.get("source") == "event_promotion":
+                promo_facts.extend(p.get("knowledge_facts") or [])
+
+    assert "Maya likes pottery" in promo_facts
+
+
+def test_turn_with_no_active_events_skips_classifier(app_state_setup, tmp_path):
+    """When no active events are seeded, ``detect_event_transitions``
+    short-circuits without an LLM call (per T52). The canned queue must
+    therefore have ZERO event-detection slots — same shape as the
+    Phase 2 no-guest baseline.
+    """
+    _seed(tmp_path / "test.db")
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "dialogue", "text": "hello"}]}
+    )
+    # Only 4 slots: parse + narrative + 2 state-updates. NO extra slot for
+    # event-detection — non-existent active_events causes the helper to
+    # short-circuit before pulling from the queue.
+    mock = _override_llm(
+        [canned_parse, "Hi there.", _zero_state(), _zero_state()]
+    )
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "hello"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    # Queue fully drained — no canned slot was consumed by event detection.
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        for kind in ("event_started", "event_completed", "event_cancelled"):
+            count = conn.execute(
+                "SELECT COUNT(*) FROM event_log WHERE kind = ?", (kind,)
+            ).fetchone()[0]
+            assert count == 0, f"expected zero {kind} events, got {count}"
+
+
+# ---------------------------------------------------------------------------
+# Phase 3 (T62) — natural-language skip-command surface.
+#
+# The classifier may flag prose as a time-skip directive via
+# ``ParsedTurn.intent``. Elision runs through the shared controller in
+# :mod:`chat.web.skip` and short-circuits the regular narrative path;
+# jump returns 422 directing the user to the drawer's structured form
+# (Phase 3 simpler path — natural-language jump time derivation is too
+# fragile for v1 without the structured surface).
+# ---------------------------------------------------------------------------
+
+
+def test_elision_skip_via_natural_language(app_state_setup, tmp_path):
+    """User prose 'skip to when we arrive at the park' classifies as
+    ``intent='skip_elision'``. The post_turn handler short-circuits the
+    narrative path, advances the chat clock by an hour stub, appends a
+    ``time_skip_elision`` event AND an ``assistant_turn`` carrying the
+    canned narration. No ``user_turn`` is emitted on the skip path.
+
+    Canned queue: 1 parse_turn (intent=skip_elision) + 1 narration
+    string (consumed by ``narrate_skip``). No state-update / scene-close
+    / event-detection slots — those branches are bypassed entirely.
+    """
+    _seed(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {
+            "segments": [
+                {"kind": "dialogue", "text": "skip to when we arrive at the park"}
+            ],
+            "intent": "skip_elision",
+            "landing_state_hint": "we arrive at the park",
+        }
+    )
+    canned_narration = "We pull up to the park entrance, sun low in the sky."
+    mock = _override_llm([canned_parse, canned_narration])
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "skip to when we arrive at the park"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+
+    # Both canned slots drained — no other classifier branches ran.
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        # time_skip_elision landed.
+        skip_rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'time_skip_elision' ORDER BY id"
+        ).fetchall()
+        assert len(skip_rows) == 1
+        sp = json.loads(skip_rows[0][0])
+        assert sp["chat_id"] == "chat_bot_a"
+        # 1-hour stub from the seeded chat clock (20:00 -> 21:00).
+        assert sp["new_time"].startswith("2026-04-26T21:00:00")
+
+        # Chat clock advanced via the projector.
+        from chat.state.world import get_chat
+
+        chat = get_chat(conn, "chat_bot_a")
+        assert chat["time"].startswith("2026-04-26T21:00:00")
+
+        # An assistant_turn carrying the canned narration was appended.
+        turn_rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'assistant_turn' ORDER BY id"
+        ).fetchall()
+        assert len(turn_rows) == 1
+        tp = json.loads(turn_rows[0][0])
+        assert tp["chat_id"] == "chat_bot_a"
+        assert tp["text"] == canned_narration
+        assert tp["speaker_id"] == "bot_a"
+        assert tp["truncated"] is False
+
+        # No user_turn lands on the skip path — the natural-language
+        # skip is a command, not a beat the bots should remember.
+        user_count = conn.execute(
+            "SELECT COUNT(*) FROM event_log WHERE kind = 'user_turn'"
+        ).fetchone()[0]
+        assert user_count == 0
+
+
+def test_jump_skip_via_natural_language_returns_422(app_state_setup, tmp_path):
+    """User prose 'next morning' classifies as ``intent='skip_jump'``.
+    The handler returns 422 with a guidance payload pointing the author
+    at the drawer's structured jump form. No event is emitted — the
+    drawer form is the only entry point for jump skips in Phase 3.
+    """
+    _seed(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {
+            "segments": [{"kind": "dialogue", "text": "next morning"}],
+            "intent": "skip_jump",
+            "landing_state_hint": "",
+        }
+    )
+    # Only one canned slot — parse — because the 422 fallback short-
+    # circuits before any other classifier runs.
+    mock = _override_llm([canned_parse])
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "next morning"}
+        )
+        assert response.status_code == 422
+        body = response.json()
+        # Guidance payload mentions the drawer so the client can surface
+        # the right CTA; we don't pin the exact wording.
+        assert "drawer" in body.get("error", "").lower()
+    finally:
+        app.dependency_overrides.clear()
+
+    # Parse slot consumed; no follow-on classifier calls.
+    assert mock._canned == []
+
+    with open_db(tmp_path / "test.db") as conn:
+        for kind in (
+            "user_turn",
+            "assistant_turn",
+            "time_skip_elision",
+            "time_skip_jump",
+        ):
+            count = conn.execute(
+                "SELECT COUNT(*) FROM event_log WHERE kind = ?", (kind,)
+            ).fetchone()[0]
+            assert count == 0, f"expected zero {kind} on jump-via-NL, got {count}"
+
+
+def test_skip_command_does_not_run_narrative_classifier(
+    app_state_setup, tmp_path, monkeypatch
+):
+    """The skip dispatch branch must bypass the narrative-prompt assembly
+    entirely. We monkeypatch ``assemble_narrative_prompt`` (re-bound on
+    the ``chat.web.turns`` module since the handler imports it by name)
+    and assert the call count is zero after the elision skip lands.
+    """
+    _seed(tmp_path / "test.db")
+    canned_parse = json.dumps(
+        {
+            "segments": [
+                {"kind": "dialogue", "text": "skip to when we arrive at the park"}
+            ],
+            "intent": "skip_elision",
+            "landing_state_hint": "we arrive at the park",
+        }
+    )
+    canned_narration = "We arrive moments later."
+    mock = _override_llm([canned_parse, canned_narration])
+
+    call_counter = {"n": 0}
+
+    def _spy(*args, **kwargs):
+        call_counter["n"] += 1
+        return []
+
+    # Patch the symbol at the handler's import site so we can assert
+    # the skip path bypasses prompt assembly even when the symbol still
+    # exists in the module namespace.
+    from chat.web import turns as turns_mod
+
+    monkeypatch.setattr(turns_mod, "assemble_narrative_prompt", _spy)
+
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "skip to when we arrive at the park"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+
+    assert mock._canned == []
+    assert call_counter["n"] == 0, (
+        "assemble_narrative_prompt was called on the skip path; the "
+        "natural-language skip dispatch must bypass narrative assembly."
+    )
+
+
+# ---------------------------------------------------------------------------
+# Phase 3.5 (T82.1) — post_turn consumes pending meanwhile digests.
+#
+# The helper ``consume_pending_meanwhile_digests`` lives in
+# chat.services.prompt and is now wired into the END of post_turn (after
+# scene-close detection, before the response broadcast). This pins the
+# wiring so future refactors don't accidentally drop the call and leave
+# digests pending forever.
+# ---------------------------------------------------------------------------
+
+
+def test_post_turn_consumes_pending_meanwhile_digests(
+    app_state_setup, tmp_path
+):
+    """Seed a pending meanwhile digest via ``meanwhile_digest_created``,
+    POST a regular you-turn through post_turn, and assert:
+
+    1. A ``meanwhile_digest_consumed`` event lands in the event_log.
+    2. ``list_pending_meanwhile_digests`` returns empty after the turn.
+
+    The post_turn flow surfaces the digest in the prompt (T65) and then
+    consumes it (T82.1) so the next turn starts clean.
+    """
+    _seed(tmp_path / "test.db")
+
+    db_path = tmp_path / "test.db"
+    # Seed a pending digest directly via the projection event. The scene_id
+    # field doesn't need to reference an existing meanwhile scene for the
+    # digest table — the FK is on the digest payload only.
+    with open_db(db_path) as conn:
+        append_and_apply(
+            conn,
+            kind="meanwhile_digest_created",
+            payload={
+                "scene_id": 99,
+                "chat_id": "chat_bot_a",
+                "summary": "While you were away, the bots talked.",
+            },
+        )
+        # Confirm the digest is pending before the turn lands.
+        from chat.state.meanwhile import list_pending_meanwhile_digests
+
+        assert len(list_pending_meanwhile_digests(conn, "chat_bot_a")) == 1
+
+    canned_parse = json.dumps(
+        {"segments": [{"kind": "dialogue", "text": "hello"}]}
+    )
+    # Standard 4-slot queue: parse + narrative + 2 state-updates. No
+    # active scene so scene-close detection short-circuits without an LLM
+    # call (consistent with the no-guest regression test).
+    mock = _override_llm(
+        [canned_parse, "Hi there.", _zero_state(), _zero_state()]
+    )
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns", data={"prose": "hello"}
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    # All canned slots drained — no extra classifier calls fired.
+    assert mock._canned == []
+
+    with open_db(db_path) as conn:
+        # A meanwhile_digest_consumed event landed for the seeded digest.
+        consumed_rows = conn.execute(
+            "SELECT payload_json FROM event_log "
+            "WHERE kind = 'meanwhile_digest_consumed' ORDER BY id"
+        ).fetchall()
+        assert len(consumed_rows) == 1
+
+        # The pending list is empty after consumption.
+        from chat.state.meanwhile import list_pending_meanwhile_digests
+
+        assert list_pending_meanwhile_digests(conn, "chat_bot_a") == []
+
+
+# ---------------------------------------------------------------------------
+# Phase 3.5 (T82.2) — natural-language skip runs scene close detection.
+#
+# A user typing "fade out, skip an hour" should close the scene FIRST
+# (so the close summary captures the closing scene's final beat) and
+# THEN run the elision skip. Without this wiring, the skip dispatch
+# branch bypasses scene close entirely.
+# ---------------------------------------------------------------------------
+
+
+def test_natural_language_skip_with_close_signal_closes_scene(
+    app_state_setup, tmp_path
+):
+    """Prose that hard-signals a close ("fade out, skip to morning") and
+    parses as ``intent=skip_elision`` must:
+
+    1. Land a ``scene_closed`` event before any skip event.
+    2. Run ``apply_scene_close_summary`` for the closing scene.
+    3. Land a ``time_skip_elision`` event AFTER the scene_closed.
+
+    Order matters — the scene_closed id must be lower than the
+    time_skip_elision id in the event_log.
+
+    Canned queue (single-bot, scene seeded, NO prior dialogue rows):
+      1. parse_turn -> intent=skip_elision
+      2. detect_scene_close -> should_close=True
+      3. apply_scene_close_summary host POV
+      4. narrate_skip narration
+
+    detect_threads (T58.2 fires on every close) short-circuits when the
+    scene-scoped transcript is empty — in this test no user/assistant
+    turns landed in scene 1 before the close, so no thread-detection
+    slot is needed.
+    """
+    # Seed an open scene so detect_scene_close has something to act on.
+    db_path = tmp_path / "test.db"
+    with open_db(db_path) as conn:
+        append_event(
+            conn,
+            kind="bot_authored",
+            payload={
+                "id": "bot_a",
+                "name": "BotA",
+                "persona": "thoughtful, observant",
+                "voice_samples": [],
+                "traits": [],
+                "backstory": "",
+                "initial_relationship_to_you": "",
+                "kickoff_prose": "...",
+            },
+        )
+        append_event(
+            conn,
+            kind="chat_created",
+            payload={
+                "id": "chat_bot_a",
+                "host_bot_id": "bot_a",
+                "initial_time": "2026-04-26T20:00:00+00:00",
+                "narrative_anchor": "Day 1",
+                "weather": "",
+            },
+        )
+        append_event(
+            conn,
+            kind="container_created",
+            payload={
+                "chat_id": "chat_bot_a",
+                "name": "office",
+                "type": "workplace",
+                "properties": {},
+            },
+        )
+        append_event(
+            conn,
+            kind="scene_opened",
+            payload={
+                "chat_id": "chat_bot_a",
+                "container_id": 1,
+                "started_at": "2026-04-26T20:00:00+00:00",
+                "participants": ["you", "bot_a"],
+            },
+        )
+        append_event(
+            conn,
+            kind="edge_update",
+            payload={
+                "source_id": "bot_a",
+                "target_id": "you",
+                "chat_id": "chat_bot_a",
+                "knowledge_facts": ["coworker"],
+            },
+        )
+        for entity_id, verb in [("you", "talking"), ("bot_a", "listening")]:
+            append_event(
+                conn,
+                kind="activity_change",
+                payload={
+                    "entity_id": entity_id,
+                    "posture": "sitting",
+                    "action": {
+                        "verb": verb,
+                        "interruptible": True,
+                        "required_attention": "low",
+                        "expected_duration": "ongoing",
+                    },
+                    "attention": "",
+                    "holding": [],
+                    "status": {},
+                },
+            )
+        project(conn)
+
+    canned_parse = json.dumps(
+        {
+            "segments": [
+                {"kind": "narration", "text": "fade out, skip to morning"}
+            ],
+            "intent": "skip_elision",
+            "landing_state_hint": "morning at home",
+        }
+    )
+    canned_close = json.dumps(
+        {"should_close": True, "reason": "fade out signaled"}
+    )
+    canned_pov = json.dumps(
+        {
+            "summary": "BotA noticed the day winding down.",
+            "knowledge_facts": [],
+            "relationship_summary": "warmer",
+        }
+    )
+    canned_narration = "The night fades and morning arrives."
+    mock = _override_llm(
+        [
+            canned_parse,
+            canned_close,
+            canned_pov,
+            canned_narration,
+        ]
+    )
+    try:
+        response = app_state_setup.post(
+            "/chats/chat_bot_a/turns",
+            data={"prose": "fade out, skip to morning"},
+        )
+        assert response.status_code == 204
+    finally:
+        app.dependency_overrides.clear()
+    # All 4 canned slots drained — close + skip both ran end-to-end.
+    assert mock._canned == []
+
+    with open_db(db_path) as conn:
+        # scene_closed and time_skip_elision both landed.
+        scene_close_rows = conn.execute(
+            "SELECT id FROM event_log WHERE kind = 'scene_closed'"
+        ).fetchall()
+        skip_rows = conn.execute(
+            "SELECT id FROM event_log WHERE kind = 'time_skip_elision'"
+        ).fetchall()
+        assert len(scene_close_rows) == 1, "scene_closed must land"
+        assert len(skip_rows) == 1, "time_skip_elision must land"
+        # Order: scene close first, then skip.
+        assert scene_close_rows[0][0] < skip_rows[0][0], (
+            "scene_closed must precede time_skip_elision in the event_log"
+        )

tests/test_world.py

@@ -324,11 +324,11 @@ def test_get_scene_returns_none_for_missing(tmp_path):
         assert active_scene(conn, "chat_missing") is None
 
 
-def test_schema_version_after_migration_is_8(tmp_path):
+def test_schema_version_after_migration_is_13(tmp_path):
     db = tmp_path / "t.db"
     apply_migrations(db)
     with open_db(db) as conn:
         row = conn.execute(
             "SELECT value FROM meta WHERE key = 'schema_version'"
         ).fetchone()
-        assert int(row[0]) == 8
+        assert int(row[0]) == 13