merge: bring main into claude/hopeful-maxwell-214a12 (LayoutDesc importer branch)

main was 65 commits ahead of this branch's fork point. Only conflict was the
divergence register: both sides appended an 'AP-32' row. Resolved by keeping
main's AP-32..AP-36 (cell-shell lift, look-in cells, alpha deferral, dungeon
streaming, point lights) and renumbering the importer's row to AP-37; AP header
count -> 37. GameWindow.cs auto-merged cleanly. Verified: AcDream.App builds
0/0; AcDream.App.Tests 354 passed / 1 skipped / 0 failed.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

docs/plans/2026-05-12-milestones.md

@@ -2,7 +2,13 @@
 
 **Status:** Living document. Created 2026-05-12.
 **Sits above:** [`docs/plans/2026-04-11-roadmap.md`](2026-04-11-roadmap.md) (the strategic phase index).
-**Currently working toward:** **M1.5 — Indoor world feels right.**
+**Currently working toward:** **M1.5 — Indoor world feels right.** The
+building/cellar demo is DONE + user-gated, but M1.5 was EXTENDED 2026-06-13
+to include **dungeon support (full Phase G.3)** — dungeons don't work yet
+(terrain-less dungeon landblocks aren't supported by the streaming/load
+pipeline; issue #133). M1.5 does NOT land until dungeons work. M2 stays
+deferred. (Correction: M1.5 was briefly marked landed 2026-06-13; the user
+reverted that — the indoor world isn't done while dungeons are broken.)
 
 ---
 
@@ -185,7 +191,56 @@ close range and the player sees "You pick up the X." in chat.
 
 ---
 
-### M1.5 — "Indoor world feels right" — 🔵 ACTIVE (resumed 2026-05-21 after Phase O ship)
+### M1.5 — "Indoor world feels right" — 🔵 ACTIVE (building/cellar demo DONE; EXTENDED 2026-06-13 to include dungeon support / Phase G.3)
+
+**EXTENDED 2026-06-13 — dungeons pulled into M1.5 scope.** The
+building/cellar demo (below) is DONE + user-gated, but attempting the
+dungeon demo surfaced that dungeons don't work AT ALL: terrain-less
+dungeon landblocks aren't supported anywhere in the streaming/load/
+render/physics pipeline (`LandblockLoader.Load` returns null with no
+`LandBlock` terrain record; the streamer fails with no terrain mesh; the
+teleport snap Resolves before hydration — issue #133). The user decided
+M1.5 is NOT done while the indoor world excludes dungeons, and chose the
+FULL Phase G.3 scope (dungeon streaming + portal-space loading screen +
+multi-landblock dungeon LOD + `PlayerTeleport` handling). Design in
+progress (`docs/superpowers/specs/` — dungeon-support spec). M1.5 lands
+when: building/cellar demo (DONE) + dungeon demo (enter via portal,
+navigate 3-5 rooms, walls block, smooth transitions) both pass.
+
+**Building/cellar demo — DONE + user-gated.** The indoor world reads as
+solid. Across the
+2026-06 sessions the holistic retail-faithful render port (Option A: ONE
+`DrawInside(viewer_cell)`, no inside/outside branch — BR-2..BR-7 / T1..T6)
+shipped and was user-gated, and the indoor physics/membership family was
+brought to retail fidelity (the A6.P4 per-cell shadow architecture; the
+#107/#111/#112 spawn + membership fixes; the cellar-lip wedge). End-to-end,
+user-gated this milestone: walk into a building and climb a multi-floor inn
+without sling-out or wall-clip; descend a cottage cellar and ascend it
+without falling through (the #98 + cellar-lip + #108 grass-window closes);
+walls block everywhere (indoor + stab-shell, the #99 door run-through
+closed); cell transitions are smooth (the doorway "flap" family killed —
+#119/#128, #112, #113, #124, #129/#130/#131/#132, #108-residual, #127 all
+closed with user gates). The #90-stickiness + `TryFindIndoorWalkablePlane`
+synthesis workarounds were removed by A6.P4. Remaining feel-level debt is
+tracked (#116 slide-response, partial Ghidra fix shipped; A7 indoor
+lighting fidelity not yet done — folded forward).
+
+**Still OPEN in M1.5 — dungeon support (Phase G.3, issue #133).** Dungeons
+don't work: the streaming/load/render/physics pipeline was built entirely
+around outdoor landblocks (terrain + scattered buildings) and has no path
+for terrain-less indoor-only dungeon landblocks. Confirmed gaps:
+`LandblockLoader.Load` returns null with no `LandBlock` record; the
+streamer fails with no terrain mesh; the teleport-arrival snap Resolves
+before the dungeon hydrates → places the player in the old frame over
+ocean. Full G.3 scope chosen by the user 2026-06-13 (streaming + portal-
+space loading screen + multi-landblock LOD + `PlayerTeleport` handling).
+Spec under `docs/superpowers/specs/`.
+
+---
+
+#### (historical M1.5 working notes below)
+
+🔵 ACTIVE (resumed 2026-05-21 after Phase O ship)
 
 **2026-05-30 — render-pipeline pivot.** The indoor *rendering* seam (seamless
 in/out: the flap, missing/transparent walls, terrain bleed) will be solved by a
@@ -293,13 +348,23 @@ unblocks that).
 
 ---
 
-### M2 — "Kill a drudge" — ⏸ DEFERRED until M1.5 lands (was: NEXT)
+### M2 — "Kill a drudge" — ⏸ DEFERRED until M1.5 lands (incl. dungeons)
 
 **Demo scenario:** Equip a sword. Walk to a drudge. Swing. See "You hit
 Drudge for 12 slashing damage (87%)" in chat. Watch the swing animation
 play. Drudge dies, drops loot. Pick up the loot. Open the inventory panel
 and see it.
 
+**First port target when M2 starts (per the M2 combat-math research memo,
+`docs/research/2026-06-04-combat-math-deep-dive.md`):**
+`CombatMath.ComputeDamage` — damage-calc + armor-resists are port-ready
+(ACE is the high-confidence oracle; two known scaffold bugs in
+`CombatModel.cs` identified — additive attributeBonus + subtractive armor).
+Hit-roll is well-documented client-side; the server sigmoid/crit +
+weapon-timing (the x87 `GetPowerBarLevel` artifact) come after. NOTE: M2
+was briefly started 2026-06-13 then re-deferred when M1.5 was extended to
+include dungeons.
+
 **Phases to ship:**
 - **F.2 (panels)** — Inventory panel reading `ItemRepository` (data already
   shipped in F.2 base; M2 ships the visual surface).