refactor(simulation): PR #137 review — audit override + regression tests + docs

Addresses Tyre, Hoshe, and lead review comments on PR #137: - **Audit doc amendment** (Tyre E1 / Hoshe H1 / Lead): add "Lead override (2026-04-21)" section at top of docs/architecture/sprint-37-878-audit.md. Rewrites the conclusion to "DECISION: STRIP" with the cascade-based rationale. Preserves the original audit body as the pre-override record. - **Regression tests** (Lead 2a-2b / Hoshe H2 / H3): add POSITIVE assertions of the new uniform behavior so silent reintroduction fails. - `phase2_container_verb_labels_uniform_regardless_of_player_state` — two trials (empty KG, POI-bearing KG) assert container verb labels equal Phase-1 defaults. - `monologue_pool_selection_uniform_no_archetype_key` — two observers with divergent MonologueState both draw from OBSERVE_NPC_LINES. - **Decision record amendments** (Lead 3 / Tyre S2): D-032, D-035, and D-057 amended with Phase 6 deferral wording. "Retired pending Phase 6, not deferred with scaffolding." Reintroduction gate: a confirmed Phase 6 character-model design. - **types.rs doc fixes** (Tyre S1 / Hoshe H5): StartupMessage protocol- flow comment updated to reflect no-version handshake (D-192). ObserverSnapshot version-history block grows a "Sprint 37 wire-format shifts" section documenting D-192 + #878 schema drops. - **observer/tests.rs:944 comment** (Hoshe H6): rewritten to cite cascade rationale instead of the stale D-032-SUPERSEDED premise. - **tests/run-atlas-determinism exit** (Hoshe H7): exit 0 when EXIT_CODE=2 (venv/DB missing = skip, not fail). Preserves skip semantics for tests/run-all on machines without the Python venv. Follow-up tickets filed: - #895 (server, low): expand check-systems-db-stamp GENERATOR_SOURCES to cover gemma_naming.py + naming_core.py (Tyre S3). - #896 (planning, low): add CLAUDE.md carveout for server wiki writes closing coverage gates (Tyre S4 / Hoshe H8). H4 investigation: v01_integration_playthrough.rs was not the only E2E handshake→tick→snapshot test; coverage preserved by bridge_ipc.rs, bridge_tcp.rs, and game_loop.rs (the latter is pre-existing-broken per #885). No replacement test needed. 1142/1142 lib tests pass. cargo clippy -- -D warnings clean. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-22 10:09:35 +02:00
parent 8f46048a75
commit b86bb00a55
7 changed files with 356 additions and 19 deletions
@@ -2125,4 +2125,103 @@ mod tests {
            "queue should be empty after monologue consumed the event"
        );
    }
+
+    // -----------------------------------------------------------------------
+    // Regression: monologue pool selection is uniform (D-032 / #878)
+    // -----------------------------------------------------------------------
+
+    #[test]
+    fn monologue_pool_selection_uniform_no_archetype_key() {
+        // Regression guard (D-032 cascade purge, #878):
+        // trigger_event_monologue previously partitioned pool selection by
+        // CharacterArchetype key (MonologueState.character). That field is gone.
+        // Pool selection is now by trigger string only — "observe_npc", "hear_sound",
+        // "post_conversation" — and the line IDs are drawn exclusively from the
+        // corresponding hardcoded constant (OBSERVE_NPC_LINES et al.).
+        //
+        // This test asserts the POSITIVE behaviour: an observe_npc trigger always
+        // produces a line whose ID begins with "observe_npc_", regardless of any
+        // additional observer state. It FAILS if an archetype-keyed dispatch path
+        // is reintroduced (which would produce IDs outside that prefix or panic on
+        // a missing archetype field).
+
+        // Known line IDs from OBSERVE_NPC_LINES (compile-checked below).
+        const VALID_OBSERVE_NPC_IDS: &[&str] =
+            &["observe_npc_01", "observe_npc_02", "observe_npc_03"];
+
+        // --- Observer A: minimal state (no extra components) ---
+        let line_a = {
+            let mut world = setup_event_world();
+            let player = spawn_event_player(&mut world);
+
+            world
+                .resource_mut::<ObservationEventQueue>()
+                .push(ObservationEvent {
+                    tick: 1,
+                    trigger: ObservationTrigger::NewEntity {
+                        entity: StableId(10),
+                        location: TilePosition::new(12, 12, 0),
+                    },
+                    observer: player,
+                });
+
+            run_event_system(&mut world);
+
+            let buf = world.get::<MonologueBuffer>(player).unwrap();
+            buf.event
+                .as_ref()
+                .expect("observe_npc trigger must fire a monologue")
+                .id
+                .clone()
+        };
+
+        // --- Observer B: player has heard a previous sound (last_fired_tick set) ---
+        // Simulates a player with non-default MonologueState — the pool key must
+        // still resolve to OBSERVE_NPC_LINES, not an archetype-partitioned variant.
+        let line_b = {
+            let mut world = setup_event_world();
+            let player = spawn_event_player(&mut world);
+
+            // Pre-populate state to exercise a non-fresh observer
+            world.resource_mut::<SimulationTime>().tick = 10;
+            {
+                let mut state = world.get_mut::<MonologueState>(player).unwrap();
+                state.last_fired_tick = 3;
+            }
+
+            world
+                .resource_mut::<ObservationEventQueue>()
+                .push(ObservationEvent {
+                    tick: 5,
+                    trigger: ObservationTrigger::NewEntity {
+                        entity: StableId(20),
+                        location: TilePosition::new(14, 14, 0),
+                    },
+                    observer: player,
+                });
+
+            run_event_system(&mut world);
+
+            let buf = world.get::<MonologueBuffer>(player).unwrap();
+            buf.event
+                .as_ref()
+                .expect("observe_npc trigger must fire for observer B")
+                .id
+                .clone()
+        };
+
+        // Both observers must produce IDs from the unified observe_npc pool.
+        assert!(
+            VALID_OBSERVE_NPC_IDS.contains(&line_a.as_str()),
+            "Observer A line_id '{}' is not from OBSERVE_NPC_LINES — \
+             archetype-keyed pool dispatch may have been reintroduced",
+            line_a
+        );
+        assert!(
+            VALID_OBSERVE_NPC_IDS.contains(&line_b.as_str()),
+            "Observer B line_id '{}' is not from OBSERVE_NPC_LINES — \
+             archetype-keyed pool dispatch may have been reintroduced",
+            line_b
+        );
+    }
 }