diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 064e41af..8339effb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,5 @@ jobs:
         run: scripts/doc-links.py
       - name: pass-span-lint
         run: scripts/pass-span-lint.py
-      - name: player-build
-        run: cargo build -p benilla --no-default-features
       - name: player-tests
         run: cargo test -p benilla-formats -p benilla-app --no-default-features --lib
diff --git a/Cargo.lock b/Cargo.lock
index aba3867d..7afa1b73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -546,6 +546,7 @@ dependencies = [
  "toml",
  "wgpu",
  "windows-sys 0.59.0",
+ "winit",
 ]
 
 [[package]]
@@ -3048,15 +3049,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "epaint"
 version = "0.33.3"
@@ -4120,7 +4112,7 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kira"
-version = "0.12.1"
+version = "0.12.4"
 dependencies = [
  "atomic-arena",
  "glam 0.33.2",
@@ -5664,6 +5656,12 @@ dependencies = [
  "regex-syntax",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.10"
@@ -6181,9 +6179,9 @@ dependencies = [
 
 [[package]]
 name = "symphonia"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039"
+checksum = "a7edef6a96b696d4e0cab5ee9ebb7ca155ed95f30a6b45bbb8b97d2727f02424"
 dependencies = [
  "lazy_static",
  "symphonia-bundle-mp3",
@@ -6196,21 +6194,20 @@ dependencies = [
 
 [[package]]
 name = "symphonia-bundle-mp3"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4872dd6bb56bf5eac799e3e957aa1981086c3e613b27e0ac23b176054f7c57ed"
+checksum = "98ea5ffc8716bff677dfb3b01b420c7b758de901a72b8c330bf2040ab74b4add"
 dependencies = [
  "lazy_static",
  "log",
  "symphonia-core",
- "symphonia-metadata",
 ]
 
 [[package]]
 name = "symphonia-codec-adpcm"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dddc50e2bbea4cfe027441eece77c46b9f319748605ab8f3443350129ddd07f"
+checksum = "445932ecb0c59362fde9c082dd63a75380650c5077fdb8b80b8cac850442a74c"
 dependencies = [
  "log",
  "symphonia-core",
@@ -6218,9 +6215,9 @@ dependencies = [
 
 [[package]]
 name = "symphonia-codec-pcm"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95"
+checksum = "e04ba75686acbe43542fdd374571195f0530c0b7785ca25cc6840e9c6c4b6eea"
 dependencies = [
  "log",
  "symphonia-core",
@@ -6228,22 +6225,23 @@ dependencies = [
 
 [[package]]
 name = "symphonia-core"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea00cc4f79b7f6bb7ff87eddc065a1066f3a43fe1875979056672c9ef948c2af"
+checksum = "01c412864d599d4750d0c3d684d7e093ec05e5309681ef5252cc1096a437f6e0"
 dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
+ "bitflags 2.11.1",
  "bytemuck",
  "lazy_static",
  "log",
+ "num-complex",
+ "smallvec",
 ]
 
 [[package]]
 name = "symphonia-format-riff"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f"
+checksum = "1ff70929083a8c1a5f6cd7c904b6071c7914ad04739b510c2f7239dfc9b7dabe"
 dependencies = [
  "extended",
  "log",
@@ -6253,13 +6251,14 @@ dependencies = [
 
 [[package]]
 name = "symphonia-metadata"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36306ff42b9ffe6e5afc99d49e121e0bd62fe79b9db7b9681d48e29fa19e6b16"
+checksum = "83713a97705d77bdef7cdbc0768fd6e5a54e4cd7e48d60a806ae85639e2c87c6"
 dependencies = [
- "encoding_rs",
  "lazy_static",
  "log",
+ "regex-lite",
+ "smallvec",
  "symphonia-core",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index d747a754..c046a0b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ sha1 = "0.10.6"
 # the hunks and the command that checks them: `third_party/lua-src/BENILLA.md`.
 [patch.crates-io]
 lua-src = { path = "third_party/lua-src" }
-# kira 0.12.1, patched to compute spatial gains and the volume tween per output chunk and
+# kira 0.12.4, patched to compute spatial gains and the volume tween per output chunk and
 # interpolate them, not per sample frame (`third_party/kira/BENILLA.md`).
 kira = { path = "third_party/kira" }
 
diff --git a/crates/benilla-app/Cargo.toml b/crates/benilla-app/Cargo.toml
index 80ed5285..7dd1c49f 100644
--- a/crates/benilla-app/Cargo.toml
+++ b/crates/benilla-app/Cargo.toml
@@ -32,7 +32,8 @@ half = "2"
 include_dir = "0.7"
 # The 1.12 chat filters (`text_filter`), with one `RegexSet` for the any-match pass per line.
 regex = "1"
-# `getrusage` for perf CPU time; the audio clock and render thread's realtime policy on macOS.
+# `getrusage` for perf CPU time; `localtime_r` for the log stamp; the audio clock and render
+# thread's realtime policy on macOS.
 libc = "0.2"
 # PNG encoding only: the macOS cursor's NSImage data and screenshots.
 image = { version = "0.25", default-features = false, features = ["png"] }
@@ -49,6 +50,9 @@ toml = "0.8"
 avian3d = "0.6"
 # Shapes and rasterizes `FontString` text standalone (`ui_text`), at bevy_text's own 0.16.
 cosmic-text = "0.16"
+# The layout's unshifted character per key (`KeyEventExtModifierSupplement`), which bevy's
+# `KeyboardInput` drops; bevy_winit's own 0.30, whose features it sets.
+winit = { version = "0.30", default-features = false }
 # `cosmic-text`'s font database, named by `ui_text`; must stay the version it depends on.
 fontdb = "0.23"
 # The mixer. Its `cpal` backend stays off on every target: `sound::output` is our own backend.
@@ -56,7 +60,7 @@ kira = { version = "0.12", default-features = false, features = ["mp3", "wav", "
 # Aborts a debug build on an allocation in the audio IO callback or render pass; off in release.
 assert_no_alloc = "1.1"
 # `MediaSource`: our source raises kira's decode thread's QoS; must stay kira's version.
-symphonia = { version = "0.5", default-features = false }
+symphonia = { version = "0.6", default-features = false }
 # The audio threads' lock-free SPSC rings (output, mix tap); kira's version, so the graph has one.
 rtrb = "0.3"
 mint = "0.5"
@@ -93,9 +97,15 @@ objc2-foundation = { version = "0.2", features = ["NSArray", "NSData", "NSGeomet
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 cpal = "0.17"
 
-# Windows CPU clocks for `perf::clock`.
+# Windows CPU clocks for `perf::clock`; `GetLocalTime` for the log stamp (`ui_chat::logging`); the
+# layout's virtual keys for `bindings::layout`.
 [target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_System_Threading"] }
+windows-sys = { version = "0.59", features = [
+    "Win32_Foundation",
+    "Win32_System_SystemInformation",
+    "Win32_System_Threading",
+    "Win32_UI_Input_KeyboardAndMouse",
+] }
 
 # The login cycle's fake realmd runs the server half of SRP6 (`net::io::cycle_tests`).
 [dev-dependencies]
diff --git a/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml b/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml
index 26466581..dbf4261d 100644
--- a/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml
+++ b/crates/benilla-app/assets/ui/ContainerFrameAdapters.xml
@@ -1,54 +1,18 @@
 <!--
     Adapters over the stock ContainerFrame.xml and .lua; loaded after them, so these win.
-    Deviation: our keyring is a container (id -2), not inventory slots as in the reference, so its
-    tooltip comes from `SetBagItem`; the stock fork (ContainerFrame.lua:615-620) reads the slots.
     A full keyring prints an empty error line as the reference does: `PutKeyInKeyRing` reads
     `NO_EMPTY_KEYRING_SLOTS`, which 1.12 does not ship.
 -->
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
     <Script><![CDATA[
-        -- The stock body, captured before it is shadowed; nil when no client data was sourced.
-        local refItemButtonOnEnter = ContainerFrameItemButton_OnEnter
-
-        function ContainerFrameItemButton_OnEnter(button)
-            if not button then
-                button = this
-            end
-            if not button then return end
-
-            -- The stock bag-slot path, not its inventory-slot keyring detour.
-            if button:GetParent():GetID() == KEYRING_CONTAINER then
-                if (button:GetRight() or 0) >= (GetScreenWidth() / 2) then
-                    GameTooltip:SetOwner(button, "ANCHOR_LEFT")
-                else
-                    GameTooltip:SetOwner(button, "ANCHOR_RIGHT")
-                end
-                GameTooltip:SetBagItem(KEYRING_CONTAINER, button:GetID())
-                ResetCursor()
-                return
-            end
-
-            if not refItemButtonOnEnter then
-                message("benilla: Interface\\FrameXML\\ContainerFrame.lua was not sourced from the "
-                    .. "game data, so bag-slot tooltips cannot work. Check the client data path.")
-                return
-            end
-            refItemButtonOnEnter(button)
-        end
-
-        -- ══ The three bag verbs benilla answers differently ═══════════════════════════════════
-        -- Deviation: `OpenBackpack` opens every equipped bag, not only the backpack, so the vendor,
-        -- bank, mail and trade windows that call it bring up every bag to sell or deposit from.
-        -- The was-open memory is keyed by bag id: `ContainerFrame1..12` are recycled across bags.
+        -- ══ The two bag verbs benilla answers differently ═════════════════════════════════════
+        -- Deviation: `OpenBackpack` opens every equipped bag, not only the backpack, so the vendor
+        -- and mailbox windows that call it (MerchantFrame.lua:35, MailFrame.lua:39) bring up every
+        -- bag to sell or mail from. The was-open memory is keyed by bag id: `ContainerFrame1..12`
+        -- are recycled across bags. The stock `CloseAllBags` (ContainerFrame.lua:702-707) runs
+        -- unchanged: it calls this `CloseBackpack`, then closes bags 1 and up.
         BENILLA_BAG_WAS_OPEN = {}
 
-        -- Ignores the was-open memory and covers the bank bags, as ContainerFrame.lua:702-707 does.
-        function BenillaCloseAllBags()
-            for bagId = 0, (NUM_CONTAINER_FRAMES or -1) do
-                CloseBag(bagId)
-            end
-        end
-
         -- The reference's `backpackWasOpen`, one entry per bag: CloseBackpack leaves those open.
         function BenillaOpenBackpack()
             for bagId = 0, (NUM_BAG_FRAMES or -1) do
@@ -72,9 +36,9 @@
             end
         end
 
-        -- After the stock ContainerFrame.lua has loaded, so its callers reach these.
+        -- The stock names, redefined after the stock ContainerFrame.lua has loaded, so its callers
+        -- (the vendor and mailbox windows, the vendor's close and `CloseAllBags`) reach these.
         OpenBackpack = BenillaOpenBackpack
         CloseBackpack = BenillaCloseBackpack
-        CloseAllBags = BenillaCloseAllBags
     ]]></Script>
 </Ui>
diff --git a/crates/benilla-app/assets/ui/FrameXMLFixes.xml b/crates/benilla-app/assets/ui/FrameXMLFixes.xml
new file mode 100644
index 00000000..461e6f9a
--- /dev/null
+++ b/crates/benilla-app/assets/ui/FrameXMLFixes.xml
@@ -0,0 +1,51 @@
+<Ui>
+    <!--
+        benilla's fixes to the stock FrameXML Lua, loaded after every stock file.
+    -->
+    <Script><![CDATA[
+        -- Deviation: the stock FCF_ChatTabFadeFinished (FloatingChatFrame.lua:989-992) nils
+        -- oldAlpha even under a live hover, so leaving and re-entering within
+        -- CHAT_FRAME_FADE_TIME (a flick to the scroll buttons, outside the hover box, does it)
+        -- stops the plate fading in (l.873) for the rest of the session; this keeps oldAlpha while
+        -- hover is set.
+        if FCF_ChatTabFadeFinished then
+            function FCF_ChatTabFadeFinished(chatTab, chatFrame)
+                chatTab:Hide()
+                if not chatFrame.hover then
+                    chatFrame.oldAlpha = nil
+                end
+            end
+        end
+
+        -- Deviation: re-runs UIParent_ManageFramePositions after DurabilityFrame's own OnEvent. The
+        -- pass seats the frame 20 further in while a side glyph shows (UIParent.lua:1759-1768),
+        -- but the stock frame runs it only from OnShow/OnHide, so a glyph appearing while the frame
+        -- is shown leaves the shield's overhang off the screen edge. The stock handler runs first,
+        -- unchanged, on the this/event/arg1 already set for the dispatch.
+        if DurabilityFrame then
+            local refOnEvent = DurabilityFrame:GetScript("OnEvent")
+            DurabilityFrame:SetScript("OnEvent", function()
+                if refOnEvent then refOnEvent() end
+                UIParent_ManageFramePositions()
+            end)
+        end
+
+        -- Deviation: friendly plates the player turned on come back at every world entry. The
+        -- stock UpdateNameplates (UIOptionsFrame.lua:768-780) shows them and hides them again at
+        -- once (l.775-776), and FRIENDNAMEPLATES_ON is never saved, since l.182 registers
+        -- NAMEPLATES_ON a second time.
+        function UpdateNameplates()
+            if ( NAMEPLATES_ON ) then
+                ShowNameplates()
+            else
+                HideNameplates()
+            end
+            if ( FRIENDNAMEPLATES_ON ) then
+                ShowFriendNameplates()
+            else
+                HideFriendNameplates()
+            end
+        end
+        RegisterForSave("FRIENDNAMEPLATES_ON")
+    ]]></Script>
+</Ui>
diff --git a/crates/benilla-app/assets/ui/GameMenuAdapters.xml b/crates/benilla-app/assets/ui/GameMenuAdapters.xml
new file mode 100644
index 00000000..43cf5fea
--- /dev/null
+++ b/crates/benilla-app/assets/ui/GameMenuAdapters.xml
@@ -0,0 +1,132 @@
+<Ui>
+    <!--
+        The ESC menu: the stock GameMenuFrame.xml, reshaped in place as a 1.12 addon reshapes it.
+        Deviation: the rungs are the 1.15 era client's ESC menu, because its settings screens
+        replace 1.12's, which are much worse to use; the era's AddOns rung is dropped, since the
+        character-select AddOns screen is the only addon UI.
+    -->
+
+    <!-- The era's header font, which 1.12's Fonts.xml lacks. -->
+    <Font name="BenillaGameFontNormalMed1" inherits="GameFontNormal" virtual="true">
+        <FontHeight><AbsValue val="13"/></FontHeight>
+    </Font>
+
+    <Script><![CDATA[
+        -- ══ The frame: the era layout, 28+144+28 wide, 32 top, 28 bottom, 7 rungs of 21 and
+        -- three gaps of 20 ═══════════════════════════════════════════════════════════════════════
+        GameMenuFrame:SetWidth(200)
+        GameMenuFrame:SetHeight(267)
+
+        -- The stock title (`GameMenuFrame.xml:36`) has no name: found as addons find it.
+        for _, region in ipairs({ GameMenuFrame:GetRegions() }) do
+            if region:GetObjectType() == "FontString" and region:GetText() == MAIN_MENU then
+                region:SetFontObject(BenillaGameFontNormalMed1)
+            end
+        end
+
+        -- BENILLA_ERA_WINDOW_SCALE (OptionsFrame.xml) stands in for the era's UIParent scale;
+        -- read at every show, then the stock OnShow.
+        local Ref_GameMenuFrame_OnShow = GameMenuFrame:GetScript("OnShow")
+        GameMenuFrame:SetScript("OnShow", function()
+            this:SetScale(BENILLA_ERA_WINDOW_SCALE or 1)
+            Ref_GameMenuFrame_OnShow()
+        end)
+
+        -- ══ The rungs ═══════════════════════════════════════════════════════════════════════════
+        -- Every stock rung stays, anchored TOP to a BOTTOM as in the stock file, so an addon's
+        -- `SetPoint("TOP", …)` replaces its one anchor. The three the era menu lacks are hidden
+        -- in place, with Sound and UI Options each laid over the rung above it, so they take no
+        -- space: a width or height of 0 is no size in 1.12's layout, not a flat rect.
+
+        -- Literal: 1.12 has no GAMEMENU_OPTIONS; its OPTIONS_MENU is "Options Menu".
+        GameMenuButtonOptions:SetText("Options")
+        GameMenuButtonOptions:ClearAllPoints()
+        GameMenuButtonOptions:SetPoint("TOP", GameMenuFrame, "TOP", 0, -32)
+        GameMenuButtonOptions:SetScript("OnClick", function()
+            PlaySound("igMainMenuOption")
+            HideUIPanel(GameMenuFrame)
+            ShowUIPanel(BenillaOptionsFrame)
+        end)
+
+        for _, fold in ipairs({
+            { GameMenuButtonSoundOptions, GameMenuButtonOptions },
+            { GameMenuButtonUIOptions, GameMenuButtonSoundOptions },
+        }) do
+            local button, above = fold[1], fold[2]
+            button:Hide()
+            button:ClearAllPoints()
+            button:SetPoint("TOP", above, "BOTTOM", 0, button:GetHeight())
+        end
+        -- Key Bindings keeps its stock anchor, 1 under UI Options: the era rungs hang from its
+        -- top, so an addon that inserts a button above it and re-anchors it under that button
+        -- (ShaguTweaks) moves them down as it moves the stock rungs.
+        GameMenuButtonKeybindings:Hide()
+
+        -- The era's Edit Mode and Support, with nothing behind them yet: disabled.
+        local editMode = CreateFrame("Button", "BenillaGameMenuButtonEditMode", GameMenuFrame,
+            "GameMenuButtonTemplate")
+        editMode:SetPoint("TOP", GameMenuButtonKeybindings, "TOP", 0, -19)
+        editMode:SetText("Edit Mode")
+        editMode:Disable()
+        local support = CreateFrame("Button", "BenillaGameMenuButtonSupport", GameMenuFrame,
+            "GameMenuButtonTemplate")
+        support:SetPoint("TOP", editMode, "BOTTOM", 0, 0)
+        support:SetText("Support")
+        support:Disable()
+
+        GameMenuButtonMacros:SetPoint("TOP", support, "BOTTOM", 0, 0)
+        GameMenuButtonLogout:SetPoint("TOP", GameMenuButtonMacros, "BOTTOM", 0, -20)
+        GameMenuButtonQuit:SetPoint("TOP", GameMenuButtonLogout, "BOTTOM", 0, 0)
+        GameMenuButtonContinue:SetPoint("TOP", GameMenuButtonQuit, "BOTTOM", 0, -20)
+
+        -- ══ Our options window in the stock "is an options window open?" checks ═══════════════
+        -- Each wraps the stock function to add `BenillaOptionsFrame`.
+        local Ref_IsOptionFrameOpen = IsOptionFrameOpen
+        local Ref_ToggleGameMenu = ToggleGameMenu
+        local Ref_UpdateMicroButtons = UpdateMicroButtons
+
+        -- Guarded for a test kit that loads the game menu without the options window.
+        local function BenillaOptions_IsOpen()
+            return BenillaOptionsFrame and BenillaOptionsFrame:IsVisible()
+        end
+
+        -- `UIParent.lua:996`: a yes keeps the ESC sweep off the centre panel, which our window is.
+        function IsOptionFrameOpen()
+            if BenillaOptions_IsOpen() then
+                return 1
+            end
+            return Ref_IsOptionFrameOpen()
+        end
+
+        -- `UIParent.lua:1465-1497`: static popup, then an open options window, then the stock
+        -- ladder. Our Close click is the discard-and-hide of the reference's `OptionsFrameCancel`.
+        function ToggleGameMenu(clicked)
+            if clicked then
+                -- As the reference's `clicked` arm: close an options window, then toggle.
+                if BenillaOptions_IsOpen() then
+                    BenillaOptionsFrameCloseButton:Click()
+                end
+                return Ref_ToggleGameMenu(clicked)
+            end
+            if StaticPopup_EscapePressed() then
+                return
+            end
+            if BenillaOptions_IsOpen() then
+                BenillaOptionsFrameCloseButton:Click()
+                return
+            end
+            return Ref_ToggleGameMenu(clicked)
+        end
+
+        -- `MainMenuBarMicroButtons.lua:47-58`: only ever pushes the button, so the stock decision
+        -- stands and ours adds our window. Guarded for a test kit that loads no micro buttons.
+        function UpdateMicroButtons()
+            if Ref_UpdateMicroButtons then
+                Ref_UpdateMicroButtons()
+            end
+            if MainMenuMicroButton and BenillaOptions_IsOpen() then
+                MainMenuMicroButton:SetButtonState("PUSHED", 1)
+            end
+        end
+    ]]></Script>
+</Ui>
diff --git a/crates/benilla-app/assets/ui/GameMenuFrame.xml b/crates/benilla-app/assets/ui/GameMenuFrame.xml
deleted file mode 100644
index 955fa369..00000000
--- a/crates/benilla-app/assets/ui/GameMenuFrame.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<Ui>
-    <!--
-        The game menu ESC opens, in the chrome of the reference's GameMenuFrame.xml.
-        Deviation: the rungs are the 1.15 era client's ESC menu, because its settings screens
-        replace 1.12's, which are much worse to use; the era's AddOns rung is dropped, since the
-        character-select AddOns screen is the only addon UI. Addons address `GameMenuFrame` by name.
-    -->
-    <Script><![CDATA[
-        -- Label strings as `X = X or "..."`, so a stock GlobalStrings value wins where one exists.
-        MAIN_MENU = MAIN_MENU or "Main Menu"
-        HUD_EDIT_MODE_MENU = HUD_EDIT_MODE_MENU or "Edit Mode"
-        GAMEMENU_SUPPORT = GAMEMENU_SUPPORT or "Support"
-        MACROS = MACROS or "Macros"
-        LOGOUT = LOGOUT or "Logout"
-        EXIT_GAME = EXIT_GAME or "Exit Game"
-        RETURN_TO_GAME = RETURN_TO_GAME or "Return to Game"
-        CANCEL = CANCEL or "Cancel"
-
-        -- A rung with nothing behind it yet (Edit Mode, Support), disabled.
-        function GameMenuButton_Pending(button, text)
-            button:SetText(text)
-            button:Disable()
-        end
-
-        -- ══ Our options window in the stock "is an options window open?" checks ══
-        -- Each wraps the stock body to add `BenillaOptionsFrame`; here because this file loads
-        -- last, after MainMenuBarMicroButtons.xml.
-        local Ref_IsOptionFrameOpen = IsOptionFrameOpen
-        local Ref_ToggleGameMenu = ToggleGameMenu
-        local Ref_UpdateMicroButtons = UpdateMicroButtons
-
-        -- Guarded for a test kit that loads the game menu without the options window.
-        local function BenillaOptions_IsOpen()
-            return BenillaOptionsFrame and BenillaOptionsFrame:IsVisible()
-        end
-
-        -- `UIParent.lua:996`: a yes keeps the ESC sweep off the centre panel, which our window is.
-        function IsOptionFrameOpen()
-            if BenillaOptions_IsOpen() then
-                return 1
-            end
-            return Ref_IsOptionFrameOpen()
-        end
-
-        -- `UIParent.lua:1465-1497`: static popup, then an open options window, then the stock
-        -- ladder. Our Close click is the discard-and-hide of the reference's `OptionsFrameCancel`.
-        function ToggleGameMenu(clicked)
-            if clicked then
-                -- As the reference's `clicked` arm: close an options window, then toggle.
-                if BenillaOptions_IsOpen() then
-                    BenillaOptionsFrameCloseButton:Click()
-                end
-                return Ref_ToggleGameMenu(clicked)
-            end
-            if StaticPopup_EscapePressed() then
-                return
-            end
-            if BenillaOptions_IsOpen() then
-                BenillaOptionsFrameCloseButton:Click()
-                return
-            end
-            return Ref_ToggleGameMenu(clicked)
-        end
-
-        -- `MainMenuBarMicroButtons.lua:47-58`: only ever pushes the button, so the stock decision
-        -- stands and ours adds our window.
-        function UpdateMicroButtons()
-            if Ref_UpdateMicroButtons then
-                Ref_UpdateMicroButtons()
-            end
-            if MainMenuMicroButton and BenillaOptions_IsOpen() then
-                MainMenuMicroButton:SetButtonState("PUSHED", 1)
-            end
-        end
-
-    ]]></Script>
-
-    <!-- The era's header font, which 1.12's Fonts.xml lacks. -->
-    <Font name="GameFontNormalMed1" inherits="GameFontNormal" virtual="true">
-        <FontHeight><AbsValue val="13"/></FontHeight>
-    </Font>
-
-
-    <!-- GameMenuFrame.xml:4's attributes but `movable`, inert there: it has no drag scripts. -->
-    <Frame name="GameMenuFrame" parent="UIParent" frameStrata="DIALOG" toplevel="true" enableMouse="true" hidden="true">
-        <!-- The era layout: 28+144+28 wide, 32 top, 28 bottom, 7 rungs of 21, 3 gaps of 20. -->
-        <Size><AbsDimension x="200" y="267"/></Size>
-        <Anchors><Anchor point="CENTER"/></Anchors>
-        <Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="true">
-            <BackgroundInsets><AbsInset left="11" right="12" top="12" bottom="11"/></BackgroundInsets>
-            <TileSize><AbsValue val="32"/></TileSize>
-            <EdgeSize><AbsValue val="32"/></EdgeSize>
-        </Backdrop>
-        <Layers>
-            <Layer level="ARTWORK">
-                <Texture name="GameMenuFrameHeader" file="Interface\DialogFrame\UI-DialogBox-Header">
-                    <Size><AbsDimension x="256" y="64"/></Size>
-                    <Anchors><Anchor point="TOP"><Offset><AbsDimension x="0" y="12"/></Offset></Anchor></Anchors>
-                </Texture>
-                <!-- The era's 13px font on the 1.12 seat, within half a unit of the era's. -->
-                <FontString name="GameMenuFrameTitle" inherits="GameFontNormalMed1" text="MAIN_MENU">
-                    <Anchors>
-                        <Anchor point="TOP" relativeTo="GameMenuFrameHeader"><Offset><AbsDimension x="0" y="-14"/></Offset></Anchor>
-                    </Anchors>
-                </FontString>
-            </Layer>
-        </Layers>
-        <Frames>
-
-            <!-- Literal: 1.12 has no GAMEMENU_OPTIONS; its OPTIONS_MENU is "Options Menu". -->
-            <Button name="GameMenuButtonOptions" inherits="GameMenuButtonTemplate" text="Options">
-                <Anchors>
-                    <Anchor point="TOPLEFT"><Offset><AbsDimension x="28" y="-32"/></Offset></Anchor>
-                </Anchors>
-                <Scripts>
-                    <OnClick>
-                        PlaySound("igMainMenuOption")
-                        HideUIPanel(GameMenuFrame)
-                        ShowUIPanel(BenillaOptionsFrame)
-                    </OnClick>
-                </Scripts>
-            </Button>
-
-            <Button name="GameMenuButtonEditMode" inherits="GameMenuButtonTemplate">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonOptions" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor>
-                </Anchors>
-                <Scripts><OnLoad>GameMenuButton_Pending(self, HUD_EDIT_MODE_MENU)</OnLoad></Scripts>
-            </Button>
-            <Button name="GameMenuButtonSupport" inherits="GameMenuButtonTemplate">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonEditMode" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
-                </Anchors>
-                <Scripts><OnLoad>GameMenuButton_Pending(self, GAMEMENU_SUPPORT)</OnLoad></Scripts>
-            </Button>
-            <Button name="GameMenuButtonMacros" inherits="GameMenuButtonTemplate" text="MACROS">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonSupport" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
-                </Anchors>
-                <!-- GameMenuFrame.xml:118-122. -->
-                <Scripts>
-                    <OnClick>
-                        PlaySound("igMainMenuOption")
-                        HideUIPanel(getglobal("GameMenuFrame"))
-                        ShowMacroFrame()
-                    </OnClick>
-                </Scripts>
-            </Button>
-
-            <!-- As the reference: disabled while a CAMP or QUIT countdown is up. -->
-            <Button name="GameMenuButtonLogout" inherits="GameMenuButtonTemplate" text="LOGOUT">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonMacros" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor>
-                </Anchors>
-                <Scripts>
-                    <OnShow>
-                        if not StaticPopup_Visible("CAMP") and not StaticPopup_Visible("QUIT") then
-                            self:Enable()
-                        else
-                            self:Disable()
-                        end
-                    </OnShow>
-                    <OnClick>
-                        PlaySound("igMainMenuLogout")
-                        Logout()
-                        HideUIPanel(GameMenuFrame)
-                    </OnClick>
-                </Scripts>
-            </Button>
-            <Button name="GameMenuButtonQuit" inherits="GameMenuButtonTemplate" text="EXIT_GAME">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonLogout" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor>
-                </Anchors>
-                <Scripts>
-                    <OnShow>
-                        if not StaticPopup_Visible("CAMP") and not StaticPopup_Visible("QUIT") then
-                            self:Enable()
-                        else
-                            self:Disable()
-                        end
-                    </OnShow>
-                    <OnClick>
-                        PlaySound("igMainMenuQuit")
-                        Quit()
-                        HideUIPanel(GameMenuFrame)
-                    </OnClick>
-                </Scripts>
-            </Button>
-            <Button name="GameMenuButtonContinue" inherits="GameMenuButtonTemplate" text="RETURN_TO_GAME">
-                <Anchors>
-                    <Anchor point="TOPLEFT" relativeTo="GameMenuButtonQuit" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-20"/></Offset></Anchor>
-                </Anchors>
-                <Scripts>
-                    <OnClick>
-                        PlaySound("igMainMenuContinue")
-                        HideUIPanel(GameMenuFrame)
-                    </OnClick>
-                </Scripts>
-            </Button>
-        </Frames>
-        <!-- The reference's OnShow/OnHide, guarded for a test that loads no action bar. -->
-        <Scripts>
-            <OnShow>
-                -- ERA_WINDOW_SCALE (OptionsFrame.xml) stands in for the era's UIParent scale. A
-                -- second OnShow on this frame would replace this one.
-                this:SetScale(ERA_WINDOW_SCALE or 1)
-                if UpdateMicroButtons then UpdateMicroButtons() end
-                if Disable_BagButtons then Disable_BagButtons() end
-            </OnShow>
-            <OnHide>
-                if UpdateMicroButtons then UpdateMicroButtons() end
-                if Enable_BagButtons then Enable_BagButtons() end
-            </OnHide>
-        </Scripts>
-    </Frame>
-</Ui>
diff --git a/crates/benilla-app/assets/ui/KeyBindingsPage.xml b/crates/benilla-app/assets/ui/KeyBindingsPage.xml
index a89fa332..03d4de7e 100644
--- a/crates/benilla-app/assets/ui/KeyBindingsPage.xml
+++ b/crates/benilla-app/assets/ui/KeyBindingsPage.xml
@@ -4,14 +4,16 @@
         OptionsFrame.xml, which loads after. Only commands the engine dispatches appear.
         Deviation: the layout is the era Settings panel's Keybindings page (collapsible category
         sections), because 1.12's settings screens are much worse to use. Capture follows 1.12's
-        Blizzard_BindingUI: the next key or mouse 3/4/5 press binds, left and right clicks only
-        select, and ESC while armed binds Escape (its OnKeyDown has no ESCAPE filter).
+        Blizzard_BindingUI: while a capsule is selected the window is keyboard-enabled, so the
+        next key binds through its OnKeyDown, and a mouse 3/4/5 click or a wheel notch binds;
+        left and right clicks only select, and ESC while armed binds Escape (its OnKeyDown has no
+        ESCAPE filter).
         Deviation: every bind, unbind and reset saves at once, as the era panel commits, where
         1.12 had Okay and Cancel; only Reset To Default and leaving the character set confirm.
     -->
 
-    <!-- 1.12's KeyBindingFrameBindingButtonTemplate; all five buttons reach the capture. -->
-    <Button name="KeyBindingButtonTemplate" virtual="true">
+    <!-- 1.12's KeyBindingFrameBindingButtonTemplate; all five buttons reach the handler. -->
+    <Button name="BenillaKeyBindingButtonTemplate" virtual="true">
         <Size><AbsDimension x="180" y="22"/></Size>
         <ButtonText name="$parentText"/>
         <NormalTexture file="Interface\Buttons\UI-Panel-Button-Up"><TexCoords left="0" right="0.625" top="0" bottom="0.6875"/></NormalTexture>
@@ -22,13 +24,13 @@
         <DisabledFont inherits="GameFontDisableSmall"/>
         <Scripts>
             <OnLoad>this:RegisterForClicks("LeftButtonUp", "RightButtonUp", "MiddleButtonUp", "Button4Up", "Button5Up")</OnLoad>
-            <OnClick>KeyBindingButton_OnClick(arg1)</OnClick>
+            <OnClick>BenillaKeyBindingButton_OnClick(arg1)</OnClick>
         </Scripts>
     </Button>
 
     <!-- A binding row or a section header in 1.12's QuestLogTitleButton dress, since the era's
          expand arrows are not in 1.12; 25 tall, the era's row height. -->
-    <Frame name="KeyBindingRowTemplate" virtual="true">
+    <Frame name="BenillaKeyBindingRowTemplate" virtual="true">
         <Size><AbsDimension x="560" y="25"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -61,13 +63,13 @@
                 <NormalFont inherits="GameFontNormal"/>
                 <HighlightFont inherits="GameFontHighlight"/>
                 <Scripts>
-                    <OnClick>KeyBindings_ToggleSection(this.sectionIndex)</OnClick>
+                    <OnClick>BenillaKeyBindings_ToggleSection(this.sectionIndex)</OnClick>
                 </Scripts>
             </Button>
-            <Button name="$parentKey1Button" inherits="KeyBindingButtonTemplate" id="1">
+            <Button name="$parentKey1Button" inherits="BenillaKeyBindingButtonTemplate" id="1">
                 <Anchors><Anchor point="LEFT"><Offset><AbsDimension x="175" y="0"/></Offset></Anchor></Anchors>
             </Button>
-            <Button name="$parentKey2Button" inherits="KeyBindingButtonTemplate" id="2">
+            <Button name="$parentKey2Button" inherits="BenillaKeyBindingButtonTemplate" id="2">
                 <Anchors><Anchor point="LEFT" relativeTo="$parentKey1Button" relativePoint="RIGHT"><Offset><AbsDimension x="0" y="0"/></Offset></Anchor></Anchors>
             </Button>
         </Frames>
@@ -75,7 +77,7 @@
 
     <Script><![CDATA[
         -- ── Strings ── a 1.12 GlobalStrings global, or the fallback for a harness without them.
-        function KeyBindings_String(name, fallback)
+        function BenillaKeyBindings_String(name, fallback)
             local s = getglobal(name)
             if s then return s end
             return fallback
@@ -83,9 +85,9 @@
 
         -- ── Key display ── 1.12's GetBindingText in full form: modifier prefixes stay tokens, the
         -- base key reads its KEY_* global. "CTRL--" is CTRL plus the minus key.
-        function KeyBindings_KeyText(key)
+        function BenillaKeyBindings_KeyText(key)
             if not key then
-                return NORMAL_FONT_COLOR_CODE .. KeyBindings_String("NOT_BOUND", "Not Bound") .. FONT_COLOR_CODE_CLOSE
+                return NORMAL_FONT_COLOR_CODE .. BenillaKeyBindings_String("NOT_BOUND", "Not Bound") .. FONT_COLOR_CODE_CLOSE
             end
             local prefix = ""
             local rest = key
@@ -104,43 +106,55 @@
                     break
                 end
             end
-            return prefix .. KeyBindings_String("KEY_" .. rest, rest)
+            return prefix .. BenillaKeyBindings_String("KEY_" .. rest, rest)
         end
 
         -- ── Page state ── `searchPainted` maps OptionsFrame.xml's search rows to binding indices.
-        KeyBindingsPage = { sections = {}, items = {} }
+        BenillaKeyBindingsPage = { sections = {}, items = {} }
 
-        KEYBINDINGS_ROW_BASE = "BenillaOptionsFrameContainerBodyKeybindingsRow"
-        KEYBINDINGS_DISPLAYED = 19
-        KEYBINDINGS_ROW_HEIGHT = 25
-        KEYBINDINGS_SEARCH_ROWS = 8
+        BENILLA_KEYBINDINGS_ROW_BASE = "BenillaOptionsFrameContainerBodyKeybindingsRow"
+        BENILLA_KEYBINDINGS_DISPLAYED = 19
+        BENILLA_KEYBINDINGS_ROW_HEIGHT = 25
+        BENILLA_KEYBINDINGS_SEARCH_ROWS = 8
 
-        -- ── Section model ── one section per category in Bindings.xml order, collapsed at first
-        -- as in the era; a rebuild keeps each state.
-        function KeyBindings_BuildSections()
-            local page = KeyBindingsPage
+        -- ── Section model ── one section per `HEADER_*` row of the binding list, in its
+        -- order (Blizzard_BindingUI.lua:84-92), collapsed at first as in the era; a rebuild keeps
+        -- each state. `token` is the header's GlobalStrings key, `fallback` its bare name.
+        -- Deviation: the spacer headers BLANK, BLANK2 and BLANK3 over multibars 2-4
+        -- (Bindings.xml:883/967/1051), which 1.12 draws blank (BINDING_HEADER_BLANK is "  ", the
+        -- other two are not defined), continue the section above, because this page's sections
+        -- are named and collapsible.
+        function BenillaKeyBindings_IsHeader(command)
+            return strsub(command, 1, 6) == "HEADER"
+        end
+
+        function BenillaKeyBindings_BuildSections()
+            local page = BenillaKeyBindingsPage
             local was = {}
             for _, s in ipairs(page.sections) do
                 was[s.token] = s.expanded
             end
             page.sections = {}
-            local byToken = {}
+            local sec = nil
             for i = 1, GetNumBindings() do
-                local _, category = GetBinding(i)
-                local sec = byToken[category]
-                if not sec then
-                    sec = { token = category, indices = {}, expanded = was[category] }
-                    byToken[category] = sec
-                    table.insert(page.sections, sec)
+                local command = GetBinding(i)
+                if BenillaKeyBindings_IsHeader(command) then
+                    local token = "BINDING_" .. command
+                    if not (sec and strfind(command, "^HEADER_BLANK%d*$")) then
+                        sec = { token = token, fallback = strsub(command, 8), indices = {},
+                            expanded = was[token] }
+                        table.insert(page.sections, sec)
+                    end
+                elseif sec then
+                    table.insert(sec.indices, i)
                 end
-                table.insert(sec.indices, i)
             end
-            KeyBindings_Flatten()
+            BenillaKeyBindings_Flatten()
         end
 
         -- The visible list the faux scroll runs over.
-        function KeyBindings_Flatten()
-            local page = KeyBindingsPage
+        function BenillaKeyBindings_Flatten()
+            local page = BenillaKeyBindingsPage
             page.items = {}
             for n, sec in ipairs(page.sections) do
                 table.insert(page.items, { header = n })
@@ -153,38 +167,38 @@
         end
 
         -- A header click, voiced with the checkbox sound.
-        function KeyBindings_ToggleSection(n)
-            local sec = KeyBindingsPage.sections[n]
+        function BenillaKeyBindings_ToggleSection(n)
+            local sec = BenillaKeyBindingsPage.sections[n]
             if not sec then return end
             PlaySound("igMainMenuOptionCheckBoxOn")
             sec.expanded = not sec.expanded
-            KeyBindings_Flatten()
-            KeyBindingsPage_Update()
+            BenillaKeyBindings_Flatten()
+            BenillaKeyBindingsPage_Update()
         end
 
         -- Silent, for the capture fixture.
-        function KeyBindings_ExpandSection(n, on)
-            local sec = KeyBindingsPage.sections[n]
+        function BenillaKeyBindings_ExpandSection(n, on)
+            local sec = BenillaKeyBindingsPage.sections[n]
             if not sec then return end
             sec.expanded = on and true or false
-            KeyBindings_Flatten()
+            BenillaKeyBindings_Flatten()
         end
 
         -- ── Painters ── shared by the list and the search rows, which capture in place.
-        function KeyBindings_PaintBindRow(name, index)
-            local command, _, key1, key2 = GetBinding(index)
+        function BenillaKeyBindings_PaintBindRow(name, index)
+            local command, key1, key2 = GetBinding(index)
             local b1 = getglobal(name .. "Key1Button")
             local b2 = getglobal(name .. "Key2Button")
             b1.commandName = command
             b2.commandName = command
-            b1:SetText(KeyBindings_KeyText(key1))
-            b2:SetText(KeyBindings_KeyText(key2))
+            b1:SetText(BenillaKeyBindings_KeyText(key1))
+            b2:SetText(BenillaKeyBindings_KeyText(key2))
             if key1 then b1:SetAlpha(1) else b1:SetAlpha(0.8) end
             if key2 then b2:SetAlpha(1) else b2:SetAlpha(0.8) end
             local desc = getglobal(name .. "Description")
-            desc:SetText(KeyBindings_String("BINDING_NAME_" .. command, command))
+            desc:SetText(BenillaKeyBindings_String("BINDING_NAME_" .. command, command))
             desc:Show()
-            local page = KeyBindingsPage
+            local page = BenillaKeyBindingsPage
             if page.selected == command and page.keyID == 1 then
                 b1:LockHighlight()
             else
@@ -200,11 +214,11 @@
             getglobal(name .. "Header"):Hide()
         end
 
-        function KeyBindings_PaintHeaderRow(name, n)
-            local sec = KeyBindingsPage.sections[n]
+        function BenillaKeyBindings_PaintHeaderRow(name, n)
+            local sec = BenillaKeyBindingsPage.sections[n]
             local header = getglobal(name .. "Header")
             header.sectionIndex = n
-            header:SetText(KeyBindings_String(sec.token, sec.token))
+            header:SetText(BenillaKeyBindings_String(sec.token, sec.fallback))
             local icon = getglobal(name .. "HeaderIcon")
             if sec.expanded then
                 icon:SetTexture("Interface\\Buttons\\UI-MinusButton-Up")
@@ -218,34 +232,34 @@
         end
 
         -- ── The list repaint (1.12 KeyBindingFrame_Update) ──
-        function KeyBindingsPage_Update()
-            local page = KeyBindingsPage
+        function BenillaKeyBindingsPage_Update()
+            local page = BenillaKeyBindingsPage
             local scroll = getglobal("BenillaOptionsFrameContainerBodyKeybindingsScrollFrame")
             local offset = FauxScrollFrame_GetOffset(scroll)
-            for i = 1, KEYBINDINGS_DISPLAYED do
-                local name = KEYBINDINGS_ROW_BASE .. i
+            for i = 1, BENILLA_KEYBINDINGS_DISPLAYED do
+                local name = BENILLA_KEYBINDINGS_ROW_BASE .. i
                 local row = getglobal(name)
                 local item = page.items[offset + i]
                 if item and item.header then
-                    KeyBindings_PaintHeaderRow(name, item.header)
+                    BenillaKeyBindings_PaintHeaderRow(name, item.header)
                     row:Show()
                 elseif item then
-                    KeyBindings_PaintBindRow(name, item.bind)
+                    BenillaKeyBindings_PaintBindRow(name, item.bind)
                     row:Show()
                 else
                     row:Hide()
                 end
             end
             FauxScrollFrame_Update(scroll, table.getn(page.items),
-                KEYBINDINGS_DISPLAYED, KEYBINDINGS_ROW_HEIGHT)
+                BENILLA_KEYBINDINGS_DISPLAYED, BENILLA_KEYBINDINGS_ROW_HEIGHT)
             -- Our trough follows the bar `FauxScrollFrame_Update` has just shown or hidden.
             BenillaScrollTrough_Follow(scroll:GetName())
-            KeyBindings_UpdateUnbindKey()
+            BenillaKeyBindings_UpdateUnbindKey()
         end
 
         -- The page entry: a rebind or a set switch may have changed the table.
-        function KeyBindingsPage_Refresh()
-            KeyBindings_BuildSections()
+        function BenillaKeyBindingsPage_Refresh()
+            BenillaKeyBindings_BuildSections()
             local box = getglobal("BenillaOptionsFrameContainerBodyKeybindingsCharacterRowCheck")
             if GetCurrentBindingSet() == 2 then
                 box:SetChecked(1)
@@ -253,23 +267,28 @@
                 box:SetChecked(nil)
             end
             getglobal("BenillaOptionsFrameContainerBodyKeybindingsScrollFrameScrollBar"):SetValue(0)
-            KeyBindingsPage_Update()
+            BenillaKeyBindingsPage_Update()
         end
 
-        function KeyBindings_Output(text)
+        function BenillaKeyBindings_Output(text)
             getglobal("BenillaOptionsFrameContainerBodyKeybindingsOutput"):SetText(text)
         end
 
-        -- ── Selection ── arms the host's capture, which hands its chord to KeyBindings_OnHostKey.
-        function KeyBindings_SetSelected(command, keyID)
-            KeyBindingsPage.selected = command
-            KeyBindingsPage.keyID = keyID
-            BenillaBindCapture(command ~= nil)
+        -- ── Selection ── while a capsule is selected the window takes every key and the
+        -- wheel, as 1.12's keyboard-enabled KeyBindingFrame does (Blizzard_BindingUI.xml:73,
+        -- :541-543); unarmed it takes neither, so keys and the wheel reach the game.
+        function BenillaKeyBindings_SetSelected(command, keyID)
+            BenillaKeyBindingsPage.selected = command
+            BenillaKeyBindingsPage.keyID = keyID
+            if BenillaOptionsFrame then
+                BenillaOptionsFrame:EnableKeyboard(command ~= nil)
+                BenillaOptionsFrame:EnableMouseWheel(command ~= nil)
+            end
         end
 
-        function KeyBindings_UpdateUnbindKey()
+        function BenillaKeyBindings_UpdateUnbindKey()
             local unbind = getglobal("BenillaOptionsFrameContainerUnbind")
-            if KeyBindingsPage.selected then
+            if BenillaKeyBindingsPage.selected then
                 unbind:Enable()
             else
                 unbind:Disable()
@@ -277,94 +296,134 @@
         end
 
         -- Every search row: a bind from one can unbind a victim shown on another.
-        function KeyBindings_RepaintVisible()
-            if KeyBindingsPage.searchPainted then
-                for name, index in pairs(KeyBindingsPage.searchPainted) do
-                    KeyBindings_PaintBindRow(name, index)
+        function BenillaKeyBindings_RepaintVisible()
+            if BenillaKeyBindingsPage.searchPainted then
+                for name, index in pairs(BenillaKeyBindingsPage.searchPainted) do
+                    BenillaKeyBindings_PaintBindRow(name, index)
                 end
-                KeyBindings_UpdateUnbindKey()
+                BenillaKeyBindings_UpdateUnbindKey()
             else
-                KeyBindingsPage_Update()
+                BenillaKeyBindingsPage_Update()
             end
         end
 
-        function KeyBindingButton_OnClick(button)
-            -- As 1.12: while armed, a middle, 4 or 5 press is a bind the capture takes after this.
-            local page = KeyBindingsPage
+        -- 1.12's KeyBindingButton_OnClick (Blizzard_BindingUI.lua:228-258): while armed, a middle,
+        -- 4 or 5 click binds that button.
+        function BenillaKeyBindingButton_OnClick(button)
+            local page = BenillaKeyBindingsPage
             if page.selected then
                 if button ~= "LeftButton" and button ~= "RightButton" then
+                    BenillaKeyBindings_OnKeyDown(button)
                     return
                 end
                 if page.selected == this.commandName and page.keyID == this:GetID() then
-                    KeyBindings_SetSelected(nil)
-                    KeyBindings_Output("")
+                    BenillaKeyBindings_SetSelected(nil)
+                    BenillaKeyBindings_Output("")
                 else
-                    KeyBindings_SetSelected(this.commandName, this:GetID())
-                    KeyBindings_Output(string.format(
-                        KeyBindings_String("BIND_KEY_TO_COMMAND", "Press Key to Bind to Command -> %s"),
-                        KeyBindings_String("BINDING_NAME_" .. this.commandName, this.commandName)))
+                    BenillaKeyBindings_SetSelected(this.commandName, this:GetID())
+                    BenillaKeyBindings_Output(string.format(
+                        BenillaKeyBindings_String("BIND_KEY_TO_COMMAND", "Press Key to Bind to Command -> %s"),
+                        BenillaKeyBindings_String("BINDING_NAME_" .. this.commandName, this.commandName)))
                 end
             else
-                KeyBindings_SetSelected(this.commandName, this:GetID())
-                KeyBindings_Output(string.format(
-                    KeyBindings_String("BIND_KEY_TO_COMMAND", "Press Key to Bind to Command -> %s"),
-                    KeyBindings_String("BINDING_NAME_" .. this.commandName, this.commandName)))
+                BenillaKeyBindings_SetSelected(this.commandName, this:GetID())
+                BenillaKeyBindings_Output(string.format(
+                    BenillaKeyBindings_String("BIND_KEY_TO_COMMAND", "Press Key to Bind to Command -> %s"),
+                    BenillaKeyBindings_String("BINDING_NAME_" .. this.commandName, this.commandName)))
             end
-            KeyBindings_RepaintVisible()
+            BenillaKeyBindings_RepaintVisible()
         end
 
-        function KeyBindings_Commit()
+        function BenillaKeyBindings_Commit()
             SaveBindings(GetCurrentBindingSet())
         end
 
-        -- `chord` is ALT-CTRL-SHIFT-TOKEN; 1.12's OnKeyDown armed branch, then the live commit.
-        function KeyBindings_OnHostKey(chord)
-            local page = KeyBindingsPage
+        -- 1.12's KeyBindingFrame_OnKeyDown armed branch (Blizzard_BindingUI.lua:140-212), then
+        -- the live commit: `button` is a mouse button's or the wheel's name, else the key is
+        -- `arg1`, the window's OnKeyDown argument. Unarmed it does nothing: the window takes keys
+        -- only while armed, so 1.12's unarmed ESCAPE arm never runs here.
+        function BenillaKeyBindings_OnKeyDown(button)
+            local page = BenillaKeyBindingsPage
             if not page.selected then
                 return
             end
+            if button == "LeftButton" then
+                button = "BUTTON1"
+            elseif button == "RightButton" then
+                button = "BUTTON2"
+            elseif button == "MiddleButton" then
+                button = "BUTTON3"
+            elseif button == "Button4" then
+                button = "BUTTON4"
+            elseif button == "Button5" then
+                button = "BUTTON5"
+            end
+            local chord
+            if button then
+                if button == "BUTTON1" or button == "BUTTON2" then
+                    return
+                end
+                chord = button
+            else
+                chord = arg1
+            end
+            if chord == "UNKNOWN" or chord == "SHIFT" or chord == "CTRL" or chord == "ALT" then
+                return
+            end
+            if IsShiftKeyDown() then chord = "SHIFT-" .. chord end
+            if IsControlKeyDown() then chord = "CTRL-" .. chord end
+            if IsAltKeyDown() then chord = "ALT-" .. chord end
             local selected = page.selected
             local oldAction = GetBindingAction(chord)
             if oldAction ~= "" and oldAction ~= selected then
                 local k1, k2 = GetBindingKey(oldAction)
                 if (not k1 or k1 == chord) and (not k2 or k2 == chord) then
-                    KeyBindings_Output(string.format(
-                        KeyBindings_String("KEY_UNBOUND_ERROR", "|cffff0000%s Function is Now Unbound!|r"),
-                        KeyBindings_String("BINDING_NAME_" .. oldAction, oldAction)))
+                    BenillaKeyBindings_Output(string.format(
+                        BenillaKeyBindings_String("KEY_UNBOUND_ERROR", "|cffff0000%s Function is Now Unbound!|r"),
+                        BenillaKeyBindings_String("BINDING_NAME_" .. oldAction, oldAction)))
                 else
-                    KeyBindings_Output(KeyBindings_String("KEY_BOUND", "Key Bound Successfully"))
+                    BenillaKeyBindings_Output(BenillaKeyBindings_String("KEY_BOUND", "Key Bound Successfully"))
                 end
             else
-                KeyBindings_Output(KeyBindings_String("KEY_BOUND", "Key Bound Successfully"))
+                BenillaKeyBindings_Output(BenillaKeyBindings_String("KEY_BOUND", "Key Bound Successfully"))
             end
             local key1, key2 = GetBindingKey(selected)
             if key1 then SetBinding(key1) end
             if key2 then SetBinding(key2) end
             if page.keyID == 1 then
-                KeyBindings_SetOrRestore(chord, selected, key1)
+                BenillaKeyBindings_SetOrRestore(chord, selected, key1)
                 if key2 then SetBinding(key2, selected) end
             else
                 if key1 then SetBinding(key1, selected) end
-                KeyBindings_SetOrRestore(chord, selected, key2)
+                BenillaKeyBindings_SetOrRestore(chord, selected, key2)
             end
-            KeyBindings_Commit()
-            KeyBindings_SetSelected(nil)
-            KeyBindings_RepaintVisible()
+            BenillaKeyBindings_Commit()
+            BenillaKeyBindings_SetSelected(nil)
+            BenillaKeyBindings_RepaintVisible()
         end
 
         -- 1.12's KeyBindingFrame_SetBinding, message and all; SetBinding refuses only a non-key.
-        function KeyBindings_SetOrRestore(key, command, oldKey)
+        function BenillaKeyBindings_SetOrRestore(key, command, oldKey)
             if not SetBinding(key, command) then
                 if oldKey then SetBinding(oldKey, command) end
-                KeyBindings_Output(KeyBindings_String(
+                BenillaKeyBindings_Output(BenillaKeyBindings_String(
                     "KEYBINDINGFRAME_MOUSEWHEEL_ERROR",
                     "Can't bind mousewheel to actions with up and down states"))
             end
         end
 
+        -- The list's OnMouseWheel while armed (Blizzard_BindingUI.xml:377-387).
+        function BenillaKeyBindings_OnMouseWheel(delta)
+            if delta > 0 then
+                BenillaKeyBindings_OnKeyDown("MOUSEWHEELUP")
+            else
+                BenillaKeyBindings_OnKeyDown("MOUSEWHEELDOWN")
+            end
+        end
+
         -- 1.12's Unbind Key body, then the live commit.
-        function KeyBindings_Unbind()
-            local page = KeyBindingsPage
+        function BenillaKeyBindings_Unbind()
+            local page = BenillaKeyBindingsPage
             local key1, key2 = GetBindingKey(page.selected)
             if key1 then SetBinding(key1) end
             if key2 then SetBinding(key2) end
@@ -373,67 +432,70 @@
             else
                 if key1 then SetBinding(key1, page.selected) end
             end
-            KeyBindings_Commit()
-            KeyBindings_SetSelected(nil)
-            KeyBindings_Output("")
-            KeyBindings_RepaintVisible()
+            BenillaKeyBindings_Commit()
+            BenillaKeyBindings_SetSelected(nil)
+            BenillaKeyBindings_Output("")
+            BenillaKeyBindings_RepaintVisible()
         end
 
         -- ── Character-specific set ── checking saves set 2 at once (LoadBindings(2) falls back
         -- to the account set); unchecking confirms first, as the era does. The accept loads set 1
         -- before saving it, or the character binds would be written into the account set.
-        function KeyBindings_CharacterToggle(box)
+        function BenillaKeyBindings_CharacterToggle(box)
             PlaySound("igMainMenuOptionCheckBoxOn")
             if box:GetChecked() then
                 LoadBindings(2)
                 SaveBindings(2)
-                KeyBindings_SetSelected(nil)
-                KeyBindings_Output("")
-                KeyBindingsPage_Refresh()
+                BenillaKeyBindings_SetSelected(nil)
+                BenillaKeyBindings_Output("")
+                BenillaKeyBindingsPage_Refresh()
             else
                 box:SetChecked(1)
-                StaticPopup_Show("CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS")
+                StaticPopup_Show("BENILLA_CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS")
             end
         end
 
-        StaticPopupDialogs["CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS"] = {
-            text = KeyBindings_String("CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS",
+        -- Our key: Blizzard_BindingUI.lua:10 defines the stock one for its own window.
+        StaticPopupDialogs["BENILLA_CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS"] = {
+            text = BenillaKeyBindings_String("CONFIRM_DELETING_CHARACTER_SPECIFIC_BINDINGS",
                 "Really switch to general key bindings?  All key bindings specific to this character will be permanantly deleted."),
-            button1 = KeyBindings_String("OKAY", "Okay"),
-            button2 = KeyBindings_String("CANCEL", "Cancel"),
+            button1 = BenillaKeyBindings_String("OKAY", "Okay"),
+            button2 = BenillaKeyBindings_String("CANCEL", "Cancel"),
             OnAccept = function()
                 LoadBindings(1)
                 SaveBindings(1)
-                KeyBindings_SetSelected(nil)
-                KeyBindings_Output("")
-                KeyBindingsPage_Refresh()
+                BenillaKeyBindings_SetSelected(nil)
+                BenillaKeyBindings_Output("")
+                BenillaKeyBindingsPage_Refresh()
             end,
         }
         -- Reset To Default confirms, as the era's does; our string, since 1.12 has none.
-        StaticPopupDialogs["CONFIRM_RESET_KEYBINDINGS"] = {
+        StaticPopupDialogs["BENILLA_CONFIRM_RESET_KEYBINDINGS"] = {
             text = "Are you sure you want to reset all keybindings to their defaults?",
-            button1 = KeyBindings_String("OKAY", "Okay"),
-            button2 = KeyBindings_String("CANCEL", "Cancel"),
+            button1 = BenillaKeyBindings_String("OKAY", "Okay"),
+            button2 = BenillaKeyBindings_String("CANCEL", "Cancel"),
             OnAccept = function()
                 PlaySound("igMainMenuOptionCheckBoxOn")
                 LoadBindings(0)
-                KeyBindings_Commit()
-                KeyBindings_SetSelected(nil)
-                KeyBindings_Output("")
-                KeyBindingsPage_Refresh()
+                BenillaKeyBindings_Commit()
+                BenillaKeyBindings_SetSelected(nil)
+                BenillaKeyBindings_Output("")
+                BenillaKeyBindingsPage_Refresh()
             end,
         }
 
         -- ── Search ── a binding's tag is its display name uppercased, as the era's.
-        -- A static pool of KEYBINDINGS_SEARCH_ROWS rows, where the era's results scroll.
-        function KeyBindings_SearchMatches(words)
+        -- A static pool of BENILLA_KEYBINDINGS_SEARCH_ROWS rows, where the era's results scroll.
+        function BenillaKeyBindings_SearchMatches(words)
             local out = {}
             for i = 1, GetNumBindings() do
                 local command = GetBinding(i)
-                local tag = string.upper(KeyBindings_String("BINDING_NAME_" .. command, command))
-                local s = OptionsSearch_Score(tag, words)
-                if s then
-                    table.insert(out, { score = s, index = i })
+                if not BenillaKeyBindings_IsHeader(command) then
+                    local tag = string.upper(BenillaKeyBindings_String("BINDING_NAME_" .. command, command))
+                    local s = BenillaOptionsSearch_Score(tag, words)
+                    if s then
+                        table.insert(out, { score = s, index = i })
+                    end
                 end
             end
             return out
diff --git a/crates/benilla-app/assets/ui/OptionsFrame.xml b/crates/benilla-app/assets/ui/OptionsFrame.xml
index 141189fe..7bf8ed8d 100644
--- a/crates/benilla-app/assets/ui/OptionsFrame.xml
+++ b/crates/benilla-app/assets/ui/OptionsFrame.xml
@@ -8,7 +8,7 @@
     -->
 
     <!-- The era's 14 and 20 white fonts, outside Fonts.xml's 1.12 set; MasterFont's shadow. -->
-    <Font name="OptionsFontHighlightMedium" font="Fonts\FRIZQT__.TTF" virtual="true">
+    <Font name="BenillaOptionsFontHighlightMedium" font="Fonts\FRIZQT__.TTF" virtual="true">
         <Shadow>
             <Offset><AbsDimension x="1" y="-1"/></Offset>
             <Color r="0" g="0" b="0"/>
@@ -16,7 +16,7 @@
         <FontHeight><AbsValue val="14"/></FontHeight>
         <Color r="1.0" g="1.0" b="1.0"/>
     </Font>
-    <Font name="OptionsFontHighlightHuge" font="Fonts\FRIZQT__.TTF" virtual="true">
+    <Font name="BenillaOptionsFontHighlightHuge" font="Fonts\FRIZQT__.TTF" virtual="true">
         <Shadow>
             <Offset><AbsDimension x="1" y="-1"/></Offset>
             <Color r="0" g="0" b="0"/>
@@ -34,7 +34,7 @@
         RegisterForSave("AUTO_QUEST_WATCH")
 
         -- UIOptionsFrame.lua:370-376: Blizzard_CombatText is LoadOnDemand, so the master loads it.
-        function CombatText_UpdateOrLoad()
+        function BenillaCombatText_UpdateOrLoad()
             if ( SHOW_COMBAT_TEXT == "1" ) then
                 UIParentLoadAddOn("Blizzard_CombatText")
             end
@@ -43,7 +43,7 @@
             end
         end
         -- The Remove Chat Hover Delay row's applyFunc (UIOptionsFrame.lua:216).
-        function ChatFrame_ApplyMouseOverDelay()
+        function BenillaChatFrame_ApplyMouseOverDelay()
             if SetChatMouseOverDelay then -- nil in a VM loaded without the chat files
                 SetChatMouseOverDelay(REMOVE_CHAT_DELAY)
             end
@@ -63,39 +63,49 @@
             end
         end
 
-        -- UIOptionsFrame.lua:768-780. Deviation: stock l.776 is dropped. On 1.12 its show-then-hide
-        -- clears volatile bits (`[0xc4da34]`); here the verbs write the CVar pair that is the
-        -- store, so it would erase the saved setting at every world entry.
-        function UpdateNameplates()
-            if ( NAMEPLATES_ON ) then
+        -- The two plate rows' store: FrameXML's own NAMEPLATES_ON/FRIENDNAMEPLATES_ON, the number 1
+        -- or nil (a "0" would be truthy), applied through the verbs as the bindings do.
+        function BenillaOptionsFrame_GetEnemyPlates()
+            return NAMEPLATES_ON
+        end
+        function BenillaOptionsFrame_SetEnemyPlates(value)
+            if ( value == "1" ) then
+                NAMEPLATES_ON = 1
                 ShowNameplates()
             else
+                NAMEPLATES_ON = nil
                 HideNameplates()
             end
-            if ( FRIENDNAMEPLATES_ON ) then
+        end
+        function BenillaOptionsFrame_GetFriendlyPlates()
+            return FRIENDNAMEPLATES_ON
+        end
+        function BenillaOptionsFrame_SetFriendlyPlates(value)
+            if ( value == "1" ) then
+                FRIENDNAMEPLATES_ON = 1
                 ShowFriendNameplates()
             else
+                FRIENDNAMEPLATES_ON = nil
                 HideFriendNameplates()
             end
         end
 
-
         -- The category tree in list order; keys are the row name suffixes.
         -- MONKEY (advanced graphics): "AdvancedGraphics" joins the System group under Graphics —
         -- the seat the era's own tree gives a page that refines the one above it, and the seat
         -- that keeps the three shadow rows it inherits one row away from where they used to be.
-        OPTIONS_CATEGORY_KEYS = {
+        BENILLA_OPTIONS_CATEGORY_KEYS = {
             "Controls", "Interface", "ActionBars", "Combat", "Chat", "Keybindings", "Nameplates",
             "Graphics", "AdvancedGraphics", "Audio",
         }
 
         -- The era UIParent draws smaller than our 768-unit canvas; a chosen value, not the
         -- reference's.
-        ERA_WINDOW_SCALE = 0.78
+        BENILLA_ERA_WINDOW_SCALE = 0.78
 
         function BenillaOptionsFrame_UpdateScale()
             -- The era panel's checkFit: it also shrinks to fit the screen.
-            local k = ERA_WINDOW_SCALE
+            local k = BENILLA_ERA_WINDOW_SCALE
             local wFit = GetScreenWidth() / 940
             local hFit = GetScreenHeight() / 744
             if wFit < k then k = wFit end
@@ -104,12 +114,12 @@
         end
 
         -- The era tab width, label + 40, measured after OnShow sets the scale.
-        function OptionsTab_FitWidth(tab)
+        function BenillaOptionsTab_FitWidth(tab)
             tab:SetWidth(getglobal(tab:GetName() .. "Text"):GetStringWidth() + 40)
         end
 
         -- The wash at the era atlas size, in the 1.14 hover steel-blue.
-        function OptionsCategoryRow_OnLoad(row, key, label)
+        function BenillaOptionsCategoryRow_OnLoad(row, key, label)
             row.categoryKey = key
             row.pageTitle = label
             row:SetText(label)
@@ -126,7 +136,7 @@
                 BenillaOptionsFrameSearchBox:SetText("")
                 return -- the restore re-entered with this key and finished
             end
-            for _, k in ipairs(OPTIONS_CATEGORY_KEYS) do
+            for _, k in ipairs(BENILLA_OPTIONS_CATEGORY_KEYS) do
                 local row = getglobal("BenillaOptionsFrameCategoryListRow" .. k)
                 local bg = getglobal("BenillaOptionsFrameCategoryListRow" .. k .. "Bg")
                 if k == key then
@@ -140,7 +150,7 @@
                     row:SetTextFontObject("GameFontNormal")
                 end
             end
-            for k in pairs(OPTIONS_PAGE_ROWS) do
+            for k in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
                 local body = getglobal("BenillaOptionsFrameContainerBody" .. k)
                 if k == key then body:Show() else body:Hide() end
             end
@@ -150,16 +160,16 @@
             local kb = getglobal("BenillaOptionsFrameContainerBodyKeybindings")
             if key == "Keybindings" then
                 kb:Show()
-                KeyBindingsPage_Refresh()
+                BenillaKeyBindingsPage_Refresh()
                 BenillaOptionsFrameContainerUnbind:Show()
                 BenillaOptionsFrameContainerDefaults:Enable()
             else
                 kb:Hide()
-                KeyBindings_SetSelected(nil)
-                KeyBindings_Output("")
+                BenillaKeyBindings_SetSelected(nil)
+                BenillaKeyBindings_Output("")
                 BenillaOptionsFrameContainerUnbind:Hide()
-                if OPTIONS_PAGE_ROWS[key] then
-                    OptionsPage_Refresh(key)
+                if BENILLA_OPTIONS_PAGE_ROWS[key] then
+                    BenillaOptionsPage_Refresh(key)
                     BenillaOptionsFrameContainerDefaults:Enable()
                 else
                     BenillaOptionsFrameContainerDefaults:Disable()
@@ -171,7 +181,7 @@
         -- Tags are labels uppercased, matched by plain substring and scored by matched length.
         -- Results are the live rows, so writes work mid-search.
 
-        function OptionsSearch_Words(text)
+        function BenillaOptionsSearch_Words(text)
             local up = string.upper(text)
             local words = { up }
             for w in string.gfind(up, "([^, ]+)") do
@@ -181,7 +191,7 @@
         end
 
         -- The era's MatchesSearchTags score, with a plain find.
-        function OptionsSearch_Score(tag, words)
+        function BenillaOptionsSearch_Score(tag, words)
             for _, w in ipairs(words) do
                 local first, last = string.find(tag, w, 1, true)
                 if first then return last - first end
@@ -189,14 +199,14 @@
             return nil
         end
 
-        function OptionsSearch_FindMatches(text)
-            local words = OptionsSearch_Words(text)
+        function BenillaOptionsSearch_FindMatches(text)
+            local words = BenillaOptionsSearch_Words(text)
             local buckets, scores = {}, {}
-            for _, key in ipairs(OPTIONS_CATEGORY_KEYS) do
-                if OPTIONS_PAGE_ROWS[key] then
-                    for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+            for _, key in ipairs(BENILLA_OPTIONS_CATEGORY_KEYS) do
+                if BENILLA_OPTIONS_PAGE_ROWS[key] then
+                    for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                         local row = getglobal("BenillaOptionsFrameContainerBody" .. key .. rkey)
-                        local s = OptionsSearch_Score(row.searchTag, words)
+                        local s = BenillaOptionsSearch_Score(row.searchTag, words)
                         if s then
                             if not buckets[s] then
                                 buckets[s] = {}
@@ -208,7 +218,7 @@
                 end
             end
             -- Keybinding matches join the buckets; their rkey is the binding index.
-            for _, m in ipairs(KeyBindings_SearchMatches(words)) do
+            for _, m in ipairs(BenillaKeyBindings_SearchMatches(words)) do
                 if not buckets[m.score] then
                     buckets[m.score] = {}
                     table.insert(scores, m.score)
@@ -231,7 +241,7 @@
 
         -- ── The page scroll ──
         -- Only frames hung off the body's top are measured, so the size converges.
-        function OptionsScroll_ContentBottom()
+        function BenillaOptionsScroll_ContentBottom()
             local bottom = nil
             local function take(name)
                 local f = getglobal(name)
@@ -240,30 +250,30 @@
                     if b and (not bottom or b < bottom) then bottom = b end
                 end
             end
-            for _, key in ipairs(OPTIONS_CATEGORY_KEYS) do
-                if OPTIONS_PAGE_ROWS[key] then
+            for _, key in ipairs(BENILLA_OPTIONS_CATEGORY_KEYS) do
+                if BENILLA_OPTIONS_PAGE_ROWS[key] then
                     take("BenillaOptionsFrameContainerBodySearchHead" .. key)
-                    for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+                    for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                         take("BenillaOptionsFrameContainerBody" .. key .. rkey)
                     end
                 end
             end
             take("BenillaOptionsFrameContainerBodySearchHeadKeybindings")
-            for i = 1, KEYBINDINGS_SEARCH_ROWS do
+            for i = 1, BENILLA_KEYBINDINGS_SEARCH_ROWS do
                 take("BenillaOptionsFrameContainerBodyKeybindSearch" .. i)
             end
             return bottom
         end
 
         -- From OnUpdate, off the previous frame's rects; SetWidth and SetHeight invalidate layout.
-        function OptionsScroll_Fit()
+        function BenillaOptionsScroll_Fit()
             local sf = BenillaOptionsFrameContainerScroll
             local body = BenillaOptionsFrameContainerBody
             local fw, fh = sf:GetWidth(), sf:GetHeight()
             if not fw or fw <= 0 or not fh or fh <= 0 then return end
             if math.abs(body:GetWidth() - fw) >= 0.5 then body:SetWidth(fw) end
             local h = fh
-            local top, bottom = body:GetTop(), OptionsScroll_ContentBottom()
+            local top, bottom = body:GetTop(), BenillaOptionsScroll_ContentBottom()
             if top and bottom then
                 local content = (top - bottom) + BENILLA_SCROLL_PAD
                 if content > h then h = content end
@@ -275,7 +285,7 @@
         end
 
         -- The era SettingsList layout: the head at (10,-12), each next at (0,-9), as in the XML.
-        function OptionsSearch_Place(name, prev)
+        function BenillaOptionsSearch_Place(name, prev)
             local f = getglobal(name)
             f:ClearAllPoints()
             if prev then
@@ -288,38 +298,38 @@
         end
 
         -- Back on the XML chain after a search; a test holds the two equal.
-        function OptionsPage_Layout(key)
+        function BenillaOptionsPage_Layout(key)
             local prev = nil
-            for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+            for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                 local name = "BenillaOptionsFrameContainerBody" .. key .. rkey
-                OptionsSearch_Place(name, prev)
+                BenillaOptionsSearch_Place(name, prev)
                 getglobal(name):Show()
                 prev = name
             end
         end
 
         -- The title and no-match strings are ours: the era's are not in its UI source.
-        function OptionsSearch_Display(text)
+        function BenillaOptionsSearch_Display(text)
             BenillaOptionsFrameContainerScroll:SetVerticalScroll(0)
-            for k in pairs(OPTIONS_PAGE_ROWS) do
+            for k in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
                 getglobal("BenillaOptionsFrameContainerBody" .. k):Show()
-                for _, rkey in ipairs(OPTIONS_PAGE_ROWS[k]) do
+                for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[k]) do
                     getglobal("BenillaOptionsFrameContainerBody" .. k .. rkey):Hide()
                 end
                 getglobal("BenillaOptionsFrameContainerBodySearchHead" .. k):Hide()
             end
             getglobal("BenillaOptionsFrameContainerBodyKeybindings"):Hide()
             getglobal("BenillaOptionsFrameContainerBodySearchHeadKeybindings"):Hide()
-            for i = 1, KEYBINDINGS_SEARCH_ROWS do
+            for i = 1, BENILLA_KEYBINDINGS_SEARCH_ROWS do
                 getglobal("BenillaOptionsFrameContainerBodyKeybindSearch" .. i):Hide()
             end
-            KeyBindingsPage.searchPainted = nil
-            KeyBindings_SetSelected(nil)
+            BenillaKeyBindingsPage.searchPainted = nil
+            BenillaKeyBindings_SetSelected(nil)
             BenillaOptionsFrameContainerUnbind:Hide()
             BenillaOptionsFrameContainerTitle:SetText("Search Results")
             BenillaOptionsFrameContainerDefaults:Hide()
 
-            local order, groups = OptionsSearch_FindMatches(text)
+            local order, groups = BenillaOptionsSearch_FindMatches(text)
             if table.getn(order) == 0 then
                 BenillaOptionsFrameContainerBodyNoResults:Show()
                 return
@@ -328,20 +338,20 @@
             local prev = nil
             for _, key in ipairs(order) do
                 local head = "BenillaOptionsFrameContainerBodySearchHead" .. key
-                OptionsSearch_Place(head, prev)
+                BenillaOptionsSearch_Place(head, prev)
                 getglobal(head):Show()
                 prev = head
                 if key == "Keybindings" then
-                    KeyBindingsPage.searchPainted = {}
+                    BenillaKeyBindingsPage.searchPainted = {}
                     local shown = 0
                     for _, index in ipairs(groups[key]) do
-                        if shown < KEYBINDINGS_SEARCH_ROWS then
+                        if shown < BENILLA_KEYBINDINGS_SEARCH_ROWS then
                             shown = shown + 1
                             local name = "BenillaOptionsFrameContainerBodyKeybindSearch" .. shown
-                            KeyBindings_PaintBindRow(name, index)
-                            OptionsSearch_Place(name, prev)
+                            BenillaKeyBindings_PaintBindRow(name, index)
+                            BenillaOptionsSearch_Place(name, prev)
                             getglobal(name):Show()
-                            KeyBindingsPage.searchPainted[name] = index
+                            BenillaKeyBindingsPage.searchPainted[name] = index
                             prev = name
                         end
                     end
@@ -352,47 +362,47 @@
                         if row.parentRow and not placed[row.parentRow] then
                             placed[row.parentRow] = 1
                             local pname = "BenillaOptionsFrameContainerBody" .. key .. row.parentRow
-                            OptionsSearch_Place(pname, prev)
+                            BenillaOptionsSearch_Place(pname, prev)
                             getglobal(pname):Show()
                             prev = pname
                         end
                         if not placed[rkey] then
                             placed[rkey] = 1
                             local name = "BenillaOptionsFrameContainerBody" .. key .. rkey
-                            OptionsSearch_Place(name, prev)
+                            BenillaOptionsSearch_Place(name, prev)
                             row:Show()
                             prev = name
                         end
                     end
-                    OptionsPage_Refresh(key)
+                    BenillaOptionsPage_Refresh(key)
                 end
             end
         end
 
-        function OptionsSearch_Restore()
+        function BenillaOptionsSearch_Restore()
             BenillaOptionsFrameContainerScroll:SetVerticalScroll(0)
-            for k in pairs(OPTIONS_PAGE_ROWS) do
-                OptionsPage_Layout(k)
+            for k in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
+                BenillaOptionsPage_Layout(k)
                 getglobal("BenillaOptionsFrameContainerBodySearchHead" .. k):Hide()
             end
-            for i = 1, KEYBINDINGS_SEARCH_ROWS do
+            for i = 1, BENILLA_KEYBINDINGS_SEARCH_ROWS do
                 getglobal("BenillaOptionsFrameContainerBodyKeybindSearch" .. i):Hide()
             end
             getglobal("BenillaOptionsFrameContainerBodySearchHeadKeybindings"):Hide()
-            KeyBindingsPage.searchPainted = nil
+            BenillaKeyBindingsPage.searchPainted = nil
             BenillaOptionsFrameContainerBodyNoResults:Hide()
             BenillaOptionsFrameContainerDefaults:Show()
             BenillaOptionsFrame_SelectCategory(BenillaOptionsFrame.selectedCategory or "Controls")
         end
 
-        function OptionsSearch_OnTextChanged(text)
+        function BenillaOptionsSearch_OnTextChanged(text)
             if text == BenillaOptionsFrame.searchText then return end
             local had = BenillaOptionsFrame.searchText and BenillaOptionsFrame.searchText ~= ""
             BenillaOptionsFrame.searchText = text
             if text == "" then
-                if had then OptionsSearch_Restore() end
+                if had then BenillaOptionsSearch_Restore() end
             else
-                OptionsSearch_Display(text)
+                BenillaOptionsSearch_Display(text)
             end
         end
 
@@ -997,7 +1007,7 @@
         -- shipping one file per locale with every key present.
         BENILLA_ADVGFX = BENILLA_ADVGFX_STRINGS[GetLocale()] or BENILLA_ADVGFX_STRINGS.enUS
 
-        -- A row's description resolves by GLOBAL NAME at hover time (`OptionsRow_ShowTooltip`), so
+        -- A row's description resolves by GLOBAL NAME at hover time (`BenillaOptionsRow_ShowTooltip`), so
         -- the selected column's copy is published under the key the row carries. Same `BENILLA_`
         -- prefix the four rows above use, and for the same reason: the reference's
         -- `OPTION_TOOLTIP_` namespace stays the reference's.
@@ -1005,12 +1015,12 @@
             setglobal("BENILLA_TOOLTIP_" .. key, text)
         end
 
-        OPTIONS_PAGE_ROWS = {
+        BENILLA_OPTIONS_PAGE_ROWS = {
             -- The era Controls order first; the rest follow their 1.12 box's columns.
             Controls = {
                 "RowStickyTarget", "RowAssistAttack", "RowClearAFK",
                 "RowBlockTrades", "RowAutoSelfCast",
-                "RowAutoLoot", "RowInvertMouse", "RowMouseSpeed",
+                "RowAutoLoot", "RowInvertMouse", "RowMouseSpeed", "RowClickToMove",
                 "RowCameraFollowStyle", "RowFollowTerrain", "RowHeadBob",
                 "RowAutoFollowSpeed", "RowWaterCollision", "RowSmartPivot",
                 "RowMouseLookSpeed", "RowMaxCameraDistance",
@@ -1021,7 +1031,7 @@
                 "RowBackgroundSound",
             },
             Graphics = {
-                "RowUiScale", "RowFarclip", "RowWorldDetail", "RowBrightness",
+                "RowUiScale", "RowFarclip", "RowWorldDetail", "RowSpellDetail", "RowBrightness",
                 "RowWeatherDensity",
                 "RowDisplayMode", "RowVerticalSync",
                 "RowRenderScale",
@@ -1109,11 +1119,11 @@
         }
 
         -- `tip` is a GlobalStrings key, resolved at hover as UIOptionsFrame.lua:265 does.
-        function OptionsRow_OnLoad(row, cvar, label, tip, child)
+        function BenillaOptionsRow_OnLoad(row, cvar, label, tip, child)
             row.cvar = cvar
             row.tip = tip
             row.searchTag = string.upper(label)
-            -- OptionsRow_SetEnabled's disabled font must keep the child size.
+            -- BenillaOptionsRow_SetEnabled's disabled font must keep the child size.
             row.child = child
             local l = getglobal(row:GetName() .. "Label")
             l:SetText(label)
@@ -1127,12 +1137,12 @@
 
         -- ── The row's store ──
         -- 1.12's `cvar`, `uvar` or `func`/`setFunc` (UIOptionsFrame.lua:230-377), all strings. Keep
-        -- OptionsRow_HasStore in OptionsRow_Set's order.
-        function OptionsRow_HasStore(row)
+        -- BenillaOptionsRow_HasStore in BenillaOptionsRow_Set's order.
+        function BenillaOptionsRow_HasStore(row)
             return row.uvar or row.setFunc or row.cvar
         end
 
-        function OptionsRow_Get(row)
+        function BenillaOptionsRow_Get(row)
             if row.uvar then return getglobal(row.uvar) end
             if row.getFunc then
                 -- OptionsFrame.lua:110/135, formatted like the slider's write so strings compare
@@ -1146,7 +1156,7 @@
         end
 
         -- A uvar row applies on the click; `cvarEvent` is CVAR_UPDATE's arg1.
-        function OptionsRow_Set(row, value)
+        function BenillaOptionsRow_Set(row, value)
             if row.uvar then
                 setglobal(row.uvar, value)
                 -- Looked up when applied: most definers load after this file.
@@ -1166,12 +1176,12 @@
                 return
             end
             SetCVar(row.cvar, value, row.cvarEvent)
-            OptionsRow_WritePartner(row, value)
+            BenillaOptionsRow_WritePartner(row, value)
         end
 
         -- UIOptionsFrame_Save's partner writes: Pet Melee Damage also writes PetSpellDamage
         -- (l.334-336); the camera speeds write their pitch twin at yaw/4 and yaw/2 (l.351-356).
-        function OptionsRow_WritePartner(row, value)
+        function BenillaOptionsRow_WritePartner(row, value)
             if not row.partner then return end
             local v = value
             if row.partner.scale then
@@ -1182,44 +1192,44 @@
         end
 
         -- A uvar's default is captured at OnLoad, before the saved-variables chunk runs.
-        function OptionsRow_Default(row)
+        function BenillaOptionsRow_Default(row)
             if row.uvar then return row.udefault end
             if row.getFunc then return row.fdefault end
             return GetCVarDefault(row.cvar)
         end
 
-        -- OptionsRow_OnLoad's signature with the global's name in the cvar seat.
-        function OptionsGlobalRow_OnLoad(row, uvar, label, tip, child)
-            OptionsRow_OnLoad(row, nil, label, tip, child)
+        -- BenillaOptionsRow_OnLoad's signature with the global's name in the cvar seat.
+        function BenillaOptionsGlobalRow_OnLoad(row, uvar, label, tip, child)
+            BenillaOptionsRow_OnLoad(row, nil, label, tip, child)
             row.uvar = uvar
             row.udefault = getglobal(uvar)
         end
 
         -- Stated, as UIOptionsFrame_SetDefaults hand-writes it (l.631-634).
-        function OptionsFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
-            OptionsRow_OnLoad(row, nil, label, tip, child)
+        function BenillaOptionsFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
+            BenillaOptionsRow_OnLoad(row, nil, label, tip, child)
             row.getFunc = getFunc
             row.setFunc = setFunc
             row.fdefault = default
         end
 
         -- `default` is still a string, since rows compare strings.
-        function OptionsNumFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
-            OptionsFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
+        function BenillaOptionsNumFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
+            BenillaOptionsFuncRow_OnLoad(row, getFunc, setFunc, default, label, tip, child)
             row.numeric = 1
         end
 
         -- UIOptionsFrame.lua:193-227 re-applies saved uvars, so this window has no load ladder.
 
         -- OptionsFrameSliders is the stock table (OptionsFrame.lua:24-34), which addons write.
-        -- Holes at 4, 5, 7 and 8, so the OnShow loop uses the pairs form: ipairs would stop at 3.
+        -- Holes at 4, 5 and 7, so the OnShow loop uses the pairs form: ipairs would stop at 3.
         BENILLA_GRAPHICS_SLIDER_ROWS = {
             "RowUiScale", "RowFarclip", "RowWorldDetail",
-            [6] = "RowBrightness", [9] = "RowWeatherDensity",
+            [6] = "RowBrightness", [8] = "RowSpellDetail", [9] = "RowWeatherDensity",
         }
 
         -- SetMinMaxValues re-clamps and fires OnValueChanged, which must not write back.
-        function OptionsSliderRow_Setup(row, min, max, step, fmt, stops)
+        function BenillaOptionsSliderRow_Setup(row, min, max, step, fmt, stops)
             local slider = getglobal(row:GetName() .. "ControlSlider")
             row.fmt = fmt
             -- Kept for the "travel" readout, a share of the row's own range.
@@ -1234,42 +1244,42 @@
         end
 
         -- ── The dropdown rows: the 1.12 UIDropDownMenu kit ──
-        function OptionsDropdownRow_Setup(row, entries)
+        function BenillaOptionsDropdownRow_Setup(row, entries)
             row.entries = entries
             local dd = getglobal(row:GetName() .. "Dropdown")
             UIDropDownMenu_SetWidth(180, dd)
-            UIDropDownMenu_Initialize(dd, OptionsDropdownRow_InitMenu)
+            UIDropDownMenu_Initialize(dd, BenillaOptionsDropdownRow_InitMenu)
             -- The capsule's button steals hover from the row, so it carries the row wash too.
             local btn = getglobal(dd:GetName() .. "Button")
-            btn:SetScript("OnEnter", function() OptionsRow_Hover(this:GetParent():GetParent(), 1) end)
-            btn:SetScript("OnLeave", function() OptionsRow_Hover(this:GetParent():GetParent(), nil) end)
+            btn:SetScript("OnEnter", function() BenillaOptionsRow_Hover(this:GetParent():GetParent(), 1) end)
+            btn:SetScript("OnLeave", function() BenillaOptionsRow_Hover(this:GetParent():GetParent(), nil) end)
         end
 
-        function OptionsDropdownRow_InitMenu()
+        function BenillaOptionsDropdownRow_InitMenu()
             local dd = getglobal(UIDROPDOWNMENU_INIT_MENU)
             local row = dd:GetParent()
             for _, e in ipairs(row.entries) do
                 local info = {}
                 info.text = e.text
                 info.value = e.value
-                info.func = OptionsDropdownEntry_OnClick
+                info.func = BenillaOptionsDropdownEntry_OnClick
                 UIDropDownMenu_AddButton(info)
             end
         end
 
         -- `this` is the list button; the kit closes the list and plays the click.
-        function OptionsDropdownEntry_OnClick()
+        function BenillaOptionsDropdownEntry_OnClick()
             local dd = UIDropDownMenu_GetCurrentDropDown()
             local row = dd:GetParent()
-            OptionsRow_Set(row, this.value)
-            OptionsDropdown_ShowValue(row)
+            BenillaOptionsRow_Set(row, this.value)
+            BenillaOptionsDropdown_ShowValue(row)
         end
 
         -- A field, not SetSelectedValue, whose Refresh walks the shared DropDownList1. An off-grid
         -- value shows the nearest entry.
-        function OptionsDropdown_ShowValue(row)
+        function BenillaOptionsDropdown_ShowValue(row)
             local dd = getglobal(row:GetName() .. "Dropdown")
-            local v = OptionsRow_Get(row)
+            local v = BenillaOptionsRow_Get(row)
             local match
             for _, e in ipairs(row.entries) do
                 -- `alt`: a stored "3" shows as Never, where the nearest value would show Always.
@@ -1296,7 +1306,7 @@
             end
         end
 
-        function OptionsRow_FormatValue(row, value)
+        function BenillaOptionsRow_FormatValue(row, value)
             if row.fmt == "raw" then
                 return string.format("%d", math.floor(value + 0.5))
             end
@@ -1343,11 +1353,11 @@
         end
 
         -- Crossing controls does not blink: OnLeave fires before OnEnter within a move.
-        function OptionsRow_Hover(row, on)
+        function BenillaOptionsRow_Hover(row, on)
             local hover = getglobal(row:GetName() .. "Hover")
             if on then
                 hover:Show()
-                OptionsRow_ShowTooltip(row)
+                BenillaOptionsRow_ShowTooltip(row)
             else
                 hover:Hide()
                 GameTooltip:Hide()
@@ -1355,7 +1365,7 @@
         end
 
         -- 1.12's per-option string alone in gold (OptionsFrameTemplates.xml:52-64).
-        function OptionsRow_ShowTooltip(row)
+        function BenillaOptionsRow_ShowTooltip(row)
             local text = row.tip and getglobal(row.tip)
             if text then
                 GameTooltip:SetOwner(getglobal(row:GetName() .. "Tip"), "ANCHOR_RIGHT", -10, 0)
@@ -1367,7 +1377,7 @@
             end
         end
 
-        function OptionsCheckbox_OnClick(box)
+        function BenillaOptionsCheckbox_OnClick(box)
             local row = box:GetParent()
             local checked = box:GetChecked()
             -- The 1.12 panels disagree: the interface panel plays CheckBoxOn when checked
@@ -1383,14 +1393,14 @@
             local on = checked
             if row.invert then on = not on end
             if on then
-                OptionsRow_Set(row, "1")
+                BenillaOptionsRow_Set(row, "1")
             else
-                OptionsRow_Set(row, "0")
+                BenillaOptionsRow_Set(row, "0")
             end
-            OptionsPage_UpdateDependencies(BenillaOptionsFrame.selectedCategory)
+            BenillaOptionsPage_UpdateDependencies(BenillaOptionsFrame.selectedCategory)
         end
 
-        function OptionsSlider_OnValueChanged(slider, value)
+        function BenillaOptionsSlider_OnValueChanged(slider, value)
             local control = slider:GetParent()
             local row = control:GetParent()
             if not row.refreshing then
@@ -1407,53 +1417,53 @@
                     value = snapped -- the clean grid number, not the f32-rounded echo
                 end
             end
-            getglobal(control:GetName() .. "Value"):SetText(OptionsRow_FormatValue(row, value))
-            if OptionsRow_HasStore(row) and not row.refreshing then
+            getglobal(control:GetName() .. "Value"):SetText(BenillaOptionsRow_FormatValue(row, value))
+            if BenillaOptionsRow_HasStore(row) and not row.refreshing then
                 -- Trailing zeros stripped, so a value at its default stays out of the config file.
                 local str = string.gsub(string.format("%.2f", value), "%.?0+$", "")
                 if row.deferred then
                     -- Stored on Apply; a pending equal to the committed value is dropped.
-                    if str == OptionsRow_Get(row) then
+                    if str == BenillaOptionsRow_Get(row) then
                         row.pending = nil
                     else
                         row.pending = str
                     end
-                    OptionsApply_Update()
+                    BenillaOptionsApply_Update()
                 else
-                    OptionsRow_Set(row, str)
+                    BenillaOptionsRow_Set(row, str)
                 end
             end
         end
 
-        function OptionsPage_Refresh(key)
+        function BenillaOptionsPage_Refresh(key)
             local base = "BenillaOptionsFrameContainerBody" .. key
-            for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+            for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                 local row = getglobal(base .. rkey)
                 local box = getglobal(base .. rkey .. "Check")
                 if box then
                     -- "0" unchecks; an inverted row checks on "0".
                     if row.invert then
                         local checked
-                        if OptionsRow_Get(row) == "0" then checked = 1 end
+                        if BenillaOptionsRow_Get(row) == "0" then checked = 1 end
                         box:SetChecked(checked)
                     else
-                        box:SetChecked(OptionsRow_Get(row))
+                        box:SetChecked(BenillaOptionsRow_Get(row))
                     end
                 elseif row.entries then
-                    OptionsDropdown_ShowValue(row)
+                    BenillaOptionsDropdown_ShowValue(row)
                 else
                     local slider = getglobal(base .. rkey .. "ControlSlider")
                     row.refreshing = 1
                     -- A staged value shows first, as the era's GetValue returns it.
-                    slider:SetValue(tonumber(row.pending or OptionsRow_Get(row) or "0") or 0)
+                    slider:SetValue(tonumber(row.pending or BenillaOptionsRow_Get(row) or "0") or 0)
                     row.refreshing = nil
                     -- SetValue fires only on a change, so the readout is written here.
                     getglobal(base .. rkey .. "ControlValue"):SetText(
-                        OptionsRow_FormatValue(row, slider:GetValue()))
+                        BenillaOptionsRow_FormatValue(row, slider:GetValue()))
                 end
             end
-            OptionsPage_UpdateDependencies(key)
-            OptionsApply_Update()
+            BenillaOptionsPage_UpdateDependencies(key)
+            BenillaOptionsApply_Update()
         end
 
         -- ── MONKEY (advanced graphics): the page that has to WATCH its settings ─────────────
@@ -1475,14 +1485,14 @@
         -- Safe under a drag, and not by luck: the value the refresh would write back is the value
         -- the drag just wrote, `SetValue` fires nothing when it does not change the value, and the
         -- `refreshing` guard stops a write even if it did. A staged (deferred) edit is safe too —
-        -- `OptionsPage_Refresh` shows `row.pending` ahead of the stored value.
+        -- `BenillaOptionsPage_Refresh` shows `row.pending` ahead of the stored value.
         BENILLA_ADVGFX_POLL = 0.25
 
         function AdvGfx_Signature()
             local out = ""
-            for _, rkey in ipairs(OPTIONS_PAGE_ROWS.AdvancedGraphics) do
+            for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS.AdvancedGraphics) do
                 local row = getglobal("BenillaOptionsFrameContainerBodyAdvancedGraphics" .. rkey)
-                out = out .. "|" .. (OptionsRow_Get(row) or "")
+                out = out .. "|" .. (BenillaOptionsRow_Get(row) or "")
             end
             return out
         end
@@ -1494,11 +1504,11 @@
             local sig = AdvGfx_Signature()
             if sig == page.sig then return end
             page.sig = sig
-            OptionsPage_Refresh("AdvancedGraphics")
+            BenillaOptionsPage_Refresh("AdvancedGraphics")
         end
 
         -- Each page's dependency rules, the 1.12 panel's own.
-        function OptionsPage_UpdateDependencies(key)
+        function BenillaOptionsPage_UpdateDependencies(key)
             if key == "Combat" then
                 -- Combo Points is for rogues and druids only.
                 local on = SHOW_COMBAT_TEXT ~= "0"
@@ -1509,18 +1519,18 @@
                 local damage = {
                     RowShowDamage = 1, RowPeriodicDamage = 1, RowPetDamage = 1,
                 }
-                for _, rkey in ipairs(OPTIONS_PAGE_ROWS.Combat) do
+                for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS.Combat) do
                     if rkey ~= "RowCombatText" and not damage[rkey] then
                         local live = on
                         if rkey == "RowComboPoints" and not combo then live = nil end
-                        OptionsRow_SetEnabled(
+                        BenillaOptionsRow_SetEnabled(
                             getglobal("BenillaOptionsFrameContainerBodyCombat" .. rkey), live)
                     end
                 end
                 -- UIOptionsFrame.lua:710-716: Show Target Damage off greys Periodic and Pet Damage.
                 local dmg = GetCVar("CombatDamage") ~= "0"
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyCombatRowPeriodicDamage, dmg)
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyCombatRowPetDamage, dmg)
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyCombatRowPeriodicDamage, dmg)
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyCombatRowPetDamage, dmg)
                 return
             end
             if key == "AdvancedGraphics" then
@@ -1535,43 +1545,43 @@
                 local base = "BenillaOptionsFrameContainerBodyAdvancedGraphics"
                 local sun = GetCVar("characterShadows") ~= "0"
                     or GetCVar("worldShadows") ~= "0"
-                OptionsRow_SetEnabled(getglobal(base .. "RowShadowDistance"), sun)
-                OptionsRow_SetEnabled(getglobal(base .. "RowShadowResolution"), sun)
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowShadowDistance"), sun)
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowShadowResolution"), sun)
                 local interior = GetCVar("interiorLight") ~= "0"
-                OptionsRow_SetEnabled(getglobal(base .. "RowInteriorShadows"), interior)
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowInteriorShadows"), interior)
                 local torch = (interior and GetCVar("interiorShadows") ~= "0")
                     or GetCVar("exteriorShadows") ~= "0"
-                OptionsRow_SetEnabled(getglobal(base .. "RowTorchSoft"), torch)
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowTorchSoft"), torch)
                 -- MONKEY (daylight: terrain torch casters): the ground only casts for outdoor fires.
-                OptionsRow_SetEnabled(getglobal(base .. "RowTorchTerrainShadows"),
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowTorchTerrainShadows"),
                     GetCVar("exteriorShadows") ~= "0")
                 -- MONKEY (fix-wind): the strength only matters while some foliage sways.
-                OptionsRow_SetEnabled(getglobal(base .. "RowFoliageWindStrength"),
+                BenillaOptionsRow_SetEnabled(getglobal(base .. "RowFoliageWindStrength"),
                     GetCVar("foliageWind") ~= "0")
                 return
             end
             if key == "Controls" then
                 -- UIOptionsFrame.lua:717-721: dead while the style is Never, "0" or a stray "3".
                 local style = GetCVar("cameraSmoothStyle")
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyControlsRowAutoFollowSpeed,
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyControlsRowAutoFollowSpeed,
                     style ~= "0" and style ~= "3")
                 return
             end
             if key == "Nameplates" then
                 -- UIOptionsFrame.lua:703-709: Player Names off greys Player Guild Names.
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyNameplatesRowGuildNames,
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyNameplatesRowGuildNames,
                     GetCVar("UnitNamePlayer") ~= "0")
                 return
             end
             if key == "Interface" then
                 -- UIOptionsFrame.lua:697-701: the mode is dead while its switch is off.
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyInterfaceRowTargetOfTargetMode,
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyInterfaceRowTargetOfTargetMode,
                     SHOW_TARGET_OF_TARGET ~= "0")
                 return
             end
             if key == "ActionBars" then
                 -- UIOptionsFrame.lua:722-726: Right ActionBar 2 needs Right ActionBar.
-                OptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyActionBarsRowMultiBar4,
+                BenillaOptionsRow_SetEnabled(BenillaOptionsFrameContainerBodyActionBarsRowMultiBar4,
                     SHOW_MULTI_ACTIONBAR_3)
                 return
             end
@@ -1592,7 +1602,7 @@
         end
 
         -- As OptionsFrame_DisableDropDown; 1.12 has no UIDropDownMenu_DisableDropDown.
-        function OptionsRow_SetEnabled(row, on)
+        function BenillaOptionsRow_SetEnabled(row, on)
             local name = row:GetName()
             local box = getglobal(name .. "Check")
             local dd = getglobal(name .. "Dropdown")
@@ -1633,35 +1643,35 @@
         end
 
         -- Pending edits dropped.
-        function OptionsPage_Defaults(key)
+        function BenillaOptionsPage_Defaults(key)
             local base = "BenillaOptionsFrameContainerBody" .. key
-            for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+            for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                 local row = getglobal(base .. rkey)
                 row.pending = nil
                 if not row.preset then
-                    OptionsRow_Set(row, OptionsRow_Default(row))
+                    BenillaOptionsRow_Set(row, BenillaOptionsRow_Default(row))
                 end
             end
             -- MONKEY (presets): a preset row goes last, so its default rung (the Graphics
             -- Preset's High) is what the page lands on rather than its members' own defaults.
             -- `SetCVar` queues only a moved value, so "Custom" (which the host applies as
             -- nothing) goes first: the rung is then always a queued write, after the members.
-            for _, rkey in ipairs(OPTIONS_PAGE_ROWS[key]) do
+            for _, rkey in ipairs(BENILLA_OPTIONS_PAGE_ROWS[key]) do
                 local row = getglobal(base .. rkey)
                 if row.preset then
-                    OptionsRow_Set(row, "Custom")
-                    OptionsRow_Set(row, OptionsRow_Default(row))
+                    BenillaOptionsRow_Set(row, "Custom")
+                    BenillaOptionsRow_Set(row, BenillaOptionsRow_Default(row))
                 end
             end
-            OptionsPage_Refresh(key)
+            BenillaOptionsPage_Refresh(key)
         end
 
         -- ── The Apply flow ──
         -- Pending edits survive a category switch; hiding discards them.
 
-        function OptionsApply_Update()
+        function BenillaOptionsApply_Update()
             local pending
-            for key, rows in pairs(OPTIONS_PAGE_ROWS) do
+            for key, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
                 local base = "BenillaOptionsFrameContainerBody" .. key
                 for _, rkey in ipairs(rows) do
                     if getglobal(base .. rkey).pending then pending = 1 end
@@ -1676,34 +1686,34 @@
             end
         end
 
-        function OptionsPage_Apply()
-            for key, rows in pairs(OPTIONS_PAGE_ROWS) do
+        function BenillaOptionsPage_Apply()
+            for key, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
                 local base = "BenillaOptionsFrameContainerBody" .. key
                 for _, rkey in ipairs(rows) do
                     local row = getglobal(base .. rkey)
                     if row.pending then
-                        OptionsRow_Set(row, row.pending)
+                        BenillaOptionsRow_Set(row, row.pending)
                         row.pending = nil
                     end
                 end
             end
-            OptionsApply_Update()
+            BenillaOptionsApply_Update()
         end
 
-        function OptionsPage_DiscardPending()
-            for key, rows in pairs(OPTIONS_PAGE_ROWS) do
+        function BenillaOptionsPage_DiscardPending()
+            for key, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do
                 local base = "BenillaOptionsFrameContainerBody" .. key
                 for _, rkey in ipairs(rows) do
                     getglobal(base .. rkey).pending = nil
                 end
             end
-            OptionsApply_Update()
+            BenillaOptionsApply_Update()
         end
     ]]></Script>
 
     <!-- A copy of the stock GameMenuButtonTemplate (UIPanelTemplates.xml:403) at the era's
          96x22. -->
-    <Button name="OptionsRedButtonTemplate" virtual="true">
+    <Button name="BenillaOptionsRedButtonTemplate" virtual="true">
         <Size><AbsDimension x="96" y="22"/></Size>
         <ButtonText name="$parentText"/>
         <NormalTexture file="Interface\Buttons\UI-Panel-Button-Up"><TexCoords left="0" right="0.625" top="0" bottom="0.6875"/></NormalTexture>
@@ -1716,7 +1726,7 @@
     </Button>
 
     <!-- The wash is 1.14's OptionsListButtonTemplate: blue on hover, gold when selected. -->
-    <Button name="OptionsCategoryRowTemplate" virtual="true">
+    <Button name="BenillaOptionsCategoryRowTemplate" virtual="true">
         <Size><AbsDimension x="199" y="20"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -1752,11 +1762,11 @@
     </Button>
 
     <!-- A category header; the era's wash has no 1.12 art. -->
-    <Frame name="OptionsCategoryHeaderTemplate" virtual="true">
+    <Frame name="BenillaOptionsCategoryHeaderTemplate" virtual="true">
         <Size><AbsDimension x="199" y="30"/></Size>
         <Layers>
             <Layer level="OVERLAY">
-                <FontString name="$parentLabel" inherits="OptionsFontHighlightMedium">
+                <FontString name="$parentLabel" inherits="BenillaOptionsFontHighlightMedium">
                     <Anchors><Anchor point="LEFT"><Offset><AbsDimension x="20" y="-1"/></Offset></Anchor></Anchors>
                 </FontString>
             </Layer>
@@ -1764,7 +1774,7 @@
     </Frame>
 
     <!-- A search group head; a click selects the category, ending the search. -->
-    <Button name="OptionsSearchHeadTemplate" virtual="true" hidden="true">
+    <Button name="BenillaOptionsSearchHeadTemplate" virtual="true" hidden="true">
         <Size><AbsDimension y="45"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -1790,7 +1800,7 @@
     </Button>
 
     <!-- A checkbox row with the 1.12 UI-CheckBox set; the row-wide wash is the hover. -->
-    <Frame name="OptionsCheckboxRowTemplate" virtual="true" enableMouse="true">
+    <Frame name="BenillaOptionsCheckboxRowTemplate" virtual="true" enableMouse="true">
         <Size><AbsDimension y="26"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -1828,21 +1838,21 @@
                 <CheckedTexture file="Interface\Buttons\UI-CheckBox-Check"/>
                 <DisabledCheckedTexture file="Interface\Buttons\UI-CheckBox-Check-Disabled"/>
                 <Scripts>
-                    <OnClick>OptionsCheckbox_OnClick(this)</OnClick>
-                    <OnEnter>OptionsRow_Hover(this:GetParent(), 1)</OnEnter>
-                    <OnLeave>OptionsRow_Hover(this:GetParent(), nil)</OnLeave>
+                    <OnClick>BenillaOptionsCheckbox_OnClick(this)</OnClick>
+                    <OnEnter>BenillaOptionsRow_Hover(this:GetParent(), 1)</OnEnter>
+                    <OnLeave>BenillaOptionsRow_Hover(this:GetParent(), nil)</OnLeave>
                 </Scripts>
             </CheckButton>
         </Frames>
         <Scripts>
-            <OnEnter>OptionsRow_Hover(this, 1)</OnEnter>
-            <OnLeave>OptionsRow_Hover(this, nil)</OnLeave>
+            <OnEnter>BenillaOptionsRow_Hover(this, 1)</OnEnter>
+            <OnLeave>BenillaOptionsRow_Hover(this, nil)</OnLeave>
         </Scripts>
     </Frame>
 
     <!-- 1.12's OptionsSliderTemplate groove (OptionsFrameTemplates.xml:74); no steppers, as in
          1.12. The +3 seats the art, so the readout stays level with the label. -->
-    <Frame name="OptionsSliderRowTemplate" virtual="true" enableMouse="true">
+    <Frame name="BenillaOptionsSliderRowTemplate" virtual="true" enableMouse="true">
         <Size><AbsDimension y="26"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -1904,22 +1914,22 @@
                             <Size><AbsDimension x="32" y="32"/></Size>
                         </ThumbTexture>
                         <Scripts>
-                            <OnValueChanged>OptionsSlider_OnValueChanged(this, arg1)</OnValueChanged>
-                            <OnEnter>OptionsRow_Hover(this:GetParent():GetParent(), 1)</OnEnter>
-                            <OnLeave>OptionsRow_Hover(this:GetParent():GetParent(), nil)</OnLeave>
+                            <OnValueChanged>BenillaOptionsSlider_OnValueChanged(this, arg1)</OnValueChanged>
+                            <OnEnter>BenillaOptionsRow_Hover(this:GetParent():GetParent(), 1)</OnEnter>
+                            <OnLeave>BenillaOptionsRow_Hover(this:GetParent():GetParent(), nil)</OnLeave>
                         </Scripts>
                     </Slider>
                 </Frames>
             </Frame>
         </Frames>
         <Scripts>
-            <OnEnter>OptionsRow_Hover(this, 1)</OnEnter>
-            <OnLeave>OptionsRow_Hover(this, nil)</OnLeave>
+            <OnEnter>BenillaOptionsRow_Hover(this, 1)</OnEnter>
+            <OnLeave>BenillaOptionsRow_Hover(this, nil)</OnLeave>
         </Scripts>
     </Frame>
 
     <!-- At CENTER-71, so the capsule's ink opens at the groove's column. -->
-    <Frame name="OptionsDropdownRowTemplate" virtual="true" enableMouse="true">
+    <Frame name="BenillaOptionsDropdownRowTemplate" virtual="true" enableMouse="true">
         <Size><AbsDimension y="26"/></Size>
         <Layers>
             <Layer level="BACKGROUND">
@@ -1953,8 +1963,8 @@
             </Frame>
         </Frames>
         <Scripts>
-            <OnEnter>OptionsRow_Hover(this, 1)</OnEnter>
-            <OnLeave>OptionsRow_Hover(this, nil)</OnLeave>
+            <OnEnter>BenillaOptionsRow_Hover(this, 1)</OnEnter>
+            <OnLeave>BenillaOptionsRow_Hover(this, nil)</OnLeave>
         </Scripts>
     </Frame>
 
@@ -1988,7 +1998,7 @@
                 </Texture>
             </Layer>
             <Layer level="OVERLAY">
-                <!-- Not GameFontNormalMed1: GameMenuFrame.xml declares that after this file. -->
+                <!-- Not BenillaGameFontNormalMed1: GameMenuAdapters.xml declares it later. -->
                 <FontString name="$parentTitleText" inherits="GameFontNormal" text="Options">
                     <Anchors>
                         <Anchor point="TOP" relativeTo="$parentHeader"><Offset><AbsDimension x="0" y="-14"/></Offset></Anchor>
@@ -2059,7 +2069,7 @@
                 <HighlightFont inherits="GameFontHighlightSmall"/>
                 <DisabledFont inherits="GameFontHighlightSmall"/>
                 <Scripts>
-                    <OnShow>OptionsTab_FitWidth(self)</OnShow>
+                    <OnShow>BenillaOptionsTab_FitWidth(this)</OnShow>
                 </Scripts>
             </Button>
             <Button name="$parentAddOnsTab">
@@ -2087,8 +2097,8 @@
                 <DisabledFont inherits="GameFontNormalSmall"/>
                 <!-- No addon list behind it: disabled, in the era's unselected gold. -->
                 <Scripts>
-                    <OnLoad>self:Disable()</OnLoad>
-                    <OnShow>OptionsTab_FitWidth(self)</OnShow>
+                    <OnLoad>this:Disable()</OnLoad>
+                    <OnShow>BenillaOptionsTab_FitWidth(this)</OnShow>
                 </Scripts>
             </Button>
 
@@ -2102,64 +2112,64 @@
                 </Anchors>
                 <!-- The era list rhythm: spacing 2, and an 18-tall spacer between groups. -->
                 <Frames>
-                    <Frame name="$parentHeaderGameplay" inherits="OptionsCategoryHeaderTemplate">
+                    <Frame name="$parentHeaderGameplay" inherits="BenillaOptionsCategoryHeaderTemplate">
                         <Anchors><Anchor point="TOPLEFT"/></Anchors>
                         <Scripts>
-                            <OnLoad>getglobal(self:GetName() .. "Label"):SetText("Gameplay")</OnLoad>
+                            <OnLoad>getglobal(this:GetName() .. "Label"):SetText("Gameplay")</OnLoad>
                         </Scripts>
                     </Frame>
-                    <Button name="$parentRowControls" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowControls" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentHeaderGameplay" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Controls", "Controls")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Controls", "Controls")</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowInterface" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowInterface" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowControls" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Interface", "Interface")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Interface", "Interface")</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowActionBars" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowActionBars" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowInterface" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "ActionBars", "Action Bars")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "ActionBars", "Action Bars")</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowCombat" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowCombat" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowActionBars" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Combat", "Combat")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Combat", "Combat")</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowChat" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowChat" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowCombat" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Chat", "Chat")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Chat", "Chat")</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowKeybindings" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowKeybindings" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowChat" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Keybindings", "Keybindings")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Keybindings", "Keybindings")</OnLoad></Scripts>
                     </Button>
                     <!-- The era Gameplay group's last row (NAMEPLATE_OPTIONS_LABEL). -->
-                    <Button name="$parentRowNameplates" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowNameplates" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowKeybindings" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Nameplates", "Nameplates")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Nameplates", "Nameplates")</OnLoad></Scripts>
                     </Button>
-                    <Frame name="$parentHeaderSystem" inherits="OptionsCategoryHeaderTemplate">
+                    <Frame name="$parentHeaderSystem" inherits="BenillaOptionsCategoryHeaderTemplate">
                         <Anchors>
                             <Anchor point="TOPLEFT" relativeTo="$parentRowNameplates" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-22"/></Offset></Anchor>
                         </Anchors>
                         <Scripts>
-                            <OnLoad>getglobal(self:GetName() .. "Label"):SetText("System")</OnLoad>
+                            <OnLoad>getglobal(this:GetName() .. "Label"):SetText("System")</OnLoad>
                         </Scripts>
                     </Frame>
-                    <Button name="$parentRowGraphics" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowGraphics" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentHeaderSystem" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Graphics", "Graphics")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Graphics", "Graphics")</OnLoad></Scripts>
                     </Button>
                     <!-- MONKEY (advanced graphics): under Graphics, which is what it refines. Its
                          label is the one category label in this tree that is not a literal — the
                          page is bilingual, so the row (and the page title it doubles as) reads
                          the selected column like every other string on it. -->
-                    <Button name="$parentRowAdvancedGraphics" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowAdvancedGraphics" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowGraphics" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "AdvancedGraphics", BENILLA_ADVGFX.page)</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "AdvancedGraphics", BENILLA_ADVGFX.page)</OnLoad></Scripts>
                     </Button>
-                    <Button name="$parentRowAudio" inherits="OptionsCategoryRowTemplate">
+                    <Button name="$parentRowAudio" inherits="BenillaOptionsCategoryRowTemplate">
                         <Anchors><Anchor point="TOPLEFT" relativeTo="$parentRowAdvancedGraphics" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-2"/></Offset></Anchor></Anchors>
-                        <Scripts><OnLoad>OptionsCategoryRow_OnLoad(self, "Audio", "Audio")</OnLoad></Scripts>
+                        <Scripts><OnLoad>BenillaOptionsCategoryRow_OnLoad(this, "Audio", "Audio")</OnLoad></Scripts>
                     </Button>
                 </Frames>
             </Frame>
@@ -2184,37 +2194,37 @@
                     </Layer>
                     <Layer level="OVERLAY">
                         <!-- The page title, written by BenillaOptionsFrame_SelectCategory. -->
-                        <FontString name="$parentTitle" inherits="OptionsFontHighlightHuge">
+                        <FontString name="$parentTitle" inherits="BenillaOptionsFontHighlightHuge">
                             <Anchors><Anchor point="TOPLEFT"><Offset><AbsDimension x="7" y="-22"/></Offset></Anchor></Anchors>
                         </FontString>
                     </Layer>
                 </Layers>
                 <Frames>
                     <!-- On the Keybindings page, 1.12's Reset To Default behind a confirm. -->
-                    <Button name="$parentDefaults" inherits="OptionsRedButtonTemplate" text="Defaults">
+                    <Button name="$parentDefaults" inherits="BenillaOptionsRedButtonTemplate" text="Defaults">
                         <Anchors><Anchor point="TOPRIGHT"><Offset><AbsDimension x="-36" y="-16"/></Offset></Anchor></Anchors>
                         <Scripts>
-                            <OnLoad>self:Disable()</OnLoad>
+                            <OnLoad>this:Disable()</OnLoad>
                             <OnClick>
                                 if BenillaOptionsFrame.selectedCategory == "Keybindings" then
-                                    StaticPopup_Show("CONFIRM_RESET_KEYBINDINGS")
+                                    StaticPopup_Show("BENILLA_CONFIRM_RESET_KEYBINDINGS")
                                 else
-                                    OptionsPage_Defaults(BenillaOptionsFrame.selectedCategory)
+                                    BenillaOptionsPage_Defaults(BenillaOptionsFrame.selectedCategory)
                                 end
                             </OnClick>
                         </Scripts>
                     </Button>
                     <!-- 1.12's Unbind Key: Keybindings only, live while a capsule is selected. -->
-                    <Button name="$parentUnbind" inherits="OptionsRedButtonTemplate" hidden="true">
+                    <Button name="$parentUnbind" inherits="BenillaOptionsRedButtonTemplate" hidden="true">
                         <Anchors><Anchor point="RIGHT" relativeTo="$parentDefaults" relativePoint="LEFT"><Offset><AbsDimension x="-2" y="0"/></Offset></Anchor></Anchors>
                         <Scripts>
                             <OnLoad>
-                                self:SetText(KeyBindings_String("UNBIND", "Unbind Key"))
-                                self:Disable()
+                                this:SetText(BenillaKeyBindings_String("UNBIND", "Unbind Key"))
+                                this:Disable()
                             </OnLoad>
                             <OnClick>
                                 PlaySound("igMainMenuOptionCheckBoxOn")
-                                KeyBindings_Unbind()
+                                BenillaKeyBindings_Unbind()
                             </OnClick>
                         </Scripts>
                     </Button>
@@ -2226,9 +2236,16 @@
                         </Anchors>
                         <Scripts>
                             <!-- The loader fires OnLoad bottom-up, so the body already exists. -->
-                            <OnLoad>self:SetScrollChild(BenillaOptionsFrameContainerBody)</OnLoad>
-                            <OnUpdate>OptionsScroll_Fit()</OnUpdate>
-                            <OnMouseWheel>BenillaScroll_OnMouseWheel(this, arg1)</OnMouseWheel>
+                            <OnLoad>this:SetScrollChild(BenillaOptionsFrameContainerBody)</OnLoad>
+                            <OnUpdate>BenillaOptionsScroll_Fit()</OnUpdate>
+                            <!-- An armed Keybindings capsule binds the wheel, search rows included. -->
+                            <OnMouseWheel>
+                                if BenillaKeyBindingsPage.selected then
+                                    BenillaKeyBindings_OnMouseWheel(arg1)
+                                else
+                                    BenillaScroll_OnMouseWheel(this, arg1)
+                                end
+                            </OnMouseWheel>
                             <OnVerticalScroll>BenillaScroll_SyncBar(this)</OnVerticalScroll>
                             <OnScrollRangeChanged>BenillaScroll_SyncBar(this)</OnScrollRangeChanged>
                         </Scripts>
@@ -2236,7 +2253,7 @@
                             <!-- Declared before the body and the bar so it draws beneath both. -->
                             <Frame name="$parentBarTrough" inherits="BenillaScrollTroughTemplate"/>
                             <!-- Sized, not anchored: SetScrollChild pins its TOPLEFT and
-                                 OptionsScroll_Fit sizes it. -->
+                                 BenillaOptionsScroll_Fit sizes it. -->
                             <Frame name="BenillaOptionsFrameContainerBody">
                                 <Size><AbsDimension x="665" y="563"/></Size>
                             <Layers>
@@ -2256,185 +2273,194 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowStickyTarget" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowStickyTarget" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "deselectOnClick", "Sticky Targeting",
+                                                BenillaOptionsRow_OnLoad(this, "deselectOnClick", "Sticky Targeting",
                                                     "OPTION_TOOLTIP_GAMEFIELD_DESELECT")
-                                                self.invert = 1
+                                                this.invert = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Labels verbatim, ASSIST_ATTACK's sentence case too. -->
-                                        <Frame name="$parentRowAssistAttack" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAssistAttack" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowStickyTarget" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowStickyTarget" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "assistAttack", "Attack on assist",
+                                                BenillaOptionsRow_OnLoad(this, "assistAttack", "Attack on assist",
                                                     "OPTION_TOOLTIP_ASSIST_ATTACK")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowClearAFK" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowClearAFK" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAssistAttack" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAssistAttack" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "autoClearAFK", "Auto Clear AFK",
+                                                BenillaOptionsRow_OnLoad(this, "autoClearAFK", "Auto Clear AFK",
                                                     "OPTION_TOOLTIP_CLEAR_AFK")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowBlockTrades" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowBlockTrades" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowClearAFK" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowClearAFK" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "BlockTrades", "Block Trades",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "BlockTrades", "Block Trades",
                                                 "OPTION_TOOLTIP_BLOCK_TRADES")</OnLoad></Scripts>
                                         </Frame>
                                         <!-- Deviation: ships "1" where 1.12 registers "0": off, a
                                              friendly cast falls into the targeting cursor, which is
                                              not modelled. -->
-                                        <Frame name="$parentRowAutoSelfCast" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAutoSelfCast" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowBlockTrades" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowBlockTrades" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "autoSelfCast", "Auto Self Cast",
+                                                BenillaOptionsRow_OnLoad(this, "autoSelfCast", "Auto Self Cast",
                                                     "OPTION_TOOLTIP_AUTO_SELF_CAST")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAutoLoot" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAutoLoot" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAutoSelfCast" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAutoSelfCast" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <!-- No tip: 1.12 has no AUTO_LOOT string. -->
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "autoLootDefault", "Auto Loot")</OnLoad></Scripts>
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "autoLootDefault", "Auto Loot")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowInvertMouse" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowInvertMouse" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAutoLoot" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAutoLoot" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "mouseInvertPitch", "Invert Mouse",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "mouseInvertPitch", "Invert Mouse",
                                                 "OPTION_TOOLTIP_INVERT_MOUSE")</OnLoad></Scripts>
                                         </Frame>
                                         <!-- The reference's range and step. -->
-                                        <Frame name="$parentRowMouseSpeed" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMouseSpeed" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowInvertMouse" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowInvertMouse" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "mousespeed", "Mouse Sensitivity",
+                                                BenillaOptionsRow_OnLoad(this, "mousespeed", "Mouse Sensitivity",
                                                     "OPTION_TOOLTIP_MOUSE_SENSITIVITY")
-                                                OptionsSliderRow_Setup(self, 0.5, 1.5, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0.5, 1.5, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <!-- Smart 1, Always 2, Never 0 (UIOptionsFrame.lua:525,
-                                             536, 547). -->
-                                        <Frame name="$parentRowCameraFollowStyle" inherits="OptionsDropdownRowTemplate">
+                                        <!-- 1.12's box sits under the mouse slider. -->
+                                        <Frame name="$parentRowClickToMove" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMouseSpeed" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMouseSpeed" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "autointeract", "Click-to-Move",
+                                                "OPTION_TOOLTIP_CLICK_TO_MOVE")</OnLoad></Scripts>
+                                        </Frame>
+                                        <!-- Smart 1, Always 2, Never 0 (UIOptionsFrame.lua:525,
+                                             536, 547). -->
+                                        <Frame name="$parentRowCameraFollowStyle" inherits="BenillaOptionsDropdownRowTemplate">
+                                            <Anchors>
+                                                <Anchor point="TOPLEFT" relativeTo="$parentRowClickToMove" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                                <Anchor point="TOPRIGHT" relativeTo="$parentRowClickToMove" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                            </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraSmoothStyle",
+                                                BenillaOptionsRow_OnLoad(this, "cameraSmoothStyle",
                                                     "Camera Following Style", "OPTION_TOOLTIP_CAMERA1")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = "Smart", value = "1", tip = "OPTION_TOOLTIP_CAMERA1" },
                                                     { text = "Always", value = "2", tip = "OPTION_TOOLTIP_CAMERA2" },
                                                     { text = "Never", value = "0", alt = "3", tip = "OPTION_TOOLTIP_CAMERA3" },
                                                 })
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFollowTerrain" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowFollowTerrain" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowCameraFollowStyle" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowCameraFollowStyle" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraTerrainTilt", "Follow Terrain",
+                                                BenillaOptionsRow_OnLoad(this, "cameraTerrainTilt", "Follow Terrain",
                                                     "OPTION_TOOLTIP_FOLLOW_TERRAIN")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- First person only, as in 1.12: the gate requires
                                              `[cam+0xec] <= 1/6` on the zoom distance. -->
-                                        <Frame name="$parentRowHeadBob" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowHeadBob" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFollowTerrain" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFollowTerrain" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraBobbing", "Head Bob",
+                                                BenillaOptionsRow_OnLoad(this, "cameraBobbing", "Head Bob",
                                                     "OPTION_TOOLTIP_HEAD_BOB")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- UIOptionsFrameSliders row 2. Deviation: no partner
                                              write of cameraPitchSmoothSpeed, which has no reader:
                                              the follow here has one rate. -->
-                                        <Frame name="$parentRowAutoFollowSpeed" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowAutoFollowSpeed" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowHeadBob" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowHeadBob" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraYawSmoothSpeed", "Auto-Follow Speed",
+                                                BenillaOptionsRow_OnLoad(this, "cameraYawSmoothSpeed", "Auto-Follow Speed",
                                                     "OPTION_TOOLTIP_AUTO_FOLLOW_SPEED")
-                                                OptionsSliderRow_Setup(self, 90, 270, 10, "raw")
+                                                BenillaOptionsSliderRow_Setup(this, 90, 270, 10, "raw")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- One CVar, two consumers: the `0xf0000` nibble in
                                              `0x50e570`'s trace mask and `0x50e629`'s pivot floor
                                              and cap test. -->
-                                        <Frame name="$parentRowWaterCollision" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowWaterCollision" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAutoFollowSpeed" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAutoFollowSpeed" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraWaterCollision", "Water Collision",
+                                                BenillaOptionsRow_OnLoad(this, "cameraWaterCollision", "Water Collision",
                                                     "OPTION_TOOLTIP_WATER_COLLISION")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowSmartPivot" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowSmartPivot" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowWaterCollision" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowWaterCollision" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraPivot", "Smart Pivot",
+                                                BenillaOptionsRow_OnLoad(this, "cameraPivot", "Smart Pivot",
                                                     "OPTION_TOOLTIP_SMART_PIVOT")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Writes cameraPitchMoveSpeed at half (l.354-356). -->
-                                        <Frame name="$parentRowMouseLookSpeed" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMouseLookSpeed" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSmartPivot" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSmartPivot" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraYawMoveSpeed", "Mouse Look Speed",
+                                                BenillaOptionsRow_OnLoad(this, "cameraYawMoveSpeed", "Mouse Look Speed",
                                                     "OPTION_TOOLTIP_MOUSE_LOOK_SPEED")
-                                                OptionsSliderRow_Setup(self, 90, 270, 10, "raw")
-                                                self.partner = { cvar = "cameraPitchMoveSpeed", scale = 0.5 }
+                                                BenillaOptionsSliderRow_Setup(this, 90, 270, 10, "raw")
+                                                this.partner = { cvar = "cameraPitchMoveSpeed", scale = 0.5 }
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMaxCameraDistance" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMaxCameraDistance" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMouseLookSpeed" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMouseLookSpeed" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "cameraDistanceMaxFactor",
+                                                BenillaOptionsRow_OnLoad(this, "cameraDistanceMaxFactor",
                                                     "Max Camera Distance", "OPTION_TOOLTIP_MAX_FOLLOW_DIST")
-                                                OptionsSliderRow_Setup(self, 1.0, 2.0, 0.1, "yards")
+                                                BenillaOptionsSliderRow_Setup(this, 1.0, 2.0, 0.1, "yards")
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -2446,104 +2472,104 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowEnableAll" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnableAll" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "MasterSoundEffects", "Enable All Sound",
+                                                BenillaOptionsRow_OnLoad(this, "MasterSoundEffects", "Enable All Sound",
                                                     "OPTION_TOOLTIP_ENABLE_ALL_SOUND")
-                                                self.soundQuirk = 1
+                                                this.soundQuirk = 1
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMaster" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMaster" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnableAll" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnableAll" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "MasterVolume", "Master Volume",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "MasterVolume", "Master Volume",
                                                 "OPTION_TOOLTIP_MASTER_VOLUME")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowSound" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowSound" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMaster" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMaster" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "SoundVolume", "Sound Volume",
+                                                BenillaOptionsRow_OnLoad(this, "SoundVolume", "Sound Volume",
                                                     "OPTION_TOOLTIP_SOUND_VOLUME", 1)
-                                                self.parentRow = "RowMaster"
+                                                this.parentRow = "RowMaster"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMusic" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMusic" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSound" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSound" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "MusicVolume", "Music Volume",
+                                                BenillaOptionsRow_OnLoad(this, "MusicVolume", "Music Volume",
                                                     "OPTION_TOOLTIP_MUSIC_VOLUME", 1)
-                                                self.parentRow = "RowMaster"
+                                                this.parentRow = "RowMaster"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAmbience" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowAmbience" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMusic" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMusic" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "AmbienceVolume", "Ambience Volume",
+                                                BenillaOptionsRow_OnLoad(this, "AmbienceVolume", "Ambience Volume",
                                                     "OPTION_TOOLTIP_AMBIENCE_VOLUME", 1)
-                                                self.parentRow = "RowMaster"
+                                                this.parentRow = "RowMaster"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowEnableMusic" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnableMusic" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAmbience" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAmbience" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "EnableMusic", "Enable Music",
+                                                BenillaOptionsRow_OnLoad(this, "EnableMusic", "Enable Music",
                                                     "OPTION_TOOLTIP_ENABLE_MUSIC")
-                                                self.soundQuirk = 1
+                                                this.soundQuirk = 1
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowEnableAmbience" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnableAmbience" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnableMusic" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnableMusic" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "EnableAmbience", "Enable Ambience",
+                                                BenillaOptionsRow_OnLoad(this, "EnableAmbience", "Enable Ambience",
                                                     "OPTION_TOOLTIP_ENABLE_AMBIENCE")
-                                                self.soundQuirk = 1
+                                                this.soundQuirk = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- 1.12's checkbox 4 (SoundOptionsFrame.lua:3). -->
-                                        <Frame name="$parentRowEnableErrorSpeech" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnableErrorSpeech" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnableAmbience" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnableAmbience" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "EnableErrorSpeech", "Enable Error Speech",
+                                                BenillaOptionsRow_OnLoad(this, "EnableErrorSpeech", "Enable Error Speech",
                                                     "OPTION_TOOLTIP_ENABLE_ERROR_SPEECH")
-                                                self.soundQuirk = 1
+                                                this.soundQuirk = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- An era row, not in 1.12, which always mutes when
                                              the window loses focus; off matches it. -->
-                                        <Frame name="$parentRowBackgroundSound" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowBackgroundSound" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnableErrorSpeech" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnableErrorSpeech" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "Sound_EnableSoundWhenGameIsInBG",
+                                                BenillaOptionsRow_OnLoad(this, "Sound_EnableSoundWhenGameIsInBG",
                                                     "Enable Sound in Background",
                                                     "BENILLA_TOOLTIP_BACKGROUND_SOUND")
-                                                self.soundQuirk = 1
+                                                this.soundQuirk = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -2557,88 +2583,106 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowUiScale" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowUiScale" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "uiScale", "UI Scale",
+                                                BenillaOptionsRow_OnLoad(this, "uiScale", "UI Scale",
                                                     "OPTION_TOOLTIP_UI_SCALE")
-                                                OptionsSliderRow_Setup(self, OptionsFrameSliders[1].minValue,
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[1].minValue,
                                                     OptionsFrameSliders[1].maxValue,
                                                     OptionsFrameSliders[1].valueStep)
                                                 -- A live write would rescale the slider mid-drag.
-                                                self.deferred = 1
+                                                this.deferred = 1
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFarclip" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowFarclip" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowUiScale" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowUiScale" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "farclip", "Terrain Distance",
+                                                BenillaOptionsRow_OnLoad(this, "farclip", "Terrain Distance",
                                                     "OPTION_TOOLTIP_FARCLIP")
-                                                OptionsSliderRow_Setup(self, OptionsFrameSliders[2].minValue,
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[2].minValue,
                                                     OptionsFrameSliders[2].maxValue,
                                                     OptionsFrameSliders[2].valueStep, "raw")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowWorldDetail" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowWorldDetail" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFarclip" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFarclip" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "WorldDetail", "Environment Detail",
+                                                BenillaOptionsRow_OnLoad(this, "WorldDetail", "Environment Detail",
                                                     "OPTION_TOOLTIP_ENVIRONMENT_DETAIL")
                                                 -- Stop names from the era quality ladder.
-                                                OptionsSliderRow_Setup(self, OptionsFrameSliders[3].minValue,
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[3].minValue,
                                                     OptionsFrameSliders[3].maxValue,
                                                     OptionsFrameSliders[3].valueStep, nil,
                                                     { "Low", "Medium", "High" })
                                             </OnLoad></Scripts>
                                         </Frame>
+                                        <!-- On the CVar, as 1.12's slider 8 lands: there is no
+                                             SetspellEffectLevel global. -->
+                                        <Frame name="$parentRowSpellDetail" inherits="BenillaOptionsSliderRowTemplate">
+                                            <Anchors>
+                                                <Anchor point="TOPLEFT" relativeTo="$parentRowWorldDetail" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                                <Anchor point="TOPRIGHT" relativeTo="$parentRowWorldDetail" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                            </Anchors>
+                                            <Scripts><OnLoad>
+                                                BenillaOptionsRow_OnLoad(this, "spellEffectLevel", SPELL_DETAIL,
+                                                    "OPTION_TOOLTIP_SPELL_DETAIL")
+                                                -- Our names for the handler's emission scalars
+                                                -- 0.33, 0.66 and 1.0 (`0x689510`).
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[8].minValue,
+                                                    OptionsFrameSliders[8].maxValue,
+                                                    OptionsFrameSliders[8].valueStep, nil,
+                                                    { "Low", "Medium", "High" })
+                                            </OnLoad></Scripts>
+                                        </Frame>
                                         <!-- An API row over GetGamma/SetGamma, whose unit is
                                              `1 - gamma`; writing `gamma` would invert the
                                              control. -->
-                                        <Frame name="$parentRowBrightness" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowBrightness" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
-                                                <Anchor point="TOPLEFT" relativeTo="$parentRowWorldDetail" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
-                                                <Anchor point="TOPRIGHT" relativeTo="$parentRowWorldDetail" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                                <Anchor point="TOPLEFT" relativeTo="$parentRowSpellDetail" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
+                                                <Anchor point="TOPRIGHT" relativeTo="$parentRowSpellDetail" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
                                                 -- OptionsFrame_SetDefaults' default (l.444-445);
                                                 -- `or 1` covers a VM with no CVars.
                                                 local gd = tonumber(GetCVarDefault("gamma")) or 1
-                                                OptionsNumFuncRow_OnLoad(self, GetGamma, SetGamma,
+                                                BenillaOptionsNumFuncRow_OnLoad(this, GetGamma, SetGamma,
                                                     tostring(1 - gd), "Brightness",
                                                     "BENILLA_TOOLTIP_BRIGHTNESS")
-                                                OptionsSliderRow_Setup(self, OptionsFrameSliders[6].minValue,
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[6].minValue,
                                                     OptionsFrameSliders[6].maxValue,
                                                     OptionsFrameSliders[6].valueStep, "travel")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- On the CVar, as 1.12's lands: there is no
                                              SetweatherDensity global. -->
-                                        <Frame name="$parentRowWeatherDensity" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowWeatherDensity" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowBrightness" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowBrightness" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "weatherDensity", "Weather Intensity",
+                                                BenillaOptionsRow_OnLoad(this, "weatherDensity", "Weather Intensity",
                                                     "OPTION_TOOLTIP_WEATHER_DETAIL")
                                                 -- Our names for `0x67b870`'s spawn-rate gains
                                                 -- `{0.1, 0.33, 0.66, 1.0}` (`[0x8680ec]`).
-                                                OptionsSliderRow_Setup(self, OptionsFrameSliders[9].minValue,
+                                                BenillaOptionsSliderRow_Setup(this, OptionsFrameSliders[9].minValue,
                                                     OptionsFrameSliders[9].maxValue,
                                                     OptionsFrameSliders[9].valueStep, nil,
                                                     { "Minimal", "Low", "Medium", "Full" })
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowDisplayMode" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowDisplayMode" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowWeatherDensity" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowWeatherDensity" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2647,15 +2691,15 @@
                                                 -- Deviation: modern Classic's two-entry Display
                                                 -- Mode, as there is no exclusive fullscreen;
                                                 -- gxWindow "0" is the borderless window.
-                                                OptionsRow_OnLoad(self, "gxWindow", "Display Mode",
+                                                BenillaOptionsRow_OnLoad(this, "gxWindow", "Display Mode",
                                                     "BENILLA_TOOLTIP_DISPLAY_MODE")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = "Windowed (Fullscreen)", value = "0" },
                                                     { text = "Windowed", value = "1" },
                                                 })
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowVerticalSync" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowVerticalSync" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowDisplayMode" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowDisplayMode" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2663,7 +2707,7 @@
                                             <Scripts><OnLoad>
                                                 -- Not deferred despite gxRestart: vsync changes
                                                 -- live.
-                                                OptionsRow_OnLoad(self, "gxVSync", "Vertical Sync",
+                                                BenillaOptionsRow_OnLoad(this, "gxVSync", "Vertical Sync",
                                                     "OPTION_TOOLTIP_VERTICAL_SYNC")
                                             </OnLoad></Scripts>
                                         </Frame>
@@ -2674,7 +2718,7 @@
                                              labels, same descriptions, same deferred commit on the
                                              slider — because they are three rows of one rig whose
                                              other fifteen a player could not reach at all. -->
-                                        <Frame name="$parentRowRenderScale" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowRenderScale" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowVerticalSync" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowVerticalSync" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2684,10 +2728,10 @@
                                                 -- the backbuffer), and no Multisampling, which
                                                 -- misses alpha-tested cutouts. Deferred: a write
                                                 -- rebuilds the render target.
-                                                OptionsRow_OnLoad(self, "renderScale", "Render Scale",
+                                                BenillaOptionsRow_OnLoad(this, "renderScale", "Render Scale",
                                                     "BENILLA_TOOLTIP_RENDER_SCALE")
-                                                OptionsSliderRow_Setup(self, 0.5, 2.0, 0.05)
-                                                self.deferred = 1
+                                                BenillaOptionsSliderRow_Setup(this, 0.5, 2.0, 0.05)
+                                                this.deferred = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -2699,7 +2743,7 @@
                                                 local info = OptionsFrameSliders[i]
                                                 local row = getglobal(this:GetName() .. name)
                                                 if ( info and row ) then
-                                                    OptionsSliderRow_Setup(row, info.minValue, info.maxValue,
+                                                    BenillaOptionsSliderRow_Setup(row, info.minValue, info.maxValue,
                                                         info.valueStep, row.fmt, row.stops)
                                                 end
                                             end
@@ -2735,17 +2779,17 @@
                                              Quality below it, ONE CVar: the host's
                                              `cvars::GRAPHICS_PRESETS` writes the rows and
                                              re-derives this one every frame. -->
-                                        <Frame name="$parentRowGraphicsQuality" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowGraphicsQuality" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "graphicsQuality",
+                                                BenillaOptionsRow_OnLoad(this, "graphicsQuality",
                                                     BENILLA_ADVGFX.graphicsQuality,
                                                     "BENILLA_TOOLTIP_GRAPHICS_QUALITY")
-                                                self.preset = 1
-                                                OptionsDropdownRow_Setup(self, {
+                                                this.preset = 1
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.pClassic, value = "Classic" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "Low" },
                                                     { text = BENILLA_ADVGFX.qMedium, value = "Medium" },
@@ -2759,19 +2803,19 @@
                                              Distance, on the extended range (`view::FARCLIP_RANGE`,
                                              177..1497 on the 1.12 grid of 60). Live like its
                                              Graphics twin; both read the one CVar. -->
-                                        <Frame name="$parentRowRenderDistance" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowRenderDistance" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowGraphicsQuality" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowGraphicsQuality" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "farclip",
+                                                BenillaOptionsRow_OnLoad(this, "farclip",
                                                     BENILLA_ADVGFX.renderDistance,
                                                     "BENILLA_TOOLTIP_RENDER_DISTANCE")
-                                                OptionsSliderRow_Setup(self, 177, 1497, 60, "yd")
+                                                BenillaOptionsSliderRow_Setup(this, 177, 1497, 60, "yd")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowLightingQuality" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowLightingQuality" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowRenderDistance" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowRenderDistance" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2792,10 +2836,10 @@
                                                 -- would be a copy the other three cannot see.
                                                 -- The page's OnUpdate poll is what brings the
                                                 -- member rows' new values back onto the screen.
-                                                OptionsRow_OnLoad(self, "lightingQuality",
+                                                BenillaOptionsRow_OnLoad(this, "lightingQuality",
                                                     BENILLA_ADVGFX.lightingQuality,
                                                     "BENILLA_TOOLTIP_LIGHTING_QUALITY")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.qOff, value = "Off" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "Low" },
                                                     { text = BENILLA_ADVGFX.qMedium, value = "Medium" },
@@ -2805,16 +2849,16 @@
                                                 })
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowWaterQuality" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowWaterQuality" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowLightingQuality" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowLightingQuality" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "waterQuality",
+                                                BenillaOptionsRow_OnLoad(this, "waterQuality",
                                                     BENILLA_ADVGFX.waterQuality,
                                                     "BENILLA_TOOLTIP_WATER_QUALITY")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.waterClassic, value = "0" },
                                                     { text = BENILLA_ADVGFX.waterEnhanced, value = "1" },
                                                     { text = BENILLA_ADVGFX.waterHigh, value = "2" },
@@ -2822,15 +2866,15 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (volumetric fog): live numeric tiers use the existing localised dropdown. -->
-                                        <Frame name="$parentRowVolumetricFog" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowVolumetricFog" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowWaterQuality" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowWaterQuality" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "volumetricFog", BENILLA_ADVGFX.volumetricFog,
+                                                BenillaOptionsRow_OnLoad(this, "volumetricFog", BENILLA_ADVGFX.volumetricFog,
                                                     "BENILLA_TOOLTIP_VOLUMETRIC_FOG")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.fogOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "1" },
                                                     { text = BENILLA_ADVGFX.qHigh, value = "2" },
@@ -2838,15 +2882,15 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (sky): the sky tier, Classic / Enhanced / High. -->
-                                        <Frame name="$parentRowSkyQuality" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowSkyQuality" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowVolumetricFog" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowVolumetricFog" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "skyQuality", BENILLA_ADVGFX.skyQuality,
+                                                BenillaOptionsRow_OnLoad(this, "skyQuality", BENILLA_ADVGFX.skyQuality,
                                                     "BENILLA_TOOLTIP_SKY_QUALITY")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.waterClassic, value = "0" },
                                                     { text = BENILLA_ADVGFX.waterEnhanced, value = "1" },
                                                     { text = BENILLA_ADVGFX.waterHigh, value = "2" },
@@ -2854,15 +2898,15 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (post): live HDR/bloom tier; Off is the baseline. -->
-                                        <Frame name="$parentRowBloom" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowBloom" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSkyQuality" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSkyQuality" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "bloom", BENILLA_ADVGFX.bloom,
+                                                BenillaOptionsRow_OnLoad(this, "bloom", BENILLA_ADVGFX.bloom,
                                                     "BENILLA_TOOLTIP_BLOOM")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.fogOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "1" },
                                                     { text = BENILLA_ADVGFX.qHigh, value = "2" },
@@ -2870,51 +2914,51 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (post): depth-occluded radial sunlight, world only. -->
-                                        <Frame name="$parentRowSunShafts" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowSunShafts" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowBloom" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowBloom" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "sunShafts", BENILLA_ADVGFX.sunShafts,
+                                                BenillaOptionsRow_OnLoad(this, "sunShafts", BENILLA_ADVGFX.sunShafts,
                                                     "BENILLA_TOOLTIP_SUN_SHAFTS")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (post): zone/day-night 32-cube grade, world only. -->
-                                        <Frame name="$parentRowColorGrading" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowColorGrading" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSunShafts" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSunShafts" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "colorGrading", BENILLA_ADVGFX.colorGrading,
+                                                BenillaOptionsRow_OnLoad(this, "colorGrading", BENILLA_ADVGFX.colorGrading,
                                                     "BENILLA_TOOLTIP_COLOR_GRADING")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowCharacterShadows" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowCharacterShadows" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <!-- MONKEY (post): screen effects sit immediately above this one. -->
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowColorGrading" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowColorGrading" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "characterShadows",
+                                                BenillaOptionsRow_OnLoad(this, "characterShadows",
                                                     BENILLA_ADVGFX.characterShadows,
                                                     "BENILLA_TOOLTIP_CHARACTER_SHADOWS")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowWorldShadows" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowWorldShadows" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowCharacterShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowCharacterShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "worldShadows",
+                                                BenillaOptionsRow_OnLoad(this, "worldShadows",
                                                     BENILLA_ADVGFX.worldShadows,
                                                     "BENILLA_TOOLTIP_WORLD_SHADOWS")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowShadowDistance" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowShadowDistance" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowWorldShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowWorldShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2925,7 +2969,7 @@
                                                 -- own clamp (SHADOW_DISTANCE_RANGE). DEFERRED to
                                                 -- Apply so a drag doesn't re-fit the cascade + recollect
                                                 -- casters on every tick (one rebuild on commit instead).
-                                                OptionsRow_OnLoad(self, "shadowDistance",
+                                                BenillaOptionsRow_OnLoad(this, "shadowDistance",
                                                     BENILLA_ADVGFX.shadowDistance,
                                                     "BENILLA_TOOLTIP_SHADOW_DISTANCE")
                                                 -- `"yd"`, not `"yards"`: the value is already a
@@ -2934,11 +2978,11 @@
                                                 -- This row rode the wrong one from the day it was
                                                 -- seated and printed "1200 yd" for an 80 yd
                                                 -- cascade.
-                                                OptionsSliderRow_Setup(self, 40, 200, 10, "yd")
-                                                self.deferred = 1
+                                                BenillaOptionsSliderRow_Setup(this, 40, 200, 10, "yd")
+                                                this.deferred = 1
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowShadowResolution" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowShadowResolution" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShadowDistance" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShadowDistance" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2951,17 +2995,17 @@
                                                 -- rounds UP into a bigger and slower map than the
                                                 -- one that was asked for. The entry texts are the
                                                 -- numbers themselves — nothing to translate.
-                                                OptionsRow_OnLoad(self, "shadowMapSize",
+                                                BenillaOptionsRow_OnLoad(this, "shadowMapSize",
                                                     BENILLA_ADVGFX.shadowResolution,
                                                     "BENILLA_TOOLTIP_SHADOW_RESOLUTION")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = "1024", value = "1024" },
                                                     { text = "2048", value = "2048" },
                                                     { text = "4096", value = "4096" },
                                                 })
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMoonShadows" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMoonShadows" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShadowResolution" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShadowResolution" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -2972,58 +3016,58 @@
                                                 -- on it, so the left end of this groove is the
                                                 -- night the client rendered before the moon lane
                                                 -- existed.
-                                                OptionsRow_OnLoad(self, "moonShadowStrength",
+                                                BenillaOptionsRow_OnLoad(this, "moonShadowStrength",
                                                     BENILLA_ADVGFX.moonShadows,
                                                     "BENILLA_TOOLTIP_MOON_SHADOWS")
-                                                OptionsSliderRow_Setup(self, 0, 1, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 1, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowInteriorLight" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowInteriorLight" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMoonShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMoonShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "interiorLight",
+                                                BenillaOptionsRow_OnLoad(this, "interiorLight",
                                                     BENILLA_ADVGFX.interiorLight,
                                                     "BENILLA_TOOLTIP_INTERIOR_LIGHT")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowInteriorShadows" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowInteriorShadows" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowInteriorLight" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowInteriorLight" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "interiorShadows",
+                                                BenillaOptionsRow_OnLoad(this, "interiorShadows",
                                                     BENILLA_ADVGFX.interiorShadows,
                                                     "BENILLA_TOOLTIP_INTERIOR_SHADOWS")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowExteriorShadows" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowExteriorShadows" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowInteriorShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowInteriorShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "exteriorShadows",
+                                                BenillaOptionsRow_OnLoad(this, "exteriorShadows",
                                                     BENILLA_ADVGFX.exteriorShadows,
                                                     "BENILLA_TOOLTIP_EXTERIOR_SHADOWS")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (daylight: terrain torch casters) -->
-                                        <Frame name="$parentRowTorchTerrainShadows" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowTorchTerrainShadows" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowExteriorShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowExteriorShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "torchTerrainShadows",
+                                                BenillaOptionsRow_OnLoad(this, "torchTerrainShadows",
                                                     BENILLA_ADVGFX.torchTerrainShadows,
                                                     "BENILLA_TOOLTIP_TORCH_TERRAIN_SHADOWS")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowTorchSoft" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowTorchSoft" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowTorchTerrainShadows" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowTorchTerrainShadows" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -3033,26 +3077,26 @@
                                                 -- SCALE on the PCF tap radius at a contact, so the
                                                 -- readout is a percentage of the shipped radius
                                                 -- and 100% is what the lane was tuned at.
-                                                OptionsRow_OnLoad(self, "interiorShadowSoft",
+                                                BenillaOptionsRow_OnLoad(this, "interiorShadowSoft",
                                                     BENILLA_ADVGFX.torchSoft,
                                                     "BENILLA_TOOLTIP_TORCH_SOFT")
-                                                OptionsSliderRow_Setup(self, 0.5, 3, 0.1)
+                                                BenillaOptionsSliderRow_Setup(this, 0.5, 3, 0.1)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFireLight" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowFireLight" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowTorchSoft" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowTorchSoft" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
                                                 -- Full 0..4 registry range, in five-percent steps.
-                                                OptionsRow_OnLoad(self, "fireLightGain",
+                                                BenillaOptionsRow_OnLoad(this, "fireLightGain",
                                                     BENILLA_ADVGFX.fireLight,
                                                     "BENILLA_TOOLTIP_FIRE_LIGHT")
-                                                OptionsSliderRow_Setup(self, 0, 4, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 4, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFireFlicker" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowFireFlicker" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFireLight" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFireLight" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -3061,38 +3105,38 @@
                                                 -- 0..2, the CVar's own clamp verbatim: the
                                                 -- amplitudes are authored at 100%, and 200% is the
                                                 -- deliberate over-drive for judging the shape.
-                                                OptionsRow_OnLoad(self, "fireFlicker",
+                                                BenillaOptionsRow_OnLoad(this, "fireFlicker",
                                                     BENILLA_ADVGFX.fireFlicker,
                                                     "BENILLA_TOOLTIP_FIRE_FLICKER")
-                                                OptionsSliderRow_Setup(self, 0, 2, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 2, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowSpellLights" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowSpellLights" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFireFlicker" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFireFlicker" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
                                                 -- Full 0..4 registry range, in five-percent steps.
-                                                OptionsRow_OnLoad(self, "spellLightGain",
+                                                BenillaOptionsRow_OnLoad(this, "spellLightGain",
                                                     BENILLA_ADVGFX.spellLights,
                                                     "BENILLA_TOOLTIP_SPELL_LIGHTS")
-                                                OptionsSliderRow_Setup(self, 0, 4, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 4, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowLavaGlow" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowLavaGlow" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSpellLights" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSpellLights" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "lavaLightGain",
+                                                BenillaOptionsRow_OnLoad(this, "lavaLightGain",
                                                     BENILLA_ADVGFX.lavaGlow,
                                                     "BENILLA_TOOLTIP_LAVA_GLOW")
-                                                OptionsSliderRow_Setup(self, 0, 4, 0.05)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 4, 0.05)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowNightDarkness" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowNightDarkness" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowLavaGlow" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowLavaGlow" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -3109,13 +3153,13 @@
                                                 -- the row is named for the darkness: left is
                                                 -- darker, and this is what makes the number say so
                                                 -- too. The store keeps the gain, untouched.
-                                                OptionsRow_OnLoad(self, "nightGain",
+                                                BenillaOptionsRow_OnLoad(this, "nightGain",
                                                     BENILLA_ADVGFX.nightDarkness,
                                                     "BENILLA_TOOLTIP_NIGHT_DARKNESS")
-                                                OptionsSliderRow_Setup(self, 0.2, 1.5, 0.05, "darkness")
+                                                BenillaOptionsSliderRow_Setup(this, 0.2, 1.5, 0.05, "darkness")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowInteriorDarkness" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowInteriorDarkness" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowNightDarkness" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowNightDarkness" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -3123,59 +3167,59 @@
                                             <Scripts><OnLoad>
                                                 -- The room lane's own dim dial, same clamp and same
                                                 -- backwards readout as the night one above it.
-                                                OptionsRow_OnLoad(self, "interiorGain",
+                                                BenillaOptionsRow_OnLoad(this, "interiorGain",
                                                     BENILLA_ADVGFX.interiorDarkness,
                                                     "BENILLA_TOOLTIP_INTERIOR_DARKNESS")
-                                                OptionsSliderRow_Setup(self, 0.2, 1.5, 0.05, "darkness")
+                                                BenillaOptionsSliderRow_Setup(this, 0.2, 1.5, 0.05, "darkness")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (p0 skyDither): the combine's deband dither. -->
-                                        <Frame name="$parentRowSkyDither" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowSkyDither" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowInteriorDarkness" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowInteriorDarkness" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "skyDither",
+                                                BenillaOptionsRow_OnLoad(this, "skyDither",
                                                     BENILLA_ADVGFX.skyDither,
                                                     "BENILLA_TOOLTIP_SKY_DITHER")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (fog): the distance-fog model. -->
-                                        <Frame name="$parentRowFogModel" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowFogModel" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowSkyDither" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowSkyDither" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "fogModel",
+                                                BenillaOptionsRow_OnLoad(this, "fogModel",
                                                     BENILLA_ADVGFX.fogModel,
                                                     "BENILLA_TOOLTIP_FOG_MODEL")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (wet): wet surfaces + rain ripples. -->
-                                        <Frame name="$parentRowRainSurfaces" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowRainSurfaces" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFogModel" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFogModel" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "rainSurfaces",
+                                                BenillaOptionsRow_OnLoad(this, "rainSurfaces",
                                                     BENILLA_ADVGFX.rainSurfaces,
                                                     "BENILLA_TOOLTIP_RAIN_SURFACES")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (wind): three foliage tiers; appended at the end of the page. -->
-                                        <Frame name="$parentRowFoliageWind" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowFoliageWind" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowRainSurfaces" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowRainSurfaces" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "foliageWind",
+                                                BenillaOptionsRow_OnLoad(this, "foliageWind",
                                                     BENILLA_ADVGFX.foliageWind,
                                                     "BENILLA_TOOLTIP_FOLIAGE_WIND")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.qOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.windGrass, value = "1" },
                                                     { text = BENILLA_ADVGFX.windTrees, value = "2" },
@@ -3183,28 +3227,28 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (fix-wind): the sway gain, 0.25..3 (100% = the shipped tuning). -->
-                                        <Frame name="$parentRowFoliageWindStrength" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowFoliageWindStrength" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFoliageWind" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFoliageWind" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "foliageWindStrength",
+                                                BenillaOptionsRow_OnLoad(this, "foliageWindStrength",
                                                     BENILLA_ADVGFX.foliageWindStrength,
                                                     "BENILLA_TOOLTIP_FOLIAGE_WIND_STRENGTH")
-                                                OptionsSliderRow_Setup(self, 0.25, 3, 0.25)
+                                                BenillaOptionsSliderRow_Setup(this, 0.25, 3, 0.25)
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (ao): numeric tiers through the existing localised dropdown. -->
-                                        <Frame name="$parentRowAmbientOcclusion" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowAmbientOcclusion" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFoliageWindStrength" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFoliageWindStrength" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "ambientOcclusion", BENILLA_ADVGFX.ambientOcclusion,
+                                                BenillaOptionsRow_OnLoad(this, "ambientOcclusion", BENILLA_ADVGFX.ambientOcclusion,
                                                     "BENILLA_TOOLTIP_AMBIENT_OCCLUSION")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.fogOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "1" },
                                                     { text = BENILLA_ADVGFX.qHigh, value = "2" },
@@ -3212,15 +3256,15 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (lampfog): night point-light airlight tiers. -->
-                                        <Frame name="$parentRowLampFog" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowLampFog" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAmbientOcclusion" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAmbientOcclusion" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "lampFog", BENILLA_ADVGFX.lampFog,
+                                                BenillaOptionsRow_OnLoad(this, "lampFog", BENILLA_ADVGFX.lampFog,
                                                     "BENILLA_TOOLTIP_LAMP_FOG")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.fogOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.qLow, value = "1" },
                                                     { text = BENILLA_ADVGFX.qHigh, value = "2" },
@@ -3228,39 +3272,39 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (integration): the daylight lane's district window split (checkbox). -->
-                                        <Frame name="$parentRowDaylightWindowSplit" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowDaylightWindowSplit" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowLampFog" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowLampFog" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "daylightWindowSplit",
+                                                BenillaOptionsRow_OnLoad(this, "daylightWindowSplit",
                                                     BENILLA_ADVGFX.daylightWindowSplit,
                                                     "BENILLA_TOOLTIP_DAYLIGHT_WINDOW_SPLIT")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- MONKEY (skybox): the zone skybox switch (integration: appended at the page end). -->
-                                        <Frame name="$parentRowZoneSkyboxes" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowZoneSkyboxes" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowDaylightWindowSplit" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowDaylightWindowSplit" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "zoneSkyboxes",
+                                                BenillaOptionsRow_OnLoad(this, "zoneSkyboxes",
                                                     BENILLA_ADVGFX.zoneSkyboxes,
                                                     "BENILLA_TOOLTIP_ZONE_SKYBOXES")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- GFX (volumetric light): the shaft tiers, 0 Off / 1 Medium / 2 High. -->
-                                        <Frame name="$parentRowVolumetricLight" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowVolumetricLight" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowZoneSkyboxes" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowZoneSkyboxes" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "volumetricLight", BENILLA_ADVGFX.volumetricLight,
+                                                BenillaOptionsRow_OnLoad(this, "volumetricLight", BENILLA_ADVGFX.volumetricLight,
                                                     "BENILLA_TOOLTIP_VOLUMETRIC_LIGHT")
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = BENILLA_ADVGFX.fogOff, value = "0" },
                                                     { text = BENILLA_ADVGFX.qMedium, value = "1" },
                                                     { text = BENILLA_ADVGFX.qHigh, value = "2" },
@@ -3268,28 +3312,28 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- GFX (volumetric light): the shafts' brightness, 0..2 (1 = shipped). -->
-                                        <Frame name="$parentRowVolumetricLightStrength" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowVolumetricLightStrength" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowVolumetricLight" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowVolumetricLight" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "volumetricLightStrength",
+                                                BenillaOptionsRow_OnLoad(this, "volumetricLightStrength",
                                                     BENILLA_ADVGFX.volumetricLightStrength,
                                                     "BENILLA_TOOLTIP_VOLUMETRIC_LIGHT_STRENGTH")
-                                                OptionsSliderRow_Setup(self, 0, 2, 0.25)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 2, 0.25)
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- GFX (moonlight): the additive moon term, 0..2 (0 = the reference night). -->
-                                        <Frame name="$parentRowMoonLight" inherits="OptionsSliderRowTemplate">
+                                        <Frame name="$parentRowMoonLight" inherits="BenillaOptionsSliderRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowVolumetricLightStrength" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowVolumetricLightStrength" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "moonLight", BENILLA_ADVGFX.moonLight,
+                                                BenillaOptionsRow_OnLoad(this, "moonLight", BENILLA_ADVGFX.moonLight,
                                                     "BENILLA_TOOLTIP_MOONLIGHT")
-                                                OptionsSliderRow_Setup(self, 0, 2, 0.25)
+                                                BenillaOptionsSliderRow_Setup(this, 0, 2, 0.25)
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -3310,227 +3354,227 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowCombatText" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowCombatText" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "SHOW_COMBAT_TEXT",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "SHOW_COMBAT_TEXT",
                                                     "Enable Floating Combat Text", "OPTION_TOOLTIP_SHOW_COMBAT_TEXT")
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- 1.12's scroll-mode values: 1 up, 2 down, 3 arc. -->
-                                        <Frame name="$parentRowFloatMode" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowFloatMode" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowCombatText" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowCombatText" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_FLOAT_MODE",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_FLOAT_MODE",
                                                     "Combat Text Float Mode", "OPTION_TOOLTIP_COMBAT_TEXT_MODE", 1)
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = "Scroll Up", value = "1" },
                                                     { text = "Scroll Down", value = "2" },
                                                     { text = "Arc", value = "3" },
                                                 })
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowLowHealthMana" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowLowHealthMana" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFloatMode" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFloatMode" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_LOW_HEALTH_MANA",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_LOW_HEALTH_MANA",
                                                     "Show Low Mana and Health",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_LOW_HEALTH_MANA", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAuras" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAuras" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowLowHealthMana" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowLowHealthMana" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_AURAS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_AURAS",
                                                     "Show Auras", "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_AURAS", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAuraFade" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAuraFade" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAuras" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAuras" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_AURA_FADE",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_AURA_FADE",
                                                     "Show Fading Auras", "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_AURA_FADE", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowCombatState" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowCombatState" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAuraFade" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAuraFade" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_COMBAT_STATE",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_COMBAT_STATE",
                                                     "Show Combat State",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_COMBAT_STATE", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowDodgeParryMiss" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowDodgeParryMiss" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowCombatState" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowCombatState" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_DODGE_PARRY_MISS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_DODGE_PARRY_MISS",
                                                     "Show Dodge/Parries/Misses",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_DODGE_PARRY_MISS", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowResistances" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowResistances" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowDodgeParryMiss" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowDodgeParryMiss" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_RESISTANCES",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_RESISTANCES",
                                                     "Show Damage Reduction",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_RESISTANCES", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowReputation" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowReputation" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowResistances" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowResistances" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_REPUTATION",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_REPUTATION",
                                                     "Show Reputation",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_REPUTATION", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowReactives" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowReactives" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowReputation" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowReputation" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_REACTIVES",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_REACTIVES",
                                                     "Show Reactive Spells and Abilities",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_REACTIVES", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFriendlyNames" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowFriendlyNames" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowReactives" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowReactives" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_FRIENDLY_NAMES",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_FRIENDLY_NAMES",
                                                     "Show Friendly Healer Names",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_FRIENDLY_NAMES", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Greyed for all but rogues and druids, as in 1.12. -->
-                                        <Frame name="$parentRowComboPoints" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowComboPoints" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFriendlyNames" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFriendlyNames" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_COMBO_POINTS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_COMBO_POINTS",
                                                     "Show Combo Points",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_COMBO_POINTS", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowEnergyGains" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnergyGains" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowComboPoints" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowComboPoints" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_MANA",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_MANA",
                                                     "Show Energy Gains",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_MANA", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowHonorGained" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowHonorGained" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnergyGains" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnergyGains" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "COMBAT_TEXT_SHOW_HONOR_GAINED",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "COMBAT_TEXT_SHOW_HONOR_GAINED",
                                                     "Show Honor Gained",
                                                     "OPTION_TOOLTIP_COMBAT_TEXT_SHOW_HONOR_GAINED", 1)
-                                                self.parentRow = "RowCombatText"
-                                                self.applyFunc = "CombatText_UpdateOrLoad"
+                                                this.parentRow = "RowCombatText"
+                                                this.applyFunc = "BenillaCombatText_UpdateOrLoad"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- CombatDamage masters what floats over a unit, apart
                                              from SHOW_COMBAT_TEXT; at "0" neither `0x607140` nor
                                              `0x6128b0` floats anything. -->
-                                        <Frame name="$parentRowShowDamage" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowShowDamage" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowHonorGained" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowHonorGained" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "CombatDamage", "Show Target Damage",
+                                                BenillaOptionsRow_OnLoad(this, "CombatDamage", "Show Target Damage",
                                                     "OPTION_TOOLTIP_SHOW_DAMAGE")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Off drops the SMSG_PERIODICAURALOG body
                                              (`0x626dee`). -->
-                                        <Frame name="$parentRowPeriodicDamage" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowPeriodicDamage" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShowDamage" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShowDamage" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "CombatLogPeriodicSpells", "Periodic Damage",
+                                                BenillaOptionsRow_OnLoad(this, "CombatLogPeriodicSpells", "Periodic Damage",
                                                     "OPTION_TOOLTIP_LOG_PERIODIC_EFFECTS", 1)
-                                                self.parentRow = "RowShowDamage"
+                                                this.parentRow = "RowShowDamage"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Also writes PetSpellDamage (l.334-336). -->
-                                        <Frame name="$parentRowPetDamage" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowPetDamage" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowPeriodicDamage" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowPeriodicDamage" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "PetMeleeDamage", "Pet Damage",
+                                                BenillaOptionsRow_OnLoad(this, "PetMeleeDamage", "Pet Damage",
                                                     "OPTION_TOOLTIP_SHOW_PET_MELEE_DAMAGE", 1)
-                                                self.parentRow = "RowShowDamage"
-                                                self.partner = { cvar = "PetSpellDamage" }
+                                                this.parentRow = "RowShowDamage"
+                                                this.partner = { cvar = "PetSpellDamage" }
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -3544,13 +3588,13 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowMultiBar1" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowMultiBar1" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self,
+                                                BenillaOptionsFuncRow_OnLoad(this,
                                                     function() return SHOW_MULTI_ACTIONBAR_1 end,
                                                     function(value)
                                                         local on
@@ -3564,13 +3608,13 @@
                                                     "0", "Show Bottom Left ActionBar", "OPTION_TOOLTIP_SHOW_MULTIBAR1")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMultiBar2" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowMultiBar2" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMultiBar1" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMultiBar1" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self,
+                                                BenillaOptionsFuncRow_OnLoad(this,
                                                     function() return SHOW_MULTI_ACTIONBAR_2 end,
                                                     function(value)
                                                         local on
@@ -3584,13 +3628,13 @@
                                                     "0", "Show Bottom Right ActionBar", "OPTION_TOOLTIP_SHOW_MULTIBAR2")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowMultiBar3" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowMultiBar3" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMultiBar2" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMultiBar2" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self,
+                                                BenillaOptionsFuncRow_OnLoad(this,
                                                     function() return SHOW_MULTI_ACTIONBAR_3 end,
                                                     function(value)
                                                         local on
@@ -3605,13 +3649,13 @@
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Needs Right ActionBar (UIOptionsFrame.lua:722-726). -->
-                                        <Frame name="$parentRowMultiBar4" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowMultiBar4" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMultiBar3" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMultiBar3" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self,
+                                                BenillaOptionsFuncRow_OnLoad(this,
                                                     function() return SHOW_MULTI_ACTIONBAR_4 end,
                                                     function(value)
                                                         local on
@@ -3625,25 +3669,25 @@
                                                     "0", "Show Right ActionBar 2", "OPTION_TOOLTIP_SHOW_MULTIBAR4", 1)
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAlwaysShowMultibars" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAlwaysShowMultibars" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowMultiBar4" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowMultiBar4" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "ALWAYS_SHOW_MULTIBARS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "ALWAYS_SHOW_MULTIBARS",
                                                     "Always Show ActionBars", "OPTION_TOOLTIP_ALWAYS_SHOW_MULTIBARS")
                                                 -- UIOptionsFrame.xml:680-683's click arm.
-                                                self.applyFunc = "MultiActionBar_UpdateGridVisibility"
+                                                this.applyFunc = "MultiActionBar_UpdateGridVisibility"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowLockActionBar" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowLockActionBar" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAlwaysShowMultibars" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAlwaysShowMultibars" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "LOCK_ACTIONBAR",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "LOCK_ACTIONBAR",
                                                     "Lock ActionBars", "OPTION_TOOLTIP_LOCK_ACTIONBAR")
                                             </OnLoad></Scripts>
                                         </Frame>
@@ -3658,153 +3702,153 @@
                                     </Anchors>
                                     <Frames>
                                         <!-- cvarEvent wakes TextStatusBar's CVAR_UPDATE. -->
-                                        <Frame name="$parentRowEnhancedTooltips" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnhancedTooltips" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "UberTooltips", "Enhanced Tooltips",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "UberTooltips", "Enhanced Tooltips",
                                                 "OPTION_TOOLTIP_USE_UBERTOOLTIPS")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowStatusText" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowStatusText" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnhancedTooltips" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnhancedTooltips" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "statusBarText",
+                                                BenillaOptionsRow_OnLoad(this, "statusBarText",
                                                     "Status Bar Text", "OPTION_TOOLTIP_STATUS_BAR")
-                                                self.cvarEvent = "STATUS_BAR_TEXT"
+                                                this.cvarEvent = "STATUS_BAR_TEXT"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Saved globals in 1.12; the mode greys with its switch
                                              (UIOptionsFrame.lua:697-701). -->
-                                        <Frame name="$parentRowTargetOfTarget" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowTargetOfTarget" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowStatusText" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowStatusText" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "SHOW_TARGET_OF_TARGET",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "SHOW_TARGET_OF_TARGET",
                                                     "Show Target of Target", "OPTION_TOOLTIP_SHOW_TARGET_OF_TARGET")
-                                                self.applyFunc = "TargetofTarget_Update"
+                                                this.applyFunc = "TargetofTarget_Update"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- The label is ours, since 1.12 never sets this
                                              dropdown's; entries are its strings in its order. -->
-                                        <Frame name="$parentRowTargetOfTargetMode" inherits="OptionsDropdownRowTemplate">
+                                        <Frame name="$parentRowTargetOfTargetMode" inherits="BenillaOptionsDropdownRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowTargetOfTarget" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowTargetOfTarget" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "SHOW_TARGET_OF_TARGET_STATE",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "SHOW_TARGET_OF_TARGET_STATE",
                                                     "Show When", "OPTION_TOOLTIP_TARGETOFTARGET5", 1)
-                                                OptionsDropdownRow_Setup(self, {
+                                                BenillaOptionsDropdownRow_Setup(this, {
                                                     { text = "Raid", value = "1", tip = "OPTION_TOOLTIP_TARGETOFTARGET1" },
                                                     { text = "Party", value = "2", tip = "OPTION_TOOLTIP_TARGETOFTARGET2" },
                                                     { text = "Solo", value = "3", tip = "OPTION_TOOLTIP_TARGETOFTARGET3" },
                                                     { text = "Party or Raid", value = "4", tip = "OPTION_TOOLTIP_TARGETOFTARGET4" },
                                                     { text = "Always", value = "5", tip = "OPTION_TOOLTIP_TARGETOFTARGET5" },
                                                 })
-                                                self.applyFunc = "TargetofTarget_Update"
+                                                this.applyFunc = "TargetofTarget_Update"
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- PLAYER_FLAGS bits, API rows
                                              (UIOptionsFrame.lua:18-19). -->
-                                        <Frame name="$parentRowShowCloak" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowShowCloak" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowTargetOfTargetMode" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowTargetOfTargetMode" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self, ShowingCloak, ShowCloak, "1",
+                                                BenillaOptionsFuncRow_OnLoad(this, ShowingCloak, ShowCloak, "1",
                                                     "Show Cloak", "OPTION_TOOLTIP_SHOW_CLOAK")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowShowHelm" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowShowHelm" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShowCloak" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShowCloak" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self, ShowingHelm, ShowHelm, "1",
+                                                BenillaOptionsFuncRow_OnLoad(this, ShowingHelm, ShowHelm, "1",
                                                     "Show Helm", "OPTION_TOOLTIP_SHOW_HELM")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowInstantQuestText" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowInstantQuestText" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShowHelm" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShowHelm" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "QUEST_FADING_DISABLE",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "QUEST_FADING_DISABLE",
                                                     "Instant Quest Text", "OPTION_TOOLTIP_SHOW_QUEST_FADING")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Its applyFunc re-states the buff bar's row pitch. -->
-                                        <Frame name="$parentRowBuffDurations" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowBuffDurations" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowInstantQuestText" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowInstantQuestText" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "SHOW_BUFF_DURATIONS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "SHOW_BUFF_DURATIONS",
                                                     "Buff Durations", "OPTION_TOOLTIP_SHOW_BUFF_DURATION")
-                                                self.applyFunc = "BuffButtons_UpdatePositions"
+                                                this.applyFunc = "BuffButtons_UpdatePositions"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowAutoQuestWatch" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowAutoQuestWatch" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowBuffDurations" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowBuffDurations" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "AUTO_QUEST_WATCH",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "AUTO_QUEST_WATCH",
                                                     "Automatic Quest Tracking", "OPTION_TOOLTIP_AUTO_QUEST_WATCH")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- The CVar gates in the shared masker (`0x4a1a66`). -->
-                                        <Frame name="$parentRowProfanityFilter" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowProfanityFilter" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowAutoQuestWatch" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowAutoQuestWatch" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "profanityFilter", "Profanity Filter",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "profanityFilter", "Profanity Filter",
                                                 "OPTION_TOOLTIP_PROFANITY_FILTER")</OnLoad></Scripts>
                                         </Frame>
                                         <!-- No Reset Tutorials button: ticking this row resets
                                              them. -->
-                                        <Frame name="$parentRowShowTutorials" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowShowTutorials" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowProfanityFilter" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowProfanityFilter" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <!-- Default "1" (UIOptionsFrame.lua:645-646). -->
                                             <Scripts><OnLoad>
-                                                OptionsFuncRow_OnLoad(self, TutorialsEnabled,
+                                                BenillaOptionsFuncRow_OnLoad(this, TutorialsEnabled,
                                                     BenillaOptionsFrame_SetTutorialsEnabled, "1",
                                                     "Show Tutorials", "OPTION_TOOLTIP_SHOW_TUTORIALS")
                                             </OnLoad></Scripts>
                                         </Frame>
                                         <!-- Label and tooltip name the tips differently; both are
                                              1.12's. -->
-                                        <Frame name="$parentRowTipOfTheDay" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowTipOfTheDay" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowShowTutorials" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowShowTutorials" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "showGameTips",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "showGameTips",
                                                 "Show Loading Screen Tips",
                                                 "OPTION_TOOLTIP_SHOW_TIPOFTHEDAY")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowNewbieTips" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowNewbieTips" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowTipOfTheDay" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowTipOfTheDay" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsGlobalRow_OnLoad(self, "SHOW_NEWBIE_TIPS",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "SHOW_NEWBIE_TIPS",
                                                     "Show Detailed Tooltips", "OPTION_TOOLTIP_SHOW_NEWBIE_TIPS")
                                             </OnLoad></Scripts>
                                         </Frame>
@@ -3818,19 +3862,19 @@
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowGuildMemberAlert" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowGuildMemberAlert" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
                                                 <!-- 1.12 registers it "0". -->
-                                                OptionsRow_OnLoad(self, "guildMemberNotify",
+                                                BenillaOptionsRow_OnLoad(this, "guildMemberNotify",
                                                     "Guild Member Alert",
                                                     "OPTION_TOOLTIP_GUILDMEMBER_ALERT")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowRemoveChatDelay" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowRemoveChatDelay" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowGuildMemberAlert" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowGuildMemberAlert" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
@@ -3838,41 +3882,41 @@
                                             <Scripts><OnLoad>
                                                 <!-- A uvar, as 1.12's CheckButton18; its applyFunc
                                                      moves ChatFrame.xml's fade constants. -->
-                                                OptionsGlobalRow_OnLoad(self, "REMOVE_CHAT_DELAY",
+                                                BenillaOptionsGlobalRow_OnLoad(this, "REMOVE_CHAT_DELAY",
                                                     "Remove Chat Hover Delay",
                                                     "OPTION_TOOLTIP_REMOVE_CHAT_DELAY")
-                                                self.applyFunc = "ChatFrame_ApplyMouseOverDelay"
+                                                this.applyFunc = "BenillaChatFrame_ApplyMouseOverDelay"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowChatBubbles" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowChatBubbles" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowRemoveChatDelay" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowRemoveChatDelay" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "ChatBubbles",
+                                                BenillaOptionsRow_OnLoad(this, "ChatBubbles",
                                                     "Show Chat Bubbles", "OPTION_TOOLTIP_CHAT_BUBBLES")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowLootSpam" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowLootSpam" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowChatBubbles" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowChatBubbles" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
                                                 <!-- Group loot-roll lines only. -->
-                                                OptionsRow_OnLoad(self, "showLootSpam",
+                                                BenillaOptionsRow_OnLoad(this, "showLootSpam",
                                                     "Detailed Loot Information",
                                                     "OPTION_TOOLTIP_SHOW_LOOT_SPAM")
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowPartyChatBubbles" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowPartyChatBubbles" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowLootSpam" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowLootSpam" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "ChatBubblesParty",
+                                                BenillaOptionsRow_OnLoad(this, "ChatBubblesParty",
                                                     "Show Party Chat Bubbles", "OPTION_TOOLTIP_PARTY_CHAT_BUBBLES")
                                             </OnLoad></Scripts>
                                         </Frame>
@@ -3880,78 +3924,78 @@
                                              and writes it (l.337). The filter drops a
                                              SpamMessages.dbc match in every chat type but
                                              CHAT_MSG_FILTERED (`0x49aad2`). -->
-                                        <Frame name="$parentRowSpamFilter" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowSpamFilter" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowPartyChatBubbles" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowPartyChatBubbles" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "spamFilter", "Disable Spam Filter",
+                                                BenillaOptionsRow_OnLoad(this, "spamFilter", "Disable Spam Filter",
                                                     "OPTION_TOOLTIP_DISABLE_SPAM_FILTER")
-                                                self.invert = 1
+                                                this.invert = 1
                                             </OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
                                 </Frame>
-                                <!-- The Nameplates page: the V-key plates (`[0xc4da34]` bits 0 and
-                                     3), then 1.12's UnitName* checkboxes. The plate rows are era
-                                     rows: 1.12 has only the keybinding. -->
+                                <!-- The Nameplates page: the V-key plates, then 1.12's UnitName*
+                                     checkboxes. The plate rows are era rows: 1.12 has only the
+                                     keybindings. -->
                                 <Frame name="$parentNameplates" hidden="true">
                                     <Anchors>
                                         <Anchor point="TOPLEFT"/>
                                         <Anchor point="BOTTOMRIGHT"/>
                                     </Anchors>
                                     <Frames>
-                                        <Frame name="$parentRowEnemyPlates" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowEnemyPlates" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-12"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-20" y="-12"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "nameplateShowEnemies",
-                                                "Enemy Name Plates")</OnLoad></Scripts>
+                                            <Scripts><OnLoad>BenillaOptionsFuncRow_OnLoad(this, BenillaOptionsFrame_GetEnemyPlates,
+                                                BenillaOptionsFrame_SetEnemyPlates, "0", "Enemy Name Plates")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowFriendlyPlates" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowFriendlyPlates" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowEnemyPlates" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowEnemyPlates" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "nameplateShowFriends",
-                                                "Friendly Name Plates")</OnLoad></Scripts>
+                                            <Scripts><OnLoad>BenillaOptionsFuncRow_OnLoad(this, BenillaOptionsFrame_GetFriendlyPlates,
+                                                BenillaOptionsFrame_SetFriendlyPlates, "0", "Friendly Name Plates")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowPlayerNames" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowPlayerNames" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowFriendlyPlates" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowFriendlyPlates" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "UnitNamePlayer", "Player Names",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "UnitNamePlayer", "Player Names",
                                                 "OPTION_TOOLTIP_SHOW_PLAYER_NAMES")</OnLoad></Scripts>
                                         </Frame>
                                         <!-- A child of Player Names, as CheckButton22 of 21. -->
-                                        <Frame name="$parentRowGuildNames" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowGuildNames" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowPlayerNames" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowPlayerNames" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
                                             <Scripts><OnLoad>
-                                                OptionsRow_OnLoad(self, "UnitNamePlayerGuild", "Player Guild Names",
+                                                BenillaOptionsRow_OnLoad(this, "UnitNamePlayerGuild", "Player Guild Names",
                                                     "OPTION_TOOLTIP_SHOW_GUILD_NAMES", 1)
-                                                self.parentRow = "RowPlayerNames"
+                                                this.parentRow = "RowPlayerNames"
                                             </OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowNpcNames" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowNpcNames" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowGuildNames" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowGuildNames" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "UnitNameNPC", "NPC Names",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "UnitNameNPC", "NPC Names",
                                                 "OPTION_TOOLTIP_SHOW_NPC_NAMES")</OnLoad></Scripts>
                                         </Frame>
-                                        <Frame name="$parentRowOwnName" inherits="OptionsCheckboxRowTemplate">
+                                        <Frame name="$parentRowOwnName" inherits="BenillaOptionsCheckboxRowTemplate">
                                             <Anchors>
                                                 <Anchor point="TOPLEFT" relativeTo="$parentRowNpcNames" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                                 <Anchor point="TOPRIGHT" relativeTo="$parentRowNpcNames" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="0" y="-9"/></Offset></Anchor>
                                             </Anchors>
-                                            <Scripts><OnLoad>OptionsRow_OnLoad(self, "UnitNameOwn", "Show Own Name",
+                                            <Scripts><OnLoad>BenillaOptionsRow_OnLoad(this, "UnitNameOwn", "Show Own Name",
                                                 "OPTION_TOOLTIP_SHOW_OWN_NAME")</OnLoad></Scripts>
                                         </Frame>
                                     </Frames>
@@ -3997,10 +4041,10 @@
                                                     <CheckedTexture file="Interface\Buttons\UI-CheckBox-Check"/>
                                                     <DisabledCheckedTexture file="Interface\Buttons\UI-CheckBox-Check-Disabled"/>
                                                     <Scripts>
-                                                        <OnClick>KeyBindings_CharacterToggle(this)</OnClick>
+                                                        <OnClick>BenillaKeyBindings_CharacterToggle(this)</OnClick>
                                                         <OnEnter>
                                                             GameTooltip:SetOwner(this, "ANCHOR_RIGHT")
-                                                            GameTooltip:SetText(KeyBindings_String("CHARACTER_SPECIFIC_KEYBINDING_TOOLTIP",
+                                                            GameTooltip:SetText(BenillaKeyBindings_String("CHARACTER_SPECIFIC_KEYBINDING_TOOLTIP",
                                                                 "Click this to toggle between general key bindings and key bindings specific to this character."), nil, nil, nil, nil, 1)
                                                         </OnEnter>
                                                         <OnLeave>GameTooltip:Hide()</OnLeave>
@@ -4010,119 +4054,119 @@
                                             <Scripts>
                                                 <OnLoad>
                                                     getglobal(this:GetName() .. "Label"):SetText(
-                                                        KeyBindings_String("CHARACTER_SPECIFIC_KEYBINDINGS", "Character Specific Key Bindings"))
+                                                        BenillaKeyBindings_String("CHARACTER_SPECIFIC_KEYBINDINGS", "Character Specific Key Bindings"))
                                                 </OnLoad>
                                             </Scripts>
                                         </Frame>
-                                <Frame name="$parentRow1" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow1" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT"><Offset><AbsDimension x="10" y="-47"/></Offset></Anchor>
                                         <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-32" y="-47"/></Offset></Anchor>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow2" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow2" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow1" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow1" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow3" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow3" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow2" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow2" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow4" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow4" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow3" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow3" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow5" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow5" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow4" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow4" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow6" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow6" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow5" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow5" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow7" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow7" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow6" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow6" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow8" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow8" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow7" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow7" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow9" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow9" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow8" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow8" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow10" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow10" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow9" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow9" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow11" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow11" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow10" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow10" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow12" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow12" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow11" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow11" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow13" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow13" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow12" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow12" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow14" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow14" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow13" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow13" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow15" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow15" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow14" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow14" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow16" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow16" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow15" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow15" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow17" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow17" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow16" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow16" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow18" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow18" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow17" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow17" relativePoint="BOTTOMRIGHT"/>
                                     </Anchors>
                                 </Frame>
-                                <Frame name="$parentRow19" inherits="KeyBindingRowTemplate">
+                                <Frame name="$parentRow19" inherits="BenillaKeyBindingRowTemplate">
                                     <Anchors>
                                         <Anchor point="TOPLEFT" relativeTo="$parentRow18" relativePoint="BOTTOMLEFT"/>
                                         <Anchor point="TOPRIGHT" relativeTo="$parentRow18" relativePoint="BOTTOMRIGHT"/>
@@ -4140,100 +4184,106 @@
                                             </Anchors>
                                             <Scripts>
                                                 <OnLoad>ScrollFrame_OnLoad()</OnLoad>
-                                                <!-- KEYBINDINGS_ROW_HEIGHT must stay a global: this
+                                                <!-- BENILLA_KEYBINDINGS_ROW_HEIGHT must stay a global: this
                                                      chunk cannot see another file's local. -->
-                                                <OnVerticalScroll>FauxScrollFrame_OnVerticalScroll(KEYBINDINGS_ROW_HEIGHT, KeyBindingsPage_Update)</OnVerticalScroll>
+                                                <OnVerticalScroll>FauxScrollFrame_OnVerticalScroll(BENILLA_KEYBINDINGS_ROW_HEIGHT, BenillaKeyBindingsPage_Update)</OnVerticalScroll>
                                                 <!-- Fires before the page's guard, so it is
                                                      replaced: an armed capsule binds the wheel. -->
                                                 <OnMouseWheel>
-                                                    if not KeyBindingsPage.selected then
+                                                    if BenillaKeyBindingsPage.selected then
+                                                        BenillaKeyBindings_OnMouseWheel(arg1)
+                                                    else
                                                         ScrollFrameTemplate_OnMouseWheel(arg1)
                                                     end
                                                 </OnMouseWheel>
                                             </Scripts>
                                         </ScrollFrame>
                                     </Frames>
-                                    <!-- Rows and the bar bubble the wheel here. -->
+                                    <!-- Rows and the bar bubble the wheel here; the rows' own
+                                         clicks too, so mouse 3-5 bind over the page. -->
                                     <Scripts>
                                         <OnMouseWheel>
-                                            if not KeyBindingsPage.selected then
+                                            if BenillaKeyBindingsPage.selected then
+                                                BenillaKeyBindings_OnMouseWheel(arg1)
+                                            else
                                                 BenillaFauxScrollFrame_OnMouseWheel(getglobal(this:GetName() .. "ScrollFrame"), arg1)
                                             end
                                         </OnMouseWheel>
+                                        <OnMouseUp>BenillaKeyBindings_OnKeyDown(arg1)</OnMouseUp>
                                     </Scripts>
                                 </Frame>
-                                <!-- One per OPTIONS_PAGE_ROWS page. -->
-                                <Button name="$parentSearchHeadControls" inherits="OptionsSearchHeadTemplate">
+                                <!-- One per BENILLA_OPTIONS_PAGE_ROWS page. -->
+                                <Button name="$parentSearchHeadControls" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Controls"
-                                        getglobal(self:GetName() .. "Label"):SetText("Controls")
+                                        this.categoryKey = "Controls"
+                                        getglobal(this:GetName() .. "Label"):SetText("Controls")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadAudio" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadAudio" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Audio"
-                                        getglobal(self:GetName() .. "Label"):SetText("Audio")
+                                        this.categoryKey = "Audio"
+                                        getglobal(this:GetName() .. "Label"):SetText("Audio")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadGraphics" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadGraphics" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Graphics"
-                                        getglobal(self:GetName() .. "Label"):SetText("Graphics")
+                                        this.categoryKey = "Graphics"
+                                        getglobal(this:GetName() .. "Label"):SetText("Graphics")
                                     </OnLoad></Scripts>
                                 </Button>
                                 <!-- MONKEY (advanced graphics): its own head, like every page with
                                      rows. The label is the page's own bilingual title. -->
-                                <Button name="$parentSearchHeadAdvancedGraphics" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadAdvancedGraphics" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "AdvancedGraphics"
-                                        getglobal(self:GetName() .. "Label"):SetText(BENILLA_ADVGFX.page)
+                                        this.categoryKey = "AdvancedGraphics"
+                                        getglobal(this:GetName() .. "Label"):SetText(BENILLA_ADVGFX.page)
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadCombat" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadCombat" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Combat"
-                                        getglobal(self:GetName() .. "Label"):SetText("Combat")
+                                        this.categoryKey = "Combat"
+                                        getglobal(this:GetName() .. "Label"):SetText("Combat")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadActionBars" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadActionBars" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "ActionBars"
-                                        getglobal(self:GetName() .. "Label"):SetText("Action Bars")
+                                        this.categoryKey = "ActionBars"
+                                        getglobal(this:GetName() .. "Label"):SetText("Action Bars")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadInterface" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadInterface" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Interface"
-                                        getglobal(self:GetName() .. "Label"):SetText("Interface")
+                                        this.categoryKey = "Interface"
+                                        getglobal(this:GetName() .. "Label"):SetText("Interface")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadChat" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadChat" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Chat"
-                                        getglobal(self:GetName() .. "Label"):SetText("Chat")
+                                        this.categoryKey = "Chat"
+                                        getglobal(this:GetName() .. "Label"):SetText("Chat")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadNameplates" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadNameplates" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Nameplates"
-                                        getglobal(self:GetName() .. "Label"):SetText("Nameplates")
+                                        this.categoryKey = "Nameplates"
+                                        getglobal(this:GetName() .. "Label"):SetText("Nameplates")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <Button name="$parentSearchHeadKeybindings" inherits="OptionsSearchHeadTemplate">
+                                <Button name="$parentSearchHeadKeybindings" inherits="BenillaOptionsSearchHeadTemplate">
                                     <Scripts><OnLoad>
-                                        self.categoryKey = "Keybindings"
-                                        getglobal(self:GetName() .. "Label"):SetText("Keybindings")
+                                        this.categoryKey = "Keybindings"
+                                        getglobal(this:GetName() .. "Label"):SetText("Keybindings")
                                     </OnLoad></Scripts>
                                 </Button>
-                                <!-- KEYBINDINGS_SEARCH_ROWS (8) frames. -->
-                                <Frame name="$parentKeybindSearch1" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch2" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch3" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch4" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch5" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch6" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch7" inherits="KeyBindingRowTemplate" hidden="true"/>
-                                <Frame name="$parentKeybindSearch8" inherits="KeyBindingRowTemplate" hidden="true"/>
+                                <!-- BENILLA_KEYBINDINGS_SEARCH_ROWS (8) frames. -->
+                                <Frame name="$parentKeybindSearch1" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch2" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch3" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch4" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch5" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch6" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch7" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
+                                <Frame name="$parentKeybindSearch8" inherits="BenillaKeyBindingRowTemplate" hidden="true"/>
                             </Frames>
                             </Frame>
                             <!-- Inset 21/20 so the trough, which hangs 21 above and 20 below the
@@ -4243,7 +4293,7 @@
                                     <Anchor point="TOPRIGHT"><Offset><AbsDimension x="-10" y="-21"/></Offset></Anchor>
                                     <Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-10" y="20"/></Offset></Anchor>
                                 </Anchors>
-                                <Scripts><OnValueChanged>BenillaScrollBar_OnValueChanged(self, arg1)</OnValueChanged></Scripts>
+                                <Scripts><OnValueChanged>BenillaScrollBar_OnValueChanged(this, arg1)</OnValueChanged></Scripts>
                             </Slider>
                         </Frames>
                     </ScrollFrame>
@@ -4322,7 +4372,7 @@
                             BenillaOptionsFrameSearchBoxInstructions:Hide()
                             BenillaOptionsFrameSearchBoxClearButton:Show()
                         end
-                        OptionsSearch_OnTextChanged(this:GetText())
+                        BenillaOptionsSearch_OnTextChanged(this:GetText())
                     </OnTextChanged>
                     <OnEscapePressed>this:ClearFocus()</OnEscapePressed>
                 </Scripts>
@@ -4330,7 +4380,7 @@
             </EditBox>
 
             <!-- ── Close: no corner X; the red button and ESC close the window ── -->
-            <Button name="$parentCloseButton" inherits="OptionsRedButtonTemplate" text="Close">
+            <Button name="$parentCloseButton" inherits="BenillaOptionsRedButtonTemplate" text="Close">
                 <Anchors><Anchor point="BOTTOMRIGHT"><Offset><AbsDimension x="-16" y="16"/></Offset></Anchor></Anchors>
                 <Scripts>
                     <OnClick>
@@ -4340,11 +4390,11 @@
                 </Scripts>
             </Button>
             <!-- The era Apply, shown with a pending edit. -->
-            <Button name="$parentApplyButton" inherits="OptionsRedButtonTemplate" text="Apply" hidden="true">
+            <Button name="$parentApplyButton" inherits="BenillaOptionsRedButtonTemplate" text="Apply" hidden="true">
                 <Anchors><Anchor point="RIGHT" relativeTo="$parentCloseButton" relativePoint="LEFT"><Offset><AbsDimension x="-2" y="0"/></Offset></Anchor></Anchors>
                 <Scripts>
-                    <OnLoad>self:Disable()</OnLoad>
-                    <OnClick>OptionsPage_Apply()</OnClick>
+                    <OnLoad>this:Disable()</OnLoad>
+                    <OnClick>BenillaOptionsPage_Apply()</OnClick>
                 </Scripts>
             </Button>
         </Frames>
@@ -4355,13 +4405,22 @@
                 BenillaOptionsFrame_SelectCategory(this.selectedCategory or "Controls")
                 if UpdateMicroButtons then UpdateMicroButtons() end
             </OnShow>
-            <!-- Hiding ends a search, discards pending edits, and disarms a bind capture, which
-                 would otherwise swallow all input. -->
+            <!-- The Keybindings capture, 1.12's KeyBindingFrame OnClick and OnKeyDown
+                 (Blizzard_BindingUI.xml:538-543) and its list's wheel (:377-387): keyboard and
+                 wheel stay off until a capsule is selected (BenillaKeyBindings_SetSelected). -->
+            <OnLoad>
+                this:EnableKeyboard(false)
+                this:EnableMouseWheel(false)
+            </OnLoad>
+            <OnKeyDown>BenillaKeyBindings_OnKeyDown()</OnKeyDown>
+            <OnMouseUp>BenillaKeyBindings_OnKeyDown(arg1)</OnMouseUp>
+            <OnMouseWheel>BenillaKeyBindings_OnMouseWheel(arg1)</OnMouseWheel>
+            <!-- Hiding ends a search, discards pending edits, and disarms a bind capture. -->
             <OnHide>
                 BenillaOptionsFrameSearchBox:SetText("")
-                OptionsPage_DiscardPending()
-                KeyBindings_SetSelected(nil)
-                KeyBindings_Output("")
+                BenillaOptionsPage_DiscardPending()
+                BenillaKeyBindings_SetSelected(nil)
+                BenillaKeyBindings_Output("")
                 if UpdateMicroButtons then UpdateMicroButtons() end
             </OnHide>
         </Scripts>
diff --git a/crates/benilla-app/assets/ui/ScriptLogFrame.xml b/crates/benilla-app/assets/ui/ScriptLogFrame.xml
index 375c1dcc..9a2abc30 100644
--- a/crates/benilla-app/assets/ui/ScriptLogFrame.xml
+++ b/crates/benilla-app/assets/ui/ScriptLogFrame.xml
@@ -1,16 +1,20 @@
 <Ui>
     <!--
-        The script error log, which 1.12 does not have, so every name carries the `Benilla` prefix
-        (`tests::reference_surface`); the stock `ScriptErrors` dialog shows one message, this keeps
-        the log. Shaped like the reference's CraftFrame. It polls the engine:
-        `BenillaGetNumScriptErrors()` is (retained, total-ever), `BenillaGetScriptErrorInfo(i)` is
-        `seq, kind, message, count` (1-based, oldest first, nil past the end).
+        The script error log, which 1.12 does not have, so every name carries the `Benilla` prefix;
+        the stock `ScriptErrors` dialog shows one message, this keeps the log. Laid out on the
+        ClassTrainer panel art as the class trainer lays itself out (Blizzard_TrainerUI.xml:214-356
+        and :481-513, Blizzard_TrainerUI.lua:469-474): its rows, its list, its detail under the
+        list and its two buttons in the art's sockets. It collects as a 1.12 error-log addon does:
+        it wraps the handler `geterrorhandler` holds, the stock `_ERRORMESSAGE`
+        (BasicControls.xml:16), which still runs after it. An addon that later calls
+        `seterrorhandler` replaces the chain, as in 1.12.
     -->
     <Script><![CDATA[
         -- A pushable above every stock panel's, so a game window opening pushes the log aside.
         UIPanelWindows["BenillaScriptLogFrame"] = { area = "left", pushable = 9, whileDead = 1 }
 
-        BENILLA_SCRIPTLOG_ROWS = 13
+        -- The class trainer's rows (`CLASS_TRAINER_SKILLS_DISPLAYED`, Blizzard_TrainerUI.lua:470).
+        BENILLA_SCRIPTLOG_ROWS = 11
         BENILLA_SCRIPTLOG_ROW_HEIGHT = 16
         -- A wrapped row would break the faux kit's fixed rows.
         BENILLA_SCRIPTLOG_ROW_CHARS = 52
@@ -18,6 +22,39 @@
         -- A `seq`, not an index: indices shift when the cap evicts.
         BenillaScriptLogSelected = nil
 
+        -- Distinct messages kept before the oldest is evicted.
+        BENILLA_SCRIPTLOG_CAP = 256
+        -- Rows oldest first, each { seq, message, count }; `total` is the last `seq` handed out,
+        -- kept apart from the row count so an eviction or a clear never renumbers.
+        BenillaScriptLog = { rows = {}, total = 0 }
+
+        -- A repeat bumps its row's count and keeps its place.
+        function BenillaScriptLog_Record(message)
+            if type(message) ~= "string" then message = tostring(message) end
+            local log = BenillaScriptLog
+            local found = nil
+            for i = 1, table.getn(log.rows) do
+                if log.rows[i].message == message then found = log.rows[i] end
+            end
+            if found then
+                found.count = found.count + 1
+            else
+                log.total = log.total + 1
+                if table.getn(log.rows) >= BENILLA_SCRIPTLOG_CAP then table.remove(log.rows, 1) end
+                table.insert(log.rows, { seq = log.total, message = message, count = 1 })
+            end
+            if BenillaScriptLogFrame and BenillaScriptLogFrame:IsVisible() then
+                BenillaScriptLog_Update()
+            end
+        end
+
+        -- The chain: the log first, guarded so a fault in it cannot stop the stock handler.
+        local benillaStockErrorHandler = geterrorhandler()
+        seterrorhandler(function(message)
+            pcall(BenillaScriptLog_Record, message)
+            return benillaStockErrorHandler(message)
+        end)
+
         -- `strsub` counts bytes, so the cut backs up over UTF-8 continuation bytes (0x80..0xBF).
         function BenillaScriptLog_RowText(message)
             local cut = strfind(message, "\n", 1, 1)
@@ -35,18 +72,10 @@
             return head
         end
 
-        -- `load` red (the addon is not running), `error` amber (code raised), `warn` grey (a call
-        -- was accepted and quietly did nothing).
-        function BenillaScriptLog_RowColor(kind)
-            if kind == "load" then return 1.0, 0.3, 0.3 end
-            if kind == "warn" then return 0.65, 0.65, 0.65 end
-            return 1.0, 0.82, 0.0
-        end
-
         function BenillaScriptLog_Update()
-            local shown, total = BenillaGetNumScriptErrors()
+            local shown = table.getn(BenillaScriptLog.rows)
+            local total = BenillaScriptLog.total
 
-            -- "Problems", because two of the three kinds are not errors.
             local summary
             if total == 0 then
                 summary = "No problems this session."
@@ -68,18 +97,17 @@
             for i = 1, BENILLA_SCRIPTLOG_ROWS do
                 local button = getglobal("BenillaScriptLogRow" .. i)
                 local index = offset + i
-                local seq, kind, message, count = BenillaGetScriptErrorInfo(index)
-                if seq then
-                    button.seq = seq
-                    button.message = message
+                local row = BenillaScriptLog.rows[index]
+                if row then
+                    button.seq = row.seq
+                    button.message = row.message
                     -- `#12 x1113`: one deduplicated failure that happened 1,113 times.
-                    local label = "#" .. seq
-                    if count > 1 then label = label .. " x" .. count end
+                    local label = "#" .. row.seq
+                    if row.count > 1 then label = label .. " x" .. row.count end
                     button.index:SetText(label)
-                    button.label:SetText(BenillaScriptLog_RowText(message))
-                    button.label:SetTextColor(BenillaScriptLog_RowColor(kind))
+                    button.label:SetText(BenillaScriptLog_RowText(row.message))
                     button:Show()
-                    if seq == BenillaScriptLogSelected then selectedRow = button end
+                    if row.seq == BenillaScriptLogSelected then selectedRow = button end
                 else
                     button.seq = nil
                     button.message = nil
@@ -99,15 +127,16 @@
             BenillaScriptLog_UpdateDetail()
         end
 
-        -- The selected message in full, traceback and all.
+        -- The selected message in full, traceback and all, in a box a player can select and copy
+        -- from. A text that has not changed is left alone: `SetText` collapses the selection, so a
+        -- new error arriving must not undo one about to be copied. A different text takes the
+        -- keyboard from the box, as a click on another row does.
         function BenillaScriptLog_UpdateDetail()
             local text = ""
             if BenillaScriptLogSelected then
-                local shown = BenillaGetNumScriptErrors()
-                for i = 1, shown do
-                    local seq, _, message = BenillaGetScriptErrorInfo(i)
-                    if seq == BenillaScriptLogSelected then
-                        text = message
+                for _, row in ipairs(BenillaScriptLog.rows) do
+                    if row.seq == BenillaScriptLogSelected then
+                        text = row.message
                         break
                     end
                 end
@@ -115,12 +144,24 @@
             if text == "" then
                 text = "Select a row above to read it in full."
             end
-            getglobal("BenillaScriptLogDetailText"):SetText(text)
+            local box = getglobal("BenillaScriptLogDetailText")
+            if text ~= box.shown then
+                box.shown = text
+                box:ClearFocus()
+                box:SetText(text)
+            end
         end
 
-        -- Text rects resolve after Lua runs, so the detail child is re-measured every frame.
-        function BenillaScriptLogFrame_OnUpdate()
-            BenillaScroll_ResizeChild("BenillaScriptLogDetailScroll", { "BenillaScriptLogDetailText" })
+        -- The box is read-only: a player's edit is undone. The restore's own `SetText` raises
+        -- another change, which finds the text equal and stops; `SetText` of an equal text does
+        -- nothing. The selection an edit replaced is put back, so Ctrl+C still copies it all.
+        function BenillaScriptLogDetail_OnTextChanged()
+            local shown = this.shown or ""
+            if this:GetText() ~= shown then
+                this:SetText(shown)
+                this:HighlightText()
+            end
+            ScrollingEdit_OnTextChanged(getglobal("BenillaScriptLogDetailScroll"))
         end
 
         function BenillaScriptLogRow_OnClick(button)
@@ -133,7 +174,7 @@
             BenillaScriptLog_Update()
         end
 
-        function BenillaScriptLogFrame_OnLoad(self)
+        function BenillaScriptLogFrame_OnLoad()
             -- Masks the square icon to the portrait ring.
             SetPortraitToTexture("BenillaScriptLogFramePortrait",
                 "Interface\\Icons\\INV_Misc_Note_01")
@@ -157,7 +198,7 @@
 
         -- `/errors clear`: keeps the numbering, so a number never names two failures.
         function BenillaScriptLog_Clear()
-            BenillaClearScriptErrors()
+            BenillaScriptLog.rows = {}
             BenillaScriptLogSelected = nil
             if getglobal("BenillaScriptLogFrame"):IsVisible() then
                 BenillaScriptLog_Update()
@@ -184,10 +225,10 @@
         <HighlightTexture file="Interface\Buttons\UI-Listbox-Highlight2" alphaMode="ADD"/>
         <Scripts>
             <OnLoad>
-                self.index = getglobal(self:GetName() .. "Index")
-                self.label = getglobal(self:GetName() .. "Label")
+                this.index = getglobal(this:GetName() .. "Index")
+                this.label = getglobal(this:GetName() .. "Label")
             </OnLoad>
-            <OnClick>BenillaScriptLogRow_OnClick(self)</OnClick>
+            <OnClick>BenillaScriptLogRow_OnClick(this)</OnClick>
         </Scripts>
     </Button>
 
@@ -232,8 +273,9 @@
                 </Layer></Layers>
             </Frame>
 
+            <!-- The class trainer's first row (ClassTrainerSkill1, Blizzard_TrainerUI.xml:214-222). -->
             <Button name="BenillaScriptLogRow1" inherits="BenillaScriptLogRowTemplate">
-                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="22" y="-94"/></Offset></Anchor></Anchors>
+                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="22" y="-100"/></Offset></Anchor></Anchors>
             </Button>
             <Button name="BenillaScriptLogRow2" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow1" relativePoint="BOTTOMLEFT"/></Anchors></Button>
             <Button name="BenillaScriptLogRow3" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow2" relativePoint="BOTTOMLEFT"/></Anchors></Button>
@@ -245,28 +287,29 @@
             <Button name="BenillaScriptLogRow9" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow8" relativePoint="BOTTOMLEFT"/></Anchors></Button>
             <Button name="BenillaScriptLogRow10" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow9" relativePoint="BOTTOMLEFT"/></Anchors></Button>
             <Button name="BenillaScriptLogRow11" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow10" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="BenillaScriptLogRow12" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow11" relativePoint="BOTTOMLEFT"/></Anchors></Button>
-            <Button name="BenillaScriptLogRow13" inherits="BenillaScriptLogRowTemplate"><Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogRow12" relativePoint="BOTTOMLEFT"/></Anchors></Button>
 
-            <!-- Only the faux kit's right-hand Slider renders. -->
+            <!-- The class trainer's list frame (Blizzard_TrainerUI.xml:313-322, 184 tall as its .lua:471
+                 sets it). Only the faux kit's right-hand Slider renders. -->
             <ScrollFrame name="BenillaScriptLogListScrollFrame" inherits="FauxScrollFrameTemplate">
-                <Size><AbsDimension x="293" y="208"/></Size>
-                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="22" y="-94"/></Offset></Anchor></Anchors>
-                            <Scripts>
+                <Size><AbsDimension x="296" y="184"/></Size>
+                <Anchors><Anchor point="TOPRIGHT" relativePoint="TOPRIGHT"><Offset><AbsDimension x="-67" y="-96"/></Offset></Anchor></Anchors>
+                <Scripts>
                     <!-- The stock kit has no `updateFunc`, so the repaint is wired here. -->
                     <OnVerticalScroll>FauxScrollFrame_OnVerticalScroll(BENILLA_SCRIPTLOG_ROW_HEIGHT, BenillaScriptLog_Update)</OnVerticalScroll>
                 </Scripts>
-</ScrollFrame>
+            </ScrollFrame>
 
-            <!-- The real-scroll kit: a message with its traceback has variable height. -->
+            <!-- The class trainer's detail pane, 8 under its list and 119 tall (Blizzard_TrainerUI.xml:
+                 346-356, .lua:472), so it ends above the buttons' sockets. The real-scroll kit: a
+                 message with its traceback has variable height. -->
             <ScrollFrame name="BenillaScriptLogDetailScroll">
-                <Size><AbsDimension x="293" y="128"/></Size>
-                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="22" y="-314"/></Offset></Anchor></Anchors>
+                <Size><AbsDimension x="296" y="119"/></Size>
+                <Anchors><Anchor point="TOPLEFT" relativeTo="BenillaScriptLogListScrollFrame" relativePoint="BOTTOMLEFT"><Offset><AbsDimension x="0" y="-8"/></Offset></Anchor></Anchors>
                 <Scripts>
-                    <OnLoad>self:SetScrollChild(getglobal(self:GetName() .. "Child"))</OnLoad>
-                    <OnMouseWheel>BenillaScroll_OnMouseWheel(self, arg1)</OnMouseWheel>
-                    <OnVerticalScroll>BenillaScroll_SyncBar(self)</OnVerticalScroll>
-                    <OnScrollRangeChanged>BenillaScroll_SyncBar(self)</OnScrollRangeChanged>
+                    <OnLoad>this:SetScrollChild(getglobal(this:GetName() .. "Child"))</OnLoad>
+                    <OnMouseWheel>BenillaScroll_OnMouseWheel(this, arg1)</OnMouseWheel>
+                    <OnVerticalScroll>BenillaScroll_SyncBar(this)</OnVerticalScroll>
+                    <OnScrollRangeChanged>BenillaScroll_SyncBar(this)</OnScrollRangeChanged>
                 </Scripts>
                 <Frames>
                     <Slider name="$parentBar" inherits="BenillaScrollBarTemplate" hidden="true">
@@ -274,64 +317,83 @@
                             <Anchor point="TOPLEFT" relativePoint="TOPRIGHT"><Offset><AbsDimension x="6" y="-16"/></Offset></Anchor>
                             <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMRIGHT"><Offset><AbsDimension x="6" y="16"/></Offset></Anchor>
                         </Anchors>
-                        <Scripts><OnValueChanged>BenillaScrollBar_OnValueChanged(self, arg1)</OnValueChanged></Scripts>
+                        <Scripts><OnValueChanged>BenillaScrollBar_OnValueChanged(this, arg1)</OnValueChanged></Scripts>
                     </Slider>
-                    <Frame name="$parentChild">
-                        <Size><AbsDimension x="293" y="128"/></Size>
+                    <!-- Mouse-enabled and the pane's full height, as SendMailScrollChildFrame is
+                         (MailFrame.xml:604-659): a click below the text focuses the box. -->
+                    <Frame name="$parentChild" enableMouse="true">
+                        <Size><AbsDimension x="296" y="119"/></Size>
                         <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"/></Anchors>
-                        <Layers>
-                            <Layer level="ARTWORK">
-                                <!-- 270 wide so the traceback wraps rather than clips. -->
-                                <FontString name="BenillaScriptLogDetailText" inherits="GameFontHighlightSmall" justifyH="LEFT" justifyV="TOP" text="">
-                                    <Size><AbsDimension x="270" y="0"/></Size>
-                                    <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="6" y="-6"/></Offset></Anchor></Anchors>
-                                </FontString>
-                            </Layer>
-                        </Layers>
+                        <Frames>
+                            <!-- A multi-line box in a scroll frame as MailFrame.xml:616-649 hosts the mail
+                                 body: `autoFocus="false"`, so the keyboard stays with the game until a
+                                 click, and Escape clears the focus. A multi-line box is as tall as its
+                                 insets and its wrapped text, so the scroll frame ranges over it as
+                                 ScrollingEdit_OnTextChanged (UIPanelTemplates.lua:307) recomputes. The
+                                 insets seat the text 6 in and 6 down, 270 wide, and leave 20 below
+                                 the last line. No `letters`, so the whole error goes in. Read-only
+                                 through OnTextChanged; a click selects it all, so Ctrl+C copies the
+                                 error. Not wired: the stock scroll-to-caret (UIPanelTemplates.lua:
+                                 314-342), since selecting all leaves the caret at the end and a
+                                 click would scroll a long traceback to its bottom. -->
+                            <EditBox name="BenillaScriptLogDetailText" multiLine="true" autoFocus="false">
+                                <Size><AbsDimension x="296" y="119"/></Size>
+                                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"/></Anchors>
+                                <TextInsets><AbsInset left="6" right="20" top="6" bottom="20"/></TextInsets>
+                                <Scripts>
+                                    <OnTextChanged>BenillaScriptLogDetail_OnTextChanged()</OnTextChanged>
+                                    <OnEditFocusGained>this:HighlightText()</OnEditFocusGained>
+                                    <OnEscapePressed>this:ClearFocus()</OnEscapePressed>
+                                </Scripts>
+                                <FontString inherits="GameFontHighlightSmall"/>
+                            </EditBox>
+                        </Frames>
+                        <Scripts>
+                            <OnMouseUp>BenillaScriptLogDetailText:SetFocus()</OnMouseUp>
+                        </Scripts>
                     </Frame>
                 </Frames>
             </ScrollFrame>
 
+            <!-- The art's two button sockets, where the class trainer's Train and Exit sit
+                 (Blizzard_TrainerUI.xml:481-513). -->
             <Button name="BenillaScriptLogClearButton" inherits="UIPanelButtonTemplate" text="Clear">
-                <Size><AbsDimension x="96" y="22"/></Size>
-                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="22" y="-455"/></Offset></Anchor></Anchors>
+                <Size><AbsDimension x="80" y="22"/></Size>
+                <Anchors><Anchor point="CENTER" relativePoint="TOPLEFT"><Offset><AbsDimension x="224" y="-420"/></Offset></Anchor></Anchors>
                 <Scripts><OnClick>BenillaScriptLog_Clear()</OnClick></Scripts>
             </Button>
             <Button name="BenillaScriptLogCloseBottomButton" inherits="UIPanelButtonTemplate" text="Close">
-                <Size><AbsDimension x="96" y="22"/></Size>
-                <Anchors><Anchor point="TOPLEFT" relativePoint="TOPLEFT"><Offset><AbsDimension x="219" y="-455"/></Offset></Anchor></Anchors>
+                <Size><AbsDimension x="80" y="22"/></Size>
+                <Anchors><Anchor point="CENTER" relativePoint="TOPLEFT"><Offset><AbsDimension x="305" y="-420"/></Offset></Anchor></Anchors>
                 <Scripts><OnClick>HideUIPanel(getglobal("BenillaScriptLogFrame"))</OnClick></Scripts>
             </Button>
         </Frames>
         <Scripts>
-            <OnLoad>BenillaScriptLogFrame_OnLoad(self)</OnLoad>
+            <OnLoad>BenillaScriptLogFrame_OnLoad()</OnLoad>
             <!-- A spin bubbles up the parent chain; the detail pane's own handler wins there. -->
             <OnMouseWheel>BenillaScriptLogFrame_OnMouseWheel(arg1)</OnMouseWheel>
             <OnShow>BenillaScriptLog_Update()</OnShow>
-            <OnUpdate>BenillaScriptLogFrame_OnUpdate()</OnUpdate>
         </Scripts>
     </Frame>
-    <!-- Benilla's slash commands, handed to SubmitChatInput (ui_chat::input); loads after the
-         stock ChatFrame.xml, which declares SlashCmdList. -->
+    <!-- The player's commands, as an addon registers them; after the stock ChatFrame.lua, which
+         declares SlashCmdList. -->
     <Script><![CDATA[
-        local BENILLA_COMMANDS = {
-            { "CHATTEST", "/chattest" },
-            { "SHOT", "/shot" },
-            { "LIQUID", "/liquid" },
-            { "CASTVIS", "/castvis" },
-            { "PARTYTEST", "/partytest" },
-            { "REACTION", "/reaction", "/react" },
-            { "RELOAD", "/reload" },
-            { "ERRORS", "/errors", "/err" },
-            { "CONVERTRAID", "/convertraid" },
-        }
-        for _, row in ipairs(BENILLA_COMMANDS) do
-            local key = "BENILLA_" .. row[1]
-            for i = 2, table.getn(row) do
-                setglobal("SLASH_" .. key .. (i - 1), row[i])
-            end
-            SlashCmdList[key] = function(msg)
-                SubmitChatInput(row[2] .. " " .. (msg or ""))
+        -- Deviation: 1.12 has no `/reload` (later clients added it; 1.12 reloads through
+        -- `/console reloadui`); kept so a player can reload the interface after toggling addons.
+        SLASH_BENILLA_RELOAD1 = "/reload"
+        SlashCmdList["BENILLA_RELOAD"] = function()
+            ReloadUI()
+        end
+
+        -- `/errors` toggles the log and `/errors clear` empties it; `/err` is the short form.
+        SLASH_BENILLA_ERRORS1 = "/errors"
+        SLASH_BENILLA_ERRORS2 = "/err"
+        SlashCmdList["BENILLA_ERRORS"] = function(msg)
+            local arg = string.lower((string.gsub(msg or "", "^%s*(.-)%s*$", "%1")))
+            if arg == "clear" then
+                BenillaScriptLog_Clear()
+            else
+                BenillaScriptLog_Toggle()
             end
         end
     ]]></Script>
diff --git a/crates/benilla-app/assets/ui/ScrollTemplates.xml b/crates/benilla-app/assets/ui/ScrollTemplates.xml
index 0a7cfd07..19a3f3e8 100644
--- a/crates/benilla-app/assets/ui/ScrollTemplates.xml
+++ b/crates/benilla-app/assets/ui/ScrollTemplates.xml
@@ -183,7 +183,7 @@
             </Button>
         </Frames>
         <Scripts>
-            <OnValueChanged>BenillaFauxScrollBar_OnValueChanged(self, arg1)</OnValueChanged>
+            <OnValueChanged>BenillaFauxScrollBar_OnValueChanged(this, arg1)</OnValueChanged>
         </Scripts>
         <ThumbTexture name="$parentThumbTexture" file="Interface\Buttons\UI-ScrollBar-Knob">
             <Size><AbsDimension x="16" y="16"/></Size>
diff --git a/crates/benilla-app/assets/ui/benilla.toc b/crates/benilla-app/assets/ui/benilla.toc
deleted file mode 100644
index 9170c73a..00000000
--- a/crates/benilla-app/assets/ui/benilla.toc
+++ /dev/null
@@ -1,167 +0,0 @@
-# The built-in interface, in load order: a bare filename is ours, from `assets/ui`; a path is
-# the reference's own file, off the player's patch chain. Entry 0, Fonts.xml, loads alone into
-# every boot VM, from Startup on; the rest loads on entering the world, then third-party addons.
-# The font objects thus exist before the login screen; the reference loads Fonts.xml with the
-# rest of FrameXML.
-# `inherits=`, `parent=` and a named `relativeTo=` resolve only against names declared above; a
-# missing one only warns (the template is skipped, the parent falls back to the enclosing frame).
-# A later Lua global or template replaces an earlier one; a named frame publishes its global
-# only while the name is free.
-# A stock `.xml` that does not `<Script file=>` its own `.lua` needs both rows, `.lua` first.
-# LoadOnDemand addons have no row, as in the reference; they load off the chain on first use.
-
-## Interface: 11200
-## Title: benilla
-
-Interface\FrameXML\Fonts.xml
-
-# Second, not first as in the reference, because entry 0 must be Fonts.xml.
-Interface\FrameXML\GlobalStrings.lua
-# `Localize()` runs at load and overwrites GlobalStrings keys, so this follows them.
-Interface\FrameXML\Localization.xml
-# `GetText` is a Lua global, not an engine binding: the client's `0x703bf0` calls it.
-Interface\FrameXML\LocaleProperties.lua
-Interface\FrameXML\BasicControls.xml
-# Before UIParent.xml, whose `LowHealthFrame` has `parent="WorldFrame"`.
-Interface\FrameXML\WorldFrame.xml
-# Above every file that names `parent="UIParent"` or adds a `UIPanelWindows` row at load.
-Interface\FrameXML\UIParent.xml
-Interface\FrameXML\ItemButtonTemplate.xml
-# Before GameTooltip.xml and StaticPopup.xml, whose money rows inherit `SmallMoneyFrameTemplate`.
-Interface\FrameXML\MoneyFrame.lua
-Interface\FrameXML\MoneyFrame.xml
-Interface\FrameXML\MoneyInputFrame.lua
-Interface\FrameXML\MoneyInputFrame.xml
-Interface\FrameXML\GameTooltip.xml
-Interface\FrameXML\UIDropDownMenu.xml
-Interface\FrameXML\UIMenu.xml
-# Before the unit frames, whose dropdowns' OnLoad reaches `UnitPopup_ShowMenu`.
-Interface\FrameXML\UnitPopup.xml
-Interface\FrameXML\ItemRef.xml
-# The `TextStatusBar` template and verbs, which the unit bars and `MainMenuExpBar` inherit.
-Interface\FrameXML\TextStatusBar.lua
-Interface\FrameXML\TextStatusBar.xml
-# Before PartyFrame.xml, whose rows reach `RefreshBuffs` from their OnLoad.
-Interface\FrameXML\BuffFrame.xml
-# Function-only kits the unit windows below call from their OnLoad.
-Interface\FrameXML\UnitFrame.xml
-Interface\FrameXML\CombatFeedback.xml
-Interface\FrameXML\PlayerFrame.xml
-Interface\FrameXML\PartyFrame.xml
-Interface\FrameXML\TargetFrame.xml
-Interface\FrameXML\PetFrame.xml
-# Anchors `relativeTo="TargetFrame"`.
-Interface\FrameXML\ComboFrame.xml
-# Ours: the scroll parts of our options window and script log.
-ScrollTemplates.xml
-
-Interface\FrameXML\UIPanelTemplates.lua
-
-Interface\FrameXML\UIPanelTemplates.xml
-# The reference's three options windows, loaded hidden so addons find their frames by name.
-# Deviation: the player opens our own options window, `OptionsFrame.xml` below, because 1.12's
-# settings screens are much worse to use; the stock one holds `OptionsFrame`.
-Interface\FrameXML\OptionsFrame.xml
-Interface\FrameXML\SoundOptionsFrame.xml
-# Inherits `OptionsCheckButtonTemplate`, and declares `UIOptionsFrameCheckButtons`, which
-# MultiActionBars.lua writes at load.
-Interface\FrameXML\UIOptionsFrame.xml
-# StaticPopup.lua starts `StaticPopupDialogs` empty: a file that adds a dialog at load follows it.
-Interface\FrameXML\StaticPopup.xml
-Interface\FrameXML\CoinPickupFrame.xml
-
-# Ours: the Keybindings page's templates and script, which OptionsFrame.xml uses at load.
-KeyBindingsPage.xml
-
-# Ours: `BenillaOptionsFrame`; its rows read the option globals the stock windows above set.
-OptionsFrame.xml
-
-# `MainMenuBar`, `MainMenuBarArtFrame` and `MainMenuExpBar`, which later files read at load.
-Interface\FrameXML\MainMenuBar.xml
-
-Interface\FrameXML\Cooldown.xml
-# `ActionButtonTemplate`, which ActionBarFrame.xml's `ActionBarButtonTemplate` inherits.
-Interface\FrameXML\ActionButtonTemplate.xml
-Interface\FrameXML\ActionBarFrame.xml
-# The four optional bars, action slots 25-72.
-Interface\FrameXML\MultiActionBars.xml
-Interface\FrameXML\PetActionBarFrame.xml
-# `UpdateMicroButtons` reads CharacterFrame, SpellBookFrame, QuestLogFrame, GameMenuFrame, the
-# three stock options windows, FriendsFrame, WorldMapFrame, HelpFrame and KeyRingButton
-# unguarded, so each must be on this list.
-Interface\FrameXML\MainMenuBarMicroButtons.xml
-# Before Minimap.xml, whose queue dropdown's OnLoad calls `MiniMapBattlefieldDropDown_OnLoad`.
-Interface\FrameXML\BattlefieldFrame.xml
-# GameTime.xml, DurabilityFrame.xml and QuestTimerFrame.xml name `MinimapCluster` at load.
-Interface\FrameXML\Minimap.xml
-Interface\FrameXML\GameTime.xml
-# Before ZoneText.xml, whose frames call `FadingFrame_OnLoad` in their OnLoad.
-Interface\FrameXML\FadingFrame.xml
-Interface\FrameXML\ZoneText.xml
-Interface\FrameXML\ColorPickerFrame.xml
-Interface\FrameXML\WorldMapFrame.xml
-Interface\FrameXML\CastingBarFrame.xml
-Interface\FrameXML\MirrorTimer.xml
-Interface\FrameXML\DurabilityFrame.xml
-Interface\FrameXML\UIErrorsFrame.xml
-# Anchors `relativeTo="UIErrorsFrame"`.
-Interface\FrameXML\RaidWarning.xml
-Interface\FrameXML\ContainerFrame.xml
-# `CharacterFrame` parents every tab page below, and its OnLoad reads `PlayerFrameHealthBar`,
-# `PlayerFrameManaBar` and `MainMenuExpBar`; PaperDollFrame.xml declares templates the pet page
-# and the bag bar inherit.
-Interface\FrameXML\CharacterFrame.xml
-Interface\FrameXML\PaperDollFrame.xml
-Interface\FrameXML\PetPaperDollFrame.xml
-Interface\FrameXML\MainMenuBarBagButtons.xml
-Interface\FrameXML\StackSplitFrame.xml
-# Ours: wraps the stock bag verbs; the keyring is a container (id -2).
-ContainerFrameAdapters.xml
-Interface\FrameXML\ReputationFrame.xml
-Interface\FrameXML\SkillFrame.xml
-# Brings HonorFrameTemplates.xml, whose row templates `Blizzard_InspectUI` inherits.
-Interface\FrameXML\HonorFrame.xml
-Interface\FrameXML\DressUpFrame.xml
-Interface\FrameXML\SpellBookFrame.xml
-# Ours: the pet page's autocast widgets in the pet action button's proportions.
-SpellBookAdapters.xml
-# RaidFrame.xml names `parent="FriendsFrame"` and MailFrame.xml inherits `FriendsFrameTabTemplate`.
-Interface\FrameXML\FriendsFrame.xml
-Interface\FrameXML\RaidFrame.xml
-Interface\FrameXML\GossipFrame.xml
-Interface\FrameXML\MerchantFrame.xml
-Interface\FrameXML\MailFrame.xml
-Interface\FrameXML\TradeFrame.xml
-Interface\FrameXML\ItemTextFrame.xml
-Interface\FrameXML\BankFrame.xml
-Interface\FrameXML\TaxiFrame.xml
-Interface\FrameXML\PetStable.xml
-Interface\FrameXML\LootFrame.xml
-# Brings QuestFrameTemplates.xml, whose templates the guild registrar and quest log inherit; the
-# quest log's OnLoad also calls `QuestMoneyFrame_OnLoad` from QuestFrame.lua.
-Interface\FrameXML\QuestFrame.xml
-Interface\FrameXML\GuildRegistrarFrame.xml
-Interface\FrameXML\PetitionFrame.xml
-Interface\FrameXML\QuestLogFrame.xml
-Interface\FrameXML\QuestTimerFrame.xml
-# ChatFrame.lua starts `SlashCmdList` empty: a file that registers slash commands at load follows.
-Interface\FrameXML\ChatFrame.xml
-Interface\FrameXML\FloatingChatFrame.xml
-
-# `ShapeshiftBar_OnLoad` can reach `UIParent_ManageFramePositions`, which reads the frames above
-# unguarded.
-Interface\FrameXML\BonusActionBarFrame.xml
-# `WorldStateAlwaysUpFrame`'s OnLoad runs the same pass, which also reads
-# `ShapeshiftBarLeft/Middle/Right`, so this follows BonusActionBarFrame.xml.
-Interface\FrameXML\WorldStateFrame.xml
-# `ClassTrainerListScrollFrameTemplate`, which on-demand addons inherit.
-Interface\FrameXML\ClassTrainerFrameTemplates.xml
-# Ours: the `/errors` script error log and our slash commands.
-ScriptLogFrame.xml
-Interface\FrameXML\HelpFrame.xml
-Interface\FrameXML\CinematicFrame.xml
-Interface\FrameXML\TabardFrame.xml
-Interface\FrameXML\TutorialFrame.xml
-# Ours: the ESC game menu. Last: it wraps `ToggleGameMenu`, `IsOptionFrameOpen` and
-# `UpdateMicroButtons` to count `BenillaOptionsFrame`.
-GameMenuFrame.xml
diff --git a/crates/benilla-app/assets/ui/layer.toc b/crates/benilla-app/assets/ui/layer.toc
new file mode 100644
index 00000000..09c679b3
--- /dev/null
+++ b/crates/benilla-app/assets/ui/layer.toc
@@ -0,0 +1,23 @@
+# benilla's own interface, one layer on the stock one (docs/METHOD.md): every file is ours, from
+# `assets/ui`, and loads in this order after every `FrameXML.toc` row and before the third-party
+# addons. It is listed in no addon list, fires no `ADDON_LOADED` and cannot be switched off; a dev
+# build boots without it under `WOW_STOCK_UI=1`. A test names its files, so it does not grow.
+
+## Interface: 11200
+
+# The scroll parts of our options window and script log.
+ScrollTemplates.xml
+# The Keybindings page's templates and script, which OptionsFrame.xml uses at load.
+KeyBindingsPage.xml
+# `BenillaOptionsFrame`; its rows read the option globals the stock options windows set.
+OptionsFrame.xml
+# The ESC menu's era look on the stock `GameMenuFrame`, whose Options rung opens ours.
+GameMenuAdapters.xml
+# `OpenBackpack` and `CloseBackpack` over every equipped bag, for the vendor and the mailbox.
+ContainerFrameAdapters.xml
+# The pet page's autocast widgets in the pet action button's proportions.
+SpellBookAdapters.xml
+# The `/errors` script error log and our slash commands.
+ScriptLogFrame.xml
+# Our fixes to the stock Lua.
+FrameXMLFixes.xml
diff --git a/crates/benilla-app/examples/extended_launcher.rs b/crates/benilla-app/examples/extended_launcher.rs
new file mode 100644
index 00000000..8c44196c
--- /dev/null
+++ b/crates/benilla-app/examples/extended_launcher.rs
@@ -0,0 +1,82 @@
+//! `extended_launcher`: the client with a plugin of its own on top, started through
+//! [`benilla_app::run_with`] as a crate built on benilla starts it. A feature 1.12.1 does not have
+//! lives in a crate like this one, never in benilla.
+//!
+//! ```text
+//! cargo run -p benilla-app --example extended_launcher
+//! ```
+//!
+//! The banner reads `benilla build … · extended`, and the plugin logs one line at `Startup`.
+//!
+//! A crate of its own copies the `benilla` launcher (`crates/benilla`): a build script that stamps
+//! its commit, a `main` like this one that reads the stamp back as `crates/benilla/src/main.rs`
+//! does, and a manifest that takes benilla as the workspace does:
+//!
+//! ```toml
+//! [features]
+//! default = ["dev"]
+//! # The instruments; the player build is `--no-default-features`.
+//! dev = ["benilla-app/dev"]
+//!
+//! [dependencies]
+//! # `default-features = false`, or `--no-default-features` still builds benilla-app with `dev`.
+//! benilla-app = { git = "https://github.com/samwhosung/benilla", default-features = false }
+//! # benilla's version, adding no features: bevy's defaults bring its audio stack back.
+//! bevy = { version = "0.18.1", default-features = false }
+//!
+//! [build-dependencies]
+//! benilla-buildstamp = { git = "https://github.com/samwhosung/benilla" }
+//!
+//! # Cargo reads `[patch]` and `[profile]` from the root manifest only, so benilla's are repeated:
+//! # without the patches the addon Lua and the mixer are not benilla's.
+//! [patch.crates-io]
+//! lua-src = { git = "https://github.com/samwhosung/benilla" }
+//! kira = { git = "https://github.com/samwhosung/benilla" }
+//!
+//! [profile.dev]
+//! opt-level = 1
+//!
+//! [profile.dev.package."*"]
+//! opt-level = 3
+//! ```
+//!
+//! ```text
+//! // build.rs
+//! fn main() {
+//!     benilla_buildstamp::emit();
+//! }
+//! ```
+//!
+//! Its `Cargo.lock` starts as a copy of benilla's: cargo reads only the root's lockfile too, and
+//! without it resolves every crate to its newest compatible version, not the one benilla is built
+//! with. A dev build keeps its `WoW` link, `benilla-config/` and `.probe-identity` in its own
+//! folder, beside that `Cargo.lock`, as benilla's does.
+
+use benilla_app::{AppExit, BuildId};
+use bevy::prelude::*;
+
+/// The crate's own plugin: one line at `Startup`, to show it runs inside the client.
+struct HelloPlugin;
+
+impl Plugin for HelloPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_systems(Startup, || info!("a plugin on top of benilla is running"));
+    }
+}
+
+fn main() -> AppExit {
+    // A launcher of its own passes the stamp its build script made; an example has no build
+    // script, so this names the version and profile alone.
+    let build = BuildId {
+        version: env!("CARGO_PKG_VERSION"),
+        profile: if cfg!(debug_assertions) {
+            "debug"
+        } else {
+            "release"
+        },
+        ..Default::default()
+    };
+    benilla_app::run_with(build, |app| {
+        app.add_plugins(HelloPlugin);
+    })
+}
diff --git a/crates/benilla-app/src/addon_harness/mod.rs b/crates/benilla-app/src/addon_harness/mod.rs
index 4fccd95f..3a48574c 100644
--- a/crates/benilla-app/src/addon_harness/mod.rs
+++ b/crates/benilla-app/src/addon_harness/mod.rs
@@ -1074,6 +1074,9 @@ fn seat_a_session(script: &mut UiScript) {
             class_file: Some("WARRIOR".into()),
             sex: 2,
             is_player: true,
+            // `UnitCreatureType("player")`: the feed's snapshot carries the race's type, and a
+            // Human is a Humanoid.
+            creature_type_name: Some("Humanoid".into()),
             // `UnitFactionGroup("player")`: every playable race has a side, and AceDB-2.0
             // concatenates it into its per-realm key at file scope.
             faction_group: Some("Alliance".into()),
@@ -1088,18 +1091,20 @@ fn seat_a_session(script: &mut UiScript) {
     // One buff, one target and one action with a running cooldown, so an addon that only draws when
     // there is content (a buff bar, a target frame, cooldown text) is separated from one that
     // failed.
-    script.set_auras(
-        "player",
-        Some(vec![benilla_ui::script::AuraState {
-            spell_id: 1243,
-            name: Some("Power Word: Fortitude".into()),
-            icon: Some("Interface\\Icons\\Spell_Holy_WordFortitude".into()),
-            count: 1,
-            helpful: true,
-            cancelable: true,
-            ..Default::default()
-        }]),
-    );
+    // The player's guid, which a token resolves to before its aura list is read.
+    script.set_unit_guids(&benilla_ui::script::UnitGuids {
+        player: 1,
+        ..Default::default()
+    });
+    script.set_player_auras(vec![benilla_ui::script::AuraState {
+        spell_id: 1243,
+        name: Some("Power Word: Fortitude".into()),
+        icon: Some("Interface\\Icons\\Spell_Holy_WordFortitude".into()),
+        count: 1,
+        helpful: true,
+        cancelable: true,
+        ..Default::default()
+    }]);
     script.set_unit(
         "target",
         Some(benilla_ui::script::UnitState {
diff --git a/crates/benilla-app/src/area.rs b/crates/benilla-app/src/area.rs
index 2f49d4f6..f511943a 100644
--- a/crates/benilla-app/src/area.rs
+++ b/crates/benilla-app/src/area.rs
@@ -99,7 +99,7 @@ fn elect_event(cache: &ZoneCache, next: &ZoneSignal) -> Option<&'static str> {
     None
 }
 
-/// Resolves the texts and PvP info, writes the host globals, then fires the elected zone event and,
+/// Resolves the texts and PvP info, pushes the zone caches, then fires the elected zone event and,
 /// independently, `MINIMAP_ZONE_CHANGED`.
 fn feed_zone_events(
     script: Option<NonSendMut<UiScript>>,
@@ -213,21 +213,20 @@ fn feed_zone_events(
             };
             Some((ty, f.catalog().faction_group_name(zone_mask).unwrap_or("")))
         });
-    let (pvp_type, pvp_faction) = pvp.unwrap_or(("", ""));
+    let pvp_type = pvp.map_or("", |(ty, _)| ty);
 
-    let globals = script.lua().globals();
-    let pushed = globals
-        .set("__benilla_zone_name", signal.zone_text.clone())
-        .and_then(|()| globals.set("__benilla_real_zone_name", real_zone_text))
-        .and_then(|()| globals.set("__benilla_subzone_name", signal.subzone_text.clone()))
-        .and_then(|()| globals.set("__benilla_zone_text", minimap_text.clone()))
-        .and_then(|()| globals.set("__benilla_pvp_type", pvp_type))
-        .and_then(|()| globals.set("__benilla_pvp_faction", pvp_faction))
-        .and_then(|()| globals.set("__benilla_pvp_arena", is_arena));
-    if let Err(e) = pushed {
-        warn!("area: zone host globals: {e}");
-        return;
-    }
+    script.set_zone_texts(benilla_ui::script::ZoneTexts {
+        zone: signal.zone_text.clone(),
+        real_zone: real_zone_text,
+        subzone: signal.subzone_text.clone(),
+        minimap: minimap_text.clone(),
+        pvp_type: pvp.map(|(ty, _)| ty.to_string()),
+        pvp_faction: pvp
+            .map(|(_, faction)| faction)
+            .filter(|f| !f.is_empty())
+            .map(str::to_string),
+        is_arena,
+    });
 
     if let Some(event) = event {
         script.fire_event(event, vec![]);
diff --git a/crates/benilla-app/src/bindings.rs b/crates/benilla-app/src/bindings.rs
index 4281c87c..a3b035ba 100644
--- a/crates/benilla-app/src/bindings.rs
+++ b/crates/benilla-app/src/bindings.rs
@@ -1,23 +1,24 @@
-//! Key bindings: the one chord-to-command engine every rebindable input runs through. The table
-//! lives engine-side ([`benilla_ui::script::keybind`], which the Key Bindings window's Lua edits);
-//! this module derives an exact-match dispatch map from it whenever its generation moves.
+//! Key bindings: the one chord-to-command engine every rebindable input runs through. The key
+//! table and the commands live engine-side ([`benilla_ui::script::keybind`]): the commands are the
+//! `Bindings.xml` rows the core and each addon loaded, the live keys what `SetBinding` and the Key
+//! Bindings window write. This module derives an exact-match dispatch map from the keys whenever
+//! the table's generation moves, and runs a pressed chord's command.
 //!
-//! Dispatch ([`latch_and_dispatch`], in [`crate::ui_script::UiInput`] after the UI key feed):
+//! Dispatch ([`latch_and_dispatch`], in [`crate::ui_script::UiInput`] after the UI key feed), as
+//! `CBindings::ExecuteBinding` (`0x4b7990`) and `RunCommand` (`0x4b7b50`) do:
 //! - a press probes its exact chord, then once more with its leftmost modifier dropped
-//!   ([`Chord::fallback`]); Super held matches nothing;
-//! - [`Kind::Held`] commands latch on the press and unlatch on the base key's release (the
-//!   reference's `runOnUp` law). UI focus suppresses presses and releases nothing already held;
-//!   a latch ends only on its base key's release, the stuck-latch sweep (OS focus loss, the
+//!   ([`Chord::fallback`]);
+//! - the resolved command's body runs with `keystate = "down"`, and the base key's release runs a
+//!   `runOnUp` body again with `"up"`. UI focus suppresses presses and releases nothing already
+//!   held; a latch ends only on its base key's release, the stuck-latch sweep (OS focus loss, the
 //!   loading cover) or a VM swap;
-//! - [`Kind::Edge`]/[`Kind::EdgeUpDown`] run their 1.12 Lua bodies in the VM;
-//! - [`Kind::Host`] lands in [`BindingsState::fired`] for engine consumers.
+//! - what the bodies call reaches the engine through the Lua binding functions
+//!   ([`benilla_ui::script::BindingInput`]) as [`BindingsState`]'s [`Input`]s.
 //!
-//! An addon's `Bindings.xml` rows ([`benilla_ui::bindings_xml`]) dispatch here too: a resolved
-//! chord names a [`Bound`], either a registry [`Cmd`] or an index into the addon table.
-//!
-//! While the Keybindings page has a capsule selected (`BenillaBindCapture`), raw input is
-//! canonicalized (`ALT-CTRL-SHIFT-<TOKEN>`) and handed to the page, by the 1.12 law: lone
-//! modifiers ignored, left and right clicks stay UI clicks, ESC binds like any key.
+//! Deviation: a press with Super (Cmd) held runs no binding, so a system chord such as Cmd+Tab or
+//! Cmd+Q never acts in game. The reference has no such modifier and runs the bare key's binding:
+//! the Mac enqueues the key with Command held and skips only its text (`0x8a519`), and Windows
+//! hands `VK_LWIN`/`VK_RWIN` to the layout arm (`0x42da39`) like any key.
 //!
 //! Persistence: `benilla-config/bindings/account.txt` and `<Realm>-<Char>.txt` ([`store`]); the
 //! character file's existence is the character-set state, as in the reference.
@@ -27,38 +28,26 @@ use bevy::input::mouse::{AccumulatedMouseScroll, MouseScrollUnit};
 use bevy::input::ButtonState;
 use bevy::prelude::*;
 
-use benilla_ui::script::keybind::{AddonBindingBody, KeybindCommand, KeybindRequest};
+use benilla_ui::script::keybind::KeybindRequest;
 use benilla_ui::script::UiScript;
 
 use crate::char_select::InWorldGated;
 use crate::ui_script::{PlayerUiHover, PointerOverUiPanel, UiKeyboardCapture};
 
 pub(crate) mod chord;
-pub(crate) mod commands;
+mod layout;
+mod script_input;
 mod store;
 
 use chord::{BindKey, Chord};
-pub(crate) use commands::cmd;
-use commands::{Cmd, Kind, SPECS};
+pub(crate) use layout::LayoutNames;
+pub(crate) use script_input::Input;
 
-/// What a bound chord names: a registry command or an addon's `Bindings.xml` body. An enum, not
-/// one index space, so no `SPECS[cmd]` read can be handed an addon index.
-#[derive(Clone, Copy, PartialEq, Eq, Debug)]
-enum Bound {
-    /// A registry command, an index into [`SPECS`].
-    Spec(Cmd),
-    /// An addon-declared binding, an index into [`BindingDispatch::addons`].
-    Addon(u16),
-}
-
-/// The chord-to-binding map, rebuilt whenever the engine table's generation moves. Probe it
+/// The chord-to-command map, rebuilt whenever the engine table's generation moves. Probe it
 /// through [`BindingDispatch::resolve`]: the lookup is two probes.
 #[derive(Resource, Default)]
 struct BindingDispatch {
-    map: std::collections::HashMap<Chord, Bound>,
-    /// The addon bindings [`Bound::Addon`] indexes, in registration order; snapshotted with the
-    /// map so the two agree on what an index means.
-    addons: Vec<AddonBindingBody>,
+    map: std::collections::HashMap<Chord, String>,
     /// The engine table's generation this map was built from, keyed per VM: a fresh VM restarts
     /// its counter at 0.
     seen_generation: crate::ui_script::VmMemo<Option<u64>>,
@@ -72,30 +61,33 @@ impl BindingDispatch {
     /// `Ctrl`+`Shift` is the dev overlays' plane ([`benilla_world::modkeys::DEV_CHORD`]) and
     /// `Ctrl`+`Shift`+`P` would otherwise fall back to `SHIFT-P` (`TOGGLECHARACTER3`). An exact
     /// `CTRL-SHIFT-` binding still dispatches; mouse and wheel are never suppressed.
-    fn resolve(&self, chord: Chord, dev_plane: bool) -> Option<Bound> {
-        if let Some(&bound) = self.map.get(&chord) {
-            return Some(bound);
+    fn resolve(&self, chord: Chord, dev_plane: bool) -> Option<&str> {
+        if let Some(command) = self.map.get(&chord) {
+            return Some(command);
         }
         if dev_plane {
             return None;
         }
-        self.map.get(&chord.fallback()?).copied()
+        self.map.get(&chord.fallback()?).map(String::as_str)
     }
 }
 
-/// This frame's binding activity, which engine-side consumers read instead of raw keys.
+/// This frame's binding activity, which engine-side consumers read instead of raw keys: the
+/// [`Input`]s the running bodies' Lua calls set.
 #[derive(Resource, Default)]
 pub(crate) struct BindingsState {
-    /// Live latches, (base key, binding): a [`Kind::Held`], [`Kind::EdgeUpDown`] or `runOnUp`
-    /// addon press not yet released.
-    latched: Vec<(BindKey, Bound)>,
-    /// Commands whose first latch began this frame (the press edge).
-    just: Vec<Cmd>,
-    /// Host-edge commands fired this frame.
-    fired: Vec<Cmd>,
-    /// Analog amount per host command this frame (wheel notches; a key press adds the
-    /// reference's 1.0 step), the camera zoom's input.
-    amounts: Vec<(Cmd, f32)>,
+    /// Live latches, (base input, command): a press not yet released, whose release runs the
+    /// command's `runOnUp` half. The reference replays the press-time chord at key-up (`0x483bd0`);
+    /// latching the resolved command is equivalent.
+    latched: Vec<(Held, String)>,
+    /// The held bits a Start set and no Stop has cleared.
+    held: Vec<Input>,
+    /// Inputs whose Start, or whose one-shot, came this frame (the press edge).
+    just: Vec<Input>,
+    /// One-shots fired this frame.
+    fired: Vec<Input>,
+    /// Amount per one-shot this frame: a zoom's yards, else 1.0.
+    amounts: Vec<(Input, f32)>,
     /// The keys we believe are down: a press of one is a repeat. The reference classifies
     /// auto-repeat off its own list (`0x4248b3`), never the Win32 `lParam` repeat bit.
     /// Normalized like [`latched`](Self::latched) and reconciled against `ButtonInput` every
@@ -104,34 +96,46 @@ pub(crate) struct BindingsState {
     down: Vec<KeyCode>,
 }
 
+/// The physical input a latch waits on: a keyboard key by its code, not its name, so its release
+/// ends the latch whatever the layout names it by then.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+enum Held {
+    Key(KeyCode),
+    Mouse(MouseButton),
+    Wheel,
+}
+
 impl BindingsState {
-    /// Is a registry command latched right now (the reference's held movement bit)?
-    pub(crate) fn pressed(&self, c: Cmd) -> bool {
-        self.latched.iter().any(|&(_, l)| l == Bound::Spec(c))
+    /// Is a held bit set right now (the reference's `[InputControl+4]`)?
+    pub(crate) fn pressed(&self, i: Input) -> bool {
+        self.held.contains(&i)
     }
-    /// Did this command's latch begin this frame (the key-down edge)?
-    pub(crate) fn just_pressed(&self, c: Cmd) -> bool {
-        self.just.contains(&c)
+    /// Did this bit's Start, or this one-shot, come this frame (the key-down edge)?
+    pub(crate) fn just_pressed(&self, i: Input) -> bool {
+        self.just.contains(&i)
     }
-    /// Did this host-edge command fire this frame?
-    pub(crate) fn fired(&self, c: Cmd) -> bool {
-        self.fired.contains(&c)
+    /// Did this one-shot fire this frame?
+    pub(crate) fn fired(&self, i: Input) -> bool {
+        self.fired.contains(&i)
     }
-    /// Total analog amount for a host command this frame (0.0 when idle).
-    pub(crate) fn amount(&self, c: Cmd) -> f32 {
+    /// Total amount for a one-shot this frame (0.0 when idle): the camera zoom's yards.
+    pub(crate) fn amount(&self, i: Input) -> f32 {
         self.amounts
             .iter()
-            .filter(|&&(a, _)| a == c)
+            .filter(|&&(a, _)| a == i)
             .map(|&(_, v)| v)
             .sum()
     }
-    /// Test seam for consumer systems: a state in which these host commands fired this frame.
-    #[cfg(test)]
-    pub(crate) fn test_fired(cmds: &[Cmd]) -> Self {
-        Self {
-            fired: cmds.to_vec(),
-            ..Default::default()
-        }
+    /// Both mouse bits held by their Lua Starts, the both-button run: MOVEANDSTEER's body
+    /// (`Bindings.xml:3-11`) runs `CameraOrSelectOrMoveStart` and `TurnOrActionStart`.
+    pub(crate) fn steering(&self) -> bool {
+        self.pressed(Input::TurnOrAction) && self.pressed(Input::CameraOrSelectOrMove)
+    }
+    /// [`Self::steering`] began this frame.
+    pub(crate) fn steering_began(&self) -> bool {
+        self.steering()
+            && (self.just_pressed(Input::TurnOrAction)
+                || self.just_pressed(Input::CameraOrSelectOrMove))
     }
 }
 
@@ -152,64 +156,45 @@ pub(crate) struct BindingsPlugin;
 
 impl Plugin for BindingsPlugin {
     fn build(&self, app: &mut App) {
-        app.init_resource::<BindingDispatch>()
+        app.add_plugins(layout::plugin)
+            .init_resource::<BindingDispatch>()
             .init_resource::<BindingsState>()
             .init_resource::<BindingFiles>()
             .add_systems(
                 Update,
                 (
-                    // The registry and both sets are seeded at the VM's birth, not here:
-                    // `seed_bindings_for_vm` runs in `load_ingame_ui_on_world_entry`, before
-                    // FrameXML and every addon.
+                    // The key sets are seeded at the VM's birth, not here: `seed_bindings_for_vm`
+                    // runs in `load_ingame_ui_on_world_entry`, before FrameXML and every addon;
+                    // the commands come with the load.
                     (sync_dispatch, latch_and_dispatch)
                         .chain()
                         .in_set(crate::ui_script::UiInput)
                         .in_set(BindingSet)
                         .in_set(InWorldGated),
-                    // After the tick: the requests are Lua's own (`SaveBindings`, `RunBinding`),
-                    // queued by handlers the tick dispatched, and a save must not wait a frame.
+                    // After the tick: the requests are Lua's own (`SaveBindings`), queued by
+                    // handlers the tick dispatched, and a save must not wait a frame.
                     drain_binding_requests.after(crate::ui_script::UiInput),
                 ),
             );
     }
 }
 
-/// The registry as the engine table's registration payload, for the boot seed and the capture
-/// fixtures.
-pub(crate) fn registry_commands() -> Vec<KeybindCommand> {
-    SPECS
-        .iter()
-        .map(|s| KeybindCommand {
-            name: s.name,
-            category: s.category,
-            run_on_up: s.run_on_up(),
-            default1: s.d1,
-            default2: s.d2,
-        })
-        .collect()
-}
-
-/// Seed the keybinding table at the VM's birth, before any interface file runs: the command
-/// registry, the account set, and the character's set if it has one.
+/// Seed the key sets at the VM's birth, before any interface file runs: the defaults off the
+/// player's chain (`WTF\DefaultBindings.wtf`), the account set, and the character's set if it has
+/// one. The keys are their own table, so a command a later file declares finds its keys there,
+/// and stock `ActionButton_OnLoad` paints its hotkey corner from `GetBindingKey` at load.
 ///
-/// Order matters, and is the reference's: stock `ActionButton_OnLoad` paints its hotkey corner
-/// from `GetBindingKey` at load, an addon's `SetBinding` on a stock command needs the command
-/// registered, and the registry must hold the low indices the Key Bindings window walks.
-/// `seed_binding_set` keeps the diff by name, so a stored addon row binds when the addon
-/// registers it later.
+/// The reference reads the defaults later in `UI_Init` (`0x4b62b0` at `0x4900c7`); here they are
+/// read first because the stored sets are diffs against them ([`store`]'s deviation), and nothing
+/// reads set 0 before `LoadBindings(0)`.
 pub(crate) fn seed_bindings_for_vm(world: &mut World, script: &mut UiScript) {
-    script.register_bindings(&registry_commands());
+    let defaults = crate::ui_script::default_bindings();
+    script.set_default_bindings(defaults);
+    let defaults = script.default_bindings();
     let account = crate::local_state::bindings_account_path();
     let overrides = read_diff(&account).unwrap_or_default();
-    script.seed_binding_set(1, Some(store::resolve(&overrides)));
+    script.seed_binding_set(1, Some(store::resolve(&overrides, &defaults)));
     script.load_binding_set(1);
-    // `SPECS` and `ABSENT` together are the client's whole 1.12 command surface.
-    info!(
-        "bindings: {} of {} 1.12 commands registered ({} recorded absent)",
-        SPECS.len(),
-        SPECS.len() + commands::ABSENT.len(),
-        commands::ABSENT.len()
-    );
 
     // The character's own set: its file existing makes it the active set, the reference's rule.
     // No roster identity (a rigged or capture run) leaves set 2 unseeded.
@@ -221,7 +206,7 @@ pub(crate) fn seed_bindings_for_vm(world: &mut World, script: &mut UiScript) {
         .and_then(|(realm, name)| crate::local_state::bindings_character_path(realm, name));
     match read_diff(&character) {
         Some(overrides) => {
-            script.seed_binding_set(2, Some(store::resolve(&overrides)));
+            script.seed_binding_set(2, Some(store::resolve(&overrides, &defaults)));
             script.load_binding_set(2);
             info!("bindings: character-specific set loaded");
         }
@@ -249,34 +234,13 @@ fn read_diff(path: &Option<std::path::PathBuf>) -> Option<Vec<(String, Vec<Strin
     }
 }
 
-/// Drain the VM's binding requests. `Save` (`SaveBindings`) writes the set's diff; saving the
-/// account set deletes the character file. `Run` is `RunBinding(name)`, which stock keyboard
-/// frames use to pass a chord back to its binding (`CinematicFrame.xml:42`,
-/// `WorldMapFrame.xml:629`).
+/// Drain the VM's binding requests: `SaveBindings` writes the set's diff; saving the account set
+/// deletes the character file.
 fn drain_binding_requests(script: Option<NonSendMut<UiScript>>, files: Res<BindingFiles>) {
     let Some(mut script) = script else { return };
     for req in script.take_keybind_requests() {
-        // Only the Lua-bodied kinds can run this way: a `Held`/`Host` action is engine state a Lua
-        // call cannot assert. The stock callers run `SCREENSHOT` and `TOGGLEWORLDMAP`, both
-        // `Kind::Edge`.
-        let which = match req {
-            KeybindRequest::Save(which) => which,
-            KeybindRequest::Run(name) => {
-                match SPECS.iter().find(|s| s.name == name).map(|s| &s.kind) {
-                    Some(Kind::Edge(lua)) | Some(Kind::EdgeUpDown(lua, _)) => {
-                        let lua = *lua;
-                        if let Err(e) = script.run(lua) {
-                            warn!("bindings(RunBinding {name}): {e}");
-                        }
-                    }
-                    Some(_) => warn!("RunBinding({name}): a held/engine action has no body to run"),
-                    None => warn!("RunBinding({name}): no such command"),
-                }
-                continue;
-            }
-        };
-        let snapshot = script.keybind_snapshot();
-        let text = store::to_diff(&snapshot);
+        let KeybindRequest::Save(which) = req;
+        let text = store::to_diff(&script.keybind_snapshot(), &script.default_bindings());
         let path = match which {
             1 => &files.account,
             2 => &files.character,
@@ -299,8 +263,9 @@ fn drain_binding_requests(script: Option<NonSendMut<UiScript>>, files: Res<Bindi
     }
 }
 
-/// Rebuild the dispatch map when the engine table moved (a rebind, a set switch, the seed), and
-/// fire `UPDATE_BINDINGS` so the Lua consumers (the action bar's hotkey corners) repaint.
+/// Rebuild the dispatch map when the engine table moved (a rebind, a set switch, the seed, a
+/// load), and fire `UPDATE_BINDINGS` so the Lua consumers (the action bar's hotkey corners)
+/// repaint.
 fn sync_dispatch(script: Option<NonSendMut<UiScript>>, mut dispatch: ResMut<BindingDispatch>) {
     let Some(mut script) = script else { return };
     let generation = script.keybinds_generation();
@@ -309,43 +274,14 @@ fn sync_dispatch(script: Option<NonSendMut<UiScript>>, mut dispatch: ResMut<Bind
     }
     *dispatch.seen_generation.get(&script) = Some(generation);
     dispatch.map.clear();
-    // The addon table is where names the registry does not know resolve.
-    let addons = script.addon_binding_bodies();
-    let mut by_name: std::collections::HashMap<&str, Bound> = SPECS
-        .iter()
-        .enumerate()
-        .map(|(i, s)| (s.name, Bound::Spec(Cmd(i as u16))))
-        .collect();
-    for (i, a) in addons.iter().enumerate() {
-        // A registry name is never overwritten. `try_from`, because a wrapped index would
-        // dispatch the wrong body rather than none.
-        let Ok(i) = u16::try_from(i) else { break };
-        by_name.entry(a.name.as_str()).or_insert(Bound::Addon(i));
-    }
-    for (name, keys) in script.keybind_snapshot() {
-        let Some(&bound) = by_name.get(name.as_str()) else {
-            // A name with no home: an uninstalled addon's row (kept on purpose) or a 1.12
-            // command benilla does not implement, which `ABSENT` explains in the log.
-            if let Some(absent) = commands::ABSENT.iter().find(|a| a.name == name) {
-                if !keys.is_empty() {
-                    warn!(
-                        "bindings: {name} is bound to {keys:?} but benilla does not implement it \u{2014} {}",
-                        absent.why
-                    );
-                }
-            }
-            continue;
-        };
-        for key in keys {
-            match Chord::parse(&key) {
-                Some(ch) => {
-                    dispatch.map.insert(ch, bound);
-                }
-                None => warn!("bindings: {name}: unpressable chord '{key}' (unknown token)"),
+    for (key, command) in script.binding_keys() {
+        match Chord::parse(&key) {
+            Some(ch) => {
+                dispatch.map.insert(ch, command);
             }
+            None => warn!("bindings: {command}: unpressable chord '{key}' (unknown token)"),
         }
     }
-    dispatch.addons = addons;
     script.fire_event("UPDATE_BINDINGS", vec![]);
 }
 
@@ -387,8 +323,10 @@ impl WheelNotches {
 /// The dispatch pass (see the module doc). Runs after the UI key feed and before
 /// `WorldStage::Input`, so a bound key acts this frame, once.
 fn latch_and_dispatch(
-    script: Option<NonSendMut<UiScript>>,
+    mut script: Option<NonSendMut<UiScript>>,
     mut keyboard: MessageReader<KeyboardInput>,
+    // What the active layout names a letter, digit or punctuation key.
+    layout: Res<LayoutNames>,
     keys: Res<ButtonInput<KeyCode>>,
     buttons: Res<ButtonInput<MouseButton>>,
     scroll: Res<AccumulatedMouseScroll>,
@@ -399,79 +337,51 @@ fn latch_and_dispatch(
     dispatch: Res<BindingDispatch>,
     mut state: ResMut<BindingsState>,
     mut same_vm: Local<crate::ui_script::VmMemo<bool>>,
+    mut notches: Local<WheelNotches>,
+    mut focus_lost: MessageReader<bevy::input::keyboard::KeyboardFocusLost>,
+    cover: Option<Res<crate::loading_screen::LoadingScreen>>,
 ) {
     state.just.clear();
     state.fired.clear();
     state.amounts.clear();
 
-    // Deviation: latches die with the VM that made them, because a latch indexes that VM's
-    // dispatch table and releasing it against a new one would run the wrong addon's up-half. The
+    // Deviation: latches die with the VM that made them, because a latch names a command of that
+    // VM's table and releasing it against a new one would run another load's up-half. The
     // reference keeps a held key running through `ReloadUI`; here it re-latches on its next press.
+    // The held bits die with it, as the key's Stop would have cleared them.
     if let Some(script) = script.as_ref() {
         if same_vm.claim(script) {
             state.latched.clear();
+            state.held.clear();
         }
     }
+    // The reference's two bulk clears: the window deactivate (`0x514490`'s `and eax,0xfffff00f`,
+    // the direction bits only, so the mouse pair and autorun survive) and the world enter behind
+    // the loading cover (`0x5144c0`), which clears every bit. A key's latch meets them in the
+    // stuck-latch sweep too, whose up-half runs the Stop.
+    if cover.is_some_and(|c| c.covering()) {
+        state.held.clear();
+    } else if focus_lost.read().count() > 0 {
+        state
+            .held
+            .retain(|&i| matches!(i, Input::TurnOrAction | Input::CameraOrSelectOrMove));
+    }
+    // Lua's binding calls made since the last pass, before this frame's keys.
+    if let Some(s) = script.as_mut() {
+        let inputs = s.take_binding_input();
+        state.apply_script_input(inputs);
+    }
 
     let shift = keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight);
     let ctrl = keys.pressed(KeyCode::ControlLeft) || keys.pressed(KeyCode::ControlRight);
     let alt = keys.pressed(KeyCode::AltLeft) || keys.pressed(KeyCode::AltRight);
     let sup = keys.pressed(KeyCode::SuperLeft) || keys.pressed(KeyCode::SuperRight);
-    // The dev overlays' plane (`modkeys::dev_chord`; the `sup` gate covers its Super arm), which
-    // costs the keyboard its fallback probe (`BindingDispatch::resolve`). Only in a build with dev
+    // The dev overlays' plane, Ctrl+Shift without Alt (`modkeys::dev_chord`, which Super blocks
+    // too, as the `sup` gate below keeps any Super-held press from dispatching), which costs the
+    // keyboard its fallback probe (`BindingDispatch::resolve`). Only in a build with dev
     // affordances: a player build keeps the reference's `CTRL-SHIFT-P` fallback to `SHIFT-P`.
     let dev_plane = ctrl && shift && !alt && crate::run_mode::dev_affordances();
 
-    let mut script = script;
-    let armed = script.as_ref().is_some_and(|s| s.bind_capture_armed());
-    let run_lua = |script: &mut Option<NonSendMut<UiScript>>, lua: &str, tag: &str| {
-        if let Some(s) = script.as_mut() {
-            if let Err(e) = s.run(lua) {
-                warn!("bindings({tag}): {e}");
-            }
-        }
-    };
-
-    // ── The capture seam ── a Keybindings capsule is selected: swallow raw input and hand the
-    // chord string to the page's Lua. The 1.12 law: lone modifiers and unknown keys ignored,
-    // left and right stay UI clicks, the wheel is a chord. Super is not a 1.12 modifier, so a
-    // Super press is ignored outright.
-    if armed {
-        let mut captured: Option<String> = None;
-        for ev in keyboard.read() {
-            if ev.state != ButtonState::Pressed || ev.repeat || sup {
-                continue;
-            }
-            if let Some(token) = chord::key_token(ev.key_code) {
-                captured = Some(chord::chord_string(alt, ctrl, shift, token));
-            }
-        }
-        for b in [MouseButton::Middle, MouseButton::Forward, MouseButton::Back] {
-            if buttons.just_pressed(b) && !sup {
-                if let Some(token) = chord::mouse_token(b) {
-                    captured = Some(chord::chord_string(alt, ctrl, shift, token));
-                }
-            }
-        }
-        if scroll.delta.y != 0.0 && !sup {
-            let token = if scroll.delta.y > 0.0 {
-                "MOUSEWHEELUP"
-            } else {
-                "MOUSEWHEELDOWN"
-            };
-            captured = Some(chord::chord_string(alt, ctrl, shift, token));
-        }
-        if let Some(chord_str) = captured {
-            run_lua(
-                &mut script,
-                &format!("KeyBindings_OnHostKey(\"{chord_str}\")"),
-                "capture",
-            );
-        }
-        // Releases still unlatch below so a key held across the arm cannot stick; nothing new
-        // latches or fires while armed.
-    }
-
     // ── Who owns this frame's keys ── a focused EditBox eats every key while it holds focus; a
     // shown keyboard frame ate the keys in `capture.consumed`. Both suppress a press and nothing
     // else: in the reference a focused box makes the movement handlers no-ops, so the direction
@@ -484,10 +394,10 @@ fn latch_and_dispatch(
     // reference's `0x424790` wipe, so a key held across an alt-tab re-latches on its next repeat.
     state
         .down
-        .retain(|&kc| physically_down(BindKey::Key(kc), &keys, &buttons));
+        .retain(|&kc| physically_down(Held::Key(kc), &keys, &buttons));
 
-    // ── Keyboard ── press edges latch or fire, gated on ownership and the capture arm; release
-    // edges unlatch and fire the `runOnUp` up-half.
+    // ── Keyboard ── press edges run their command, gated on ownership and the capture arm;
+    // release edges unlatch and run the `runOnUp` up-half.
     let typing = capture.typing;
     for ev in keyboard.read() {
         let key = chord::normalize_key(ev.key_code);
@@ -512,38 +422,31 @@ fn latch_and_dispatch(
                 if !repeat {
                     state.down.push(key);
                 }
-                if armed || (typing && !arrow_exempt) || eaten || sup || repeat {
+                // `sup`: the Super deviation (module doc).
+                if (typing && !arrow_exempt) || eaten || sup || repeat {
                     continue;
                 }
-                if state.latched.iter().any(|&(k, _)| k == BindKey::Key(key)) {
+                if state.latched.iter().any(|(k, _)| *k == Held::Key(key)) {
                     continue; // already latched (missed release would double-latch)
                 }
+                // Named under the layout this press was typed in; a key 1.12 cannot name binds
+                // nothing.
+                let Some(name) = chord::key_token(ev.key_code, &layout) else {
+                    continue;
+                };
                 let chord = Chord {
                     alt,
                     ctrl,
                     shift,
-                    key: BindKey::Key(key),
+                    key: BindKey::Key(name),
                 };
-                if let Some(bound) = dispatch.resolve(chord, dev_plane) {
-                    press(
-                        &mut state,
-                        &mut script,
-                        run_lua,
-                        &dispatch,
-                        bound,
-                        BindKey::Key(key),
-                    );
+                if let Some(command) = dispatch.resolve(chord, dev_plane) {
+                    press(&mut state, &mut script, command, Held::Key(key));
                 }
             }
             ButtonState::Released => {
                 state.down.retain(|&kc| kc != key);
-                release(
-                    &mut state,
-                    &mut script,
-                    run_lua,
-                    &dispatch,
-                    BindKey::Key(key),
-                );
+                release(&mut state, &mut script, Held::Key(key));
             }
         }
     }
@@ -558,10 +461,9 @@ fn latch_and_dispatch(
         MouseButton::Back,
     ] {
         if buttons.just_pressed(b)
-            && !armed
             && !sup
             && hover.0.is_none()
-            && !state.latched.iter().any(|&(k, _)| k == BindKey::Mouse(b))
+            && !state.latched.iter().any(|(k, _)| *k == Held::Mouse(b))
         {
             let chord = Chord {
                 alt,
@@ -569,40 +471,28 @@ fn latch_and_dispatch(
                 shift,
                 key: BindKey::Mouse(b),
             };
-            if let Some(bound) = dispatch.resolve(chord, false) {
-                press(
-                    &mut state,
-                    &mut script,
-                    run_lua,
-                    &dispatch,
-                    bound,
-                    BindKey::Mouse(b),
-                );
+            if let Some(command) = dispatch.resolve(chord, false) {
+                press(&mut state, &mut script, command, Held::Mouse(b));
             }
         }
         if buttons.just_released(b) {
-            release(
-                &mut state,
-                &mut script,
-                run_lua,
-                &dispatch,
-                BindKey::Mouse(b),
-            );
+            release(&mut state, &mut script, Held::Mouse(b));
         }
     }
 
-    // ── Wheel ── a notch is a press and its release, back to back: the reference hands one chord
-    // to `CBindings::ExecuteBinding` with `isDown=1` (`0x483d6f`) then `isDown=0` (`0x483d82`).
-    // A `runOnUp` command runs both halves in the frame; a plain one's up leg is the
-    // `RunCommand` (`0x4b7b50`) no-op.
+    // ── Wheel ── each notch is a press and its release, back to back: the reference hands one
+    // chord to `CBindings::ExecuteBinding` with `isDown=1` (`0x483d6f`) then `isDown=0`
+    // (`0x483d82`) per wheel message. A `runOnUp` command runs both halves; a plain one's up leg is
+    // the `RunCommand` (`0x4b7bf1`) no-op. A trackpad's fractional lines carry to whole notches.
     let wheel = wheel_lines(scroll.unit, scroll.delta.y);
     // Over chrome only (`PointerOverUiPanel`): the wheel still zooms with the cursor on a
     // nameplate, a mouse-enabled widget but not a panel.
-    if wheel != 0.0 && !armed && !sup && !over_ui.0 {
-        let (key, amount) = if wheel > 0.0 {
-            (BindKey::WheelUp, wheel)
+    if wheel != 0.0 && !sup && !over_ui.0 {
+        let steps = notches.feed(wheel);
+        let key = if steps > 0 {
+            BindKey::WheelUp
         } else {
-            (BindKey::WheelDown, -wheel)
+            BindKey::WheelDown
         };
         let chord = Chord {
             alt,
@@ -610,150 +500,81 @@ fn latch_and_dispatch(
             shift,
             key,
         };
-        match dispatch.resolve(chord, false) {
-            // A host command takes the notch's analog magnitude (the camera zoom), which `press`
-            // cannot carry: it spends the 1.0 key step. It has no release half.
-            Some(Bound::Spec(cmd)) if matches!(SPECS[cmd.0 as usize].kind, Kind::Host) => {
-                state.fired.push(cmd);
-                state.amounts.push((cmd, amount));
+        if let Some(command) = dispatch.resolve(chord, false) {
+            for _ in 0..steps.unsigned_abs() {
+                press(&mut state, &mut script, command, Held::Wheel);
+                release(&mut state, &mut script, Held::Wheel);
             }
-            // Everything else is the reference's pair: `Kind::EdgeUpDown` runs both halves (a
-            // wheel-bound action button casts), an addon's `runOnUp` body runs down then up, and
-            // `Kind::Held` sets and clears in the one tick, as the reference's movement bit does.
-            Some(bound) => {
-                press(&mut state, &mut script, run_lua, &dispatch, bound, key);
-                release(&mut state, &mut script, run_lua, &dispatch, key);
-            }
-            None => {}
         }
     }
 
     // ── The stuck-latch sweep ── a release the window never saw: a latch whose base key reads up
-    // unlatches now and fires its up-half. The reference's two bulk clears land here, since bevy
-    // zeroes `ButtonInput` for both: OS window deactivate (`0x514490`'s `and eax,0xfffff00f`, the
-    // direction bits released while autorun survives) and the loading cover
-    // (`loading_screen::input`'s `swallow`, the world-enter `0x5144c0`, which clears everything).
-    // UI keyboard focus never reaches here.
-    let mut stuck: Vec<BindKey> = Vec::new();
-    for &(k, _) in &state.latched {
-        if !physically_down(k, &keys, &buttons) && !stuck.contains(&k) {
-            stuck.push(k);
+    // unlatches now and runs its up-half. The reference's two bulk clears land here too, since
+    // bevy zeroes `ButtonInput` for both (see the clears above). UI keyboard focus never reaches
+    // here.
+    let mut stuck: Vec<Held> = Vec::new();
+    for (k, _) in &state.latched {
+        if !physically_down(*k, &keys, &buttons) && !stuck.contains(k) {
+            stuck.push(*k);
         }
     }
     for k in stuck {
-        release(&mut state, &mut script, run_lua, &dispatch, k);
+        release(&mut state, &mut script, k);
+    }
+
+    // The calls this pass's binding bodies made act this frame, as the reference's return from
+    // `0x515090` has already moved the bit.
+    if let Some(s) = script.as_mut() {
+        let inputs = s.take_binding_input();
+        state.apply_script_input(inputs);
     }
 }
 
-#[cfg(test)]
-impl BindingDispatch {
-    /// A dispatch seeded from the registry defaults, the no-VM test seam; no addon bindings.
-    fn test_defaults() -> Self {
-        let mut map = std::collections::HashMap::new();
-        for (i, s) in SPECS.iter().enumerate() {
-            for d in [s.d1, s.d2].into_iter().flatten() {
-                map.insert(
-                    Chord::parse(d).expect("default parses"),
-                    Bound::Spec(Cmd(i as u16)),
-                );
-            }
-        }
-        Self {
-            map,
-            addons: Vec::new(),
-            seen_generation: crate::ui_script::VmMemo::default(),
-        }
-    }
-}
-
-/// Is this base key physically down, per bevy's button planes? The stuck-latch sweep and the
+/// Is this input physically down, per bevy's button planes? The stuck-latch sweep and the
 /// pressed-key reconcile must agree, so both ask here. `ENTER` is down while either physical
 /// key is, since [`chord::normalize_key`] folds `NUMPADENTER` into it.
 fn physically_down(
-    key: BindKey,
+    key: Held,
     keys: &ButtonInput<KeyCode>,
     buttons: &ButtonInput<MouseButton>,
 ) -> bool {
     match key {
-        BindKey::Key(KeyCode::Enter) => {
+        Held::Key(KeyCode::Enter) => {
             keys.pressed(KeyCode::Enter) || keys.pressed(KeyCode::NumpadEnter)
         }
-        BindKey::Key(kc) => keys.pressed(kc),
-        BindKey::Mouse(b) => buttons.pressed(b),
+        Held::Key(kc) => keys.pressed(kc),
+        Held::Mouse(b) => buttons.pressed(b),
         // A notch is a press and a release in one frame; it is never "held".
-        BindKey::WheelUp | BindKey::WheelDown => false,
+        Held::Wheel => false,
     }
 }
 
-/// One matching press: latch the held kinds, run or fire by kind.
+/// One matching press: the command's body with `keystate = "down"`, and a latch on its input so
+/// the release can run the up-half.
 fn press(
     state: &mut BindingsState,
     script: &mut Option<NonSendMut<UiScript>>,
-    run_lua: impl Fn(&mut Option<NonSendMut<UiScript>>, &str, &str),
-    dispatch: &BindingDispatch,
-    bound: Bound,
-    key: BindKey,
+    command: &str,
+    key: Held,
 ) {
-    let cmd = match bound {
-        Bound::Spec(cmd) => cmd,
-        // Run the body with `keystate = "down"`; latch only if its `runOnUp` asks for the
-        // release half.
-        Bound::Addon(i) => {
-            if let Some(a) = dispatch.addons.get(i as usize) {
-                run_addon(script, a, "down");
-                if a.run_on_up {
-                    state.latched.push((key, bound));
-                }
-            }
-            return;
-        }
-    };
-    let spec = &SPECS[cmd.0 as usize];
-    match &spec.kind {
-        Kind::Held => {
-            if !state.pressed(cmd) {
-                state.just.push(cmd);
-            }
-            state.latched.push((key, bound));
-        }
-        Kind::Edge(lua) => run_lua(script, lua, spec.name),
-        Kind::EdgeUpDown(down, _) => {
-            run_lua(script, down, spec.name);
-            state.latched.push((key, bound));
-        }
-        Kind::Host => {
-            state.fired.push(cmd);
-            if !state.pressed(cmd) {
-                state.just.push(cmd);
-            }
-            state.amounts.push((cmd, 1.0));
+    if let Some(s) = script.as_mut() {
+        if let Err(e) = s.execute_binding(command, true) {
+            warn!("bindings({command}): {e}");
         }
     }
+    state.latched.push((key, command.to_owned()));
 }
 
-/// A base key's release: drop its latch and fire a `runOnUp` up-half, even while typing (the
-/// reference completes a pressed binding's release regardless of focus).
-fn release(
-    state: &mut BindingsState,
-    script: &mut Option<NonSendMut<UiScript>>,
-    run_lua: impl Fn(&mut Option<NonSendMut<UiScript>>, &str, &str),
-    dispatch: &BindingDispatch,
-    key: BindKey,
-) {
+/// A base key's release: drop its latch and run the command's `runOnUp` up-half, even while
+/// typing (the reference completes a pressed binding's release regardless of focus).
+fn release(state: &mut BindingsState, script: &mut Option<NonSendMut<UiScript>>, key: Held) {
     let mut i = 0;
     while i < state.latched.len() {
         if state.latched[i].0 == key {
-            match state.latched.remove(i).1 {
-                Bound::Spec(cmd) => {
-                    if let Kind::EdgeUpDown(_, up) = &SPECS[cmd.0 as usize].kind {
-                        run_lua(script, up, SPECS[cmd.0 as usize].name);
-                    }
-                }
-                // The same body again, with `keystate = "up"`.
-                Bound::Addon(a) => {
-                    if let Some(a) = dispatch.addons.get(a as usize) {
-                        run_addon(script, a, "up");
-                    }
+            let (_, command) = state.latched.remove(i);
+            if let Some(s) = script.as_mut() {
+                if let Err(e) = s.execute_binding(&command, false) {
+                    warn!("bindings({command}): {e}");
                 }
             }
         } else {
@@ -762,30 +583,6 @@ fn release(
     }
 }
 
-/// Run one addon binding's body with the `keystate` global set for the call and restored after.
-///
-/// A `runOnUp` body is one chunk run on press and release, forking on the bare global `keystate`
-/// (`Bindings.xml:4`); it is set in `_G`, not prepended, so the addon's line numbers hold.
-/// `keystate` is absent from the 1.12 client's in-world `_G` (`reference/1.12-globals.tsv`), so
-/// the reference sets it transiently, as it does `this`/`arg1` (`0x703f50` → `0x704f10`).
-/// Save-and-restore because bodies nest: an inner binding must not clear the outer `keystate`.
-fn run_addon(script: &mut Option<NonSendMut<UiScript>>, bind: &AddonBindingBody, keystate: &str) {
-    let Some(s) = script.as_mut() else { return };
-    let globals = s.lua().globals();
-    // `Option<String>`, since benilla-app does not depend on mlua; `None` converts back to nil.
-    let prior: Option<String> = globals.get("keystate").unwrap_or(None);
-    if let Err(e) = globals.set("keystate", keystate) {
-        warn!("bindings({}): setting keystate: {e}", bind.name);
-        return;
-    }
-    if let Err(e) = s.run(&bind.body) {
-        warn!("bindings({}): {e}", bind.name);
-    }
-    if let Err(e) = s.lua().globals().set("keystate", prior) {
-        warn!("bindings({}): restoring keystate: {e}", bind.name);
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use bevy::input::keyboard::{Key, KeyboardInput};
@@ -793,18 +590,53 @@ mod tests {
 
     use super::*;
 
-    /// A minimal app around [`latch_and_dispatch`] with the registry defaults and no VM, fed real
-    /// input events through `InputPlugin` as winit feeds them.
+    /// A core `Bindings.xml` in the reference's shapes over the real binding functions, and bodies
+    /// that count their runs where the stock one would open a window; plus its defaults.
+    const CORE: &str = r#"<Bindings>
+        <Binding name="MOVEANDSTEER" runOnUp="true" header="MOVEMENT">
+            if keystate == "down" then CameraOrSelectOrMoveStart() TurnOrActionStart()
+            else CameraOrSelectOrMoveStop() TurnOrActionStop() end
+        </Binding>
+        <Binding name="MOVEFORWARD" runOnUp="true">
+            if keystate == "down" then MoveForwardStart() else MoveForwardStop() end
+        </Binding>
+        <Binding name="TURNLEFT" runOnUp="true">
+            if keystate == "down" then TurnLeftStart() else TurnLeftStop() end
+        </Binding>
+        <Binding name="JUMP">Jump()</Binding>
+        <Binding name="SITORSTAND">SitOrStand()</Binding>
+        <Binding name="TOGGLESHEATH">ToggleSheath()</Binding>
+        <Binding name="TOGGLEAUTORUN">ToggleAutoRun()</Binding>
+        <Binding name="ACTIONBUTTON1" runOnUp="true" header="ACTIONBAR">AB1 = keystate</Binding>
+        <Binding name="BONUSACTIONBUTTON1" runOnUp="true">PET1 = keystate</Binding>
+        <Binding name="BONUSACTIONBUTTON10" runOnUp="true">PET10 = keystate</Binding>
+        <Binding name="TARGETNEARESTENEMY" header="TARGETING">TABS = (TABS or 0) + 1</Binding>
+        <Binding name="TARGETPREVIOUSENEMY">STABS = (STABS or 0) + 1</Binding>
+        <Binding name="TOGGLECHARACTER3" header="INTERFACE">PETPAPER = 1</Binding>
+        <Binding name="TOGGLEUI" header="MISC">UITOGGLES = (UITOGGLES or 0) + 1</Binding>
+        <Binding name="CAMERAZOOMIN" header="CAMERA">CameraZoomIn(1.0)</Binding>
+        <Binding name="CAMERAZOOMOUT">CameraZoomOut(1.0)</Binding>
+    </Bindings>"#;
+    const DEFAULTS: &str = "bind BUTTON3 MOVEANDSTEER\r\nbind W MOVEFORWARD\r\nbind UP MOVEFORWARD\r\n\
+        bind A TURNLEFT\r\nbind LEFT TURNLEFT\r\nbind SPACE JUMP\r\nbind X SITORSTAND\r\n\
+        bind Z TOGGLESHEATH\r\nbind NUMLOCK TOGGLEAUTORUN\r\nbind BUTTON4 TOGGLEAUTORUN\r\n\
+        bind 1 ACTIONBUTTON1\r\nbind CTRL-1 BONUSACTIONBUTTON1\r\nbind CTRL-0 BONUSACTIONBUTTON10\r\n\
+        bind TAB TARGETNEARESTENEMY\r\nbind SHIFT-TAB TARGETPREVIOUSENEMY\r\n\
+        bind SHIFT-P TOGGLECHARACTER3\r\nbind ALT-Z TOGGLEUI\r\n\
+        bind MOUSEWHEELUP CAMERAZOOMIN\r\nbind MOUSEWHEELDOWN CAMERAZOOMOUT\r\n";
+
+    /// A VM with [`CORE`] declared and [`DEFAULTS`] live, as a first login has them.
+    fn core_script() -> UiScript {
+        let mut script = UiScript::new().expect("VM");
+        script.set_default_bindings(benilla_ui::script::keybind::parse_bindings_wtf(DEFAULTS));
+        script.load_binding_set(1);
+        script.register_bindings(&benilla_ui::bindings_xml::parse(CORE).expect("well-formed"));
+        script
+    }
+
+    /// The dispatch harness over [`core_script`].
     fn harness() -> App {
-        let mut app = App::new();
-        app.add_plugins((MinimalPlugins, bevy::input::InputPlugin))
-            .init_resource::<UiKeyboardCapture>()
-            .init_resource::<PlayerUiHover>()
-            .init_resource::<PointerOverUiPanel>()
-            .init_resource::<BindingsState>()
-            .insert_resource(BindingDispatch::test_defaults())
-            .add_systems(Update, latch_and_dispatch);
-        app
+        vm_harness(core_script())
     }
 
     fn key(app: &mut App, k: KeyCode, state: bevy::input::ButtonState, repeat: bool) {
@@ -830,6 +662,21 @@ mod tests {
     fn state(app: &App) -> &BindingsState {
         app.world().resource::<BindingsState>()
     }
+    fn mouse(app: &mut App, button: MouseButton, state: bevy::input::ButtonState) {
+        app.world_mut().write_message(MouseButtonInput {
+            button,
+            state,
+            window: Entity::PLACEHOLDER,
+        });
+    }
+    fn wheel(app: &mut App, y: f32) {
+        app.world_mut().write_message(MouseWheel {
+            unit: MouseScrollUnit::Line,
+            x: 0.0,
+            y,
+            window: Entity::PLACEHOLDER,
+        });
+    }
 
     /// What a keyboard frame ate this frame. Set, not pushed: `feed_ui_input` rewrites the list
     /// every pass.
@@ -863,6 +710,7 @@ mod tests {
             .init_resource::<PointerOverUiPanel>()
             .init_resource::<BindingsState>()
             .init_resource::<BindingDispatch>()
+            .init_resource::<LayoutNames>()
             .add_systems(Update, (sync_dispatch, latch_and_dispatch).chain());
         app.insert_non_send_resource(script);
         app
@@ -884,16 +732,20 @@ mod tests {
             .expect("eval")
     }
 
-    /// An addon's `runOnUp` body is one chunk run twice, `keystate` "down" then "up"; our own
-    /// registry holds two strings ([`Kind::EdgeUpDown`]) instead.
-    #[test]
-    fn an_addon_binding_fires_its_lua_and_runs_again_on_release_when_it_asked_to() {
-        let mut script = UiScript::new().expect("VM");
-        script.register_bindings(&registry_commands());
+    fn with_addon(bindings: &str) -> UiScript {
+        let mut script = core_script();
         script.register_addon_bindings(
             "ProbeAddon",
-            &benilla_ui::bindings_xml::parse(PROBE_BINDINGS).expect("well-formed"),
+            &benilla_ui::bindings_xml::parse(bindings).expect("well-formed"),
         );
+        script
+    }
+
+    /// A `runOnUp` body is one chunk run twice, `keystate` "down" then "up"; a plain one runs on
+    /// the press alone. The core's and an addon's rows dispatch the same way.
+    #[test]
+    fn a_binding_fires_its_lua_and_runs_again_on_release_when_it_asked_to() {
+        let script = with_addon(PROBE_BINDINGS);
         // A 1.12 `<Binding>` ships no default chord, so an addon binding starts unbound.
         script
             .run(r#"SetBinding("J", "PROBEHOLD"); SetBinding("G", "PROBEEDGE")"#)
@@ -906,7 +758,7 @@ mod tests {
         assert_eq!(
             lua_count(&app, "PROBE_DOWN"),
             1,
-            "the press must reach the addon's body — this is the phase-4 bug"
+            "the press reaches the body"
         );
         assert_eq!(lua_str(&app, "PROBE_LAST"), "down");
         assert_eq!(
@@ -938,23 +790,14 @@ mod tests {
             "no runOnUp, no second run — an addon that toggled here would toggle back"
         );
 
-        // The registry dispatches unchanged beside them.
+        // The core's rows dispatch beside them.
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
-        assert_eq!(
-            lua_count(&app, "PROBE_DOWN"),
-            1,
-            "a built-in press is nobody else's"
-        );
+        assert!(state(&app).pressed(Input::MoveForward));
+        assert_eq!(lua_count(&app, "PROBE_DOWN"), 1, "W is nobody else's");
 
-        // `keystate` does not outlive the call: the 1.12 client's in-world `_G` has none
-        // (`reference/1.12-globals.tsv`).
-        assert_eq!(
-            lua_str(&app, "tostring(keystate)"),
-            "nil",
-            "keystate must be restored after a binding body runs, not left standing in _G"
-        );
+        // `keystate` does not outlive the call: `RunCommand` sets it to nil (`0x4b7c42`).
+        assert_eq!(lua_str(&app, "tostring(keystate)"), "nil");
     }
 
     /// A focused EditBox swallows every key (the reference's handler returns 1 on every path,
@@ -970,7 +813,7 @@ mod tests {
         press_key(&mut app, KeyCode::ArrowLeft);
         app.update();
         assert!(
-            !state(&app).pressed(cmd::TURN_LEFT),
+            !state(&app).pressed(Input::TurnLeft),
             "an unflagged focused box eats the arrow"
         );
         release_key(&mut app, KeyCode::ArrowLeft);
@@ -983,7 +826,7 @@ mod tests {
         press_key(&mut app, KeyCode::ArrowLeft);
         app.update();
         assert!(
-            state(&app).pressed(cmd::TURN_LEFT),
+            state(&app).pressed(Input::TurnLeft),
             "a flagged box declines the arrow, so TURNLEFT runs"
         );
 
@@ -991,7 +834,7 @@ mod tests {
         press_key(&mut app, KeyCode::KeyW);
         app.update();
         assert!(
-            !state(&app).pressed(cmd::MOVE_FORWARD),
+            !state(&app).pressed(Input::MoveForward),
             "only the arrows are exempt — every other key a focused box still eats"
         );
     }
@@ -1000,26 +843,21 @@ mod tests {
     /// direction bits rather than clearing them (`0x514490` is the OS window-deactivate clear).
     #[test]
     fn a_held_latch_rides_out_a_box_taking_focus_and_still_releases() {
-        let mut script = UiScript::new().expect("VM");
-        script.register_bindings(&registry_commands());
-        script.register_addon_bindings(
-            "ProbeAddon",
-            &benilla_ui::bindings_xml::parse(PROBE_BINDINGS).expect("well-formed"),
-        );
+        let script = with_addon(PROBE_BINDINGS);
         script.run(r#"SetBinding("J", "PROBEHOLD")"#).expect("bind");
         let mut app = vm_harness(script);
 
         press_key(&mut app, KeyCode::KeyW);
         press_key(&mut app, KeyCode::KeyJ);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
         assert_eq!(lua_count(&app, "PROBE_DOWN"), 1);
 
         // A box takes focus; both latches ride it out.
         app.world_mut().resource_mut::<UiKeyboardCapture>().typing = true;
         app.update();
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "holding W and opening the chat box keeps you running"
         );
         assert_eq!(
@@ -1033,7 +871,7 @@ mod tests {
         release_key(&mut app, KeyCode::KeyJ);
         app.update();
         assert!(
-            !state(&app).pressed(cmd::MOVE_FORWARD),
+            !state(&app).pressed(Input::MoveForward),
             "releasing W stops you, while typing exactly as otherwise"
         );
         assert_eq!(
@@ -1043,69 +881,17 @@ mod tests {
         );
     }
 
-    /// The armed capture seam, driven by a real wheel event.
-    #[test]
-    fn an_armed_capture_takes_a_wheel_notch() {
-        let mut script = UiScript::new().expect("VM");
-        script.register_bindings(&registry_commands());
-        script
-            .run(
-                r#"CAPTURED = nil
-                   function KeyBindings_OnHostKey(chord) CAPTURED = chord end
-                   BenillaBindCapture(true)"#,
-            )
-            .expect("arm");
-        let mut app = vm_harness(script);
-
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 1.0,
-            window: Entity::PLACEHOLDER,
-        });
-        app.update();
-        assert_eq!(
-            lua_str(&app, "tostring(CAPTURED)"),
-            "MOUSEWHEELUP",
-            "a wheel notch while armed is a binding key"
-        );
-        assert!(
-            !state(&app).fired(cmd::CAMERA_ZOOM_IN),
-            "the armed seam swallows the notch — it must not also zoom"
-        );
-
-        // Down, and a modified notch.
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: -1.0,
-            window: Entity::PLACEHOLDER,
-        });
-        app.update();
-        assert_eq!(lua_str(&app, "tostring(CAPTURED)"), "MOUSEWHEELDOWN");
-        press_key(&mut app, KeyCode::ShiftLeft);
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 1.0,
-            window: Entity::PLACEHOLDER,
-        });
-        app.update();
-        assert_eq!(lua_str(&app, "tostring(CAPTURED)"), "SHIFT-MOUSEWHEELUP");
-    }
-
-    /// The whole wheel-bind path: the real Keybindings page, a capsule armed by a click, a real
-    /// notch, then the bound chord dispatching.
+    /// The whole wheel-bind path: the real Keybindings page over the stock commands, a capsule
+    /// armed by a click, a notch over the page (its OnMouseWheel, as 1.12's window binds it), then
+    /// the bound chord dispatching the stock JUMP body.
     #[test]
     fn a_wheel_notch_binds_through_the_real_page_and_then_dispatches() {
         benilla_formats::wow_data_or_skip!();
-        let by_name =
-            |n: &str| Cmd(SPECS.iter().position(|s| s.name == n).expect("registered") as u16);
         let mut s = crate::ui_script::keybindings_tests::harness();
         crate::ui_script::keybindings_tests::on_page(&mut s);
         const ROW: &str = "BenillaOptionsFrameContainerBodyKeybindingsRow";
-        // Expand Movement and arm JUMP's first capsule: JUMP is not `runOnUp`, so the reference
-        // accepts the wheel on it.
+        // Expand Movement and arm JUMP's first capsule: the reference accepts the wheel on any
+        // command.
         s.run(&format!("{ROW}1Header:Click()")).expect("expand");
         s.run(&format!("{ROW}9Key1Button:Click()")).expect("select");
         assert_eq!(
@@ -1113,69 +899,50 @@ mod tests {
                 .unwrap(),
             crate::ui_script::keybindings_tests::label(&s, "BINDING_NAME_JUMP", "JUMP")
         );
-        assert!(s.bind_capture_armed());
+        s.resolve();
+        let (x, y): (f32, f32) = s
+            .eval(&format!(
+                "return ({ROW}5:GetLeft() + {ROW}5:GetRight()) / 2, \
+                        ({ROW}5:GetTop() + {ROW}5:GetBottom()) / 2"
+            ))
+            .unwrap();
+        s.mouse_wheel(x, y, 1.0);
+        assert_eq!(
+            s.eval::<String>(r#"return GetBindingAction("MOUSEWHEELUP")"#)
+                .unwrap(),
+            "JUMP",
+            "a notch on an armed capsule is a bind"
+        );
+        assert!(
+            s.eval::<bool>("return BenillaKeyBindingsPage.selected == nil")
+                .unwrap(),
+            "the completed bind disarms"
+        );
         let mut app = vm_harness(s);
 
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 1.0,
-            window: Entity::PLACEHOLDER,
-        });
-        app.update();
-        {
-            let s = app.world().non_send_resource::<UiScript>();
-            assert_eq!(
-                s.eval::<String>(r#"return GetBindingAction("MOUSEWHEELUP")"#)
-                    .unwrap(),
-                "JUMP",
-                "a notch on an armed capsule is a bind"
-            );
-            assert!(!s.bind_capture_armed(), "the completed bind disarms");
-        }
-
         // The bound chord now dispatches: the next notch jumps rather than binding.
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 1.0,
-            window: Entity::PLACEHOLDER,
-        });
+        wheel(&mut app, 1.0);
         app.update();
-        assert!(state(&app).fired(by_name("JUMP")));
+        assert!(state(&app).fired(Input::Jump));
         assert!(
-            !state(&app).fired(cmd::CAMERA_ZOOM_IN),
+            !state(&app).fired(Input::CameraZoomIn),
             "JUMP stole the wheel from the camera, the 1.12 steal law"
         );
     }
 
     /// A notch is a press and its release (`0x483d6f`, `0x483d82`), so a `runOnUp` binding on the
-    /// wheel runs both halves in one frame. Seeded through the stored set, since `SetBinding`
-    /// refuses a wheel chord on a press-and-release command: the hand-edited file case.
+    /// wheel runs both halves in one frame.
     #[test]
     fn a_wheel_notch_runs_both_halves_of_a_press_and_release_binding() {
-        let mut script = UiScript::new().expect("VM");
-        script.register_bindings(&registry_commands());
-        script.register_addon_bindings(
-            "ProbeAddon",
-            &benilla_ui::bindings_xml::parse(PROBE_BINDINGS).expect("well-formed"),
-        );
+        let mut script = with_addon(PROBE_BINDINGS);
         script.seed_binding_set(
             1,
-            Some(vec![(
-                "PROBEHOLD".to_string(),
-                vec!["MOUSEWHEELUP".to_string()],
-            )]),
+            Some(vec![("MOUSEWHEELUP".to_string(), "PROBEHOLD".to_string())]),
         );
         script.load_binding_set(1);
         let mut app = vm_harness(script);
 
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 1.0,
-            window: Entity::PLACEHOLDER,
-        });
+        wheel(&mut app, 1.0);
         app.update();
         assert_eq!(lua_count(&app, "PROBE_DOWN"), 1, "the notch's press half");
         assert_eq!(
@@ -1199,29 +966,29 @@ mod tests {
         let mut app = harness();
         press_key(&mut app, KeyCode::Space);
         app.update();
-        assert!(state(&app).fired(cmd::JUMP), "the first press jumps");
+        assert!(state(&app).fired(Input::Jump), "the first press jumps");
 
-        // (1) JUMP never latches, so only the pressed-key set stops a jump per repeat.
+        // (1) Only the pressed-key set stops a jump per repeat.
         repeat_key(&mut app, KeyCode::Space);
         app.update();
         assert!(
-            !state(&app).fired(cmd::JUMP),
+            !state(&app).fired(Input::Jump),
             "a repeat of a key already down is not a press"
         );
 
         // Movement, so the resume below has something to observe.
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
 
         // (3) The window is deactivated: bevy empties the keyboard plane, which unlatches through
-        // the stuck-latch sweep and empties our pressed-key set.
+        // the stuck-latch sweep, whose up-half runs the Stop, and empties our pressed-key set.
         app.world_mut()
             .resource_mut::<ButtonInput<KeyCode>>()
             .release_all();
         app.update();
         assert!(
-            !state(&app).pressed(cmd::MOVE_FORWARD),
+            !state(&app).pressed(Input::MoveForward),
             "the deactivate releases the direction bits (0x514490)"
         );
 
@@ -1230,44 +997,147 @@ mod tests {
         repeat_key(&mut app, KeyCode::KeyW);
         app.update();
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "the first repeat after re-activation re-latches"
         );
     }
 
+    /// An addon's bindings that call the movement functions: a Start and a Stop alone.
+    const MOVE_BINDINGS: &str = r#"<Bindings>
+        <Binding name="PROBEGO">MoveForwardStart()</Binding>
+        <Binding name="PROBESTOP">MoveForwardStop()</Binding>
+    </Bindings>"#;
+
+    /// `MoveForwardStart`/`Stop` set and clear the bit the W key's body does (`0x515090(0x10, …)`):
+    /// a Start with no Stop keeps moving, a Stop clears it whoever set it, and outside a binding
+    /// body the gate (`0x494a50`) refuses the call.
     #[test]
-    fn held_commands_latch_across_frames_and_release_per_base_key() {
-        let mut app = harness();
-        // W and UP are both MOVEFORWARD: press both, release one, still moving.
+    fn the_movement_functions_drive_the_held_state_as_the_key_does() {
+        let script = with_addon(MOVE_BINDINGS);
+        script
+            .run(r#"SetBinding("K", "PROBEGO"); SetBinding("L", "PROBESTOP")"#)
+            .expect("bind");
+        let mut app = vm_harness(script);
+        let tap = |app: &mut App, k: KeyCode| {
+            press_key(app, k);
+            app.update();
+            release_key(app, k);
+            app.update();
+        };
+
+        // The `runOnUp` pair: forward from the press frame, stopped on the release.
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
-        assert!(state(&app).just_pressed(cmd::MOVE_FORWARD), "press edge");
+        assert!(state(&app).pressed(Input::MoveForward));
+        assert!(
+            state(&app).just_pressed(Input::MoveForward),
+            "the press edge"
+        );
+        app.update();
+        assert!(
+            state(&app).pressed(Input::MoveForward),
+            "held across frames"
+        );
+        assert!(!state(&app).just_pressed(Input::MoveForward));
+        release_key(&mut app, KeyCode::KeyW);
+        app.update();
+        assert!(!state(&app).pressed(Input::MoveForward));
+
+        // A Start with no Stop keeps moving past its key's release; the Stop ends it.
+        tap(&mut app, KeyCode::KeyK);
+        app.update();
+        assert!(
+            state(&app).pressed(Input::MoveForward),
+            "no Stop, still moving"
+        );
+        tap(&mut app, KeyCode::KeyL);
+        assert!(!state(&app).pressed(Input::MoveForward));
+
+        // W's release runs MOVEFORWARD's Stop, which clears a Lua Start too.
+        tap(&mut app, KeyCode::KeyK);
+        tap(&mut app, KeyCode::KeyW);
+        assert!(!state(&app).pressed(Input::MoveForward));
+        // And a Stop clears the bit under a held key, which stays stopped until pressed again.
+        press_key(&mut app, KeyCode::KeyW);
+        app.update();
+        tap(&mut app, KeyCode::KeyL);
+        assert!(!state(&app).pressed(Input::MoveForward));
+        release_key(&mut app, KeyCode::KeyW);
+        app.update();
+
+        // Outside a binding body (a macro, `RunScript`, an addon's own code) nothing moves.
+        app.world()
+            .non_send_resource::<UiScript>()
+            .run("MoveForwardStart() Jump() ToggleAutoRun() RunBinding('MOVEFORWARD')")
+            .expect("the calls answer");
+        app.update();
+        assert!(!state(&app).pressed(Input::MoveForward));
+        assert!(!state(&app).fired(Input::Jump));
+        assert!(!state(&app).fired(Input::ToggleAutoRun));
+    }
+
+    /// The ungated one-shots fire as the keys do: `CameraZoomIn(yards)` carries its amount to the
+    /// zoom (1.0 when absent, `0x50b42d`), `SitOrStand` and `ToggleSheath` fire.
+    #[test]
+    fn the_one_shot_functions_fire_their_inputs() {
+        let mut app = harness();
+        let run = |app: &mut App, lua: &str| {
+            app.world()
+                .non_send_resource::<UiScript>()
+                .run(lua)
+                .expect("the call answers");
+            app.update();
+        };
+        run(&mut app, "CameraZoomIn(3)");
+        assert!(state(&app).fired(Input::CameraZoomIn));
+        assert_eq!(state(&app).amount(Input::CameraZoomIn), 3.0);
+        run(&mut app, "CameraZoomOut()");
+        assert_eq!(state(&app).amount(Input::CameraZoomOut), 1.0);
+        assert_eq!(
+            state(&app).amount(Input::CameraZoomIn),
+            0.0,
+            "one frame only"
+        );
+        run(&mut app, "SitOrStand()");
+        assert!(state(&app).fired(Input::SitOrStand));
+        run(&mut app, "ToggleSheath()");
+        assert!(state(&app).fired(Input::ToggleSheath));
+        assert!(!state(&app).fired(Input::SitOrStand));
+    }
+
+    /// Two keys on one command share its one bit: W and UP both run MOVEFORWARD's body, so the
+    /// second Start is no new edge (`0x514840`) and either release's Stop clears the bit whoever
+    /// set it (`0x514b70`).
+    #[test]
+    fn two_keys_on_one_command_share_its_bit_so_either_release_stops_it() {
+        let mut app = harness();
+        press_key(&mut app, KeyCode::KeyW);
+        app.update();
+        assert!(state(&app).pressed(Input::MoveForward));
+        assert!(state(&app).just_pressed(Input::MoveForward), "press edge");
         press_key(&mut app, KeyCode::ArrowUp);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
         assert!(
-            !state(&app).just_pressed(cmd::MOVE_FORWARD),
+            !state(&app).just_pressed(Input::MoveForward),
             "second key on an already-held command is no new edge"
         );
         release_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD), "UP still holds it");
+        assert!(
+            !state(&app).pressed(Input::MoveForward),
+            "W's Stop clears the bit though UP is still down"
+        );
         release_key(&mut app, KeyCode::ArrowUp);
         app.update();
-        assert!(!state(&app).pressed(cmd::MOVE_FORWARD));
-        // A repeat press (held-key auto-repeat) neither re-latches nor re-edges.
+        assert!(!state(&app).pressed(Input::MoveForward));
+        // A repeat press (held-key auto-repeat) neither re-runs nor re-edges.
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        key(
-            &mut app,
-            KeyCode::KeyW,
-            bevy::input::ButtonState::Pressed,
-            true,
-        );
+        repeat_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
-        assert!(!state(&app).just_pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
+        assert!(!state(&app).just_pressed(Input::MoveForward));
     }
 
     /// The two-probe lookup: the exact chord, then one retry with the leftmost modifier dropped,
@@ -1275,129 +1145,215 @@ mod tests {
     #[test]
     fn a_press_probes_its_chord_then_falls_back_once() {
         // Shift held, W pressed: `SHIFT-W` is unbound, so the retry drops SHIFT and MOVEFORWARD
-        // latches (the reference's `strchr` step, `0x4b7990`).
+        // runs (the reference's `strchr` step, `0x4b7990`).
         let mut app = harness();
         press_key(&mut app, KeyCode::ShiftLeft);
         press_key(&mut app, KeyCode::KeyW);
         app.update();
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "an unbound SHIFT-W falls back to W, the modifier dropped"
         );
-        // It unlatches on the base key with the modifier still down (the reference replays the
-        // press-time chord at key-up, `0x483bd0`; latching the resolved command is equivalent).
+        // It releases on the base key with the modifier still down (the reference replays the
+        // press-time chord at key-up, `0x483bd0`).
         release_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(!state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(!state(&app).pressed(Input::MoveForward));
         // Bare Z is the sheath toggle, ALT-Z is TOGGLEUI: the exact probe runs first, so a
         // fallback never overrides a real entry.
         let mut app = harness();
         press_key(&mut app, KeyCode::KeyZ);
         app.update();
-        assert!(state(&app).fired(cmd::TOGGLE_SHEATH));
-        assert!(!state(&app).fired(cmd::TOGGLE_UI));
+        assert!(state(&app).fired(Input::ToggleSheath));
+        assert_eq!(lua_count(&app, "UITOGGLES"), 0);
         release_key(&mut app, KeyCode::KeyZ);
         press_key(&mut app, KeyCode::AltLeft);
         press_key(&mut app, KeyCode::KeyZ);
         app.update();
-        assert!(
-            state(&app).fired(cmd::TOGGLE_UI),
+        assert_eq!(
+            lua_count(&app, "UITOGGLES"),
+            1,
             "ALT-Z is TOGGLEUI: the exact chord probes first"
         );
-        assert!(!state(&app).fired(cmd::TOGGLE_SHEATH));
-        // CTRL-ALT-Z fires nothing: the single strip drops the leftmost modifier (`ALT-CTRL-Z`
+        assert!(!state(&app).fired(Input::ToggleSheath));
+        // CTRL-ALT-Z runs nothing: the single strip drops the leftmost modifier (`ALT-CTRL-Z`
         // to `CTRL-Z`, unbound) and stops, never reaching ALT-Z or Z.
         release_key(&mut app, KeyCode::KeyZ);
         press_key(&mut app, KeyCode::ControlLeft);
         press_key(&mut app, KeyCode::KeyZ);
         app.update();
         assert!(
-            !state(&app).fired(cmd::TOGGLE_UI) && !state(&app).fired(cmd::TOGGLE_SHEATH),
+            lua_count(&app, "UITOGGLES") == 1 && !state(&app).fired(Input::ToggleSheath),
             "ALT-CTRL-Z probes CTRL-Z and stops — no second strip to ALT-Z or Z"
         );
         // TAB and SHIFT-TAB are both bound, so each resolves exactly.
         let mut app = harness();
         press_key(&mut app, KeyCode::Tab);
         app.update();
-        assert!(state(&app).fired(cmd::TARGET_NEAREST_ENEMY));
+        assert_eq!(lua_count(&app, "TABS"), 1);
         release_key(&mut app, KeyCode::Tab);
         press_key(&mut app, KeyCode::ShiftLeft);
         press_key(&mut app, KeyCode::Tab);
         app.update();
-        assert!(state(&app).fired(cmd::TARGET_PREVIOUS_ENEMY));
-        assert!(!state(&app).fired(cmd::TARGET_NEAREST_ENEMY));
-        // Super is never a binding modifier: a Super-held press builds no chord, so no fallback.
+        assert_eq!(lua_count(&app, "STABS"), 1);
+        assert_eq!(lua_count(&app, "TABS"), 1);
+        // The Super deviation: a Super-held press runs no binding, not even its bare key's.
         let mut app = harness();
         press_key(&mut app, KeyCode::SuperLeft);
         press_key(&mut app, KeyCode::KeyZ);
         app.update();
-        assert!(!state(&app).fired(cmd::TOGGLE_SHEATH));
+        assert!(!state(&app).fired(Input::ToggleSheath));
     }
 
-    /// The dev plane spends the keyboard's fallback probe and nothing else. Asserted on
-    /// [`BindingDispatch::resolve`] because the colliding command is `Kind::Edge`, which the no-VM
-    /// harness cannot observe.
+    /// What the layout names `k`, as `layout::record_layout_names` records it from the key's own
+    /// OS message, ahead of the press.
+    fn layout_key(app: &mut App, k: KeyCode, name: char) {
+        app.world_mut()
+            .resource_mut::<LayoutNames>()
+            .set(k, Some(layout::LayoutName::Char(name)));
+    }
+
+    /// A press with the logical key the OS reports, modifiers applied.
+    fn type_key(app: &mut App, k: KeyCode, logical: &str) {
+        app.world_mut().write_message(KeyboardInput {
+            key_code: k,
+            logical_key: Key::Character(logical.into()),
+            state: bevy::input::ButtonState::Pressed,
+            text: Some(logical.into()),
+            repeat: false,
+            window: Entity::PLACEHOLDER,
+        });
+    }
+
+    /// 1.12 binds a key by what its layout names it: on AZERTY the key where a US W sits is
+    /// `VK_Z` and runs `Z`'s binding, and `W`'s moves to the key labelled W. Shift is a prefix,
+    /// never part of the name.
+    #[test]
+    fn a_key_runs_the_binding_of_what_its_layout_names_it() {
+        let script = core_script();
+        script
+            .run(
+                r#"SetBinding("SHIFT-Z", "TOGGLEUI"); SetBinding("SHIFT-1", "TARGETPREVIOUSENEMY");
+                SetBinding("SHIFT-;", "TARGETNEARESTENEMY")"#,
+            )
+            .expect("bind");
+        let mut app = vm_harness(script);
+        layout_key(&mut app, KeyCode::KeyW, 'Z');
+        layout_key(&mut app, KeyCode::KeyZ, 'W');
+        type_key(&mut app, KeyCode::KeyW, "z");
+        app.update();
+        assert!(
+            state(&app).fired(Input::ToggleSheath),
+            "the key labelled Z is Z"
+        );
+        assert!(!state(&app).pressed(Input::MoveForward));
+        release_key(&mut app, KeyCode::KeyW);
+        type_key(&mut app, KeyCode::KeyZ, "w");
+        app.update();
+        assert!(
+            state(&app).pressed(Input::MoveForward),
+            "the key labelled W is W"
+        );
+        release_key(&mut app, KeyCode::KeyZ);
+        app.update();
+        assert!(
+            !state(&app).pressed(Input::MoveForward),
+            "its release ends it"
+        );
+        // Shift makes the character `Z`, and the chord `SHIFT-Z`.
+        press_key(&mut app, KeyCode::ShiftLeft);
+        type_key(&mut app, KeyCode::KeyW, "Z");
+        app.update();
+        assert_eq!(lua_count(&app, "UITOGGLES"), 1, "SHIFT-Z");
+        release_key(&mut app, KeyCode::KeyW);
+        // Shift+1 makes `!` on a US layout, and is `SHIFT-1`.
+        type_key(&mut app, KeyCode::Digit1, "!");
+        app.update();
+        assert_eq!(lua_count(&app, "STABS"), 1, "SHIFT-1, never SHIFT-!");
+        release_key(&mut app, KeyCode::Digit1);
+        // And Shift+; makes `:`, and is `SHIFT-;`.
+        type_key(&mut app, KeyCode::Semicolon, ":");
+        app.update();
+        assert_eq!(lua_count(&app, "TABS"), 1, "SHIFT-;, never SHIFT-:");
+    }
+
+    /// A key's name follows a layout switch while running: its next press is named under the
+    /// layout it was typed in.
+    #[test]
+    fn a_layout_switch_renames_a_key_at_its_next_press() {
+        let mut app = harness();
+        layout_key(&mut app, KeyCode::KeyW, 'Z');
+        type_key(&mut app, KeyCode::KeyW, "z");
+        app.update();
+        assert!(state(&app).fired(Input::ToggleSheath));
+        release_key(&mut app, KeyCode::KeyW);
+        app.update();
+        // Back on a US layout, the key's next message reports `w`.
+        layout_key(&mut app, KeyCode::KeyW, 'W');
+        type_key(&mut app, KeyCode::KeyW, "w");
+        app.update();
+        assert!(state(&app).pressed(Input::MoveForward));
+        assert!(!state(&app).fired(Input::ToggleSheath));
+    }
+
+    /// The dev plane spends the keyboard's fallback probe and nothing else, asserted on
+    /// [`BindingDispatch::resolve`] itself.
     #[test]
     fn the_dev_plane_keeps_its_letters_without_stealing_bound_chords() {
-        let by_name =
-            |n: &str| Cmd(SPECS.iter().position(|s| s.name == n).expect("registered") as u16);
-        let pet_paper_doll = by_name("TOGGLECHARACTER3"); // SHIFT-P
-        let mut dispatch = BindingDispatch::test_defaults();
+        let mut app = harness();
+        app.update();
+        let mut dispatch = app
+            .world_mut()
+            .remove_resource::<BindingDispatch>()
+            .expect("synced");
         let plane_p = Chord::parse("CTRL-SHIFT-P").expect("parses");
         // Ctrl+Shift+P is the perf HUD's; off the plane it falls back onto SHIFT-P...
         assert_eq!(
             dispatch.resolve(plane_p, false),
-            Some(Bound::Spec(pet_paper_doll)),
+            Some("TOGGLECHARACTER3"),
             "without the plane rule the retry does reach SHIFT-P — this is what is being blocked"
         );
         // ...so on the plane the retry is suppressed.
         assert_eq!(dispatch.resolve(plane_p, true), None);
         // Only the fallback is suppressed: an exact CTRL-SHIFT- entry, as a player would bind,
         // still resolves.
-        dispatch.map.insert(plane_p, Bound::Spec(pet_paper_doll));
+        dispatch.map.insert(plane_p, "TOGGLECHARACTER3".into());
         assert_eq!(
             dispatch.resolve(plane_p, true),
-            Some(Bound::Spec(pet_paper_doll)),
+            Some("TOGGLECHARACTER3"),
             "the plane spends the retry, never the exact probe"
         );
-        // SHIFT-P itself is still the pet paper doll.
         let shift_p = Chord::parse("SHIFT-P").expect("parses");
-        assert_eq!(
-            dispatch.resolve(shift_p, false),
-            Some(Bound::Spec(pet_paper_doll))
-        );
+        assert_eq!(dispatch.resolve(shift_p, false), Some("TOGGLECHARACTER3"));
     }
 
     /// The pet bar routes on the CTRL digits and the number row is untouched: the two share base
     /// keys, kept apart only by the exact-modifier probe. CTRL-0 is slot 10.
     #[test]
     fn the_pet_lane_dispatches_on_the_ctrl_digits() {
-        let by_name =
-            |n: &str| Cmd(SPECS.iter().position(|s| s.name == n).expect("registered") as u16);
         let mut app = harness();
         press_key(&mut app, KeyCode::ControlLeft);
         press_key(&mut app, KeyCode::Digit1);
         app.update();
-        assert!(state(&app).pressed(by_name("BONUSACTIONBUTTON1")));
-        assert!(
-            !state(&app).pressed(by_name("ACTIONBUTTON1")),
+        assert_eq!(lua_str(&app, "PET1"), "down");
+        assert_eq!(
+            lua_str(&app, "AB1"),
+            "",
             "the modifier decides: CTRL-1 is not the number row's"
         );
-        // The latch drops on the base key's release with Ctrl still held; in the VM that release
-        // runs `PetActionButtonUp`, which casts.
+        // The release runs the up half with Ctrl still held.
         release_key(&mut app, KeyCode::Digit1);
         app.update();
-        assert!(!state(&app).pressed(by_name("BONUSACTIONBUTTON1")));
-        // CTRL-0 is slot 10.
+        assert_eq!(lua_str(&app, "PET1"), "up");
         press_key(&mut app, KeyCode::Digit0);
         app.update();
-        assert!(state(&app).pressed(by_name("BONUSACTIONBUTTON10")));
-        // Bare 1 is still the action bar's, with no pet command in sight.
+        assert_eq!(lua_str(&app, "PET10"), "down", "CTRL-0 is slot 10");
+        // Bare 1 is still the action bar's.
         let mut app = harness();
         press_key(&mut app, KeyCode::Digit1);
         app.update();
-        assert!(state(&app).pressed(by_name("ACTIONBUTTON1")));
-        assert!(!state(&app).pressed(by_name("BONUSACTIONBUTTON1")));
+        assert_eq!(lua_str(&app, "AB1"), "down");
+        assert_eq!(lua_str(&app, "PET1"), "");
     }
 
     /// The typing gate blocks new presses and releases nothing already held: holding W and
@@ -1407,25 +1363,25 @@ mod tests {
         let mut app = harness();
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
         // A box takes focus. You keep running, and new presses type instead of binding.
         app.world_mut().resource_mut::<UiKeyboardCapture>().typing = true;
         app.update();
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "the capture edge is not a release — holding W keeps you running while you type"
         );
         press_key(&mut app, KeyCode::KeyX);
         app.update();
         assert!(
-            !state(&app).fired(cmd::SIT_OR_STAND),
+            !state(&app).fired(Input::SitOrStand),
             "typed keys are not bindings"
         );
         // Letting go still stops you, box focused or not.
         release_key(&mut app, KeyCode::KeyW);
         app.update();
         assert!(
-            !state(&app).pressed(cmd::MOVE_FORWARD),
+            !state(&app).pressed(Input::MoveForward),
             "the release is delivered regardless of focus"
         );
         // Focus drops; keys work again.
@@ -1434,7 +1390,7 @@ mod tests {
         app.update();
         press_key(&mut app, KeyCode::KeyX);
         app.update();
-        assert!(state(&app).fired(cmd::SIT_OR_STAND));
+        assert!(state(&app).fired(Input::SitOrStand));
     }
 
     /// A shown keyboard frame eating the key that closes it costs that key its binding and
@@ -1445,15 +1401,13 @@ mod tests {
         let mut app = harness();
         press_key(&mut app, KeyCode::KeyW);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_FORWARD));
+        assert!(state(&app).pressed(Input::MoveForward));
 
-        // The map eats this frame's `M`. `M` is `Kind::Edge`, invisible to a no-VM harness, so
-        // the suppression is asserted on `X` below.
         frame_ate(&mut app, &[KeyCode::KeyM]);
         press_key(&mut app, KeyCode::KeyM);
         app.update();
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "the frame ate the toggle key; you are still running"
         );
 
@@ -1464,7 +1418,7 @@ mod tests {
         press_key(&mut app, KeyCode::KeyX);
         app.update();
         assert!(
-            !state(&app).fired(cmd::SIT_OR_STAND),
+            !state(&app).fired(Input::SitOrStand),
             "the frame ate this key: its binding must not also fire"
         );
 
@@ -1475,11 +1429,11 @@ mod tests {
         press_key(&mut app, KeyCode::KeyX);
         app.update();
         assert!(
-            state(&app).fired(cmd::SIT_OR_STAND),
+            state(&app).fired(Input::SitOrStand),
             "consumption is per key, not per frame"
         );
         assert!(
-            state(&app).pressed(cmd::MOVE_FORWARD),
+            state(&app).pressed(Input::MoveForward),
             "and W has been held throughout"
         );
     }
@@ -1488,78 +1442,99 @@ mod tests {
     fn mouse_buttons_bind_only_over_the_world_and_the_wheel_respects_ui() {
         let mut app = harness();
         // BUTTON4 (winit Forward) is TOGGLEAUTORUN's second default.
-        app.world_mut().write_message(MouseButtonInput {
-            button: MouseButton::Forward,
-            state: bevy::input::ButtonState::Pressed,
-            window: Entity::PLACEHOLDER,
-        });
+        mouse(&mut app, MouseButton::Forward, ButtonState::Pressed);
         app.update();
-        assert!(state(&app).fired(cmd::TOGGLE_AUTORUN));
+        assert!(state(&app).fired(Input::ToggleAutoRun));
         // Over a UI frame the press belongs to the frame.
-        app.world_mut().write_message(MouseButtonInput {
-            button: MouseButton::Forward,
-            state: bevy::input::ButtonState::Released,
-            window: Entity::PLACEHOLDER,
-        });
+        mouse(&mut app, MouseButton::Forward, ButtonState::Released);
         app.update();
         app.world_mut().resource_mut::<PlayerUiHover>().0 = Some(7);
-        app.world_mut().write_message(MouseButtonInput {
-            button: MouseButton::Forward,
-            state: bevy::input::ButtonState::Pressed,
-            window: Entity::PLACEHOLDER,
-        });
+        mouse(&mut app, MouseButton::Forward, ButtonState::Pressed);
         app.update();
-        assert!(!state(&app).fired(cmd::TOGGLE_AUTORUN));
-        // MOVEANDSTEER (BUTTON3) is a HELD command on a mouse button: press latches, release ends.
+        assert!(!state(&app).fired(Input::ToggleAutoRun));
+        // MOVEANDSTEER (BUTTON3): its body holds both mouse bits, the both-button run, until the
+        // release's Stops.
         let mut app = harness();
-        app.world_mut().write_message(MouseButtonInput {
-            button: MouseButton::Middle,
-            state: bevy::input::ButtonState::Pressed,
-            window: Entity::PLACEHOLDER,
-        });
+        mouse(&mut app, MouseButton::Middle, ButtonState::Pressed);
         app.update();
-        assert!(state(&app).pressed(cmd::MOVE_AND_STEER));
-        app.world_mut().write_message(MouseButtonInput {
-            button: MouseButton::Middle,
-            state: bevy::input::ButtonState::Released,
-            window: Entity::PLACEHOLDER,
-        });
+        assert!(state(&app).steering() && state(&app).steering_began());
         app.update();
-        assert!(!state(&app).pressed(cmd::MOVE_AND_STEER));
-        // The wheel: a notch fires CAMERAZOOMIN with its amount; over UI it belongs to the frame.
+        assert!(state(&app).steering() && !state(&app).steering_began());
+        mouse(&mut app, MouseButton::Middle, ButtonState::Released);
+        app.update();
+        assert!(!state(&app).steering());
+        // The wheel: each notch runs CAMERAZOOMIN's `CameraZoomIn(1.0)`; over UI it belongs to
+        // the frame.
         let mut app = harness();
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 2.0,
-            window: Entity::PLACEHOLDER,
-        });
+        wheel(&mut app, 2.0);
         app.update();
-        assert!(state(&app).fired(cmd::CAMERA_ZOOM_IN));
-        assert_eq!(state(&app).amount(cmd::CAMERA_ZOOM_IN), 2.0);
+        assert!(state(&app).fired(Input::CameraZoomIn));
+        assert_eq!(state(&app).amount(Input::CameraZoomIn), 2.0, "two notches");
         app.world_mut().resource_mut::<PointerOverUiPanel>().0 = true;
-        app.world_mut().write_message(MouseWheel {
-            unit: MouseScrollUnit::Line,
-            x: 0.0,
-            y: 2.0,
-            window: Entity::PLACEHOLDER,
-        });
+        wheel(&mut app, 2.0);
         app.update();
         assert!(
-            !state(&app).fired(cmd::CAMERA_ZOOM_IN),
+            !state(&app).fired(Input::CameraZoomIn),
             "a UI wheel is the frame's"
         );
     }
 
-    /// B opens the backpack and SHIFT-B opens every bag, end to end: a real key event, the shipped
-    /// defaults, the binding body and the stock Lua. The windows are the stock
+    /// A trackpad's fractional lines carry to whole notches, each one `CameraZoomIn(1.0)`, and a
+    /// reversal drops the carried fraction.
+    #[test]
+    fn fractional_wheel_lines_dispatch_per_whole_notch() {
+        let mut app = harness();
+        for want in [0.0, 0.0, 1.0] {
+            wheel(&mut app, 0.4);
+            app.update();
+            assert_eq!(
+                state(&app).amount(Input::CameraZoomIn),
+                want,
+                "0.4 lines a frame: the third completes the notch"
+            );
+        }
+        wheel(&mut app, -1.0);
+        app.update();
+        assert_eq!(state(&app).amount(Input::CameraZoomOut), 1.0);
+        assert_eq!(state(&app).amount(Input::CameraZoomIn), 0.0);
+    }
+
+    /// The window deactivate (`0x514490`) clears the direction bits a Lua Start set and keeps the
+    /// mouse pair.
+    #[test]
+    fn focus_loss_clears_the_direction_bits_and_keeps_the_mouse_pair() {
+        let mut app = harness();
+        app.add_message::<bevy::input::keyboard::KeyboardFocusLost>();
+        let script_starts = |app: &mut App| {
+            app.world()
+                .non_send_resource::<UiScript>()
+                .execute_binding("MOVEANDSTEER", true)
+                .expect("runs");
+            app.world()
+                .non_send_resource::<UiScript>()
+                .execute_binding("MOVEFORWARD", true)
+                .expect("runs");
+            app.update();
+        };
+        script_starts(&mut app);
+        assert!(state(&app).steering() && state(&app).pressed(Input::MoveForward));
+        app.world_mut()
+            .write_message(bevy::input::keyboard::KeyboardFocusLost);
+        app.update();
+        assert!(!state(&app).pressed(Input::MoveForward));
+        assert!(state(&app).steering(), "0x514490 masks 0xfffff00f");
+    }
+
+    /// B opens the backpack and SHIFT-B opens every bag, end to end: a real key event, the
+    /// install's defaults, the stock binding body and the stock Lua. The windows are the stock
     /// `ContainerFrame1..12`, recycled across containers, so the test asks `IsBagOpen(id)`; the
     /// interface loads through [`crate::ui_script::load_default_ui`], so it needs client data.
     #[test]
     fn b_opens_the_backpack_and_shift_b_opens_every_bag() {
         let _data = benilla_formats::wow_data_or_skip!();
         let mut script = UiScript::new().expect("VM");
-        script.register_bindings(&registry_commands());
+        script.set_default_bindings(crate::ui_script::default_bindings());
+        script.load_binding_set(1);
         script.set_screen_size(1024.0, 768.0);
         // A player exists by the time the in-game UI loads, and the stock macro window formats
         // `UnitName("player")` into its character tab in OnLoad.
@@ -1642,4 +1617,108 @@ mod tests {
             "SHIFT-B again shuts them all"
         );
     }
+
+    /// No production source in the bindings code carries a stock body: every command's Lua is the
+    /// file's own, read off the chain at load. Each string literal outside the test modules, its
+    /// whitespace collapsed, is held against every stock body's.
+    #[test]
+    fn no_stock_binding_body_is_retyped_in_the_tree() {
+        benilla_formats::wow_data_or_skip!();
+        let collapse = |s: &str| s.split_whitespace().collect::<Vec<_>>().join(" ");
+        let stock = crate::ui_script::stock_bindings_file().expect("the install's Bindings.xml");
+        let bodies: Vec<String> = benilla_ui::bindings_xml::parse(&stock)
+            .expect("parses")
+            .iter()
+            .map(|b| collapse(&b.body))
+            .collect();
+        assert!(bodies.len() > 200);
+        let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("..");
+        let mut files = vec![
+            root.join("benilla-app/src/bindings.rs"),
+            root.join("benilla-ui/src/script/keybind.rs"),
+            root.join("benilla-ui/src/bindings_xml.rs"),
+        ];
+        for e in std::fs::read_dir(root.join("benilla-app/src/bindings")).unwrap() {
+            files.push(e.unwrap().path());
+        }
+        assert!(
+            !root.join("benilla-app/src/bindings/commands.rs").exists(),
+            "the retyped registry is gone"
+        );
+        for path in files {
+            let text = std::fs::read_to_string(&path).unwrap();
+            let production = text.split("#[cfg(test)]").next().unwrap_or_default();
+            for literal in string_literals(production) {
+                let literal = collapse(&literal);
+                if literal.is_empty() {
+                    continue;
+                }
+                for body in &bodies {
+                    assert!(
+                        !literal.contains(body.as_str()),
+                        "{} carries the stock body {body:?}",
+                        path.display()
+                    );
+                }
+            }
+        }
+    }
+
+    /// The contents of every `"…"` and `r#"…"#` literal in Rust source, escapes left as written.
+    fn string_literals(src: &str) -> Vec<String> {
+        let mut out = Vec::new();
+        let b = src.as_bytes();
+        let mut i = 0;
+        while i < b.len() {
+            if b[i] == b'/' && b.get(i + 1) == Some(&b'/') {
+                i = src[i..].find('\n').map_or(b.len(), |n| i + n);
+                continue;
+            }
+            if b[i] == b'\'' {
+                // A char literal or a lifetime: skip `'x'` and `'\x'` so a quote char is no string.
+                if b.get(i + 2) == Some(&b'\'') {
+                    i += 3;
+                    continue;
+                }
+                if b.get(i + 1) == Some(&b'\\') && b.get(i + 3) == Some(&b'\'') {
+                    i += 4;
+                    continue;
+                }
+                i += 1;
+                continue;
+            }
+            if b[i] == b'r' && (b.get(i + 1) == Some(&b'#') || b.get(i + 1) == Some(&b'"')) {
+                let hashes = src[i + 1..].bytes().take_while(|&c| c == b'#').count();
+                if b.get(i + 1 + hashes) == Some(&b'"') {
+                    let start = i + 2 + hashes;
+                    let close = format!("\"{}", "#".repeat(hashes));
+                    let end = src[start..].find(&close).map_or(b.len(), |n| start + n);
+                    out.push(src[start..end].to_string());
+                    i = end + close.len();
+                    continue;
+                }
+            }
+            if b[i] == b'"' {
+                let start = i + 1;
+                let mut j = start;
+                while j < b.len() && b[j] != b'"' {
+                    j += if b[j] == b'\\' { 2 } else { 1 };
+                }
+                out.push(src[start..j.min(b.len())].to_string());
+                i = j + 1;
+                continue;
+            }
+            i += 1;
+        }
+        out
+    }
+
+    /// The literal scanner finds what it must, so the check above cannot pass by seeing nothing.
+    #[test]
+    fn the_literal_scanner_reads_both_kinds_of_string() {
+        let found = string_literals(
+            "let a = \"x\\\"y\"; // \"comment\"\nlet c = '\"'; let b = r#\"ToggleBackpack();\"#;",
+        );
+        assert_eq!(found, ["x\\\"y", "ToggleBackpack();"]);
+    }
 }
diff --git a/crates/benilla-app/src/bindings/chord.rs b/crates/benilla-app/src/bindings/chord.rs
index f64e9a75..2e7f4ffe 100644
--- a/crates/benilla-app/src/bindings/chord.rs
+++ b/crates/benilla-app/src/bindings/chord.rs
@@ -4,15 +4,37 @@
 //!
 //! Prefix order is ALT-CTRL-SHIFT (`Blizzard_BindingUI.lua:176-182`; the emitter `0x4b6630` walks
 //! the table at `0x846bd0`), and it decides which modifier the fallback drops. Super/Cmd is not a
-//! 1.12 modifier: a chord never carries it and a press with it held never matches.
+//! 1.12 modifier, so a chord never carries it; that a press with it held runs nothing is
+//! `crate::bindings`'s deviation.
+
+use std::fmt;
 
 use bevy::input::mouse::MouseButton;
 use bevy::prelude::KeyCode;
 
-/// A bindable base input: a keyboard key, a mouse button, or one wheel direction.
+use super::layout::{LayoutName, LayoutNames};
+
+/// A key's 1.12 name: one character (`Z`, `1`, `ù`), or a word from the reference's name table
+/// (`F1`, `NUMPAD7`, `SPACE`).
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(crate) enum KeyName {
+    Char(char),
+    Word(&'static str),
+}
+
+impl fmt::Display for KeyName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            KeyName::Char(c) => write!(f, "{c}"),
+            KeyName::Word(w) => f.write_str(w),
+        }
+    }
+}
+
+/// A bindable base input: a keyboard key by its 1.12 name, a mouse button, or one wheel direction.
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub(crate) enum BindKey {
-    Key(KeyCode),
+    Key(KeyName),
     Mouse(MouseButton),
     WheelUp,
     WheelDown,
@@ -78,186 +100,122 @@ impl Chord {
     }
 }
 
-/// Build the canonical chord string from live modifier state and a base token.
-pub(crate) fn chord_string(alt: bool, ctrl: bool, shift: bool, token: &str) -> String {
-    let mut s = String::new();
-    if alt {
-        s.push_str("ALT-");
+/// The 1.12 name a key press gets: a letter, digit or punctuation key what the active layout
+/// names it ([`LayoutNames`]), every other key its fixed name. `None` for a key the reference
+/// names `UNKNOWN` or drops, and for the modifiers, which are only prefixes
+/// (`IsKeyPressIgnoredForBinding`). Both Enters are `ENTER`.
+pub(crate) fn key_token(k: KeyCode, layout: &LayoutNames) -> Option<KeyName> {
+    match layout.name(k) {
+        // The lookup folds `a`-`z` up (`0x64b419`), so Turkish `VK_OEM_7`'s `i` is `I`'s key.
+        Some(LayoutName::Char(c)) => Some(KeyName::Char(c.to_ascii_uppercase())),
+        Some(LayoutName::Dropped) => None,
+        None => fixed_name(k),
     }
-    if ctrl {
-        s.push_str("CTRL-");
-    }
-    if shift {
-        s.push_str("SHIFT-");
-    }
-    s.push_str(token);
-    s
 }
 
-/// The 1.12 token for a physical key; `None` for a key the reference names `UNKNOWN` and for the
-/// modifiers, which are only prefixes (`IsKeyPressIgnoredForBinding`). Both Enters are `ENTER`.
-pub(crate) fn key_token(k: KeyCode) -> Option<&'static str> {
+/// The fixed half of `0x42d800` and the Mac table: every key no layout names
+/// ([`super::layout::position`]).
+fn fixed_name(k: KeyCode) -> Option<KeyName> {
     use KeyCode::*;
+    use KeyName::Word;
     Some(match k {
-        KeyA => "A",
-        KeyB => "B",
-        KeyC => "C",
-        KeyD => "D",
-        KeyE => "E",
-        KeyF => "F",
-        KeyG => "G",
-        KeyH => "H",
-        KeyI => "I",
-        KeyJ => "J",
-        KeyK => "K",
-        KeyL => "L",
-        KeyM => "M",
-        KeyN => "N",
-        KeyO => "O",
-        KeyP => "P",
-        KeyQ => "Q",
-        KeyR => "R",
-        KeyS => "S",
-        KeyT => "T",
-        KeyU => "U",
-        KeyV => "V",
-        KeyW => "W",
-        KeyX => "X",
-        KeyY => "Y",
-        KeyZ => "Z",
-        Digit1 => "1",
-        Digit2 => "2",
-        Digit3 => "3",
-        Digit4 => "4",
-        Digit5 => "5",
-        Digit6 => "6",
-        Digit7 => "7",
-        Digit8 => "8",
-        Digit9 => "9",
-        Digit0 => "0",
-        F1 => "F1",
-        F2 => "F2",
-        F3 => "F3",
-        F4 => "F4",
-        F5 => "F5",
-        F6 => "F6",
-        F7 => "F7",
-        F8 => "F8",
-        F9 => "F9",
-        F10 => "F10",
-        F11 => "F11",
-        F12 => "F12",
+        F1 => Word("F1"),
+        F2 => Word("F2"),
+        F3 => Word("F3"),
+        F4 => Word("F4"),
+        F5 => Word("F5"),
+        F6 => Word("F6"),
+        F7 => Word("F7"),
+        F8 => Word("F8"),
+        F9 => Word("F9"),
+        F10 => Word("F10"),
+        F11 => Word("F11"),
+        F12 => Word("F12"),
         // On a Mac F13 is print-screen: the Mac key table `0x5bf320` maps keycode `0x69` to
         // `0x212`, `PRINTSCREEN`, and macOS has no PrintScreen keycode.
         #[cfg(target_os = "macos")]
-        F13 => "PRINTSCREEN",
+        F13 => Word("PRINTSCREEN"),
         // `IsValidBindingKeyString` accepts `F` + any digits (`0x846c04`) and the Mac table maps
         // keycode `0x6A` to `F16` (`0x30d`). Deviation: the Windows key table stops at `VK_F12`
         // and drops later F-keys; they are named here so a stored `F13`-`F24` can be pressed.
         #[cfg(not(target_os = "macos"))]
-        F13 => "F13",
+        F13 => Word("F13"),
         // On a Mac F14 and F15 are ScrollLock and Pause: keycodes `0x6B` and `0x71` map to
         // `0x210` and `0x211`, which the namer calls `UNKNOWN`, so they stay unbindable there.
         #[cfg(not(target_os = "macos"))]
-        F14 => "F14",
+        F14 => Word("F14"),
         #[cfg(not(target_os = "macos"))]
-        F15 => "F15",
-        F16 => "F16",
-        F17 => "F17",
-        F18 => "F18",
-        F19 => "F19",
-        F20 => "F20",
-        F21 => "F21",
-        F22 => "F22",
-        F23 => "F23",
-        F24 => "F24",
-        Space => "SPACE",
-        Tab => "TAB",
-        Enter | NumpadEnter => "ENTER",
-        Escape => "ESCAPE",
-        Backspace => "BACKSPACE",
-        Insert => "INSERT",
-        Delete => "DELETE",
-        Home => "HOME",
-        End => "END",
-        PageUp => "PAGEUP",
-        PageDown => "PAGEDOWN",
-        ArrowUp => "UP",
-        ArrowDown => "DOWN",
-        ArrowLeft => "LEFT",
-        ArrowRight => "RIGHT",
-        Numpad0 => "NUMPAD0",
-        Numpad1 => "NUMPAD1",
-        Numpad2 => "NUMPAD2",
-        Numpad3 => "NUMPAD3",
-        Numpad4 => "NUMPAD4",
-        Numpad5 => "NUMPAD5",
-        Numpad6 => "NUMPAD6",
-        Numpad7 => "NUMPAD7",
-        Numpad8 => "NUMPAD8",
-        Numpad9 => "NUMPAD9",
-        NumpadAdd => "NUMPADPLUS",
-        NumpadSubtract => "NUMPADMINUS",
-        NumpadDivide => "NUMPADDIVIDE",
-        NumpadMultiply => "NUMPADMULTIPLY",
-        NumpadDecimal => "NUMPADDECIMAL",
+        F15 => Word("F15"),
+        F16 => Word("F16"),
+        F17 => Word("F17"),
+        F18 => Word("F18"),
+        F19 => Word("F19"),
+        F20 => Word("F20"),
+        F21 => Word("F21"),
+        F22 => Word("F22"),
+        F23 => Word("F23"),
+        F24 => Word("F24"),
+        Space => Word("SPACE"),
+        Tab => Word("TAB"),
+        Enter | NumpadEnter => Word("ENTER"),
+        Escape => Word("ESCAPE"),
+        Backspace => Word("BACKSPACE"),
+        Insert => Word("INSERT"),
+        Delete => Word("DELETE"),
+        Home => Word("HOME"),
+        End => Word("END"),
+        PageUp => Word("PAGEUP"),
+        PageDown => Word("PAGEDOWN"),
+        ArrowUp => Word("UP"),
+        ArrowDown => Word("DOWN"),
+        ArrowLeft => Word("LEFT"),
+        ArrowRight => Word("RIGHT"),
+        Numpad0 => Word("NUMPAD0"),
+        Numpad1 => Word("NUMPAD1"),
+        Numpad2 => Word("NUMPAD2"),
+        Numpad3 => Word("NUMPAD3"),
+        Numpad4 => Word("NUMPAD4"),
+        Numpad5 => Word("NUMPAD5"),
+        Numpad6 => Word("NUMPAD6"),
+        Numpad7 => Word("NUMPAD7"),
+        Numpad8 => Word("NUMPAD8"),
+        Numpad9 => Word("NUMPAD9"),
+        NumpadAdd => Word("NUMPADPLUS"),
+        NumpadSubtract => Word("NUMPADMINUS"),
+        NumpadDivide => Word("NUMPADDIVIDE"),
+        NumpadMultiply => Word("NUMPADMULTIPLY"),
+        NumpadDecimal => Word("NUMPADDECIMAL"),
         // The Mac keypad's `=`: the namer's `0x30c`, and in `IsValidBindingKeyString`'s table.
-        NumpadEqual => "NUMPADEQUALS",
-        NumLock => "NUMLOCK",
-        PrintScreen => "PRINTSCREEN",
+        NumpadEqual => Word("NUMPADEQUALS"),
+        NumLock => Word("NUMLOCK"),
+        PrintScreen => Word("PRINTSCREEN"),
         // No ScrollLock or Pause: the namer (`0x4b66b0`) calls `0x210`/`0x211` `UNKNOWN`, and
         // `IsValidBindingKeyString` (`0x4b7890`) has neither name.
-        CapsLock => "CAPSLOCK",
-        Minus => "-",
-        Equal => "=",
-        BracketLeft => "[",
-        BracketRight => "]",
-        Backslash => "\\",
-        Semicolon => ";",
-        Quote => "'",
-        Comma => ",",
-        Period => ".",
-        Slash => "/",
-        Backquote => "`",
+        CapsLock => Word("CAPSLOCK"),
         _ => return None,
     })
 }
 
-/// Fold key aliases that share one 1.12 token (`NumpadEnter` → `Enter`) so a chord parsed from
-/// `ENTER` matches either physical key.
+/// Fold the keys the reference gives one code (`NumpadEnter` → `Enter`, both `0x201`), so the
+/// pressed-key list and a latch treat them as one key.
 pub(crate) fn normalize_key(k: KeyCode) -> KeyCode {
     match k {
         KeyCode::NumpadEnter => KeyCode::Enter,
-        // The Mac print-screen key; must agree with `key_token`, which names it for capture.
-        #[cfg(target_os = "macos")]
-        KeyCode::F13 => KeyCode::PrintScreen,
         other => other,
     }
 }
 
-/// The 1.12 token for a mouse button: BUTTON4 is winit's `Forward` and BUTTON5 its `Back`, so the
-/// 1.12 default `BUTTON4 TOGGLEAUTORUN` sits on `Forward`. Which physical button the reference
-/// calls BUTTON4 is untraced.
-pub(crate) fn mouse_token(b: MouseButton) -> Option<&'static str> {
-    Some(match b {
-        MouseButton::Left => "BUTTON1",
-        MouseButton::Right => "BUTTON2",
-        MouseButton::Middle => "BUTTON3",
-        MouseButton::Forward => "BUTTON4",
-        MouseButton::Back => "BUTTON5",
-        // The reference names further buttons `BUTTON<n>` (`0x4b6aa0`'s bit-scan fallback).
-        // winit passes the platform's button number, so the sixth button is `Other(5)`.
-        MouseButton::Other(n) => return EXTRA_BUTTONS.get(usize::from(n).wrapping_sub(5)).copied(),
-    })
-}
-
-/// `BUTTON6` to `BUTTON20`, indexed by `Other(n) - 5`.
+/// `BUTTON6` to `BUTTON20`, indexed by `Other(n) - 5`: the reference names further buttons
+/// `BUTTON<n>` (`0x4b6aa0`'s bit-scan fallback), and winit passes the platform's button number, so
+/// the sixth button is `Other(5)`.
 const EXTRA_BUTTONS: &[&str] = &[
     "BUTTON6", "BUTTON7", "BUTTON8", "BUTTON9", "BUTTON10", "BUTTON11", "BUTTON12", "BUTTON13",
     "BUTTON14", "BUTTON15", "BUTTON16", "BUTTON17", "BUTTON18", "BUTTON19", "BUTTON20",
 ];
 
-/// Token to base input: the inverse of [`key_token`] and [`mouse_token`], plus the wheel pair.
+/// Token to base input: the inverse of [`key_token`], the mouse buttons and the wheel pair.
+/// BUTTON4 is winit's `Forward` and BUTTON5 its `Back`, so the 1.12 default `BUTTON4
+/// TOGGLEAUTORUN` sits on `Forward`; which physical button the reference calls BUTTON4 is untraced.
 fn token_key(t: &str) -> Option<BindKey> {
     use KeyCode::*;
     if let Some(b) = match t {
@@ -279,43 +237,15 @@ fn token_key(t: &str) -> Option<BindKey> {
         "MOUSEWHEELDOWN" => return Some(BindKey::WheelDown),
         _ => {}
     }
+    // One character: what a layout names some key, which the namer writes as UTF-8 (`0x4b66b0`'s
+    // `[0x21, 0xff]` arm through `0x41abb0`). [`key_token`] folds `a`-`z` up as the lookup does,
+    // so a lowercase letter is no press's name.
+    let mut chars = t.chars();
+    if let (Some(c), None) = (chars.next(), chars.next()) {
+        let pressable = !c.is_control() && !c.is_whitespace() && !c.is_ascii_lowercase();
+        return pressable.then_some(BindKey::Key(KeyName::Char(c)));
+    }
     let k = match t {
-        "A" => KeyA,
-        "B" => KeyB,
-        "C" => KeyC,
-        "D" => KeyD,
-        "E" => KeyE,
-        "F" => KeyF,
-        "G" => KeyG,
-        "H" => KeyH,
-        "I" => KeyI,
-        "J" => KeyJ,
-        "K" => KeyK,
-        "L" => KeyL,
-        "M" => KeyM,
-        "N" => KeyN,
-        "O" => KeyO,
-        "P" => KeyP,
-        "Q" => KeyQ,
-        "R" => KeyR,
-        "S" => KeyS,
-        "T" => KeyT,
-        "U" => KeyU,
-        "V" => KeyV,
-        "W" => KeyW,
-        "X" => KeyX,
-        "Y" => KeyY,
-        "Z" => KeyZ,
-        "1" => Digit1,
-        "2" => Digit2,
-        "3" => Digit3,
-        "4" => Digit4,
-        "5" => Digit5,
-        "6" => Digit6,
-        "7" => Digit7,
-        "8" => Digit8,
-        "9" => Digit9,
-        "0" => Digit0,
         "F1" => F1,
         "F2" => F2,
         "F3" => F3,
@@ -374,47 +304,45 @@ fn token_key(t: &str) -> Option<BindKey> {
         "NUMLOCK" => NumLock,
         "PRINTSCREEN" => PrintScreen,
         "CAPSLOCK" => CapsLock,
-        "-" => Minus,
-        "=" => Equal,
-        "[" => BracketLeft,
-        "]" => BracketRight,
-        "\\" => Backslash,
-        ";" => Semicolon,
-        "'" => Quote,
-        "," => Comma,
-        "." => Period,
-        "/" => Slash,
-        "`" => Backquote,
         _ => return None,
     };
-    // Fold aliases so a parsed chord equals a normalized press, and accept only a token the
-    // namer produces on this platform (on a Mac, F13-F15 are other keys).
-    let k = normalize_key(k);
-    if key_token(k) != Some(t) {
-        return None;
+    // Only a name the namer gives on this platform: on a Mac, F13-F15 are other keys.
+    match fixed_name(k) {
+        Some(name @ KeyName::Word(w)) if w == t => Some(BindKey::Key(name)),
+        _ => None,
     }
-    Some(BindKey::Key(k))
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    /// Ties this namer to the engine's `IsValidBindingKeyString`: every default chord, and one key
-    /// of each token shape, since `KeyCode` cannot be enumerated.
+    /// Ties this namer to the engine's `IsValidBindingKeyString`: every chord the install's
+    /// `WTF\DefaultBindings.wtf` ships is a key string it accepts and a chord the dispatcher can
+    /// press, and one key of each token shape, since `KeyCode` cannot be enumerated.
     #[test]
     fn every_token_the_codec_names_is_one_setbinding_accepts() {
         use benilla_ui::script::keybind::normalize_binding_key;
-        for spec in super::super::commands::SPECS {
-            for default in [spec.d1, spec.d2].into_iter().flatten() {
-                assert_eq!(
-                    normalize_binding_key(default).as_deref(),
-                    Some(default),
-                    "the default chord '{default}' ({}) is not a bindable key string",
-                    spec.name
-                );
-            }
+        let defaults = crate::ui_script::default_bindings();
+        if benilla_formats::wow_data().is_some() {
+            assert!(
+                defaults.len() > 100,
+                "the install's defaults: {}",
+                defaults.len()
+            );
         }
+        for (default, command) in &defaults {
+            assert_eq!(
+                normalize_binding_key(default).as_deref(),
+                Some(default.as_str()),
+                "the default chord '{default}' ({command}) is not a bindable key string"
+            );
+            assert!(
+                Chord::parse(default).is_some(),
+                "{command}: default '{default}' does not parse"
+            );
+        }
+        let us = LayoutNames::default();
         for k in [
             KeyCode::KeyW,
             KeyCode::Digit0,
@@ -449,28 +377,24 @@ mod tests {
             KeyCode::Slash,
             KeyCode::Backquote,
         ] {
-            let token = key_token(k).expect("named");
+            let token = key_token(k, &us).expect("named").to_string();
             assert!(
-                normalize_binding_key(token).is_some(),
+                normalize_binding_key(&token).is_some(),
                 "{k:?} names '{token}', which SetBinding refuses"
             );
         }
-        for b in [
-            MouseButton::Left,
-            MouseButton::Right,
-            MouseButton::Middle,
-            MouseButton::Forward,
-            MouseButton::Back,
+        for token in [
+            "BUTTON1", "BUTTON2", "BUTTON3", "BUTTON4", "BUTTON5", "BUTTON20",
         ] {
-            let token = mouse_token(b).expect("named");
-            assert!(normalize_binding_key(token).is_some(), "{b:?} → '{token}'");
+            assert!(token_key(token).is_some(), "'{token}' names no button");
+            assert!(normalize_binding_key(token).is_some(), "'{token}'");
         }
         for token in ["MOUSEWHEELUP", "MOUSEWHEELDOWN"] {
             assert!(normalize_binding_key(token).is_some());
         }
         // The reference's namer calls these `UNKNOWN` (`0x210`/`0x211`).
-        assert_eq!(key_token(KeyCode::ScrollLock), None);
-        assert_eq!(key_token(KeyCode::Pause), None);
+        assert_eq!(key_token(KeyCode::ScrollLock, &us), None);
+        assert_eq!(key_token(KeyCode::Pause, &us), None);
     }
 
     /// The validator's accept set is infinite, so this covers the tokens a real keyboard or mouse
@@ -539,6 +463,7 @@ mod tests {
 
     #[test]
     fn the_codec_round_trips_every_keyboard_token() {
+        let us = LayoutNames::default();
         let mut checked = 0;
         for k in [
             KeyCode::KeyW,
@@ -552,38 +477,33 @@ mod tests {
             KeyCode::Backquote,
             KeyCode::Quote,
         ] {
-            let t = key_token(k).unwrap();
+            let name = key_token(k, &us).unwrap();
             assert_eq!(
-                token_key(t),
-                Some(BindKey::Key(normalize_key(k))),
-                "token {t}"
+                token_key(&name.to_string()),
+                Some(BindKey::Key(name)),
+                "token {name}"
             );
             checked += 1;
         }
         assert_eq!(checked, 10);
-        assert_eq!(key_token(KeyCode::NumpadEnter), Some("ENTER"));
-        assert_eq!(token_key("ENTER"), Some(BindKey::Key(KeyCode::Enter)));
+        let enter = Some(KeyName::Word("ENTER"));
+        assert_eq!(key_token(KeyCode::NumpadEnter, &us), enter);
+        assert_eq!(key_token(KeyCode::Enter, &us), enter);
+        assert_eq!(token_key("ENTER"), enter.map(BindKey::Key));
     }
 
     /// macOS has no `PrintScreen`, so capture and dispatch must both read F13 as `PRINTSCREEN`.
     #[cfg(target_os = "macos")]
     #[test]
     fn f13_is_print_screen_on_a_mac() {
-        assert_eq!(
-            key_token(KeyCode::F13),
-            Some("PRINTSCREEN"),
-            "the capture arm"
-        );
-        assert_eq!(
-            normalize_key(KeyCode::F13),
-            KeyCode::PrintScreen,
-            "the dispatch arm"
-        );
+        let name = key_token(KeyCode::F13, &LayoutNames::default());
+        assert_eq!(name, Some(KeyName::Word("PRINTSCREEN")));
         assert_eq!(
             token_key("PRINTSCREEN"),
-            Some(BindKey::Key(normalize_key(KeyCode::F13))),
+            name.map(BindKey::Key),
             "a chord parsed from the shipped default matches an F13 press"
         );
+        assert_eq!(token_key("F13"), None, "no Mac key is F13");
     }
 
     #[test]
@@ -594,7 +514,7 @@ mod tests {
                 alt: true,
                 ctrl: true,
                 shift: true,
-                key: BindKey::Key(KeyCode::F1)
+                key: BindKey::Key(KeyName::Word("F1"))
             })
         );
         // `CTRL--` is Ctrl + the minus key.
@@ -604,7 +524,7 @@ mod tests {
                 alt: false,
                 ctrl: true,
                 shift: false,
-                key: BindKey::Key(KeyCode::Minus)
+                key: BindKey::Key(KeyName::Char('-'))
             })
         );
         assert_eq!(
@@ -626,18 +546,148 @@ mod tests {
             })
         );
         assert_eq!(Chord::parse("BOGUS"), None);
-        assert_eq!(
-            chord_string(true, false, true, "PAGEDOWN"),
-            "ALT-SHIFT-PAGEDOWN"
-        );
         assert_eq!(
             Chord::parse("ALT-SHIFT-PAGEDOWN").unwrap(),
             Chord {
                 alt: true,
                 ctrl: false,
                 shift: true,
-                key: BindKey::Key(KeyCode::PageDown)
+                key: BindKey::Key(KeyName::Word("PAGEDOWN"))
             }
         );
     }
+
+    /// The names a layout gives its keys, as `layout::record_layout_names` keeps them.
+    fn layout(keys: &[(KeyCode, char)]) -> LayoutNames {
+        let mut names = LayoutNames::default();
+        for &(k, c) in keys {
+            names.set(k, Some(LayoutName::Char(c)));
+        }
+        names
+    }
+
+    fn name(k: KeyCode, layout: &LayoutNames) -> Option<String> {
+        key_token(k, layout).map(|n| n.to_string())
+    }
+
+    /// 1.12 names a letter, digit or punctuation key what the active layout names it, its ASCII
+    /// letters folded up as the lookup folds them, and every other key by the fixed table. AZERTY
+    /// on Windows: `VK_Z` where a US W sits, `VK_M` on the semicolon key.
+    #[test]
+    fn a_layout_key_is_named_what_its_layout_names_it() {
+        use KeyCode::*;
+        let mut azerty = layout(&[
+            (KeyW, 'Z'),
+            (KeyZ, 'W'),
+            (KeyQ, 'A'),
+            (KeyA, 'Q'),
+            (Semicolon, 'M'),
+            (KeyM, ','),
+            (Comma, ';'),
+            (Period, ':'),
+            (Slash, '!'),
+            (Quote, 'ù'),
+            (Backquote, '²'),
+            (Minus, ')'),
+            (BracketLeft, '^'),
+            (BracketRight, '$'),
+            (Backslash, '*'),
+            (IntlBackslash, '<'),
+            (NumpadComma, '.'),
+            (Digit1, '1'),
+        ]);
+        // Turkish Q's `VK_OEM_7` names its key `i`, which the lookup folds to `I`.
+        azerty.set(KeyCode::KeyI, Some(LayoutName::Char('i')));
+        for (k, expected) in [
+            (KeyW, "Z"),
+            (KeyZ, "W"),
+            (KeyQ, "A"),
+            (KeyA, "Q"),
+            (Semicolon, "M"),
+            (KeyM, ","),
+            (Comma, ";"),
+            (Period, ":"),
+            (Slash, "!"),
+            (Quote, "ù"),
+            (Backquote, "²"),
+            (Minus, ")"),
+            (BracketLeft, "^"),
+            (BracketRight, "$"),
+            (Backslash, "*"),
+            (IntlBackslash, "<"),
+            (NumpadComma, "."),
+            (Digit1, "1"),
+            (KeyI, "I"),
+            (F1, "F1"),
+            (Numpad7, "NUMPAD7"),
+            (Space, "SPACE"),
+        ] {
+            assert_eq!(name(k, &azerty).as_deref(), Some(expected), "{k:?}");
+            let token = key_token(k, &azerty).unwrap();
+            assert_eq!(
+                token_key(expected),
+                Some(BindKey::Key(token)),
+                "the stored '{expected}' is that key's chord"
+            );
+        }
+        // A key its layout drops binds nothing (`0x42da49`).
+        azerty.set(Backquote, Some(LayoutName::Dropped));
+        assert_eq!(name(Backquote, &azerty), None);
+    }
+
+    /// A US layout, reported or not, names every key as it always has.
+    #[test]
+    fn a_us_layout_names_its_keys_as_the_us_positions() {
+        use KeyCode::*;
+        let reported = layout(&[
+            (KeyW, 'w'),
+            (KeyZ, 'z'),
+            (Quote, '\''),
+            (Backquote, '`'),
+            (Minus, '-'),
+            (IntlBackslash, '\\'),
+        ]);
+        let unreported = LayoutNames::default();
+        for layout in [&reported, &unreported] {
+            for (k, expected) in [
+                (KeyW, "W"),
+                (KeyZ, "Z"),
+                (Quote, "'"),
+                (Backquote, "`"),
+                (Minus, "-"),
+                (Digit1, "1"),
+            ] {
+                assert_eq!(name(k, layout).as_deref(), Some(expected), "{k:?}");
+            }
+        }
+        assert_eq!(name(IntlBackslash, &reported).as_deref(), Some("\\"));
+        assert_eq!(
+            name(IntlBackslash, &unreported),
+            None,
+            "an ISO key no layout has named yet"
+        );
+    }
+
+    /// Modifiers are prefixes, never part of the name: Shift+1 is `SHIFT-1`, not `!`.
+    #[test]
+    fn a_chord_names_its_key_unshifted() {
+        let azerty = layout(&[(KeyCode::KeyW, 'z')]);
+        let key = |k| BindKey::Key(key_token(k, &azerty).unwrap());
+        assert_eq!(
+            Chord::parse("SHIFT-Z").map(|c| (c.shift, c.key)),
+            Some((true, key(KeyCode::KeyW)))
+        );
+        assert_eq!(
+            Chord::parse("SHIFT-1").map(|c| (c.shift, c.key)),
+            Some((true, key(KeyCode::Digit1)))
+        );
+        // Nothing presses a lowercase letter, a space or a control character.
+        for t in ["w", " ", "\u{7}"] {
+            assert_eq!(Chord::parse(t), None, "{t:?}");
+        }
+        assert_eq!(
+            Chord::parse("ù").map(|c| c.key),
+            Some(BindKey::Key(KeyName::Char('ù')))
+        );
+    }
 }
diff --git a/crates/benilla-app/src/bindings/commands.rs b/crates/benilla-app/src/bindings/commands.rs
deleted file mode 100644
index 76c2459b..00000000
--- a/crates/benilla-app/src/bindings/commands.rs
+++ /dev/null
@@ -1,2250 +0,0 @@
-//! The binding command registry: every command benilla implements, in 1.12 `Bindings.xml` order,
-//! with the stock default chords (`WTF\DefaultBindings.wtf`) and each command's dispatch class.
-//! A command appears only over a real engine action; the rest are in [`ABSENT`], and the two
-//! together are exactly the client's 228 live bindings. Labels and headers are the 1.12
-//! `BINDING_NAME_*`/`BINDING_HEADER_*` GlobalStrings.
-//!
-//! Dispatch classes:
-//! - [`Kind::Held`]: press latches, base-key release unlatches (the `runOnUp` movement pairs);
-//!   engine systems read the latch ([`super::BindingsState`]).
-//! - [`Kind::Edge`] / [`Kind::EdgeUpDown`]: runs the reference's binding body as Lua.
-//! - [`Kind::Host`]: fires into [`super::BindingsState::fired`] for an engine system.
-
-/// A command's index into [`SPECS`], the engine-side handle (`cmd::JUMP`).
-#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
-pub(crate) struct Cmd(pub u16);
-
-pub(crate) enum Kind {
-    /// Latched while the base key is held; engine systems read the state.
-    Held,
-    /// Fires this Lua on the matching press.
-    Edge(&'static str),
-    /// The reference's `runOnUp` button pair: Lua on press, Lua on base-key release.
-    EdgeUpDown(&'static str, &'static str),
-    /// Fires into [`super::BindingsState`]; an engine system consumes it.
-    Host,
-}
-
-pub(crate) struct Spec {
-    pub name: &'static str,
-    /// The category header's global-string key (`BINDING_HEADER_MOVEMENT`).
-    pub category: &'static str,
-    pub kind: Kind,
-    /// The 1.12 default chords; `None` is shipped unbound.
-    pub d1: Option<&'static str>,
-    pub d2: Option<&'static str>,
-}
-
-impl Spec {
-    /// The reference's `<Binding runOnUp=…>`; its one reader (`0x4b7bf1`) gates the release half
-    /// and nothing else.
-    pub(crate) fn run_on_up(&self) -> bool {
-        matches!(self.kind, Kind::Held | Kind::EdgeUpDown(..))
-    }
-}
-
-macro_rules! spec {
-    ($name:literal, $cat:ident, $kind:expr, $d1:expr, $d2:expr) => {
-        Spec {
-            name: $name,
-            category: concat!("BINDING_HEADER_", stringify!($cat)),
-            kind: $kind,
-            d1: $d1,
-            d2: $d2,
-        }
-    };
-}
-
-/// Engine-side handles for the host-dispatched commands, as indexes into [`SPECS`].
-pub(crate) mod cmd {
-    use super::{Cmd, TABLE};
-
-    /// Resolve a command name to its [`Cmd`] at compile time; an unknown name is a build error.
-    const fn by_name(name: &str) -> Cmd {
-        let mut i = 0;
-        while i < TABLE.len() {
-            if const_str_eq(TABLE[i].name, name) {
-                return Cmd(i as u16);
-            }
-            i += 1;
-        }
-        panic!("no such binding command")
-    }
-
-    const fn const_str_eq(a: &str, b: &str) -> bool {
-        let (a, b) = (a.as_bytes(), b.as_bytes());
-        if a.len() != b.len() {
-            return false;
-        }
-        let mut i = 0;
-        while i < a.len() {
-            if a[i] != b[i] {
-                return false;
-            }
-            i += 1;
-        }
-        true
-    }
-
-    pub(crate) const MOVE_AND_STEER: Cmd = by_name("MOVEANDSTEER");
-    pub(crate) const MOVE_FORWARD: Cmd = by_name("MOVEFORWARD");
-    pub(crate) const MOVE_BACKWARD: Cmd = by_name("MOVEBACKWARD");
-    pub(crate) const TURN_LEFT: Cmd = by_name("TURNLEFT");
-    pub(crate) const TURN_RIGHT: Cmd = by_name("TURNRIGHT");
-    pub(crate) const STRAFE_LEFT: Cmd = by_name("STRAFELEFT");
-    pub(crate) const STRAFE_RIGHT: Cmd = by_name("STRAFERIGHT");
-    pub(crate) const JUMP: Cmd = by_name("JUMP");
-    pub(crate) const SIT_OR_STAND: Cmd = by_name("SITORSTAND");
-    pub(crate) const TOGGLE_SHEATH: Cmd = by_name("TOGGLESHEATH");
-    pub(crate) const TOGGLE_AUTORUN: Cmd = by_name("TOGGLEAUTORUN");
-    pub(crate) const TOGGLE_RUN: Cmd = by_name("TOGGLERUN");
-    pub(crate) const TARGET_NEAREST_ENEMY: Cmd = by_name("TARGETNEARESTENEMY");
-    pub(crate) const TARGET_PREVIOUS_ENEMY: Cmd = by_name("TARGETPREVIOUSENEMY");
-    pub(crate) const NAMEPLATES: Cmd = by_name("NAMEPLATES");
-    pub(crate) const FRIEND_NAMEPLATES: Cmd = by_name("FRIENDNAMEPLATES");
-    pub(crate) const ALL_NAMEPLATES: Cmd = by_name("ALLNAMEPLATES");
-    pub(crate) const ATTACK_TARGET: Cmd = by_name("ATTACKTARGET");
-    pub(crate) const TOGGLE_UI: Cmd = by_name("TOGGLEUI");
-    pub(crate) const CAMERA_ZOOM_IN: Cmd = by_name("CAMERAZOOMIN");
-    pub(crate) const CAMERA_ZOOM_OUT: Cmd = by_name("CAMERAZOOMOUT");
-}
-
-/// The registry, in 1.12 `Bindings.xml` order. `TABLE` is the `const` view [`cmd::by_name`] scans,
-/// since a `static` cannot be read during const evaluation.
-pub(crate) static SPECS: &[Spec] = TABLE;
-
-const TABLE: &[Spec] = &[
-    // ── Movement (BINDING_HEADER_MOVEMENT) ──────────────────────────────────────────────
-    spec!("MOVEANDSTEER", MOVEMENT, Kind::Held, Some("BUTTON3"), None),
-    spec!("MOVEFORWARD", MOVEMENT, Kind::Held, Some("W"), Some("UP")),
-    spec!(
-        "MOVEBACKWARD",
-        MOVEMENT,
-        Kind::Held,
-        Some("S"),
-        Some("DOWN")
-    ),
-    spec!("TURNLEFT", MOVEMENT, Kind::Held, Some("A"), Some("LEFT")),
-    spec!("TURNRIGHT", MOVEMENT, Kind::Held, Some("D"), Some("RIGHT")),
-    spec!("STRAFELEFT", MOVEMENT, Kind::Held, Some("Q"), None),
-    spec!("STRAFERIGHT", MOVEMENT, Kind::Held, Some("E"), None),
-    spec!("JUMP", MOVEMENT, Kind::Host, Some("SPACE"), Some("NUMPAD0")),
-    spec!("SITORSTAND", MOVEMENT, Kind::Host, Some("X"), None),
-    spec!("TOGGLESHEATH", MOVEMENT, Kind::Host, Some("Z"), None),
-    spec!(
-        "TOGGLEAUTORUN",
-        MOVEMENT,
-        Kind::Host,
-        Some("NUMLOCK"),
-        Some("BUTTON4")
-    ),
-    spec!(
-        "TOGGLERUN",
-        MOVEMENT,
-        Kind::Host,
-        Some("NUMPADDIVIDE"),
-        None
-    ),
-    spec!(
-        "FOLLOWTARGET",
-        MOVEMENT,
-        Kind::Edge(r#"FollowUnit("target")"#),
-        None,
-        None
-    ),
-    // ── Chat (BINDING_HEADER_CHAT) ──────────────────────────────────────────────────────
-    spec!(
-        "OPENCHAT",
-        CHAT,
-        Kind::Edge("ChatFrame_OpenChat(\"\")"),
-        Some("ENTER"),
-        None
-    ),
-    spec!(
-        "OPENCHATSLASH",
-        CHAT,
-        Kind::Edge("ChatFrame_OpenChat(\"/\")"),
-        Some("/"),
-        None
-    ),
-    spec!(
-        "CHATPAGEUP",
-        CHAT,
-        Kind::Edge("ChatFrame_ChatPageUp()"),
-        Some("PAGEUP"),
-        None
-    ),
-    spec!(
-        "CHATPAGEDOWN",
-        CHAT,
-        Kind::Edge("ChatFrame_ChatPageDown()"),
-        Some("PAGEDOWN"),
-        None
-    ),
-    spec!(
-        "CHATBOTTOM",
-        CHAT,
-        Kind::Edge("ChatFrame_ScrollToBottom()"),
-        Some("SHIFT-PAGEDOWN"),
-        None
-    ),
-    spec!(
-        "REPLY",
-        CHAT,
-        Kind::Edge("ChatFrame_ReplyTell()"),
-        Some("R"),
-        None
-    ),
-    // The last person you told, not the last who told you (`ChatFrame.lua:1650`).
-    spec!(
-        "REPLY2",
-        CHAT,
-        Kind::Edge("ChatFrame_ReplyTell2()"),
-        Some("SHIFT-R"),
-        None
-    ),
-    // The combat-log four (`Bindings.xml:108-119`): ChatFrame2's paging and `ToggleCombatLog`.
-    spec!(
-        "COMBATLOGPAGEUP",
-        CHAT,
-        Kind::Edge("ChatFrame2:PageUp()"),
-        Some("CTRL-PAGEUP"),
-        None
-    ),
-    spec!(
-        "COMBATLOGPAGEDOWN",
-        CHAT,
-        Kind::Edge("ChatFrame2:PageDown()"),
-        Some("CTRL-PAGEDOWN"),
-        None
-    ),
-    spec!(
-        "COMBATLOGBOTTOM",
-        CHAT,
-        Kind::Edge("ChatFrame2:ScrollToBottom()"),
-        Some("CTRL-SHIFT-PAGEDOWN"),
-        None
-    ),
-    spec!(
-        "TOGGLECOMBATLOG",
-        CHAT,
-        Kind::Edge("ToggleCombatLog()"),
-        Some("SHIFT-C"),
-        None
-    ),
-    // ── Action bar (BINDING_HEADER_ACTIONBAR) ───────────────────────────────────────────
-    // The `runOnUp` pair (`Bindings.xml:121`): down shows the pushed visual, up fires.
-    spec!(
-        "ACTIONBUTTON1",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(1)", "ActionButtonUp(1)"),
-        Some("1"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON2",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(2)", "ActionButtonUp(2)"),
-        Some("2"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON3",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(3)", "ActionButtonUp(3)"),
-        Some("3"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON4",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(4)", "ActionButtonUp(4)"),
-        Some("4"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON5",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(5)", "ActionButtonUp(5)"),
-        Some("5"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON6",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(6)", "ActionButtonUp(6)"),
-        Some("6"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON7",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(7)", "ActionButtonUp(7)"),
-        Some("7"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON8",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(8)", "ActionButtonUp(8)"),
-        Some("8"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON9",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(9)", "ActionButtonUp(9)"),
-        Some("9"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON10",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(10)", "ActionButtonUp(10)"),
-        Some("0"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON11",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(11)", "ActionButtonUp(11)"),
-        Some("-"),
-        None
-    ),
-    spec!(
-        "ACTIONBUTTON12",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(12)", "ActionButtonUp(12)"),
-        Some("="),
-        None
-    ),
-    // ── Self-cast (`Bindings.xml:205-288`) ─────────────────────────────────────────────
-    // ACTIONBUTTON's halves with `ActionButtonUp`'s `onSelf` argument set, which stock
-    // `ActionButtonUp` forwards to `UseAction`.
-    spec!(
-        "SELFACTIONBUTTON1",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(1)", "ActionButtonUp(1, 1)"),
-        Some("ALT-1"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON2",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(2)", "ActionButtonUp(2, 1)"),
-        Some("ALT-2"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON3",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(3)", "ActionButtonUp(3, 1)"),
-        Some("ALT-3"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON4",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(4)", "ActionButtonUp(4, 1)"),
-        Some("ALT-4"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON5",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(5)", "ActionButtonUp(5, 1)"),
-        Some("ALT-5"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON6",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(6)", "ActionButtonUp(6, 1)"),
-        Some("ALT-6"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON7",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(7)", "ActionButtonUp(7, 1)"),
-        Some("ALT-7"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON8",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(8)", "ActionButtonUp(8, 1)"),
-        Some("ALT-8"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON9",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(9)", "ActionButtonUp(9, 1)"),
-        Some("ALT-9"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON10",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(10)", "ActionButtonUp(10, 1)"),
-        Some("ALT-0"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON11",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(11)", "ActionButtonUp(11, 1)"),
-        Some("ALT--"),
-        None
-    ),
-    spec!(
-        "SELFACTIONBUTTON12",
-        ACTIONBAR,
-        Kind::EdgeUpDown("ActionButtonDown(12)", "ActionButtonUp(12, 1)"),
-        Some("ALT-="),
-        None
-    ),
-    // The reference body is `ShapeshiftBar_ChangeForm(n)`; this clicks the visible stock
-    // button, whose OnClick calls it (`BonusActionBarFrame.xml:37`).
-    spec!(
-        "SHAPESHIFTBUTTON1",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton1"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F1"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON2",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton2"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F2"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON3",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton3"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F3"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON4",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton4"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F4"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON5",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton5"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F5"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON6",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton6"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F6"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON7",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton7"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F7"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON8",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton8"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F8"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON9",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton9"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F9"),
-        None
-    ),
-    spec!(
-        "SHAPESHIFTBUTTON10",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"local b = getglobal("ShapeshiftButton10"); if b and b:IsVisible() then b:Click() end"#
-        ),
-        Some("CTRL-F10"),
-        None
-    ),
-    // The pet bar, which 1.12 names BONUSACTIONBUTTON under the ACTIONBAR header
-    // (`Bindings.xml:321-390`); its `BonusActionButtonDown/Up` only call
-    // `PetActionButtonDown/Up` (`BonusActionBarFrame.lua:106-112`).
-    spec!(
-        "BONUSACTIONBUTTON1",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(1)", "PetActionButtonUp(1)"),
-        Some("CTRL-1"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON2",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(2)", "PetActionButtonUp(2)"),
-        Some("CTRL-2"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON3",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(3)", "PetActionButtonUp(3)"),
-        Some("CTRL-3"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON4",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(4)", "PetActionButtonUp(4)"),
-        Some("CTRL-4"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON5",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(5)", "PetActionButtonUp(5)"),
-        Some("CTRL-5"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON6",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(6)", "PetActionButtonUp(6)"),
-        Some("CTRL-6"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON7",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(7)", "PetActionButtonUp(7)"),
-        Some("CTRL-7"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON8",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(8)", "PetActionButtonUp(8)"),
-        Some("CTRL-8"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON9",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(9)", "PetActionButtonUp(9)"),
-        Some("CTRL-9"),
-        None
-    ),
-    spec!(
-        "BONUSACTIONBUTTON10",
-        ACTIONBAR,
-        Kind::EdgeUpDown("PetActionButtonDown(10)", "PetActionButtonUp(10)"),
-        Some("CTRL-0"),
-        None
-    ),
-    // ── Action-bar pages (`Bindings.xml:391-432`) ──────────────────────────────────────
-    // Six pages of twelve (slots 1-72). `ChangeActionBarPage` is an engine verb that only fires
-    // `ACTIONBAR_PAGE_CHANGED`; the `ActionBar_Page{Up,Down}` wrap is stock ActionButton.lua's.
-    spec!(
-        "ACTIONPAGE1",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 1 ) then CURRENT_ACTIONBAR_PAGE = 1; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-1"),
-        None
-    ),
-    spec!(
-        "ACTIONPAGE2",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 2 ) then CURRENT_ACTIONBAR_PAGE = 2; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-2"),
-        None
-    ),
-    spec!(
-        "ACTIONPAGE3",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 3 ) then CURRENT_ACTIONBAR_PAGE = 3; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-3"),
-        None
-    ),
-    spec!(
-        "ACTIONPAGE4",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 4 ) then CURRENT_ACTIONBAR_PAGE = 4; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-4"),
-        None
-    ),
-    spec!(
-        "ACTIONPAGE5",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 5 ) then CURRENT_ACTIONBAR_PAGE = 5; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-5"),
-        None
-    ),
-    spec!(
-        "ACTIONPAGE6",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( CURRENT_ACTIONBAR_PAGE ~= 6 ) then CURRENT_ACTIONBAR_PAGE = 6; \
-             ChangeActionBarPage(); end"
-        ),
-        Some("SHIFT-6"),
-        None
-    ),
-    spec!(
-        "PREVIOUSACTIONPAGE",
-        ACTIONBAR,
-        Kind::Edge("ActionBar_PageDown()"),
-        Some("SHIFT-UP"),
-        Some("SHIFT-MOUSEWHEELUP")
-    ),
-    spec!(
-        "NEXTACTIONPAGE",
-        ACTIONBAR,
-        Kind::Edge("ActionBar_PageUp()"),
-        Some("SHIFT-DOWN"),
-        Some("SHIFT-MOUSEWHEELDOWN")
-    ),
-    // Flips the `LOCK_ACTIONBAR` uvar the Options window's Lock ActionBars row writes
-    // (`Bindings.xml:433-439`).
-    spec!(
-        "TOGGLEACTIONBARLOCK",
-        ACTIONBAR,
-        Kind::Edge(
-            r#"if LOCK_ACTIONBAR == "1" then LOCK_ACTIONBAR = "0" else LOCK_ACTIONBAR = "1" end"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLEAUTOSELFCAST",
-        ACTIONBAR,
-        Kind::Edge(
-            "if ( GetCVar(\"autoSelfCast\") == \"1\" ) then SetCVar(\"autoSelfCast\", \"0\"); \
-             else SetCVar(\"autoSelfCast\", \"1\"); end"
-        ),
-        None,
-        None
-    ),
-    // ── Targeting (BINDING_HEADER_TARGETING) ────────────────────────────────────────────
-    spec!(
-        "TARGETNEARESTENEMY",
-        TARGETING,
-        Kind::Host,
-        Some("TAB"),
-        None
-    ),
-    spec!(
-        "TARGETPREVIOUSENEMY",
-        TARGETING,
-        Kind::Host,
-        Some("SHIFT-TAB"),
-        None
-    ),
-    // The friendly scan; `1` is the reverse flag (`Bindings.xml:458`).
-    spec!(
-        "TARGETNEARESTFRIEND",
-        TARGETING,
-        Kind::Edge("TargetNearestFriend()"),
-        Some("CTRL-TAB"),
-        None
-    ),
-    spec!(
-        "TARGETPREVIOUSFRIEND",
-        TARGETING,
-        Kind::Edge("TargetNearestFriend(1)"),
-        Some("CTRL-SHIFT-TAB"),
-        None
-    ),
-    // An already-targeted unit falls through to its pet (`Bindings.xml:460-494`).
-    spec!(
-        "TARGETSELF",
-        TARGETING,
-        Kind::Edge(
-            r#"if UnitIsUnit("player", "target") then TargetUnit("pet") else TargetUnit("player") end"#
-        ),
-        Some("F1"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYMEMBER1",
-        TARGETING,
-        Kind::Edge(
-            r#"if UnitIsUnit("party1", "target") then TargetUnit("partypet1") else TargetUnit("party1") end"#
-        ),
-        Some("F2"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYMEMBER2",
-        TARGETING,
-        Kind::Edge(
-            r#"if UnitIsUnit("party2", "target") then TargetUnit("partypet2") else TargetUnit("party2") end"#
-        ),
-        Some("F3"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYMEMBER3",
-        TARGETING,
-        Kind::Edge(
-            r#"if UnitIsUnit("party3", "target") then TargetUnit("partypet3") else TargetUnit("party3") end"#
-        ),
-        Some("F4"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYMEMBER4",
-        TARGETING,
-        Kind::Edge(
-            r#"if UnitIsUnit("party4", "target") then TargetUnit("partypet4") else TargetUnit("party4") end"#
-        ),
-        Some("F5"),
-        None
-    ),
-    spec!(
-        "TARGETPET",
-        TARGETING,
-        Kind::Edge(r#"TargetUnit("pet")"#),
-        Some("SHIFT-F1"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYPET1",
-        TARGETING,
-        Kind::Edge(r#"TargetUnit("partypet1")"#),
-        Some("SHIFT-F2"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYPET2",
-        TARGETING,
-        Kind::Edge(r#"TargetUnit("partypet2")"#),
-        Some("SHIFT-F3"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYPET3",
-        TARGETING,
-        Kind::Edge(r#"TargetUnit("partypet3")"#),
-        Some("SHIFT-F4"),
-        None
-    ),
-    spec!(
-        "TARGETPARTYPET4",
-        TARGETING,
-        Kind::Edge(r#"TargetUnit("partypet4")"#),
-        Some("SHIFT-F5"),
-        None
-    ),
-    spec!(
-        "TARGETLASTHOSTILE",
-        TARGETING,
-        Kind::Edge("TargetLastEnemy()"),
-        Some("G"),
-        None
-    ),
-    spec!(
-        "ASSISTTARGET",
-        TARGETING,
-        Kind::Edge(r#"AssistUnit("target")"#),
-        Some("F"),
-        None
-    ),
-    spec!("NAMEPLATES", TARGETING, Kind::Host, Some("V"), None),
-    spec!(
-        "FRIENDNAMEPLATES",
-        TARGETING,
-        Kind::Host,
-        Some("SHIFT-V"),
-        None
-    ),
-    spec!("ALLNAMEPLATES", TARGETING, Kind::Host, Some("CTRL-V"), None),
-    spec!("ATTACKTARGET", TARGETING, Kind::Host, Some("T"), None),
-    spec!(
-        "PETATTACK",
-        TARGETING,
-        Kind::Edge("PetAttack()"),
-        Some("SHIFT-T"),
-        None
-    ),
-    // ── Interface panels (BINDING_HEADER_INTERFACE) ─────────────────────────────────────
-    spec!(
-        "TOGGLECHARACTER0",
-        INTERFACE,
-        Kind::Edge(r#"ToggleCharacter("PaperDollFrame")"#),
-        Some("C"),
-        None
-    ),
-    // The bag family: `B` opens the backpack alone, `SHIFT-B` every bag. Each body is the bare
-    // global, as in `Bindings.xml`, never a button's OnClick, which would add its checked state.
-    spec!(
-        "TOGGLEBACKPACK",
-        INTERFACE,
-        Kind::Edge("ToggleBackpack()"),
-        Some("B"),
-        Some("F12")
-    ),
-    // TOGGLEBAGn is bag 5-n, so F8 opens the slot farthest from the backpack
-    // (`Bindings.xml:564-575`).
-    spec!(
-        "TOGGLEBAG1",
-        INTERFACE,
-        Kind::Edge("ToggleBag(4)"),
-        Some("F8"),
-        None
-    ),
-    spec!(
-        "TOGGLEBAG2",
-        INTERFACE,
-        Kind::Edge("ToggleBag(3)"),
-        Some("F9"),
-        None
-    ),
-    spec!(
-        "TOGGLEBAG3",
-        INTERFACE,
-        Kind::Edge("ToggleBag(2)"),
-        Some("F10"),
-        None
-    ),
-    spec!(
-        "TOGGLEBAG4",
-        INTERFACE,
-        Kind::Edge("ToggleBag(1)"),
-        Some("F11"),
-        None
-    ),
-    spec!(
-        "OPENALLBAGS",
-        INTERFACE,
-        Kind::Edge("OpenAllBags()"),
-        Some("SHIFT-B"),
-        None
-    ),
-    spec!(
-        "TOGGLEKEYRING",
-        INTERFACE,
-        Kind::Edge("ToggleKeyRing()"),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLESPELLBOOK",
-        INTERFACE,
-        Kind::Edge("ToggleSpellBook(BOOKTYPE_SPELL)"),
-        Some("P"),
-        None
-    ),
-    // The pet book is the same window forked on `bookType`.
-    spec!(
-        "TOGGLEPETBOOK",
-        INTERFACE,
-        Kind::Edge("ToggleSpellBook(BOOKTYPE_PET)"),
-        Some("SHIFT-I"),
-        None
-    ),
-    spec!(
-        "TOGGLETALENTS",
-        INTERFACE,
-        Kind::Edge("ToggleTalentFrame()"),
-        Some("N"),
-        None
-    ),
-    // TOGGLECHARACTERn is the reference's page number, not a tab index: 0 PaperDoll, 1 Skill,
-    // 2 Reputation, 3 PetPaperDoll, 4 Honor; the file runs them 4, 3, 2, 1.
-    spec!(
-        "TOGGLECHARACTER4",
-        INTERFACE,
-        Kind::Edge(r#"ToggleCharacter("HonorFrame")"#),
-        Some("H"),
-        None
-    ),
-    spec!(
-        "TOGGLECHARACTER3",
-        INTERFACE,
-        Kind::Edge(r#"ToggleCharacter("PetPaperDollFrame")"#),
-        Some("SHIFT-P"),
-        None
-    ),
-    spec!(
-        "TOGGLECHARACTER2",
-        INTERFACE,
-        Kind::Edge(r#"ToggleCharacter("ReputationFrame")"#),
-        Some("U"),
-        None
-    ),
-    spec!(
-        "TOGGLECHARACTER1",
-        INTERFACE,
-        Kind::Edge(r#"ToggleCharacter("SkillFrame")"#),
-        Some("K"),
-        None
-    ),
-    spec!(
-        "TOGGLEQUESTLOG",
-        INTERFACE,
-        Kind::Edge("ToggleQuestLog()"),
-        Some("L"),
-        None
-    ),
-    spec!(
-        "TOGGLEGAMEMENU",
-        INTERFACE,
-        Kind::Edge("ToggleGameMenu()"),
-        Some("ESCAPE"),
-        None
-    ),
-    spec!(
-        "TOGGLEMINIMAP",
-        INTERFACE,
-        Kind::Edge(
-            r#"if MinimapCluster:IsVisible() then MinimapCluster:Hide() else MinimapCluster:Show() end"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLEWORLDMAP",
-        INTERFACE,
-        Kind::Edge("ToggleWorldMap()"),
-        Some("M"),
-        None
-    ),
-    spec!(
-        "TOGGLESOCIAL",
-        INTERFACE,
-        Kind::Edge("ToggleFriendsFrame()"),
-        Some("O"),
-        None
-    ),
-    spec!(
-        "TOGGLEFRIENDSTAB",
-        INTERFACE,
-        Kind::Edge("ToggleFriendsFrame(1)"),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLEWHOTAB",
-        INTERFACE,
-        Kind::Edge("ToggleFriendsFrame(2)"),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLEGUILDTAB",
-        INTERFACE,
-        Kind::Edge("ToggleFriendsFrame(3)"),
-        None,
-        None
-    ),
-    spec!(
-        "TOGGLERAIDTAB",
-        INTERFACE,
-        Kind::Edge("ToggleFriendsFrame(4)"),
-        None,
-        None
-    ),
-    // `ToggleWorldStateScoreFrame` is stock WorldStateFrame.lua's, `ToggleBattlefieldMinimap`
-    // stock `UIParent.lua:216` (`Bindings.xml:630-635`).
-    spec!(
-        "TOGGLEWORLDSTATESCORES",
-        INTERFACE,
-        Kind::Edge("ToggleWorldStateScoreFrame()"),
-        Some("SHIFT-SPACE"),
-        None
-    ),
-    spec!(
-        "TOGGLEBATTLEFIELDMINIMAP",
-        INTERFACE,
-        Kind::Edge("ToggleBattlefieldMinimap()"),
-        Some("SHIFT-M"),
-        None
-    ),
-    // ── Miscellaneous (BINDING_HEADER_MISC) ─────────────────────────────────────────────
-    spec!(
-        "MINIMAPZOOMIN",
-        MISC,
-        Kind::Edge("Minimap_ZoomInClick()"),
-        Some("NUMPADPLUS"),
-        None
-    ),
-    spec!(
-        "MINIMAPZOOMOUT",
-        MISC,
-        Kind::Edge("Minimap_ZoomOutClick()"),
-        Some("NUMPADMINUS"),
-        None
-    ),
-    // The CVars stock SoundOptionsFrame.lua moves: `MasterSoundEffects` is the master enable,
-    // `MasterVolume` steps by 0.1.
-    spec!(
-        "TOGGLEMUSIC",
-        MISC,
-        Kind::Edge(
-            r#"if GetCVar("EnableMusic") == "1" then SetCVar("EnableMusic", "0") else SetCVar("EnableMusic", "1") end"#
-        ),
-        Some("CTRL-M"),
-        None
-    ),
-    spec!(
-        "TOGGLESOUND",
-        MISC,
-        Kind::Edge(
-            r#"if GetCVar("MasterSoundEffects") == "1" then SetCVar("MasterSoundEffects", "0") else SetCVar("MasterSoundEffects", "1") end"#
-        ),
-        Some("CTRL-S"),
-        None
-    ),
-    spec!(
-        "MASTERVOLUMEUP",
-        MISC,
-        Kind::Edge(
-            r#"local v = tonumber(GetCVar("MasterVolume")) + 0.1; if v > 1 then v = 1 end; SetCVar("MasterVolume", v)"#
-        ),
-        Some("CTRL-="),
-        None
-    ),
-    spec!(
-        "MASTERVOLUMEDOWN",
-        MISC,
-        Kind::Edge(
-            r#"local v = tonumber(GetCVar("MasterVolume")) - 0.1; if v < 0 then v = 0 end; SetCVar("MasterVolume", v)"#
-        ),
-        Some("CTRL--"),
-        None
-    ),
-    // ALT-Z is the shipped default; a `bindings-cache.wtf` holding CTRL-Z is a player rebind.
-    spec!("TOGGLEUI", MISC, Kind::Host, Some("ALT-Z"), None),
-    // Stock WorldFrame.lua's framerate readout.
-    spec!(
-        "TOGGLEFPS",
-        MISC,
-        Kind::Edge("ToggleFramerate();"),
-        Some("CTRL-R"),
-        None
-    ),
-    // `Edge`: the `<Binding>` has no `runOnUp`, and the dispatcher returns on key-up without it
-    // (`0x4b7bea`).
-    spec!(
-        "SCREENSHOT",
-        MISC,
-        Kind::Edge("TakeScreenshot();"),
-        Some("PRINTSCREEN"),
-        None
-    ),
-    // ── Camera (BINDING_HEADER_CAMERA) ──────────────────────────────────────────────────
-    // The five camera views (defaults: the table at `0x84f488`). NEXTVIEW/PREVVIEW stop at the
-    // ends (`0x50faa0`/`0x50fac0`); 1.12 has no SAVEVIEW1/RESETVIEW1 row though the engine
-    // accepts view 1.
-    spec!(
-        "NEXTVIEW",
-        CAMERA,
-        Kind::Edge("NextView()"),
-        Some("END"),
-        None
-    ),
-    spec!(
-        "PREVVIEW",
-        CAMERA,
-        Kind::Edge("PrevView()"),
-        Some("HOME"),
-        None
-    ),
-    spec!(
-        "CAMERAZOOMIN",
-        CAMERA,
-        Kind::Host,
-        Some("MOUSEWHEELUP"),
-        None
-    ),
-    spec!(
-        "CAMERAZOOMOUT",
-        CAMERA,
-        Kind::Host,
-        Some("MOUSEWHEELDOWN"),
-        None
-    ),
-    spec!("SETVIEW1", CAMERA, Kind::Edge("SetView(1)"), None, None),
-    spec!("SETVIEW2", CAMERA, Kind::Edge("SetView(2)"), None, None),
-    spec!("SETVIEW3", CAMERA, Kind::Edge("SetView(3)"), None, None),
-    spec!("SETVIEW4", CAMERA, Kind::Edge("SetView(4)"), None, None),
-    spec!("SETVIEW5", CAMERA, Kind::Edge("SetView(5)"), None, None),
-    spec!("SAVEVIEW2", CAMERA, Kind::Edge("SaveView(2)"), None, None),
-    spec!("SAVEVIEW3", CAMERA, Kind::Edge("SaveView(3)"), None, None),
-    spec!("SAVEVIEW4", CAMERA, Kind::Edge("SaveView(4)"), None, None),
-    spec!("SAVEVIEW5", CAMERA, Kind::Edge("SaveView(5)"), None, None),
-    spec!("RESETVIEW2", CAMERA, Kind::Edge("ResetView(2)"), None, None),
-    spec!("RESETVIEW3", CAMERA, Kind::Edge("ResetView(3)"), None, None),
-    spec!("RESETVIEW4", CAMERA, Kind::Edge("ResetView(4)"), None, None),
-    spec!("RESETVIEW5", CAMERA, Kind::Edge("ResetView(5)"), None, None),
-    spec!(
-        "FLIPCAMERAYAW",
-        CAMERA,
-        Kind::Edge("FlipCameraYaw(180)"),
-        None,
-        None
-    ),
-    // ── MultiActionBar (BINDING_HEADER_MULTIACTIONBAR) ──────────────────────────────────
-    // The four multibars' `runOnUp` pairs (`Bindings.xml:799-1134`), stock MultiActionBars.lua's.
-    // Deviation: 1.12 files bars 2-4 under the spacer headers `BLANK`, `BLANK2` and `BLANK3`; they
-    // sit under MULTIACTIONBAR here because this page's sections are named.
-    spec!(
-        "MULTIACTIONBAR1BUTTON1",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 1)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 1)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON2",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 2)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 2)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON3",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 3)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 3)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON4",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 4)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 4)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON5",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 5)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 5)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON6",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 6)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 6)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON7",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 7)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 7)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON8",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 8)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 8)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON9",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 9)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 9)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON10",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 10)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 10)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON11",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 11)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 11)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR1BUTTON12",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomLeft", 12)"#,
-            r#"MultiActionButtonUp("MultiBarBottomLeft", 12)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON1",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 1)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 1)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON2",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 2)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 2)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON3",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 3)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 3)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON4",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 4)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 4)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON5",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 5)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 5)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON6",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 6)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 6)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON7",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 7)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 7)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON8",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 8)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 8)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON9",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 9)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 9)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON10",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 10)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 10)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON11",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 11)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 11)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR2BUTTON12",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarBottomRight", 12)"#,
-            r#"MultiActionButtonUp("MultiBarBottomRight", 12)"#
-        ),
-        None,
-        None
-    ),
-    // The vertical bars: `MultiBarRight` is bar 3, `MultiBarLeft` bar 4.
-    spec!(
-        "MULTIACTIONBAR3BUTTON1",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 1)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 1)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON2",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 2)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 2)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON3",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 3)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 3)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON4",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 4)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 4)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON5",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 5)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 5)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON6",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 6)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 6)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON7",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 7)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 7)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON8",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 8)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 8)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON9",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 9)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 9)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON10",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 10)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 10)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON11",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 11)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 11)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR3BUTTON12",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarRight", 12)"#,
-            r#"MultiActionButtonUp("MultiBarRight", 12)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON1",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 1)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 1)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON2",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 2)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 2)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON3",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 3)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 3)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON4",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 4)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 4)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON5",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 5)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 5)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON6",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 6)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 6)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON7",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 7)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 7)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON8",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 8)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 8)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON9",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 9)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 9)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON10",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 10)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 10)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON11",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 11)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 11)"#
-        ),
-        None,
-        None
-    ),
-    spec!(
-        "MULTIACTIONBAR4BUTTON12",
-        MULTIACTIONBAR,
-        Kind::EdgeUpDown(
-            r#"MultiActionButtonDown("MultiBarLeft", 12)"#,
-            r#"MultiActionButtonUp("MultiBarLeft", 12)"#
-        ),
-        None,
-        None
-    ),
-    // ── Raid targeting (BINDING_HEADER_RAID_TARGET) ─────────────────────────────────────
-    // `SetRaidTargetIcon` toggles an icon the unit already wears off; 0 clears.
-    spec!(
-        "RAIDTARGET1",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 1)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET2",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 2)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET3",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 3)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET4",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 4)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET5",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 5)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET6",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 6)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET7",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 7)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGET8",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 8)"#),
-        None,
-        None
-    ),
-    spec!(
-        "RAIDTARGETNONE",
-        RAID_TARGET,
-        Kind::Edge(r#"SetRaidTargetIcon("target", 0)"#),
-        None,
-        None
-    ),
-];
-
-/// One 1.12 binding command this client does not register, and the mechanism it waits on; a
-/// test fails once every global in [`needs`] is defined.
-///
-/// [`needs`]: Absent::needs
-pub(crate) struct Absent {
-    /// The 1.12 command name, exactly as `Bindings.xml` spells it.
-    pub name: &'static str,
-    /// Lua globals the reference's body calls that this client does not define; never empty, and
-    /// once all are defined the row belongs in [`SPECS`].
-    #[cfg_attr(
-        not(test),
-        expect(
-            dead_code,
-            reason = "the falsifier is the gate test's to read, and the gate is the whole point \
-                      of the field; an `expect` rather than an `allow` so the attribute goes by \
-                      itself the day a runtime reader wants it"
-        )
-    )]
-    pub needs: &'static [&'static str],
-    /// What would have to exist, in one line.
-    pub why: &'static str,
-}
-
-macro_rules! absent {
-    ($name:literal, [$($needs:literal),* $(,)?], $why:literal) => {
-        Absent {
-            name: $name,
-            needs: &[$($needs),*],
-            why: $why,
-        }
-    };
-}
-
-/// The 1.12 commands benilla does not implement, in `Bindings.xml` order; with `SPECS`, exactly
-/// the client's 228 live bindings.
-pub(crate) static ABSENT: &[Absent] = &[
-    // ── Movement ────────────────────────────────────────────────────────────────────────
-    absent!(
-        "PITCHUP",
-        ["PitchUpStart", "PitchUpStop"],
-        "no keyboard pitch: the mover has no pitch axis at all — swim and hover attitude ride the \
-         move flags the server echoes, and nothing steers them"
-    ),
-    absent!(
-        "PITCHDOWN",
-        ["PitchDownStart", "PitchDownStop"],
-        "no keyboard pitch — see PITCHUP"
-    ),
-    // ── Misc ────────────────────────────────────────────────────────────────────────────
-    // The nine `hidden="true" debug="true"` rows: benilla's instruments for these answer to the
-    // dev plane's chords, not to a binding.
-    absent!(
-        "TOGGLESTATS",
-        ["ToggleStats"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLETRIS",
-        ["ToggleTris"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLEPORTALS",
-        ["TogglePortals"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLECOLLISION",
-        ["ToggleCollision"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLECOLLISIONDISPLAY",
-        ["ToggleCollisionDisplay"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLEPLAYERBOUNDS",
-        ["TogglePlayerBounds"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLEPERFORMANCEDISPLAY",
-        ["TogglePerformanceDisplay"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "TOGGLEPERFORMANCEVALUES",
-        ["TogglePerformanceValues"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    absent!(
-        "RESETPERFORMANCEVALUES",
-        ["ResetPerformanceValues"],
-        "a dev-plane instrument on a dev chord"
-    ),
-    // ── The mouse's own three (hidden) ──────────────────────────────────────────────────
-    // The reference's mouse-look bindings (BUTTON2, BUTTON1, CTRL-BUTTON1), hidden from the
-    // window; benilla's mouse-look is hardwired in `player/camera.rs`.
-    absent!(
-        "TURNORACTION",
-        ["TurnOrActionStart", "TurnOrActionStop"],
-        "right-button mouse-look is hardwired, not routed through a binding"
-    ),
-    absent!(
-        "CAMERAORSELECTORMOVE",
-        ["CameraOrSelectOrMoveStart", "CameraOrSelectOrMoveStop"],
-        "left-button select/move is hardwired, not routed through a binding"
-    ),
-    absent!(
-        "CAMERAORSELECTORMOVESTICKY",
-        ["CameraOrSelectOrMoveStart", "CameraOrSelectOrMoveStop"],
-        "left-button select/move is hardwired, not routed through a binding"
-    ),
-    // ── iTunes remote (platform="mac") ──────────────────────────────────────────────────
-    // 1.12's only `platform="mac"` rows; they remote the system music player, not the game's.
-    absent!(
-        "ITUNES_PLAYPAUSE",
-        ["MusicPlayer_PlayPause"],
-        "platform=\"mac\", and there is no system music player to remote"
-    ),
-    absent!(
-        "ITUNES_NEXTTRACK",
-        ["MusicPlayer_NextTrack"],
-        "platform=\"mac\", and there is no system music player to remote"
-    ),
-    absent!(
-        "ITUNES_BACKTRACK",
-        ["MusicPlayer_BackTrack"],
-        "platform=\"mac\", and there is no system music player to remote"
-    ),
-    absent!(
-        "ITUNES_VOLUMEUP",
-        ["MusicPlayer_VolumeUp"],
-        "platform=\"mac\", and there is no system music player to remote"
-    ),
-    absent!(
-        "ITUNES_VOLUMEDOWN",
-        ["MusicPlayer_VolumeDown"],
-        "platform=\"mac\", and there is no system music player to remote"
-    ),
-];
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn every_default_chord_parses() {
-        for s in SPECS {
-            for d in [s.d1, s.d2].into_iter().flatten() {
-                assert!(
-                    crate::bindings::chord::Chord::parse(d).is_some(),
-                    "{}: default '{d}' does not parse",
-                    s.name
-                );
-            }
-        }
-    }
-
-    /// One key, one command: a duplicate default would leave the loser of the steal pass unbound.
-    #[test]
-    fn no_two_commands_ship_the_same_default_chord() {
-        let mut seen: std::collections::HashMap<&str, &str> = std::collections::HashMap::new();
-        for s in SPECS {
-            for d in [s.d1, s.d2].into_iter().flatten() {
-                if let Some(prev) = seen.insert(d, s.name) {
-                    panic!("default '{d}' is on both {prev} and {}", s.name);
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn names_are_unique() {
-        let mut seen = std::collections::HashSet::new();
-        for s in SPECS {
-            assert!(seen.insert(s.name), "duplicate command {}", s.name);
-        }
-    }
-
-    /// Every row's `runOnUp` against the install's `Bindings.xml`, and its default chords against
-    /// `WTF\DefaultBindings.wtf`.
-    #[test]
-    fn the_registry_matches_the_installs_own_bindings() {
-        let data = benilla_formats::wow_data_or_skip!();
-        let mut chain = benilla_formats::open_chain(&data).expect("open the 1.12 patch chain");
-
-        let xml = String::from_utf8_lossy(
-            &chain
-                .read_file("Interface\\FrameXML\\Bindings.xml")
-                .expect("the install carries Bindings.xml"),
-        )
-        .into_owned();
-        let reference = benilla_ui::bindings_xml::parse(&xml).expect("Blizzard's own file parses");
-        let run_on_up: std::collections::HashMap<&str, bool> = reference
-            .iter()
-            .map(|b| (b.name.as_str(), b.run_on_up))
-            .collect();
-
-        // `bind <CHORD> <COMMAND>`; file order is the Key 1, Key 2 order.
-        let wtf = String::from_utf8_lossy(
-            &chain
-                .read_file("WTF\\DefaultBindings.wtf")
-                .expect("the install carries DefaultBindings.wtf"),
-        )
-        .into_owned();
-        let mut defaults: std::collections::HashMap<&str, Vec<&str>> =
-            std::collections::HashMap::new();
-        for line in wtf.lines() {
-            let mut it = line.split_whitespace();
-            if let (Some("bind"), Some(chord), Some(command), None) =
-                (it.next(), it.next(), it.next(), it.next())
-            {
-                defaults.entry(command).or_default().push(chord);
-            }
-        }
-
-        for s in SPECS {
-            let Some(&reference_run_on_up) = run_on_up.get(s.name) else {
-                panic!(
-                    "{} is not a 1.12 binding at all — the tree is meant to be honest",
-                    s.name
-                );
-            };
-            assert_eq!(
-                s.run_on_up(),
-                reference_run_on_up,
-                "{}: runOnUp disagrees with the install's Bindings.xml — that flag decides \
-                 whether a press of this command delivers a release half",
-                s.name
-            );
-            let ours: Vec<&str> = [s.d1, s.d2].into_iter().flatten().collect();
-            assert_eq!(
-                ours,
-                defaults.get(s.name).cloned().unwrap_or_default(),
-                "{}: default chords disagree with the install's DefaultBindings.wtf",
-                s.name
-            );
-        }
-    }
-
-    /// Every one of the client's 228 live bindings is in exactly one of [`SPECS`] and [`ABSENT`],
-    /// none of the twelve `hidden="true"` ones is in `SPECS`, and `SPECS` keeps the file's order.
-    #[test]
-    fn every_1_12_command_is_registered_or_recorded_absent() {
-        let Some(reference) = install_bindings() else {
-            return;
-        };
-
-        let registered: std::collections::HashSet<&str> = SPECS.iter().map(|s| s.name).collect();
-        let recorded: std::collections::HashSet<&str> = ABSENT.iter().map(|a| a.name).collect();
-
-        let mut unwritten = Vec::new();
-        for b in &reference {
-            let name = b.name.as_str();
-            match (registered.contains(name), recorded.contains(name)) {
-                (true, true) => panic!("{name} is both registered and recorded absent"),
-                (false, false) => unwritten.push(name),
-                (true, false) => assert!(
-                    !b.hidden,
-                    "{name} is hidden=\"true\" in 1.12 — the Keybindings page would list a row \
-                     the reference never shows"
-                ),
-                (false, true) => {}
-            }
-        }
-        assert!(
-            unwritten.is_empty(),
-            "these 1.12 bindings are neither implemented nor recorded absent — add a `spec!` row \
-             if the mechanism is here, an `absent!` row with its falsifier if it is not: {unwritten:?}"
-        );
-
-        let live: std::collections::HashSet<&str> =
-            reference.iter().map(|b| b.name.as_str()).collect();
-        for a in ABSENT {
-            assert!(
-                live.contains(a.name),
-                "ABSENT names {}, which is not a live 1.12 binding (the six MOVEVIEW* rows are \
-                 commented out in Blizzard's own file and are not commands)",
-                a.name
-            );
-        }
-
-        // The table's order is the Keybindings page's row order.
-        let order: Vec<&str> = reference.iter().map(|b| b.name.as_str()).collect();
-        let mut at = 0usize;
-        for s in SPECS {
-            let Some(found) = order[at..].iter().position(|n| *n == s.name) else {
-                panic!(
-                    "{} is out of 1.12 Bindings.xml order — the page renders SPECS order, so this \
-                     is what the player sees",
-                    s.name
-                );
-            };
-            at += found + 1;
-        }
-    }
-
-    /// An [`ABSENT`] row whose `needs` are all defined belongs in [`SPECS`]. "Defined" is read
-    /// from source, not from a VM.
-    #[test]
-    fn the_absent_commands_are_still_absent() {
-        let defined = lua_globals_defined();
-        for a in ABSENT {
-            if a.needs.is_empty() {
-                continue;
-            }
-            let landed: Vec<&str> = a
-                .needs
-                .iter()
-                .copied()
-                .filter(|n| defined.contains(*n))
-                .collect();
-            assert_ne!(
-                landed.len(),
-                a.needs.len(),
-                "{}'s mechanism has landed — {:?} are all defined now, so the row belongs in \
-                 SPECS. (Recorded reason: {})",
-                a.name,
-                a.needs,
-                a.why
-            );
-        }
-    }
-
-    /// Unique names, a reason on every row, and no row without `needs`, which could go stale
-    /// unnoticed.
-    #[test]
-    fn the_absent_table_is_well_formed() {
-        let mut seen = std::collections::HashSet::new();
-        for a in ABSENT {
-            assert!(seen.insert(a.name), "duplicate absent command {}", a.name);
-            assert!(!a.why.is_empty(), "{}: no reason recorded", a.name);
-        }
-        let unfalsifiable: Vec<&str> = ABSENT
-            .iter()
-            .filter(|a| a.needs.is_empty())
-            .map(|a| a.name)
-            .collect();
-        assert!(
-            unfalsifiable.is_empty(),
-            "every absent row must carry a falsifier — a row with no `needs` can go stale \
-             unnoticed, which is the whole failure this table exists to end: {unfalsifiable:?}"
-        );
-    }
-
-    /// `lua_globals_defined` sees each store it reads and invents nothing; a blind scanner would
-    /// pass every [`ABSENT`] row.
-    #[test]
-    fn the_global_scanner_sees_both_kinds_of_definition() {
-        benilla_formats::wow_data_or_skip!();
-        let defined = lua_globals_defined();
-        for host in ["TargetUnit", "UseAction", "SetBinding"] {
-            assert!(
-                defined.contains(host),
-                "the Rust scan missed the host registration `{host}`"
-            );
-        }
-        // None of these is in `assets/ui`: `ChangeActionBarPage` is a host registration and the
-        // other two come from stock CharacterFrame.lua and UIParent.lua off the chain, so this
-        // loop does not isolate the `assets/ui` scan.
-        for shipped in ["ToggleCharacter", "ChangeActionBarPage", "ShowUIPanel"] {
-            assert!(
-                defined.contains(shipped),
-                "the scan missed `{shipped}`, a host registration or a stock chain global"
-            );
-        }
-        // Stock ContainerFrame.lua's, sourced off the chain by `benilla.toc`.
-        if benilla_formats::wow_data().is_some() {
-            for sourced in ["ToggleKeyRing", "ToggleBag", "OpenAllBags"] {
-                assert!(
-                    defined.contains(sourced),
-                    "the chain scan missed `{sourced}` — it is defined in the reference's own \
-                     ContainerFrame.lua, which benilla.toc sources off the player's install"
-                );
-            }
-        }
-        assert!(
-            !defined.contains("BenillaNoSuchGlobalExists"),
-            "the scanner claims to define a name nobody wrote"
-        );
-    }
-
-    /// The install's `Bindings.xml` has the shape `benilla_ui::bindings_xml` documents; the
-    /// commented-out `MOVEVIEW*` family must not register.
-    #[test]
-    fn the_installs_bindings_xml_reads_as_the_parsers_header_says() {
-        let Some(binds) = install_bindings() else {
-            return;
-        };
-        assert_eq!(
-            binds.len(),
-            228,
-            "1.12.1 ships 228 live bindings — the other six are inside a comment"
-        );
-        assert!(binds.iter().all(|b| !b.name.is_empty()));
-        assert!(
-            !binds.iter().any(|b| b.name.starts_with("MOVEVIEW")),
-            "the commented-out family must not register"
-        );
-        assert_eq!(binds.iter().filter(|b| b.run_on_up).count(), 94);
-        assert_eq!(binds.iter().filter(|b| b.header.is_some()).count(), 13);
-        assert_eq!(binds.iter().filter(|b| b.hidden).count(), 12);
-        assert_eq!(
-            binds[0].header.as_deref(),
-            Some("MOVEMENT"),
-            "the file opens on the MOVEMENT section"
-        );
-    }
-
-    /// The install's own `Bindings.xml`, parsed.
-    fn install_bindings() -> Option<Vec<benilla_ui::bindings_xml::AddonBinding>> {
-        let data = benilla_formats::wow_data_or_skip!(None);
-        let mut chain = benilla_formats::open_chain(&data).expect("open the 1.12 patch chain");
-        let xml = String::from_utf8_lossy(
-            &chain
-                .read_file("Interface\\FrameXML\\Bindings.xml")
-                .expect("the install carries Bindings.xml"),
-        )
-        .into_owned();
-        Some(benilla_ui::bindings_xml::parse(&xml).expect("Blizzard's own file parses"))
-    }
-
-    /// Every Lua global this client defines, read from source: host registrations
-    /// (`g.set("Name", …)`), function definitions in `assets/ui`'s `<Script>` blocks, and the
-    /// stock files `benilla.toc` sources off the chain (none without an install). Deliberately
-    /// generous, `local function` included: a false "defined" fails loudly, a false "missing"
-    /// would hide a landed mechanism.
-    fn lua_globals_defined() -> std::collections::HashSet<String> {
-        fn walk(dir: &std::path::Path, ext: &str, out: &mut Vec<std::path::PathBuf>) {
-            let Ok(entries) = std::fs::read_dir(dir) else {
-                return;
-            };
-            for entry in entries.flatten() {
-                let path = entry.path();
-                if path.is_dir() {
-                    if path.file_name().is_some_and(|n| n == "target") {
-                        continue;
-                    }
-                    walk(&path, ext, out);
-                } else if path.extension().is_some_and(|e| e == ext) {
-                    out.push(path);
-                }
-            }
-        }
-
-        fn push(names: &mut std::collections::HashSet<String>, s: &str) {
-            if s.chars()
-                .next()
-                .is_some_and(|c| c.is_ascii_alphabetic() || c == '_')
-            {
-                names.insert(s.to_string());
-            }
-        }
-
-        /// The `function Name(` and `Name = function` definitions in one Lua-carrying text.
-        fn scan_lua(text: &str, names: &mut std::collections::HashSet<String>) {
-            let mut rest = text;
-            while let Some(i) = rest.find("function ") {
-                rest = &rest[i + "function ".len()..];
-                let end = rest
-                    .find(|c: char| !(c.is_ascii_alphanumeric() || c == '_'))
-                    .unwrap_or(rest.len());
-                if rest[end..].trim_start().starts_with('(') {
-                    push(names, &rest[..end]);
-                }
-            }
-            for line in text.lines() {
-                let line = line.trim_start();
-                if let Some((lhs, rhs)) = line.split_once('=') {
-                    let lhs = lhs.trim();
-                    if rhs.trim_start().starts_with("function")
-                        && lhs.chars().all(|c| c.is_ascii_alphanumeric() || c == '_')
-                    {
-                        push(names, lhs);
-                    }
-                }
-            }
-        }
-
-        /// The `.lua` files an XML document pulls in through `<Script file="…"/>`, relative to the
-        /// document's directory, as the loader resolves them.
-        fn script_files(text: &str) -> Vec<String> {
-            let mut out = Vec::new();
-            let mut rest = text;
-            while let Some(i) = rest.find("file=\"") {
-                rest = &rest[i + "file=\"".len()..];
-                let Some(end) = rest.find('"') else { break };
-                if rest[..end].to_ascii_lowercase().ends_with(".lua") {
-                    out.push(rest[..end].to_string());
-                }
-                rest = &rest[end..];
-            }
-            out
-        }
-
-        let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-            .parent()
-            .and_then(|p| p.parent())
-            .expect("the workspace root is two above the crate")
-            .to_path_buf();
-
-        let mut names = std::collections::HashSet::new();
-
-        let mut rust = Vec::new();
-        walk(&root.join("crates"), "rs", &mut rust);
-        for path in rust {
-            let Ok(text) = std::fs::read_to_string(&path) else {
-                continue;
-            };
-            // `.set("Name"`, across any whitespace, as rustfmt breaks long ones onto a new line.
-            let mut rest = text.as_str();
-            while let Some(i) = rest.find(".set(") {
-                rest = &rest[i + ".set(".len()..];
-                let head = rest.trim_start();
-                if let Some(body) = head.strip_prefix('"') {
-                    if let Some(end) = body.find('"') {
-                        push(&mut names, &body[..end]);
-                    }
-                }
-            }
-        }
-
-        let ui = root.join("crates/benilla-app/assets/ui");
-        let mut xml = Vec::new();
-        walk(&ui, "xml", &mut xml);
-        for path in xml {
-            let Ok(text) = std::fs::read_to_string(&path) else {
-                continue;
-            };
-            scan_lua(&text, &mut names);
-        }
-
-        let Some(data) = benilla_formats::wow_data() else {
-            return names;
-        };
-        let Ok(mut chain) = benilla_formats::open_chain(&data) else {
-            return names;
-        };
-        let manifest =
-            std::fs::read_to_string(ui.join("benilla.toc")).expect("the manifest is committed");
-        for entry in manifest
-            .lines()
-            .map(str::trim)
-            .filter(|l| !l.is_empty() && !l.starts_with('#'))
-            // An entry with a path separator is a stock file
-            // (`ui_script::reference_ui::is_chain_entry`).
-            .filter(|l| l.contains('\\') || l.contains('/'))
-        {
-            let Ok(bytes) = chain.read_file(entry) else {
-                continue;
-            };
-            let text = String::from_utf8_lossy(&bytes).into_owned();
-            scan_lua(&text, &mut names);
-            if !entry.to_ascii_lowercase().ends_with(".xml") {
-                continue;
-            }
-            let dir = entry.rfind('\\').map_or("", |i| &entry[..=i]);
-            for script in script_files(&text) {
-                if let Ok(b) = chain.read_file(&format!("{dir}{script}")) {
-                    scan_lua(&String::from_utf8_lossy(&b), &mut names);
-                }
-            }
-        }
-        names
-    }
-}
diff --git a/crates/benilla-app/src/bindings/layout.rs b/crates/benilla-app/src/bindings/layout.rs
new file mode 100644
index 00000000..b373b0f3
--- /dev/null
+++ b/crates/benilla-app/src/bindings/layout.rs
@@ -0,0 +1,668 @@
+//! What the active keyboard layout names each letter, digit and punctuation key, which 1.12 binds
+//! by. The Windows client names a key from the virtual-key code the layout produced: the
+//! translator `0x42d800` keeps `VK_0`-`VK_9` as themselves (`0x42d81c`) and sends every other key
+//! outside its fixed table, `VK_A`-`VK_Z` and `VK_OEM_*` among them, to
+//! `MapVirtualKeyA(vk, MAPVK_VK_TO_CHAR)` (`0x42da39`), which returns `VK_A`-`VK_Z`'s own letter
+//! whatever the layout types there. The Mac client fills its letter and punctuation keys from the
+//! live layout, `KeyTranslate` (`0x8a3c3`) on the current `KCHR` (re-read when it changes,
+//! `0x8a345`), and fixes its digits by position (`0x5bf320`). Bevy's `KeyboardInput` carries the
+//! physical key and a `logical_key` with Shift applied, so each platform's name is read off the
+//! raw winit key messages here, before any `Update` reader.
+
+use std::collections::HashMap;
+
+use bevy::input::keyboard::KeyCode;
+use bevy::prelude::*;
+
+/// A layout-named key's place on a US keyboard, with the US name there.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Position {
+    Letter(char),
+    Digit(char),
+    /// The ISO and JIS extra keys and the keypad comma have no US name.
+    Punctuation(Option<char>),
+}
+
+impl Position {
+    fn us(self) -> Option<char> {
+        match self {
+            Position::Letter(c) | Position::Digit(c) => Some(c),
+            Position::Punctuation(c) => c,
+        }
+    }
+}
+
+/// The keys a layout names: the letters, the digits, the punctuation, the ISO and JIS extras and
+/// the keypad comma. Windows sends `VK_OEM_102`, `VK_ABNT_C2` and `VK_SEPARATOR` to the layout arm
+/// like any `VK_OEM_*` key, and the Mac table leaves the ISO key `0x0A` and the keypad comma
+/// `0x5F` to `KeyTranslate` (`-1` at `0x5bf320`). winit 0.30 cannot deliver those on a Mac, as on
+/// main: it reports `0x0A` as `Backquote` (whose scancode it gives back as `0x32`) and leaves
+/// `0x5E` and `0x5F` unidentified, so the `IntlBackslash`, `IntlRo` and `NumpadComma` arms never
+/// fire there.
+pub(crate) fn position(k: KeyCode) -> Option<Position> {
+    use KeyCode::*;
+    use Position::{Digit, Letter, Punctuation};
+    Some(match k {
+        KeyA => Letter('A'),
+        KeyB => Letter('B'),
+        KeyC => Letter('C'),
+        KeyD => Letter('D'),
+        KeyE => Letter('E'),
+        KeyF => Letter('F'),
+        KeyG => Letter('G'),
+        KeyH => Letter('H'),
+        KeyI => Letter('I'),
+        KeyJ => Letter('J'),
+        KeyK => Letter('K'),
+        KeyL => Letter('L'),
+        KeyM => Letter('M'),
+        KeyN => Letter('N'),
+        KeyO => Letter('O'),
+        KeyP => Letter('P'),
+        KeyQ => Letter('Q'),
+        KeyR => Letter('R'),
+        KeyS => Letter('S'),
+        KeyT => Letter('T'),
+        KeyU => Letter('U'),
+        KeyV => Letter('V'),
+        KeyW => Letter('W'),
+        KeyX => Letter('X'),
+        KeyY => Letter('Y'),
+        KeyZ => Letter('Z'),
+        Digit1 => Digit('1'),
+        Digit2 => Digit('2'),
+        Digit3 => Digit('3'),
+        Digit4 => Digit('4'),
+        Digit5 => Digit('5'),
+        Digit6 => Digit('6'),
+        Digit7 => Digit('7'),
+        Digit8 => Digit('8'),
+        Digit9 => Digit('9'),
+        Digit0 => Digit('0'),
+        Minus => Punctuation(Some('-')),
+        Equal => Punctuation(Some('=')),
+        BracketLeft => Punctuation(Some('[')),
+        BracketRight => Punctuation(Some(']')),
+        Backslash => Punctuation(Some('\\')),
+        Semicolon => Punctuation(Some(';')),
+        Quote => Punctuation(Some('\'')),
+        Comma => Punctuation(Some(',')),
+        Period => Punctuation(Some('.')),
+        Slash => Punctuation(Some('/')),
+        Backquote => Punctuation(Some('`')),
+        IntlBackslash | IntlRo | IntlYen | NumpadComma => Punctuation(None),
+        _ => return None,
+    })
+}
+
+/// A layout-named key's name.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum LayoutName {
+    Char(char),
+    /// None: `MapVirtualKeyA` returned 0 and the reference drops the key's message (`0x42da49`).
+    Dropped,
+}
+
+/// Each layout-named key's name under the active layout, as its platform last reported it: an
+/// entry changes with the next message of its key after a layout switch, so a press is named under
+/// the layout it was typed in. Empty where no winit feeds it (a headless run, a test).
+#[derive(Resource, Default, Debug)]
+pub(crate) struct LayoutNames(HashMap<KeyCode, LayoutName>);
+
+impl LayoutNames {
+    /// The name of `key` if a layout names it, `None` for a key the fixed table names. A key never
+    /// reported (a headless run) keeps its US name.
+    ///
+    /// Deviation: on the Mac and Linux a key its platform reports no character for keeps its US
+    /// name too, where the Mac reference drops it (`0x8a4aa`), and a Linux dead key not yet pressed
+    /// bare stays bindable.
+    pub(crate) fn name(&self, key: KeyCode) -> Option<LayoutName> {
+        let position = position(key)?;
+        Some(match self.0.get(&key) {
+            Some(name) => *name,
+            None => position.us().map_or(LayoutName::Dropped, LayoutName::Char),
+        })
+    }
+
+    /// Set what the layout names `key`; `None` clears it back to the US name.
+    pub(crate) fn set(&mut self, key: KeyCode, name: Option<LayoutName>) {
+        match name {
+            Some(name) => self.0.insert(key, name),
+            None => self.0.remove(&key),
+        };
+    }
+}
+
+/// Keeps [`LayoutNames`] current from the raw key messages (every shipped platform).
+pub(super) fn plugin(app: &mut App) {
+    app.init_resource::<LayoutNames>();
+    // A headless build has no winit to register it.
+    #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
+    app.add_message::<bevy::winit::RawWinitWindowEvent>()
+        .add_systems(PreUpdate, record_layout_names);
+}
+
+/// Names each key a raw key message reports, by its platform's rule. On the main thread, the
+/// window's: Windows reads that thread's layout, and macOS's input-source calls want it.
+#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
+fn record_layout_names(
+    mut raw: MessageReader<bevy::winit::RawWinitWindowEvent>,
+    mut names: ResMut<LayoutNames>,
+    #[cfg(target_os = "linux")] mut mods: Local<LinuxMods>,
+    _main_thread: bevy::ecs::system::NonSendMarker,
+) {
+    use bevy::winit::converters::convert_physical_key_code;
+    use winit::event::WindowEvent;
+    #[cfg(target_os = "macos")]
+    let mut ascii_capable = None;
+    for ev in raw.read() {
+        let event = match &ev.event {
+            WindowEvent::KeyboardInput { event, .. } => event,
+            #[cfg(target_os = "linux")]
+            WindowEvent::ModifiersChanged(m) => {
+                mods.state = m.state();
+                continue;
+            }
+            _ => continue,
+        };
+        #[cfg(target_os = "linux")]
+        mods.key(event.physical_key, event.state.is_pressed());
+        let key = convert_physical_key_code(event.physical_key);
+        let Some(position) = position(key) else {
+            continue;
+        };
+        #[cfg(target_os = "windows")]
+        {
+            let _ = position;
+            names.set(key, windows::name(event.physical_key));
+        }
+        // The Mac and Linux keep their digits by position.
+        #[cfg(target_os = "macos")]
+        if !matches!(position, Position::Digit(_)) {
+            use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
+            let capable = *ascii_capable.get_or_insert_with(mac::current_is_ascii_capable);
+            let current = one_char(&event.key_without_modifiers());
+            let name = mac_name(capable, current, || {
+                mac::ascii_capable_char(event.physical_key)
+            });
+            names.set(key, name);
+        }
+        #[cfg(target_os = "linux")]
+        if !matches!(position, Position::Digit(_)) {
+            use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
+            let unshifted = event.key_without_modifiers();
+            if let Some(name) = linux_name(position, &unshifted, &event.logical_key, mods.bare()) {
+                names.set(key, name);
+            }
+        }
+    }
+}
+
+/// The one printable character a winit key stands for.
+#[cfg(any(target_os = "macos", target_os = "linux", test))]
+fn one_char(key: &winit::keyboard::Key) -> Option<char> {
+    let winit::keyboard::Key::Character(s) = key else {
+        return None;
+    };
+    let mut chars = s.chars();
+    chars
+        .next()
+        .filter(|c| chars.next().is_none() && !c.is_control() && !c.is_whitespace())
+}
+
+/// The reference's name for the virtual key `vk`, given `MapVirtualKeyExW(vk, MAPVK_VK_TO_CHAR)`;
+/// `None` for a key `0x42d800`'s fixed table names.
+///
+/// Deviation: a character above U+00FF names the key by itself. The reference's `MapVirtualKeyA`
+/// returns an ANSI code-page byte, which `0x42da4b` drops past `0xff` and the namer's UTF-8
+/// encoder (`0x41abb0`) otherwise reads as Latin-1, so such a key is mislabelled or dropped; named
+/// by what it types, it stays bindable and readable.
+#[cfg(any(target_os = "windows", test))]
+fn windows_name(vk: u32, to_char: u32) -> Option<LayoutName> {
+    match vk {
+        // `VK_A`-`VK_Z`, named by their letter, and `VK_0`-`VK_9`, kept as themselves.
+        0x41..=0x5a | 0x30..=0x39 => Some(LayoutName::Char(char::from(vk as u8))),
+        _ if fixed_vk(vk) => None,
+        // The dynamic arm: `and eax,0xffff` (`0x42da42`) drops the dead-key bit, and 0 drops the
+        // key (`0x42da49`). U+F000-U+F002 are a layout table's `WCH_NONE`, `WCH_DEAD` and
+        // `WCH_LGTR` markers, no character, should the call ever return one.
+        _ => Some(match char::from_u32(to_char & 0xffff) {
+            Some(c)
+                if !c.is_control()
+                    && !c.is_whitespace()
+                    && !('\u{f000}'..='\u{f002}').contains(&c) =>
+            {
+                LayoutName::Char(c)
+            }
+            _ => LayoutName::Dropped,
+        }),
+    }
+}
+
+/// `0x42d800`'s fixed table, read from its byte remap at `0x42dafc` and jump table at `0x42da60`:
+/// the keys it names itself, never by character. F1-F12 take their own arm (`0x42d800`).
+#[cfg(any(target_os = "windows", test))]
+fn fixed_vk(vk: u32) -> bool {
+    matches!(
+        vk,
+        0x08 | 0x09
+            | 0x0d
+            | 0x10..=0x14
+            | 0x1b
+            | 0x20..=0x28
+            | 0x2c..=0x2e
+            | 0x60..=0x6b
+            | 0x6d..=0x7b
+            | 0x90
+            | 0x91
+    )
+}
+
+#[cfg(target_os = "windows")]
+mod windows {
+    use windows_sys::Win32::UI::Input::KeyboardAndMouse::{
+        GetKeyboardLayout, MapVirtualKeyExW, MAPVK_VK_TO_CHAR, MAPVK_VSC_TO_VK_EX,
+    };
+
+    /// The reference's own path for the key at `physical`: the virtual key the window thread's
+    /// layout gives its scancode, then that key's name (`super::windows_name`).
+    pub(super) fn name(physical: winit::keyboard::PhysicalKey) -> Option<super::LayoutName> {
+        use winit::platform::scancode::PhysicalKeyExtScancode;
+        let scancode = physical.to_scancode()?;
+        // SAFETY: plain Win32 calls with no pointers. `GetKeyboardLayout(0)` is the calling
+        // thread's layout; the caller runs on the main thread, the window's, so it is the layout
+        // the window's key messages were made under.
+        let (vk, to_char) = unsafe {
+            let hkl = GetKeyboardLayout(0);
+            let vk = MapVirtualKeyExW(scancode, MAPVK_VSC_TO_VK_EX, hkl);
+            (vk, MapVirtualKeyExW(vk, MAPVK_VK_TO_CHAR, hkl))
+        };
+        if vk == 0 {
+            return None;
+        }
+        super::windows_name(vk, to_char)
+    }
+}
+
+/// The Mac name of a letter or punctuation key: the layout's own unshifted character, as
+/// `KeyTranslate` gives the reference, or none.
+///
+/// Deviation: a layout that is not ASCII-capable (Hebrew, Greek, Russian, Arabic, Thai) names its
+/// keys through the ASCII-capable layout macOS pairs with it, as macOS names its own shortcuts. The
+/// reference reads a non-Roman `KCHR`'s byte as MacRoman (`0x8a40f`), which names no real key.
+///
+/// Deviation: a character above U+00FF (Czech `ě`, Polish `ł`, Turkish `ş`) names the key by
+/// itself. The reference reads `KeyTranslate`'s byte as MacRoman (`0x8a40f`) and keeps it only if
+/// it converts to Latin-1 (`CFStringGetBytes`, `0x8a46b`, stored at `0x8a482`), else leaves the
+/// slot `-1`, which `0x8a4aa` drops, so such a key is mislabelled or dropped; named by what it
+/// types, it stays bindable and readable.
+#[cfg(any(target_os = "macos", test))]
+fn mac_name(
+    ascii_capable: bool,
+    current: Option<char>,
+    ascii_layout_char: impl FnOnce() -> Option<char>,
+) -> Option<LayoutName> {
+    let c = if ascii_capable {
+        current
+    } else {
+        ascii_layout_char()
+    };
+    c.map(LayoutName::Char)
+}
+
+#[cfg(target_os = "macos")]
+mod mac {
+    use std::ffi::c_void;
+    use std::os::raw::c_ulong;
+
+    type CFTypeRef = *const c_void;
+
+    #[link(name = "CoreFoundation", kind = "framework")]
+    extern "C" {
+        fn CFRelease(cf: CFTypeRef);
+        fn CFDataGetBytePtr(data: CFTypeRef) -> *const u8;
+        fn CFBooleanGetValue(boolean: CFTypeRef) -> u8;
+    }
+
+    #[link(name = "Carbon", kind = "framework")]
+    extern "C" {
+        static kTISPropertyInputSourceIsASCIICapable: CFTypeRef;
+        static kTISPropertyUnicodeKeyLayoutData: CFTypeRef;
+        fn TISCopyCurrentKeyboardLayoutInputSource() -> CFTypeRef;
+        fn TISCopyCurrentASCIICapableKeyboardLayoutInputSource() -> CFTypeRef;
+        fn TISGetInputSourceProperty(source: CFTypeRef, key: CFTypeRef) -> CFTypeRef;
+        fn LMGetKbdType() -> u8;
+        fn UCKeyTranslate(
+            layout: *const u8,
+            virtual_key_code: u16,
+            key_action: u16,
+            modifier_key_state: u32,
+            keyboard_type: u32,
+            key_translate_options: u32,
+            dead_key_state: *mut u32,
+            max_string_length: c_ulong,
+            actual_string_length: *mut c_ulong,
+            unicode_string: *mut u16,
+        ) -> i32;
+    }
+
+    const K_UC_KEY_ACTION_DISPLAY: u16 = 3;
+    const K_UC_KEY_TRANSLATE_NO_DEAD_KEYS_MASK: u32 = 1;
+
+    /// Is the current keyboard layout one macOS types shortcuts with directly?
+    pub(super) fn current_is_ascii_capable() -> bool {
+        // SAFETY: the copied source is released here; the property is a borrowed CFBoolean.
+        unsafe {
+            let source = TISCopyCurrentKeyboardLayoutInputSource();
+            if source.is_null() {
+                return true;
+            }
+            let value = TISGetInputSourceProperty(source, kTISPropertyInputSourceIsASCIICapable);
+            let capable = value.is_null() || CFBooleanGetValue(value) != 0;
+            CFRelease(source);
+            capable
+        }
+    }
+
+    /// The unshifted character the ASCII-capable layout macOS pairs with the current input
+    /// source makes on `physical`, dead keys off.
+    pub(super) fn ascii_capable_char(physical: winit::keyboard::PhysicalKey) -> Option<char> {
+        use winit::platform::scancode::PhysicalKeyExtScancode;
+        let keycode = u16::try_from(physical.to_scancode()?).ok()?;
+        let mut buf = [0u16; 4];
+        let mut len: c_ulong = 0;
+        // SAFETY: the copied source owns the layout bytes and is released after the translate;
+        // `buf` and `len` are valid for the length passed.
+        let status = unsafe {
+            let source = TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
+            if source.is_null() {
+                return None;
+            }
+            let data = TISGetInputSourceProperty(source, kTISPropertyUnicodeKeyLayoutData);
+            let status = if data.is_null() {
+                -1
+            } else {
+                let mut dead = 0u32;
+                UCKeyTranslate(
+                    CFDataGetBytePtr(data),
+                    keycode,
+                    K_UC_KEY_ACTION_DISPLAY,
+                    0,
+                    u32::from(LMGetKbdType()),
+                    K_UC_KEY_TRANSLATE_NO_DEAD_KEYS_MASK,
+                    &mut dead,
+                    buf.len() as c_ulong,
+                    &mut len,
+                    buf.as_mut_ptr(),
+                )
+            };
+            CFRelease(source);
+            status
+        };
+        if status != 0 {
+            return None;
+        }
+        let units = buf.get(..usize::try_from(len).ok()?)?;
+        let mut chars = char::decode_utf16(units.iter().copied());
+        let c = chars.next()?.ok()?;
+        (chars.next().is_none() && !c.is_control() && !c.is_whitespace()).then_some(c)
+    }
+}
+
+/// The modifiers a Linux key press is made under, from the raw key stream. winit's
+/// `ModifiersState` has no AltGr, so the right Alt key is followed by its own messages: an AltGr
+/// press on a dead key types its AltGr level, never the key's own accent.
+#[cfg(any(target_os = "linux", test))]
+#[derive(Default)]
+struct LinuxMods {
+    state: winit::keyboard::ModifiersState,
+    alt_right: bool,
+}
+
+#[cfg(any(target_os = "linux", test))]
+impl LinuxMods {
+    /// Follow the right Alt key through a key message.
+    fn key(&mut self, physical: winit::keyboard::PhysicalKey, pressed: bool) {
+        use winit::keyboard::{KeyCode, PhysicalKey};
+        if physical == PhysicalKey::Code(KeyCode::AltRight) {
+            self.alt_right = pressed;
+        }
+    }
+
+    /// No modifier held, AltGr included.
+    fn bare(&self) -> bool {
+        self.state.is_empty() && !self.alt_right
+    }
+}
+
+/// The Linux name of a letter or punctuation key, `None` to keep what the key had. No 1.12 client
+/// ran on Linux, so this is the closest consistent rule: a letter position takes an ASCII letter or
+/// ASCII punctuation the layout types there, and anything else there (another script's letter, an
+/// accented letter, a mark) keeps its US letter, as Windows keeps `VK_A`-`VK_Z` there on nearly
+/// every such layout; any other key takes its character. A dead keysym has no character
+/// (`key_without_modifiers` is `Unidentified`), so it takes the dead key's own character from a
+/// press with no modifier held, and otherwise keeps what it had.
+#[cfg(any(target_os = "linux", test))]
+fn linux_name(
+    position: Position,
+    unshifted: &winit::keyboard::Key,
+    logical: &winit::keyboard::Key,
+    bare: bool,
+) -> Option<Option<LayoutName>> {
+    use winit::keyboard::Key;
+    let c = match (unshifted, logical) {
+        (Key::Unidentified(_), Key::Dead(Some(c))) if bare => Some(*c),
+        (Key::Unidentified(_), _) => return None,
+        _ => one_char(unshifted),
+    };
+    Some(c.map(|c| {
+        LayoutName::Char(match position {
+            Position::Letter(us) if !(c.is_ascii_alphabetic() || c.is_ascii_punctuation()) => us,
+            _ => c,
+        })
+    }))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A layout key's name under `names`, its ASCII letters folded up as the lookup folds them.
+    fn named(names: &LayoutNames, k: KeyCode) -> Option<char> {
+        match names.name(k) {
+            Some(LayoutName::Char(c)) => Some(c.to_ascii_uppercase()),
+            _ => None,
+        }
+    }
+
+    const VK_OEM_1: u32 = 0xba;
+    const VK_OEM_COMMA: u32 = 0xbc;
+    const VK_OEM_3: u32 = 0xc0;
+    const VK_OEM_6: u32 = 0xdd;
+    const VK_OEM_7: u32 = 0xde;
+
+    /// Windows: the reference's path on rows of the layouts' own tables (the key, its virtual
+    /// key, its unshifted character), as `MapVirtualKeyExW` returns them.
+    #[test]
+    fn windows_names_a_key_by_its_virtual_key_as_the_reference_does() {
+        let vk = |c: u8| u32::from(c);
+        let rows: &[(&str, KeyCode, u32, u32, char)] = &[
+            // Hebrew: the W key types `'` but is `VK_W`; Q types `/` and is `VK_Q`.
+            ("hebrew W", KeyCode::KeyW, vk(b'W'), '\''.into(), 'W'),
+            ("hebrew Q", KeyCode::KeyQ, vk(b'Q'), '/'.into(), 'Q'),
+            ("greek Q", KeyCode::KeyQ, vk(b'Q'), ';'.into(), 'Q'),
+            ("lithuanian Q", KeyCode::KeyQ, vk(b'Q'), 'ą'.into(), 'Q'),
+            ("lithuanian W", KeyCode::KeyW, vk(b'W'), 'ž'.into(), 'W'),
+            ("turkish ı", KeyCode::KeyI, vk(b'I'), 'ı'.into(), 'I'),
+            // Turkish Q's `VK_OEM_7` types `i`: one name with `I`, as the lookup folds it.
+            ("turkish i", KeyCode::Quote, VK_OEM_7, 'i'.into(), 'I'),
+            // Bulgarian: `VK_Q` on the Period key, `VK_OEM_COMMA` on Q.
+            ("bulgarian .", KeyCode::Period, vk(b'Q'), 'л'.into(), 'Q'),
+            ("bulgarian Q", KeyCode::KeyQ, VK_OEM_COMMA, ','.into(), ','),
+            // Hungarian: `VK_0` on Backquote, `VK_OEM_3` `ö` on the 0 key.
+            ("hungarian `", KeyCode::Backquote, vk(b'0'), '0'.into(), '0'),
+            ("hungarian 0", KeyCode::Digit0, VK_OEM_3, 'ö'.into(), 'ö'),
+            // Dvorak's Q position is `VK_OEM_7`, `'`.
+            ("dvorak Q", KeyCode::KeyQ, VK_OEM_7, '\''.into(), '\''),
+            ("us ;", KeyCode::Semicolon, VK_OEM_1, ';'.into(), ';'),
+            // A dead key's bit (`0x80000000`) is masked off: French `^`.
+            ("french ^", KeyCode::BracketLeft, VK_OEM_6, 0x8000_005e, '^'),
+            // Above U+00FF the key is named by what it types (the deviation).
+            ("russian ж", KeyCode::Semicolon, VK_OEM_1, 'ж'.into(), 'ж'),
+            // The ISO key, German `VK_OEM_102`; the keypad comma, Brazilian ABNT's `VK_ABNT_C2`
+            // and a `VK_SEPARATOR` keypad.
+            ("german <", KeyCode::IntlBackslash, 0xe2, '<'.into(), '<'),
+            ("abnt keypad .", KeyCode::NumpadComma, 0xc2, '.'.into(), '.'),
+            ("keypad ,", KeyCode::NumpadComma, 0x6c, ','.into(), ','),
+        ];
+        let mut names = LayoutNames::default();
+        for &(what, key, vk, to_char, expected) in rows {
+            names.set(key, windows_name(vk, to_char));
+            assert_eq!(named(&names, key), Some(expected), "{what}");
+        }
+        // `MapVirtualKeyA` returning 0 drops the key (`0x42da49`): Japanese 106's
+        // `VK_OEM_AUTO` on Backquote.
+        assert_eq!(windows_name(0xf3, 0), Some(LayoutName::Dropped));
+        names.set(KeyCode::Backquote, windows_name(0xf3, 0));
+        assert_eq!(names.name(KeyCode::Backquote), Some(LayoutName::Dropped));
+        // A layout table's `WCH_NONE`/`WCH_DEAD`/`WCH_LGTR` marker is no character.
+        for marker in 0xf000..=0xf002 {
+            assert_eq!(
+                windows_name(VK_OEM_1, marker),
+                Some(LayoutName::Dropped),
+                "{marker:#x}"
+            );
+        }
+        // A key the fixed table names is no layout key's: F1, Space, Numpad 0.
+        for vk in [0x70, 0x20, 0x60] {
+            assert_eq!(windows_name(vk, 0), None, "{vk:#x}");
+        }
+    }
+
+    /// The fixed table is `0x42d800`'s, decoded from its remap bytes: the 60 entries less the
+    /// digits and F1-F12, which take their own arms.
+    #[test]
+    fn the_fixed_virtual_keys_are_the_translators_table() {
+        let fixed: Vec<u32> = (0..=0xffu32)
+            .filter(|&vk| fixed_vk(vk) && !(0x70..=0x7b).contains(&vk))
+            .collect();
+        assert_eq!(
+            fixed,
+            [
+                0x08, 0x09, 0x0d, 0x10, 0x11, 0x12, 0x13, 0x14, 0x1b, 0x20, 0x21, 0x22, 0x23, 0x24,
+                0x25, 0x26, 0x27, 0x28, 0x2c, 0x2d, 0x2e, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+                0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6d, 0x6e, 0x6f, 0x90, 0x91,
+            ]
+        );
+    }
+
+    /// macOS: a Latin layout's own character; a layout that is not ASCII-capable names through
+    /// its ASCII-capable partner.
+    #[test]
+    fn a_mac_layout_that_is_not_ascii_capable_names_through_its_ascii_partner() {
+        // Hebrew: W types `'`; its U.S. partner types `w` there.
+        assert_eq!(
+            mac_name(false, Some('\''), || Some('w')),
+            Some(LayoutName::Char('w'))
+        );
+        // French: W types `z`, and the partner is never asked.
+        assert_eq!(
+            mac_name(true, Some('z'), || panic!(
+                "an ASCII-capable layout names itself"
+            )),
+            Some(LayoutName::Char('z'))
+        );
+        // No character: the US name stands in (the fallback deviation).
+        let mut names = LayoutNames::default();
+        names.set(KeyCode::KeyW, mac_name(true, None, || None));
+        assert_eq!(named(&names, KeyCode::KeyW), Some('W'));
+    }
+
+    /// Linux: a letter position keeps its US letter unless the layout types an ASCII letter or
+    /// ASCII punctuation there; any other key takes its character.
+    #[test]
+    fn linux_names_a_letter_position_by_its_ascii_character_or_its_us_letter() {
+        use winit::keyboard::{Key, NativeKey};
+        let ch = |c: &str| Key::Character(c.into());
+        for (key, typed, expected) in [
+            (KeyCode::KeyW, "z", 'z'),
+            (KeyCode::KeyM, ",", ','),
+            (KeyCode::KeyQ, "'", '\''),
+            (KeyCode::KeyQ, "ą", 'Q'),
+            (KeyCode::KeyI, "ı", 'I'),
+            (KeyCode::KeyW, "ц", 'W'),
+            // Thai's tone mark on H, INSCRIPT's virama on D.
+            (KeyCode::KeyH, "\u{e48}", 'H'),
+            (KeyCode::KeyD, "\u{94d}", 'D'),
+            (KeyCode::Semicolon, "ж", 'ж'),
+            (KeyCode::Quote, "ù", 'ù'),
+        ] {
+            let got = linux_name(position(key).unwrap(), &ch(typed), &ch(typed), true);
+            assert_eq!(
+                got,
+                Some(Some(LayoutName::Char(expected))),
+                "{key:?} typing {typed}"
+            );
+        }
+        // A dead keysym: its character from a bare press, kept through a modified one.
+        let none = Key::Unidentified(NativeKey::Unidentified);
+        let bracket = position(KeyCode::BracketLeft).unwrap();
+        assert_eq!(
+            linux_name(bracket, &none, &Key::Dead(Some('^')), true),
+            Some(Some(LayoutName::Char('^')))
+        );
+        assert_eq!(
+            linux_name(bracket, &none, &Key::Dead(Some('¨')), false),
+            None
+        );
+    }
+
+    #[test]
+    fn a_layout_switch_renames_a_key_at_its_next_message() {
+        let mut names = LayoutNames::default();
+        names.set(KeyCode::KeyW, Some(LayoutName::Char('z')));
+        assert_eq!(named(&names, KeyCode::KeyW), Some('Z'));
+        names.set(KeyCode::KeyW, Some(LayoutName::Char('w')));
+        assert_eq!(
+            named(&names, KeyCode::KeyW),
+            Some('W'),
+            "back on a US layout"
+        );
+        // A layout that makes no character there falls back to the US name.
+        names.set(KeyCode::KeyQ, Some(LayoutName::Char('a')));
+        names.set(KeyCode::KeyQ, None);
+        assert_eq!(named(&names, KeyCode::KeyQ), Some('Q'));
+        // Digits and punctuation name themselves until a layout says otherwise; an ISO key no
+        // layout reported has no name.
+        assert_eq!(named(&names, KeyCode::Digit1), Some('1'));
+        assert_eq!(named(&names, KeyCode::Quote), Some('\''));
+        for key in [KeyCode::IntlBackslash, KeyCode::NumpadComma] {
+            assert_eq!(names.name(key), Some(LayoutName::Dropped), "{key:?}");
+        }
+        assert_eq!(names.name(KeyCode::F1), None, "the fixed table's");
+    }
+
+    /// Linux: AltGr counts as a modifier for a dead key's bare press, though winit's
+    /// `ModifiersState` has no AltGr; AltGr on a dead-key position keeps the key's own accent.
+    #[test]
+    fn linux_altgr_is_no_bare_press() {
+        use winit::keyboard::{Key, KeyCode, ModifiersState, NativeKey, PhysicalKey};
+        let none = Key::Unidentified(NativeKey::Unidentified);
+        let bracket = position(bevy::input::keyboard::KeyCode::BracketLeft).unwrap();
+        let mut mods = LinuxMods::default();
+        assert!(mods.bare());
+        mods.key(PhysicalKey::Code(KeyCode::AltRight), true);
+        assert!(!mods.bare(), "AltGr held");
+        // AltGr on the French `^` key types `~`: the key keeps its `^`.
+        assert_eq!(
+            linux_name(bracket, &none, &Key::Dead(Some('~')), mods.bare()),
+            None
+        );
+        mods.key(PhysicalKey::Code(KeyCode::AltRight), false);
+        assert!(mods.bare(), "AltGr released");
+        mods.key(PhysicalKey::Code(KeyCode::KeyQ), true);
+        assert!(mods.bare(), "another key is no modifier");
+        mods.state = ModifiersState::SHIFT;
+        assert!(!mods.bare(), "Shift held");
+    }
+}
diff --git a/crates/benilla-app/src/bindings/script_input.rs b/crates/benilla-app/src/bindings/script_input.rs
new file mode 100644
index 00000000..06fef46f
--- /dev/null
+++ b/crates/benilla-app/src/bindings/script_input.rs
@@ -0,0 +1,104 @@
+//! What the binding functions called from Lua ([`BindingInput`]) leave for the engine. Every key
+//! runs its command's `Bindings.xml` body, so this is the one way a key moves the player: in the
+//! reference `MOVEFORWARD` runs `MoveForwardStart()` on the press and `MoveForwardStop()` on the
+//! release, and both halves set and clear one bit of `[InputControl+4]` through `0x515090`; so a
+//! Start with no Stop keeps moving, a Stop clears the bit whichever input set it, and a one-shot
+//! fires once per call.
+
+use benilla_ui::script::{BindingInput, FiredInput, HeldInput};
+
+use super::BindingsState;
+
+/// One engine input a binding function drives: a held bit of `[InputControl+4]` or a one-shot.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Input {
+    /// `MoveForwardStart`/`Stop`, bit `0x10`.
+    MoveForward,
+    /// `MoveBackwardStart`/`Stop`, bit `0x20`.
+    MoveBackward,
+    /// `TurnLeftStart`/`Stop`, bit `0x100`.
+    TurnLeft,
+    /// `TurnRightStart`/`Stop`, bit `0x200`.
+    TurnRight,
+    /// `StrafeLeftStart`/`Stop`, bit `0x40`.
+    StrafeLeft,
+    /// `StrafeRightStart`/`Stop`, bit `0x80`.
+    StrafeRight,
+    /// `TurnOrActionStart`/`Stop`, bit `0x1`.
+    TurnOrAction,
+    /// `CameraOrSelectOrMoveStart`/`Stop`, bit `0x2`.
+    CameraOrSelectOrMove,
+    /// `Jump()`.
+    Jump,
+    /// `ToggleRun()`, the walk toggle.
+    ToggleRun,
+    /// `ToggleAutoRun()`.
+    ToggleAutoRun,
+    /// `SitOrStand()`.
+    SitOrStand,
+    /// `ToggleSheath()`.
+    ToggleSheath,
+    /// `CameraZoomIn([yards])`, its yards in [`BindingsState::amount`].
+    CameraZoomIn,
+    /// `CameraZoomOut([yards])`, its yards in [`BindingsState::amount`].
+    CameraZoomOut,
+}
+
+/// The bit a Start or Stop names.
+fn held_input(input: HeldInput) -> Input {
+    match input {
+        HeldInput::MoveForward => Input::MoveForward,
+        HeldInput::MoveBackward => Input::MoveBackward,
+        HeldInput::TurnLeft => Input::TurnLeft,
+        HeldInput::TurnRight => Input::TurnRight,
+        HeldInput::StrafeLeft => Input::StrafeLeft,
+        HeldInput::StrafeRight => Input::StrafeRight,
+        HeldInput::TurnOrAction => Input::TurnOrAction,
+        HeldInput::CameraOrSelectOrMove => Input::CameraOrSelectOrMove,
+    }
+}
+
+/// The one-shot a fire names, and its amount: a zoom's yards, else 1.0.
+fn fired_input(input: FiredInput) -> (Input, f32) {
+    match input {
+        FiredInput::Jump => (Input::Jump, 1.0),
+        FiredInput::ToggleRun => (Input::ToggleRun, 1.0),
+        FiredInput::ToggleAutoRun => (Input::ToggleAutoRun, 1.0),
+        FiredInput::SitOrStand => (Input::SitOrStand, 1.0),
+        FiredInput::ToggleSheath => (Input::ToggleSheath, 1.0),
+        FiredInput::CameraZoomIn(yards) => (Input::CameraZoomIn, yards),
+        FiredInput::CameraZoomOut(yards) => (Input::CameraZoomOut, yards),
+    }
+}
+
+impl BindingsState {
+    /// Apply Lua's binding calls, in call order.
+    pub(super) fn apply_script_input(&mut self, inputs: Vec<BindingInput>) {
+        for input in inputs {
+            match input {
+                // The set helper `0x514840` early-outs on a bit already set, so a Start on a held
+                // bit is no new edge.
+                BindingInput::Start(held) => {
+                    let i = held_input(held);
+                    if !self.pressed(i) {
+                        self.just.push(i);
+                        self.held.push(i);
+                    }
+                }
+                // `0x514b70` clears the bit whoever set it, so a second key still down on the
+                // same command stops too, and its release is a no-op second Stop.
+                BindingInput::Stop(held) => {
+                    let i = held_input(held);
+                    self.held.retain(|&h| h != i);
+                }
+                // A one-shot is its own press edge.
+                BindingInput::Fire(fired) => {
+                    let (i, amount) = fired_input(fired);
+                    self.fired.push(i);
+                    self.just.push(i);
+                    self.amounts.push((i, amount));
+                }
+            }
+        }
+    }
+}
diff --git a/crates/benilla-app/src/bindings/store.rs b/crates/benilla-app/src/bindings/store.rs
index f7a8a0de..cf5690d2 100644
--- a/crates/benilla-app/src/bindings/store.rs
+++ b/crates/benilla-app/src/bindings/store.rs
@@ -13,29 +13,48 @@
 //! Deviation: the reference saves a full snapshot (`bindings-cache.wtf`); a diff is stored
 //! because a full snapshot would leave every command added later unbound for a saved file.
 
-use std::collections::HashMap;
+use benilla_ui::script::keybind::KeyBinding;
 
-use super::commands::SPECS;
+/// A key list grouped by command, in first-appearance order; names compare case-insensitively.
+fn by_command(list: &[KeyBinding]) -> Vec<(String, Vec<String>)> {
+    let mut out: Vec<(String, Vec<String>)> = Vec::new();
+    for (key, command) in list {
+        match out
+            .iter_mut()
+            .find(|(c, _)| c.eq_ignore_ascii_case(command))
+        {
+            Some((_, keys)) => keys.push(key.clone()),
+            None => out.push((command.clone(), vec![key.clone()])),
+        }
+    }
+    out
+}
 
-/// Serialize the live `(command, keys)` table, in registry order, as the diff file.
-pub(crate) fn to_diff(snapshot: &[(String, Vec<String>)]) -> String {
-    let defaults: HashMap<&str, Vec<&str>> = SPECS
-        .iter()
-        .map(|s| (s.name, [s.d1, s.d2].into_iter().flatten().collect()))
-        .collect();
+/// Serialize the live `(command, keys)` table (`keybind_snapshot`) as the diff file against the
+/// defaults (`WTF\DefaultBindings.wtf`): a line for each command whose keys differ, including a
+/// defaulted command the live table left unbound.
+pub(crate) fn to_diff(snapshot: &[(String, Vec<String>)], defaults: &[KeyBinding]) -> String {
+    let defaults = by_command(defaults);
+    let default_of = |name: &str| {
+        defaults
+            .iter()
+            .find(|(c, _)| c.eq_ignore_ascii_case(name))
+            .map_or(&[][..], |(_, k)| k.as_slice())
+    };
     let mut out = String::from("# benilla key bindings — diff vs defaults\n");
-    for (name, keys) in snapshot {
-        let is_default = defaults
-            .get(name.as_str())
-            .is_some_and(|d| d.iter().copied().eq(keys.iter().map(String::as_str)));
-        if is_default {
+    let unlisted = defaults
+        .iter()
+        .filter(|(c, _)| !snapshot.iter().any(|(n, _)| n.eq_ignore_ascii_case(c)))
+        .map(|(c, _)| (c.clone(), Vec::new()));
+    for (name, keys) in snapshot.iter().cloned().chain(unlisted) {
+        if default_of(&name) == keys.as_slice() {
             continue;
         }
         out.push_str("bind ");
-        out.push_str(name);
+        out.push_str(&name);
         for k in keys {
             out.push(' ');
-            out.push_str(k);
+            out.push_str(&k);
         }
         out.push('\n');
     }
@@ -64,35 +83,14 @@ pub(crate) fn from_diff(text: &str) -> Vec<(String, Vec<String>)> {
     out
 }
 
-/// Resolve a diff into the full key table: defaults, then each override in file order stealing
-/// its keys from every other command, so one key always maps to one command.
-pub(crate) fn resolve(diff: &[(String, Vec<String>)]) -> Vec<(String, Vec<String>)> {
-    let mut table: Vec<(String, Vec<String>)> = SPECS
-        .iter()
-        .map(|s| {
-            (
-                s.name.to_string(),
-                [s.d1, s.d2]
-                    .into_iter()
-                    .flatten()
-                    .map(str::to_owned)
-                    .collect(),
-            )
-        })
-        .collect();
+/// Resolve a diff into the full key table: the defaults, then each override in file order
+/// replacing its command's keys and stealing each key from every other command, so one key always
+/// maps to one command.
+pub(crate) fn resolve(diff: &[(String, Vec<String>)], defaults: &[KeyBinding]) -> Vec<KeyBinding> {
+    let mut table = defaults.to_vec();
     for (name, keys) in diff {
-        // Steal each key from wherever it currently sits, then install the command's list.
-        for k in keys {
-            for (_, held) in table.iter_mut() {
-                held.retain(|h| h != k);
-            }
-        }
-        match table.iter_mut().find(|(n, _)| n == name) {
-            Some((_, slot)) => *slot = keys.clone(),
-            // A name not in SPECS is an addon's command, registered later at world entry: keep
-            // its row so the binding has its keys to restore.
-            None => table.push((name.clone(), keys.clone())),
-        }
+        table.retain(|(k, c)| !c.eq_ignore_ascii_case(name) && !keys.contains(k));
+        table.extend(keys.iter().map(|k| (k.clone(), name.clone())));
     }
     table
 }
@@ -101,65 +99,73 @@ pub(crate) fn resolve(diff: &[(String, Vec<String>)]) -> Vec<(String, Vec<String
 mod tests {
     use super::*;
 
+    fn defaults() -> Vec<KeyBinding> {
+        [
+            ("W", "MOVEFORWARD"),
+            ("UP", "MOVEFORWARD"),
+            ("Q", "STRAFELEFT"),
+            ("SPACE", "JUMP"),
+            ("NUMPAD0", "JUMP"),
+            ("Z", "TOGGLESHEATH"),
+        ]
+        .into_iter()
+        .map(|(k, c)| (k.to_string(), c.to_string()))
+        .collect()
+    }
+
+    fn keys(table: &[KeyBinding], command: &str) -> Vec<String> {
+        table
+            .iter()
+            .filter(|(_, c)| c == command)
+            .map(|(k, _)| k.clone())
+            .collect()
+    }
+
     #[test]
     fn the_diff_round_trips_and_defaults_stay_silent() {
         // All defaults: a header-only file.
-        let snapshot: Vec<(String, Vec<String>)> = SPECS
-            .iter()
-            .map(|s| {
-                (
-                    s.name.to_string(),
-                    [s.d1, s.d2]
-                        .into_iter()
-                        .flatten()
-                        .map(str::to_owned)
-                        .collect(),
-                )
-            })
-            .collect();
-        let text = to_diff(&snapshot);
+        let snapshot = by_command(&defaults());
+        let text = to_diff(&snapshot, &defaults());
         assert_eq!(text.lines().count(), 1, "defaults produce no bind lines");
 
-        // Move JUMP to F (unbinding SPACE/NUMPAD0), unbind TOGGLESHEATH entirely.
-        let mut moved = snapshot.clone();
+        // Move JUMP to F (unbinding SPACE/NUMPAD0), unbind TOGGLESHEATH entirely, and leave
+        // STRAFELEFT out of the snapshot with no keys (a defaulted command no file declared).
+        let mut moved: Vec<(String, Vec<String>)> = snapshot
+            .into_iter()
+            .filter(|(n, _)| n != "STRAFELEFT")
+            .collect();
         moved.iter_mut().find(|(n, _)| n == "JUMP").unwrap().1 = vec!["F".into()];
         moved
             .iter_mut()
             .find(|(n, _)| n == "TOGGLESHEATH")
             .unwrap()
             .1 = vec![];
-        let text = to_diff(&moved);
+        let text = to_diff(&moved, &defaults());
         assert!(text.contains("bind JUMP F\n"));
         assert!(
             text.contains("bind TOGGLESHEATH\n"),
             "unbound = a bare line"
         );
+        assert!(
+            text.contains("bind STRAFELEFT\n"),
+            "a defaulted command the snapshot lacks is unbound too"
+        );
         assert!(
             !text.contains("MOVEFORWARD"),
             "untouched commands stay absent"
         );
 
-        let parsed = from_diff(&text);
-        let resolved = resolve(&parsed);
-        let get = |n: &str| {
-            resolved
-                .iter()
-                .find(|(name, _)| name == n)
-                .map(|(_, k)| k.clone())
-                .unwrap()
-        };
-        assert_eq!(get("JUMP"), vec!["F".to_string()]);
-        assert!(get("TOGGLESHEATH").is_empty());
-        assert_eq!(get("MOVEFORWARD"), vec!["W".to_string(), "UP".to_string()]);
+        let resolved = resolve(&from_diff(&text), &defaults());
+        assert_eq!(keys(&resolved, "JUMP"), ["F"]);
+        assert!(keys(&resolved, "TOGGLESHEATH").is_empty());
+        assert_eq!(keys(&resolved, "MOVEFORWARD"), ["W", "UP"]);
     }
 
     #[test]
     fn resolve_steals_across_commands_even_without_a_line_for_the_victim() {
-        let resolved = resolve(&[("JUMP".to_string(), vec!["W".to_string()])]);
-        let fwd = &resolved.iter().find(|(n, _)| n == "MOVEFORWARD").unwrap().1;
-        assert_eq!(fwd, &vec!["UP".to_string()]);
-        let jump = &resolved.iter().find(|(n, _)| n == "JUMP").unwrap().1;
-        assert_eq!(jump, &vec!["W".to_string()]);
+        let resolved = resolve(&[("JUMP".to_string(), vec!["W".to_string()])], &defaults());
+        assert_eq!(keys(&resolved, "MOVEFORWARD"), ["UP"]);
+        assert_eq!(keys(&resolved, "JUMP"), ["W"]);
     }
 
     #[test]
@@ -173,12 +179,10 @@ mod tests {
             ]
         );
         // An unknown command (an addon's, registered later) is kept, and still steals its key.
-        let resolved = resolve(&parsed);
-        let bogus = &resolved.iter().find(|(n, _)| n == "BOGUSCMD").unwrap().1;
-        assert_eq!(bogus, &vec!["Q".to_string()]);
-        let strafe = &resolved.iter().find(|(n, _)| n == "STRAFELEFT").unwrap().1;
+        let resolved = resolve(&parsed, &defaults());
+        assert_eq!(keys(&resolved, "BOGUSCMD"), ["Q"]);
         assert!(
-            strafe.is_empty(),
+            keys(&resolved, "STRAFELEFT").is_empty(),
             "Q was stolen by the unknown command's line"
         );
     }
diff --git a/crates/benilla-app/src/capture/fixtures.rs b/crates/benilla-app/src/capture/fixtures.rs
index 4ee9c272..82f28201 100644
--- a/crates/benilla-app/src/capture/fixtures.rs
+++ b/crates/benilla-app/src/capture/fixtures.rs
@@ -100,7 +100,6 @@ pub(super) fn seed_ui_fixture(
     mut names: ResMut<crate::names::NameCache>,
     icons: Option<Res<crate::entities::ItemDisplays>>,
     mut script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-    mut vplates: ResMut<crate::vplates::VPlateMode>,
     mut selection: ResMut<crate::target::Selection>,
     mut player: ResMut<crate::player::Player>,
     // A nested tuple, one param under Bevy's 16-param cap.
@@ -1003,7 +1002,8 @@ pub(super) fn seed_ui_fixture(
                     Visibility::default(),
                 ))
                 .id();
-            vplates.enemies = true;
+            // As the V binding does, so FrameXML's replay at `PLAYER_ENTERING_WORLD` agrees.
+            set_enemy_plates(script.as_deref(), true);
             // The wolf is the target, so its plate draws lit with the target ring.
             selection.target = Some(wolf);
             selection.guid = Some(WOLF_GUID);
@@ -1095,17 +1095,17 @@ pub(super) fn seed_ui_fixture(
             }
         }
         UiFixture::KeyBindings => {
-            let Some(mut script) = script else {
+            let Some(script) = script else {
                 return;
             };
-            // The Keybindings page: the real command registry and CVar set first, then the live
-            // open path, with Movement expanded to show a header row and the default bindings.
+            // The Keybindings page over the commands the load registered: the real CVar set
+            // first, then the live open path, with Movement expanded to show a header row and the
+            // default bindings.
             script.register_cvars(crate::cvars::registered_pairs());
-            script.register_bindings(&crate::bindings::registry_commands());
             if let Err(e) = script.run(
                 "ShowUIPanel(BenillaOptionsFrame); \
                  BenillaOptionsFrameCategoryListRowKeybindings:Click(); \
-                 KeyBindings_ExpandSection(1, true); KeyBindingsPage_Update()",
+                 BenillaKeyBindings_ExpandSection(1, true); BenillaKeyBindingsPage_Update()",
             ) {
                 warn!("capture: ui-keybindings seed failed: {e}");
             }
@@ -1364,7 +1364,7 @@ pub(super) fn seed_ui_fixture(
                 Visibility::default(),
             ));
             // A plated unit draws no floating name, so enemy plates go off.
-            vplates.enemies = false;
+            set_enemy_plates(script.as_deref(), false);
         }
         // The lighting matrix: one spawn with a streamed entity's component set, anonymous and
         // with plates off, so no glyph rides over the body.
@@ -1408,7 +1408,7 @@ pub(super) fn seed_ui_fixture(
                     ));
                 }
             }
-            vplates.enemies = false;
+            set_enemy_plates(script.as_deref(), false);
         }
     }
 }
@@ -1429,9 +1429,7 @@ fn seed_cooldown_filmstrip(
 ) {
     // The clock first: `set_container` stores each triple against it, and
     // `GetContainerItemCooldown`'s expiry guard reads it.
-    if let Err(e) = script.run(&format!("__benilla_now = {COOLDOWN_NOW_S}")) {
-        warn!("capture: ui-cooldown failed to pin the session clock: {e}");
-    }
+    script.set_now(COOLDOWN_NOW_S);
     const DISP_STONE: u32 = 6418;
     let texture = icons
         .and_then(|i| i.catalog.get(DISP_STONE))
@@ -1747,3 +1745,16 @@ pub(super) fn seed_perf_crowd(
         ));
     }
 }
+
+/// Turn enemy plates on or off as the V binding does, the verb and FrameXML's global together,
+/// so FrameXML's own replay agrees.
+fn set_enemy_plates(script: Option<&benilla_ui::script::UiScript>, on: bool) {
+    let lua = if on {
+        "NAMEPLATES_ON = 1; ShowNameplates()"
+    } else {
+        "NAMEPLATES_ON = nil; HideNameplates()"
+    };
+    if let Some(Err(e)) = script.map(|s| s.run(lua)) {
+        warn!("nameplates: {e}");
+    }
+}
diff --git a/crates/benilla-app/src/capture/probe_auction.rs b/crates/benilla-app/src/capture/probe_auction.rs
index 2a936cd5..67304337 100644
--- a/crates/benilla-app/src/capture/probe_auction.rs
+++ b/crates/benilla-app/src/capture/probe_auction.rs
@@ -431,6 +431,7 @@ fn auction_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} 0"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
@@ -781,6 +782,7 @@ fn auction_probe(
                     kind: ChatKind::Say,
                     target: None,
                     text: format!(".additem {ITEM_ENTRY} {ITEM_COUNT}"),
+                    language: None,
                 });
                 probe.phase = Phase::EnsureItem {
                     since: now,
diff --git a/crates/benilla-app/src/capture/probe_bank.rs b/crates/benilla-app/src/capture/probe_bank.rs
index a1f46213..f7791cde 100644
--- a/crates/benilla-app/src/capture/probe_bank.rs
+++ b/crates/benilla-app/src/capture/probe_bank.rs
@@ -202,6 +202,7 @@ fn bank_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} 0"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
@@ -276,6 +277,7 @@ fn bank_probe(
                     kind: ChatKind::Say,
                     target: None,
                     text: format!(".additem {ITEM_ENTRY} 1"),
+                    language: None,
                 });
                 probe.phase = Phase::EnsureItem {
                     since: now,
@@ -395,6 +397,7 @@ fn bank_probe(
                     let _ = net.0.send(ClientCommand::Chat {
                         kind: ChatKind::Say,
                         text: format!(".modify money {grant}"),
+                        language: None,
                         target: None,
                     });
                     probe.phase = Phase::BuySlot {
@@ -482,6 +485,7 @@ fn bank_probe(
                     kind: ChatKind::Say,
                     target: None,
                     text: format!(".go xyz {x} {by} {bz} 0"),
+                    language: None,
                 });
                 probe.phase = Phase::Refusal {
                     since: now,
diff --git a/crates/benilla-app/src/capture/probe_bg.rs b/crates/benilla-app/src/capture/probe_bg.rs
index 4273e4e3..b7c7e7eb 100644
--- a/crates/benilla-app/src/capture/probe_bg.rs
+++ b/crates/benilla-app/src/capture/probe_bg.rs
@@ -291,6 +291,7 @@ fn gm(net: &NetCommands, text: impl Into<String>) {
         kind: ChatKind::Say,
         target: None,
         text: text.into(),
+        language: None,
     });
 }
 
diff --git a/crates/benilla-app/src/capture/probe_bg_queue.rs b/crates/benilla-app/src/capture/probe_bg_queue.rs
index 037fec12..ecfe7f65 100644
--- a/crates/benilla-app/src/capture/probe_bg_queue.rs
+++ b/crates/benilla-app/src/capture/probe_bg_queue.rs
@@ -87,6 +87,7 @@ fn bg_queue_probe(
                 kind: crate::net::ChatKind::Say,
                 target: None,
                 text: ".revive".to_string(),
+                language: None,
             });
             // A body under the bracket floor is refused at the hello, with no list to join from.
             let level = store.0.unit_level().unwrap_or(0);
@@ -96,6 +97,7 @@ fn bg_queue_probe(
                     kind: crate::net::ChatKind::Say,
                     target: None,
                     text: format!(".levelup {}", QUEUE_LEVEL - level),
+                    language: None,
                 });
             }
             let [x, y, z] = BATTLEMASTER_AT;
@@ -104,6 +106,7 @@ fn bg_queue_probe(
                 kind: crate::net::ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} 0"),
+                language: None,
             });
             probe.phase = Phase::Hopped { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_binder.rs b/crates/benilla-app/src/capture/probe_binder.rs
index 26da0df7..c017c9fc 100644
--- a/crates/benilla-app/src/capture/probe_binder.rs
+++ b/crates/benilla-app/src/capture/probe_binder.rs
@@ -235,6 +235,7 @@ fn binder_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {INNKEEPER_MAP}"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_book.rs b/crates/benilla-app/src/capture/probe_book.rs
index 1add8a07..d48f429c 100644
--- a/crates/benilla-app/src/capture/probe_book.rs
+++ b/crates/benilla-app/src/capture/probe_book.rs
@@ -239,6 +239,7 @@ fn book_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} 0"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_charter.rs b/crates/benilla-app/src/capture/probe_charter.rs
index 8cbb8d03..5346991b 100644
--- a/crates/benilla-app/src/capture/probe_charter.rs
+++ b/crates/benilla-app/src/capture/probe_charter.rs
@@ -371,6 +371,7 @@ fn charter_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".modify money {FUND_COPPER}"),
+                language: None,
             });
             info!(
                 "PROBE_CHARTER: 0 (precheck) — funding the body with {FUND_COPPER} copper so the \
@@ -710,7 +711,7 @@ fn charter_probe(
             }
         }
         // ── Step 6: the item-use fork ───────────────────────────────────────────────────────
-        // A real bag right-click through `UseContainerItem`, so `drain_container_uses` reaches
+        // A real bag right-click through `UseContainerItem`, so `use_container_item` reaches
         // `ItemUseRoute::ShowPetition`. A FAIL is either the fork missing the charter arm or
         // `SMSG_PETITION_SHOW_SIGNATURES` never becoming `PETITION_SHOW`. No getter exposes the
         // open charter's item guid, so its identity rests on no window being up before the click.
@@ -1046,6 +1047,7 @@ fn hop(probe: &mut CharterProbe, net: &NetCommands, now: f64) {
         kind: ChatKind::Say,
         target: None,
         text: format!(".go xyz {x} {y} {z} {REGISTRAR_MAP}"),
+        language: None,
     });
     probe.phase = Phase::Settling { sent_at: now };
 }
diff --git a/crates/benilla-app/src/capture/probe_chest.rs b/crates/benilla-app/src/capture/probe_chest.rs
index 212a03e4..523968b5 100644
--- a/crates/benilla-app/src/capture/probe_chest.rs
+++ b/crates/benilla-app/src/capture/probe_chest.rs
@@ -200,6 +200,7 @@ fn chest_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {map}"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_clam.rs b/crates/benilla-app/src/capture/probe_clam.rs
index f24d84ca..e7639a55 100644
--- a/crates/benilla-app/src/capture/probe_clam.rs
+++ b/crates/benilla-app/src/capture/probe_clam.rs
@@ -126,6 +126,7 @@ fn finish(net: &NetCommands, entry: u32, now: f64) -> Phase {
         kind: ChatKind::Say,
         target: None,
         text: format!(".additem {entry} -1"),
+        language: None,
     });
     Phase::Cleanup { since: now }
 }
@@ -197,6 +198,7 @@ fn clam_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".additem {entry}"),
+                language: None,
             });
             probe.phase = Phase::Stocking { sent_at: now };
         }
@@ -321,7 +323,7 @@ fn clam_probe(
 }
 
 /// Right-click the clam through the live VM's `UseContainerItem`, so the real dispatcher
-/// (`ui_items::drain::drain_container_uses`) picks the packet.
+/// (`ui_items::ScriptItemUse::use_container_item`) picks the packet.
 fn click(script: &mut UiScript, probe: &mut ClamProbe, round: u8) {
     let slot = probe.slot;
     info!("PROBE_CLAM: round {round} — UseContainerItem(0, {slot}) through the live VM");
diff --git a/crates/benilla-app/src/capture/probe_crossing.rs b/crates/benilla-app/src/capture/probe_crossing.rs
index b3012818..031646d8 100644
--- a/crates/benilla-app/src/capture/probe_crossing.rs
+++ b/crates/benilla-app/src/capture/probe_crossing.rs
@@ -134,6 +134,7 @@ fn crossing_probe(
                     kind: crate::net::ChatKind::Say,
                     target: None,
                     text: format!(".go xyz {x} {y} {z} {}", m as i32),
+                    language: None,
                 });
                 return;
             }
@@ -167,6 +168,7 @@ fn crossing_probe(
                     kind: crate::net::ChatKind::Say,
                     target: None,
                     text: format!(".go xyz {x} {y} {} ", z + DROP_HEIGHT),
+                    language: None,
                 });
                 probe.phase = Phase::Boarding {
                     boat: guid.0,
diff --git a/crates/benilla-app/src/capture/probe_goquest.rs b/crates/benilla-app/src/capture/probe_goquest.rs
index 36868f36..a3a4f85d 100644
--- a/crates/benilla-app/src/capture/probe_goquest.rs
+++ b/crates/benilla-app/src/capture/probe_goquest.rs
@@ -147,6 +147,7 @@ fn level_to(net: &NetCommands, from: u32, to: u32) {
         kind: ChatKind::Say,
         target: None,
         text: format!(".levelup {delta}"),
+        language: None,
     });
 }
 
@@ -209,6 +210,7 @@ fn goquest_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {map}"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_guard_poi.rs b/crates/benilla-app/src/capture/probe_guard_poi.rs
index c47611de..e4e707c2 100644
--- a/crates/benilla-app/src/capture/probe_guard_poi.rs
+++ b/crates/benilla-app/src/capture/probe_guard_poi.rs
@@ -83,6 +83,7 @@ fn guard_poi_probe(
                 kind: crate::net::ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} 0"),
+                language: None,
             });
             probe.phase = Phase::Hopped { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_mail.rs b/crates/benilla-app/src/capture/probe_mail.rs
index bc823497..fb3c6b27 100644
--- a/crates/benilla-app/src/capture/probe_mail.rs
+++ b/crates/benilla-app/src/capture/probe_mail.rs
@@ -232,6 +232,7 @@ fn mail_probe(
                     kind: ChatKind::Say,
                     target: None,
                     text,
+                    language: None,
                 });
             }
             probe.phase = Phase::Settling { sent_at: now };
diff --git a/crates/benilla-app/src/capture/probe_melee.rs b/crates/benilla-app/src/capture/probe_melee.rs
index f0caae42..1f607dc2 100644
--- a/crates/benilla-app/src/capture/probe_melee.rs
+++ b/crates/benilla-app/src/capture/probe_melee.rs
@@ -1,7 +1,7 @@
-//! The melee live probe (`WOW_PROBE=melee`), inert without the env: once in-world it fires the
-//! attack-nearest core ([`AttackNearestRequest`]) every few seconds, so the character fights
-//! whatever is closest while `WOW_MOVE_TRACE=<path>` records the swing, impact and combat-text
-//! timeline.
+//! The melee live probe (`WOW_PROBE=melee`), inert without the env: once in-world it presses the
+//! player's Attack with nothing selected ([`AttackNearestRequest`]) every few seconds, so the
+//! character acquires and fights whatever is nearest while `WOW_MOVE_TRACE=<path>` records the
+//! swing, impact and combat-text timeline.
 //!
 //! Never run it unattended (`docs/METHOD.md`, "The local server"): it fights with no health
 //! awareness and the character dies.
@@ -21,7 +21,7 @@ impl Plugin for ProbeMeleePlugin {
 }
 
 /// Every 3 s: swing at the selection (idempotent while auto-attacking, and it covers an attacker
-/// the acquire core skips), or with none, run the acquire core.
+/// the acquire skips), or with none, press Attack, which acquires.
 fn melee_probe(
     time: ProbeClock,
     mut last: Local<f64>,
diff --git a/crates/benilla-app/src/capture/probe_service.rs b/crates/benilla-app/src/capture/probe_service.rs
index 8535374f..e82b6a18 100644
--- a/crates/benilla-app/src/capture/probe_service.rs
+++ b/crates/benilla-app/src/capture/probe_service.rs
@@ -641,6 +641,7 @@ fn service_probe(
                     kind: ChatKind::Say,
                     target: None,
                     text: format!(".additem {SELL_ITEM_ENTRY} 1"),
+                    language: None,
                 });
                 probe.phase = Phase::VendorArm { since: now, guid };
             } else if now - since > WINDOW_TIMEOUT_SECS {
@@ -813,6 +814,7 @@ fn hop(probe: &mut ServiceProbe, net: &NetCommands, i: usize, h: usize, now: f64
         kind: ChatKind::Say,
         target: None,
         text: format!(".go xyz {x} {y} {z} {}", leg.map),
+        language: None,
     });
     probe.polls = 0;
     probe.phase = Phase::Hop {
@@ -837,6 +839,7 @@ fn next(probe: &mut ServiceProbe, net: &NetCommands, i: usize, now: f64) {
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {VENDOR_MAP}"),
+                language: None,
             });
             probe.phase = Phase::VendorHop { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probe_stone.rs b/crates/benilla-app/src/capture/probe_stone.rs
index d07f9751..50573cc8 100644
--- a/crates/benilla-app/src/capture/probe_stone.rs
+++ b/crates/benilla-app/src/capture/probe_stone.rs
@@ -192,6 +192,7 @@ fn stone_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {map}"),
+                language: None,
             });
             probe.phase = Phase::Settling { sent_at: now };
         }
@@ -251,6 +252,7 @@ fn stone_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".character level {LEVEL_BELOW}"),
+                language: None,
             });
             probe.phase = Phase::WaitLevel {
                 want: LEVEL_BELOW,
@@ -302,6 +304,7 @@ fn stone_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".character level {want}"),
+                language: None,
             });
             probe.phase = Phase::WaitLevel {
                 want,
diff --git a/crates/benilla-app/src/capture/probe_taxi.rs b/crates/benilla-app/src/capture/probe_taxi.rs
index e56ae22c..7319e495 100644
--- a/crates/benilla-app/src/capture/probe_taxi.rs
+++ b/crates/benilla-app/src/capture/probe_taxi.rs
@@ -170,6 +170,7 @@ fn taxi_probe(
                     kind: crate::net::ChatKind::Say,
                     target: None,
                     text,
+                    language: None,
                 });
             }
             probe.phase = Phase::Hopped { sent_at: now };
diff --git a/crates/benilla-app/src/capture/probe_vendor_swap.rs b/crates/benilla-app/src/capture/probe_vendor_swap.rs
index 2e5e2a56..a7b16552 100644
--- a/crates/benilla-app/src/capture/probe_vendor_swap.rs
+++ b/crates/benilla-app/src/capture/probe_vendor_swap.rs
@@ -173,6 +173,7 @@ fn vendor_swap_probe(
                 kind: ChatKind::Say,
                 target: None,
                 text: format!(".go xyz {x} {y} {z} {MAP}"),
+                language: None,
             });
             probe.phase = Phase::Settle { sent_at: now };
         }
diff --git a/crates/benilla-app/src/capture/probes/act.rs b/crates/benilla-app/src/capture/probes/act.rs
index e3966c63..bfad967f 100644
--- a/crates/benilla-app/src/capture/probes/act.rs
+++ b/crates/benilla-app/src/capture/probes/act.rs
@@ -141,8 +141,12 @@ fn probe_key_by_name(name: &str) -> Option<KeyCode> {
         "Tab" => KeyCode::Tab,
         // TOGGLEAUTORUN's 1.12 default; with `WOW_PROBE_LOOK` it scripts a drive.
         "NumLock" => KeyCode::NumLock,
-        // The nameplate toggle: bare `V` shows enemy plates, `Shift`+`V` friendly ones.
+        // The nameplate toggles: `V`, `Shift`+`V`, `Ctrl`+`V`.
         "V" => KeyCode::KeyV,
+        // A window toggle (TOGGLEBACKPACK) and an action button (ACTIONBUTTON1), by their 1.12
+        // defaults.
+        "B" => KeyCode::KeyB,
+        "1" => KeyCode::Digit1,
         // Free-fly is the dev chord (`Ctrl`+`Shift`) + `F` (`player.rs`); a held `Ctrl` is its ×5
         // speed boost (`camera.rs`).
         "F" => KeyCode::KeyF,
diff --git a/crates/benilla-app/src/capture/scenarios.rs b/crates/benilla-app/src/capture/scenarios.rs
index 1d6ab8ab..9d254c9c 100644
--- a/crates/benilla-app/src/capture/scenarios.rs
+++ b/crates/benilla-app/src/capture/scenarios.rs
@@ -41,8 +41,8 @@ pub(super) enum UiFixture {
     Bag,
     /// The cooldown sweep at sixteen phases in one still: each backpack slot's
     /// `GetContainerItemCooldown` sits at its own fraction of one long cooldown, in reading order
-    /// (slot 1 renders top-left, `ContainerFrame_GenerateFrame` numbering backwards). The VM clock
-    /// `__benilla_now` is parked at a large value, so the settle's seconds are ~5e-4 of a phase.
+    /// (slot 1 renders top-left, `ContainerFrame_GenerateFrame` numbering backwards). The VM's
+    /// `GetTime` clock is parked at a large value, so the settle's seconds are ~5e-4 of a phase.
     Cooldown,
     /// The cooldown filmstrip with the pet bar's autocast shine beside it: `UI-AutoCastButton.m2`
     /// is four additive emitters and no batch, sharing the tile atlas, so this asks whether its
@@ -106,8 +106,8 @@ pub(super) enum UiFixture {
     OptionsDropdownList,
     /// The Options window mid-search: "volume" lists the four volume sliders under the Audio head.
     OptionsSearch,
-    /// The Options window's Keybindings page, Movement expanded, over the 1.12 default bindings and
-    /// GlobalStrings; the command registry registers in-fixture.
+    /// The Options window's Keybindings page, Movement expanded, over the stock commands and
+    /// default bindings the load read off the install, and GlobalStrings.
     KeyBindings,
     /// An overhead name with the river behind it: a named unit 25 yd out in the Elwynn river (the
     /// `water-noon` camera). Deep water is opaque (`WATER_DEEP_ALPHA` 1.0), so a name sorted before
diff --git a/crates/benilla-app/src/char_create/mod.rs b/crates/benilla-app/src/char_create/mod.rs
index 0a15c7c2..b0d89aa5 100644
--- a/crates/benilla-app/src/char_create/mod.rs
+++ b/crates/benilla-app/src/char_create/mod.rs
@@ -340,8 +340,9 @@ fn create_input(
     keys: Res<ButtonInput<KeyCode>>,
     catalog: Option<Res<CharCreate>>,
     mut sel: ResMut<CreateSelection>,
-    // The host pasteboard and the window handle its Wayland backend needs.
-    mut clipboard: NonSendMut<HostClipboard>,
+    // The host pasteboard and the window handle its Wayland backend needs, and the layout that
+    // names the clipboard chords' letters.
+    (mut clipboard, layout): (NonSendMut<HostClipboard>, Res<crate::bindings::LayoutNames>),
     raw_handle: Query<&bevy::window::RawHandleWrapper, With<bevy::window::PrimaryWindow>>,
     time: Res<Time>,
     mut preview: ResMut<GluePreview>,
@@ -421,6 +422,7 @@ fn create_input(
             &mut sel.name,
             ev,
             mods,
+            &layout,
             &mut clipboard,
             wl,
             textinput::CharFilter::Letters,
diff --git a/crates/benilla-app/src/char_select/addons.rs b/crates/benilla-app/src/char_select/addons.rs
index d20f0196..9c5c0bd9 100644
--- a/crates/benilla-app/src/char_select/addons.rs
+++ b/crates/benilla-app/src/char_select/addons.rs
@@ -104,21 +104,20 @@ enum Hover {
     Check(usize),
 }
 
-/// The screen's state; edits stage per character and only Okay writes the files.
+/// The screen's state; a click writes the in-memory store and only Okay writes the files.
 #[derive(Resource)]
 pub(super) struct AddonsPanel {
     pub(super) open: bool,
-    /// The installed list read at open, so a row's index is stable; the enable state is `staged`'s.
+    /// The installed list read at open, so a row's index is stable.
     list: Vec<InstalledAddOn>,
-    /// The roster's realm, half of every enable file's `(realm, name)` key.
-    realm: String,
     /// The roster's character names, the dropdown's entries after "All".
     chars: Vec<String>,
-    /// `staged[c][i]` is character `c`'s bit for `list[i]`; with no characters, one anonymous
-    /// column that Okay does not write.
-    staged: Vec<Vec<bool>>,
-    /// What the files said at open; Okay writes only the columns that moved off it.
-    baseline: Vec<Vec<bool>>,
+    /// Every roster character's enable hash, which a click sets and Okay saves where dirty.
+    store: addons::EnableStore,
+    /// `bits[c][i]` is the query's answer for character `c` and `list[i]`, re-read from the store
+    /// after every change, so a character with no row follows the others' edits at once; with no
+    /// characters, one anonymous column of `## DefaultState`s.
+    bits: Vec<Vec<bool>>,
     /// The dropdown's selection: `None` is "All", `Some(c)` is `chars[c]`.
     view: Option<usize>,
     dropdown_open: bool,
@@ -145,10 +144,9 @@ impl Default for AddonsPanel {
         Self {
             open: false,
             list: Vec::new(),
-            realm: String::new(),
             chars: Vec::new(),
-            staged: Vec::new(),
-            baseline: Vec::new(),
+            store: addons::EnableStore::default(),
+            bits: Vec::new(),
             view: None,
             dropdown_open: false,
             // The registered default, "1"; a `false` would paint out-of-date rows loadable for a
@@ -165,29 +163,14 @@ impl Default for AddonsPanel {
 }
 
 impl AddonsPanel {
-    /// Open for this realm's roster: read the folder, and one staged column per character, as
-    /// `AddonList_OnShow` re-reads. The store loads for the whole roster: an addon a character has
-    /// no row for takes what the other characters agree on, else the manifest's `## DefaultState`.
+    /// Open for this realm's roster: read the folder and every character's enable file, as
+    /// `AddonList_OnShow` re-reads. An addon a character has no row for takes what the other
+    /// characters agree on, else the manifest's `## DefaultState`.
     pub(super) fn open_for(&mut self, realm: String, chars: Vec<String>) {
         self.list = addons::installed_rows();
-        self.staged.clear();
-        let store = addons::EnableStore::load(&realm, &chars);
-        let columns: Vec<Option<&str>> = if chars.is_empty() {
-            vec![None]
-        } else {
-            chars.iter().map(|c| Some(c.as_str())).collect()
-        };
-        for character in columns {
-            self.staged.push(
-                self.list
-                    .iter()
-                    .map(|a| store.enabled_for(&a.name, a.default_state, character))
-                    .collect(),
-            );
-        }
-        self.baseline = self.staged.clone();
-        self.realm = realm;
+        self.store = addons::EnableStore::load(&realm, &chars);
         self.chars = chars;
+        self.reread();
         // "All" is the reference's default selection.
         self.view = None;
         self.dropdown_open = false;
@@ -201,31 +184,53 @@ impl AddonsPanel {
         self.open = false;
         self.list.clear();
         self.chars.clear();
-        self.staged.clear();
-        self.baseline.clear();
+        self.store = addons::EnableStore::default();
+        self.bits.clear();
         self.view = None;
         self.dropdown_open = false;
         self.tip = None;
         self.dirty = true;
     }
 
-    /// Okay, `SaveAddOns`: write the enable file of each character whose column changed.
-    fn save_staged(&self) {
-        for (c, name) in self.chars.iter().enumerate() {
-            if self.staged.get(c) == self.baseline.get(c) {
-                continue;
-            }
-            let id = (self.realm.clone(), name.clone());
-            let states: Vec<(String, bool)> = self
-                .list
-                .iter()
-                .zip(self.staged[c].iter())
-                .map(|(a, &on)| (a.name.clone(), on))
-                .collect();
-            addons::write_enable_state(Some(&id), &states);
+    /// Re-read every checkbox through the query `0x51e470`, as `AddonList_Update` does after each
+    /// `EnableAddOn`/`DisableAddOn`.
+    fn reread(&mut self) {
+        let columns: Vec<Option<&str>> = if self.chars.is_empty() {
+            vec![None]
+        } else {
+            self.chars.iter().map(|c| Some(c.as_str())).collect()
+        };
+        self.bits = columns
+            .into_iter()
+            .map(|character| {
+                self.list
+                    .iter()
+                    .map(|a| self.store.enabled_for(&a.name, a.default_state, character))
+                    .collect()
+            })
+            .collect();
+        self.dirty = true;
+    }
+
+    /// The glue `EnableAddOn`/`DisableAddOn` (`0x46d7b0`, `0x46d8a0`) for the current view: the
+    /// setter on the viewed character, or on every character in the All view (`nil`). With no
+    /// characters there is no node to set, so a click changes nothing.
+    fn set(&mut self, i: usize, on: bool) {
+        let character = self
+            .view
+            .and_then(|c| self.chars.get(c))
+            .map(String::as_str);
+        if let Some(a) = self.list.get(i) {
+            self.store.set(&a.name, character, on);
         }
     }
 
+    /// Okay, `SaveAddOns` (`0x46d990` into the writer `0x51ef20`): each character a click changed
+    /// gets its enable hash written; the rest are left as they are.
+    fn save(&mut self) {
+        self.store.save();
+    }
+
     /// Whether any addon is installed (`UpdateAddonButton` hides the button otherwise). Cached for
     /// the process: the screen respawns every frame of a drag-resize.
     pub(super) fn any_installed() -> bool {
@@ -269,7 +274,7 @@ impl AddonsPanel {
         match self.view {
             Some(c) => {
                 if self
-                    .staged
+                    .bits
                     .get(c)
                     .is_some_and(|col| col.get(i) == Some(&true))
                 {
@@ -280,13 +285,13 @@ impl AddonsPanel {
             }
             None => {
                 let on = self
-                    .staged
+                    .bits
                     .iter()
                     .filter(|col| col.get(i) == Some(&true))
                     .count();
                 if on == 0 {
                     BoxState::Off
-                } else if on == self.staged.len() {
+                } else if on == self.bits.len() {
                     BoxState::On
                 } else {
                     BoxState::Mixed
@@ -339,40 +344,17 @@ impl AddonsPanel {
     /// A checkbox click. In the All view a mixed box counts as checked, so clicking On or Mixed
     /// disables for every character and only an unchecked box enables for all.
     fn click_row(&mut self, i: usize) {
-        match self.view {
-            Some(c) => {
-                if let Some(slot) = self.staged.get_mut(c).and_then(|col| col.get_mut(i)) {
-                    *slot = !*slot;
-                    self.dirty = true;
-                }
-            }
-            None => {
-                let target = self.box_state(i) == BoxState::Off;
-                for col in &mut self.staged {
-                    if let Some(slot) = col.get_mut(i) {
-                        *slot = target;
-                    }
-                }
-                self.dirty = true;
-            }
-        }
+        let on = self.box_state(i) == BoxState::Off;
+        self.set(i, on);
+        self.reread();
     }
 
-    /// Enable All and Disable All sweep the current view's columns.
+    /// Enable All and Disable All: the setter for every listed addon, on the current view.
     fn set_all(&mut self, on: bool) {
-        match self.view {
-            Some(c) => {
-                if let Some(col) = self.staged.get_mut(c) {
-                    col.iter_mut().for_each(|s| *s = on);
-                }
-            }
-            None => {
-                for col in &mut self.staged {
-                    col.iter_mut().for_each(|s| *s = on);
-                }
-            }
+        for i in 0..self.list.len() {
+            self.set(i, on);
         }
-        self.dirty = true;
+        self.reread();
     }
 
     fn view_name<'a>(&'a self, strings: &'a GlueStrings) -> &'a str {
@@ -564,7 +546,7 @@ pub(super) fn drive_addons_panel(
     if close_and_save {
         // `AddonList_OnOk` and `AddonList_OnCancel` play the realm dialog's pair.
         sounds.write(GlueSound("gsLoginChangeRealmOK"));
-        panel.save_staged();
+        panel.save();
         panel.close();
         return;
     }
@@ -1531,27 +1513,36 @@ mod tests {
         }
     }
 
-    /// A panel over `chars` staged columns, each starting at the manifest defaults, viewing All.
+    /// A panel over `chars` characters with no enable rows, so every bit starts at the manifest
+    /// default, viewing All.
     fn panel_for(chars: usize, list: Vec<InstalledAddOn>) -> AddonsPanel {
-        let staged: Vec<Vec<bool>> = (0..chars.max(1))
-            .map(|_| list.iter().map(|a| a.default_state).collect())
-            .collect();
-        AddonsPanel {
+        let chars: Vec<String> = (0..chars).map(|c| format!("Char{c}")).collect();
+        let mut p = AddonsPanel {
             open: true,
-            realm: "TestRealm".into(),
-            chars: (0..chars).map(|c| format!("Char{c}")).collect(),
-            baseline: staged.clone(),
-            staged,
+            store: addons::EnableStore::blank("TestRealm", &chars),
+            chars,
             list,
             ..Default::default()
-        }
+        };
+        p.reread();
+        p.dirty = false; // the tests spawn no tree
+        p
     }
 
-    /// One column, whose All view is that column, so `p.staged[0][i]` drives everything.
+    /// One character, whose All view is that character.
     fn panel(list: Vec<InstalledAddOn>) -> AddonsPanel {
         panel_for(1, list)
     }
 
+    /// The glue setter for character `c` (`None`: every character), then the re-read
+    /// `AddonList_Enable` runs.
+    fn set(p: &mut AddonsPanel, c: Option<usize>, i: usize, on: bool) {
+        let view = std::mem::replace(&mut p.view, c);
+        p.set(i, on);
+        p.view = view;
+        p.reread();
+    }
+
     /// Every fallback label is its token's shipped value (`GlueStrings.lua:44-56`).
     #[test]
     fn the_status_labels_are_the_reference_globalstrings_values() {
@@ -1611,11 +1602,11 @@ mod tests {
         assert_eq!(p.verdict(5).token(), None);
         p.version_check = true;
 
-        p.staged[0][1] = false;
+        set(&mut p, Some(0), 1, false);
         assert_eq!(p.verdict(1).token().as_deref(), Some("DISABLED"));
         assert_eq!(p.verdict(2).token().as_deref(), Some("DEP_DISABLED"));
 
-        p.staged[0][3] = false;
+        set(&mut p, Some(0), 3, false);
         assert_eq!(p.verdict(3).token().as_deref(), Some("DISABLED"));
     }
 
@@ -1630,7 +1621,7 @@ mod tests {
         assert_eq!(p.title_colour(0), GOLD, "loadable = gold");
         assert_eq!(p.title_colour(2), BROKEN, "enabled + out of date = red");
 
-        p.staged[0][0] = false;
+        set(&mut p, Some(0), 0, false);
         assert_eq!(p.title_colour(0), DIM, "player-disabled = grey");
         assert_eq!(
             p.title_colour(1),
@@ -1646,7 +1637,9 @@ mod tests {
             2,
             vec![addon("Lib", &[], 11200), addon("Needs", &["Lib"], 11200)],
         );
-        p.staged[0][0] = false; // Char0 turned Lib off, Char1 has not
+        // Char0 turned Lib off and Char1 on; with no row Char1 would follow Char0.
+        set(&mut p, Some(0), 0, false);
+        set(&mut p, Some(1), 0, true);
 
         assert_eq!(
             p.verdict(0).token(),
@@ -1668,20 +1661,21 @@ mod tests {
         let mut p = panel_for(3, vec![addon("A", &[], 11200)]);
         assert_eq!(p.box_state(0), BoxState::On, "enabled for all three");
 
-        p.staged[1][0] = false;
+        set(&mut p, None, 0, true); // a row for each, so one can differ
+        set(&mut p, Some(1), 0, false);
         assert_eq!(
             p.box_state(0),
             BoxState::Mixed,
             "enabled for SOME (state 1)"
         );
 
-        p.staged[0][0] = false;
-        p.staged[2][0] = false;
+        set(&mut p, Some(0), 0, false);
+        set(&mut p, Some(2), 0, false);
         assert_eq!(p.box_state(0), BoxState::Off, "disabled for all");
 
         p.view = Some(1);
         assert_eq!(p.box_state(0), BoxState::Off);
-        p.staged[1][0] = true;
+        set(&mut p, Some(1), 0, true);
         assert_eq!(p.box_state(0), BoxState::On);
     }
 
@@ -1689,47 +1683,51 @@ mod tests {
     #[test]
     fn an_all_view_click_follows_the_references_checkbutton() {
         let mut p = panel_for(3, vec![addon("A", &[], 11200)]);
-        p.staged[1][0] = false; // mixed
+        set(&mut p, None, 0, true);
+        set(&mut p, Some(1), 0, false); // mixed
 
         p.click_row(0);
         assert!(
-            p.staged.iter().all(|col| !col[0]),
+            p.bits.iter().all(|col| !col[0]),
             "mixed → disabled for ALL characters"
         );
 
         p.click_row(0);
         assert!(
-            p.staged.iter().all(|col| col[0]),
+            p.bits.iter().all(|col| col[0]),
             "unchecked → enabled for ALL characters"
         );
 
         p.click_row(0);
-        assert!(p.staged.iter().all(|col| !col[0]), "checked → back off");
+        assert!(p.bits.iter().all(|col| !col[0]), "checked → back off");
 
         p.view = Some(2);
         p.click_row(0);
-        assert!(p.staged[2][0] && !p.staged[0][0] && !p.staged[1][0]);
+        assert!(p.bits[2][0] && !p.bits[0][0] && !p.bits[1][0]);
     }
 
     /// No enable file is touched until Okay; Cancel (`ResetAddOns`) is `close`.
     #[test]
     fn edits_are_staged_and_cancel_discards_them() {
         let mut p = panel(vec![addon("A", &[], 11200), addon("B", &[], 11200)]);
-        assert_eq!(p.staged, vec![vec![true, true]]);
-        p.staged[0][0] = false;
+        assert_eq!(p.bits, vec![vec![true, true]]);
+        set(&mut p, Some(0), 0, false);
+        assert_eq!(p.bits, vec![vec![false, true]]);
         assert!(
             p.list[0].default_state,
-            "the read-in list is never mutated — only `staged` is, which is what makes Cancel free"
+            "the read-in list is never mutated — only the store is, which is what makes Cancel free"
         );
         p.close();
         assert!(!p.open);
         assert!(
-            p.staged.is_empty(),
+            p.bits.is_empty() && p.store.node("Char0").is_none(),
             "a cancelled edit leaves nothing behind"
         );
     }
 
-    /// Okay writes each changed character's file and creates none for an untouched one.
+    /// Okay (`SaveAddOns`) writes only the characters whose hash a click changed, and each one's
+    /// own rows only: the issue's Alice and Bob, with Carol never touched. Bob's disable reaches
+    /// Alice and Carol through the query, on screen at once and after the files are read back.
     #[test]
     fn okay_writes_every_changed_characters_file_and_only_those() {
         let _l = crate::local_state::test_env::ENV_LOCK
@@ -1747,6 +1745,13 @@ mod tests {
         let _c = crate::local_state::test_env::EnvGuard::unset("WOW_CAPTURE");
         let _h =
             crate::local_state::test_env::EnvGuard::set("BENILLA_HOME", home.to_str().unwrap());
+        let path = |who: &str| {
+            addons::enable_state_path(Some(&("TestRealm".to_string(), who.to_string()))).unwrap()
+        };
+        // Alice's file as some other writer left it: a rewrite would drop the stray line.
+        let alice_file = "Gone: disabled\nstray line\nAlpha: enabled\n";
+        std::fs::create_dir_all(path("Alice").parent().unwrap()).unwrap();
+        std::fs::write(path("Alice"), alice_file).unwrap();
 
         let mut p = AddonsPanel::default();
         p.open_for(
@@ -1755,12 +1760,31 @@ mod tests {
         );
         assert!(p.view.is_none(), "the reference's default selection is All");
         assert_eq!(p.list.len(), 2, "discovery found the two hermetic addons");
-        assert_eq!(p.staged.len(), 3, "one staged column per roster character");
-        assert_eq!(p.staged, p.baseline);
+        assert_eq!(p.bits.len(), 3, "one column per roster character");
 
-        p.staged[0][0] = false;
-        p.staged[1][1] = false;
-        p.save_staged();
+        set(&mut p, Some(0), 0, true); // Alice re-ticks what her row already says
+        set(&mut p, Some(1), 1, false); // Bob unticks Beta
+        assert_eq!(
+            p.bits,
+            vec![vec![true, false]; 3],
+            "Bob is the only one with a Beta row, so Alice and Carol follow him at once"
+        );
+        p.save();
+
+        assert_eq!(
+            std::fs::read_to_string(path("Alice")).unwrap(),
+            alice_file,
+            "a setter call that changed nothing leaves the node clean and the file unwritten"
+        );
+        assert_eq!(
+            std::fs::read_to_string(path("Bob")).unwrap(),
+            "Beta: disabled\n",
+            "Bob's file carries his one toggle, not a row per listed addon"
+        );
+        assert!(
+            !path("Carol").exists(),
+            "an untouched character writes no file"
+        );
 
         // Read back through the store world entry resolves against.
         let roster = ["Alice".to_string(), "Bob".to_string(), "Carol".to_string()];
@@ -1771,20 +1795,9 @@ mod tests {
                 .map(|a| store.enabled_for(&a.name, a.default_state, Some(who)))
                 .collect()
         };
-        assert_eq!(
-            read("Alice"),
-            vec![false, true],
-            "Alice's file carries HER edit"
-        );
-        assert_eq!(read("Bob"), vec![true, false], "Bob's carries HIS");
-        let carol = ("TestRealm".to_string(), "Carol".to_string());
-        assert!(
-            !addons::enable_state_path(Some(&carol)).unwrap().exists(),
-            "an unchanged column writes no file — only the diffs against the open-time baseline"
-        );
-        // Carol, with no file, takes what the others agree on; they split on both, so each falls
-        // to its manifest's `## DefaultState`.
-        assert_eq!(read("Carol"), vec![true, true]);
+        for who in ["Alice", "Bob", "Carol"] {
+            assert_eq!(read(who), vec![true, false], "{who}");
+        }
         let _ = std::fs::remove_dir_all(&tmp);
     }
 
@@ -1815,7 +1828,7 @@ mod tests {
             vec!["Onemage".into(), "Onerogue".into()],
         );
         p.set_all(false);
-        p.save_staged();
+        p.save();
         p.close();
 
         // A created character, with no enable file.
@@ -1824,9 +1837,9 @@ mod tests {
             vec!["Onemage".into(), "Onerogue".into(), "Freshling".into()],
         );
         assert!(p.view.is_none(), "reopens on All, the reference's default");
-        assert_eq!(p.staged.len(), 3);
+        assert_eq!(p.bits.len(), 3);
         assert_eq!(
-            p.staged[2],
+            p.bits[2],
             vec![false, false],
             "the new character inherits the unanimous disable, not a blank slate"
         );
@@ -1879,7 +1892,7 @@ mod tests {
         p.set_all(false); // the mage turns both off; the rogue keeps the defaults
         p.view = Some(1);
         p.set_all(true);
-        p.save_staged();
+        p.save();
         p.close();
 
         p.open_for(
@@ -1887,7 +1900,7 @@ mod tests {
             vec!["Onemage".into(), "Onerogue".into(), "Freshling".into()],
         );
         assert_eq!(
-            p.staged[2],
+            p.bits[2],
             vec![true, false],
             "split roster → each row falls to its own `## DefaultState`"
         );
diff --git a/crates/benilla-app/src/char_select/dialog.rs b/crates/benilla-app/src/char_select/dialog.rs
index 5a90d042..ce4d150c 100644
--- a/crates/benilla-app/src/char_select/dialog.rs
+++ b/crates/benilla-app/src/char_select/dialog.rs
@@ -92,7 +92,8 @@ pub(super) fn drive_delete_dialog(
         Option<&mut Text>,
         &mut Visibility,
     )>,
-    mut clipboard: NonSendMut<HostClipboard>,
+    // The pasteboard, and the layout that names the clipboard chords' letters.
+    (mut clipboard, layout): (NonSendMut<HostClipboard>, Res<crate::bindings::LayoutNames>),
     // The window drives the glue scale; its raw handle carries the Wayland clipboard's display.
     window: Query<
         (&Window, Option<&bevy::window::RawHandleWrapper>),
@@ -139,6 +140,7 @@ pub(super) fn drive_delete_dialog(
             &mut dialog.typed,
             ev,
             mods,
+            &layout,
             &mut clipboard,
             wl,
             textinput::CharFilter::Any,
@@ -385,8 +387,8 @@ fn spawn_dialog(
                                 ..default()
                             },))
                                 .with_children(|f| {
-                                    // The five-part field row: segments either side of the
-                                    // selection, a caret slot at each edge.
+                                    // The five-part field row: the text either side of the
+                                    // selection, which splits at the caret.
                                     let segment = |f: &mut ChildSpawnerCommands, part| {
                                         outlined_text(
                                             f,
@@ -404,14 +406,9 @@ fn spawn_dialog(
                                         );
                                     };
                                     segment(f, GlueFieldPart::Before);
-                                    caret_bar(
-                                        f,
-                                        (DeleteCaret, GlueFieldPart::CaretAtStart),
-                                        15.0,
-                                        s,
-                                    );
-                                    segment(f, GlueFieldPart::Selected);
-                                    caret_bar(f, (DeleteCaret, GlueFieldPart::CaretAtEnd), 15.0, s);
+                                    segment(f, GlueFieldPart::SelectedHead);
+                                    caret_bar(f, (DeleteCaret, GlueFieldPart::Caret), 15.0, s);
+                                    segment(f, GlueFieldPart::SelectedTail);
                                     segment(f, GlueFieldPart::After);
                                 });
                         });
diff --git a/crates/benilla-app/src/cinematic.rs b/crates/benilla-app/src/cinematic.rs
index c4f45e08..16b7ccd8 100644
--- a/crates/benilla-app/src/cinematic.rs
+++ b/crates/benilla-app/src/cinematic.rs
@@ -157,6 +157,7 @@ impl Plugin for CinematicPlugin {
                 Update,
                 drive_letterbox.in_set(WorldStage::Input).after(drive),
             )
+            .add_systems(Update, send_opening_cinematic.in_set(WorldStage::Input))
             // Leaving the world drops a cinematic with no ack, as the reference's teardown does
             // (`0x490a80` clears the flag and sends no `CMSG_COMPLETE_CINEMATIC`).
             .add_systems(OnExit(ClientState::InWorld), abandon_on_leaving_world);
@@ -577,6 +578,20 @@ fn feed_ui(
     );
 }
 
+/// Each Lua `OpeningCinematic()` is one empty `CMSG_OPENING_CINEMATIC` (`0x48c8c0`); the server
+/// answers, if at all, with the `SMSG_TRIGGER_CINEMATIC` [`take_trigger`] plays.
+fn send_opening_cinematic(script: Option<NonSendMut<UiScript>>, net: Option<Res<NetCommands>>) {
+    let Some(mut script) = script else {
+        return;
+    };
+    let asks = script.take_opening_cinematic_asks();
+    if let Some(net) = net {
+        for _ in 0..asks {
+            let _ = net.0.send(ClientCommand::OpeningCinematic);
+        }
+    }
+}
+
 fn ack(net: Option<&NetCommands>) {
     if let Some(net) = net {
         let _ = net.0.send(ClientCommand::CompleteCinematic);
@@ -837,3 +852,39 @@ mod settling_under_black {
         );
     }
 }
+
+/// Lua's `OpeningCinematic()` reaches the wire as one empty `CMSG_OPENING_CINEMATIC` per call.
+#[cfg(test)]
+mod opening_cinematic {
+    use super::*;
+
+    #[test]
+    fn each_call_sends_one_opening_cinematic() {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.insert_resource(NetCommands(tx));
+        app.insert_non_send_resource(UiScript::new().unwrap());
+        app.add_systems(Update, send_opening_cinematic);
+        app.world()
+            .non_send_resource::<UiScript>()
+            .run("OpeningCinematic() OpeningCinematic()")
+            .unwrap();
+        app.update();
+        let sent = rx
+            .try_iter()
+            .filter(|c| matches!(c, ClientCommand::OpeningCinematic))
+            .count();
+        assert_eq!(sent, 2);
+        app.update();
+        assert_eq!(rx.try_iter().count(), 0, "drained once");
+        // The opcode the reference puts at `0x48c8c9`.
+        assert_eq!(
+            benilla_protocol::messages::opcode::CMSG_OPENING_CINEMATIC,
+            0xf9
+        );
+        assert_eq!(
+            benilla_protocol::messages::opcode_name(0xf9),
+            Some("CMSG_OPENING_CINEMATIC")
+        );
+    }
+}
diff --git a/crates/benilla-app/src/console.rs b/crates/benilla-app/src/console.rs
index 4a85d1da..05513184 100644
--- a/crates/benilla-app/src/console.rs
+++ b/crates/benilla-app/src/console.rs
@@ -61,12 +61,31 @@ impl ConsoleCommandApp for App {
     }
 }
 
+/// Lines a CVar's change callback prints to the console (`0x63cb50`), such as `spellEffectLevel`'s
+/// "Spell effect level set to %d.". A console command's own write collects them into its output;
+/// any other write (a Lua `SetCVar`, the boot load) sends them to the log, as the reference's go
+/// to a console screen nobody has open.
+#[derive(Resource, Default)]
+pub(crate) struct ConsoleEcho {
+    capture: Option<Vec<String>>,
+}
+
+impl ConsoleEcho {
+    pub(crate) fn print(&mut self, line: String) {
+        match &mut self.capture {
+            Some(lines) => lines.push(line),
+            None => info!("console: {line}"),
+        }
+    }
+}
+
 /// The built-ins: the reference's four `ConsoleVar.cpp` commands and `help`.
 pub(crate) struct ConsolePlugin;
 
 impl Plugin for ConsolePlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<ConsoleCommands>()
+            .init_resource::<ConsoleEcho>()
             .console_command("set", "Set the value of a CVar.", set)
             .console_command("cvar_reset", "Reset a CVar to its default.", cvar_default)
             .console_command("cvar_default", "Reset a CVar to its default.", cvar_default)
@@ -136,10 +155,18 @@ fn set_cvar(world: &mut World, name: &str, value: &str) -> Vec<String> {
         let outcome = cvars.set(name, value);
         (outcome, cvars.take_events())
     };
+    // The callbacks' own lines come first, as they print inside `CVar::Set`.
+    if let Some(mut echo) = world.get_resource_mut::<ConsoleEcho>() {
+        echo.capture = Some(Vec::new());
+    }
     for event in events {
         world.trigger(event);
     }
-    match outcome {
+    let mut lines = world
+        .get_resource_mut::<ConsoleEcho>()
+        .and_then(|mut echo| echo.capture.take())
+        .unwrap_or_default();
+    lines.extend(match outcome {
         SetOutcome::Unknown => vec![format!("console: no CVar named '{name}'")],
         SetOutcome::Refused => vec![format!(
             "console: '{value}' is not a number, and {name} takes one"
@@ -148,7 +175,8 @@ fn set_cvar(world: &mut World, name: &str, value: &str) -> Vec<String> {
         SetOutcome::Staged => vec![format!(
             "{name} staged as \"{value}\" — applies at the next RestartGx"
         )],
-    }
+    });
+    lines
 }
 
 /// `set <name> <value>` (`0x63d500`). Deviation: the reference registers an unknown name as a new
diff --git a/crates/benilla-app/src/crash.rs b/crates/benilla-app/src/crash.rs
index eb17c7ff..685439d8 100644
--- a/crates/benilla-app/src/crash.rs
+++ b/crates/benilla-app/src/crash.rs
@@ -16,8 +16,9 @@ use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 use crate::BuildId;
 
-/// Chains the crash-report hook after the current one. Called once from [`crate::run`], before
-/// the `App` exists, so a panic while plugins build is covered.
+/// Chains the crash-report hook after the current one. Called once as the client launches
+/// ([`crate::run`], [`crate::run_with`]), before the `App` exists, so a panic while plugins build
+/// is covered.
 pub(crate) fn install(build: BuildId) {
     let started = Instant::now();
     let previous = std::panic::take_hook();
@@ -139,12 +140,14 @@ mod tests {
         short: "0123456",
         date: "2026-09-16",
         profile: "debug",
+        project_dir: "",
+        extended: false,
     };
 
     #[test]
     fn a_report_carries_the_build_the_place_the_payload_and_the_log() {
         let log = vec!["+  1.000s  INFO benilla_app::net: entered world".to_owned()];
-        let text = render(&Report {
+        let mut report = Report {
             build: BUILD,
             unix: 1_800_000_000,
             uptime: Duration::from_millis(12_345),
@@ -153,10 +156,10 @@ mod tests {
             payload: "index out of bounds: the len is 3 but the index is 7",
             backtrace: "   0: benilla_app::net::apply::apply_net_updates",
             log: &log,
-        });
+        };
+        let text = render(&report);
         for needle in [
-            "sha 0123456789abcdef0123456789abcdef01234567",
-            "0.2.0+3 · 0123456 · 2026-09-16 · debug",
+            "build:     0.2.0+3 · 0123456 · 2026-09-16 · debug (sha 0123456789abcdef0123456789abcdef01234567)",
             "12.3 s after launch",
             "thread:    main",
             "at:        crates/benilla-app/src/net/apply.rs:100:5",
@@ -167,6 +170,13 @@ mod tests {
         ] {
             assert!(text.contains(needle), "missing {needle:?} in:\n{text}");
         }
+        // A client a crate on top of benilla extended says so in the build line.
+        report.build.extended = true;
+        let extended = render(&report);
+        assert!(
+            extended.contains("build:     0.2.0+3 · 0123456 · 2026-09-16 · debug · extended (sha "),
+            "{extended}"
+        );
 
         let dir = std::env::temp_dir().join(format!("benilla-crash-test-{}", std::process::id()));
         let _ = std::fs::remove_dir_all(&dir);
diff --git a/crates/benilla-app/src/creature_anim.rs b/crates/benilla-app/src/creature_anim.rs
index 04617da9..d98bb775 100644
--- a/crates/benilla-app/src/creature_anim.rs
+++ b/crates/benilla-app/src/creature_anim.rs
@@ -424,6 +424,10 @@ pub(crate) struct EmoteAnim {
     pub(crate) anim_id: u16,
     /// `PlaySeq` stamp; a kit anim inherits its `CastEvent`'s.
     pub(crate) seq: u64,
+    /// Came through the shared one-shot emote player (`0x5fcd20`: `SMSG_EMOTE`, the gesture
+    /// dispatcher), which skips an id already armed on the key bone or bone 0 (`0x5fcd56`). A kit
+    /// anim and `DoEmote`'s local play call `0x5fe2f0` directly and take no such test.
+    pub(crate) via_player: bool,
 }
 
 /// A state kit's `AnimID`, compared and never played: both field-4 callers (`0x5ff4c6`,
@@ -465,6 +469,7 @@ fn flourish_to_anim(
             entity: child.0,
             anim_id: select::MOUNT_SPECIAL,
             seq: play_seq.next(),
+            via_player: false,
         });
     }
 }
@@ -511,6 +516,7 @@ mod emote_anim;
 /// The client-local gestures (chat, NPC interact), the reference's `0x60bb30`.
 mod gesture;
 use emote_anim::emote_to_anim;
+pub(crate) use emote_anim::{local_play_eligible, LocalPlay};
 pub(crate) use gesture::{select_gesture, Gesture, GestureQueue};
 
 /// The Bevy systems that execute the state machine `select` picks.
@@ -564,6 +570,16 @@ pub(crate) struct AnimDriver {
     /// The movement flags the base was last armed for: the reference has no per-one-shot latch,
     /// so a root landing with a cast one-shot (Ice Block) still lets the base overwrite bone 0.
     gait_flags: u32,
+    /// Whether the unit was the interact NPC last frame: `SetInteractNPC` (`0x4930d0`) re-picks
+    /// its base on open (`0x493198`) and on clear (`0x493219`), so a flip cuts a one-shot.
+    interacting: bool,
+    /// Whether the interaction in `interacting` (or the one just cleared) targets a player, whose
+    /// open and clear skip the re-pick (`0x493159`, `0x493203`: the PLAYER typemask bit).
+    interact_player: bool,
+    /// The clear's re-pick (`0x493219`) runs while `[0xb4e2d0]` still names the NPC, so it picks
+    /// Stand; the global is zeroed after (`0x49334b`). The state returns at the next re-pick:
+    /// the Stand window's end, a movement-flag edge, or leaving Gait.
+    interact_hold: bool,
     /// The reference's `[unit+0xd58] & 0xc0000`: while Knockdown, LiftOff or Land holds it, base
     /// requests are refused, so a stun's knockdown survives the root's Stand recompute.
     base_lock: driver::play::BaseAnimLock,
@@ -673,6 +689,9 @@ impl Default for AnimDriver {
             mode: Mode::Gait,
             gait: None,
             gait_flags: 0,
+            interacting: false,
+            interact_player: false,
+            interact_hold: false,
             base_lock: driver::play::BaseAnimLock::default(),
             sheath_cur: None,
             sheath_byte: None,
@@ -832,6 +851,8 @@ impl Plugin for CreatureAnimPlugin {
                     // Same frame as the loot kneel: the reference force-plays Loot 50 in the
                     // handler that arms the latch.
                     .after(crate::ui_loot::resolve_loot_kneel)
+                    // `DoEmote`'s local play, written in the chat drain.
+                    .after(crate::ui_chat::ChatDrain)
                     // After Input so a sheath request (the Z toggle) executes the same frame.
                     .after(WorldStage::Input)
                     // `VisualSheath` must land before `resolve_equipment` reads it, or a sheath
diff --git a/crates/benilla-app/src/creature_anim/driver.rs b/crates/benilla-app/src/creature_anim/driver.rs
index f3fadb08..80bf98bd 100644
--- a/crates/benilla-app/src/creature_anim/driver.rs
+++ b/crates/benilla-app/src/creature_anim/driver.rs
@@ -19,8 +19,8 @@ use crate::net::{
 use crate::sound::EmoteSounds;
 
 use super::select::{
-    self, current_special, defense_anim, is_swing_id, route_oneshot, swing_anim_main,
-    swing_anim_off, unify, Mode, OneShotRoute, DEATH, DEFAULT_WALK_SPEED, STAND,
+    self, current_special, defense_anim, is_swing_id, route_mounted, route_oneshot,
+    swing_anim_main, swing_anim_off, unify, Mode, OneShotRoute, DEATH, DEFAULT_WALK_SPEED, STAND,
 };
 use super::sheath::{advance_sheath_ceremony, start_sheath_ceremony};
 use super::{
@@ -53,9 +53,11 @@ const ONESHOT_RELEASE_FADE: f32 = 0.150;
 const JUMP_ARC_MIN_UP: f32 = 0.5;
 
 /// A one-shot play request from this frame's messages, resolved to an anim id per unit.
+#[derive(Clone, Copy)]
 enum OneShotReq {
     Swing(u32),
-    Emote(u16),
+    /// The id, and whether it came through the emote player's armed-id test.
+    Emote(u16, bool),
 }
 
 /// The live one-shot the combat fast path tests: the key bone's clip, else bone 0's (`0x5fe422`).
@@ -79,6 +81,31 @@ fn live_oneshot(
     None
 }
 
+/// The id armed on the unit, as `0x5fdb50` reads it: the key bone's while one runs, else bone 0's.
+/// It is the REQUESTED id, not the fallback clip that plays: op4 stores its raw argument at
+/// `+0xf8` (`0x71252f`) and the getter returns it (`0x7120d3`). A clip that has finished counts as
+/// gone: its completion callback re-arms the base.
+fn armed_id(
+    drv: &AnimDriver,
+    player: &AnimationPlayer,
+    tr: &AnimationTransitions,
+    anims: &ModelAnimations,
+) -> Option<u16> {
+    let running = |n| player.animation(n).is_some_and(|a| !a.is_finished());
+    if let Some(ov) = drv.overlay.filter(|ov| running(ov.node)) {
+        return Some(ov.id);
+    }
+    let node = tr.get_main_animation().filter(|&n| running(n))?;
+    // The clip's own id only when the mode holds no requested id.
+    drv.active_anim().or_else(|| {
+        anims
+            .clips
+            .iter()
+            .find(|c| c.node == node)
+            .map(|c| c.anim_id)
+    })
+}
+
 /// Whether a one-shot is live on the unit; the missile queue polls it to launch a missile whose
 /// release keyframe never fired when the cast ends (the reference's `0x5fc920` → `0x60c9b0`).
 pub(crate) fn oneshot_is_live(
@@ -277,13 +304,18 @@ pub(super) fn drive_animations(
         // Read for `DO_NOT_PLAY_WOUND_ANIM`; a missing cache reads as an unreceived template.
         Option<Res<crate::names::NameCache>>,
         MessageReader<BaseAnimRecompute>,
+        // A rider's mount child, where a mount-set request goes (`0x5fe7c1`).
+        Query<(&ObjectStore, &crate::entities::mount::MountChild)>,
+        // The open NPC session's unit (`[0xb4e2d0]`): its state emote is passed over when the
+        // row's `EmoteFlags` carry `0x2000` (`0x5fd7e2`-`0x5fd7fd`).
+        Option<Res<crate::ui_session::InteractNpc>>,
     ),
     // The variation roll's LCG, the reference's single CRT `_rand` stream shared by every play.
     mut rng: ResMut<benilla_assets::AnimRng>,
     // The last anim trace line per traced unit; the trace writes only on change.
     mut anim_trace_last: Local<std::collections::HashMap<Entity, String>>,
 ) {
-    let (emote_sounds, loot_kneel, time, names, mut recomputes) = aux;
+    let (emote_sounds, loot_kneel, time, names, mut recomputes, riders, interact) = aux;
     let dt = time.delta_secs();
     // This frame's one-shot plays per unit, replayed in the reference's call order (`PlaySeq`
     // stamps): a later call overwrites an earlier, and the combat fast path keys on what is playing
@@ -332,7 +364,37 @@ pub(super) fn drive_animations(
         pending
             .entry(e.entity)
             .or_default()
-            .push((OneShotReq::Emote(e.anim_id), e.seq));
+            .push((OneShotReq::Emote(e.anim_id, e.via_player), e.seq));
+    }
+    // A mounted rider's mount-set emotes go to the mount model (`0x5fe7c1`); the rider keeps the
+    // request for its own CLASS_A and nowhere routes. The emote player's armed test (`0x5fcd56`)
+    // runs once, on the rider, ahead of that routing, so the forwarded copy carries none.
+    let mut to_mount: Vec<(Entity, (OneShotReq, u64))> = Vec::new();
+    for (rider, reqs) in pending.iter() {
+        let Ok((store, child)) = riders.get(*rider) else {
+            continue;
+        };
+        if store.0.unit_mount_display_id() == 0 {
+            continue;
+        }
+        for &(req, seq) in reqs {
+            let OneShotReq::Emote(id, via_player) = req else {
+                continue;
+            };
+            if !route_mounted(id).mount {
+                continue;
+            }
+            let armed = via_player
+                .then(|| units.get(*rider).ok())
+                .flatten()
+                .and_then(|u| armed_id(u.4, u.2, u.3, u.1));
+            if armed != Some(id) {
+                to_mount.push((child.0, (OneShotReq::Emote(id, false), seq)));
+            }
+        }
+    }
+    for (child, req) in to_mount {
+        pending.entry(child).or_default().push(req);
     }
     // Stage-2 base recomputes by unit, last wins: of two in a frame the second's verdict stands.
     let mut pending_recompute: bevy::ecs::entity::EntityHashMap<u16> = default();
@@ -706,7 +768,7 @@ pub(super) fn drive_animations(
         });
         // In `PlaySeq` order, defense last: the reference plays it from the deferred impact scan,
         // after every message handler.
-        let mut requests: Vec<u16> = pending
+        let mut requests: Vec<(u16, Option<u16>)> = pending
             .remove(&entity)
             .map(|mut v| {
                 v.sort_by_key(|&(_, seq)| seq);
@@ -722,19 +784,21 @@ pub(super) fn drive_animations(
                                 swing_anim_main(w.armed_main())
                             };
                             debug!("swing: unit {entity} anim {id} (hitInfo {hit_info:#x})");
-                            id
+                            (id, None)
                         }
-                        OneShotReq::Emote(id) => id,
+                        // The armed-id test compares the record's own AnimID, before the play
+                        // seam's unarmed remap.
+                        OneShotReq::Emote(id, via_player) => (id, via_player.then_some(id)),
                     })
                     .collect()
             })
             .unwrap_or_default();
-        requests.extend(defense);
+        requests.extend(defense.map(|id| (id, None)));
         // At the play seam (`0x5fe2f0`), Special1H/2H with both hands empty becomes
         // SpecialUnarmed(118), for every request.
         {
             let w = wielded.copied().unwrap_or_default();
-            for id in &mut requests {
+            for (id, _) in &mut requests {
                 *id = select::unarmed_special(*id, w.armed_main(), w.armed_off());
             }
         }
@@ -746,9 +810,22 @@ pub(super) fn drive_animations(
             && !airborne_frozen
             && live_oneshot(&drv, &player, &tr, anims, catalog).is_none()
         {
-            requests.extend(drv.deferred.take());
+            requests.extend(drv.deferred.take().map(|id| (id, None)));
         }
-        for id in requests {
+        for (id, armed_test) in requests {
+            // The emote player's own test first (`0x5fcd56`): an id already armed on the key bone
+            // or bone 0 plays nothing, ahead of the lock and the fast path in `0x5fe2f0`.
+            if let Some(raw) = armed_test {
+                if armed_id(&drv, &player, &tr, anims) == Some(raw) {
+                    if benilla_assets::trace::enabled() {
+                        benilla_assets::trace::line(
+                            "fct",
+                            &format!("anim armed-skip unit={entity} id={raw}"),
+                        );
+                    }
+                    continue;
+                }
+            }
             // The lock first: `0x5fe2f0`'s head guard returns before routing, the fast path and
             // the dedup, so a locked unit gets no arm and no deferral.
             if drv.base_lock.refuses() {
@@ -794,13 +871,30 @@ pub(super) fn drive_animations(
                 }
                 continue;
             }
-            // Mounted forces the masked route (`0x5fe2f0`'s mounted branch).
-            let masked =
-                mounted || route_oneshot(id, mv.flags, mv.stand_state) == OneShotRoute::Masked;
+            // A mounted rider plays only its CLASS_A ids, on the key bone, and nothing else
+            // (`0x5fe7b5`); a mount child plays the clip on its own bone 0 (`0x5fe7c1`).
+            let masked = if mounted {
+                if !route_mounted(id).rider_upper {
+                    continue;
+                }
+                true
+            } else {
+                mount_body.is_none()
+                    && route_oneshot(id, mv.flags, mv.stand_state) == OneShotRoute::Masked
+            };
             // Resolve to a clip this model has, roll its variation and its replay budget (a clamp
             // one-shot authored `(min,max)` plays R times).
             let picked =
                 find_resolved(anims, id, catalog).map(|h| roll_oneshot(anims, h, &mut rng));
+            // No split bone (`[+0xd5c] == -1`): a key-bone play arms nothing (`0x5fdcc4`).
+            if masked
+                && match picked {
+                    Some((c, _)) => c.upper_node.is_none(),
+                    None => mounted,
+                }
+            {
+                continue;
+            }
             let upper = masked
                 .then(|| picked.and_then(|(c, r)| c.upper_node.map(|n| (n, r))))
                 .flatten();
@@ -826,7 +920,7 @@ pub(super) fn drive_animations(
                 masked_played = true;
                 played_oneshot = Some(id);
             } else {
-                // Full-body, or a model with no key bone (the −1 sentinel arms bone 0): the clip
+                // Full-body: the clip
                 // replaces the base on bone 0 even over a Special, last writer wins (`0x5fe6c8`).
                 // An airborne arc's own clip freezes first, op4's pose-snapshot decay.
                 if let Some(sp) =
@@ -896,6 +990,7 @@ pub(super) fn drive_animations(
             {
                 if drv.mode == Mode::Gait {
                     drv.gait = None;
+                    drv.interact_hold = false; // the window's end is a re-pick (`0x5fc45a`)
                 } else {
                     let head = anims
                         .clips
@@ -936,6 +1031,34 @@ pub(super) fn drive_animations(
             }
         }
 
+        // `SetInteractNPC` re-picks the base at once on open and on clear (`0x5fd9e0(-1)`, sites
+        // `0x493198` and `0x493219`), over a live one-shot as any base arm; in Gait the per-frame
+        // pick already follows. A player's open and clear skip it (`0x493159`, `0x493203`), a pose
+        // under the one-shot re-picks to its own id and an airborne unit to the freeze
+        // (`0x5fd8e8`), which cut nothing.
+        let target = interact.as_ref().filter(|i| i.0 == Some(entity));
+        let interacting = target.is_some();
+        if let Some(guid) = target.and_then(|i| i.1) {
+            drv.interact_player = benilla_protocol::guid::is_player(guid);
+        }
+        if std::mem::replace(&mut drv.interacting, interacting) != interacting
+            && !drv.interact_player
+        {
+            // Opening re-picks with the NPC named, so it ends a hold; clearing re-picks with it
+            // still named, so the state stays passed over until the next re-pick.
+            drv.interact_hold = !interacting;
+            if matches!(drv.mode, Mode::Swing { under: None, .. }) && !airborne_frozen {
+                drv.deferred = None;
+                drv.mode = Mode::Gait;
+                drv.gait = None;
+            }
+        }
+        if drv.interact_hold
+            && (mv.flags != drv.gait_flags || !matches!(drv.mode, Mode::Gait | Mode::Swing { .. }))
+        {
+            drv.interact_hold = false;
+        }
+
         // ── The mode machine: the base track's decision.
         mode::run(
             mode::Frame {
@@ -955,6 +1078,7 @@ pub(super) fn drive_animations(
                 wielded,
                 store,
                 emote_sounds: emote_sounds.as_deref(),
+                interacting: interacting || drv.interact_hold,
                 walk,
                 model_scale,
                 traced,
diff --git a/crates/benilla-app/src/creature_anim/driver/mode.rs b/crates/benilla-app/src/creature_anim/driver/mode.rs
index 0c274a3c..bc4d1626 100644
--- a/crates/benilla-app/src/creature_anim/driver/mode.rs
+++ b/crates/benilla-app/src/creature_anim/driver/mode.rs
@@ -9,10 +9,7 @@ use bevy::prelude::*;
 use crate::net::ObjectStore;
 use crate::sound::EmoteSounds;
 
-use super::super::select::{
-    self, gait_candidates, is_bare_stand, playback_rate, ready_anim, state_emote_gait, Mode, DEATH,
-    STAND,
-};
+use super::super::select::{self, base_candidates, playback_rate, ready_anim, Mode, DEATH, STAND};
 use super::super::{find_resolved, move_flags, AnimDriver, CastHold, MovementState, Wielded};
 use super::play::{enter_special, leave_special, oneshot_finished, play, play_clip, roll_loop};
 use super::transplant_up;
@@ -36,6 +33,8 @@ pub(super) struct Frame<'a> {
     pub(super) wielded: Option<&'a Wielded>,
     pub(super) store: Option<&'a ObjectStore>,
     pub(super) emote_sounds: Option<&'a EmoteSounds>,
+    /// Whether this unit is the current interact NPC.
+    pub(super) interacting: bool,
     pub(super) walk: f32,
     pub(super) model_scale: f32,
     /// Whether this body's plays go to the anim trace; `subject` labels them (rider or mount).
@@ -68,6 +67,7 @@ pub(super) fn run(
         wielded,
         store,
         emote_sounds,
+        interacting,
         walk,
         model_scale,
         traced,
@@ -315,7 +315,22 @@ pub(super) fn run(
                             load
                         }
                     });
-                let cands = gait_candidates(&mv, walk, ready, ranged_load);
+                // The looping state-emote idle (`UNIT_NPC_EMOTESTATE`: `/dance`, NPC work loops, and
+                // `/stand`'s state 26) is the resolver `0x5fd770`: it claims the base ahead of the
+                // idle fallbacks (swim, prowl, Stand) and behind everything else in the chain.
+                let state_anim = store.and_then(|s| {
+                    let state = s.0.unit_emote_state();
+                    emote_sounds.and_then(|e| {
+                        select::state_emote_anim(
+                            state,
+                            e.state_anim(state),
+                            e.emote_flags(state),
+                            interacting,
+                        )
+                    })
+                });
+                let base = base_candidates(&mv, walk, ready, ranged_load, state_anim);
+                let cands = base.as_slice();
                 // The stationary cast/channel pin (`[CGUnit+0xb4]`), full-body over the Ready and
                 // state-emote idles; stationary is `[9e8] & 0x20000f`, never the turn bits, so a
                 // turning caster keeps it and a moving one gets the masked hold instead.
@@ -327,22 +342,6 @@ pub(super) fn run(
                     }
                     _ => cands,
                 };
-                // The looping state-emote idle (`UNIT_NPC_EMOTESTATE`: `/dance`, NPC work loops)
-                // fills only the bare-Stand slot; whatever outranks Stand already routed `cands`.
-                let state_emote_cands;
-                let cands: &[u16] = if is_bare_stand(cands) {
-                    let emote_anim = store
-                        .and_then(|s| emote_sounds.and_then(|e| e.anim(s.0.unit_emote_state())));
-                    match emote_anim {
-                        Some(id) => {
-                            state_emote_cands = state_emote_gait(id as u16);
-                            &state_emote_cands
-                        }
-                        None => cands,
-                    }
-                } else {
-                    cands
-                };
                 // The loot kneel (Loot 50) of a stationary, unmounted unit with the trigger up,
                 // over the cast pin, the Ready and ranged idles, the chair loops and the state
                 // emote: `0x5fd8b0` tries locomotion, then loot (`0x5fd260`), then the cast/channel
diff --git a/crates/benilla-app/src/creature_anim/driver/tests.rs b/crates/benilla-app/src/creature_anim/driver/tests.rs
index a48c5090..b918bb1c 100644
--- a/crates/benilla-app/src/creature_anim/driver/tests.rs
+++ b/crates/benilla-app/src/creature_anim/driver/tests.rs
@@ -662,6 +662,7 @@ fn whiff_slowdown_spares_a_non_swing_oneshot() {
         entity: spinner,
         anim_id: 57,
         seq: 1,
+        via_player: false,
     });
     app.world_mut().write_message(SwingMessage {
         attacker: swinger,
@@ -747,12 +748,14 @@ fn same_frame_collision_fast_paths_the_second_combat_clip() {
         entity: spin_last,
         anim_id: 57,
         seq: 2,
+        via_player: false,
     });
     // swing_last: the spin arrives first.
     app.world_mut().write_message(EmoteAnim {
         entity: swing_last,
         anim_id: 57,
         seq: 3,
+        via_player: false,
     });
     app.world_mut().write_message(SwingMessage {
         attacker: swing_last,
@@ -1450,6 +1453,7 @@ fn a_jump_in_place_cast_replaces_the_hang_and_survives_the_arc() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     fn drv(app: &App, unit: Entity) -> &AnimDriver {
@@ -1494,6 +1498,7 @@ fn landing_mid_cast_plays_the_land_pick() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     app.world_mut()
@@ -1525,6 +1530,7 @@ fn a_cast_over_the_fall_loop_holds_until_landing() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update(); // Swing { 54, under: Jump }
     app.world_mut().entity_mut(unit).insert(MovementState {
@@ -1543,6 +1549,7 @@ fn a_cast_over_the_fall_loop_holds_until_landing() {
         entity: unit,
         anim_id: 54,
         seq: 2,
+        via_player: false,
     });
     app.update();
     assert!(
@@ -1597,6 +1604,7 @@ fn a_moving_jump_cast_masks_onto_the_overlay() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     let drv = app.world().entity(unit).get::<AnimDriver>().unwrap();
@@ -1622,6 +1630,7 @@ fn a_jump_over_a_live_cast_transplants_it_to_the_torso() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     {
@@ -1774,6 +1783,7 @@ fn a_finished_masked_cast_fades_out_instead_of_snapping() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     {
@@ -1903,6 +1913,7 @@ fn a_midair_deferred_park_survives_the_level_and_dies_at_the_landing_play() {
         entity: unit,
         anim_id: 57,
         seq: 1,
+        via_player: false,
     });
     app.world_mut().write_message(SwingMessage {
         attacker: unit,
@@ -2226,6 +2237,7 @@ fn a_root_landing_with_the_cast_returns_the_body_to_neutral() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     assert_eq!(
@@ -2252,6 +2264,7 @@ fn a_run_starting_under_a_cast_still_transplants_it_up() {
         entity: unit,
         anim_id: 54,
         seq: 1,
+        via_player: false,
     });
     app.update();
     let mode = |app: &App| app.world().entity(unit).get::<AnimDriver>().unwrap().mode;
@@ -2553,6 +2566,7 @@ fn the_mount_transition_takes_bone_0_back_from_a_full_body_one_shot() {
         entity: unit,
         anim_id: SPELL_CAST_OMNI,
         seq: 1,
+        via_player: false,
     });
     app.update();
     assert_eq!(
@@ -2872,6 +2886,7 @@ fn a_mid_volley_fire_clip_re_pulls_and_the_pull_promotes_to_the_hold() {
         entity: unit,
         anim_id: 46,
         seq: 1,
+        via_player: false,
     });
     app.update();
     assert_eq!(
@@ -3022,6 +3037,7 @@ fn every_shot_of_a_volley_re_arms_the_fire_clip_through_the_emote_lane() {
             entity: unit,
             anim_id: 46,
             seq: shot,
+            via_player: false,
         });
         app.update();
         assert_eq!(mode(&app), FIRING, "shot {shot} takes bone 0");
@@ -3429,6 +3445,7 @@ fn a_special_goes_unarmed_only_when_both_hands_are_empty() {
             entity: unit,
             anim_id: 57,
             seq: 1,
+            via_player: false,
         });
         unit
     };
@@ -3698,6 +3715,7 @@ fn a_gait_change_raises_the_anim_edge_and_a_steady_frame_does_not() {
         entity: unit,
         anim_id: 57,
         seq: 1,
+        via_player: false,
     });
     app.update();
     assert!(edge(&app), "and so does a one-shot");
@@ -3729,6 +3747,7 @@ fn a_combat_over_combat_fast_path_does_not_raise_the_anim_edge() {
         entity: unit,
         anim_id: 57,
         seq: 1,
+        via_player: false,
     });
     app.update();
     assert!(edge(&app), "the first combat play arms normally");
@@ -3806,6 +3825,7 @@ mod base_anim_lock {
             entity: unit,
             anim_id,
             seq: 1,
+            via_player: false,
         });
         app.update();
     }
@@ -3978,3 +3998,675 @@ mod base_anim_lock {
         );
     }
 }
+
+/// The one-shot routing seams `0x5fe2f0` runs ahead of the clip: the mounted three-way split
+/// (`0x5fe7b5`), and a key-bone play on a model with no split bone (`0x5fdcc4`).
+mod routing {
+    use super::*;
+
+    const FIELD_MOUNTDISPLAYID: u16 = 133;
+    const MOUNT: u16 = 91;
+    const PRAY: u16 = 75; // EmoteKneel, not CLASS_A
+    const CHEER: u16 = 68; // CLASS_A
+    const SHUFFLE: u16 = 12; // mount-set, not CLASS_A
+    const EAT: u16 = 61;
+
+    fn masked(anim_id: u16, node: u32, upper: u32) -> AnimClip {
+        let mut c = clip(anim_id, node, false);
+        c.upper_node = Some(AnimationNodeIndex::new(upper as usize));
+        c
+    }
+
+    fn model(clips: Vec<AnimClip>) -> ModelAnimations {
+        ModelAnimations {
+            graph: Handle::default(),
+            clips,
+            hand_close: [None, None],
+            playable_animation_lookup: Vec::new(),
+            animation_lookup: Vec::new(),
+            global_bones: Vec::new(),
+            first_seq: None,
+            pose: Default::default(),
+        }
+    }
+
+    fn rider_model() -> ModelAnimations {
+        model(vec![
+            clip(0, 1, true),
+            clip(MOUNT, 2, true),
+            masked(PRAY, 3, 13),
+            masked(CHEER, 4, 14),
+            masked(SHUFFLE, 5, 15),
+        ])
+    }
+
+    fn spawn(app: &mut App, model: ModelAnimations, mount_display: u32) -> Entity {
+        app.world_mut()
+            .spawn((
+                model,
+                AnimationPlayer::default(),
+                AnimationTransitions::new(),
+                AnimDriver::default(),
+                crate::net::ObjectStore(ObjectFields::from_pairs(&[(
+                    FIELD_MOUNTDISPLAYID,
+                    mount_display,
+                )])),
+                MovementState::default(),
+            ))
+            .id()
+    }
+
+    fn emote(app: &mut App, entity: Entity, anim_id: u16) {
+        app.world_mut().write_message(EmoteAnim {
+            entity,
+            anim_id,
+            seq: 1,
+            via_player: false,
+        });
+        app.update();
+    }
+
+    fn drv(app: &App, e: Entity) -> &AnimDriver {
+        app.world().entity(e).get::<AnimDriver>().unwrap()
+    }
+
+    #[test]
+    fn a_mounted_pray_arms_nothing_and_keeps_the_mounted_base() {
+        let mut app = app();
+        let rider = spawn(&mut app, rider_model(), 2404);
+        app.update();
+        assert_eq!(drv(&app, rider).active_anim(), Some(MOUNT));
+        emote(&mut app, rider, PRAY);
+        assert!(drv(&app, rider).overlay.is_none(), "no key-bone play");
+        assert_eq!(drv(&app, rider).active_anim(), Some(MOUNT), "no base play");
+    }
+
+    #[test]
+    fn a_mounted_class_a_id_plays_on_the_riders_upper_body() {
+        let mut app = app();
+        let rider = spawn(&mut app, rider_model(), 2404);
+        app.update();
+        emote(&mut app, rider, CHEER);
+        assert!(drv(&app, rider).overlay.is_some_and(|o| o.id == CHEER));
+        assert_eq!(drv(&app, rider).active_anim(), Some(MOUNT));
+    }
+
+    #[test]
+    fn a_mounted_mount_set_id_goes_to_the_mount_child() {
+        let mut app = app();
+        let rider = spawn(&mut app, rider_model(), 2404);
+        let child = app
+            .world_mut()
+            .spawn((
+                model(vec![clip(0, 1, true), masked(SHUFFLE, 2, 12)]),
+                AnimationPlayer::default(),
+                AnimationTransitions::new(),
+                AnimDriver::default(),
+                crate::entities::mount::MountBody { host: rider },
+            ))
+            .id();
+        app.world_mut()
+            .entity_mut(rider)
+            .insert(crate::entities::mount::MountChild(child));
+        app.update();
+        emote(&mut app, rider, SHUFFLE);
+        assert_eq!(
+            drv(&app, child).active_anim(),
+            Some(SHUFFLE),
+            "the mount's bone 0, full-body"
+        );
+        assert!(drv(&app, child).overlay.is_none());
+        assert!(
+            drv(&app, rider).overlay.is_none(),
+            "not CLASS_A: the rider idles"
+        );
+        assert_eq!(drv(&app, rider).active_anim(), Some(MOUNT));
+    }
+
+    #[test]
+    fn standing_eat_takes_the_key_bone() {
+        let mut app = app();
+        let unit = spawn(
+            &mut app,
+            model(vec![clip(0, 1, true), masked(EAT, 2, 12)]),
+            0,
+        );
+        app.update();
+        emote(&mut app, unit, EAT);
+        assert!(drv(&app, unit).overlay.is_some_and(|o| o.id == EAT));
+        assert_eq!(
+            drv(&app, unit).active_anim(),
+            Some(0),
+            "the legs keep Stand"
+        );
+    }
+
+    #[test]
+    fn a_key_bone_play_without_a_split_bone_arms_nothing() {
+        let mut app = app();
+        let unit = spawn(
+            &mut app,
+            model(vec![clip(0, 1, true), clip(EAT, 2, false)]),
+            0,
+        );
+        app.update();
+        emote(&mut app, unit, EAT);
+        assert!(drv(&app, unit).overlay.is_none());
+        assert_eq!(
+            drv(&app, unit).active_anim(),
+            Some(0),
+            "no full-body fallback"
+        );
+    }
+
+    /// The armed id is the requested one (`0x712090` returns `+0xf8`, op4's raw argument), not
+    /// the clip a fallback plays: Stand runs on bone 0 while 68 is the requested id.
+    #[test]
+    fn the_armed_id_is_the_requested_one_not_the_fallback_clip() {
+        use super::super::super::select::Mode;
+        let mut app = app();
+        let unit = spawn(&mut app, model(vec![clip(0, 1, true)]), 0);
+        app.update();
+        let armed = |app: &App| {
+            let e = app.world().entity(unit);
+            super::super::armed_id(
+                e.get::<AnimDriver>().unwrap(),
+                e.get::<AnimationPlayer>().unwrap(),
+                e.get::<AnimationTransitions>().unwrap(),
+                e.get::<ModelAnimations>().unwrap(),
+            )
+        };
+        assert_eq!(armed(&app), Some(0), "Stand requested, Stand playing");
+        app.world_mut()
+            .entity_mut(unit)
+            .get_mut::<AnimDriver>()
+            .unwrap()
+            .mode = Mode::Swing {
+            id: CHEER,
+            under: None,
+        };
+        assert_eq!(armed(&app), Some(CHEER), "the requested id, not clip 0");
+    }
+
+    /// A mounted rider's mount-set emote is tested once, on the rider: an id the rider has armed
+    /// is not forwarded to the mount child.
+    #[test]
+    fn a_rider_armed_id_stops_the_forward_to_the_mount() {
+        use super::super::super::select::Mode;
+        let mut app = app();
+        let rider = spawn(&mut app, model(vec![clip(0, 1, true)]), 1);
+        let child = app
+            .world_mut()
+            .spawn((
+                model(vec![clip(0, 1, true), clip(SHUFFLE, 2, false)]),
+                AnimationPlayer::default(),
+                AnimationTransitions::new(),
+                AnimDriver::default(),
+            ))
+            .id();
+        app.world_mut()
+            .entity_mut(rider)
+            .insert(crate::entities::mount::MountChild(child));
+        app.update();
+        let child_mode = |app: &App| app.world().entity(child).get::<AnimDriver>().unwrap().mode;
+        let send = |app: &mut App, via_player: bool| {
+            app.world_mut().write_message(EmoteAnim {
+                entity: rider,
+                anim_id: SHUFFLE,
+                seq: 1,
+                via_player,
+            });
+            app.update();
+        };
+        // A control: a kit anim (no armed test) is forwarded.
+        send(&mut app, false);
+        assert!(
+            matches!(child_mode(&app), Mode::Swing { id: SHUFFLE, .. }),
+            "the mount-set emote reaches the mount"
+        );
+        app.world_mut()
+            .entity_mut(child)
+            .get_mut::<AnimDriver>()
+            .unwrap()
+            .mode = Mode::Gait;
+        // The rider has it armed: the player's test refuses before the forward.
+        app.world_mut()
+            .entity_mut(rider)
+            .get_mut::<AnimDriver>()
+            .unwrap()
+            .mode = Mode::Swing {
+            id: SHUFFLE,
+            under: None,
+        };
+        send(&mut app, true);
+        assert_eq!(child_mode(&app), Mode::Gait, "not forwarded to the mount");
+    }
+
+    /// `DoEmote`'s local play (`0x5fe2f0`) arms the clip at once; the `SMSG_EMOTE` echo that follows
+    /// through the emote player finds the id armed (`0x5fcd56`) and leaves it running.
+    #[test]
+    fn the_echo_of_a_local_emote_does_not_restart_it() {
+        let mut app = app();
+        let unit = spawn(
+            &mut app,
+            model(vec![clip(0, 1, true), masked(CHEER, 2, 12)]),
+            0,
+        );
+        app.world_mut().entity_mut(unit).insert(MovementState {
+            flags: move_flags::FORWARD,
+            ..Default::default()
+        });
+        app.update();
+        let send = |app: &mut App, via_player: bool| {
+            app.world_mut().write_message(EmoteAnim {
+                entity: unit,
+                anim_id: CHEER,
+                seq: 1,
+                via_player,
+            });
+            app.update();
+        };
+        let node = AnimationNodeIndex::new(12);
+        let speed = |app: &App| {
+            app.world()
+                .entity(unit)
+                .get::<AnimationPlayer>()
+                .unwrap()
+                .animation(node)
+                .map(bevy::animation::ActiveAnimation::speed)
+        };
+        send(&mut app, false);
+        assert_eq!(speed(&app), Some(1.0), "the local play armed the key bone");
+        // A fresh arm resets the rate to 1.0, so a marker rate shows a restart.
+        app.world_mut()
+            .entity_mut(unit)
+            .get_mut::<AnimationPlayer>()
+            .unwrap()
+            .animation_mut(node)
+            .unwrap()
+            .set_speed(0.25);
+        send(&mut app, true);
+        assert_eq!(speed(&app), Some(0.25), "the echo did not re-arm the clip");
+    }
+}
+
+/// The `UNIT_NPC_EMOTESTATE` resolver (`0x5fd770`): the current interact NPC passes over a state
+/// whose `Emotes.dbc` flags carry `0x2000`, and `SetInteractNPC` re-picks its base on open and
+/// on clear.
+mod emote_state {
+    use super::*;
+    use crate::creature_anim::Mode;
+    use crate::net::ObjectStore;
+    use crate::sound::EmoteSounds;
+    use crate::ui_session::InteractNpc;
+    use benilla_formats::EmoteSoundCatalog;
+
+    /// Emote states: 28 plays AnimID 234 and yields to interaction (`0x2000`); 29 plays 235 and
+    /// does not.
+    const YIELDING: u32 = 28;
+    const STUBBORN: u32 = 29;
+    /// `/stand`'s state 26 (vmangos `ChatHandler.cpp` `HandleTextEmoteOpcode`): AnimID 0.
+    const STAND_STATE: u32 = 26;
+    const FIELD_NPC_EMOTESTATE: u16 = 148;
+
+    /// Real graph nodes, so loop windows complete: every clip lasts 0.1 s, and the loops are one
+    /// pass per window.
+    fn model(
+        app: &mut App,
+    ) -> (
+        ModelAnimations,
+        bevy::animation::graph::AnimationGraphHandle,
+    ) {
+        use bevy::animation::graph::{AnimationGraph, AnimationGraphHandle};
+        use bevy::animation::AnimationClip;
+        let ids: [(u16, bool); 6] = [
+            (0, true),    // Stand
+            (234, true),  // the yielding state's loop
+            (235, true),  // the other state's loop
+            (118, false), // SpecialUnarmed, a one-shot
+            (41, true),   // SwimIdle
+            (42, true),   // Swim
+        ];
+        let handles: Vec<_> = ids
+            .iter()
+            .map(|_| {
+                let mut c = AnimationClip::default();
+                c.set_duration(0.1);
+                app.world_mut()
+                    .resource_mut::<Assets<AnimationClip>>()
+                    .add(c)
+            })
+            .collect();
+        let (graph, nodes) = AnimationGraph::from_clips(handles);
+        let graph = app
+            .world_mut()
+            .resource_mut::<Assets<AnimationGraph>>()
+            .add(graph);
+        let clips = ids
+            .iter()
+            .zip(nodes)
+            .map(|(&(id, looping), node)| {
+                let mut c = clip(id, 0, looping);
+                c.node = node;
+                c.duration = 0.1;
+                c.blend_time = 0.0;
+                c.frequency = 0x4000;
+                c.replay = (1, 1);
+                c
+            })
+            .collect();
+        (
+            ModelAnimations {
+                graph: graph.clone(),
+                clips,
+                hand_close: [None, None],
+                playable_animation_lookup: Vec::new(),
+                animation_lookup: Vec::new(),
+                global_bones: Vec::new(),
+                first_seq: None,
+                pose: Default::default(),
+            },
+            AnimationGraphHandle(graph),
+        )
+    }
+
+    fn app_with_rows() -> App {
+        let mut app = app();
+        app.init_resource::<InteractNpc>();
+        app.insert_resource(EmoteSounds(
+            EmoteSoundCatalog::default()
+                .with_row(YIELDING, 234, 0x2000)
+                .with_row(STUBBORN, 235, 0)
+                .with_row(STAND_STATE, 0, 0),
+        ));
+        app
+    }
+
+    fn unit(app: &mut App, state: u32) -> Entity {
+        let (model, graph) = model(app);
+        app.world_mut()
+            .spawn((
+                model,
+                graph,
+                AnimationPlayer::default(),
+                AnimationTransitions::new(),
+                AnimDriver::default(),
+                ObjectStore(ObjectFields::from_pairs(&[(FIELD_NPC_EMOTESTATE, state)])),
+            ))
+            .id()
+    }
+
+    fn gait(app: &App, unit: Entity) -> Option<u16> {
+        app.world().entity(unit).get::<AnimDriver>().unwrap().gait
+    }
+
+    /// A creature's guid, which `SetInteractNPC` re-picks for; a player's does not.
+    const CREATURE: u64 = 0xF130_0000_0000_0042;
+    const PLAYER: u64 = 0x42;
+
+    fn interact_guid(app: &mut App, npc: Option<Entity>, guid: u64) {
+        *app.world_mut().resource_mut::<InteractNpc>() = InteractNpc(npc, npc.map(|_| guid));
+        app.update();
+    }
+
+    fn interact(app: &mut App, npc: Option<Entity>) {
+        interact_guid(app, npc, CREATURE);
+    }
+
+    fn mode(app: &App, unit: Entity) -> Mode {
+        app.world().entity(unit).get::<AnimDriver>().unwrap().mode
+    }
+
+    #[test]
+    fn a_yielding_state_stops_while_its_unit_is_the_interact_npc() {
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, YIELDING);
+        app.update();
+        assert_eq!(gait(&app, npc), Some(234), "the work loop plays");
+
+        interact(&mut app, Some(npc));
+        assert_eq!(gait(&app, npc), Some(0), "the window is open: Stand");
+
+        // The clear's re-pick runs with the NPC still named (`0x493219` before the zeroing at
+        // `0x49334b`), so Stand holds until the next re-pick: the end of its window.
+        interact(&mut app, None);
+        for _ in 0..3 {
+            advance(&mut app, 10);
+            assert_eq!(
+                gait(&app, npc),
+                Some(0),
+                "cleared: Stand until its window ends"
+            );
+        }
+        for _ in 0..20 {
+            advance(&mut app, 25);
+        }
+        assert_eq!(gait(&app, npc), Some(234), "then the loop resumes");
+    }
+
+    /// A live one-shot is cut to Stand by the clear, not to the loop.
+    #[test]
+    fn the_clear_cuts_a_one_shot_to_stand() {
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, YIELDING);
+        interact(&mut app, Some(npc));
+        app.world_mut().write_message(EmoteAnim {
+            entity: npc,
+            anim_id: 118,
+            seq: 1,
+            via_player: false,
+        });
+        app.update();
+        assert!(matches!(mode(&app, npc), Mode::Swing { id: 118, .. }));
+        interact(&mut app, None);
+        assert_eq!(mode(&app, npc), Mode::Gait);
+        assert_eq!(gait(&app, npc), Some(0));
+    }
+
+    /// `0x493159` and `0x493203` skip the re-pick for a player (a trade partner).
+    #[test]
+    fn a_player_target_is_not_re_picked() {
+        let mut app = app_with_rows();
+        let partner = unit(&mut app, YIELDING);
+        app.update();
+        app.world_mut().write_message(EmoteAnim {
+            entity: partner,
+            anim_id: 118,
+            seq: 1,
+            via_player: false,
+        });
+        app.update();
+        interact_guid(&mut app, Some(partner), PLAYER);
+        assert!(
+            matches!(mode(&app, partner), Mode::Swing { id: 118, .. }),
+            "open"
+        );
+        interact_guid(&mut app, None, PLAYER);
+        assert!(
+            matches!(mode(&app, partner), Mode::Swing { id: 118, .. }),
+            "clear"
+        );
+    }
+
+    /// The re-pick of a seated unit goes to its pose (`0x5fd550`), so the one-shot over it is
+    /// left to finish and the sit-down entry is not replayed.
+    #[test]
+    fn a_pose_under_the_one_shot_is_not_cut() {
+        use crate::creature_anim::select::Special;
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, YIELDING);
+        app.world_mut().entity_mut(npc).insert(MovementState {
+            stand_state: 1,
+            ..Default::default()
+        });
+        let swing = Mode::Swing {
+            id: 118,
+            under: Some(Special::Pose(1)),
+        };
+        app.world_mut()
+            .entity_mut(npc)
+            .get_mut::<AnimDriver>()
+            .unwrap()
+            .mode = swing;
+        interact(&mut app, Some(npc));
+        assert!(
+            !matches!(mode(&app, npc), Mode::Gait | Mode::Entering(_)),
+            "no forced Gait, so no replay of the entry: {:?}",
+            mode(&app, npc)
+        );
+    }
+
+    #[test]
+    fn a_state_without_the_bit_keeps_playing_while_interacted() {
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, STUBBORN);
+        interact(&mut app, Some(npc));
+        assert_eq!(gait(&app, npc), Some(235));
+    }
+
+    #[test]
+    fn only_the_interact_npc_stops() {
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, YIELDING);
+        let other = unit(&mut app, YIELDING);
+        interact(&mut app, Some(npc));
+        assert_eq!(gait(&app, npc), Some(0));
+        assert_eq!(gait(&app, other), Some(234), "a neighbour keeps working");
+    }
+
+    /// The re-pick overwrites bone 0 like any base arm, so it cuts a live one-shot.
+    #[test]
+    fn opening_the_window_re_picks_over_a_live_one_shot() {
+        let mut app = app_with_rows();
+        let npc = unit(&mut app, YIELDING);
+        app.update();
+        app.world_mut().write_message(EmoteAnim {
+            entity: npc,
+            anim_id: 118,
+            seq: 1,
+            via_player: false,
+        });
+        app.update();
+        assert!(matches!(
+            app.world().entity(npc).get::<AnimDriver>().unwrap().mode,
+            Mode::Swing { id: 118, .. }
+        ));
+
+        interact(&mut app, Some(npc));
+        assert_eq!(gait(&app, npc), Some(0), "the one-shot is cut for Stand");
+    }
+
+    /// State 26 holds Stand over the swim idle until the unit moves (`0x5fd770` before `0x5fd830`).
+    #[test]
+    fn a_set_state_holds_stand_over_the_swim_idle_until_the_unit_moves() {
+        let mut app = app_with_rows();
+        let swimmer = unit(&mut app, STAND_STATE);
+        let bare = unit(&mut app, 0);
+        for u in [swimmer, bare] {
+            app.world_mut().entity_mut(u).insert(MovementState {
+                flags: move_flags::SWIMMING,
+                ..Default::default()
+            });
+        }
+        app.update();
+        assert_eq!(gait(&app, swimmer), Some(0), "state 26 stands in the water");
+        assert_eq!(gait(&app, bare), Some(41), "no state: the swim idle");
+
+        app.world_mut().entity_mut(swimmer).insert(MovementState {
+            speed: 4.7,
+            flags: move_flags::SWIMMING | move_flags::FORWARD,
+            ..Default::default()
+        });
+        app.update();
+        assert_eq!(gait(&app, swimmer), Some(42), "moving, it swims");
+    }
+}
+
+/// The emote player's armed-id test (`0x5fcd56`, `0x5fdb50`): an id already running on bone 0 is
+/// not played again, whether it is the gait clip or an earlier one-shot; a different id is, and a
+/// kit anim (`0x5fe2f0` directly) takes no such test.
+#[test]
+fn the_emote_player_skips_an_id_already_armed_but_plays_a_different_one() {
+    use bevy::animation::graph::{AnimationGraph, AnimationGraphHandle};
+    use bevy::animation::AnimationClip;
+
+    let mut app = app();
+    let mut asset = |secs: f32| {
+        let mut c = AnimationClip::default();
+        c.set_duration(secs);
+        app.world_mut()
+            .resource_mut::<Assets<AnimationClip>>()
+            .add(c)
+    };
+    let (stand, dance, wave) = (asset(10.0), asset(10.0), asset(10.0));
+    let (graph, nodes) = AnimationGraph::from_clips([stand, dance, wave]);
+    let graph_handle = app
+        .world_mut()
+        .resource_mut::<Assets<AnimationGraph>>()
+        .add(graph);
+    let mut clips = vec![clip(0, 0, true), clip(69, 0, true), clip(67, 0, false)];
+    for (c, n) in clips.iter_mut().zip(nodes.iter().copied()) {
+        c.node = n;
+        c.duration = 10.0;
+    }
+    let unit = app
+        .world_mut()
+        .spawn((
+            ModelAnimations {
+                graph: graph_handle.clone(),
+                clips,
+                hand_close: [None, None],
+                playable_animation_lookup: Vec::new(),
+                animation_lookup: Vec::new(),
+                global_bones: Vec::new(),
+                first_seq: None,
+                pose: Default::default(),
+            },
+            AnimationPlayer::default(),
+            AnimationTransitions::new(),
+            AnimationGraphHandle(graph_handle),
+            AnimDriver::default(),
+        ))
+        .id();
+    app.update(); // settle: Stand holds bone 0
+    let play = |app: &mut App, anim_id: u16, via_player: bool| {
+        app.world_mut().write_message(EmoteAnim {
+            entity: unit,
+            anim_id,
+            seq: 1,
+            via_player,
+        });
+        advance(app, 500);
+    };
+    let swing = |app: &App| match app.world().entity(unit).get::<AnimDriver>().unwrap().mode {
+        super::super::select::Mode::Swing { id, .. } => Some(id),
+        _ => None,
+    };
+    let time = |app: &App, node| {
+        app.world()
+            .entity(unit)
+            .get::<AnimationPlayer>()
+            .unwrap()
+            .animation(node)
+            .map(|a| a.seek_time())
+    };
+
+    // The gait's own id over itself: nothing arms.
+    play(&mut app, 0, true);
+    assert_eq!(swing(&app), None, "Stand over Stand is skipped");
+    // A kit anim has no such test: it arms the same id.
+    play(&mut app, 0, false);
+    assert_eq!(swing(&app), Some(0), "a kit anim is not skipped");
+    // A different id arms and runs.
+    play(&mut app, 69, true);
+    assert_eq!(swing(&app), Some(69), "a different id plays");
+    let t = time(&app, nodes[1]).expect("armed");
+    assert!(t > 0.4, "the dance has run since its arm: {t}");
+    // The same id over itself does not restart: its clip time keeps advancing.
+    play(&mut app, 69, true);
+    let t2 = time(&app, nodes[1]).expect("armed");
+    assert!(t2 > t, "the dance kept advancing, {t} then {t2}");
+    // A different id replaces it.
+    play(&mut app, 67, true);
+    assert_eq!(swing(&app), Some(67));
+}
diff --git a/crates/benilla-app/src/creature_anim/emote_anim.rs b/crates/benilla-app/src/creature_anim/emote_anim.rs
index 251bca99..39692544 100644
--- a/crates/benilla-app/src/creature_anim/emote_anim.rs
+++ b/crates/benilla-app/src/creature_anim/emote_anim.rs
@@ -13,7 +13,7 @@ use bevy::prelude::*;
 use crate::net::{EmoteKind, EmoteMessage, ObjectStore, RemoteMotion};
 use crate::sound::EmoteSounds;
 
-use super::{move_flags, EmoteAnim, Engaged, MovementState};
+use super::{move_flags, select, EmoteAnim, Engaged, MovementState};
 
 /// The performer's gate inputs: stand state, move flags (`MovementState` for us, `RemoteMotion`
 /// for a remote player; a creature's spline carries no swim bit) and the [`Engaged`] marker.
@@ -45,7 +45,7 @@ pub(super) fn emote_to_anim(
         };
         let (store, movement, remote, engaged) =
             units.get(entity).unwrap_or((None, None, None, false));
-        if !play_eligible(store, movement, remote, engaged) {
+        if !play_eligible(store, movement, remote, engaged, anim_id) {
             debug!("emote_anim: suppressed anim {anim_id} for {entity:?}");
             continue;
         }
@@ -53,6 +53,7 @@ pub(super) fn emote_to_anim(
             entity,
             anim_id: anim_id as u16,
             seq: play_seq.next(),
+            via_player: true,
         });
     }
 }
@@ -65,10 +66,13 @@ pub(super) fn receive_eligible(stand_state: u8, swimming: bool) -> bool {
 }
 
 /// The shared player's half, `0x5fcd20`: no play while channeling (`0x5fcd83`) or in combat
-/// (`0x5fcd9d`). Its already-armed test (`0x5fcd5d`) is the driver's same-id dedup, and its
-/// `[+0xd58] & 0x400` test (`0x5fcd8e`) reads an anim-state bit with no counterpart here.
-fn player_eligible(channeling: bool, in_combat: bool) -> bool {
-    !channeling && !in_combat
+/// (`0x5fcd9d`), and LiftOff (192) and Land (200) skip the combat test alone (`0x5fcd5f`/`0x5fcd67`
+/// set the flag that `0x5fcd90` branches past `0x60ecd0` on; the channel test at `0x5fcd83` runs
+/// first). Its already-armed test (`0x5fcd5d`) is the driver's `armed_id`, and its
+/// `[+0xd58] & 0x400` test (`0x5fcd8e`, the weapon-visual hold) is [`super::RangedHold`].
+fn player_eligible(anim_id: u32, channeling: bool, in_combat: bool) -> bool {
+    let exempt = anim_id == u32::from(select::LIFT_OFF) || anim_id == u32::from(select::LAND);
+    !channeling && (exempt || !in_combat)
 }
 
 /// The whole gate for one unit, as both producers call it; `engaged` stands for the client's
@@ -78,6 +82,7 @@ pub(super) fn play_eligible(
     movement: Option<&MovementState>,
     remote: Option<&RemoteMotion>,
     engaged: bool,
+    anim_id: u32,
 ) -> bool {
     let fields = store.map(|s| &s.0);
     let stand_state = fields.map_or(0, |f| f.unit_stand_state());
@@ -89,7 +94,53 @@ pub(super) fn play_eligible(
         != 0;
     let channeling = fields.is_some_and(|f| f.unit_channel_spell() != 0);
     let in_combat = engaged || fields.is_some_and(|f| f.unit_flags() & UNIT_FLAGS_COMBAT_BIT != 0);
-    receive_eligible(stand_state, swimming) && player_eligible(channeling, in_combat)
+    receive_eligible(stand_state, swimming) && player_eligible(anim_id, channeling, in_combat)
+}
+
+/// Our own unit's inputs to `DoEmote`'s local-play gate `0x5fd680`.
+#[derive(Clone, Copy, Default)]
+pub(crate) struct LocalPlay {
+    /// The shared dead test `0x605f90`: health 0, `UNIT_DYNFLAG_DEAD` or stand state 7.
+    pub(crate) reads_dead: bool,
+    pub(crate) stand_state: u8,
+    pub(crate) move_flags: u32,
+    pub(crate) vertical_speed: f32,
+    /// On a flying server spline (a taxi), which exempts the turn-shuffle test (`0x5fce47`).
+    pub(crate) flying: bool,
+    /// The loot-kneel latch with its kneeling target (`0x6126b0` and `0x612710`).
+    pub(crate) loot_kneel: bool,
+    pub(crate) channeling: bool,
+    /// The auto-attack target `[+0xc48]` alone (`0x60ecb0`), not the combat flag bit.
+    pub(crate) engaged: bool,
+}
+
+/// Move flags that void the turn-shuffle test: HOVER, SWIMMING and `0x800` (`0x5fce5d`).
+const SHUFFLE_VOID: u32 = move_flags::HOVER | move_flags::SWIMMING | 0x800;
+
+/// `0x5fd680`, the gate on `DoEmote`'s local play (`0x5ef660`, then `0x5fe2f0` at `0x5ef66f`): the emote plays at once only while
+/// a direction key is held, and every other case waits for the server's `SMSG_EMOTE`. It refuses
+/// the dead (`0x605f90`), a unit both jumping and falling far (`0x5fd6a9`), a jump with vertical
+/// speed (`0x5fd6c5`), a kneeling looter (`0x5fd6e7`), a channel (`0x5fd701`), an auto-attack
+/// target (`0x5fd721`), a turn shuffle (`0x5fd72c`, approximated) and any stand state but 0 (`0x5fd74d`, and
+/// the cached `[+0xc1c]` at `0x5fd757`, which tracks it). The `[+0xd58]` test at `0x5fd711` refuses
+/// only when both 0x400 ([`super::RangedHold`]) and 0x10000 (unmodelled) are set, and so is not
+/// tested here; the turn-shuffle test approximates `0x5fce30`, which also exempts on the armed id,
+/// exempts on `d58 & 0xc` and fires on the mouse-turn latch `d58 & 0x1800`. The ranged auto-repeat
+/// test (`0x5fd735`)
+/// needs sheath state 2, which the stow `DoEmote` runs first (`0x611cf0(0)`) has cleared.
+pub(crate) fn local_play_eligible(i: &LocalPlay) -> bool {
+    let f = i.move_flags;
+    let turning = f & (move_flags::TURN_LEFT | move_flags::TURN_RIGHT) != 0;
+    let shuffling = turning && !i.flying && f & SHUFFLE_VOID == 0;
+    !i.reads_dead
+        && !(f & move_flags::FALLING != 0 && f & move_flags::FALLING_FAR != 0)
+        && (f & move_flags::FALLING == 0 || i.vertical_speed == 0.0)
+        && f & move_flags::ANY_MOVE != 0
+        && !i.loot_kneel
+        && !i.channeling
+        && !i.engaged
+        && !shuffling
+        && i.stand_state == 0
 }
 
 /// The flag half of the in-combat test `0x60ecd0` (`UNIT_FIELD_FLAGS` bit 11); the other half is
@@ -132,11 +183,24 @@ mod tests {
     #[test]
     fn channeling_or_combat_suppresses_the_play() {
         assert!(
-            player_eligible(false, false),
+            player_eligible(66, false, false),
             "idle and out of combat plays"
         );
-        assert!(!player_eligible(true, false), "channeling suppresses");
-        assert!(!player_eligible(false, true), "in combat suppresses");
+        assert!(!player_eligible(66, true, false), "channeling suppresses");
+        assert!(!player_eligible(66, false, true), "in combat suppresses");
+    }
+
+    /// `0x5fcd5f`/`0x5fcd67`: LiftOff (192) and Land (200) skip the combat test, not the channel.
+    #[test]
+    fn lift_off_and_land_play_in_combat_but_not_while_channeling() {
+        assert!(player_eligible(192, false, true), "LiftOff in combat");
+        assert!(player_eligible(200, false, true), "Land in combat");
+        assert!(!player_eligible(66, false, true), "any other id refuses");
+        assert!(!player_eligible(193, false, true), "the neighbours refuse");
+        assert!(
+            !player_eligible(192, true, true),
+            "channeling still refuses"
+        );
     }
 
     /// The attack-target half of `0x60ecd0` (`[+0xc48]`, from ATTACKSTART to ATTACKSTOP) refuses
@@ -144,10 +208,114 @@ mod tests {
     #[test]
     fn an_engaged_unit_refuses_the_play_without_the_flag_bit() {
         assert!(
-            play_eligible(None, None, None, false),
+            play_eligible(None, None, None, false, 66),
             "idle, no store: plays"
         );
-        assert!(!play_eligible(None, None, None, true), "engaged: refused");
+        assert!(
+            !play_eligible(None, None, None, true, 66),
+            "engaged: refused"
+        );
+        assert!(
+            play_eligible(None, None, None, true, 192),
+            "engaged LiftOff"
+        );
+        assert!(play_eligible(None, None, None, true, 200), "engaged Land");
+    }
+
+    fn moving() -> LocalPlay {
+        LocalPlay {
+            move_flags: move_flags::FORWARD,
+            ..Default::default()
+        }
+    }
+
+    #[test]
+    fn a_local_emote_plays_only_while_a_direction_key_is_held() {
+        assert!(local_play_eligible(&moving()));
+        for dir in [
+            move_flags::BACKWARD,
+            move_flags::STRAFE_LEFT,
+            move_flags::STRAFE_RIGHT,
+        ] {
+            let i = LocalPlay {
+                move_flags: dir,
+                ..moving()
+            };
+            assert!(local_play_eligible(&i), "{dir:#x}");
+        }
+        assert!(
+            !local_play_eligible(&LocalPlay::default()),
+            "standing still"
+        );
+        let turn_only = LocalPlay {
+            move_flags: move_flags::TURN_LEFT,
+            ..Default::default()
+        };
+        assert!(!local_play_eligible(&turn_only), "turning in place");
+    }
+
+    #[test]
+    fn each_local_play_gate_refuses_on_its_own() {
+        let base = moving();
+        let refused = [
+            LocalPlay {
+                reads_dead: true,
+                ..base
+            },
+            LocalPlay {
+                stand_state: 1,
+                ..base
+            },
+            LocalPlay {
+                loot_kneel: true,
+                ..base
+            },
+            LocalPlay {
+                channeling: true,
+                ..base
+            },
+            LocalPlay {
+                engaged: true,
+                ..base
+            },
+            // Both jumping and falling far.
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::FALLING | move_flags::FALLING_FAR,
+                ..base
+            },
+            // A jump still rising.
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::FALLING,
+                vertical_speed: 3.0,
+                ..base
+            },
+            // Turning while moving is a turn shuffle.
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::TURN_RIGHT,
+                ..base
+            },
+        ];
+        for (n, i) in refused.iter().enumerate() {
+            assert!(!local_play_eligible(i), "case {n}");
+        }
+        // A jump whose vertical speed reads exactly 0.0 (a step-off fall's first tick), and a turn while swimming or on a flying spline, pass.
+        for i in [
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::FALLING,
+                ..base
+            },
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::TURN_RIGHT | move_flags::SWIMMING,
+                ..base
+            },
+            LocalPlay {
+                move_flags: move_flags::FORWARD | move_flags::TURN_RIGHT,
+                flying: true,
+                ..base
+            },
+        ] {
+            assert!(local_play_eligible(&i));
+        }
     }
 
     #[test]
diff --git a/crates/benilla-app/src/creature_anim/gesture.rs b/crates/benilla-app/src/creature_anim/gesture.rs
index b14979b9..cc56a16a 100644
--- a/crates/benilla-app/src/creature_anim/gesture.rs
+++ b/crates/benilla-app/src/creature_anim/gesture.rs
@@ -114,7 +114,7 @@ pub(super) fn drive_gestures(
         };
         let (store, movement, remote, engaged) =
             units.get(entity).unwrap_or((None, None, None, false));
-        if !super::emote_anim::play_eligible(store, movement, remote, engaged) {
+        if !super::emote_anim::play_eligible(store, movement, remote, engaged, anim_id) {
             debug!("gesture: {gesture:?} suppressed for {entity:?}");
             continue;
         }
@@ -122,6 +122,7 @@ pub(super) fn drive_gestures(
             entity,
             anim_id: anim_id as u16,
             seq: play_seq.next(),
+            via_player: true,
         });
     }
 }
diff --git a/crates/benilla-app/src/creature_anim/net.rs b/crates/benilla-app/src/creature_anim/net.rs
index dcd1173e..93076de8 100644
--- a/crates/benilla-app/src/creature_anim/net.rs
+++ b/crates/benilla-app/src/creature_anim/net.rs
@@ -333,6 +333,7 @@ fn text_emote(
     chat_log: &mut crate::ui_chat::ChatLog,
 ) {
     out.write(EmoteMessage {
+        guid,
         source: index.0.get(&guid).copied(),
         kind: EmoteKind::Text(text_emote),
     });
@@ -342,6 +343,7 @@ fn text_emote(
 /// `SMSG_EMOTE`: an `Emotes.dbc` id to play on a unit (NPC scripts, a `/`-emote's animation).
 fn emote(guid: u64, emote_id: u32, index: &GuidIndex, out: &mut MessageWriter<EmoteMessage>) {
     out.write(EmoteMessage {
+        guid,
         source: index.0.get(&guid).copied(),
         kind: EmoteKind::Anim(emote_id),
     });
diff --git a/crates/benilla-app/src/creature_anim/select.rs b/crates/benilla-app/src/creature_anim/select.rs
index 80bc35ae..2c35e9d9 100644
--- a/crates/benilla-app/src/creature_anim/select.rs
+++ b/crates/benilla-app/src/creature_anim/select.rs
@@ -281,17 +281,82 @@ pub(super) enum Mode {
 
 /// The ids a unit in [`Mode::Gait`] tries, most specific first: the `0x5fd8b0` chain without its
 /// Special states. `ready` is the engaged idle, which locomotion outranks.
+///
+/// The pick without a state emote, which [`base_candidates`] adds.
 pub(super) fn gait_candidates(
     state: &MovementState,
     walk_speed: f32,
     ready: Option<u16>,
     ranged_load: Option<u16>,
 ) -> &'static [u16] {
+    claimed_candidates(state, walk_speed, ready, ranged_load)
+        .unwrap_or_else(|| idle_fallback(state))
+}
+
+/// What the base picks: a fixed candidate list, or the unit's emote state's loop, Stand behind it.
+pub(super) enum BaseCands {
+    Fixed(&'static [u16]),
+    State([u16; 2]),
+}
+
+impl BaseCands {
+    pub(super) fn as_slice(&self) -> &[u16] {
+        match self {
+            Self::Fixed(c) => c,
+            Self::State(c) => c,
+        }
+    }
+}
+
+/// The full pick of the `0x5fd8b0` chain in its byte order: the resolvers [`claimed_candidates`]
+/// covers, then the state-emote resolver (`0x5fd770`, `0x5fd9a1`), then the idle fallback
+/// (`0x5fd830`). `state_anim` is the resolver's verdict ([`state_emote_anim`]); a set state claims
+/// the base over the swim idle, the prowl idle and Stand, so `/stand`'s state 26 holds Stand
+/// against both until the unit moves.
+pub(super) fn base_candidates(
+    state: &MovementState,
+    walk_speed: f32,
+    ready: Option<u16>,
+    ranged_load: Option<u16>,
+    state_anim: Option<u16>,
+) -> BaseCands {
+    if let Some(c) = claimed_candidates(state, walk_speed, ready, ranged_load) {
+        return BaseCands::Fixed(c);
+    }
+    match state_anim {
+        Some(anim) => BaseCands::State([anim, STAND]),
+        None => BaseCands::Fixed(idle_fallback(state)),
+    }
+}
+
+/// The idle fallback (`0x5fd830`), the chain's last resolver: the swim idle on `SWIMMING`
+/// (`0x5fd83c`, `[9e8] & 0x200000`), else the prowl idle, else Stand. The hover idle (193,
+/// `0x5fd88d`) is not modelled.
+fn idle_fallback(state: &MovementState) -> &'static [u16] {
+    if state.flags & move_flags::SWIMMING != 0 {
+        &[41, 0]
+    } else if state.stealthed {
+        &[STEALTH_STAND, STAND]
+    } else {
+        &[STAND]
+    }
+}
+
+/// The resolvers ahead of the state-emote resolver, `None` where none claims the base. The
+/// locomotion resolver (`0x5fd100`) runs on `[9e8] & 0xf` alone, so a stationary swimmer is not
+/// its: it falls through the standing resolvers to the swim idle in [`idle_fallback`].
+fn claimed_candidates(
+    state: &MovementState,
+    walk_speed: f32,
+    ready: Option<u16>,
+    ranged_load: Option<u16>,
+) -> Option<&'static [u16]> {
     use move_flags::*;
     let f = state.flags;
-    // Swimming (`0x5fd100`): turn, then strafe, then backward, then forward.
-    if f & SWIMMING != 0 {
-        return if f & (TURN_LEFT | TURN_RIGHT) != 0 {
+    let swimming = f & SWIMMING != 0;
+    // Swimming locomotion (`0x5fd100`): turn, then strafe, then backward, then forward.
+    if swimming && f & ANY_MOVE != 0 {
+        return Some(if f & (TURN_LEFT | TURN_RIGHT) != 0 {
             &[41, 0]
         } else if f & STRAFE_LEFT != 0 {
             &[43, 42, 41, 0]
@@ -299,57 +364,58 @@ pub(super) fn gait_candidates(
             &[44, 42, 41, 0]
         } else if f & BACKWARD != 0 {
             &[45, 41, 0]
-        } else if f & FORWARD != 0 {
-            &[42, 41, 0]
         } else {
-            &[41, 0]
-        };
+            &[42, 41, 0]
+        });
     }
     // A flying spline, the taxi (`0x5fd19c`): Fly 135 ahead of backward and speed.
     if state.flying {
-        return &[135, 0];
+        return Some(&[135, 0]);
     }
     // Backward dominates strafe (`0x5fd1bc`, `[9e8] & 2` → WalkBackwards 13).
     if f & BACKWARD != 0 {
-        return &[13, 4, 0];
+        return Some(&[13, 4, 0]);
     }
     // Stealthed and moving, the prowl (`0x5fd1d3`); Walk is row 119's AnimationData fallback.
     if state.stealthed && f & ANY_MOVE != 0 {
-        return &[STEALTH_WALK, 4, 0];
+        return Some(&[STEALTH_WALK, 4, 0]);
     }
     // Ground gaits by live speed (`0x5fd202`/`0x5fd224`): Sprint at 11 and above, Run above twice
     // walk, else Walk. Strafe takes these too: the reference has no ground strafe branch.
     if f & ANY_MOVE != 0 {
         let s = state.speed;
-        return if s >= FAST_RUN_SPEED {
+        return Some(if s >= FAST_RUN_SPEED {
             &[143, 5, 4, 0]
         } else if s > 2.0 * walk_speed {
             &[5, 4, 0]
         } else {
             &[4, 0]
-        };
+        });
     }
-    // Turning in place: the shuffle (`0x5fd3f0`, 11 left, 12 right).
-    if f & TURN_LEFT != 0 {
-        return &[SHUFFLE_LEFT, STAND];
+    // Turning in place: the shuffle (`0x5fd3f0`, 11 left, 12 right); the fidget gate (`0x5fce30`)
+    // refuses a swimmer.
+    if !swimming && f & TURN_LEFT != 0 {
+        return Some(&[SHUFFLE_LEFT, STAND]);
     }
-    if f & TURN_RIGHT != 0 {
-        return &[SHUFFLE_RIGHT, STAND];
+    if !swimming && f & TURN_RIGHT != 0 {
+        return Some(&[SHUFFLE_RIGHT, STAND]);
     }
-    // Standing and engaged: the Ready idle (`0x5fd360`), gated on engagement, not the sheath.
+    // Standing and engaged: the Ready idle (`0x5fd360`), gated on engagement, not the sheath; a
+    // swimmer's is the swim idle (`0x5fd3ac`).
     if let Some(r) = ready {
-        return match r {
+        return Some(match r {
+            _ if swimming => &[41, 0],
             26 => &[26, 25, 0],
             27 => &[27, 25, 0],
             28 => &[28, 25, 0],
             _ => &[25, 0],
-        };
+        });
     }
     // Auto-repeat in the ranged stance (`0x5fd460`), ahead of the chair loops (`0x5fd550`).
     if let Some(l) = ranged_load {
         // A finished Load becomes its Hold through the completion dispatch (`0x5fc3f0`, fired at
         // `0x7075af`); each Hold falls back to its Load, so a model without it holds full draw.
-        return match l {
+        return Some(match l {
             105 => &[105, 25, 0],
             106 => &[106, 25, 0],
             109 => &[109, 105, 25, 0],
@@ -357,16 +423,15 @@ pub(super) fn gait_candidates(
             111 => &[111, 25, 0],
             112 => &[112, 25, 0],
             _ => &[25, 0],
-        };
+        });
     }
-    // Standing: a chair loop (4/5/6), else the prowl idle, else Stand; state 2 (`SIT_CHAIR`)
-    // writes no override in the reference (its row declines, `0x5fd644`), so it stands.
+    // Standing: a chair loop (4/5/6); state 2 (`SIT_CHAIR`) writes no override in the reference
+    // (its row declines, `0x5fd644`), so it falls through.
     match state.stand_state {
-        4 => &[102, 0],
-        5 => &[103, 0],
-        6 => &[104, 0],
-        _ if state.stealthed => &[STEALTH_STAND, STAND],
-        _ => &[STAND],
+        4 => Some(&[102, 0]),
+        5 => Some(&[103, 0]),
+        6 => Some(&[104, 0]),
+        _ => None,
     }
 }
 
@@ -453,16 +518,21 @@ pub(super) fn is_cast_anim(id: u16) -> bool {
     matches!(id, 2 | 32 | 33 | 53 | 54)
 }
 
-/// Whether `cands` is bare Stand, the one slot the state-emote idle (`UNIT_NPC_EMOTESTATE`) may
-/// fill. The prowl idle counts as bare: the reference's emote-state resolver (`0x5fd770`) runs
-/// before the fallback idle (`0x5fd830`) that picks it.
-pub(super) fn is_bare_stand(cands: &[u16]) -> bool {
-    cands == [STAND] || cands == [STEALTH_STAND, STAND]
-}
-
-/// The state-emote idle's candidates, Stand as the fallback; only for a bare-Stand frame.
-pub(super) fn state_emote_gait(emote_anim: u16) -> [u16; 2] {
-    [emote_anim, STAND]
+/// The state-emote resolver's verdict (`0x5fd770`): the row's `AnimID` for the unit's
+/// `UNIT_NPC_EMOTESTATE`, `None` when it passes over. A state with no row passes over, a row
+/// whose `AnimID` is 0 claims the base for Stand (`0x5fd816` stores `row+8` as it is), and the
+/// current interact NPC passes over a row whose `EmoteFlags` carry `EMOTE_FLAG_INTERACTION`
+/// (`0x5fd7e2`-`0x5fd7fd`), so a vendor stops hammering while his window is open.
+pub(super) fn state_emote_anim(
+    state: u32,
+    anim: Option<u32>,
+    flags: Option<u32>,
+    interacting: bool,
+) -> Option<u16> {
+    if state == 0 || (interacting && flags? & benilla_formats::EMOTE_FLAG_INTERACTION != 0) {
+        return None;
+    }
+    anim.map(|a| a as u16)
 }
 
 /// The mainhand swing id (`0x6246a0`); anything but an equipped melee weapon swings unarmed (16).
@@ -630,11 +700,33 @@ pub(super) enum OneShotRoute {
     FullBody,
 }
 
-/// The CLASS_A set (`0x5fed90`), the only ids that may mask; its ranges' interior is inferred,
-/// but only swings, emotes and casts reach [`route_oneshot`].
+/// The CLASS_A set (`0x5fed90`'s byte table over `id - 2`), the only ids that may play on the
+/// key bone; every other id plays full-body.
 fn is_class_a(id: u16) -> bool {
     matches!(id,
-        2 | 8..=10 | 14..=36 | 46..=49 | 51..=90 | 105..=113 | 117..=118 | 122..=138 | 185..=186 | 195)
+        2 | 8..=10 | 14..=36 | 46..=49 | 51..=74 | 76..=78 | 80..=90 | 105..=113 | 117 | 118
+        | 122..=125 | 128..=130 | 133 | 134 | 136..=138 | 185 | 186 | 195)
+}
+
+/// The mount-set (`0x5fec80`'s byte table), the ids a mounted rider's request sends to the mount
+/// model.
+fn is_mount_set(id: u16) -> bool {
+    matches!(id, 0 | 1 | 3..=6 | 8..=13 | 37..=45 | 92..=95 | 119 | 120 | 127 | 131 | 132 | 135 | 143 | 187)
+}
+
+/// Where a request goes while the unit has a mount model (`0x5fe7b5`..`0x5fe803`): a mount-set id
+/// to the mount, a CLASS_A id to the rider's key bone (8-10 are both), anything else nowhere.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(super) struct MountedRoute {
+    pub(super) mount: bool,
+    pub(super) rider_upper: bool,
+}
+
+pub(super) fn route_mounted(id: u16) -> MountedRoute {
+    MountedRoute {
+        mount: is_mount_set(id),
+        rider_upper: is_class_a(id),
+    }
 }
 
 /// The COMBAT set (`0x5fcc10`), the ids an airborne unit masks: every swing, no emote and no
@@ -649,10 +741,17 @@ fn is_forced_full_body(id: u16) -> bool {
     matches!(id, 1 | 6 | 131 | 132 | 57 | 58 | 118)
 }
 
-/// Route a one-shot by live state (`0x5fe6c8`..`0x5fe74d`): masked while the lower body is
+/// EmoteEat, the `/eat` and `/drink` loop.
+const EMOTE_EAT: u16 = 61;
+
+/// Route an unmounted one-shot by live state (`0x5fe6c8`..`0x5fe74d`): masked while the lower body is
 /// committed (moving, turning, swimming, a non-zero stand state, or a COMBAT id airborne), else
 /// full-body, so one Attack1H is full-body standing and masked running.
 pub(super) fn route_oneshot(id: u16, flags: u32, stand_state: u8) -> OneShotRoute {
+    // EmoteEat (61) unmounted always takes the key bone, whatever the state (`0x5fe834`).
+    if id == EMOTE_EAT {
+        return OneShotRoute::Masked;
+    }
     if is_forced_full_body(id) || !is_class_a(id) {
         return OneShotRoute::FullBody;
     }
@@ -705,7 +804,7 @@ pub(super) fn scaled_rate(clip: &AnimClip, speed: f32, model_scale: f32) -> Opti
 /// remote's relayed flags ([`RemoteMotion`]), a creature's spline, else still.
 /// `creature_swimming` supplies the `SWIMMING` the wire never sends for a creature; `modes`, the
 /// `SMSG_SPLINE_MOVE_*` grants, join the remote and creature flags (one word in the reference).
-pub(super) fn unify(
+pub(crate) fn unify(
     movement: Option<&MovementState>,
     remote: Option<&RemoteMotion>,
     spline: Option<&Spline>,
diff --git a/crates/benilla-app/src/creature_anim/select/tests.rs b/crates/benilla-app/src/creature_anim/select/tests.rs
index fbe71543..6c45596e 100644
--- a/crates/benilla-app/src/creature_anim/select/tests.rs
+++ b/crates/benilla-app/src/creature_anim/select/tests.rs
@@ -472,13 +472,11 @@ fn ranged_load_idle_selects_by_weapon_and_ranks_below_ready() {
         gait_candidates(&moving_forward(3.0), 2.5, None, Some(105))[0],
         4
     );
-    // It takes the bare-Stand slot, so it also blocks the state-emote idle.
-    assert!(!is_bare_stand(gait_candidates(
-        &standing,
-        2.5,
-        None,
-        Some(105)
-    )));
+    // It outranks the state-emote resolver (`0x5fd460` runs before `0x5fd770`).
+    assert_eq!(
+        base_candidates(&standing, 2.5, None, Some(105), Some(234)).as_slice(),
+        &[105, 25, 0]
+    );
 }
 
 /// `0x5fd460` claims the drawn ranged idle ([`ranged_idle_gate`]) on the ranged sheath
@@ -510,46 +508,85 @@ fn each_ranged_load_promotes_to_its_weapon_familys_hold() {
     assert_eq!(ranged_hold_anim(46), 46); // a fire id is no Load and maps onto no hold
 }
 
+/// The state-emote resolver (`0x5fd770`) runs right after the chair loops and before the idle
+/// fallback (`0x5fd830`, `0x5fd9a1`): a set state outranks the swim idle, the prowl idle and
+/// Stand, and everything ahead of it outranks the state.
 #[test]
-fn state_emote_idle_only_fills_the_bare_stand_slot() {
-    assert!(is_bare_stand(gait_candidates(
-        &MovementState::default(),
-        2.5,
-        None,
-        None
-    )));
-    assert_eq!(state_emote_gait(200), [200, STAND]);
-
-    assert!(!is_bare_stand(gait_candidates(
-        &moving_forward(3.0),
-        2.5,
-        None,
-        None
-    )));
-    let turning = MovementState {
-        flags: move_flags::TURN_LEFT,
-        ..Default::default()
+fn a_set_state_outranks_the_idle_fallbacks_and_nothing_before_them() {
+    let claimed = |state: &MovementState, ready, ranged, anim| {
+        base_candidates(state, 2.5, ready, ranged, anim)
+            .as_slice()
+            .to_vec()
     };
-    assert!(!is_bare_stand(gait_candidates(&turning, 2.5, None, None)));
+    let still = MovementState::default();
+    assert_eq!(claimed(&still, None, None, Some(234)), [234, STAND]);
+    assert_eq!(claimed(&still, None, None, None), [STAND]);
+
+    // Behind it: the swim idle (`/stand`, state 26, plays AnimID 0) and the prowl idle.
     let swimming = MovementState {
         flags: move_flags::SWIMMING,
         ..Default::default()
     };
-    assert!(!is_bare_stand(gait_candidates(&swimming, 2.5, None, None)));
-    assert!(!is_bare_stand(gait_candidates(
-        &MovementState::default(),
-        2.5,
-        Some(26),
-        None
-    )));
-    // The chair stand states 4, 5 and 6 have their own slot, above bare Stand.
-    for stand_state in [4, 5, 6] {
-        let chair = MovementState {
-            stand_state,
-            ..Default::default()
-        };
-        assert!(!is_bare_stand(gait_candidates(&chair, 2.5, None, None)));
-    }
+    assert_eq!(claimed(&swimming, None, None, None), [41, 0]);
+    assert_eq!(claimed(&swimming, None, None, Some(0)), [0, STAND]);
+    assert_eq!(claimed(&swimming, None, None, Some(234)), [234, STAND]);
+    let prowling = MovementState {
+        stealthed: true,
+        ..Default::default()
+    };
+    assert_eq!(claimed(&prowling, None, None, None), [STEALTH_STAND, STAND]);
+    assert_eq!(claimed(&prowling, None, None, Some(234)), [234, STAND]);
+
+    // Ahead of it: locomotion (`0x5fd100`), swimming included, runs on the move bits alone.
+    let swim_forward = MovementState {
+        flags: move_flags::SWIMMING | move_flags::FORWARD,
+        ..Default::default()
+    };
+    assert_eq!(claimed(&swim_forward, None, None, Some(234)), [42, 41, 0]);
+    assert_eq!(claimed(&moving_forward(3.0), None, None, Some(234)), [4, 0]);
+    // The turn shuffle, the Ready idle (a swimmer's is the swim idle), the ranged idle and the
+    // chair loops all come first.
+    let turning = MovementState {
+        flags: move_flags::TURN_LEFT,
+        ..Default::default()
+    };
+    assert_eq!(claimed(&turning, None, None, Some(234)), [11, 0]);
+    assert_eq!(claimed(&still, Some(26), None, Some(234)), [26, 25, 0]);
+    assert_eq!(claimed(&swimming, Some(26), None, Some(234)), [41, 0]);
+    assert_eq!(claimed(&still, None, Some(105), Some(234)), [105, 25, 0]);
+    // `0x5fd460` has no swim gate: a swimmer takes it too.
+    assert_eq!(claimed(&swimming, None, Some(105), Some(234)), [105, 25, 0]);
+    let chair = MovementState {
+        stand_state: 4,
+        ..Default::default()
+    };
+    assert_eq!(claimed(&chair, None, None, Some(234)), [102, 0]);
+    // A turning swimmer is no shuffle (`0x5fce30` refuses `SWIMMING`) and no mover: the state.
+    let swim_turning = MovementState {
+        flags: move_flags::SWIMMING | move_flags::TURN_LEFT,
+        ..Default::default()
+    };
+    assert_eq!(claimed(&swim_turning, None, None, Some(234)), [234, STAND]);
+    assert_eq!(claimed(&swim_turning, None, None, None), [41, 0]);
+}
+
+/// The resolver's verdict: a row's `AnimID` is taken as it is, 0 included (`0x5fd816`); a missing
+/// row or no state passes over; the interact NPC passes over a row with `0x2000`.
+#[test]
+fn the_state_resolver_claims_a_row_even_when_its_anim_is_stand() {
+    assert_eq!(state_emote_anim(26, Some(0), Some(0), false), Some(0));
+    assert_eq!(
+        state_emote_anim(28, Some(234), Some(0x2000), false),
+        Some(234)
+    );
+    assert_eq!(state_emote_anim(28, Some(234), Some(0x2000), true), None);
+    assert_eq!(state_emote_anim(29, Some(235), Some(0), true), Some(235));
+    assert_eq!(state_emote_anim(30, None, None, false), None, "no row");
+    assert_eq!(
+        state_emote_anim(0, Some(0), Some(0), false),
+        None,
+        "no state"
+    );
 }
 
 // ── The per-play one-shot route ──
@@ -631,8 +668,36 @@ fn route_classifier_memberships_are_the_decoded_bytes() {
     for id in [16, 17, 18, 19, 85, 87, 88, 117] {
         assert!(is_combat(id) && is_class_a(id), "swing {id}");
     }
-    for id in [17, 66, 68, 80] {
-        assert!(is_class_a(id), "class-A {id}");
+    // The whole table, member and non-member alike, from the decoded bytes of `0x5fed90`.
+    let class_a: Vec<u16> = [2, 8, 9, 10, 14, 15]
+        .into_iter()
+        .chain(16..=36)
+        .chain(46..=49)
+        .chain(51..=74)
+        .chain(76..=78)
+        .chain(80..=90)
+        .chain(105..=113)
+        .chain([117, 118])
+        .chain(122..=125)
+        .chain(128..=130)
+        .chain([133, 134])
+        .chain(136..=138)
+        .chain([185, 186, 195])
+        .collect();
+    for id in 0..=300u16 {
+        assert_eq!(is_class_a(id), class_a.contains(&id), "CLASS_A {id}");
+    }
+    // The mount-set, `0x5fec80`.
+    let mount: Vec<u16> = [0, 1]
+        .into_iter()
+        .chain(3..=6)
+        .chain(8..=13)
+        .chain(37..=45)
+        .chain(92..=95)
+        .chain([119, 120, 127, 131, 132, 135, 143, 187])
+        .collect();
+    for id in 0..=300u16 {
+        assert_eq!(is_mount_set(id), mount.contains(&id), "mount-set {id}");
     }
     // Forced-full-body carve-outs never mask, even seated.
     for id in [1, 6, 131, 132, 57, 58, 118] {
@@ -640,6 +705,34 @@ fn route_classifier_memberships_are_the_decoded_bytes() {
     }
 }
 
+#[test]
+fn mounted_routing_sends_each_id_where_the_bytes_do() {
+    let r = |id| route_mounted(id);
+    // EmoteKneel and EmoteBeg are in neither set: they play nowhere.
+    for id in [75, 79] {
+        assert_eq!((r(id).mount, r(id).rider_upper), (false, false), "{id}");
+    }
+    assert_eq!((r(68).mount, r(68).rider_upper), (false, true));
+    assert_eq!((r(12).mount, r(12).rider_upper), (true, false));
+    // Wound ids 8-10 are in both.
+    assert_eq!((r(9).mount, r(9).rider_upper), (true, true));
+}
+
+#[test]
+fn standing_eat_is_masked_whatever_the_state() {
+    assert_eq!(route_oneshot(61, 0, 0), Masked);
+    assert_eq!(route_oneshot(61, move_flags::FORWARD, 0), Masked);
+    assert_eq!(route_oneshot(61, 0, 1), Masked);
+}
+
+#[test]
+fn whirlwind_and_birth_play_full_body_while_moving() {
+    for id in [126, 127] {
+        assert_eq!(route_oneshot(id, move_flags::FORWARD, 0), FullBody, "{id}");
+        assert_eq!(route_oneshot(id, 0, 1), FullBody, "{id}");
+    }
+}
+
 #[test]
 fn state_emote_idle_never_reached_during_a_special() {
     // `current_special` takes jumps and poses before `gait_candidates` runs, so the order is:
@@ -974,9 +1067,10 @@ fn the_prowl_idle_is_the_lowest_priority_stand() {
         gait_candidates(&idle, 2.5, None, None),
         &[STEALTH_STAND, STAND],
     );
-    assert!(
-        is_bare_stand(gait_candidates(&idle, 2.5, None, None)),
-        "the state-emote idle still owns this slot",
+    assert_eq!(
+        base_candidates(&idle, 2.5, None, None, Some(234)).as_slice(),
+        &[234, STAND],
+        "a set state outranks it",
     );
     let chair = MovementState {
         stand_state: 4,
diff --git a/crates/benilla-app/src/creature_anim/spell_visual.rs b/crates/benilla-app/src/creature_anim/spell_visual.rs
index c977ee9b..bc2b91f6 100644
--- a/crates/benilla-app/src/creature_anim/spell_visual.rs
+++ b/crates/benilla-app/src/creature_anim/spell_visual.rs
@@ -443,6 +443,7 @@ fn play_kit(
                 entity,
                 anim_id,
                 seq,
+                via_player: false,
             });
         }
     }
diff --git a/crates/benilla-app/src/creature_type.rs b/crates/benilla-app/src/creature_type.rs
new file mode 100644
index 00000000..94ef215c
--- /dev/null
+++ b/crates/benilla-app/src/creature_type.rs
@@ -0,0 +1,250 @@
+//! A unit's creature type as the reference resolves it (`0x605570`), which the spell bind's
+//! creature-type gate and the tracking dots read: the shapeshift form's type when above 0
+//! (`SpellShapeshiftForm.dbc` column 12, `0x60559a`), else the cached creature template's
+//! (`[unit+0xb30] + 0x18`, `0x6055a8`), else the race's (`ChrRaces.dbc` column 9, `0x6055ca`).
+//! 0 is a unit with no type, which a creature-type-limited spell refuses.
+
+use std::collections::HashMap;
+
+use benilla_formats::ShapeshiftForm;
+
+use crate::names::NameCache;
+use crate::net::ObjectStore;
+use crate::ui_action::Spells;
+
+/// What the resolver reads beside the unit's own fields: the creature template cache and the
+/// form table. A source that is absent resolves nothing at its stage.
+#[derive(Clone, Copy, Default)]
+pub(crate) struct CreatureTypeSources<'a> {
+    pub(crate) names: Option<&'a NameCache>,
+    pub(crate) forms: Option<&'a HashMap<u32, ShapeshiftForm>>,
+}
+
+impl<'a> CreatureTypeSources<'a> {
+    /// The sources a system holds as resources: the name cache and, once `Spell.dbc` has loaded,
+    /// the form table it carries.
+    pub(crate) fn of_resources(names: &'a NameCache, spells: Option<&'a Spells>) -> Self {
+        Self {
+            names: Some(names),
+            forms: spells.map(|s| &s.forms),
+        }
+    }
+
+    /// The unit's creature type, 0 for none. The template stage answers whatever the record
+    /// holds, 0 included, and is keyed by `OBJECT_FIELD_ENTRY` as the reference's cache is.
+    pub(crate) fn of(&self, store: &ObjectStore) -> u32 {
+        let fields = &store.0;
+        let form = self
+            .forms
+            .and_then(|forms| forms.get(&u32::from(fields.unit_shapeshift_form())))
+            .map(|row| row.creature_type)
+            .filter(|&ty| ty > 0);
+        if let Some(ty) = form {
+            return ty as u32;
+        }
+        let record = self
+            .names
+            .zip(fields.object_entry())
+            .and_then(|(names, entry)| names.creature_type(entry));
+        if let Some(ty) = record {
+            return ty;
+        }
+        // The race byte of `UNIT_FIELD_BYTES_0`: a player's, or 0 on a creature whose template
+        // has not come back, which has no row.
+        race_creature_type((fields.unit_bytes_0().unwrap_or(0) & 0xff) as u8)
+    }
+}
+
+/// `ChrRaces.dbc` column 9 by race id: Humanoid on all nine shipped rows, and 0 where the table
+/// has no row (`0x6055b3`-`0x6055d1`).
+fn race_creature_type(race: u8) -> u32 {
+    if (1..=9).contains(&race) {
+        CREATURE_TYPE_HUMANOID
+    } else {
+        0
+    }
+}
+
+/// `CreatureType.dbc` id 7.
+const CREATURE_TYPE_HUMANOID: u32 = 7;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::names::CreatureRecord;
+    use benilla_protocol::ObjectFields;
+
+    /// `UNIT_FIELD_BYTES_1` and `UNIT_FIELD_BYTES_0`, absolute descriptor indices.
+    const BYTES_1: u16 = 138;
+    const BYTES_0: u16 = 36;
+    const OBJECT_FIELD_ENTRY: u16 = 3;
+
+    fn store(entry: u32, race: u32, form: u32) -> ObjectStore {
+        ObjectStore(ObjectFields::from_pairs(&[
+            (OBJECT_FIELD_ENTRY, entry),
+            (BYTES_0, race),
+            (BYTES_1, form << 16),
+        ]))
+    }
+
+    fn names_with(entry: u32, creature_type: u32) -> NameCache {
+        let mut names = NameCache::default();
+        names.insert_creature(
+            entry,
+            Some(CreatureRecord {
+                name: "Test".into(),
+                subname: None,
+                creature_type,
+                pet_family: 0,
+                rank: 0,
+                type_flags: 0,
+                civilian: false,
+                racial_leader: false,
+                display_id: 0,
+            }),
+        );
+        names
+    }
+
+    fn forms() -> HashMap<u32, ShapeshiftForm> {
+        let row = |creature_type| ShapeshiftForm {
+            creature_type,
+            ..Default::default()
+        };
+        // Cat form is a Beast; a warrior stance carries type 0, and Tree of Life -1.
+        HashMap::from([(1, row(1)), (2, row(-1)), (17, row(0))])
+    }
+
+    /// The three stages in the reference's order: form above 0, then the template, then the
+    /// race, and 0 for a unit none of them names.
+    #[test]
+    fn stages_resolve_in_the_references_order() {
+        let names = names_with(69, 1);
+        let forms = forms();
+        let sources = CreatureTypeSources {
+            names: Some(&names),
+            forms: Some(&forms),
+        };
+        // A cat-form player is a Beast; unshifted, a Humanoid by race.
+        assert_eq!(sources.of(&store(0, 1, 1)), 1);
+        assert_eq!(sources.of(&store(0, 1, 0)), 7);
+        // A row of type 0 or -1 falls through to the race, not to a fixed answer.
+        assert_eq!(sources.of(&store(0, 5, 17)), 7);
+        assert_eq!(sources.of(&store(0, 5, 2)), 7);
+        // A cached creature is its template's type; the form still wins over it.
+        assert_eq!(sources.of(&store(69, 0, 0)), 1);
+        let humanoid = names_with(69, 7);
+        let sources = CreatureTypeSources {
+            names: Some(&humanoid),
+            forms: Some(&forms),
+        };
+        assert_eq!(sources.of(&store(69, 0, 0)), 7);
+        assert_eq!(
+            sources.of(&store(69, 0, 1)),
+            1,
+            "a form outranks the template"
+        );
+        // The template answers whatever it holds: type 0 does not fall through to the race.
+        let untyped = names_with(69, 0);
+        let sources = CreatureTypeSources {
+            names: Some(&untyped),
+            forms: None,
+        };
+        assert_eq!(sources.of(&store(69, 1, 0)), 0);
+    }
+
+    /// A creature whose template has not answered has race 0, which has no row: type 0. A form
+    /// id with no row, or no form table at all, resolves nothing at that stage.
+    #[test]
+    fn an_uncached_creature_and_a_missing_row_read_type_zero() {
+        let names = NameCache::default();
+        let forms = forms();
+        let sources = CreatureTypeSources {
+            names: Some(&names),
+            forms: Some(&forms),
+        };
+        assert_eq!(sources.of(&store(69, 0, 0)), 0, "no template, race 0");
+        assert_eq!(sources.of(&store(69, 0, 99)), 0, "no form row either");
+        assert_eq!(sources.of(&store(0, 10, 0)), 0, "race 10 has no row");
+        assert_eq!(CreatureTypeSources::default().of(&store(0, 1, 1)), 7);
+        assert_eq!(CreatureTypeSources::default().of(&store(69, 0, 1)), 0);
+    }
+
+    /// The shipped `SpellShapeshiftForm.dbc` through the resolver: the forms of type 1 name a
+    /// Beast, and every other row falls through to the race.
+    #[test]
+    fn the_shipped_forms_name_a_beast_or_fall_through_to_the_race() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let forms =
+            benilla_formats::load_shapeshift_forms(&mut chain).expect("SpellShapeshiftForm.dbc");
+        let sources = CreatureTypeSources {
+            names: None,
+            forms: Some(&forms),
+        };
+        // Cat, Travel, Aquatic, Bear, Dire Bear, Creature - Bear, Creature - Cat, Ghost Wolf.
+        for id in [1, 3, 4, 5, 8, 14, 15, 16] {
+            assert_eq!(forms[&id].creature_type, 1, "form {id} is type 1");
+            assert_eq!(sources.of(&store(0, 1, id)), 1, "form {id}");
+        }
+        // Tree of Life and Battle Stance carry -1: the human race's type answers.
+        for id in [2, 17] {
+            assert!(forms[&id].creature_type <= 0, "form {id} carries no type");
+            assert_eq!(sources.of(&store(0, 1, id)), 7, "form {id}");
+        }
+        // Every row by the rule: above 0 names the type, else the race.
+        for (&id, row) in &forms {
+            let expected = u32::try_from(row.creature_type).ok().filter(|&t| t > 0);
+            assert_eq!(
+                sources.of(&store(0, 1, id)),
+                expected.unwrap_or(7),
+                "form {id}"
+            );
+        }
+    }
+
+    /// The unit snapshot carries the resolver's word for every unit, players included: a
+    /// shapeshifted player a Beast, an unshifted one a Humanoid by race, a form of no type the
+    /// same, and a creature its template's.
+    #[test]
+    fn the_snapshot_carries_the_resolved_type_word() {
+        let names = names_with(69, 1);
+        let forms = forms();
+        let sources = CreatureTypeSources {
+            names: Some(&names),
+            forms: Some(&forms),
+        };
+        let word = |store: &ObjectStore| {
+            crate::ui_unit::snapshot(store, 0, None, 0, None, sources).creature_type_name
+        };
+        assert_eq!(word(&store(0, 1, 1)).as_deref(), Some("Beast"), "cat form");
+        assert_eq!(
+            word(&store(0, 1, 0)).as_deref(),
+            Some("Humanoid"),
+            "no form"
+        );
+        assert_eq!(
+            word(&store(0, 1, 2)).as_deref(),
+            Some("Humanoid"),
+            "type -1"
+        );
+        assert_eq!(word(&store(69, 0, 0)).as_deref(), Some("Beast"), "template");
+        assert_eq!(word(&store(70, 0, 0)), None, "uncached: race 0, no type");
+    }
+
+    /// The frozen race table against the shipped `ChrRaces.dbc`.
+    #[test]
+    fn race_creature_type_matches_the_shipped_table() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let rows = benilla_formats::load_race_creature_types(&mut chain).expect("ChrRaces walk");
+        assert_eq!(rows.len(), 9, "ChrRaces.dbc row count");
+        for race in 0..=u8::MAX {
+            assert_eq!(
+                race_creature_type(race),
+                rows.get(&race).copied().unwrap_or(0),
+                "race {race}"
+            );
+        }
+    }
+}
diff --git a/crates/benilla-app/src/cursor.rs b/crates/benilla-app/src/cursor.rs
index 406cedd6..a1b518f8 100644
--- a/crates/benilla-app/src/cursor.rs
+++ b/crates/benilla-app/src/cursor.rs
@@ -483,7 +483,7 @@ mod macos {
         }
         // A cinematic hides the pointer too (`0x58b590`); `CursorOptions.visible` is inert here, so
         // it joins the look's hide/unhide pair, keeping AppKit's hide counter balanced.
-        let looking = rig.is_looking() || cinematic.is_some_and(|c| c.is_playing());
+        let looking = rig.holds_cursor() || cinematic.is_some_and(|c| c.is_playing());
         let stem = mode.0.stem();
         // The key names the chosen cursor, so `NSCursor::set`, a WindowServer round-trip that can
         // stall the main thread for milliseconds, fires only on a change or a drift.
diff --git a/crates/benilla-app/src/cvars.rs b/crates/benilla-app/src/cvars/mod.rs
similarity index 73%
rename from crates/benilla-app/src/cvars.rs
rename to crates/benilla-app/src/cvars/mod.rs
index e02f739b..7c137a48 100644
--- a/crates/benilla-app/src/cvars.rs
+++ b/crates/benilla-app/src/cvars/mod.rs
@@ -5,7 +5,7 @@
 //! `GetCVar`/`SetCVar` ([`benilla_ui::script::UiScript::seed_cvars`]) whose writes queue back here.
 //!
 //! - [`REGISTERED`] holds only vars something reads, a host knob or a Lua consumer. A row's default
-//!   is the reference's, and [`Registered::reference`] says where it stands against it.
+//!   is the reference's, and [`table::Registered::reference`] says where it stands against it.
 //! - The change callback is a Bevy observer on [`CvarChanged`], beside the knob it writes; the
 //!   registry applies nothing itself.
 //! - A latched row's write is staged in [`Row::pending`] until [`Cvars::commit_latched`], the
@@ -27,986 +27,10 @@ use bevy::prelude::*;
 use crate::ui_script::VmMemo;
 use benilla_ui::script::{SeededCvar, UiScript};
 
-/// One host-backed CVar: its name, benilla's default, and where that default stands against the
-/// reference's ([`Reference`]).
-pub(crate) struct Registered {
-    /// The registered name, in the reference's own spelling.
-    pub(crate) name: &'static str,
-    /// What a fresh `benilla-config` runs at, and what `GetCVar` answers until the player moves it.
-    pub(crate) default: &'static str,
-    /// Where `default` stands against the reference's. Read only by the tests: it records the
-    /// reference, never a value this client acts on.
-    #[allow(dead_code)]
-    pub(crate) reference: Reference,
-    /// Registered with flag bit1 (`rec+0x1c & 0x2`, `flags` 2 or 3 at the register site): a write
-    /// is staged in [`Row::pending`] until [`Cvars::commit_latched`].
-    pub(crate) latched: bool,
-}
-
-impl Registered {
-    /// Mark the row latched.
-    pub(crate) const fn latched(self) -> Self {
-        Self {
-            latched: true,
-            ..self
-        }
-    }
-}
-
-/// benilla's default against the reference's: the string the reference's `CVar::Register`
-/// (`0x63db90`) passes for the name, or, for a setting 1.12 keeps in FrameXML, the value
-/// `UIOptionsFrame.lua` boots it at. Not a `Config.wtf` line (`SaveConfig 0x63d980` writes only
-/// values off their default), and not always what a fresh install runs at: `hwDetect` rewrites
-/// sixteen video CVars from `VideoHardware.dbc` before the first frame ([`Reference::Overridden`]).
-/// Each row's register site or FrameXML line is cited above it.
-#[allow(dead_code)] // read only by the tests
-pub(crate) enum Reference {
-    /// The reference registers this default and benilla ships it; the test compares the two.
-    Same(&'static str),
-    /// The reference registers `registered`, but its own boot code overwrites it before the first
-    /// frame; `default` is where that lands, and `why` is the override.
-    Overridden {
-        registered: &'static str,
-        why: &'static str,
-    },
-    /// The reference ships `value` and benilla ships another; `why` is the reason.
-    Deviates {
-        value: &'static str,
-        why: &'static str,
-    },
-    /// No reference setting to match: benilla's own knob, or a later-era name for something 1.12
-    /// never made settable. `why` says which, and what the reference does instead.
-    Ours(&'static str),
-}
-
-/// A row whose default is the reference's own registered string.
-const fn same(name: &'static str, default: &'static str) -> Registered {
-    Registered {
-        name,
-        default,
-        reference: Reference::Same(default),
-        latched: false,
-    }
-}
-
-/// A row whose default follows the reference's boot-time override of its registered string.
-const fn overridden(
-    name: &'static str,
-    default: &'static str,
-    registered: &'static str,
-    why: &'static str,
-) -> Registered {
-    Registered {
-        name,
-        default,
-        reference: Reference::Overridden { registered, why },
-        latched: false,
-    }
-}
-
-/// A row that ships something other than the reference's `value`, for `why`.
-const fn deviates(
-    name: &'static str,
-    default: &'static str,
-    value: &'static str,
-    why: &'static str,
-) -> Registered {
-    Registered {
-        name,
-        default,
-        reference: Reference::Deviates { value, why },
-        latched: false,
-    }
-}
-
-/// A row the reference has no counterpart for.
-const fn ours(name: &'static str, default: &'static str, why: &'static str) -> Registered {
-    Registered {
-        name,
-        default,
-        reference: Reference::Ours(why),
-        latched: false,
-    }
-}
-
-/// The table as the script VM's registrar wants it: `(name, default)` pairs in table order.
-pub(crate) fn registered_pairs() -> impl Iterator<Item = (&'static str, &'static str)> {
-    REGISTERED.iter().map(|r| (r.name, r.default))
-}
-
-/// The host-backed CVars, one row per knob that has a reader.
-///
-/// Not registered for want of a reader, though pfUI's `hdgraphic` writes them: `lodDist`
-/// (`0x688524`, "100.0", read at `0x6afb1d` for the doodad LOD swap), `footstepBias` (`0x6888b4`,
-/// "0.125", read at `0x68fcb6`), `mapObjLightLOD` (`0x6886ec`, "0") and `SkyCloudLOD` (`0x6d1d33`,
-/// "0"). `DistCull` (`0x688570`) and `texLodBias` (`0x6885e2`, whose sink `0x672640` is `ret 4`)
-/// have no reader in the reference either. `maxLOD` is no 1.12 CVar.
-pub(crate) const REGISTERED: &[Registered] = &[
-    // `realmName` (`0x83f2d0`): registered `""` (`0x882748`), help "Last realm connected to"
-    // (`0x85d684`); the client builds its SavedVariables path from it (`0x5ab7d0`). Written from
-    // the session's realm when addons load. `Ace/AceState.lua:27` trims it at
-    // PLAYER_ENTERING_WORLD, so a nil breaks every Ace addon.
-    same("realmName", ""),
-    // The logon server address (register site `0x5ab6a6`), a string row judged by
-    // `realmlist::on_cvar`.
-    deviates(
-        crate::realmlist::CVAR_REALMLIST,
-        crate::realmlist::DEFAULT_REALMLIST,
-        "us.logon.worldofwarcraft.com:3724",
-        "that host has not resolved since 2019, so shipping it makes every first launch a \
-         DNS failure; benilla dials the machine it is running on",
-    ),
-    // `autoClearAFK` (`0x5e24d4`, "1" `0x82e748`, handle `[0xc4d68c]` set at `0x5e24ef`, read at
-    // `0x5eb84b`) gates five implicit AFK clears: any chat send but type `0x14`, Jump,
-    // forward/back, strafe and turn (`0x513d36`/`0x514e23`/`0x514f0b`/`0x514fca`). Off, the clear
-    // does nothing at all: no echo, no mirror write, no packet.
-    same("autoClearAFK", "1"),
-    same("MasterVolume", "1"),
-    same("SoundVolume", "1"),
-    same("MusicVolume", "0.4"),
-    same("AmbienceVolume", "0.6"),
-    // Registered "1" at `0x45737a`/`0x45739b`/`0x460a9d`. `MasterSoundEffects` is the Enable All
-    // Sound box (`SoundOptionsFrame.lua:6`), which pauses the whole sound engine, not an SFX
-    // toggle.
-    same("MasterSoundEffects", "1"),
-    same("EnableMusic", "1"),
-    same("EnableAmbience", "1"),
-    // The race/sex refusal voice lines (`0x457877`), `SoundOptionsFrame.lua:3`; the master enable
-    // greys it.
-    same("EnableErrorSpeech", "1"),
-    // Not a 1.12 CVar or checkbox; the later-era name. The reference mutes on losing focus, music
-    // included (`WM_ACTIVATE` to `0x7a4860`'s `FSOUND_SetMute(-3, active ? 0 : 1)`), so "0" is its
-    // behaviour. The knob is `SoundConfig::background_sound`.
-    same("Sound_EnableSoundWhenGameIsInBG", "0"),
-    // Registered "1" (`0x4573be`); `SoundConfig::reverb` carries the evidence for shipping "0".
-    deviates(
-        "SoundReverb",
-        "0",
-        "1",
-        "the reference's reverb is EAX-over-hardware, and that hardware has not existed since \
-         Vista, so \"1\" would ship audio the real client has never actually produced on any \
-         machine a player runs today",
-    ),
-    // FMOD 3's mix-ahead buffer in ms (`0x4571ca`, flags 2: read once at sound init); here it sizes
-    // the render thread's ring ahead of the IO callback (`sound::output`). `0x457520` registers
-    // "50" or "100" by a host probe (`0x835e10`/`0x835e0c`), which one on a current machine
-    // untraced; ours is the larger, since the depth has to hide a whole stalled IO cycle.
-    same("SoundBufferSize", "100").latched(),
-    // benilla's own, not a 1.12 CVar. Deviation: the reference clips at full scale and has no
-    // headroom mechanism (its SFX-bus duck `0x457960` is a sidechain armed only by server-pushed
-    // voice lines); benilla limits because every SFX is mastered to full scale and overlapping
-    // kits clip.
-    ours(
-        "SoundOutputLimiter",
-        "1",
-        "benilla's own — the reference sums at full scale and clips; every WoW SFX is mastered \
-         to full scale, so overlapping kits need a limiter to keep from distorting",
-    ),
-    overridden(
-        "uiScale",
-        "0.9",
-        "1.0",
-        "a fresh reference client never consults this CVar: `useUiScale` registers \"0\" \
-         (`0x48fce4`), and the OFF leg `0x492f70` computes clamp(768/height, 0.9, 1.0) instead — \
-         0.9 at 854 px tall and up, which is every window we ship against. It is 1.0 at 768 and \
-         below, where our flat 0.9 does diverge; `ui_script::DEFAULT_UI_SCALE` carries that. \
-         See `useUiScale` below, whose row this one used to say did not exist",
-    ),
-    // `useUiScale` (`0x8430c0`), the switch the `uiScale` override gates on:
-    // `ContainerFrame.lua:483` and `UIDropDownMenu.lua:525` branch on it and `OptionsFrame.lua:13`
-    // gives it a checkbox.
-    same("useUiScale", "0"),
-    same("farclip", "350"),
-    // `nearclip` (`0x68867a`: name `0x84ffb0`, default `0x84fb48` "0.1", flags 1, callback
-    // `0x688d90`, record `[0xc7f348]`). The camera re-reads the record every frame: `0x511bc0`
-    // (sole caller `0x483094`) stamps `[cam+0x38]` from it through the handle `[0xbe1078]` that
-    // `0x50b728` caches, overwriting the ctor's 1/9 (`0x3de38e39`);
-    // `benilla_world::view::stamp_near_clip` is that.
-    // The callback's derived global `[0xc7b480]` has no reader. pfUI's `hdgraphic` writes
-    // 0.06..0.30, inside `[0.01, 0.33]`.
-    same("nearclip", "0.1"),
-    // `deselectOnClick` and `mouseInvertPitch` are 1.12's own (`UIOptionsFrame.lua:8,4`);
-    // `autoLootDefault` is the later-era name, 1.12 having only the shift gesture.
-    same("deselectOnClick", "1"),
-    // `BlockTrades` (`0x842fbc`), `UIOptionsFrame.lua:11`: the refusal leg `0x4bf7bc` fires only
-    // when it is set. The knob is [`crate::ui_trade::BlockTrades`].
-    same("BlockTrades", "0"),
-    // `autoSelfCast` (register site `0x6e731d`, record `[0xceac34]`, read at `0x6e53d7`; `0x870dc0`
-    // is its name string): a friendly cast that binds nothing falls back to the caster.
-    // `TOGGLEAUTOSELFCAST` toggles it.
-    same("autoSelfCast", "0"),
-    // The five saved camera views and the live index, at the reference's names and default strings;
-    // owned by [`crate::player::camera_view`]. Registered so a `SaveView` persists.
-    same(
-        crate::player::camera_view::CVAR_ACTIVE_VIEW,
-        crate::player::camera_view::ACTIVE_VIEW_DEFAULT,
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[0][0],
-        crate::player::camera_view::VIEW_DEFAULTS[0][0],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[0][1],
-        crate::player::camera_view::VIEW_DEFAULTS[0][1],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[0][2],
-        crate::player::camera_view::VIEW_DEFAULTS[0][2],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[1][0],
-        crate::player::camera_view::VIEW_DEFAULTS[1][0],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[1][1],
-        crate::player::camera_view::VIEW_DEFAULTS[1][1],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[1][2],
-        crate::player::camera_view::VIEW_DEFAULTS[1][2],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[2][0],
-        crate::player::camera_view::VIEW_DEFAULTS[2][0],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[2][1],
-        crate::player::camera_view::VIEW_DEFAULTS[2][1],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[2][2],
-        crate::player::camera_view::VIEW_DEFAULTS[2][2],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[3][0],
-        crate::player::camera_view::VIEW_DEFAULTS[3][0],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[3][1],
-        crate::player::camera_view::VIEW_DEFAULTS[3][1],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[3][2],
-        crate::player::camera_view::VIEW_DEFAULTS[3][2],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[4][0],
-        crate::player::camera_view::VIEW_DEFAULTS[4][0],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[4][1],
-        crate::player::camera_view::VIEW_DEFAULTS[4][1],
-    ),
-    same(
-        crate::player::camera_view::VIEW_CVARS[4][2],
-        crate::player::camera_view::VIEW_DEFAULTS[4][2],
-    ),
-    same("mouseInvertPitch", "0"),
-    ours(
-        "autoLootDefault",
-        "0",
-        "1.12 has no auto-loot CVar at all — vanilla offers only the shift gesture, so OFF \
-         IS the reference's own behaviour; the spelling is era's",
-    ),
-    // The overhead-name gates, registered at `0x6c7470` into mask `0xce8720`: `UnitNamePlayer`
-    // (`0x86c694`) "1" (`0x82e748`), `UnitNameNPC` (`0x86c6a4`) and `UnitNameOwn` (`0x86c6b0`) "0"
-    // (`0x82e570`).
-    same("UnitNamePlayer", "1"),
-    same("UnitNameNPC", "0"),
-    same("UnitNameOwn", "0"),
-    // `UnitNamePlayerGuild` (`0x86c680`, "1", mask bit `0x10`) is not a show gate: `ShouldShowName`
-    // (`0x6070a0`) reads bits `0x1/0x2/0x4`, and this gates the `"\n<%s>"` guild line at
-    // `0x609085`. `UnitNamePlayerPVPTitle` (bit `0x20`, "1") has no row: nothing here draws the
-    // rank prefix.
-    same("UnitNamePlayerGuild", "1"),
-    // 1.12 has no nameplate CVar: the bitmask `[0xc4da34]` (bits 0 and 3) persists through
-    // FrameXML's `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON`, so these take the later-era names. Both
-    // boot off (`UIOptionsFrame.lua:180-183`, `:769-775`): no plates until V.
-    same(crate::vplates::CVAR_ENEMIES, "0"),
-    same(crate::vplates::CVAR_FRIENDS, "0"),
-    // `WorldDetail` is no 1.12 CVar but the `GetWorldDetail`/`SetWorldDetail` verb name
-    // (`OptionsFrame.lua:27`); stops 0/1/2 are `frillDensity` 16/32/48. `SetWorldDetail 0x488dd0`
-    // also writes `SmallCull` {0.07, 0.04, 0.01}, and `GetWorldDetail` reads only `SmallCull`,
-    // whose registered 0.04 is stop 1: the reference's slider boots at Medium.
-    same("WorldDetail", "1"),
-    // `frillDensity` (`0x68862e`: name `0x8423d8`, default `0x864644` "16", flags 1, callback
-    // `0x688de0`, record `[0xc7f2f4]`): detail-doodad cells visited per chunk, clamped to [1, 256]
-    // and handed through `0x6725a0` to `[0xc7b494]`, the bound of the scatter loop at
-    // `0x6bfcfb`/`0x6bff1c`. One knob with `WorldDetail`, each keeping its own clamp. `hwDetect`
-    // (`0x639a60`) sets it from `VideoHardware.dbc` field `+0x18`, 24 on videoID 170. pfUI's
-    // `hdgraphic` reads `GetCVar("frillDensity") > 48` and writes up to 256.
-    deviates(
-        "frillDensity",
-        "32",
-        "16",
-        "the reference's registered 16 is stop 0 and its post-`hwDetect` 24 is on no \
-         stop at all, so every stop diverges; Medium (32) is the nearest one no sparser than a \
-         fresh install, and erring sparse is the worse failure for ground cover",
-    ),
-    // ── Combat log display ranges, in yards ──────────────────────────────────────────────────────
-    //
-    // Registered by `0x626d00` from the `{name, default}` pairs at `0x8629e0`, read as the record's
-    // float (`+0x24`). Classes 0 and 1, you and your pet, have no CVar there, only the `100000.0`
-    // sentinel.
-    same("CombatLogRangeParty", "50"),
-    same("CombatLogRangePartyPet", "50"),
-    same("CombatLogRangeFriendlyPlayers", "50"),
-    same("CombatLogRangeFriendlyPlayersPets", "50"),
-    same("CombatLogRangeHostilePlayers", "50"),
-    same("CombatLogRangeHostilePlayersPets", "50"),
-    same("CombatLogRangeCreature", "30"),
-    // Outside that table (`0x626d5f`, "60" at `0x862e14`): `0x62c160` reads it first and falls back
-    // to the per-class range only when the lookup fails.
-    same(crate::ui_chat::combat::DEATH_LOG_RANGE_CVAR, "60"),
-    // ── Floating combat text ─────────────────────────────────────────────────────────────────────
-    //
-    // `CombatDamage` (`0x6032df`, record `[0xc4d944]`) is the master: its two readers, the word
-    // emitter `0x607140` and the number emitter `0x6128b0`, both return at "0", so nothing floats.
-    // The `Pet*` rows gate only the owned-by-you branch; the stock Pet Melee Damage box writes both
-    // (`UIOptionsFrame.lua:335-336`).
-    same("CombatDamage", "1"),
-    same("PetMeleeDamage", "1"),
-    same("PetSpellDamage", "1"),
-    // `CombatLogPeriodicSpells` (`0x6033b3`): the handle is discarded and every use looks it up by
-    // name; read as the record's int.
-    same(crate::ui_chat::combat::LOG_PERIODIC_CVAR, "1"),
-    // ── Sound-panel check buttons ────────────────────────────────────────────────────────────────
-    //
-    // Category-7 registrations that keep no handle: the reference looks each up by name at use.
-    //
-    // `SoundListenerAtCharacter` (`0x457890`): the listener at the character, else at the camera
-    // (`update_audio_listener`).
-    same("SoundListenerAtCharacter", "1"),
-    // `EmoteSounds` (`0x4573b9`): the received text-emote voice kit, and only that.
-    same("EmoteSounds", "1"),
-    // `SoundZoneMusicNoDelay` (`0x4578b3`): `next_track_time`'s immediate path.
-    same("SoundZoneMusicNoDelay", "0"),
-    // `assistAttack` (`0x48fc50`, record `[0xb4d8f8]`): `/assist` also starts the swing. The "3"
-    // beside it is the next registration's, `minimapZoom`: stock `/assist` selects without
-    // swinging.
-    same("assistAttack", "0"),
-    // ── Mouse-look speed, per axis ───────────────────────────────────────────────────────────────
-    //
-    // `cameraYawMoveSpeed` is the MOUSE_LOOK_SPEED slider (`UIOptionsFrame.lua:89`); a nil there
-    // raises in `slider:SetValue` (`0x790980`) and stops `UIOptionsFrame_Load`. The stock Save
-    // writes `cameraPitchMoveSpeed` as half of it (`:355-356`). The reference integrates
-    // OS-accelerated pixels where we take raw device deltas, so the unit factor lives in
-    // `camera::LOOK_YAW_PER_SPEED` and these defaults stay the reference's. The validator
-    // `0x50c000` → `0x50b330` rejects values outside [0.1, 360] rather than clamping, and
-    // `player::camera::on_cvar` does the same.
-    same("cameraYawMoveSpeed", "180"),
-    same("cameraPitchMoveSpeed", "90"),
-    // MOUSE_SENSITIVITY (`UIOptionsFrame.lua:87`): FrameXML's spelling of the binary's `mouseSpeed`
-    // (`0x402c7b`); lookups are case-insensitive (`CVar::Lookup 0x63de30`), here as there. The
-    // reference's default is `SPI_GETMOUSESPEED × 0.1`, "1.0" on stock Windows, and its record
-    // `[0x882704]` has no reader: the slider sets the OS pointer speed (`0x402ec0`, [0.1, 2.0]).
-    // The default matches; Deviation: here the dial multiplies the camera's own rate, because
-    // benilla does not change the OS pointer speed, a system-wide setting.
-    same("mousespeed", "1"),
-    // MAX_FOLLOW_DIST (`UIOptionsFrame.lua:90`), a factor over `cameraDistanceMax`'s 15 yd
-    // (`0x84fbd0`); registered "1.0" (`0x82e92c`).
-    same("cameraDistanceMaxFactor", "1"),
-    // `cameraSmoothStyle` (`0x50ba92`, default `[0x84f4f4]` "1"), the auto-return behind the
-    // character. The engine's enum is 0 Never, 1 Smart, 2 Always, as the stock dropdown writes it
-    // (`UIOptionsFrame.lua:525,536,547`); 3, the Never entry's position, is the validator's upper
-    // bound (`0x50b330(v, 0, 3)`). See `FollowStyle`.
-    same("cameraSmoothStyle", "1"),
-    // Read instead of `cameraSmoothStyle` while the state mask holds Track or Fear; no panel row.
-    same("cameraSmoothTrackingStyle", "1"),
-    // AUTO_FOLLOW_SPEED (`UIOptionsFrame.lua:88`), deg/s, registered "180.0" (`[0xbe1070]`): it
-    // sets the transition's duration (`|dyaw| / rate * factor`), an average rate, not a slew. The
-    // knob clamps it to `FOLLOW_SPEED_RANGE`. The stock Save also writes `cameraPitchSmoothSpeed`
-    // at a quarter (`:353`), unregistered here: `FollowRig` has one rate.
-    same("cameraYawSmoothSpeed", "180"),
-    // `cameraPivot` `[0xbe10a4]` "1" (`0x50bda3`), smart pivot: gate `0x510690`, routing
-    // `0x50fee0`, release `0x5107f0`; ours is `player::camera_dynamics::SmartPivot`.
-    same("cameraPivot", "1"),
-    // Read by the routing (`0x50fff5`/`0x510004`) in radians of camera rotation, so they carry to
-    // benilla's raw-device units unchanged.
-    same("cameraPivotDXMax", "0.05"),
-    same("cameraPivotDYMin", "0"),
-    // The pitch bias's ease-back once the pivot lets go, deg/s (`[0xbe0fc8]`; `0x512a50` divides
-    // |Δ| by rate · π/180 for the duration); no panel row.
-    same("cameraTargetSmoothSpeed", "90"),
-    // `cameraWaterCollision` `[0xbe1088]` "1" (`0x50bd63`, `0x82e748`): one register, two consumers
-    // that must ship together. `0x50e5ec` builds it; its `0xf0000` nibble joins the trace mask of
-    // all three `0x50e570` queries (reaching `0x69cc13`), and `0x50e629` tests it to lift the sweep
-    // origin to `surface + 2/9`. Ours: `benilla_world::collision::camera_filter` and
-    // `player::camera_water`.
-    same("cameraWaterCollision", "1"),
-    // `cameraTerrainTilt` `[0xbe0fd4]` "0" (`0x50bcfd`), Follow Terrain: probe and staircase
-    // `0x50d900`, arm `0x50dbc0`; ours is `player::camera_dynamics::TerrainTilt`.
-    same("cameraTerrainTilt", "0"),
-    // Rate in deg/s (`[0xbe0fc0]`), duration bounds in seconds (`[0xbe1050]`/`[0xbe1054]`). The 3 s
-    // floor always binds (20° at 7.5°/s is 2.67 s), so the camera leans rather than tracks.
-    same("cameraGroundSmoothSpeed", "7.5"),
-    same("cameraTerrainTiltTimeMin", "3"),
-    same("cameraTerrainTiltTimeMax", "10"),
-    // `cameraBobbing` `[0xbe10c0]` "0" (`0x50b76d`), head bob: kernel `0x511920`, gate `0x5105e0`;
-    // ours is `player::camera_dynamics::HeadBob`.
-    same("cameraBobbing", "0"),
-    // Amplitudes in the CVar's units, scaled by 1/36 (`[0x7ff9d0]`) to yards.
-    // `cameraBobbingSmoothSpeed` is the decay rate, read only in the disarm `0x51113a`, which
-    // divides the largest component by it for the ramp's duration (~0.069 s at these defaults).
-    same("cameraBobbingLRAmplitude", "2"),
-    same("cameraBobbingUDAmplitude", "2"),
-    same("cameraBobbingFrequency", "0.8"),
-    same("cameraBobbingSmoothSpeed", "0.8"),
-    // `statusBarText` (`0x48fc34`, record `[0xb4d904]`, no engine reader), read by
-    // `TextStatusBar.lua:47,97`: "0" shows the numbers on hover only.
-    same("statusBarText", "0"),
-    // Enhanced Tooltips (`UIOptionsFrame.lua:15`), registered "1" at `0x48fddd` (`0x82e748`); read
-    // only by the stock interface.
-    same("UberTooltips", "1"),
-    // Registered at `0x603280`: `ChatBubbles` "1", `ChatBubblesParty` "0".
-    same("ChatBubbles", "1"),
-    same("ChatBubblesParty", "0"),
-    // Registered "1" (`0x82e748`), category 4. `profanityFilter` (`0x402e68`, name `0x82e7f4`,
-    // callback `0x403570`) masks `ChatProfanity.dbc` spans inside the shared masker `0x4a1a66`,
-    // covering all thirteen call sites; `spamFilter` (`0x402e8e`, name `0x82e7d4`, callback
-    // `0x4035b0`) silently drops a line matching `SpamMessages.dbc`. The knob is
-    // [`crate::text_filter::TextFilterSwitches`].
-    same("profanityFilter", "1"),
-    same("spamFilter", "1"),
-    // Registered by `CGlueMgr::EnterWorld` (`0x46b633` `gameTip` "0", `0x46b658` `showGameTips`
-    // "1"), category 5. `gameTip` is the cursor and holds the next tip, not the one on screen;
-    // `crate::game_tip` advances it.
-    same("gameTip", "0"),
-    same("showGameTips", "1"),
-    // `showLootSpam` (`0x48fd1c`, name `0x8430a0`, "1" `0x82e748`, record `0xb4e2bc`): off, group
-    // loot-roll lines are hidden and only the winner shows. Its three readers are the roll-line
-    // composers; the knob is [`crate::ui_loot::LootConfig::show_loot_spam`].
-    same("showLootSpam", "1"),
-    // `guildMemberNotify` (`0x5e24c7`, "0" `0x82e570`, record `0xc4d3c4`): guildmate log on/off
-    // lines, read only in `SMSG_GUILD_EVENT`'s handler. The knob is
-    // [`crate::ui_guild::GuildMemberNotify`].
-    same("guildMemberNotify", "0"),
-    // Both registered "3" (`0x48fc6c`, `0x48fc88`); the minimap's +/- buttons write them through
-    // `Minimap:SetZoom`. The knob is [`crate::minimap::MinimapZoom`].
-    same("minimapZoom", "3"),
-    same("minimapInsideZoom", "3"),
-    // Load out of date AddOns, inverted (`0x402c3b`): "1" enforces the check. Read by the load walk
-    // ([`Cvars::addon_version_check`]) and live by the VM's gate.
-    same("checkAddonVersion", "1"),
-    // `gxApi` (`0x63a833`: name `0x842a64`, default `0x864f7c` "direct3d", flags 3, callback
-    // `0x63b030`, record `[0xc4ea94]`): the reference builds D3D9 unless it reads "OpenGl"
-    // (`0x63a3c4`, `0x842a5c`). Here it reports the wgpu backend (`wgpu::Backend::to_str`), pushed
-    // from `RenderAdapterInfo` and owned by the session, so it is never persisted. pfUI's
-    // `panel.lua:185` concatenates it.
-    deviates(
-        "gxApi",
-        "",
-        "direct3d",
-        "descriptive, not a selector — benilla renders through wgpu, which has no D3D9 \
-         backend and no chooser; the value is the live adapter's own and is never persisted",
-    )
-    .latched(),
-    // `gxVSync` (`0x63a859`, "1", flags 3), `OptionsFrame.lua:9`. The knob is
-    // [`crate::video::VideoConfig::vsync`], which the window's present mode follows at the
-    // `RestartGx` commit. `$WOW_NOVSYNC=1` overrides it for the session.
-    same("gxVSync", "1").latched(),
-    // MONKEY (advanced graphics): the one row on the Advanced Graphics page that is not a knob —
-    // it is a NAME for a combination of the rows under it ([`LIGHTING_PRESETS`]). Writing a preset
-    // name writes that preset's members; writing anything else is corrected on the next frame by
-    // [`lighting_quality`], which re-DERIVES the name from the members those rows actually hold.
-    // So the stored value is never stale: it is either a preset every member agrees with, or
-    // `Custom`.
-    //
-    // A STRING row, not an int, so `config.toml` and `/console set lightingQuality Medium` both
-    // read as what they mean — and so the ladder can gain a rung without renumbering a player's
-    // saved value. `Row::numeric` is false for it (the default does not parse as a number), which
-    // is what lets the registry accept a non-numeric write at all; `realmList` is the precedent.
-    ours(
-        "lightingQuality",
-        "High",
-        "benilla's own: the preset ladder over the dynamic light + shadow rows — Off / Low / \
-         Medium / High / Ultra, or Custom when the members match none of them; the reference has no \
-         realtime light or shadow system to preset",
-    ),
-    // MONKEY (presets): the Graphics Preset — `lightingQuality`'s posture one level up, a NAME
-    // for every graphics row at once ([`GRAPHICS_PRESETS`]), re-derived every frame. "High" is
-    // what a player with no saved preset boots into: [`Cvars::seed_graphics_preset`] writes the
-    // High column over every row their `config.toml` does not carry, so the rows themselves keep
-    // their per-lane defaults (Classic-leaning, and `farclip` the reference's 350) and a capture
-    // or a test, which never seeds, keeps them too.
-    ours(
-        "graphicsQuality",
-        "High",
-        "benilla's own: the preset ladder over every graphics row — Classic / Low / Medium / High \
-         / Ultra, or Custom when the rows match none of them; the reference's options have no \
-         such preset",
-    ),
-    // MONKEY (volumetric fog): saved live tier; capture override stays session-only.
-    ours("volumetricFog", "1", "benilla's own: near-field volumetric fog, 0 Off / 1 Low / 2 High"),
-    // MONKEY (lampfog): opt-in point-light halos; High graphics preset value is 2.
-    ours(
-        "lampFog",
-        "0",
-        "benilla's own: lamps scattering through night fog, 0 Off / 1 Low (16 lamps) / 2 High (32 lamps)",
-    ),
-    // GFX (volumetric light): shadow-mapped light shafts for the sun and the moon.
-    ours(
-        "volumetricLight",
-        "0",
-        "benilla's own: sun and moon light shafts marched through the shadow map, 0 Off / 1 Medium / 2 High",
-    ),
-    ours(
-        "volumetricLightStrength",
-        "1",
-        "benilla's own: brightness of the volumetric light shafts, 0..2 (1 = default)",
-    ),
-    // GFX (moonlight): the moon as a light on top of the stock night.
-    ours(
-        "moonLight",
-        "0",
-        "benilla's own: moonlight on top of the stock night, 0..2 (0 = the reference night)",
-    ),
-    // MONKEY (p0 skyDither): the FFXGlow combine's deband dither (was env WOW_DITHER only).
-    // Default 0 = the reference look; the Graphics preset's High sets 1.
-    ours(
-        "skyDither",
-        "0",
-        "benilla's own: faint screen dither against sky and fog banding, 0 Off / 1 On",
-    ),
-    // MONKEY (post): tier 0 leaves every emissive site and the frame byte-identical.
-    ours("bloom", "2", "benilla's own: HDR emissive bloom, 0 Off / 1 Low / 2 High"),
-    ours("sunShafts", "1", "benilla's own: depth-occluded screen-space sun shafts"),
-    ours("colorGrading", "1", "benilla's own: zone and day/night 32-cube colour grade"),
-    // MONKEY (sky): the sky tier; the High graphics preset sets 2.
-    ours(
-        "skyQuality",
-        "0",
-        "benilla's own: sky quality, 0 Classic / 1 Enhanced (smooth gradient, sun glow, stars) / \
-         2 High (+ detailed sun-lit clouds)",
-    ),
-    // MONKEY (wind): one tier controls the grass-only and grass-plus-tree receivers.
-    ours(
-        "foliageWind",
-        "2",
-        "benilla's own: foliage wind, 0 Off / 1 Grass / 2 Grass + trees",
-    ),
-    // MONKEY (fix-wind): the sway strength slider under Foliage Wind; not on the preset ladder.
-    ours(
-        "foliageWindStrength",
-        "1",
-        "benilla's own: foliage wind strength, a gain on the sway, 0.25..3 (1 = the shipped tuning)",
-    ),
-    // MONKEY (fog): the distance-fog model. 0 = the 1.12 linear fog (byte-identical), 1 = Modern
-    // (exponential, sun/horizon colour, end-fog shift, fog end decoupled from farclip past 777).
-    // Default 0; the Graphics preset's High sets 1.
-    ours(
-        "fogModel",
-        "0",
-        "benilla's own: distance fog, 0 Classic (1.12 linear) / 1 Modern (soft, sun-coloured horizon)",
-    ),
-    // MONKEY (wet): rain darkens and glosses sky-exposed surfaces and rings the water. Default 1
-    // (only visible while it rains or the ground dries); the Graphics preset's High sets 1.
-    ours(
-        "rainSurfaces",
-        "1",
-        "benilla's own: rain wets sky-exposed surfaces and rings the water, 0 Off / 1 On",
-    ),
-    // MONKEY (ao): opt-in contact shadows; the High graphics preset value is 2.
-    ours("ambientOcclusion", "0", "benilla's own: screen-space ambient occlusion, 0 Off / 1 Low / 2 High"),
-    // MONKEY (skybox): the living player's zone skybox from `LightParams`; High sets 1.
-    ours(
-        "zoneSkyboxes",
-        "0",
-        "benilla's own: draw the zone skybox LightParams names for the living, 0 Off / 1 On; the \
-         reference draws a DBC skybox only for the ghost",
-    ),
-    ours(
-        "waterQuality",
-        "1",
-        "benilla's own: water quality, 0 Classic / 1 Enhanced / 2 High; mirror reflections are opt-in",
-    ),
-    ours(
-        "lavaLightGain",
-        "1",
-        "benilla's own: brightness of lava lighting its surroundings, 0..4 (0 = no glow)",
-    ),
-    // Benilla's opt-in realtime shadow-map path, split into two INDEPENDENT lanes over one shared
-    // shadow rig (one sun / one map). `worldShadows` = the static world (trees, buildings, foliage)
-    // casts realtime shadows and baked MCSH terrain shadows switch off; `characterShadows` =
-    // players/NPCs/creatures/mounts cast realtime silhouettes instead of the legacy oval blob.
-    //
-    // `ours(...)`, not `same(...)`: the reference has no realtime shadow at all — it bakes MCSH
-    // into the terrain and draws an oval under every unit — so there is no registered default for
-    // these two to agree with, and claiming `Same` would put a false entry in the one column
-    // [`Reference`] exists to keep honest. (They read `same("…", "1")` until the 2303 registry
-    // port; the default string is unchanged.)
-    ours(
-        "worldShadows",
-        "1",
-        "benilla's own: the static world (trees, buildings, alpha-tested foliage) casts a realtime \
-         shadow and the baked MCSH terrain shadows stand aside; the reference bakes and has no \
-         such switch",
-    ),
-    ours(
-        "characterShadows",
-        "1",
-        "benilla's own: units cast a realtime silhouette instead of the reference's oval blob \
-         decal, which is all 1.12 has and is therefore not a setting there",
-    ),
-    // Realtime-shadow render distance in yards (the shadow-map cascade range + caster reach).
-    // benilla's own — the reference has no realtime shadow to size. Clamped to SHADOW_DISTANCE_RANGE.
-    ours(
-        "shadowDistance",
-        "80",
-        "1900: benilla's own realtime-shadow render-distance slider; the reference bakes MCSH and \
-         has no cascade to size",
-    ),
-    // MONKEY (sun shadow perf): the five live dials over the sun lanes' ~5 ms/frame (RTX 3070,
-    // 1080p, both lanes on: 45-47 fps, and 68-73 with both off). All benilla's own — the reference
-    // bakes MCSH and has no realtime shadow to tune. `shadow_core`'s constants block holds the cost
-    // split each one takes; every row is LIVE, so the whole set A/Bs from one chat line.
-    ours(
-        "shadowMapSize",
-        "2048",
-        "benilla's own: directional shadow-map edge in texels, 1024/2048/4096 (cost is quadratic)",
-    ),
-    ours(
-        "shadowFilter",
-        "1",
-        "benilla's own: shadow PCF kernel: 0 hardware-2x2 (1 sample), 1 gaussian (9, the look)",
-    ),
-    ours(
-        "characterShadowRate",
-        "30",
-        "benilla's own: Hz cap on the character shadow proxy re-skin+upload, 0..120 (0 = per frame)",
-    ),
-    ours(
-        "worldShadowRate",
-        "30",
-        "benilla's own: Hz cap on the world lane's environment caster, 0..120 (0 = per frame)",
-    ),
-    ours(
-        "shadowCasterReach",
-        "1",
-        "benilla's own: multiplier on the shadow caster-collection reach, 0.25..2 (1 = unchanged)",
-    ),
-    // MONKEY (moon shadows): how dark a MOON-shadowed fragment is allowed to get at night — the
-    // dial over the night lane's own shadow term (`benilla_world::lighting::MoonShadowStrength`,
-    // bridged by `dynamic_interior` beside the spell gain). `0` is the FAITHFUL null: every
-    // consumer guards on it, so a night at 0 renders as the build before the feature did — which
-    // is also what the Off and Low presets ask for.
-    ours(
-        "moonShadowStrength",
-        "0.35",
-        "benilla's own: how dark a moon-shadowed fragment gets at night, 0..1 (0 = no moon \
-         shadow, the reference's own night)",
-    ),
-    // MONKEY (dynamic interiors): WMO interiors + their props light from the room's LIVE fixtures
-    // instead of the MOCV bake / the baked prop probe (`static_gx.wgsl` `interior_room_light`;
-    // bridged by `dynamic_interior`). The three numeric knobs are live-tunable from chat —
-    // `/script SetCVar("interiorExposure", 2)` — which is how their defaults were found.
-    ours(
-        "interiorLight",
-        "1",
-        "benilla's own: fixture-lit WMO interiors (0 = the reference's baked interior path)",
-    ),
-    ours(
-        "interiorAmbient",
-        "0.015",
-        "benilla's own: interior base ambient, 0..1",
-    ),
-    ours(
-        "interiorFill",
-        "0.08",
-        "benilla's own: interior per-fixture bounce gain, 0..2",
-    ),
-    ours(
-        "interiorExposure",
-        "2.5",
-        "benilla's own: interior light-budget multiplier before the soft rolloff, 0.25..8",
-    ),
-    // MONKEY (soft falloff): the live scale on every interior fixture's AUTHORED attenuation
-    // window (WMO MOLT `+0x28/+0x2c`; M2 sources bucket by intensity instead — their authored pair
-    // is a template default, not a reach). A fixture's EFFECTIVE RADIUS is `authored end × this`.
-    // The artists' own ends — Goldshire inn 6.97-9.53 yd over 10 fixtures, its blacksmith 6.0,
-    // NSabbey 4.17-5.56, Stormwind's 606 median 6.94 — are where FULL brightness ends, not where
-    // light stops, so `1` drew a hard-edged disc at exactly that radius with black beyond it (the
-    // abbey candelabra ring). **2.5** is the default: the pool now tails smoothly to 2.5× the
-    // authored end, reading ~⅓ of its 1 yd brightness AT the authored end and ~8 % at twice it.
-    // `>1.6` widens further, `<1.6` tightens, `0` switches the window off (the 48 yd lane), so the
-    // whole shape A/Bs from chat.
-    ours(
-        "interiorAttenScale",
-        "1.6",
-        "benilla's own: scale on interior fixtures' authored attenuation window = their effective \
-         radius, 0..8 (0 = no window, the old flat lane)",
-    ),
-    // MONKEY (room gate): whether an interior fixture may light only the rooms it CLAIMS — its
-    // authored MOLR groups unioned with the interior groups whose MOGI bounding box it stands
-    // inside (`LightLitRooms` carries the corpus evidence for why MOLR alone is far too sparse:
-    // the Goldshire inn authors one on 2 of its 12 groups). Off restores the pre-gate behaviour:
-    // every interior fixture in range lights every interior surface in range, so an inn's
-    // ground-floor candles light its basement through the floor. Kept as a dial because a room the
-    // gate leaves on ambient alone looks the same as a bug, and this tells the two apart in one
-    // keystroke.
-    ours(
-        "interiorRoomGate",
-        "1",
-        "benilla's own: an interior fixture lights only the WMO groups it claims (0 = the old \
-         leak-through-walls behaviour)",
-    ),
-    ours(
-        "interiorShadows",
-        "1",
-        "benilla's own: interior fixtures cast real shadows (Stage B, the nearest few); needs \
-         interiorLight",
-    ),
-    // MONKEY (outdoor torch shadows): the outdoor half of the same cube-map lane. Its own row
-    // because it is its own audience (a night camp, a lit village) and its own cost profile — and
-    // because "turn the outdoor shadows off" must not also turn the inn's candles' shadows off.
-    ours(
-        "exteriorShadows",
-        "1",
-        "benilla's own: outdoor fire lights (campfires, braziers, lampposts) cast real shadows at \
-         night; no effect by day",
-    ),
-    // MONKEY (daylight: terrain torch casters): the ground as a torch caster.
-    ours(
-        "torchTerrainShadows",
-        "0",
-        "benilla's own: the ground casts into outdoor fire shadows (hills and banks block a fire's \
-         light); needs exteriorShadows",
-    ),
-    // MONKEY (static torch cache): residency and per-frame work have separate live budgets.
-    ours(
-        "interiorShadowCasters",
-        "12",
-        "benilla's own: resident interior fixture shadow maps, 1..16",
-    ),
-    ours(
-        "interiorShadowDynamic",
-        "4",
-        "benilla's own: nearest promoted fixtures with moving entity shadows, 0..16",
-    ),
-    // MONKEY (torch lane perf): the moving-caster REGATHER cadence. Its own row (and not folded
-    // into `interiorShadowDynamic`) because it trades a different currency: `Dynamic` buys how
-    // MANY fixtures overlay moving casters, this buys how OFTEN the one shared overlay mesh is
-    // rebuilt. Neither of the count dials moved the frame time at all, so the cost was never per
-    // map -- it was this gather + mesh mutation, paid once a frame no matter what the counts said.
-    // `0` is the pre-feature every-frame behaviour, kept as the live A/B.
-    ours(
-        "interiorShadowEntityRate",
-        "30",
-        "benilla's own: how often (Hz) moving torch-shadow casters are regathered; 0 = every frame",
-    ),
-    // MONKEY (torch caster selection): the PCF tap radius on the torch maps. Candle clusters read
-    // very hard-edged at 1 (a half-texel box on a 512² face); 2 is a visible softening for four
-    // extra texel-neighbourhood taps' worth of cache pressure, no extra samples.
-    ours(
-        "interiorShadowSoft",
-        "1.5",
-        "benilla's own: torch-shadow edge softness — the PCF tap radius scale at a CONTACT, 0.5..3",
-    ),
-    // MONKEY (shadow floor): how BLACK a torch shadow is allowed to get. The lane's shadows were
-    // the only occlusion in the direct term and took all of it, which is what made them read as
-    // scars rather than as shadows; 0.7 leaves 30 % standing in place of the bounce light this
-    // renderer does not have. `1` is the shipped look, `0` is off.
-    ours(
-        "torchShadowStrength",
-        "0.7",
-        "benilla's own: torch-shadow darkness — how much of the direct term a shadow removes, 0..1",
-    ),
-    ours(
-        "interiorDebug",
-        "0",
-        "benilla's own: interior diagnostic overlay — 1 classification, 2 shadow, 3 caster count, 4 WMO lane map",
-    ),
-    // MONKEY (darkness gains): the two live dim dials. `nightGain` scales the EXTERIOR day/night
-    // law (the packed ambient/diffuse/specular rows) by `mix(1, gain, night_w)`, so it is exactly
-    // inert by day and full strength after dark; `interiorGain` scales the room lane's inputs (base
-    // ambient, per-fixture fill, and every interior fixture's colour). Both fold in at PACK time in
-    // `build_light_data`, so `SetCVar` moves the whole world on the very next frame — which is how
-    // "20 % / 30 % darker" gets judged at all, and `1` on either is the restore.
-    //
-    // Night gain leaves fire lights alone; interior gain also scales interior fixtures,
-    // including their candlelight. Outdoor fires retain their brightness under both dials.
-    ours(
-        "nightGain",
-        "0.45",
-        "benilla's own: exterior night brightness, 0.2..1.5 (1 = the reference's own night)",
-    ),
-    // MONKEY (lighting debug panel): weaker fresh interiors; persisted gains still win at boot.
-    ours(
-        "interiorGain",
-        "0.5",
-        "benilla's own: WMO interior brightness, 0.2..1.5 (1 = the pre-dial fixture-lit room)",
-    ),
-    // MONKEY (enclosed day floor): the daylight a room INSIDE A BUILDING gets by day, for the
-    // doorways this renderer cannot locate in the data (the Goldshire inn's entry group authors no
-    // portal, no EXT-class batch, no stitched vertex and no bake hot spot — there is nowhere to
-    // stand a fixture). An additive ambient in `interiorAmbient`'s own units, scaled by the sun's
-    // day envelope, so it is exactly 0 at night and the night look never moves. `0` is the restore.
-    ours(
-        "interiorDaylight",
-        "0.0",
-        "benilla's own: daylight floor for rooms inside a building, 0..1 (0 = none, the old look)",
-    ),
-    // MONKEY (fix-daylight): the district window split, gateable (default on = merged behaviour).
-    ours(
-        "daylightWindowSplit",
-        "1",
-        "benilla's own: split city window batches into window-sized daylight apertures (applies to newly loaded buildings)",
-    ),
-    // MONKEY (bake floor): the share of an interior batch's own MOCV bake that survives the live-
-    // fixture lane. The lane throws the bake away and lets the fixtures decide, which leaves a room
-    // no fixture reaches (the Lion's Pride Inn's east vestibule: MOLR 0, no claims, one faded
-    // portal hop) rendering black between a sky-lit porch and a candle-lit hall — something the
-    // reference client cannot do, because it draws every interior batch at its bake regardless of
-    // lights. A fraction of the bake, inside the room law's rolloff, so a lit surface barely moves.
-    ours(
-        "interiorBakeFloor",
-        "0.12",
-        "benilla's own: share of an interior batch's baked light kept where no fixture reaches, 0..1 (0 = the old look)",
-    ),
-    // MONKEY (fire GO lights): the gain on lights SYNTHESISED from a model's flame emitter for the
-    // ~410 fire props the artists never gave a light block (campfires, wall torches, magic
-    // braziers, forges, candles). Live, like the interior knobs — and `0` is the kill switch for
-    // the whole invented-light lane, which matters because unlike everything beside it this one is
-    // a heuristic over content rather than a byte-verified mechanism.
-    ours(
-        "fireLightGain",
-        "1",
-        "benilla's own: brightness of lights synthesised from fire props' flame emitters (0 = off)",
-    ),
-    // MONKEY (spellLightGain): the same dial for the SPELL lane — a kit's aura glow, a missile's
-    // core, an impact flash, a firework's burst. A separate knob from the one above it because the
-    // two are separate judgements: that one tunes SCENERY (how bright is the invented campfire),
-    // this one tunes COMBAT (how hard does a fight flash the room), and a spell light carries both
-    // markers, so one dial over both would mean dimming the world's hearths to calm a fireball.
-    // `0` is this lane's kill switch and reaches nothing else.
-    ours(
-        "spellLightGain",
-        "1",
-        "benilla's own: brightness of spell, missile and impact lights (0 = off)",
-    ),
-    // MONKEY (flame flicker): how hard every FLAME breathes — candles fast and shallow, bonfires
-    // slow and shallower still (`benilla_world::lighting::FlameKind`). Live like the gain beside
-    // it, and `0` restores the steady constants every fire had before the feature, which is the
-    // escape hatch this needs precisely because "subtle" is a judgement call and a flicker that
-    // reads as a strobe is worse than none.
-    ours(
-        "fireFlicker",
-        "1",
-        "benilla's own: how strongly fire lights flicker — 0 steady, 1 default, 2 pronounced",
-    ),
-    // `gxWindow` (`0x63a889`): "0" on enUS; zhCN registers "1", as it does `gxMaximize`
-    // (`0x63a8e0`), and koKR `AutoInteract` (`0x603390`). The knob is
-    // [`crate::video::VideoConfig::display`]. Deviation: "0" raises a borderless fullscreen window
-    // instead of mode-setting the display, because Wayland and macOS offer no mode-set and X11's
-    // leaves the desktop changed after a crash ([`crate::video`]).
-    same("gxWindow", "0").latched(),
-    // `gxResolution`, a string row parsed by `video::on_cvar`. Here it is only the windowed size:
-    // fullscreen is the monitor's own and no mode list is offered.
-    deviates(
-        "gxResolution",
-        "1600x900",
-        "640x480",
-        "narrowed to the WINDOWED size only — fullscreen is the monitor's own and we expose \
-         no mode list, and 640x480 is not a window anyone would ship a client at",
-    )
-    .latched(),
-    // benilla's own: a body pane's doll renders at half the frame rate while the pane is open; the
-    // reference draws it in the main pass. The knob is [`crate::portrait::PaneRate`].
-    ours(
-        "boothHalfRate",
-        "1",
-        "benilla's own — the reference draws its doll inside the main pass and has no \
-         second view to rate-limit",
-    ),
-    // `gxMultisample` (`0x63a950`, flags 3). The reference formats its default from field 21 of the
-    // `VideoHardware.dbc` row `DetectHardware` (`0x641260`) matches, which is 1, no multisampling,
-    // on every fallback row a modern GPU reaches. The knob is [`benilla_world::view::MsaaSetting`],
-    // read once at the camera's spawn; `$WOW_MSAA` overrides it for the session.
-    same("gxMultisample", "1").latched(),
-    // `GetCurrentMultisampleFormat 0x48c580` looks up all three of the Video dropdown's values by
-    // name, so these must exist. They describe the swapchain's own pair and steer nothing;
-    // `SetMultisampleFormat` writes them as `0x48c640` does.
-    deviates(
-        "gxColorBits",
-        "32",
-        "16",
-        "these describe, they do not steer — the pair is our swapchain's own, and every \
-         format `MsaaFormats` publishes carries it",
-    )
-    .latched(),
-    deviates(
-        "gxDepthBits",
-        "32",
-        "16",
-        "as `gxColorBits` — the depth half of the same descriptive pair",
-    )
-    .latched(),
-    // `trilinear` and `anisotropic`, over `benilla_assets::TexFilterSetting` (`tex_filter.rs`
-    // carries the derivation). A change applies at the next launch, since a sampler is baked into
-    // each texture at load; the reference's UI says "enabled upon restart".
-    // `$WOW_TRILINEAR`/`$WOW_ANISO` override for the session.
-    //
-    // `trilinear` registers "0", but `hwDetect` runs `DetectHardware 0x641260` and sets it from the
-    // matched `VideoHardware.dbc` row before the first frame; the fallback rows an unlisted GPU
-    // reaches are 168/169/170, and 169 and 170 give 1. The reference install's `gx.log` resolves to
-    // videoID 170.
-    overridden(
-        "trilinear",
-        "1",
-        "0",
-        "`hwDetect` sets it from `VideoHardware.dbc` field 9 before the first frame, and \
-         that field is 1 on both fallback rows an unlisted modern GPU can reach — measured on the \
-         reference's own `Logs/gx.log` (`videoID: 170`)",
-    ),
-    // Not one of `hwDetect`'s sixteen (`[0x639a60, 0x639b80)` never reads `0xc7f2e4`), so the
-    // registered "1", off, stands.
-    same("anisotropic", "1"),
-    // Weather Intensity (`OptionsFrame.lua:33`), registered "2" (`0x67b806`, flags 0, callback
-    // `0x67b870`, name `0x8685ac`). The reader is `benilla_world::weather::WeatherState`, which
-    // scales the precipitation spawn rate by `0x67b870`'s table {0.1, 0.33, 0.66, 1.0}; rendering
-    // only.
-    deviates(
-        "weatherDensity",
-        "3",
-        "2",
-        "every precipitation rate in `benilla-world`'s own precipitation module was \
-         derived and graded against the reference install's own apitrace captures, and that \
-         install runs \
-         `SET weatherDensity \"3\"` (K = 1.0) — so 3 is the value a benilla-vs-reference \
-         side-by-side is correct at, and the registered 2 would thin every rate to 0.66 against \
-         the only client we compare with. The slider is how a player takes it back down",
-    ),
-    // `gamma` (`0x402d70`: name `0x82e924` "Gamma", default `0x82e92c` "1.0", flags 0, callback
-    // `0x4034d0`). The reference uploads `pow(i/255, gamma)` (`0x591680`) through
-    // `SetDeviceGammaRamp`, except when windowed (`byte[dev+0x20b]`). Deviation: benilla, which
-    // has no exclusive mode, applies the same curve in the composite pass
-    // ([`crate::ui_gamma::DisplayGamma`]), because the skipped upload would make a slider that
-    // moves no pixel. Spelled "1.000000" because `SetGamma 0x4891f0` formats with `"%f"`, and
-    // Restore Defaults must compare equal to the default; [`sync_cvars`] seeds it the same way.
-    same("gamma", "1.000000"),
-    // benilla's own: the world renders at `window × this` while the UI stays native. The knob is
-    // [`crate::world_backdrop::RenderScale`], clamped to `RENDER_SCALE_RANGE`; at "1" nothing is
-    // resampled. `$WOW_RENDER_SCALE` overrides it for the session.
-    ours(
-        "renderScale",
-        "1",
-        "benilla's own — the reference has no off-screen buffer to hang a resolution dial \
-         on; its nearest equivalent, `gxResolution`, drops the interface with the world",
-    ),
-    // benilla's own: `/console fpsJournal 1` appends a per-second row of position, frame cost and
-    // per-pass GPU time to `benilla-config/Diagnostics/fps-journal.csv`. The knob is
-    // [`crate::perf::FpsJournalSetting`].
-    ours(
-        "fpsJournal",
-        "0",
-        "benilla's own — 1.12 has no player-side perf log; its nearest thing is the \
-         Ctrl+R framerate label, a number with no file behind it",
-    ),
-    // `lastCharacterIndex` (`0x402d93`, "0" `0x82e570`, category 4, handle `[0x882674]`), help
-    // "Last character selected": a 0-based row (the selection cell `[0x83856c]` under `"%d"`), so
-    // "0" is the first character. It mirrors [`crate::char_select::Roster::pending_index`].
-    same(crate::char_select::CVAR_LAST_CHARACTER, "0"),
-];
+mod table;
+#[cfg(test)]
+use table::Reference;
+pub(crate) use table::{registered_pairs, REGISTERED};
 
 /// `config.toml`: a `[cvars]` table of `Name = "value"` strings, sorted so every save is stable.
 #[derive(serde::Serialize, serde::Deserialize, Default)]
@@ -1193,6 +217,22 @@ impl Cvars {
         self.last_change = Some(Instant::now());
     }
 
+    /// Remove a `config.toml` entry no row claims, a setting retired from the table, and return
+    /// its value; the next save writes the file without it.
+    pub(crate) fn retire_file_entry(&mut self, name: &str) -> Option<String> {
+        if self.index.contains_key(&name.to_ascii_lowercase()) {
+            return None;
+        }
+        let key = self
+            .file
+            .keys()
+            .find(|k| k.eq_ignore_ascii_case(name))?
+            .clone();
+        let value = self.file.remove(&key);
+        self.touch();
+        value
+    }
+
     /// A write from either side of the VM boundary. A `from_vm` write is not echoed back, but a
     /// refusal is, because the mirror already stored the refused value.
     fn write(&mut self, name: &str, value: &str, from_vm: bool) -> SetOutcome {
@@ -1587,10 +627,16 @@ impl Plugin for CvarPlugin {
             // After the tick, so a `SetCVar` from this frame reaches the registry and its observers
             // before the frame's drains; `video::drain_restart_gx` orders after this so the commit
             // finds the stage.
-            .add_systems(Update, sync_cvars.after(crate::ui_script::UiInput));
-        // The save runs on the exit edge: the close button's `AppExit` is written in `PostUpdate`,
-        // and `Last` still runs after `sync_cvars`.
-        crate::shutdown::on_app_exit(app, save_config.into_configs());
+            .add_systems(Update, sync_cvars.after(crate::ui_script::UiInput))
+            // In `Last`, after every `Update` writer of the registry, so the save reads the frame's
+            // settled state; before the exit flush, which finds it clean on a quiet exit frame.
+            .add_systems(
+                Last,
+                save_config_when_quiet.before(crate::shutdown::OnAppExit),
+            );
+        // The exit flush runs on the exit edge: the close button's `AppExit` is written in
+        // `PostUpdate`, so an `Update` save never sees it.
+        crate::shutdown::on_app_exit(app, save_config_on_exit.into_configs());
     }
 }
 
@@ -1962,6 +1008,7 @@ fn session_values(world: &World) -> Vec<(&'static str, Option<String>)> {
             "gxWindow",
             v.map(|c| flag(c.display == crate::video::DisplayMode::Windowed)),
         ));
+        out.push(("gxMaximize", v.map(|c| flag(c.maximize))));
         out.push((
             "gxResolution",
             v.map(|c| format!("{}x{}", c.windowed.x, c.windowed.y)),
@@ -2249,17 +1296,23 @@ const HEADER: &str = "\
 # Managed by the client; hand edits are read on next launch and preserved on save.
 ";
 
-/// Dirty and one quiet second, or the app exiting: rewrite `config.toml` atomically from the
-/// registry, so a session with no VM saves what it changed.
-fn save_config(mut cvars: ResMut<Cvars>, mut exits: MessageReader<AppExit>) {
-    let exiting = exits.read().next().is_some();
-    if !cvars.dirty {
-        return;
+/// Dirty and one quiet second since the last change: save, so a crash loses at most that second.
+fn save_config_when_quiet(mut cvars: ResMut<Cvars>) {
+    if cvars.dirty && cvars.last_change.is_none_or(|t| t.elapsed() >= SAVE_QUIET) {
+        write_config(&mut cvars);
     }
-    let quiet = cvars.last_change.is_none_or(|t| t.elapsed() >= SAVE_QUIET);
-    if !(quiet || exiting) {
-        return;
+}
+
+/// The exit frame: save whatever is still dirty, quiet second or not.
+fn save_config_on_exit(mut cvars: ResMut<Cvars>) {
+    if cvars.dirty {
+        write_config(&mut cvars);
     }
+}
+
+/// Rewrite `config.toml` atomically from the registry, so a session with no VM saves what it
+/// changed.
+fn write_config(cvars: &mut Cvars) {
     let Some(path) = crate::local_state::config_path() else {
         cvars.dirty = false; // hermetic/session-only: nothing to write, stop retrying
         return;
@@ -2305,16 +1358,14 @@ mod tests {
     use crate::chat_bubble::BubbleConfig;
     use crate::minimap::MinimapZoom;
     use crate::nameplates::NameConfig;
-    use crate::player::camera::{
-        FollowConfig, FollowStyle, LookConfig, ZoomLimit, FOLLOW_SPEED_RANGE,
-    };
+    use crate::player::camera::{FollowConfig, FollowStyle, LookConfig, FOLLOW_SPEED_RANGE};
+    use crate::player::camera_zoom::ZoomLimit;
     use crate::portrait::PaneRate;
     use crate::sound::SoundConfig;
     use crate::target::ClickConfig;
     use crate::ui_loot::LootConfig;
     use crate::ui_script::{UiScaleCvar, DEFAULT_UI_SCALE};
     use crate::video::VideoConfig;
-    use crate::vplates::VPlateMode;
     use crate::world_backdrop::{RenderScale, RENDER_SCALE_RANGE};
     use benilla_ui::widget::MINIMAP_ZOOM_LEVELS;
     use benilla_world::clutter::ClutterConfig;
@@ -2444,6 +1495,7 @@ mod tests {
             LookConfig::default().invert_pitch
         );
         assert_eq!(d["mousespeed"], LookConfig::default().sensitivity);
+        assert_eq!(d["cameraDistanceMax"], ZoomLimit::default().distance_max());
         assert_eq!(d["cameraDistanceMaxFactor"], ZoomLimit::default().factor());
         let follow = FollowConfig::default();
         assert_eq!(
@@ -2522,13 +1574,6 @@ mod tests {
             d["weatherDensity"],
             f32::from(benilla_world::weather::WeatherState::default().weather_density)
         );
-        let plates = VPlateMode::default();
-        assert_eq!(d[crate::vplates::CVAR_ENEMIES] != 0.0, plates.enemies);
-        assert_eq!(d[crate::vplates::CVAR_FRIENDS] != 0.0, plates.friends);
-        assert!(
-            !plates.enemies && !plates.friends,
-            "a fresh 1.12 client draws no plates until V is pressed"
-        );
         // `ClutterConfig::default()` reads `$WOW_CLUTTER_DENSITY`; stop 1 is its env-less ×2.
         assert_eq!(d["WorldDetail"], 1.0);
         assert_eq!(
@@ -3212,6 +2257,53 @@ mod tests {
         assert_eq!(cvars.get("waterQuality"), Some("1"));
     }
 
+    /// The FFX pass's three switches reach it one by one (`ffx`, `ffxGlow`, `ffxDeath`).
+    #[test]
+    fn the_ffx_switches_reach_the_pass() {
+        use benilla_world::ffx_glow::FfxSwitches;
+        let mut app = cvar_app();
+        let on = FfxSwitches::default();
+        assert_eq!(*res::<FfxSwitches>(&app), on);
+        apply(&mut app, "ffxGlow", "0");
+        assert_eq!(*res::<FfxSwitches>(&app), FfxSwitches { glow: false, ..on });
+        apply(&mut app, "ffxglow", "1");
+        apply(&mut app, "ffxDeath", "0");
+        assert_eq!(
+            *res::<FfxSwitches>(&app),
+            FfxSwitches { death: false, ..on }
+        );
+        apply(&mut app, "ffxDeath", "1");
+        apply(&mut app, "ffx", "0");
+        assert_eq!(
+            *res::<FfxSwitches>(&app),
+            FfxSwitches {
+                master: false,
+                ..on
+            }
+        );
+    }
+
+    /// `gxMaximize` registers latched (flags 3): a write is staged and moves nothing until the
+    /// `RestartGx` commit, where the window knob takes it.
+    #[test]
+    fn gx_maximize_waits_for_the_restart_commit() {
+        let mut app = cvar_app();
+        let outcome = app
+            .world_mut()
+            .resource_mut::<Cvars>()
+            .set("gxMaximize", "1");
+        assert_eq!(outcome, SetOutcome::Staged);
+        let events = app.world_mut().resource_mut::<Cvars>().take_events();
+        assert!(events.is_empty(), "a staged write fires no callback");
+        assert!(!res::<VideoConfig>(&app).maximize);
+        assert_eq!(app.world_mut().resource_mut::<Cvars>().commit_latched(), 1);
+        let events = app.world_mut().resource_mut::<Cvars>().take_events();
+        for event in events {
+            app.world_mut().trigger(event);
+        }
+        assert!(res::<VideoConfig>(&app).maximize, "the commit applies it");
+    }
+
     #[test]
     fn the_observers_apply_every_arm() {
         let mut app = cvar_app();
@@ -3341,11 +2433,25 @@ mod tests {
             res::<FollowConfig>(&app).yaw_speed,
             *FOLLOW_SPEED_RANGE.end()
         );
-        // The max-orbit factor lands as YARDS on the knob (base 15 x factor), clamped to 1..2.
+        // The max orbit lands as yards on the knob: `cameraDistanceMax` x the factor, held to
+        // [0, 50]; the factor is not held to its slider's 1 to 2.
         apply(&mut app, "cameraDistanceMaxFactor", "1");
         assert_eq!(res::<ZoomLimit>(&app).max, 15.0);
-        apply(&mut app, "cameradistancemaxfactor", "5");
-        assert_eq!(res::<ZoomLimit>(&app).max, 30.0);
+        apply(&mut app, "cameradistancemaxfactor", "3");
+        assert_eq!(res::<ZoomLimit>(&app).max, 45.0);
+        apply(&mut app, "cameraDistanceMaxFactor", "1");
+        apply(&mut app, "cameraDistanceMax", "25");
+        assert_eq!(res::<ZoomLimit>(&app).max, 25.0);
+        apply(&mut app, "cameraDistanceMaxFactor", "3");
+        assert_eq!(res::<ZoomLimit>(&app).max, 50.0);
+        apply(&mut app, "cameraDistanceMaxFactor", "-1");
+        assert_eq!(res::<ZoomLimit>(&app).max, 0.0);
+        apply(&mut app, "cameraDistanceMaxFactor", "nan");
+        assert_eq!(res::<ZoomLimit>(&app).max, 50.0);
+        // Out of `cameraDistanceMax`'s validator range: refused at the knob, 25 stands.
+        apply(&mut app, "cameraDistanceMaxFactor", "1");
+        apply(&mut app, "cameraDistanceMax", "60");
+        assert_eq!(res::<ZoomLimit>(&app).max, 25.0);
         apply(&mut app, "autoLootDefault", "1");
         assert!(res::<LootConfig>(&app).auto_loot);
         apply(&mut app, "showLootSpam", "0");
@@ -3358,10 +2464,6 @@ mod tests {
         assert!(!res::<NameConfig>(&app).npc);
         apply(&mut app, "unitnameown", "1");
         assert!(res::<NameConfig>(&app).own);
-        apply(&mut app, crate::vplates::CVAR_ENEMIES, "0");
-        assert!(!res::<VPlateMode>(&app).enemies);
-        apply(&mut app, "nameplateshowfriends", "1");
-        assert!(res::<VPlateMode>(&app).friends);
         apply(&mut app, "ChatBubbles", "0");
         assert!(!res::<BubbleConfig>(&app).all);
         apply(&mut app, "chatbubblesparty", "0");
@@ -3460,6 +2562,17 @@ mod tests {
                 "{key}: RestoreVideoDefaults would restore it, and nothing registers it"
             );
         }
+        // The video pairs and `SetWorldDetail`'s `smallCull` write by name; a missing row would
+        // warn and store nothing.
+        for key in benilla_ui::script::VIDEO_PAIR_CVARS
+            .iter()
+            .chain([&benilla_ui::script::CVAR_SMALL_CULL])
+        {
+            assert!(
+                REGISTERED.iter().any(|r| r.name.eq_ignore_ascii_case(key)),
+                "{key}: a video verb writes it, and nothing registers it"
+            );
+        }
         for (n, frill) in benilla_ui::script::WORLD_DETAIL_STOPS.iter().enumerate() {
             assert_eq!(
                 *frill,
@@ -3481,6 +2594,37 @@ mod tests {
         }
         apply(&mut app, "WorldDetail", "1");
         assert_eq!(res::<ClutterConfig>(&app).density, 2.0);
+        // A stop set as a CVar keeps `SmallCull` in step, as `SetWorldDetail` writes it.
+        apply(&mut app, "WorldDetail", "0");
+        assert_eq!(
+            res::<Cvars>(&app).get(benilla_ui::script::CVAR_SMALL_CULL),
+            Some("0.070000")
+        );
+        apply(&mut app, "WorldDetail", "1");
+        assert_eq!(
+            res::<Cvars>(&app).get(benilla_ui::script::CVAR_SMALL_CULL),
+            Some("0.040000")
+        );
+        // Spell Detail: `SStrToInt`, clamp, then the shared emission scalar (`0x689510`).
+        for (level, scale) in [
+            ("0", 0.33),
+            ("1", 0.66),
+            ("2", 1.0),
+            ("-3", 0.33),
+            ("7", 1.0),
+        ] {
+            apply(&mut app, "spellEffectLevel", level);
+            assert_eq!(
+                res::<benilla_world::particles::ParticleTuning>(&app).density(),
+                scale,
+                "spellEffectLevel {level}"
+            );
+            assert_eq!(
+                res::<crate::video::SpellEffectLevel>(&app).0,
+                level.parse::<i32>().unwrap(),
+                "the record's integer, unclamped, for the shard emitter"
+            );
+        }
         apply(&mut app, "minimapZoom", "5");
         assert_eq!(res::<MinimapZoom>(&app).outdoor, 5);
         assert_eq!(
@@ -3497,6 +2641,28 @@ mod tests {
         assert_eq!(apply(&mut app, "bogus", "1"), SetOutcome::Unknown);
     }
 
+    /// `/console spellEffectLevel 0` prints the handler's own line (`0x689537`-`0x689554`, format
+    /// `0x869f94`) with the level it clamped to; a Lua write logs it instead.
+    #[test]
+    fn the_spell_effect_level_handler_echoes_to_the_console() {
+        let mut app = cvar_app();
+        app.init_resource::<crate::console::ConsoleEcho>();
+        assert_eq!(
+            crate::console::execute(app.world_mut(), "spellEffectLevel 0"),
+            ["Spell effect level set to 0."]
+        );
+        assert_eq!(
+            crate::console::execute(app.world_mut(), "spellEffectLevel 9"),
+            ["Spell effect level set to 2."]
+        );
+        assert_eq!(res::<Cvars>(&app).get("spellEffectLevel"), Some("9"));
+        assert_eq!(
+            crate::console::execute(app.world_mut(), "farclip 400"),
+            Vec::<String>::new(),
+            "a callback that prints nothing adds nothing"
+        );
+    }
+
     #[test]
     fn compose_writes_the_diff_and_preserves_what_it_does_not_own() {
         let mut cvars = Cvars::default();
@@ -3519,6 +2685,46 @@ mod tests {
         assert_eq!(out.get("FutureKnob").map(String::as_str), Some("3"));
     }
 
+    #[test]
+    fn a_change_saves_after_one_quiet_second_with_no_exit() {
+        use crate::local_state::test_env::{EnvGuard, ENV_LOCK};
+        let _l = ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let tmp = std::env::temp_dir().join(format!("benilla-cvar-quiet-{}", std::process::id()));
+        std::fs::remove_dir_all(&tmp).ok();
+        let _c = EnvGuard::unset("WOW_CAPTURE");
+        let _u = EnvGuard::unset("WOW_UI_SCALE");
+        let _f = EnvGuard::unset("WOW_FARCLIP");
+        let _d = EnvGuard::unset("WOW_CLUTTER_DENSITY");
+        let _h = EnvGuard::set("BENILLA_HOME", tmp.to_str().unwrap());
+
+        let mut app = cvar_app();
+        app.update();
+        app.world_mut()
+            .non_send_resource_mut::<UiScript>()
+            .run(r#"SetCVar("MusicVolume", 0.75)"#)
+            .unwrap();
+        app.update();
+        assert!(
+            !tmp.join("config.toml").exists(),
+            "inside the quiet second nothing is written"
+        );
+
+        // The change ages past the quiet second; no `AppExit` anywhere.
+        {
+            let mut cvars = app.world_mut().resource_mut::<Cvars>();
+            assert!(cvars.dirty);
+            cvars.last_change = Instant::now().checked_sub(SAVE_QUIET * 2);
+        }
+        app.update();
+        let text = std::fs::read_to_string(tmp.join("config.toml")).unwrap();
+        assert!(text.contains("MusicVolume = \"0.75\""), "{text}");
+        assert!(!app.world().resource::<Cvars>().dirty);
+        assert!(app.should_exit().is_none());
+        std::fs::remove_dir_all(&tmp).ok();
+    }
+
     #[test]
     fn a_lua_setcvar_lands_in_config_toml_end_to_end() {
         use crate::local_state::test_env::{EnvGuard, ENV_LOCK};
@@ -3606,18 +2812,20 @@ mod tests {
             .init_resource::<crate::combat_text::DamageTextGates>()
             .init_resource::<crate::ui_chat::combat::LogPeriodicSpells>()
             .init_resource::<benilla_world::weather::WeatherState>()
+            .init_resource::<benilla_world::particles::ParticleTuning>()
+            .init_resource::<crate::video::SpellEffectLevel>()
             .init_resource::<crate::ui_gamma::DisplayGamma>()
             .init_resource::<ClickConfig>()
             .init_resource::<crate::target::AssistAttack>()
             .init_resource::<LootConfig>()
             .init_resource::<NameConfig>()
-            .init_resource::<VPlateMode>()
             .init_resource::<ClutterConfig>()
             .init_resource::<MinimapZoom>()
             .init_resource::<BubbleConfig>()
             .init_resource::<ZoomLimit>()
             .init_resource::<FollowConfig>()
             .init_resource::<VideoConfig>()
+            .init_resource::<benilla_world::ffx_glow::FfxSwitches>()
             // Literal, not Default: RenderScale::default() reads $WOW_RENDER_SCALE.
             .insert_resource(RenderScale(1.0))
             // Literal: `Realmlist::default()` reads `$WOW_HOST`.
@@ -3692,9 +2900,6 @@ mod tests {
         |app| {
             app.add_observer(crate::nameplates::on_cvar);
         },
-        |app| {
-            app.add_observer(crate::vplates::on_cvar);
-        },
         |app| {
             app.add_observer(crate::game_tip::on_cvar);
         },
@@ -4214,6 +3419,33 @@ mod tests {
                 "useUiScale",
                 "UIOptionsFrame.lua and OptionsFrame.lua branch on it to gate the uiScale slider",
             ),
+            (
+                "DesktopGamma",
+                "OptionsFrame.lua's Use Desktop Gamma box, recorded at open and put back on close",
+            ),
+            (
+                "pixelShaders",
+                "OptionsFrame.lua's Enable All Shaders box, which its Okay copies into `ffx`",
+            ),
+            ("specular", "OptionsFrame.lua's Terrain Highlights box"),
+            (
+                "M2UseShaders",
+                "OptionsFrame.lua's Vertex Animation Shaders box",
+            ),
+            ("M2UsePixelShaders", "OptionsFrame.lua's Phong Shading box"),
+            ("lod", "OptionsFrame.lua's World LOD box"),
+            (
+                "movieSubtitle",
+                "OptionsFrame.lua's Cinematic Subtitles box",
+            ),
+            (
+                "useWeatherShaders",
+                "OptionsFrame.lua's Weather Shaders box",
+            ),
+            ("gxTripleBuffer", "OptionsFrame.lua's Triple Buffering box"),
+            ("gxCursor", "OptionsFrame.lua's Hardware Cursor box"),
+            ("gxFixLag", "OptionsFrame.lua's Fix Input Lag box"),
+            ("gxRefresh", "OptionsFrame.lua's refresh-rate dropdown"),
         ];
         let app_src = crate::test_support::src_dir();
         let ui_src = app_src
@@ -4228,7 +3460,7 @@ mod tests {
             .chain(crate::test_support::rust_files(&ui_src))
         {
             let rel = file.to_string_lossy().replace('\\', "/");
-            if rel.ends_with("/cvars.rs") && rel.contains("benilla-app") || rel.contains("tests") {
+            if rel.contains("benilla-app/src/cvars/") || rel.contains("tests") {
                 continue;
             }
             let text = std::fs::read_to_string(&file).expect("source is readable");
@@ -4280,9 +3512,14 @@ mod tests {
                 "SoundBufferSize",
                 "gxApi",
                 "gxColorBits",
+                "gxCursor",
                 "gxDepthBits",
+                "gxFixLag",
+                "gxMaximize",
                 "gxMultisample",
+                "gxRefresh",
                 "gxResolution",
+                "gxTripleBuffer",
                 "gxVSync",
                 "gxWindow",
             ]
@@ -4293,7 +3530,7 @@ mod tests {
 
     /// The value the reference boots a row at, as its [`Reference`] column records it; `None`
     /// for benilla's own rows (nothing to match).
-    fn reference_boot_value(row: &Registered) -> Option<&'static str> {
+    fn reference_boot_value(row: &super::table::Registered) -> Option<&'static str> {
         match &row.reference {
             Reference::Same(v) => Some(v),
             // The reference's own boot code lands where our default does.
diff --git a/crates/benilla-app/src/cvars/table.rs b/crates/benilla-app/src/cvars/table.rs
new file mode 100644
index 00000000..0cbf81de
--- /dev/null
+++ b/crates/benilla-app/src/cvars/table.rs
@@ -0,0 +1,1110 @@
+//! The registry's table: every host-backed CVar, its default, and that default's standing against
+//! the reference's registered one ([`Reference`]). The runtime that holds the live values is the
+//! parent module.
+
+/// One host-backed CVar: its name, benilla's default, and where that default stands against the
+/// reference's ([`Reference`]).
+pub(crate) struct Registered {
+    /// The registered name, in the reference's own spelling.
+    pub(crate) name: &'static str,
+    /// What a fresh `benilla-config` runs at, and what `GetCVar` answers until the player moves it.
+    pub(crate) default: &'static str,
+    /// Where `default` stands against the reference's. Read only by the tests: it records the
+    /// reference, never a value this client acts on.
+    #[allow(dead_code)]
+    pub(crate) reference: Reference,
+    /// Registered with flag bit1 (`rec+0x1c & 0x2`, `flags` 2 or 3 at the register site): a write
+    /// is staged in [`super::Row::pending`] until [`super::Cvars::commit_latched`].
+    pub(crate) latched: bool,
+}
+
+impl Registered {
+    /// Mark the row latched.
+    pub(crate) const fn latched(self) -> Self {
+        Self {
+            latched: true,
+            ..self
+        }
+    }
+}
+
+/// benilla's default against the reference's: the string the reference's `CVar::Register`
+/// (`0x63db90`) passes for the name, or, for a setting 1.12 keeps in FrameXML, the value
+/// `UIOptionsFrame.lua` boots it at. Not a `Config.wtf` line (`SaveConfig 0x63d980` writes only
+/// values off their default), and not always what a fresh install runs at: `hwDetect` rewrites
+/// sixteen video CVars from `VideoHardware.dbc` before the first frame ([`Reference::Overridden`]).
+/// Each row's register site or FrameXML line is cited above it.
+#[allow(dead_code)] // read only by the tests
+pub(crate) enum Reference {
+    /// The reference registers this default and benilla ships it; the test compares the two.
+    Same(&'static str),
+    /// The reference registers `registered`, but its own boot code overwrites it before the first
+    /// frame; `default` is where that lands, and `why` is the override.
+    Overridden {
+        registered: &'static str,
+        why: &'static str,
+    },
+    /// The reference ships `value` and benilla ships another; `why` is the reason.
+    Deviates {
+        value: &'static str,
+        why: &'static str,
+    },
+    /// No reference setting to match: benilla's own knob, or a later-era name for something 1.12
+    /// never made settable. `why` says which, and what the reference does instead.
+    Ours(&'static str),
+}
+
+/// A row whose default is the reference's own registered string.
+const fn same(name: &'static str, default: &'static str) -> Registered {
+    Registered {
+        name,
+        default,
+        reference: Reference::Same(default),
+        latched: false,
+    }
+}
+
+/// A row whose default follows the reference's boot-time override of its registered string.
+const fn overridden(
+    name: &'static str,
+    default: &'static str,
+    registered: &'static str,
+    why: &'static str,
+) -> Registered {
+    Registered {
+        name,
+        default,
+        reference: Reference::Overridden { registered, why },
+        latched: false,
+    }
+}
+
+/// A row that ships something other than the reference's `value`, for `why`.
+const fn deviates(
+    name: &'static str,
+    default: &'static str,
+    value: &'static str,
+    why: &'static str,
+) -> Registered {
+    Registered {
+        name,
+        default,
+        reference: Reference::Deviates { value, why },
+        latched: false,
+    }
+}
+
+/// A row the reference has no counterpart for.
+const fn ours(name: &'static str, default: &'static str, why: &'static str) -> Registered {
+    Registered {
+        name,
+        default,
+        reference: Reference::Ours(why),
+        latched: false,
+    }
+}
+
+/// The table as the script VM's registrar wants it: `(name, default)` pairs in table order.
+pub(crate) fn registered_pairs() -> impl Iterator<Item = (&'static str, &'static str)> {
+    REGISTERED.iter().map(|r| (r.name, r.default))
+}
+
+/// The host-backed CVars, one row per knob that has a reader: a host knob, or a Lua consumer
+/// such as the stock Video Options window's verbs.
+///
+/// Not registered for want of a reader, though pfUI's `hdgraphic` writes them: `lodDist`
+/// (`0x688524`, "100.0", read at `0x6afb1d` for the doodad LOD swap), `footstepBias` (`0x6888b4`,
+/// "0.125", read at `0x68fcb6`), `mapObjLightLOD` (`0x6886ec`, "0") and `SkyCloudLOD` (`0x6d1d33`,
+/// "0"). `DistCull` (`0x688570`) has no reader in the reference either. `maxLOD` is no 1.12 CVar.
+pub(crate) const REGISTERED: &[Registered] = &[
+    // `realmName` (`0x83f2d0`): registered `""` (`0x882748`), help "Last realm connected to"
+    // (`0x85d684`); the client builds its SavedVariables path from it (`0x5ab7d0`). Written from
+    // the session's realm when addons load. `Ace/AceState.lua:27` trims it at
+    // PLAYER_ENTERING_WORLD, so a nil breaks every Ace addon.
+    same("realmName", ""),
+    // The logon server address (register site `0x5ab6a6`), a string row judged by
+    // `realmlist::on_cvar`.
+    deviates(
+        crate::realmlist::CVAR_REALMLIST,
+        crate::realmlist::DEFAULT_REALMLIST,
+        "us.logon.worldofwarcraft.com:3724",
+        "that host has not resolved since 2019, so shipping it makes every first launch a \
+         DNS failure; benilla dials the machine it is running on",
+    ),
+    // `autoClearAFK` (`0x5e24d4`, "1" `0x82e748`, handle `[0xc4d68c]` set at `0x5e24ef`, read at
+    // `0x5eb84b`) gates five implicit AFK clears: any chat send but type `0x14`, Jump,
+    // forward/back, strafe and turn (`0x513d36`/`0x514e23`/`0x514f0b`/`0x514fca`). Off, the clear
+    // does nothing at all: no echo, no mirror write, no packet.
+    same("autoClearAFK", "1"),
+    same("MasterVolume", "1"),
+    same("SoundVolume", "1"),
+    same("MusicVolume", "0.4"),
+    same("AmbienceVolume", "0.6"),
+    // Registered "1" at `0x45737a`/`0x45739b`/`0x460a9d`. `MasterSoundEffects` is the Enable All
+    // Sound box (`SoundOptionsFrame.lua:6`), which pauses the whole sound engine, not an SFX
+    // toggle.
+    same("MasterSoundEffects", "1"),
+    same("EnableMusic", "1"),
+    same("EnableAmbience", "1"),
+    // The race/sex refusal voice lines (`0x457877`), `SoundOptionsFrame.lua:3`; the master enable
+    // greys it.
+    same("EnableErrorSpeech", "1"),
+    // Not a 1.12 CVar or checkbox; the later-era name. The reference mutes on losing focus, music
+    // included (`WM_ACTIVATE` to `0x7a4860`'s `FSOUND_SetMute(-3, active ? 0 : 1)`), so "0" is its
+    // behaviour. The knob is `SoundConfig::background_sound`.
+    same("Sound_EnableSoundWhenGameIsInBG", "0"),
+    // Registered "1" (`0x4573be`); `SoundConfig::reverb` carries the evidence for shipping "0".
+    deviates(
+        "SoundReverb",
+        "0",
+        "1",
+        "the reference's reverb is EAX-over-hardware, and that hardware has not existed since \
+         Vista, so \"1\" would ship audio the real client has never actually produced on any \
+         machine a player runs today",
+    ),
+    // FMOD 3's mix-ahead buffer in ms (`0x4571ca`, flags 2: read once at sound init); here it sizes
+    // the render thread's ring ahead of the IO callback (`sound::output`). `0x457520` registers
+    // "50" or "100" by a host probe (`0x835e10`/`0x835e0c`), which one on a current machine
+    // untraced; ours is the larger, since the depth has to hide a whole stalled IO cycle.
+    same("SoundBufferSize", "100").latched(),
+    // benilla's own, not a 1.12 CVar. Deviation: the reference clips at full scale and has no
+    // headroom mechanism (its SFX-bus duck `0x457960` is a sidechain armed only by server-pushed
+    // voice lines); benilla limits because every SFX is mastered to full scale and overlapping
+    // kits clip.
+    ours(
+        "SoundOutputLimiter",
+        "1",
+        "benilla's own — the reference sums at full scale and clips; every WoW SFX is mastered \
+         to full scale, so overlapping kits need a limiter to keep from distorting",
+    ),
+    overridden(
+        "uiScale",
+        "0.9",
+        "1.0",
+        "a fresh reference client never consults this CVar: `useUiScale` registers \"0\" \
+         (`0x48fce4`), and the OFF leg `0x492f70` computes clamp(768/height, 0.9, 1.0) instead — \
+         0.9 at 854 px tall and up, which is every window we ship against. It is 1.0 at 768 and \
+         below, where our flat 0.9 does diverge; `ui_script::DEFAULT_UI_SCALE` carries that. \
+         See `useUiScale` below, whose row this one used to say did not exist",
+    ),
+    // `useUiScale` (`0x8430c0`), the switch the `uiScale` override gates on:
+    // `ContainerFrame.lua:483` and `UIDropDownMenu.lua:525` branch on it and `OptionsFrame.lua:13`
+    // gives it a checkbox.
+    same("useUiScale", "0"),
+    same("farclip", "350"),
+    // `nearclip` (`0x68867a`: name `0x84ffb0`, default `0x84fb48` "0.1", flags 1, callback
+    // `0x688d90`, record `[0xc7f348]`). The camera re-reads the record every frame: `0x511bc0`
+    // (sole caller `0x483094`) stamps `[cam+0x38]` from it through the handle `[0xbe1078]` that
+    // `0x50b728` caches, overwriting the ctor's 1/9 (`0x3de38e39`);
+    // `benilla_world::view::stamp_near_clip` is that.
+    // The callback's derived global `[0xc7b480]` has no reader. pfUI's `hdgraphic` writes
+    // 0.06..0.30, inside `[0.01, 0.33]`.
+    same("nearclip", "0.1"),
+    // `deselectOnClick` and `mouseInvertPitch` are 1.12's own (`UIOptionsFrame.lua:8,4`);
+    // `autoLootDefault` is the later-era name, 1.12 having only the shift gesture.
+    same("deselectOnClick", "1"),
+    // `AutoInteract` (`0x603390`, record `[0xc4d9a4]`), Click-to-Move (`UIOptionsFrame.lua:7`):
+    // "1" on koKR alone (`0x603368`). The knob is [`crate::player::Approach`].
+    same("AutoInteract", "0"),
+    // `BlockTrades` (`0x842fbc`), `UIOptionsFrame.lua:11`: the refusal leg `0x4bf7bc` fires only
+    // when it is set. The knob is [`crate::ui_trade::BlockTrades`].
+    same("BlockTrades", "0"),
+    // `autoSelfCast` (register site `0x6e731d`, record `[0xceac34]`, read at `0x6e53d7`; `0x870dc0`
+    // is its name string): a friendly cast that binds nothing falls back to the caster.
+    // `TOGGLEAUTOSELFCAST` toggles it.
+    same("autoSelfCast", "0"),
+    // The five saved camera views and the live index, at the reference's names and default strings;
+    // owned by [`crate::player::camera_view`]. Registered so a `SaveView` persists.
+    same(
+        crate::player::camera_view::CVAR_ACTIVE_VIEW,
+        crate::player::camera_view::ACTIVE_VIEW_DEFAULT,
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[0][0],
+        crate::player::camera_view::VIEW_DEFAULTS[0][0],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[0][1],
+        crate::player::camera_view::VIEW_DEFAULTS[0][1],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[0][2],
+        crate::player::camera_view::VIEW_DEFAULTS[0][2],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[1][0],
+        crate::player::camera_view::VIEW_DEFAULTS[1][0],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[1][1],
+        crate::player::camera_view::VIEW_DEFAULTS[1][1],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[1][2],
+        crate::player::camera_view::VIEW_DEFAULTS[1][2],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[2][0],
+        crate::player::camera_view::VIEW_DEFAULTS[2][0],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[2][1],
+        crate::player::camera_view::VIEW_DEFAULTS[2][1],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[2][2],
+        crate::player::camera_view::VIEW_DEFAULTS[2][2],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[3][0],
+        crate::player::camera_view::VIEW_DEFAULTS[3][0],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[3][1],
+        crate::player::camera_view::VIEW_DEFAULTS[3][1],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[3][2],
+        crate::player::camera_view::VIEW_DEFAULTS[3][2],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[4][0],
+        crate::player::camera_view::VIEW_DEFAULTS[4][0],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[4][1],
+        crate::player::camera_view::VIEW_DEFAULTS[4][1],
+    ),
+    same(
+        crate::player::camera_view::VIEW_CVARS[4][2],
+        crate::player::camera_view::VIEW_DEFAULTS[4][2],
+    ),
+    same("mouseInvertPitch", "0"),
+    ours(
+        "autoLootDefault",
+        "0",
+        "1.12 has no auto-loot CVar at all — vanilla offers only the shift gesture, so OFF \
+         IS the reference's own behaviour; the spelling is era's",
+    ),
+    // The overhead-name gates, registered at `0x6c7470` into mask `0xce8720`: `UnitNamePlayer`
+    // (`0x86c694`) "1" (`0x82e748`), `UnitNameNPC` (`0x86c6a4`) and `UnitNameOwn` (`0x86c6b0`) "0"
+    // (`0x82e570`).
+    same("UnitNamePlayer", "1"),
+    same("UnitNameNPC", "0"),
+    same("UnitNameOwn", "0"),
+    // `UnitNamePlayerGuild` (`0x86c680`, "1", mask bit `0x10`) is not a show gate: `ShouldShowName`
+    // (`0x6070a0`) reads bits `0x1/0x2/0x4`, and this gates the `"\n<%s>"` guild line at
+    // `0x609085`. `UnitNamePlayerPVPTitle` (bit `0x20`, "1") has no row: nothing here draws the
+    // rank prefix.
+    same("UnitNamePlayerGuild", "1"),
+    // `WorldDetail` is no 1.12 CVar but the `GetWorldDetail`/`SetWorldDetail` verb name
+    // (`OptionsFrame.lua:27`); stops 0/1/2 are `frillDensity` 16/32/48. `SetWorldDetail 0x488dd0`
+    // also writes `SmallCull` {0.07, 0.04, 0.01}, and `GetWorldDetail` reads only `SmallCull`,
+    // whose registered 0.04 is stop 1: the reference's slider boots at Medium.
+    same("WorldDetail", "1"),
+    // `SmallCull` (`0x68854a`: name `0x8696f8`, default `0x869718` "0.04", flags 1, callback
+    // `0x688b10`, record `[0xc7f330]`). The callback refuses outside [0.001, 2.0] and stores into
+    // `[0x868620]`, which nothing reads: no mechanism here either. Its readers are Lua ones:
+    // `SetWorldDetail` writes it per stop, and `OptionsFrame_SetDefaults` reads its default
+    // (`OptionsFrame.lua:431`). `hwDetect` sets 0.04 on the fallback row a modern GPU reaches.
+    same(benilla_ui::script::CVAR_SMALL_CULL, "0.04"),
+    // `frillDensity` (`0x68862e`: name `0x8423d8`, default `0x864644` "16", flags 1, callback
+    // `0x688de0`, record `[0xc7f2f4]`): detail-doodad cells visited per chunk, clamped to [1, 256]
+    // and handed through `0x6725a0` to `[0xc7b494]`, the bound of the scatter loop at
+    // `0x6bfcfb`/`0x6bff1c`. One knob with `WorldDetail`, each keeping its own clamp. `hwDetect`
+    // (`0x639a60`) sets it from `VideoHardware.dbc` field `+0x18`, 24 on videoID 170. pfUI's
+    // `hdgraphic` reads `GetCVar("frillDensity") > 48` and writes up to 256.
+    deviates(
+        "frillDensity",
+        "32",
+        "16",
+        "the reference's registered 16 is stop 0 and its post-`hwDetect` 24 is on no \
+         stop at all, so every stop diverges; Medium (32) is the nearest one no sparser than a \
+         fresh install, and erring sparse is the worse failure for ground cover",
+    ),
+    // ── Combat log display ranges, in yards ──────────────────────────────────────────────────────
+    //
+    // Registered by `0x626d00` from the `{name, default}` pairs at `0x8629e0`, read as the record's
+    // float (`+0x24`). Classes 0 and 1, you and your pet, have no CVar there, only the `100000.0`
+    // sentinel.
+    same("CombatLogRangeParty", "50"),
+    same("CombatLogRangePartyPet", "50"),
+    same("CombatLogRangeFriendlyPlayers", "50"),
+    same("CombatLogRangeFriendlyPlayersPets", "50"),
+    same("CombatLogRangeHostilePlayers", "50"),
+    same("CombatLogRangeHostilePlayersPets", "50"),
+    same("CombatLogRangeCreature", "30"),
+    // Outside that table (`0x626d5f`, "60" at `0x862e14`): `0x62c160` reads it first and falls back
+    // to the per-class range only when the lookup fails.
+    same(crate::ui_chat::combat::DEATH_LOG_RANGE_CVAR, "60"),
+    // ── Floating combat text ─────────────────────────────────────────────────────────────────────
+    //
+    // `CombatDamage` (`0x6032df`, record `[0xc4d944]`) is the master: its two readers, the word
+    // emitter `0x607140` and the number emitter `0x6128b0`, both return at "0", so nothing floats.
+    // The `Pet*` rows gate only the owned-by-you branch; the stock Pet Melee Damage box writes both
+    // (`UIOptionsFrame.lua:335-336`).
+    same("CombatDamage", "1"),
+    same("PetMeleeDamage", "1"),
+    same("PetSpellDamage", "1"),
+    // `CombatLogPeriodicSpells` (`0x6033b3`): the handle is discarded and every use looks it up by
+    // name; read as the record's int.
+    same(crate::ui_chat::combat::LOG_PERIODIC_CVAR, "1"),
+    // ── Sound-panel check buttons ────────────────────────────────────────────────────────────────
+    //
+    // Category-7 registrations that keep no handle: the reference looks each up by name at use.
+    //
+    // `SoundListenerAtCharacter` (`0x457890`): the listener at the character, else at the camera
+    // (`update_audio_listener`).
+    same("SoundListenerAtCharacter", "1"),
+    // `EmoteSounds` (`0x4573b9`): the received text-emote voice kit, and only that.
+    same("EmoteSounds", "1"),
+    // `SoundZoneMusicNoDelay` (`0x4578b3`): `next_track_time`'s immediate path.
+    same("SoundZoneMusicNoDelay", "0"),
+    // `assistAttack` (`0x48fc50`, record `[0xb4d8f8]`): `/assist` also starts the swing. The "3"
+    // beside it is the next registration's, `minimapZoom`: stock `/assist` selects without
+    // swinging.
+    same("assistAttack", "0"),
+    // ── Mouse-look speed, per axis ───────────────────────────────────────────────────────────────
+    //
+    // `cameraYawMoveSpeed` is the MOUSE_LOOK_SPEED slider (`UIOptionsFrame.lua:89`); a nil there
+    // raises in `slider:SetValue` (`0x790980`) and stops `UIOptionsFrame_Load`. The stock Save
+    // writes `cameraPitchMoveSpeed` as half of it (`:355-356`). The reference integrates
+    // OS-accelerated pixels where we take raw device deltas, so the unit factor lives in
+    // `camera::LOOK_YAW_PER_SPEED` and these defaults stay the reference's. The validator
+    // `0x50c000` → `0x50b330` rejects values outside [0.1, 360] rather than clamping, and
+    // `player::camera::on_cvar` does the same.
+    same("cameraYawMoveSpeed", "180"),
+    same("cameraPitchMoveSpeed", "90"),
+    // MOUSE_SENSITIVITY (`UIOptionsFrame.lua:87`): FrameXML's spelling of the binary's `mouseSpeed`
+    // (`0x402c7b`); lookups are case-insensitive (`CVar::Lookup 0x63de30`), here as there. The
+    // reference's default is `SPI_GETMOUSESPEED × 0.1`, "1.0" on stock Windows, and its record
+    // `[0x882704]` has no reader: the slider sets the OS pointer speed (`0x402ec0`, [0.1, 2.0]).
+    // The default matches; Deviation: here the dial multiplies the camera's own rate, because
+    // benilla does not change the OS pointer speed, a system-wide setting.
+    same("mousespeed", "1"),
+    // The zoom-out limit is `cameraDistanceMax × cameraDistanceMaxFactor`, held to [0, 50]
+    // (`0x5112d6`). `cameraDistanceMax` (`0x50beb2`, default `0x84fbd0`) has no panel row; its
+    // validator `0x50b310` refuses a value outside [0, 50], and `player::camera::on_cvar` does the
+    // same. The factor is MAX_FOLLOW_DIST (`UIOptionsFrame.lua:90`), registered "1.0" (`0x82e92c`)
+    // with no validator: the slider's 1 to 2 is the slider's, not the CVar's.
+    same("cameraDistanceMax", "15.0"),
+    same("cameraDistanceMaxFactor", "1"),
+    // `cameraSmoothStyle` (`0x50ba92`, default `[0x84f4f4]` "1"), the auto-return behind the
+    // character. The engine's enum is 0 Never, 1 Smart, 2 Always, as the stock dropdown writes it
+    // (`UIOptionsFrame.lua:525,536,547`); 3, the Never entry's position, is the validator's upper
+    // bound (`0x50b330(v, 0, 3)`). See `FollowStyle`.
+    same("cameraSmoothStyle", "1"),
+    // Read instead of `cameraSmoothStyle` while the state mask holds Track or Fear; no panel row.
+    same("cameraSmoothTrackingStyle", "1"),
+    // AUTO_FOLLOW_SPEED (`UIOptionsFrame.lua:88`), deg/s, registered "180.0" (`[0xbe1070]`): it
+    // sets the transition's duration (`|dyaw| / rate * factor`), an average rate, not a slew. The
+    // knob clamps it to `FOLLOW_SPEED_RANGE`. The stock Save also writes `cameraPitchSmoothSpeed`
+    // at a quarter (`:353`), unregistered here: `FollowRig` has one rate.
+    same("cameraYawSmoothSpeed", "180"),
+    // `cameraPivot` `[0xbe10a4]` "1" (`0x50bda3`), smart pivot: gate `0x510690`, routing
+    // `0x50fee0`, release `0x5107f0`; ours is `player::camera_dynamics::SmartPivot`.
+    same("cameraPivot", "1"),
+    // Read by the routing (`0x50fff5`/`0x510004`) in radians of camera rotation, so they carry to
+    // benilla's raw-device units unchanged.
+    same("cameraPivotDXMax", "0.05"),
+    same("cameraPivotDYMin", "0"),
+    // The pitch bias's ease-back once the pivot lets go, deg/s (`[0xbe0fc8]`; `0x512a50` divides
+    // |Δ| by rate · π/180 for the duration); no panel row.
+    same("cameraTargetSmoothSpeed", "90"),
+    // `cameraWaterCollision` `[0xbe1088]` "1" (`0x50bd63`, `0x82e748`): one register, two consumers
+    // that must ship together. `0x50e5ec` builds it; its `0xf0000` nibble joins the trace mask of
+    // all three `0x50e570` queries (reaching `0x69cc13`), and `0x50e629` tests it to lift the sweep
+    // origin to `surface + 2/9`. Ours: `benilla_world::collision::camera_filter` and
+    // `player::camera_water`.
+    same("cameraWaterCollision", "1"),
+    // `cameraTerrainTilt` `[0xbe0fd4]` "0" (`0x50bcfd`), Follow Terrain: probe and staircase
+    // `0x50d900`, arm `0x50dbc0`; ours is `player::camera_dynamics::TerrainTilt`.
+    same("cameraTerrainTilt", "0"),
+    // Rate in deg/s (`[0xbe0fc0]`), duration bounds in seconds (`[0xbe1050]`/`[0xbe1054]`). The 3 s
+    // floor always binds (20° at 7.5°/s is 2.67 s), so the camera leans rather than tracks.
+    same("cameraGroundSmoothSpeed", "7.5"),
+    same("cameraTerrainTiltTimeMin", "3"),
+    same("cameraTerrainTiltTimeMax", "10"),
+    // `cameraBobbing` `[0xbe10c0]` "0" (`0x50b76d`), head bob: kernel `0x511920`, gate `0x5105e0`;
+    // ours is `player::camera_dynamics::HeadBob`.
+    same("cameraBobbing", "0"),
+    // Amplitudes in the CVar's units, scaled by 1/36 (`[0x7ff9d0]`) to yards.
+    // `cameraBobbingSmoothSpeed` is the decay rate, read only in the disarm `0x51113a`, which
+    // divides the largest component by it for the ramp's duration (~0.069 s at these defaults).
+    same("cameraBobbingLRAmplitude", "2"),
+    same("cameraBobbingUDAmplitude", "2"),
+    same("cameraBobbingFrequency", "0.8"),
+    same("cameraBobbingSmoothSpeed", "0.8"),
+    // `statusBarText` (`0x48fc34`, record `[0xb4d904]`, no engine reader), read by
+    // `TextStatusBar.lua:47,97`: "0" shows the numbers on hover only.
+    same("statusBarText", "0"),
+    // Enhanced Tooltips (`UIOptionsFrame.lua:15`), registered "1" at `0x48fddd` (`0x82e748`); read
+    // only by the stock interface.
+    same("UberTooltips", "1"),
+    // Registered at `0x603280`: `ChatBubbles` "1", `ChatBubblesParty` "0".
+    same("ChatBubbles", "1"),
+    same("ChatBubblesParty", "0"),
+    // Registered "1" (`0x82e748`), category 4. `profanityFilter` (`0x402e68`, name `0x82e7f4`,
+    // callback `0x403570`) masks `ChatProfanity.dbc` spans inside the shared masker `0x4a1a66`,
+    // covering all thirteen call sites; `spamFilter` (`0x402e8e`, name `0x82e7d4`, callback
+    // `0x4035b0`) silently drops a line matching `SpamMessages.dbc`. The knob is
+    // [`crate::text_filter::TextFilterSwitches`].
+    same("profanityFilter", "1"),
+    same("spamFilter", "1"),
+    // Registered by `CGlueMgr::EnterWorld` (`0x46b633` `gameTip` "0", `0x46b658` `showGameTips`
+    // "1"), category 5. `gameTip` is the cursor and holds the next tip, not the one on screen;
+    // `crate::game_tip` advances it.
+    same("gameTip", "0"),
+    same("showGameTips", "1"),
+    // `showLootSpam` (`0x48fd1c`, name `0x8430a0`, "1" `0x82e748`, record `0xb4e2bc`): off, group
+    // loot-roll lines are hidden and only the winner shows. Its three readers are the roll-line
+    // composers; the knob is [`crate::ui_loot::LootConfig::show_loot_spam`].
+    same("showLootSpam", "1"),
+    // `guildMemberNotify` (`0x5e24c7`, "0" `0x82e570`, record `0xc4d3c4`): guildmate log on/off
+    // lines, read only in `SMSG_GUILD_EVENT`'s handler. The knob is
+    // [`crate::ui_guild::GuildMemberNotify`].
+    same("guildMemberNotify", "0"),
+    // Both registered "3" (`0x48fc6c`, `0x48fc88`); the minimap's +/- buttons write them through
+    // `Minimap:SetZoom`. The knob is [`crate::minimap::MinimapZoom`].
+    same("minimapZoom", "3"),
+    same("minimapInsideZoom", "3"),
+    // Load out of date AddOns, inverted (`0x402c3b`): "1" enforces the check. Read by the load walk
+    // ([`Cvars::addon_version_check`]) and live by the VM's gate.
+    same("checkAddonVersion", "1"),
+    // `gxApi` (`0x63a833`: name `0x842a64`, default `0x864f7c` "direct3d", flags 3, callback
+    // `0x63b030`, record `[0xc4ea94]`): the reference builds D3D9 unless it reads "OpenGl"
+    // (`0x63a3c4`, `0x842a5c`). Here it reports the wgpu backend (`wgpu::Backend::to_str`), pushed
+    // from `RenderAdapterInfo` and owned by the session, so it is never persisted. pfUI's
+    // `panel.lua:185` concatenates it.
+    deviates(
+        "gxApi",
+        "",
+        "direct3d",
+        "descriptive, not a selector — benilla renders through wgpu, which has no D3D9 \
+         backend and no chooser; the value is the live adapter's own and is never persisted",
+    )
+    .latched(),
+    // `gxVSync` (`0x63a859`, "1", flags 3), `OptionsFrame.lua:9`. The knob is
+    // [`crate::video::VideoConfig::vsync`], which the window's present mode follows at the
+    // `RestartGx` commit. `$WOW_NOVSYNC=1` overrides it for the session.
+    same("gxVSync", "1").latched(),
+    // MONKEY (advanced graphics): the one row on the Advanced Graphics page that is not a knob —
+    // it is a NAME for a combination of the rows under it ([`LIGHTING_PRESETS`]). Writing a preset
+    // name writes that preset's members; writing anything else is corrected on the next frame by
+    // [`lighting_quality`], which re-DERIVES the name from the members those rows actually hold.
+    // So the stored value is never stale: it is either a preset every member agrees with, or
+    // `Custom`.
+    //
+    // A STRING row, not an int, so `config.toml` and `/console set lightingQuality Medium` both
+    // read as what they mean — and so the ladder can gain a rung without renumbering a player's
+    // saved value. `Row::numeric` is false for it (the default does not parse as a number), which
+    // is what lets the registry accept a non-numeric write at all; `realmList` is the precedent.
+    ours(
+        "lightingQuality",
+        "High",
+        "benilla's own: the preset ladder over the dynamic light + shadow rows — Off / Low / \
+         Medium / High / Ultra, or Custom when the members match none of them; the reference has no \
+         realtime light or shadow system to preset",
+    ),
+    // MONKEY (presets): the Graphics Preset — `lightingQuality`'s posture one level up, a NAME
+    // for every graphics row at once ([`GRAPHICS_PRESETS`]), re-derived every frame. "High" is
+    // what a player with no saved preset boots into: [`Cvars::seed_graphics_preset`] writes the
+    // High column over every row their `config.toml` does not carry, so the rows themselves keep
+    // their per-lane defaults (Classic-leaning, and `farclip` the reference's 350) and a capture
+    // or a test, which never seeds, keeps them too.
+    ours(
+        "graphicsQuality",
+        "High",
+        "benilla's own: the preset ladder over every graphics row — Classic / Low / Medium / High \
+         / Ultra, or Custom when the rows match none of them; the reference's options have no \
+         such preset",
+    ),
+    // MONKEY (volumetric fog): saved live tier; capture override stays session-only.
+    ours("volumetricFog", "1", "benilla's own: near-field volumetric fog, 0 Off / 1 Low / 2 High"),
+    // MONKEY (lampfog): opt-in point-light halos; High graphics preset value is 2.
+    ours(
+        "lampFog",
+        "0",
+        "benilla's own: lamps scattering through night fog, 0 Off / 1 Low (16 lamps) / 2 High (32 lamps)",
+    ),
+    // GFX (volumetric light): shadow-mapped light shafts for the sun and the moon.
+    ours(
+        "volumetricLight",
+        "0",
+        "benilla's own: sun and moon light shafts marched through the shadow map, 0 Off / 1 Medium / 2 High",
+    ),
+    ours(
+        "volumetricLightStrength",
+        "1",
+        "benilla's own: brightness of the volumetric light shafts, 0..2 (1 = default)",
+    ),
+    // GFX (moonlight): the moon as a light on top of the stock night.
+    ours(
+        "moonLight",
+        "0",
+        "benilla's own: moonlight on top of the stock night, 0..2 (0 = the reference night)",
+    ),
+    // MONKEY (p0 skyDither): the FFXGlow combine's deband dither (was env WOW_DITHER only).
+    // Default 0 = the reference look; the Graphics preset's High sets 1.
+    ours(
+        "skyDither",
+        "0",
+        "benilla's own: faint screen dither against sky and fog banding, 0 Off / 1 On",
+    ),
+    // MONKEY (post): tier 0 leaves every emissive site and the frame byte-identical.
+    ours("bloom", "2", "benilla's own: HDR emissive bloom, 0 Off / 1 Low / 2 High"),
+    ours("sunShafts", "1", "benilla's own: depth-occluded screen-space sun shafts"),
+    ours("colorGrading", "1", "benilla's own: zone and day/night 32-cube colour grade"),
+    // MONKEY (sky): the sky tier; the High graphics preset sets 2.
+    ours(
+        "skyQuality",
+        "0",
+        "benilla's own: sky quality, 0 Classic / 1 Enhanced (smooth gradient, sun glow, stars) / \
+         2 High (+ detailed sun-lit clouds)",
+    ),
+    // MONKEY (wind): one tier controls the grass-only and grass-plus-tree receivers.
+    ours(
+        "foliageWind",
+        "2",
+        "benilla's own: foliage wind, 0 Off / 1 Grass / 2 Grass + trees",
+    ),
+    // MONKEY (fix-wind): the sway strength slider under Foliage Wind; not on the preset ladder.
+    ours(
+        "foliageWindStrength",
+        "1",
+        "benilla's own: foliage wind strength, a gain on the sway, 0.25..3 (1 = the shipped tuning)",
+    ),
+    // MONKEY (fog): the distance-fog model. 0 = the 1.12 linear fog (byte-identical), 1 = Modern
+    // (exponential, sun/horizon colour, end-fog shift, fog end decoupled from farclip past 777).
+    // Default 0; the Graphics preset's High sets 1.
+    ours(
+        "fogModel",
+        "0",
+        "benilla's own: distance fog, 0 Classic (1.12 linear) / 1 Modern (soft, sun-coloured horizon)",
+    ),
+    // MONKEY (wet): rain darkens and glosses sky-exposed surfaces and rings the water. Default 1
+    // (only visible while it rains or the ground dries); the Graphics preset's High sets 1.
+    ours(
+        "rainSurfaces",
+        "1",
+        "benilla's own: rain wets sky-exposed surfaces and rings the water, 0 Off / 1 On",
+    ),
+    // MONKEY (ao): opt-in contact shadows; the High graphics preset value is 2.
+    ours("ambientOcclusion", "0", "benilla's own: screen-space ambient occlusion, 0 Off / 1 Low / 2 High"),
+    // MONKEY (skybox): the living player's zone skybox from `LightParams`; High sets 1.
+    ours(
+        "zoneSkyboxes",
+        "0",
+        "benilla's own: draw the zone skybox LightParams names for the living, 0 Off / 1 On; the \
+         reference draws a DBC skybox only for the ghost",
+    ),
+    ours(
+        "waterQuality",
+        "1",
+        "benilla's own: water quality, 0 Classic / 1 Enhanced / 2 High; mirror reflections are opt-in",
+    ),
+    ours(
+        "lavaLightGain",
+        "1",
+        "benilla's own: brightness of lava lighting its surroundings, 0..4 (0 = no glow)",
+    ),
+    // Benilla's opt-in realtime shadow-map path, split into two INDEPENDENT lanes over one shared
+    // shadow rig (one sun / one map). `worldShadows` = the static world (trees, buildings, foliage)
+    // casts realtime shadows and baked MCSH terrain shadows switch off; `characterShadows` =
+    // players/NPCs/creatures/mounts cast realtime silhouettes instead of the legacy oval blob.
+    //
+    // `ours(...)`, not `same(...)`: the reference has no realtime shadow at all — it bakes MCSH
+    // into the terrain and draws an oval under every unit — so there is no registered default for
+    // these two to agree with, and claiming `Same` would put a false entry in the one column
+    // [`Reference`] exists to keep honest. (They read `same("…", "1")` until the 2303 registry
+    // port; the default string is unchanged.)
+    ours(
+        "worldShadows",
+        "1",
+        "benilla's own: the static world (trees, buildings, alpha-tested foliage) casts a realtime \
+         shadow and the baked MCSH terrain shadows stand aside; the reference bakes and has no \
+         such switch",
+    ),
+    ours(
+        "characterShadows",
+        "1",
+        "benilla's own: units cast a realtime silhouette instead of the reference's oval blob \
+         decal, which is all 1.12 has and is therefore not a setting there",
+    ),
+    // Realtime-shadow render distance in yards (the shadow-map cascade range + caster reach).
+    // benilla's own — the reference has no realtime shadow to size. Clamped to SHADOW_DISTANCE_RANGE.
+    ours(
+        "shadowDistance",
+        "80",
+        "1900: benilla's own realtime-shadow render-distance slider; the reference bakes MCSH and \
+         has no cascade to size",
+    ),
+    // MONKEY (sun shadow perf): the five live dials over the sun lanes' ~5 ms/frame (RTX 3070,
+    // 1080p, both lanes on: 45-47 fps, and 68-73 with both off). All benilla's own — the reference
+    // bakes MCSH and has no realtime shadow to tune. `shadow_core`'s constants block holds the cost
+    // split each one takes; every row is LIVE, so the whole set A/Bs from one chat line.
+    ours(
+        "shadowMapSize",
+        "2048",
+        "benilla's own: directional shadow-map edge in texels, 1024/2048/4096 (cost is quadratic)",
+    ),
+    ours(
+        "shadowFilter",
+        "1",
+        "benilla's own: shadow PCF kernel: 0 hardware-2x2 (1 sample), 1 gaussian (9, the look)",
+    ),
+    ours(
+        "characterShadowRate",
+        "30",
+        "benilla's own: Hz cap on the character shadow proxy re-skin+upload, 0..120 (0 = per frame)",
+    ),
+    ours(
+        "worldShadowRate",
+        "30",
+        "benilla's own: Hz cap on the world lane's environment caster, 0..120 (0 = per frame)",
+    ),
+    ours(
+        "shadowCasterReach",
+        "1",
+        "benilla's own: multiplier on the shadow caster-collection reach, 0.25..2 (1 = unchanged)",
+    ),
+    // MONKEY (moon shadows): how dark a MOON-shadowed fragment is allowed to get at night — the
+    // dial over the night lane's own shadow term (`benilla_world::lighting::MoonShadowStrength`,
+    // bridged by `dynamic_interior` beside the spell gain). `0` is the FAITHFUL null: every
+    // consumer guards on it, so a night at 0 renders as the build before the feature did — which
+    // is also what the Off and Low presets ask for.
+    ours(
+        "moonShadowStrength",
+        "0.35",
+        "benilla's own: how dark a moon-shadowed fragment gets at night, 0..1 (0 = no moon \
+         shadow, the reference's own night)",
+    ),
+    // MONKEY (dynamic interiors): WMO interiors + their props light from the room's LIVE fixtures
+    // instead of the MOCV bake / the baked prop probe (`static_gx.wgsl` `interior_room_light`;
+    // bridged by `dynamic_interior`). The three numeric knobs are live-tunable from chat —
+    // `/script SetCVar("interiorExposure", 2)` — which is how their defaults were found.
+    ours(
+        "interiorLight",
+        "1",
+        "benilla's own: fixture-lit WMO interiors (0 = the reference's baked interior path)",
+    ),
+    ours(
+        "interiorAmbient",
+        "0.015",
+        "benilla's own: interior base ambient, 0..1",
+    ),
+    ours(
+        "interiorFill",
+        "0.08",
+        "benilla's own: interior per-fixture bounce gain, 0..2",
+    ),
+    ours(
+        "interiorExposure",
+        "2.5",
+        "benilla's own: interior light-budget multiplier before the soft rolloff, 0.25..8",
+    ),
+    // MONKEY (soft falloff): the live scale on every interior fixture's AUTHORED attenuation
+    // window (WMO MOLT `+0x28/+0x2c`; M2 sources bucket by intensity instead — their authored pair
+    // is a template default, not a reach). A fixture's EFFECTIVE RADIUS is `authored end × this`.
+    // The artists' own ends — Goldshire inn 6.97-9.53 yd over 10 fixtures, its blacksmith 6.0,
+    // NSabbey 4.17-5.56, Stormwind's 606 median 6.94 — are where FULL brightness ends, not where
+    // light stops, so `1` drew a hard-edged disc at exactly that radius with black beyond it (the
+    // abbey candelabra ring). **2.5** is the default: the pool now tails smoothly to 2.5× the
+    // authored end, reading ~⅓ of its 1 yd brightness AT the authored end and ~8 % at twice it.
+    // `>1.6` widens further, `<1.6` tightens, `0` switches the window off (the 48 yd lane), so the
+    // whole shape A/Bs from chat.
+    ours(
+        "interiorAttenScale",
+        "1.6",
+        "benilla's own: scale on interior fixtures' authored attenuation window = their effective \
+         radius, 0..8 (0 = no window, the old flat lane)",
+    ),
+    // MONKEY (room gate): whether an interior fixture may light only the rooms it CLAIMS — its
+    // authored MOLR groups unioned with the interior groups whose MOGI bounding box it stands
+    // inside (`LightLitRooms` carries the corpus evidence for why MOLR alone is far too sparse:
+    // the Goldshire inn authors one on 2 of its 12 groups). Off restores the pre-gate behaviour:
+    // every interior fixture in range lights every interior surface in range, so an inn's
+    // ground-floor candles light its basement through the floor. Kept as a dial because a room the
+    // gate leaves on ambient alone looks the same as a bug, and this tells the two apart in one
+    // keystroke.
+    ours(
+        "interiorRoomGate",
+        "1",
+        "benilla's own: an interior fixture lights only the WMO groups it claims (0 = the old \
+         leak-through-walls behaviour)",
+    ),
+    ours(
+        "interiorShadows",
+        "1",
+        "benilla's own: interior fixtures cast real shadows (Stage B, the nearest few); needs \
+         interiorLight",
+    ),
+    // MONKEY (outdoor torch shadows): the outdoor half of the same cube-map lane. Its own row
+    // because it is its own audience (a night camp, a lit village) and its own cost profile — and
+    // because "turn the outdoor shadows off" must not also turn the inn's candles' shadows off.
+    ours(
+        "exteriorShadows",
+        "1",
+        "benilla's own: outdoor fire lights (campfires, braziers, lampposts) cast real shadows at \
+         night; no effect by day",
+    ),
+    // MONKEY (daylight: terrain torch casters): the ground as a torch caster.
+    ours(
+        "torchTerrainShadows",
+        "0",
+        "benilla's own: the ground casts into outdoor fire shadows (hills and banks block a fire's \
+         light); needs exteriorShadows",
+    ),
+    // MONKEY (static torch cache): residency and per-frame work have separate live budgets.
+    ours(
+        "interiorShadowCasters",
+        "12",
+        "benilla's own: resident interior fixture shadow maps, 1..16",
+    ),
+    ours(
+        "interiorShadowDynamic",
+        "4",
+        "benilla's own: nearest promoted fixtures with moving entity shadows, 0..16",
+    ),
+    // MONKEY (torch lane perf): the moving-caster REGATHER cadence. Its own row (and not folded
+    // into `interiorShadowDynamic`) because it trades a different currency: `Dynamic` buys how
+    // MANY fixtures overlay moving casters, this buys how OFTEN the one shared overlay mesh is
+    // rebuilt. Neither of the count dials moved the frame time at all, so the cost was never per
+    // map -- it was this gather + mesh mutation, paid once a frame no matter what the counts said.
+    // `0` is the pre-feature every-frame behaviour, kept as the live A/B.
+    ours(
+        "interiorShadowEntityRate",
+        "30",
+        "benilla's own: how often (Hz) moving torch-shadow casters are regathered; 0 = every frame",
+    ),
+    // MONKEY (torch caster selection): the PCF tap radius on the torch maps. Candle clusters read
+    // very hard-edged at 1 (a half-texel box on a 512² face); 2 is a visible softening for four
+    // extra texel-neighbourhood taps' worth of cache pressure, no extra samples.
+    ours(
+        "interiorShadowSoft",
+        "1.5",
+        "benilla's own: torch-shadow edge softness — the PCF tap radius scale at a CONTACT, 0.5..3",
+    ),
+    // MONKEY (shadow floor): how BLACK a torch shadow is allowed to get. The lane's shadows were
+    // the only occlusion in the direct term and took all of it, which is what made them read as
+    // scars rather than as shadows; 0.7 leaves 30 % standing in place of the bounce light this
+    // renderer does not have. `1` is the shipped look, `0` is off.
+    ours(
+        "torchShadowStrength",
+        "0.7",
+        "benilla's own: torch-shadow darkness — how much of the direct term a shadow removes, 0..1",
+    ),
+    ours(
+        "interiorDebug",
+        "0",
+        "benilla's own: interior diagnostic overlay — 1 classification, 2 shadow, 3 caster count, 4 WMO lane map",
+    ),
+    // MONKEY (darkness gains): the two live dim dials. `nightGain` scales the EXTERIOR day/night
+    // law (the packed ambient/diffuse/specular rows) by `mix(1, gain, night_w)`, so it is exactly
+    // inert by day and full strength after dark; `interiorGain` scales the room lane's inputs (base
+    // ambient, per-fixture fill, and every interior fixture's colour). Both fold in at PACK time in
+    // `build_light_data`, so `SetCVar` moves the whole world on the very next frame — which is how
+    // "20 % / 30 % darker" gets judged at all, and `1` on either is the restore.
+    //
+    // Night gain leaves fire lights alone; interior gain also scales interior fixtures,
+    // including their candlelight. Outdoor fires retain their brightness under both dials.
+    ours(
+        "nightGain",
+        "0.45",
+        "benilla's own: exterior night brightness, 0.2..1.5 (1 = the reference's own night)",
+    ),
+    // MONKEY (lighting debug panel): weaker fresh interiors; persisted gains still win at boot.
+    ours(
+        "interiorGain",
+        "0.5",
+        "benilla's own: WMO interior brightness, 0.2..1.5 (1 = the pre-dial fixture-lit room)",
+    ),
+    // MONKEY (enclosed day floor): the daylight a room INSIDE A BUILDING gets by day, for the
+    // doorways this renderer cannot locate in the data (the Goldshire inn's entry group authors no
+    // portal, no EXT-class batch, no stitched vertex and no bake hot spot — there is nowhere to
+    // stand a fixture). An additive ambient in `interiorAmbient`'s own units, scaled by the sun's
+    // day envelope, so it is exactly 0 at night and the night look never moves. `0` is the restore.
+    ours(
+        "interiorDaylight",
+        "0.0",
+        "benilla's own: daylight floor for rooms inside a building, 0..1 (0 = none, the old look)",
+    ),
+    // MONKEY (fix-daylight): the district window split, gateable (default on = merged behaviour).
+    ours(
+        "daylightWindowSplit",
+        "1",
+        "benilla's own: split city window batches into window-sized daylight apertures (applies to newly loaded buildings)",
+    ),
+    // MONKEY (bake floor): the share of an interior batch's own MOCV bake that survives the live-
+    // fixture lane. The lane throws the bake away and lets the fixtures decide, which leaves a room
+    // no fixture reaches (the Lion's Pride Inn's east vestibule: MOLR 0, no claims, one faded
+    // portal hop) rendering black between a sky-lit porch and a candle-lit hall — something the
+    // reference client cannot do, because it draws every interior batch at its bake regardless of
+    // lights. A fraction of the bake, inside the room law's rolloff, so a lit surface barely moves.
+    ours(
+        "interiorBakeFloor",
+        "0.12",
+        "benilla's own: share of an interior batch's baked light kept where no fixture reaches, 0..1 (0 = the old look)",
+    ),
+    // MONKEY (fire GO lights): the gain on lights SYNTHESISED from a model's flame emitter for the
+    // ~410 fire props the artists never gave a light block (campfires, wall torches, magic
+    // braziers, forges, candles). Live, like the interior knobs — and `0` is the kill switch for
+    // the whole invented-light lane, which matters because unlike everything beside it this one is
+    // a heuristic over content rather than a byte-verified mechanism.
+    ours(
+        "fireLightGain",
+        "1",
+        "benilla's own: brightness of lights synthesised from fire props' flame emitters (0 = off)",
+    ),
+    // MONKEY (spellLightGain): the same dial for the SPELL lane — a kit's aura glow, a missile's
+    // core, an impact flash, a firework's burst. A separate knob from the one above it because the
+    // two are separate judgements: that one tunes SCENERY (how bright is the invented campfire),
+    // this one tunes COMBAT (how hard does a fight flash the room), and a spell light carries both
+    // markers, so one dial over both would mean dimming the world's hearths to calm a fireball.
+    // `0` is this lane's kill switch and reaches nothing else.
+    ours(
+        "spellLightGain",
+        "1",
+        "benilla's own: brightness of spell, missile and impact lights (0 = off)",
+    ),
+    // MONKEY (flame flicker): how hard every FLAME breathes — candles fast and shallow, bonfires
+    // slow and shallower still (`benilla_world::lighting::FlameKind`). Live like the gain beside
+    // it, and `0` restores the steady constants every fire had before the feature, which is the
+    // escape hatch this needs precisely because "subtle" is a judgement call and a flicker that
+    // reads as a strobe is worse than none.
+    ours(
+        "fireFlicker",
+        "1",
+        "benilla's own: how strongly fire lights flicker — 0 steady, 1 default, 2 pronounced",
+    ),
+    // `gxWindow` (`0x63a889`): "0" on enUS; zhCN registers "1", as it does `gxMaximize`
+    // (`0x63a8e0`), and koKR `AutoInteract` (`0x603390`). The knob is
+    // [`crate::video::VideoConfig::display`]. Deviation: "0" raises a borderless fullscreen window
+    // instead of mode-setting the display, because Wayland and macOS offer no mode-set and X11's
+    // leaves the desktop changed after a crash ([`crate::video`]).
+    same("gxWindow", "0").latched(),
+    // `gxResolution`, a string row parsed by `video::on_cvar`. Here it is only the windowed size:
+    // fullscreen is the monitor's own and no mode list is offered.
+    deviates(
+        "gxResolution",
+        "1600x900",
+        "640x480",
+        "narrowed to the WINDOWED size only — fullscreen is the monitor's own and we expose \
+         no mode list, and 640x480 is not a window anyone would ship a client at",
+    )
+    .latched(),
+    // benilla's own: a body pane's doll renders at half the frame rate while the pane is open; the
+    // reference draws it in the main pass. The knob is [`crate::portrait::PaneRate`].
+    ours(
+        "boothHalfRate",
+        "1",
+        "benilla's own — the reference draws its doll inside the main pass and has no \
+         second view to rate-limit",
+    ),
+    // `gxMultisample` (`0x63a950`, flags 3). The reference formats its default from field 21 of the
+    // `VideoHardware.dbc` row `DetectHardware` (`0x641260`) matches, which is 1, no multisampling,
+    // on every fallback row a modern GPU reaches. The knob is [`benilla_world::view::MsaaSetting`],
+    // read once at the camera's spawn; `$WOW_MSAA` overrides it for the session.
+    same("gxMultisample", "1").latched(),
+    // `GetCurrentMultisampleFormat 0x48c580` looks up all three of the Video dropdown's values by
+    // name, so these must exist. They describe the swapchain's own pair and steer nothing;
+    // `SetMultisampleFormat` writes them as `0x48c640` does.
+    deviates(
+        "gxColorBits",
+        "32",
+        "16",
+        "these describe, they do not steer — the pair is our swapchain's own, and every \
+         format `MsaaFormats` publishes carries it",
+    )
+    .latched(),
+    deviates(
+        "gxDepthBits",
+        "32",
+        "16",
+        "as `gxColorBits` — the depth half of the same descriptive pair",
+    )
+    .latched(),
+    // `trilinear` and `anisotropic`, over `benilla_assets::TexFilterSetting` (`tex_filter.rs`
+    // carries the derivation). A change applies at the next launch, since a sampler is baked into
+    // each texture at load; the reference's UI says "enabled upon restart".
+    // `$WOW_TRILINEAR`/`$WOW_ANISO` override for the session.
+    //
+    // `trilinear` registers "0", but `hwDetect` runs `DetectHardware 0x641260` and sets it from the
+    // matched `VideoHardware.dbc` row before the first frame; the fallback rows an unlisted GPU
+    // reaches are 168/169/170, and 169 and 170 give 1. The reference install's `gx.log` resolves to
+    // videoID 170.
+    overridden(
+        "trilinear",
+        "1",
+        "0",
+        "`hwDetect` sets it from `VideoHardware.dbc` field 9 before the first frame, and \
+         that field is 1 on both fallback rows an unlisted modern GPU can reach — measured on the \
+         reference's own `Logs/gx.log` (`videoID: 170`)",
+    ),
+    // Not one of `hwDetect`'s sixteen (`[0x639a60, 0x639b80)` never reads `0xc7f2e4`), so the
+    // registered "1", off, stands.
+    same("anisotropic", "1"),
+    // The four video CVars the stock window's verbs read and write (`benilla_ui` `video_pairs`);
+    // benilla has no mechanism behind any of them. `shadowLevel` (`0x6885bc`, "1", flags 1,
+    // callback `0x688c10`, record `[0xc7f350]`) is behind `Get/SetTerrainMip` as `1 − level`: the
+    // callback refuses above 1 and prints "Shadow mip level changed upon restart.", and the
+    // terrain's shadow-map mip (`0x66f877`) reads it at load. `hwDetect` leaves it at 1.
+    same("shadowLevel", "1"),
+    // `doodadAnim` (`0x6884d8`, "1", flags 1, callback `0x688a10`, record `[0xc7f354]`), behind
+    // `Get/SetDoodadAnim`: the callback toggles bit `0x8000` of `[0xc7b2a4]` and calls `0x6953d0`,
+    // a bare `ret`, so no animation reads it. `hwDetect` sets 0 or 1 by CPU tier.
+    same("doodadAnim", "1"),
+    // `texLodBias` (`0x6885e2`, "0.0" at `0x84fad4`, flags 1, callback `0x688c90`, record
+    // `[0xc7f2f8]`), behind `Get/SetTexLodBias`: the callback refuses outside [-1.0, 1.0] and its
+    // sink `0x672640` is `ret 4`.
+    same("texLodBias", "0.0"),
+    // `baseMip` (`0x6887aa`, "0", flags 1, callback `0x689090`, record `[0xc7f2f0]`), behind
+    // `Get/SetBaseMip` as `1 − level`: the callback refuses outside [0, 1] ("BaseMip must be 0 or
+    // 1") and sets the device's first uploaded mip level (`0x589bf0`, read at `0x59f6ce`). benilla
+    // uploads every level; the write is kept and has no effect. `hwDetect` leaves it at 0.
+    same("baseMip", "0"),
+    // `spellEffectLevel` (`0x688900`: name `0x869324`, default `0x843068` "2", flags 1, callback
+    // `0x689510`, record `[0xc7f2a4]`), the Spell Detail slider (`OptionsFrame.lua:32`). The
+    // callback's two effects here: the particle emission scalar ([`crate::video::on_cvar`]) and
+    // the dynamic-object shard rate, read at each emitter's spawn (`crate::entities`). Its third,
+    // skipping one M2-scene ground decal below level 2 (`0x672b3a`), has no counterpart: benilla
+    // does not draw that projection.
+    same("spellEffectLevel", "2"),
+    // Weather Intensity (`OptionsFrame.lua:33`), registered "2" (`0x67b806`, flags 0, callback
+    // `0x67b870`, name `0x8685ac`). The reader is `benilla_world::weather::WeatherState`, which
+    // scales the precipitation spawn rate by `0x67b870`'s table {0.1, 0.33, 0.66, 1.0}; rendering
+    // only.
+    deviates(
+        "weatherDensity",
+        "3",
+        "2",
+        "every precipitation rate in `benilla-world`'s own precipitation module was \
+         derived and graded against the reference install's own apitrace captures, and that \
+         install runs \
+         `SET weatherDensity \"3\"` (K = 1.0) — so 3 is the value a benilla-vs-reference \
+         side-by-side is correct at, and the registered 2 would thin every rate to 0.66 against \
+         the only client we compare with. The slider is how a player takes it back down",
+    ),
+    // `gamma` (`0x402d70`: name `0x82e924` "Gamma", default `0x82e92c` "1.0", flags 0, callback
+    // `0x4034d0`). The reference uploads `pow(i/255, gamma)` (`0x591680`) through
+    // `SetDeviceGammaRamp`, except when windowed (`byte[dev+0x20b]`). Deviation: benilla, which
+    // has no exclusive mode, applies the same curve in the composite pass
+    // ([`crate::ui_gamma::DisplayGamma`]), because the skipped upload would make a slider that
+    // moves no pixel. Spelled "1.000000" because `SetGamma 0x4891f0` formats with `"%f"`, and
+    // Restore Defaults must compare equal to the default; [`sync_cvars`] seeds it the same way.
+    same("gamma", "1.000000"),
+    // `DesktopGamma` (`0x402d4d`: name `0x82e930`, default "0" `0x82e570`, flags 0, callback
+    // `0x403500`, record `[0x8826d4]`), the stock window's Use Desktop Gamma box, which it also
+    // sets whenever Windowed Mode is ticked (`OptionsFrame.lua:399-408`). On 1 the callback puts
+    // the desktop's own ramp back, and `gamma`'s callback (`0x4034d0`) uploads only while this
+    // reads 0. No effect here: [`crate::ui_gamma::DisplayGamma`] follows `gamma` alone, because
+    // the stock window ticks this box whenever Windowed Mode is (`:399-408`), so honouring it would
+    // drop the gamma of every windowed player who opens that window.
+    same("DesktopGamma", "0"),
+    // ── The stock Video Options window's other boxes (`OptionsFrame.lua:5-22`) ───────────────────
+    //
+    // `ffx` (`0x6ccfe3`: name `0x86f2ac`, record `[0xce8a04]`), `ffxGlow` (`0x6cc17d`, name
+    // `0x86f200`) and `ffxDeath` (`0x6cc6d1`, name `0x86f238`): each "1", flags 1, with the echo stub
+    // `0x6cde30` as callback, and each record's integer read every frame. The FFX begin/end pair
+    // (`0x6cd890`/`0x6cda70`) runs the active pass only while `ffx` (`0x6cd8a6`), `pixelShaders`
+    // (`0x6cd8b6`) and that pass's own enable hold: `CFFXGlow` (`0x6cc5a0`) reads `ffxGlow` at
+    // `0x6cc5a8`, `CFFXDeath` (`0x6cded0`) reads `ffxDeath` at `0x6cdf10`. The stock Okay writes
+    // `ffx` as Enable All Shaders (`OptionsFrame.lua:202-204`). The knob is
+    // [`benilla_world::ffx_glow::FfxSwitches`].
+    same("ffx", "1"),
+    same("ffxGlow", "1"),
+    same("ffxDeath", "1"),
+    // `pixelShaders` (`0x688712`: name `0x869560`, "0", flags 1, callback `0x688f40`, record
+    // `[0xc7f360]`) and `specular` (`0x6886a0`: name `0x8695d8`, "0", flags 1, callback `0x688e20`,
+    // record `[0xc7f2cc]`), Enable All Shaders and Terrain Highlights. Both callbacks act only on a
+    // device whose caps field `[0x58a230()+0x98]` is above -1, setting bits 28 and 27 of the render
+    // flags `[0xc7b2a4]`, which gate the shader negotiation `0x6941f0` for terrain, water and
+    // models; `pixelShaders` also gates the FFX pass (`0x6cd8b6`). No effect here: benilla always
+    // draws the shader leg (`liquid.wgsl` records it), and the stock Okay carries this box into
+    // `ffx`, which is wired.
+    overridden(
+        "pixelShaders",
+        "1",
+        "0",
+        "`hwDetect` (`0x639a60`) sets it from `VideoHardware.dbc` field 11 before the first frame, \
+         and that field is non-zero on fallback row 170, the one a modern GPU reaches \
+         (`Logs/gx.log`: `videoID: 170`)",
+    ),
+    overridden(
+        "specular",
+        "1",
+        "0",
+        "`hwDetect` sets it from the same field 11 as `pixelShaders`, so row 170 gives 1",
+    ),
+    // `M2UseShaders` (`0x4028e9`, name `0x82e67c`, "1") and `M2UsePixelShaders` (`0x40290c`, name
+    // `0x82e644`, "0"), flags 0, no callback: their registering function reads six of its eight
+    // `M2*` records at `0x40297f`-`0x4029dd` into the M2 renderer's feature word `[0xceefb0]`
+    // (`0x706dd0`), once at startup, hence the stock tooltip's logout requirement. No effect here:
+    // benilla's M2 draw has one skinning and lighting path, chosen by no switch.
+    same("M2UseShaders", "1"),
+    same("M2UsePixelShaders", "0"),
+    // `lod` (`0x68848c`: name `0x8697d0`, "1", flags 1, callback `0x688920`, record `[0xc7f314]`),
+    // World LOD: bit 2 of `[0xc7b2a4]`, which gates the doodad LOD distance test at `0x6afb11`. No
+    // effect here: benilla has no doodad LOD swap, as `lodDist` above has no row.
+    same("lod", "1"),
+    // `movieSubtitle` (`0x402c18`: name `0x82e9d8`, "0", flags 0, record `[0x882640]`), Cinematic
+    // Subtitles: the pre-rendered movies' subtitles, read by the glue's `GetMovieSubtitles`
+    // (`0x46dbc0`). No effect here: benilla plays no pre-rendered movie.
+    same("movieSubtitle", "0"),
+    // `useWeatherShaders` (`0x67b81d`: name `0x868598`, "1", flags 0, no callback, record
+    // `[0xc7b588]`), Weather Shaders: read in each precipitation effect's constructor (`0x67480f`,
+    // `0x6775a7`, `0x679274`), which clears the effect's shader flag at 0. No effect here: rain's
+    // two legs are one draw with other scalars, but snow's fixed-function leg (`0x678960`) is a
+    // CPU-built triangle per flake where the shader leg (`0x678610`) is a point sprite, a second
+    // draw path `benilla_world::weather` does not have, so the shader leg always runs.
+    same("useWeatherShaders", "1"),
+    // The latched `gx*` rows the stock window's boxes and refresh dropdown write (flags 3, committed
+    // by `RestartGx`), each callback storing one field of the device-format record `0xc4eb98`.
+    //
+    // `gxMaximize` (`0x63a8e0`: name `0x864edc`, "0", "1" on zhCN like `gxWindow`, callback
+    // `0x63b1f0` → `+0x09` `[0xc4eba1]`): the window rebuild `0x58cf10` makes a windowed, maximized
+    // window a borderless popup (style `0x90000000`) at the screen's full size (`GetSystemMetrics`
+    // 0 and 1). The knob is [`crate::video::VideoConfig::maximize`].
+    same("gxMaximize", "0").latched(),
+    // `gxTripleBuffer` (`0x63a80d`: name `0x864f88`, "0", callback `0x63afe0` → `+0x18`), whose
+    // callback refuses any value but 0 or 1 ("TripleBuffer must be 0 or 1", `0x8650b8`), a range
+    // this registry has no way to refuse with. No effect here: wgpu's present modes offer no
+    // triple-buffer choice.
+    same("gxTripleBuffer", "0").latched(),
+    // `gxCursor` (`0x63a906`: name `0x864eb8`, "1", callback `0x63b220` → `+0x05` `[0xc4eb9d]`),
+    // Hardware Cursor. No effect here: benilla always draws the OS cursor (`crate::cursor`) and has
+    // no software cursor to fall back to.
+    same("gxCursor", "1").latched(),
+    // `gxFixLag` (`0x63a9c1`: name `0x864e40`, callback `0x63b310` → `+0x06` `[0xc4eb9e]`), Fix
+    // Input Lag: its default is `"%d"` of `VideoHardware.dbc` field 20 (`[[0xc4e6e4]+0x50]`) of the
+    // row `DetectHardware` matched, 1 on all three fallback rows (168, 169, 170) a modern GPU can
+    // reach. No effect here: benilla has no such switch in its frame pacing.
+    same("gxFixLag", "1").latched(),
+    // `gxRefresh` (`0x63a7e7`: name `0x864fa8`, "75", callback `0x63aed0` → `+0x28`), the refresh
+    // dropdown (`OptionsFrame.lua:242-245`, `:300`); the callback accepts only the eleven rates at
+    // `0x8645e0` (60 to 200). No effect here: fullscreen is borderless at the monitor's own rate,
+    // and `GetRefreshRates` answers the reference's no-rates sentinel, which disables the dropdown.
+    same("gxRefresh", "75").latched(),
+    // benilla's own: the world renders at `window × this` while the UI stays native. The knob is
+    // [`crate::world_backdrop::RenderScale`], clamped to `RENDER_SCALE_RANGE`; at "1" nothing is
+    // resampled. `$WOW_RENDER_SCALE` overrides it for the session.
+    ours(
+        "renderScale",
+        "1",
+        "benilla's own — the reference has no off-screen buffer to hang a resolution dial \
+         on; its nearest equivalent, `gxResolution`, drops the interface with the world",
+    ),
+    // benilla's own: `/console fpsJournal 1` appends a per-second row of position, frame cost and
+    // per-pass GPU time to `benilla-config/Diagnostics/fps-journal.csv`. The knob is
+    // [`crate::perf::FpsJournalSetting`].
+    ours(
+        "fpsJournal",
+        "0",
+        "benilla's own — 1.12 has no player-side perf log; its nearest thing is the \
+         Ctrl+R framerate label, a number with no file behind it",
+    ),
+    // `lastCharacterIndex` (`0x402d93`, "0" `0x82e570`, category 4, handle `[0x882674]`), help
+    // "Last character selected": a 0-based row (the selection cell `[0x83856c]` under `"%d"`), so
+    // "0" is the first character. It mirrors [`crate::char_select::Roster::pending_index`].
+    same(crate::char_select::CVAR_LAST_CHARACTER, "0"),
+];
diff --git a/crates/benilla-app/src/entities.rs b/crates/benilla-app/src/entities.rs
index e4c90d52..510134e9 100644
--- a/crates/benilla-app/src/entities.rs
+++ b/crates/benilla-app/src/entities.rs
@@ -28,6 +28,10 @@ use display::{
 mod attach;
 use attach::{attach_entity_visuals, build_dressup_preview, build_glue_pet, build_glue_preview};
 
+/// Composited body skins by look, built off the main thread.
+mod skin_composite;
+use skin_composite::{land_skin_composites, SkinComposites, SkinKey, SkinSections};
+
 /// The dynamic point lights an entity's own model carries, such as a held torch.
 mod carried_light;
 use carried_light::spawn_carried_lights;
@@ -251,6 +255,11 @@ impl Creatures {
         self.catalog.foley_material(display_id)
     }
 
+    /// A display's override race and sex (`CreatureDisplayInfoExtra`), `None` without one.
+    pub(crate) fn display_race_sex(&self, display_id: u32) -> Option<(u8, u8)> {
+        self.catalog.display_race_sex(display_id)
+    }
+
     /// A display's collision height in raw model units; [`CollisionHeight`] is the world value.
     pub(crate) fn collision_height(&self, display_id: u32) -> Option<f32> {
         self.catalog.collision_height(display_id)
@@ -384,34 +393,28 @@ struct GameObjects {
 #[derive(Resource)]
 struct Characters(CharacterGeosets);
 
-/// The `CharSections` skin lookup; without it a player's body skin stays untextured.
-#[derive(Resource)]
-struct SkinSections(CharSections);
-
 /// Character-creation data (body displays, race and class combos, appearance ranges).
 #[derive(Resource)]
 pub(crate) struct CharCreate(pub(crate) CharCreateCatalog);
 
-/// Composited body skins by look, so every player wearing a look shares one 256² atlas.
-#[derive(Resource, Default)]
-struct SkinComposites(benilla_assets::SpatialCache<SkinKey, Handle<Image>>);
+/// When a net entity arrived, on the appear fade's clock: the reference stamps a unit's fade as its
+/// create block is processed (`0x465c50` → `0x5fb880`, a player's through `0x5debe0` →
+/// `0x613af0` at `0x5fb956` → `0x614f80`), before its model or composite is ready, so the ramp runs
+/// from here however long the visual waits. A mount child carries its rider's, as the reference
+/// writes the unit's one fade onto the mount model (`0x614ae6`–`0x614af4`, `0x614b9e`–`0x614bba`).
+#[derive(Component, Clone, Copy, Debug, PartialEq)]
+pub(crate) struct Arrival(pub(crate) f32);
 
-/// What decides a composited body skin: race and sex pick the `CharSections` rows, the dials pick
-/// the variations, and `equip` holds the worn armour display ids by body slot − 2.
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-pub(super) struct SkinKey {
-    pub(super) race: u8,
-    pub(super) sex: u8,
-    pub(super) skin: u8,
-    pub(super) face: u8,
-    pub(super) facial_hair: u8,
-    pub(super) hair_style: u8,
-    pub(super) hair_color: u8,
-    pub(super) equip: [u32; 8],
-    /// The guild emblem: two guilds' members wear one tabard display but must not share an atlas.
-    pub(super) emblem: Option<benilla_formats::GuildEmblem>,
-    /// The tabard designer's preview: the emblem paints over an empty tabard slot.
-    pub(super) tabard_preview: bool,
+/// Stamp each net entity's [`Arrival`] the frame it streams in.
+fn stamp_arrivals(
+    mut commands: Commands,
+    time: Res<Time>,
+    arrived: Query<Entity, (Added<NetEntity>, Without<Arrival>)>,
+) {
+    let now = time.elapsed_secs();
+    for entity in &arrived {
+        commands.entity(entity).insert(Arrival(now));
+    }
 }
 
 /// Marks a net entity whose visual is attached; the `waterfx` rig pre-marks its dummy unit.
@@ -449,9 +452,9 @@ fn evict_display_caches(
         items.as_ref().map_or(0, |i| i.models.len()),
         fx.models.len(),
         glows.as_ref().map_or(0, |g| g.models.len()),
-        composites.0.len(),
+        composites.done.len(),
     );
-    composites.0.clear();
+    composites.clear();
     fx.models.clear();
     if let Some(mut c) = creatures {
         c.models.clear();
@@ -474,7 +477,10 @@ fn scope_entity_art(
     mut scope: benilla_world::art_scope::ArtScope,
     mut composites: ResMut<SkinComposites>,
 ) {
-    scope.apply(&mut composites.0, benilla_world::art_scope::ArtSlot::Skins);
+    scope.apply(
+        &mut composites.done,
+        benilla_world::art_scope::ArtSlot::Skins,
+    );
 }
 
 /// A built body's armed-idle box in model space, which [`publish_world_units`] restates as
@@ -603,6 +609,21 @@ impl Plugin for EntitiesPlugin {
         .add_message::<live_display::DisplaySwapped>()
         .add_systems(Startup, setup_entities.after(AssetSet::Open))
         .add_systems(Update, (evict_display_caches, scope_entity_art))
+        // An arrival is stamped the frame it streams in, before its visual is asked for.
+        .add_systems(
+            Update,
+            stamp_arrivals
+                .after(WorldStage::Net)
+                .before(EntityVisualsSet),
+        )
+        // Finished body composites land before the frame's bodies ask for their atlas.
+        .add_systems(
+            Update,
+            land_skin_composites
+                .after(evict_display_caches)
+                .before(EntityVisualsSet)
+                .after(WorldStage::Net),
+        )
         // After the net stage, whose Commands create the entity; until then its readers take the
         // constructor default.
         .add_systems(Update, stamp_collision_heights.after(WorldStage::Net))
@@ -874,7 +895,9 @@ fn setup_entities(
         Err(e) => warn!("character geosets unavailable, players show every geoset: {e:#}"),
     }
     match CharSections::load(&mut chain) {
-        Ok(sections) => commands.insert_resource(SkinSections(sections)),
+        Ok(sections) => {
+            commands.insert_resource(SkinSections::new(sections, world_assets.chain.clone()))
+        }
         Err(e) => warn!("char sections unavailable, player bodies stay untextured: {e:#}"),
     }
     match CharCreateCatalog::load(&mut chain) {
@@ -936,6 +959,10 @@ fn setup_entities(
         Ok(catalog) => commands.insert_resource(crate::ui_mail::Stationery(catalog)),
         Err(e) => warn!("stationery catalog unavailable, mail uses the default backdrop: {e:#}"),
     }
+    match benilla_formats::load_packages(&mut chain) {
+        Ok(rows) => commands.insert_resource(crate::ui_mail::Packages(rows)),
+        Err(e) => warn!("mail packages unavailable, GetNumPackages answers 0: {e:#}"),
+    }
     match benilla_formats::load_page_text_material_catalog(&mut chain) {
         Ok(catalog) => commands.insert_resource(crate::ui_item_text::PageMaterials(catalog)),
         Err(e) => warn!("page text materials unavailable, books read on parchment: {e:#}"),
diff --git a/crates/benilla-app/src/entities/attach/arrival_tests.rs b/crates/benilla-app/src/entities/attach/arrival_tests.rs
new file mode 100644
index 00000000..d8457edf
--- /dev/null
+++ b/crates/benilla-app/src/entities/attach/arrival_tests.rs
@@ -0,0 +1,455 @@
+//! Bodies arriving together, against the real install: each composite runs off the main thread and
+//! its body is built only once it can draw dressed, as the reference withholds a unit whose first
+//! composite is pending (`0x607da0` → `0x477860`, `0x481749` → `0x710c50`).
+
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+use std::time::{Duration, Instant};
+
+use benilla_formats::{load_item_display_catalog, open_chain, CharSections, NpcAppearance};
+use benilla_protocol::ObjectFields;
+
+use super::super::skin_composite::{land_skin_composites, SkinKey};
+use super::super::{Equipment, ItemDisplays};
+use super::*;
+
+/// The one character-body display every arrival wears.
+const BODY: u32 = 42;
+
+/// Worn display ids by bodyslot − 2: tier-2 sets at their 1.12 displays.
+const SETS: [[u32; 8]; 4] = [
+    [10840, 33983, 33990, 33986, 33989, 33982, 33984, 0],
+    [0, 33650, 31110, 31115, 31111, 31127, 33651, 0],
+    [0, 33667, 33665, 33672, 34269, 33666, 33668, 0],
+    [0, 34081, 34078, 34084, 34083, 34079, 34082, 0],
+];
+
+/// One synthetic batch that can feather, so a built body has a child to show and joins its
+/// appear ramp.
+fn body_part() -> super::super::EntityPart {
+    super::super::EntityPart {
+        mesh: Handle::default(),
+        geometry: Arc::new(benilla_formats::RenderSubmesh::default()),
+        aabb: None,
+        skinned_mesh: None,
+        welded_billboard: false,
+        material: Handle::default(),
+        material_interior: None,
+        material_interior_bake: None,
+        material_interior_bake_blend: None,
+        fade_blend: Some(Handle::default()),
+        zfill: None,
+        blend: benilla_formats::ModelBlend::Opaque,
+        additive: false,
+        two_sided: false,
+        geoset_id: 0,
+        char_slot: None,
+        billboard: None,
+        alpha_anim: None,
+        rgb_anim: None,
+        rgb_seq: None,
+        uv_anim: None,
+        uv_seq: None,
+        uv_rot_seq: None,
+        uv_scale_seq: None,
+        ground_quad: None,
+    }
+}
+
+/// A loaded character-body display; `npc` gives it a creature-display look.
+fn body_display(npc: Option<NpcAppearance>) -> DisplayModel {
+    DisplayModel {
+        handle: ModelHandle::M2(Handle::default()),
+        parts: Some(vec![body_part()]),
+        is_character_body: true,
+        npc_appearance: npc,
+        ..super::super::display::empty_shell()
+    }
+}
+
+/// The attach chain over the real tables and chain: finished composites land, then bodies build.
+fn app() -> Option<App> {
+    let data = benilla_formats::wow_data_or_skip!(None);
+    let mut chain = open_chain(&data).expect("open chain");
+    let tables = CharSections::load(&mut chain).expect("CharSections");
+    let items = load_item_display_catalog(&mut chain).expect("ItemDisplayInfo");
+    let mut app = App::new();
+    app.add_plugins((MinimalPlugins, AssetPlugin::default()))
+        .init_asset::<Image>()
+        .init_asset::<Mesh>()
+        .init_asset::<benilla_assets::materials::WowModelMaterial>()
+        .init_resource::<benilla_world::model_render::ModelMaterials>()
+        .init_resource::<super::super::corpse::BonesModels>()
+        .init_resource::<SkinComposites>()
+        .init_resource::<merge::MergedFormsCache>()
+        .init_resource::<benilla_world::doodad_anim::UvAnimMaterials>()
+        .init_resource::<benilla_world::doodad_anim::TintAnimMaterials>()
+        .init_resource::<benilla_world::mat_anim_table::MatAnimTable>()
+        .init_resource::<benilla_world::rig_palette::RigPalettes>()
+        .init_resource::<benilla_world::collision::ColliderEpoch>()
+        .insert_resource(CubeAssets {
+            mesh: Handle::default(),
+            player_mesh: Handle::default(),
+            player_mat: Handle::default(),
+            npc_mat: Handle::default(),
+        })
+        .insert_resource(SkinSections::new(tables, Arc::new(Mutex::new(chain))))
+        .insert_resource(ItemDisplays::icons_for_tests(items))
+        .add_systems(
+            Update,
+            (
+                super::super::stamp_arrivals,
+                land_skin_composites,
+                attach_entity_visuals,
+            )
+                .chain(),
+        );
+    Some(app)
+}
+
+/// A player's look: race, sex, face, hair style and its worn set.
+#[derive(Clone, Copy)]
+struct Look {
+    race: u8,
+    sex: u8,
+    face: u8,
+    hair: u8,
+    equip: [u32; 8],
+}
+
+impl Look {
+    fn key(&self) -> SkinKey {
+        SkinKey {
+            race: self.race,
+            sex: self.sex,
+            skin: 0,
+            face: self.face,
+            facial_hair: 0,
+            hair_style: self.hair,
+            hair_color: 0,
+            equip: self.equip,
+            emblem: None,
+            tabard_preview: false,
+        }
+    }
+}
+
+/// A player arriving in `look`, its gear settled.
+fn arrive(app: &mut App, look: Look) -> Entity {
+    let bytes_0 = u32::from(look.race) | u32::from(look.sex) << 16;
+    let bytes = u32::from(look.face) << 8 | u32::from(look.hair) << 16;
+    app.world_mut()
+        .spawn((
+            NetEntity {
+                kind: EntityKind::Player,
+                display_id: Some(BODY),
+                scale: 1.0,
+            },
+            Equipment {
+                bodyslots: look.equip,
+                settled: true,
+                ..Default::default()
+            },
+            // UNIT_FIELD_BYTES_0 (36): race, gender; PLAYER_BYTES (193): face, hair style.
+            ObjectStore(ObjectFields::from_pairs(&[(36, bytes_0), (193, bytes)])),
+            Transform::default(),
+            Visibility::default(),
+        ))
+        .id()
+}
+
+fn built(app: &App, e: Entity) -> bool {
+    app.world().entity(e).contains::<VisualAttached>()
+}
+
+fn children(app: &App, e: Entity) -> usize {
+    app.world().get::<Children>(e).map_or(0, |c| c.len())
+}
+
+/// A crowd arriving in one frame costs that frame no composite: every body waits, drawing
+/// nothing, while its look composites off the main thread, and each is built on a frame its
+/// finished atlas is already cached. A look already cached builds at once.
+#[test]
+fn a_crowd_composites_off_the_main_thread_and_each_body_waits_for_its_atlas() {
+    let Some(mut app) = app() else { return };
+    app.world_mut().insert_resource(Creatures {
+        catalog: Default::default(),
+        models: HashMap::from([(BODY, body_display(None))]),
+    });
+    let races = [1u8, 2, 3, 4, 5, 6, 7, 8];
+    let looks: Vec<Look> = (0..12)
+        .map(|i| Look {
+            race: races[i % races.len()],
+            sex: (i / races.len()) as u8,
+            face: (i % 3) as u8,
+            hair: (i % 4) as u8,
+            equip: SETS[i % SETS.len()],
+        })
+        .collect();
+    let crowd: Vec<Entity> = looks.iter().map(|&l| arrive(&mut app, l)).collect();
+
+    app.update();
+    let composites = app.world().resource::<SkinComposites>();
+    assert_eq!(
+        composites.done.len(),
+        0,
+        "the arrival frame composited nothing on the main thread"
+    );
+    assert_eq!(composites.running(), crowd.len(), "one composite per look");
+    for &e in &crowd {
+        assert!(!built(&app, e), "a body waits for its composite");
+        assert_eq!(children(&app, e), 0, "and draws nothing meanwhile");
+    }
+
+    let deadline = Instant::now() + Duration::from_secs(20);
+    while crowd.iter().any(|&e| !built(&app, e)) {
+        assert!(Instant::now() < deadline, "every composite lands");
+        std::thread::sleep(Duration::from_millis(1));
+        app.update();
+        for (&e, look) in crowd.iter().zip(&looks) {
+            if built(&app, e) {
+                let atlas = app
+                    .world_mut()
+                    .resource_mut::<SkinComposites>()
+                    .done
+                    .fetch(&look.key());
+                assert!(
+                    matches!(atlas, Some(Some(_))),
+                    "a body is built only over its finished atlas"
+                );
+                assert!(children(&app, e) > 0, "and draws once built");
+            }
+        }
+    }
+    assert_eq!(app.world().resource::<SkinComposites>().running(), 0);
+
+    // A look already composited is not waited on.
+    let twin = arrive(&mut app, looks[0]);
+    app.update();
+    assert!(built(&app, twin), "a cached look builds on its first frame");
+    assert_eq!(app.world().resource::<SkinComposites>().running(), 0);
+}
+
+/// A body that waited on its composite joins the appear ramp its arrival started: the reference's
+/// fade is stamped by the create block's appear handler (`0x613af0` → `0x614f80`) and ramps on the
+/// wall clock whatever ShouldRender answers (`0x614a90` at `0x60800c`).
+#[test]
+fn a_body_that_waited_for_its_atlas_fades_from_its_arrival() {
+    let Some(mut app) = app() else { return };
+    app.world_mut().insert_resource(Creatures {
+        catalog: Default::default(),
+        models: HashMap::from([(BODY, body_display(None))]),
+    });
+    let look = Look {
+        race: 1,
+        sex: 0,
+        face: 0,
+        hair: 0,
+        equip: SETS[0],
+    };
+    let player = arrive(&mut app, look);
+    app.update();
+    let arrived = app
+        .world()
+        .get::<super::super::Arrival>(player)
+        .expect("stamped the frame it arrived")
+        .0;
+    assert!(!built(&app, player), "the body waits for its atlas");
+
+    let deadline = Instant::now() + Duration::from_secs(20);
+    while !built(&app, player) {
+        assert!(Instant::now() < deadline, "the composite lands");
+        std::thread::sleep(Duration::from_millis(1));
+        app.update();
+    }
+    let built_at = app.world().resource::<Time>().elapsed_secs();
+    assert!(
+        built_at > arrived,
+        "the body was built frames after it arrived"
+    );
+    assert_eq!(
+        app.world()
+            .get::<benilla_world::model_fade::UnitAppearFade>(player)
+            .copied(),
+        Some(benilla_world::model_fade::UnitAppearFade::Pending {
+            since: built_at,
+            arrived,
+        }),
+        "its ramp runs from its arrival, its backstop from its build"
+    );
+}
+
+/// benilla's own palette heal rebuilds a body that was drawn: its composite is forced, so even a
+/// look the cache has dropped rebuilds in the same frame and never drops out.
+#[test]
+fn a_healed_rig_rebuilds_its_body_in_the_same_frame() {
+    use bevy::ecs::system::RunSystemOnce;
+    let Some(mut app) = app() else { return };
+    app.world_mut().insert_resource(Creatures {
+        catalog: Default::default(),
+        models: HashMap::from([(BODY, body_display(None))]),
+    });
+    let look = Look {
+        race: 2,
+        sex: 1,
+        face: 1,
+        hair: 2,
+        equip: SETS[1],
+    };
+    let player = arrive(&mut app, look);
+    let deadline = Instant::now() + Duration::from_secs(20);
+    while !built(&app, player) {
+        assert!(Instant::now() < deadline, "the composite lands");
+        std::thread::sleep(Duration::from_millis(1));
+        app.update();
+    }
+
+    // The scope sweep dropped the look, then the rig starved and heals.
+    app.world_mut()
+        .resource_mut::<SkinComposites>()
+        .done
+        .clear();
+    app.world_mut()
+        .entity_mut(player)
+        .insert((crate::net::Guid(7), benilla_world::rig_palette::RigStarved));
+    app.world_mut()
+        .run_system_once(super::super::live_display::heal_rig_starved)
+        .expect("the heal runs");
+    assert!(!built(&app, player), "the heal tore the visual down");
+    app.update();
+    assert!(built(&app, player), "and it rebuilt in the same frame");
+    assert!(children(&app, player) > 0, "drawing");
+    assert_eq!(app.world().resource::<SkinComposites>().running(), 0);
+}
+
+/// A creature display with a baked atlas loads it as is and is never waited on (`0x477866`); one
+/// without composites like a player and waits.
+#[test]
+fn a_baked_npc_skin_never_waits_on_the_compositor() {
+    let Some(mut app) = app() else { return };
+    let npc = |bake_name: Option<&str>| NpcAppearance {
+        race: 1,
+        sex: 0,
+        skin: 0,
+        face: 0,
+        hair_style: 0,
+        hair_color: 0,
+        facial_hair: 0,
+        equipment: [0; 10],
+        bake_name: bake_name.map(str::to_owned),
+    };
+    app.world_mut().insert_resource(Creatures {
+        catalog: Default::default(),
+        models: HashMap::from([
+            (7, body_display(Some(npc(Some("HumanMaleGuard.blp"))))),
+            (8, body_display(Some(npc(None)))),
+        ]),
+    });
+    let mut unit = |display: u32| {
+        app.world_mut()
+            .spawn((
+                NetEntity {
+                    kind: EntityKind::Unit,
+                    display_id: Some(display),
+                    scale: 1.0,
+                },
+                Transform::default(),
+                Visibility::default(),
+            ))
+            .id()
+    };
+    let (baked, live) = (unit(7), unit(8));
+    app.update();
+    assert!(built(&app, baked), "a baked skin builds on its first frame");
+    assert!(
+        !built(&app, live),
+        "a composited NPC skin waits for its atlas"
+    );
+    assert_eq!(app.world().resource::<SkinComposites>().running(), 1);
+}
+
+/// What a crowd of 40 distinct looks costs the main thread: its arrival frame's requests, each
+/// frame's landing, against compositing the same crowd on this thread.
+#[test]
+#[ignore = "instrument: run by hand — cargo test -p benilla-app --lib arrival_tests::crowd_main_thread_cost -- --ignored --nocapture"]
+fn crowd_main_thread_cost() {
+    use super::super::skin_composite::SkinComposites;
+    let data = benilla_formats::wow_data_or_skip!();
+    bevy::tasks::AsyncComputeTaskPool::get_or_init(bevy::tasks::TaskPool::new);
+    let mut chain = open_chain(&data).expect("open chain");
+    let tables = CharSections::load(&mut chain).expect("CharSections");
+    let items = load_item_display_catalog(&mut chain).expect("ItemDisplayInfo");
+    let sections = SkinSections::new(tables, Arc::new(Mutex::new(chain)));
+    let races = [1u8, 2, 3, 4, 5, 6, 7, 8];
+    let keys: Vec<SkinKey> = (0..40)
+        .map(|i| {
+            Look {
+                race: races[i % races.len()],
+                sex: (i / races.len() % 2) as u8,
+                face: (i % 3) as u8,
+                hair: (i % 4) as u8,
+                equip: SETS[i % SETS.len()],
+            }
+            .key()
+        })
+        .collect();
+    let plan = |key: &SkinKey| {
+        let worn: [Option<&benilla_formats::ItemDisplay>; 8] = std::array::from_fn(|i| {
+            (key.equip[i] != 0)
+                .then(|| items.get(key.equip[i]))
+                .flatten()
+        });
+        sections.tables.composite_plan(
+            key.race,
+            key.sex,
+            key.skin,
+            key.face,
+            key.facial_hair,
+            key.hair_style,
+            key.hair_color,
+            worn,
+            key.emblem,
+            key.tabard_preview,
+        )
+    };
+    let ms = |d: Duration| d.as_secs_f64() * 1e3;
+
+    let mut images = Assets::<Image>::default();
+    let mut lane = SkinComposites::default();
+    let t = Instant::now();
+    for key in &keys {
+        lane.request(*key, &sections, || plan(key));
+    }
+    let arrival = t.elapsed();
+    let (mut landing, mut worst, mut frames) = (Duration::ZERO, Duration::ZERO, 0);
+    let wall = Instant::now();
+    while lane.running() > 0 {
+        std::thread::sleep(Duration::from_millis(1));
+        let t = Instant::now();
+        if lane.land(&mut images) > 0 {
+            frames += 1;
+        }
+        let d = t.elapsed();
+        landing += d;
+        worst = worst.max(d);
+    }
+    println!(
+        "LANE arrival frame: {:.3} ms for {} looks; landing {:.3} ms over {frames} landing frames \
+         (worst {:.3} ms); all landed {:.1} ms after arrival",
+        ms(arrival),
+        keys.len(),
+        ms(landing),
+        ms(worst),
+        ms(wall.elapsed())
+    );
+
+    let mut sync = SkinComposites::default();
+    let t = Instant::now();
+    for key in &keys {
+        sync.force(*key, &sections, || plan(key), &mut images);
+    }
+    println!(
+        "LANE the same crowd composited on this thread: {:.1} ms",
+        ms(t.elapsed())
+    );
+}
diff --git a/crates/benilla-app/src/entities/attach/char_skin.rs b/crates/benilla-app/src/entities/attach/char_skin.rs
index 70aa8a49..1ba4f557 100644
--- a/crates/benilla-app/src/entities/attach/char_skin.rs
+++ b/crates/benilla-app/src/entities/attach/char_skin.rs
@@ -7,9 +7,9 @@ use bevy::prelude::*;
 
 use crate::net::{NetEntity, ObjectStore};
 use benilla_assets::materials::WowModelMaterial;
-use benilla_assets::{repeat_texture_authored, LockRecover, WorldAssets};
 
-use super::super::{DisplayModel, EntityPart, SkinKey, SkinSections};
+use super::super::skin_composite::BodyAtlas;
+use super::super::{DisplayModel, EntityPart, SkinComposites, SkinKey, SkinSections};
 
 /// A character-model body's appearance, from the wire or from its display's
 /// CreatureDisplayInfoExtra row; it drives both the geoset selection and the skin materials.
@@ -214,24 +214,131 @@ fn shared_skin_probe() -> bool {
     *ON.get_or_init(|| std::env::var_os("WOW_PROBE_SHARED_SKIN").is_some())
 }
 
-/// Build a character body's per-appearance materials: the body atlas (composited live, or an NPC's
-/// baked BLP), the hair, the cape and the extra skin, each at its batches' own blend and
-/// sidedness from `parts`. Without the tables or the light buffer, parts keep their built material.
-#[allow(clippy::type_complexity)]
-pub(super) fn build_char_skin_materials(
+/// The composite a look wears: `None` for a baked NPC atlas, which is never composited.
+pub(super) fn skin_key(
     look: &CharLook,
     // The armor ids paint only a live composite; a baked NPC atlas already carries its gear.
     equip: [u32; 8],
-    cloak: u32,
     // Painted over a tabard whose display asks for it; `None` leaves the tabard's own art.
     emblem: Option<benilla_formats::GuildEmblem>,
     tabard_preview: bool,
+) -> Option<SkinKey> {
+    let BodySkin::Composite { face } = look.body else {
+        return None;
+    };
+    // `WOW_PROBE_SHARED_SKIN` prices a shared body material and is never a look: one key for every
+    // body lets Bevy's batcher instance them.
+    if shared_skin_probe() {
+        return Some(SkinKey {
+            race: 1,
+            sex: 0,
+            skin: 0,
+            face: 0,
+            facial_hair: 0,
+            hair_style: 0,
+            hair_color: 0,
+            equip: [0; 8],
+            emblem: None,
+            tabard_preview: false,
+        });
+    }
+    Some(SkinKey {
+        race: look.race,
+        sex: look.sex,
+        skin: look.skin,
+        face,
+        facial_hair: look.facial_hair,
+        hair_style: look.hair_style,
+        hair_color: look.hair_color,
+        equip,
+        emblem,
+        tabard_preview,
+    })
+}
+
+/// What `key`'s composite reads, from the tables and the worn displays' rows.
+fn composite_plan(
+    key: &SkinKey,
+    sections: &SkinSections,
+    displays: Option<&super::super::ItemDisplays>,
+) -> Option<benilla_formats::CompositePlan> {
+    let mut worn: [Option<&benilla_formats::ItemDisplay>; 8] = [None; 8];
+    if let Some(catalog) = displays.map(|d| &d.catalog) {
+        for (i, id) in key.equip.iter().enumerate() {
+            if *id != 0 {
+                worn[i] = catalog.get(*id);
+            }
+        }
+    }
+    sections.tables.composite_plan(
+        key.race,
+        key.sex,
+        key.skin,
+        key.face,
+        key.facial_hair,
+        key.hair_style,
+        key.hair_color,
+        worn,
+        key.emblem,
+        key.tabard_preview,
+    )
+}
+
+/// A world body's atlas. A baked NPC skin loads as is and is never waited on (the fork at
+/// `0x477866`); a composited one is cached, or running off the main thread, started here on a
+/// miss. Without the tables the body stays untextured.
+pub(super) fn body_atlas(
+    look: &CharLook,
+    key: Option<SkinKey>,
     displays: Option<&super::super::ItemDisplays>,
     sections: Option<&SkinSections>,
-    world_assets: Option<&WorldAssets>,
-    parts: &[EntityPart],
+    composites: &mut SkinComposites,
+    asset_server: &AssetServer,
+) -> BodyAtlas {
+    if let BodySkin::Baked(name) = &look.body {
+        return BodyAtlas::Ready(Some(asset_server.load::<Image>(baked_npc_url(name))));
+    }
+    match (key, sections) {
+        (Some(key), Some(sections)) => {
+            composites.request(key, sections, || composite_plan(&key, sections, displays))
+        }
+        _ => BodyAtlas::Ready(None),
+    }
+}
+
+/// [`body_atlas`] composited on this thread on a miss ([`SkinComposites::force`]): the previews, whose
+/// composite the reference forces, a re-dress of a standing body and a rig-heal rebuild.
+pub(super) fn forced_body_atlas(
+    look: &CharLook,
+    key: Option<SkinKey>,
+    displays: Option<&super::super::ItemDisplays>,
+    sections: Option<&SkinSections>,
+    composites: &mut SkinComposites,
+    asset_server: &AssetServer,
     images: &mut Assets<Image>,
-    skin_cache: &mut benilla_assets::SpatialCache<SkinKey, Handle<Image>>,
+) -> Option<Handle<Image>> {
+    if let BodySkin::Baked(name) = &look.body {
+        return Some(asset_server.load::<Image>(baked_npc_url(name)));
+    }
+    let (key, sections) = (key?, sections?);
+    composites.force(
+        key,
+        sections,
+        || composite_plan(&key, sections, displays),
+        images,
+    )
+}
+
+/// Build a character body's per-appearance materials: the body atlas ([`body_atlas`]), the hair,
+/// the cape and the extra skin, each at its batches' own blend and sidedness from `parts`. Without
+/// the tables or the light buffer, parts keep their built material.
+pub(super) fn build_char_skin_materials(
+    look: &CharLook,
+    body_tex: Option<Handle<Image>>,
+    cloak: u32,
+    displays: Option<&super::super::ItemDisplays>,
+    sections: Option<&SkinSections>,
+    parts: &[EntityPart],
     asset_server: &AssetServer,
     mats: &mut benilla_world::model_render::M2BatchMaterials,
 ) -> CharSkinMaterials {
@@ -250,80 +357,6 @@ pub(super) fn build_char_skin_materials(
         )
     };
 
-    // The composite reads its BLPs synchronously off the shared chain, once per look behind the
-    // cache.
-    let body_tex: Option<Handle<Image>> = match &look.body {
-        BodySkin::Baked(name) => Some(asset_server.load::<Image>(baked_npc_url(name))),
-        BodySkin::Composite { face } => world_assets.and_then(|world| {
-            let mut key = SkinKey {
-                race: look.race,
-                sex: look.sex,
-                skin: look.skin,
-                face: *face,
-                facial_hair: look.facial_hair,
-                hair_style: look.hair_style,
-                hair_color: look.hair_color,
-                equip,
-                emblem,
-                tabard_preview,
-            };
-            // `WOW_PROBE_SHARED_SKIN` prices a shared body material and is never a look: one key
-            // for every body lets Bevy's batcher instance them.
-            if shared_skin_probe() {
-                key = SkinKey {
-                    race: 1,
-                    sex: 0,
-                    skin: 0,
-                    face: 0,
-                    facial_hair: 0,
-                    hair_style: 0,
-                    hair_color: 0,
-                    equip: [0; 8],
-                    emblem: None,
-                    tabard_preview: false,
-                };
-            }
-            match skin_cache.fetch(&key) {
-                Some(handle) => Some(handle),
-                None => {
-                    let catalog = displays.map(|d| &d.catalog);
-                    let mut worn: [Option<&benilla_formats::ItemDisplay>; 8] = [None; 8];
-                    if let Some(catalog) = catalog {
-                        for (i, id) in equip.iter().enumerate() {
-                            if *id != 0 {
-                                worn[i] = catalog.get(*id);
-                            }
-                        }
-                    }
-                    let chain = &mut world.chain.lock_recover();
-                    let composed = sections
-                        .0
-                        .composite_body(
-                            chain,
-                            key.race,
-                            key.sex,
-                            key.skin,
-                            key.face,
-                            key.facial_hair,
-                            key.hair_style,
-                            key.hair_color,
-                            worn,
-                            key.emblem,
-                            key.tabard_preview,
-                        )
-                        .ok()??;
-                    // Through the upload gate like every texture: a no-op on this RGBA8
-                    // composite, but it keeps the format and the bytes in agreement.
-                    let handle = images.add(repeat_texture_authored(
-                        benilla_assets::for_upload(composed),
-                        (true, true),
-                    ));
-                    skin_cache.insert(key, handle.clone());
-                    Some(handle)
-                }
-            }
-        }),
-    };
     // A single-sided and a two-sided set, chosen per batch by its own M2 `0x04`: the robe skirt
     // (geoset 1302) is authored two-sided, the closed body is not.
     let body = body_tex.map(|tex| {
@@ -342,7 +375,7 @@ pub(super) fn build_char_skin_materials(
     // The hair texture (M2 type 6) also dresses the facial hair of races whose beards are
     // geometry, so it resolves through `hair_mesh_texture`'s bald fallback: a bald orc has a beard.
     let hair = sections
-        .0
+        .tables
         .hair_mesh_texture(look.race, look.sex, look.hair_style, look.hair_color)
         .and_then(|path| {
             let hair_part = parts
@@ -377,7 +410,7 @@ pub(super) fn build_char_skin_materials(
     // skinColor, loaded plain as the reference does, never composited. Its batches are an opaque
     // single-sided core and alpha-cut two-sided fringe cards, so one set per sidedness.
     let skin_extra = sections
-        .0
+        .tables
         .skin_extra_texture(look.race, look.sex, look.skin)
         .map_or((None, None), |path| {
             let tex = asset_server.load::<Image>(format!(
diff --git a/crates/benilla-app/src/entities/attach/dress.rs b/crates/benilla-app/src/entities/attach/dress.rs
index 3be9197b..42be7054 100644
--- a/crates/benilla-app/src/entities/attach/dress.rs
+++ b/crates/benilla-app/src/entities/attach/dress.rs
@@ -660,7 +660,10 @@ mod tests {
             bake_center: Vec3::ZERO,
             idle_aabb: None,
             now: 0.0,
-            fade: JoinedFade::Pending { since: SINCE },
+            fade: JoinedFade::Pending {
+                since: SINCE,
+                arrived: SINCE,
+            },
         };
         let mut own = TestOwn::default();
         let mut queue = bevy::ecs::world::CommandQueue::default();
diff --git a/crates/benilla-app/src/entities/attach/mod.rs b/crates/benilla-app/src/entities/attach/mod.rs
index 0055355e..06af2209 100644
--- a/crates/benilla-app/src/entities/attach/mod.rs
+++ b/crates/benilla-app/src/entities/attach/mod.rs
@@ -7,7 +7,6 @@ use benilla_assets::ModelAnimations;
 use benilla_protocol::EntityKind;
 use bevy::prelude::*;
 
-use benilla_assets::WorldAssets;
 use bevy::animation::transition::AnimationTransitions;
 
 use crate::creature_anim::AnimDriver;
@@ -19,13 +18,17 @@ use benilla_world::model_fade::JoinedFade;
 use benilla_world::model_render::ModelKind;
 use benilla_world::particles;
 
+use super::skin_composite::BodyAtlas;
 use super::{
     Characters, Creatures, CubeAssets, DisplayModel, GameObjects, ModelHandle, SkinComposites,
     SkinSections, VisualAttached,
 };
 
 mod char_skin;
-use char_skin::{build_char_skin_materials, equip_geosets, resolve_char_look, resolve_worn_equip};
+use char_skin::{
+    body_atlas, build_char_skin_materials, equip_geosets, resolve_char_look, resolve_worn_equip,
+    skin_key,
+};
 mod dress;
 mod merge;
 use dress::{spawn_group, PartDress};
@@ -33,6 +36,8 @@ pub(super) use merge::MergedFormsCache;
 mod preview;
 pub(crate) use preview::equip_slot;
 pub(super) use preview::{build_dressup_preview, build_glue_pet, build_glue_preview};
+#[cfg(test)]
+mod arrival_tests;
 mod redress;
 
 /// One body's drawn parts as `WOW_DRESS_CENSUS` prints them: index, merge group, blend, material.
@@ -229,8 +234,14 @@ pub(super) fn attach_entity_visuals(
             Option<&super::mount::MountChild>,
             Option<&super::mount::MountBody>,
             Has<crate::transport::TransportAnchor>,
+            Option<&super::Arrival>,
+            Has<super::live_display::ShownRebuild>,
+        ),
+        // A torn-down unit gets no model: the reference frees it at once (`0x464920`).
+        (
+            Without<VisualAttached>,
+            Without<benilla_world::model_fade::DespawnFade>,
         ),
-        Without<VisualAttached>,
     >,
     // A mounted rider waits on its mount child, whose attachment-0 point is the seat.
     mount_children: super::mount::MountChildren,
@@ -250,8 +261,6 @@ pub(super) fn attach_entity_visuals(
     // The character-skin build chain, nested for Bevy's 16-param system limit.
     skin_build: (
         Option<Res<SkinSections>>,
-        Option<Res<WorldAssets>>,
-        ResMut<Assets<Image>>,
         ResMut<SkinComposites>,
         Res<AssetServer>,
         benilla_world::model_render::M2BatchMaterials,
@@ -260,6 +269,8 @@ pub(super) fn attach_entity_visuals(
         ResMut<benilla_world::doodad_anim::UvAnimMaterials>,
         ResMut<benilla_world::doodad_anim::TintAnimMaterials>,
         ResMut<benilla_world::mat_anim_table::MatAnimTable>,
+        // A forced composite's upload.
+        ResMut<Assets<Image>>,
     ),
     mut palettes: ResMut<benilla_world::rig_palette::RigPalettes>,
     mut collider_epoch: ResMut<benilla_world::collision::ColliderEpoch>,
@@ -267,8 +278,6 @@ pub(super) fn attach_entity_visuals(
 ) {
     let (
         sections,
-        world_assets,
-        mut images,
         mut skin_composites,
         asset_server,
         mut mats,
@@ -277,9 +286,23 @@ pub(super) fn attach_entity_visuals(
         mut uv_reg,
         mut tint_reg,
         mut anim_table,
+        mut images,
     ) = skin_build;
     let now = time.elapsed_secs();
-    for (entity, net, equipment, reattached, mount_child, mount_body, anchored) in &pending {
+    for (
+        entity,
+        net,
+        equipment,
+        reattached,
+        mount_child,
+        mount_body,
+        anchored,
+        arrival,
+        shown_rebuild,
+    ) in &pending
+    {
+        // The appear ramp's origin: the unit's arrival, however long its visual waited to build.
+        let arrived = arrival.map_or(now, |a| a.0);
         // A player attaches once its equipment settles, so it never flashes naked.
         if net.kind == EntityKind::Player && !equipment.is_some_and(|e| e.settled) {
             continue;
@@ -324,6 +347,44 @@ pub(super) fn attach_entity_visuals(
             None => None,
         };
 
+        // A character model carries every hair, facial and body geoset, and is shared by its
+        // display, so the entity's own look picks which show.
+        let look = model.and_then(|_| resolve_char_look(net, dm, entity, &stores));
+        // A body whose composite is still running is not built: nothing of it draws, its mount
+        // included, until it can draw dressed, as the reference's ShouldRender answers the
+        // composite driver's 0 (`0x607e7c` → `0x481749`). Retried each frame, with the look of
+        // that frame. A display swap waits the same way, a fresh component in the reference
+        // (`0x607da0` → `0x5fb200`); a body benilla rebuilds while it was drawn does not.
+        let body_tex = match look.as_ref() {
+            Some(l) => {
+                let key = skin_key(l, equip, worn.emblem, worn.tabard_preview);
+                if shown_rebuild {
+                    char_skin::forced_body_atlas(
+                        l,
+                        key,
+                        displays.as_deref(),
+                        sections.as_deref(),
+                        &mut skin_composites,
+                        &asset_server,
+                        &mut images,
+                    )
+                } else {
+                    match body_atlas(
+                        l,
+                        key,
+                        displays.as_deref(),
+                        sections.as_deref(),
+                        &mut skin_composites,
+                        &asset_server,
+                    ) {
+                        BodyAtlas::Ready(tex) => tex,
+                        BodyAtlas::Pending => continue,
+                    }
+                }
+            }
+            None => None,
+        };
+
         // Invisible GameObjects and trigger creatures hide by transparent or empty M2s, never by a
         // flag: the reference draws any loaded model and culls zero-alpha batches (`0x707b3a`),
         // so their `parts` are empty and `named_a_model` keeps the cube off them.
@@ -349,6 +410,7 @@ pub(super) fn attach_entity_visuals(
                     mount_child.map(|&super::mount::MountChild(c)| c),
                     mount_display,
                     reattached,
+                    arrival.copied(),
                 ) {
                     super::mount::Seat::Wait => continue,
                     super::mount::Seat::Frame(anchor) => rider_root = anchor,
@@ -525,9 +587,6 @@ pub(super) fn attach_entity_visuals(
                         .insert(crate::creature_anim::BodyTwist::new(spine, head));
                 }
             }
-            // A character model carries every hair, facial and body geoset, and is shared by its
-            // display, so the entity's own look picks which show.
-            let look = resolve_char_look(net, dm, entity, &stores);
             // The worn geoset selectors, the helm's hide-mask rows included (`0x4799a0`).
             let equip_geosets = equip_geosets(
                 displays.as_deref(),
@@ -536,7 +595,7 @@ pub(super) fn attach_entity_visuals(
                 worn.helm,
                 worn.tabard_preview,
             );
-            let visible_geosets: Option<Vec<u16>> = look.as_ref().and_then(|l| {
+            let visible_geosets = look.as_ref().and_then(|l| {
                 let cg = characters.as_deref()?;
                 Some(cg.0.visible_geosets(
                     l.race,
@@ -549,16 +608,11 @@ pub(super) fn attach_entity_visuals(
             let char_mats = match look.as_ref() {
                 Some(l) => build_char_skin_materials(
                     l,
-                    equip,
+                    body_tex,
                     worn.cloak,
-                    worn.emblem,
-                    worn.tabard_preview,
                     displays.as_deref(),
                     sections.as_deref(),
-                    world_assets.as_deref(),
                     parts,
-                    &mut images,
-                    &mut skin_composites.0,
                     &asset_server,
                     &mut mats,
                 ),
@@ -625,7 +679,10 @@ pub(super) fn attach_entity_visuals(
                 fade: if reattached {
                     JoinedFade::Steady
                 } else {
-                    JoinedFade::Pending { since: now }
+                    JoinedFade::Pending {
+                        since: now,
+                        arrived,
+                    }
                 },
             };
             // The shown batches spawn as material groups (`merge`).
@@ -653,9 +710,12 @@ pub(super) fn attach_entity_visuals(
             }
             // A `Reattached` rebuild drops any in-flight fade, as its parts spawned steady.
             if unit_will_fade {
-                commands
-                    .entity(entity)
-                    .insert(benilla_world::model_fade::UnitAppearFade::Pending { since: now });
+                commands.entity(entity).insert(
+                    benilla_world::model_fade::UnitAppearFade::Pending {
+                        since: now,
+                        arrived,
+                    },
+                );
             } else if reattached {
                 commands
                     .entity(entity)
@@ -856,7 +916,10 @@ pub(super) fn attach_entity_visuals(
             .insert(VisualAttached)
             // The display the visual was built with, for `refresh_live_display` to diff.
             .insert(super::live_display::AppliedDisplay(net.display_id))
-            .remove::<super::equipment::Reattached>();
+            .remove::<(
+                super::equipment::Reattached,
+                super::live_display::ShownRebuild,
+            )>();
     }
 }
 
@@ -962,4 +1025,67 @@ mod tests {
             *app.world_mut() = world;
         }
     }
+    /// A unit torn down before its visual built gets none: `0x464920` frees it at once, so the
+    /// build would run commands on an entity `apply_despawn_fade` has despawned by the time they
+    /// apply.
+    #[test]
+    fn a_torn_down_unit_is_not_built() {
+        use benilla_world::model_fade::DespawnFade;
+
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, AssetPlugin::default()))
+            .init_asset::<Image>()
+            .init_asset::<Mesh>()
+            .init_asset::<benilla_assets::materials::WowModelMaterial>()
+            .init_resource::<benilla_world::model_render::ModelMaterials>()
+            .init_resource::<super::super::corpse::BonesModels>()
+            .init_resource::<SkinComposites>()
+            .init_resource::<merge::MergedFormsCache>()
+            .init_resource::<benilla_world::doodad_anim::UvAnimMaterials>()
+            .init_resource::<benilla_world::doodad_anim::TintAnimMaterials>()
+            .init_resource::<benilla_world::mat_anim_table::MatAnimTable>()
+            .init_resource::<benilla_world::rig_palette::RigPalettes>()
+            .init_resource::<benilla_world::collision::ColliderEpoch>()
+            .insert_resource(CubeAssets {
+                mesh: Handle::default(),
+                player_mesh: Handle::default(),
+                player_mat: Handle::default(),
+                npc_mat: Handle::default(),
+            });
+        let mut spawn = |torn_down: bool| {
+            let mut unit = app.world_mut().spawn(NetEntity {
+                kind: EntityKind::Unit,
+                display_id: None,
+                scale: 1.0,
+            });
+            if torn_down {
+                unit.insert(DespawnFade::default());
+            }
+            unit.id()
+        };
+        let (gone, kept, live) = (spawn(true), spawn(true), spawn(false));
+
+        // The build's commands are queued, the fade's despawn of the unit with nothing fadeable
+        // lands, then the queue applies: the order two unordered chains can interleave in.
+        let world = app.world_mut();
+        let mut build = IntoSystem::into_system(attach_entity_visuals);
+        build.initialize(world);
+        build
+            .run_without_applying_deferred((), world)
+            .expect("the build system runs");
+        world.despawn(gone);
+        build.apply_deferred(world);
+
+        let kept = world.entity(kept);
+        assert!(
+            !kept.contains::<VisualAttached>(),
+            "a torn-down unit has no visual"
+        );
+        assert!(!kept.contains::<benilla_world::interior::BodyBakeCenter>());
+
+        assert!(
+            world.entity(live).contains::<VisualAttached>(),
+            "a live unit still builds"
+        );
+    }
 }
diff --git a/crates/benilla-app/src/entities/attach/preview.rs b/crates/benilla-app/src/entities/attach/preview.rs
index 3e518664..920f257d 100644
--- a/crates/benilla-app/src/entities/attach/preview.rs
+++ b/crates/benilla-app/src/entities/attach/preview.rs
@@ -17,7 +17,6 @@ use crate::portrait::{
     PreviewRider,
 };
 use benilla_assets::materials::WowModelMaterial;
-use benilla_assets::WorldAssets;
 
 use super::super::equipment::{attach_id, ensure_item_model, placement, ItemModelKind};
 use super::super::item_glow::{self, ItemGlows};
@@ -102,7 +101,6 @@ pub(in crate::entities) struct PreviewCtx<'a, 'w> {
     /// nobody wears.
     pub(in crate::entities) glows: Option<&'a mut ItemGlows>,
     pub(in crate::entities) sections: Option<&'a SkinSections>,
-    pub(in crate::entities) world_assets: Option<&'a WorldAssets>,
     pub(in crate::entities) images: &'a mut Assets<Image>,
     pub(in crate::entities) skin_composites: &'a mut SkinComposites,
     pub(in crate::entities) asset_server: &'a AssetServer,
@@ -120,7 +118,6 @@ pub(in crate::entities) fn build_glue_preview(
     mut displays: Option<ResMut<ItemDisplays>>,
     mut glows: Option<ResMut<ItemGlows>>,
     sections: Option<Res<SkinSections>>,
-    world_assets: Option<Res<WorldAssets>>,
     mut images: ResMut<Assets<Image>>,
     mut skin_composites: ResMut<SkinComposites>,
     asset_server: Res<AssetServer>,
@@ -208,7 +205,6 @@ pub(in crate::entities) fn build_glue_preview(
             displays: displays.as_deref_mut(),
             glows: glows.as_deref_mut(),
             sections: sections.as_deref(),
-            world_assets: world_assets.as_deref(),
             images: &mut images,
             skin_composites: &mut skin_composites,
             asset_server: &asset_server,
@@ -286,7 +282,6 @@ pub(in crate::entities) fn build_dressup_preview(
     mut displays: Option<ResMut<ItemDisplays>>,
     mut glows: Option<ResMut<ItemGlows>>,
     sections: Option<Res<SkinSections>>,
-    world_assets: Option<Res<WorldAssets>>,
     mut images: ResMut<Assets<Image>>,
     mut skin_composites: ResMut<SkinComposites>,
     asset_server: Res<AssetServer>,
@@ -342,7 +337,6 @@ pub(in crate::entities) fn build_dressup_preview(
             displays: displays.as_deref_mut(),
             glows: glows.as_deref_mut(),
             sections: sections.as_deref(),
-            world_assets: world_assets.as_deref(),
             images: &mut images,
             skin_composites: &mut skin_composites,
             asset_server: &asset_server,
@@ -574,18 +568,22 @@ fn assemble(spec: &PreviewSpec, ctx: &mut PreviewCtx<'_, '_>) -> Option<Assemble
     let visible = ctx.characters.map(|c| {
         c.0.visible_geosets(race, sex, char_look.hair_style, char_look.facial_hair, &eg)
     });
-    let char_mats = super::char_skin::build_char_skin_materials(
+    let body_tex = super::char_skin::forced_body_atlas(
         &char_look,
-        bodyslots,
-        cloak,
-        spec.emblem,
-        false,
+        super::char_skin::skin_key(&char_look, bodyslots, spec.emblem, false),
         ctx.displays.as_deref(),
         ctx.sections,
-        ctx.world_assets,
-        parts,
+        ctx.skin_composites,
+        ctx.asset_server,
         ctx.images,
-        &mut ctx.skin_composites.0,
+    );
+    let char_mats = super::char_skin::build_char_skin_materials(
+        &char_look,
+        body_tex,
+        cloak,
+        ctx.displays.as_deref(),
+        ctx.sections,
+        parts,
         ctx.asset_server,
         ctx.mats,
     );
diff --git a/crates/benilla-app/src/entities/attach/redress.rs b/crates/benilla-app/src/entities/attach/redress.rs
index 683d359e..739bce34 100644
--- a/crates/benilla-app/src/entities/attach/redress.rs
+++ b/crates/benilla-app/src/entities/attach/redress.rs
@@ -11,7 +11,6 @@ use bevy::prelude::*;
 use crate::net::{NetEntity, ObjectStore};
 use crate::portrait::PortraitPart;
 use benilla_assets::materials::WowModelMaterial;
-use benilla_assets::WorldAssets;
 use benilla_world::interior::InteriorLit;
 use benilla_world::model_fade::{
     join_unit_appear_fade, FadeMaterials, PendingAppearFade, RenderFade,
@@ -23,8 +22,8 @@ use super::super::{
     VisualAttached,
 };
 use super::char_skin::{
-    build_char_skin_materials, equip_geosets, resolve_char_look, resolve_worn_equip,
-    CharSkinMaterials,
+    build_char_skin_materials, equip_geosets, forced_body_atlas, resolve_char_look,
+    resolve_worn_equip, skin_key, CharSkinMaterials,
 };
 use super::dress::{part_materials, spawn_group, DressedPart, PartDress};
 use super::merge::{self, DressedGroup, MergedFormsCache};
@@ -57,7 +56,11 @@ pub(in crate::entities) fn redress_player_looks(
             Option<&benilla_world::interior::BodyBakeCenter>,
             Option<&benilla_world::model_fade::UnitAppearFade>,
         ),
-        With<VisualAttached>,
+        // A torn-down player is freed, not re-dressed (`0x464920`).
+        (
+            With<VisualAttached>,
+            Without<benilla_world::model_fade::DespawnFade>,
+        ),
     >,
     // The standing parts, found again by their batch index.
     mut standing: Query<(
@@ -77,13 +80,13 @@ pub(in crate::entities) fn redress_player_looks(
     // The skin build chain, nested for Bevy's system-param limit.
     skin_build: (
         Option<Res<SkinSections>>,
-        Option<Res<WorldAssets>>,
-        ResMut<Assets<Image>>,
         ResMut<SkinComposites>,
         Res<AssetServer>,
         benilla_world::model_render::M2BatchMaterials,
         ResMut<Assets<Mesh>>,
         ResMut<MergedFormsCache>,
+        // The composite's upload.
+        ResMut<Assets<Image>>,
     ),
     // The own-material lane `spawn_part` takes; no character batch in the shipped data uses it.
     mut own_lane: (
@@ -93,16 +96,8 @@ pub(in crate::entities) fn redress_player_looks(
     ),
     time: Res<Time>,
 ) {
-    let (
-        sections,
-        world_assets,
-        mut images,
-        mut skin_composites,
-        asset_server,
-        mut mats,
-        mut meshes,
-        mut merged,
-    ) = skin_build;
+    let (sections, mut skin_composites, asset_server, mut mats, mut meshes, mut merged, mut images) =
+        skin_build;
     let now = time.elapsed_secs();
     for (entity, net, live, mut applied, children, rig, bones, mut pose, bake_center, unit_fade) in
         &mut players
@@ -125,6 +120,21 @@ pub(in crate::entities) fn redress_player_looks(
 
         let worn = resolve_worn_equip(net, Some(live), Some(dm));
         let look = resolve_char_look(net, Some(dm), entity, &stores);
+        // A re-dress is the reference's incremental composite (`0x47789c`–`0x4778c3`): the new
+        // geosets apply at once and the atlas composites that frame when its sections are
+        // resident, never gated or withheld. So it composites here, in the frame, taking over a
+        // running composite of the same look; only an arriving body waits for its atlas.
+        let body_tex = look.as_ref().and_then(|l| {
+            forced_body_atlas(
+                l,
+                skin_key(l, worn.bodyslots, worn.emblem, worn.tabard_preview),
+                displays.as_deref(),
+                sections.as_deref(),
+                &mut skin_composites,
+                &asset_server,
+                &mut images,
+            )
+        });
         let eg = equip_geosets(
             displays.as_deref(),
             &worn.bodyslots,
@@ -132,7 +142,7 @@ pub(in crate::entities) fn redress_player_looks(
             worn.helm,
             worn.tabard_preview,
         );
-        let visible: Option<Vec<u16>> = look.as_ref().and_then(|l| {
+        let visible = look.as_ref().and_then(|l| {
             let cg = characters.as_deref()?;
             Some(cg.0.visible_geosets(l.race, l.sex, l.hair_style, l.facial_hair, &eg))
         });
@@ -140,16 +150,11 @@ pub(in crate::entities) fn redress_player_looks(
         let char_mats: CharSkinMaterials = match look.as_ref() {
             Some(l) => build_char_skin_materials(
                 l,
-                worn.bodyslots,
+                body_tex,
                 worn.cloak,
-                worn.emblem,
-                worn.tabard_preview,
                 displays.as_deref(),
                 sections.as_deref(),
-                world_assets.as_deref(),
                 parts,
-                &mut images,
-                &mut skin_composites.0,
                 &asset_server,
                 &mut mats,
             ),
@@ -486,6 +491,58 @@ mod tests {
             self.app.update();
         }
 
+        /// Composite against the real tables and chain, landing each frame before the re-dress;
+        /// `false` without the install.
+        fn with_skin_data(&mut self) -> bool {
+            let Some(data) = benilla_formats::wow_data() else {
+                benilla_formats::skipped("no WoW install found", &benilla_formats::candidates());
+                return false;
+            };
+            let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+            let tables = benilla_formats::CharSections::load(&mut chain).expect("CharSections");
+            let items = benilla_formats::load_item_display_catalog(&mut chain).expect("items");
+            self.app
+                .insert_resource(SkinSections::new(
+                    tables,
+                    std::sync::Arc::new(std::sync::Mutex::new(chain)),
+                ))
+                .insert_resource(ItemDisplays::icons_for_tests(items))
+                .add_systems(
+                    Update,
+                    super::super::super::skin_composite::land_skin_composites
+                        .before(redress_player_looks),
+                );
+            true
+        }
+
+        /// What the player's visual is dressed with.
+        fn applied(&self) -> Equipment {
+            self.app
+                .world()
+                .get::<AppliedEquipment>(self.player)
+                .unwrap()
+                .0
+        }
+
+        /// Whether the atlas of the fixture's look (race 1, sex 0, every dial 0) in `gear` is
+        /// composited and cached.
+        fn composited(&mut self, gear: Equipment) -> bool {
+            let key = super::super::super::SkinKey {
+                race: 1,
+                sex: 0,
+                skin: 0,
+                face: 0,
+                facial_hair: 0,
+                hair_style: 0,
+                hair_color: 0,
+                equip: gear.bodyslots,
+                emblem: None,
+                tabard_preview: false,
+            };
+            let mut lane = self.app.world_mut().resource_mut::<SkinComposites>();
+            matches!(lane.done.fetch(&key), Some(Some(_))) && lane.running() == 0
+        }
+
         /// The batch indices currently standing under the player.
         fn showing(&mut self) -> Vec<u32> {
             let mut out: Vec<u32> = self
@@ -523,7 +580,7 @@ mod tests {
         );
     }
 
-    /// The re-dress fires once per change: the composite behind it reads BLPs synchronously.
+    /// The re-dress fires once per change.
     #[test]
     fn a_gear_change_restamps_what_the_visual_is_dressed_with() {
         let mut s = stand(&[0], &[0], None);
@@ -565,4 +622,48 @@ mod tests {
             "and the held item never moved",
         );
     }
+
+    /// Tier-2 gear, worn by bodyslot − 2.
+    fn tier2(sets: [u32; 8]) -> Equipment {
+        Equipment {
+            bodyslots: sets,
+            settled: true,
+            ..Default::default()
+        }
+    }
+
+    /// A gear change on a standing body is the reference's incremental composite, never gated or
+    /// withheld (`0x47789c`–`0x4778c3`): the new look, atlas included, lands the frame it is seen.
+    #[test]
+    fn a_gear_change_composites_in_the_frame_it_is_seen() {
+        let mut s = stand(&[0, 401], &[0, 1], None);
+        if !s.with_skin_data() {
+            return;
+        }
+        let gear = tier2([10840, 33983, 33990, 33986, 33989, 33982, 33984, 0]);
+        s.wear(gear);
+        assert_eq!(s.applied(), gear, "the change lands this frame");
+        assert!(s.composited(gear), "over its own composited atlas");
+        assert_eq!(s.showing(), vec![0, 1], "the body kept drawing");
+        assert!(
+            s.app.world().get_entity(s.held).is_ok(),
+            "the held item never moved"
+        );
+    }
+
+    /// Gear that changes again: each change lands its own frame, and the latest is the look worn.
+    #[test]
+    fn the_latest_gear_wins() {
+        let mut s = stand(&[0], &[0], None);
+        if !s.with_skin_data() {
+            return;
+        }
+        let first = tier2([0, 33650, 31110, 31115, 31111, 31127, 33651, 0]);
+        let last = tier2([0, 33667, 33665, 33672, 34269, 33666, 33668, 0]);
+        s.wear(first);
+        assert_eq!(s.applied(), first);
+        s.wear(last);
+        assert_eq!(s.applied(), last, "the latest gear is worn");
+        assert!(s.composited(last));
+    }
 }
diff --git a/crates/benilla-app/src/entities/dest_fx.rs b/crates/benilla-app/src/entities/dest_fx.rs
index 99e157fd..1375e220 100644
--- a/crates/benilla-app/src/entities/dest_fx.rs
+++ b/crates/benilla-app/src/entities/dest_fx.rs
@@ -32,6 +32,13 @@ fn shard_model_index(param0: f32) -> usize {
     idx.min(SHARD_MODELS.len() - 1)
 }
 
+/// The shard emitter's rate factor from the `spellEffectLevel` record's integer, read once at the
+/// emitter's Initialize (`0x6eb95e`-`0x6eb989`), so a change reaches only emitters created after
+/// it: 0.33 at 0, 0.66 at 1, and 1.0 for any other value, unclamped, or with no record.
+fn shard_rate_scale(spell_effect_level: Option<i32>) -> f32 {
+    spell_effect_level.map_or(1.0, crate::video::spell_effect_scale)
+}
+
 /// A dest-anchored effect model: visual A, a shard or a GO burst.
 #[derive(Component)]
 pub(super) struct GroundFx {
@@ -92,8 +99,8 @@ pub(super) struct ShardEmitter {
     path: String,
     /// `DYNAMICOBJECT_RADIUS`: the wire radius is the spread (`0x6ebad0`).
     radius: f32,
-    /// Shards per second: `CharParamOne` times the `spellEffectLevel` factor, 1.0 at its
-    /// default "2".
+    /// Shards per second: `CharParamOne` times the `spellEffectLevel` factor (`0x6eb95e`-
+    /// `0x6eb98f`), 1.0 at its default "2".
     rate: f32,
     /// Fractional emissions carried between frames.
     accum: f32,
@@ -121,10 +128,12 @@ pub(super) fn arm_ground_effects(
     fx: Option<ResMut<SpellFx>>,
     asset_server: Res<AssetServer>,
     mut sounds: MessageWriter<SpellKitSound>,
+    spell_effect_level: Option<Res<crate::video::SpellEffectLevel>>,
 ) {
     let (Some(visuals), Some(spells), Some(mut fx)) = (visuals, spells, fx) else {
         return;
     };
+    let level_scale = shard_rate_scale(spell_effect_level.map(|l| l.0));
     for (anchor, net, store) in &created {
         if net.kind != EntityKind::DynamicObject {
             continue;
@@ -180,7 +189,7 @@ pub(super) fn arm_ground_effects(
                 commands.entity(anchor).insert(ShardEmitter {
                     path,
                     radius,
-                    rate: proc.params[1],
+                    rate: proc.params[1] * level_scale,
                     accum: 0.0,
                     rng: 0x9e3779b97f4a7c15 ^ anchor.to_bits(),
                 });
@@ -415,6 +424,17 @@ pub(super) fn attach_ground_fx_models(
 mod tests {
     use super::*;
 
+    #[test]
+    fn the_shard_rate_follows_the_spell_effect_level_record() {
+        assert_eq!(shard_rate_scale(Some(0)), 0.33);
+        assert_eq!(shard_rate_scale(Some(1)), 0.66);
+        assert_eq!(shard_rate_scale(Some(2)), 1.0);
+        // The record's integer, not the handler's clamped copy: out of range is the ×1.0 arm.
+        assert_eq!(shard_rate_scale(Some(-1)), 1.0);
+        assert_eq!(shard_rate_scale(Some(5)), 1.0);
+        assert_eq!(shard_rate_scale(None), 1.0);
+    }
+
     /// The `0x5d55c0` decode, `bits(f32(param0 + 512.0)) >> 14 & 0xff`; the real rows carry 0.0
     /// (Blizzard) and 1.0 (Rain of Fire).
     #[test]
diff --git a/crates/benilla-app/src/entities/equipment/spawn.rs b/crates/benilla-app/src/entities/equipment/spawn.rs
index 08bf3f5a..916f2fee 100644
--- a/crates/benilla-app/src/entities/equipment/spawn.rs
+++ b/crates/benilla-app/src/entities/equipment/spawn.rs
@@ -98,20 +98,24 @@ impl SeatWriters<'_, '_> {
 #[allow(clippy::type_complexity)]
 pub(in crate::entities) fn attach_held_items(
     mut commands: Commands,
-    mut units: Query<(
-        &HeldItems,
-        &BoneAttach,
-        Option<&mut HeldAttached>,
-        Entity,
-        Option<&UnitAppearFade>,
-        Option<&benilla_world::interior::BodyBakeCenter>,
-        Option<&Transform>,
-        // The wearer's slot, which a slotless item's parts carry so the body tint reaches them;
-        // an attached model inherits its parent's computed colours (`0x714000`).
-        Option<&benilla_world::rig_palette::RigSkin>,
-        // The attach joint spawns on demand from the live pose, never the rest pose.
-        Option<&mut benilla_world::rig_anim::RigPose>,
-    )>,
+    mut units: Query<
+        (
+            &HeldItems,
+            &BoneAttach,
+            Option<&mut HeldAttached>,
+            Entity,
+            Option<&UnitAppearFade>,
+            Option<&benilla_world::interior::BodyBakeCenter>,
+            Option<&Transform>,
+            // The wearer's slot, which a slotless item's parts carry so the body tint reaches them;
+            // an attached model inherits its parent's computed colours (`0x714000`).
+            Option<&benilla_world::rig_palette::RigSkin>,
+            // The attach joint spawns on demand from the live pose, never the rest pose.
+            Option<&mut benilla_world::rig_anim::RigPose>,
+        ),
+        // A torn-down wearer gets no new item model: the reference frees it at once (`0x464920`).
+        Without<benilla_world::model_fade::DespawnFade>,
+    >,
     held: Option<Res<ItemDisplays>>,
     time: Res<Time>,
     mut seats: SeatWriters,
@@ -1251,7 +1255,10 @@ mod tests {
                 items,
                 bones,
                 Transform::default(),
-                UnitAppearFade::Pending { since: SINCE },
+                UnitAppearFade::Pending {
+                    since: SINCE,
+                    arrived: SINCE,
+                },
             ))
             .id();
         let pose = benilla_world::testing::test_rig_pose(wearer, &[Vec3::ZERO; 4]);
@@ -1339,7 +1346,10 @@ mod tests {
                 items,
                 bones,
                 Transform::default(),
-                UnitAppearFade::Pending { since: SINCE },
+                UnitAppearFade::Pending {
+                    since: SINCE,
+                    arrived: SINCE,
+                },
             ))
             .id();
         let pose = benilla_world::testing::test_rig_pose(wearer, &[Vec3::ZERO; 4]);
diff --git a/crates/benilla-app/src/entities/live_display.rs b/crates/benilla-app/src/entities/live_display.rs
index 8a1deedc..040ec32a 100644
--- a/crates/benilla-app/src/entities/live_display.rs
+++ b/crates/benilla-app/src/entities/live_display.rs
@@ -82,7 +82,11 @@ pub(super) fn refresh_live_display(
             Option<&CollisionHeight>,
             &Transform,
         ),
-        With<VisualAttached>,
+        // A torn-down unit is freed, not rebuilt (`0x464920`).
+        (
+            With<VisualAttached>,
+            Without<benilla_world::model_fade::DespawnFade>,
+        ),
     >,
     mut swapped: MessageWriter<DisplaySwapped>,
 ) {
@@ -188,6 +192,11 @@ pub(super) fn tick_scale_ease(
     }
 }
 
+/// A rebuild of a body that was drawn, benilla's own palette heal: its composite is forced, so the
+/// body never drops out for frames as an arriving one waits, and rebuilds at once as it always has.
+#[derive(Component)]
+pub(super) struct ShownRebuild;
+
 /// Palette headroom the healer waits for, under the doodad reaper's low-water (256) so the reaper
 /// makes room first; rebuilding into a tight table would starve again.
 const HEAL_MIN_HEADROOM: usize = 128;
@@ -206,6 +215,7 @@ pub(super) fn heal_rig_starved(
         (
             With<benilla_world::rig_palette::RigStarved>,
             With<VisualAttached>,
+            Without<benilla_world::model_fade::DespawnFade>,
         ),
     >,
 ) {
@@ -241,7 +251,7 @@ pub(super) fn heal_rig_starved(
                 super::equipment::HeldAttached,
                 benilla_world::rig_palette::RigStarved,
             )>()
-            .insert(super::equipment::Reattached);
+            .insert((super::equipment::Reattached, ShownRebuild));
     }
 }
 
@@ -314,6 +324,29 @@ mod tests {
         );
     }
 
+    #[test]
+    fn a_torn_down_starved_unit_is_not_rebuilt() {
+        let mut app = App::new();
+        app.init_resource::<benilla_world::rig_palette::RigPalettes>();
+        app.add_systems(Update, heal_rig_starved);
+        let unit = app
+            .world_mut()
+            .spawn((
+                benilla_world::rig_palette::RigStarved,
+                VisualAttached,
+                benilla_world::model_fade::DespawnFade::default(),
+                crate::net::Guid(0xB0B),
+            ))
+            .id();
+        app.update();
+        let e = app.world().entity(unit);
+        assert!(
+            e.contains::<VisualAttached>(),
+            "a fading unit keeps its visual"
+        );
+        assert!(!e.contains::<super::super::equipment::Reattached>());
+    }
+
     #[test]
     fn scale_ease_is_the_2s_cosine_smoothstep() {
         let w = |elapsed: f32| {
diff --git a/crates/benilla-app/src/entities/mount.rs b/crates/benilla-app/src/entities/mount.rs
index b016f0a9..c6ebe8c2 100644
--- a/crates/benilla-app/src/entities/mount.rs
+++ b/crates/benilla-app/src/entities/mount.rs
@@ -44,6 +44,8 @@ pub(super) fn spawn_mount_child(
     display: u32,
     scale: f32,
     fade_skip: bool,
+    // The rider's arrival, so the mount rides the rider's appear ramp.
+    arrival: Option<super::Arrival>,
 ) -> Entity {
     let child = commands
         .spawn((
@@ -57,6 +59,9 @@ pub(super) fn spawn_mount_child(
             Visibility::default(),
         ))
         .id();
+    if let Some(arrival) = arrival {
+        commands.entity(child).insert(arrival);
+    }
     if fade_skip {
         commands.entity(child).insert(super::equipment::Reattached);
     }
@@ -120,13 +125,21 @@ pub(super) fn seat_or_spawn_mount(
     child: Option<Entity>,
     mount_display: u32,
     fade_skip: bool,
+    arrival: Option<super::Arrival>,
 ) -> Seat {
     // `0x607a75`: `SCALE_X` × `creatureModelScale` alone, without `CreatureModelData.modelScale`.
     let mount_scale = creatures
         .and_then(|c| c.catalog.display_scale(mount_display))
         .unwrap_or(1.0);
     let Some(child) = child else {
-        spawn_mount_child(commands, unit, mount_display, mount_scale, fade_skip);
+        spawn_mount_child(
+            commands,
+            unit,
+            mount_display,
+            mount_scale,
+            fade_skip,
+            arrival,
+        );
         return Seat::Wait;
     };
     // Built for a display the field has left, or gone: drop it and start over next pass.
@@ -226,8 +239,13 @@ pub(super) fn reseat_mounts(
             &ObjectStore,
             Option<&AppliedMount>,
             Option<&MountChild>,
+            Option<&super::Arrival>,
+        ),
+        // A torn-down unit is freed, not re-seated (`0x464920`).
+        (
+            With<super::VisualAttached>,
+            Without<benilla_world::model_fade::DespawnFade>,
         ),
-        With<super::VisualAttached>,
     >,
     // One pose query for both sides, the rider's rig and the mount's, borrowed in sequence below.
     mut poses: Query<&mut RigPose>,
@@ -235,7 +253,7 @@ pub(super) fn reseat_mounts(
     conforms: Query<(), With<super::conform::ConformNode>>,
     creatures: Option<Res<super::Creatures>>,
 ) {
-    for (entity, net, store, applied, child) in &units {
+    for (entity, net, store, applied, child, arrival) in &units {
         if !matches!(net.kind, EntityKind::Unit | EntityKind::Player) {
             continue;
         }
@@ -293,6 +311,7 @@ pub(super) fn reseat_mounts(
             child,
             live,
             true,
+            arrival.copied(),
         ) {
             Seat::Wait => {}
             Seat::Frame(anchor) => {
diff --git a/crates/benilla-app/src/entities/mount/tests.rs b/crates/benilla-app/src/entities/mount/tests.rs
index 0a3bfdf5..2f65aae4 100644
--- a/crates/benilla-app/src/entities/mount/tests.rs
+++ b/crates/benilla-app/src/entities/mount/tests.rs
@@ -286,3 +286,35 @@ fn a_mount_without_a_seat_leaves_the_body_at_the_unit_matrix() {
     assert_eq!(s.frame(), s.rider);
     assert!(s.attachments_alive());
 }
+
+/// A mount child rides its rider's appear ramp: it carries the rider's arrival, which the arrival
+/// stamp leaves alone, as the reference writes the unit's one fade onto the mount model
+/// (`0x614ae6`–`0x614af4`, `0x614b9e`–`0x614bba`).
+#[test]
+fn a_mount_child_carries_its_riders_arrival() {
+    use crate::entities::Arrival;
+    use bevy::ecs::world::CommandQueue;
+
+    let mut app = App::new();
+    app.init_resource::<Time>()
+        .add_systems(Update, crate::entities::stamp_arrivals);
+    app.world_mut()
+        .resource_mut::<Time>()
+        .advance_to(std::time::Duration::from_secs(5));
+    let rider = app
+        .world_mut()
+        .spawn((Transform::default(), Visibility::default(), Arrival(1.0)))
+        .id();
+    let mut queue = CommandQueue::default();
+    let child = {
+        let mut commands = Commands::new(&mut queue, app.world());
+        spawn_mount_child(&mut commands, rider, 7, 1.0, false, Some(Arrival(1.0)))
+    };
+    queue.apply(app.world_mut());
+    app.update();
+    assert_eq!(
+        app.world().get::<Arrival>(child),
+        Some(&Arrival(1.0)),
+        "the mount fades on its rider's clock, not from its own spawn"
+    );
+}
diff --git a/crates/benilla-app/src/entities/skin_composite.rs b/crates/benilla-app/src/entities/skin_composite.rs
new file mode 100644
index 00000000..3c191cc7
--- /dev/null
+++ b/crates/benilla-app/src/entities/skin_composite.rs
@@ -0,0 +1,363 @@
+//! Composited body skins, one 256² atlas per look. An arriving body's first composite runs off the
+//! main thread: the reference's world composite is unforced, so its section loads poll and never
+//! block the frame (`0x44b430`), and it draws nothing of a unit whose first composite has not
+//! finished, its ShouldRender answering `0x477860(cc, 0)`'s result (`0x607e7c`). Only the forced
+//! callers wait on their loads (`0x44ad50`): the glue model (`0x470c59`, `0x471308`, `0x4731b6`),
+//! the dressing room (`0x504485`), `PlayerModel`'s `SetUnit` (`0x5059be`) and world entry
+//! (`0x49091e`). Here the forced lane ([`SkinComposites::force`]) composites on the calling thread.
+
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+use anyhow::Context;
+use benilla_assets::{repeat_texture_authored, LockRecover, SpatialCache};
+use benilla_formats::{blp_bytes_to_mip_chain, BlpMipChain, Chain, CharSections, CompositePlan};
+use bevy::prelude::*;
+use bevy::tasks::{block_on, futures_lite::future, AsyncComputeTaskPool, Task};
+
+/// The `CharSections` skin lookup and the chain its textures read from; without it a player's body
+/// skin stays untextured.
+#[derive(Resource)]
+pub(super) struct SkinSections {
+    pub(super) tables: CharSections,
+    chain: Arc<Mutex<Chain>>,
+}
+
+impl SkinSections {
+    pub(super) fn new(tables: CharSections, chain: Arc<Mutex<Chain>>) -> Self {
+        Self { tables, chain }
+    }
+}
+
+/// What decides a composited body skin: race and sex pick the `CharSections` rows, the dials pick
+/// the variations, and `equip` holds the worn armour display ids by body slot − 2.
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(super) struct SkinKey {
+    pub(super) race: u8,
+    pub(super) sex: u8,
+    pub(super) skin: u8,
+    pub(super) face: u8,
+    pub(super) facial_hair: u8,
+    pub(super) hair_style: u8,
+    pub(super) hair_color: u8,
+    pub(super) equip: [u32; 8],
+    /// The guild emblem: two guilds' members wear one tabard display but must not share an atlas.
+    pub(super) emblem: Option<benilla_formats::GuildEmblem>,
+    /// The tabard designer's preview: the emblem paints over an empty tabard slot.
+    pub(super) tabard_preview: bool,
+}
+
+/// Where a body's atlas stands.
+#[derive(Debug, PartialEq)]
+pub(super) enum BodyAtlas {
+    /// Ready to bind; `None` for a look with no atlas (no base skin row, or art that never read).
+    Ready(Option<Handle<Image>>),
+    /// Its composite is running.
+    Pending,
+}
+
+/// A composite's whole work, run where it lands: reads, decodes and blits.
+type Work = Box<dyn FnOnce() -> Option<BlpMipChain> + Send>;
+
+/// Composited body skins by look, so every body wearing a look shares one atlas, and the
+/// composites still running.
+#[derive(Resource, Default)]
+pub(super) struct SkinComposites {
+    /// Finished atlases, swept by distance ([`benilla_world::art_scope`]); `None` for a look with
+    /// no atlas, so it is never retried.
+    pub(super) done: SpatialCache<SkinKey, Option<Handle<Image>>>,
+    /// Composites on the async compute pool, one per look however many bodies wait on it.
+    running: HashMap<SkinKey, Task<Option<BlpMipChain>>>,
+}
+
+impl SkinComposites {
+    /// A world body's atlas: finished, or running, its composite started here on a miss. `plan` is
+    /// read only then; `None` is a look with no atlas.
+    pub(super) fn request(
+        &mut self,
+        key: SkinKey,
+        sections: &SkinSections,
+        plan: impl FnOnce() -> Option<CompositePlan>,
+    ) -> BodyAtlas {
+        self.request_with(key, || plan().map(|p| work(p, sections.chain.clone())))
+    }
+
+    /// [`Self::request`] over any work, so the lane is testable without the install.
+    fn request_with(&mut self, key: SkinKey, work: impl FnOnce() -> Option<Work>) -> BodyAtlas {
+        if let Some(done) = self.done.fetch(&key) {
+            return BodyAtlas::Ready(done);
+        }
+        if self.running.contains_key(&key) {
+            return BodyAtlas::Pending;
+        }
+        let Some(work) = work() else {
+            self.done.insert(key, None);
+            return BodyAtlas::Ready(None);
+        };
+        self.running.insert(
+            key,
+            AsyncComputeTaskPool::get().spawn(async move { work() }),
+        );
+        BodyAtlas::Pending
+    }
+
+    /// An atlas composited on this thread on a miss, or waited for if it is already running, as
+    /// the reference's forced composite waits on its section loads (`0x44ad50`) and passes no
+    /// admission test: the glue model's (`0x477860(cc, 1)` at `0x470c59`, `0x471308`, `0x4731b6`)
+    /// and the dressing room's (`0x504485`, in `0x504470`). A re-dress of a standing body and a
+    /// rig-heal rebuild come here too, so neither drops out for a frame.
+    pub(super) fn force(
+        &mut self,
+        key: SkinKey,
+        sections: &SkinSections,
+        plan: impl FnOnce() -> Option<CompositePlan>,
+        images: &mut Assets<Image>,
+    ) -> Option<Handle<Image>> {
+        self.force_with(
+            key,
+            || plan().map(|p| work(p, sections.chain.clone())),
+            images,
+        )
+    }
+
+    /// [`Self::force`] over any work, so the lane is testable without the install.
+    fn force_with(
+        &mut self,
+        key: SkinKey,
+        work: impl FnOnce() -> Option<Work>,
+        images: &mut Assets<Image>,
+    ) -> Option<Handle<Image>> {
+        if let Some(done) = self.done.fetch(&key) {
+            return done;
+        }
+        let atlas = match self.running.remove(&key) {
+            Some(task) => block_on(task),
+            None => work().and_then(|w| w()),
+        };
+        self.install(key, atlas, images)
+    }
+
+    /// Move every finished composite into [`Self::done`]; how many landed.
+    pub(super) fn land(&mut self, images: &mut Assets<Image>) -> usize {
+        let mut finished = Vec::new();
+        self.running
+            .retain(|key, task| match block_on(future::poll_once(task)) {
+                Some(atlas) => {
+                    finished.push((*key, atlas));
+                    false
+                }
+                None => true,
+            });
+        let landed = finished.len();
+        for (key, atlas) in finished {
+            self.install(key, atlas, images);
+        }
+        landed
+    }
+
+    /// Upload one atlas and cache it by look.
+    fn install(
+        &mut self,
+        key: SkinKey,
+        atlas: Option<BlpMipChain>,
+        images: &mut Assets<Image>,
+    ) -> Option<Handle<Image>> {
+        // Through the upload gate like every texture: a no-op on this RGBA8 composite, but it
+        // keeps the format and the bytes in agreement.
+        let handle = atlas.map(|a| {
+            images.add(repeat_texture_authored(
+                benilla_assets::for_upload(a),
+                (true, true),
+            ))
+        });
+        self.done.insert(key, handle.clone());
+        handle
+    }
+
+    /// How many composites are running.
+    #[cfg(test)]
+    pub(super) fn running(&self) -> usize {
+        self.running.len()
+    }
+
+    /// Drop every atlas and every running composite: the map-change teardown.
+    pub(super) fn clear(&mut self) {
+        self.done.clear();
+        self.running.clear();
+    }
+}
+
+/// A plan's work over the shared chain, which each read locks for its archive lookup alone.
+fn work(plan: CompositePlan, chain: Arc<Mutex<Chain>>) -> Work {
+    Box::new(move || {
+        plan.run(|path| read_texture(&chain, path))
+            .inspect_err(|e| warn!("body skin composite failed: {e:#}"))
+            .ok()
+    })
+}
+
+/// Read and decode one BLP off `chain`, locked only to find its archive.
+fn read_texture(chain: &Mutex<Chain>, path: &str) -> anyhow::Result<BlpMipChain> {
+    let name = path.replace('/', "\\");
+    let archive = chain.lock_recover().archive_for(&name)?;
+    let bytes = archive
+        .read_file(&name)
+        .with_context(|| format!("reading texture '{name}'"))?;
+    blp_bytes_to_mip_chain(&bytes).with_context(|| format!("decoding texture '{name}'"))
+}
+
+/// Land every finished composite before this frame's bodies ask for theirs.
+pub(super) fn land_skin_composites(
+    mut composites: ResMut<SkinComposites>,
+    mut images: ResMut<Assets<Image>>,
+) {
+    composites.land(&mut images);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::mpsc;
+
+    fn key(race: u8) -> SkinKey {
+        SkinKey {
+            race,
+            sex: 0,
+            skin: 0,
+            face: 0,
+            facial_hair: 0,
+            hair_style: 0,
+            hair_color: 0,
+            equip: [0; 8],
+            emblem: None,
+            tabard_preview: false,
+        }
+    }
+
+    /// A 1×1 atlas.
+    fn atlas() -> BlpMipChain {
+        BlpMipChain {
+            width: 1,
+            height: 1,
+            texels: benilla_formats::BlpTexels::Rgba8Unorm,
+            mips: vec![vec![255; 4]],
+        }
+    }
+
+    /// Work that finishes when the test says so, and counts how many times it ran. It gives up
+    /// after two seconds, so work run inline on the test's thread fails the test, never hangs it.
+    fn gated(ran: &Arc<std::sync::atomic::AtomicUsize>) -> (mpsc::Sender<()>, Work) {
+        let (tx, rx) = mpsc::channel::<()>();
+        let ran = ran.clone();
+        let work: Work = Box::new(move || {
+            ran.fetch_add(1, std::sync::atomic::Ordering::SeqCst);
+            rx.recv_timeout(std::time::Duration::from_secs(2)).ok()?;
+            Some(atlas())
+        });
+        (tx, work)
+    }
+
+    /// Land until `key` is done, or give up after two seconds.
+    fn land_until(c: &mut SkinComposites, images: &mut Assets<Image>, key: SkinKey) {
+        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(2);
+        while c.running.contains_key(&key) && std::time::Instant::now() < deadline {
+            c.land(images);
+            std::thread::yield_now();
+        }
+    }
+
+    /// A look's composite runs once off the main thread however many bodies ask, and every body
+    /// gets the one atlas once it lands.
+    #[test]
+    fn a_look_composites_once_off_the_main_thread() {
+        AsyncComputeTaskPool::get_or_init(bevy::tasks::TaskPool::new);
+        let mut images = Assets::<Image>::default();
+        let mut c = SkinComposites::default();
+        let ran = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let (tx, w) = gated(&ran);
+        let mut w = Some(w);
+
+        assert_eq!(c.request_with(key(1), || w.take()), BodyAtlas::Pending);
+        // A second body of the same look waits on the same composite; its work is never built.
+        assert_eq!(
+            c.request_with(key(1), || panic!(
+                "a running look starts no second composite"
+            )),
+            BodyAtlas::Pending
+        );
+        assert_eq!(c.running(), 1);
+        assert_eq!(
+            c.land(&mut images),
+            0,
+            "nothing lands before the work finishes"
+        );
+
+        tx.send(()).unwrap();
+        land_until(&mut c, &mut images, key(1));
+        let BodyAtlas::Ready(Some(first)) = c.request_with(key(1), || None) else {
+            panic!("the landed atlas is ready");
+        };
+        assert_eq!(
+            c.request_with(key(1), || None),
+            BodyAtlas::Ready(Some(first))
+        );
+        assert_eq!(ran.load(std::sync::atomic::Ordering::SeqCst), 1);
+        assert_eq!(c.running(), 0);
+    }
+
+    /// A forced composite of a look already running waits for that composite rather than starting
+    /// a second, and the atlas is the one every later request gets.
+    #[test]
+    fn a_forced_composite_takes_over_the_running_one() {
+        AsyncComputeTaskPool::get_or_init(bevy::tasks::TaskPool::new);
+        let mut images = Assets::<Image>::default();
+        let mut c = SkinComposites::default();
+        let ran = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let (tx, w) = gated(&ran);
+        let mut w = Some(w);
+        assert_eq!(c.request_with(key(3), || w.take()), BodyAtlas::Pending);
+        tx.send(()).unwrap();
+        let forced = c.force_with(
+            key(3),
+            || panic!("a running look starts no second composite"),
+            &mut images,
+        );
+        assert!(forced.is_some(), "the running composite's atlas");
+        assert_eq!(ran.load(std::sync::atomic::Ordering::SeqCst), 1);
+        assert_eq!(c.running(), 0);
+        assert_eq!(c.request_with(key(3), || None), BodyAtlas::Ready(forced));
+    }
+
+    /// A look with no atlas is ready at once, as `None`, and never retried.
+    #[test]
+    fn a_look_without_an_atlas_never_waits() {
+        let mut c = SkinComposites::default();
+        assert_eq!(c.request_with(key(9), || None), BodyAtlas::Ready(None));
+        assert_eq!(
+            c.request_with(key(9), || panic!("a look with no atlas is never retried")),
+            BodyAtlas::Ready(None)
+        );
+        assert_eq!(c.running(), 0);
+    }
+
+    /// The map-change teardown drops running composites with the cache: a body still waiting
+    /// starts its composite again.
+    #[test]
+    fn a_teardown_drops_the_running_composites() {
+        AsyncComputeTaskPool::get_or_init(bevy::tasks::TaskPool::new);
+        let mut c = SkinComposites::default();
+        let ran = Arc::new(std::sync::atomic::AtomicUsize::new(0));
+        let (_tx, w) = gated(&ran);
+        let mut w = Some(w);
+        assert_eq!(c.request_with(key(2), || w.take()), BodyAtlas::Pending);
+        c.clear();
+        assert_eq!(c.running(), 0);
+        let (_tx2, w2) = gated(&ran);
+        let mut w2 = Some(w2);
+        assert_eq!(c.request_with(key(2), || w2.take()), BodyAtlas::Pending);
+        assert!(
+            w2.is_none(),
+            "a body still waiting starts its composite again"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/game_plugins.rs b/crates/benilla-app/src/game_plugins.rs
index c0aaf466..f794730d 100644
--- a/crates/benilla-app/src/game_plugins.rs
+++ b/crates/benilla-app/src/game_plugins.rs
@@ -254,8 +254,6 @@ impl PluginGroup for GamePlugins {
             .add(crate::raid_marks::RaidMarksPlugin)
             .add(crate::vplates::VPlatesPlugin)
             .add(crate::chat_bubble::ChatBubblePlugin)
-            // TOGGLEUI (`ALT-Z`): the whole quad layer goes dark, leaving the world and the cursor.
-            .add(crate::ui_hide::UiHidePlugin)
             .add(UiItemsPlugin)
             .add(UiGossipPlugin)
             .add(UiMerchantPlugin)
@@ -698,11 +696,32 @@ pub(crate) mod schedule_tests {
     /// - `ui_quest::lines::feed_quest_lines` against `ui_items::feed_item_stats` and
     ///   `ui_tooltip::feed_spell_tooltips` over `Items` and the VM: it only reads templates, which
     ///   those two do not write, and a chat line commutes with their pushes;
-    /// - `spell::targeting::drain_spell_target_unit` against the lone `.after(UiInput)` cast
-    ///   drains over the `CastLadder`, and the party, pet-book and chat drains over the unit-token
-    ///   resolver: the class `drop_item_on_unit` and the world click's legs already carry, as none
-    ///   of those drains orders against the target chain. A cast press and a unit-frame bind in one
-    ///   frame take either order until the cast drains share a set that does.
+    /// - `script_calls::apply_script_calls`, in the target chain, against the `.after(UiInput)`
+    ///   drains of gestures that are not such script calls (the ATTACKTARGET binding, the
+    ///   item-pick commit, the GameObject openers, the chat, party, duel, trade and death drains)
+    ///   over the `CastLadder`, the selection and the unit-token resolver: the class
+    ///   `drop_item_on_unit` and the world click's legs already carry, as none of those drains
+    ///   orders against the target chain. Such a gesture and a script call in one frame take
+    ///   either order;
+    /// - the range compare's readers (`ui_action::state::feed_action_state`,
+    ///   `ui_tooltip::spell_feed::feed_spell_tooltips`, `spell::targeting::feed_targeting_to_vm`,
+    ///   the targeting cursor and the object-click commit) against the writers of `Player` and
+    ///   `RemoteMotion` (`camera_saved::load_camera_pose`, `world_focus`'s focus publish and settle
+    ///   release, `transport::compose_riders` and `ground_deck_riders`): the readers take the
+    ///   movement flags of the caster (`Player::move_flags`) and its target
+    ///   (`RemoteMotion::flags`), and those writers touch `login_pitch`, the settle fields and a
+    ///   rider's pose, never the flags;
+    /// - Click to Move's steer and arrival (`player::approach::steer_approach`,
+    ///   `target::click::act_on_arrival`) against what `steer_follow` and `act_on_right_click`
+    ///   already pair with: the steer is chained after follow's and writes the same `Player`
+    ///   fields, the arrival runs the click's dispatchers, and their `Transform` reads are the
+    ///   disjoint-lane kind. The dispatchers also carry the walk's start (`Player`,
+    ///   `FollowState`, `Approach`, the stand request), which only a click, an arrival or a
+    ///   crate's interaction writes;
+    /// - a crate's interaction (`target::click::act_on_interact`) against what
+    ///   `act_on_right_click` and the cursor classifier already pair with: it runs the click's
+    ///   dispatchers over the classifier's reading of its object, and its attack leg
+    ///   selects as the click does, so it writes `Selection` where the click's drain does.
     ///
     /// Raising the ceiling is a claim that a new undeclared order is acceptable: make it with the
     /// reason read off the dump, or declare the order (`.after`, a set, a `chain`). A resource
@@ -715,7 +734,11 @@ pub(crate) mod schedule_tests {
     /// rows) and one pair each of the new systems against the two exclusive systems. Upstream
     /// 5,481 + ours = 5,509, read off the merged tree (upstream v0.2.0 ba7fe6e2; three more of ours
     /// pair with upstream's new v0.2.0 systems).
-    const UPDATE_ACTIONABLE_CEILING: usize = 5_509;
+    ///
+    /// MONKEY (merge upstream b396bbf6, 2026-10-02): upstream's own declarations dropped its
+    /// ceiling to 4,980; the merged tree reads 4,999 = upstream 4,980 + 19 of ours (the lanes'
+    /// residual pairs above, unchanged in kind). Read off the merged tree's test run.
+    const UPDATE_ACTIONABLE_CEILING: usize = 4_999;
     const UPDATE_ACTIONABLE_SLACK: usize = 40;
 
     fn ratchet(what: &str, n: usize, ceiling: usize, slack: usize) {
@@ -1196,8 +1219,6 @@ pub(crate) mod schedule_tests {
          "`told` is a `VmMemo` inside the session (a fresh VM re-begins), and the open is a player click"),
         ("ui_items/drain.rs", "drain_container_destroys", Because::FilledByVm,
          "`take_container_destroys` is a VM-owned queue filled by Lua's `DeleteCursorItem`"),
-        ("ui_items/drain.rs", "drain_container_uses", Because::FilledByVm,
-         "`take_container_uses` and `take_container_repairs` are Lua intents held by the VM"),
         ("ui_logout.rs", "feed_logout", Because::PlayerRoundTrip,
          "both packets answer the `CMSG_LOGOUT_REQUEST`/cancel the game menu sent"),
         ("ui_loot/mod.rs", "drain_loot", Because::Deliberate,
diff --git a/crates/benilla-app/src/glue/dialog.rs b/crates/benilla-app/src/glue/dialog.rs
index 1099b5d7..6b10171e 100644
--- a/crates/benilla-app/src/glue/dialog.rs
+++ b/crates/benilla-app/src/glue/dialog.rs
@@ -140,8 +140,8 @@ impl GlueDialog {
         self.kind = Some(DialogKind::Realmlist);
         self.edit = crate::textinput::field(crate::realmlist::MAX_LETTERS, false);
         self.edit.set_text(current);
-        // `HighlightText(0, -1)`, the reference's select-all (`0x77cca0`), also resets the blink
-        // so the box opens on a solid caret.
+        // `HighlightText(0, -1)`, the reference's select-all (`0x77cca0`); the dialog's spawn
+        // starts the caret solid.
         self.edit.highlight_text(0, -1);
         self.set_text(prompt);
     }
diff --git a/crates/benilla-app/src/glue/widgets.rs b/crates/benilla-app/src/glue/widgets.rs
index 9bfa7824..f203aafe 100644
--- a/crates/benilla-app/src/glue/widgets.rs
+++ b/crates/benilla-app/src/glue/widgets.rs
@@ -515,22 +515,54 @@ pub(crate) fn caret_bar<C: Bundle>(
         });
 }
 
-/// Which item of a glue edit box's row `[before][caret][selected][caret][after]` an entity is.
-/// Flex places the caret and selection with no text measuring; an empty `Selected` has zero
-/// width, and the caret slots are zero-width seams, so the text is one unbroken line.
+/// Which item of a glue edit box's row `[before][selected][caret][selected][after]` an entity is.
+/// Flex places the caret and selection with no text measuring: the selection splits at the caret,
+/// an empty run has zero width and the caret is a zero-width seam, so the text is one unbroken line.
 #[derive(Component, Clone, Copy, PartialEq, Eq, Debug)]
 pub(crate) enum GlueFieldPart {
-    /// `display[..sel_start]`
+    /// The text before the selection.
     Before,
-    /// The caret at the selection's start, and whenever nothing is selected.
-    CaretAtStart,
-    /// `display[sel_start..sel_end]`, the highlighted run.
-    Selected,
-    CaretAtEnd,
-    /// `display[sel_end..]`
+    /// The highlighted run from the selection's start to the caret.
+    SelectedHead,
+    /// The caret, which can sit inside the selection: `HighlightText` leaves it (`0x77cca0`).
+    Caret,
+    /// The highlighted run from the caret to the selection's end.
+    SelectedTail,
+    /// The text after the selection.
     After,
 }
 
+/// What `part` of `field`'s row draws: its slice of `display`, for a text run, and whether it
+/// shows. `focused` gates the caret, not the highlight: the reference's caret flush hides when
+/// `E != [0xcf4dc8]` (`0x77da80`), but the selection flush (`0x77d950`, `0x77de70`) never reads
+/// focus, so an unfocused box paints the selection it holds.
+fn glue_field_part<'d>(
+    field: &EditBoxState,
+    display: &'d str,
+    focused: bool,
+    part: GlueFieldPart,
+) -> (Option<&'d str>, bool) {
+    let (mut lo, mut hi) = (
+        field.sel_start.min(field.sel_end),
+        field.sel_start.max(field.sel_end),
+    );
+    // An empty selection has no place of its own: it sits at the caret.
+    if lo == hi {
+        (lo, hi) = (field.cursor, field.cursor);
+    }
+    // A caret outside a selection, which no glue field makes, draws at its nearer end.
+    let caret = field.cursor.clamp(lo, hi);
+    let [lo, caret, hi] = [lo, caret, hi].map(|b| field.text_to_display(b).min(display.len()));
+    match part {
+        GlueFieldPart::Before => (Some(&display[..lo]), true),
+        GlueFieldPart::SelectedHead => (Some(&display[lo..caret]), true),
+        // `caret_shown` is ticked by `textinput::tick_caret`, the chat caret's clock too.
+        GlueFieldPart::Caret => (None, focused && field.caret_shown),
+        GlueFieldPart::SelectedTail => (Some(&display[caret..hi]), true),
+        GlueFieldPart::After => (Some(&display[hi..]), true),
+    }
+}
+
 /// Paint one glue edit box's segments, selection and caret from its [`EditBoxState`].
 pub(crate) fn paint_glue_field<'a>(
     field: &EditBoxState,
@@ -543,24 +575,9 @@ pub(crate) fn paint_glue_field<'a>(
         ),
     >,
 ) {
-    // `focused` gates the caret, not the highlight: the reference's caret flush hides when
-    // `E != [0xcf4dc8]` (`0x77da80`), but the selection flush (`0x77d950`, `0x77de70`) never reads
-    // focus, so an unfocused box paints the selection it holds.
     let display = field.display();
-    let lo = field.sel_start.min(field.sel_end);
-    let hi = field.sel_start.max(field.sel_end);
-    let (d_lo, d_hi) = (field.text_to_display(lo), field.text_to_display(hi));
-    let d_cursor = field.text_to_display(field.cursor);
-    // `caret_shown` is ticked by `textinput::tick_caret`, the chat caret's clock too.
-    let caret_on = focused && field.caret_shown;
     for (part, text, mut vis) in parts {
-        let (want_text, want_vis) = match part {
-            GlueFieldPart::Before => (Some(&display[..d_lo]), true),
-            GlueFieldPart::Selected => (Some(&display[d_lo..d_hi]), true),
-            GlueFieldPart::After => (Some(&display[d_hi..]), true),
-            GlueFieldPart::CaretAtStart => (None, caret_on && d_cursor <= d_lo),
-            GlueFieldPart::CaretAtEnd => (None, caret_on && d_cursor > d_lo),
-        };
+        let (want_text, want_vis) = glue_field_part(field, &display, focused, *part);
         if let (Some(want), Some(mut t)) = (want_text, text) {
             if t.0 != want {
                 t.0 = want.to_string();
@@ -650,7 +667,10 @@ pub(crate) fn glue_edit_box<E: Bundle, T: Bundle + Clone>(
                             ..default()
                         },
                     ));
-                    if part == GlueFieldPart::Selected {
+                    if matches!(
+                        part,
+                        GlueFieldPart::SelectedHead | GlueFieldPart::SelectedTail
+                    ) {
                         // `SetHighlightColor`'s default, opaque medium grey, as the chat box.
                         e.insert(BackgroundColor(Color::srgb(
                             96.0 / 255.0,
@@ -660,19 +680,9 @@ pub(crate) fn glue_edit_box<E: Bundle, T: Bundle + Clone>(
                     }
                 };
                 segment(f, GlueFieldPart::Before);
-                caret_bar(
-                    f,
-                    (marker.clone(), GlueFieldPart::CaretAtStart),
-                    EDIT_FONT_SIZE,
-                    s,
-                );
-                segment(f, GlueFieldPart::Selected);
-                caret_bar(
-                    f,
-                    (marker.clone(), GlueFieldPart::CaretAtEnd),
-                    EDIT_FONT_SIZE,
-                    s,
-                );
+                segment(f, GlueFieldPart::SelectedHead);
+                caret_bar(f, (marker.clone(), GlueFieldPart::Caret), EDIT_FONT_SIZE, s);
+                segment(f, GlueFieldPart::SelectedTail);
                 segment(f, GlueFieldPart::After);
             });
     });
@@ -761,6 +771,46 @@ pub(crate) fn glue_button<A: Component>(
 mod tests {
     use super::*;
 
+    /// The selection splits at the caret, so a caret that `HighlightText` left inside the
+    /// selection (`0x77cca0`) draws where it is; an empty selection sits at the caret.
+    #[test]
+    fn the_caret_draws_where_it_is_inside_a_selection() {
+        use GlueFieldPart::*;
+        let mut f = EditBoxState {
+            text: "hello".into(),
+            cursor: 2,
+            ..Default::default()
+        };
+        f.highlight_text(0, -1);
+        let d = f.display();
+        let row = |f: &EditBoxState, focused| {
+            [Before, SelectedHead, Caret, SelectedTail, After]
+                .map(|part| glue_field_part(f, &d, focused, part))
+        };
+        assert_eq!(
+            row(&f, true),
+            [
+                (Some(""), true),
+                (Some("he"), true),
+                (None, true),
+                (Some("llo"), true),
+                (Some(""), true),
+            ]
+        );
+        f.highlight_text(0, 0);
+        assert_eq!(
+            row(&f, false),
+            [
+                (Some("he"), true),
+                (Some(""), true),
+                (None, false),
+                (Some(""), true),
+                (Some("llo"), true),
+            ],
+            "nothing selected, the caret hidden out of focus"
+        );
+    }
+
     #[test]
     fn colour_escapes_become_spans_not_text() {
         let base = GOLD;
diff --git a/crates/benilla-app/src/hover_log.rs b/crates/benilla-app/src/hover_log.rs
index 66133912..99725980 100644
--- a/crates/benilla-app/src/hover_log.rs
+++ b/crates/benilla-app/src/hover_log.rs
@@ -99,25 +99,25 @@ impl Plugin for HoverLogPlugin {
     }
 }
 
-/// The tooltip context, asked of the Lua VM, once per frame while recording.
+/// The tooltip context, asked of the Lua VM, once per frame while recording; the owner, which 1.12
+/// does not answer to Lua, from the engine.
 fn tooltip_context(script: &UiScript) -> Option<(String, i64, String)> {
     let chunk = r#"
         if not GameTooltip or not GameTooltip:IsShown() then return "" end
-        local owner = GameTooltip:BenillaGetTooltipOwner()
-        local name = "(no owner)"
-        if owner and owner.GetName and owner:GetName() then name = owner:GetName() end
-        local first = ""
+        local first = "
         if GameTooltipTextLeft1 and GameTooltipTextLeft1:GetText() then
             first = GameTooltipTextLeft1:GetText()
         end
-        return name .. "\t" .. GameTooltip:NumLines() .. "\t" .. first
+        return GameTooltip:NumLines() .. "\t" .. first
     "#;
     let s: String = script.eval(chunk).ok()?;
     if s.is_empty() {
         return None;
     }
     let mut parts = s.split('\t');
-    let owner = parts.next()?.to_string();
+    let owner = script
+        .tooltip_owner_name("GameTooltip")
+        .unwrap_or_else(|| "(no owner)".to_string());
     let lines = parts.next()?.trim().parse::<f64>().ok()? as i64;
     let first = parts.next().unwrap_or("").to_string();
     Some((owner, lines, first))
diff --git a/crates/benilla-app/src/items.rs b/crates/benilla-app/src/items.rs
index e4c51bfa..663d0acf 100644
--- a/crates/benilla-app/src/items.rs
+++ b/crates/benilla-app/src/items.rs
@@ -564,6 +564,12 @@ fn equipped_class(
     Some(items.template(entry, guid, commands)?.class as u8)
 }
 
+/// Whether the disarm flag is up (`UNIT_FIELD_FLAGS & UNIT_FLAG_DISARMED`), which hides one hand
+/// from the equipped-item search.
+pub(crate) fn is_disarmed(store: &ObjectStore) -> bool {
+    store.0.unit_flags() & crate::creature_anim::UNIT_FLAG_DISARMED != 0
+}
+
 /// The equipment slot this character's disarm hides ([`crate::creature_anim::disarmed_hand`] over
 /// the raw inventory), for the action bar's equipped-item requirement (`0x5f0c50`) and the
 /// item-use refusal (`CGItem::Use` rung 15). `None` while the flag is down or neither hand holds
@@ -574,7 +580,7 @@ pub(crate) fn disarmed_equipment_slot(
     items: &Items,
     commands: &NetCommands,
 ) -> Option<u8> {
-    if store.0.unit_flags() & crate::creature_anim::UNIT_FLAG_DISARMED == 0 {
+    if !is_disarmed(store) {
         return None;
     }
     let main = equipped_class(store, objects, items, commands, EQUIPMENT_SLOT_MAINHAND);
@@ -588,7 +594,7 @@ pub(crate) fn disarmed_equipment_slot_cached(
     objects: &Objects,
     items: &Items,
 ) -> Option<u8> {
-    if store.0.unit_flags() & crate::creature_anim::UNIT_FLAG_DISARMED == 0 {
+    if !is_disarmed(store) {
         return None;
     }
     let class_of = |slot: u8| -> Option<u8> {
diff --git a/crates/benilla-app/src/lib.rs b/crates/benilla-app/src/lib.rs
index 221175c6..a94b89f0 100644
--- a/crates/benilla-app/src/lib.rs
+++ b/crates/benilla-app/src/lib.rs
@@ -42,6 +42,7 @@ mod combat_text;
 mod console;
 mod crash;
 mod creature_anim;
+mod creature_type;
 mod cursor;
 mod cvars;
 mod death;
@@ -107,6 +108,7 @@ mod realmlist;
 mod run_mode;
 mod screen_fade;
 mod screenshot;
+mod script_calls;
 mod shaders;
 mod shadow_core;
 
@@ -152,7 +154,6 @@ mod ui_gamma;
 mod ui_gm_ticket;
 mod ui_gossip;
 mod ui_guild;
-mod ui_hide;
 mod ui_honor;
 mod ui_inspect;
 mod ui_instance;
@@ -209,17 +210,36 @@ mod world_state_ui;
 
 use bevy::prelude::*;
 
-// The `benilla` launcher shim stamps the build id at compile time and hands it to [`run`];
-// re-exported so the shim needs no bevy dependency of its own.
+// A launcher stamps the build id at compile time and hands it to [`run`] or [`run_with`];
+// re-exported so the `benilla` shim needs no bevy dependency of its own.
 pub use benilla_world::build_id::BuildId;
 /// The world viewer's entry point, the engine with no game attached, called by the
 /// `benilla-worldview` shim.
 pub use benilla_world::worldview::run as run_worldview;
 pub use bevy::app::AppExit;
+// A crate on top of benilla reads objects and interacts through these, with no protocol dependency.
+pub use benilla_protocol::{messages::ObjectType, ObjectFields};
+pub use net::Objects;
+pub use target::Interact;
 
 /// Builds and runs the client app. `build` is the launcher's compile-time git stamp, passed in as
 /// data so the sha lives in the shim's fingerprint and a commit does not recompile this crate.
 pub fn run(build: BuildId) -> AppExit {
+    launch(build, None)
+}
+
+/// [`run`], plus `extend` adding a crate's own plugins: how a feature 1.12.1 lacks is built on top
+/// of benilla (`examples/extended_launcher.rs`), the build marked `extended` wherever it is named.
+/// `extend` gets the client fully built and runs before the probe fleet, which sees what it adds.
+pub fn run_with(build: BuildId, extend: impl FnOnce(&mut App)) -> AppExit {
+    launch(build, Some(Box::new(extend)))
+}
+
+/// What a crate on top of benilla adds to the built app ([`run_with`]).
+type Extension<'a> = Box<dyn FnOnce(&mut App) + 'a>;
+
+/// The one body behind [`run`] and [`run_with`], not generic, so a launcher compiles none of it.
+fn launch(build: BuildId, extend: Option<Extension<'_>>) -> AppExit {
     // `WOW_HOVER_LOG_REPORT=<csv>` and `WOW_CAPTURE=list` print and exit before any setup.
     if let Ok(path) = std::env::var("WOW_HOVER_LOG_REPORT") {
         dev::report_recorded_hover_log(&path);
@@ -235,12 +255,22 @@ pub fn run(build: BuildId) -> AppExit {
         return AppExit::Success;
     }
 
+    // Every line that names the build says whether a crate on top extended it.
+    let build = BuildId {
+        extended: extend.is_some(),
+        ..build
+    };
+
+    // A dev build's install, state folder and probe identity resolve from the launcher's folder,
+    // so a crate on top of benilla keeps them in its own and not in cargo's checkout of benilla.
+    benilla_formats::set_project_folder(build.project_dir);
+
     // From here a panic leaves `benilla-config/Diagnostics/crash-<unix>.txt`; armed before the
     // `App` exists, so a panic while plugins build is reported too.
     crash::install(build);
 
     let mut app = App::new();
-    // The panel footer and the preflight banner read the stamp back.
+    // The panel footer and the build banner read the stamp back.
     app.insert_resource(build);
     // Static-scene transform tracking pinned on: the default threshold re-decides every frame with
     // two full scans of the rows the tracking exists to skip, and this scene is static-heavy. It
@@ -426,6 +456,11 @@ pub fn run(build: BuildId) -> AppExit {
         }
     }
 
+    // A crate on top of benilla adds its plugins here ([`run_with`]).
+    if let Some(extend) = extend {
+        extend(&mut app);
+    }
+
     // The probe fleet, last so it observes the fully-built app; compiled out by
     // `--no-default-features`.
     app.add_plugins(dev::DevProbesPlugin);
diff --git a/crates/benilla-app/src/local_state.rs b/crates/benilla-app/src/local_state.rs
index 96aef80d..11ff4869 100644
--- a/crates/benilla-app/src/local_state.rs
+++ b/crates/benilla-app/src/local_state.rs
@@ -4,8 +4,8 @@
 //!
 //! Resolution, in order, the same shape as [`benilla_formats::wow_data`]:
 //! 1. `$BENILLA_HOME`.
-//! 2. `<project folder>/benilla-config/`, dev builds only: a shipped binary must not carry the
-//!    build machine's source tree.
+//! 2. `<project folder>/benilla-config/`, dev builds only ([`benilla_formats::project_folder`], the
+//!    launcher's): a shipped binary must not carry the build machine's source tree.
 //! 3. `<exe dir>/benilla-config/`.
 //!
 //! With `$WOW_CAPTURE` set every path resolves to `None`: a capture neither reads nor writes
@@ -28,6 +28,14 @@ pub(crate) fn home() -> Option<PathBuf> {
     if let Some(over) = std::env::var_os("BENILLA_HOME") {
         return Some(PathBuf::from(over));
     }
+    if cfg!(test) {
+        return None; // a unit test reaches no real state folder unless it pins `$BENILLA_HOME`
+    }
+    resident_home()
+}
+
+/// Steps 2 and 3 of [`home`]: the folder the build itself lives in.
+fn resident_home() -> Option<PathBuf> {
     // 2 · the project folder, dev builds only.
     if let Some(root) = dev_project_root() {
         return Some(root.join(STATE_DIR));
@@ -39,11 +47,15 @@ pub(crate) fn home() -> Option<PathBuf> {
         .map(|dir| dir.join(STATE_DIR))
 }
 
-/// The project folder a dev build keeps its state in: the primary checkout, whichever worktree
-/// built the binary, so every worktree shares one settings folder. Anything unexpected falls back
-/// to the crate root's grandparent rather than `None`.
+/// The project folder a dev build keeps its state in ([`benilla_formats::project_folder`]), through
+/// [`shared_root`].
 fn dev_project_root() -> Option<PathBuf> {
-    let here = crate::run_mode::dev_source_dir()?.ancestors().nth(2)?;
+    Some(shared_root(benilla_formats::project_folder()?))
+}
+
+/// `here`, or for a linked worktree its primary checkout, whichever worktree built the binary, so
+/// every worktree shares one settings folder. Anything unexpected keeps `here`.
+fn shared_root(here: &Path) -> PathBuf {
     let dot_git = here.join(".git");
     // A linked worktree: `.git` is a file pointing at `<primary>/.git/worktrees/<name>`.
     if dot_git.is_file() {
@@ -59,12 +71,12 @@ fn dev_project_root() -> Option<PathBuf> {
                 .and_then(|d| d.parent())
             {
                 if primary.is_dir() {
-                    return Some(primary.to_path_buf());
+                    return primary.to_path_buf();
                 }
             }
         }
     }
-    Some(here.to_path_buf())
+    here.to_path_buf()
 }
 
 /// `benilla-config/config.toml`: the CVar overrides, the `Config.wtf` analog.
@@ -372,6 +384,19 @@ mod tests {
         std::fs::remove_dir_all(&tmp).ok();
     }
 
+    /// A unit test that does not pin `$BENILLA_HOME` resolves no state folder, so no test can write
+    /// the real one.
+    #[test]
+    fn a_test_without_an_override_has_no_state_folder() {
+        let _l = ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let _c = EnvGuard::unset("WOW_CAPTURE");
+        let _h = EnvGuard::unset("BENILLA_HOME");
+        assert_eq!(home(), None);
+        assert_eq!(config_path(), None);
+    }
+
     /// A missing or wrong `$WOW_DATA` does not move or lose the state folder.
     #[test]
     fn the_state_folder_no_longer_depends_on_finding_the_install() {
@@ -381,7 +406,8 @@ mod tests {
         let _c = EnvGuard::unset("WOW_CAPTURE");
         let _h = EnvGuard::unset("BENILLA_HOME");
         let _d = EnvGuard::set("WOW_DATA", "/nonexistent/benilla-test/Data");
-        let h = home().expect("a broken install path must not cost the player their config");
+        let h =
+            resident_home().expect("a broken install path must not cost the player their config");
         assert!(
             !h.starts_with("/nonexistent"),
             "home() still reads $WOW_DATA: {}",
@@ -399,11 +425,10 @@ mod tests {
             .unwrap_or_else(std::sync::PoisonError::into_inner);
         let _c = EnvGuard::unset("WOW_CAPTURE");
         let _h = EnvGuard::unset("BENILLA_HOME");
-        let h = home().expect("home() always resolves outside a capture");
+        let h = resident_home().expect("the resident folder always resolves");
         assert!(h.ends_with(STATE_DIR), "{}", h.display());
 
-        let Some(here) = crate::run_mode::dev_source_dir().and_then(|d| d.ancestors().nth(2))
-        else {
+        let Some(here) = benilla_formats::project_folder() else {
             // Player build: beside the binary.
             let exe_dir = std::env::current_exe()
                 .unwrap()
@@ -430,6 +455,86 @@ mod tests {
         }
     }
 
+    /// A project folder that is a linked worktree keeps its state in the primary checkout, so every
+    /// worktree shares one; any other folder, a crate on top of benilla's included, keeps its own.
+    #[test]
+    fn the_state_root_is_the_folder_or_its_primary_checkout() {
+        let tmp = std::env::temp_dir().join(format!("benilla-root-{}", std::process::id()));
+        std::fs::remove_dir_all(&tmp).ok();
+        let primary = tmp.join("benilla");
+        std::fs::create_dir_all(primary.join(".git/worktrees/pool-3")).unwrap();
+        let slot = tmp.join("pool-3");
+        std::fs::create_dir_all(&slot).unwrap();
+        let gitdir = primary.join(".git/worktrees/pool-3");
+        std::fs::write(slot.join(".git"), format!("gitdir: {}\n", gitdir.display())).unwrap();
+        assert_eq!(shared_root(&slot), primary);
+        assert_eq!(shared_root(&primary), primary);
+        let hello_mod = tmp.join("hello-mod");
+        std::fs::create_dir_all(hello_mod.join(".git")).unwrap();
+        assert_eq!(shared_root(&hello_mod), hello_mod);
+        let plain = tmp.join("plain");
+        std::fs::create_dir_all(&plain).unwrap();
+        assert_eq!(shared_root(&plain), plain);
+        std::fs::remove_dir_all(&tmp).ok();
+    }
+
+    /// A launcher's recorded folder is where a dev build keeps its state and reads its probe
+    /// identity; a player build resolves neither from it. Recording is process-wide, so the parent
+    /// runs this same test in a child process of the test binary, which records and resolves.
+    #[test]
+    fn a_recorded_launcher_folder_holds_the_state_and_the_identity() {
+        const CHILD: &str = "BENILLA_TEST_LAUNCHER_FOLDER";
+        if let Some(dir) = std::env::var_os(CHILD) {
+            let dir = PathBuf::from(dir);
+            benilla_formats::set_project_folder(dir.to_str().unwrap());
+            if crate::run_mode::dev_affordances() {
+                assert_eq!(resident_home(), Some(dir.join(STATE_DIR)));
+                assert_eq!(
+                    crate::run_mode::declared_identity(),
+                    Some(crate::run_mode::DeclaredIdentity {
+                        user: "probe9".into(),
+                        character: "Modchar".into()
+                    })
+                );
+            } else {
+                let exe_dir = std::env::current_exe().unwrap();
+                assert_eq!(
+                    resident_home(),
+                    Some(exe_dir.parent().unwrap().join(STATE_DIR))
+                );
+                assert_eq!(crate::run_mode::declared_identity(), None);
+            }
+            return;
+        }
+        let tmp = std::env::temp_dir().join(format!("benilla-launcher-{}", std::process::id()));
+        std::fs::remove_dir_all(&tmp).ok();
+        std::fs::create_dir_all(&tmp).unwrap();
+        std::fs::write(
+            tmp.join(".probe-identity"),
+            "WOW_USER=probe9\nWOW_PASS=unused\nWOW_CHAR=Modchar\n",
+        )
+        .unwrap();
+        let name =
+            "local_state::tests::a_recorded_launcher_folder_holds_the_state_and_the_identity";
+        let out = std::process::Command::new(std::env::current_exe().unwrap())
+            .args(["--exact", name, "--nocapture"])
+            .env(CHILD, &tmp)
+            .env_remove("BENILLA_HOME")
+            .env_remove("WOW_CAPTURE")
+            .output()
+            .unwrap();
+        let report = format!(
+            "{}{}",
+            String::from_utf8_lossy(&out.stdout),
+            String::from_utf8_lossy(&out.stderr)
+        );
+        assert!(
+            out.status.success() && report.contains("1 passed"),
+            "the child run:\n{report}"
+        );
+        std::fs::remove_dir_all(&tmp).ok();
+    }
+
     #[test]
     fn write_atomic_creates_dirs_and_replaces_whole_files() {
         let _l = ENV_LOCK
diff --git a/crates/benilla-app/src/login/mod.rs b/crates/benilla-app/src/login/mod.rs
index 281586f7..58cfefd4 100644
--- a/crates/benilla-app/src/login/mod.rs
+++ b/crates/benilla-app/src/login/mod.rs
@@ -596,17 +596,17 @@ impl Default for LoginForm {
 }
 
 impl LoginForm {
-    /// Give `field` the keyboard, select all its text and collapse the selection in the box left.
-    ///
-    /// Deviation: select on focus and collapse on leaving, because a player entering a login
-    /// field means to replace what is there. The reference's focus gain (`0x77e3f6`) and loss
-    /// (`0x77af50`) leave the selection alone, and its click collapses it (`0x77b800` calls
-    /// `0x77ccf0` before `SetFocus`). `HighlightText(0, -1)` (`0x77cca0`) also resets the blink,
-    /// so the caret opens solid.
+    /// Give `field` the keyboard as the stock `AccountLogin.xml` boxes take it: the box left drops
+    /// its selection (`OnEditFocusLost`, `HighlightText(0, 0)`), and the box gaining it selects
+    /// all (`OnEditFocusGained`, `HighlightText()`), which leaves its caret where it was
+    /// (`0x77cca0`). The focus change raises the caret bit (`0x77afa8`), whose flush restarts the
+    /// blink (`0x77dd68`, `0x77de35`), so the caret opens solid.
     fn focus(&mut self, field: Field) {
-        self.focused().collapse();
+        self.focused().highlight_text(0, 0);
         self.focus = field;
-        self.focused().highlight_text(0, -1);
+        let f = self.focused();
+        f.highlight_text(0, -1);
+        f.reset_blink();
     }
 
     fn focused(&mut self) -> &mut EditBoxState {
@@ -651,7 +651,8 @@ fn login_input(
     clicks: Res<crate::glue::GlueClicks>,
     mut keyboard: MessageReader<KeyboardInput>,
     keys: Res<ButtonInput<KeyCode>>,
-    mut clipboard: NonSendMut<HostClipboard>,
+    // The pasteboard, and the layout that names the clipboard chords' letters.
+    (mut clipboard, layout): (NonSendMut<HostClipboard>, Res<crate::bindings::LayoutNames>),
     raw_handle: Query<&bevy::window::RawHandleWrapper, With<bevy::window::PrimaryWindow>>,
     mut form: ResMut<LoginForm>,
     mut attempt: Attempt,
@@ -742,6 +743,7 @@ fn login_input(
                     &mut dialog.edit,
                     ev,
                     mods,
+                    &layout,
                     &mut clipboard,
                     wl,
                     textinput::CharFilter::Any,
@@ -755,6 +757,7 @@ fn login_input(
             form.focused(),
             ev,
             mods,
+            &layout,
             &mut clipboard,
             wl,
             textinput::CharFilter::Any,
@@ -1412,10 +1415,16 @@ mod tests {
         form.account.set_text("remembered");
         form.password.set_text("secret");
 
+        // Mid-blink, caret off and mid-text: the focus restarts it solid, where it was.
+        form.account.caret_shown = false;
+        form.account.blink_accum = 0.3;
+        form.account.cursor = 3;
         form.focus(Field::Account);
         assert_eq!(form.focus, Field::Account);
         assert_eq!(form.account.selected_text().as_deref(), Some("remembered"));
+        assert_eq!(form.account.cursor, 3, "HighlightText leaves the caret");
         assert!(form.account.caret_shown, "a fresh focus starts solid");
+        assert_eq!(form.account.blink_accum, 0.0, "with a full half-period");
 
         // Checked as a range: a password box's `selected_text` returns the `*` mask.
         form.focus(Field::Password);
diff --git a/crates/benilla-app/src/minimap/blips/dots.rs b/crates/benilla-app/src/minimap/blips/dots.rs
index fb1afb07..3f976cdb 100644
--- a/crates/benilla-app/src/minimap/blips/dots.rs
+++ b/crates/benilla-app/src/minimap/blips/dots.rs
@@ -10,6 +10,7 @@ use benilla_assets::coords::bevy_to_wow;
 use benilla_formats::{LockCatalog, ShapeshiftForm, LOCK_KEY_SKILL};
 use benilla_protocol::EntityKind;
 
+use crate::creature_type::CreatureTypeSources;
 use crate::go_templates::GameObjectTemplates;
 use crate::names::NameCache;
 use crate::net::{GuidIndex, NetEntity, ObjectStore};
@@ -31,10 +32,6 @@ const TRACKED_UNIT_CELL: [f32; 4] = [0.25, 0.5, 0.0, 0.25];
 /// `UNIT_DYNAMIC_FLAGS` bit 0x2, set per viewer on a Hunter's Mark victim for its caster; one of
 /// `0x5ed210`'s two always-show clauses (`+0x224 & 0x2`).
 const UNIT_DYNFLAG_TRACK_UNIT: u32 = 0x2;
-/// Creature type 7, Humanoid: a player's type (`ChrRaces.dbc` col 9 is 7 for all nine playable
-/// races, read by `0x605570`) and the `<= 0` fallback of the shapeshift override.
-const CREATURE_TYPE_HUMANOID: u32 = 7;
-
 /// Only DIALOG_STATUS 7 draws a quest dot, the gold cell 3 (`cmp [obj+0xcb8],7` at `0x4eac31`).
 fn quest_dot_cell(status: u32) -> Option<[f32; 4]> {
     (status == 7).then_some([0.75, 1.0, 0.0, 0.25])
@@ -162,33 +159,6 @@ fn tracked_creature(
             .is_some_and(|t| (1..=32).contains(&t) && tracking.creatures & (1u32 << (t - 1)) != 0)
 }
 
-/// The creature-type resolver `0x605570`: a shapeshift form's `SpellShapeshiftForm.dbc` type
-/// first (`<= 0` reads Humanoid), else an NPC's cached template, else Humanoid for a player.
-fn creature_type_of(
-    kind: EntityKind,
-    shapeshift_form: u8,
-    entry: Option<u32>,
-    names: &NameCache,
-    forms: Option<&HashMap<u32, ShapeshiftForm>>,
-) -> Option<u32> {
-    if shapeshift_form != 0 {
-        if let Some(t) =
-            forms.and_then(|f| f.get(&u32::from(shapeshift_form)).map(|r| r.creature_type))
-        {
-            return Some(if t >= 1 {
-                t as u32
-            } else {
-                CREATURE_TYPE_HUMANOID
-            });
-        }
-    }
-    match kind {
-        EntityKind::Unit => entry.and_then(|e| names.creature_type(e)),
-        EntityKind::Player => Some(CREATURE_TYPE_HUMANOID),
-        _ => None,
-    }
-}
-
 /// Draw the tracking dots, gold cell 0 per GameObject then red cell 1 per unit not at quest
 /// status 7 (`0x4eac31` tests that first). Drawn before the quest and party dots, as the cell
 /// lists draw in order.
@@ -257,6 +227,10 @@ pub(in crate::minimap) fn emit_tracking_dots(
         }
     }
     // Cell 1, units.
+    let types = CreatureTypeSources {
+        names: Some(names),
+        forms,
+    };
     for (guid, net, tf, store) in candidates.iter() {
         if !matches!(net.kind, EntityKind::Unit | EntityKind::Player) {
             continue;
@@ -267,22 +241,10 @@ pub(in crate::minimap) fn emit_tracking_dots(
         if statuses.get(&guid.0).copied() == Some(7) {
             continue; // the ==7 branch already drew the quest dot
         }
-        let (dyn_flags, form, creeping) = store
-            .map(|s| {
-                (
-                    s.0.unit_dynamic_flags(),
-                    s.0.unit_shapeshift_form(),
-                    s.0.unit_is_stealthed(),
-                )
-            })
-            .unwrap_or((0, 0, false));
-        let creature_type = creature_type_of(
-            net.kind,
-            form,
-            benilla_protocol::guid::entry(guid.0),
-            names,
-            forms,
-        );
+        let (dyn_flags, creeping) = store
+            .map(|s| (s.0.unit_dynamic_flags(), s.0.unit_is_stealthed()))
+            .unwrap_or((0, false));
+        let creature_type = store.map(|s| types.of(s));
         if tracked_creature(tracking, creature_type, dyn_flags, creeping) {
             dot(guid.0, tf, TRACKED_UNIT_CELL, DotName::Guid);
         }
@@ -332,6 +294,9 @@ pub(in crate::minimap) fn emit_party_dots(
 mod tests {
     use super::*;
 
+    /// Creature type 7, Humanoid: a player's, by race (`ChrRaces.dbc` column 9).
+    const CREATURE_TYPE_HUMANOID: u32 = 7;
+
     /// The first row is the control: an ordinary live creature still passes.
     #[test]
     fn the_dead_our_own_minions_and_the_untrackable_draw_no_dot_of_either_kind() {
@@ -495,51 +460,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn creature_type_resolver_prefers_the_shapeshift_override() {
-        use benilla_formats::ShapeshiftForm;
-        let names = NameCache::default();
-        let forms: HashMap<u32, ShapeshiftForm> = [
-            (
-                1,
-                ShapeshiftForm {
-                    creature_type: 1, // Cat → Beast
-                    ..Default::default()
-                },
-            ),
-            (
-                16,
-                ShapeshiftForm {
-                    creature_type: 0, // a <=0 row reads Humanoid (the resolver's fallback)
-                    ..Default::default()
-                },
-            ),
-        ]
-        .into();
-        // A cat-form player is a Beast; unshifted, a Humanoid.
-        assert_eq!(
-            creature_type_of(EntityKind::Player, 1, None, &names, Some(&forms)),
-            Some(1)
-        );
-        assert_eq!(
-            creature_type_of(EntityKind::Player, 0, None, &names, Some(&forms)),
-            Some(CREATURE_TYPE_HUMANOID)
-        );
-        assert_eq!(
-            creature_type_of(EntityKind::Player, 16, None, &names, Some(&forms)),
-            Some(CREATURE_TYPE_HUMANOID)
-        );
-        // An NPC with no cached template yet resolves nothing.
-        assert_eq!(
-            creature_type_of(EntityKind::Unit, 0, Some(69), &names, Some(&forms)),
-            None
-        );
-        assert_eq!(
-            creature_type_of(EntityKind::GameObject, 0, None, &names, Some(&forms)),
-            None
-        );
-    }
-
     /// The tracking spell's `EffectMiscValue`, the server's mask bit and the node's `Lock.dbc`
     /// skill slot, on the install's data.
     #[test]
@@ -586,12 +506,17 @@ mod tests {
             0,
             false
         ));
-        let cat = creature_type_of(
-            EntityKind::Player,
-            1,
-            None,
-            &NameCache::default(),
-            Some(&forms),
+        // A cat-form player (`UNIT_FIELD_BYTES_1` byte 2 is form 1).
+        let cat_druid = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(
+            138,
+            1 << 16,
+        )]));
+        let cat = Some(
+            CreatureTypeSources {
+                names: Some(&NameCache::default()),
+                forms: Some(&forms),
+            }
+            .of(&cat_druid),
         );
         assert_eq!(cat, Some(1), "cat form resolves Beast (DBC col 12)");
         assert!(tracked_creature(beasts, cat, 0, false));
diff --git a/crates/benilla-app/src/minimap/mod.rs b/crates/benilla-app/src/minimap/mod.rs
index c25f66c8..10f72ccf 100644
--- a/crates/benilla-app/src/minimap/mod.rs
+++ b/crates/benilla-app/src/minimap/mod.rs
@@ -842,14 +842,14 @@ fn feed_minimap_player_facing(
     script.set_minimap_player_facing(player.facing().rem_euclid(std::f32::consts::TAU));
 }
 
-/// Push the game clock into `GetGameTime()`'s backing globals when the minute ticks, the API's own
-/// resolution. Before the first `SMSG_LOGIN_SETTIMESPEED` they hold 0:00.
+/// Push the game clock `GetGameTime()` answers when the minute ticks, the API's own resolution.
+/// Before the first `SMSG_LOGIN_SETTIMESPEED` it reads 0:00.
 fn feed_game_time(
     script: Option<bevy::ecs::system::NonSendMut<benilla_ui::script::UiScript>>,
     time: Res<crate::net::ServerTime>,
     mut last: Local<crate::ui_script::VmMemo<Option<u32>>>,
 ) {
-    let Some(script) = script else { return };
+    let Some(mut script) = script else { return };
     let last = last.get(&script);
     let Some(gt) = time.0 else { return };
     let minute = gt.minute_of_day();
@@ -857,13 +857,7 @@ fn feed_game_time(
         return;
     }
     *last = Some(minute);
-    let globals = script.lua().globals();
-    let pushed = globals
-        .set("__benilla_game_hour", minute / 60)
-        .and_then(|()| globals.set("__benilla_game_minute", minute % 60));
-    if let Err(e) = pushed {
-        warn!("minimap: game-time globals: {e}");
-    }
+    script.set_game_time(minute / 60, minute % 60);
 }
 
 /// The app half of the `<Minimap>` widget. The zone label feed is `crate::area`'s: the reference
diff --git a/crates/benilla-app/src/net.rs b/crates/benilla-app/src/net.rs
index f669ffe1..eaaca9f7 100644
--- a/crates/benilla-app/src/net.rs
+++ b/crates/benilla-app/src/net.rs
@@ -226,6 +226,18 @@ pub(crate) fn current_speed(s: &MoveSpeeds, flags: u32) -> f32 {
 #[derive(Component, Clone, Default)]
 pub(crate) struct ObjectStore(pub(crate) ObjectFields);
 
+impl ObjectStore {
+    /// The object manager's unit lookup (`0x468460`, `ecx = 8`): a unit or a player, which share
+    /// the unit block; a game object, corpse or item is not one.
+    pub(crate) fn is_unit(&self) -> bool {
+        use benilla_protocol::messages::ObjectType;
+        matches!(
+            self.0.object_type(),
+            Some(ObjectType::Unit | ObjectType::Player)
+        )
+    }
+}
+
 /// One descriptor dword moved on a streamed object, the reference's `CMirrorHandler` edge: the
 /// values notifier (`0x465330`) diffs live against a shadow copy and passes the old value
 /// (`0x465570`). A first create fires nothing; a re-create of a live guid fires like a delta.
@@ -406,23 +418,24 @@ pub(crate) struct LoginAbandon(pub(crate) std::sync::Arc<std::sync::atomic::Atom
 #[derive(Resource, Default)]
 pub(crate) struct GuidIndex(pub(crate) HashMap<u64, Entity>);
 
-/// The object manager's guid lookup (`ClntObjMgrObjectPtr 0x468460`): a guid to its descriptor
-/// store, whatever the kind, and an item's countdown cells. Read-only.
+/// The streamed objects, whatever the kind, with their descriptor stores, our own player, and an
+/// item's countdown cells. Read-only. The by-guid lookups are `ClntObjMgrObjectPtr` (`0x468460`).
 #[derive(SystemParam)]
-pub(crate) struct Objects<'w, 's> {
+pub struct Objects<'w, 's> {
     index: Res<'w, GuidIndex>,
     stores: Query<'w, 's, &'static ObjectStore>,
     countdowns: Query<'w, 's, &'static crate::items::Countdowns>,
+    me: Query<'w, 's, Entity, With<SelfPlayer>>,
 }
 
 impl Objects<'_, '_> {
-    /// The entity behind a guid, if streamed.
-    pub(crate) fn entity(&self, guid: u64) -> Option<Entity> {
+    /// The entity behind a guid, if streamed (`ClntObjMgrObjectPtr`, `0x468460`).
+    pub fn entity(&self, guid: u64) -> Option<Entity> {
         self.index.0.get(&guid).copied()
     }
 
-    /// A streamed object's merged descriptor fields.
-    pub(crate) fn object(&self, guid: u64) -> Option<&ObjectFields> {
+    /// A streamed object's merged descriptor fields, found as `0x468460` does, by guid.
+    pub fn object(&self, guid: u64) -> Option<&ObjectFields> {
         self.index
             .0
             .get(&guid)
@@ -430,6 +443,19 @@ impl Objects<'_, '_> {
             .map(|s| &s.0)
     }
 
+    /// Every streamed object, items included.
+    pub fn iter(&self) -> impl Iterator<Item = (u64, Entity, &ObjectFields)> + '_ {
+        self.index
+            .0
+            .iter()
+            .filter_map(|(&guid, &e)| Some((guid, e, &self.stores.get(e).ok()?.0)))
+    }
+
+    /// Our own player, once in the world.
+    pub fn player(&self) -> Option<Entity> {
+        self.me.single().ok()
+    }
+
     /// An item object's countdown cells.
     pub(crate) fn countdowns(&self, guid: u64) -> Option<&crate::items::Countdowns> {
         self.index
@@ -678,23 +704,62 @@ pub(crate) fn addon_wire_chat_type(distribution: benilla_ui::script::AddonDistri
 /// `HandleChatMessageOpcode`). `Whisper` and `Channel` name their target in `target`.
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub(crate) enum ChatKind {
+    /// `/say`; GM dot-commands go out this way, parsed after the language gate.
     Say,
+    /// `/yell` (`CHAT_MSG_YELL`, `SharedDefines.h:1199`).
     Yell,
+    /// A custom `/emote`, shown verbatim as `"PlayerName <text>"`.
     Emote,
+    /// `/whisper`: the target's name precedes the text (`Chat.cpp:3-12`).
     Whisper,
+    /// `/p`, dropped silently when ungrouped (`ChatHandler.cpp:472-493`).
     Party,
+    /// `/ra`; needs a raid (`ChatHandler.cpp:514-536`).
     Raid,
+    /// `/rl`, leader only (`ChatHandler.cpp:538-559`).
     RaidLeader,
+    /// `/rw`, leader or assistant only (`ChatHandler.cpp:561-576`).
     RaidWarning,
+    /// `/g`; needs a guild (`ChatHandler.cpp:494-503`).
     Guild,
+    /// `/o`; needs a guild (`ChatHandler.cpp:504-513`).
     Officer,
+    /// Needs a battleground group (`ChatHandler.cpp:579-593`).
     Battleground,
+    /// Battleground leader only (`ChatHandler.cpp:595-609`).
     BattlegroundLeader,
+    /// Toggles AFK, the text the auto-reply if any; it clears DND (`ChatHandler.cpp:611-630`).
     Afk,
+    /// Toggles DND, which clears AFK (`ChatHandler.cpp:632-648`).
     Dnd,
+    /// A channel line by name, dropped unless we are on it (`ChatHandler.cpp:255-327`).
     Channel,
 }
 
+impl ChatKind {
+    /// The `CMSG_MESSAGECHAT` `type` field.
+    pub(crate) fn chat_type(self) -> u32 {
+        use benilla_protocol::messages as m;
+        match self {
+            Self::Say => m::CHAT_TYPE_SAY,
+            Self::Yell => m::CHAT_TYPE_YELL,
+            Self::Emote => m::CHAT_TYPE_EMOTE,
+            Self::Whisper => m::CHAT_TYPE_WHISPER,
+            Self::Party => m::CHAT_TYPE_PARTY,
+            Self::Raid => m::CHAT_TYPE_RAID,
+            Self::RaidLeader => m::CHAT_TYPE_RAID_LEADER,
+            Self::RaidWarning => m::CHAT_TYPE_RAID_WARNING,
+            Self::Guild => m::CHAT_TYPE_GUILD,
+            Self::Officer => m::CHAT_TYPE_OFFICER,
+            Self::Battleground => m::CHAT_TYPE_BATTLEGROUND,
+            Self::BattlegroundLeader => m::CHAT_TYPE_BATTLEGROUND_LEADER,
+            Self::Afk => m::CHAT_TYPE_AFK,
+            Self::Dnd => m::CHAT_TYPE_DND,
+            Self::Channel => m::CHAT_TYPE_CHANNEL,
+        }
+    }
+}
+
 /// `WOW_CAST_TRACE=1`: log our own cast packets and every outbound movement packet. vmangos
 /// interrupts a cast on a movement report whose position differs at all (`Player::SetPosition`).
 pub(crate) static CAST_TRACE: std::sync::LazyLock<bool> =
@@ -780,6 +845,8 @@ pub(crate) enum ClientCommand {
         kind: ChatKind,
         target: Option<String>,
         text: String,
+        /// The `Languages.dbc` id `SendChatMessage` named; `None` speaks the character's own.
+        language: Option<u32>,
     },
     /// `SendAddonMessage`: a `CMSG_MESSAGECHAT` in `LANG_ADDON` (1.12 has no addon opcode and no
     /// whispered addon message). `text` is `prefix` TAB `message`.
@@ -919,8 +986,9 @@ pub(crate) enum ClientCommand {
         toggles: u8,
     },
     /// `CMSG_PET_ACTION`: `packed` is the slot's word as the server sent it, dispatched on its type
-    /// byte; `target_guid` is our selection (`0x4bd212`). The server does not reply, so the
-    /// caller applies the change locally first.
+    /// byte; `target_guid` is our selection (`0x4bd212`), or the player under the pet book's
+    /// `onSelf` (`0x4b4345`). The server does not reply, so the caller applies the change locally
+    /// first.
     PetAction {
         pet_guid: u64,
         packed: u32,
@@ -1361,6 +1429,8 @@ pub(crate) enum ClientCommand {
         body: String,
         /// The `Stationery.dbc` id, the sixth field.
         stationery: u32,
+        /// The `Package.dbc` id, the seventh field, 0 without an item.
+        package: u32,
         item_guid: u64,
         money: u32,
         cod: u32,
@@ -1581,6 +1651,8 @@ pub(crate) enum ClientCommand {
     },
     /// `/played` (`CMSG_PLAYED_TIME`).
     PlayedTime,
+    /// `OpeningCinematic()`: `CMSG_OPENING_CINEMATIC`, empty.
+    OpeningCinematic,
     /// `CMSG_COMPLETE_CINEMATIC`, at the end or skip, or at once for an unresolvable trigger.
     /// Unacked, vmangos keeps visibility on the cinematic camera and nearby NPCs despawn.
     CompleteCinematic,
@@ -2120,6 +2192,8 @@ pub(crate) enum ServerSoundKind {
 /// and sex).
 #[derive(Message, Clone, Copy)]
 pub(crate) struct EmoteMessage {
+    /// The performer's wire guid, known even while its entity has not streamed.
+    pub(crate) guid: u64,
     pub(crate) source: Option<Entity>,
     pub(crate) kind: EmoteKind,
 }
@@ -2395,4 +2469,37 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn objects_lists_every_streamed_object_and_names_our_own() {
+        use bevy::ecs::system::RunSystemOnce;
+        const ME: u64 = 0x5E1F;
+        const BOAR: u64 = 0xF130_0000_0000_0042;
+        let mut world = World::new();
+        world.init_resource::<GuidIndex>();
+        let fields = |health| {
+            ObjectStore(ObjectFields::from_pairs(&[(
+                benilla_protocol::field::FIELD_UNIT_HEALTH,
+                health,
+            )]))
+        };
+        let me = world.spawn((SelfPlayer, Guid(ME), fields(256))).id();
+        let boar = world.spawn((Guid(BOAR), fields(40))).id();
+        world
+            .resource_mut::<GuidIndex>()
+            .0
+            .extend([(ME, me), (BOAR, boar)]);
+        let (listed, player) = world
+            .run_system_once(|objects: Objects| {
+                let mut listed: Vec<_> = objects
+                    .iter()
+                    .map(|(guid, e, f)| (guid, e, f.unit_health()))
+                    .collect();
+                listed.sort_by_key(|&(guid, ..)| guid);
+                (listed, objects.player())
+            })
+            .unwrap();
+        assert_eq!(listed, [(ME, me, Some(256)), (BOAR, boar, Some(40))]);
+        assert_eq!(player, Some(me));
+    }
 }
diff --git a/crates/benilla-app/src/net/io.rs b/crates/benilla-app/src/net/io.rs
index 01290709..869b97c4 100644
--- a/crates/benilla-app/src/net/io.rs
+++ b/crates/benilla-app/src/net/io.rs
@@ -25,7 +25,7 @@ use benilla_protocol::{
 };
 use crossbeam_channel::{Receiver, Sender};
 
-use super::{CharRequest, ChatKind, ClientCommand, RealmRequest};
+use super::{CharRequest, ClientCommand, RealmRequest};
 
 /// The inbound census: every packet off the world socket, and the unix ms of the latest, which
 /// tell a silent server from a dead socket for the runaway watch ([`crate::net::motion`]).
@@ -920,27 +920,12 @@ fn writer_loop(
                     ClientCommand::CancelAutoRepeat => w.cancel_auto_repeat(),
                     ClientCommand::CancelCast { spell_id } => w.cancel_cast(spell_id),
                     ClientCommand::CancelChannelling { spell_id } => w.cancel_channelling(spell_id),
-                    ClientCommand::Chat { kind, target, text } => match kind {
-                        ChatKind::Say => w.send_chat(&text),
-                        ChatKind::Yell => w.send_yell(&text),
-                        ChatKind::Emote => w.send_emote_chat(&text),
-                        ChatKind::Whisper => {
-                            w.send_whisper(target.as_deref().unwrap_or_default(), &text)
-                        }
-                        ChatKind::Party => w.send_party(&text),
-                        ChatKind::Raid => w.send_raid(&text),
-                        ChatKind::RaidLeader => w.send_raid_leader(&text),
-                        ChatKind::RaidWarning => w.send_raid_warning(&text),
-                        ChatKind::Guild => w.send_guild(&text),
-                        ChatKind::Officer => w.send_officer(&text),
-                        ChatKind::Battleground => w.send_battleground(&text),
-                        ChatKind::BattlegroundLeader => w.send_battleground_leader(&text),
-                        ChatKind::Afk => w.send_afk(&text),
-                        ChatKind::Dnd => w.send_dnd(&text),
-                        ChatKind::Channel => {
-                            w.send_channel(target.as_deref().unwrap_or_default(), &text)
-                        }
-                    },
+                    ClientCommand::Chat {
+                        kind,
+                        target,
+                        text,
+                        language,
+                    } => w.send_message_chat(kind.chat_type(), language, target.as_deref(), &text),
                     // The distribution is an enum, so its map to a chat type is total.
                     ClientCommand::AddonMessage { distribution, text } => {
                         w.send_addon_message(super::addon_wire_chat_type(distribution), &text)
@@ -1247,14 +1232,15 @@ fn writer_loop(
                         subject,
                         body,
                         stationery,
+                        package,
                         item_guid,
                         money,
                         cod,
                     } => w.send_mail(
                         mailbox, &receiver, &subject, &body,
-                        // The chosen stationery and package 0, as the reference sends; vmangos
-                        // stores `MAIL_STATIONERY_DEFAULT` (41) regardless.
-                        stationery, 0, item_guid, money, cod,
+                        // vmangos stores `MAIL_STATIONERY_DEFAULT` (41) regardless of the chosen
+                        // stationery, and reads the package id (`Packets/Mail.cpp:10`) unused.
+                        stationery, package, item_guid, money, cod,
                     ),
                     ClientCommand::MailTakeMoney { mailbox, mail_id } => {
                         w.mail_take_money(mailbox, mail_id)
@@ -1349,6 +1335,7 @@ fn writer_loop(
                     ClientCommand::ClearTradeItem { trade_slot } => w.clear_trade_item(trade_slot),
                     ClientCommand::Logout => w.logout_request(),
                     ClientCommand::LogoutCancel => w.logout_cancel(),
+                    ClientCommand::OpeningCinematic => w.opening_cinematic(),
                     ClientCommand::CompleteCinematic => w.complete_cinematic(),
                     ClientCommand::NextCinematicCamera => w.next_cinematic_camera(),
                     ClientCommand::MoveModeAck {
diff --git a/crates/benilla-app/src/net/motion/facing.rs b/crates/benilla-app/src/net/motion/facing.rs
index a37d2c69..046b7c44 100644
--- a/crates/benilla-app/src/net/motion/facing.rs
+++ b/crates/benilla-app/src/net/motion/facing.rs
@@ -36,7 +36,7 @@ const UNIT_FLAG_STUNNED: u32 = 0x0004_0000;
 
 /// The `EmoteFlags` bit that permits the target and interaction facing during a state emote
 /// (`600d98 test ch,0x20`); the name is ours, the tested bit is the reference's.
-const EMOTE_PERMITS_FACING: u32 = 0x2000;
+const EMOTE_PERMITS_FACING: u32 = benilla_formats::EMOTE_FLAG_INTERACTION;
 
 /// A stationary unit's display-facing state, the client's `CGUnit+0xc98` goal and
 /// `+0xc9c..+0xca8` delta ring; present only while [`drive_display_facing`] governs the unit.
diff --git a/crates/benilla-app/src/net/objects.rs b/crates/benilla-app/src/net/objects.rs
index e9f4bd06..7d2d7ebf 100644
--- a/crates/benilla-app/src/net/objects.rs
+++ b/crates/benilla-app/src/net/objects.rs
@@ -302,8 +302,15 @@ fn on_object_values(In(ev): In<SessionEvent>, mut sc: Scene) {
 fn on_object_destroyed(In(ev): In<SessionEvent>, mut sc: Scene) {
     if let SessionEvent::ObjectDestroyed(guid) = ev {
         crate::death::net::forget_corpse(guid, &mut sc.death_net);
-        let store = sc.index.0.get(&guid).and_then(|e| sc.stores.get(*e).ok());
-        crate::ui_party::net::member_deactivated(guid, &mut sc.group, store, &sc.net);
+        let held = |g: u64| sc.index.0.get(&g).and_then(|e| sc.stores.get(*e).ok());
+        crate::ui_party::net::member_deactivated(
+            guid,
+            &mut sc.group,
+            held(guid),
+            held,
+            &sc.names,
+            &sc.net,
+        );
         object_destroyed(guid, &mut sc.commands, &mut sc.index);
     }
 }
@@ -313,8 +320,15 @@ fn on_object_destroyed(In(ev): In<SessionEvent>, mut sc: Scene) {
 fn on_objects_removed(In(ev): In<SessionEvent>, mut sc: Scene) {
     if let SessionEvent::ObjectsRemoved(guids) = ev {
         for guid in &guids {
-            let store = sc.index.0.get(guid).and_then(|e| sc.stores.get(*e).ok());
-            crate::ui_party::net::member_deactivated(*guid, &mut sc.group, store, &sc.net);
+            let held = |g: u64| sc.index.0.get(&g).and_then(|e| sc.stores.get(*e).ok());
+            crate::ui_party::net::member_deactivated(
+                *guid,
+                &mut sc.group,
+                held(*guid),
+                held,
+                &sc.names,
+                &sc.net,
+            );
         }
         objects_removed(guids, &mut sc.commands, &mut sc.index);
     }
diff --git a/crates/benilla-app/src/net/session.rs b/crates/benilla-app/src/net/session.rs
index b0a3233c..dd841d4a 100644
--- a/crates/benilla-app/src/net/session.rs
+++ b/crates/benilla-app/src/net/session.rs
@@ -228,7 +228,7 @@ fn on_worldport(
     } = ev
     {
         // Every streamed roster member is about to be purged; the reference deactivates each.
-        crate::ui_party::net::roster_deactivated(&mut group, &b.index, &b.stores, &b.net);
+        crate::ui_party::net::roster_deactivated(&mut group, &b.index, &b.stores, &b.names, &b.net);
         worldport(
             map_id,
             position,
diff --git a/crates/benilla-app/src/player.rs b/crates/benilla-app/src/player.rs
index f0ebb2a7..bb08a4e1 100644
--- a/crates/benilla-app/src/player.rs
+++ b/crates/benilla-app/src/player.rs
@@ -23,6 +23,7 @@ use benilla_assets::AssetSet;
 use benilla_world::interact::{WorldClick, WorldRightClick};
 use benilla_world::schedule::WorldStage;
 
+mod approach;
 mod arc;
 mod net;
 // Writes the frame onto the body we drive: pose, `MovementState`, the counter-twist gap.
@@ -30,6 +31,7 @@ mod body_pose;
 pub(crate) mod camera;
 mod camera_channel;
 pub(crate) mod camera_dynamics;
+pub(crate) mod camera_zoom;
 mod controller;
 mod world_focus;
 // The remembered camera pose, inside `player/` to read the rig's `pub(super)` fields.
@@ -70,13 +72,17 @@ pub(crate) use camera::apply_self_model_fade;
 use controller::control;
 // The private camera and `state` items are re-imported for the modules beside this one, which
 // name them `super::X`.
-use camera::{
-    apply_zoom_scroll, model_pivot_height, run_look_session, FlyCam, LookButton, CAM_DIST_DEFAULT,
-};
 pub(crate) use camera::{head_height, CameraControl, CameraPivot};
+use camera::{model_pivot_height, run_look_session, FlyCam, LookButton};
+use camera_zoom::{apply_zoom_scroll, CAM_DIST_DEFAULT};
 // `/follow`: chat sends the request, `crate::target` resolves the subject into the state, and
 // `follow` owns the motion.
 pub(crate) use follow::{FollowRequest, FollowState};
+// Click to Move: `crate::target`'s dispatchers start it and run the verb it owes on arrival.
+pub(crate) use approach::{
+    can_auto_interact, Approach, ApproachVerb, AutoMove, Refused, Subject, RANGE_STOP_FRACTION,
+    TALK_STOP,
+};
 use state::{
     MoveSpeed, PlayerRide, AIR_NUDGE_SPEED, FALL_FAR_DROP, FALL_FAR_TIME, FOOT_CONE_HEIGHT,
     GROUND_COS, GROUND_PROBE, JUMP_SPEED, LAND_PROBE, MOUSELOOK_PITCH_CLAMP, RUN_BACK_RATIO,
@@ -205,6 +211,7 @@ impl Plugin for PlayerPlugin {
     fn build(&self, app: &mut App) {
         net::register(app);
         follow::plugin(app);
+        approach::plugin(app);
         camera_saved::plugin(app);
         camera_view::plugin(app);
         // The stream focus is published after `control`'s teleport snap and before the stream
@@ -228,7 +235,7 @@ impl Plugin for PlayerPlugin {
         app.add_observer(camera::on_cvar);
         app.add_observer(camera_dynamics::on_cvar);
         app.init_resource::<camera::LookConfig>();
-        app.init_resource::<camera::ZoomLimit>();
+        app.init_resource::<camera_zoom::ZoomLimit>();
         app.init_resource::<camera::FollowConfig>();
         app.init_resource::<camera_dynamics::CameraOptions>();
         // Far sight resolves `PLAYER_FARSIGHT` to a pose before `control` seats the camera: a
@@ -343,11 +350,12 @@ impl Plugin for PlayerPlugin {
                 .run_if(not(resource_exists::<crate::run_mode::CaptureMode>))
                 .in_set(crate::char_select::InWorldGated),
         )
-        // `/follow` steers before `control`, so the player's own turn input lands after it and
-        // wins over the follow's steering.
+        // `/follow` and Click to Move steer before `control`, so the player's own turn input
+        // lands after them and wins over their steering.
         .add_systems(
             Update,
-            follow::steer_follow
+            (follow::steer_follow, approach::steer_approach)
+                .chain()
                 .in_set(WorldStage::Input)
                 .before(control)
                 .in_set(crate::char_select::InWorldGated),
diff --git a/crates/benilla-app/src/player/approach.rs b/crates/benilla-app/src/player/approach.rs
new file mode 100644
index 00000000..566cfafa
--- /dev/null
+++ b/crates/benilla-app/src/player/approach.rs
@@ -0,0 +1,1019 @@
+//! Click to Move's walks (`AutoInteract`, "Toggles auto-move to interact target"). With the option
+//! on, a right-click on an NPC, a body to loot or skin, or a GameObject beyond the verb's reach
+//! walks the player there and the verb runs on arrival; a right-click on the ground walks to the
+//! point (mode 4), one on the sky walks that way until stopped (mode 8), and an attack on an enemy
+//! out of melee walks to where it stood (mode 10). It is [`super::follow`]'s auto-move: one cell
+//! holds either (mode `0xc4d888`, guid `0xc4d980`), so arming one ends the other (`0x611130` calls
+//! the canceller `0x60fb60` first), the same input cancels both, and nothing goes on the wire but
+//! the movement; an attack on an enemy already in melee only turns to face it (mode 2).
+
+use std::f32::consts::{FRAC_PI_2, PI};
+
+use bevy::ecs::system::SystemParam;
+use bevy::prelude::*;
+
+use benilla_protocol::EntityKind;
+
+use crate::net::{Embodied, Guid, GuidIndex, NetEntity, ObjectStore, SelfPlayer, UnitSpeeds};
+
+use super::follow::{self, FollowInput, FollowState};
+use super::state::Player;
+
+/// The verb an approach owes, by its mode in `0xc4d888`; the pending dispatcher `0x60fa20` runs it
+/// at the stop.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum ApproachVerb {
+    /// Mode 5: the NPC-service dispatch `0x5f0130`.
+    Talk,
+    /// Mode 6: the unit loot `0x5df2a0`.
+    Loot,
+    /// Mode 7: the GameObject use `0x5f86b0`.
+    Use,
+    /// Mode 9: the skin cast `0x5f05e0`.
+    Skin,
+}
+
+/// What the start gate (`0x60fed0`) checks the target for.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Subject {
+    Unit { dead: bool },
+    Corpse,
+    GameObject,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum Refused {
+    Silent,
+    /// `ERR_AUTOFOLLOW_TOO_FAR` (`0x126`, `0x61110c`).
+    TooFar,
+}
+
+/// Talk stops at half the 5.5556 yd service reach (`0x60e680`).
+pub(crate) const TALK_STOP: f32 = 5.555_555_3 * 0.5;
+/// Use and Skin stop at this fraction of the verb's range (`0x804588`).
+pub(crate) const RANGE_STOP_FRACTION: f32 = 0.9;
+/// The ground walk stops half a yard short (`0x60e740`).
+const GROUND_STOP: f32 = 0.5;
+/// No approach starts or lasts at 80 yd or more: the rows of modes 5-7, 9 and 10 in `0x860a58`
+/// (`0x60e5d1`); the ground and sky rows have none.
+const LEASH_SQ: f32 = 6400.0;
+/// Within this many yards on the ground the goal's height is ignored (`0x80c4c8`).
+const FLAT_SNAP: f32 = 0.5;
+/// The sky walk's swim pitch: straight up or down past this sine (`0x80c4d4`), level within the
+/// next (`0x80c4d8`).
+const SKY_PITCH_STEEP: f32 = 0.866_02;
+const SKY_PITCH_LEVEL: f32 = 0.173_64;
+/// `automoveturnspeednarrow` and `automoveturnspeedwide`, deg/s (`0x6039e9`, `0x6039ca`).
+const TURN_NARROW: f32 = 800.0;
+const TURN_WIDE: f32 = 1200.0;
+/// Less ground than this in a frame while lined up and holding forward is stuck (`0x80c4dc`).
+const STUCK: f32 = 1.0 / 360.0;
+
+/// The approach in flight, and the verb an arrival owes.
+#[derive(Resource, Default)]
+pub(crate) struct Approach {
+    /// `AutoInteract`, `CanAutoInteract`'s last term (`0x60f925`).
+    pub(crate) enabled: bool,
+    goal: Option<Goal>,
+    /// The pending cells `0x60f940` fills (`0xc4da28`, `0xc4da78`, `0xc4d950`, `0xc4da20`).
+    pub(crate) arrived: Option<(ApproachVerb, u64)>,
+}
+
+/// What a walk heads for, by its mode in `0xc4d888`.
+#[derive(Clone, Copy, PartialEq, Debug)]
+enum Toward {
+    /// Modes 5-7 and 9: the object's live position.
+    Object { verb: ApproachVerb, guid: u64 },
+    /// Mode 4.
+    Ground(Anchor),
+    /// Mode 10.
+    Melee(Anchor),
+    /// Mode 8: a facing (`0xc4d9a8`), with no stop.
+    Sky(f32),
+    /// Mode 2: a facing, turned to and done.
+    Face(f32),
+}
+
+/// A point fixed at the arm (`0xc4d890`), held in the frame of the transport the player stands on
+/// (`0x7c4a00`) and carried back to the world each frame (`0x7c4930`).
+#[derive(Clone, Copy, PartialEq, Debug)]
+struct Anchor {
+    at: Vec3,
+    frame: Option<Entity>,
+}
+
+impl Toward {
+    fn is_talk(self) -> bool {
+        matches!(
+            self,
+            Toward::Object {
+                verb: ApproachVerb::Talk,
+                ..
+            }
+        )
+    }
+
+    /// Talk's and the melee walk's arrive and snap radii never scale with speed (`0x610ae8`,
+    /// `0x610ff1`).
+    fn unscaled(self) -> bool {
+        self.is_talk() || matches!(self, Toward::Melee(_))
+    }
+
+    fn leashed(self) -> bool {
+        matches!(self, Toward::Object { .. } | Toward::Melee(_))
+    }
+}
+
+struct Goal {
+    toward: Toward,
+    /// `0xc4d910`.
+    stop: f32,
+    /// Latched by the first turn (`0x61042c`).
+    turn_rate: Option<f32>,
+    /// Bit 1 of `0xc4da48`: the facing has lined up once.
+    aligned: bool,
+    /// Last frame's position (`0xc4da84`).
+    last_pos: Vec3,
+    held: bool,
+    /// The swim pitch the sky arm sets (`0x6101ee`), applied on the walk's first frame.
+    pitch: Option<f32>,
+}
+
+impl Approach {
+    /// The reference's `0x6103a0` for this mode family: an approach is in flight.
+    pub(crate) fn active(&self) -> bool {
+        self.goal.is_some()
+    }
+
+    pub(crate) fn stop(&mut self) {
+        self.goal = None;
+    }
+
+    #[cfg(test)]
+    pub(crate) fn stop_distance(&self) -> Option<f32> {
+        self.goal.as_ref().map(|g| g.stop)
+    }
+
+    #[cfg(test)]
+    pub(crate) fn facing(&self) -> bool {
+        self.goal
+            .as_ref()
+            .is_some_and(|g| matches!(g.toward, Toward::Face(_)))
+    }
+}
+
+/// `CanAutoInteract` (`0x60f900`): alive, driving our own body, and the option on.
+pub(crate) fn can_auto_interact(enabled: bool, me: Option<&ObjectStore>, player: &Player) -> bool {
+    enabled
+        && me.is_some_and(|s| s.0.unit_health().unwrap_or(0) > 0)
+        && player.foreign_mover.is_none()
+        && !player.control_lost
+}
+
+/// The start: the gates (`0x60fed0`, `0x610300`, `CanAutoInteract` for the rest) and the arm
+/// `0x611130`.
+#[derive(SystemParam)]
+pub(crate) struct AutoMove<'w, 's> {
+    pub(crate) approach: ResMut<'w, Approach>,
+    follow: ResMut<'w, FollowState>,
+    player: Res<'w, Player>,
+    me: Query<'w, 's, (&'static Guid, &'static ObjectStore), With<SelfPlayer>>,
+    stand: MessageWriter<'w, super::StandStateRequest>,
+    transports: Query<'w, 's, &'static Transform>,
+}
+
+impl AutoMove<'_, '_> {
+    pub(crate) fn can_auto_interact(&self) -> bool {
+        can_auto_interact(
+            self.approach.enabled,
+            self.me.single().ok().map(|(_, s)| s),
+            &self.player,
+        )
+    }
+
+    /// The interaction walks' gate (`0x60fed0`): the verb's own kind of target, never ourselves.
+    pub(crate) fn start(
+        &mut self,
+        verb: ApproachVerb,
+        guid: u64,
+        subject: Subject,
+        at: Vec3,
+        stop: f32,
+    ) -> Result<(), Refused> {
+        let Ok((me, store)) = self.me.single() else {
+            return Err(Refused::Silent);
+        };
+        let admitted = match (verb, subject) {
+            (ApproachVerb::Talk, Subject::Unit { .. }) => true,
+            (ApproachVerb::Loot | ApproachVerb::Skin, Subject::Corpse) => true,
+            (ApproachVerb::Loot | ApproachVerb::Skin, Subject::Unit { dead }) => dead,
+            (ApproachVerb::Use, Subject::GameObject) => true,
+            _ => false,
+        };
+        if !admitted
+            || guid == me.0
+            || self.player.foreign_mover.is_some()
+            || self.player.control_lost
+            || store.0.unit_health().unwrap_or(0) == 0
+        {
+            return Err(Refused::Silent);
+        }
+        self.arm(Toward::Object { verb, guid }, at, stop)
+    }
+
+    /// `0x6102b0`, the right-click on the ground (`0x5e0378`).
+    pub(crate) fn walk_to_ground(&mut self, at: Vec3) -> bool {
+        if !self.can_auto_interact() {
+            return false;
+        }
+        let anchor = self.anchor(at);
+        self.arm(Toward::Ground(anchor), at, GROUND_STOP).is_ok()
+    }
+
+    /// `0x610100`, the right-click on the sky (`0x492dca`), along the press's ray.
+    pub(crate) fn walk_toward_sky(&mut self, ray: Vec3) -> bool {
+        let dir = ray.normalize_or_zero();
+        if dir == Vec3::ZERO || !self.can_auto_interact() {
+            return false;
+        }
+        let facing = follow::bearing_to(Vec3::new(dir.x, 0.0, dir.z));
+        let at = self.player.pos;
+        if self.arm(Toward::Sky(facing), at, 0.0).is_err() {
+            return false;
+        }
+        if let Some(goal) = self.approach.goal.as_mut() {
+            goal.pitch = self.player.swimming.then(|| sky_pitch(dir.y));
+        }
+        true
+    }
+
+    /// `0x60fcc0`'s walk, for an attack on an enemy out of melee: to where it stands, stopping
+    /// `stop` short.
+    /// Deviation: the reference re-projects the point's height onto the first walkable facet a
+    /// zero-size box gather finds at the enemy (`0x60fe25`-`0x60fe51`); here it keeps the enemy's
+    /// height. The snap radius is the stop, so the two differ only while swimming or on a steep facet.
+    /// Deviation: the reference stores the world point unconverted and reads it back as deck-local
+    /// (`0x60fe6c`, `0x610e95`), so on a transport it walks astray; here it rides the deck.
+    pub(crate) fn walk_into_melee(&mut self, at: Vec3, stop: f32) -> Result<(), Refused> {
+        if !self.can_auto_interact() {
+            return Err(Refused::Silent);
+        }
+        let anchor = self.anchor(at);
+        self.arm(Toward::Melee(anchor), at, stop)
+    }
+
+    /// `0x6100a0`, for an attack on an enemy in melee: turn to face `at`.
+    pub(crate) fn face(&mut self, at: Vec3) -> bool {
+        if !self.can_auto_interact() {
+            return false;
+        }
+        let delta = at - self.player.pos;
+        let facing = follow::bearing_to(Vec3::new(delta.x, 0.0, delta.z));
+        self.arm(Toward::Face(facing), at, 0.0).is_ok()
+    }
+
+    /// Deviation: the reference converts back through the transport the player stands on each
+    /// frame (`0x610e6b`), so stepping off mid-walk sends the point astray; here the deck is fixed
+    /// at the arm.
+    fn anchor(&self, at: Vec3) -> Anchor {
+        let frame = self.player.ride.as_ref().map(|r| r.entity);
+        match frame.and_then(|e| self.transports.get(e).ok().map(|tf| (e, tf))) {
+            Some((e, tf)) => Anchor {
+                at: tf.compute_affine().inverse().transform_point3(at),
+                frame: Some(e),
+            },
+            None => Anchor { at, frame: None },
+        }
+    }
+
+    /// `0x611130`: the canceller, then the leash on the world point `at`, then the goal.
+    fn arm(&mut self, toward: Toward, at: Vec3, stop: f32) -> Result<(), Refused> {
+        let standing = self
+            .me
+            .single()
+            .is_ok_and(|(_, s)| s.0.unit_stand_state() == 0);
+        self.follow.stop();
+        self.approach.stop();
+        if toward.leashed() && self.player.pos.distance_squared(at) >= LEASH_SQ {
+            return Err(Refused::TooFar);
+        }
+        info!("approach: {toward:?}, stopping {stop:.2} yd short");
+        self.approach.goal = Some(Goal {
+            toward,
+            stop,
+            turn_rate: None,
+            aligned: false,
+            last_pos: self.player.pos,
+            held: false,
+            pitch: None,
+        });
+        if !standing {
+            self.stand.write(super::StandStateRequest { state: 0 });
+        }
+        Ok(())
+    }
+}
+
+/// The swim pitch the sky walk takes from its ray (`0x6101b9`-`0x61022c`).
+fn sky_pitch(y: f32) -> f32 {
+    if y.abs() > SKY_PITCH_STEEP {
+        FRAC_PI_2.copysign(y)
+    } else if y.abs() > SKY_PITCH_LEVEL {
+        y.asin()
+    } else {
+        0.0
+    }
+}
+
+fn speed_scale(speed: f32) -> f32 {
+    (speed / follow::SPEED_NORM).max(1.0)
+}
+
+/// The goal distance, squared (`0x610e40`'s tail): on the ground alone once inside the snap
+/// radius, unless swimming. The melee walk's snap radius is its stop (`0x610eaf`).
+fn goal_distance_sq(toward: Toward, stop: f32, delta: Vec3, speed: f32, swimming: bool) -> f32 {
+    let base = if matches!(toward, Toward::Melee(_)) {
+        stop
+    } else {
+        FLAT_SNAP
+    };
+    let snap = if toward.unscaled() {
+        base
+    } else {
+        base * speed_scale(speed)
+    };
+    let flat = delta.x * delta.x + delta.z * delta.z;
+    if !swimming && flat <= snap * snap {
+        flat
+    } else {
+        delta.length_squared()
+    }
+}
+
+/// The arrive distance (`0x610add`-`0x610b07`): the stop distance scaled by the mover's current
+/// speed over 7 (`0x7c4c90`, 0 at rest), never below 1×.
+fn arrive_distance(toward: Toward, stop: f32, speed: f32) -> f32 {
+    if toward.unscaled() {
+        stop
+    } else {
+        stop * speed_scale(speed)
+    }
+}
+
+/// The rate the first turn latches, rad/s: wide for a turn of more than 120° (`0x61043f`).
+fn turn_rate(remaining: f32) -> f32 {
+    let deg = if remaining.abs() > 2.0 * PI / 3.0 {
+        TURN_WIDE
+    } else {
+        TURN_NARROW
+    };
+    deg.to_radians()
+}
+
+/// Steer toward the goal and hold forward; on arrival at an object face it and owe its verb. After
+/// [`follow::steer_follow`], which clears [`Player::auto_forward`].
+pub(super) fn steer_approach(
+    time: Res<Time>,
+    mut approach: ResMut<Approach>,
+    mut player: ResMut<Player>,
+    mover: Query<&UnitSpeeds, With<Embodied>>,
+    index: Res<GuidIndex>,
+    targets: Query<(&Transform, Option<&ObjectStore>, Option<&NetEntity>)>,
+    input: FollowInput,
+) {
+    let Some(goal) = approach.goal.as_mut() else {
+        return;
+    };
+    // `GetCurrentSpeed` on last frame's word, as the reference reads the mover's own.
+    let speed = mover
+        .single()
+        .map_or(0.0, |s| crate::net::current_speed(&s.0, player.move_flags));
+    if input.cancels(&player) {
+        info!("approach: cancelled by the player's own movement input");
+        approach.stop();
+        return;
+    }
+    let toward = goal.toward;
+    if let Some(pitch) = goal.pitch.take() {
+        player.mover_pitch = pitch;
+    }
+    let target = match toward {
+        Toward::Object { verb, guid } => {
+            let Some((tf, store, kind)) = index.0.get(&guid).and_then(|e| targets.get(*e).ok())
+            else {
+                info!("approach: the target is gone");
+                approach.stop();
+                return;
+            };
+            // `0x610f13`-`0x610f40`: a unit on a taxi ends it, a dead one too unless the verb
+            // wants a body.
+            if kind.is_some_and(|k| matches!(k.kind, EntityKind::Unit | EntityKind::Player)) {
+                let store = store.map(|s| &s.0);
+                let taxi =
+                    store.is_some_and(|s| s.unit_flags() & super::UNIT_FLAG_TAXI_FLIGHT != 0);
+                let dead = store.is_none_or(|s| s.unit_health().unwrap_or(0) == 0);
+                if taxi || (dead && !matches!(verb, ApproachVerb::Loot | ApproachVerb::Skin)) {
+                    info!("approach: the target left reach (taxi {taxi}, dead {dead})");
+                    approach.stop();
+                    return;
+                }
+            }
+            Some(tf.translation)
+        }
+        Toward::Ground(anchor) | Toward::Melee(anchor) => match anchor.frame {
+            None => Some(anchor.at),
+            Some(frame) => {
+                let Ok((tf, ..)) = targets.get(frame) else {
+                    info!("approach: the transport is gone");
+                    approach.stop();
+                    return;
+                };
+                Some(tf.transform_point(anchor.at))
+            }
+        },
+        Toward::Sky(_) | Toward::Face(_) => None,
+    };
+    let delta = target.map(|t| t - player.pos);
+    let d2 = delta.map(|d| goal_distance_sq(toward, goal.stop, d, speed, player.swimming));
+    if toward.leashed() && d2.is_some_and(|d2| d2 >= LEASH_SQ) {
+        info!("approach: beyond 80 yd");
+        approach.stop();
+        return;
+    }
+    // `0x61073c`: once lined up, a frame that ends farther off than the last aborts, but not Talk.
+    if let Some(target) = target {
+        if goal.aligned
+            && !toward.is_talk()
+            && goal.last_pos.distance_squared(target) < player.pos.distance_squared(target)
+        {
+            info!("approach: no longer closing");
+            approach.stop();
+            return;
+        }
+    }
+    let bearing = match (toward, delta) {
+        (Toward::Sky(facing) | Toward::Face(facing), _) => facing,
+        (_, Some(d)) => follow::bearing_to(Vec3::new(d.x, 0.0, d.z)),
+        (_, None) => player.face_yaw,
+    };
+    let remaining = follow::wrap_pi(bearing - player.face_yaw);
+    let turning = remaining.abs() > follow::TURN_DEADZONE;
+    if turning {
+        let rate = *goal.turn_rate.get_or_insert_with(|| turn_rate(remaining));
+        player.face_yaw = follow::steer(player.face_yaw, bearing, rate, time.delta_secs());
+    } else if let Toward::Face(_) = toward {
+        // `0x6108c3`: the facing walk ends once lined up, never holding forward.
+        approach.goal = None;
+        return;
+    } else {
+        goal.aligned = true;
+    }
+    if let Toward::Face(_) = toward {
+        return;
+    }
+    if let (Some(d2), Some(delta)) = (d2, delta) {
+        let arrive = arrive_distance(toward, goal.stop, speed);
+        if d2 <= arrive * arrive {
+            info!("approach: arrived at {:.2} yd", d2.sqrt());
+            // The canceller faces the armed guid (`0x60fbe8`): the object, and none for the ground.
+            // Deviation: the melee arm names the player's own guid (`0x60fe5f`), so the reference
+            // turns to face itself, a fixed heading; here the melee walk does not turn.
+            if let Toward::Object { verb, guid } = toward {
+                if delta.x * delta.x + delta.z * delta.z > f32::EPSILON {
+                    player.face_yaw = bearing;
+                }
+                approach.arrived = Some((verb, guid));
+            }
+            approach.goal = None;
+            return;
+        }
+    }
+    // Rooted, the reference lets go of forward (`0x610b4a`), which also spares the stuck test.
+    let hold = !player.modes.rooted;
+    if !turning && goal.held && player.pos.distance_squared(goal.last_pos) < STUCK * STUCK {
+        info!("approach: stuck");
+        approach.stop();
+        return;
+    }
+    if delta.is_some_and(follow::vertically_degenerate) {
+        info!("approach: the target is straight overhead");
+        approach.stop();
+        return;
+    }
+    goal.last_pos = player.pos;
+    goal.held = hold;
+    player.auto_forward = hold;
+}
+
+fn on_cvar(ev: On<crate::cvars::CvarChanged>, mut approach: ResMut<Approach>) {
+    if ev.is("AutoInteract") {
+        approach.enabled = ev.flag();
+    }
+}
+
+pub(super) fn plugin(app: &mut App) {
+    app.init_resource::<Approach>().add_observer(on_cvar);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::super::state::{MoveSpeed, PlayerRide};
+    use super::*;
+    use benilla_protocol::messages::ObjectFields;
+    use bevy::ecs::system::RunSystemOnce;
+
+    const fn object(verb: ApproachVerb) -> Toward {
+        Toward::Object { verb, guid: 0 }
+    }
+
+    const POINT: Anchor = Anchor {
+        at: Vec3::ZERO,
+        frame: None,
+    };
+
+    #[test]
+    fn talk_stops_inside_the_service_reach_and_never_scales() {
+        let talk = object(ApproachVerb::Talk);
+        assert!((TALK_STOP - 2.777_777_7).abs() < 1e-5);
+        assert_eq!(arrive_distance(talk, TALK_STOP, 14.0), TALK_STOP);
+        let loot = object(ApproachVerb::Loot);
+        assert_eq!(arrive_distance(loot, 5.0, 7.0), 5.0);
+        assert_eq!(arrive_distance(loot, 5.0, 14.0), 10.0);
+        let usage = object(ApproachVerb::Use);
+        assert_eq!(arrive_distance(usage, 5.0, 3.5), 5.0);
+        assert_eq!(arrive_distance(usage, 5.0, 0.0), 5.0, "at rest");
+    }
+
+    /// `0x610ae8`: the melee walk's stop is Talk's kind, never scaled; the ground's is.
+    #[test]
+    fn the_ground_stop_scales_with_speed_and_the_melee_stop_does_not() {
+        assert_eq!(
+            arrive_distance(Toward::Ground(POINT), GROUND_STOP, 7.0),
+            0.5
+        );
+        assert_eq!(
+            arrive_distance(Toward::Ground(POINT), GROUND_STOP, 14.0),
+            1.0
+        );
+        assert_eq!(arrive_distance(Toward::Melee(POINT), 1.9, 14.0), 1.9);
+    }
+
+    #[test]
+    fn the_goal_flattens_only_inside_the_snap_radius() {
+        let usage = object(ApproachVerb::Use);
+        let above = Vec3::new(0.3, 4.0, 0.3);
+        assert!((goal_distance_sq(usage, 0.0, above, 7.0, false) - 0.18).abs() < 1e-5);
+        assert!((goal_distance_sq(usage, 0.0, above, 7.0, true) - 16.18).abs() < 1e-4);
+        let far = Vec3::new(3.0, 4.0, 0.0);
+        assert_eq!(goal_distance_sq(usage, 0.0, far, 7.0, false), 25.0);
+    }
+
+    /// `0x610eaf`: the melee walk snaps to the ground within its stop, not half a yard, unscaled.
+    #[test]
+    fn the_melee_goal_flattens_within_its_stop() {
+        let melee = Toward::Melee(POINT);
+        let above = Vec3::new(1.5, 4.0, 0.0);
+        assert!((goal_distance_sq(melee, 1.9, above, 14.0, false) - 2.25).abs() < 1e-5);
+        let beyond = Vec3::new(2.0, 4.0, 0.0);
+        assert!((goal_distance_sq(melee, 1.9, beyond, 14.0, false) - 20.0).abs() < 1e-4);
+    }
+
+    /// `0x6101b9`-`0x61022c`.
+    #[test]
+    fn the_sky_swim_pitch_clamps_steep_and_levels_shallow() {
+        assert_eq!(sky_pitch(0.9), FRAC_PI_2);
+        assert_eq!(sky_pitch(-0.9), -FRAC_PI_2);
+        assert!((sky_pitch(0.5) - 0.5_f32.asin()).abs() < 1e-6);
+        assert_eq!(sky_pitch(0.1), 0.0);
+    }
+
+    const ME: u64 = 0x1;
+    const VENDOR: u64 = 0xF00D;
+    const DT: f32 = 1.0 / 60.0;
+
+    /// Our body at the origin facing -Z, alive (and seated when `stand_state` is set), a vendor at
+    /// `at`, and both steers chained as the plugin runs them.
+    fn world(at: Vec3, stand_state: u32) -> App {
+        let mut app = App::new();
+        app.init_resource::<Time>()
+            .init_resource::<Approach>()
+            .init_resource::<FollowState>()
+            .init_resource::<Player>()
+            .init_resource::<GuidIndex>()
+            .init_resource::<ButtonInput<MouseButton>>()
+            .init_resource::<crate::bindings::BindingsState>()
+            .init_resource::<super::super::camera::CameraControl>()
+            .init_resource::<super::super::view_subject::ViewSubject>()
+            .insert_resource(MoveSpeed {
+                value: 7.0,
+                env_override: false,
+            })
+            .add_message::<super::super::StandStateRequest>()
+            .add_systems(Update, (follow::steer_follow, steer_approach).chain());
+        app.world_mut().resource_mut::<Approach>().enabled = true;
+        app.world_mut().spawn((
+            SelfPlayer,
+            Guid(ME),
+            ObjectStore(ObjectFields::from_pairs(&[
+                (22, 100),
+                (28, 100),
+                (138, stand_state),
+            ])),
+        ));
+        let vendor = app
+            .world_mut()
+            .spawn((Guid(VENDOR), Transform::from_translation(at)))
+            .id();
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .insert(VENDOR, vendor);
+        app
+    }
+
+    fn start(app: &mut App, verb: ApproachVerb, subject: Subject, at: Vec3) -> Result<(), Refused> {
+        app.world_mut()
+            .run_system_once(move |mut auto: AutoMove| {
+                auto.start(verb, VENDOR, subject, at, TALK_STOP)
+            })
+            .unwrap()
+    }
+
+    /// One frame: the steers, then the controller's walk along the facing while forward is held.
+    fn frame(app: &mut App, walks: bool) {
+        app.world_mut()
+            .resource_mut::<Time>()
+            .advance_by(std::time::Duration::from_secs_f32(DT));
+        app.update();
+        let mut player = app.world_mut().resource_mut::<Player>();
+        if walks && player.auto_forward {
+            let forward = Quat::from_rotation_y(player.face_yaw) * Vec3::NEG_Z;
+            player.pos += forward * 7.0 * DT;
+        }
+    }
+
+    #[test]
+    fn a_vendor_out_of_reach_is_walked_to_and_owed_the_talk() {
+        let at = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(at, 0);
+        assert_eq!(
+            start(
+                &mut app,
+                ApproachVerb::Talk,
+                Subject::Unit { dead: false },
+                at
+            ),
+            Ok(())
+        );
+        frame(&mut app, true);
+        assert!(
+            app.world().resource::<Player>().auto_forward,
+            "forward from the first frame"
+        );
+        let mut frames = 1;
+        while app.world().resource::<Approach>().arrived.is_none() {
+            assert!(frames < 300, "never arrived");
+            frame(&mut app, true);
+            frames += 1;
+        }
+        let player = app.world().resource::<Player>();
+        let left = player.pos.distance(at);
+        assert!(
+            left <= TALK_STOP && left > TALK_STOP - 7.0 * DT - 1e-3,
+            "stopped {left} yd off, not at the 2.78 yd stop"
+        );
+        assert!(!player.auto_forward, "forward let go at the stop");
+        assert!(
+            (follow::wrap_pi(player.face_yaw - follow::bearing_to(at - player.pos))).abs() < 1e-4,
+            "facing the vendor"
+        );
+        let approach = app.world().resource::<Approach>();
+        assert_eq!(approach.arrived, Some((ApproachVerb::Talk, VENDOR)));
+        assert!(!approach.active());
+    }
+
+    #[test]
+    fn the_arm_ends_a_follow_and_refuses_past_80_yards() {
+        let near = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(near, 0);
+        app.world_mut()
+            .resource_mut::<FollowState>()
+            .start(0xBEEF, "Friend".into());
+        assert_eq!(
+            start(
+                &mut app,
+                ApproachVerb::Talk,
+                Subject::Unit { dead: false },
+                near
+            ),
+            Ok(())
+        );
+        assert!(
+            app.world().resource::<FollowState>().guid.is_none(),
+            "one auto-move cell"
+        );
+
+        let far = Vec3::new(80.0, 0.0, 0.0);
+        assert_eq!(
+            start(
+                &mut app,
+                ApproachVerb::Talk,
+                Subject::Unit { dead: false },
+                far
+            ),
+            Err(Refused::TooFar)
+        );
+        assert!(
+            !app.world().resource::<Approach>().active(),
+            "the arm cancelled the last walk"
+        );
+    }
+
+    #[test]
+    fn the_gate_admits_each_verb_its_own_kind_of_target() {
+        let at = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(at, 0);
+        for (verb, subject, ok) in [
+            (ApproachVerb::Talk, Subject::Unit { dead: false }, true),
+            (ApproachVerb::Talk, Subject::GameObject, false),
+            (ApproachVerb::Loot, Subject::Unit { dead: true }, true),
+            (ApproachVerb::Loot, Subject::Unit { dead: false }, false),
+            (ApproachVerb::Loot, Subject::Corpse, true),
+            (ApproachVerb::Skin, Subject::Unit { dead: false }, false),
+            (ApproachVerb::Use, Subject::GameObject, true),
+            (ApproachVerb::Use, Subject::Unit { dead: false }, false),
+        ] {
+            let got = start(&mut app, verb, subject, at);
+            assert_eq!(got.is_ok(), ok, "{verb:?} at {subject:?}: {got:?}");
+        }
+    }
+
+    #[test]
+    fn a_seated_player_stands_to_walk() {
+        let at = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(at, 1);
+        assert_eq!(
+            start(
+                &mut app,
+                ApproachVerb::Talk,
+                Subject::Unit { dead: false },
+                at
+            ),
+            Ok(())
+        );
+        let asks: Vec<u8> = app
+            .world_mut()
+            .resource_mut::<Messages<super::super::StandStateRequest>>()
+            .drain()
+            .map(|m| m.state)
+            .collect();
+        assert_eq!(asks, vec![0]);
+    }
+
+    #[test]
+    fn the_players_own_movement_cancels_the_walk() {
+        let at = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(at, 0);
+        assert_eq!(
+            start(
+                &mut app,
+                ApproachVerb::Talk,
+                Subject::Unit { dead: false },
+                at
+            ),
+            Ok(())
+        );
+        frame(&mut app, true);
+        app.world_mut()
+            .resource_mut::<ButtonInput<MouseButton>>()
+            .press(MouseButton::Forward);
+        frame(&mut app, true);
+        let approach = app.world().resource::<Approach>();
+        assert!(!approach.active() && approach.arrived.is_none());
+    }
+
+    #[test]
+    fn a_walk_that_cannot_move_gives_up_once_lined_up() {
+        let at = Vec3::new(14.0, 0.0, 0.0);
+        let mut app = world(at, 0);
+        assert_eq!(
+            start(&mut app, ApproachVerb::Use, Subject::GameObject, at),
+            Ok(())
+        );
+        frame(&mut app, false);
+        frame(&mut app, false);
+        assert!(
+            app.world().resource::<Approach>().active(),
+            "still turning, where standing still is not stuck"
+        );
+        for _ in 0..60 {
+            frame(&mut app, false);
+        }
+        let approach = app.world().resource::<Approach>();
+        assert!(!approach.active(), "stuck against a wall");
+        assert!(approach.arrived.is_none(), "nothing owed");
+    }
+
+    #[test]
+    fn the_first_turn_picks_the_wide_rate_past_120_degrees() {
+        assert_eq!(turn_rate(0.5), 800f32.to_radians());
+        assert_eq!(turn_rate(-2.0 * PI / 3.0), 800f32.to_radians());
+        assert_eq!(turn_rate(2.2), 1200f32.to_radians());
+        assert_eq!(turn_rate(-PI), 1200f32.to_radians());
+    }
+
+    fn run_until_idle(app: &mut App, frames: usize) -> usize {
+        for n in 0..frames {
+            if !app.world().resource::<Approach>().active() {
+                return n;
+            }
+            frame(app, true);
+        }
+        frames
+    }
+
+    /// `0x6102b0`: the ground walk stops half a yard short at walking pace and owes nothing.
+    #[test]
+    fn a_ground_walk_stops_half_a_yard_short_and_owes_nothing() {
+        let point = Vec3::new(0.0, 0.0, -10.0);
+        let mut app = world(Vec3::new(40.0, 0.0, 0.0), 0);
+        assert!(app
+            .world_mut()
+            .run_system_once(move |mut auto: AutoMove| auto.walk_to_ground(point))
+            .unwrap());
+        assert!(run_until_idle(&mut app, 300) < 300, "never arrived");
+        let left = app.world().resource::<Player>().pos.distance(point);
+        assert!(left <= 0.5 && left > 0.5 - 7.0 * DT - 1e-3, "{left}");
+        assert!(app.world().resource::<Approach>().arrived.is_none());
+    }
+
+    /// The ground row has no leash (`0x860a8c` = 0): a point past 80 yd still walks.
+    #[test]
+    fn a_ground_walk_has_no_leash() {
+        let mut app = world(Vec3::new(14.0, 0.0, 0.0), 0);
+        let far = Vec3::new(0.0, 0.0, -120.0);
+        assert!(app
+            .world_mut()
+            .run_system_once(move |mut auto: AutoMove| auto.walk_to_ground(far))
+            .unwrap());
+        for _ in 0..30 {
+            frame(&mut app, true);
+        }
+        assert!(app.world().resource::<Approach>().active());
+    }
+
+    /// `0x60f900`: with the option off, neither world walk arms.
+    #[test]
+    fn the_world_walks_need_click_to_move() {
+        let mut app = world(Vec3::new(14.0, 0.0, 0.0), 0);
+        app.world_mut().resource_mut::<Approach>().enabled = false;
+        let armed = app
+            .world_mut()
+            .run_system_once(|mut auto: AutoMove| {
+                auto.walk_to_ground(Vec3::new(0.0, 0.0, -10.0))
+                    || auto.walk_toward_sky(Vec3::new(1.0, 0.5, 0.0))
+            })
+            .unwrap();
+        assert!(!armed);
+    }
+
+    /// `0x610100`: the sky walk turns to the ray's heading and holds forward with no stop (row 8's
+    /// `+9` flag, `0x610a93`).
+    #[test]
+    fn a_sky_walk_turns_to_the_ray_and_keeps_going() {
+        let mut app = world(Vec3::new(14.0, 0.0, 0.0), 0);
+        assert!(app
+            .world_mut()
+            .run_system_once(|mut auto: AutoMove| auto.walk_toward_sky(Vec3::new(1.0, 0.4, 0.0)))
+            .unwrap());
+        for _ in 0..600 {
+            frame(&mut app, true);
+        }
+        let player = app.world().resource::<Player>();
+        let want = follow::bearing_to(Vec3::X);
+        assert!(follow::wrap_pi(player.face_yaw - want).abs() < 1e-3);
+        assert!(player.auto_forward);
+        assert!(player.pos.x > 60.0, "walked {}", player.pos.x);
+        assert!(app.world().resource::<Approach>().active());
+    }
+
+    /// `0x7c4a00` and `0x7c4930`: a ground point on a deck rides the deck.
+    #[test]
+    fn a_ground_point_on_a_transport_rides_it() {
+        let mut app = world(Vec3::new(40.0, 0.0, 0.0), 0);
+        let boat = app.world_mut().spawn(Transform::default()).id();
+        app.world_mut().resource_mut::<Player>().ride = Some(PlayerRide {
+            entity: boat,
+            guid: 0xB0A7,
+            local_pos: Vec3::ZERO,
+            boat_yaw: 0.0,
+        });
+        let point = Vec3::new(0.0, 0.0, -10.0);
+        assert!(app
+            .world_mut()
+            .run_system_once(move |mut auto: AutoMove| auto.walk_to_ground(point))
+            .unwrap());
+        app.world_mut()
+            .entity_mut(boat)
+            .insert(Transform::from_xyz(-6.0, 0.0, 0.0));
+        assert!(run_until_idle(&mut app, 300) < 300, "never arrived");
+        let left = app
+            .world()
+            .resource::<Player>()
+            .pos
+            .distance(Vec3::new(-6.0, 0.0, -10.0));
+        assert!(left <= 0.5, "{left}");
+    }
+
+    /// `0x60fcc0` → mode 10: the walk stops at its stop, unscaled, owes nothing and does not turn
+    /// to face on arrival.
+    #[test]
+    fn a_melee_walk_stops_at_its_stop_and_owes_nothing() {
+        let at = Vec3::new(0.0, 0.0, -10.0);
+        let stop = (5.0_f32 - 1.333_333_3).sqrt();
+        let mut app = world(Vec3::new(40.0, 0.0, 0.0), 0);
+        assert_eq!(
+            app.world_mut()
+                .run_system_once(move |mut auto: AutoMove| auto.walk_into_melee(at, stop))
+                .unwrap(),
+            Ok(())
+        );
+        assert!(run_until_idle(&mut app, 300) < 300, "never arrived");
+        let left = app.world().resource::<Player>().pos.distance(at);
+        assert!(left <= stop && left > stop - 7.0 * DT - 1e-3, "{left}");
+        assert!(app.world().resource::<Approach>().arrived.is_none());
+    }
+
+    /// `0x6100a0` → mode 2: ends a follow, turns to the enemy and is done, never walking.
+    #[test]
+    fn a_face_turns_to_the_enemy_ends_a_follow_and_never_walks() {
+        let mut app = world(Vec3::new(14.0, 0.0, 0.0), 0);
+        app.world_mut()
+            .resource_mut::<FollowState>()
+            .start(0xBEEF, "Friend".into());
+        let enemy = Vec3::new(3.0, 0.0, 0.0);
+        assert!(app
+            .world_mut()
+            .run_system_once(move |mut auto: AutoMove| auto.face(enemy))
+            .unwrap());
+        assert!(app.world().resource::<FollowState>().guid.is_none());
+        let mut walked = false;
+        let frames = (0..120)
+            .take_while(|_| {
+                frame(&mut app, true);
+                walked |= app.world().resource::<Player>().auto_forward;
+                app.world().resource::<Approach>().active()
+            })
+            .count();
+        assert!(frames < 119, "never lined up");
+        assert!(!walked);
+        let player = app.world().resource::<Player>();
+        assert_eq!(player.pos, Vec3::ZERO);
+        assert!(follow::wrap_pi(player.face_yaw - follow::bearing_to(enemy)).abs() < 1e-3);
+    }
+
+    /// `0x7c4930` on a turning deck: the point turns with it.
+    #[test]
+    fn a_ground_point_on_a_turning_transport_turns_with_it() {
+        let mut app = world(Vec3::new(40.0, 0.0, 0.0), 0);
+        let boat = app.world_mut().spawn(Transform::default()).id();
+        app.world_mut().resource_mut::<Player>().ride = Some(PlayerRide {
+            entity: boat,
+            guid: 0xB0A7,
+            local_pos: Vec3::ZERO,
+            boat_yaw: 0.0,
+        });
+        let point = Vec3::new(0.0, 0.0, -10.0);
+        assert!(app
+            .world_mut()
+            .run_system_once(move |mut auto: AutoMove| auto.walk_to_ground(point))
+            .unwrap());
+        app.world_mut()
+            .entity_mut(boat)
+            .insert(Transform::from_rotation(Quat::from_rotation_y(FRAC_PI_2)));
+        assert!(run_until_idle(&mut app, 300) < 300, "never arrived");
+        let left = app
+            .world()
+            .resource::<Player>()
+            .pos
+            .distance(Vec3::new(-10.0, 0.0, 0.0));
+        assert!(left <= 0.5, "{left}");
+    }
+
+    /// `0x6101b9`: swimming, the sky walk pitches along its ray.
+    #[test]
+    fn a_swimming_sky_walk_pitches_along_the_ray() {
+        let mut app = world(Vec3::new(14.0, 0.0, 0.0), 0);
+        app.world_mut().resource_mut::<Player>().swimming = true;
+        assert!(app
+            .world_mut()
+            .run_system_once(|mut auto: AutoMove| auto.walk_toward_sky(Vec3::new(1.0, 1.0, 0.0)))
+            .unwrap());
+        frame(&mut app, false);
+        let pitch = app.world().resource::<Player>().mover_pitch;
+        assert!(
+            (pitch - std::f32::consts::FRAC_PI_4).abs() < 1e-5,
+            "{pitch}"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/player/camera.rs b/crates/benilla-app/src/player/camera.rs
index 1e54b39e..33c00431 100644
--- a/crates/benilla-app/src/player/camera.rs
+++ b/crates/benilla-app/src/player/camera.rs
@@ -1,5 +1,5 @@
-//! The third-person camera rig: the two mouse-look modes, the wheel-zoom glide, the
-//! collision-swept boom on the framing pivot, and the self-avatar fade into first person.
+//! The third-person camera rig: the two mouse-look modes, the collision-swept boom on the
+//! framing pivot, and the self-avatar fade into first person. The zoom is [`super::camera_zoom`].
 
 use bevy::ecs::entity::EntityHashSet;
 use bevy::input::mouse::AccumulatedMouseMotion;
@@ -9,6 +9,7 @@ use bevy::window::{CursorGrabMode, CursorOptions, PrimaryWindow};
 
 use super::camera_channel::{Arm, SmoothChannel};
 use super::camera_dynamics::{DynamicsInput, HeadBob, SmartPivot, TerrainTilt};
+use super::camera_zoom::{ZoomLimit, CAM_DISTANCE_MAX_RANGE};
 use crate::creature_anim::wrap_pi;
 use crate::net::Embodied;
 use benilla_assets::materials::WowModelMaterial;
@@ -57,53 +58,6 @@ impl PressGesture {
     }
 }
 
-/// The zoom floor, yd: at 0 the eye sits at the framing pivot, inside the head, and the avatar
-/// fades out. The reference clamps the orbit to `cameraDistanceMax × cameraDistanceMaxFactor`,
-/// capped at 50 (`0x5112d0`). Deviation: the starting zoom, [`CAM_DIST_DEFAULT`], is 15 yd where
-/// the reference's `cameraDistance` is 5.55 (`0x84f488`), for a wider view.
-pub(super) const CAM_DIST_MIN: f32 = 0.0;
-/// The reference's `cameraDistanceMax` (default 15); 1.12's panel offers only the factor.
-pub(super) const CAM_DIST_BASE_MAX: f32 = 15.0;
-/// `cameraDistanceMaxFactor`'s slider, MAX_FOLLOW_DIST (1 to 2 by 0.1, `UIOptionsFrame.lua:90`).
-pub(crate) const CAM_DIST_FACTOR_RANGE: std::ops::RangeInclusive<f32> = 1.0..=2.0;
-/// The factor slider's top: the clamp for a distance read back off disk ([`ZoomLimit`] is live).
-pub(super) const CAM_DIST_MAX: f32 = CAM_DIST_BASE_MAX * 2.0;
-pub(super) const CAM_DIST_DEFAULT: f32 = 15.0;
-
-/// The max orbit distance: 1.12's `cameraDistanceMaxFactor` over [`CAM_DIST_BASE_MAX`], 15 yd at
-/// the reference's defaults (`cameraDistanceMax` "15.0" at `0x84fbd0`, `cameraDistanceMaxFactor`
-/// "1.0" at `0x82e92c`). Lowering the factor pulls the live target in on the next frame.
-#[derive(Resource)]
-pub(crate) struct ZoomLimit {
-    pub(crate) max: f32,
-}
-
-impl Default for ZoomLimit {
-    fn default() -> Self {
-        // Factor 1.0, the reference's default; `CAM_DIST_MAX` is the slider's top.
-        Self {
-            max: CAM_DIST_BASE_MAX,
-        }
-    }
-}
-
-impl ZoomLimit {
-    pub(crate) fn set_factor(&mut self, factor: f32) {
-        let f = factor.clamp(*CAM_DIST_FACTOR_RANGE.start(), *CAM_DIST_FACTOR_RANGE.end());
-        self.max = CAM_DIST_BASE_MAX * f;
-    }
-
-    /// The live factor, the inverse of [`Self::set_factor`], for tests.
-    #[cfg(test)]
-    pub(crate) fn factor(&self) -> f32 {
-        self.max / CAM_DIST_BASE_MAX
-    }
-}
-/// Yards per wheel notch, the stock bindings' `CameraZoomIn(1.0)` (`Bindings.xml:707`).
-const CAM_ZOOM_STEP: f32 = 1.0;
-/// Zoom speed in yd/s, `cameraDistanceMoveSpeed`'s default: the reference glides the distance to
-/// the wheel target at this constant speed (`0x5112d0`), not an ease.
-const CAM_MOVE_SPEED: f32 = 8.33;
 /// Radians of camera rotation per raw mouse unit at the default move speeds and `mousespeed` 1.0.
 const LOOK_SENSITIVITY: f32 = 0.003;
 /// `mousespeed`'s slider, MOUSE_SENSITIVITY (0.5 to 1.5 by 0.05, `UIOptionsFrame.lua:87`).
@@ -138,6 +92,16 @@ pub(crate) fn on_cvar(
                 look.pitch_speed = v;
             }
         }
+        "cameradistancemax" => {
+            if !zoom.set_distance_max(v) {
+                warn!(
+                    "cvar {}: value out of range ({} - {}) — ignored",
+                    ev.name,
+                    CAM_DISTANCE_MAX_RANGE.start(),
+                    CAM_DISTANCE_MAX_RANGE.end()
+                );
+            }
+        }
         "cameradistancemaxfactor" => zoom.set_factor(v),
         // The stock dropdown writes 1 Smart, 2 Always, 0 Never (`UIOptionsFrame.lua:518`).
         "camerasmoothstyle" => follow.style = FollowStyle::from_cvar(v),
@@ -581,6 +545,8 @@ pub(crate) struct CameraControl {
     pub(super) world_mouse: WorldMouse,
     /// Logical cursor position captured when look began, to restore on release.
     pub(super) cursor_stash: Option<Vec2>,
+    /// A look session is running with the OS cursor handed back: the window is unfocused.
+    pub(super) cursor_released: bool,
     /// The self-avatar's alpha from the camera-to-pivot distance, 1 in third person to 0 in first
     /// (`self_model_fade_alpha`); applied by [`apply_self_model_fade`].
     pub(super) self_fade_alpha: f32,
@@ -609,11 +575,18 @@ impl CameraControl {
         self.target_distance = d;
     }
 
-    /// True while a mouse-look drag is active (right- or left-button). The cursor is hidden then.
+    /// True while a mouse-look drag is active (right- or left-button).
     pub(crate) fn is_looking(&self) -> bool {
         self.look.is_some()
     }
 
+    /// True while a look session holds the OS cursor, hidden and locked: looking, and focused.
+    /// Read by the macOS cursor hide, the one platform that hides the cursor itself.
+    #[cfg(any(target_os = "macos", test))]
+    pub(crate) fn holds_cursor(&self) -> bool {
+        self.look.is_some() && !self.cursor_released
+    }
+
     /// The self-avatar's render alpha this frame. The blob shadow multiplies it in, as the
     /// reference's shadow diffuse rides the body's model fade slot (`[model+0x180]`).
     pub(crate) fn self_fade(&self) -> f32 {
@@ -637,16 +610,23 @@ impl LookButton {
     }
 }
 
-/// The mouse buttons the world owns, latched at the press. 1.12 reads the `TurnOrAction` and
-/// `CameraOrSelectOrMove` bindings, which a press a UI frame captured never dispatches: no mouse
-/// bit in `[InputControl+0x4]`, no look session, no [`FollowState`]. The world's down sets the bit
-/// and that button's up clears it, so a frame appearing under the locked cursor cannot steal it.
+/// The mouse buttons the world owns, latched at the press, and the two channels they drive. 1.12
+/// reads the `TurnOrAction` and `CameraOrSelectOrMove` bindings, which a press a UI frame captured
+/// never dispatches: no mouse bit in `[InputControl+0x4]`, no look session, no [`FollowState`].
+/// The world's down sets the bit and that button's up clears it, so a frame appearing under the
+/// locked cursor cannot steal it. `MouselookStart` sets the TurnOrAction bit with no button.
 #[derive(Default)]
 pub(super) struct WorldMouse {
     /// Held by the world right now, indexed by [`LookButton`].
     held: [bool; 2],
     /// Took its down edge from the world this frame, same index.
     down: [bool; 2],
+    /// `MouselookStart` holds the TurnOrAction channel (`0x515090(1, 1, …)` at `0x514231`).
+    scripted: bool,
+    /// This frame's `MouselookStart` raised the channel.
+    scripted_rise: bool,
+    /// A `MouselookStart`/`Stop` ran this frame; each disarms the pending click (`0x514810(0)`).
+    disarmed: bool,
 }
 
 impl WorldMouse {
@@ -658,20 +638,60 @@ impl WorldMouse {
         self.down[b as usize]
     }
 
-    /// Both primaries in the world's hand: the both-button run.
+    /// The TurnOrAction channel, `[InputControl+4] & 1`: the world's right button, or a
+    /// `MouselookStart` with none.
+    pub(super) fn turn(&self) -> bool {
+        self.held(LookButton::Right) || self.scripted
+    }
+
+    /// The channel `b`'s look session runs on: TurnOrAction for right, the left button's own.
+    pub(super) fn channel(&self, b: LookButton) -> bool {
+        match b {
+            LookButton::Right => self.turn(),
+            LookButton::Left => self.held(LookButton::Left),
+        }
+    }
+
+    /// Both channels held: the both-button run (`0x514da0` nets `0x1` and `0x2` as forward).
     pub(super) fn both(&self) -> bool {
-        self.held(LookButton::Right) && self.held(LookButton::Left)
+        self.turn() && self.held(LookButton::Left)
+    }
+
+    /// A channel rose this frame, by a press or a `MouselookStart`: with [`Self::both`], the
+    /// transition into the both-button run (`0x514a73`, in the set helper both reach).
+    pub(super) fn rose(&self) -> bool {
+        self.down(LookButton::Left) || self.down(LookButton::Right) || self.scripted_rise
+    }
+
+    /// A `MouselookStart`/`Stop` this frame: no click may settle from the gesture in flight.
+    pub(super) fn disarmed(&self) -> bool {
+        self.disarmed
     }
 
     /// Latch this frame; `world_press` says whether a down edge belongs to the world. A held bit
     /// rides to its release, including a cover's emptying of the button planes.
     fn update(&mut self, buttons: &ButtonInput<MouseButton>, world_press: bool) {
+        self.scripted_rise = false;
+        self.disarmed = false;
         for b in [LookButton::Right, LookButton::Left] {
             let i = b as usize;
             self.down[i] = world_press && buttons.just_pressed(b.button());
             self.held[i] = (self.held[i] || self.down[i]) && buttons.pressed(b.button());
         }
     }
+
+    /// `MouselookStart` (`on`) or `MouselookStop`: one bit, whoever set it, so a stop also ends
+    /// a right drag in flight, whose release then clears nothing.
+    fn mouselook(&mut self, on: bool) {
+        self.disarmed = true;
+        if on {
+            self.scripted_rise |= !self.turn();
+            self.scripted = true;
+        } else {
+            self.scripted = false;
+            self.held[LookButton::Right as usize] = false;
+        }
+    }
 }
 
 /// Decide once per frame which mouse buttons the world owns: a press in the viewport off the UI,
@@ -691,13 +711,40 @@ pub(super) fn latch_world_mouse(
     mut rig: ResMut<CameraControl>,
     cameras: Query<&Camera, With<FlyCam>>,
     window: Single<&Window, With<PrimaryWindow>>,
+    mut script: Option<NonSendMut<benilla_ui::script::UiScript>>,
+    cover: Option<Res<crate::loading_screen::LoadingScreen>>,
 ) {
+    let calls = script
+        .as_mut()
+        .map(|s| s.take_mouselook_calls())
+        .unwrap_or_default();
     let Ok(camera) = cameras.single() else {
         return;
     };
     let over_ui = pointer_over_ui.0;
     let world_press = rig.look.is_some() || (cursor_in_viewport(&window, camera) && !over_ui);
-    rig.world_mouse.update(&buttons, world_press);
+    let wm = &mut rig.world_mouse;
+    wm.update(&buttons, world_press);
+    // The script's calls, made since the last latch, before this frame's release.
+    for on in calls {
+        wm.mouselook(on);
+    }
+    // The right button's release ends a scripted channel too, wherever its press went: in
+    // freelook every button event goes to the `WorldFrame` (`0x492b50`), whose TURNORACTION up
+    // runs `TurnOrActionStop` (`0x514160`), `0x515090(1, 0, …)`.
+    if buttons.just_released(MouseButton::Right) {
+        wm.scripted = false;
+    }
+    // The world enter behind the cover clears the whole word (`0x5144c0` → `0x514b70(-1, …)`).
+    // A window deactivate clears none of it (`0x5144a3 and eax,0xfffff00f` keeps the low bits):
+    // the session outlives the focus, and only the OS cursor goes back ([`sync_look_focus`]).
+    if cover.is_some_and(|c| c.covering()) {
+        wm.scripted = false;
+    }
+    // `IsMouselooking` (`0x514270`) reads `[InputControl+4] & 1`, the TurnOrAction channel.
+    if let Some(mut script) = script {
+        script.set_turn_or_action_held(rig.world_mouse.turn());
+    }
 }
 
 /// The right button's down edge in the world, before the press is judged a click or a drag:
@@ -744,9 +791,9 @@ pub(crate) struct CameraPivot {
 /// The mouse-look session: start, stop and hand-off between the buttons, cursor grab and restore,
 /// the look rotation, and the click tests behind [`WorldClick`]/[`WorldRightClick`]. Orbit and
 /// select are independent: each primary press engages its session at once and arms a click test,
-/// and the release decides on [`PressGesture::is_click`] alone.
+/// and the release decides on [`PressGesture::is_click`] alone. A session lasts while its
+/// [`WorldMouse::channel`] is held, so a `MouselookStart` runs the right button's session.
 pub(super) fn run_look_session(
-    buttons: &ButtonInput<MouseButton>,
     mouse_motion: &AccumulatedMouseMotion,
     both_buttons: bool,
     rig: &mut CameraControl,
@@ -767,18 +814,30 @@ pub(super) fn run_look_session(
     dynamics: &DynamicsInput,
     // Seconds on the app clock, for the press predicate's two time gates.
     now: f32,
+    // The primary window has the OS focus.
+    focused: bool,
 ) {
+    // The mouse moves the view only through a held cursor: motion while unfocused, or on the frame
+    // that takes the cursor back, is the pointer travelling in another app.
+    let motion = if sync_look_focus(rig, focused, window, cursor_opts) {
+        mouse_motion.delta
+    } else {
+        Vec2::ZERO
+    };
     // A chord is a both-button run, never a select: the reference kills the pending click and arms
-    // none while another primary's binding is held (`0x514ac1`, `0x51481a`).
-    if rig.world_mouse.both() {
+    // none while another primary's binding is held (`0x514ac1`, `0x51481a`). A `MouselookStart` or
+    // `Stop` disarms it too, ahead of the channel's move (`0x514810(0)` stores mode 0 unguarded,
+    // then `0x515090`), so a stop's release, or the button's after it, selects nothing.
+    let disarmed = rig.world_mouse.disarmed();
+    if rig.world_mouse.both() || disarmed {
         *left_click = None;
         *right_click = None;
     }
     // Both tests accumulate the rotation the press asked for, charged before the pitch clamp: the
     // reference accumulates raw motion, so a drag pinned at the pitch limit still spends budget.
     let (yaw_rate, pitch_rate) = (look_cfg.yaw_rate(), look_cfg.pitch_rate());
-    let dyaw = (mouse_motion.delta.x * yaw_rate).abs();
-    let dpitch = (mouse_motion.delta.y * pitch_rate).abs();
+    let dyaw = (motion.x * yaw_rate).abs();
+    let dpitch = (motion.y * pitch_rate).abs();
     for test in [&mut *left_click, &mut *right_click].into_iter().flatten() {
         test.yaw_travel += dyaw;
         test.pitch_travel += dpitch;
@@ -787,8 +846,8 @@ pub(super) fn run_look_session(
     // Both buttons engage their session on the down edge, with no threshold (`0x51491f`); the click
     // test rides along to the release. Looking hides and locks the cursor until the release.
     if let Some(active) = rig.look {
-        if !buttons.pressed(active.button()) {
-            // The button went up: settle its click test (a chord already cancelled both).
+        if !rig.world_mouse.channel(active) {
+            // The channel went down: settle its click test (a chord already cancelled both).
             let test = match active {
                 LookButton::Left => left_click.take(),
                 LookButton::Right => right_click.take(),
@@ -805,51 +864,43 @@ pub(super) fn run_look_session(
                     }
                 }
             }
-            // Hand off to the other button if the world holds it, as the reference keeps turning;
-            // a button the UI holds never fired its binding.
+            // Hand off to the other channel if it is held, as the reference keeps turning; a
+            // button the UI holds never fired its binding.
             let other = match active {
                 LookButton::Right => LookButton::Left,
                 LookButton::Left => LookButton::Right,
             };
-            if rig.world_mouse.held(other) {
+            if rig.world_mouse.channel(other) {
                 rig.look = Some(other);
             } else {
-                rig.look = None;
-                cursor_opts.grab_mode = CursorGrabMode::None;
-                // Show the cursor again; on macOS hiding is the cursor subsystem's job.
-                cursor_opts.visible = true;
-                if let Some(pos) = rig.cursor_stash.take() {
-                    window.set_cursor_position(Some(pos));
-                }
+                disengage_look(rig, window, cursor_opts);
             }
         }
     } else {
         // `WorldMouse` has already dropped a press over the UI, the dev overlay or outside the
         // viewport. Right-drag turns, and arms its click test unless left is held.
         if rig.world_mouse.down(LookButton::Right) {
-            rig.look = Some(LookButton::Right);
-            rig.cursor_stash = window.cursor_position();
-            cursor_opts.grab_mode = CursorGrabMode::Locked;
-            cursor_opts.visible = false;
-            *right_click =
-                (!rig.world_mouse.held(LookButton::Left)).then(|| PressGesture::new(now));
+            engage_look(rig, LookButton::Right, focused, window, cursor_opts);
+            *right_click = (!rig.world_mouse.held(LookButton::Left) && !disarmed)
+                .then(|| PressGesture::new(now));
+        } else if rig.world_mouse.turn() {
+            // `MouselookStart` with no button: the channel's rise enters the same freelook
+            // (`0x514840` → `0x51491f`), and no click is armed (`0x514810(0)`).
+            engage_look(rig, LookButton::Right, focused, window, cursor_opts);
         } else if rig.world_mouse.down(LookButton::Left) && !inspect_enabled {
             // Left-drag orbits, engaged on the press like right (`0x51491f`); the select settles
             // at the release. While the inspector is armed, left belongs to it.
-            rig.look = Some(LookButton::Left);
-            rig.cursor_stash = window.cursor_position();
-            cursor_opts.grab_mode = CursorGrabMode::Locked;
-            cursor_opts.visible = false;
+            engage_look(rig, LookButton::Left, focused, window, cursor_opts);
             // A cursor-payload world drop still orbits (`0x51491f`) but must not also select.
             *right_click = None;
-            *left_click = (!click_consumed && !rig.world_mouse.held(LookButton::Right))
+            *left_click = (!click_consumed && !rig.world_mouse.turn() && !disarmed)
                 .then(|| PressGesture::new(now));
         }
     }
 
     // Look rotation; a right-drag also turns the character.
     if let Some(active) = rig.look {
-        let delta = mouse_motion.delta;
+        let delta = motion;
         let d_yaw = -delta.x * yaw_rate;
         cam.yaw += d_yaw;
         // `mouseInvertPitch` flips only the pitch axis.
@@ -880,18 +931,79 @@ pub(super) fn run_look_session(
     rig.freelook = rig.look == Some(LookButton::Right) || (rig.look.is_some() && both_buttons);
 }
 
-/// Wheel zoom, run every frame: `CAMERAZOOMIN`/`OUT` move the target, and the distance glides to it
-/// at a constant `cameraDistanceMoveSpeed`, as the reference's does. `scroll` is this frame's net
-/// zoom-in in notches (positive is closer).
-pub(super) fn apply_zoom_scroll(scroll: f32, dt: f32, rig: &mut CameraControl, max: f32) {
-    if scroll != 0.0 {
-        rig.target_distance =
-            (rig.target_distance - scroll * CAM_ZOOM_STEP).clamp(CAM_DIST_MIN, max);
+/// Start `button`'s look session: stash the cursor, then lock and hide it until the session ends,
+/// or leave it free while the window is unfocused ([`sync_look_focus`]).
+fn engage_look(
+    rig: &mut CameraControl,
+    button: LookButton,
+    focused: bool,
+    window: &Window,
+    cursor_opts: &mut CursorOptions,
+) {
+    rig.look = Some(button);
+    if focused {
+        take_cursor(rig, window, cursor_opts);
+    } else {
+        rig.cursor_released = true;
+    }
+}
+
+/// End the look session: free and show the cursor, and put it back where the look began unless
+/// it was already free, when it is wherever the player left it.
+fn disengage_look(rig: &mut CameraControl, window: &mut Window, cursor_opts: &mut CursorOptions) {
+    rig.look = None;
+    let stash = rig.cursor_stash.take();
+    if !std::mem::take(&mut rig.cursor_released) {
+        release_cursor(cursor_opts);
+        if let Some(pos) = stash {
+            window.set_cursor_position(Some(pos));
+        }
+    }
+}
+
+/// Stash the cursor, then lock and hide it for the session.
+fn take_cursor(rig: &mut CameraControl, window: &Window, cursor_opts: &mut CursorOptions) {
+    rig.cursor_stash = window.cursor_position();
+    cursor_opts.grab_mode = CursorGrabMode::Locked;
+    cursor_opts.visible = false;
+}
+
+/// Unlock and show the cursor; on macOS hiding is the cursor subsystem's job.
+fn release_cursor(cursor_opts: &mut CursorOptions) {
+    cursor_opts.grab_mode = CursorGrabMode::None;
+    cursor_opts.visible = true;
+}
+
+/// Hand the OS cursor back while the window is unfocused and take it again on focus, without
+/// touching the session: the look state outlives a deactivate (`0x514490` keeps the mouse bits).
+/// Platform behaviour, not a reference fact. On macOS winit's `Locked` is the global
+/// `CGAssociateMouseAndMouseCursorPosition(false)`, and losing key status (`windowDidResignKey`)
+/// leaves it, so a lock held while unfocused freezes the pointer in every other app; 1.12.1's
+/// Windows client gives the cursor back to other applications while inactive. Returns whether the
+/// session holds the cursor through this whole frame, so its motion may turn the view.
+fn sync_look_focus(
+    rig: &mut CameraControl,
+    focused: bool,
+    window: &Window,
+    cursor_opts: &mut CursorOptions,
+) -> bool {
+    if rig.look.is_none() {
+        return focused;
+    }
+    match (focused, rig.cursor_released) {
+        (false, false) => {
+            release_cursor(cursor_opts);
+            rig.cursor_released = true;
+            false
+        }
+        (true, true) => {
+            // The pointer is where the player brought it back: the release restores it there.
+            take_cursor(rig, window, cursor_opts);
+            rig.cursor_released = false;
+            false
+        }
+        (focused, _) => focused,
     }
-    // Re-clamp every frame, so lowering the max-distance slider pulls the camera in.
-    rig.target_distance = rig.target_distance.min(max);
-    let max_step = CAM_MOVE_SPEED * dt;
-    rig.distance += (rig.target_distance - rig.distance).clamp(-max_step, max_step);
 }
 
 /// Seat the camera on whatever it orbits: our own body, or the far-sight subject `PLAYER_FARSIGHT`
@@ -1410,6 +1522,9 @@ pub(crate) fn cam_dump_enabled() -> bool {
     *ON.get_or_init(|| std::env::var_os("WOW_CAM_DUMP").is_some())
 }
 
+#[cfg(test)]
+mod mouselook_tests;
+
 #[cfg(test)]
 mod tests {
     use super::super::camera_channel::CHANNEL_EPS;
diff --git a/crates/benilla-app/src/player/camera/mouselook_tests.rs b/crates/benilla-app/src/player/camera/mouselook_tests.rs
new file mode 100644
index 00000000..fb813748
--- /dev/null
+++ b/crates/benilla-app/src/player/camera/mouselook_tests.rs
@@ -0,0 +1,389 @@
+//! `MouselookStart`/`MouselookStop` against the look session: the latch and the session run as the
+//! frame runs them, with the VM's calls in between.
+
+use benilla_ui::script::UiScript;
+use bevy::ecs::system::RunSystemOnce;
+use bevy::math::DVec2;
+
+use super::super::camera_dynamics::{CameraOptions, SubjectState};
+use super::*;
+
+/// What the session's caller keeps between frames: the facing and the two click tests.
+#[derive(Resource, Default)]
+struct Hand {
+    face_yaw: f32,
+    left: Option<PressGesture>,
+    right: Option<PressGesture>,
+}
+
+/// `control`'s call of [`run_look_session`], with the both-button run read off the latch.
+fn look_frame(
+    motion: Res<AccumulatedMouseMotion>,
+    mut rig: ResMut<CameraControl>,
+    cam: Single<&mut FlyCam>,
+    window: Single<(&mut Window, &mut CursorOptions), With<PrimaryWindow>>,
+    mut clicks: (MessageWriter<WorldClick>, MessageWriter<WorldRightClick>),
+    mut hand: ResMut<Hand>,
+) {
+    let (mut window, mut opts) = window.into_inner();
+    let focused = window.focused;
+    let mut cam = cam.into_inner();
+    let hand = &mut *hand;
+    let both = rig.world_mouse.both();
+    let dynamics = DynamicsInput {
+        options: CameraOptions::default(),
+        smooth_style: FollowStyle::default(),
+        tracking_style: FollowStyle::default(),
+        subject: SubjectState::default(),
+        nearclip: 0.2,
+        surface_y: None,
+    };
+    run_look_session(
+        &motion,
+        both,
+        &mut rig,
+        &mut cam,
+        &mut hand.face_yaw,
+        &mut window,
+        &mut opts,
+        false,
+        false,
+        &mut clicks.0,
+        &mut clicks.1,
+        &mut hand.left,
+        &mut hand.right,
+        LookConfig::default(),
+        &dynamics,
+        0.0,
+        focused,
+    );
+}
+
+/// A world with the camera, the window, a VM and nothing held; `over_ui` says where the cursor is.
+fn world(over_ui: bool) -> World {
+    let mut world = World::new();
+    world.init_resource::<ButtonInput<MouseButton>>();
+    world.init_resource::<AccumulatedMouseMotion>();
+    world.insert_resource(crate::ui_script::PointerOverUi(over_ui));
+    world.init_resource::<CameraControl>();
+    world.init_resource::<Hand>();
+    world.init_resource::<Messages<WorldClick>>();
+    world.init_resource::<Messages<WorldRightClick>>();
+    world.spawn((
+        Camera::default(),
+        FlyCam {
+            yaw: 0.0,
+            pitch: 0.0,
+            speed: 0.0,
+        },
+    ));
+    let mut window = Window::default();
+    window.set_physical_cursor_position(Some(DVec2::new(100.0, 100.0)));
+    world.spawn((window, CursorOptions::default(), PrimaryWindow));
+    world.insert_non_send_resource(UiScript::new().unwrap());
+    world
+}
+
+/// One frame with the mouse moved by `dx` pixels: the latch, then the session, then the input
+/// planes age as bevy's do.
+fn frame(world: &mut World, dx: f32) {
+    world.resource_mut::<AccumulatedMouseMotion>().delta = Vec2::new(dx, 0.0);
+    world.run_system_once(latch_world_mouse).unwrap();
+    world.run_system_once(look_frame).unwrap();
+    world.resource_mut::<ButtonInput<MouseButton>>().clear();
+}
+
+/// The OS gives the window focus or takes it.
+fn focus(world: &mut World, focused: bool) {
+    world
+        .query::<&mut Window>()
+        .single_mut(world)
+        .unwrap()
+        .focused = focused;
+}
+
+/// Where the OS pointer is, in logical window pixels.
+fn pointer(world: &mut World) -> Option<Vec2> {
+    world
+        .query::<&Window>()
+        .single(world)
+        .unwrap()
+        .cursor_position()
+}
+
+fn lua(world: &mut World, chunk: &str) {
+    world.non_send_resource::<UiScript>().run(chunk).unwrap();
+}
+
+fn is_mouselooking(world: &World) -> bool {
+    world
+        .non_send_resource::<UiScript>()
+        .eval::<Option<i64>>("return IsMouselooking()")
+        .unwrap()
+        == Some(1)
+}
+
+fn yaw(world: &mut World) -> f32 {
+    world.query::<&FlyCam>().single(world).unwrap().yaw
+}
+
+fn cursor(world: &mut World) -> CursorOptions {
+    world
+        .query::<&CursorOptions>()
+        .single(world)
+        .unwrap()
+        .clone()
+}
+
+fn press(world: &mut World, b: MouseButton) {
+    world.resource_mut::<ButtonInput<MouseButton>>().press(b);
+}
+
+fn release(world: &mut World, b: MouseButton) {
+    world.resource_mut::<ButtonInput<MouseButton>>().release(b);
+}
+
+/// The right button's session, entered with no button: the mouse turns the camera and the body
+/// together, the cursor is locked and hidden, and `IsMouselooking` answers 1 (`0x514210`).
+#[test]
+fn mouselook_start_turns_the_camera_and_the_character_with_no_button_held() {
+    let mut w = world(false);
+    frame(&mut w, 0.0);
+    assert!(!is_mouselooking(&w));
+
+    lua(&mut w, "MouselookStart()");
+    frame(&mut w, 40.0);
+    let rig = w.resource::<CameraControl>();
+    assert_eq!(
+        rig.look,
+        Some(LookButton::Right),
+        "the right button's session"
+    );
+    assert!(rig.freelook);
+    let turned = yaw(&mut w);
+    assert!(turned < 0.0, "the mouse turns the camera: {turned}");
+    assert_eq!(
+        w.resource::<Hand>().face_yaw,
+        turned,
+        "and the character with it"
+    );
+    let c = cursor(&mut w);
+    assert_eq!(c.grab_mode, CursorGrabMode::Locked);
+    assert!(!c.visible);
+    assert!(is_mouselooking(&w));
+
+    // It holds with no button while the mouse keeps moving.
+    frame(&mut w, 40.0);
+    assert!(yaw(&mut w) < turned);
+    assert!(w.resource::<CameraControl>().is_looking());
+}
+
+/// `MouselookStop` (`0x514240`) ends the session: the cursor comes back and the mouse turns
+/// nothing, and `IsMouselooking` answers nil.
+#[test]
+fn mouselook_stop_ends_the_session() {
+    let mut w = world(false);
+    lua(&mut w, "MouselookStart()");
+    frame(&mut w, 40.0);
+    let turned = yaw(&mut w);
+
+    lua(&mut w, "MouselookStop()");
+    frame(&mut w, 40.0);
+    assert_eq!(w.resource::<CameraControl>().look, None);
+    assert_eq!(yaw(&mut w), turned, "the mouse turns nothing");
+    let c = cursor(&mut w);
+    assert_eq!(c.grab_mode, CursorGrabMode::None);
+    assert!(c.visible);
+    assert!(!is_mouselooking(&w));
+}
+
+/// CustomNameplates' steer: a right press a plate took calls `MouselookStart`, and the button's
+/// release ends it (`0x492b50` routes it to `TurnOrActionStop`) without a world click.
+#[test]
+fn the_right_release_ends_a_mouselook_its_press_started_on_the_ui() {
+    let mut w = world(true);
+    press(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    assert_eq!(
+        w.resource::<CameraControl>().look,
+        None,
+        "the plate's press alone starts no look"
+    );
+
+    lua(&mut w, "MouselookStart()");
+    frame(&mut w, 40.0);
+    assert_eq!(w.resource::<CameraControl>().look, Some(LookButton::Right));
+    assert!(is_mouselooking(&w));
+
+    release(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, None);
+    assert!(!is_mouselooking(&w));
+    assert!(
+        w.resource::<Messages<WorldRightClick>>().is_empty(),
+        "no click was armed"
+    );
+}
+
+/// The loading cover's world enter clears the whole word (`0x5144c0`).
+#[test]
+fn the_cover_ends_a_scripted_mouselook() {
+    let mut w = world(false);
+    lua(&mut w, "MouselookStart()");
+    frame(&mut w, 0.0);
+    w.insert_resource(crate::loading_screen::LoadingScreen::test_covering());
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, None);
+    assert!(!is_mouselooking(&w));
+}
+
+/// A session across a focus loss: the look state stays as the deactivate leaves it (`0x514490`
+/// keeps the mouse bits), the OS cursor is free and shown meanwhile and the mouse turns nothing,
+/// and the focus takes it back locked and hidden, with no jolt on the frame it returns.
+fn a_session_survives_focus_loss(start: impl Fn(&mut World)) {
+    let mut w = world(false);
+    start(&mut w);
+    frame(&mut w, 40.0);
+    assert_eq!(w.resource::<CameraControl>().look, Some(LookButton::Right));
+    let before = yaw(&mut w);
+
+    focus(&mut w, false);
+    frame(&mut w, 40.0);
+    assert_eq!(
+        w.resource::<CameraControl>().look,
+        Some(LookButton::Right),
+        "the session outlives the focus"
+    );
+    assert!(is_mouselooking(&w));
+    let c = cursor(&mut w);
+    assert_eq!(c.grab_mode, CursorGrabMode::None, "the OS pointer is free");
+    assert!(c.visible);
+    assert!(!w.resource::<CameraControl>().holds_cursor());
+    assert_eq!(
+        yaw(&mut w),
+        before,
+        "the pointer in another app turns nothing"
+    );
+
+    focus(&mut w, true);
+    frame(&mut w, 40.0);
+    let c = cursor(&mut w);
+    assert_eq!(c.grab_mode, CursorGrabMode::Locked);
+    assert!(!c.visible);
+    assert!(w.resource::<CameraControl>().holds_cursor());
+    assert_eq!(
+        yaw(&mut w),
+        before,
+        "the returning frame's travel is not a turn"
+    );
+    frame(&mut w, 40.0);
+    assert!(yaw(&mut w) < before, "and the mouse turns the view again");
+    assert!(is_mouselooking(&w));
+}
+
+#[test]
+fn a_scripted_mouselook_survives_focus_loss() {
+    a_session_survives_focus_loss(|w| lua(w, "MouselookStart()"));
+}
+
+#[test]
+fn a_right_drag_survives_focus_loss() {
+    a_session_survives_focus_loss(|w| press(w, MouseButton::Right));
+}
+
+/// `MouselookStop` while unfocused ends the session; the pointer stays where the player left it
+/// in the other app, and the focus coming back takes nothing.
+#[test]
+fn mouselook_stop_while_unfocused_ends_it_and_the_focus_takes_nothing_back() {
+    let mut w = world(false);
+    lua(&mut w, "MouselookStart()");
+    frame(&mut w, 0.0);
+    focus(&mut w, false);
+    frame(&mut w, 0.0);
+    let away = Vec2::new(300.0, 250.0);
+    w.query::<&mut Window>()
+        .single_mut(&mut w)
+        .unwrap()
+        .set_cursor_position(Some(away));
+
+    lua(&mut w, "MouselookStop()");
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, None);
+    assert!(!is_mouselooking(&w));
+    assert_eq!(pointer(&mut w), Some(away), "no warp back to the stash");
+
+    focus(&mut w, true);
+    frame(&mut w, 0.0);
+    let c = cursor(&mut w);
+    assert_eq!(c.grab_mode, CursorGrabMode::None);
+    assert!(c.visible);
+    assert!(!w.resource::<CameraControl>().is_looking());
+}
+
+/// One bit, whoever set it: `MouselookStop` ends a right drag in flight and disarms its click, so
+/// the release after it selects nothing (`0x514810(0)`, then `0x515090(1, 0, …)`).
+#[test]
+fn mouselook_stop_ends_a_right_drag_and_its_release_clicks_nothing() {
+    let mut w = world(false);
+    press(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    assert!(
+        w.resource::<Hand>().right.is_some(),
+        "the press armed a click"
+    );
+
+    lua(&mut w, "MouselookStop()");
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, None);
+    assert!(!is_mouselooking(&w));
+    release(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    assert!(w.resource::<Messages<WorldRightClick>>().is_empty());
+    assert!(!is_mouselooking(&w));
+
+    // The control: the same press and release with no stop is a click.
+    let mut w = world(false);
+    press(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    release(&mut w, MouseButton::Right);
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<Messages<WorldRightClick>>().len(), 1);
+}
+
+/// `MouselookStart` under a left drag sets the other primary channel: the both-button run, its
+/// rise, and the left click disarmed; the left release hands the session to the mouselook.
+#[test]
+fn mouselook_start_under_a_left_drag_is_the_both_button_run() {
+    let mut w = world(false);
+    press(&mut w, MouseButton::Left);
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, Some(LookButton::Left));
+    assert!(w.resource::<Hand>().left.is_some());
+
+    lua(&mut w, "MouselookStart()");
+    w.resource_mut::<AccumulatedMouseMotion>().delta = Vec2::new(40.0, 0.0);
+    w.run_system_once(latch_world_mouse).unwrap();
+    {
+        let wm = &w.resource::<CameraControl>().world_mouse;
+        assert!(wm.both(), "both channels held");
+        assert!(wm.rose(), "the transition into the run (0x514a73)");
+    }
+    w.run_system_once(look_frame).unwrap();
+    w.resource_mut::<ButtonInput<MouseButton>>().clear();
+    assert!(
+        w.resource::<Hand>().left.is_none(),
+        "the left click disarmed"
+    );
+    let cam_yaw = yaw(&mut w);
+    assert!(cam_yaw < 0.0);
+    assert_eq!(
+        w.resource::<Hand>().face_yaw,
+        cam_yaw,
+        "the body turns with the camera"
+    );
+
+    release(&mut w, MouseButton::Left);
+    frame(&mut w, 0.0);
+    assert_eq!(w.resource::<CameraControl>().look, Some(LookButton::Right));
+    assert!(w.resource::<Messages<WorldClick>>().is_empty());
+}
diff --git a/crates/benilla-app/src/player/camera_saved.rs b/crates/benilla-app/src/player/camera_saved.rs
index 6c6cf69b..32f637da 100644
--- a/crates/benilla-app/src/player/camera_saved.rs
+++ b/crates/benilla-app/src/player/camera_saved.rs
@@ -18,9 +18,8 @@ use bevy::prelude::*;
 
 use crate::char_select::{ClientState, InWorldGated};
 
-use super::camera::{
-    CameraControl, FlyCam, CAM_DIST_DEFAULT, CAM_DIST_MAX, CAM_DIST_MIN, CAM_PITCH_LIMIT,
-};
+use super::camera::{CameraControl, FlyCam, CAM_PITCH_LIMIT};
+use super::camera_zoom::{CAM_DIST_DEFAULT, CAM_DIST_MAX, CAM_DIST_MIN};
 use super::Player;
 use benilla_world::view::WorldCamera;
 
diff --git a/crates/benilla-app/src/player/camera_view.rs b/crates/benilla-app/src/player/camera_view.rs
index c398b170..7f2cbd9f 100644
--- a/crates/benilla-app/src/player/camera_view.rs
+++ b/crates/benilla-app/src/player/camera_view.rs
@@ -25,8 +25,9 @@ use benilla_world::view::WorldCamera;
 
 use crate::creature_anim::wrap_pi;
 
-use super::camera::{CameraControl, FlyCam, CAM_DIST_MAX, CAM_DIST_MIN, CAM_PITCH_LIMIT};
+use super::camera::{CameraControl, FlyCam, CAM_PITCH_LIMIT};
 use super::camera_saved::{pitch_from_file, pitch_to_file};
+use super::camera_zoom::{CAM_DIST_MAX, CAM_DIST_MIN};
 use super::Player;
 
 /// The reference's five views, through the UI crate's constant so the Lua range check agrees.
diff --git a/crates/benilla-app/src/player/camera_zoom.rs b/crates/benilla-app/src/player/camera_zoom.rs
new file mode 100644
index 00000000..b4cc6440
--- /dev/null
+++ b/crates/benilla-app/src/player/camera_zoom.rs
@@ -0,0 +1,196 @@
+//! The zoom: the orbit distance's range, from `cameraDistanceMax` × `cameraDistanceMaxFactor`
+//! under the reference's 0 and 50 yd bounds, and the wheel's glide to the chosen distance.
+
+use bevy::prelude::*;
+
+use super::camera::CameraControl;
+
+/// The zoom floor, yd (`ds:0x8089a8` = 0.0): at 0 the eye sits at the framing pivot, inside the
+/// head, and the avatar fades out. Deviation: the starting zoom, [`CAM_DIST_DEFAULT`], is 15 yd
+/// where the reference's `cameraDistance` is 5.55 (`0x84f488`), for a wider view.
+pub(super) const CAM_DIST_MIN: f32 = 0.0;
+/// The zoom ceiling, yd (`ds:0x8089a4` = 50.0): the cap on [`ZoomLimit`] (`0x511309`) and the top
+/// of the distance validator `0x50b310`; also the clamp for a distance read back off disk.
+pub(super) const CAM_DIST_MAX: f32 = 50.0;
+pub(super) const CAM_DIST_DEFAULT: f32 = 15.0;
+/// `cameraDistanceMax`'s registered default, "15.0" (`0x84fbd0`).
+const CAM_DISTANCE_MAX_DEFAULT: f32 = 15.0;
+/// `cameraDistanceMaxFactor`'s registered default, "1.0" (`0x82e92c`). The CVar has no validator:
+/// the options slider's 1 to 2 (`UIOptionsFrame.lua:90`) bounds the slider, not the value.
+const CAM_DISTANCE_MAX_FACTOR_DEFAULT: f32 = 1.0;
+/// `cameraDistanceMax`'s validator (`0x50b310` → `0x50b330(v, 0.0, 50.0)`) accepts `0 ≤ v ≤ 50`;
+/// anything else, NaN included (`fcom` unordered sets C0), is refused and the old value stands.
+pub(crate) const CAM_DISTANCE_MAX_RANGE: std::ops::RangeInclusive<f32> =
+    CAM_DIST_MIN..=CAM_DIST_MAX;
+/// Yards per wheel notch, the stock bindings' `CameraZoomIn(1.0)` (`Bindings.xml:707`).
+const CAM_ZOOM_STEP: f32 = 1.0;
+/// Zoom speed in yd/s, `cameraDistanceMoveSpeed`'s default: the reference glides the distance to
+/// the wheel target at this constant speed (`0x5112d0`), not an ease.
+const CAM_MOVE_SPEED: f32 = 8.33;
+
+/// The max orbit distance, yd, from `cameraDistanceMax` and `cameraDistanceMaxFactor`: 15 at the
+/// reference's defaults. Lowering it pulls the live target in on the next frame.
+#[derive(Resource)]
+pub(crate) struct ZoomLimit {
+    /// The live limit, [`orbit_limit`] of the two below: in `[0, 50]`, never NaN.
+    pub(crate) max: f32,
+    distance_max: f32,
+    factor: f32,
+}
+
+impl Default for ZoomLimit {
+    fn default() -> Self {
+        let (distance_max, factor) = (CAM_DISTANCE_MAX_DEFAULT, CAM_DISTANCE_MAX_FACTOR_DEFAULT);
+        Self {
+            max: orbit_limit(distance_max, factor),
+            distance_max,
+            factor,
+        }
+    }
+}
+
+impl ZoomLimit {
+    /// `cameraDistanceMax`, through its validator's range ([`CAM_DISTANCE_MAX_RANGE`]); `false`
+    /// when refused, the old value standing.
+    pub(crate) fn set_distance_max(&mut self, v: f32) -> bool {
+        if !CAM_DISTANCE_MAX_RANGE.contains(&v) {
+            return false;
+        }
+        self.distance_max = v;
+        self.max = orbit_limit(self.distance_max, self.factor);
+        true
+    }
+
+    /// `cameraDistanceMaxFactor`, taken as it comes: the reference registers it with no validator.
+    pub(crate) fn set_factor(&mut self, factor: f32) {
+        self.factor = factor;
+        self.max = orbit_limit(self.distance_max, self.factor);
+    }
+
+    #[cfg(test)]
+    pub(crate) fn distance_max(&self) -> f32 {
+        self.distance_max
+    }
+
+    #[cfg(test)]
+    pub(crate) fn factor(&self) -> f32 {
+        self.factor
+    }
+}
+
+/// The reference's orbit limit (`0x5112d6`–`0x51131e`): `cameraDistanceMax × cameraDistanceMaxFactor`
+/// through two ordered x87 compares. Below 0.0 (`fcom ds:0x8089a8`, C0 alone) it is 0.0; else
+/// below 50.0 (`fcom ds:0x8089a4`, C0 alone) it stands; else it is 50.0. A NaN product compares
+/// unordered (C0, C2 and C3 all set), which passes the first test and fails the second: 50.0.
+fn orbit_limit(distance_max: f32, factor: f32) -> f32 {
+    let product = distance_max * factor;
+    if product < CAM_DIST_MIN {
+        CAM_DIST_MIN
+    } else if product < CAM_DIST_MAX {
+        product
+    } else {
+        CAM_DIST_MAX
+    }
+}
+
+/// Wheel zoom, run every frame: `CAMERAZOOMIN`/`OUT` move the target, and the distance glides to it
+/// at a constant `cameraDistanceMoveSpeed`, as the reference's does. `scroll` is this frame's net
+/// zoom-in in notches (positive is closer). `max` is [`ZoomLimit::max`], CVar-fed, so it bounds by
+/// `max`/`min`, never `f32::clamp`, which panics on a NaN or inverted bound.
+pub(super) fn apply_zoom_scroll(scroll: f32, dt: f32, rig: &mut CameraControl, max: f32) {
+    if scroll != 0.0 {
+        rig.target_distance = (rig.target_distance - scroll * CAM_ZOOM_STEP)
+            .max(CAM_DIST_MIN)
+            .min(max);
+    }
+    // Re-clamp every frame, so lowering the max-distance slider pulls the camera in.
+    rig.target_distance = rig.target_distance.min(max);
+    let max_step = CAM_MOVE_SPEED * dt;
+    rig.distance += (rig.target_distance - rig.distance).clamp(-max_step, max_step);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn limit(distance_max: f32, factor: f32) -> f32 {
+        let mut z = ZoomLimit::default();
+        assert!(
+            z.set_distance_max(distance_max),
+            "{distance_max} is in range"
+        );
+        z.set_factor(factor);
+        z.max
+    }
+
+    #[test]
+    fn the_limit_is_the_product_of_both_cvars() {
+        assert_eq!(ZoomLimit::default().max, 15.0, "the reference's defaults");
+        // The factor has no validator: 3 is not held to the slider's 2.
+        assert_eq!(limit(15.0, 3.0), 45.0);
+        assert_eq!(limit(15.0, 0.5), 7.5, "nor raised to the slider's 1");
+        assert_eq!(limit(25.0, 1.0), 25.0);
+    }
+
+    #[test]
+    fn the_limit_holds_to_zero_and_fifty() {
+        assert_eq!(limit(15.0, 4.0), 50.0);
+        assert_eq!(limit(50.0, 1.0), 50.0);
+        assert_eq!(limit(15.0, f32::INFINITY), 50.0);
+        assert_eq!(limit(15.0, -2.0), 0.0);
+        assert_eq!(limit(15.0, f32::NEG_INFINITY), 0.0);
+    }
+
+    #[test]
+    fn a_nan_product_fails_both_compares_and_is_fifty() {
+        assert_eq!(limit(15.0, f32::NAN), 50.0);
+        // 0 × ∞ is NaN too, with both values accepted.
+        assert_eq!(limit(0.0, f32::INFINITY), 50.0);
+    }
+
+    #[test]
+    fn cameradistancemax_is_refused_outside_its_validator_range() {
+        let mut z = ZoomLimit::default();
+        for bad in [-0.5, 50.5, f32::NAN, f32::INFINITY] {
+            assert!(!z.set_distance_max(bad), "{bad} is refused");
+            assert_eq!(
+                (z.distance_max(), z.max),
+                (15.0, 15.0),
+                "the old value stands"
+            );
+        }
+        assert!(
+            z.set_distance_max(0.0) && z.max == 0.0,
+            "both ends are inclusive"
+        );
+        assert!(z.set_distance_max(50.0) && z.max == 50.0);
+    }
+
+    #[test]
+    fn a_nan_factor_zooms_without_panicking() {
+        let mut z = ZoomLimit::default();
+        z.set_factor(f32::NAN);
+        let mut rig = CameraControl {
+            target_distance: 10.0,
+            distance: 10.0,
+            ..default()
+        };
+        apply_zoom_scroll(-1.0, 0.1, &mut rig, z.max);
+        assert_eq!(rig.target_distance, 11.0);
+        // Even a NaN bound handed straight in bounds nothing and panics nowhere.
+        apply_zoom_scroll(-1.0, 0.1, &mut rig, f32::NAN);
+        assert_eq!(rig.target_distance, 12.0);
+    }
+
+    #[test]
+    fn the_wheel_stops_at_the_limit() {
+        let mut rig = CameraControl {
+            target_distance: 44.5,
+            ..default()
+        };
+        apply_zoom_scroll(-1.0, 0.1, &mut rig, limit(15.0, 3.0));
+        assert_eq!(rig.target_distance, 45.0);
+        apply_zoom_scroll(1000.0, 0.1, &mut rig, 45.0);
+        assert_eq!(rig.target_distance, CAM_DIST_MIN);
+    }
+}
diff --git a/crates/benilla-app/src/player/controller.rs b/crates/benilla-app/src/player/controller.rs
index 31433721..a186ce16 100644
--- a/crates/benilla-app/src/player/controller.rs
+++ b/crates/benilla-app/src/player/controller.rs
@@ -16,7 +16,7 @@ pub(super) fn control(
     pointer: (
         Res<AccumulatedMouseMotion>,
         Res<camera::LookConfig>,
-        Res<camera::ZoomLimit>,
+        Res<camera_zoom::ZoomLimit>,
         Res<camera::FollowConfig>,
         Res<camera_dynamics::CameraOptions>,
         // Only `nearclip` is read here, for the self-avatar fade.
@@ -227,8 +227,8 @@ pub(super) fn control(
         *left_click = None;
         *right_click = None;
     }
+    let focused = window.focused;
     run_look_session(
-        &buttons,
         mouse_motion,
         both_buttons,
         &mut rig,
@@ -245,6 +245,7 @@ pub(super) fn control(
         look_cfg,
         &dynamics,
         time.elapsed_secs(),
+        focused,
     );
     // The mouse turns the view, but the body hand-off (`0x514474`) skips a body that is stunned,
     // dead or seated (`0x5145e0`) or not ours to drive (`control_lost`, `reseat`), while the
@@ -265,8 +266,8 @@ pub(super) fn control(
     }
 
     // A rebound zoom key steps 1.0 per press, the stock `CameraZoomIn(1.0)` (`Bindings.xml:707`).
-    let zoom = binds.amount(crate::bindings::cmd::CAMERA_ZOOM_IN)
-        - binds.amount(crate::bindings::cmd::CAMERA_ZOOM_OUT);
+    let zoom = binds.amount(crate::bindings::Input::CameraZoomIn)
+        - binds.amount(crate::bindings::Input::CameraZoomOut);
     apply_zoom_scroll(zoom, dt, &mut rig, zoom_max);
 
     // Free fly is a dev tool on the dev chord: a bare `F` is the player's to bind.
@@ -492,7 +493,7 @@ pub(super) fn control(
         // `Jump` (`0x513bd0`) inlines `0x5144e0` and `0x514560`, which is `may_translate` term for
         // term: health, root and stand state 7. Hover's refusal is the movement handler's
         // (`0x7c623a`), which keeps the mounted flourish reachable while hovering.
-        let mut want_jump = binds.fired(crate::bindings::cmd::JUMP) && may_translate;
+        let mut want_jump = binds.fired(crate::bindings::Input::Jump) && may_translate;
 
         // Swim or walk, latched with hysteresis at the `0x6030c0` boundary against flicker.
         let surface_y = swim::surface_over_feet(world, player.pos);
diff --git a/crates/benilla-app/src/player/embody.rs b/crates/benilla-app/src/player/embody.rs
index 26284af0..e63f5098 100644
--- a/crates/benilla-app/src/player/embody.rs
+++ b/crates/benilla-app/src/player/embody.rs
@@ -15,6 +15,7 @@
 
 use bevy::prelude::*;
 
+use super::approach::Approach;
 use super::follow::FollowState;
 use super::state::Player;
 use crate::creature_anim::MovementState;
@@ -26,6 +27,7 @@ pub(super) fn maintain_embodiment(
     mut commands: Commands,
     mut player: ResMut<Player>,
     mut follow: ResMut<FollowState>,
+    mut approach: ResMut<Approach>,
     guids: (Res<SelfGuid>, Res<GuidIndex>),
     self_body: Query<Entity, With<SelfPlayer>>,
     attached: Query<Entity, With<Embodied>>,
@@ -49,6 +51,7 @@ pub(super) fn maintain_embodiment(
             // `SetActiveMover` `0x6006e0` cancels click-to-move and follow on the outgoing mover,
             // through `0x6103a0` → `0x60fb60(0, 1)`.
             follow.stop();
+            approach.stop();
         }
     }
 
@@ -91,6 +94,7 @@ mod tests {
         let mut app = App::new();
         app.init_resource::<Player>()
             .init_resource::<FollowState>()
+            .init_resource::<Approach>()
             .init_resource::<SelfGuid>()
             .init_resource::<GuidIndex>()
             .add_systems(Update, maintain_embodiment);
diff --git a/crates/benilla-app/src/player/follow.rs b/crates/benilla-app/src/player/follow.rs
index 4f05bcc3..e539346d 100644
--- a/crates/benilla-app/src/player/follow.rs
+++ b/crates/benilla-app/src/player/follow.rs
@@ -7,7 +7,7 @@
 //! A player's movement start cancels it on the key-down edge: the start emitters call `0x60e990`,
 //! which cancels at `0x60e9b5` unless bit 0 of `ds:0xc4da48` is set, and only follow's own emitters
 //! (`0x60e790`, `0x60e7f0`, `0x60e8a0`, `0x60e940`) set it; ours is a flag,
-//! [`Player::follow_forward`], so it never reaches the cancel. Jump survives (`0x60e990(0, 0)` at
+//! [`Player::auto_forward`], so it never reaches the cancel. Jump survives (`0x60e990(0, 0)` at
 //! `0x60dea8`), as do key releases, sitting, the walk toggle, damage, combat, mounting, casting and
 //! the followee leaving range (`0x6107e5` skips follow's mode at `0x610749`, `0x610752`).
 //!
@@ -29,10 +29,10 @@ use super::state::{MoveSpeed, Player};
 const TURN_RATE: f32 = PI;
 
 /// Inside this many radians of the bearing, follow stops turning (`0x6108bb` → `0x60e920`).
-const TURN_DEADZONE: f32 = 0.001;
+pub(super) const TURN_DEADZONE: f32 = 0.001;
 
 /// The speed the thresholds scale by (`0x80c4d0`), the base run speed.
-const SPEED_NORM: f32 = 7.0;
+pub(super) const SPEED_NORM: f32 = 7.0;
 
 /// The base stop distance (`0x80c4c0`), a constant, not a CVar.
 const STOP_DISTANCE: f32 = 3.0;
@@ -116,7 +116,7 @@ fn follow_cancelled(
 }
 
 /// Wrap an angle into `[-π, π)`.
-fn wrap_pi(a: f32) -> f32 {
+pub(super) fn wrap_pi(a: f32) -> f32 {
     let t = std::f32::consts::TAU;
     let x = (a + PI).rem_euclid(t);
     x - PI
@@ -124,23 +124,23 @@ fn wrap_pi(a: f32) -> f32 {
 
 /// The `face_yaw` pointing at a horizontal Bevy-space delta, matching `control`'s forward
 /// `from_rotation_y(y) * NEG_Z = (-sin y, 0, -cos y)`: `y = atan2(-dx, -dz)`.
-fn bearing_to(delta: Vec3) -> f32 {
+pub(super) fn bearing_to(delta: Vec3) -> f32 {
     (-delta.x).atan2(-delta.z)
 }
 
 /// The followee is within 1° of straight up or down, where the bearing means nothing (`0x610d32`).
-fn vertically_degenerate(delta: Vec3) -> bool {
+pub(super) fn vertically_degenerate(delta: Vec3) -> bool {
     let dist = delta.length();
     dist > f32::EPSILON && delta.y.abs() / dist > VERTICAL_ALIGN_COS
 }
 
 /// Turn toward `bearing` by at most `rate × dt`, not inside the deadzone (`0x6103d0`).
-fn steer(face: f32, bearing: f32, dt: f32) -> f32 {
+pub(super) fn steer(face: f32, bearing: f32, rate: f32, dt: f32) -> f32 {
     let remaining = wrap_pi(bearing - face);
     if remaining.abs() <= TURN_DEADZONE {
         return face;
     }
-    let budget = TURN_RATE * dt;
+    let budget = rate * dt;
     face + remaining.clamp(-budget, budget)
 }
 
@@ -163,19 +163,39 @@ pub(super) struct FollowInput<'w, 's> {
 impl FollowInput<'_, '_> {
     /// The press edge of any of the six movement commands; turn and strafe both cancel.
     fn move_start(&self) -> bool {
-        use crate::bindings::cmd;
+        use crate::bindings::Input;
         [
-            cmd::MOVE_FORWARD,
-            cmd::MOVE_BACKWARD,
-            cmd::TURN_LEFT,
-            cmd::TURN_RIGHT,
-            cmd::STRAFE_LEFT,
-            cmd::STRAFE_RIGHT,
+            Input::MoveForward,
+            Input::MoveBackward,
+            Input::TurnLeft,
+            Input::TurnRight,
+            Input::StrafeLeft,
+            Input::StrafeRight,
         ]
         .iter()
         .any(|&c| self.binds.just_pressed(c))
     }
 
+    /// The cancel set, the start emitters' `0x60e990` and the input tick's teardown, which end any
+    /// auto-move.
+    pub(super) fn cancels(&self, player: &Player) -> bool {
+        // The world's buttons, not the device's: the both-button run is two bindings held, and a
+        // press a UI frame captured dispatches neither.
+        let both_engaged = self.rig.world_mouse.both() && self.rig.world_mouse.rose();
+        follow_cancelled(
+            self.move_start(),
+            // The on edge: `control` toggles `autorun` after this, so the flag is the pre-toggle
+            // value.
+            self.buttons.just_pressed(MouseButton::Forward) && !player.autorun,
+            both_engaged,
+            self.rig.look == Some(LookButton::Right),
+            // The teardown leg, or the body handed to a server spline; the ride term is not one of
+            // the reference's conjuncts (`0x5144e0`), and its reference side is untraced.
+            self.input_torn_down(player.modes.rooted, player.foreign_mover.is_none())
+                || player.server_riding(),
+        )
+    }
+
     /// The input tick's teardown leg ([`super::state::MoverInput::torn_down`]), which the reference
     /// takes (`0x5146d6 call 0x60fb60`) only with both predicates down (`0x5146c3`, `0x5146ce`):
     /// death, far sight, or root and stun together end a follow, a root alone does not.
@@ -193,7 +213,7 @@ impl FollowInput<'_, '_> {
     }
 }
 
-/// Cancel, re-resolve the followee, steer, and set [`Player::follow_forward`] for `control`. The
+/// Cancel, re-resolve the followee, steer, and set [`Player::auto_forward`] for `control`. The
 /// cancel comes first, as the reference's start emitters run ahead of the axis math (`0x5150a7` vs
 /// the emitter tail `0x5151a0`).
 pub(super) fn steer_follow(
@@ -205,27 +225,11 @@ pub(super) fn steer_follow(
     transforms: Query<&Transform>,
     input: FollowInput,
 ) {
-    player.follow_forward = false;
+    player.auto_forward = false;
     if follow.guid.is_none() {
         return;
     }
-    // ── The cancel set ──
-    // The world's buttons, not the device's: the both-button run is two bindings held, and a
-    // press a UI frame captured dispatches neither.
-    let both_engaged = input.rig.world_mouse.both()
-        && (input.rig.world_mouse.down(LookButton::Left)
-            || input.rig.world_mouse.down(LookButton::Right));
-    if follow_cancelled(
-        input.move_start(),
-        // The on edge: `control` toggles `autorun` after this, so the flag is the pre-toggle value.
-        input.buttons.just_pressed(MouseButton::Forward) && !player.autorun,
-        both_engaged,
-        input.rig.look == Some(LookButton::Right),
-        // The teardown leg, or the body handed to a server spline; the ride term is not one of the
-        // reference's conjuncts (`0x5144e0`), and its reference side is untraced.
-        input.input_torn_down(player.modes.rooted, player.foreign_mover.is_none())
-            || player.server_riding(),
-    ) {
+    if input.cancels(&player) {
         info!("follow: cancelled by the player's own movement input");
         follow.stop();
         return;
@@ -255,7 +259,7 @@ pub(super) fn steer_follow(
         return;
     }
     let bearing = bearing_to(flat);
-    player.face_yaw = steer(player.face_yaw, bearing, time.delta_secs());
+    player.face_yaw = steer(player.face_yaw, bearing, TURN_RATE, time.delta_secs());
     let moving = should_move(follow.moving, distance, speed.value);
     if moving != follow.moving {
         info!(
@@ -285,7 +289,7 @@ pub(super) fn steer_follow(
         }
     }
     follow.moving = moving;
-    player.follow_forward = moving;
+    player.auto_forward = moving;
 }
 
 /// Whether `WOW_FOLLOW_TRACE` is set, read once.
@@ -352,18 +356,18 @@ mod tests {
     #[test]
     fn the_turn_is_rate_limited_and_has_a_deadzone() {
         // 180°/s for a 0.1 s tick is 18° of the 90°.
-        let after = steer(0.0, PI / 2.0, 0.1);
+        let after = steer(0.0, PI / 2.0, TURN_RATE, 0.1);
         assert!(
             (after - TURN_RATE * 0.1).abs() < 1e-6,
             "clamped to the budget"
         );
-        assert!((steer(0.0, 0.05, 1.0) - 0.05).abs() < 1e-6);
-        assert_eq!(steer(1.0, 1.0 + TURN_DEADZONE / 2.0, 1.0), 1.0);
+        assert!((steer(0.0, 0.05, TURN_RATE, 1.0) - 0.05).abs() < 1e-6);
+        assert_eq!(steer(1.0, 1.0 + TURN_DEADZONE / 2.0, TURN_RATE, 1.0), 1.0);
     }
 
     #[test]
     fn steering_takes_the_short_way_round() {
-        let after = steer(PI - 0.05, -PI + 0.05, 1.0);
+        let after = steer(PI - 0.05, -PI + 0.05, TURN_RATE, 1.0);
         assert!(
             wrap_pi(after - (PI - 0.05)) > 0.0,
             "should wrap forward across ±π"
diff --git a/crates/benilla-app/src/player/input.rs b/crates/benilla-app/src/player/input.rs
index e1b3bf26..e208d343 100644
--- a/crates/benilla-app/src/player/input.rs
+++ b/crates/benilla-app/src/player/input.rs
@@ -24,7 +24,7 @@ pub(super) fn look_input(
 ) -> LookInput {
     // Both buttons held run forward and steer with the mouse, whichever went down first.
     // MOVEANDSTEER is the same state: its 1.12 body runs CameraOrSelectOrMove and TurnOrAction.
-    let steer_held = binds.pressed(crate::bindings::cmd::MOVE_AND_STEER);
+    let steer_held = binds.steering();
     let both_buttons = rig.world_mouse.both() || steer_held;
 
     // 1.12's `[InputControl+0x4]`, bit for bit: the camera's auto-follow arms on its edges.
@@ -36,37 +36,34 @@ pub(super) fn look_input(
                 w |= b;
             }
         };
-        set(
-            rig.world_mouse.held(LookButton::Right) || steer_held,
-            bit::RIGHT_MOUSE,
-        );
+        set(rig.world_mouse.turn() || steer_held, bit::RIGHT_MOUSE);
         set(
             rig.world_mouse.held(LookButton::Left) || steer_held,
             bit::LEFT_MOUSE,
         );
-        // `/follow` sets the forward bit through W's own setter, so it arms the camera like W.
+        // The auto-move sets the forward bit through W's own setter, so it arms the camera like W.
         set(
-            binds.pressed(crate::bindings::cmd::MOVE_FORWARD) || player.follow_forward,
+            binds.pressed(crate::bindings::Input::MoveForward) || player.auto_forward,
             bit::FORWARD,
         );
         set(
-            binds.pressed(crate::bindings::cmd::MOVE_BACKWARD),
+            binds.pressed(crate::bindings::Input::MoveBackward),
             bit::BACKWARD,
         );
         set(
-            binds.pressed(crate::bindings::cmd::STRAFE_LEFT),
+            binds.pressed(crate::bindings::Input::StrafeLeft),
             bit::STRAFE_LEFT,
         );
         set(
-            binds.pressed(crate::bindings::cmd::STRAFE_RIGHT),
+            binds.pressed(crate::bindings::Input::StrafeRight),
             bit::STRAFE_RIGHT,
         );
         set(
-            binds.pressed(crate::bindings::cmd::TURN_LEFT),
+            binds.pressed(crate::bindings::Input::TurnLeft),
             bit::TURN_LEFT,
         );
         set(
-            binds.pressed(crate::bindings::cmd::TURN_RIGHT),
+            binds.pressed(crate::bindings::Input::TurnRight),
             bit::TURN_RIGHT,
         );
         set(player.autorun, bit::AUTORUN);
@@ -121,7 +118,7 @@ pub(super) fn move_axes(
     // `Forward`). The reference's window-deactivate handler (`0x514490`, called only from the
     // WM_ACTIVATE slot at `0x493058`) releases every direction bit and keeps `0x1000`.
     let mut autorun_armed = false;
-    if binds.fired(crate::bindings::cmd::TOGGLE_AUTORUN) {
+    if binds.fired(crate::bindings::Input::ToggleAutoRun) {
         player.autorun = !player.autorun;
         autorun_armed = player.autorun;
     }
@@ -143,12 +140,10 @@ pub(super) fn move_axes(
     //   emit; ours is `state::may_translate`. The server-ride term is benilla's own.
     // A jump, a chat EditBox taking focus and a zone change leave it set; mounting is untraced and
     // leaves it set here. A focused chat box releases nothing, so W held through ENTER still runs.
-    let both_buttons_engaged = (both_buttons
-        && (rig.world_mouse.down(LookButton::Left) || rig.world_mouse.down(LookButton::Right)))
-        || binds.just_pressed(crate::bindings::cmd::MOVE_AND_STEER);
+    let both_buttons_engaged = (both_buttons && rig.world_mouse.rose()) || binds.steering_began();
     if state::autorun_cancelled(
-        binds.just_pressed(crate::bindings::cmd::MOVE_FORWARD),
-        binds.just_pressed(crate::bindings::cmd::MOVE_BACKWARD),
+        binds.just_pressed(crate::bindings::Input::MoveForward),
+        binds.just_pressed(crate::bindings::Input::MoveBackward),
         both_buttons_engaged,
         !may_translate || player.server_riding,
     ) {
@@ -158,11 +153,12 @@ pub(super) fn move_axes(
     // ── The forward/back axis ── The order of S and autorun decides: S held, then autorun
     // toggled, keeps both (the toggle pushes `0x1000`, so `test cl,0x30` misses) and the
     // reference sends MSG_MOVE_STOP with S held; autorun, then S, clears the bit at key-down and
-    // walks you backward. `/follow` is a held forward, W's own bit `0x100000` through W's setter,
-    // so it nets against S like W and never trips the cancel set, which fires on key-down edges.
+    // walks you backward. The auto-move is a held forward, W's own bit `0x100000` through W's
+    // setter, so it nets against S like W and never trips the cancel set, which fires on key-down
+    // edges.
     let fwd_axis = state::forward_axis(
-        binds.pressed(crate::bindings::cmd::MOVE_FORWARD) || player.follow_forward,
-        binds.pressed(crate::bindings::cmd::MOVE_BACKWARD),
+        binds.pressed(crate::bindings::Input::MoveForward) || player.auto_forward,
+        binds.pressed(crate::bindings::Input::MoveBackward),
         both_buttons,
         autorun,
     );
@@ -172,10 +168,10 @@ pub(super) fn move_axes(
     let mouselook = both_buttons || rig.look == Some(LookButton::Right);
     // The strafe axis nets like `fwd_axis`: vmangos relays no packet carrying both strafe bits,
     // and the reference's 1.12.1 capture sends none.
-    let strafe_left = binds.pressed(crate::bindings::cmd::STRAFE_LEFT);
-    let strafe_right = binds.pressed(crate::bindings::cmd::STRAFE_RIGHT);
-    let turn_left = binds.pressed(crate::bindings::cmd::TURN_LEFT);
-    let turn_right = binds.pressed(crate::bindings::cmd::TURN_RIGHT);
+    let strafe_left = binds.pressed(crate::bindings::Input::StrafeLeft);
+    let strafe_right = binds.pressed(crate::bindings::Input::StrafeRight);
+    let turn_left = binds.pressed(crate::bindings::Input::TurnLeft);
+    let turn_right = binds.pressed(crate::bindings::Input::TurnRight);
     let side_axis = i32::from(strafe_right) - i32::from(strafe_left)
         + if mouselook {
             i32::from(turn_right) - i32::from(turn_left)
diff --git a/crates/benilla-app/src/player/land.rs b/crates/benilla-app/src/player/land.rs
index fa5ce9d0..59ca609a 100644
--- a/crates/benilla-app/src/player/land.rs
+++ b/crates/benilla-app/src/player/land.rs
@@ -83,6 +83,7 @@ pub(crate) fn land_here(
         kind: ChatKind::Say,
         target: None,
         text,
+        language: None,
     });
     *pending = Some(time.elapsed_secs() + LAND_TIMEOUT);
 }
diff --git a/crates/benilla-app/src/player/posture.rs b/crates/benilla-app/src/player/posture.rs
index d93104bc..08162dd4 100644
--- a/crates/benilla-app/src/player/posture.rs
+++ b/crates/benilla-app/src/player/posture.rs
@@ -51,7 +51,7 @@ pub(super) fn update(
     // The queued asks (the `/sit` family) ran in the reference's message pass, before the X key
     // is read; the last writer wins, and all land on the single commit below.
     let mut request_stand = asks.read().last().map(|r| r.state);
-    if binds.fired(crate::bindings::cmd::SIT_OR_STAND) {
+    if binds.fired(crate::bindings::Input::SitOrStand) {
         request_stand = Some(u8::from(stand_state == 0));
     }
     // Movement stands us up, volunteered, as the server never does: translation, a keyboard turn
@@ -61,7 +61,7 @@ pub(super) fn update(
     // event stands us too (`0x60e139`: `GetStandState` `0x60be50`, then `0x60be30(0)`), read off
     // the latch [`super::wire_in::apply_server_moves`] armed this frame, as the mover runs later.
     let knocked_out_of_it = player.knockback.is_some();
-    if (moving || turned || knocked_out_of_it || binds.fired(crate::bindings::cmd::JUMP))
+    if (moving || turned || knocked_out_of_it || binds.fired(crate::bindings::Input::Jump))
         && stand_state != 0
         && request_stand.is_none()
     {
@@ -94,7 +94,7 @@ pub(super) fn update(
     // The sheath toggle (Z) cycles the anim layer's committed sheath state through its one setter
     // ([`crate::creature_anim::SheathRequest`]), which sends `CMSG_SETSHEATHED`; only it plays the
     // ceremony (`bInstant = 0` in `ToggleSheath` `0x5eb480`). No body model yet drops the press.
-    if binds.fired(crate::bindings::cmd::TOGGLE_SHEATH) {
+    if binds.fired(crate::bindings::Input::ToggleSheath) {
         if let Ok((e, _, _, _, Some(drv), store, engaged, _, _, wielded, _)) = body.single() {
             // Of `ToggleSheath`'s 12 silent guards: dead, in combat, any nonzero stand state,
             // mid-ceremony (clip 89/90) and mounted; its stunned and channeling guards are not
diff --git a/crates/benilla-app/src/player/state.rs b/crates/benilla-app/src/player/state.rs
index 2adbcaf2..03a0d328 100644
--- a/crates/benilla-app/src/player/state.rs
+++ b/crates/benilla-app/src/player/state.rs
@@ -296,10 +296,11 @@ pub(crate) struct Player {
     /// current bit (`0x60e080`). Observers read our gait off it, and it is in the server-authored
     /// merge mask, so a server move can flip it ([`super::wire_in`]); it owes no ack.
     pub(super) walking: bool,
-    /// `/follow` holding forward this frame: the reference's follow pushes W's own bit
-    /// (`0x60e790`), so this is a [`forward_axis`] term. Rewritten each frame by
-    /// [`super::follow::steer_follow`] just before the controller reads it.
-    pub(super) follow_forward: bool,
+    /// The auto-move (`/follow` or Click to Move) holding forward this frame: the reference pushes
+    /// W's own bit (`0x60e790`), so this is a [`forward_axis`] term. Rewritten each frame by
+    /// [`super::follow::steer_follow`] and [`super::approach::steer_approach`] just before the
+    /// controller reads it.
+    pub(super) auto_forward: bool,
     /// Free-fly (`F`): the camera moves on its own and the avatar/server position is frozen.
     pub(crate) detached: bool,
     /// `SMSG_CLIENT_CONTROL_UPDATE` with `allowMove = 0` named the unit we drive: us, while someone
@@ -486,6 +487,15 @@ pub(super) struct PendingKnockback {
 }
 
 impl Player {
+    /// A player whose last streamed movement word is `flags`, for the gates that read it.
+    #[cfg(test)]
+    pub(crate) fn with_move_flags(flags: u32) -> Self {
+        Self {
+            move_flags: flags,
+            ..Self::default()
+        }
+    }
+
     /// Take the jump a hover grant owes, clearing the latch: `Jump(0)` refuses only ROOT and
     /// FALLING (`0x7c625c`), skipping the hover test (`0x7c6236`), and a refused jump is dropped,
     /// not retried.
diff --git a/crates/benilla-app/src/player/walk.rs b/crates/benilla-app/src/player/walk.rs
index 4d9e1d6d..7836b659 100644
--- a/crates/benilla-app/src/player/walk.rs
+++ b/crates/benilla-app/src/player/walk.rs
@@ -31,7 +31,7 @@ pub(super) fn update(
     body: &BodyQuery,
     binds: &crate::bindings::BindingsState,
 ) {
-    if !binds.fired(crate::bindings::cmd::TOGGLE_RUN) {
+    if !binds.fired(crate::bindings::Input::ToggleRun) {
         return;
     }
     let dead = body
diff --git a/crates/benilla-app/src/portrait/mod.rs b/crates/benilla-app/src/portrait/mod.rs
index 6fdeab7a..efdd9933 100644
--- a/crates/benilla-app/src/portrait/mod.rs
+++ b/crates/benilla-app/src/portrait/mod.rs
@@ -64,8 +64,10 @@ use light::{model_pane_light, studio_light, BoothLight};
 pub(crate) mod test_bake;
 
 /// The round portrait slots, each with its own layer and camera. `"npc"` is an interaction
-/// window's NPC ([`crate::ui_session::InteractNpc`]); `"targettarget"` resolves only while drawn.
-const SLOTS: [&str; 9] = [
+/// window's NPC ([`crate::ui_session::InteractNpc`]); `"targettarget"` resolves only while drawn,
+/// and so do a party member's pet, `"partypetN"`, and the loot source `SetLootPortrait` binds
+/// ([`benilla_ui::script::LOOT_PORTRAIT_UNIT`]).
+const SLOTS: [&str; 14] = [
     "player",
     "target",
     "targettarget",
@@ -75,6 +77,11 @@ const SLOTS: [&str; 9] = [
     "party2",
     "party3",
     "party4",
+    "partypet1",
+    "partypet2",
+    "partypet3",
+    "partypet4",
+    benilla_ui::script::LOOT_PORTRAIT_UNIT,
 ];
 /// The character window's full-body pane: the dressed player, sampled square.
 const PAPERDOLL_SLOT: &str = "paperdoll";
@@ -658,8 +665,10 @@ pub(crate) struct PartyBooths<'w, 's> {
     palettes: ResMut<'w, benilla_world::rig_palette::RigPalettes>,
     pet_bar: Res<'w, crate::ui_pet::PetBar>,
     names: Res<'w, crate::names::NameCache>,
-    /// What the UI drew last frame, read by `"targettarget"` alone.
+    /// What the UI drew last frame, read by `"targettarget"` and the loot source.
     panes: Res<'w, BoothPanes>,
+    /// The open loot, whose source `SetLootPortrait` bakes (`0x4c2bc5`, `[0xb71b48]`).
+    loot: Option<Res<'w, crate::ui_loot::LootState>>,
     /// The guid-keyed bake cache, and a fresh target plus the camera's [`RenderTarget`] for the
     /// handover.
     bakes: ResMut<'w, PortraitBakes>,
@@ -1326,6 +1335,32 @@ fn sync_portraits(
                 entity
             }
             "npc" => interact_npc.0,
+            // Gated on the UI drawing it, as `"targettarget"`: no stock file binds it.
+            benilla_ui::script::LOOT_PORTRAIT_UNIT => party
+                .panes
+                .0
+                .contains_key(token)
+                .then(|| {
+                    party
+                        .loot
+                        .as_ref()
+                        .and_then(|l| l.source())
+                        .and_then(|g| party.index.0.get(&g).copied())
+                })
+                .flatten(),
+            // A party member's pet, gated on the UI drawing it as `"targettarget"` is: a slot's
+            // frame ships hidden, and an undrawn one would bake for nothing.
+            tok if tok.starts_with("partypet") => {
+                let (entity, stand_in) = party_pet_subject(
+                    &party.roster,
+                    tok,
+                    party.panes.0.contains_key(tok),
+                    |g| party.index.0.get(&g).copied(),
+                    |g| party.index.0.get(&g).and_then(|e| stores_q.get(*e).ok()),
+                );
+                unseen = stand_in.or(unseen);
+                entity
+            }
             // Out of range, the stand-in's race and sex come from the name cache.
             tok => {
                 let member = tok
@@ -2176,12 +2211,56 @@ fn player_temporary_portrait(race: Option<u8>, sex: Option<u8>) -> String {
     format!("{TEMPORARY_PORTRAIT}-{sex}-{race}.blp")
 }
 
+/// What `"partypetN"`'s portrait shows, as the entity to bake and the stand-in file: the pet the
+/// roster names for that party slot (`0x4e81d0`) while the UI draws the slot. A pet the client does
+/// not hold takes the roster pet's stand-in (`0x525cb0`), and one with no pet record, blank
+/// (`0x51a0ce`), so neither.
+///
+/// Deviation: the reference probes a bake cache keyed by the record's display id (`0x525cb0`,
+/// `0xc0cea4`) before the stand-in, so a pet out of view keeps its face. benilla holds no such
+/// cache, and [`PortraitBakes`] is keyed by guid for the party slots alone: the stand-in shows.
+fn party_pet_subject<'a>(
+    roster: &crate::ui_party::GroupState,
+    token: &str,
+    drawn: bool,
+    entity_of: impl Fn(u64) -> Option<Entity>,
+    store_of: impl Fn(u64) -> Option<&'a crate::net::ObjectStore>,
+) -> (Option<Entity>, Option<String>) {
+    if !drawn {
+        return (None, None);
+    }
+    let Some(member) = token
+        .strip_prefix("partypet")
+        .and_then(|n| n.parse::<usize>().ok())
+        .and_then(|n| n.checked_sub(1))
+        .and_then(|n| roster.party_slots().nth(n))
+    else {
+        return (None, None);
+    };
+    let Some(pet) = roster.party_pet_guid(member.guid, store_of(member.guid).map(|s| &s.0)) else {
+        return (None, None);
+    };
+    match entity_of(pet) {
+        Some(entity) => (Some(entity), None),
+        None => (
+            None,
+            roster.pet_record(pet).map(|_| pet_temporary_portrait()),
+        ),
+    }
+}
+
 /// The creature stand-in, benilla's own file: the reference's only creature stand-in is `-Pet`,
 /// for a roster pet with no object (`0x525cb0`), and a live creature not yet loaded shows blank.
 fn creature_temporary_portrait() -> String {
     format!("{TEMPORARY_PORTRAIT}-Monster.blp")
 }
 
+/// A roster pet with no object and no bake under its display id (`0x525cb0`): the reference's
+/// creature stand-in, its only.
+fn pet_temporary_portrait() -> String {
+    format!("{TEMPORARY_PORTRAIT}-Pet.blp")
+}
+
 /// Set the named slot's camera transform and projection to `rig`.
 fn aim(
     cams: &mut Query<(&BoothCam, &mut Transform, &mut Projection)>,
@@ -2201,6 +2280,117 @@ mod tests {
     use super::*;
     use crate::entities::ItemModelKind;
 
+    /// The stock pet frame binds `"partypetN"` (`PartyFrameTemplates.xml`, `UnitFrame_Initialize`),
+    /// and `SetPortraitTexture` draws only a token a slot bakes.
+    #[test]
+    fn every_party_pet_token_has_a_portrait_slot() {
+        for token in crate::ui_party::PARTY_PET_TOKENS {
+            assert!(SLOTS.contains(&token), "{token} has no slot");
+        }
+    }
+
+    /// The party pet's portrait, by what the client holds: the pet's own model while it is held,
+    /// the roster pet's stand-in (`0x525cb0`) while only its owner's record names it, blank with no
+    /// record (`0x51a0ce`), and nothing while the UI is not drawing the slot.
+    #[test]
+    fn a_party_pets_portrait_is_its_bake_else_the_roster_pets_stand_in() {
+        use benilla_protocol::messages::{
+            member_status, GroupMemberEntry, ObjectFields, PartyMemberStatsInfo,
+        };
+        const MEMBER: u64 = 0x1001;
+        const PET: u64 = 0xF140_0000_0000_0001;
+        let mut world = World::new();
+        let held = world.spawn_empty().id();
+        let summon = |guid: u64| {
+            crate::net::ObjectStore(ObjectFields::from_pairs(&[
+                (8, guid as u32),
+                (9, (guid >> 32) as u32),
+            ]))
+        };
+        let group = |status: u8| {
+            let mut g = crate::ui_party::GroupState::default();
+            g.apply_list(
+                0,
+                0,
+                vec![GroupMemberEntry {
+                    name: "Brisca".into(),
+                    guid: MEMBER,
+                    status,
+                    flags: 0,
+                }],
+                MEMBER,
+                None,
+                None,
+            );
+            g.stats.insert(
+                MEMBER,
+                PartyMemberStatsInfo {
+                    status: Some(status),
+                    pet_guid: Some(PET),
+                    ..Default::default()
+                },
+            );
+            g
+        };
+        let subject = |g: &crate::ui_party::GroupState,
+                       drawn: bool,
+                       pet_held: bool,
+                       owner: Option<&crate::net::ObjectStore>| {
+            party_pet_subject(
+                g,
+                "partypet1",
+                drawn,
+                |guid| (pet_held && guid == PET).then_some(held),
+                |guid| owner.filter(|_| guid == MEMBER),
+            )
+        };
+        let online = group(member_status::ONLINE);
+        let stand_in = Some(pet_temporary_portrait());
+        assert!(stand_in
+            .as_deref()
+            .is_some_and(|f| f.ends_with("TemporaryPortrait-Pet.blp")));
+
+        assert_eq!(
+            subject(&online, false, true, None),
+            (None, None),
+            "not drawn"
+        );
+        assert_eq!(
+            subject(&online, true, true, None),
+            (Some(held), None),
+            "held"
+        );
+        assert_eq!(
+            subject(&online, true, false, None),
+            (None, stand_in.clone()),
+            "the record"
+        );
+        // A held owner names its pet off its descriptor, whatever the record holds.
+        let owner = summon(PET);
+        assert_eq!(
+            subject(&online, true, false, Some(&owner)),
+            (None, stand_in)
+        );
+        let mut no_record = group(member_status::ONLINE);
+        no_record.stats.clear();
+        assert_eq!(
+            subject(&no_record, true, false, Some(&owner)),
+            (None, None),
+            "a pet with no record is blank"
+        );
+        let offline = group(member_status::OFFLINE);
+        assert_eq!(
+            subject(&offline, true, true, None),
+            (None, None),
+            "an offline owner's pet"
+        );
+        assert_eq!(
+            party_pet_subject(&online, "partypet2", true, |_| Some(held), |_| None),
+            (None, None),
+            "a slot with no member"
+        );
+    }
+
     #[test]
     fn the_bake_cache_replaces_in_place_and_evicts_oldest_first() {
         let mut bakes = PortraitBakes::default();
diff --git a/crates/benilla-app/src/run_mode.rs b/crates/benilla-app/src/run_mode.rs
index 3b9b02de..2a8b7f55 100644
--- a/crates/benilla-app/src/run_mode.rs
+++ b/crates/benilla-app/src/run_mode.rs
@@ -127,9 +127,9 @@ pub(crate) fn free_fly_hint() -> String {
 
 /// This crate's source directory on a dev build, `None` in a player build. The `cfg` must be real,
 /// not a runtime check: `env!("CARGO_MANIFEST_DIR")` names the build machine, and the literal must
-/// be absent from a player binary. Read by [`crate::ui_script`] (live `assets/ui`) and
-/// [`crate::local_state`] (the project-folder home); held by
-/// [`tests::the_dev_plane_has_exactly_one_door`].
+/// be absent from a player binary. Read by [`crate::ui_script`] for the live `assets/ui`, which are
+/// benilla's own files whoever the launcher is; the launcher's folder is
+/// [`benilla_formats::project_folder`]. Held by [`tests::the_dev_plane_has_exactly_one_door`].
 pub(crate) fn dev_source_dir() -> Option<&'static std::path::Path> {
     #[cfg(feature = "dev")]
     {
@@ -158,23 +158,15 @@ pub(crate) struct DeclaredIdentity {
     pub(crate) character: String,
 }
 
-/// The declaration, read off the project folder; a player build has none.
-#[cfg(feature = "dev")]
+/// The declaration, read off the launcher's project folder ([`benilla_formats::project_folder`]);
+/// a player build has none.
 pub(crate) fn declared_identity() -> Option<DeclaredIdentity> {
-    let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-        .ancestors()
-        .nth(2)?;
+    let root = benilla_formats::project_folder()?;
     parse_identity(&std::fs::read_to_string(root.join(".probe-identity")).ok()?)
 }
 
-#[cfg(not(feature = "dev"))]
-pub(crate) fn declared_identity() -> Option<DeclaredIdentity> {
-    None
-}
-
 /// The file as an identity, `None` unless both the account and the character are there; the
 /// password is never read.
-#[cfg_attr(not(feature = "dev"), allow(dead_code))]
 fn parse_identity(text: &str) -> Option<DeclaredIdentity> {
     let field = |key: &str| {
         text.lines()
diff --git a/crates/benilla-app/src/script_calls.rs b/crates/benilla-app/src/script_calls.rs
new file mode 100644
index 00000000..7231a433
--- /dev/null
+++ b/crates/benilla-app/src/script_calls.rs
@@ -0,0 +1,838 @@
+//! The one point in the frame where the script calls that touch the selection, the player's cast
+//! or the targeting cursor take effect, in the order the script made them. In the reference each
+//! such call is done when it returns (the macro runner `0x4f14e0` fires every line in one pass;
+//! `TargetByName` `0x489d60` and `TargetUnit` `0x4899d0` commit through `SetSelection 0x493540`;
+//! `CastSpellByName` `0x4b4ab0` casts at the selection as it stands then), so `/target Bob` then
+//! `/cast Flash Heal` heals Bob, and `/cast` then `/target` casts at the old target. A fixed order
+//! between per-kind drains cannot give both, so the VM keeps one queue ([`ScriptCall`]) and this
+//! system applies it front to back, each call through its owner's applier.
+
+use std::collections::VecDeque;
+
+use bevy::prelude::*;
+
+use benilla_ui::script::{ScriptCall, UiScript};
+
+/// How deep calls made while applying a call may nest in one frame: a macro whose line presses a
+/// macro, and so on. Past it (a macro that presses itself), what is left waits for the next frame,
+/// so a frame always ends.
+const MAX_NESTING: u8 = 8;
+
+/// Apply this frame's script calls in call order, in the target chain after the world clicks.
+#[allow(clippy::type_complexity)] // the appliers, one per owner of the state a call touches
+pub(crate) fn apply_script_calls(
+    script: Option<NonSendMut<UiScript>>,
+    mut appliers: ParamSet<(
+        crate::target::ScriptSelect,
+        crate::spell::ScriptCursor,
+        crate::spell::SelfCancel,
+        crate::spell::ScriptCast,
+        crate::ui_action::ActionPress,
+        crate::ui_items::ScriptItemUse,
+        crate::ui_pet::PetPress,
+        crate::ui_action::AttackPress,
+    )>,
+) {
+    let Some(mut script) = script else {
+        return;
+    };
+    in_call_order(&mut script, |script, call| {
+        match call {
+            ScriptCall::Select(request) => appliers.p0().select(request),
+            ScriptCall::TargetByName { name, exact } => appliers.p0().target_by_name(&name, exact),
+            ScriptCall::TargetNearest { mode, reverse } => {
+                appliers.p0().target_nearest(mode, reverse);
+            }
+            ScriptCall::TargetLastTarget => appliers.p0().target_last_target(),
+            ScriptCall::ClearTarget => appliers.p0().clear_target(),
+            ScriptCall::AttackTarget => appliers.p7().attack_target(),
+            ScriptCall::SpellTargetUnit(token) => appliers.p1().spell_target_unit(&token),
+            ScriptCall::SpellStopTargeting => appliers.p1().stop_targeting(),
+            ScriptCall::SpellStopCasting => appliers.p2().stop_casting(),
+            ScriptCall::CastSpell { spell_id, on_self } => {
+                crate::ui_spellbook::cast_spell(&mut appliers.p3(), spell_id, on_self);
+            }
+            ScriptCall::CastShapeshiftForm(spell_id) => {
+                crate::ui_shapeshift::cast_form(&mut appliers.p3(), spell_id);
+            }
+            ScriptCall::UseAction(press) => {
+                let used = crate::ui_action::use_action(&mut appliers.p4(), script, press);
+                if used == crate::ui_action::UseOutcome::Attack {
+                    appliers.p7().attack_target();
+                }
+            }
+            ScriptCall::UseContainerItem { bag, slot } => {
+                appliers.p5().use_container_item(script, bag, slot);
+            }
+            ScriptCall::UseInventoryItem(id) => appliers.p5().use_inventory_item(script, id),
+            ScriptCall::CastPetSpell { spell_id, on_self } => {
+                crate::ui_pet_book::cast_pet_spell(&mut appliers.p6(), spell_id, on_self);
+            }
+            ScriptCall::PetAction(slot) => appliers.p6().press_slot(slot),
+            ScriptCall::PetOrder(packed) => appliers.p6().order(packed),
+        }
+        // TryCast's attack pick can move the selection mid-cast (`0x6e4efb`), so a press held
+        // there is picked and resumed before the next call reads the selection.
+        let Some(held) = appliers.p3().ladder.take_held() else {
+            return;
+        };
+        if appliers.p7().pick_for_cast(held) {
+            let mut cast = appliers.p3();
+            let ctx = cast.targeting.context();
+            cast.ladder.resume_after_pick(held, &ctx);
+        }
+    });
+}
+
+/// Apply every queued call front to back. Applying one may queue more: a macro's lines run
+/// inside `UseAction` (`0x4e6098 call 0x4f1460`), so the calls they make go before the next one
+/// queued.
+pub(crate) fn in_call_order(
+    script: &mut UiScript,
+    mut apply: impl FnMut(&mut UiScript, ScriptCall),
+) {
+    let mut queue: VecDeque<(ScriptCall, u8)> = script
+        .take_script_calls()
+        .into_iter()
+        .map(|call| (call, 0))
+        .collect();
+    let mut next_frame = Vec::new();
+    while let Some((call, depth)) = queue.pop_front() {
+        apply(script, call);
+        let nested = script.take_script_calls();
+        if depth >= MAX_NESTING {
+            next_frame.extend(nested);
+            continue;
+        }
+        for call in nested.into_iter().rev() {
+            queue.push_front((call, depth + 1));
+        }
+    }
+    if !next_frame.is_empty() {
+        script.requeue_script_calls(next_frame);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::net::{
+        ClientCommand, Guid, GuidIndex, NetCommands, ObjectStore, SelfGuid, SelfPlayer,
+    };
+    use crate::target::Selection;
+    use benilla_protocol::messages::{
+        ActionButton, GroupMemberEntry, ACTION_KIND_MACRO, ACTION_KIND_SPELL,
+    };
+    use benilla_ui::script::{PetBookState, SpellBookState, SpellSlotView, SpellTabView};
+    use bevy::ecs::system::RunSystemOnce;
+    use crossbeam_channel::Receiver;
+
+    const ME: u64 = 0x10;
+    /// The unit selected before the script runs.
+    const OLD: u64 = 0x21;
+    /// `party1`, the unit the script selects.
+    const NEW: u64 = 0x22;
+    /// Not in the (absent) spell catalog, so the cast's wire target is the selection as it stands.
+    const HEAL: u32 = 2050;
+    /// A mob the TAB scan can pick: it alone carries a `NetEntity`.
+    const MOB: u64 = 0x31;
+    /// `UNIT_FIELD_FACTIONTEMPLATE`, `UNIT_FIELD_HEALTH`, `UNIT_FIELD_FLAGS`.
+    const TEMPLATE: u16 = 35;
+    const HEALTH: u16 = 22;
+    const FLAGS: u16 = 46;
+    /// The fixture's templates: ours (group 1, friendly toward group 2, enemy of group 4), a
+    /// friendly NPC's (group 2) and a hostile mob's (group 4).
+    const OURS: u32 = 1;
+    const FRIEND: u32 = 2;
+    const FOE: u32 = 3;
+
+    struct Frame {
+        app: App,
+        rx: Receiver<ClientCommand>,
+    }
+
+    /// The whole client, headless, with us, `OLD` (selected when `selected`) and `NEW` as
+    /// `party1`, and a VM whose book holds Heal.
+    fn frame(selected: bool) -> Frame {
+        let mut app = crate::game_plugins::schedule_tests::headless_client();
+        let (tx, rx) = crossbeam_channel::unbounded();
+        app.insert_resource(NetCommands(tx));
+        let world = app.world_mut();
+        // Fields 22 health and 28 max health: every unit is alive.
+        let unit = |guid: u64, x: f32| {
+            (
+                Guid(guid),
+                Transform::from_xyz(x, 0.0, 0.0),
+                GlobalTransform::from_translation(Vec3::new(x, 0.0, 0.0)),
+                ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                    (22, 100),
+                    (28, 100),
+                ])),
+            )
+        };
+        // We are a player (`OBJECT_FIELD_TYPE` 0x19, `UNIT_FLAG_PVP_ATTACKABLE`), which selects
+        // `CanAttack`'s player arm: with no `FactionTemplate.dbc` a plain unit is attackable.
+        let me = world.spawn((SelfPlayer, unit(ME, 0.0))).id();
+        world
+            .entity_mut(me)
+            .insert(ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (2, 0x19),
+                (22, 100),
+                (28, 100),
+                (46, 0x8),
+            ])));
+        let old = world.spawn(unit(OLD, 5.0)).id();
+        let new = world.spawn(unit(NEW, 6.0)).id();
+        let index = &mut world.resource_mut::<GuidIndex>().0;
+        index.insert(ME, me);
+        index.insert(OLD, old);
+        index.insert(NEW, new);
+        world.resource_mut::<SelfGuid>().0 = Some(ME);
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .members
+            .push(GroupMemberEntry {
+                name: "Bob".into(),
+                guid: NEW,
+                status: 1,
+                flags: 0,
+            });
+        if selected {
+            *world.resource_mut::<Selection>() = Selection {
+                target: Some(old),
+                guid: Some(OLD),
+                ..Default::default()
+            };
+        }
+        let mut script = UiScript::new().expect("a VM");
+        script.set_spellbook(SpellBookState {
+            tabs: vec![SpellTabView {
+                name: "Holy".into(),
+                texture: None,
+                offset: 0,
+                num_spells: 1,
+            }],
+            slots: vec![SpellSlotView {
+                spell_id: HEAL,
+                name: "Heal".into(),
+                ..Default::default()
+            }],
+        });
+        if selected {
+            // The frame's unit snapshot, as the feed pushed it before the input pass.
+            script.set_unit(
+                "target",
+                Some(benilla_ui::script::UnitState {
+                    exists: true,
+                    ..Default::default()
+                }),
+            );
+        }
+        world.insert_non_send_resource(script);
+        Frame { app, rx }
+    }
+
+    /// Run `lua` in the VM, then this frame's one application of what it queued.
+    fn run(f: &mut Frame, lua: &str) {
+        f.app
+            .world_mut()
+            .non_send_resource_mut::<UiScript>()
+            .run(lua)
+            .expect("the script runs");
+        f.app
+            .world_mut()
+            .run_system_once(apply_script_calls)
+            .expect("the calls apply as a one-shot system");
+    }
+
+    /// The `CMSG_CAST_SPELL`s sent, as `(spell, target)`.
+    fn casts(f: &Frame) -> Vec<(u32, Option<u64>)> {
+        f.rx.try_iter()
+            .filter_map(|c| match c {
+                ClientCommand::CastSpell { spell_id, target } => Some((spell_id, target)),
+                _ => None,
+            })
+            .collect()
+    }
+
+    fn selected(f: &Frame) -> Option<u64> {
+        f.app.world().resource::<Selection>().guid
+    }
+
+    /// `MOB` at 3 yd, alive, with `fields` over its health.
+    fn spawn_mob(f: &mut Frame, fields: &[(u16, u32)]) {
+        let world = f.app.world_mut();
+        let mut pairs = vec![(HEALTH, 100), (28, 100)];
+        pairs.extend_from_slice(fields);
+        let mob = world
+            .spawn((
+                Guid(MOB),
+                crate::net::NetEntity {
+                    kind: benilla_protocol::EntityKind::Unit,
+                    display_id: None,
+                    scale: 1.0,
+                },
+                Transform::from_xyz(3.0, 0.0, 0.0),
+                GlobalTransform::from_translation(Vec3::new(3.0, 0.0, 0.0)),
+                ObjectStore(benilla_protocol::ObjectFields::from_pairs(&pairs)),
+            ))
+            .id();
+        world.resource_mut::<GuidIndex>().0.insert(MOB, mob);
+    }
+
+    /// Give the world a faction table, us [`OURS`] and `OLD` the `old` template with `fields`
+    /// over it.
+    fn with_factions(f: &mut Frame, old: u32, fields: &[(u16, u32)]) {
+        use benilla_formats::{FactionCatalog, FactionTemplate};
+        use std::collections::HashMap;
+        let tpl = |faction, group_mask, friend_group_mask, enemy_group_mask| FactionTemplate {
+            faction,
+            group_mask,
+            friend_group_mask,
+            enemy_group_mask,
+            enemies: [0; 4],
+            friends: [0; 4],
+        };
+        let world = f.app.world_mut();
+        world.insert_resource(crate::target::Factions::from_catalog(
+            FactionCatalog::from_rows(
+                HashMap::from([
+                    (OURS, tpl(OURS, 1, 2, 4)),
+                    (FRIEND, tpl(FRIEND, 2, 0, 0)),
+                    (FOE, tpl(FOE, 4, 0, 0)),
+                ]),
+                HashMap::new(),
+            ),
+        ));
+        let index = &world.resource::<GuidIndex>().0;
+        let (me, old_unit) = (index[&ME], index[&OLD]);
+        world
+            .entity_mut(me)
+            .insert(ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (2, 0x19),
+                (HEALTH, 100),
+                (28, 100),
+                (FLAGS, 0x8),
+                (TEMPLATE, OURS),
+            ])));
+        let mut pairs = vec![(HEALTH, 100), (28, 100), (TEMPLATE, old)];
+        pairs.extend_from_slice(fields);
+        world
+            .entity_mut(old_unit)
+            .insert(ObjectStore(benilla_protocol::ObjectFields::from_pairs(
+                &pairs,
+            )));
+    }
+
+    /// The `CMSG_ATTACKSWING`s sent, and whether a `CMSG_ATTACKSTOP` went out.
+    fn swings(f: &Frame) -> (Vec<u64>, bool) {
+        let mut stopped = false;
+        let swings =
+            f.rx.try_iter()
+                .filter_map(|c| match c {
+                    ClientCommand::AttackSwing { guid } => Some(guid),
+                    ClientCommand::AttackStop => {
+                        stopped = true;
+                        None
+                    }
+                    _ => None,
+                })
+                .collect();
+        (swings, stopped)
+    }
+
+    /// The keys of the error lines raised.
+    fn errors(f: &Frame) -> Vec<&'static str> {
+        f.app
+            .world()
+            .resource::<crate::ui_action::UiErrorKeys>()
+            .0
+            .iter()
+            .map(|e| e.key)
+            .collect()
+    }
+
+    /// `CastSpellByName(name, onSelf)` (`0x4b4ab0`) and `CastSpell(slot, book, onSelf)` (`0x4b42f0`)
+    /// swap the target guid for the active player's (`0x4b4afa`, `0x4b4345`) when
+    /// `GetBoolOrDefault` reads the flag true, so the cast goes to us whoever is selected, and the
+    /// selection stays where it was. Without the flag it goes to the selection.
+    #[test]
+    fn on_self_casts_at_the_player_and_leaves_the_selection() {
+        for (lua, target, selection) in [
+            (r#"CastSpellByName("Heal", 1)"#, ME, OLD),
+            (r#"CastSpellByName("Heal", "yes")"#, ME, OLD),
+            (r#"CastSpell(1, "spell", 1)"#, ME, OLD),
+            (
+                r#"TargetUnit("party1") CastSpellByName("Heal", 1)"#,
+                ME,
+                NEW,
+            ),
+            (r#"CastSpellByName("Heal")"#, OLD, OLD),
+            (r#"CastSpellByName("Heal", 0.5)"#, OLD, OLD),
+            (r#"CastSpellByName("Heal", "false")"#, OLD, OLD),
+            (r#"CastSpell(1, "spell")"#, OLD, OLD),
+            (r#"CastSpell(1, "spell", "0")"#, OLD, OLD),
+        ] {
+            let mut f = frame(true);
+            run(&mut f, lua);
+            assert_eq!(casts(&f), vec![(HEAL, Some(target))], "{lua}");
+            assert_eq!(selected(&f), Some(selection), "{lua}");
+        }
+    }
+
+    /// Power Word: Fortitude's word, an assist unit (implicit target 21), in the catalog and
+    /// the book.
+    const FORTITUDE: u32 = 1243;
+
+    fn with_fortitude(f: &mut Frame) {
+        let world = f.app.world_mut();
+        let display = benilla_formats::SpellDisplay {
+            implicit_target_a1: 21,
+            ..Default::default()
+        };
+        world.insert_resource(crate::ui_action::Spells {
+            catalog: benilla_formats::SpellCatalog::from_displays([(FORTITUDE, display)].into()),
+            ..crate::ui_action::Spells::empty_for_tests()
+        });
+        world
+            .non_send_resource_mut::<UiScript>()
+            .set_spellbook(SpellBookState {
+                tabs: vec![SpellTabView {
+                    name: "Priest".into(),
+                    texture: None,
+                    offset: 0,
+                    num_spells: 1,
+                }],
+                slots: vec![SpellSlotView {
+                    spell_id: FORTITUDE,
+                    name: "Fortitude".into(),
+                    ..Default::default()
+                }],
+            });
+    }
+
+    /// The bind runs the ordinary relation chain over the player: with a unit we cannot assist
+    /// selected and `autoSelfCast` off, the plain call binds nothing (the cursor comes up), while
+    /// `onSelf` binds us; with a friendly player selected the plain call binds that player.
+    #[test]
+    fn on_self_binds_the_player_where_the_selection_is_not_assistable() {
+        for (selected_template, lua, target) in [
+            (FOE, r#"CastSpellByName("Fortitude")"#, None),
+            (FOE, r#"CastSpellByName("Fortitude", 1)"#, Some(ME)),
+            (FOE, r#"CastSpell(1, "spell", 1)"#, Some(ME)),
+            (FRIEND, r#"CastSpellByName("Fortitude")"#, Some(OLD)),
+            (FRIEND, r#"CastSpellByName("Fortitude", 1)"#, Some(ME)),
+        ] {
+            let mut f = frame(true);
+            // `CanAssist` passes a friendly player-controlled unit (`UNIT_FLAG_PLAYER_CONTROLLED`).
+            with_factions(&mut f, selected_template, &[(FLAGS, 0x8)]);
+            with_fortitude(&mut f);
+            run(&mut f, lua);
+            let sent: Vec<_> = target.into_iter().map(|t| (FORTITUDE, Some(t))).collect();
+            assert_eq!(casts(&f), sent, "{lua} at template {selected_template}");
+            assert_eq!(selected(&f), Some(OLD), "{lua}");
+        }
+    }
+
+    /// The pet's guid, and the pet book's Growl (`CMSG_PET_ACTION`'s type-1 word, `0x4b34ce`).
+    const PET: u64 = 0x50;
+    const GROWL: u32 = 2649;
+
+    /// The `CMSG_PET_ACTION`s sent, as `(pet, word, target)`.
+    fn pet_actions(f: &Frame) -> Vec<(u64, u32, u64)> {
+        f.rx.try_iter()
+            .filter_map(|c| match c {
+                ClientCommand::PetAction {
+                    pet_guid,
+                    packed,
+                    target_guid,
+                } => Some((pet_guid, packed, target_guid)),
+                _ => None,
+            })
+            .collect()
+    }
+
+    /// `0x4b3300`'s pet fork sends the guid it was handed as the order's target (`0x4b34ce`), so
+    /// `CastSpell(slot, "pet", 1)` aims the pet's spell at the player, not the selection.
+    #[test]
+    fn a_pet_book_cast_on_self_aims_at_the_player() {
+        for (lua, target) in [
+            (r#"CastSpell(1, "pet", 1)"#, ME),
+            (r#"CastSpell(1, "pet", "on")"#, ME),
+            (r#"CastSpell(1, "pet")"#, OLD),
+            (r#"CastSpell(1, "pet", "0")"#, OLD),
+        ] {
+            let mut f = frame(true);
+            f.app
+                .world_mut()
+                .resource_mut::<crate::ui_pet::PetBar>()
+                .spells
+                .pet_guid = PET;
+            f.app
+                .world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .set_pet_book(PetBookState {
+                    token: Some("PET".into()),
+                    slots: vec![SpellSlotView {
+                        spell_id: GROWL,
+                        name: "Growl".into(),
+                        ..Default::default()
+                    }],
+                });
+            run(&mut f, lua);
+            assert_eq!(
+                pet_actions(&f),
+                vec![(PET, 0x0100_0000 | GROWL, target)],
+                "{lua}"
+            );
+            assert_eq!(selected(&f), Some(OLD), "{lua}");
+        }
+    }
+
+    /// `/target` then `/cast`: `TargetUnit` commits through `SetSelection 0x493540` before it
+    /// returns, and `CastSpellByName` (`0x4b4ab0`) casts at the selection as it stands then.
+    #[test]
+    fn a_cast_after_a_target_goes_to_the_new_target() {
+        let mut f = frame(true);
+        run(&mut f, r#"TargetUnit("party1") CastSpellByName("Heal")"#);
+        assert_eq!(casts(&f), vec![(HEAL, Some(NEW))]);
+        assert_eq!(selected(&f), Some(NEW));
+    }
+
+    /// `/cast` then `/target`: the cast is done before the selection moves.
+    #[test]
+    fn a_cast_before_a_target_goes_to_the_old_target() {
+        let mut f = frame(true);
+        run(&mut f, r#"CastSpellByName("Heal") TargetUnit("party1")"#);
+        assert_eq!(casts(&f), vec![(HEAL, Some(OLD))]);
+        assert_eq!(selected(&f), Some(NEW));
+    }
+
+    /// `ClearTarget` (`0x489ff0`) reads the selection at call time and deselects through
+    /// `0x493540(0,0)`: after `TargetUnit("player")` there is one to clear, with or without a
+    /// target before the script ran.
+    #[test]
+    fn a_clear_after_a_target_ends_with_nothing_selected() {
+        for selected_before in [true, false] {
+            let mut f = frame(selected_before);
+            run(&mut f, r#"TargetUnit("player") ClearTarget()"#);
+            assert_eq!(selected(&f), None, "selected before: {selected_before}");
+            let world = f.app.world();
+            assert_eq!(world.resource::<Selection>().target, None);
+            let sends: Vec<u64> =
+                f.rx.try_iter()
+                    .filter_map(|c| match c {
+                        ClientCommand::SetSelection { guid } => Some(guid),
+                        _ => None,
+                    })
+                    .collect();
+            assert_eq!(sends, vec![ME, 0], "selected before: {selected_before}");
+        }
+    }
+
+    /// `TargetNearestEnemy` (`0x489a80` → `0x493f60(0, 1)`) commits through `SetSelection` before
+    /// it returns, so the cast after it in the same script goes to the unit the TAB cycle picked.
+    #[test]
+    fn a_cast_after_target_nearest_enemy_goes_to_the_picked_unit() {
+        let mut f = frame(true);
+        // OLD and NEW carry no `NetEntity`, so the scan's one candidate is the mob.
+        spawn_mob(&mut f, &[]);
+        run(&mut f, r#"TargetNearestEnemy() CastSpellByName("Heal")"#);
+        assert_eq!(casts(&f), vec![(HEAL, Some(MOB))]);
+        assert_eq!(selected(&f), Some(MOB));
+    }
+
+    /// `TargetLastTarget` (`0x489b00`) reads the pair `SetSelection` stamps with the outgoing
+    /// selection (`0x49361d`): a held pair re-selects, which swaps the two; an empty one deselects
+    /// through `0x493540(0,0)` (`0x489b2d`), which stamps what it drops.
+    #[test]
+    fn target_last_target_swaps_and_deselects_on_an_empty_pair() {
+        let mut f = frame(false);
+        // Selecting from nothing stamps nothing: the pair is empty, so the call deselects.
+        run(&mut f, r#"TargetUnit("party1") TargetLastTarget()"#);
+        assert_eq!(selected(&f), None);
+        // The deselect stamped NEW, so the next call brings it back.
+        run(&mut f, "TargetLastTarget()");
+        assert_eq!(selected(&f), Some(NEW));
+        // A switch stamps the outgoing unit; the call swaps back, and the cast after it in the
+        // same script goes to the unit it re-selected.
+        run(
+            &mut f,
+            r#"TargetUnit("player") TargetLastTarget() CastSpellByName("Heal")"#,
+        );
+        assert_eq!(selected(&f), Some(NEW));
+        assert_eq!(casts(&f), vec![(HEAL, Some(NEW))]);
+        run(&mut f, "TargetLastTarget()");
+        assert_eq!(selected(&f), Some(ME), "and back again");
+    }
+
+    /// `AttackTarget` (`0x489b50` → `0x6131a0`) swings at the selection as the calls before it
+    /// left it.
+    #[test]
+    fn attack_target_swings_at_the_selection_in_call_order() {
+        let mut f = frame(true);
+        run(&mut f, r#"AttackTarget() TargetUnit("party1")"#);
+        assert_eq!(swings(&f), (vec![OLD], false));
+        let mut f = frame(true);
+        run(&mut f, r#"TargetUnit("party1") AttackTarget()"#);
+        assert_eq!(swings(&f), (vec![NEW], false));
+    }
+
+    /// `0x6130a3`: a unit we are friendly toward is dropped (`0x6130a8`) and `TargetNearestEnemy`
+    /// runs (`0x6130b5`), moving the selection; the swing goes at what it picked (`0x6130c1`).
+    /// The Attack button reaches the same `0x6131a0` through `TryCast` (`0x6e4c90`).
+    #[test]
+    fn attack_with_a_friend_selected_swings_at_the_nearest_enemy_instead() {
+        for lua in ["AttackTarget()", "UseAction(1)"] {
+            let mut f = frame(true);
+            with_factions(&mut f, FRIEND, &[]);
+            spawn_mob(&mut f, &[(TEMPLATE, FOE)]);
+            f.app
+                .world_mut()
+                .resource_mut::<crate::ui_action::PlayerActions>()
+                .buttons
+                .insert(
+                    0,
+                    ActionButton {
+                        slot: 0,
+                        action: crate::ui_action::SPELL_ATTACK,
+                        kind: benilla_protocol::messages::ACTION_KIND_SPELL,
+                    },
+                );
+            run(&mut f, lua);
+            assert_eq!(selected(&f), Some(MOB), "{lua}");
+            assert_eq!(swings(&f), (vec![MOB], false), "{lua}");
+            assert_eq!(errors(&f), Vec::<&str>::new(), "{lua}");
+        }
+    }
+
+    /// The retarget commits before `AttackTarget` returns, so a cast after it in the same script
+    /// goes to the enemy it picked, from a friend or from nothing selected.
+    #[test]
+    fn a_cast_after_attack_target_goes_to_the_enemy_it_picked() {
+        for selected_before in [true, false] {
+            let mut f = frame(selected_before);
+            with_factions(&mut f, FRIEND, &[]);
+            spawn_mob(&mut f, &[(TEMPLATE, FOE)]);
+            run(&mut f, r#"AttackTarget() CastSpellByName("Heal")"#);
+            assert_eq!(
+                casts(&f),
+                vec![(HEAL, Some(MOB))],
+                "selected before: {selected_before}"
+            );
+        }
+    }
+
+    /// With no enemy in reach the scan moves nothing (`0x493f60`), so the selection re-read at
+    /// `0x6130c1` is the friend, which the final gate's `CanAttack` refuses (`0x613171`); only an
+    /// empty selection is "There is nothing to attack." (`0x6130d9`). Neither swings.
+    #[test]
+    fn attack_with_no_enemy_near_refuses_by_what_is_selected() {
+        let mut f = frame(true);
+        with_factions(&mut f, FRIEND, &[]);
+        run(&mut f, "AttackTarget()");
+        assert_eq!(selected(&f), Some(OLD));
+        assert_eq!(errors(&f), vec!["ERR_INVALID_ATTACK_TARGET"]);
+        assert_eq!(swings(&f), (vec![], false));
+
+        let mut f = frame(false);
+        with_factions(&mut f, FRIEND, &[]);
+        run(&mut f, "AttackTarget()");
+        assert_eq!(selected(&f), None);
+        assert_eq!(errors(&f), vec!["ERR_NO_ATTACK_TARGET"]);
+        assert_eq!(swings(&f), (vec![], false));
+    }
+
+    /// A hostile corpse is kept (`0x6130a3` reads the reaction alone), so no scan runs past it to
+    /// the live mob, and the final gate refuses a unit neither alive nor feigning (`0x613152`–
+    /// `0x613165`): "You cannot attack that target.", and no swing, which vmangos would stop
+    /// (`CombatHandler.cpp:53-58`).
+    #[test]
+    fn attack_at_a_corpse_cannot_attack_it() {
+        let mut f = frame(true);
+        with_factions(&mut f, FOE, &[(HEALTH, 0)]);
+        spawn_mob(&mut f, &[(TEMPLATE, FOE)]);
+        run(&mut f, "AttackTarget()");
+        assert_eq!(selected(&f), Some(OLD));
+        assert_eq!(errors(&f), vec!["ERR_INVALID_ATTACK_TARGET"]);
+        assert_eq!(swings(&f), (vec![], false));
+    }
+
+    /// `0x6131a0` toggles only past the validator: attacking a live foe stops, and a press the
+    /// validator refuses neither stops nor swings.
+    #[test]
+    fn attack_toggles_off_only_past_the_validator() {
+        for (health, stopped, refused) in [
+            (100, true, None),
+            (0, false, Some("ERR_INVALID_ATTACK_TARGET")),
+        ] {
+            let mut f = frame(true);
+            with_factions(&mut f, FOE, &[(HEALTH, health)]);
+            let world = f.app.world_mut();
+            let me = world.resource::<GuidIndex>().0[&ME];
+            world
+                .entity_mut(me)
+                .insert(crate::creature_anim::Engaged(OLD));
+            run(&mut f, "AttackTarget()");
+            assert_eq!(swings(&f), (vec![], stopped), "health {health}");
+            assert_eq!(
+                errors(&f),
+                refused.into_iter().collect::<Vec<_>>(),
+                "health {health}"
+            );
+        }
+    }
+
+    /// A macro's lines run inside `UseAction` (`0x4e6098 call 0x4f1460`), so what they call lands
+    /// before the calls the pressing script makes after it: the macro's cast goes to the old
+    /// target, then the script's `TargetUnit` moves the selection.
+    #[test]
+    fn a_macros_calls_land_inside_the_use_action_that_ran_it() {
+        let mut f = frame(true);
+        {
+            let world = f.app.world_mut();
+            let script = world.non_send_resource::<UiScript>();
+            // `ChatFrame1`'s `EXECUTE_CHAT_LINE` handler (`ChatFrame.lua:1343`) sends the line
+            // through the edit box; this one runs it as Lua, which is all the order needs.
+            script
+                .run(
+                    r#"local f = CreateFrame("Frame")
+                    f:RegisterEvent("EXECUTE_CHAT_LINE")
+                    f:SetScript("OnEvent", function() RunScript(arg1) end)
+                    MACRO_INDEX = CreateMacro("heal", 1, 'CastSpellByName("Heal")', 1, nil)"#,
+                )
+                .expect("the macro is made");
+            let index: u32 = script.eval("return MACRO_INDEX").expect("an index");
+            world
+                .resource_mut::<crate::ui_action::PlayerActions>()
+                .buttons
+                .insert(
+                    0,
+                    ActionButton {
+                        slot: 0,
+                        action: index,
+                        kind: ACTION_KIND_MACRO,
+                    },
+                );
+        }
+        run(&mut f, r#"UseAction(1) TargetUnit("party1")"#);
+        assert_eq!(casts(&f), vec![(HEAL, Some(OLD))]);
+        assert_eq!(selected(&f), Some(NEW));
+    }
+
+    /// Sinister Strike: `AttributesEx & 0x200`, one of predicate `0x6e5200`'s bits, and the enemy
+    /// word (implicit target 6).
+    const SINISTER_STRIKE: u32 = 1752;
+
+    /// Sinister Strike in the catalog and on action slot 1.
+    fn with_strike(f: &mut Frame) {
+        let world = f.app.world_mut();
+        let strike = benilla_formats::SpellDisplay {
+            attributes_ex: 0x200,
+            implicit_target_a1: 6,
+            ..Default::default()
+        };
+        world.insert_resource(crate::ui_action::Spells {
+            catalog: benilla_formats::SpellCatalog::from_displays(
+                [(SINISTER_STRIKE, strike)].into(),
+            ),
+            ..crate::ui_action::Spells::empty_for_tests()
+        });
+        world
+            .resource_mut::<crate::ui_action::PlayerActions>()
+            .buttons
+            .insert(
+                0,
+                ActionButton {
+                    slot: 0,
+                    action: SINISTER_STRIKE,
+                    kind: ACTION_KIND_SPELL,
+                },
+            );
+    }
+
+    /// The selections, strikes and swings sent, in wire order.
+    fn strike_wire(f: &Frame) -> Vec<(&'static str, u64)> {
+        f.rx.try_iter()
+            .filter_map(|c| match c {
+                ClientCommand::SetSelection { guid } => Some(("select", guid)),
+                ClientCommand::CastSpell {
+                    spell_id: SINISTER_STRIKE,
+                    target: Some(guid),
+                } => Some(("cast", guid)),
+                ClientCommand::AttackSwing { guid } => Some(("swing", guid)),
+                _ => None,
+            })
+            .collect()
+    }
+
+    /// TryCast's attack pick (`0x6e4efb` → `0x612df0`): a strike pressed with no target selects the
+    /// nearest enemy before its bind, so the selection goes out ahead of the cast and its swing,
+    /// and the call after it reads the selection only once the cast is done.
+    #[test]
+    fn a_strike_with_no_target_selects_the_nearest_enemy_and_casts_at_it() {
+        let mut f = frame(false);
+        spawn_mob(&mut f, &[]);
+        with_strike(&mut f);
+        run(&mut f, r#"UseAction(1) TargetUnit("party1")"#);
+        assert_eq!(
+            strike_wire(&f),
+            vec![
+                ("select", MOB),
+                ("cast", MOB),
+                ("swing", MOB),
+                ("select", NEW)
+            ]
+        );
+    }
+
+    /// A self-cast press passes the caster to the pick (`0x4e610e`), and the reaction to oneself is
+    /// 4 (`0x606200`), so the pick Tabs to the enemy. With no faction table the caster would read
+    /// neutral and be kept.
+    #[test]
+    fn a_self_cast_strike_selects_the_nearest_enemy() {
+        let mut f = frame(false);
+        spawn_mob(&mut f, &[]);
+        with_strike(&mut f);
+        run(&mut f, "UseAction(1, 0, 1)");
+        assert_eq!(
+            strike_wire(&f),
+            vec![("select", MOB), ("cast", MOB), ("swing", MOB)]
+        );
+    }
+
+    /// The pick's keep test (`0x6130a3`) drops a friend, so a strike at one retargets the nearest
+    /// enemy, where the bind alone would refuse it as an invalid target.
+    #[test]
+    fn a_strike_at_a_friend_retargets_the_nearest_enemy() {
+        let mut f = frame(true);
+        with_factions(&mut f, FRIEND, &[]);
+        spawn_mob(&mut f, &[(TEMPLATE, FOE)]);
+        with_strike(&mut f);
+        run(&mut f, "UseAction(1)");
+        assert_eq!(
+            strike_wire(&f),
+            vec![("select", MOB), ("cast", MOB), ("swing", MOB)]
+        );
+    }
+
+    /// `0x6130d9`: with no enemy to acquire, the strike stops at the pick with "There is nothing to
+    /// attack.", not the bind's "You have no target.".
+    #[test]
+    fn a_strike_with_nothing_to_attack_says_so_and_sends_nothing() {
+        let mut f = frame(false);
+        with_strike(&mut f);
+        run(&mut f, "UseAction(1)");
+        assert_eq!(casts(&f), vec![]);
+        assert_eq!(selected(&f), None);
+        let world = f.app.world();
+        assert_eq!(
+            world.resource::<crate::ui_action::UiErrorKeys>().0,
+            vec![crate::ui_action::UiError::key("ERR_NO_ATTACK_TARGET")]
+        );
+        assert!(world
+            .resource::<crate::ui_action::CastErrors>()
+            .0
+            .is_empty());
+    }
+}
diff --git a/crates/benilla-app/src/sound/anim_events.rs b/crates/benilla-app/src/sound/anim_events.rs
index bf397113..04705601 100644
--- a/crates/benilla-app/src/sound/anim_events.rs
+++ b/crates/benilla-app/src/sound/anim_events.rs
@@ -24,7 +24,7 @@ use benilla_assets::WorldAssets;
 use benilla_world::schedule::WorldStage;
 
 use super::emitter_pool::AmbientEmitterPool;
-use super::emote::EmoteSounds;
+use super::emote::{play_emote_voice, EmoteSounds, VOICE_ATTACH};
 use super::kit::{play_kit, KitRef, SoundCategory, SoundKits};
 use super::{AudioListener, SoundConfig, SoundOutput};
 
@@ -32,9 +32,6 @@ use super::{AudioListener, SoundConfig, SoundOutput};
 /// point.
 const TRD_HEIGHT: f32 = 1.0;
 
-/// The attachment the emote voice plays at (`0x623c3a push 0x11`).
-const CSD_ATTACH: u16 = 17;
-
 pub(super) fn route_anim_events(
     mut events: MessageReader<AnimSoundEvent>,
     // GlobalTransform: `$SND` can fire from a parented visual (a mount's model).
@@ -130,20 +127,24 @@ pub(super) fn route_anim_events(
             b"$SND" | b"$DSO" if ev.data != 0 => {
                 ring(&mut kits, &mut out, ev.data, ev, &mut complained);
             }
-            // `$CSD` plays at attachment 17, never the fired key: the CGUnit dispatcher hands
-            // `0x623c10` no position (`0x5ffeed`), and it reads attachment `0x11` (`0x623b90`),
-            // falling back to the origin + 2.0 z. The reference then binds the handle to follow the
-            // unit (`0x7a57e0`, `[unit+0xb28]`); this is a one-shot at the onset point.
+            // `$CSD` is the emote voice `0x623c10`: attachment 17, never the fired key (the CGUnit
+            // dispatcher hands it no position, `0x5ffeed`; origin + 2.0 z without the
+            // attachment), and it stops the unit's previous emote voice.
             b"$CSD" if ev.data != 0 => {
                 let root = transforms
                     .get(ev.entity)
                     .map_or(Vec3::ZERO, |t| t.translation());
-                let at = attach.point(ev.entity, CSD_ATTACH, root);
-                let voiced = AnimSoundEvent {
-                    pos: Some(at),
-                    ..*ev
-                };
-                ring(&mut kits, &mut out, ev.data, &voiced, &mut complained);
+                let at = attach.point(ev.entity, VOICE_ATTACH, root);
+                if let Err(e) = play_emote_voice(
+                    &mut kits, &assets, &mut out, &config, listener, ev.data, ev.entity, at,
+                ) {
+                    if complained.insert(ev.data) {
+                        warn!(
+                            "anim event kit {}: {e:#} (further reports for this kit suppressed)",
+                            ev.data
+                        );
+                    }
+                }
             }
             b"$ESD" => {
                 let Some(emotes) = emotes.as_deref() else {
diff --git a/crates/benilla-app/src/sound/emote.rs b/crates/benilla-app/src/sound/emote.rs
index 3db89621..89bb07fd 100644
--- a/crates/benilla-app/src/sound/emote.rs
+++ b/crates/benilla-app/src/sound/emote.rs
@@ -1,17 +1,23 @@
-//! Emote sounds: `SMSG_TEXT_EMOTE` plays the performer's race/sex voice kit
-//! (`EmotesTextSound`), `SMSG_EMOTE` plays the anim emote's `EventSoundID` (`Emotes.dbc`). Our
-//! own `/wave` goes out as `CMSG_TEXT_EMOTE` and plays through the server echo, as in 1.12. The
-//! catalog also serves `crate::ui_chat` and `crate::creature_anim`.
+//! Emote sounds: `SMSG_TEXT_EMOTE` plays the performer's race/sex voice kit (`EmotesTextSound`)
+//! for the active player and the party only. Our own `/wave` goes out as `CMSG_TEXT_EMOTE` and
+//! plays through the server echo, as in 1.12. The catalog also serves `crate::ui_chat` and
+//! `crate::creature_anim`.
 
 use bevy::prelude::*;
 
 use benilla_formats::EmoteSoundCatalog;
+use benilla_protocol::messages::ObjectType;
 
-use crate::net::{EmoteKind, EmoteMessage, ObjectStore};
+use crate::entities::{AttachPoints, Creatures};
+use crate::net::{EmoteKind, EmoteMessage, ObjectStore, SelfGuid};
+use crate::spell::group_relation::GroupRoster;
+use crate::ui_social::SocialState;
 use benilla_assets::{AssetSet, LockRecover, WorldAssets};
 use benilla_world::schedule::WorldStage;
 
-use super::kit::{play_kit, KitRef, SoundCategory, SoundKits};
+use super::kit::{
+    play_kit_ext, stop_older_emote_voices, KitRef, Latch, PlayExtras, SoundCategory, SoundKits,
+};
 use super::{AudioListener, SoundConfig, SoundOutput};
 
 /// The emote-audio catalog (also the chat sender's `/name` → text-id resolver).
@@ -29,6 +35,11 @@ impl EmoteSounds {
         self.0.anim(emote_id)
     }
 
+    /// An `Emotes.dbc` row's raw `AnimID` for the `UNIT_NPC_EMOTESTATE` resolver, `0` included.
+    pub(crate) fn state_anim(&self, emote_id: u32) -> Option<u32> {
+        self.0.state_anim(emote_id)
+    }
+
     /// A text emote's `Emotes.dbc` id (`EmotesText.dbc` `EmoteID`); 0 is chat-only (`/thank`).
     pub(crate) fn text_emote(&self, text_id: u32) -> Option<u32> {
         self.0.text_emote(text_id)
@@ -75,14 +86,76 @@ fn load_emote_sounds(mut commands: Commands, assets: Option<Res<WorldAssets>>) {
     }
 }
 
-/// Route the bridged emotes: a text emote plays the performer's race/sex voice; an anim emote
-/// plays its event kit. A performer whose race/sex has not arrived yet stays silent.
+/// The attachment the emote voice plays at (`0x623c3a push 0x11`).
+pub(super) const VOICE_ATTACH: u16 = 17;
+
+/// Who hears a text emote's voice: the composer's tail (`0x623c80`) plays it for relation class
+/// 0, the active player, or 2, a player in one of the four party slots (`0x623cc2`-`0x623cce`,
+/// `0x5efea0`). A raid-only member is class 4, a hostile player 6, a creature 1/3/5/7/8 and an
+/// unstreamed performer 9, none of which play. An ignored performer never reaches the composer
+/// (`0x49dc36`).
+fn voice_audible(
+    performer: u64,
+    me: Option<u64>,
+    performer_is_player: bool,
+    roster: &GroupRoster,
+    ignored: bool,
+) -> bool {
+    if ignored {
+        return false;
+    }
+    Some(performer) == me || performer_is_player && roster.in_party(me, performer)
+}
+
+/// `0x623c10`: play `kit` at the unit's attachment `0x11`, then stop the unit's previous emote
+/// voice (`[unit+0xb28]`, `0x623c63`-`0x623c70`); a play that opens no channel stops nothing
+/// (`0x623c55`). Shared by the text-emote voice and the `$CSD` anim event.
+pub(super) fn play_emote_voice(
+    kits: &mut SoundKits,
+    assets: &WorldAssets,
+    out: &mut SoundOutput,
+    config: &SoundConfig,
+    listener: Vec3,
+    kit: u32,
+    unit: Entity,
+    at: Vec3,
+) -> anyhow::Result<bool> {
+    let extras = PlayExtras {
+        source: Some(unit),
+        latch: Latch::EmoteVoice,
+        ..PlayExtras::default()
+    };
+    let opened = play_kit_ext(
+        kits,
+        assets,
+        out,
+        config,
+        listener,
+        KitRef::Id(kit),
+        Some(at),
+        SoundCategory::Sfx,
+        extras,
+    )?;
+    if opened {
+        stop_older_emote_voices(out, unit);
+    }
+    Ok(opened)
+}
+
+/// Route a text emote to the performer's race/sex voice. A performer whose race/sex has not
+/// arrived yet stays silent. `SMSG_EMOTE` plays no sound: the one-shot path never reads
+/// `EventSoundID` (`0x5e66b0` -> `0x5fcd20`), which only the state emote's `$ESD` does (`0x623a21`).
 fn emote_sounds(
     mut msgs: MessageReader<EmoteMessage>,
     units: Query<(&ObjectStore, &Transform)>,
     emotes: Option<Res<EmoteSounds>>,
     kits: Option<ResMut<SoundKits>>,
     assets: Option<Res<WorldAssets>>,
+    creatures: Option<Res<Creatures>>,
+    roster: Option<Res<GroupRoster>>,
+    social: Res<SocialState>,
+    self_guid: Res<SelfGuid>,
+    attach: AttachPoints,
     mut out: NonSendMut<SoundOutput>,
     config: Res<SoundConfig>,
     listener: Res<AudioListener>,
@@ -94,36 +167,56 @@ fn emote_sounds(
         return;
     };
     let listener = listener.pos;
+    let no_roster = GroupRoster::default();
     for m in msgs.read() {
-        let Some((store, transform)) = m.source.and_then(|e| units.get(e).ok()) else {
+        let EmoteKind::Text(text_id) = m.kind else {
             continue;
         };
-        let kit = match m.kind {
-            EmoteKind::Text(text_id) => {
-                // The `EmoteSounds` CVar gates only the text-emote voice, read at play time; a
-                // zero never fetches the kit. The `Anim` one-shot has no such gate.
-                if !config.emote_sounds {
-                    continue;
-                }
+        // The `EmoteSounds` CVar gates the text-emote voice, read at play time; a zero never
+        // fetches the kit.
+        if !config.emote_sounds {
+            continue;
+        }
+        let Some((unit, (store, transform))) =
+            m.source.and_then(|e| units.get(e).ok().map(|row| (e, row)))
+        else {
+            continue;
+        };
+        let is_player = store.0.object_type() == Some(ObjectType::Player);
+        if !voice_audible(
+            m.guid,
+            self_guid.0,
+            is_player,
+            roster.as_deref().unwrap_or(&no_roster),
+            social.is_ignored(m.guid),
+        ) {
+            continue;
+        }
+        // The display override's race and sex before the descriptor's (`0x60c6a0`/`0x60c6c0`).
+        let overridden = store
+            .0
+            .unit_displayid()
+            .and_then(|d| u32::try_from(d).ok())
+            .and_then(|d| creatures.as_deref()?.display_race_sex(d));
+        let (race, sex) = match overridden {
+            Some(rs) => rs,
+            None => {
                 let (Some(race), Some(sex)) = (store.0.unit_race(), store.0.unit_gender()) else {
                     continue;
                 };
-                emotes.0.voice(text_id, race as u32, sex as u32)
+                (race, sex)
             }
-            EmoteKind::Anim(emote_id) => emotes.0.event_sound(emote_id),
         };
-        let Some(kit) = kit.filter(|&k| k != 0) else {
+        let Some(kit) = emotes
+            .0
+            .voice(text_id, race as u32, sex as u32)
+            .filter(|&k| k != 0)
+        else {
             continue; // most emotes are voiceless (/wave)
         };
-        if let Err(e) = play_kit(
-            &mut kits,
-            &assets,
-            &mut out,
-            &config,
-            listener,
-            KitRef::Id(kit),
-            Some(transform.translation),
-            SoundCategory::Sfx,
+        let at = attach.point(unit, VOICE_ATTACH, transform.translation);
+        if let Err(e) = play_emote_voice(
+            &mut kits, &assets, &mut out, &config, listener, kit, unit, at,
         ) {
             warn!("emote sound (kit {kit}): {e:#}");
         }
@@ -135,3 +228,68 @@ pub(super) fn plugin(app: &mut App) {
     app.add_systems(Startup, load_emote_sounds.after(AssetSet::Open))
         .add_systems(Update, emote_sounds.in_set(WorldStage::Present));
 }
+
+#[cfg(test)]
+mod tests {
+    use super::super::kit::occupies_emote_slot;
+    use super::*;
+
+    const ME: u64 = 1;
+    const MATE: u64 = 2;
+    const RAIDER: u64 = 3;
+    const STRANGER: u64 = 4;
+
+    fn roster() -> GroupRoster {
+        GroupRoster {
+            party: vec![MATE],
+            raid: vec![ME, MATE, RAIDER],
+        }
+    }
+
+    /// `0x623cc2`-`0x623cce`: class 0 and class 2 play, every other class is silent.
+    #[test]
+    fn only_you_and_the_party_are_heard() {
+        let r = roster();
+        let heard = |who, player, ignored| voice_audible(who, Some(ME), player, &r, ignored);
+        assert!(heard(ME, true, false), "class 0, you");
+        assert!(heard(MATE, true, false), "class 2, a party member");
+        assert!(
+            !heard(RAIDER, true, false),
+            "class 4: the raid is not the party slots"
+        );
+        assert!(
+            !heard(STRANGER, true, false),
+            "class 4 or 6, any other player"
+        );
+        assert!(
+            !heard(MATE, false, false),
+            "a creature never classes as a player"
+        );
+        assert!(!voice_audible(
+            MATE,
+            None,
+            true,
+            &GroupRoster::default(),
+            false
+        ));
+    }
+
+    /// An ignored performer is dropped before the composer (`0x49dc36`), even you or a mate.
+    #[test]
+    fn an_ignored_performer_is_silent() {
+        let r = roster();
+        assert!(!voice_audible(MATE, Some(ME), true, &r, true));
+        assert!(!voice_audible(ME, Some(ME), true, &r, true));
+    }
+
+    /// The slot holder is the unit's own emote voice, never its bark or another unit's.
+    #[test]
+    fn the_emote_slot_is_the_units_own() {
+        let mut world = World::new();
+        let (a, b) = (world.spawn_empty().id(), world.spawn_empty().id());
+        assert!(occupies_emote_slot(Some(a), Latch::EmoteVoice, a));
+        assert!(!occupies_emote_slot(Some(b), Latch::EmoteVoice, a));
+        assert!(!occupies_emote_slot(Some(a), Latch::Voice(0), a));
+        assert!(!occupies_emote_slot(None, Latch::EmoteVoice, a));
+    }
+}
diff --git a/crates/benilla-app/src/sound/kit.rs b/crates/benilla-app/src/sound/kit.rs
index 3c5e6ceb..d5ea5c83 100644
--- a/crates/benilla-app/src/sound/kit.rs
+++ b/crates/benilla-app/src/sound/kit.rs
@@ -145,6 +145,10 @@ pub(super) enum Latch {
     /// `0x62f880` has no such gate. It ends with the sound or when the emitter leaves
     /// `DistanceCutoff` (`0x457a50`).
     ObjectSound,
+    /// The unit's emote voice, `[unit+0xb28]` (`0x623c10`): it blocks nothing, a new emote voice
+    /// stops the sounding one (`0x623c68`-`0x623c70`, `Sound::Stop 0x7a5700`). Shared by the
+    /// text-emote voice and the `$CSD` anim event.
+    EmoteVoice,
 }
 
 /// The class-bark chance roll (`0x623520`): `r = MulHi32(101, rand32)` in 0..=100, pass iff
@@ -287,9 +291,9 @@ fn claim_voice(out: &mut SoundOutput, candidate_amp: f32) -> bool {
 
 /// Can the voice cap steal this channel? Never a loop, whose loss leaves a hole that stays open,
 /// and never a latch holder: its liveness is the unit's latch, so stealing it would let the unit
-/// fire again at once.
+/// fire again at once. The emote voice holds no latch, only a slot the next one stops.
 fn stealable(looping: bool, latch: Latch) -> bool {
-    !looping && latch == Latch::None
+    !looping && matches!(latch, Latch::None | Latch::EmoteVoice)
 }
 
 /// What [`claim_voice`] decided.
@@ -591,6 +595,25 @@ pub(super) fn occupies_voice_slot(source: Option<Entity>, latch: Latch, unit: En
     source == Some(unit) && matches!(latch, Latch::Voice(_))
 }
 
+/// Stop every emote voice of `unit` but the newest channel (`0x623c68`-`0x623c70`).
+pub(super) fn stop_older_emote_voices(out: &mut SoundOutput, unit: Entity) {
+    let newest = out.channels.len().saturating_sub(1);
+    let mut i = 0;
+    out.channels.retain_mut(|c| {
+        let stop = i != newest && occupies_emote_slot(c.source, c.latch, unit);
+        i += 1;
+        if stop {
+            c.handle.stop(mixer::declick());
+        }
+        !stop
+    });
+}
+
+/// Does this channel hold `unit`'s emote-voice slot (`[unit+0xb28]`)?
+pub(super) fn occupies_emote_slot(source: Option<Entity>, latch: Latch, unit: Entity) -> bool {
+    source == Some(unit) && latch == Latch::EmoteVoice
+}
+
 /// Does this channel hold `unit`'s greeting latch (`[unit+0xb1c]`)?
 pub(super) fn occupies_greeting_latch(source: Option<Entity>, latch: Latch, unit: Entity) -> bool {
     source == Some(unit) && latch == Latch::Greeting
@@ -732,10 +755,14 @@ fn near_field(d_sq: f32, cutoff: f32) -> f32 {
 }
 
 impl SoundKits {
-    /// A kit id by its `PlaySoundByName` key (the `0x458030` name registry), such as the ghost
-    /// tracks "Ghost" and "GhostMusic".
-    pub(crate) fn id_by_name(&self, name: &str) -> Option<u32> {
-        self.catalog.by_name(name).map(|k| k.id)
+    /// The ambience kit a ghost hears (`[0xb06d48]`, resolved at init by `0x4609b0`).
+    pub(super) fn ghost_bed(&self) -> Option<u32> {
+        self.catalog.ghost_bed()
+    }
+
+    /// The ambience kit a submerged listener hears (`[0xb06d4c]`, resolved at init by `0x4609b0`).
+    pub(super) fn underwater_bed(&self) -> Option<u32> {
+        self.catalog.underwater_bed()
     }
 
     pub(crate) fn new(catalog: SoundKitCatalog) -> Self {
@@ -1237,6 +1264,10 @@ mod tests {
             !stealable(false, Latch::Voice(0)),
             "a bark holds [unit+0xb20] — stealing it lets the unit re-bark at once"
         );
+        assert!(
+            stealable(false, Latch::EmoteVoice),
+            "an emote voice blocks nothing, so losing it re-fires nothing"
+        );
         assert!(
             !stealable(true, Latch::None),
             "beds are held for their own reason"
diff --git a/crates/benilla-app/src/sound/mixer.rs b/crates/benilla-app/src/sound/mixer.rs
index 18ebb502..6b6b5f9b 100644
--- a/crates/benilla-app/src/sound/mixer.rs
+++ b/crates/benilla-app/src/sound/mixer.rs
@@ -310,7 +310,7 @@ impl Mixer {
         Ok((track, handle))
     }
 
-    /// Decode-stream a long sound (music, ambience MP3s) on the main track.
+    /// Decode-stream a long sound (music, an ambience bed) on the main track.
     pub(crate) fn play_stream(
         &mut self,
         data: StreamingSoundData<FromFileError>,
@@ -486,22 +486,49 @@ pub(crate) fn sfx_from_bytes(bytes: Vec<u8>) -> Result<StaticSoundData> {
     StaticSoundData::from_cursor(std::io::Cursor::new(bytes)).context("decoding sfx")
 }
 
-/// Decode a looping bed whole: kira's streaming decoder reads these 22050 Hz PCM WAVs at twice
-/// their length, so a streamed loop falls silent past EOF.
-pub(crate) fn loop_from_bytes(bytes: Vec<u8>) -> Result<StaticSoundData> {
-    Ok(sfx_from_bytes(bytes)?.loop_region(..))
-}
-
-/// Wrap compressed audio bytes for decode-streaming, behind [`PromotingSource`].
+/// Wrap compressed audio bytes for decode-streaming ([`stream_from_source`]).
 pub(crate) fn stream_from_bytes(bytes: Vec<u8>) -> Result<StreamingSoundData<FromFileError>> {
-    StreamingSoundData::from_media_source(PromotingSource(std::io::Cursor::new(bytes)))
-        .context("opening stream")
+    let len = bytes.len() as u64;
+    stream_from_source(std::io::Cursor::new(bytes), len)
 }
 
-/// Compressed-audio source whose first read on a thread promotes it to user-interactive QoS:
-/// kira's decode thread starts at default QoS, below the world-entry burst, and a starved decoder
-/// crackles without tripping any [`MixHealth`] meter.
-struct PromotingSource(std::io::Cursor<Vec<u8>>);
+/// Open a decode-stream over `len` bytes of `source`: its header is read here, on the calling
+/// thread, and the rest on kira's decode thread as it plays, behind [`PromotingSource`].
+pub(crate) fn stream_from_source<R>(
+    source: R,
+    len: u64,
+) -> Result<StreamingSoundData<FromFileError>>
+where
+    R: std::io::Read + std::io::Seek + Send + Sync + 'static,
+{
+    let armed = Arc::new(AtomicBool::new(false));
+    let data = StreamingSoundData::from_media_source(PromotingSource {
+        inner: source,
+        len,
+        armed: armed.clone(),
+    })
+    .context("opening stream")?;
+    armed.store(true, Ordering::Relaxed);
+    Ok(data)
+}
+
+/// A stream's bytes, whose first read on a thread once the stream is built promotes that thread
+/// to user-interactive QoS: kira's decode thread starts at default QoS, below the world-entry
+/// burst, and a starved decoder crackles without tripping any [`MixHealth`] meter.
+struct PromotingSource<R> {
+    inner: R,
+    len: u64,
+    /// Set once the stream is built, so the thread that read its header keeps its own QoS.
+    armed: Arc<AtomicBool>,
+}
+
+impl<R> PromotingSource<R> {
+    fn promote(&self) {
+        if self.armed.load(Ordering::Relaxed) {
+            promote_decode_thread();
+        }
+    }
+}
 
 /// Once-per-thread promotion latch for [`PromotingSource`].
 fn promote_decode_thread() {
@@ -522,26 +549,29 @@ fn promote_decode_thread() {
     });
 }
 
-impl std::io::Read for PromotingSource {
+impl<R: std::io::Read> std::io::Read for PromotingSource<R> {
     fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        promote_decode_thread();
-        self.0.read(buf)
+        self.promote();
+        self.inner.read(buf)
     }
 }
 
-impl std::io::Seek for PromotingSource {
+impl<R: std::io::Seek> std::io::Seek for PromotingSource<R> {
     fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {
-        promote_decode_thread();
-        self.0.seek(pos)
+        self.promote();
+        self.inner.seek(pos)
     }
 }
 
-impl symphonia::core::io::MediaSource for PromotingSource {
+impl<R> symphonia::core::io::MediaSource for PromotingSource<R>
+where
+    R: std::io::Read + std::io::Seek + Send + Sync,
+{
     fn is_seekable(&self) -> bool {
         true
     }
     fn byte_len(&self) -> Option<u64> {
-        Some(self.0.get_ref().len() as u64)
+        Some(self.len)
     }
 }
 
@@ -707,8 +737,8 @@ impl StreamWatch {
                 last_pos,
                 window_start,
             } => {
-                // A backwards jump is a new stream swapped onto the slot (no watched stream
-                // loops), so it re-enters its own spin-up.
+                // A backwards jump is a new stream swapped onto the slot or an ambience bed's
+                // loop wrapping; either re-enters the spin-up, uncounted.
                 if pos < last_pos {
                     self.phase = Phase::Starting {
                         since: now,
@@ -744,7 +774,7 @@ impl StreamWatch {
 }
 
 #[cfg(test)]
-mod tests {
+pub(super) mod tests {
     use super::*;
 
     fn preset(decay: f32, hf_ratio: f32, room: i32, room_hf: i32, reverb: i32) -> SoundProvider {
@@ -1473,4 +1503,251 @@ mod tests {
             "the fade is gradual, not an instant cut — needs blocks mid-ramp ({series:?})"
         );
     }
+
+    /// A 16-bit PCM WAV in memory with `block_align` as given: 2 on a stereo file is the header
+    /// of the install's ambience beds.
+    pub(in crate::sound) fn pcm16_wav(
+        rate: u32,
+        channels: u16,
+        block_align: u16,
+        frames: usize,
+        sample: impl Fn(usize) -> i16,
+    ) -> Vec<u8> {
+        let data_len = (frames * channels as usize * 2) as u32;
+        let mut wav = Vec::new();
+        wav.extend_from_slice(b"RIFF");
+        wav.extend_from_slice(&(36 + data_len).to_le_bytes());
+        wav.extend_from_slice(b"WAVEfmt ");
+        wav.extend_from_slice(&16u32.to_le_bytes());
+        wav.extend_from_slice(&1u16.to_le_bytes());
+        wav.extend_from_slice(&channels.to_le_bytes());
+        wav.extend_from_slice(&rate.to_le_bytes());
+        wav.extend_from_slice(&(rate * u32::from(channels) * 2).to_le_bytes());
+        wav.extend_from_slice(&block_align.to_le_bytes());
+        wav.extend_from_slice(&16u16.to_le_bytes());
+        wav.extend_from_slice(b"data");
+        wav.extend_from_slice(&data_len.to_le_bytes());
+        for i in 0..frames {
+            for _ in 0..channels {
+                wav.extend_from_slice(&sample(i).to_le_bytes());
+            }
+        }
+        wav
+    }
+
+    /// The install's bed header: 22050 Hz stereo, `nBlockAlign` 2.
+    #[test]
+    fn a_stereo_bed_streams_its_true_length() {
+        let frames = 3000;
+        let bed = pcm16_wav(22_050, 2, 2, frames, |i| i as i16);
+        let data = stream_from_bytes(bed).expect("opens");
+        assert_eq!(data.num_frames(), frames, "the frames in the data chunk");
+    }
+
+    /// Rendered through kira at the bed's own rate, a streamed loop wraps from its last frame to
+    /// its first and plays on, where one sized from the stored `nBlockAlign` stops at the end.
+    #[test]
+    fn a_streamed_bed_loops_seamlessly() {
+        use kira::backend::{Backend, Renderer};
+        use std::sync::Mutex;
+
+        const RATE: u32 = 22_050;
+        const FRAMES: usize = 3000;
+        const STEP: i16 = 8;
+        struct Capture(Arc<Mutex<Option<Renderer>>>);
+        impl Backend for Capture {
+            type Settings = ();
+            type Error = ();
+            fn setup(_: (), _buf: usize) -> Result<(Self, u32), ()> {
+                Ok((Capture(Arc::new(Mutex::new(None))), RATE))
+            }
+            fn start(&mut self, renderer: Renderer) -> Result<(), ()> {
+                *self.0.lock().unwrap() = Some(renderer);
+                Ok(())
+            }
+        }
+
+        // A sawtooth that names its own frame: sample `i` is `1000 + STEP·i`, never silent.
+        let bed = pcm16_wav(RATE, 2, 2, FRAMES, |i| 1000 + STEP * i as i16);
+        let data = stream_from_bytes(bed).expect("opens").loop_region(..);
+        let mut manager =
+            AudioManager::<Capture>::new(AudioManagerSettings::default()).expect("manager");
+        let slot = manager.backend_mut().0.clone();
+        let _h = manager.play(data).expect("play");
+
+        // Let the decode thread fill its ring, then render two and a half loops in one go.
+        let render = |n: usize| -> Vec<f32> {
+            let mut guard = slot.lock().unwrap();
+            let r = guard.as_mut().expect("renderer started");
+            r.on_start_processing();
+            let mut out = vec![0.0f32; n * 2];
+            r.process(&mut out, 2);
+            out.iter().step_by(2).copied().collect()
+        };
+        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
+        let mut lead = render(1);
+        while lead[0] == 0.0 && std::time::Instant::now() < deadline {
+            std::thread::sleep(std::time::Duration::from_millis(20));
+            lead = render(1);
+        }
+        std::thread::sleep(std::time::Duration::from_millis(200));
+        let heard = render(FRAMES * 5 / 2);
+
+        let frame_of = |v: f32| ((v * 32768.0 - 1000.0) / f32::from(STEP)).round() as i64;
+        let silent = heard.iter().filter(|v| v.abs() < 1e-4).count();
+        assert_eq!(silent, 0, "no silence once playing");
+        let frames: Vec<i64> = heard.iter().map(|&v| frame_of(v)).collect();
+        let wraps = frames.windows(2).filter(|w| w[1] < w[0]).count();
+        assert_eq!(wraps, 2, "two wraps in two and a half loops");
+        for (k, w) in frames.windows(2).enumerate() {
+            let next = (w[0] + 1) % FRAMES as i64;
+            assert_eq!(w[1], next, "frame {k}: {} follows {}", w[1], w[0]);
+        }
+    }
+
+    /// Every bed in the install streams at its data chunk's length, the 79 under `Sound\Ambience`
+    /// whose stereo header stores a mono `nBlockAlign` (2) among them, the inn's `Tavern.wav` too:
+    /// symphonia 0.5 sized its frames from that field and counted them twice.
+    #[test]
+    fn real_beds_stream_their_data_chunks_frames() {
+        use std::io::Read;
+        let data = benilla_formats::wow_data_or_skip!();
+        let Ok(chain) = benilla_formats::open_chain(&data) else {
+            eprintln!("skipping: no client data at {}", data.display());
+            return;
+        };
+        let beds: Vec<String> = chain
+            .list()
+            .expect("listing")
+            .into_iter()
+            .map(|e| e.name)
+            .filter(|n| {
+                let n = n.to_ascii_lowercase();
+                n.starts_with("sound\\ambience\\") && n.ends_with(".wav")
+            })
+            .collect();
+        assert!(beds.len() > 100, "the install's beds: {}", beds.len());
+        let mut mono_align = 0;
+        for path in &beds {
+            let archive = chain.archive_for(path).expect("in the chain");
+            let mut head = vec![0u8; 4096];
+            let n = archive.open_file(path).unwrap().read(&mut head).unwrap();
+            head.truncate(n);
+            let (frame, data_len, align) = wav_frame_and_data_len(&head).expect(path);
+            mono_align += usize::from(align < frame);
+
+            let file = archive.open_file(path).expect("opens");
+            let len = file.size();
+            let streamed = stream_from_source(file, len).expect(path).num_frames();
+            assert_eq!(streamed, data_len / frame, "{path}: streamed frames");
+        }
+        assert!(mono_align > 0, "no bed carries the mono nBlockAlign");
+
+        let forest = "Sound\\Ambience\\ZoneAmbience\\ForestNormalDay.wav";
+        let decoded = sfx_from_bytes(chain.read(forest).unwrap()).unwrap();
+        assert_eq!(decoded.num_frames(), 60 * 22_050, "decoded whole, 60 s");
+    }
+
+    /// A PCM WAV header's frame size (channels × bytes per sample), data chunk length and stored
+    /// `nBlockAlign`.
+    fn wav_frame_and_data_len(head: &[u8]) -> Option<(usize, usize, usize)> {
+        let u16_at = |at: usize| Some(u16::from_le_bytes(head.get(at..at + 2)?.try_into().ok()?));
+        let u32_at = |at: usize| Some(u32::from_le_bytes(head.get(at..at + 4)?.try_into().ok()?));
+        let (mut at, mut fmt) = (12usize, None);
+        loop {
+            let (id, len) = (head.get(at..at + 4)?, u32_at(at + 4)? as usize);
+            if id == b"fmt " {
+                let frame = usize::from(u16_at(at + 10)?) * usize::from(u16_at(at + 22)? / 8);
+                fmt = Some((frame, usize::from(u16_at(at + 20)?)));
+            } else if id == b"data" {
+                let (frame, align) = fmt?;
+                return Some((frame, len, align));
+            }
+            at += 8 + len + (len & 1);
+        }
+    }
+
+    /// Silent MPEG-1 Layer III frames, 44.1 kHz mono, one per `(bitrate index, padding)`: a
+    /// header over an all-zero body, whose side info asks for no data and decodes to silence.
+    fn silent_mp3(frames: &[(u8, bool)]) -> Vec<u8> {
+        const KBPS: [u32; 15] = [
+            0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320,
+        ];
+        let mut mp3 = Vec::new();
+        for &(bitrate, pad) in frames {
+            let len = 144 * KBPS[usize::from(bitrate)] * 1000 / 44_100 + u32::from(pad);
+            mp3.extend_from_slice(&[0xFF, 0xFB, bitrate << 4 | u8::from(pad) << 1, 0xC0]);
+            mp3.resize(mp3.len() + len as usize - 4, 0);
+        }
+        mp3
+    }
+
+    /// Pump `h` on a mock device until it stops, for at most 5 s; whether it did.
+    pub(in crate::sound) fn plays_out(
+        manager: &mut AudioManager<kira::backend::mock::MockBackend>,
+        h: &StreamingSoundHandle<FromFileError>,
+    ) -> bool {
+        let deadline = std::time::Instant::now() + std::time::Duration::from_secs(5);
+        let backend = manager.backend_mut();
+        while h.state() != kira::sound::PlaybackState::Stopped
+            && std::time::Instant::now() < deadline
+        {
+            backend.on_start_processing();
+            backend.process();
+            std::thread::sleep(std::time::Duration::from_micros(200));
+        }
+        h.state() == kira::sound::PlaybackState::Stopped
+    }
+
+    pub(in crate::sound) fn mock_manager() -> AudioManager<kira::backend::mock::MockBackend> {
+        use kira::backend::mock::{MockBackend, MockBackendSettings};
+        AudioManager::<MockBackend>::new(AudioManagerSettings {
+            backend_settings: MockBackendSettings {
+                sample_rate: 44_100,
+            },
+            ..Default::default()
+        })
+        .expect("mock backend")
+    }
+
+    /// A stream that runs out of packets before the length its container reported stops there.
+    /// With no Xing header, symphonia 0.6 estimates an MP3's length from its first 17 frames'
+    /// mean size; small frames ahead of large ones make it over-count, as it does
+    /// `ZulGurubVooDoo.mp3` by one frame. kira 0.12.4 answers the missing packets with empty
+    /// chunks, and its decode thread spins on them forever with the sound never ending.
+    #[test]
+    fn a_stream_that_runs_out_before_its_reported_length_stops() {
+        let mut frames = vec![(1, false); 17];
+        frames.extend([(9, false); 3]);
+        let data = stream_from_bytes(silent_mp3(&frames)).expect("opens");
+        assert!(
+            data.num_frames() > 20 * 1152,
+            "the estimate over-counts: {}",
+            data.num_frames()
+        );
+        let mut manager = mock_manager();
+        let h = manager.play(data).expect("play");
+        assert!(
+            plays_out(&mut manager, &h),
+            "the stream ends at its last packet"
+        );
+    }
+
+    /// The install's one track that symphonia 0.6 over-counts ends, played from its last second.
+    #[test]
+    fn the_over_counted_install_track_ends() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let Ok(chain) = benilla_formats::open_chain(&data) else {
+            eprintln!("skipping: no client data at {}", data.display());
+            return;
+        };
+        let path = "Sound\\Music\\Musical Moments\\ZulGurubVooDoo.mp3";
+        let stream = stream_from_bytes(chain.read(path).expect("in the chain")).expect("opens");
+        let secs = stream.duration().as_secs_f64();
+        let mut manager = mock_manager();
+        let h = manager
+            .play(stream.start_position(secs - 1.0))
+            .expect("play");
+        assert!(plays_out(&mut manager, &h), "{path} ends");
+    }
 }
diff --git a/crates/benilla-app/src/sound/ui.rs b/crates/benilla-app/src/sound/ui.rs
index 304ba119..a135f3b0 100644
--- a/crates/benilla-app/src/sound/ui.rs
+++ b/crates/benilla-app/src/sound/ui.rs
@@ -48,7 +48,6 @@ fn drain_ui_sounds(
     };
     for req in requests {
         let kit_ref = match &req {
-            SoundRequest::KitId(id) => KitRef::Id(*id),
             SoundRequest::KitName(name) => KitRef::Name(name),
             SoundRequest::File(path) => {
                 // `PlaySoundFile`: by path, with no kit gates or variation.
diff --git a/crates/benilla-app/src/sound/zone.rs b/crates/benilla-app/src/sound/zone.rs
index b6f84ca8..57f759db 100644
--- a/crates/benilla-app/src/sound/zone.rs
+++ b/crates/benilla-app/src/sound/zone.rs
@@ -7,7 +7,9 @@
 //! interval (`0x4601f0`). A zone-music change (`0x4602e0`) or world entry (`0x45ffc0`, at
 //! `0x45ffdb`) arms the next start to −1 at `0x836400`, so the incoming track opens that tick
 //! (`0x460240`) at full volume: no fade-in primitive (`0x7a57b0`, `0x7a5730`) is called on a
-//! music slot.
+//! music slot. A start that plays nothing (no kit, a file missing from the archive, a failed
+//! open) leaves that deadline armed, so every tick retries with a fresh weighted pick
+//! (`0x460240` writes `[0x836400]` on no failure path): a missing file costs a tick, not the zone.
 //!
 //! Server-pushed music (`SMSG_PLAY_MUSIC`) takes the same slot. The server re-pushes an event
 //! track to loop it (the Darkmoon Faire every 5 s, vmangos `go_scripts.cpp:318`), so a push for
@@ -17,10 +19,19 @@
 //! Ambience (`0x460b00`): an area, interior, day/night or ghost change crossfades over 5.0 s;
 //! submerge/emerge is instant (`0x458650` → `0x460af0`). Day is 05:30 ≤ t < 21:00 on the
 //! server-synced clock, a hard step with no fade (`0x4578c0`, via the `0x642710` range check).
+//! The bed is a looping stream read from the archive as it plays (`0x7a54d0`), opened on the IO
+//! pool so the frame that changes it reads and decodes nothing.
 
+use std::sync::Mutex;
+
+use anyhow::Context;
 use bevy::prelude::*;
+use bevy::tasks::futures_lite::future;
+use bevy::tasks::{block_on, IoTaskPool, Task};
+use kira::sound::streaming::StreamingSoundData;
+use kira::sound::FromFileError;
 
-use benilla_formats::AreaSoundCatalog;
+use benilla_formats::{AreaSoundCatalog, Chain};
 
 use crate::net::{ServerSoundKind, ServerSoundMessage};
 use benilla_assets::{AssetSet, LockRecover, WorldAssets};
@@ -52,8 +63,19 @@ fn phase(clock: &GameClock) -> usize {
     }
 }
 
-/// SoundEntries 4123 `UnderWaterLoop`, the submerged ambience bed.
-const UNDERWATER_LOOP_KIT: u32 = 4123;
+/// The selector's two forced beds (`0x460bd0`), ahead of the weather and zone beds: a ghost's
+/// `[0xb06d48]`, else a submerged listener's `[0xb06d4c]`. The kit is 0 when the row was not
+/// found, and the selector then returns silence rather than falling through, as `0x460bd9` and
+/// `0x460be8` return the global unchecked.
+fn forced_bed(kits: &SoundKits, ghost: bool, submerged: bool) -> Option<u32> {
+    if ghost {
+        Some(kits.ghost_bed().unwrap_or(0))
+    } else if submerged {
+        Some(kits.underwater_bed().unwrap_or(0))
+    } else {
+        None
+    }
+}
 
 /// The outgoing music fade, the only fade on the music slot: `0x4602e0` →
 /// `0x7a5a10(0x40800000 = 4.0f)`.
@@ -126,21 +148,29 @@ pub(super) struct ZoneAudio {
     /// The Lua `PlayMusic` slot, the reference's `[0xb06ccc]`: a second music stream beside the
     /// zone track's `[0xb06cc4]`, driven only by `PlayMusic`/`StopMusic`.
     lua_music: Option<StreamingSoundHandle<kira::sound::FromFileError>>,
-    /// The file on that slot, kept to restart it: `0x7a5620` opens it with `SetLoopCount(-1)`
-    /// (`0x7a5592`), and kira cannot loop a decode-stream.
+    /// The file on that slot, kept to reopen it at its natural end: `0x7a5620` opens it with
+    /// `SetLoopCount(-1)` (`0x7a5592`), where this slot restarts it.
     lua_music_path: Option<String>,
     lua_music_watch: mixer::StreamWatch,
     /// When the next zone track starts (`Time::elapsed_secs_f64`); `None` while one plays or the
-    /// zone has no music.
+    /// zone has no music. A due start that plays nothing leaves it set, so the next frame retries
+    /// (`0x460240` never writes `[0x836400]` on a failure).
     next_track_at: Option<f64>,
+    /// Music paths already warned about, so a retry every frame reports a bad file once.
+    unplayable: std::collections::HashSet<String>,
     /// Last frame's [`SoundConfig::music_suppressed`], for its edges.
     music_suppressed: bool,
-    /// The looping ambience kit currently up (0 = none), its handle and base volume.
+    /// The looping ambience kit last asked for (0 = none): the bed playing, or the one opening.
     ambience_kit: u32,
-    ambience: Option<mixer::StaticSoundHandle>,
+    /// The bed playing and its base volume.
+    ambience: Option<StreamingSoundHandle<FromFileError>>,
     ambience_kit_vol: f32,
     /// The incoming leg of an ambience crossfade, while the new bed ramps up.
     ambience_fade_in: Option<FadeIn>,
+    /// The next bed, opening off the main thread; the playing one holds until it lands.
+    ambience_opening: Option<OpeningBed>,
+    /// The playing bed's starvation meter: it reads from the archive as it plays.
+    ambience_watch: mixer::StreamWatch,
     /// Intro row id to last-played time (secs), against `MinDelayMinutes`.
     intro_last: std::collections::HashMap<u32, f64>,
     area: Option<u32>,
@@ -163,11 +193,14 @@ impl Default for ZoneAudio {
             lua_music_path: None,
             lua_music_watch: mixer::StreamWatch::new("Lua music"),
             next_track_at: None,
+            unplayable: std::collections::HashSet::new(),
             music_suppressed: false,
             ambience_kit: 0,
             ambience: None,
             ambience_kit_vol: 1.0,
             ambience_fade_in: None,
+            ambience_opening: None,
+            ambience_watch: mixer::StreamWatch::new("ambience"),
             intro_last: std::collections::HashMap::new(),
             area: None,
             interior: None,
@@ -295,51 +328,21 @@ fn zone_audio(
             if let Some(mut h) = zone.music.take() {
                 h.stop(mixer::fade(MUSIC_FADE_OUT_MS));
             }
-            zone.next_track_at = None;
-            // The intro preempts the zone track, at full, if off cooldown.
-            let mut slot_taken = false;
-            if let Some(intro) = intro {
-                let ok_at = zone
-                    .intro_last
-                    .get(&intro.id)
-                    .map(|t| t + intro.min_delay_minutes as f64 * 60.0);
-                if ok_at.is_none_or(|t| now >= t)
-                    && intro.sound_id != 0
-                    && start_music_stream(
-                        zone,
-                        &mut out,
-                        &mut kits,
-                        &assets,
-                        &config,
-                        intro.sound_id,
-                    )
-                {
-                    zone.intro_last.insert(intro.id, now);
-                    slot_taken = true;
-                }
-            }
-            // Otherwise the zone track starts now, on a change and on world entry alike (the −1
-            // that `0x4602e0` and `0x45ffc0` arm); the silence interval is same-zone spacing only.
-            if !slot_taken {
-                if let Some(kit) = zone_music_row(&areas.0, music_row).map(|m| m.sounds[phase]) {
-                    if kit != 0 {
-                        start_music_stream(zone, &mut out, &mut kits, &assets, &config, kit);
-                    }
-                }
-            }
+            let kit = zone_music_row(&areas.0, music_row).map(|m| m.sounds[phase]);
+            begin_zone_music(zone, intro, kit, now, |zone, kit| {
+                start_music_stream(zone, &mut out, &mut kits, &assets, &config, kit)
+            });
         }
     }
 
     // ---- ambience: the reference's selector (`0x460bd0`) ranks ghost > submerged > weather >
-    // interior/zone day/night; the ghost bed is the kit named "Ghost", its swap the 5.0 s
-    // crossfade (`0x458680` → `0x460c20`) ----
+    // interior/zone day/night; a ghost's swap is the 5.0 s crossfade (`0x458680` → `0x460c20`) ----
+    reap_stopped_bed(zone);
     let ghost = self_store
         .single()
         .is_ok_and(|store| store.0.player_is_ghost());
-    let desired = if ghost {
-        kits.id_by_name("Ghost").unwrap_or(0)
-    } else if world.submersion().is_water() {
-        UNDERWATER_LOOP_KIT
+    let desired = if let Some(bed) = forced_bed(&kits, ghost, world.submersion().is_water()) {
+        bed
     } else if weather.0 != 0 && world.area_interior().is_none() {
         // `0x460bf7`–`0x460c17`: with the zonetext indoor bit `[0xb06d44]` clear, the weather's
         // SoundEntries is the bed; indoors the selector ignores it, and the swap crossfades.
@@ -365,11 +368,10 @@ fn zone_audio(
         } else {
             AMBIENCE_TRANSITION_FADE_MS
         };
-        swap_ambience(
-            zone, &mut out, &mut kits, &assets, &config, desired, fade_ms, now,
-        );
+        swap_ambience(zone, &out, &mut kits, &assets, desired, fade_ms);
     }
     zone.was_underwater = world.submersion().is_water();
+    land_ambience(zone, &mut out, &config, now);
 
     // ---- music transport ----
     // Reap a finished track and schedule the next after a silence interval (`0x4600b6`).
@@ -382,16 +384,13 @@ fn zone_audio(
         }
     }
     // The deadline passed: start the next track. Under a live Lua slot the reference's pump bails
-    // before reading the deadline (`0x460057`) while this consumes it and is refused at the slot;
-    // the same outcome, since only the verb ends the override and it always rewrites the deadline.
+    // before reading the deadline (`0x460057`); here the start is refused at the slot and the
+    // deadline stays armed until the verb rewrites it, the same outcome.
     if zone.next_track_at.is_some_and(|t| now >= t) && zone.music.is_none() {
-        zone.next_track_at = None;
-        if let Some(m) = zone_music_row(&areas.0, zone.zone_music) {
-            let kit = m.sounds[phase];
-            if kit != 0 {
-                start_music_stream(zone, &mut out, &mut kits, &assets, &config, kit);
-            }
-        }
+        let kit = zone_music_row(&areas.0, zone.zone_music).map(|m| m.sounds[phase]);
+        pump_zone_music(zone, kit, |zone, kit| {
+            start_music_stream(zone, &mut out, &mut kits, &assets, &config, kit)
+        });
     }
 
     // ---- per-frame volumes (sliders are live) ----
@@ -417,6 +416,9 @@ fn zone_audio(
             mixer::glide(),
         );
     }
+    if let Some(h) = &zone.ambience {
+        zone.ambience_watch.feed(h, f64::from(real.delta_secs()));
+    }
 }
 
 /// The two edges of [`SoundConfig::music_suppressed`] on the music slot: down is a cut, since
@@ -492,6 +494,62 @@ fn slot_holds(music_kit: u32, kit_id: u32, slot: Option<kira::sound::PlaybackSta
     music_kit == kit_id && slot.is_some_and(|s| s != kira::sound::PlaybackState::Stopped)
 }
 
+/// A zone-music change's start: the intro if off cooldown, else the zone track now, on a change
+/// and on world entry alike (the −1 that `0x4602e0` and `0x45ffc0` arm); the silence interval is
+/// same-zone spacing only. `kit` is the row's kit for the phase, `None` with no row. A start that
+/// plays nothing leaves the pump armed for the next frame (`0x460240` returns without writing
+/// `[0x836400]`), which is also how a phase with no kit waits for the other one.
+fn begin_zone_music(
+    zone: &mut ZoneAudio,
+    intro: Option<&benilla_formats::ZoneIntroEntry>,
+    kit: Option<u32>,
+    now: f64,
+    mut start: impl FnMut(&mut ZoneAudio, u32) -> bool,
+) {
+    zone.next_track_at = None;
+    if let Some(intro) = intro {
+        let ok_at = zone
+            .intro_last
+            .get(&intro.id)
+            .map(|t| t + intro.min_delay_minutes as f64 * 60.0);
+        if ok_at.is_none_or(|t| now >= t) && intro.sound_id != 0 && start(zone, intro.sound_id) {
+            zone.intro_last.insert(intro.id, now);
+            return;
+        }
+    }
+    let Some(kit) = kit else {
+        return;
+    };
+    if kit == 0 || !start(zone, kit) {
+        zone.next_track_at = Some(now);
+    }
+}
+
+/// The due start: the row's kit for the phase (`None` with no row) with a fresh weighted pick
+/// (`0x45bb70`) per attempt. The deadline is spent only by a stream that opened; a missing file,
+/// no kit or a refused slot leaves it armed (`0x46024b`–`0x4602a4` return before any write).
+fn pump_zone_music(
+    zone: &mut ZoneAudio,
+    kit: Option<u32>,
+    mut start: impl FnMut(&mut ZoneAudio, u32) -> bool,
+) {
+    match kit {
+        None => zone.next_track_at = None,
+        Some(0) => {}
+        Some(kit) => {
+            if start(zone, kit) {
+                zone.next_track_at = None;
+            }
+        }
+    }
+}
+
+/// Whether `path` is newly unplayable: the reference retries a bad pick silently every tick, so
+/// the log hears of each path once.
+fn first_unplayable(zone: &mut ZoneAudio, path: &str) -> bool {
+    zone.unplayable.insert(path.to_owned())
+}
+
 /// Open a music kit on the music slot at full volume (`0x460240` → `0x7a5dc0`), replacing what
 /// is there; whether a stream started.
 fn start_music_stream(
@@ -527,7 +585,9 @@ fn start_music_stream(
     let data = match bytes.and_then(mixer::stream_from_bytes) {
         Ok(d) => d,
         Err(e) => {
-            warn!("zone music: {path} — {e:#}");
+            if first_unplayable(zone, &path) {
+                warn!("zone music: {path} — {e:#}");
+            }
             return false;
         }
     };
@@ -544,7 +604,9 @@ fn start_music_stream(
             true
         }
         Err(e) => {
-            warn!("zone music: {path} — {e:#}");
+            if first_unplayable(zone, &path) {
+                warn!("zone music: {path} — {e:#}");
+            }
             false
         }
     }
@@ -655,53 +717,145 @@ fn drop_lua_music(zone: &mut ZoneAudio) {
     zone.lua_music_watch.reset();
 }
 
-/// Crossfade the looping ambience bed to a new kit (0 = stop) over `fade_ms`: the old bed fades
-/// out on the backend while the new one starts silent under the per-frame envelope.
+/// Crossfade the looping ambience bed to a new kit (0 = stop) over `fade_ms`. The new bed opens
+/// on the IO pool ([`open_bed`]) and both legs start the frame it lands ([`land_ambience`]), a
+/// frame or more after the swap, where the reference fades out and opens in the one call
+/// (`0x460b31`, `0x460b54`): a cold open can take far longer than a frame. A newer swap drops an
+/// open still in flight, so the latest kit wins.
 fn swap_ambience(
     zone: &mut ZoneAudio,
-    out: &mut SoundOutput,
+    out: &SoundOutput,
     kits: &mut SoundKits,
     assets: &WorldAssets,
-    config: &SoundConfig,
     kit_id: u32,
     fade_ms: u64,
-    now: f64,
 ) {
     if kit_id == zone.ambience_kit {
         return;
     }
-    if let Some(mut h) = zone.ambience.take() {
-        h.stop(mixer::fade(fade_ms));
-    }
     zone.ambience_kit = kit_id;
-    zone.ambience_fade_in = None;
-    if kit_id == 0 {
-        return;
-    }
-    let Some(mixer_ref) = out.mixer.as_mut() else {
+    zone.ambience_opening = None;
+    let pick = if kit_id != 0 && out.mixer.is_some() {
+        kits.pick_stream(kit_id)
+    } else {
+        None
+    };
+    let Some((path, kit_vol)) = pick else {
+        // Nothing opens, so the old bed goes now: the reference's fade-out precedes its open
+        // (`0x460b31`, then `0x460b54`).
+        fade_out_ambience(zone, fade_ms);
         return;
     };
-    let Some((path, kit_vol)) = kits.pick_stream(kit_id) else {
+    let chain = assets.chain.clone();
+    let open_path = path.clone();
+    begin_bed_open(zone, path, kit_vol, fade_ms, move || {
+        open_bed(&chain, &open_path)
+    });
+}
+
+/// An ambience bed opening off the main thread, and how it goes in once open.
+struct OpeningBed {
+    path: String,
+    kit_vol: f32,
+    fade_ms: u64,
+    task: Task<anyhow::Result<StreamingSoundData<FromFileError>>>,
+}
+
+/// A bed whose open finished, ready to land.
+struct OpenedBed {
+    path: String,
+    kit_vol: f32,
+    fade_ms: u64,
+    stream: anyhow::Result<StreamingSoundData<FromFileError>>,
+}
+
+/// Run `open` on the IO pool as the next bed, replacing any open in flight.
+fn begin_bed_open(
+    zone: &mut ZoneAudio,
+    path: String,
+    kit_vol: f32,
+    fade_ms: u64,
+    open: impl FnOnce() -> anyhow::Result<StreamingSoundData<FromFileError>> + Send + 'static,
+) {
+    let task = IoTaskPool::get().spawn(async move { open() });
+    zone.ambience_opening = Some(OpeningBed {
+        path,
+        kit_vol,
+        fade_ms,
+        task,
+    });
+}
+
+/// The open in flight, once it has finished.
+fn poll_bed_open(zone: &mut ZoneAudio) -> Option<OpenedBed> {
+    let stream = block_on(future::poll_once(&mut zone.ambience_opening.as_mut()?.task))?;
+    let OpeningBed {
+        path,
+        kit_vol,
+        fade_ms,
+        ..
+    } = zone.ambience_opening.take()?;
+    Some(OpenedBed {
+        path,
+        kit_vol,
+        fade_ms,
+        stream,
+    })
+}
+
+/// Open `path` as a looping ambience stream, read from its archive a sector at a time as it
+/// plays: the reference opens a bed with `FSOUND_Stream_Open` in mode `0x82002`, its `0x2` the
+/// loop bit, and loop count −1 (`0x458900` → `0x7a5620` → `0x7a54d0`, `0x7a5592`), reading
+/// through its MPQ file callbacks. The chain's lock covers the archive lookup alone.
+fn open_bed(chain: &Mutex<Chain>, path: &str) -> anyhow::Result<StreamingSoundData<FromFileError>> {
+    let archive = chain.lock_recover().archive_for(path)?;
+    let file = archive
+        .open_file(path)
+        .with_context(|| format!("opening {path} in {}", archive.path().display()))?;
+    let len = file.size();
+    Ok(mixer::stream_from_source(file, len)?.loop_region(..))
+}
+
+/// The frame the next bed's open lands: the old bed fades out over the swap's `fade_ms` and the
+/// new one starts under the per-frame fade-in envelope (`0x460b31`, `0x460b76`–`0x460b8c`), or at
+/// full with the old one cut when the swap is instant. A bed that failed to open leaves silence,
+/// as the reference's failed open leaves `[0xb06d3c]` empty behind the fade.
+fn land_ambience(zone: &mut ZoneAudio, out: &mut SoundOutput, config: &SoundConfig, now: f64) {
+    let Some(opened) = poll_bed_open(zone) else {
         return;
     };
-    let bytes = {
-        let chain = assets.chain.lock_recover();
-        chain.read(&path)
-    };
-    // A static loop, not a stream (`mixer::loop_from_bytes`).
-    let data = match bytes.and_then(mixer::loop_from_bytes) {
-        Ok(d) => d,
-        Err(e) => {
-            warn!("ambience: {path} — {e:#}");
-            return;
-        }
-    };
+    let ambience_amp = config.category_amp(SoundCategory::Ambience);
+    start_bed(zone, opened, ambience_amp, now, |data| {
+        out.mixer
+            .as_mut()
+            .context("the audio device closed")?
+            .play_stream(data)
+    });
+}
+
+/// [`land_ambience`] once the bed is open: `play` starts it on the device.
+fn start_bed(
+    zone: &mut ZoneAudio,
+    opened: OpenedBed,
+    ambience_amp: f32,
+    now: f64,
+    play: impl FnOnce(
+        StreamingSoundData<FromFileError>,
+    ) -> anyhow::Result<StreamingSoundHandle<FromFileError>>,
+) {
+    let OpenedBed {
+        path,
+        kit_vol,
+        fade_ms,
+        stream,
+    } = opened;
+    fade_out_ambience(zone, fade_ms);
     let start_amp = if fade_ms > 0 {
         0.0
     } else {
-        config.category_amp(SoundCategory::Ambience) * kit_vol
+        ambience_amp * kit_vol
     };
-    match mixer_ref.play_2d(data.volume(mixer::amp_to_db(start_amp))) {
+    match stream.and_then(|data| play(data.volume(mixer::amp_to_db(start_amp)))) {
         Ok(h) => {
             info!("ambience: {path}");
             zone.ambience = Some(h);
@@ -714,6 +868,41 @@ fn swap_ambience(
     }
 }
 
+/// Drop a bed that stopped by itself, which a looping stream does only on a read or decode
+/// error, and clear its kit so the selection reopens it next; whether one was reaped. An open in
+/// flight replaces it anyway, so its kit is kept.
+fn reap_stopped_bed(zone: &mut ZoneAudio) -> bool {
+    let Some(h) = zone.ambience.as_mut() else {
+        return false;
+    };
+    if h.state() != kira::sound::PlaybackState::Stopped {
+        return false;
+    }
+    let error = h
+        .pop_error()
+        .map_or_else(|| "no error reported".to_owned(), |e| e.to_string());
+    warn!(
+        "ambience: kit {} stopped mid-play — {error}",
+        zone.ambience_kit
+    );
+    zone.ambience = None;
+    zone.ambience_fade_in = None;
+    zone.ambience_watch.reset();
+    if zone.ambience_opening.is_none() {
+        zone.ambience_kit = 0;
+    }
+    true
+}
+
+/// Release the playing bed to fade out over `fade_ms` on the backend; `0` cuts it.
+fn fade_out_ambience(zone: &mut ZoneAudio, fade_ms: u64) {
+    if let Some(mut h) = zone.ambience.take() {
+        h.stop(mixer::fade(fade_ms));
+    }
+    zone.ambience_fade_in = None;
+    zone.ambience_watch.reset();
+}
+
 /// The Lua music slot: this frame's queued verbs, the loop, the slider and the watch.
 /// Unconditional: the stream is the caller's, not the world soundscape's.
 fn lua_music(
@@ -872,6 +1061,9 @@ fn stop_world_soundscape(zone: &mut ZoneAudio, reason: &str) {
     if let Some(mut h) = zone.ambience.take() {
         h.stop(mixer::fade(WORLD_TEARDOWN_FADE_MS));
     }
+    // An open still in flight lands nowhere.
+    zone.ambience_opening = None;
+    zone.ambience_watch.reset();
     zone.zone_music = 0;
     zone.music_kit = 0;
     zone.music_kit_vol = 1.0;
@@ -930,10 +1122,184 @@ pub(super) fn plugin(app: &mut App) {
 #[cfg(test)]
 mod tests {
     use super::{
-        apply_music_suppression, slot_holds, take_lua_music_slot, ZoneAudio,
+        apply_music_suppression, begin_bed_open, begin_zone_music, first_unplayable, forced_bed,
+        open_bed, poll_bed_open, pump_zone_music, reap_stopped_bed, slot_holds, start_bed,
+        stop_world_soundscape, take_lua_music_slot, OpenedBed, ZoneAudio,
         CINEMATIC_MUSIC_RESUME_SECS, LUA_MUSIC_SCHEDULE_SECS,
     };
-    use kira::sound::PlaybackState;
+    use crate::sound::kit::SoundKits;
+    use crate::sound::mixer;
+    use benilla_formats::SoundKitCatalog;
+    use kira::sound::streaming::StreamingSoundData;
+    use kira::sound::{FromFileError, PlaybackState};
+    use std::sync::{mpsc, Arc, Mutex};
+    use std::time::{Duration, Instant};
+
+    /// A kit of `files`, of which only the `present` ones open, picked uniformly per attempt as
+    /// the reference's weighted pick does: every attempt is logged in `tried`.
+    struct Kit {
+        files: usize,
+        present: Vec<usize>,
+        tried: Vec<usize>,
+        /// Picks to make first, then the RNG's.
+        script: Vec<usize>,
+    }
+
+    impl Kit {
+        fn start(&mut self, zone: &mut ZoneAudio, _kit: u32) -> bool {
+            let pick = if self.script.is_empty() {
+                zone.rand() as usize % self.files
+            } else {
+                self.script.remove(0)
+            };
+            self.tried.push(pick);
+            self.present.contains(&pick)
+        }
+    }
+
+    /// The pump's frame loop, as `zone_audio` runs it: a track starts once the deadline passed.
+    fn frames(zone: &mut ZoneAudio, kit: &mut Kit, n: usize, mut playing: impl FnMut() -> bool) {
+        for f in 0..n {
+            let now = f as f64 / 60.0;
+            if zone.next_track_at.is_some_and(|t| now >= t) && !playing() {
+                pump_zone_music(zone, Some(7), |z, k| kit.start(z, k));
+            }
+        }
+    }
+
+    /// The Crossroads' shape: four tracks, one in the install.
+    #[test]
+    fn a_pick_that_lands_on_a_missing_file_is_retried_until_one_plays() {
+        let mut zone = ZoneAudio {
+            next_track_at: Some(0.0),
+            ..ZoneAudio::default()
+        };
+        let mut kit = Kit {
+            files: 4,
+            present: vec![2],
+            tried: vec![],
+            script: vec![0, 1],
+        };
+        frames(&mut zone, &mut kit, 600, || false);
+        assert_eq!(kit.tried.last(), Some(&2), "a later frame found the track");
+        assert!(kit.tried.len() > 1, "the seed's first pick is a miss");
+        assert_eq!(
+            zone.next_track_at, None,
+            "the deadline is spent by the start"
+        );
+        let n = kit.tried.len();
+        frames(&mut zone, &mut kit, 60, || false);
+        assert_eq!(kit.tried.len(), n, "nothing retries once a stream opened");
+    }
+
+    #[test]
+    fn a_zone_change_whose_start_fails_keeps_the_pump_armed() {
+        let mut zone = ZoneAudio::default();
+        let mut kit = Kit {
+            files: 4,
+            present: vec![],
+            tried: vec![],
+            script: vec![0],
+        };
+        begin_zone_music(&mut zone, None, Some(7), 5.0, |z, k| kit.start(z, k));
+        assert_eq!(kit.tried.len(), 1, "the change starts inline");
+        assert_eq!(zone.next_track_at, Some(5.0), "and arms the retry at once");
+
+        kit.present = vec![0, 1, 2, 3];
+        let mut now = 5.0;
+        while zone.next_track_at.is_some() {
+            pump_zone_music(&mut zone, Some(7), |z, k| kit.start(z, k));
+            now += 1.0 / 60.0;
+            assert!(now < 10.0);
+        }
+        assert_eq!(kit.tried.len(), 2, "the next frame's pick played");
+    }
+
+    #[test]
+    fn a_zone_change_that_starts_leaves_nothing_armed() {
+        let mut zone = ZoneAudio {
+            next_track_at: Some(1.0),
+            ..ZoneAudio::default()
+        };
+        let mut kit = Kit {
+            files: 1,
+            present: vec![0],
+            tried: vec![],
+            script: vec![],
+        };
+        begin_zone_music(&mut zone, None, Some(7), 5.0, |z, k| kit.start(z, k));
+        assert_eq!(zone.next_track_at, None);
+        // No row: no music, nothing to retry.
+        begin_zone_music(&mut zone, None, None, 5.0, |_, _| {
+            panic!("no row starts nothing")
+        });
+        assert_eq!(zone.next_track_at, None);
+    }
+
+    /// Everlook: a kit for one phase only. The pump waits for the phase that has one.
+    #[test]
+    fn a_phase_with_no_kit_stays_armed_until_the_other_phase_has_one() {
+        let mut zone = ZoneAudio::default();
+        begin_zone_music(&mut zone, None, Some(0), 3.0, |_, _| {
+            panic!("kit 0 opens nothing")
+        });
+        assert_eq!(zone.next_track_at, Some(3.0));
+        for _ in 0..100 {
+            pump_zone_music(&mut zone, Some(0), |_, _| panic!("kit 0 opens nothing"));
+        }
+        assert_eq!(zone.next_track_at, Some(3.0));
+
+        let mut started = vec![];
+        pump_zone_music(&mut zone, Some(9), |_, k| {
+            started.push(k);
+            true
+        });
+        assert_eq!(started, [9]);
+        assert_eq!(zone.next_track_at, None);
+    }
+
+    #[test]
+    fn a_zone_with_no_music_row_drops_the_deadline() {
+        let mut zone = ZoneAudio {
+            next_track_at: Some(0.0),
+            ..ZoneAudio::default()
+        };
+        pump_zone_music(&mut zone, None, |_, _| panic!("no row starts nothing"));
+        assert_eq!(zone.next_track_at, None);
+    }
+
+    /// The intro wins when it plays; one that fails falls through to the zone track.
+    #[test]
+    fn an_intro_that_fails_falls_through_to_the_zone_track() {
+        let intro = benilla_formats::ZoneIntroEntry {
+            id: 1,
+            sound_id: 11,
+            priority: 0,
+            min_delay_minutes: 10,
+        };
+        let mut zone = ZoneAudio::default();
+        let mut asked = vec![];
+        begin_zone_music(&mut zone, Some(&intro), Some(7), 0.0, |_, k| {
+            asked.push(k);
+            k == 7
+        });
+        assert_eq!(asked, [11, 7]);
+        assert_eq!(zone.next_track_at, None);
+        assert!(
+            !zone.intro_last.contains_key(&1),
+            "a failed intro is not stamped"
+        );
+    }
+
+    #[test]
+    fn a_missing_path_is_reported_once_across_retries() {
+        let mut zone = ZoneAudio::default();
+        let hits = (0..500)
+            .filter(|_| first_unplayable(&mut zone, "Sound\\Music\\a.mp3"))
+            .count();
+        assert_eq!(hits, 1);
+        assert!(first_unplayable(&mut zone, "Sound\\Music\\b.mp3"));
+    }
 
     #[test]
     fn a_cinematic_cuts_the_music_and_brings_it_back_three_seconds_later() {
@@ -1043,4 +1409,350 @@ mod tests {
         assert!(!slot_holds(8440, 8440, None));
         assert!(!slot_holds(8440, 4123, Some(PlaybackState::Playing)));
     }
+
+    /// A ghost hears its own bed whatever the water does, a swimmer the underwater one, and a
+    /// living dry listener neither. A row named plain `Ghost` or `UnderWaterLoop`, which the
+    /// selector does not look for, is never the bed.
+    #[test]
+    fn a_ghost_selects_the_ghost_bed_ahead_of_the_water_bed() {
+        let kits = SoundKits::new(SoundKitCatalog::named_for_tests(&[
+            (7, "Ghost"),
+            (4123, "UnderWaterLoop"),
+            (4160, "Ghost (DONOTRENAME)"),
+            (4209, "Underwater (DONOTRENAME)"),
+        ]));
+        assert_eq!(forced_bed(&kits, true, false), Some(4160));
+        assert_eq!(
+            forced_bed(&kits, true, true),
+            Some(4160),
+            "ghost outranks water"
+        );
+        assert_eq!(forced_bed(&kits, false, true), Some(4209));
+        assert_eq!(
+            forced_bed(&kits, false, false),
+            None,
+            "the weather and zone beds follow"
+        );
+    }
+
+    /// `0x460bd9` and `0x460be8` return the global unchecked, so an unresolved row is silence
+    /// (kit 0), not the next bed in the ranking.
+    #[test]
+    fn an_unresolved_forced_bed_is_silence() {
+        let kits = SoundKits::new(SoundKitCatalog::named_for_tests(&[(
+            4123,
+            "UnderWaterLoop",
+        )]));
+        assert_eq!(forced_bed(&kits, true, false), Some(0));
+        assert_eq!(forced_bed(&kits, false, true), Some(0));
+        assert_eq!(forced_bed(&kits, false, false), None);
+    }
+
+    /// With the install: the ghost bed is `GhostState.wav` and the water bed the underwater loop
+    /// at its own row's volume, each a file the chain opens.
+    #[test]
+    fn the_install_s_ghost_and_water_beds_are_the_donotrename_rows() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("chain");
+        let catalog = benilla_formats::load_sound_kit_catalog(&mut chain).expect("SoundEntries");
+        let mut kits = SoundKits::new(catalog);
+        assert_eq!(forced_bed(&kits, true, false), Some(4160));
+        assert_eq!(forced_bed(&kits, false, true), Some(4209));
+        for (kit, file) in [(4160, "GhostState.wav"), (4209, "UndwaterLoop.wav")] {
+            let (path, _) = kits.pick_stream(kit).expect("the kit has a bed");
+            assert!(path.ends_with(file), "kit {kit} plays {path}");
+            assert!(chain.contains(&path), "{path} is in the archives");
+        }
+    }
+
+    fn io_pool() {
+        bevy::tasks::IoTaskPool::get_or_init(bevy::tasks::TaskPool::new);
+    }
+
+    /// A short synthetic bed, stereo with the install's mono `nBlockAlign`.
+    fn bed() -> anyhow::Result<StreamingSoundData<FromFileError>> {
+        let wav = mixer::tests::pcm16_wav(22_050, 2, 2, 100, |i| i as i16);
+        Ok(mixer::stream_from_bytes(wav)?.loop_region(..))
+    }
+
+    /// An opener held until `gate` fires; run on the caller's thread it gives up after 2 s.
+    fn held(
+        gate: mpsc::Receiver<()>,
+        ran_on: Arc<Mutex<Option<std::thread::ThreadId>>>,
+    ) -> impl FnOnce() -> anyhow::Result<StreamingSoundData<FromFileError>> + Send + 'static {
+        move || {
+            *ran_on.lock().unwrap() = Some(std::thread::current().id());
+            let _ = gate.recv_timeout(Duration::from_secs(2));
+            bed()
+        }
+    }
+
+    fn wait_landed(zone: &mut ZoneAudio) -> Option<OpenedBed> {
+        let deadline = Instant::now() + Duration::from_secs(5);
+        while Instant::now() < deadline {
+            if let Some(bed) = poll_bed_open(zone) {
+                return Some(bed);
+            }
+            std::thread::sleep(Duration::from_millis(2));
+        }
+        None
+    }
+
+    /// The swap's frame reads and decodes nothing: the open runs on the IO pool, and the caller
+    /// is back while it is still held.
+    #[test]
+    fn a_bed_opens_off_the_calling_thread() {
+        io_pool();
+        let mut zone = ZoneAudio::default();
+        let (release, gate) = mpsc::channel();
+        let ran_on = Arc::new(Mutex::new(None));
+        begin_bed_open(
+            &mut zone,
+            "a.wav".into(),
+            1.0,
+            5000,
+            held(gate, ran_on.clone()),
+        );
+        assert!(
+            poll_bed_open(&mut zone).is_none(),
+            "nothing lands while the open is held"
+        );
+        let _ = release.send(());
+        let landed = wait_landed(&mut zone).expect("the open lands");
+        assert_eq!(landed.path, "a.wav");
+        assert!(landed.stream.is_ok());
+        let ran_on = ran_on.lock().unwrap().expect("the open ran");
+        assert_ne!(ran_on, std::thread::current().id(), "opened off the caller");
+    }
+
+    /// Latest wins: a swap made while an open is in flight drops it.
+    #[test]
+    fn a_newer_swap_drops_the_open_in_flight() {
+        io_pool();
+        let mut zone = ZoneAudio::default();
+        let (release, gate) = mpsc::channel();
+        begin_bed_open(
+            &mut zone,
+            "old.wav".into(),
+            1.0,
+            5000,
+            held(gate, Arc::default()),
+        );
+        begin_bed_open(&mut zone, "new.wav".into(), 0.5, 5000, bed);
+        let _ = release.send(());
+        let landed = wait_landed(&mut zone).expect("the open lands");
+        assert_eq!(landed.path, "new.wav");
+        std::thread::sleep(Duration::from_millis(50));
+        assert!(
+            poll_bed_open(&mut zone).is_none(),
+            "the dropped open never lands"
+        );
+    }
+
+    /// Leaving the world (or the loading cover) takes an open in flight with it.
+    #[test]
+    fn leaving_the_world_drops_an_open_in_flight() {
+        io_pool();
+        let mut zone = ZoneAudio {
+            ambience_kit: 7,
+            ..Default::default()
+        };
+        let (release, gate) = mpsc::channel();
+        begin_bed_open(
+            &mut zone,
+            "a.wav".into(),
+            1.0,
+            5000,
+            held(gate, Arc::default()),
+        );
+        stop_world_soundscape(&mut zone, "test");
+        let _ = release.send(());
+        std::thread::sleep(Duration::from_millis(100));
+        assert!(poll_bed_open(&mut zone).is_none());
+        assert_eq!(zone.ambience_kit, 0);
+    }
+
+    /// A landed bed: 5 s in under the envelope, or cut in at full; a failed open leaves silence.
+    #[test]
+    fn a_landed_bed_fades_in_or_cuts_in() {
+        use kira::backend::mock::{MockBackend, MockBackendSettings};
+        use kira::{AudioManager, AudioManagerSettings};
+        let mut manager = AudioManager::<MockBackend>::new(AudioManagerSettings {
+            backend_settings: MockBackendSettings {
+                sample_rate: 22_050,
+            },
+            ..Default::default()
+        })
+        .expect("mock backend");
+        let mut play = |d| manager.play(d).map_err(|e| anyhow::anyhow!("{e}"));
+        let opened = |fade_ms, stream| OpenedBed {
+            path: "a.wav".into(),
+            kit_vol: 0.5,
+            fade_ms,
+            stream,
+        };
+        let mut zone = ZoneAudio::default();
+
+        start_bed(&mut zone, opened(5000, bed()), 1.0, 10.0, &mut play);
+        assert!(zone.ambience.is_some());
+        assert_eq!(zone.ambience_kit_vol, 0.5);
+        let fade = zone.ambience_fade_in.expect("the in-leg ramps");
+        assert_eq!(fade.gain(10.0), 0.0);
+        assert!((fade.gain(12.5) - 0.5).abs() < 1e-6);
+
+        start_bed(&mut zone, opened(0, bed()), 1.0, 20.0, &mut play);
+        assert!(zone.ambience.is_some());
+        assert!(zone.ambience_fade_in.is_none(), "an instant swap cuts in");
+
+        let failed = opened(5000, Err(anyhow::anyhow!("missing")));
+        start_bed(&mut zone, failed, 1.0, 30.0, &mut play);
+        assert!(
+            zone.ambience.is_none(),
+            "the old bed went, nothing replaced it"
+        );
+    }
+
+    /// The main thread's cost of an ambience change, before (read and decode the bed whole) and
+    /// after (queue the open; start the opened stream), over every bed in the install.
+    #[test]
+    #[ignore = "instrument: run by hand — cargo test -p benilla-app --lib sound::zone::tests::bed_swap_cost -- --ignored --nocapture"]
+    fn bed_swap_cost() {
+        use kira::backend::mock::{MockBackend, MockBackendSettings};
+        use kira::{AudioManager, AudioManagerSettings};
+        let data = benilla_formats::wow_data_or_skip!();
+        let chain = Arc::new(Mutex::new(
+            benilla_formats::open_chain(&data).expect("chain"),
+        ));
+        io_pool();
+        let mut manager = AudioManager::<MockBackend>::new(AudioManagerSettings {
+            backend_settings: MockBackendSettings {
+                sample_rate: 44_100,
+            },
+            ..Default::default()
+        })
+        .expect("mock backend");
+        let beds: Vec<String> = chain
+            .lock()
+            .unwrap()
+            .list()
+            .expect("listing")
+            .into_iter()
+            .map(|e| e.name)
+            .filter(|n| {
+                let n = n.to_ascii_lowercase();
+                n.starts_with("sound\\ambience\\") && n.ends_with(".wav")
+            })
+            .collect();
+        let ms = |t: Instant| t.elapsed().as_secs_f64() * 1000.0;
+        // Warm, as a running client's IO pool and kira are by its first swap.
+        let mut zone = ZoneAudio::default();
+        let (c, p) = (chain.clone(), beds[0].clone());
+        begin_bed_open(&mut zone, p.clone(), 1.0, 0, move || open_bed(&c, &p));
+        let landed = wait_landed(&mut zone).expect("lands");
+        start_bed(&mut zone, landed, 1.0, 0.0, |d| {
+            manager.play(d).map_err(|e| anyhow::anyhow!("{e}"))
+        });
+        let (mut before, mut after, mut worker) = (Vec::new(), Vec::new(), Vec::new());
+        for path in &beds {
+            // After: the swap's frame queues the open; the landing frame starts the stream.
+            let mut zone = ZoneAudio::default();
+            let (c, p) = (chain.clone(), path.clone());
+            let worker_ms = Arc::new(Mutex::new(0.0));
+            let w = worker_ms.clone();
+            let t = Instant::now();
+            begin_bed_open(&mut zone, path.clone(), 1.0, 5000, move || {
+                let t = Instant::now();
+                let bed = open_bed(&c, &p);
+                *w.lock().unwrap() = ms(t);
+                bed
+            });
+            let queue = ms(t);
+            let landed = wait_landed(&mut zone).expect("lands");
+            let t = Instant::now();
+            start_bed(&mut zone, landed, 1.0, 0.0, |d| {
+                manager.play(d).map_err(|e| anyhow::anyhow!("{e}"))
+            });
+            let start = ms(t);
+            assert!(zone.ambience.is_some(), "{path} plays");
+            stop_world_soundscape(&mut zone, "next");
+
+            // Before: the whole bed read and decoded on the caller.
+            let t = Instant::now();
+            let bytes = chain.lock().unwrap().read(path).expect("reads");
+            let read = ms(t);
+            let t = Instant::now();
+            let _bed = mixer::sfx_from_bytes(bytes)
+                .expect("decodes")
+                .loop_region(..);
+            let decode = ms(t);
+
+            eprintln!(
+                "{path}: before read {read:.1} + decode {decode:.1} ms | after queue {queue:.3} \
+                 + start {start:.3} ms on the caller, open {:.2} ms on the IO pool",
+                worker_ms.lock().unwrap()
+            );
+            before.push(read + decode);
+            after.push(queue + start);
+            worker.push(*worker_ms.lock().unwrap());
+        }
+        let summary = |v: &mut Vec<f64>| {
+            v.sort_by(f64::total_cmp);
+            let at = |q: f64| v[((v.len() - 1) as f64 * q).round() as usize];
+            format!("{:.3} / {:.3} / {:.3}", at(0.5), at(0.9), at(1.0))
+        };
+        eprintln!(
+            "{} beds, median / p90 / max ms: before, on the caller {}; after, on the caller {}, \
+             on the IO pool {}",
+            beds.len(),
+            summary(&mut before),
+            summary(&mut after),
+            summary(&mut worker),
+        );
+    }
+
+    /// A source whose reads fail past `limit` bytes, as a bad archive sector would mid-play.
+    struct FailsAfter(std::io::Cursor<Vec<u8>>, u64);
+
+    impl std::io::Read for FailsAfter {
+        fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+            let left = self.1.saturating_sub(self.0.position());
+            if left == 0 {
+                return Err(std::io::Error::other("unreadable sector"));
+            }
+            let n = buf.len().min(left as usize);
+            self.0.read(&mut buf[..n])
+        }
+    }
+
+    impl std::io::Seek for FailsAfter {
+        fn seek(&mut self, to: std::io::SeekFrom) -> std::io::Result<u64> {
+            self.0.seek(to)
+        }
+    }
+
+    /// A bed that a read error stops mid-play is reaped and its kit cleared, so the selection
+    /// reopens it the next frame instead of leaving silence until the kit changes.
+    #[test]
+    fn a_bed_that_stops_mid_play_is_reaped() {
+        let wav = mixer::tests::pcm16_wav(22_050, 2, 4, 20_000, |i| i as i16);
+        let len = wav.len() as u64;
+        let bed = mixer::stream_from_source(FailsAfter(std::io::Cursor::new(wav), 60_000), len)
+            .expect("the header reads")
+            .loop_region(..);
+        let mut manager = mixer::tests::mock_manager();
+        let h = manager.play(bed).expect("play");
+        let mut zone = ZoneAudio {
+            ambience_kit: 7,
+            ..Default::default()
+        };
+        zone.ambience = Some(h);
+        assert!(!reap_stopped_bed(&mut zone), "a playing bed stays");
+        assert!(
+            mixer::tests::plays_out(&mut manager, zone.ambience.as_ref().unwrap()),
+            "the read error stops the bed"
+        );
+        assert!(reap_stopped_bed(&mut zone));
+        assert!(zone.ambience.is_none());
+        assert_eq!(zone.ambience_kit, 0, "the selection reopens it");
+    }
 }
diff --git a/crates/benilla-app/src/spell/bind_gates.rs b/crates/benilla-app/src/spell/bind_gates.rs
new file mode 100644
index 00000000..a5f9218e
--- /dev/null
+++ b/crates/benilla-app/src/spell/bind_gates.rs
@@ -0,0 +1,541 @@
+//! `BindTarget 0x6e5b40`'s gates: the five silent exits a unit meets before any relation arm
+//! (`6e5bd8`-`6e5ca2`). A refused unit binds nothing, so `ArmCast` falls to its next candidate,
+//! the player behind `autoSelfCast`, and then to the enemy-word refusal or the targeting cursor.
+//! The read-only mirror `SpellCanTargetUnit 0x6e6460` runs the same five (`6e6507`-`6e65ab`), so
+//! the press, the cursor's click, `SpellTargetUnit` and the hover verdict share this one gate
+//! through [`super::cast_target::unit_binds`].
+
+use benilla_formats::SpellDisplay;
+use benilla_protocol::ObjectFields;
+
+use super::cast_target::{TargetRelations, CORPSE_WORD_BITS, TF_EXPLICIT_GATE};
+
+/// `UNIT_FIELD_FLAGS & 0x10000` (vmangos `UNIT_FLAG_NON_ATTACKABLE_2`, `UnitDefines.h:561`), tested
+/// at `6e5c16`-`6e5c1d`.
+const UNIT_FLAG_NON_ATTACKABLE_2: u32 = 0x0001_0000;
+
+/// The bind's alive test (`6e5c5f`, `6e5e55`) and the world pick's (`4806fd`, `480713 setg`,
+/// [`super::targeting::PickFlags::admits`]): signed `UNIT_FIELD_HEALTH` above 0. An absent field
+/// reads 0, as the reference's descriptor does, so a dead unit whose create sent no health is dead.
+pub(super) fn unit_alive(fields: &ObjectFields) -> bool {
+    fields.unit_health().unwrap_or(0) as i32 > 0
+}
+
+/// Whether `unit` passes the gates for `word`. `is_caster` is the unit being the cast's caster
+/// (`6e5bd8`-`6e5bee`); the unit's own fields come from `rel.target_store`, and a candidate with
+/// no streamed store has none to read, so the relation arms alone decide it. Refused when:
+///
+/// - the unit is the caster and the spell has `AttributesEx & 0x80000` (`6e5bf7`);
+/// - the unit has `UNIT_FIELD_FLAGS & 0x10000` (`6e5c1d`);
+/// - the spell's `TargetCreatureType` mask excludes the unit's creature type (`6e5c36`, `6e5c53`);
+/// - the unit is dead and neither `UNIT_DYNAMIC_FLAGS & 0x20`, a word in `0x8600` nor
+///   `AttributesEx2 & 1` admits it (`6e5c8b`);
+/// - the unit is alive and the word has `0x400` (`6e5ca2`).
+pub(super) fn bind_gates(
+    def: &SpellDisplay,
+    word: u16,
+    is_caster: bool,
+    rel: &TargetRelations,
+) -> bool {
+    if is_caster && def.excludes_caster() {
+        return false;
+    }
+    let Some(store) = rel.target_store else {
+        return true;
+    };
+    let fields = &store.0;
+    if fields.unit_flags() & UNIT_FLAG_NON_ATTACKABLE_2 != 0 {
+        return false;
+    }
+    if !def.admits_creature_type(rel.types.of(store)) {
+        return false;
+    }
+    if unit_alive(fields) {
+        word & TF_EXPLICIT_GATE == 0
+    } else {
+        fields.unit_dynflag_dead() || word & CORPSE_WORD_BITS != 0 || def.allows_dead_target()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::creature_type::CreatureTypeSources;
+    use crate::names::{CreatureRecord, NameCache};
+    use crate::net::{ObjectStore, Reputations};
+    use benilla_protocol::ObjectFields;
+
+    /// Absolute descriptor indices: `OBJECT_FIELD_ENTRY`, `UNIT_FIELD_BYTES_0` (the race byte),
+    /// `UNIT_FIELD_HEALTH`, `UNIT_FIELD_FLAGS` and `UNIT_DYNAMIC_FLAGS`.
+    const ENTRY: u16 = 3;
+    const BYTES_0: u16 = 36;
+    const HEALTH: u16 = 22;
+    const FLAGS: u16 = 46;
+    const DYNAMIC_FLAGS: u16 = 143;
+
+    const WORD_UNIT: u16 = 0x0002;
+    const WORD_ASSIST: u16 = 0x0100;
+    const WORD_DEAD_ONLY: u16 = 0x0402;
+    const WORD_CORPSE_ALLY: u16 = 0x8000;
+
+    /// A store with the fields a case sets, health 100 unless it says otherwise.
+    fn unit(extra: &[(u16, u32)]) -> ObjectStore {
+        let mut pairs = extra.to_vec();
+        if !pairs.iter().any(|&(index, _)| index == HEALTH) {
+            pairs.push((HEALTH, 100));
+        }
+        ObjectStore(ObjectFields::from_pairs(&pairs))
+    }
+
+    fn passes(def: &SpellDisplay, word: u16, is_caster: bool, store: &ObjectStore) -> bool {
+        passes_with(def, word, is_caster, store, CreatureTypeSources::default())
+    }
+
+    fn passes_with(
+        def: &SpellDisplay,
+        word: u16,
+        is_caster: bool,
+        store: &ObjectStore,
+        types: CreatureTypeSources,
+    ) -> bool {
+        static EMPTY: Reputations = Reputations(Vec::new());
+        let rel = TargetRelations {
+            target_store: Some(store),
+            target_owner_store: None,
+            self_store: None,
+            factions: None,
+            reputations: &EMPTY,
+            types,
+            group: Default::default(),
+        };
+        bind_gates(def, word, is_caster, &rel)
+    }
+
+    fn spell() -> SpellDisplay {
+        SpellDisplay::default()
+    }
+
+    #[test]
+    fn an_ordinary_live_unit_passes() {
+        assert!(passes(&spell(), WORD_UNIT, false, &unit(&[])));
+        assert!(passes(&spell(), WORD_ASSIST, true, &unit(&[])));
+    }
+
+    /// `6e5bf7`: the caster, and only the caster, under `AttributesEx & 0x80000`.
+    #[test]
+    fn the_caster_is_refused_under_a_self_excluding_spell() {
+        let excluding = SpellDisplay {
+            attributes_ex: 0x0008_0000,
+            ..spell()
+        };
+        assert!(!passes(&excluding, WORD_ASSIST, true, &unit(&[])));
+        assert!(passes(&excluding, WORD_ASSIST, false, &unit(&[])));
+        assert!(passes(&spell(), WORD_ASSIST, true, &unit(&[])));
+        // Before any store is read: an unstreamed caster is still the caster.
+        let rel = TargetRelations {
+            target_store: None,
+            target_owner_store: None,
+            self_store: None,
+            factions: None,
+            reputations: &Reputations(Vec::new()),
+            types: CreatureTypeSources::default(),
+            group: Default::default(),
+        };
+        assert!(!bind_gates(&excluding, WORD_ASSIST, true, &rel));
+        assert!(bind_gates(&excluding, WORD_ASSIST, false, &rel));
+    }
+
+    /// `6e5c1d`: bit 16 of `UNIT_FIELD_FLAGS`, and only that bit.
+    #[test]
+    fn a_unit_flagged_0x10000_is_refused() {
+        assert!(!passes(
+            &spell(),
+            WORD_ASSIST,
+            false,
+            &unit(&[(FLAGS, 0x0001_0000)])
+        ));
+        assert!(!passes(
+            &spell(),
+            WORD_ASSIST,
+            true,
+            &unit(&[(FLAGS, 0x0001_1008)])
+        ));
+        for other in [0x0000_ffff, 0x0002_0000, 0xfffe_ffff] {
+            assert!(
+                passes(&spell(), WORD_ASSIST, false, &unit(&[(FLAGS, other)])),
+                "flags {other:#x}"
+            );
+        }
+    }
+
+    /// `6e5c26`-`6e5c53`: a mask excludes a unit of another type, a unit of no type, and lets
+    /// the right type through, the type read the reference's way.
+    #[test]
+    fn a_creature_type_mask_refuses_the_wrong_type() {
+        let hibernate = SpellDisplay {
+            target_creature_type: 0x3,
+            ..spell()
+        };
+        let mut names = NameCache::default();
+        for (entry, creature_type) in [(69u32, 1u32), (70, 7)] {
+            names.insert_creature(
+                entry,
+                Some(CreatureRecord {
+                    name: String::new(),
+                    subname: None,
+                    creature_type,
+                    pet_family: 0,
+                    rank: 0,
+                    type_flags: 0,
+                    civilian: false,
+                    racial_leader: false,
+                    display_id: 0,
+                }),
+            );
+        }
+        let types = CreatureTypeSources {
+            names: Some(&names),
+            forms: None,
+        };
+        let check = |def: &SpellDisplay, store: &ObjectStore| {
+            passes_with(def, WORD_UNIT, false, store, types)
+        };
+        assert!(check(&hibernate, &unit(&[(ENTRY, 69)])), "a Beast");
+        assert!(!check(&hibernate, &unit(&[(ENTRY, 70)])), "a Humanoid");
+        assert!(
+            !check(&hibernate, &unit(&[(ENTRY, 71)])),
+            "a creature no template has answered for is type 0"
+        );
+        assert!(check(&spell(), &unit(&[(ENTRY, 70)])), "no mask, any type");
+        assert!(check(&spell(), &unit(&[(ENTRY, 71)])), "no mask, no type");
+        // A player is Humanoid by race, so Hibernate refuses it and Mind Control (Humanoid) takes it.
+        let player = unit(&[(BYTES_0, 1)]);
+        let mind_control = SpellDisplay {
+            target_creature_type: 0x40,
+            ..spell()
+        };
+        assert!(!check(&hibernate, &player));
+        assert!(check(&mind_control, &player));
+    }
+
+    /// `6e5c6a`-`6e5c8b`: a dead unit is refused unless the dynamic flag, a corpse word or
+    /// `AttributesEx2 & 1` admits it; health is the signed field, and absent reads 0.
+    #[test]
+    fn a_dead_unit_is_refused_unless_something_admits_it() {
+        let dead = unit(&[(HEALTH, 0)]);
+        assert!(!passes(&spell(), WORD_ASSIST, false, &dead));
+        assert!(!passes(&spell(), WORD_ASSIST, true, &dead));
+        assert!(!passes(&spell(), WORD_UNIT, false, &dead));
+        let absent = ObjectStore(ObjectFields::default());
+        assert!(
+            !passes(&spell(), WORD_ASSIST, false, &absent),
+            "a dead unit's create sends no health"
+        );
+        let negative = unit(&[(HEALTH, 0x8000_0000)]);
+        assert!(!passes(&spell(), WORD_ASSIST, false, &negative), "signed");
+
+        assert!(
+            passes(
+                &spell(),
+                WORD_ASSIST,
+                false,
+                &unit(&[(HEALTH, 0), (DYNAMIC_FLAGS, 0x20)])
+            ),
+            "UNIT_DYNAMIC_FLAGS bit 5"
+        );
+        for word in [WORD_CORPSE_ALLY, 0x0200, WORD_DEAD_ONLY] {
+            assert!(passes(&spell(), word, false, &dead), "word {word:#06x}");
+        }
+        let raise_dead = SpellDisplay {
+            attributes_ex2: 1,
+            ..spell()
+        };
+        assert!(passes(&raise_dead, WORD_ASSIST, false, &dead));
+        let other_ex2 = SpellDisplay {
+            attributes_ex2: 0xffff_fffe,
+            ..spell()
+        };
+        assert!(!passes(&other_ex2, WORD_ASSIST, false, &dead));
+        assert!(!passes(
+            &spell(),
+            WORD_ASSIST,
+            false,
+            &unit(&[(HEALTH, 0), (DYNAMIC_FLAGS, 0xffff_ffdf)])
+        ));
+    }
+
+    /// `6e5c9a`-`6e5ca2`: a live unit is refused when the word has `0x400`, whatever else it has.
+    #[test]
+    fn a_living_unit_is_refused_under_the_0x400_word() {
+        let alive = unit(&[]);
+        assert!(!passes(&spell(), WORD_DEAD_ONLY, false, &alive));
+        assert!(!passes(&spell(), 0x0400, false, &alive));
+        assert!(!passes(&spell(), WORD_DEAD_ONLY, true, &alive));
+        assert!(passes(&spell(), WORD_UNIT, false, &alive));
+        // AttributesEx2 & 1 and a corpse bit other than 0x400 exempt only the dead.
+        let raise_dead = SpellDisplay {
+            attributes_ex2: 1,
+            ..spell()
+        };
+        assert!(!passes(&raise_dead, WORD_DEAD_ONLY, false, &alive));
+        assert!(passes(&spell(), WORD_CORPSE_ALLY, false, &alive));
+        assert!(
+            passes(&spell(), WORD_DEAD_ONLY, false, &unit(&[(HEALTH, 0)])),
+            "the same word at a corpse"
+        );
+    }
+
+    /// The gates at the press, through `resolve_cast_target`: a unit they refuse binds nothing,
+    /// so the selection falls to the player behind `autoSelfCast`, and with nothing bound an
+    /// enemy word refuses "Invalid target" and any other word raises the cursor. Each case's
+    /// control is the same unit passing the gate, which binds.
+    mod ladder {
+        use super::*;
+        use crate::spell::cast_target::{
+            cast_target_mask, resolve_cast_target, CastCandidates, CastWireTarget,
+            ERR_INVALID_TARGET,
+        };
+        use crate::spell::targeting::corpse_fixture as fx;
+
+        const ME: u64 = 1;
+        const THEM: u64 = 42;
+        const TEMPLATE: u16 = 35;
+        /// A creature entry whose cached template is a Humanoid (type 7) and one that is a
+        /// Beast (type 1).
+        const HUMANOID_ENTRY: u32 = 69;
+        const BEAST_ENTRY: u32 = 70;
+
+        fn spell_at(targets: u32, implicit: u32) -> SpellDisplay {
+            SpellDisplay {
+                targets,
+                implicit_target_a1: implicit,
+                ..Default::default()
+            }
+        }
+
+        /// A heal: the assist word, `Targets 0` with implicit target 21.
+        fn heal() -> SpellDisplay {
+            spell_at(0, 21)
+        }
+
+        /// A player-controlled unit of faction template 1 (`0x8`), so [`fx::factions`]' Human pair
+        /// is friendly to itself and `CanAssist` passes on its player-controlled arm. `extra`
+        /// overrides a default; health is 100 unless it says otherwise.
+        fn player(extra: &[(u16, u32)]) -> ObjectStore {
+            let mut fields =
+                std::collections::BTreeMap::from([(TEMPLATE, 1), (FLAGS, 0x8), (HEALTH, 100)]);
+            fields.extend(extra.iter().copied());
+            let pairs: Vec<_> = fields.into_iter().collect();
+            ObjectStore(ObjectFields::from_pairs(&pairs))
+        }
+
+        fn cached(creature_type: u32) -> CreatureRecord {
+            CreatureRecord {
+                name: String::new(),
+                subname: None,
+                creature_type,
+                pet_family: 0,
+                rank: 0,
+                type_flags: 0,
+                civilian: false,
+                racial_leader: false,
+                display_id: 0,
+            }
+        }
+
+        fn names() -> NameCache {
+            let mut names = NameCache::default();
+            names.insert_creature(HUMANOID_ENTRY, Some(cached(7)));
+            names.insert_creature(BEAST_ENTRY, Some(cached(1)));
+            names
+        }
+
+        /// The wire result for `def` with `target` selected (`selection_is_self`: the player is
+        /// the selection), the player being `me`.
+        fn press_as(
+            me: &ObjectStore,
+            def: &SpellDisplay,
+            target: &ObjectStore,
+            selection_is_self: bool,
+            auto_self_cast: bool,
+        ) -> CastWireTarget {
+            let factions = fx::factions();
+            let names = names();
+            let rel = TargetRelations {
+                target_store: Some(target),
+                target_owner_store: None,
+                self_store: Some(me),
+                factions: Some(&factions),
+                reputations: &Reputations(Vec::new()),
+                types: CreatureTypeSources {
+                    names: Some(&names),
+                    forms: None,
+                },
+                group: Default::default(),
+            };
+            let candidates = CastCandidates {
+                selection: Some(if selection_is_self { ME } else { THEM }),
+                caster: Some(ME),
+                main_hand_item: None,
+            };
+            resolve_cast_target(Some(def), &candidates, auto_self_cast, &rel)
+        }
+
+        /// [`press_as`] with a living, unflagged player.
+        fn press(
+            def: &SpellDisplay,
+            target: &ObjectStore,
+            selection_is_self: bool,
+            auto_self_cast: bool,
+        ) -> CastWireTarget {
+            press_as(&player(&[]), def, target, selection_is_self, auto_self_cast)
+        }
+
+        /// A dead friendly player selected with a heal: the selection binds nothing. With
+        /// `autoSelfCast` on the player is bound instead; with it off the assist word is left for
+        /// the cursor, as for any relation failure.
+        #[test]
+        fn a_dead_friendly_selection_falls_to_you_or_the_cursor() {
+            let alive = player(&[]);
+            let dead = player(&[(HEALTH, 0)]);
+            for auto in [false, true] {
+                assert_eq!(
+                    press(&heal(), &alive, false, auto),
+                    CastWireTarget::Unit(THEM),
+                    "the living friendly binds (autoSelfCast {auto})"
+                );
+            }
+            assert_eq!(
+                press(&heal(), &dead, false, true),
+                CastWireTarget::Unit(ME),
+                "the corpse is skipped and the player takes the heal"
+            );
+            assert_eq!(
+                press(&heal(), &dead, false, false),
+                CastWireTarget::Targeting(WORD_ASSIST),
+                "with autoSelfCast off the cursor comes up, as for a relation failure"
+            );
+            // A store that never streamed a health field is dead in the reference's descriptor.
+            let unstreamed = ObjectStore(ObjectFields::from_pairs(&[(TEMPLATE, 1), (FLAGS, 0x8)]));
+            assert_eq!(
+                press(&heal(), &unstreamed, false, false),
+                CastWireTarget::Targeting(WORD_ASSIST)
+            );
+            // `AttributesEx2 & 1` and `UNIT_DYNAMIC_FLAGS & 0x20` keep a corpse a candidate.
+            let raise = SpellDisplay {
+                attributes_ex2: 1,
+                ..heal()
+            };
+            assert_eq!(
+                press(&raise, &dead, false, false),
+                CastWireTarget::Unit(THEM)
+            );
+            let feigning = player(&[(HEALTH, 0), (DYNAMIC_FLAGS, 0x20)]);
+            assert_eq!(
+                press(&heal(), &feigning, false, false),
+                CastWireTarget::Unit(THEM)
+            );
+        }
+
+        /// Hibernate at a unit of another type binds nothing, so the enemy word refuses locally
+        /// with "Invalid target"; a Beast binds.
+        #[test]
+        fn a_creature_type_mask_refuses_the_wrong_type_locally() {
+            let hibernate = SpellDisplay {
+                target_creature_type: 0x3,
+                ..spell_at(0, 6)
+            };
+            let creature = |entry| {
+                ObjectStore(ObjectFields::from_pairs(&[
+                    (ENTRY, entry),
+                    (HEALTH, 100),
+                    (TEMPLATE, 0),
+                ]))
+            };
+            assert_eq!(
+                press(&hibernate, &creature(BEAST_ENTRY), false, true),
+                CastWireTarget::Unit(THEM)
+            );
+            for entry in [HUMANOID_ENTRY, 999] {
+                assert_eq!(
+                    press(&hibernate, &creature(entry), false, true),
+                    CastWireTarget::Refused(ERR_INVALID_TARGET),
+                    "entry {entry}: a Humanoid, and a creature with no cached template"
+                );
+            }
+            assert_eq!(
+                press(&spell_at(0, 6), &creature(HUMANOID_ENTRY), false, true),
+                CastWireTarget::Unit(THEM),
+                "the same Humanoid without a mask"
+            );
+        }
+
+        /// A self-excluding spell with yourself selected: you are not bound, not even by
+        /// `autoSelfCast`, so the assist word raises the cursor.
+        #[test]
+        fn a_self_excluding_spell_never_binds_the_caster() {
+            let excluding = SpellDisplay {
+                attributes_ex: 0x0008_0000,
+                ..heal()
+            };
+            let me = player(&[]);
+            for auto in [false, true] {
+                assert_eq!(
+                    press(&excluding, &me, true, auto),
+                    CastWireTarget::Targeting(WORD_ASSIST),
+                    "autoSelfCast {auto}"
+                );
+            }
+            assert_eq!(
+                press(&excluding, &player(&[]), false, false),
+                CastWireTarget::Unit(THEM),
+                "another friendly still binds"
+            );
+            assert_eq!(
+                press(&heal(), &me, true, false),
+                CastWireTarget::Unit(ME),
+                "without the attribute the caster is the selection"
+            );
+        }
+
+        /// `UNIT_FIELD_FLAGS & 0x10000` binds nothing: a flagged selection falls to the player
+        /// behind `autoSelfCast`, and a flagged player has no fallback left.
+        #[test]
+        fn a_unit_flagged_0x10000_binds_nothing() {
+            let flagged = || player(&[(FLAGS, 0x0001_0008)]);
+            assert_eq!(
+                press(&heal(), &flagged(), false, false),
+                CastWireTarget::Targeting(WORD_ASSIST)
+            );
+            assert_eq!(
+                press(&heal(), &flagged(), false, true),
+                CastWireTarget::Unit(ME),
+                "the selection is skipped, the player binds"
+            );
+            assert_eq!(
+                press_as(&flagged(), &heal(), &flagged(), true, true),
+                CastWireTarget::Targeting(WORD_ASSIST),
+                "neither the selection nor the fallback"
+            );
+        }
+
+        /// The `0x400` word (Skinning, `Targets 0x402`): a living unit is refused, a dead one
+        /// binds and loses the bit.
+        #[test]
+        fn the_0x400_word_binds_only_the_dead() {
+            let skinning = spell_at(0x402, 0);
+            assert_eq!(cast_target_mask(&skinning), WORD_DEAD_ONLY);
+            let creature =
+                |health| ObjectStore(ObjectFields::from_pairs(&[(HEALTH, health), (TEMPLATE, 0)]));
+            assert_eq!(
+                press(&skinning, &creature(100), false, false),
+                CastWireTarget::Targeting(WORD_DEAD_ONLY),
+                "a living unit binds nothing; the word is left for the cursor"
+            );
+            assert_eq!(
+                press(&skinning, &creature(0), false, false),
+                CastWireTarget::Unit(THEM)
+            );
+        }
+    }
+}
diff --git a/crates/benilla-app/src/spell/cast_send.rs b/crates/benilla-app/src/spell/cast_send.rs
index 9a9dd4b3..4195e2c7 100644
--- a/crates/benilla-app/src/spell/cast_send.rs
+++ b/crates/benilla-app/src/spell/cast_send.rs
@@ -3,11 +3,11 @@
 //!
 //! The rungs: the auto-repeat toggle-off (the reference's action-button handler, ahead of TryCast;
 //! its order against the profession intercept is unobservable), the profession intercept, dead or a
-//! ghost, the targeting abort, in-flight, reagents and totems, the equipped item, target binding
-//! and range, then the validator `0x6094f0` (not-ready and GCD, power, crowd control, mounted,
-//! water, moving, form), the deferred cast-arm refusal and the targeting cursor. The commit tail
-//! follows: ranged stance, auto-repeat arm, the send, the auto-attack start, the GCD. A refusal is
-//! local and pre-commit: no packet, no GCD, no pending arm, only the red line.
+//! ghost, the targeting abort, in-flight, reagents and totems, the equipped item, combo points, the
+//! attack pick, target binding and range, then the validator `0x6094f0` (not-ready and GCD, power,
+//! crowd control, mounted, water, moving, form), the deferred cast-arm refusal and the targeting
+//! cursor. The commit tail follows: ranged stance, auto-repeat arm, the send, the auto-attack start,
+//! the GCD. A refusal is local and pre-commit: no packet, no GCD, no pending arm, only the red line.
 //!
 //! An item use takes the same ladder: `CGItem::Use 0x5d8d00` calls `0x6e5a90`, whose body is
 //! `call 0x6e4b60` with the item as TryCast's third argument (read at `6e4d76` and `6e4f33`). Three
@@ -64,6 +64,22 @@ impl CastCommit {
     }
 }
 
+/// The class byte TryCast's finisher rung tests (`6e4e98`).
+const CLASS_ROGUE: u8 = 4;
+
+/// A player's spell press held at TryCast's attack pick (`6e4edf` → `0x612df0`), which can move
+/// the selection the ladder only reads. [`crate::script_calls`] runs the pick and resumes it.
+#[derive(Resource, Default)]
+pub(crate) struct HeldForPick(Option<HeldCast>);
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) struct HeldCast {
+    pub(crate) spell_id: u32,
+    /// Pressed with the self-cast modifier: TryCast's guid argument is then the caster
+    /// (`0x4e610e`), which the pick tries before the selection.
+    pub(crate) on_self: bool,
+}
+
 /// Everything the cast-send path reads, as one [`SystemParam`]: [`CastLadder::send`] is the only
 /// way into [`send_spell_cast`], for every caster surface.
 #[derive(SystemParam)]
@@ -86,6 +102,7 @@ pub(crate) struct CastLadder<'w, 's> {
     pub(crate) auto_repeat: ResMut<'w, AutoRepeatActive>,
     pub(crate) trade_skill_opens: ResMut<'w, crate::ui_tradeskill::TradeSkillOpens>,
     pub(crate) ground: ResMut<'w, super::targeting::SpellTargeting>,
+    pub(crate) held_for_pick: ResMut<'w, HeldForPick>,
 }
 
 /// What a targeting-cursor click bound: what `BindLocation 0x6e60f0` or `BindTarget 0x6e5b40`
@@ -173,7 +190,7 @@ impl CastLadder<'_, '_> {
             self.pending.arm(spell_id, now, guards);
         }
         if let Some(d) = self.spells.as_ref().and_then(|s| s.catalog.get(spell_id)) {
-            self.cooldowns.start_gcd(spell_id, d, now);
+            self.cooldowns.start_gcd(spell_id, d, now, &self.spell_mods);
         }
         self.ground.clear();
     }
@@ -189,14 +206,38 @@ impl CastLadder<'_, '_> {
         caster_dead_refusal(spell_id, def, self_store, &mut self.cast_errors)
     }
 
-    /// Run the ladder for `spell_id` and commit as `commit` says.
+    /// Run the ladder for `spell_id` and commit as `commit` says, with no attack pick: no 1.12
+    /// item use, form, craft or `modalNextSpell` chain casts a spell of predicate `0x6e5200`.
     pub(crate) fn send(
         &mut self,
         spell_id: u32,
         ctx: &cast_target::CastContext,
         commit: CastCommit,
     ) {
-        self.send_bound(spell_id, ctx, commit, None);
+        self.send_bound(spell_id, ctx, commit, None, None);
+    }
+
+    /// A player's spell press (`UseAction`, `CastSpell`, `CastSpellByName`): the ladder with
+    /// TryCast's attack pick, where the cast may stop in [`HeldForPick`].
+    pub(crate) fn send_spell(
+        &mut self,
+        spell_id: u32,
+        ctx: &cast_target::CastContext,
+        on_self: bool,
+    ) {
+        let held = HeldCast { spell_id, on_self };
+        self.send_bound(spell_id, ctx, CastCommit::Spell, None, Some(held));
+    }
+
+    /// The press held at the attack pick, if one is.
+    pub(crate) fn take_held(&mut self) -> Option<HeldCast> {
+        self.held_for_pick.0.take()
+    }
+
+    /// A held press after its pick, at the unit the pick left selected. The rungs above the pick
+    /// run again; none reads the selection, so each passes as it did.
+    pub(crate) fn resume_after_pick(&mut self, held: HeldCast, ctx: &cast_target::CastContext) {
+        self.send_bound(held.spell_id, ctx, CastCommit::Spell, None, None);
     }
 
     /// The ladder for a cast the caller already bound to a GameObject (a lock opener): TryCast
@@ -208,7 +249,7 @@ impl CastLadder<'_, '_> {
         ctx: &cast_target::CastContext,
         go_guid: u64,
     ) {
-        self.send_bound(spell_id, ctx, CastCommit::Spell, Some(go_guid));
+        self.send_bound(spell_id, ctx, CastCommit::Spell, Some(go_guid), None);
     }
 
     fn send_bound(
@@ -217,12 +258,14 @@ impl CastLadder<'_, '_> {
         ctx: &cast_target::CastContext,
         commit: CastCommit,
         on_object: Option<u64>,
+        hold: Option<HeldCast>,
     ) {
         send_spell_cast(
             spell_id,
             ctx,
             commit,
             on_object,
+            hold,
             &self.commands,
             &self.self_player,
             self.spells.as_deref(),
@@ -238,6 +281,7 @@ impl CastLadder<'_, '_> {
             &mut self.auto_repeat,
             &mut self.trade_skill_opens,
             &mut self.ground,
+            &mut self.held_for_pick,
         );
     }
 }
@@ -275,6 +319,8 @@ fn send_spell_cast(
     commit: CastCommit,
     // A caller-bound GameObject for a spell commit; an item commit carries its own.
     bound_object: Option<u64>,
+    // Set for a player's spell press, which parks in `held_for_pick` at the attack pick.
+    hold: Option<HeldCast>,
     commands: &NetCommands,
     self_player: &Query<(Entity, Has<crate::creature_anim::Engaged>), With<SelfPlayer>>,
     spells: Option<&Spells>,
@@ -290,6 +336,7 @@ fn send_spell_cast(
     auto_repeat: &mut AutoRepeatActive,
     trade_skill_opens: &mut crate::ui_tradeskill::TradeSkillOpens,
     ground: &mut super::targeting::SpellTargeting,
+    held_for_pick: &mut HeldForPick,
 ) {
     let now = Instant::now();
     let def = spells.and_then(|s| s.catalog.get(spell_id));
@@ -358,6 +405,34 @@ fn send_spell_cast(
             }
         }
     }
+    // The finisher rung (`6e4e50`–`6e4ecd`), above the attack pick: a finishing move
+    // (`AttributesEx & 0x500000`) with the combo-point byte at 0 refuses 0x46 "That ability
+    // requires combo points" for a rogue (class byte 4, `6e4e98`), else 0x12. Like the button
+    // greying, it reads no target.
+    if let (Some(d), Some(store)) = (def, ctx.rel.self_store) {
+        if d.needs_combo_points() && store.0.player_combo_points().unwrap_or(0) == 0 {
+            let reason = if store.0.unit_class() == Some(CLASS_ROGUE) {
+                0x46
+            } else {
+                0x12
+            };
+            debug!("ui_action: cast {spell_id} refused locally — no combo points ({reason:#x})");
+            cast_errors.push_local(spell_id, reason);
+            return;
+        }
+    }
+    // TryCast's attack pick (`6e4edf`–`6e4f02`): a spell of predicate `0x6e5200`, pressed while
+    // not attacking (`0x60ecb0`), goes through the attack validator `0x612df0`, which keeps a
+    // hostile selection or selects the nearest enemy. It sits above the bind and the range gate,
+    // so an acquired target out of reach reads "Out of range.".
+    if let Some(held) = hold {
+        let engaged = self_player.single().is_ok_and(|(_, engaged)| engaged);
+        if def.is_some_and(|d| d.initiates_combat()) && !engaged {
+            debug!("ui_action: cast {spell_id} holds for the attack pick");
+            held_for_pick.0 = Some(held);
+            return;
+        }
+    }
     // ArmCast (`0x6e5250`) resolves the wire target from the spell's targeting constraints, never
     // the raw selection. A caller-bound GameObject skips the walk, as TryCast's resolve (`6e4ef4` →
     // `0x612df0`) takes a passed guid pair.
@@ -419,7 +494,7 @@ fn send_spell_cast(
     if let Some(d) = def {
         if target.is_some() && target == ctx.selection_guid && target != ctx.self_guid {
             let row = spells.and_then(|s| s.ranges.get(d.range_index));
-            if let Some(reason) = ctx.range.refusal(d, row) {
+            if let Some(reason) = ctx.range.refusal(d, row, spell_mods) {
                 debug!("ui_action: cast {spell_id} refused locally — range ({reason:#x})");
                 cast_errors.push_local(spell_id, reason);
                 return;
@@ -546,7 +621,7 @@ fn send_spell_cast(
             .self_store
             .and_then(|s| s.0.unit_level())
             .unwrap_or(0);
-        let cast_time_ms = spells.map_or(0, |s| s.cast_time_ms(d, caster_level));
+        let cast_time_ms = spells.map_or(0, |s| s.cast_time_ms(d, caster_level, spell_mods));
         if validator::cast_moving_refusal(ctx.self_move_flags, cast_time_ms, def) {
             debug!("ui_action: cast {spell_id} refused locally — moving (0x2e)");
             cast_errors.push_local(spell_id, 0x2e);
@@ -694,7 +769,7 @@ fn send_spell_cast(
     // The GCD arms at send (`0x6e2de0` from `0x6e58fb`); a failed cast result clears it
     // (`0x6e1630`).
     if let Some(d) = def {
-        cooldowns.start_gcd(spell_id, d, now);
+        cooldowns.start_gcd(spell_id, d, now, spell_mods);
     }
 }
 
@@ -731,6 +806,8 @@ mod tests {
                 self_store: None,
                 factions: None,
                 reputations: &EMPTY_REPUTATIONS,
+                types: Default::default(),
+                group: Default::default(),
             },
             range: cast_target::RangeInputs::default(),
             main_hand_item: None,
@@ -754,6 +831,7 @@ mod tests {
         world.init_resource::<AutoRepeatActive>();
         world.init_resource::<crate::ui_tradeskill::TradeSkillOpens>();
         world.init_resource::<crate::spell::SpellTargeting>();
+        world.init_resource::<crate::spell::HeldForPick>();
         // A bare World has no message storage until it is asked for.
         world.init_resource::<Messages<crate::creature_anim::SheathRequest>>();
         world.init_resource::<Messages<crate::player::StandStateRequest>>();
@@ -926,11 +1004,13 @@ mod tests {
     const AUTO_SHOT: u32 = 75;
     const RAPTOR_STRIKE: u32 = 2973;
     const SERPENT_STING: u32 = 1978;
+    const EVISCERATE: u32 = 2098;
     const MOB: u64 = 0x0000_0000_0000_00f1;
 
     /// Auto Shot (auto-repeat `AttributesEx2 & 0x20`, ranged `Attributes & 0x2`), Raptor Strike
-    /// (on-next-swing `0x404`) and Serpent Sting, as the 1.12 rows classify them. `Targets & 0x2`
-    /// binds the selection without faction data.
+    /// (on-next-swing `0x404`), Serpent Sting and Eviscerate (a finisher, `AttributesEx 0x100000`,
+    /// that starts combat, `0x200`), as the 1.12 rows classify them. `Targets & 0x2` binds the
+    /// selection without faction data.
     fn combat_catalog() -> Spells {
         use std::collections::HashMap;
         let auto_shot = benilla_formats::SpellDisplay {
@@ -953,11 +1033,17 @@ mod tests {
             modal_next_spell: AUTO_SHOT,
             ..Default::default()
         };
+        let eviscerate = benilla_formats::SpellDisplay {
+            targets: 0x2,
+            attributes_ex: 0x0010_0200,
+            ..Default::default()
+        };
         Spells {
             catalog: benilla_formats::SpellCatalog::from_displays(HashMap::from([
                 (AUTO_SHOT, auto_shot),
                 (RAPTOR_STRIKE, raptor_strike),
                 (SERPENT_STING, serpent_sting),
+                (EVISCERATE, eviscerate),
             ])),
             ..Spells::empty_for_tests()
         }
@@ -1076,6 +1162,90 @@ mod tests {
             .expect("the ladder runs as a one-shot system");
     }
 
+    /// TryCast's attack pick (`6e4edf`): a press of a `0x6e5200` spell stops there, above the
+    /// bind, for its owner to pick a unit. Attacking skips the pick (`0x60ecb0`), and neither a
+    /// spell without the bits nor a send that is not a press stops.
+    #[test]
+    fn a_combat_press_holds_at_the_attack_pick_unless_attacking() {
+        let press = |world: &mut World, spell_id: u32| {
+            world
+                .run_system_once(move |mut ladder: CastLadder| {
+                    ladder.send_spell(spell_id, &ctx(), false);
+                    ladder.take_held()
+                })
+                .expect("the ladder runs as a one-shot system")
+        };
+        let (mut world, rx) = combat_world(false);
+        assert_eq!(
+            press(&mut world, RAPTOR_STRIKE),
+            Some(HeldCast {
+                spell_id: RAPTOR_STRIKE,
+                on_self: false
+            })
+        );
+        assert!(rx.try_recv().is_err(), "a held press sends nothing");
+        assert!(world.resource::<CastErrors>().0.is_empty());
+        assert_eq!(press(&mut world, SERPENT_STING), None, "no 0x6e5200 bit");
+
+        let (mut world, _rx) = combat_world(true);
+        assert_eq!(press(&mut world, RAPTOR_STRIKE), None, "attacking");
+
+        let (mut world, _rx) = combat_world(false);
+        send(&mut world, RAPTOR_STRIKE, CastCommit::Spell);
+        assert_eq!(world.resource::<HeldForPick>().0, None, "not a press");
+    }
+
+    /// The rungs above the pick refuse before it: a press mid-cast (`6e4d97`) and a finisher with no
+    /// combo points (`6e4e50`) hold nothing, so they never select a unit. A rogue reads 0x46, any
+    /// other class 0x12 (`6e4e98`).
+    #[test]
+    fn the_rungs_above_the_attack_pick_refuse_before_it() {
+        use benilla_protocol::ObjectFields;
+        let (mut world, rx) = combat_world(false);
+        world
+            .resource_mut::<crate::spell::PendingCast>()
+            .arm(SERPENT_STING, Instant::now(), true);
+        let held = world
+            .run_system_once(|mut ladder: CastLadder| {
+                ladder.send_spell(RAPTOR_STRIKE, &ctx(), false);
+                ladder.take_held()
+            })
+            .expect("the ladder runs as a one-shot system");
+        assert_eq!(held, None, "in flight");
+        assert_eq!(
+            world.resource::<CastErrors>().0,
+            vec![CastFail::local(RAPTOR_STRIKE, 0x61)]
+        );
+        assert!(rx.try_recv().is_err());
+
+        // `UNIT_FIELD_BYTES_0` (field 36) byte 1 is the class; `PLAYER_FIELD_BYTES` holds no
+        // combo points.
+        for (class, reason) in [(4u32, 0x46), (11, 0x12)] {
+            let (mut world, rx) = combat_world(false);
+            let held = world
+                .run_system_once(move |mut ladder: CastLadder| {
+                    let me = crate::net::ObjectStore(ObjectFields::from_pairs(&[(36, class << 8)]));
+                    let ctx = cast_target::CastContext {
+                        rel: cast_target::TargetRelations {
+                            self_store: Some(&me),
+                            ..ctx().rel
+                        },
+                        ..ctx()
+                    };
+                    ladder.send_spell(EVISCERATE, &ctx, false);
+                    ladder.take_held()
+                })
+                .expect("the ladder runs as a one-shot system");
+            assert_eq!(held, None, "class {class}: no combo points");
+            assert_eq!(
+                world.resource::<CastErrors>().0,
+                vec![CastFail::local(EVISCERATE, reason)],
+                "class {class}"
+            );
+            assert!(rx.try_recv().is_err());
+        }
+    }
+
     /// The commit's StopAttack (`0x6e5976`): `CMSG_ATTACKSTOP` (`0x624370`), then `CancelQueuedCast
     /// 0x6e6f30` hands the queued strike to `CancelCast 0x6e4940(dl=1)` and its `CMSG_CANCEL_CAST`.
     #[test]
diff --git a/crates/benilla-app/src/spell/cast_target.rs b/crates/benilla-app/src/spell/cast_target.rs
index fd842c0a..7a90122e 100644
--- a/crates/benilla-app/src/spell/cast_target.rs
+++ b/crates/benilla-app/src/spell/cast_target.rs
@@ -6,8 +6,9 @@
 //!   target from the spell's implicit targeting.
 //! - `Attributes & 0x200`: the candidate is the equipped main hand (`0x6e5361`), bound as an item
 //!   with no cursor; an empty hand refuses with "Your weapon hand is empty" (`0x6e504b`).
-//! - otherwise each bit is cleared against the selection by its relation check, then against the
-//!   player behind `autoSelfCast` (`0x6e53d7`); only a fully cleared word commits, as a unit guid.
+//! - otherwise the selection meets `BindTarget`'s gates ([`bind_gates`]), then each bit is cleared
+//!   by its relation check; then the player behind `autoSelfCast` (`0x6e53d7`) does the same. Only a
+//!   fully cleared word commits, as a unit guid.
 //! - a word with item, lock, GameObject or location bits enters the targeting cursor carrying
 //!   the whole word: its location (`0x6e6320`, `& 0x60`), item (`0x6e6330`, `& 0x4010`),
 //!   GameObject (`0x6e62d0`, `& 0x4800`) and unit (`0x6e6460`) predicates can hold at once, and
@@ -21,8 +22,13 @@ use benilla_formats::SpellDisplay;
 use bevy::ecs::system::SystemParam;
 use bevy::prelude::*;
 
+use super::bind_gates::{bind_gates, unit_alive};
+use super::group_relation::{GroupInputs, GroupRoster};
+use crate::creature_type::CreatureTypeSources;
+use crate::names::NameCache;
 use crate::net::{GuidIndex, ObjectStore, Reputations, SelfGuid, SelfPlayer};
 use crate::target::{can_assist, can_attack, Factions, Selection};
+use benilla_protocol::messages::OwnerFallback;
 
 /// `TARGET_FLAG_*` bits of the client's targeting flag word (`0xcecac0`).
 const TF_UNIT: u16 = 0x0002;
@@ -31,8 +37,11 @@ const TF_UNIT_PARTY: u16 = 0x0008;
 const TF_UNIT_ENEMY: u16 = 0x0080;
 const TF_UNIT_ASSIST: u16 = 0x0100;
 const TF_CORPSE_ENEMY: u16 = 0x0200;
-const TF_EXPLICIT_GATE: u16 = 0x0400;
+pub(super) const TF_EXPLICIT_GATE: u16 = 0x0400;
 const TF_CORPSE_ALLY: u16 = 0x8000;
+/// The corpse words, `0x8600`: `BindTarget`'s dead-unit gate lets a dead unit through for any of
+/// them (`6e5c7a`).
+pub(super) const CORPSE_WORD_BITS: u16 = TF_CORPSE_ENEMY | TF_EXPLICIT_GATE | TF_CORPSE_ALLY;
 /// The unit-shaped bits a selected unit (alive or dead) can satisfy.
 const UNIT_BITS: u16 = TF_UNIT
     | TF_UNIT_RAID
@@ -104,7 +113,7 @@ pub(crate) struct CastCandidates {
     pub(crate) main_hand_item: Option<u64>,
 }
 
-/// What the binder's relation checks read: the selected unit's store and the player's.
+/// What the binder's gates and relation checks read: the selected unit's store and the player's.
 #[derive(Clone, Copy)]
 pub(crate) struct TargetRelations<'a> {
     pub(crate) target_store: Option<&'a ObjectStore>,
@@ -113,6 +122,48 @@ pub(crate) struct TargetRelations<'a> {
     pub(crate) self_store: Option<&'a ObjectStore>,
     pub(crate) factions: Option<&'a Factions>,
     pub(crate) reputations: &'a Reputations,
+    /// The creature-type gate's inputs, for the candidate and for the player alike.
+    pub(crate) types: CreatureTypeSources<'a>,
+    /// The party and raid predicates' inputs (`0x606c20`, `0x606d20`).
+    pub(crate) group: GroupInputs<'a>,
+}
+
+/// A unit's owner as `CanAssist`'s `IsPvP` chase (`0x5ee5a0`) and `0x606170` read it, its charmer
+/// else its creator: that object's descriptor, if it has streamed (`0x468460`).
+pub(super) fn owner_store<'a>(
+    store: Option<&ObjectStore>,
+    index: Option<&GuidIndex>,
+    stores: &'a Query<&ObjectStore>,
+) -> Option<&'a ObjectStore> {
+    let owner = store?.0.unit_owner(OwnerFallback::CreatedBy)?;
+    stores.get(*index?.0.get(&owner)?).ok()
+}
+
+impl TargetRelations<'_> {
+    /// `CanAssist 0x6066f0` toward the candidate, which the caster always is for himself. The
+    /// binder's assist arm and the world pick's relation leg both ask it.
+    pub(super) fn assistable(&self, is_self: bool) -> bool {
+        is_self
+            || can_assist(
+                self.target_store,
+                self.factions,
+                self.reputations,
+                self.self_store,
+                |_| self.target_owner_store.cloned(),
+            )
+    }
+
+    /// `CanAttack 0x606980` toward the candidate, never the caster. The binder's enemy arm and the
+    /// world pick's relation leg both ask it.
+    pub(super) fn attackable(&self, is_self: bool) -> bool {
+        !is_self
+            && can_attack(
+                self.target_store,
+                self.factions,
+                self.reputations,
+                self.self_store,
+            )
+    }
 }
 
 /// The targeting inputs [`super::send_spell_cast`] resolves with, built by both cast callers.
@@ -131,15 +182,32 @@ pub(crate) struct CastContext<'a> {
     pub(crate) self_move_flags: u32,
 }
 
-/// Positions and combat reaches for the pre-send range refusal: the client's cast runs
+impl CastContext<'_> {
+    /// Applies the self-cast modifier, `onSelf`: the caster replaces the selection as the bind
+    /// candidate, guid and store both, the pair the autoSelfCast fallback swaps (`0x6e53d7`). It
+    /// is the explicit guid `CastSpell` and `CastSpellByName` hand `ArmCast 0x6e5250` (`0x4b4345`,
+    /// `0x4b4afa`, bound at `0x6e5393`); where `UseAction 0x4e5ee0` applies its own is untraced.
+    pub(crate) fn self_bound(mut self, on_self: bool) -> Self {
+        if on_self {
+            self.selection_guid = self.self_guid;
+            self.rel.target_store = self.rel.self_store;
+            self.rel.group.target_guid = self.self_guid;
+        }
+        self
+    }
+}
+
+/// Positions and the two units for the pre-send range refusal: the client's cast runs
 /// `CanTargetUnit 0x6e4440` and `IsTargetInRange 0x6e47b0` before the commit, so an out-of-range
 /// press refuses locally and none of the commit tail runs.
 #[derive(Clone, Copy)]
 pub(crate) struct RangeInputs {
     pub(crate) self_pos: Option<Vec3>,
     pub(crate) target_pos: Option<Vec3>,
-    pub(crate) self_reach: f32,
-    pub(crate) target_reach: Option<f32>,
+    /// The caster's combat reach and motion.
+    pub(crate) caster: benilla_formats::RangeUnit,
+    /// The bound unit, which `GetMinMaxRange` reads for the ranged pad and the moving bonus.
+    pub(crate) target: Option<benilla_formats::RangeUnit>,
 }
 
 impl RangeInputs {
@@ -151,12 +219,13 @@ impl RangeInputs {
         &self,
         def: &SpellDisplay,
         row: Option<&benilla_formats::SpellRange>,
+        mods: &super::SpellModifiers,
     ) -> Option<u8> {
         let dist_sq = self
             .self_pos
             .zip(self.target_pos)
             .map(|(a, b)| a.distance_squared(b));
-        super::validator::cast_range_refusal(def, row, self.self_reach, self.target_reach, dist_sq)
+        super::validator::cast_range_refusal(def, row, self.caster, self.target, dist_sq, mods)
     }
 }
 
@@ -165,9 +234,8 @@ impl Default for RangeInputs {
         Self {
             self_pos: None,
             target_pos: None,
-            // The descriptor's default combat reach.
-            self_reach: 1.5,
-            target_reach: None,
+            caster: benilla_formats::RangeUnit::still(super::DEFAULT_REACH),
+            target: None,
         }
     }
 }
@@ -183,35 +251,47 @@ pub(crate) struct CastTargeting<'w, 's> {
     auto_self_cast: Res<'w, AutoSelfCast>,
     factions: Option<Res<'w, Factions>>,
     reputations: Res<'w, Reputations>,
+    /// The party slots and raid roster as the frame began; a harness without them has no group.
+    roster: Option<Res<'w, GroupRoster>>,
+    /// The creature-type gate's template cache and form table; a harness without them resolves
+    /// no type.
+    names: Option<Res<'w, NameCache>>,
+    spells: Option<Res<'w, crate::ui_action::Spells>>,
     self_transform: Query<'w, 's, &'static Transform, With<SelfPlayer>>,
     transforms: Query<'w, 's, &'static Transform>,
     /// `Option`: the body exists only in world, and the cast-result handler must fetch this param
     /// anywhere. With no body the moving gate passes and the server decides.
     player: Option<Res<'w, crate::player::Player>>,
+    /// The caster's and the selection's reach and motion, for the range gate.
+    range_units: super::RangeUnits<'w, 's>,
 }
 
 impl CastTargeting<'_, '_> {
     /// This frame's [`CastContext`].
     pub(crate) fn context(&self) -> CastContext<'_> {
         let target_store = self.selection.target.and_then(|e| self.stores.get(e).ok());
-        let target_owner_store = target_store
-            .and_then(|store| {
-                store
-                    .0
-                    .unit_owner(benilla_protocol::messages::OwnerFallback::CreatedBy)
-            })
-            .and_then(|guid| self.index.as_ref()?.0.get(&guid).copied())
-            .and_then(|entity| self.stores.get(entity).ok());
+        let owner_store = |store| owner_store(store, self.index.as_deref(), &self.stores);
+        let self_store = self.self_store.iter().next();
         CastContext {
             selection_guid: self.selection.guid,
             self_guid: self.self_guid.0,
             auto_self_cast: self.auto_self_cast.0,
             rel: TargetRelations {
                 target_store,
-                target_owner_store,
-                self_store: self.self_store.iter().next(),
+                target_owner_store: owner_store(target_store),
+                self_store,
                 factions: self.factions.as_deref(),
                 reputations: &self.reputations,
+                types: CreatureTypeSources {
+                    names: self.names.as_deref(),
+                    forms: self.spells.as_deref().map(|s| &s.forms),
+                },
+                group: GroupInputs {
+                    self_guid: self.self_guid.0,
+                    target_guid: self.selection.guid,
+                    self_owner_store: owner_store(self_store),
+                    roster: self.roster.as_deref(),
+                },
             },
             range: RangeInputs {
                 self_pos: self.self_transform.iter().next().map(|t| t.translation),
@@ -220,12 +300,8 @@ impl CastTargeting<'_, '_> {
                     .target
                     .and_then(|e| self.transforms.get(e).ok())
                     .map(|t| t.translation),
-                self_reach: self
-                    .self_store
-                    .iter()
-                    .next()
-                    .map_or(1.5, |s| s.0.unit_combat_reach()),
-                target_reach: target_store.map(|s| s.0.unit_combat_reach()),
+                caster: self.range_units.caster(),
+                target: self.selection.target.and_then(|e| self.range_units.unit(e)),
             },
             main_hand_item: self
                 .self_store
@@ -273,50 +349,38 @@ pub(crate) fn cast_target_mask(def: &SpellDisplay) -> u16 {
     word
 }
 
-/// `BindTarget 0x6e5b40`'s unit branch: clear every flag-word bit the candidate satisfies.
+/// `BindTarget 0x6e5b40`'s unit branch past the gates: clear every flag-word bit the candidate
+/// satisfies.
 ///
 /// The assist bit asks `CanAssist 0x6066f0`: selectable, friendly or better, and an NPC's owner
 /// (or the NPC itself) PvP-enabled. This keeps friendly ambient NPCs and critters unbindable.
-/// The enemy bit asks `CanAttack` (`0x606980`). Party and raid (`0x606c20`, `0x606d20`) accept
-/// only the player; the corpse check (`0x6067d0`) is assistable with health 0 here.
+/// The enemy bit asks `CanAttack` (`0x606980`). The party bit needs `0x606c20` and then `CanAssist`
+/// (`6e5cad`-`6e5cec`): the player, a member of his party, or a unit that answers to one. The raid
+/// bit needs `0x606d20` and `CanAssist` (`6e5cf1`-`6e5d2f`): the same, with the raid roster
+/// counting as well as the party slots. The corpse check (`0x6067d0`) is assistable with health 0
+/// here.
 fn clear_satisfied_bits(word: u16, is_self: bool, rel: &TargetRelations) -> u16 {
     let mut word = word;
-    let assist = is_self
-        || can_assist(
-            rel.target_store,
-            rel.factions,
-            rel.reputations,
-            rel.self_store,
-            |_| rel.target_owner_store.cloned(),
-        );
-    let dead = rel
-        .target_store
-        .is_some_and(|s| s.0.unit_health() == Some(0));
-    if word & TF_UNIT_PARTY != 0 && is_self {
+    let assist = rel.assistable(is_self);
+    let dead = rel.target_store.is_some_and(|s| !unit_alive(&s.0));
+    if word & TF_UNIT_PARTY != 0 && assist && rel.in_party(is_self) {
         word &= !TF_UNIT_PARTY;
     }
-    if word & TF_UNIT_RAID != 0 && is_self {
+    if word & TF_UNIT_RAID != 0 && assist && rel.in_group(is_self) {
         word &= !TF_UNIT_RAID;
     }
     if word & TF_UNIT_ASSIST != 0 && assist {
         word &= !TF_UNIT_ASSIST;
     }
-    if word & TF_UNIT_ENEMY != 0
-        && !is_self
-        && can_attack(
-            rel.target_store,
-            rel.factions,
-            rel.reputations,
-            rel.self_store,
-        )
-    {
+    if word & TF_UNIT_ENEMY != 0 && rel.attackable(is_self) {
         word &= !TF_UNIT_ENEMY;
     }
-    // Bit 1 has no relation check: any unit binds. Bit 10 is cleared by any candidate but self.
+    // Bit 1 has no relation check: any unit binds. A dead unit's bind clears bit 10 (`6e5d89`,
+    // `6e5ddb`); the gate refuses a living unit under that word before it gets here.
     if word & TF_UNIT != 0 {
         word &= !TF_UNIT;
     }
-    if word & TF_EXPLICIT_GATE != 0 && !is_self {
+    if word & TF_EXPLICIT_GATE != 0 && dead {
         word &= !TF_EXPLICIT_GATE;
     }
     if word & TF_CORPSE_ALLY != 0 && assist && dead {
@@ -328,12 +392,24 @@ fn clear_satisfied_bits(word: u16, is_self: bool, rel: &TargetRelations) -> u16
     word
 }
 
-/// Whether `BindTarget 0x6e5b40`'s unit arm clears the whole standing word for this unit.
-/// The initial selection, a world click and `SpellTargetUnit` all use this one predicate.
-pub(super) fn unit_word_binds(word: u16, is_self: bool, rel: &TargetRelations) -> bool {
+/// Whether the unit arm's relation checks clear the whole standing word for this unit.
+fn unit_word_binds(word: u16, is_self: bool, rel: &TargetRelations) -> bool {
     word & UNIT_BITS != 0 && clear_satisfied_bits(word, is_self, rel) == 0
 }
 
+/// Whether `BindTarget 0x6e5b40`'s unit branch binds this unit under the standing word: the gates
+/// ([`bind_gates`]), then the relation checks. The initial selection, the `autoSelfCast` fallback,
+/// a world click, `SpellTargetUnit` and the hover verdict all ask this one predicate. An unknown
+/// spell has no row to gate on and leaves the relation checks alone.
+pub(super) fn unit_binds(
+    def: Option<&SpellDisplay>,
+    word: u16,
+    is_self: bool,
+    rel: &TargetRelations,
+) -> bool {
+    def.is_none_or(|def| bind_gates(def, word, is_self, rel)) && unit_word_binds(word, is_self, rel)
+}
+
 /// The wire target for casting `def`. An unknown spell sends the selection as is, or no target
 /// without one, and the server validates.
 pub(crate) fn resolve_cast_target(
@@ -388,22 +464,27 @@ pub(crate) fn resolve_cast_target(
         }
         return CastWireTarget::Refused(ERR_INVALID_TARGET);
     }
-    // The selection (`0xb4e2d8`, `0x6e539f`).
+    // The selection (`0xb4e2d8`, `0x6e539f`). A unit the gates or the relation checks refuse binds
+    // nothing, so the fallback below gets its turn.
     if let Some(guid) = cand.selection {
         let is_self = cand.caster == Some(guid);
-        if unit_word_binds(word, is_self, rel) {
+        if unit_binds(Some(def), word, is_self, rel) {
             return CastWireTarget::Unit(guid);
         }
     }
-    // The fallback: the active player (`0x6e53d7`), behind autoSelfCast.
+    // The fallback: the active player (`0x6e53d7`), behind autoSelfCast, through the same gates.
     if auto_self_cast {
         if let Some(guid) = cand.caster {
             let self_rel = TargetRelations {
                 target_store: rel.self_store,
                 target_owner_store: None,
+                group: GroupInputs {
+                    target_guid: Some(guid),
+                    ..rel.group
+                },
                 ..*rel
             };
-            if unit_word_binds(word, true, &self_rel) {
+            if unit_binds(Some(def), word, true, &self_rel) {
                 return CastWireTarget::Unit(guid);
             }
         }
@@ -481,15 +562,18 @@ mod tests {
     fn resolution_wire_shapes() {
         use benilla_protocol::ObjectFields;
         // `UNIT_FIELD_FLAGS` bit 3 (player-controlled) on us alone selects `CanAttack`'s mixed
-        // arm; with no catalog the reaction resolves neutral, so the enemy bit clears.
-        let me = crate::net::ObjectStore(ObjectFields::from_pairs(&[(46, 1 << 3)]));
-        let it = crate::net::ObjectStore(ObjectFields::from_pairs(&[(35, 0)]));
+        // arm; with no catalog the reaction resolves neutral, so the enemy bit clears. Both carry
+        // `UNIT_FIELD_HEALTH` (22): a store with none reads dead to the gates.
+        let me = crate::net::ObjectStore(ObjectFields::from_pairs(&[(22, 100), (46, 1 << 3)]));
+        let it = crate::net::ObjectStore(ObjectFields::from_pairs(&[(22, 100), (35, 0)]));
         let rel = TargetRelations {
             target_store: Some(&it),
             target_owner_store: None,
             self_store: Some(&me),
             factions: None,
             reputations: &Reputations(Vec::new()),
+            types: Default::default(),
+            group: Default::default(),
         };
         let ice_armor = spell(0, 1);
         assert_eq!(
@@ -560,6 +644,8 @@ mod tests {
             self_store: Some(&me),
             factions: Some(&factions),
             reputations: &reputations,
+            types: Default::default(),
+            group: Default::default(),
         };
 
         assert!(
@@ -738,6 +824,30 @@ mod tests {
         );
     }
 
+    /// A dead unit's bind clears the `0x400` bit whoever it is (`6e5d89`, `6e5ddb`); a living
+    /// unit's never does, and the gate refuses it before the relation checks are asked.
+    #[test]
+    fn a_dead_units_bind_clears_the_0x400_bit() {
+        use benilla_protocol::ObjectFields;
+
+        let health = |hp| ObjectStore(ObjectFields::from_pairs(&[(22, hp)]));
+        let (corpse, live) = (health(0), health(100));
+        let rel = |target| TargetRelations {
+            target_store: Some(target),
+            ..rel_none()
+        };
+        for is_self in [false, true] {
+            assert!(
+                unit_word_binds(0x402, is_self, &rel(&corpse)),
+                "a corpse, self {is_self}"
+            );
+            assert!(
+                !unit_word_binds(0x402, is_self, &rel(&live)),
+                "a living unit keeps the bit, self {is_self}"
+            );
+        }
+    }
+
     fn rel_none() -> TargetRelations<'static> {
         static EMPTY: Reputations = Reputations(Vec::new());
         TargetRelations {
@@ -746,6 +856,8 @@ mod tests {
             self_store: None,
             factions: None,
             reputations: &EMPTY,
+            types: Default::default(),
+            group: Default::default(),
         }
     }
 }
diff --git a/crates/benilla-app/src/spell/cooldowns.rs b/crates/benilla-app/src/spell/cooldowns.rs
index 709dd174..93dc7e34 100644
--- a/crates/benilla-app/src/spell/cooldowns.rs
+++ b/crates/benilla-app/src/spell/cooldowns.rs
@@ -10,13 +10,15 @@
 //! - A failed cast clears the GCD armed at send (`0x6e1d83`, `0x6e1630`) and, unless the reason
 //!   is 0x3c, removes a cooldown-on-event spell's parked record (`0x6e73cc`).
 //!
-//! Every mutation bumps [`Cooldowns::generation`], the `ACTIONBAR_UPDATE_COOLDOWN` edge; a
-//! natural expiry does not, since the stock `Cooldown.lua` frame hides itself at the end.
+//! Every mutation the reference flushes bumps [`Cooldowns::generation`], the edge of the flush
+//! `0x4b31b0` makes (`ACTIONBAR_UPDATE_COOLDOWN`, `SPELL_UPDATE_COOLDOWN`); a natural expiry does
+//! not, since the stock `Cooldown.lua` frame hides itself at the end.
 
 use std::time::{Duration, Instant};
 
 use bevy::prelude::*;
 
+use super::{SpellModifiers, OP_GCD};
 use benilla_formats::SpellDisplay;
 use benilla_protocol::messages::ItemUseSpell;
 
@@ -91,12 +93,15 @@ impl CooldownInfo {
     }
 }
 
-/// The player's cooldown list (the client's `SpellHistory` at `0xcecaec`); the pet list has no
-/// consumer.
+/// One cooldown list, the client's `SpellHistory`: the player's is this resource (`0xcecaec`), the
+/// pet's is [`crate::ui_pet::PetBar::cooldowns`] (`0xcecb04`), which the pet bar, the pet book and
+/// the pet's `SMSG_SPELL_GO` leg read and write. Each list's edge feeds its own events: the
+/// player's `feed_action_state`, the pet's `ui_pet::bar::fire_pet_cooldown_events`.
 #[derive(Resource, Default)]
 pub(crate) struct Cooldowns {
     records: Vec<Record>,
-    /// Bumped on every mutation: the `ACTIONBAR_UPDATE_COOLDOWN` edge.
+    /// Bumped on every mutation the reference flushes (`0x4b31b0`), the flush's edge. Only counts
+    /// up, across [`Self::clear_silent`] too, so a watcher reads a reset as no mutation.
     pub(crate) generation: u64,
     /// Bumped when [`Self::prune`] removes records. Kept apart from [`Self::generation`]: gated
     /// feeds must see an expiry, but the reference never fires the event for one.
@@ -108,6 +113,12 @@ impl Cooldowns {
         self.generation = self.generation.wrapping_add(1);
     }
 
+    /// How many records the list holds, elapsed ones included.
+    #[cfg(test)]
+    pub(crate) fn record_count(&self) -> usize {
+        self.records.len()
+    }
+
     /// The counter a gated feed watches: moves on any mutation or pruned expiry.
     pub(crate) fn feed_epoch(&self) -> u64 {
         self.generation.wrapping_add(self.expiry_epoch)
@@ -127,8 +138,13 @@ impl Cooldowns {
     /// `AddCooldown 0x6e12c0`: always appends, never matching by id, so one spell holds separate
     /// nodes for its cast-send GCD and its SPELL_GO recovery. Replacing by id would let the GO
     /// insert wipe the running GCD.
+    ///
+    /// The list only grows here, so this is where it is bounded: the records that have run out by
+    /// `now` are dropped first ([`Self::prune`]), and a list holds its live records plus those
+    /// that ran out since its last insert. The pet's list has no other pruner.
     fn add(
         &mut self,
+        now: Instant,
         spell_id: u32,
         item_id: u32,
         recovery: Timer,
@@ -147,6 +163,7 @@ impl Cooldowns {
         {
             return;
         }
+        self.prune(now);
         self.records.push(Record {
             spell_id,
             item_id,
@@ -162,7 +179,9 @@ impl Cooldowns {
     }
 
     /// Drop fully elapsed records that are not on hold; invisible to reads, it stands in for the
-    /// client's event-driven sweeps. Bumps [`Self::expiry_epoch`], not [`Self::generation`].
+    /// client's event-driven sweeps. Bumps [`Self::expiry_epoch`], not [`Self::generation`], so it
+    /// flushes no event. [`Self::add`] runs it at every insert, and the player's feed each frame,
+    /// which the gated feeds need to see an expiry with no insert.
     pub(crate) fn prune(&mut self, now: Instant) {
         let before = self.records.len();
         self.records.retain(|r| {
@@ -180,28 +199,40 @@ impl Cooldowns {
     ///
     /// `ranged_attack_time_ms` is `UNIT_FIELD_RANGEDATTACKTIME` when
     /// [`SpellDisplay::ranged_speed_cooldown`], else 0, added to the category timer (`0x6e2b60`):
-    /// the Throw and wand Shoot sweep. Category 0 (Auto Shot) never surfaces it.
+    /// the Throw and wand Shoot sweep. Category 0 (Auto Shot) never surfaces it. `mods` applies
+    /// op 11 to both timers, as the self and pet legs do; `None` inserts the DBC values.
     pub(crate) fn start_spell(
         &mut self,
         spell_id: u32,
         spell: &SpellDisplay,
         ranged_attack_time_ms: u32,
         now: Instant,
+        mods: Option<&SpellModifiers>,
     ) {
+        let (recovery_ms, category_ms) = mods.map_or_else(
+            || {
+                (
+                    spell.recovery_ms,
+                    spell
+                        .category_recovery_ms
+                        .saturating_add(ranged_attack_time_ms),
+                )
+            },
+            |mods| mods.spell_cooldowns(spell, ranged_attack_time_ms),
+        );
         self.add(
+            now,
             spell_id,
             0,
             Timer {
                 start: now,
-                duration: Duration::from_millis(u64::from(spell.recovery_ms)),
+                duration: Duration::from_millis(u64::from(recovery_ms)),
             },
             spell.category,
             spell.category_wildcard,
             Timer {
                 start: now,
-                duration: Duration::from_millis(u64::from(
-                    spell.category_recovery_ms + ranged_attack_time_ms,
-                )),
+                duration: Duration::from_millis(u64::from(category_ms)),
             },
             spell.cooldown_on_event(),
             0,
@@ -229,6 +260,7 @@ impl Cooldowns {
             spell.map_or(0, |s| s.category_recovery_ms)
         };
         self.add(
+            now,
             use_spell.spell_id,
             item_entry,
             Timer {
@@ -248,11 +280,25 @@ impl Cooldowns {
         );
     }
 
-    /// Arm the GCD at cast send (`StartGlobalCooldown 0x6e2de0`, from `0x6e58fb`) for any cast,
-    /// item use or pet cast, only when `startRecoveryTime != 0` (`0x6e2e0f`). `on_hold` is
-    /// Attributes bit 25.
-    pub(crate) fn start_gcd(&mut self, spell_id: u32, spell: &SpellDisplay, now: Instant) {
-        if spell.start_recovery_ms == 0 {
+    /// Arm the GCD at cast send (`StartGlobalCooldown 0x6e2de0`, from `0x6e58fb`) for any cast or
+    /// item use, and at a pet-bar spell press (`0x4bd367`, into the pet's list), unless
+    /// `startRecoveryCategory` and `startRecoveryTime` are both 0
+    /// (`0x6e2e0f`-`0x6e2e21`), then with op 21 applied (`0x6e2e2c`) and nothing armed for a zero
+    /// result (`0x6e2e3d`). A negative one arms nothing either, where the reference inserts a
+    /// record no reader shows. `on_hold` is Attributes bit 25.
+    pub(crate) fn start_gcd(
+        &mut self,
+        spell_id: u32,
+        spell: &SpellDisplay,
+        now: Instant,
+        mods: &SpellModifiers,
+    ) {
+        if spell.start_recovery_category == 0 && spell.start_recovery_ms == 0 {
+            return;
+        }
+        // `StartGlobalCooldown 0x6e2de0`: op 21 before the zero-duration exit (`0x6e2e2c`).
+        let duration_ms = mods.apply(spell, OP_GCD, spell.start_recovery_ms as i32);
+        if duration_ms <= 0 {
             return;
         }
         if benilla_assets::trace::enabled() {
@@ -260,11 +306,12 @@ impl Cooldowns {
                 "cd",
                 &format!(
                     "arm-gcd spell={spell_id} gcdcat={} dur={}ms (cast-send)",
-                    spell.start_recovery_category, spell.start_recovery_ms
+                    spell.start_recovery_category, duration_ms
                 ),
             );
         }
         self.add(
+            now,
             spell_id,
             0,
             Timer::none(now),
@@ -275,7 +322,7 @@ impl Cooldowns {
             spell.start_recovery_category,
             Timer {
                 start: now,
-                duration: Duration::from_millis(u64::from(spell.start_recovery_ms)),
+                duration: Duration::from_millis(duration_ms as u64),
             },
         );
     }
@@ -336,6 +383,14 @@ impl Cooldowns {
         }
     }
 
+    /// Empty the list with no flush: `SMSG_PET_SPELLS` clears the pet's list (`0x6e9b60` →
+    /// `0x6e1880`) before it seeds it again, or for a teardown leaves it empty, and the packet
+    /// calls no `0x4b31b0`. The counters keep their place, so a watcher never reads the reset as
+    /// a mutation.
+    pub(crate) fn clear_silent(&mut self) {
+        self.records.clear();
+    }
+
     /// Session end ([`crate::net::session::disconnected`]): `SMSG_INITIAL_SPELLS` re-sends every
     /// running cooldown at world entry and [`Self::seed_initial`] appends, so a surviving record
     /// would outlive the fresh one.
@@ -371,6 +426,7 @@ impl Cooldowns {
             }
         };
         self.add(
+            now,
             spell_id,
             0,
             Timer {
@@ -400,6 +456,7 @@ impl Cooldowns {
         now: Instant,
     ) {
         self.add(
+            now,
             spell_id,
             item_entry,
             Timer {
@@ -423,6 +480,7 @@ impl Cooldowns {
         now: Instant,
     ) {
         self.add(
+            now,
             u32::from(cd.spell_id),
             u32::from(cd.item_id),
             Timer {
@@ -444,6 +502,9 @@ impl Cooldowns {
 
     /// One `SMSG_PET_SPELLS` cooldown: remainders, starting now. The category duration's
     /// [`PET_COOLDOWN_PERMANENT`] marker is stripped, or it would read as a 37-hour sweep.
+    ///
+    /// The handler seeds through `StartCooldown 0x6e2c60` (`0x4bdabf`), which calls no flush, so
+    /// the insert leaves [`Self::generation`] where it was.
     pub(crate) fn seed_pet(
         &mut self,
         cd: &benilla_protocol::messages::PetSpellCooldown,
@@ -452,7 +513,9 @@ impl Cooldowns {
     ) {
         use benilla_protocol::messages::PET_COOLDOWN_PERMANENT;
         let category_ms = cd.category_cd_ms & !PET_COOLDOWN_PERMANENT;
+        let generation = self.generation;
         self.add(
+            now,
             cd.spell_id,
             0,
             Timer {
@@ -470,6 +533,7 @@ impl Cooldowns {
             0,
             Timer::none(now),
         );
+        self.generation = generation;
     }
 
     /// The client's `IsSpellOnCooldown 0x6e1690`, which despite its name is true only for an
@@ -594,6 +658,56 @@ mod tests {
         spell(0, 0, 0, (133, 1500), 0x10000)
     }
 
+    #[test]
+    fn gcd_uses_op_21_before_arming() {
+        let mut d = fireball();
+        d.spell_family = 3;
+        d.spell_family_flags = 1 << 5;
+        let mut mods = SpellModifiers::default();
+        mods.set_class_family(3);
+        mods.set(false, 5, OP_GCD, -50);
+        let now = Instant::now();
+        let mut cds = Cooldowns::default();
+        cds.start_gcd(133, &d, now, &mods);
+        assert_eq!(cds.info(133, 0, Some(&d), now).duration_ms, 750);
+
+        d.start_recovery_ms = 0;
+        mods.set(true, 5, OP_GCD, 1000);
+        let mut cds = Cooldowns::default();
+        cds.start_gcd(133, &d, now, &mods);
+        assert_eq!(cds.info(133, 0, Some(&d), now).duration_ms, 500);
+    }
+
+    #[test]
+    fn spell_cooldown_applies_op_11_to_both_timers_after_the_ranged_pad() {
+        let mut d = spell(44, 8_000, 5_000, (0, 0), 0);
+        d.spell_family = 3;
+        d.spell_family_flags = 1 << 5;
+        let mut mods = SpellModifiers::default();
+        mods.set_class_family(3);
+        mods.set(true, 5, super::super::OP_COOLDOWN, -1_500);
+        assert_eq!(mods.spell_cooldowns(&d, 0), (6_500, 3_500));
+        assert_eq!(mods.spell_cooldowns(&d, 2_000), (6_500, 5_500));
+
+        let now = Instant::now();
+        let mut cds = Cooldowns::default();
+        cds.start_spell(2136, &d, 2_000, now, Some(&mods));
+        assert_eq!(cds.info(2136, 0, Some(&d), now).duration_ms, 6_500);
+        let sibling = spell(44, 0, 0, (0, 0), 0);
+        assert_eq!(cds.info(999, 0, Some(&sibling), now).duration_ms, 5_500);
+        let mut cds = Cooldowns::default();
+        cds.start_spell(2136, &d, 2_000, now, None);
+        assert_eq!(cds.info(2136, 0, Some(&d), now).duration_ms, 8_000);
+        assert_eq!(cds.info(999, 0, Some(&sibling), now).duration_ms, 7_000);
+
+        // Endurance 2/2: Sprint's five-minute recovery loses 30%.
+        d.recovery_ms = 300_000;
+        d.category_recovery_ms = 0;
+        mods.set(true, 5, super::super::OP_COOLDOWN, 0);
+        mods.set(false, 5, super::super::OP_COOLDOWN, -30);
+        assert_eq!(mods.spell_cooldowns(&d, 0), (210_000, 0));
+    }
+
     /// Charge-shaped: category 44, 15 s category cooldown, NO GCD pair.
     fn charge() -> SpellDisplay {
         spell(44, 0, 15_000, (0, 0), 0)
@@ -603,7 +717,7 @@ mod tests {
     fn the_gcd_spreads_to_every_spell_sharing_the_start_recovery_category() {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
-        cds.start_gcd(133, &fireball(), t0);
+        cds.start_gcd(133, &fireball(), t0, &super::SpellModifiers::default());
 
         // Any spell with the same startRecoveryCategory reads the GCD; Charge has none.
         let mid = t0 + Duration::from_millis(500);
@@ -630,8 +744,8 @@ mod tests {
         let mut cds = Cooldowns::default();
         // Frost-Nova-shaped: own 25 s recovery, category 35, the ordinary 133/1500 GCD pair.
         let frost_nova = spell(35, 25_000, 0, (133, 1500), 0);
-        cds.start_gcd(122, &frost_nova, t0); // the cast-send arm
-        cds.start_spell(122, &frost_nova, 0, t0 + Duration::from_millis(100)); // the GO insert
+        cds.start_gcd(122, &frost_nova, t0, &super::SpellModifiers::default()); // the cast-send arm
+        cds.start_spell(122, &frost_nova, 0, t0 + Duration::from_millis(100), None); // the GO insert
 
         let mid = t0 + Duration::from_millis(200);
         // Every GCD sibling still reads the running GCD.
@@ -655,8 +769,8 @@ mod tests {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
         let fd = spell(0, 30_000, 0, (133, 1500), 0); // Feign-Death-shaped minus on-event
-        cds.start_gcd(5384, &fd, t0);
-        cds.start_spell(5384, &fd, 0, t0);
+        cds.start_gcd(5384, &fd, t0, &super::SpellModifiers::default());
+        cds.start_spell(5384, &fd, 0, t0, None);
         let mid = t0 + Duration::from_millis(100);
         assert!(cds.not_ready(5384, 0, Some(&fd), mid));
 
@@ -671,7 +785,7 @@ mod tests {
     fn category_cooldowns_reach_category_siblings_but_not_others() {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
-        cds.start_spell(100, &charge(), 0, t0); // Charge: category 44, 15 s
+        cds.start_spell(100, &charge(), 0, t0, None); // Charge: category 44, 15 s
 
         let mid = t0 + Duration::from_secs(5);
         // Another spell in category 44 reads the shared remainder.
@@ -692,7 +806,7 @@ mod tests {
         let mut cds = Cooldowns::default();
         // Feign Death: 30 s recovery, SPELL_ATTR_COOLDOWN_ON_EVENT (bit 25).
         let fd = spell(0, 30_000, 0, (0, 0), 0x0200_0000);
-        cds.start_spell(5384, &fd, 0, t0);
+        cds.start_spell(5384, &fd, 0, t0, None);
 
         // Parked: full duration, disabled, and still not ready.
         let parked = cds.info(5384, 0, Some(&fd), t0 + Duration::from_secs(60));
@@ -821,8 +935,8 @@ mod tests {
     fn prune_drops_only_fully_elapsed_records() {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
-        cds.start_gcd(133, &fireball(), t0);
-        cds.start_spell(100, &charge(), 0, t0);
+        cds.start_gcd(133, &fireball(), t0, &super::SpellModifiers::default());
+        cds.start_spell(100, &charge(), 0, t0, None);
         assert_eq!(cds.records.len(), 2);
 
         // Past the 1.5 s GCD, inside Charge's 15 s.
@@ -834,6 +948,128 @@ mod tests {
         assert!(cds.records.is_empty());
     }
 
+    /// The list is bounded where it grows: whatever the inserts' spacing, it holds the records
+    /// live at the insert plus the insert itself, never every record ever added.
+    #[test]
+    fn an_insert_bounds_the_list_by_its_live_records_plus_itself() {
+        let t0 = Instant::now();
+        let mut cds = Cooldowns::default();
+        let mods = super::SpellModifiers::default();
+        // Charge's 15 s category timer, then a 1.5 s GCD every 2 s for a minute.
+        cds.start_spell(100, &charge(), 0, t0, None);
+        for i in 0..30u64 {
+            let now = t0 + Duration::from_secs(2 * i);
+            cds.start_gcd(133, &fireball(), now, &mods);
+            let charge_live = usize::from(2 * i < 15);
+            assert_eq!(
+                cds.record_count(),
+                1 + charge_live,
+                "insert {i}: Charge if it still runs, and the new GCD"
+            );
+        }
+    }
+
+    /// An insert drops the records that have run out and only those: a running timer and a parked
+    /// record survive, no read of what stays changes, and the insert is the one mutation.
+    #[test]
+    fn an_insert_keeps_a_running_and_a_parked_record_and_changes_no_read() {
+        let t0 = Instant::now();
+        let mut cds = Cooldowns::default();
+        let mods = super::SpellModifiers::default();
+        let brief = || spell(7, 2_000, 0, (0, 0), 0);
+        // Parked: `Attributes` bit 25, its timers wait for `SMSG_COOLDOWN_EVENT`.
+        let parked = || spell(9, 1_000, 0, (0, 0), 1 << 25);
+        cds.start_gcd(133, &fireball(), t0, &mods);
+        cds.start_spell(100, &brief(), 0, t0, None);
+        cds.start_spell(200, &charge(), 0, t0, None);
+        cds.start_spell(300, &parked(), 0, t0, None);
+        assert_eq!(cds.record_count(), 4);
+
+        let now = t0 + Duration::from_secs(5);
+        let asks = [
+            (133, fireball()),
+            (100, brief()),
+            (200, charge()),
+            (201, spell(44, 0, 0, (0, 0), 0)),
+            (300, parked()),
+            (301, spell(9, 0, 0, (0, 0), 0)),
+            (999, spell(0, 0, 0, (0, 0), 0)),
+        ];
+        let reads = |cds: &Cooldowns| {
+            asks.iter()
+                .map(|(id, d)| cds.info(*id, 0, Some(d), now))
+                .collect::<Vec<_>>()
+        };
+        let before = reads(&cds);
+        assert_eq!(before[2].remaining_ms, 10_000, "Charge runs");
+        assert!(!before[4].enabled, "and the parked spell reads disabled");
+        let generation = cds.generation;
+
+        // A spell of no category the others share.
+        cds.start_spell(500, &spell(99, 5_000, 0, (0, 0), 0), 0, now, None);
+
+        assert_eq!(
+            cds.record_count(),
+            3,
+            "Charge, the parked record and the new one"
+        );
+        assert!(!cds.sweep_pending(now), "nothing that ran out is left");
+        assert_eq!(
+            reads(&cds),
+            before,
+            "the records that stay read as they did"
+        );
+        assert_eq!(
+            cds.generation,
+            generation + 1,
+            "one mutation, the insert's own"
+        );
+    }
+
+    /// An elapsed record answers no read, so a prune cannot change one: what it keeps, a running
+    /// timer and a parked record whose own timers have run down, answers as before.
+    #[test]
+    fn a_prune_changes_no_read() {
+        let t0 = Instant::now();
+        let mut cds = Cooldowns::default();
+        let mods = super::SpellModifiers::default();
+        let brief = || spell(7, 2_000, 0, (0, 0), 0);
+        // Parked: `Attributes` bit 25, its timers wait for `SMSG_COOLDOWN_EVENT`.
+        let parked = || spell(9, 1_000, 0, (0, 0), 1 << 25);
+        cds.start_gcd(133, &fireball(), t0, &mods);
+        cds.start_spell(100, &brief(), 0, t0, None);
+        cds.start_spell(200, &charge(), 0, t0, None);
+        cds.start_spell(300, &parked(), 0, t0, None);
+        assert_eq!(cds.records.len(), 4);
+
+        let now = t0 + Duration::from_secs(5);
+        let asks = [
+            (133, fireball()),
+            (100, brief()),
+            (200, charge()),
+            // Another spell of Charge's category, and one of the parked spell's.
+            (201, spell(44, 0, 0, (0, 0), 0)),
+            (300, parked()),
+            (301, spell(9, 0, 0, (0, 0), 0)),
+            (999, spell(0, 0, 0, (0, 0), 0)),
+        ];
+        let reads = |cds: &Cooldowns| {
+            asks.iter()
+                .map(|(id, d)| cds.info(*id, 0, Some(d), now))
+                .collect::<Vec<_>>()
+        };
+        let before = reads(&cds);
+        assert!(cds.sweep_pending(now), "the GCD and Brief have run out");
+        assert_eq!(before[2].remaining_ms, 10_000, "Charge runs");
+        assert!(!before[4].enabled, "and the parked spell reads disabled");
+
+        cds.prune(now);
+
+        assert_eq!(cds.records.len(), 2, "the GCD and Brief are gone");
+        assert!(!cds.sweep_pending(now));
+        assert_eq!(reads(&cds), before);
+    }
+
     /// A prune that removes nothing must not move the epoch, or the per-frame prune would hold
     /// every gated feed open.
     #[test]
@@ -841,7 +1077,7 @@ mod tests {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
         let e0 = cds.feed_epoch();
-        cds.start_gcd(133, &fireball(), t0);
+        cds.start_gcd(133, &fireball(), t0, &super::SpellModifiers::default());
         let armed = cds.feed_epoch();
         assert_ne!(e0, armed, "a mutation moves the epoch (generation)");
 
@@ -862,7 +1098,7 @@ mod tests {
             cds.generation,
             {
                 let mut probe = Cooldowns::default();
-                probe.start_gcd(133, &fireball(), t0);
+                probe.start_gcd(133, &fireball(), t0, &super::SpellModifiers::default());
                 probe.generation
             },
             "…but the event-edge generation never saw it (the reference is silent on expiry)"
@@ -877,7 +1113,7 @@ mod tests {
     fn the_ui_triple_is_stable_per_arm_and_distinct_across_arms() {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
-        cds.start_gcd(772, &fireball(), t0);
+        cds.start_gcd(772, &fireball(), t0, &super::SpellModifiers::default());
 
         // Two reads of one arm, frames apart, with both clocks in lockstep.
         let read1 = cds
@@ -891,7 +1127,12 @@ mod tests {
 
         // The fail clears the GCD and a re-press re-arms 200 ms later, unseen by the feed.
         cds.clear_gcd(772, t0 + Duration::from_millis(200));
-        cds.start_gcd(772, &fireball(), t0 + Duration::from_millis(200));
+        cds.start_gcd(
+            772,
+            &fireball(),
+            t0 + Duration::from_millis(200),
+            &super::SpellModifiers::default(),
+        );
         let rearmed = cds
             .info(772, 0, Some(&fireball()), t0 + Duration::from_millis(216))
             .ui_triple(t0 + Duration::from_millis(216), 10.216);
@@ -907,7 +1148,12 @@ mod tests {
         let anchor0 = Instant::now();
         let mut cds = Cooldowns::default();
         // Armed 4 ms after this frame's anchor sample.
-        cds.start_gcd(133, &fireball(), anchor0 + Duration::from_millis(4));
+        cds.start_gcd(
+            133,
+            &fireball(),
+            anchor0 + Duration::from_millis(4),
+            &super::SpellModifiers::default(),
+        );
 
         // Frame 1 converts through the pre-arm pair, frame 2 through the next, 16 ms on.
         let read1 = cds
@@ -941,7 +1187,7 @@ mod tests {
             "no GCD running — nothing locks"
         );
 
-        cds.start_gcd(772, &fireball(), t0);
+        cds.start_gcd(772, &fireball(), t0, &super::SpellModifiers::default());
         let mid = t0 + Duration::from_millis(200);
         assert!(
             cds.not_ready(133, 0, Some(&fireball()), mid),
@@ -962,7 +1208,7 @@ mod tests {
     fn attack_and_tradeskill_reads_are_always_cold() {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
-        cds.start_gcd(772, &fireball(), t0);
+        cds.start_gcd(772, &fireball(), t0, &super::SpellModifiers::default());
         let mid = t0 + Duration::from_millis(200);
         let attack = SpellDisplay {
             effects: [78, 0, 0], // SPELL_EFFECT_ATTACK
@@ -985,7 +1231,7 @@ mod tests {
             attributes: 0x50012,
             ..Default::default()
         };
-        cds.start_spell(5019, &shoot, 1500, t0);
+        cds.start_spell(5019, &shoot, 1500, t0, None);
         let mid = t0 + Duration::from_millis(500);
         // Unrelated Fireball reads the wand swing and is not ready for its duration.
         let fb = cds.info(133, 0, Some(&fireball()), mid);
@@ -1003,7 +1249,7 @@ mod tests {
         cds.wipe();
         assert_eq!(cds.generation, g0);
 
-        cds.start_gcd(133, &fireball(), t0);
+        cds.start_gcd(133, &fireball(), t0, &super::SpellModifiers::default());
         assert_ne!(cds.generation, g0);
         let g1 = cds.generation;
         cds.wipe();
@@ -1017,7 +1263,7 @@ mod tests {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
         let throw = spell(76, 0, 0, (0, 0), 0x410012);
-        cds.start_spell(2764, &throw, 2200, t0);
+        cds.start_spell(2764, &throw, 2200, t0, None);
         let mid = t0 + Duration::from_millis(1000);
         let info = cds.info(2764, 0, Some(&throw), mid);
         assert_eq!(info.duration_ms, 2200, "the sweep is the weapon speed");
@@ -1036,7 +1282,7 @@ mod tests {
         let t0 = Instant::now();
         let mut cds = Cooldowns::default();
         let auto_shot = spell(0, 0, 0, (0, 0), 0x50012);
-        cds.start_spell(75, &auto_shot, 3200, t0);
+        cds.start_spell(75, &auto_shot, 3200, t0, None);
         let mid = t0 + Duration::from_millis(100);
         assert_eq!(
             cds.info(75, 0, Some(&auto_shot), mid).remaining_ms,
diff --git a/crates/benilla-app/src/spell/group_relation.rs b/crates/benilla-app/src/spell/group_relation.rs
new file mode 100644
index 00000000..9307df5e
--- /dev/null
+++ b/crates/benilla-app/src/spell/group_relation.rs
@@ -0,0 +1,763 @@
+//! The group relations the party and raid words ask: `BindTarget 0x6e5b40`'s party arm
+//! (`6e5cad`-`6e5cec`) needs `0x606c20(caster, unit)` and `CanAssist`, its raid arm
+//! (`6e5cf1`-`6e5d2f`) `0x606d20(caster, unit)` and `CanAssist`, and the world pick's party leg
+//! (`480686`, `4806b8`) asks `0x606c20`.
+//!
+//! - [`GroupRoster`]: the guids the reference's two tables hold, and [`publish_group_roster`],
+//!   which copies them out of `GroupState` before the input pass, so no cast or hover system
+//!   reads that resource and orders against the drains that write it.
+//! - [`GroupInputs`]: what a [`TargetRelations`] carries beside its stores for the two
+//!   predicates, and [`TargetRelations::in_party`] and [`TargetRelations::in_group`], which ask
+//!   them.
+
+use bevy::prelude::*;
+
+use benilla_protocol::messages::{ObjectType, OwnerFallback};
+
+use super::cast_target::TargetRelations;
+use crate::net::{ObjectStore, SelfGuid};
+use crate::ui_party::{raid_row_guids, GroupState};
+
+/// `UNIT_FIELD_FLAGS & 0x8`, `UNIT_FLAG_PLAYER_CONTROLLED` (vmangos `UnitDefines.h:548`), which
+/// both predicates test on both units (`606c5e`, `606c76`, `606d5e`, `606d76`).
+const UNIT_FLAG_PLAYER_CONTROLLED: u32 = 0x8;
+
+/// The two tables `0x4e7f70` and `0x4baee0` read: the guids in the party slots and in the raid
+/// roster, as the frame began.
+#[derive(Resource, Default, Debug, PartialEq, Eq)]
+pub(crate) struct GroupRoster {
+    /// The party slots `[0xbc6f48 + 8i]`, `i < 4` (`4e7f96`-`4e7fb0`); none once an opcode emptied
+    /// them.
+    pub(crate) party: Vec<u64>,
+    /// The raid roster `[[0xb712a8 + 4i]]`, `i < [0xb713e0]` (`4baee0`), us included; none outside
+    /// a raid.
+    pub(crate) raid: Vec<u64>,
+}
+
+impl GroupRoster {
+    /// `0x4e7f70`: a nonzero guid that is the active player's (`4e7f84`) or in a party slot.
+    pub(crate) fn in_party(&self, me: Option<u64>, guid: u64) -> bool {
+        guid != 0 && (me == Some(guid) || self.party.contains(&guid))
+    }
+
+    /// `0x4918e0`: [`Self::in_party`], or a nonzero guid in the raid roster (`4918ee`).
+    fn in_group(&self, me: Option<u64>, guid: u64) -> bool {
+        self.in_party(me, guid) || guid != 0 && self.raid.contains(&guid)
+    }
+}
+
+/// Publish [`GroupRoster`] before the input pass, beside the pick's other published inputs. The
+/// party slots are the ones `partyN` reads (`GroupState::party_slots`), none after a leave or a
+/// kick (`slots_emptied`, `0x4e84a0`); the raid roster is the rows `raidN` reads
+/// ([`raid_row_guids`]).
+pub(crate) fn publish_group_roster(
+    group: Option<Res<GroupState>>,
+    self_guid: Res<SelfGuid>,
+    mut roster: ResMut<GroupRoster>,
+) {
+    let Some(group) = group else { return };
+    if !group.is_changed() && !self_guid.is_changed() {
+        return;
+    }
+    let party = if group.slots_emptied {
+        Vec::new()
+    } else {
+        group.party_slots().map(|m| m.guid).collect()
+    };
+    let now = GroupRoster {
+        party,
+        raid: raid_row_guids(&group, self_guid.0),
+    };
+    if *roster != now {
+        *roster = now;
+    }
+}
+
+/// What the two predicates read beside a [`TargetRelations`]' stores.
+#[derive(Clone, Copy, Default)]
+pub(crate) struct GroupInputs<'a> {
+    /// The active player's guid (`0x468550`), whom both predicates compare controllers to.
+    pub(crate) self_guid: Option<u64>,
+    /// The candidate's guid.
+    pub(crate) target_guid: Option<u64>,
+    /// The caster's charmer or creator store, as [`TargetRelations::target_owner_store`] is the
+    /// candidate's.
+    pub(crate) self_owner_store: Option<&'a ObjectStore>,
+    /// `None` in a harness that publishes none: nobody is anybody's group.
+    pub(crate) roster: Option<&'a GroupRoster>,
+}
+
+impl TargetRelations<'_> {
+    /// `0x606c20(caster, candidate)`: the candidate is the caster (`606c3d`), or a member of his
+    /// party, or a unit that answers to one ([`Self::related`]).
+    pub(super) fn in_party(&self, is_self: bool) -> bool {
+        self.related(is_self, GroupRoster::in_party)
+    }
+
+    /// `0x606d20(caster, candidate)`: `0x606c20` with `0x4918e0` in place of `0x4e7f70`, so a
+    /// member of the raid roster counts as well as one of the party slots.
+    pub(super) fn in_group(&self, is_self: bool) -> bool {
+        self.related(is_self, GroupRoster::in_group)
+    }
+
+    /// The shape both predicates share: the caster is the candidate, or both are player-controlled
+    /// (`606c4f`-`606c79`), each answers to a player ([`controller`]), and one of the two
+    /// controllers is the active player and the other a member (`606ca3`-`606d02`), tried both
+    /// ways round. A member's pet is such a unit. Whoever has not streamed answers no controller
+    /// and no relation.
+    fn related(&self, is_self: bool, member: fn(&GroupRoster, Option<u64>, u64) -> bool) -> bool {
+        if is_self {
+            return true;
+        }
+        let group = &self.group;
+        let (Some(me), Some(target), Some(me_store), Some(store)) = (
+            group.self_guid,
+            group.target_guid,
+            self.self_store,
+            self.target_store,
+        ) else {
+            return false;
+        };
+        if me_store.0.unit_flags() & store.0.unit_flags() & UNIT_FLAG_PLAYER_CONTROLLED == 0 {
+            return false;
+        }
+        let (Some(mine), Some(theirs)) = (
+            controller(me_store, me, group.self_owner_store),
+            controller(store, target, self.target_owner_store),
+        ) else {
+            return false;
+        };
+        let member = |guid| {
+            group
+                .roster
+                .is_some_and(|roster| member(roster, Some(me), guid))
+        };
+        mine == me && member(theirs) || theirs == me && member(mine)
+    }
+}
+
+/// `0x606170`: the player a unit answers to, its charmer else its creator (`606170`-`60619f`)
+/// or the unit itself when neither is set, and only when that object is a player (`6061c6`-
+/// `6061cf`, `TYPEMASK_PLAYER`). `owner_store` is the charmer's or creator's descriptor, `None`
+/// while it has not streamed.
+fn controller(store: &ObjectStore, guid: u64, owner_store: Option<&ObjectStore>) -> Option<u64> {
+    let (owner, owner_store) = match store.0.unit_owner(OwnerFallback::CreatedBy) {
+        Some(owner) => (owner, owner_store),
+        None => (guid, Some(store)),
+    };
+    owner_store
+        .is_some_and(|s| s.0.object_type() == Some(ObjectType::Player))
+        .then_some(owner)
+}
+
+/// The stores the group tests stand up, over the faction rows of [`super::targeting::corpse_fixture`]
+/// (template 1 Human, the caster's, and 2 Orc).
+#[cfg(test)]
+pub(crate) mod fixture {
+    use super::*;
+    use benilla_protocol::ObjectFields;
+
+    /// Absolute descriptor indices: `OBJECT_FIELD_TYPE`, `UNIT_FIELD_CHARMEDBY`,
+    /// `UNIT_FIELD_CREATEDBY`, `UNIT_FIELD_HEALTH`, `UNIT_FIELD_FACTIONTEMPLATE` and
+    /// `UNIT_FIELD_FLAGS`.
+    pub(crate) const TYPE: u16 = 2;
+    pub(crate) const CHARMED_BY: u16 = 10;
+    pub(crate) const CREATED_BY: u16 = 14;
+    pub(crate) const HEALTH: u16 = 22;
+    pub(crate) const TEMPLATE: u16 = 35;
+    pub(crate) const FLAGS: u16 = 46;
+    /// `TYPEMASK_OBJECT | UNIT | PLAYER`, and `TYPEMASK_OBJECT | UNIT`.
+    pub(crate) const PLAYER_TYPE: u32 = 0x19;
+    pub(crate) const CREATURE_TYPE: u32 = 0x09;
+    /// `UNIT_FLAG_PLAYER_CONTROLLED`, and `UNIT_FLAG_PVP` (`0x1000`), which makes a friendly
+    /// creature assistable.
+    pub(crate) const CONTROLLED: u32 = 0x8;
+    pub(crate) const PVP: u32 = 0x1000;
+
+    pub(crate) fn store(pairs: &[(u16, u32)]) -> ObjectStore {
+        ObjectStore(ObjectFields::from_pairs(pairs))
+    }
+
+    /// A living, player-controlled player of this faction template.
+    pub(crate) fn player(template: u32) -> ObjectStore {
+        store(&[
+            (TYPE, PLAYER_TYPE),
+            (TEMPLATE, template),
+            (FLAGS, CONTROLLED),
+            (HEALTH, 100),
+        ])
+    }
+
+    /// A living, player-controlled creature of this template that answers to `owner`, as a pet
+    /// does: its creator, or its charmer when `charmed`.
+    pub(crate) fn pet_of(owner: u64, template: u32, charmed: bool) -> ObjectStore {
+        store(&[
+            (TYPE, CREATURE_TYPE),
+            (TEMPLATE, template),
+            (FLAGS, CONTROLLED),
+            (HEALTH, 100),
+            (if charmed { CHARMED_BY } else { CREATED_BY }, owner as u32),
+        ])
+    }
+
+    /// A living creature of this template that nobody controls, with these unit flags.
+    pub(crate) fn npc(template: u32, flags: u32) -> ObjectStore {
+        store(&[
+            (TYPE, CREATURE_TYPE),
+            (TEMPLATE, template),
+            (FLAGS, flags),
+            (HEALTH, 100),
+        ])
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::fixture::*;
+    use super::*;
+    use crate::net::Reputations;
+    use crate::spell::cast_target::{
+        cast_target_mask, resolve_cast_target, unit_binds, CastCandidates, CastWireTarget,
+    };
+    use crate::spell::targeting::corpse_fixture as fx;
+    use benilla_formats::SpellDisplay;
+    use benilla_protocol::messages::GroupMemberEntry;
+    use bevy::ecs::system::RunSystemOnce;
+
+    const ME: u64 = 1;
+    const MEMBER: u64 = 2;
+    const RAIDER: u64 = 3;
+    const STRANGER: u64 = 4;
+    const MEMBER_PET: u64 = 5;
+    const NPC: u64 = 6;
+    const ORC_MEMBER: u64 = 7;
+
+    /// `TARGET_FLAG_UNIT_RAID` and `TARGET_FLAG_UNIT_PARTY`, the words implicit targets 57 and 35
+    /// set.
+    const RAID_WORD: u16 = 0x4;
+    const PARTY_WORD: u16 = 0x8;
+
+    /// Us and our party of one, a raider in our raid and a stranger in neither.
+    fn roster() -> GroupRoster {
+        GroupRoster {
+            party: vec![MEMBER],
+            raid: vec![ME, MEMBER, RAIDER],
+        }
+    }
+
+    /// `(0x606c20, 0x606d20)` toward a candidate, with the stores that stand behind it.
+    fn asked(
+        roster: &GroupRoster,
+        me: &ObjectStore,
+        me_owner: Option<&ObjectStore>,
+        target: (u64, &ObjectStore, Option<&ObjectStore>),
+    ) -> (bool, bool) {
+        let (guid, store, owner) = target;
+        let rel = TargetRelations {
+            target_store: Some(store),
+            target_owner_store: owner,
+            self_store: Some(me),
+            factions: None,
+            reputations: &Reputations(Vec::new()),
+            types: Default::default(),
+            group: GroupInputs {
+                self_guid: Some(ME),
+                target_guid: Some(guid),
+                self_owner_store: me_owner,
+                roster: Some(roster),
+            },
+        };
+        (rel.in_party(false), rel.in_group(false))
+    }
+
+    /// `0x606c20` and `0x606d20` on players: the party slots satisfy both, the raid roster only the
+    /// second, and a player in neither answers neither.
+    #[test]
+    fn the_raid_roster_adds_to_the_party_slots_for_the_second_predicate_alone() {
+        let (roster, me, other) = (roster(), player(1), player(1));
+        let ask = |guid| asked(&roster, &me, None, (guid, &other, None));
+        assert_eq!(ask(MEMBER), (true, true), "a party member");
+        assert_eq!(ask(RAIDER), (false, true), "a raid member of another group");
+        assert_eq!(ask(STRANGER), (false, false), "a player in neither");
+        assert_eq!(
+            ask(0),
+            (false, false),
+            "no guid is nobody's (`4e7f75`, `4baee9`)"
+        );
+        assert_eq!(
+            asked(&GroupRoster::default(), &me, None, (MEMBER, &other, None)),
+            (false, false),
+            "an empty roster"
+        );
+    }
+
+    /// The caster is the candidate (`606c3d`, `606d3d`) whatever the roster holds, and a candidate
+    /// with no guid or no descriptor streamed answers no relation.
+    #[test]
+    fn the_caster_is_his_own_group_and_a_missing_input_is_none() {
+        let (me, other) = (player(1), player(1));
+        let roster = roster();
+        let rel = TargetRelations {
+            target_store: Some(&other),
+            target_owner_store: None,
+            self_store: Some(&me),
+            factions: None,
+            reputations: &Reputations(Vec::new()),
+            types: Default::default(),
+            group: GroupInputs {
+                self_guid: Some(ME),
+                target_guid: Some(MEMBER),
+                self_owner_store: None,
+                roster: Some(&roster),
+            },
+        };
+        assert!(rel.in_party(true) && rel.in_group(true), "the caster");
+        assert!(rel.in_party(false) && rel.in_group(false), "the control");
+        let no_guid = TargetRelations {
+            group: GroupInputs {
+                target_guid: None,
+                ..rel.group
+            },
+            ..rel
+        };
+        assert!(!no_guid.in_party(false) && !no_guid.in_group(false));
+        let no_store = TargetRelations {
+            target_store: None,
+            ..rel
+        };
+        assert!(!no_store.in_party(false) && !no_store.in_group(false));
+        let no_roster = TargetRelations {
+            group: GroupInputs {
+                roster: None,
+                ..rel.group
+            },
+            ..rel
+        };
+        assert!(!no_roster.in_party(false) && !no_roster.in_group(false));
+    }
+
+    /// `606c5e`-`606c76`: both units must be player-controlled, so a member who is not, or a caster
+    /// who is not, has no party.
+    #[test]
+    fn both_sides_must_be_player_controlled() {
+        let roster = roster();
+        let (me, member) = (player(1), player(1));
+        let unflagged = store(&[(TYPE, PLAYER_TYPE)]);
+        assert_eq!(
+            asked(&roster, &me, None, (MEMBER, &unflagged, None)),
+            (false, false)
+        );
+        assert_eq!(
+            asked(&roster, &unflagged, None, (MEMBER, &member, None)),
+            (false, false)
+        );
+    }
+
+    /// `0x606170`: a pet is the group member it answers to, so a party member's pet is in the party
+    /// and a raider's in the raid; a pet of a stranger, a creature that answers to nobody and a pet
+    /// whose owner has not streamed are in neither.
+    #[test]
+    fn a_pet_is_the_group_member_it_answers_to() {
+        let roster = roster();
+        let (me, member, raider, stranger) = (player(1), player(1), player(1), player(1));
+        let ask = |guid: u64, pet: &ObjectStore, owner: Option<&ObjectStore>| {
+            asked(&roster, &me, None, (guid, pet, owner))
+        };
+        assert_eq!(
+            ask(10, &pet_of(MEMBER, 1, false), Some(&member)),
+            (true, true),
+            "a member's pet"
+        );
+        assert_eq!(
+            ask(11, &pet_of(ME, 1, false), Some(&me)),
+            (true, true),
+            "our own pet"
+        );
+        assert_eq!(
+            ask(12, &pet_of(RAIDER, 1, false), Some(&raider)),
+            (false, true),
+            "a raider's pet"
+        );
+        assert_eq!(
+            ask(13, &pet_of(STRANGER, 1, false), Some(&stranger)),
+            (false, false),
+            "a stranger's pet"
+        );
+        assert_eq!(
+            ask(14, &pet_of(MEMBER, 1, false), None),
+            (false, false),
+            "an owner that has not streamed answers no controller (`606c92`)"
+        );
+        // A creature nobody controls: the flag says player-controlled, but it is no player.
+        let orphan = store(&[(TYPE, CREATURE_TYPE), (FLAGS, CONTROLLED)]);
+        assert_eq!(
+            ask(15, &orphan, None),
+            (false, false),
+            "no owner, no player"
+        );
+        assert_eq!(
+            ask(16, &npc(1, PVP), None),
+            (false, false),
+            "an NPC is not player-controlled"
+        );
+        // Only a player counts as a controller (`6061c6`-`6061cf`): a creature standing in the
+        // roster, and a pet that answers to one, have none.
+        let controlled = store(&[(TYPE, CREATURE_TYPE), (FLAGS, CONTROLLED)]);
+        assert_eq!(
+            ask(MEMBER, &controlled, None),
+            (false, false),
+            "a controlled creature whose own guid is in the party"
+        );
+        assert_eq!(
+            ask(18, &pet_of(MEMBER, 1, false), Some(&controlled)),
+            (false, false),
+            "a pet whose owner in the party is no player"
+        );
+        // A pet answers to its charmer before its creator: `CHARMEDBY` decides.
+        let charmed = store(&[
+            (TYPE, CREATURE_TYPE),
+            (FLAGS, CONTROLLED),
+            (CHARMED_BY, STRANGER as u32),
+            (CREATED_BY, MEMBER as u32),
+        ]);
+        assert_eq!(
+            ask(17, &charmed, Some(&stranger)),
+            (false, false),
+            "charmed by a stranger"
+        );
+    }
+
+    /// `606dce`-`606e02`: the controllers are tried both ways round, so a caster who answers to a
+    /// member (a charmed player) is in the group of a unit that answers to us.
+    #[test]
+    fn the_controllers_are_tried_both_ways_round() {
+        let roster = roster();
+        let (member, stranger) = (player(1), player(1));
+        let charmed_by = |guid: u64| {
+            store(&[
+                (TYPE, PLAYER_TYPE),
+                (FLAGS, CONTROLLED),
+                (CHARMED_BY, guid as u32),
+            ])
+        };
+        // Our pet answers to us (its creator is the active player) and we answer to a member: the
+        // caster's controller is not the active player, the candidate's is.
+        let (charmed_me, ours) = (charmed_by(MEMBER), pet_of(ME, 1, false));
+        assert_eq!(
+            asked(
+                &roster,
+                &charmed_me,
+                Some(&member),
+                (10, &ours, Some(&charmed_me))
+            ),
+            (true, true)
+        );
+        // Charmed by a stranger instead: the other side is no member.
+        let charmed_by_stranger = charmed_by(STRANGER);
+        assert_eq!(
+            asked(
+                &roster,
+                &charmed_by_stranger,
+                Some(&stranger),
+                (10, &ours, Some(&charmed_by_stranger))
+            ),
+            (false, false)
+        );
+        // Neither controller is the active player: no relation, whatever they are.
+        let theirs = pet_of(RAIDER, 1, false);
+        assert_eq!(
+            asked(
+                &roster,
+                &charmed_me,
+                Some(&member),
+                (11, &theirs, Some(&member))
+            ),
+            (false, false)
+        );
+    }
+
+    /// The party bit `0x8` and the raid bit `0x4` clear for the group the predicates name and
+    /// `CanAssist` passes (`6e5cad`-`6e5d2f`), and only the raid bit for a raid member outside
+    /// the party.
+    #[test]
+    fn the_party_and_raid_bits_clear_for_the_group_and_only_when_assistable() {
+        let factions = fx::factions();
+        let reputations = Reputations(Vec::new());
+        let roster = GroupRoster {
+            party: vec![MEMBER, ORC_MEMBER],
+            raid: vec![ME, MEMBER, RAIDER, ORC_MEMBER],
+        };
+        let me = player(1);
+        let (member, raider, stranger) = (player(1), player(1), player(1));
+        let orc_member = player(2);
+        let member_pet = pet_of(MEMBER, 1, false);
+        // A friendly creature that can be assisted but answers to nobody.
+        let npc = npc(1, PVP);
+        let binds = |word: u16, is_self: bool, guid, store: &ObjectStore, owner| {
+            let rel = TargetRelations {
+                target_store: Some(store),
+                target_owner_store: owner,
+                self_store: Some(&me),
+                factions: Some(&factions),
+                reputations: &reputations,
+                types: Default::default(),
+                group: GroupInputs {
+                    self_guid: Some(ME),
+                    target_guid: Some(guid),
+                    self_owner_store: None,
+                    roster: Some(&roster),
+                },
+            };
+            unit_binds(None, word, is_self, &rel)
+        };
+        // (label, guid, store, owner, binds under the party word, under the raid word)
+        type Case<'a> = (
+            &'a str,
+            u64,
+            &'a ObjectStore,
+            Option<&'a ObjectStore>,
+            bool,
+            bool,
+        );
+        let cases: [Case; 6] = [
+            ("a party member", MEMBER, &member, None, true, true),
+            (
+                "a raid member of another group",
+                RAIDER,
+                &raider,
+                None,
+                false,
+                true,
+            ),
+            (
+                "a player in neither",
+                STRANGER,
+                &stranger,
+                None,
+                false,
+                false,
+            ),
+            (
+                "a party member's pet",
+                MEMBER_PET,
+                &member_pet,
+                Some(&member),
+                true,
+                true,
+            ),
+            ("a friendly creature", NPC, &npc, None, false, false),
+            // In the party, and no friend: `CanAssist` refuses after the predicate passes.
+            (
+                "a member of the other faction",
+                ORC_MEMBER,
+                &orc_member,
+                None,
+                false,
+                false,
+            ),
+        ];
+        for (label, guid, store, owner, party, raid) in cases {
+            assert_eq!(
+                binds(PARTY_WORD, false, guid, store, owner),
+                party,
+                "{label}: the party word"
+            );
+            assert_eq!(
+                binds(RAID_WORD, false, guid, store, owner),
+                raid,
+                "{label}: the raid word"
+            );
+        }
+        // The caster binds both, in no group at all.
+        for word in [PARTY_WORD, RAID_WORD] {
+            assert!(binds(word, true, ME, &me, None), "the caster, {word:#x}");
+        }
+    }
+
+    /// Power Word: Shield (implicit target 57, the raid word) on the press: a party member binds
+    /// and goes on the wire, a friendly player in no group does not, and the fallback to ourselves
+    /// is `autoSelfCast`'s.
+    #[test]
+    fn a_raid_word_spell_pressed_on_a_party_member_binds_him() {
+        let factions = fx::factions();
+        let reputations = Reputations(Vec::new());
+        let roster = GroupRoster {
+            party: vec![MEMBER],
+            raid: Vec::new(),
+        };
+        let (me, member, stranger) = (player(1), player(1), player(1));
+        let shield = SpellDisplay {
+            implicit_target_a1: 57,
+            ..Default::default()
+        };
+        assert_eq!(cast_target_mask(&shield), RAID_WORD);
+        let press = |target: (u64, &ObjectStore), auto_self_cast| {
+            let rel = TargetRelations {
+                target_store: Some(target.1),
+                target_owner_store: None,
+                self_store: Some(&me),
+                factions: Some(&factions),
+                reputations: &reputations,
+                types: Default::default(),
+                group: GroupInputs {
+                    self_guid: Some(ME),
+                    target_guid: Some(target.0),
+                    self_owner_store: None,
+                    roster: Some(&roster),
+                },
+            };
+            let candidates = CastCandidates {
+                selection: Some(target.0),
+                caster: Some(ME),
+                main_hand_item: None,
+            };
+            resolve_cast_target(Some(&shield), &candidates, auto_self_cast, &rel)
+        };
+        for auto_self_cast in [false, true] {
+            assert_eq!(
+                press((MEMBER, &member), auto_self_cast),
+                CastWireTarget::Unit(MEMBER),
+                "a party member, autoSelfCast {auto_self_cast}"
+            );
+        }
+        assert_eq!(
+            press((STRANGER, &stranger), false),
+            CastWireTarget::Targeting(RAID_WORD),
+            "a stranger leaves the word standing for the cursor"
+        );
+        assert_eq!(
+            press((STRANGER, &stranger), true),
+            CastWireTarget::Unit(ME),
+            "and autoSelfCast falls back to the caster"
+        );
+    }
+
+    /// The shipped rows the party and raid words serve: each carries its bit, and a party member
+    /// selected when the row is pressed is the bound target, a stranger not.
+    #[test]
+    fn the_shipped_party_and_raid_spells_bind_a_party_member() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let catalog = benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let factions = fx::factions();
+        let reputations = Reputations(Vec::new());
+        let roster = GroupRoster {
+            party: vec![MEMBER],
+            raid: Vec::new(),
+        };
+        let (me, member, stranger) = (player(1), player(1), player(1));
+        // The party word (target 35), then the raid word (targets 57 and 61).
+        let rows = [
+            (13903, "Seal of Sacrifice", PARTY_WORD),
+            (17177, "Seal of Protection", PARTY_WORD),
+            (17, "Power Word: Shield", RAID_WORD),
+            (1022, "Blessing of Protection", RAID_WORD),
+            (1038, "Blessing of Salvation", RAID_WORD),
+            (6940, "Blessing of Sacrifice", RAID_WORD),
+            (604, "Dampen Magic", RAID_WORD),
+            (1008, "Amplify Magic", RAID_WORD),
+            (19752, "Divine Intervention", RAID_WORD),
+            (25782, "Greater Blessing of Might", RAID_WORD),
+            (25898, "Greater Blessing of Kings", RAID_WORD),
+        ];
+        for (id, name, bit) in rows {
+            let def = catalog.get(id).unwrap_or_else(|| panic!("{name} ({id})"));
+            assert_eq!(def.name, name, "spell {id}");
+            assert_eq!(cast_target_mask(def), bit, "{name}: the word");
+            let press = |target: (u64, &ObjectStore)| {
+                let rel = TargetRelations {
+                    target_store: Some(target.1),
+                    target_owner_store: None,
+                    self_store: Some(&me),
+                    factions: Some(&factions),
+                    reputations: &reputations,
+                    types: Default::default(),
+                    group: GroupInputs {
+                        self_guid: Some(ME),
+                        target_guid: Some(target.0),
+                        self_owner_store: None,
+                        roster: Some(&roster),
+                    },
+                };
+                let candidates = CastCandidates {
+                    selection: Some(target.0),
+                    caster: Some(ME),
+                    main_hand_item: None,
+                };
+                resolve_cast_target(Some(def), &candidates, false, &rel)
+            };
+            assert_eq!(
+                press((MEMBER, &member)),
+                CastWireTarget::Unit(MEMBER),
+                "{name}: a party member"
+            );
+            assert_eq!(
+                press((STRANGER, &stranger)),
+                CastWireTarget::Targeting(bit),
+                "{name}: a stranger"
+            );
+        }
+    }
+
+    fn entry(guid: u64, flags: u8) -> GroupMemberEntry {
+        GroupMemberEntry {
+            name: String::new(),
+            guid,
+            status: 0,
+            flags,
+        }
+    }
+
+    /// The published tables: the party slots are our own subgroup, at most four, and the raid
+    /// roster every row, us first, none outside a raid. A leave or a kick empties the slots and
+    /// keeps the roster.
+    #[test]
+    fn the_roster_publishes_the_slots_and_rows_the_reference_holds() {
+        let publish = |world: &mut World| {
+            world
+                .run_system_once(publish_group_roster)
+                .expect("the roster publishes");
+            std::mem::take(&mut *world.resource_mut::<GroupRoster>())
+        };
+        let mut world = World::new();
+        world.init_resource::<GroupRoster>();
+        world.init_resource::<GroupState>();
+        world.insert_resource(SelfGuid(Some(ME)));
+        assert_eq!(publish(&mut world), GroupRoster::default(), "no group");
+
+        // A party: everyone in our subgroup, and no raid roster.
+        world.resource_mut::<GroupState>().members =
+            vec![entry(MEMBER, 0), entry(RAIDER, 0), entry(STRANGER, 0)];
+        assert_eq!(
+            publish(&mut world),
+            GroupRoster {
+                party: vec![MEMBER, RAIDER, STRANGER],
+                raid: Vec::new(),
+            }
+        );
+
+        // A raid: the party slots are our subgroup's, the roster all rows with us first.
+        {
+            let mut group = world.resource_mut::<GroupState>();
+            group.group_type = crate::ui_party::GROUPTYPE_RAID;
+            group.members = vec![entry(MEMBER, 0), entry(RAIDER, 1), entry(STRANGER, 0)];
+        }
+        assert_eq!(
+            publish(&mut world),
+            GroupRoster {
+                party: vec![MEMBER, STRANGER],
+                raid: vec![ME, MEMBER, RAIDER, STRANGER],
+            }
+        );
+
+        // A kick empties the slots and keeps the roster (`0x4e84a0`).
+        world.resource_mut::<GroupState>().slots_emptied = true;
+        assert_eq!(
+            publish(&mut world),
+            GroupRoster {
+                party: Vec::new(),
+                raid: vec![ME, MEMBER, RAIDER, STRANGER],
+            }
+        );
+    }
+}
diff --git a/crates/benilla-app/src/spell/inflight.rs b/crates/benilla-app/src/spell/inflight.rs
index b2b889e5..b67adc35 100644
--- a/crates/benilla-app/src/spell/inflight.rs
+++ b/crates/benilla-app/src/spell/inflight.rs
@@ -7,8 +7,6 @@ use std::time::{Duration, Instant};
 
 use bevy::prelude::*;
 
-use benilla_ui::script::UiScript;
-
 use crate::creature_anim::{CastEvent, CastEventKind, Casting, PlaySeq};
 use crate::net::{ClientCommand, GuidIndex, NetCommands, SelfGuid};
 use crate::ui_action::Spells;
@@ -257,112 +255,135 @@ pub(crate) struct LocalMoveStart(pub(crate) bool);
 /// into 0x154 `SPELLCAST_INTERRUPTED` (`0x6e1a00`). Our bar edges key on the self `Casting` this
 /// reap removes, so the pair is pushed here. The stock `CastingBarFrame.lua:132-139` then steps
 /// the flash once per OnUpdate after the 1 s hold, followed by the fade.
-pub(super) fn local_self_cancel(
-    script: Option<NonSendMut<UiScript>>,
-    mut moved: ResMut<LocalMoveStart>,
-    mut pending: ResMut<PendingCast>,
-    mut queued_melee: ResMut<QueuedMeleeSpell>,
-    channel: Res<ActiveChannel>,
-    mut auto_repeat: ResMut<AutoRepeatActive>,
-    mut feed: ResMut<CastBarFeed>,
-    spells: Option<Res<Spells>>,
-    net: Res<NetCommands>,
-    self_guid: Res<SelfGuid>,
-    index: Res<GuidIndex>,
-    casting: Query<&Casting>,
-    mut cast_events: MessageWriter<CastEvent>,
-    mut play_seq: ResMut<PlaySeq>,
-    mut ecs: Commands,
-) {
-    let esc = match script {
-        Some(mut s) => s.take_spell_stop(),
-        None => false,
-    };
-    let moved = std::mem::take(&mut moved.0);
-    if !esc && !moved {
-        return;
+pub(super) fn local_self_cancel(mut moved: ResMut<LocalMoveStart>, mut cancel: SelfCancel) {
+    if std::mem::take(&mut moved.0) {
+        cancel.cancel(false, true);
     }
-    let now = Instant::now();
-    let self_e = self_guid.0.as_ref().and_then(|g| index.0.get(g)).copied();
-    // Esc stops one thing, auto-repeat first (`0x6e6e80`).
-    let esc = if esc && auto_repeat.0.is_some() {
-        if *crate::net::CAST_TRACE {
-            info!("cast-trace: LOCAL auto-repeat self-cancel (esc), CMSG_CANCEL_AUTO_REPEAT_SPELL");
-        }
-        crate::creature_anim::cancel_auto_repeat_local(self_e, &mut auto_repeat, &mut ecs, &net);
-        false // the press is spent
-    } else {
-        esc
-    };
-    if !esc && !moved {
-        return;
+}
+
+/// What [`local_self_cancel`] reads and writes, shared with the Esc cancel, which is a script call
+/// (`SpellStopCasting`) and lands in call order ([`crate::script_calls`]).
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct SelfCancel<'w, 's> {
+    pending: ResMut<'w, PendingCast>,
+    queued_melee: ResMut<'w, QueuedMeleeSpell>,
+    channel: Res<'w, ActiveChannel>,
+    auto_repeat: ResMut<'w, AutoRepeatActive>,
+    feed: ResMut<'w, CastBarFeed>,
+    spells: Option<Res<'w, Spells>>,
+    net: Res<'w, NetCommands>,
+    self_guid: Res<'w, SelfGuid>,
+    index: Res<'w, GuidIndex>,
+    casting: Query<'w, 's, &'static Casting>,
+    cast_events: MessageWriter<'w, CastEvent>,
+    play_seq: ResMut<'w, PlaySeq>,
+    ecs: Commands<'w, 's>,
+}
+
+impl SelfCancel<'_, '_> {
+    /// `SpellStopCasting()` (`0x6e6e80`), the ESC chain's cast rung.
+    pub(crate) fn stop_casting(&mut self) {
+        self.cancel(true, false);
     }
-    let flags_open = |pick: fn(&benilla_formats::SpellDisplay) -> bool, spell_id: u32| {
-        // An uncataloged spell cancels, as the server interrupts any ordinary cast.
-        spells
-            .as_ref()
-            .and_then(|s| s.catalog.get(spell_id))
-            .is_none_or(pick)
-    };
-    // `AbortCast` treats a cast and a queued strike alike; only the local teardown differs.
-    let started = self_e.and_then(|e| casting.get(e).ok()).map(|c| c.spell_id);
-    if let Some(slot) = inflight(&pending, &queued_melee, started, now) {
-        let spell_id = slot.spell_id();
-        // Movement tests `InterruptFlags`, which spares a queued strike: Heroic Strike 78,
-        // Cleave 845 and Raptor Strike 2973 ship 0 (Fireball `0xf`).
-        if esc
-            || flags_open(
-                |d| d.interrupt_flags & SPELL_INTERRUPT_MOVEMENT != 0,
-                spell_id,
-            )
-        {
+
+    fn cancel(&mut self, esc: bool, moved: bool) {
+        let Self {
+            pending,
+            queued_melee,
+            channel,
+            auto_repeat,
+            feed,
+            spells,
+            net,
+            self_guid,
+            index,
+            casting,
+            cast_events,
+            play_seq,
+            ecs,
+        } = self;
+        let now = Instant::now();
+        let self_e = self_guid.0.as_ref().and_then(|g| index.0.get(g)).copied();
+        // Esc stops one thing, auto-repeat first (`0x6e6e80`).
+        let esc = if esc && auto_repeat.0.is_some() {
             if *crate::net::CAST_TRACE {
-                info!(
-                    "cast-trace: LOCAL self-cancel — {slot:?} ({}), CMSG_CANCEL_CAST",
-                    if esc { "esc" } else { "moved" }
-                );
+                info!("cast-trace: LOCAL auto-repeat self-cancel (esc), CMSG_CANCEL_AUTO_REPEAT_SPELL");
             }
-            let _ = net.0.send(ClientCommand::CancelCast { spell_id });
-            match slot {
-                Inflight::Cast(_) => {
-                    pending.clear_if(spell_id);
-                    // STOP arms the flash, INTERRUPTED paints red and holds, so the flash bursts
-                    // after the hold; an interrupt by an enemy has no STOP and no burst.
-                    feed.0.push(CastBarEdge::Stop);
-                    feed.0.push(CastBarEdge::Interrupted);
-                    // `spell_failed_other`'s self reap, run early so the echo finds it done.
-                    if let Some(e) = self_e {
-                        if casting.get(e).is_ok_and(|c| c.spell_id == spell_id) {
-                            ecs.entity(e).remove::<Casting>();
+            crate::creature_anim::cancel_auto_repeat_local(self_e, auto_repeat, ecs, net);
+            false // the press is spent
+        } else {
+            esc
+        };
+        if !esc && !moved {
+            return;
+        }
+        let flags_open = |pick: fn(&benilla_formats::SpellDisplay) -> bool, spell_id: u32| {
+            // An uncataloged spell cancels, as the server interrupts any ordinary cast.
+            spells
+                .as_ref()
+                .and_then(|s| s.catalog.get(spell_id))
+                .is_none_or(pick)
+        };
+        // `AbortCast` treats a cast and a queued strike alike; only the local teardown differs.
+        let started = self_e.and_then(|e| casting.get(e).ok()).map(|c| c.spell_id);
+        if let Some(slot) = inflight(pending, queued_melee, started, now) {
+            let spell_id = slot.spell_id();
+            // Movement tests `InterruptFlags`, which spares a queued strike: Heroic Strike 78,
+            // Cleave 845 and Raptor Strike 2973 ship 0 (Fireball `0xf`).
+            if esc
+                || flags_open(
+                    |d| d.interrupt_flags & SPELL_INTERRUPT_MOVEMENT != 0,
+                    spell_id,
+                )
+            {
+                if *crate::net::CAST_TRACE {
+                    info!(
+                        "cast-trace: LOCAL self-cancel — {slot:?} ({}), CMSG_CANCEL_CAST",
+                        if esc { "esc" } else { "moved" }
+                    );
+                }
+                let _ = net.0.send(ClientCommand::CancelCast { spell_id });
+                match slot {
+                    Inflight::Cast(_) => {
+                        pending.clear_if(spell_id);
+                        // STOP arms the flash, INTERRUPTED paints red and holds, so the flash bursts
+                        // after the hold; an interrupt by an enemy has no STOP and no burst.
+                        feed.0.push(CastBarEdge::Stop);
+                        feed.0.push(CastBarEdge::Interrupted);
+                        // `spell_failed_other`'s self reap, run early so the echo finds it done.
+                        if let Some(e) = self_e {
+                            if casting.get(e).is_ok_and(|c| c.spell_id == spell_id) {
+                                ecs.entity(e).remove::<Casting>();
+                            }
+                            cast_events.write(CastEvent {
+                                entity: e,
+                                spell_id,
+                                kind: CastEventKind::Fail,
+                                seq: play_seq.next(),
+                            });
                         }
-                        cast_events.write(CastEvent {
-                            entity: e,
-                            spell_id,
-                            kind: CastEventKind::Fail,
-                            seq: play_seq.next(),
-                        });
+                    }
+                    Inflight::Strike(_) => {
+                        // Clearing the slot darkens the checked ring now. `AbortCast` fires 0x152
+                        // here too, inert on a hidden bar; there is no INTERRUPTED.
+                        queued_melee.clear_if(spell_id);
+                        feed.0.push(CastBarEdge::Stop);
                     }
                 }
-                Inflight::Strike(_) => {
-                    // Clearing the slot darkens the checked ring now. `AbortCast` fires 0x152
-                    // here too, inert on a hidden bar; there is no INTERRUPTED.
-                    queued_melee.clear_if(spell_id);
-                    feed.0.push(CastBarEdge::Stop);
-                }
             }
         }
-    }
-    // The channel: movement only, and the send only (`0x6e9b70`).
-    if moved {
-        if let Some(spell_id) = channel.current(now) {
-            if flags_open(
-                |d| d.channel_interrupt_flags & CHANNEL_INTERRUPT_MOVING != 0,
-                spell_id,
-            ) {
-                if *crate::net::CAST_TRACE {
-                    info!("cast-trace: LOCAL channel self-cancel — spell {spell_id}, CMSG_CANCEL_CHANNELLING");
+        // The channel: movement only, and the send only (`0x6e9b70`).
+        if moved {
+            if let Some(spell_id) = channel.current(now) {
+                if flags_open(
+                    |d| d.channel_interrupt_flags & CHANNEL_INTERRUPT_MOVING != 0,
+                    spell_id,
+                ) {
+                    if *crate::net::CAST_TRACE {
+                        info!("cast-trace: LOCAL channel self-cancel — spell {spell_id}, CMSG_CANCEL_CHANNELLING");
+                    }
+                    let _ = net.0.send(ClientCommand::CancelChannelling { spell_id });
                 }
-                let _ = net.0.send(ClientCommand::CancelChannelling { spell_id });
             }
         }
     }
@@ -484,14 +505,15 @@ mod tests {
         assert_eq!(q.current(), None, "the wire resolution opened the queue");
     }
 
-    /// [`local_self_cancel`] in a small App. With no `UiScript` Esc reads false; the Esc tests
-    /// insert a VM and call the real `SpellStopCasting()`.
+    /// [`local_self_cancel`] in a small App, and the Esc cancel: the Esc tests insert a VM, call
+    /// the real `SpellStopCasting()` and apply what it queued.
     mod local_cancel {
         use super::*;
         use crate::creature_anim::PlaySeq;
         use crate::net::{Guid, GuidIndex, NetCommands, SelfGuid, SelfPlayer};
         use crate::ui_cast::feed_cast_bar;
         use benilla_formats::{SpellCatalog, SpellDisplay};
+        use benilla_ui::script::{ScriptCall, UiScript};
         use bevy::ecs::system::RunSystemOnce;
         use std::collections::HashMap;
 
@@ -541,6 +563,19 @@ mod tests {
             app.world_mut().run_system_once(local_self_cancel).unwrap();
         }
 
+        /// Apply the `SpellStopCasting()` calls the VM queued, as `crate::script_calls` does.
+        fn apply_stops(app: &mut App) {
+            app.world_mut()
+                .run_system_once(|mut script: NonSendMut<UiScript>, mut cancel: SelfCancel| {
+                    crate::script_calls::in_call_order(&mut script, |_, call| {
+                        if call == ScriptCall::SpellStopCasting {
+                            cancel.stop_casting();
+                        }
+                    });
+                })
+                .unwrap();
+        }
+
         #[test]
         fn a_move_edge_mid_cast_cancels_locally() {
             let (mut app, rx) = harness(HashMap::from([(
@@ -704,7 +739,7 @@ mod tests {
                 None,
                 "mid-channel the binding answers nil — the vanilla /stopcasting quirk"
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(
                 rx.try_recv().is_err(),
                 "no wire cancel — channels break only on the movement path"
@@ -736,7 +771,7 @@ mod tests {
                     .unwrap(),
                 Some(1)
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(
                 matches!(
                     rx.try_recv(),
@@ -766,7 +801,7 @@ mod tests {
                     .unwrap(),
                 Some(1)
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(
                 matches!(
                     rx.try_recv(),
@@ -803,7 +838,7 @@ mod tests {
                 "the queued strike makes IsCasting true, so the binding EATS the press — which \
                  is what spares the target three rungs further down the ladder"
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(
                 matches!(
                     rx.try_recv(),
@@ -873,7 +908,7 @@ mod tests {
                     .unwrap(),
                 Some(1)
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(
                 matches!(
                     rx.try_recv(),
@@ -898,7 +933,7 @@ mod tests {
                 Some(1),
                 "still stoppable — so this press is eaten too, and the target still survives"
             );
-            app.world_mut().run_system_once(local_self_cancel).unwrap();
+            apply_stops(&mut app);
             assert!(matches!(
                 rx.try_recv(),
                 Ok(crate::net::ClientCommand::CancelCast {
diff --git a/crates/benilla-app/src/spell/mod.rs b/crates/benilla-app/src/spell/mod.rs
index 67cd2a67..ef851862 100644
--- a/crates/benilla-app/src/spell/mod.rs
+++ b/crates/benilla-app/src/spell/mod.rs
@@ -1,6 +1,7 @@
 //! The spell, the reference's `Spell_C`: the cast ladder and commit ([`cast_send`], `TryCast
 //! 0x6e4b60` and `SendCast 0x6e54f0`), the target bind ([`cast_target`], `ArmCast 0x6e5250` and
-//! `BindTarget 0x6e5b40`), the requirement validator ([`validator`], `0x6094f0`), the usable walk
+//! `BindTarget 0x6e5b40`), the party and raid relations its arms ask ([`group_relation`],
+//! `0x606c20`, `0x606d20`), the requirement validator ([`validator`], `0x6094f0`), the usable walk
 //! ([`usable`], `IsSpellUsableNow 0x6e3d60`), the targeting cursor ([`targeting`], `0xcecac0`),
 //! the in-flight slot, the cooldowns, the talent modifiers and their packet handlers ([`net`]).
 
@@ -11,33 +12,47 @@ use crate::ui_script::{UiFeed, UiInput};
 use crate::ui_unit::UnitFeed;
 use benilla_world::schedule::WorldStage;
 
+mod bind_gates;
 mod cast_send;
 pub(crate) mod cast_target;
 pub(crate) mod cooldowns;
+pub(crate) mod group_relation;
 mod inflight;
 mod mods;
 pub(crate) mod net;
+mod range_units;
 pub(crate) mod targeting;
 pub(crate) mod usable;
 pub(crate) mod validator;
 
 // The one cast path: every caster takes [`CastLadder`] and commits through [`CastCommit`];
 // `send_spell_cast` is private to `cast_send`, so no second send path can exist.
-pub(crate) use cast_send::{CastCommit, CastLadder, TargetedBind};
+pub(crate) use cast_send::{CastCommit, CastLadder, HeldCast, HeldForPick, TargetedBind};
 pub(crate) use cast_target::AutoSelfCast;
 pub(crate) use cooldowns::Cooldowns;
 pub(crate) use inflight::{
     inflight, ActiveChannel, AutoRepeatActive, LocalMoveStart, PendingCast, QueuedMeleeSpell,
-    SPELL_INTERRUPT_MOVEMENT,
+    SelfCancel, SPELL_INTERRUPT_MOVEMENT,
 };
-pub(crate) use mods::{SpellModifiers, OP_COST};
+pub(crate) use mods::{ModsDiff, SpellModifiers, OP_CAST_TIME, OP_COST, OP_GCD, OP_RADIUS};
+#[cfg(test)]
+pub(crate) use mods::{OP_COOLDOWN, OP_RANGE};
+pub(crate) use range_units::{RangeUnits, DEFAULT_REACH};
 // `TargetingWants` is exported for the ground reticle, which draws for the location word alone.
 pub(crate) use targeting::{
-    ground_cast_radius, CorpsePick, PicksSelf, SpellTargeting, TargetingWants,
+    ground_cast_radius, CorpsePick, PicksSelf, ScriptCursor, SpellTargeting, TargetingWants,
 };
 
+/// A script cast's inputs, the cast tail the action bar uses, for the spellbook's and the stance
+/// bar's calls ([`crate::script_calls`]).
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct ScriptCast<'w, 's> {
+    pub(crate) targeting: cast_target::CastTargeting<'w, 's>,
+    pub(crate) ladder: CastLadder<'w, 's>,
+}
+
 /// The local self-cancel's set: a reader of the in-flight state orders `.after(LocalCancel)` so a
-/// cast ended by a move, jump or Esc drops its cast bar the same frame.
+/// cast ended by a move or jump drops its cast bar the same frame.
 #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct LocalCancel;
 
@@ -54,9 +69,12 @@ impl Plugin for SpellPlugin {
             .init_resource::<SpellModifiers>()
             .init_resource::<AutoSelfCast>()
             .init_resource::<SpellTargeting>()
+            .init_resource::<HeldForPick>()
             .init_resource::<targeting::EnchantConfirmItem>()
             .init_resource::<targeting::PicksSelf>()
             .init_resource::<targeting::CorpsePick>()
+            .init_resource::<targeting::UnitPick>()
+            .init_resource::<group_relation::GroupRoster>()
             .add_observer(cast_target::on_cvar)
             .add_systems(
                 Update,
@@ -67,19 +85,26 @@ impl Plugin for SpellPlugin {
                     mods::track_class_family
                         .after(WorldStage::Net)
                         .before(UnitFeed),
-                    // The state push runs before the input pass's `ToggleGameMenu` and the drain
-                    // after it, so an Esc cancel lands before next frame's cursor reads the mode.
-                    // After the old-target clear, the pet bar's writer in the feed: `"pet"`
-                    // resolves off the bar.
+                    // The state push runs before the input pass's `ToggleGameMenu`, whose
+                    // `SpellStopTargeting` lands with the script calls after it. After the
+                    // old-target clear, the pet bar's writer in the feed: `"pet"` resolves off
+                    // the bar. After the aura feed, whose resolver inputs list the units the
+                    // hover verdict is asked for.
                     targeting::feed_targeting_to_vm
                         .in_set(UnitFeed)
-                        .after(crate::ui_pet::pet_stop_on_old_target_clear),
+                        .after(crate::ui_pet::pet_stop_on_old_target_clear)
+                        .after(crate::ui_aura::AuraEvents),
                     (
                         targeting::publish_picks_self,
                         targeting::publish_corpse_pick,
+                        targeting::publish_unit_pick,
                     )
                         .in_set(UiFeed),
-                    targeting::drain_stop_targeting.after(UiInput),
+                    // The party slots and raid roster the party and raid words read, before
+                    // the feed's targeting push asks them.
+                    group_relation::publish_group_roster
+                        .in_set(UiFeed)
+                        .before(UnitFeed),
                     // The item-target commit (`0x495d60`): after the input pass so a bag click
                     // binds the same frame; outside the target chain, as its clicks never reach
                     // the world.
@@ -90,3 +115,152 @@ impl Plugin for SpellPlugin {
         net::register(app);
     }
 }
+
+/// The player's skill in `spell_id`'s own line, the input of every per-level term: `0x5ea690`
+/// hops spell to SkillLineAbility line (`0x6de040`), then `0x5ea520` reads that line's
+/// `PLAYER_SKILL_INFO` slot. Every missing input reads 0, like the reference's null paths.
+pub(crate) fn spell_skill_value(
+    me: Option<&crate::net::ObjectStore>,
+    skill_lines: Option<&benilla_formats::SkillLineCatalog>,
+    spell_id: u32,
+) -> u32 {
+    let Some(line) = skill_lines.and_then(|c| c.spell_to_line(spell_id)) else {
+        return 0;
+    };
+    skill_line_value(me, line)
+}
+
+/// The player's skill in `line`, [`spell_skill_value`]'s second half: 0 without a player or a
+/// slot for it.
+pub(crate) fn skill_line_value(me: Option<&crate::net::ObjectStore>, line: u32) -> u32 {
+    let Some(store) = me else { return 0 };
+    line_skill_value(
+        (0..benilla_protocol::messages::PLAYER_SKILL_SLOTS)
+            .filter_map(|slot| store.0.player_skill(slot)),
+        line,
+    )
+}
+
+/// `0x5ea520`'s sum on the line's first slot (`0x5ea3f0`): the value, plus the bonus word's high
+/// half read unsigned when the value is positive (`0x5ea571`-`0x5ea580`), plus its low half read
+/// signed (`0x5ea5ac`-`0x5ea5ba`), floored at 0 (`0x5ea5bc`).
+fn line_skill_value(
+    slots: impl Iterator<Item = benilla_protocol::messages::PlayerSkillSlot>,
+    line: u32,
+) -> u32 {
+    for s in slots {
+        if u32::from(s.skill_id) == line {
+            let mut v = i32::from(s.value);
+            if v > 0 {
+                v += i32::from(s.perm_bonus as u16);
+            }
+            return (v + i32::from(s.temp_bonus)).max(0) as u32;
+        }
+    }
+    0
+}
+
+/// Each skill slot's line and effective value, all [`spell_skill_value`] reads: a text built
+/// against one snapshot is rebuilt when the next differs.
+pub(crate) type SkillSnapshot =
+    [(u16, u32); benilla_protocol::messages::PLAYER_SKILL_SLOTS as usize];
+
+/// The [`SkillSnapshot`] of the player; all zeros without one.
+pub(crate) fn skill_snapshot(me: Option<&crate::net::ObjectStore>) -> SkillSnapshot {
+    std::array::from_fn(|slot| {
+        me.and_then(|s| s.0.player_skill(slot as u8))
+            .map_or((0, 0), |s| {
+                (
+                    s.skill_id,
+                    line_skill_value(std::iter::once(s), s.skill_id.into()),
+                )
+            })
+    })
+}
+
+/// The skill lines whose value differs between two snapshots: a line with no slot reads 0
+/// ([`skill_line_value`]), and the first slot of a line is the one read.
+pub(crate) fn changed_skill_lines(prev: &SkillSnapshot, now: &SkillSnapshot) -> Vec<u32> {
+    let by_line = |snapshot: &SkillSnapshot| {
+        let mut lines = std::collections::HashMap::new();
+        for &(line, value) in snapshot.iter().filter(|(line, _)| *line != 0) {
+            lines.entry(u32::from(line)).or_insert(value);
+        }
+        lines
+    };
+    let (prev, now) = (by_line(prev), by_line(now));
+    let value =
+        |lines: &std::collections::HashMap<u32, u32>, line| lines.get(&line).copied().unwrap_or(0);
+    prev.keys()
+        .chain(now.keys())
+        .copied()
+        .filter(|&line| value(&prev, line) != value(&now, line))
+        .collect::<std::collections::BTreeSet<_>>()
+        .into_iter()
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use benilla_protocol::messages::PlayerSkillSlot;
+
+    fn slot(value: u16, temp_bonus: i16, perm_bonus: i16) -> PlayerSkillSlot {
+        PlayerSkillSlot {
+            skill_id: 43,
+            step: 0,
+            value,
+            max: 300,
+            temp_bonus,
+            perm_bonus,
+        }
+    }
+
+    /// A line's change is its value's, wherever its slot sits: a moved slot is no change, a line
+    /// gained or lost is one, and a slot at 0 is a line at 0.
+    #[test]
+    fn the_changed_lines_are_those_whose_value_moved() {
+        let snapshot = |slots: &[(u16, u32)]| -> SkillSnapshot {
+            let mut s = [(0, 0); benilla_protocol::messages::PLAYER_SKILL_SLOTS as usize];
+            s[..slots.len()].copy_from_slice(slots);
+            s
+        };
+        let base = snapshot(&[(43, 100), (44, 50), (54, 0)]);
+        assert!(changed_skill_lines(&base, &base).is_empty());
+        assert!(
+            changed_skill_lines(&base, &snapshot(&[(54, 0), (44, 50), (43, 100)])).is_empty(),
+            "a reordered slot table changes no line"
+        );
+        assert_eq!(
+            changed_skill_lines(&base, &snapshot(&[(43, 101), (44, 50)])),
+            [43]
+        );
+        assert_eq!(
+            changed_skill_lines(&base, &snapshot(&[(43, 100), (44, 50), (95, 1)])),
+            [95],
+            "a gained line, and the slot at 0 that went away is no change"
+        );
+        assert_eq!(
+            changed_skill_lines(&base, &snapshot(&[(43, 100)])),
+            [44],
+            "a lost line reads 0"
+        );
+    }
+
+    /// The high bonus half counts only over a positive value, and unsigned; the low half is
+    /// signed and always counts; the sum floors at 0.
+    #[test]
+    fn the_skill_value_reads_its_bonus_halves_as_the_reference_does() {
+        let value = |s: PlayerSkillSlot| super::line_skill_value(std::iter::once(s), 43);
+        assert_eq!(value(slot(100, 0, 5)), 105);
+        assert_eq!(value(slot(0, 0, 5)), 0);
+        assert_eq!(value(slot(0, 7, 5)), 7);
+        assert_eq!(value(slot(100, -20, 0)), 80);
+        assert_eq!(value(slot(10, -20, 0)), 0);
+        assert_eq!(value(slot(1, 0, -1)), 65536);
+        assert_eq!(
+            super::line_skill_value(std::iter::once(slot(100, 0, 0)), 44),
+            0
+        );
+    }
+}
diff --git a/crates/benilla-app/src/spell/mods.rs b/crates/benilla-app/src/spell/mods.rs
index ab2f298a..6e1d4a31 100644
--- a/crates/benilla-app/src/spell/mods.rs
+++ b/crates/benilla-app/src/spell/mods.rs
@@ -15,12 +15,12 @@
 //! boolean, so a bare `(flat, pct)` pair would zero every unmodified spell; hence
 //! [`SpellModifiers::modifiers`] returns `Option` and [`SpellMod`] is private.
 //!
-//! All 29 ops are stored; only op 14 (`COST`) is read here. Op 24 is the one the client routes
-//! aura 65 (casting speed) to, whatever vmangos names it.
+//! All 29 ops are stored. Op 24 is the one the client routes aura 65 (casting speed) to,
+//! whatever vmangos names it.
 
 use bevy::prelude::*;
 
-use benilla_formats::SpellDisplay;
+use benilla_formats::{SpellDisplay, SpellRange};
 
 use crate::chr_classes::ChrClassTable;
 use crate::net::{ObjectStore, SelfPlayer};
@@ -35,6 +35,16 @@ const CELLS: usize = BITS * OPS;
 /// `SPELLMOD_COST`, read by [`crate::spell::usable::power_cost`] (`GetPowerCost 0x6e31b0` at
 /// `6e32e3`).
 pub(crate) const OP_COST: u8 = 14;
+/// `SPELLMOD_CASTING_TIME`, applied by `GetCastTime 0x6e3340` at `0x6e33b7`.
+pub(crate) const OP_CAST_TIME: u8 = 10;
+/// `GetMinMaxRange 0x6e3480` applies op 5 to its maximum at `0x6e3744`.
+pub(crate) const OP_RANGE: u8 = 5;
+/// `GetCurrentCastRadius 0x6e6350` applies op 6 before the reticle's 20-yard cap.
+pub(crate) const OP_RADIUS: u8 = 6;
+/// `StartGlobalCooldown 0x6e2de0` applies op 21 to `startRecoveryTime`.
+pub(crate) const OP_GCD: u8 = 21;
+/// `StartCooldown 0x6e2c60` and the tooltip apply op 11 to both recovery columns.
+pub(crate) const OP_COOLDOWN: u8 = 11;
 
 /// `SPELL_ATTR_EX3_IGNORE_CASTER_MODIFIERS` (vmangos `SpellDefines.h:940`): a spell carrying it
 /// takes no modifier (`0x6e6b52`).
@@ -73,7 +83,7 @@ impl SpellMod {
 
 /// The two tables and the class family the gate compares against (`0xcead60`, `0xcecb30`,
 /// `0xcecaac`). Written only by the wire, cleared only at world-enter, read live.
-#[derive(Resource)]
+#[derive(Clone, Resource)]
 pub(crate) struct SpellModifiers {
     flat: [i32; CELLS],
     pct: [i32; CELLS],
@@ -125,15 +135,45 @@ impl SpellModifiers {
         self.class_family = 0;
     }
 
+    /// The two family gates of `GetSpellModifiers 0x6e6b30` (`SpellFamilyName` nonzero and the
+    /// class's, `AttributesEx3` bit 29 clear).
+    fn gates_pass(&self, d: &SpellDisplay) -> bool {
+        d.spell_family != 0
+            && d.spell_family == self.class_family
+            && d.attributes_ex3 & ATTR_EX3_IGNORE_CASTER_MODIFIERS == 0
+    }
+
+    /// The `SpellFamilyFlags` bits whose cells any read for `d` can sum, whatever the op: its
+    /// whole mask past the gates, none before them. A change to another bit's cells cannot move
+    /// a value modified for `d`; a change of the class family can, whatever the bit.
+    pub(crate) fn read_bits(&self, d: &SpellDisplay) -> u64 {
+        if self.gates_pass(d) {
+            d.spell_family_flags
+        } else {
+            0
+        }
+    }
+
+    /// What differs from `prev`: the `SpellFamilyFlags` bits with any changed cell, in either
+    /// table and at any op, and whether the class family moved.
+    pub(crate) fn diff(&self, prev: &SpellModifiers) -> ModsDiff {
+        let bits = (0..BITS).fold(0u64, |bits, bit| {
+            let row = bit * OPS..(bit + 1) * OPS;
+            let same = self.flat[row.clone()] == prev.flat[row.clone()]
+                && self.pct[row.clone()] == prev.pct[row];
+            bits | u64::from(!same) << bit
+        });
+        ModsDiff {
+            bits,
+            class_family: self.class_family != prev.class_family,
+        }
+    }
+
     /// `GetSpellModifiers 0x6e6b30` for one spell and op. `None` covers all four of its false
     /// exits: the three gates and both sums zero (`6e6ba8`/`6e6bad`). The op range check is ours;
     /// the reference's call sites all pass a literal.
     fn modifiers(&self, d: &SpellDisplay, op: u8) -> Option<SpellMod> {
-        if d.spell_family == 0
-            || d.spell_family != self.class_family
-            || d.attributes_ex3 & ATTR_EX3_IGNORE_CASTER_MODIFIERS != 0
-            || usize::from(op) >= OPS
-        {
+        if !self.gates_pass(d) || usize::from(op) >= OPS {
             return None;
         }
         // All 64 bits, no early break (`6e6b8f`/`6e6b97`); the accumulators wrap, as the
@@ -161,6 +201,73 @@ impl SpellModifiers {
     pub(crate) fn apply(&self, d: &SpellDisplay, op: u8, value: i32) -> i32 {
         self.modifiers(d, op).map_or(value, |m| m.apply(value))
     }
+
+    /// The reference applies op 11 separately to RecoveryTime and to CategoryRecoveryTime
+    /// after `0x6e2b60` adds the ranged attack time to the latter.
+    pub(crate) fn spell_cooldowns(&self, d: &SpellDisplay, ranged_ms: u32) -> (u32, u32) {
+        let recovery = self.apply(d, OP_COOLDOWN, d.recovery_ms as i32).max(0) as u32;
+        let category_base = d.category_recovery_ms.saturating_add(ranged_ms);
+        let category = self.apply(d, OP_COOLDOWN, category_base as i32).max(0) as u32;
+        (recovery, category)
+    }
+
+    /// The reference's float applier `0x6e6bf0`: add the flat integer, then multiply by the
+    /// summed percentage and its stored single-precision 0.01 constant.
+    pub(crate) fn apply_float(&self, d: &SpellDisplay, op: u8, value: f32) -> f32 {
+        self.modifiers(d, op).map_or(value, |m| {
+            ((f64::from(value) + f64::from(m.flat)) * f64::from(m.pct) * f64::from(0.01f32)) as f32
+        })
+    }
+
+    /// The software-float applier `0x6e6c30` that `GetEffectPoints` calls
+    /// ([`benilla_formats::soft_modify`]).
+    pub(crate) fn apply_soft(&self, d: &SpellDisplay, op: u8, value: f32) -> f32 {
+        self.modifiers(d, op).map_or(value, |m| {
+            benilla_formats::soft_modify(value, m.flat, m.pct)
+        })
+    }
+
+    /// `GetMinMaxRange` modifies only the maximum at its common tail, after the moving bonus
+    /// (`0x6e3648`-`0x6e36a2`, then op 5 at `0x6e3746`). The on-next-swing `Attributes & 0x404` arm
+    /// returns before that tail (`0x6e350f`).
+    pub(crate) fn min_max_range(
+        &self,
+        d: &SpellDisplay,
+        row: Option<&SpellRange>,
+        caster: benilla_formats::RangeUnit,
+        targets: benilla_formats::RangeTargets,
+    ) -> Option<(f32, f32)> {
+        let (min, max) = benilla_formats::min_max_range(d, row, caster, targets)?;
+        Some((
+            min,
+            if d.on_next_swing() {
+                max
+            } else {
+                self.apply_float(d, OP_RANGE, max)
+            },
+        ))
+    }
+}
+
+/// How one snapshot of the tables differs from an earlier one ([`SpellModifiers::diff`]).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub(crate) struct ModsDiff {
+    /// Bit `b` set: a cell of family-flag bit `b` changed, in either table at any op.
+    pub(crate) bits: u64,
+    pub(crate) class_family: bool,
+}
+
+/// The description expander's view of the tables.
+impl benilla_formats::SpellMods for SpellModifiers {
+    fn apply_int(&self, d: &SpellDisplay, op: u8, value: i32) -> i32 {
+        self.apply(d, op, value)
+    }
+    fn apply_float(&self, d: &SpellDisplay, op: u8, value: f32) -> f32 {
+        SpellModifiers::apply_float(self, d, op, value)
+    }
+    fn apply_soft(&self, d: &SpellDisplay, op: u8, value: f32) -> f32 {
+        SpellModifiers::apply_soft(self, d, op, value)
+    }
 }
 
 /// Entering the world clears the tables and class family: `Spell_C::SystemInitialize 0x6e7150`,
@@ -183,7 +290,7 @@ pub(super) fn track_class_family(
         return;
     };
     let family = classes.0.spell_family(u32::from(class));
-    // Guarded: the tooltip feed rebuilds whenever the resource is marked changed.
+    // Guarded: the tooltip feed diffs the tables whenever the resource is marked changed.
     if mods.class_family != family {
         mods.set_class_family(family);
     }
@@ -386,4 +493,87 @@ mod tests {
             "four set bits, four cells"
         );
     }
+
+    /// `GetCastTime` applies op 10 after resolving the DBC row; an instant modifier lifts the
+    /// moving-cast refusal for Frostbolt, while another class's spell keeps its cast time.
+    #[test]
+    fn cast_time_uses_the_live_modifier() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let catalog = benilla_formats::load_spell_catalog(&mut chain).expect("load Spell.dbc");
+        let mut spells = crate::ui_action::Spells::empty_for_tests();
+        spells.cast_times =
+            benilla_formats::load_spell_cast_times(&mut chain).expect("load SpellCastTimes.dbc");
+        let frostbolt = catalog.get(116).expect("Frostbolt");
+        let mut mods = mage_tables();
+        let base = spells.cast_time_ms(frostbolt, 60, &mods);
+        assert!(base > 0);
+        mods.set(false, 5, OP_CAST_TIME, -100);
+        assert_eq!(spells.cast_time_ms(frostbolt, 60, &mods), 0);
+    }
+
+    #[test]
+    fn range_modifier_changes_only_the_maximum_after_reach() {
+        let mut mods = mage_tables();
+        let d = mage(&[5]);
+        let row = SpellRange {
+            min: 8.0,
+            max: 35.0,
+            flags: 0,
+        };
+        mods.set(false, 5, OP_RANGE, 20);
+        let caster = benilla_formats::RangeUnit::still(1.5);
+        let target = benilla_formats::RangeTargets {
+            target: Some(benilla_formats::RangeUnit::still(1.5)),
+            attack_target: None,
+        };
+        let (min, max) = mods.min_max_range(&d, Some(&row), caster, target).unwrap();
+        assert_eq!(min, 11.0);
+        assert!((max - 45.6).abs() < 0.001, "38 yards with +20% range");
+        assert_eq!(mods.min_max_range(&d, None, caster, target), None);
+
+        let on_next_swing = SpellDisplay {
+            attributes: 0x404,
+            ..d
+        };
+        assert_eq!(
+            mods.min_max_range(&on_next_swing, Some(&row), caster, target),
+            benilla_formats::min_max_range(&on_next_swing, Some(&row), caster, target),
+            "the reference's early return bypasses op 5"
+        );
+    }
+
+    /// The moving bonus is part of the max before op 5 scales it (`0x6e3648`-`0x6e36a2`, then
+    /// `0x6e3746`): a +20% talent on the melee row of two running units scales 5 + 2.6667.
+    #[test]
+    fn range_modifier_scales_the_moving_bonus() {
+        let mut mods = mage_tables();
+        let d = mage(&[5]);
+        let melee = SpellRange {
+            min: 0.0,
+            max: 5.0,
+            flags: 1,
+        };
+        mods.set(false, 5, OP_RANGE, 20);
+        let runner = benilla_formats::RangeUnit {
+            motion: benilla_formats::UnitMotion {
+                flags: 1,
+                speed: 7.0,
+                walk_speed: 2.5,
+            },
+            ..benilla_formats::RangeUnit::still(1.5)
+        };
+        let targets = benilla_formats::RangeTargets {
+            target: Some(runner),
+            attack_target: None,
+        };
+        let (_, max) = mods
+            .min_max_range(&d, Some(&melee), runner, targets)
+            .unwrap();
+        let bonus = benilla_formats::MOVING_RANGE_BONUS;
+        assert!(
+            (max - (5.0 + bonus) * 1.2).abs() < 1e-4,
+            "the modifier scales the bonused max, not the bare 5.0: {max}"
+        );
+    }
 }
diff --git a/crates/benilla-app/src/spell/net.rs b/crates/benilla-app/src/spell/net.rs
index 098a0b7e..77446e01 100644
--- a/crates/benilla-app/src/spell/net.rs
+++ b/crates/benilla-app/src/spell/net.rs
@@ -283,6 +283,7 @@ fn on_spell_go(In(ev): In<SessionEvent>, mut l: Lifecycle, mut sc: Scene) {
                 &mut sc.items,
                 &l.net,
                 &mut l.pet_bar,
+                &l.spell_mods,
             ),
             (&mut l.auto_repeat, &mut sc.sheaths, engaged),
             l.play_seq.next(),
@@ -827,6 +828,7 @@ fn spell_go(
         &mut crate::items::Items,
         &crate::net::NetCommands,
         &mut crate::ui_pet::PetBar,
+        &crate::spell::SpellModifiers,
     ),
     // The GO-deferred auto-attack start's writes (`0x6e83c0`) and the attack lock it gates on
     // (`Engaged`, the reference's `[player+0xc48]`).
@@ -863,7 +865,7 @@ fn spell_go(
     if let Some(go_guid) = go_target {
         go_lid.write(crate::go_anim::GoLidOpen { go_guid, spell_id });
     }
-    let (cooldowns, spells, items, net_commands, pet_bar) = cooldown_ctx;
+    let (cooldowns, spells, items, net_commands, pet_bar, spell_mods) = cooldown_ctx;
     let (auto_repeat, sheath, engaged) = attack_ctx;
     let now = Instant::now();
     let display = spells.and_then(|s| s.catalog.get(spell_id));
@@ -955,27 +957,29 @@ fn spell_go(
                     .filter(|u| u.spell_id == spell_id);
                 match use_spell {
                     Some(u) => cooldowns.start_item(entry, &u, display, now),
-                    // Template not streamed, or naming another spell: the spell-keyed record.
+                    // Template not streamed, or naming another spell: the spell-keyed record,
+                    // unmodified, as the item leg never applies op 11 (`0x6e8566`, `0x6e8830`).
                     None => {
                         if let Some(d) = display {
-                            cooldowns.start_spell(spell_id, d, ranged_ms, now);
+                            cooldowns.start_spell(spell_id, d, ranged_ms, now, None);
                         }
                     }
                 }
             }
             None => {
                 if let Some(d) = display {
-                    cooldowns.start_spell(spell_id, d, ranged_ms, now);
+                    cooldowns.start_spell(spell_id, d, ranged_ms, now, Some(spell_mods));
                 }
             }
         }
         if benilla_assets::trace::enabled() {
             if let Some(d) = display {
+                let (recovery_ms, category_ms) = spell_mods.spell_cooldowns(d, ranged_ms);
                 benilla_assets::trace::line(
                     "cd",
                     &format!(
                         "arm spell={spell_id} rec={}ms cat={}:{}ms (GO self-insert)",
-                        d.recovery_ms, d.category, d.category_recovery_ms
+                        recovery_ms, d.category, category_ms
                     ),
                 );
             }
@@ -983,18 +987,22 @@ fn spell_go(
     }
     // The pet leg of the same insert: an independent `if`, not an else.
     if let Some(d) = display.filter(|_| pet_go_cooldown(caster, self_guid, index, stores)) {
-        // No ranged pad: `0x6e2b60` is called on the self leg only (`0x6e845d`).
-        pet_bar.cooldowns.start_spell(spell_id, d, 0, now);
-        // `0x6e85fc`/`0x6e8601` fire SPELL_UPDATE_COOLDOWN and PET_BAR_UPDATE_COOLDOWN; the pet
-        // bar's one repaint fires off its diff, and the signal bump covers a re-arm to an
-        // identical triple.
-        pet_bar.bar_signals = pet_bar.bar_signals.wrapping_add(1);
+        // No ranged pad: `0x6e2b60` is called on the self leg only (`0x6e845d`). Op 11 still
+        // applies to both columns (`0x6e85c5`, `0x6e85d1`) off the player's tables, which gate
+        // on the spell's family and never the caster (`0x6e6b30`).
+        pet_bar
+            .cooldowns
+            .start_spell(spell_id, d, 0, now, Some(spell_mods));
+        // The flush that follows (`0x6e85fc` `0x4b31b0`, `0x6e8601` `0x4bce90`) fires off the
+        // list's generation, which the insert bumped: `ACTIONBAR_UPDATE_COOLDOWN`,
+        // `SPELL_UPDATE_COOLDOWN`, `PET_BAR_UPDATE_COOLDOWN`, and no `PET_BAR_UPDATE`.
         if benilla_assets::trace::enabled() {
+            let (recovery_ms, category_ms) = spell_mods.spell_cooldowns(d, 0);
             benilla_assets::trace::line(
                 "cd",
                 &format!(
                     "arm spell={spell_id} rec={}ms cat={}:{}ms (GO pet-insert)",
-                    d.recovery_ms, d.category, d.category_recovery_ms
+                    recovery_ms, d.category, category_ms
                 ),
             );
         }
@@ -1673,6 +1681,7 @@ mod tests {
                                 &mut items,
                                 &net_commands,
                                 &mut pet_bar,
+                                &crate::spell::SpellModifiers::default(),
                             ),
                             (
                                 &mut crate::spell::AutoRepeatActive::default(),
@@ -1928,6 +1937,7 @@ mod tests {
                                 &mut items,
                                 &net_commands,
                                 &mut pet_bar,
+                                &crate::spell::SpellModifiers::default(),
                             ),
                             (
                                 &mut crate::spell::AutoRepeatActive::default(),
@@ -1961,30 +1971,39 @@ mod tests {
         );
     }
 
-    /// The GO's pet leg arms the pet's bank (`0xcecb04`), never the player's; the owner read falls
-    /// back to SUMMONEDBY, not CREATEDBY (`0x6e859a`); a stranger's cast arms neither.
-    #[test]
-    fn a_pets_own_go_arms_the_pet_bank_and_only_the_pet_bank() {
+    /// `UNIT_FIELD_CHARMEDBY` / `SUMMONEDBY` / `CREATEDBY`, two dwords each.
+    const CHARMEDBY: u16 = 10;
+    const SUMMONEDBY: u16 = 12;
+    const CREATEDBY: u16 = 14;
+
+    /// A unit store whose `field` pair names `owner`.
+    fn owned(field: u16, owner: u64) -> ObjectStore {
+        ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (field, owner as u32),
+            (field + 1, (owner >> 32) as u32),
+        ]))
+    }
+
+    /// One SPELL_GO of `display` (as spell 2649) by `caster` in a world holding us (guid 10) and,
+    /// when given, the casting item; `mods` is the player's table. Returns the player bank's and
+    /// the pet bank's armed durations, the pet bar's repaint count and the pet list's generation.
+    fn go_cooldowns(
+        caster: u64,
+        store: ObjectStore,
+        item: Option<(u64, ObjectStore)>,
+        display: fn() -> benilla_formats::SpellDisplay,
+        mods: crate::spell::SpellModifiers,
+    ) -> (u32, u32, u32, u64) {
         use crate::combat_text::CombatTextSpawn;
         use crate::creature_anim::Casting;
         use crate::go_anim::GoLidOpen;
         use crate::net::{Guid, SelfPlayer};
         use bevy::ecs::system::RunSystemOnce;
 
-        /// `UNIT_FIELD_CHARMEDBY` / `SUMMONEDBY` / `CREATEDBY`, two dwords each.
-        const CHARMEDBY: u16 = 10;
-        const SUMMONEDBY: u16 = 12;
-        const CREATEDBY: u16 = 14;
-
-        const GROWL: u32 = 2649;
-        let growl = || benilla_formats::SpellDisplay {
-            name: "Growl".into(),
-            recovery_ms: 5000,
-            ..Default::default()
-        };
-        let make_spells = || crate::ui_action::Spells {
+        const SPELL: u32 = 2649;
+        let spells = crate::ui_action::Spells {
             catalog: benilla_formats::SpellCatalog::from_displays(
-                [(GROWL, growl())].into_iter().collect(),
+                [(SPELL, display())].into_iter().collect(),
             ),
             forms: Default::default(),
             ranges: Default::default(),
@@ -1992,135 +2011,202 @@ mod tests {
             durations: Default::default(),
             radii: Default::default(),
         };
-
-        // A world with us (guid 10), our pet (20, SUMMONEDBY us), a totem (30, CREATEDBY us only)
-        // and a stranger's pet (40, SUMMONEDBY somebody else).
-        let owned = |field: u16, owner: u64| {
-            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
-                (field, owner as u32),
-                (field + 1, (owner >> 32) as u32),
-            ]))
-        };
-        let fire = |caster: u64, store: ObjectStore| {
-            let mut app = App::new();
-            app.add_message::<CastEvent>()
-                .add_message::<SpellGoTargets>()
-                .add_message::<CombatTextSpawn>()
-                .add_message::<GoLidOpen>()
-                .add_message::<crate::creature_anim::SheathRequest>()
-                .add_message::<crate::player::StandStateRequest>()
-                .init_resource::<GuidIndex>()
-                .init_resource::<SelfGuid>()
-                .init_resource::<CastBarFeed>()
-                .init_resource::<PendingCast>()
-                .init_resource::<QueuedMeleeSpell>()
-                .init_resource::<Cooldowns>()
-                .init_resource::<crate::spell::SpellModifiers>()
-                .init_resource::<crate::ui_pet::PetBar>()
-                .init_resource::<crate::items::Items>();
-            let self_e = app
-                .world_mut()
-                .spawn((Guid(10), SelfPlayer, ObjectStore::default()))
-                .id();
+        let mut app = App::new();
+        app.add_message::<CastEvent>()
+            .add_message::<SpellGoTargets>()
+            .add_message::<CombatTextSpawn>()
+            .add_message::<GoLidOpen>()
+            .add_message::<crate::creature_anim::SheathRequest>()
+            .add_message::<crate::player::StandStateRequest>()
+            .init_resource::<GuidIndex>()
+            .init_resource::<SelfGuid>()
+            .init_resource::<CastBarFeed>()
+            .init_resource::<PendingCast>()
+            .init_resource::<QueuedMeleeSpell>()
+            .init_resource::<Cooldowns>()
+            .init_resource::<crate::spell::SpellModifiers>()
+            .init_resource::<crate::ui_pet::PetBar>()
+            .init_resource::<crate::items::Items>();
+        let self_e = app
+            .world_mut()
+            .spawn((Guid(10), SelfPlayer, ObjectStore::default()))
+            .id();
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .insert(10, self_e);
+        if caster != 10 {
             let caster_e = app.world_mut().spawn((Guid(caster), store)).id();
-            {
-                let mut index = app.world_mut().resource_mut::<GuidIndex>();
-                index.0.insert(10, self_e);
-                index.0.insert(caster, caster_e);
-            }
-            app.world_mut().resource_mut::<SelfGuid>().0 = Some(10);
-
-            let (tx, _rx) = crossbeam_channel::unbounded();
-            let spells = make_spells();
             app.world_mut()
-                .run_system_once(
-                    move |mut commands: Commands,
-                          index: Res<GuidIndex>,
-                          casting: Query<&Casting>,
-                          mut cast_events: MessageWriter<CastEvent>,
-                          mut go_targets: MessageWriter<SpellGoTargets>,
-                          self_guid: Res<SelfGuid>,
-                          stores: Query<&mut ObjectStore>,
-                          mut cast_bar: ResMut<CastBarFeed>,
-                          mut pending: ResMut<PendingCast>,
-                          mut queued_melee: ResMut<QueuedMeleeSpell>,
-                          mut text: MessageWriter<CombatTextSpawn>,
-                          mut go_lid: MessageWriter<GoLidOpen>,
-                          mut cooldowns: ResMut<Cooldowns>,
-                          mut pet_bar: ResMut<crate::ui_pet::PetBar>,
-                          mut items: ResMut<crate::items::Items>,
-                          mut sheath: MessageWriter<crate::creature_anim::SheathRequest>| {
-                        let net_commands = crate::net::NetCommands(tx.clone());
-                        spell_go(
-                            caster,
-                            GROWL,
-                            0,
-                            vec![],
-                            vec![],
-                            None,
-                            None,
-                            None,
-                            None,
-                            Some(caster),
-                            &mut commands,
-                            &index,
-                            &casting,
-                            &mut cast_events,
-                            &mut go_targets,
-                            &self_guid,
-                            &stores,
-                            &mut cast_bar,
-                            &mut pending,
-                            &mut queued_melee,
-                            &mut text,
-                            crate::combat_text::DamageTextGates::default(),
-                            &mut go_lid,
-                            &mut crate::ui_loot::LootLatch::default(),
-                            (
-                                &mut cooldowns,
-                                Some(&spells),
-                                &mut items,
-                                &net_commands,
-                                &mut pet_bar,
-                            ),
-                            (
-                                &mut crate::spell::AutoRepeatActive::default(),
-                                &mut sheath,
-                                false,
-                            ),
-                            1,
-                        );
-                    },
-                )
-                .unwrap();
-            let now = Instant::now();
-            let armed = |c: &Cooldowns| c.info(GROWL, 0, Some(&growl()), now).remaining_ms > 0;
-            let world = app.world();
-            (
-                armed(world.resource::<Cooldowns>()),
-                armed(&world.resource::<crate::ui_pet::PetBar>().cooldowns),
-                world.resource::<crate::ui_pet::PetBar>().bar_signals,
+                .resource_mut::<GuidIndex>()
+                .0
+                .insert(caster, caster_e);
+        }
+        let item_caster = item.map(|(guid, item_store)| {
+            let e = app.world_mut().spawn((Guid(guid), item_store)).id();
+            app.world_mut()
+                .resource_mut::<GuidIndex>()
+                .0
+                .insert(guid, e);
+            guid
+        });
+        app.world_mut().resource_mut::<SelfGuid>().0 = Some(10);
+
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        app.world_mut()
+            .run_system_once(
+                move |mut commands: Commands,
+                      index: Res<GuidIndex>,
+                      casting: Query<&Casting>,
+                      mut cast_events: MessageWriter<CastEvent>,
+                      mut go_targets: MessageWriter<SpellGoTargets>,
+                      self_guid: Res<SelfGuid>,
+                      stores: Query<&mut ObjectStore>,
+                      mut cast_bar: ResMut<CastBarFeed>,
+                      mut pending: ResMut<PendingCast>,
+                      mut queued_melee: ResMut<QueuedMeleeSpell>,
+                      mut text: MessageWriter<CombatTextSpawn>,
+                      mut go_lid: MessageWriter<GoLidOpen>,
+                      mut cooldowns: ResMut<Cooldowns>,
+                      mut pet_bar: ResMut<crate::ui_pet::PetBar>,
+                      mut items: ResMut<crate::items::Items>,
+                      mut sheath: MessageWriter<crate::creature_anim::SheathRequest>| {
+                    let net_commands = crate::net::NetCommands(tx.clone());
+                    spell_go(
+                        caster,
+                        SPELL,
+                        0,
+                        vec![],
+                        vec![],
+                        None,
+                        None,
+                        None,
+                        None,
+                        item_caster.or(Some(caster)),
+                        &mut commands,
+                        &index,
+                        &casting,
+                        &mut cast_events,
+                        &mut go_targets,
+                        &self_guid,
+                        &stores,
+                        &mut cast_bar,
+                        &mut pending,
+                        &mut queued_melee,
+                        &mut text,
+                        crate::combat_text::DamageTextGates::default(),
+                        &mut go_lid,
+                        &mut crate::ui_loot::LootLatch::default(),
+                        (
+                            &mut cooldowns,
+                            Some(&spells),
+                            &mut items,
+                            &net_commands,
+                            &mut pet_bar,
+                            &mods,
+                        ),
+                        (
+                            &mut crate::spell::AutoRepeatActive::default(),
+                            &mut sheath,
+                            false,
+                        ),
+                        1,
+                    );
+                },
             )
+            .unwrap();
+        let now = Instant::now();
+        let armed = |c: &Cooldowns| c.info(SPELL, 0, Some(&display()), now).duration_ms;
+        let world = app.world();
+        (
+            armed(world.resource::<Cooldowns>()),
+            armed(&world.resource::<crate::ui_pet::PetBar>().cooldowns),
+            world.resource::<crate::ui_pet::PetBar>().bar_signals,
+            world
+                .resource::<crate::ui_pet::PetBar>()
+                .cooldowns
+                .generation,
+        )
+    }
+
+    /// Growl's shape: a 5 s recovery, no category.
+    fn growl() -> benilla_formats::SpellDisplay {
+        benilla_formats::SpellDisplay {
+            name: "Growl".into(),
+            recovery_ms: 5000,
+            ..Default::default()
+        }
+    }
+
+    /// The GO's pet leg arms the pet's bank (`0xcecb04`), never the player's; the owner read falls
+    /// back to SUMMONEDBY, not CREATEDBY (`0x6e859a`); a stranger's cast arms neither.
+    #[test]
+    fn a_pets_own_go_arms_the_pet_bank_and_only_the_pet_bank() {
+        let fire = |caster: u64, store: ObjectStore| {
+            let (player, pet, signals, generation) = go_cooldowns(
+                caster,
+                store,
+                None,
+                growl,
+                crate::spell::SpellModifiers::default(),
+            );
+            (player > 0, pet > 0, signals, generation)
         };
 
-        // Our pet: the PET bank only, and a forced repaint with it.
-        let (player, pet, signals) = fire(20, owned(SUMMONEDBY, 10));
+        // Our pet: the PET bank only. The insert moves the list's generation, which is the flush's
+        // edge (`0x6e85fc`, `0x6e8601`: the cooldown events), and signals no `PET_BAR_UPDATE`.
+        let (player, pet, signals, generation) = fire(20, owned(SUMMONEDBY, 10));
         assert!(pet, "our pet's GO arms the pet bank");
         assert!(!player, "…and never the player's");
-        assert_eq!(signals, 1, "PET_BAR_UPDATE_COOLDOWN's repaint");
+        assert_eq!(generation, 1, "the pet list's flush edge");
+        assert_eq!(signals, 0, "the bar's own signal is not the GO's");
 
         // A charm reads CHARMEDBY first: the same leg, the other field.
-        let (_, charmed, _) = fire(20, owned(CHARMEDBY, 10));
+        let (_, charmed, _, _) = fire(20, owned(CHARMEDBY, 10));
         assert!(charmed, "a charmed unit's GO arms it too");
 
         // A totem carries CREATEDBY and no SUMMONEDBY: `0x5ee5a0` would accept it, `0x6e859a` does
         // not.
-        let (_, totem, _) = fire(30, owned(CREATEDBY, 10));
+        let (_, totem, _, _) = fire(30, owned(CREATEDBY, 10));
         assert!(!totem, "CREATEDBY alone is not this leg's owner test");
 
-        // Somebody else's pet: neither bank.
-        let (p2, pet2, _) = fire(40, owned(SUMMONEDBY, 99));
+        // Somebody else's pet: neither bank, no flush.
+        let (p2, pet2, _, generation) = fire(40, owned(SUMMONEDBY, 99));
         assert!(!p2 && !pet2, "a stranger's pet arms nothing");
+        assert_eq!(generation, 0, "and moves no edge");
+    }
+
+    /// Op 11 on the GO insert: the self leg (`0x6e846f`, and `0x6e2b60`'s tail) and the pet leg
+    /// (`0x6e85c5`) apply the player's table; the item leg inserts the DBC values (`0x6e8566`),
+    /// here through its not-streamed fallback.
+    #[test]
+    fn op_11_shortens_the_self_and_pet_inserts_and_never_the_item_one() {
+        fn display() -> benilla_formats::SpellDisplay {
+            benilla_formats::SpellDisplay {
+                spell_family: 9,
+                spell_family_flags: 1,
+                ..growl()
+            }
+        }
+        let mods = || {
+            let mut m = crate::spell::SpellModifiers::default();
+            m.set_class_family(9);
+            m.set(true, 0, crate::spell::OP_COOLDOWN, -2000);
+            m
+        };
+        let own = ObjectStore::default();
+        assert_eq!(go_cooldowns(10, own, None, display, mods()).0, 3000);
+        let pet = go_cooldowns(20, owned(SUMMONEDBY, 10), None, display, mods());
+        assert_eq!(pet.1, 3000, "the pet leg takes the player's op 11");
+        let item = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(3, 6948)]));
+        let used = go_cooldowns(
+            10,
+            ObjectStore::default(),
+            Some((50, item)),
+            display,
+            mods(),
+        );
+        assert_eq!(used.0, 5000, "the item leg applies no modifier");
     }
 
     /// Both producers of the chain-hop array, the GO's hit list and the 816 packet, drop the
@@ -2225,6 +2311,7 @@ mod tests {
                             &mut items,
                             &net_commands,
                             &mut pet_bar,
+                            &crate::spell::SpellModifiers::default(),
                         ),
                         (
                             &mut crate::spell::AutoRepeatActive::default(),
@@ -2611,6 +2698,7 @@ mod tests {
                                 &mut items,
                                 &net_commands,
                                 &mut pet_bar,
+                                &crate::spell::SpellModifiers::default(),
                             ),
                             (
                                 &mut crate::spell::AutoRepeatActive::default(),
diff --git a/crates/benilla-app/src/spell/range_units.rs b/crates/benilla-app/src/spell/range_units.rs
new file mode 100644
index 00000000..9f035982
--- /dev/null
+++ b/crates/benilla-app/src/spell/range_units.rs
@@ -0,0 +1,364 @@
+//! The units `GetMinMaxRange` (`0x6e3480`) reads, built from the world: the caster, a target unit,
+//! and the caster's auto-attack target, each as its combat reach, player bit and motion
+//! ([`benilla_formats::RangeUnit`]).
+
+use benilla_formats::{RangeUnit, UnitMotion};
+use benilla_protocol::messages::ObjectType;
+use benilla_protocol::MoveSpeeds;
+use bevy::ecs::system::SystemParam;
+use bevy::prelude::*;
+
+use crate::creature_anim::select::unify;
+use crate::creature_anim::{move_flags, Engaged};
+use crate::net::{
+    current_speed, CreatureSwimming, Embodied, GuidIndex, ObjectStore, RemoteMotion, SelfPlayer,
+    Spline, UnitMoveModes, UnitSpeeds,
+};
+use crate::player::Player;
+
+/// The descriptor's default combat reach, before a unit's store streams.
+pub(crate) const DEFAULT_REACH: f32 = 1.5;
+
+/// One unit's motion as `0x7c4c90` and the moving test read it (`0x5fc350`, `0x6e364c`): `flags`
+/// is the movement word (`[[unit+0x118]+0x40]`), and the current speed is 0 with no direction bit
+/// (`0x7c4c99`), then the live server spline's speed, its length over its duration (`0x7c4caa`),
+/// then the swim, walk, run or run-back speed the flags pick ([`current_speed`]). A unit with no
+/// speeds streamed reads no current speed here, so it is not running; every unit's create block
+/// applies its speeds, so none is seen that way.
+pub(crate) fn unit_motion(
+    flags: u32,
+    speeds: Option<&MoveSpeeds>,
+    spline: Option<&Spline>,
+) -> UnitMotion {
+    let Some(speeds) = speeds else {
+        return UnitMotion {
+            flags,
+            ..UnitMotion::default()
+        };
+    };
+    let speed = match spline {
+        Some(spline) if flags & move_flags::ANY_MOVE != 0 => spline.speed(),
+        _ => current_speed(speeds, flags),
+    };
+    UnitMotion {
+        flags,
+        speed,
+        walk_speed: speeds.walk,
+    }
+}
+
+/// What a unit's range inputs are read from: its descriptor, and the state its movement flags and
+/// speeds come from ([`unify`], [`UnitSpeeds`]).
+type UnitParts = (
+    &'static ObjectStore,
+    Option<&'static RemoteMotion>,
+    Option<&'static Spline>,
+    Option<&'static UnitMoveModes>,
+    Option<&'static UnitSpeeds>,
+    Has<CreatureSwimming>,
+    Has<Embodied>,
+);
+
+/// The reader of the range units: any streamed unit, our own caster, and a unit's auto-attack
+/// target.
+#[derive(SystemParam)]
+pub(crate) struct RangeUnits<'w, 's> {
+    units: Query<'w, 's, UnitParts>,
+    caster: Query<'w, 's, Entity, With<SelfPlayer>>,
+    /// The auto-attack target guid, `[unit+0xc48]`.
+    engaged: Query<'w, 's, &'static Engaged>,
+    index: Option<Res<'w, GuidIndex>>,
+    /// The flags word of the body we drive, [`Player::move_flags`].
+    player: Option<Res<'w, Player>>,
+}
+
+impl RangeUnits<'_, '_> {
+    /// The unit `entity` is, `None` before its descriptor streams. The body we drive reads the
+    /// word our controller builds, one answer for the wire and the local gates; any other unit's
+    /// is its relayed or spline-implied flags with the modes the server granted.
+    pub(crate) fn unit(&self, entity: Entity) -> Option<RangeUnit> {
+        let (store, remote, spline, modes, speeds, swimming, driven) =
+            self.units.get(entity).ok()?;
+        let flags = if driven {
+            self.player.as_deref().map_or(0, Player::move_flags)
+        } else {
+            unify(None, remote, spline, swimming, modes).flags
+        };
+        Some(RangeUnit {
+            reach: store.0.unit_combat_reach(),
+            player: store.0.object_type() == Some(ObjectType::Player),
+            motion: unit_motion(flags, speeds.map(|s| &s.0), spline),
+        })
+    }
+
+    /// The caster: our own player, at the default reach and standing until its descriptor streams.
+    pub(crate) fn caster(&self) -> RangeUnit {
+        self.caster
+            .iter()
+            .next()
+            .and_then(|e| self.unit(e))
+            .unwrap_or(RangeUnit::still(DEFAULT_REACH))
+    }
+
+    /// The auto-attack target of `entity`, the unit `GetMinMaxRange` looks up itself for its melee
+    /// arm (`0x6e3552`-`0x6e3584`). `None` with no target engaged or before it streams, where the
+    /// arm reads the caster's own reach (`0x6e3594`).
+    pub(crate) fn attack_target(&self, entity: Entity) -> Option<RangeUnit> {
+        let guid = self.engaged.get(entity).ok()?.0;
+        let target = *self.index.as_ref()?.0.get(&guid)?;
+        self.unit(target)
+    }
+
+    /// The auto-attack target of our own player.
+    pub(crate) fn caster_attack_target(&self) -> Option<RangeUnit> {
+        self.attack_target(self.caster.iter().next()?)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::creature_anim::move_flags as f;
+    use crate::net::UnitSpeeds;
+
+    fn speeds() -> MoveSpeeds {
+        MoveSpeeds {
+            walk: 2.5,
+            run: 7.0,
+            run_back: 4.5,
+            swim: 4.722_222,
+            swim_back: 2.5,
+            turn_rate: std::f32::consts::PI,
+        }
+    }
+
+    fn spline(length: f32, secs: u64) -> Spline {
+        Spline {
+            points: vec![[0.0; 3], [length, 0.0, 0.0]],
+            start: std::time::Instant::now(),
+            duration: std::time::Duration::from_secs(secs),
+            id: 1,
+            grounded: true,
+            run_mode: true,
+            deck: None,
+        }
+    }
+
+    /// `0x7c4c90` for a forward runner answers the run speed, and `0x5fc350` finds it above twice
+    /// the walk speed.
+    #[test]
+    fn a_forward_runner_is_running() {
+        let m = unit_motion(f::FORWARD, Some(&speeds()), None);
+        assert_eq!((m.flags, m.speed, m.walk_speed), (f::FORWARD, 7.0, 2.5));
+        assert!(m.moves_at_run_speed());
+    }
+
+    /// Walk mode picks `min(walk, run)`, no direction bit is speed 0, and swimming is the swim
+    /// speed, which is below twice the walk speed.
+    #[test]
+    fn a_walker_a_stander_and_a_swimmer_are_not_running() {
+        let s = speeds();
+        for (name, flags) in [
+            ("walking", f::FORWARD | f::WALK_MODE),
+            ("standing", 0),
+            ("jumping in place", f::FALLING),
+            ("swimming", f::FORWARD | f::SWIMMING),
+            ("backward", f::BACKWARD),
+        ] {
+            let m = unit_motion(flags, Some(&s), None);
+            assert!(!m.moves_at_run_speed(), "{name}: {m:?}");
+        }
+        // A swim speed past twice the walk speed is running, as the compare has it.
+        let fast = MoveSpeeds { swim: 6.0, ..s };
+        assert!(unit_motion(f::FORWARD | f::SWIMMING, Some(&fast), None).moves_at_run_speed());
+    }
+
+    /// A live spline is the current speed (`0x7c4caa`), whatever the flags pick: a mob fleeing at
+    /// 8 yd/s runs, and one wandering at 2.5 does not though its flags are a runner's (a creature's
+    /// spline sets forward and no walk mode, [`unify`]); with no direction bit it is 0.
+    #[test]
+    fn a_spline_is_its_own_speed() {
+        let s = speeds();
+        let fleeing = unit_motion(f::FORWARD, Some(&s), Some(&spline(16.0, 2)));
+        assert_eq!(fleeing.speed, 8.0);
+        assert!(fleeing.moves_at_run_speed());
+        let wandering = unit_motion(f::FORWARD, Some(&s), Some(&spline(5.0, 2)));
+        assert_eq!(wandering.speed, 2.5);
+        assert!(!wandering.moves_at_run_speed());
+        assert_eq!(unit_motion(0, Some(&s), Some(&spline(16.0, 2))).speed, 0.0);
+    }
+
+    /// No speeds streamed: not running.
+    #[test]
+    fn a_unit_without_speeds_is_not_running() {
+        assert!(!unit_motion(f::FORWARD, None, Some(&spline(16.0, 2))).moves_at_run_speed());
+    }
+
+    fn store(typemask: u32, reach: f32) -> ObjectStore {
+        ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (2, typemask),
+            (22, 100),
+            (130, reach.to_bits()),
+        ]))
+    }
+
+    fn remote(flags: u32) -> RemoteMotion {
+        RemoteMotion {
+            wow_pos: [0.0; 3],
+            orientation: 0.0,
+            flags,
+            pitch: 0.0,
+            speed: 0.0,
+            vertical_velocity: 0.0,
+            jump_xy_vel: [0.0; 2],
+            fall_start_z: None,
+            pending: Default::default(),
+            relay: Default::default(),
+            last_apply_ms: 0.0,
+            last_apply_pos: [0.0; 3],
+        }
+    }
+
+    const MOB: u64 = 0xF130_0000_0000_0009;
+
+    /// The body we drive reads the word our controller built, a remote player its relayed flags,
+    /// a creature its spline; the player bit is `OBJECT_FIELD_TYPE` bit 4, and the caster's
+    /// auto-attack target is looked up through its `Engaged` guid.
+    #[test]
+    fn a_unit_is_read_off_its_own_state() {
+        use bevy::ecs::system::RunSystemOnce;
+
+        let mut world = World::new();
+        world.insert_resource(Player::with_move_flags(f::FORWARD));
+        let run = UnitSpeeds(speeds());
+        let me = world
+            .spawn((SelfPlayer, Embodied, run, store(0x19, 2.0)))
+            .id();
+        let friend = world
+            .spawn((remote(f::STRAFE_LEFT), run, store(0x19, 1.5)))
+            .id();
+        let mob = world.spawn((spline(16.0, 2), run, store(0x09, 1.25))).id();
+        let wanderer = world.spawn((spline(5.0, 2), run, store(0x09, 1.5))).id();
+        let idle = world.spawn((run, store(0x09, 1.5))).id();
+        let bare = world.spawn(run).id();
+        world.entity_mut(me).insert(Engaged(MOB));
+        world.insert_resource(GuidIndex([(MOB, mob)].into_iter().collect()));
+        world
+            .run_system_once(move |units: RangeUnits| {
+                let me = units.caster();
+                assert_eq!(me.reach, 2.0);
+                assert!(me.player && me.motion.moves_at_run_speed(), "{me:?}");
+                let friend = units.unit(friend).unwrap();
+                assert!(
+                    friend.player && friend.motion.moves_at_run_speed(),
+                    "{friend:?}"
+                );
+                let mob_unit = units.unit(mob).unwrap();
+                assert!(!mob_unit.player, "a creature");
+                assert_eq!(mob_unit.reach, 1.25);
+                assert_eq!(mob_unit.motion.speed, 8.0, "its spline's speed");
+                assert!(mob_unit.motion.moves_at_run_speed());
+                let wanderer = units.unit(wanderer).unwrap();
+                assert!(!wanderer.motion.moves_at_run_speed(), "{wanderer:?}");
+                let idle = units.unit(idle).unwrap();
+                assert!(!idle.motion.moves_at_run_speed(), "{idle:?}");
+                assert!(units.unit(bare).is_none(), "no descriptor streamed");
+                assert_eq!(units.caster_attack_target(), Some(mob_unit));
+                assert_eq!(units.attack_target(mob), None, "the mob engages nothing");
+            })
+            .expect("the units read");
+    }
+
+    /// Our own body is the word `Player` holds, so the same body standing still, walking or with
+    /// no controller in the world is not running.
+    #[test]
+    fn the_driven_body_follows_the_controllers_word() {
+        use bevy::ecs::system::RunSystemOnce;
+
+        let caster_at = |player: Option<Player>| {
+            let mut world = World::new();
+            if let Some(player) = player {
+                world.insert_resource(player);
+            }
+            world.spawn((SelfPlayer, Embodied, UnitSpeeds(speeds()), store(0x19, 1.5)));
+            world
+                .run_system_once(|units: RangeUnits| units.caster().motion.moves_at_run_speed())
+                .expect("the caster reads")
+        };
+        assert!(caster_at(Some(Player::with_move_flags(f::FORWARD))));
+        assert!(caster_at(Some(Player::with_move_flags(
+            f::STRAFE_RIGHT | f::FALLING
+        ))));
+        assert!(!caster_at(Some(Player::with_move_flags(0))));
+        assert!(!caster_at(Some(Player::with_move_flags(
+            f::FORWARD | f::WALK_MODE
+        ))));
+        assert!(!caster_at(Some(Player::with_move_flags(f::BACKWARD))));
+        assert!(!caster_at(None));
+    }
+
+    /// The send path's range gate ([`super::super::cast_target::CastTargeting`]): a warrior running
+    /// after a running mob presses Hamstring (the melee row) at 7 yards and is not refused, and
+    /// the same press with either one standing is "Out of range."
+    #[test]
+    fn the_press_reaches_the_moving_bonus_with_both_units_running() {
+        use super::super::cast_target::CastTargeting;
+        use benilla_formats::{SpellDisplay, SpellRange};
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 0xF130_0000_0000_0001;
+        let refusal = |caster_runs: bool, mob_runs: bool, yards: f32| {
+            let mut world = World::new();
+            world.insert_resource(Player::with_move_flags(if caster_runs {
+                f::FORWARD
+            } else {
+                0
+            }));
+            world.init_resource::<crate::spell::AutoSelfCast>();
+            world.insert_resource(crate::net::Reputations(Vec::new()));
+            world.insert_resource(crate::net::SelfGuid(Some(ME)));
+            let run = UnitSpeeds(speeds());
+            world.spawn((
+                SelfPlayer,
+                Embodied,
+                run,
+                store(0x19, 1.5),
+                Transform::default(),
+            ));
+            let mob = world
+                .spawn((run, store(0x09, 1.5), Transform::from_xyz(yards, 0.0, 0.0)))
+                .id();
+            if mob_runs {
+                world.entity_mut(mob).insert(spline(16.0, 2));
+            }
+            world.insert_resource(crate::target::Selection {
+                target: Some(mob),
+                guid: Some(MOB),
+                ..Default::default()
+            });
+            let hamstring = SpellDisplay {
+                range_index: 2,
+                ..Default::default()
+            };
+            let melee = SpellRange {
+                min: 0.0,
+                max: 5.0,
+                flags: 1,
+            };
+            world
+                .run_system_once(move |targeting: CastTargeting| {
+                    targeting.context().range.refusal(
+                        &hamstring,
+                        Some(&melee),
+                        &crate::spell::SpellModifiers::default(),
+                    )
+                })
+                .expect("the context builds")
+        };
+        assert_eq!(refusal(true, true, 7.0), None, "both running");
+        assert_eq!(refusal(true, true, 8.0), Some(0x59), "past 7.667");
+        assert_eq!(refusal(true, false, 7.0), Some(0x59), "the mob stands");
+        assert_eq!(refusal(false, true, 7.0), Some(0x59), "the caster stands");
+        assert_eq!(refusal(false, false, 4.9), None, "the floor stands");
+    }
+}
diff --git a/crates/benilla-app/src/spell/targeting/cursor.rs b/crates/benilla-app/src/spell/targeting/cursor.rs
index 044bd0f9..69da0ad6 100644
--- a/crates/benilla-app/src/spell/targeting/cursor.rs
+++ b/crates/benilla-app/src/spell/targeting/cursor.rs
@@ -5,39 +5,79 @@
 
 use bevy::prelude::*;
 
-use benilla_formats::SpellRange;
+use benilla_formats::{RangeTargets, RangeUnit, SpellDisplay, SpellRange};
 
 use crate::net::SelfPlayer;
+use crate::spell::SpellModifiers;
 use crate::target::{CursorKind, PickOcclusion, WorldCursor};
 use crate::ui_action::Spells;
 
 use super::{SpellTargeting, TargetingWants};
 
-/// `CheckGroundPointInRange 0x6e6810`: min² and max² from the `SpellRange` row against the squared
-/// caster-to-point distance. Its one caller is the hover classifier `0x4820f0`, so it colours the
-/// cursor and the click never asks. No row is permissive; the server judges every send.
-fn ground_point_in_range(row: Option<&SpellRange>, self_pos: Vec3, point: Vec3) -> bool {
-    let Some(row) = row else {
-        return true;
-    };
-    let dist_sq = self_pos.distance_squared(point);
-    if row.min > 0.0 && dist_sq < row.min * row.min {
-        return false;
-    }
-    dist_sq <= row.max * row.max
+/// What `GetMinMaxRange 0x6e3480` reads for the cursor's two range verdicts: the ground point
+/// (`CheckGroundPointInRange 0x6e6810`, a null target at `0x6e6879`) and the GameObject leg of
+/// `0x6e6460` (the object as target at `0x6e679b`). Neither passes a unit, which the function
+/// tests for at `0x6e34e1`-`0x6e34f9`: the ranged arm pads nothing and takes no moving bonus,
+/// and the melee arm sums the caster's reach with its auto-attack target's and asks that unit's
+/// motion, with the caster's, for the bonus.
+#[derive(Clone, Copy)]
+struct RangeCall<'a> {
+    spell: &'a SpellDisplay,
+    row: &'a SpellRange,
+    mods: &'a SpellModifiers,
+    caster: RangeUnit,
+    attack_target: Option<RangeUnit>,
 }
 
-fn range_row(spells: Option<&Spells>, spell_id: u32) -> Option<&SpellRange> {
-    let spells = spells?;
-    spells.ranges.get(spells.catalog.get(spell_id)?.range_index)
+/// The call's inputs, or `None` where the data is absent (no catalog, an unknown spell, a row
+/// missing from `SpellRange`), which is permissive: the server judges every send.
+fn range_call<'a>(checks: &'a super::BindChecks, spell_id: u32) -> Option<RangeCall<'a>> {
+    let spells = checks.spells.as_deref()?;
+    let spell = spells.catalog.get(spell_id)?;
+    Some(RangeCall {
+        spell,
+        row: spells.ranges.get(spell.range_index)?,
+        mods: &checks.spell_mods,
+        caster: checks.range_units.caster(),
+        attack_target: checks.range_units.caster_attack_target(),
+    })
+}
+
+/// `CheckGroundPointInRange 0x6e6810`: the squared caster-to-point distance against
+/// `GetMinMaxRange`'s bounds, whose max carries spell-mod op 5 (`0x6e3744`), so a range talent
+/// moves the verdict. The compare fails on min² > d² (`0x6e68b5`-`0x6e68c3`) and on max² < d²
+/// (`0x6e68c5`-`0x6e68d3`), a NaN failing both; the min has no `> 0` guard, a zero one is inert.
+/// Its one caller is the hover classifier `0x4820f0`, so it colours the cursor and the click never
+/// asks.
+fn ground_point_in_range(call: Option<RangeCall>, self_pos: Vec3, point: Vec3) -> bool {
+    let Some(call) = call else {
+        return true;
+    };
+    let targets = RangeTargets {
+        target: None,
+        attack_target: call.attack_target,
+    };
+    // The self row is `{0, 0}` (`0x6e35dd`, `0x6e35ea`) and `min_max_range` answers `None` for it:
+    // only the caster's own spot passes it here.
+    let (min, max) = call
+        .mods
+        .min_max_range(call.spell, Some(call.row), call.caster, targets)
+        .unwrap_or_default();
+    let dist_sq = self_pos.distance_squared(point);
+    min * min <= dist_sq && dist_sq <= max * max
 }
 
 /// `GetCurrentCastRadius 0x6e6350`: per effect `radius + casterLevel × perLevel` over
 /// `EffectRadiusIndex[0]` and `[1]` only, the larger with slot 1 winning ties and NaN, clamped to
 /// 20.0 (`0x4820f0`'s `[0x804478]`). 0.0 means no radius rows and the reticle's default size.
-/// The reference then applies spell-mod op 6 (SPELLMOD_RADIUS, `0x6e6bf0`); this does not yet,
-/// though `crate::spell::mods` has it.
-pub(crate) fn ground_cast_radius(spells: Option<&Spells>, spell_id: u32, level: u32) -> f32 {
+/// The reference then applies spell-mod op 6 (SPELLMOD_RADIUS, `0x6e6bf0`) before the reticle's
+/// 20-yard clamp (`0x4820f0`).
+pub(crate) fn ground_cast_radius(
+    spells: Option<&Spells>,
+    spell_id: u32,
+    level: u32,
+    mods: &super::super::SpellModifiers,
+) -> f32 {
     let Some(spells) = spells else { return 0.0 };
     let Some(d) = spells.catalog.get(spell_id) else {
         return 0.0;
@@ -55,7 +95,7 @@ pub(crate) fn ground_cast_radius(spells: Option<&Spells>, spell_id: u32, level:
     let (c0, c1) = (candidate(0), candidate(1));
     // Strict > for slot 0: a tie or a NaN falls to slot 1, as the reference compares.
     let r = if c0 > c1 { c0 } else { c1 };
-    r.min(20.0)
+    mods.apply_float(d, super::super::OP_RADIUS, r).min(20.0)
 }
 
 /// While targeting, runs after the world classifier and overwrites its verdict (`0x4820f0`'s
@@ -76,7 +116,8 @@ pub(crate) fn ground_cast_radius(spells: Option<&Spells>, spell_id: u32, level:
 /// its ray (`0x4812c8`) and the world cursor stays grey.
 ///
 /// The object arm is `0x6e6460`'s GameObject leg: `word & 0x4800`, the lock predicate `0x5f8260`,
-/// then the same min/max range test through `GetMinMaxRange 0x6e3480`. Its unit leg is
+/// then the same min/max range test through `GetMinMaxRange 0x6e3480`, its range modifier included.
+/// Its unit leg is
 /// [`SpellTargeting::can_target_unit`] and its corpse leg [`SpellTargeting::can_target_corpse`],
 /// over a corpse the pick admitted under a word in `0x8600`. The world-item leg is not built.
 ///
@@ -87,7 +128,6 @@ pub(crate) fn drive_targeting_cursor(
     occlusion: Res<PickOcclusion>,
     hovered: Res<crate::target::Hovered>,
     hovered_object: Res<crate::target::HoveredObject>,
-    spells: Option<Res<Spells>>,
     self_tf: Query<&Transform, With<SelfPlayer>>,
     go_tf: Query<&Transform>,
     stores: Query<(
@@ -103,7 +143,7 @@ pub(crate) fn drive_targeting_cursor(
     let Some(spell_id) = targeting.spell() else {
         return;
     };
-    let row = range_row(spells.as_deref(), spell_id);
+    let range = range_call(&checks, spell_id);
     let me = self_tf.single().ok().map(|tf| tf.translation);
     // The arm the click would take ([`super::world::commit_object_cast_on_click`]): a GameObject
     // word's nearest GameObject, else the picked unit or corpse, else the terrain.
@@ -116,7 +156,7 @@ pub(crate) fn drive_targeting_cursor(
             &go_tf,
             &lock_inputs,
             spell_id,
-            row,
+            range,
             me,
         )
     } else if let Some(unit) = hovered
@@ -132,7 +172,7 @@ pub(crate) fn drive_targeting_cursor(
     } else if targeting.wants(TargetingWants::Location) {
         // `0x4820f0`. No ground hit (sky, mouselook) is state 0, UnableCast.
         match (occlusion.point, me) {
-            (Some(point), Some(me)) => ground_point_in_range(row, me, point),
+            (Some(point), Some(me)) => ground_point_in_range(range, me, point),
             _ => false,
         }
     } else {
@@ -156,7 +196,7 @@ fn object_arm(
     go_tf: &Query<&Transform>,
     lock_inputs: &crate::target::lock::GoLockInputs,
     spell_id: u32,
-    row: Option<&SpellRange>,
+    range: Option<RangeCall>,
     me: Option<Vec3>,
 ) -> bool {
     let (Some(entity), Some(guid)) = (hovered_object.target, hovered_object.guid) else {
@@ -190,7 +230,7 @@ fn object_arm(
     }
     // The range tail: the caster-to-object distance against the spell's min and max.
     match (me, go_tf.get(entity)) {
-        (Some(me), Ok(tf)) => ground_point_in_range(row, me, tf.translation),
+        (Some(me), Ok(tf)) => ground_point_in_range(range, me, tf.translation),
         _ => false,
     }
 }
@@ -199,22 +239,183 @@ fn object_arm(
 mod tests {
     use super::*;
 
+    /// The call for a spell and row under these tables, with the default combat reach and no
+    /// auto-attack target.
+    fn call<'a>(
+        spell: &'a SpellDisplay,
+        row: &'a SpellRange,
+        mods: &'a SpellModifiers,
+    ) -> Option<RangeCall<'a>> {
+        Some(RangeCall {
+            spell,
+            row,
+            mods,
+            caster: RangeUnit::still(1.5),
+            attack_target: None,
+        })
+    }
+
     /// Blizzard's row 4 is 0 to 30 yd; a synthetic min exercises the too-close arm.
     #[test]
     fn ground_point_in_range_mirrors_check_ground_point_in_range() {
         let row = |min: f32, max: f32| SpellRange { min, max, flags: 0 };
         let origin = Vec3::ZERO;
         let at = |d: f32| Vec3::new(d, 0.0, 0.0);
+        let spell = SpellDisplay::default();
+        let mods = SpellModifiers::default();
         let blizzard = row(0.0, 30.0);
-        assert!(ground_point_in_range(Some(&blizzard), origin, at(29.9)));
-        assert!(!ground_point_in_range(Some(&blizzard), origin, at(30.1)));
+        let ground = |row: &SpellRange, d: f32| {
+            ground_point_in_range(call(&spell, row, &mods), origin, at(d))
+        };
+        assert!(ground(&blizzard, 29.9));
+        assert!(!ground(&blizzard, 30.1));
         let banded = row(8.0, 35.0);
-        assert!(!ground_point_in_range(Some(&banded), origin, at(5.0)));
-        assert!(ground_point_in_range(Some(&banded), origin, at(20.0)));
+        assert!(!ground(&banded, 5.0));
+        assert!(ground(&banded, 20.0));
+        // Both bounds are inclusive (`min² > d²` and `max² < d²` fail, `0x6e68c3`, `0x6e68d3`), and
+        // a NaN distance fails both.
+        assert!(ground(&banded, 8.0));
+        assert!(ground(&banded, 35.0));
+        assert!(!ground(&banded, f32::NAN));
+        assert!(!ground(&blizzard, f32::NAN));
+        // The self row is `{0, 0}`: only the caster's own spot is in range.
+        let own = row(0.0, 0.0);
+        assert!(ground(&own, 0.0));
+        assert!(!ground(&own, 1.0));
         // No row → permissive (the server still validates).
         assert!(ground_point_in_range(None, origin, at(500.0)));
     }
 
+    /// Arctic Reach adds op 5 with family mask `0xa0` (bits 5 and 7), and Blizzard's `0x80080` sets
+    /// bit 7: 30 yd at +20% is 36. The talent moves the max only, and a spell whose mask it does
+    /// not cover keeps its 30.
+    #[test]
+    fn a_range_talent_moves_the_ground_verdict() {
+        let mage = |flags: u64| SpellDisplay {
+            spell_family: 3,
+            spell_family_flags: flags,
+            ..SpellDisplay::default()
+        };
+        let blizzard = mage(0x8_0080);
+        let flamestrike = mage(0x4000_0004);
+        let row = SpellRange {
+            min: 0.0,
+            max: 30.0,
+            flags: 0,
+        };
+        let banded = SpellRange {
+            min: 8.0,
+            max: 35.0,
+            flags: 0,
+        };
+        let plain = {
+            let mut mods = SpellModifiers::default();
+            mods.set_class_family(3);
+            mods
+        };
+        let mut talented = plain.clone();
+        for bit in [5, 7] {
+            talented.set(false, bit, crate::spell::OP_RANGE, 20);
+        }
+        let ground = |spell: &SpellDisplay, row: &SpellRange, mods: &SpellModifiers, d: f32| {
+            ground_point_in_range(call(spell, row, mods), Vec3::ZERO, Vec3::new(d, 0.0, 0.0))
+        };
+
+        assert!(!ground(&blizzard, &row, &plain, 33.0), "30 yd without it");
+        assert!(ground(&blizzard, &row, &talented, 29.9));
+        assert!(ground(&blizzard, &row, &talented, 33.0));
+        assert!(ground(&blizzard, &row, &talented, 35.9));
+        assert!(!ground(&blizzard, &row, &talented, 36.1));
+        assert!(!ground(&blizzard, &row, &talented, 37.0));
+        // Bit 7 is not in Flamestrike's mask (bits 2 and 30).
+        assert!(!ground(&flamestrike, &row, &talented, 33.0));
+        // Only the max moves: 8 to 35 is 8 to 42.
+        assert!(!ground(&blizzard, &banded, &talented, 5.0));
+        assert!(ground(&blizzard, &banded, &talented, 41.0));
+        assert!(!ground(&blizzard, &banded, &talented, 43.0));
+    }
+
+    /// With no unit passed, the melee arm sums the caster's reach with its auto-attack target's, else
+    /// its own, and the max is floored at 5.0 (`0x6e3552`-`0x6e35bf`).
+    #[test]
+    fn the_melee_row_reads_the_casters_reaches() {
+        let melee = SpellRange {
+            min: 0.0,
+            max: 5.0,
+            flags: 1,
+        };
+        let spell = SpellDisplay::default();
+        let mods = SpellModifiers::default();
+        let ground = |self_reach: f32, attack_target_reach: Option<f32>, d: f32| {
+            let call = RangeCall {
+                spell: &spell,
+                row: &melee,
+                mods: &mods,
+                caster: RangeUnit::still(self_reach),
+                attack_target: attack_target_reach.map(RangeUnit::still),
+            };
+            ground_point_in_range(Some(call), Vec3::ZERO, Vec3::new(d, 0.0, 0.0))
+        };
+        // 1.5 + 1.5 + 1.3333 is under the floor.
+        assert!(ground(1.5, None, 4.9));
+        assert!(!ground(1.5, None, 5.1));
+        // The caster's 3.0 twice: 7.33.
+        assert!(ground(3.0, None, 7.2));
+        assert!(!ground(3.0, None, 7.5));
+        // An auto-attack target's 4.0 in place of the second: 1.5 + 4.0 + 1.3333 = 6.83.
+        assert!(ground(1.5, Some(4.0), 6.7));
+        assert!(!ground(1.5, Some(4.0), 7.0));
+    }
+
+    /// The moving bonus (`0x6e3648`-`0x6e36a2`) on the ground verdict: with no unit passed, only
+    /// the melee arm has a unit for it, the auto-attack target, and both must run. The ranged arm
+    /// has none, whoever the caster's auto-attack target is.
+    #[test]
+    fn the_ground_verdict_takes_the_moving_bonus_on_the_melee_row_alone() {
+        let running = RangeUnit {
+            // A player, which would earn a ranged target the bonus, were one passed.
+            player: true,
+            motion: benilla_formats::UnitMotion {
+                flags: 1,
+                speed: 7.0,
+                walk_speed: 2.5,
+            },
+            ..RangeUnit::still(1.5)
+        };
+        let melee = SpellRange {
+            min: 0.0,
+            max: 5.0,
+            flags: 1,
+        };
+        let blizzard = SpellRange {
+            min: 0.0,
+            max: 30.0,
+            flags: 0,
+        };
+        let spell = SpellDisplay::default();
+        let mods = SpellModifiers::default();
+        let ground = |row: &SpellRange, caster, attack_target, d: f32| {
+            let call = RangeCall {
+                spell: &spell,
+                row,
+                mods: &mods,
+                caster,
+                attack_target,
+            };
+            ground_point_in_range(Some(call), Vec3::ZERO, Vec3::new(d, 0.0, 0.0))
+        };
+        // 5.0 floor + 2.6667 = 7.667 for two runners.
+        assert!(ground(&melee, running, Some(running), 7.5));
+        assert!(!ground(&melee, running, Some(running), 7.8));
+        // One of them standing, or no auto-attack target, and the floor stands.
+        let still = RangeUnit::still(1.5);
+        assert!(!ground(&melee, running, Some(still), 7.5));
+        assert!(!ground(&melee, still, Some(running), 7.5));
+        assert!(!ground(&melee, running, None, 7.5));
+        // The ranged arm never reads the auto-attack target: 30, not 32.67.
+        assert!(!ground(&blizzard, running, Some(running), 31.0));
+    }
+
     /// Fixture rows mirror the real table: row 14 is 8.0 (Blizzard), row 8 is 5.0 (Flamestrike).
     #[test]
     fn ground_cast_radius_mirrors_get_current_cast_radius() {
@@ -223,6 +424,8 @@ mod tests {
         let mut spells = crate::ui_action::Spells::empty_for_tests();
         let display = |idx: [u32; 3]| SpellDisplay {
             effect_radius_index: idx,
+            spell_family: 3,
+            spell_family_flags: 1 << 5,
             ..SpellDisplay::default()
         };
         spells.catalog = benilla_formats::SpellCatalog::from_displays(HashMap::from([
@@ -275,17 +478,23 @@ mod tests {
             ),
         ]));
         let s = Some(&spells);
-        assert_eq!(ground_cast_radius(s, 10, 60), 8.0);
-        assert_eq!(ground_cast_radius(s, 2120, 60), 5.0);
+        let mods = crate::spell::SpellModifiers::default();
+        assert_eq!(ground_cast_radius(s, 10, 60, &mods), 8.0);
+        assert_eq!(ground_cast_radius(s, 2120, 60, &mods), 5.0);
         // Slot 2 is never read: no rows in slots 0 and 1 reads 0, the default size.
-        assert_eq!(ground_cast_radius(s, 777, 60), 0.0);
+        assert_eq!(ground_cast_radius(s, 777, 60, &mods), 0.0);
         // Per-level: 2.0 + 60 × 0.1 = 8.0 beats slot 1's 5.0.
-        assert_eq!(ground_cast_radius(s, 778, 60), 8.0);
+        assert_eq!(ground_cast_radius(s, 778, 60, &mods), 8.0);
         // The 20.0 clamp (`[0x804478]`).
-        assert_eq!(ground_cast_radius(s, 779, 60), 20.0);
+        assert_eq!(ground_cast_radius(s, 779, 60, &mods), 20.0);
         // Unknown spell or no data: 0, the default size.
-        assert_eq!(ground_cast_radius(s, 9999, 60), 0.0);
-        assert_eq!(ground_cast_radius(None, 10, 60), 0.0);
+        assert_eq!(ground_cast_radius(s, 9999, 60, &mods), 0.0);
+        assert_eq!(ground_cast_radius(None, 10, 60, &mods), 0.0);
+
+        let mut mods = crate::spell::SpellModifiers::default();
+        mods.set_class_family(3);
+        mods.set(false, 5, crate::spell::OP_RADIUS, -50);
+        assert_eq!(ground_cast_radius(s, 779, 60, &mods), 15.0);
     }
 
     /// Only two of the three pick states are handlers; state 0 is UnableCast.
@@ -302,10 +511,12 @@ mod tests {
             world.init_resource::<crate::go_templates::GameObjectTemplates>();
             world.init_resource::<crate::items::Items>();
             world.init_resource::<crate::net::GuidIndex>();
+            world.init_resource::<crate::spell::SpellModifiers>();
             world.insert_resource(crate::net::Reputations(Vec::new()));
             world.insert_resource(PickOcclusion {
                 distance: 10.0,
                 point,
+                ray: None,
             });
             if let Some(distance) = go {
                 let chest = world.spawn(Transform::default()).id();
@@ -356,6 +567,202 @@ mod tests {
         assert!(verdict(0x4840, Some(Vec3::ZERO), None));
     }
 
+    /// `0x4820f0` over terrain. Blizzard (10, `Targets 0x40`, family 3 mask `0x80080`, row 4, 0 to
+    /// 30 yd) under Arctic Reach's cells, and a melee-row ground spell (12684, row 2) under the
+    /// caster's reach and its auto-attack target's.
+    #[test]
+    fn the_terrain_verdict_reads_the_range_talent_and_the_casters_reaches() {
+        use super::super::corpse_fixture as fx;
+        use crate::creature_anim::Engaged;
+        use bevy::ecs::system::RunSystemOnce;
+        use std::collections::HashMap;
+
+        const BLIZZARD: u32 = 10;
+        const MELEE_GROUND: u32 = 12684;
+        const ATTACK_TARGET: u64 = 0xF130_0000_0000_0007;
+        // A spell, a talent or not, the caster's reach, an engaged target's reach, the distance.
+        let verdict =
+            |spell: u32, talent: bool, self_reach: f32, engaged: Option<f32>, d: f32| -> bool {
+                let mut world = World::new();
+                world.init_resource::<WorldCursor>();
+                world.init_resource::<SpellTargeting>();
+                world.init_resource::<crate::target::Hovered>();
+                world.init_resource::<crate::target::HoveredObject>();
+                world.init_resource::<crate::go_templates::GameObjectTemplates>();
+                world.init_resource::<crate::items::Items>();
+                world.insert_resource(crate::net::Reputations(Vec::new()));
+                world.insert_resource(PickOcclusion {
+                    distance: 10.0,
+                    point: Some(Vec3::new(d, 0.0, 0.0)),
+                    ray: None,
+                });
+                let mut mods = SpellModifiers::default();
+                mods.set_class_family(3);
+                if talent {
+                    for bit in [5, 7] {
+                        mods.set(false, bit, crate::spell::OP_RANGE, 20);
+                    }
+                }
+                world.insert_resource(mods);
+                let display = |range_index, flags| SpellDisplay {
+                    range_index,
+                    targets: 0x40,
+                    spell_family: 3,
+                    spell_family_flags: flags,
+                    ..SpellDisplay::default()
+                };
+                let mut spells = Spells::empty_for_tests();
+                spells.catalog = benilla_formats::SpellCatalog::from_displays(HashMap::from([
+                    (BLIZZARD, display(4, 0x8_0080)),
+                    (MELEE_GROUND, display(2, 0)),
+                ]));
+                spells.ranges = benilla_formats::SpellRangeCatalog::from_rows(HashMap::from([
+                    (
+                        4,
+                        SpellRange {
+                            min: 0.0,
+                            max: 30.0,
+                            flags: 0,
+                        },
+                    ),
+                    (
+                        2,
+                        SpellRange {
+                            min: 0.0,
+                            max: 5.0,
+                            flags: 1,
+                        },
+                    ),
+                ]));
+                world.insert_resource(spells);
+                let mut index = HashMap::new();
+                let mut me =
+                    world.spawn((SelfPlayer, Transform::default(), fx::caster(self_reach)));
+                if engaged.is_some() {
+                    me.insert(Engaged(ATTACK_TARGET));
+                }
+                if let Some(reach) = engaged {
+                    let target = world.spawn(fx::caster(reach)).id();
+                    index.insert(ATTACK_TARGET, target);
+                }
+                world.insert_resource(crate::net::GuidIndex(index));
+                world.resource_mut::<SpellTargeting>().enter(
+                    spell,
+                    crate::spell::CastCommit::Spell,
+                    0x0040,
+                );
+                world
+                    .run_system_once(drive_targeting_cursor)
+                    .expect("the targeting cursor drives");
+                !world.resource::<WorldCursor>().unable
+            };
+
+        // 30 yd without the talent, 36 with it.
+        assert!(!verdict(BLIZZARD, false, 1.5, None, 33.0), "past 30 yd");
+        assert!(verdict(BLIZZARD, true, 1.5, None, 33.0), "inside 36 yd");
+        assert!(!verdict(BLIZZARD, true, 1.5, None, 37.0), "past 36 yd");
+        // The melee row's 5.0 floor; the caster's own reach twice, 3.0 + 3.0 + 1.3333; an auto-attack
+        // target's 4.0 in place of the second, 1.5 + 4.0 + 1.3333.
+        assert!(!verdict(MELEE_GROUND, false, 1.5, None, 7.0));
+        assert!(verdict(MELEE_GROUND, false, 3.0, None, 7.0));
+        assert!(verdict(MELEE_GROUND, false, 1.5, Some(4.0), 6.5));
+        assert!(!verdict(MELEE_GROUND, false, 1.5, Some(4.0), 7.0));
+    }
+
+    /// `0x6e6460`'s GameObject leg asks the same range through the same call: a chest a lock spell
+    /// opens, `d` yd out, on a family-3 lock spell (fixture) with row 12, 0 to 5 yd.
+    #[test]
+    fn the_object_leg_reads_the_range_talent() {
+        use super::super::corpse_fixture as fx;
+        use benilla_formats::{LockCatalog, LockSlot, OpenLock, LOCK_KEY_SKILL};
+        use bevy::ecs::system::RunSystemOnce;
+        use std::collections::HashMap;
+
+        const OPENER: u32 = 6477;
+        const LOCK: u32 = 55;
+        // Entry 7, a chest whose `data[0]` is the lock.
+        const CHEST: u64 = 0xF110_0000_0000_0001 | 7 << 24;
+        let verdict = |talent: bool, d: f32| -> bool {
+            let mut world = World::new();
+            world.init_resource::<WorldCursor>();
+            world.init_resource::<SpellTargeting>();
+            world.init_resource::<crate::target::Hovered>();
+            world.init_resource::<crate::items::Items>();
+            world.init_resource::<crate::net::GuidIndex>();
+            world.insert_resource(crate::net::Reputations(Vec::new()));
+            world.init_resource::<PickOcclusion>();
+            let mut mods = SpellModifiers::default();
+            mods.set_class_family(3);
+            if talent {
+                mods.set(false, 7, crate::spell::OP_RANGE, 20);
+            }
+            world.insert_resource(mods);
+            let mut spells = Spells::empty_for_tests();
+            spells.catalog = benilla_formats::SpellCatalog::from_displays(HashMap::from([(
+                OPENER,
+                SpellDisplay {
+                    range_index: 12,
+                    targets: 0x4000,
+                    spell_family: 3,
+                    spell_family_flags: 1 << 7,
+                    open_lock: Some(OpenLock {
+                        effect: 0,
+                        lock_type: 1,
+                    }),
+                    ..SpellDisplay::default()
+                },
+            )]));
+            spells.ranges = benilla_formats::SpellRangeCatalog::from_rows(HashMap::from([(
+                12,
+                SpellRange {
+                    min: 0.0,
+                    max: 5.0,
+                    flags: 0,
+                },
+            )]));
+            world.insert_resource(spells);
+            let mut slots = [LockSlot::default(); benilla_formats::MAX_LOCK_SLOTS];
+            slots[0] = LockSlot {
+                key_type: LOCK_KEY_SKILL,
+                index: 1,
+                skill: 0,
+                action: 5,
+            };
+            world.insert_resource(crate::go_templates::Locks(LockCatalog::from_rows([(
+                LOCK, slots,
+            )])));
+            let mut templates = crate::go_templates::GameObjectTemplates::default();
+            let mut data = [0; 24];
+            data[0] = LOCK as i32;
+            templates.insert(7, 3, "Chest".into(), &data);
+            world.insert_resource(templates);
+            world.spawn((SelfPlayer, Transform::default(), fx::caster(1.5)));
+            let chest = world
+                .spawn(Transform::from_translation(Vec3::new(d, 0.0, 0.0)))
+                .id();
+            world.insert_resource(crate::target::HoveredObject {
+                target: Some(chest),
+                guid: Some(CHEST),
+                distance: 5.0,
+            });
+            world.resource_mut::<SpellTargeting>().enter(
+                OPENER,
+                crate::spell::CastCommit::Spell,
+                0x4800,
+            );
+            world
+                .run_system_once(drive_targeting_cursor)
+                .expect("the targeting cursor drives");
+            !world.resource::<WorldCursor>().unable
+        };
+
+        // 5 yd without the talent, 6 with it.
+        assert!(verdict(false, 4.5));
+        assert!(!verdict(false, 5.5), "past 5 yd");
+        assert!(verdict(true, 5.5), "inside 6 yd");
+        assert!(!verdict(true, 6.5), "past 6 yd");
+    }
+
     /// `0x6e6460`'s unit leg over a hovered unit: the relation checks, then min² ≤ d² ≤ max²
     /// (`6e677c`–`6e6802`). Row 5 is 0 to 30 yd and row 114 is 8 to 35 yd, both padded by the two
     /// 1.5 combat reaches: 0 to 33 and 11 to 38.
@@ -374,6 +781,7 @@ mod tests {
             world.init_resource::<crate::go_templates::GameObjectTemplates>();
             world.init_resource::<crate::items::Items>();
             world.init_resource::<crate::net::GuidIndex>();
+            world.init_resource::<crate::spell::SpellModifiers>();
             world.insert_resource(crate::net::Reputations(Vec::new()));
             world.init_resource::<PickOcclusion>();
             let display = |range_index| benilla_formats::SpellDisplay {
@@ -391,17 +799,20 @@ mod tests {
                 (114, row(8.0, 35.0)),
             ]));
             world.insert_resource(spells);
-            let empty = || crate::net::ObjectStore(benilla_protocol::ObjectFields::default());
+            // `UNIT_FIELD_HEALTH` 100: a store with no health reads dead to `BindTarget`'s gates.
+            let live = || {
+                crate::net::ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(22, 100)]))
+            };
             world.spawn((
                 SelfPlayer,
                 Transform::default(),
                 GlobalTransform::default(),
-                empty(),
+                live(),
             ));
             let unit = world
                 .spawn((
                     GlobalTransform::from_translation(Vec3::new(distance, 0.0, 0.0)),
-                    empty(),
+                    live(),
                 ))
                 .id();
             world.insert_resource(crate::target::Hovered {
@@ -441,6 +852,108 @@ mod tests {
         );
     }
 
+    /// The unit leg's range compare, the tail of `SpellCanTargetUnit 0x6e6460`, hands
+    /// `GetMinMaxRange` the hovered unit (`0x6e679b`, `0x6e67d1`): a melee spell is in range to
+    /// 7.667 yards while the caster and that unit both run, and to the 5.0 floor otherwise.
+    #[test]
+    fn the_unit_leg_takes_the_moving_bonus_on_the_melee_row() {
+        use bevy::ecs::system::RunSystemOnce;
+        use std::collections::HashMap;
+
+        const HAMSTRING: u32 = 1715;
+        let verdict = |caster_runs: bool, unit_runs: bool, distance: f32| {
+            let mut world = World::new();
+            world.init_resource::<WorldCursor>();
+            world.init_resource::<SpellTargeting>();
+            world.init_resource::<crate::target::HoveredObject>();
+            world.init_resource::<crate::go_templates::GameObjectTemplates>();
+            world.init_resource::<crate::items::Items>();
+            world.init_resource::<crate::net::GuidIndex>();
+            world.init_resource::<crate::spell::SpellModifiers>();
+            world.insert_resource(crate::net::Reputations(Vec::new()));
+            world.init_resource::<PickOcclusion>();
+            world.insert_resource(crate::player::Player::with_move_flags(if caster_runs {
+                crate::creature_anim::move_flags::FORWARD
+            } else {
+                0
+            }));
+            let mut spells = Spells::empty_for_tests();
+            spells.catalog = benilla_formats::SpellCatalog::from_displays(HashMap::from([(
+                HAMSTRING,
+                benilla_formats::SpellDisplay {
+                    range_index: 2,
+                    ..Default::default()
+                },
+            )]));
+            spells.ranges = benilla_formats::SpellRangeCatalog::from_rows(HashMap::from([(
+                2,
+                SpellRange {
+                    min: 0.0,
+                    max: 5.0,
+                    flags: 1,
+                },
+            )]));
+            world.insert_resource(spells);
+            let speeds = crate::net::UnitSpeeds(benilla_protocol::MoveSpeeds {
+                walk: 2.5,
+                run: 7.0,
+                run_back: 4.5,
+                swim: 4.7,
+                swim_back: 2.5,
+                turn_rate: 3.1,
+            });
+            let live = || {
+                crate::net::ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(22, 100)]))
+            };
+            world.spawn((
+                SelfPlayer,
+                crate::net::Embodied,
+                speeds,
+                Transform::default(),
+                GlobalTransform::default(),
+                live(),
+            ));
+            let unit = world
+                .spawn((
+                    speeds,
+                    GlobalTransform::from_translation(Vec3::new(distance, 0.0, 0.0)),
+                    live(),
+                ))
+                .id();
+            if unit_runs {
+                world.entity_mut(unit).insert(crate::net::Spline {
+                    points: vec![[distance, 0.0, 0.0], [distance + 16.0, 0.0, 0.0]],
+                    start: std::time::Instant::now(),
+                    duration: std::time::Duration::from_secs(2),
+                    id: 1,
+                    grounded: true,
+                    run_mode: true,
+                    deck: None,
+                });
+            }
+            world.insert_resource(crate::target::Hovered {
+                target: Some(unit),
+                guid: Some(0xF130_0000_0000_0001),
+                distance: 5.0,
+                ..Default::default()
+            });
+            world.resource_mut::<SpellTargeting>().enter(
+                HAMSTRING,
+                crate::spell::CastCommit::Spell,
+                0x0002,
+            );
+            world
+                .run_system_once(drive_targeting_cursor)
+                .expect("the targeting cursor drives");
+            !world.resource::<WorldCursor>().unable
+        };
+        assert!(verdict(true, true, 7.5), "both running: inside 7.667");
+        assert!(!verdict(true, true, 8.0), "past it");
+        assert!(!verdict(false, true, 7.5), "the caster stands");
+        assert!(!verdict(true, false, 7.5), "the unit stands");
+        assert!(verdict(false, false, 4.9), "the floor");
+    }
+
     /// `0x6e6460`'s corpse leg over a hovered corpse: bones, a hostile corpse under the ally bit
     /// and a corpse out of range are grey. The range pads a corpse by the caster's reach twice
     /// (`6e3605`–`6e361e`): Resurrection's 30 yd with a 3.0 reach is 36.
@@ -457,6 +970,7 @@ mod tests {
             world.init_resource::<crate::go_templates::GameObjectTemplates>();
             world.init_resource::<crate::items::Items>();
             world.init_resource::<crate::net::GuidIndex>();
+            world.init_resource::<crate::spell::SpellModifiers>();
             world.insert_resource(crate::net::Reputations(Vec::new()));
             world.init_resource::<PickOcclusion>();
             world.insert_resource(fx::spells());
diff --git a/crates/benilla-app/src/spell/targeting/mod.rs b/crates/benilla-app/src/spell/targeting/mod.rs
index 5529d2d1..c29b2c34 100644
--- a/crates/benilla-app/src/spell/targeting/mod.rs
+++ b/crates/benilla-app/src/spell/targeting/mod.rs
@@ -9,7 +9,9 @@
 //! - [`world`]: the world-click dispatcher `0x492ce0`, its terrain leg (`0x492580` → `BindLocation
 //!   0x6e60f0`) and its object leg (`0x4925d0` → `SetSelection 0x493540` → `BindTarget 0x6e5b40`),
 //!   whose unit arm [`bind_target_unit`] shares with `SpellTargetUnit`
-//!   ([`drain_spell_target_unit`]), and whose corpse arm is [`corpse`]'s.
+//!   ([`ScriptCursor::spell_target_unit`]), and whose corpse arm is [`corpse`]'s.
+//! - [`pick`]: the world pick's unit and player filter, `0x481050`'s flags from the word and each
+//!   candidate's `0x480610`, so a unit the word cannot take is out of the hover and the click.
 //! - [`item`]: the bag click (`PickupContainerItem 0x4f9b30`) and the paper-doll click
 //!   (`0x4c7300`), both `IsTargeting`, `TargetingWantsItem 0x6e6330`, then `0x495d60`, whose
 //!   confirm popups park the clicked guid (`0xb4e3c0`) with the word still standing.
@@ -20,7 +22,7 @@
 //! targeting, the pick flags come from the word alone, so a click over a unit with a dest-only
 //! word commits on the ground behind it.
 //!
-//! Cancels: ESC through `UIParent.lua:1490` ([`feed_targeting_to_vm`], [`drain_stop_targeting`]),
+//! Cancels: ESC through `UIParent.lua:1490` ([`feed_targeting_to_vm`], [`ScriptCursor::stop_targeting`]),
 //! the right-button down edge ([`cancel_targeting_on_right_press`]), a new spell's press, which
 //! aborts and proceeds (`TryCast 0x6e4b60` at `0x6e4d62`), and the bar's re-press of the same
 //! spell (`UseAction 0x4e5ee0`). A cancel clears the word and sends nothing; movement never
@@ -29,6 +31,7 @@
 mod corpse;
 mod cursor;
 mod item;
+mod pick;
 mod world;
 
 #[cfg(test)]
@@ -36,6 +39,7 @@ pub(crate) use corpse::fixture as corpse_fixture;
 pub(crate) use corpse::{corpse_pick_admits, publish_corpse_pick, CorpsePick};
 pub(crate) use cursor::{drive_targeting_cursor, ground_cast_radius};
 pub(crate) use item::{commit_item_cast_on_pick, EnchantConfirmItem};
+pub(crate) use pick::{publish_unit_pick, PickChecks, UnitPick};
 pub(crate) use world::{commit_ground_cast_on_click, commit_object_cast_on_click};
 
 use bevy::prelude::*;
@@ -44,8 +48,8 @@ use benilla_world::interact::WorldRightPress;
 
 /// The inputs of `BindTarget 0x6e5b40`'s unit and corpse arms and of their read-only mirror
 /// `0x6e6460` ([`SpellTargeting::can_target_unit`], [`bind_target_unit`],
-/// [`SpellTargeting::can_target_corpse`], [`corpse::bind_target_corpse`]): the relation checks the
-/// cast arm's selection bind runs ([`super::cast_target::unit_word_binds`]), the corpse's two
+/// [`SpellTargeting::can_target_corpse`], [`corpse::bind_target_corpse`]): the gates and relation
+/// checks the cast arm's selection bind runs ([`super::cast_target::unit_binds`]), the corpse's two
 /// facts, and the pre-send range gate's inputs ([`super::cast_target::RangeInputs`]), read as
 /// [`super::cast_target::CastTargeting`] reads them.
 #[derive(bevy::ecs::system::SystemParam)]
@@ -58,13 +62,21 @@ pub(crate) struct BindChecks<'w, 's> {
         (Entity, Option<&'static crate::net::ObjectStore>),
         With<crate::net::SelfPlayer>,
     >,
+    guids: Query<'w, 's, &'static crate::net::Guid>,
     factions: Option<Res<'w, crate::target::Factions>>,
     reputations: Res<'w, crate::net::Reputations>,
+    /// The party slots and raid roster as the frame began; a harness without them has no group.
+    roster: Option<Res<'w, super::group_relation::GroupRoster>>,
+    names: Option<Res<'w, crate::names::NameCache>>,
     /// The range leg's positions: the pose the hover picks against, as last frame propagated it,
     /// so the VM feed, the cursor and both binds read one pose. Never the camera's, which
     /// `publish_camera_pose` rewrites mid-frame.
     poses: Query<'w, 's, &'static GlobalTransform, Without<benilla_world::view::WorldCamera>>,
     spells: Option<Res<'w, crate::ui_action::Spells>>,
+    spell_mods: Res<'w, super::SpellModifiers>,
+    /// The caster, a unit and the caster's auto-attack target (`[caster+0xc48]`, which
+    /// `GetMinMaxRange` looks up) as the range compare reads them.
+    range_units: super::RangeUnits<'w, 's>,
 }
 
 impl BindChecks<'_, '_> {
@@ -75,25 +87,36 @@ impl BindChecks<'_, '_> {
             .is_some_and(|(me, _)| me == entity)
     }
 
-    /// `BindTarget 0x6e5b40`'s relation checks: whether this unit clears the whole word.
-    fn relations_clear(&self, word: u16, entity: Entity) -> bool {
+    /// `BindTarget 0x6e5b40`'s unit branch: whether this unit binds the word under this spell,
+    /// its gates and then its relation checks ([`super::cast_target::unit_binds`]). An unknown
+    /// spell has no row to gate on.
+    fn unit_binds(&self, spell_id: u32, word: u16, entity: Entity) -> bool {
         let target_store = self.stores.get(entity).ok();
-        let target_owner_store = target_store
-            .and_then(|store| {
-                store
-                    .0
-                    .unit_owner(benilla_protocol::messages::OwnerFallback::CreatedBy)
-            })
-            .and_then(|guid| self.index.as_ref()?.0.get(&guid).copied())
-            .and_then(|owner| self.stores.get(owner).ok());
+        let owner_store =
+            |store| super::cast_target::owner_store(store, self.index.as_deref(), &self.stores);
+        let me = self.self_q.iter().next();
+        let self_store = me.and_then(|(_, store)| store);
         let rel = super::cast_target::TargetRelations {
             target_store,
-            target_owner_store,
-            self_store: self.self_q.iter().next().and_then(|(_, store)| store),
+            target_owner_store: owner_store(target_store),
+            self_store,
             factions: self.factions.as_deref(),
             reputations: &self.reputations,
+            types: crate::creature_type::CreatureTypeSources {
+                names: self.names.as_deref(),
+                forms: self.spells.as_deref().map(|s| &s.forms),
+            },
+            group: super::group_relation::GroupInputs {
+                self_guid: me
+                    .and_then(|(me, _)| self.guids.get(me).ok())
+                    .map(|guid| guid.0),
+                target_guid: self.guids.get(entity).ok().map(|guid| guid.0),
+                self_owner_store: owner_store(self_store),
+                roster: self.roster.as_deref(),
+            },
         };
-        super::cast_target::unit_word_binds(word, self.is_self(entity), &rel)
+        let def = self.spells.as_deref().and_then(|s| s.catalog.get(spell_id));
+        super::cast_target::unit_binds(def, word, self.is_self(entity), &rel)
     }
 
     /// The spell's min/max range against this unit, through the one compare the pre-send gate
@@ -101,28 +124,25 @@ impl BindChecks<'_, '_> {
     /// unknown spell or a missing row passes.
     fn range_refusal(&self, spell_id: u32, entity: Entity) -> Option<u8> {
         let mut range = self.range_inputs(entity);
-        range.target_reach = self
-            .stores
-            .get(entity)
-            .ok()
-            .map(|s| s.0.unit_combat_reach());
+        range.target = self.range_units.unit(entity);
         self.refusal(spell_id, range)
     }
 
     /// The same compare against a corpse. `GetMinMaxRange 0x6e3480` pads a corpse's bounds as a
     /// unit's (`6e35fe`), but with no unit to read the second reach from it reads the caster's
-    /// again (`6e3605`–`6e361e`).
+    /// again (`6e3605`–`6e361e`). On the ranged arm, which the corpse spells use, no unit means no
+    /// moving bonus; a melee row would fall back to the auto-attack target (`0x6e3580`).
     fn corpse_range_refusal(&self, spell_id: u32, entity: Entity) -> Option<u8> {
         let mut range = self.range_inputs(entity);
-        range.target_reach = Some(range.self_reach);
+        range.target = Some(benilla_formats::RangeUnit::still(range.caster.reach));
         self.refusal(spell_id, range)
     }
 
-    /// Our position and reach and the candidate's position, each position the pose the hover
-    /// picks against.
+    /// Our position, reach and motion and the candidate's position, each position the pose the
+    /// hover picks against.
     fn range_inputs(&self, entity: Entity) -> super::cast_target::RangeInputs {
         let me = self.self_q.iter().next();
-        let mut range = super::cast_target::RangeInputs {
+        super::cast_target::RangeInputs {
             self_pos: me
                 .and_then(|(e, _)| self.poses.get(e).ok())
                 .map(GlobalTransform::translation),
@@ -131,18 +151,15 @@ impl BindChecks<'_, '_> {
                 .get(entity)
                 .ok()
                 .map(GlobalTransform::translation),
-            ..Default::default()
-        };
-        if let Some((_, Some(store))) = me {
-            range.self_reach = store.0.unit_combat_reach();
+            caster: self.range_units.caster(),
+            target: None,
         }
-        range
     }
 
     fn refusal(&self, spell_id: u32, range: super::cast_target::RangeInputs) -> Option<u8> {
         let spells = self.spells.as_deref()?;
         let def = spells.catalog.get(spell_id)?;
-        range.refusal(def, spells.ranges.get(def.range_index))
+        range.refusal(def, spells.ranges.get(def.range_index), &self.spell_mods)
     }
 
     /// What the corpse legs read of this corpse: `CORPSE_FLAG_BONES` and the reaction gate
@@ -154,16 +171,6 @@ impl BindChecks<'_, '_> {
             self.self_q.iter().next().and_then(|(_, s)| s),
         ))
     }
-
-    /// The caster under a spell with `AttributesEx & 0x80000` (`6e6507`).
-    fn excluded_caster(&self, spell_id: u32, entity: Entity) -> bool {
-        self.is_self(entity)
-            && self
-                .spells
-                .as_deref()
-                .and_then(|s| s.catalog.get(spell_id))
-                .is_some_and(|d| d.excludes_caster())
-    }
 }
 
 /// A click seam's mask test on the flag_word `0xcecac0`, one per reference predicate:
@@ -240,13 +247,12 @@ impl SpellTargeting {
 
     /// `SpellCanTargetUnit`'s predicate `0x6e6460`, its unit leg, with the range flag both callers
     /// pass (the world hover `0x4828d0` at `48290b`, the Lua `SpellCanTargetUnit 0x6e6d00`):
-    /// `BindTarget`'s relation checks, the caster refused under `AttributesEx & 0x80000`
-    /// (`6e6507`), then min² ≤ d² ≤ max² (`6e677c`–`6e6802`), so a unit inside the minimum is out
-    /// too. There is no line-of-sight test.
+    /// `BindTarget`'s gates and relation checks (`6e6507`–`6e65ab`), then min² ≤ d² ≤ max²
+    /// (`6e677c`–`6e6802`), so a unit inside the minimum is out too. There is no line-of-sight
+    /// test.
     pub(crate) fn can_target_unit(&self, entity: Entity, checks: &BindChecks) -> bool {
         self.0.as_ref().is_some_and(|t| {
-            checks.relations_clear(t.word, entity)
-                && !checks.excluded_caster(t.spell_id, entity)
+            checks.unit_binds(t.spell_id, t.word, entity)
                 && checks.range_refusal(t.spell_id, entity).is_none()
         })
     }
@@ -363,7 +369,6 @@ pub(crate) fn feed_targeting_to_vm(
     targeting: Res<SpellTargeting>,
     checks: BindChecks,
     tokens: crate::ui_unit::UnitTokens,
-    selection: Res<crate::target::Selection>,
     mut last: Local<crate::ui_script::VmMemo<Option<u32>>>,
     script: Option<NonSendMut<benilla_ui::script::UiScript>>,
 ) {
@@ -371,12 +376,19 @@ pub(crate) fn feed_targeting_to_vm(
         let last = last.get(&script);
         script.set_spell_targeting(targeting.active());
         script.set_item_pick_armed(targeting.wants(TargetingWants::Item));
-        // `SpellCanTargetUnit(unit)`: resolve each token and ask `0x6e6460`'s unit leg.
-        script.set_spell_targetable_units(crate::ui_unit::reach_tokens().filter(|token| {
-            tokens
-                .resolve(token, &selection)
-                .is_some_and(|(entity, _)| targeting.can_target_unit(entity, &checks))
-        }));
+        // `SpellCanTargetUnit(unit)`: the VM resolves the token to a guid (`0x6e6d3a`), and
+        // `0x6e6460`'s unit leg answers for that guid. The units to ask are the held ones the
+        // resolver's inputs list, the `target` chains' included.
+        let targetable: Vec<u64> = script
+            .held_unit_guids()
+            .into_iter()
+            .filter(|&guid| {
+                tokens
+                    .held(guid)
+                    .is_some_and(|(entity, _)| targeting.can_target_unit(entity, &checks))
+            })
+            .collect();
+        script.set_spell_targetable_units(targetable);
         if *last != targeting.spell() {
             *last = targeting.spell();
             script.fire_event("CURRENT_SPELL_CAST_CHANGED", vec![]);
@@ -384,25 +396,9 @@ pub(crate) fn feed_targeting_to_vm(
     }
 }
 
-/// Drain the ESC chain's `SpellStopTargeting()` after the input pass: `StopTargeting 0x6e4900`,
-/// word cleared, no packet.
-pub(crate) fn drain_stop_targeting(
-    mut targeting: ResMut<SpellTargeting>,
-    script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    if script.take_stop_targeting() {
-        debug!("ui_action: targeting cancelled (ESC chain)");
-        targeting.clear();
-    }
-}
-
 /// `BindTarget 0x6e5b40`'s unit arm, for the world click (`0x493540` at `4935d5`) and
-/// `SpellTargetUnit` (`0x6e5b10`): the caster under `AttributesEx & 0x80000` (`6e5bf7`) or a unit
-/// failing the relation checks binds nothing and the cursor stays up; otherwise the merge. The
-/// player's selection never moves.
+/// `SpellTargetUnit` (`0x6e5b10`): a unit the gates or the relation checks refuse binds nothing
+/// and the cursor stays up; otherwise the merge. The player's selection never moves.
 fn bind_target_unit(
     ladder: &mut crate::spell::CastLadder,
     checks: &BindChecks,
@@ -412,7 +408,7 @@ fn bind_target_unit(
     let Some((spell_id, commit, word)) = ladder.ground.pending() else {
         return;
     };
-    if checks.excluded_caster(spell_id, entity) || !checks.relations_clear(word, entity) {
+    if !checks.unit_binds(spell_id, word, entity) {
         return;
     }
     let range = checks.range_refusal(spell_id, entity);
@@ -447,36 +443,43 @@ fn merge(
     ladder.commit_targeted(spell_id, commit, bound);
 }
 
-/// Drain `SpellTargetUnit(unit)` (`0x6e6d90`) after the UI pass. The binding already raised the
-/// usage and unknown-token errors and dropped a call made while not targeting. Here a token that
-/// names no unit raises "Out of range." (0x59) and ends targeting, as the reference's abort
-/// clears the word, and a unit goes to [`bind_target_unit`].
-pub(crate) fn drain_spell_target_unit(
-    script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-    tokens: crate::ui_unit::UnitTokens,
-    selection: Res<crate::target::Selection>,
-    checks: BindChecks,
-    mut ladder: crate::spell::CastLadder,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    for token in script.take_spell_target_unit() {
-        // An earlier token this frame may have bound or ended the cast: not targeting, no-op.
-        let Some(spell_id) = ladder.ground.spell() else {
-            continue;
+/// The targeting cursor's script calls, applied in call order by [`crate::script_calls`].
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct ScriptCursor<'w, 's> {
+    tokens: crate::ui_unit::UnitTokens<'w, 's>,
+    selection: Res<'w, crate::target::Selection>,
+    checks: BindChecks<'w, 's>,
+    ladder: crate::spell::CastLadder<'w, 's>,
+}
+
+impl ScriptCursor<'_, '_> {
+    /// `SpellTargetUnit(unit)` (`0x6e6d90`). The binding already raised the usage and
+    /// unknown-token errors and dropped a call made while not targeting. Here a token that names
+    /// no unit raises "Out of range." (0x59) and ends targeting, as the reference's abort clears
+    /// the word, and a unit goes to [`bind_target_unit`].
+    pub(crate) fn spell_target_unit(&mut self, token: &str) {
+        // An earlier call may have bound or ended the cast: not targeting, no-op.
+        let Some(spell_id) = self.ladder.ground.spell() else {
+            return;
         };
-        match tokens.resolve(&token, &selection) {
-            Some((entity, guid)) => bind_target_unit(&mut ladder, &checks, entity, guid),
+        match self.tokens.resolve(token, &self.selection) {
+            Some((entity, guid)) => bind_target_unit(&mut self.ladder, &self.checks, entity, guid),
             None => {
                 debug!("ui_action: SpellTargetUnit({token}) names no unit — cast {spell_id} ends");
-                ladder
+                self.ladder
                     .cast_errors
                     .push_local(spell_id, super::validator::ERR_OUT_OF_RANGE);
-                ladder.ground.clear();
+                self.ladder.ground.clear();
             }
         }
     }
+
+    /// The ESC chain's `SpellStopTargeting()` (`0x6e6e30`): `StopTargeting 0x6e4900`, word
+    /// cleared, no packet.
+    pub(crate) fn stop_targeting(&mut self) {
+        debug!("ui_action: targeting cancelled (ESC chain)");
+        self.ladder.ground.clear();
+    }
 }
 
 #[cfg(test)]
@@ -513,6 +516,7 @@ mod tests {
         world.init_resource::<crate::spell::AutoRepeatActive>();
         world.init_resource::<crate::ui_tradeskill::TradeSkillOpens>();
         world.init_resource::<SpellTargeting>();
+        world.init_resource::<crate::spell::HeldForPick>();
         world.init_resource::<Messages<crate::creature_anim::SheathRequest>>();
         world.init_resource::<crate::ui_party::GroupState>();
         let mut spells = crate::ui_action::Spells::empty_for_tests();
@@ -538,18 +542,20 @@ mod tests {
             (114, row(8.0, 35.0)),
         ]));
         world.insert_resource(spells);
-        let empty = || ObjectStore(benilla_protocol::ObjectFields::default());
-        world.spawn((SelfPlayer, Guid(ME), GlobalTransform::default(), empty()));
+        // `UNIT_FIELD_HEALTH` 100: a store with no health reads dead to `BindTarget`'s gates.
+        let live = || ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(22, 100)]));
+        world.spawn((SelfPlayer, Guid(ME), GlobalTransform::default(), live()));
         let ally = world
             .spawn((
                 Guid(ALLY),
                 GlobalTransform::from_translation(Vec3::new(distance, 0.0, 0.0)),
-                empty(),
+                live(),
             ))
             .id();
         world.insert_resource(crate::target::Selection {
             target: Some(ally),
             guid: Some(ALLY),
+            ..Default::default()
         });
         let mut script = UiScript::new().expect("a VM");
         script.set_spell_targeting(true);
@@ -565,15 +571,48 @@ mod tests {
         );
     }
 
-    /// Queue `SpellTargetUnit(token)` in the VM, then run the host's drain.
+    /// What the aura feed pushes each frame for the units this world holds, us and the selection:
+    /// the resolver's inputs, and the object manager's index of them. `SpellCanTargetUnit`
+    /// resolves its token through the inputs, and the feed asks the verdict of each unit they list.
+    fn publish_guids(world: &mut World) {
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(world)
+            .expect("the player");
+        let selection = world.resource::<crate::target::Selection>();
+        let selected = selection.target.zip(selection.guid);
+        let mut guids = benilla_ui::script::UnitGuids {
+            player: ME,
+            held: HashMap::from([(ME, 0)]),
+            ..Default::default()
+        };
+        let mut index = world.resource_mut::<crate::net::GuidIndex>();
+        index.0.insert(ME, me);
+        if let Some((entity, guid)) = selected {
+            index.0.insert(guid, entity);
+            guids.target = guid;
+            guids.held.insert(guid, 0);
+        }
+        world
+            .non_send_resource_mut::<UiScript>()
+            .set_unit_guids(&guids);
+    }
+
+    /// Queue `SpellTargetUnit(token)` in the VM, then apply it.
     fn spell_target_unit(world: &mut World, token: &str) {
         world
             .non_send_resource_mut::<UiScript>()
             .run(&format!("SpellTargetUnit({token:?})"))
             .expect("a known token");
         world
-            .run_system_cached(drain_spell_target_unit)
-            .expect("the drain runs");
+            .run_system_cached(
+                |mut script: NonSendMut<UiScript>, mut cursor: ScriptCursor| {
+                    for token in script.take_spell_target_unit() {
+                        cursor.spell_target_unit(&token);
+                    }
+                },
+            )
+            .expect("the applier runs");
     }
 
     fn errors(world: &mut World) -> Vec<crate::ui_action::CastFail> {
@@ -649,6 +688,584 @@ mod tests {
         assert_eq!((selection.target, selection.guid), (Some(ally), Some(ALLY)));
     }
 
+    /// `SpellTargetUnit` takes a `target` chain as the resolver does (`0x6e6de1` into `0x515970`):
+    /// `"pettarget"` and `"playertarget"` bind the unit our pet and we target, where a chain that
+    /// names no unit still ends the cast with "Out of range.".
+    #[test]
+    fn spell_target_unit_follows_a_target_chain() {
+        const PET: u64 = 0xF140_0000_0000_0077;
+        // `OBJECT_FIELD_TYPE` and `UNIT_FIELD_TARGET`, the latter a 2-field guid.
+        let unit = |kind: u32, target: u64| {
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (2, kind),
+                (16, target as u32),
+                (17, (target >> 32) as u32),
+            ]))
+        };
+        let seat = |world: &mut World, ally: Entity| {
+            // We and our pet target the ally; the ally targets nobody.
+            let me = world
+                .query_filtered::<Entity, With<SelfPlayer>>()
+                .single(world)
+                .unwrap();
+            world.entity_mut(me).insert(unit(0x19, ALLY));
+            let pet = world.spawn((Guid(PET), unit(0x09, ALLY))).id();
+            let mut bar = crate::ui_pet::PetBar::default();
+            bar.spells.pet_guid = PET;
+            world.insert_resource(bar);
+            let mut index = world.resource_mut::<crate::net::GuidIndex>();
+            index.0.insert(ME, me);
+            index.0.insert(ALLY, ally);
+            index.0.insert(PET, pet);
+        };
+        let fail = vec![crate::ui_action::CastFail::local(HEAL, 0x59)];
+        for token in ["pettarget", "playertarget", "PETTARGET"] {
+            let (mut world, rx, ally) = unit_world(10.0);
+            seat(&mut world, ally);
+            arm(&mut world, HEAL, 0x0002);
+            spell_target_unit(&mut world, token);
+            assert!(
+                matches!(
+                    rx.try_recv(),
+                    Ok(ClientCommand::CastSpell {
+                        spell_id: HEAL,
+                        target: Some(ALLY),
+                    })
+                ),
+                "{token} binds the ally"
+            );
+            assert!(errors(&mut world).is_empty(), "{token}");
+            assert!(!world.resource::<SpellTargeting>().active(), "{token}");
+        }
+
+        // The ally targets nobody, so a hop off it names no unit: the cast ends.
+        for token in ["pettargettarget", "party1target", "pettargetfoo"] {
+            let (mut world, rx, ally) = unit_world(10.0);
+            seat(&mut world, ally);
+            arm(&mut world, HEAL, 0x0002);
+            spell_target_unit(&mut world, token);
+            assert!(rx.try_recv().is_err(), "{token}: no send");
+            assert_eq!(errors(&mut world), fail, "{token}");
+            assert!(!world.resource::<SpellTargeting>().active(), "{token}");
+        }
+    }
+
+    /// `SpellCanTargetUnit` resolves a chain as `SpellTargetUnit` does and answers the verdict of
+    /// the unit it ends on (`0x6e6d3a` into `0x515970`, then `0x6e6460`): the ally we and our pet
+    /// target, in range of the spell or not, and nobody past a unit with no target.
+    #[test]
+    fn spell_can_target_unit_follows_a_target_chain() {
+        const PET: u64 = 0xF140_0000_0000_0077;
+        // `OBJECT_FIELD_TYPE`, `UNIT_FIELD_HEALTH` and `UNIT_FIELD_TARGET`, the last a 2-field guid.
+        let unit = |kind: u32, target: u64| {
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (2, kind),
+                (22, 100),
+                (16, target as u32),
+                (17, (target >> 32) as u32),
+            ]))
+        };
+        let can = |distance: f32, token: &str| {
+            let (mut world, _rx, ally) = unit_world(distance);
+            // We and our pet target the ally; the ally targets nobody.
+            let me = world
+                .query_filtered::<Entity, With<SelfPlayer>>()
+                .single(&world)
+                .unwrap();
+            world.entity_mut(me).insert(unit(0x19, ALLY));
+            world.entity_mut(ally).insert(unit(0x09, 0));
+            let pet = world
+                .spawn((Guid(PET), GlobalTransform::default(), unit(0x09, ALLY)))
+                .id();
+            let mut bar = crate::ui_pet::PetBar::default();
+            bar.spells.pet_guid = PET;
+            world.insert_resource(bar);
+            let mut index = world.resource_mut::<crate::net::GuidIndex>();
+            index.0.insert(PET, pet);
+            arm(&mut world, HEAL, 0x0002);
+            // The index of us and the ally, then the aura feed's inputs with the chain's units:
+            // each held unit and the target it names.
+            publish_guids(&mut world);
+            world.non_send_resource_mut::<UiScript>().set_unit_guids(
+                &benilla_ui::script::UnitGuids {
+                    player: ME,
+                    pet: PET,
+                    target: ALLY,
+                    held: HashMap::from([(ME, ALLY), (PET, ALLY), (ALLY, 0)]),
+                    ..Default::default()
+                },
+            );
+            world
+                .run_system_cached(feed_targeting_to_vm)
+                .expect("the feed runs");
+            world
+                .non_send_resource::<UiScript>()
+                .eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == 1"))
+                .expect("a boolean")
+        };
+        for token in ["pettarget", "playertarget", "PETTARGET", "target"] {
+            assert!(can(10.0, token), "{token}: the ally in range");
+            assert!(!can(40.0, token), "{token}: the ally out of range");
+        }
+        for token in ["pettargettarget", "playertargettarget", "party1target"] {
+            assert!(!can(10.0, token), "{token}: past the ally, nobody");
+        }
+    }
+
+    /// The press (`resolve_cast_target`), the click and `SpellTargetUnit` ([`bind_target_unit`]) and
+    /// the hover verdict (`SpellCanTargetUnit`) all ask [`crate::spell::cast_target::unit_binds`],
+    /// so one table of units decides all three: `BindTarget`'s gates refuse the same units at
+    /// each, and the control row beside each refusal binds at each.
+    #[test]
+    fn the_press_the_click_and_the_hover_bind_the_same_units() {
+        use crate::names::{CreatureRecord, NameCache};
+        use crate::spell::cast_target::{
+            cast_target_mask, resolve_cast_target, CastCandidates, CastWireTarget, TargetRelations,
+        };
+        use benilla_formats::SpellDisplay;
+        use benilla_protocol::ObjectFields;
+
+        const SPELL: u32 = 3000;
+        /// Absolute descriptor indices: `OBJECT_FIELD_ENTRY`, `UNIT_FIELD_HEALTH`,
+        /// `UNIT_FIELD_FLAGS` and `UNIT_DYNAMIC_FLAGS`.
+        const ENTRY: u16 = 3;
+        const HEALTH: u16 = 22;
+        const FLAGS: u16 = 46;
+        const DYNAMIC_FLAGS: u16 = 143;
+        const HUMANOID: u32 = 69;
+        const BEAST: u32 = 70;
+
+        let make_names = || {
+            let mut names = NameCache::default();
+            for (entry, creature_type) in [(HUMANOID, 7), (BEAST, 1)] {
+                names.insert_creature(
+                    entry,
+                    Some(CreatureRecord {
+                        name: String::new(),
+                        subname: None,
+                        creature_type,
+                        pet_family: 0,
+                        rank: 0,
+                        type_flags: 0,
+                        civilian: false,
+                        racial_leader: false,
+                        display_id: 0,
+                    }),
+                );
+            }
+            names
+        };
+        fn plain() -> SpellDisplay {
+            SpellDisplay {
+                targets: 0x2,
+                ..Default::default()
+            }
+        }
+        fn hibernate() -> SpellDisplay {
+            SpellDisplay {
+                target_creature_type: 0x3,
+                ..plain()
+            }
+        }
+        fn excluding() -> SpellDisplay {
+            SpellDisplay {
+                attributes_ex: 0x0008_0000,
+                ..plain()
+            }
+        }
+        fn skinning() -> SpellDisplay {
+            SpellDisplay {
+                targets: 0x402,
+                ..Default::default()
+            }
+        }
+        fn raise() -> SpellDisplay {
+            SpellDisplay {
+                attributes_ex2: 1,
+                ..plain()
+            }
+        }
+        // (label, spell, the caster is the candidate, the candidate's fields, binds)
+        #[allow(clippy::type_complexity)]
+        let cases: Vec<(&str, fn() -> SpellDisplay, bool, Vec<(u16, u32)>, bool)> = vec![
+            ("a live unit", plain, false, vec![(HEALTH, 100)], true),
+            ("a dead unit", plain, false, vec![(HEALTH, 0)], false),
+            ("no health streamed", plain, false, vec![], false),
+            (
+                "a dead unit, AttributesEx2 & 1",
+                raise,
+                false,
+                vec![(HEALTH, 0)],
+                true,
+            ),
+            (
+                "a dead unit, the dynamic dead flag",
+                plain,
+                false,
+                vec![(HEALTH, 0), (DYNAMIC_FLAGS, 0x20)],
+                true,
+            ),
+            (
+                "UNIT_FIELD_FLAGS & 0x10000",
+                plain,
+                false,
+                vec![(HEALTH, 100), (FLAGS, 0x1_0000)],
+                false,
+            ),
+            (
+                "a Humanoid under Hibernate's mask",
+                hibernate,
+                false,
+                vec![(HEALTH, 100), (ENTRY, HUMANOID)],
+                false,
+            ),
+            (
+                "a Beast under Hibernate's mask",
+                hibernate,
+                false,
+                vec![(HEALTH, 100), (ENTRY, BEAST)],
+                true,
+            ),
+            (
+                "the caster, AttributesEx & 0x80000",
+                excluding,
+                true,
+                vec![(HEALTH, 100)],
+                false,
+            ),
+            (
+                "another unit, AttributesEx & 0x80000",
+                excluding,
+                false,
+                vec![(HEALTH, 100)],
+                true,
+            ),
+            (
+                "a living unit under the 0x400 word",
+                skinning,
+                false,
+                vec![(HEALTH, 100)],
+                false,
+            ),
+            (
+                "a dead unit under the 0x400 word",
+                skinning,
+                false,
+                vec![(HEALTH, 0)],
+                true,
+            ),
+        ];
+
+        for (label, make_def, on_self, fields, binds) in cases {
+            let (mut world, rx, ally) = unit_world(10.0);
+            let me = world
+                .query_filtered::<Entity, With<SelfPlayer>>()
+                .single(&world)
+                .expect("the player");
+            let (entity, guid, token) = if on_self {
+                (me, ME, "player")
+            } else {
+                (ally, ALLY, "target")
+            };
+            let store = ObjectStore(ObjectFields::from_pairs(&fields));
+            world.entity_mut(entity).insert(store.clone());
+            let word = cast_target_mask(&make_def());
+            let mut spells = world.resource_mut::<crate::ui_action::Spells>();
+            spells.catalog = benilla_formats::SpellCatalog::from_displays(HashMap::from([(
+                SPELL,
+                SpellDisplay {
+                    range_index: 5,
+                    ..make_def()
+                },
+            )]));
+            world.insert_resource(make_names());
+            arm(&mut world, SPELL, word);
+
+            // The hover verdict.
+            publish_guids(&mut world);
+            world
+                .run_system_cached(feed_targeting_to_vm)
+                .expect("the feed runs");
+            let hover = world
+                .non_send_resource::<UiScript>()
+                .eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == 1"))
+                .expect("a boolean");
+            assert_eq!(hover, binds, "{label}: the hover verdict");
+
+            // The click, through `SpellTargetUnit`.
+            spell_target_unit(&mut world, token);
+            let clicked = matches!(
+                rx.try_recv(),
+                Ok(ClientCommand::CastSpell {
+                    spell_id: SPELL,
+                    target: Some(sent),
+                }) if sent == guid
+            );
+            assert_eq!(clicked, binds, "{label}: the cursor's click");
+            assert_eq!(
+                world.resource::<SpellTargeting>().active(),
+                !binds,
+                "{label}: a bind ends the cursor, a refusal leaves it up"
+            );
+
+            // The press, from the same fields.
+            let (def, names) = (make_def(), make_names());
+            let pressed = resolve_cast_target(
+                Some(&def),
+                &CastCandidates {
+                    selection: Some(guid),
+                    caster: Some(ME),
+                    main_hand_item: None,
+                },
+                false,
+                &TargetRelations {
+                    target_store: Some(&store),
+                    target_owner_store: None,
+                    self_store: Some(&store),
+                    factions: None,
+                    reputations: &crate::net::Reputations(Vec::new()),
+                    types: crate::creature_type::CreatureTypeSources {
+                        names: Some(&names),
+                        forms: None,
+                    },
+                    group: Default::default(),
+                },
+            );
+            assert_eq!(
+                pressed == CastWireTarget::Unit(guid),
+                binds,
+                "{label}: the press ({pressed:?})"
+            );
+        }
+    }
+
+    /// The party word (target 35) and the raid word (target 57) over the same three surfaces: the
+    /// press through [`crate::spell::cast_target::CastTargeting`], the click through
+    /// `SpellTargetUnit` and the hover verdict through `SpellCanTargetUnit`, each fed the group
+    /// as `GroupState` holds it and the frame publishes it. A party member, and a pet that
+    /// answers to one, take both words; a raid member outside the party only the raid word; a
+    /// friendly player in no group, a friendly creature and a member we cannot assist neither;
+    /// the caster both.
+    #[test]
+    fn the_press_the_click_and_the_hover_bind_the_same_group_members() {
+        use crate::spell::cast_target::{
+            cast_target_mask, resolve_cast_target, CastCandidates, CastTargeting, CastWireTarget,
+        };
+        use crate::spell::group_relation::{fixture as gf, publish_group_roster, GroupRoster};
+        use crate::spell::targeting::corpse_fixture as fx;
+        use benilla_formats::SpellDisplay;
+        use benilla_protocol::messages::GroupMemberEntry;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const SPELL: u32 = 3001;
+        /// The guid a pet answers to.
+        const OWNER: u64 = 0x20;
+        #[derive(Clone, Copy)]
+        enum Standing {
+            None,
+            /// In our subgroup, so in a party slot.
+            Party,
+            /// In the raid roster and another subgroup.
+            Raid,
+        }
+        use Standing::{None as Nowhere, Party, Raid};
+
+        // (label, the candidate, its owner, who stands in the group and where, the caster is
+        // the candidate, binds under the party word, under the raid word)
+        #[allow(clippy::type_complexity)]
+        let cases: Vec<(
+            &str,
+            ObjectStore,
+            Option<ObjectStore>,
+            (u64, Standing),
+            bool,
+            bool,
+            bool,
+        )> = vec![
+            (
+                "a party member",
+                gf::player(1),
+                None,
+                (ALLY, Party),
+                false,
+                true,
+                true,
+            ),
+            (
+                "a raid member",
+                gf::player(1),
+                None,
+                (ALLY, Raid),
+                false,
+                false,
+                true,
+            ),
+            (
+                "a player in no group",
+                gf::player(1),
+                None,
+                (ALLY, Nowhere),
+                false,
+                false,
+                false,
+            ),
+            (
+                "a party member's pet",
+                gf::pet_of(OWNER, 1, false),
+                Some(gf::player(1)),
+                (OWNER, Party),
+                false,
+                true,
+                true,
+            ),
+            (
+                "a raid member's pet",
+                gf::pet_of(OWNER, 1, true),
+                Some(gf::player(1)),
+                (OWNER, Raid),
+                false,
+                false,
+                true,
+            ),
+            (
+                "a friendly creature",
+                gf::npc(1, gf::PVP),
+                None,
+                (ALLY, Nowhere),
+                false,
+                false,
+                false,
+            ),
+            (
+                "a party member of the other faction",
+                gf::player(2),
+                None,
+                (ALLY, Party),
+                false,
+                false,
+                false,
+            ),
+            (
+                "the caster",
+                gf::player(1),
+                None,
+                (ME, Nowhere),
+                true,
+                true,
+                true,
+            ),
+        ];
+
+        for (label, store, owner, (grouped, standing), on_self, party, raid) in cases {
+            for (word_label, implicit, binds) in [("party", 35, party), ("raid", 57, raid)] {
+                let label = format!("{label}, the {word_label} word");
+                let (mut world, rx, ally) = unit_world(10.0);
+                let me = world
+                    .query_filtered::<Entity, With<SelfPlayer>>()
+                    .single(&world)
+                    .expect("the player");
+                world.entity_mut(me).insert(gf::player(1));
+                let (entity, guid, token) = if on_self {
+                    (me, ME, "player")
+                } else {
+                    (ally, ALLY, "target")
+                };
+                if !on_self {
+                    world.entity_mut(ally).insert(store.clone());
+                }
+                if let Some(owner) = &owner {
+                    let owner = world
+                        .spawn((Guid(OWNER), GlobalTransform::default(), owner.clone()))
+                        .id();
+                    world
+                        .resource_mut::<crate::net::GuidIndex>()
+                        .0
+                        .insert(OWNER, owner);
+                }
+                world.insert_resource(fx::factions());
+                world.insert_resource(crate::net::SelfGuid(Some(ME)));
+                world.init_resource::<crate::spell::AutoSelfCast>();
+                world.init_resource::<GroupRoster>();
+                let member = |flags| GroupMemberEntry {
+                    name: String::new(),
+                    guid: grouped,
+                    status: 0,
+                    flags,
+                };
+                {
+                    let mut group = world.resource_mut::<crate::ui_party::GroupState>();
+                    match standing {
+                        Nowhere => {}
+                        Party => group.members = vec![member(0)],
+                        Raid => {
+                            group.group_type = crate::ui_party::GROUPTYPE_RAID;
+                            group.members = vec![member(1)];
+                        }
+                    }
+                }
+                world
+                    .run_system_once(publish_group_roster)
+                    .expect("the roster publishes");
+                world.resource_mut::<crate::target::Selection>().target = Some(entity);
+                world.resource_mut::<crate::target::Selection>().guid = Some(guid);
+
+                let def = || SpellDisplay {
+                    range_index: 5,
+                    implicit_target_a1: implicit,
+                    ..Default::default()
+                };
+                let word = cast_target_mask(&def());
+                world.resource_mut::<crate::ui_action::Spells>().catalog =
+                    benilla_formats::SpellCatalog::from_displays(HashMap::from([(SPELL, def())]));
+                arm(&mut world, SPELL, word);
+
+                // The hover verdict.
+                publish_guids(&mut world);
+                world
+                    .run_system_cached(feed_targeting_to_vm)
+                    .expect("the feed runs");
+                let hover = world
+                    .non_send_resource::<UiScript>()
+                    .eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == 1"))
+                    .expect("a boolean");
+                assert_eq!(hover, binds, "{label}: the hover verdict");
+
+                // The click, through `SpellTargetUnit`.
+                spell_target_unit(&mut world, token);
+                let clicked = matches!(
+                    rx.try_recv(),
+                    Ok(ClientCommand::CastSpell {
+                        spell_id: SPELL,
+                        target: Some(sent),
+                    }) if sent == guid
+                );
+                assert_eq!(clicked, binds, "{label}: the cursor's click");
+
+                // The press, through the context the action bar builds.
+                let def = def();
+                let pressed = world
+                    .run_system_once(move |targeting: CastTargeting| {
+                        resolve_cast_target(
+                            Some(&def),
+                            &CastCandidates {
+                                selection: Some(guid),
+                                caster: Some(ME),
+                                main_hand_item: None,
+                            },
+                            false,
+                            &targeting.context().rel,
+                        )
+                    })
+                    .expect("the press runs");
+                assert_eq!(
+                    pressed == CastWireTarget::Unit(guid),
+                    binds,
+                    "{label}: the press ({pressed:?})"
+                );
+            }
+        }
+    }
+
     /// `SpellCanTargetUnit` asks `0x6e6460`'s unit leg per token: nil out of range, inside the
     /// minimum included, and nil for ourselves under a spell that excludes its caster.
     #[test]
@@ -656,12 +1273,13 @@ mod tests {
         let can = |distance: f32, spell: u32, token: &str| {
             let (mut world, _rx, _) = unit_world(distance);
             arm(&mut world, spell, 0x0002);
+            publish_guids(&mut world);
             world
                 .run_system_cached(feed_targeting_to_vm)
                 .expect("the feed runs");
             world
                 .non_send_resource::<UiScript>()
-                .eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == true"))
+                .eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == 1"))
                 .expect("a boolean")
         };
         assert!(can(10.0, HEAL, "target"), "in range");
diff --git a/crates/benilla-app/src/spell/targeting/pick.rs b/crates/benilla-app/src/spell/targeting/pick.rs
new file mode 100644
index 00000000..78b86e67
--- /dev/null
+++ b/crates/benilla-app/src/spell/targeting/pick.rs
@@ -0,0 +1,559 @@
+//! The world pick's unit and player filter while a word stands. The pick flags come from the
+//! word alone (`0x481050`'s targeting arm, `4810f1`-`481187`), and each unit and player the trace
+//! finds meets them in `0x480610`, where `0x480780`'s unit and player arms send it. A unit the
+//! spell cannot take is no candidate, so the cursor and the click reach the one behind it.
+//!
+//! - [`PickFlags`]: the unit-shaped bits of the flags, [`PickFlags::of`], and the legs of
+//!   `0x480610` they switch on, [`PickFlags::admits`].
+//! - [`UnitPick`]: the flags as the frame began, [`publish_unit_pick`], beside
+//!   [`super::PicksSelf`] (flag `0x20`) and [`super::CorpsePick`] (flag `0x40`), which own the
+//!   other two bits the flags carry for these arms.
+//! - [`PickChecks`]: what the hover reads per candidate, the relation checks the bind runs
+//!   ([`crate::spell::cast_target::TargetRelations`]), the party leg `0x606c20` among them.
+
+use bevy::ecs::system::SystemParam;
+use bevy::prelude::*;
+
+use super::SpellTargeting;
+use crate::net::{Guid, GuidIndex, ObjectStore, Reputations, SelfGuid, SelfPlayer};
+use crate::spell::bind_gates::unit_alive;
+use crate::spell::cast_target::{owner_store, TargetRelations};
+use crate::spell::group_relation::{GroupInputs, GroupRoster};
+use crate::target::Factions;
+
+/// Flags `0x8` and `0x10`, which `0x480780`'s unit and player arms test (`4807e1`, `4807cb`) and
+/// `0x481050` sets together (`481116 or esi,0x18`) for a word with unit bits.
+const UNITS: u32 = 0x18;
+/// The relation flags: `0x606c20` (`0x6e61e0`), `CanAssist 0x6066f0` (`0x6e6200`) and `CanAttack
+/// 0x606980` (`0x6e6210`), of which `0x480610` needs one (`480686`).
+const PARTY: u32 = 0x1_0000;
+const ASSIST: u32 = 0x2_0000;
+const ATTACK: u32 = 0x4_0000;
+const RELATIONS: u32 = PARTY | ASSIST | ATTACK;
+/// The liveness flags: the word takes a living candidate, or a dead one (`4806fd`).
+const ALIVE: u32 = 0x10_0000;
+const DEAD: u32 = 0x20_0000;
+const LIVENESS: u32 = ALIVE | DEAD;
+
+/// `UNIT_FLAG_IMMUNE_TO_PLAYER` (vmangos `UnitDefines.h:553`): the `[desc+0xa0]` bit 8 that
+/// `0x480737` refuses while targeting.
+const UNIT_FLAG_IMMUNE_TO_PLAYER: u32 = 0x100;
+
+/// The unit-shaped bits of the pick flags `0x481050` builds from the standing word. The terrain
+/// (`0x3`), GameObject (`0x4`), self (`0x20`) and corpse (`0x40`) bits belong to their own arms.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub(crate) struct PickFlags(u32);
+
+impl PickFlags {
+    /// `0x481050`'s targeting arm over the word `0xcecac0`:
+    ///
+    /// - units and players (`0x18`) for a word in `0x878e` (`0x6e6180`), and inside that arm the
+    ///   relation flags for a word in `0x40c` (`0x6e61e0`, party), `0x500` (`0x6e6200`, assist)
+    ///   and `0x480` (`0x6e6210`, enemy), then the liveness flag: dead for a word in `0x8600`
+    ///   (`0x6e6230`, with the corpse flag, `0x200040`), else alive (`0x100000`);
+    /// - after it, the ally corpse bit `0x8000` (`0x6e6240`) adds the assist flag and the enemy
+    ///   corpse bit `0x200` (`0x6e6250`) the attack flag (`0x20040`, `0x40040`).
+    pub(crate) fn of(word: u16) -> Self {
+        let word = u32::from(word);
+        let mut flags = 0;
+        if word & 0x878e != 0 {
+            flags |= UNITS;
+            if word & 0x040c != 0 {
+                flags |= PARTY;
+            }
+            if word & 0x0500 != 0 {
+                flags |= ASSIST;
+            }
+            if word & 0x0480 != 0 {
+                flags |= ATTACK;
+            }
+            flags |= if word & 0x8600 != 0 { DEAD } else { ALIVE };
+        }
+        if word & 0x8000 != 0 {
+            flags |= ASSIST;
+        }
+        if word & 0x0200 != 0 {
+            flags |= ATTACK;
+        }
+        Self(flags)
+    }
+
+    /// Whether a unit or player is a candidate of the pick: `0x480780`'s arms need the unit
+    /// flags, then `0x480610`'s three legs:
+    ///
+    /// - `480686`: with a relation flag set, one of the set relations must hold. The party leg
+    ///   `in_party` is `0x606c20`, run only when asked.
+    /// - `4806fd`: with a liveness flag set, a living candidate needs `0x100000` and a dead one
+    ///   `0x200000`. Alive is the signed `UNIT_FIELD_HEALTH` above 0 (`480713 setg`), the bind's
+    ///   own test ([`unit_alive`]), and a candidate with no descriptor reads dead.
+    /// - `480737`: while targeting, `UNIT_FIELD_FLAGS & 0x100` refuses.
+    ///
+    /// The self exclusions that come first (`48062c`-`480683`) are the caller's.
+    pub(crate) fn admits(
+        self,
+        is_self: bool,
+        rel: &TargetRelations,
+        in_party: impl FnOnce() -> bool,
+    ) -> bool {
+        let flags = self.0;
+        if flags & UNITS == 0 {
+            return false;
+        }
+        let related = flags & RELATIONS == 0
+            || flags & PARTY != 0 && in_party()
+            || flags & ASSIST != 0 && rel.assistable(is_self)
+            || flags & ATTACK != 0 && rel.attackable(is_self);
+        if !related {
+            return false;
+        }
+        if flags & LIVENESS != 0 {
+            let alive = rel.target_store.is_some_and(|s| unit_alive(&s.0));
+            let needed = if alive { ALIVE } else { DEAD };
+            if flags & needed == 0 {
+                return false;
+            }
+        }
+        rel.target_store
+            .is_none_or(|s| s.0.unit_flags() & UNIT_FLAG_IMMUNE_TO_PLAYER == 0)
+    }
+}
+
+/// The unit pick's flags as the frame began, which [`crate::target`]'s hover reads: `None`
+/// outside targeting, where they carry `0x5c` and the filter's three legs never run. The press
+/// latches the hover's pick, so both read this.
+#[derive(Resource, Default)]
+pub(crate) struct UnitPick {
+    pub(crate) flags: Option<PickFlags>,
+}
+
+/// Publish [`UnitPick`] before the input pass, beside [`super::PicksSelf`].
+pub(crate) fn publish_unit_pick(targeting: Res<SpellTargeting>, mut pick: ResMut<UnitPick>) {
+    let flags = targeting
+        .0
+        .as_ref()
+        .map(|targeting| PickFlags::of(targeting.word));
+    if pick.flags != flags {
+        pick.flags = flags;
+    }
+}
+
+/// What the hover asks of a unit or player candidate while a word stands: the bind's relation
+/// checks over the same inputs, and the party leg.
+#[derive(SystemParam)]
+pub(crate) struct PickChecks<'w, 's> {
+    pick: Res<'w, UnitPick>,
+    stores: Query<'w, 's, &'static ObjectStore>,
+    index: Option<Res<'w, GuidIndex>>,
+    self_q: Query<'w, 's, (Entity, Option<&'static ObjectStore>), With<SelfPlayer>>,
+    factions: Option<Res<'w, Factions>>,
+    reputations: Res<'w, Reputations>,
+    self_guid: Res<'w, SelfGuid>,
+    guids: Query<'w, 's, &'static Guid>,
+    /// The party slots and raid roster as the frame began; a harness without them has no group.
+    roster: Option<Res<'w, GroupRoster>>,
+}
+
+impl PickChecks<'_, '_> {
+    /// Whether this unit or player is a candidate of the pick: always outside targeting,
+    /// otherwise [`PickFlags::admits`]. `store` is its descriptor, if streamed.
+    pub(crate) fn admits_unit(&self, entity: Entity, store: Option<&ObjectStore>) -> bool {
+        let Some(flags) = self.pick.flags else {
+            return true;
+        };
+        let is_self = self
+            .self_q
+            .iter()
+            .next()
+            .is_some_and(|(me, _)| me == entity);
+        let self_store = self.self_q.iter().next().and_then(|(_, store)| store);
+        let rel = TargetRelations {
+            target_store: store,
+            // `CanAssist`'s `IsPvP` owner chase: charmer, else creator.
+            target_owner_store: owner_store(store, self.index.as_deref(), &self.stores),
+            self_store,
+            factions: self.factions.as_deref(),
+            reputations: &self.reputations,
+            // The pick reads no creature type.
+            types: Default::default(),
+            group: GroupInputs {
+                self_guid: self.self_guid.0,
+                target_guid: self.guids.get(entity).ok().map(|guid| guid.0),
+                self_owner_store: owner_store(self_store, self.index.as_deref(), &self.stores),
+                roster: self.roster.as_deref(),
+            },
+        };
+        flags.admits(is_self, &rel, || rel.in_party(is_self))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::net::{GuidIndex, Reputations};
+    use crate::spell::group_relation::publish_group_roster;
+    use crate::spell::targeting::corpse_fixture as fx;
+    use benilla_protocol::messages::GroupMemberEntry;
+    use benilla_protocol::ObjectFields;
+    use bevy::ecs::system::RunSystemOnce;
+
+    /// Absolute descriptor indices: `OBJECT_FIELD_TYPE`, `UNIT_FIELD_HEALTH`,
+    /// `UNIT_FIELD_FLAGS`, `UNIT_FIELD_CHARMEDBY` and `UNIT_FIELD_CREATEDBY`.
+    const TYPE: u16 = 2;
+    const HEALTH: u16 = 22;
+    const FLAGS: u16 = 46;
+    const CHARMED_BY: u16 = 10;
+    const CREATED_BY: u16 = 14;
+    /// `UNIT_FIELD_FACTIONTEMPLATE`, on [`fx::factions`]' rows 1 (Human) and 2 (Orc).
+    const TEMPLATE: u16 = 35;
+    const PLAYER_TYPE: u32 = 0x19;
+
+    // The words: `TARGET_FLAG_*`.
+    const UNIT: u16 = 0x0002;
+    const RAID: u16 = 0x0004;
+    const PARTY_WORD: u16 = 0x0008;
+    const ENEMY: u16 = 0x0080;
+    const ASSIST_WORD: u16 = 0x0100;
+    const CORPSE_ENEMY: u16 = 0x0200;
+    const DEAD_ONLY: u16 = 0x0400;
+    const CORPSE_ALLY: u16 = 0x8000;
+
+    fn unit(pairs: &[(u16, u32)]) -> ObjectStore {
+        let mut pairs = pairs.to_vec();
+        if !pairs.iter().any(|&(index, _)| index == HEALTH) {
+            pairs.push((HEALTH, 100));
+        }
+        ObjectStore(ObjectFields::from_pairs(&pairs))
+    }
+
+    /// A player of the caster's faction, which `CanAssist` passes on its player-controlled arm.
+    fn friend(health: u32) -> ObjectStore {
+        friend_with(health, 0)
+    }
+
+    fn friend_with(health: u32, flags: u32) -> ObjectStore {
+        unit(&[(TEMPLATE, 1), (FLAGS, 0x8 | flags), (HEALTH, health)])
+    }
+
+    /// An Orc creature: hostile to the human caster and not player-controlled.
+    fn foe(health: u32) -> ObjectStore {
+        foe_with(health, 0)
+    }
+
+    fn foe_with(health: u32, flags: u32) -> ObjectStore {
+        unit(&[(TEMPLATE, 2), (FLAGS, flags), (HEALTH, health)])
+    }
+
+    fn admits(word: u16, candidate: &ObjectStore) -> bool {
+        admits_as(word, false, candidate, || false)
+    }
+
+    fn admits_as(
+        word: u16,
+        is_self: bool,
+        candidate: &ObjectStore,
+        in_party: impl FnOnce() -> bool,
+    ) -> bool {
+        let factions = fx::factions();
+        let me = fx::caster(1.5);
+        let rel = TargetRelations {
+            target_store: Some(candidate),
+            target_owner_store: None,
+            self_store: Some(&me),
+            factions: Some(&factions),
+            reputations: &Reputations(Vec::new()),
+            types: Default::default(),
+            group: Default::default(),
+        };
+        PickFlags::of(word).admits(is_self, &rel, in_party)
+    }
+
+    /// `0x481050`'s targeting arm, bit by bit: which unit-shaped flags each word sets.
+    #[test]
+    fn the_word_builds_the_flags_as_the_chooser_does() {
+        let flags = |word| PickFlags::of(word).0;
+        assert_eq!(flags(0), 0, "no word, no unit flag");
+        for word in [0x0010, 0x0020, 0x0040, 0x4000, 0x0800, 0x4800] {
+            assert_eq!(
+                flags(word),
+                0,
+                "{word:#06x} has no unit bit: no unit is picked"
+            );
+        }
+        assert_eq!(flags(UNIT), UNITS | ALIVE);
+        assert_eq!(flags(ASSIST_WORD), UNITS | ASSIST | ALIVE);
+        assert_eq!(flags(ENEMY), UNITS | ATTACK | ALIVE);
+        assert_eq!(flags(PARTY_WORD), UNITS | PARTY | ALIVE);
+        assert_eq!(
+            flags(RAID),
+            UNITS | PARTY | ALIVE,
+            "raid asks `0x606c20` too"
+        );
+        // Resurrection: the ally corpse bit takes the assist flag through `0x6e6240`, and a word
+        // in `0x8600` takes the dead flag instead of the alive one.
+        assert_eq!(flags(CORPSE_ALLY), UNITS | ASSIST | DEAD);
+        assert_eq!(flags(CORPSE_ENEMY), UNITS | ATTACK | DEAD);
+        // Skinning's word: all three relations, and dead.
+        assert_eq!(
+            flags(UNIT | DEAD_ONLY),
+            UNITS | PARTY | ASSIST | ATTACK | DEAD
+        );
+        assert_eq!(flags(ASSIST_WORD | ENEMY), UNITS | ASSIST | ATTACK | ALIVE);
+    }
+
+    /// A heal (the assist word) takes a friend and drops a foe.
+    #[test]
+    fn an_assist_word_drops_the_hostile_unit_and_keeps_the_friendly_one() {
+        assert!(admits(ASSIST_WORD, &friend(100)));
+        assert!(!admits(ASSIST_WORD, &foe(100)));
+        // A plain unit word has no relation flag: a foe is a candidate.
+        assert!(admits(UNIT, &foe(100)));
+        assert!(admits(UNIT, &friend(100)));
+    }
+
+    /// An attack word (the enemy bit) takes a foe and drops a friend.
+    #[test]
+    fn an_enemy_word_drops_the_friendly_unit_and_keeps_the_hostile_one() {
+        assert!(admits(ENEMY, &foe(100)));
+        assert!(!admits(ENEMY, &friend(100)));
+        // Neither is the caster's own body: never attackable, so never a candidate.
+        assert!(!admits_as(ENEMY, true, &friend(100), || false));
+    }
+
+    /// `4806fd`: a living candidate needs the alive flag, a dead one the dead flag.
+    #[test]
+    fn a_resurrection_word_drops_the_living_and_keeps_the_dead() {
+        assert!(admits(CORPSE_ALLY, &friend(0)), "a dead friend");
+        assert!(!admits(CORPSE_ALLY, &friend(100)), "a living friend");
+        // The assist flag `0x6e6240` adds still applies: a dead foe is no ally's corpse.
+        assert!(!admits(CORPSE_ALLY, &foe(0)), "a dead foe");
+        // The dead-only word: a dead unit of any relation, never a living one.
+        assert!(admits(UNIT | DEAD_ONLY, &foe(0)));
+        assert!(admits(UNIT | DEAD_ONLY, &friend(0)));
+        assert!(!admits(UNIT | DEAD_ONLY, &foe(100)));
+        // Every other unit word takes the living only.
+        assert!(
+            !admits(ASSIST_WORD, &friend(0)),
+            "a heal never takes a corpse"
+        );
+        assert!(!admits(UNIT, &foe(0)));
+        // A candidate with no health streamed is dead, as in the bind.
+        let bare = unit(&[(TEMPLATE, 1), (FLAGS, 0x8), (HEALTH, 0)]);
+        assert!(admits(CORPSE_ALLY, &bare));
+    }
+
+    /// The enemy corpse bit: `0x6e6250` adds the attack flag, so only a dead unit that can be
+    /// attacked is a candidate; a dead friend and a living foe are not.
+    #[test]
+    fn the_enemy_corpse_word_takes_the_dead_that_can_be_attacked() {
+        assert!(admits(CORPSE_ENEMY, &foe(0)), "a dead foe");
+        assert!(!admits(CORPSE_ENEMY, &friend(0)), "a dead friend");
+        assert!(!admits(CORPSE_ENEMY, &foe(100)), "a living foe");
+    }
+
+    /// The health field is signed and an absent descriptor is dead, as the bind reads it.
+    #[test]
+    fn the_alive_test_is_the_binds() {
+        let negative = friend(0x8000_0000);
+        assert!(admits(CORPSE_ALLY, &negative), "signed health below 0");
+        assert!(!admits(ASSIST_WORD, &negative));
+        let empty = ObjectStore(ObjectFields::default());
+        let factions = fx::factions();
+        let me = fx::caster(1.5);
+        let rel = TargetRelations {
+            target_store: Some(&empty),
+            target_owner_store: None,
+            self_store: Some(&me),
+            factions: Some(&factions),
+            reputations: &Reputations(Vec::new()),
+            types: Default::default(),
+            group: Default::default(),
+        };
+        assert!(!PickFlags::of(UNIT).admits(false, &rel, || false));
+        assert!(PickFlags::of(UNIT | DEAD_ONLY).admits(false, &rel, || true));
+    }
+
+    /// `480737`: while targeting, `UNIT_FIELD_FLAGS & 0x100` is refused, whatever the word.
+    #[test]
+    fn a_unit_immune_to_players_is_never_a_candidate() {
+        // The word, and the subject it takes: (friend or foe, health).
+        type Make = fn(u32, u32) -> ObjectStore;
+        let cases: [(u16, Make, u32); 5] = [
+            (UNIT, friend_with, 100),
+            (ASSIST_WORD, friend_with, 100),
+            (ENEMY, foe_with, 100),
+            (CORPSE_ALLY, friend_with, 0),
+            (UNIT | DEAD_ONLY, foe_with, 0),
+        ];
+        for (word, make, health) in cases {
+            assert!(admits(word, &make(health, 0)), "{word:#06x}: the control");
+            assert!(
+                !admits(word, &make(health, UNIT_FLAG_IMMUNE_TO_PLAYER)),
+                "{word:#06x}: flagged"
+            );
+        }
+        // Only bit 8: another bit of the same nibble does not.
+        let other = unit(&[(TEMPLATE, 1), (FLAGS, 0x0f8)]);
+        assert!(admits(UNIT, &other));
+    }
+
+    /// The party leg is asked only when its flag is set, and one relation suffices.
+    #[test]
+    fn one_relation_of_those_asked_is_enough() {
+        assert!(admits_as(PARTY_WORD, false, &foe(100), || true));
+        assert!(!admits_as(PARTY_WORD, false, &foe(100), || false));
+        // The assist relation does not stand in for the party flag alone.
+        assert!(!admits_as(PARTY_WORD, false, &friend(100), || false));
+        // A word with both flags: either passes.
+        assert!(admits_as(
+            PARTY_WORD | ASSIST_WORD,
+            false,
+            &friend(100),
+            || false
+        ));
+        assert!(admits_as(
+            PARTY_WORD | ASSIST_WORD,
+            false,
+            &foe(100),
+            || true
+        ));
+        assert!(!admits_as(
+            PARTY_WORD | ASSIST_WORD,
+            false,
+            &foe(100),
+            || false
+        ));
+        // No party flag, no question asked.
+        assert!(admits_as(
+            ASSIST_WORD,
+            false,
+            &friend(100),
+            || unreachable!()
+        ));
+    }
+
+    /// Ourselves: the caster assists himself and never attacks himself, so a heal word takes him
+    /// and an enemy word does not.
+    #[test]
+    fn the_caster_is_his_own_assist_and_never_his_own_attack() {
+        assert!(admits_as(ASSIST_WORD, true, &friend(100), || false));
+        assert!(!admits_as(ENEMY, true, &friend(100), || false));
+    }
+
+    /// The party leg's inputs, standing in a world: us (guid 1) and whoever a case spawns.
+    fn party_world() -> (World, Entity) {
+        let mut world = World::new();
+        world.init_resource::<UnitPick>();
+        world.init_resource::<GroupRoster>();
+        world.init_resource::<SpellTargeting>();
+        world.insert_resource(fx::factions());
+        world.insert_resource(Reputations(Vec::new()));
+        world.init_resource::<GuidIndex>();
+        world.init_resource::<crate::ui_party::GroupState>();
+        world.insert_resource(SelfGuid(Some(1)));
+        let me = world
+            .spawn((
+                crate::net::SelfPlayer,
+                Guid(1),
+                GlobalTransform::default(),
+                unit(&[(TYPE, PLAYER_TYPE), (TEMPLATE, 1), (FLAGS, 0x8)]),
+            ))
+            .id();
+        world.resource_mut::<GuidIndex>().0.insert(1, me);
+        (world, me)
+    }
+
+    fn spawn(world: &mut World, guid: u64, store: ObjectStore) -> Entity {
+        let entity = world
+            .spawn((Guid(guid), GlobalTransform::default(), store))
+            .id();
+        world.resource_mut::<GuidIndex>().0.insert(guid, entity);
+        entity
+    }
+
+    fn seat(world: &mut World, guid: u64) {
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .members
+            .push(GroupMemberEntry {
+                name: String::new(),
+                guid,
+                status: 0,
+                flags: 0,
+            });
+    }
+
+    /// The pick under `word` and the roster as it stands, published as a frame does.
+    fn asked(world: &mut World, word: u16, entity: Entity) -> bool {
+        world.resource_mut::<SpellTargeting>().enter(
+            fx::RESURRECTION,
+            crate::spell::CastCommit::Spell,
+            word,
+        );
+        world
+            .run_system_once(publish_unit_pick)
+            .expect("the word publishes");
+        world
+            .run_system_once(publish_group_roster)
+            .expect("the roster publishes");
+        world
+            .run_system_once(move |checks: PickChecks, stores: Query<&ObjectStore>| {
+                checks.admits_unit(entity, stores.get(entity).ok())
+            })
+            .expect("the checks run")
+    }
+
+    fn player(extra: &[(u16, u32)]) -> ObjectStore {
+        let mut pairs = vec![(TYPE, PLAYER_TYPE), (TEMPLATE, 1), (FLAGS, 0x8)];
+        pairs.extend_from_slice(extra);
+        unit(&pairs)
+    }
+
+    /// `0x606c20`, through the party word: us, a member of our party, our own pet and a member's
+    /// pet pass; a stranger, a hostile creature, and a member who is not player-controlled do not.
+    #[test]
+    fn the_party_word_takes_us_and_the_people_of_our_party() {
+        let (mut world, me) = party_world();
+        let member = spawn(&mut world, 2, player(&[]));
+        let stranger = spawn(&mut world, 3, player(&[]));
+        let pet = spawn(&mut world, 4, unit(&[(FLAGS, 0x8), (CREATED_BY, 1)]));
+        let member_pet = spawn(&mut world, 5, unit(&[(FLAGS, 0x8), (CHARMED_BY, 2)]));
+        let stranger_pet = spawn(&mut world, 6, unit(&[(FLAGS, 0x8), (CREATED_BY, 3)]));
+        let npc = spawn(&mut world, 7, foe(100));
+        seat(&mut world, 2);
+
+        assert!(asked(&mut world, PARTY_WORD, me), "ourselves (606c3d)");
+        assert!(asked(&mut world, PARTY_WORD, member), "a party member");
+        assert!(asked(&mut world, PARTY_WORD, pet), "our own pet");
+        assert!(asked(&mut world, PARTY_WORD, member_pet), "a member's pet");
+        assert!(
+            !asked(&mut world, PARTY_WORD, stranger),
+            "a player outside the party"
+        );
+        assert!(!asked(&mut world, PARTY_WORD, stranger_pet), "his pet");
+        assert!(!asked(&mut world, PARTY_WORD, npc), "a creature");
+
+        // Not player-controlled on either side: no party relation (606c5e, 606c76).
+        world.entity_mut(member).insert(player(&[(FLAGS, 0)]));
+        assert!(
+            !asked(&mut world, PARTY_WORD, member),
+            "a member without flag 0x8"
+        );
+        // A pet whose owner has not streamed answers no controller (606c92).
+        let orphan = spawn(&mut world, 8, unit(&[(FLAGS, 0x8), (CREATED_BY, 99)]));
+        assert!(!asked(&mut world, PARTY_WORD, orphan));
+        // The raid word asks the same predicate.
+        seat(&mut world, 3);
+        assert!(asked(&mut world, RAID, stranger), "seated now");
+        // Nobody is anybody's party once the roster is empty.
+        world.init_resource::<crate::ui_party::GroupState>();
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .members
+            .clear();
+        assert!(!asked(&mut world, PARTY_WORD, stranger));
+        assert!(
+            asked(&mut world, PARTY_WORD, me),
+            "but we are still ourselves"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/spell/targeting/world.rs b/crates/benilla-app/src/spell/targeting/world.rs
index cef9281a..b39a8734 100644
--- a/crates/benilla-app/src/spell/targeting/world.rs
+++ b/crates/benilla-app/src/spell/targeting/world.rs
@@ -77,8 +77,8 @@ pub(crate) fn commit_ground_cast_on_click(
 /// not range nor the lock: the refusal is the server's `SMSG_CAST_RESULT`. The right-click path
 /// ([`crate::target::click`], `0x5f33e0`) does resolve the lock and can refuse locally. Otherwise
 /// the picked unit goes to the unit arm ([`super::bind_target_unit`]) and the picked corpse to the
-/// corpse arm ([`super::corpse::bind_target_corpse`]); a unit click under a lock word binds nothing
-/// there, since every unit arm tests a bit the word lacks.
+/// corpse arm ([`super::corpse::bind_target_corpse`]). A lock word has no unit bit, so it puts no
+/// unit in the pick and the click reaches what stands behind one ([`super::pick`]).
 ///
 /// Runs after `select_on_click`, as the terrain commit does.
 pub(crate) fn commit_object_cast_on_click(
@@ -149,6 +149,7 @@ mod tests {
         world.init_resource::<crate::spell::AutoRepeatActive>();
         world.init_resource::<crate::ui_tradeskill::TradeSkillOpens>();
         world.init_resource::<super::super::SpellTargeting>();
+        world.init_resource::<crate::spell::HeldForPick>();
         world.init_resource::<Messages<crate::creature_anim::SheathRequest>>();
         world.init_resource::<Messages<WorldClick>>();
         // The commit legs read the press latch, not the live hover.
@@ -188,6 +189,7 @@ mod tests {
                 crate::target::PickOcclusion {
                     distance: 5.0,
                     point: Some(Vec3::new(1.0, 2.0, 3.0)),
+                    ray: None,
                 };
         };
         let run = |world: &mut World, id: SystemId| {
diff --git a/crates/benilla-app/src/spell/usable.rs b/crates/benilla-app/src/spell/usable.rs
index a714d116..f245a1a9 100644
--- a/crates/benilla-app/src/spell/usable.rs
+++ b/crates/benilla-app/src/spell/usable.rs
@@ -50,7 +50,7 @@ pub(crate) struct UsableCtx<'a> {
 
 /// The search covers equipment indices `0..=22` (`0x5f0c50`'s `cmp ebx,0x17; jl`): the 19 worn
 /// slots and the four equipped bags.
-const EQUIPMENT_SLOTS: u8 = 23;
+pub(crate) const EQUIPMENT_SLOTS: u8 = 23;
 
 /// `AttributesEx3`'s hand restrictions, the source of the search's slot mask (`0x5f0c50`'s
 /// callers): `0x400` main hand only (mask `0x8000`), `0x1000000` off hand only (mask `0x10000`).
@@ -77,6 +77,33 @@ fn hand_mask(d: &SpellDisplay) -> u32 {
     }
 }
 
+/// Whether the equipped-item search runs at all for `d`: the reference's short-circuits to "fits"
+/// (`0x6e40e0` at `6e4103`..`6e4130`) are `EquippedItemClass < 0`, a zero subclass mask (no item
+/// required, not a wildcard), and an item-targeting spell (`0x495d60` checks those).
+fn needs_equipped_item(d: &SpellDisplay) -> bool {
+    d.equipped_item_class >= 0
+        && d.equipped_item_subclass_mask != 0
+        && d.targets & TARGET_FLAG_ITEM == 0
+}
+
+/// The equipment slots [`equipped_item_fits`] reads for `d`, a bit each: none unless it searches,
+/// else the slots its hand restriction leaves and both hands, which the disarm ladder reads
+/// whatever the restriction (`0x5f0c69`, `0x5f0c91`).
+pub(crate) fn worn_slots_read(d: &SpellDisplay) -> u32 {
+    if needs_equipped_item(d) {
+        (hand_mask(d) | HANDS) & EQUIPMENT_MASK
+    } else {
+        0
+    }
+}
+
+/// The main and off hand, the two slots the disarm ladder tells apart.
+const HANDS: u32 =
+    1 << crate::items::EQUIPMENT_SLOT_MAINHAND | 1 << crate::items::EQUIPMENT_SLOT_OFFHAND;
+
+/// Every equipment index the search covers, as a mask: the 19 worn slots and the four bags.
+pub(crate) const EQUIPMENT_MASK: u32 = (1 << EQUIPMENT_SLOTS) - 1;
+
 /// [`equipped_item_fits`] for the cast ladder's rung 7: the same search, never querying a
 /// missing template; an uncached one counts as a match.
 pub(crate) fn equipped_item_fits_cached(
@@ -85,10 +112,7 @@ pub(crate) fn equipped_item_fits_cached(
     objects: &Objects,
     items: &Items,
 ) -> bool {
-    if d.equipped_item_class < 0
-        || d.equipped_item_subclass_mask == 0
-        || d.targets & TARGET_FLAG_ITEM != 0
-    {
+    if !needs_equipped_item(d) {
         return true;
     }
     let mut mask = hand_mask(d);
@@ -100,20 +124,91 @@ pub(crate) fn equipped_item_fits_cached(
         mask,
         d.equipped_item_class as u32,
         d.equipped_item_subclass_mask,
-        |guid| {
-            let obj = objects.object(guid)?;
-            let t = items.template_cached(obj.object_entry()?)?;
-            Some(WornItem {
-                class: t.class,
-                subclass: t.subclass,
-                flags: t.flags,
-                durability: obj.item_durability(),
-                max_durability: obj.item_max_durability(),
-            })
-        },
+        |guid| worn_item_cached(guid, objects, items),
     )
 }
 
+/// The worn item `guid` names from the cached records alone: `None` while its object or its
+/// template has not streamed.
+fn worn_item_cached(guid: u64, objects: &Objects, items: &Items) -> Option<WornItem> {
+    let obj = objects.object(guid)?;
+    let t = items.template_cached(obj.object_entry()?)?;
+    Some(WornItem {
+        class: t.class,
+        subclass: t.subclass,
+        flags: t.flags,
+        durability: obj.item_durability(),
+        max_durability: obj.item_max_durability(),
+    })
+}
+
+/// What the equipped-item search learns of one equipment slot, and all it can: the feed compares
+/// these frame to frame, so a view built on the search is rebuilt when a slot's answer can move,
+/// and not on a durability tick that leaves an item unbroken.
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(crate) enum SlotItem {
+    /// No guid: the search passes over the slot.
+    Empty,
+    /// A guid whose item object or template has not streamed: the search gives the benefit of the
+    /// doubt.
+    Unresolved,
+    Item {
+        class: u32,
+        subclass: u32,
+        /// `ITEM_FLAG_DEPRECATED`.
+        deprecated: bool,
+        /// `MaxDurability > 0 && Durability == 0`.
+        broken: bool,
+    },
+}
+
+impl SlotItem {
+    fn of(guid: u64, worn: impl FnOnce(u64) -> Option<WornItem>) -> SlotItem {
+        if guid == 0 {
+            return SlotItem::Empty;
+        }
+        let Some(it) = worn(guid) else {
+            return SlotItem::Unresolved;
+        };
+        SlotItem::Item {
+            class: it.class,
+            subclass: it.subclass,
+            deprecated: it.flags & ITEM_FLAG_DEPRECATED != 0,
+            broken: it.max_durability.is_some_and(|m| m > 0) && it.durability == Some(0),
+        }
+    }
+
+    /// The search's verdict on the slot for a requirement.
+    fn fits(self, class: u32, subclass_mask: u32) -> bool {
+        match self {
+            SlotItem::Empty => false,
+            SlotItem::Unresolved => true, // unresolved template: benefit of the doubt
+            // The reference's two rejects before the class match: deprecated, and broken.
+            SlotItem::Item {
+                deprecated: true, ..
+            }
+            | SlotItem::Item { broken: true, .. } => false,
+            SlotItem::Item {
+                class: c,
+                subclass: sub,
+                ..
+            } => c == class && subclass_mask & (1 << sub) != 0,
+        }
+    }
+}
+
+/// Equipment slot `slot`'s [`SlotItem`] from the cached records, without an ask.
+pub(crate) fn slot_item_cached(
+    store: &ObjectStore,
+    slot: u8,
+    objects: &Objects,
+    items: &Items,
+) -> SlotItem {
+    SlotItem::of(store.0.player_inv_slot(slot).unwrap_or(0), |guid| {
+        worn_item_cached(guid, objects, items)
+    })
+}
+
 /// The equipped-item refusal reason, keyed on `AttributesEx3` alone (`0x6e40e0` at
 /// `6e416e`..`6e4180`): main-hand-only `0x1a`, off-hand-only `0x1b`, else `0x19`. All three render
 /// "Must have a %s equipped" with the item subclass name.
@@ -137,13 +232,9 @@ pub(crate) fn equipped_item_fits(
     items: &Items,
     commands: &NetCommands,
 ) -> bool {
-    // The reference's short-circuits to "fits" (`0x6e40e0` at `6e4103`..`6e4130`): a caster that
-    // is not the active player (always ours here), `EquippedItemClass < 0`, a zero subclass mask
-    // (no item required, not a wildcard), and an item-targeting spell (`0x495d60` checks those).
-    if d.equipped_item_class < 0
-        || d.equipped_item_subclass_mask == 0
-        || d.targets & TARGET_FLAG_ITEM != 0
-    {
+    // The short-circuits to "fits" (`0x6e40e0` at `6e4103`..`6e4130`): a caster that is not the
+    // active player (always ours here), and those of [`needs_equipped_item`].
+    if !needs_equipped_item(d) {
         return true;
     }
     let class = d.equipped_item_class as u32;
@@ -194,21 +285,8 @@ fn equipped_slots_match(
     (0..EQUIPMENT_SLOTS)
         .filter(|slot| mask & (1u32 << slot) != 0)
         .any(|slot| {
-            let Some(guid) = store.0.player_inv_slot(slot).filter(|&g| g != 0) else {
-                return false;
-            };
-            let Some(it) = worn(guid) else {
-                return true; // unresolved template: benefit of the doubt
-            };
-            // The reference's two rejects before the class match: deprecated, and broken
-            // (`MaxDurability > 0 && Durability == 0`).
-            if it.flags & ITEM_FLAG_DEPRECATED != 0 {
-                return false;
-            }
-            if it.max_durability.is_some_and(|m| m > 0) && it.durability == Some(0) {
-                return false;
-            }
-            it.class == class && subclass_mask & (1 << it.subclass) != 0
+            let guid = store.0.player_inv_slot(slot).unwrap_or(0);
+            SlotItem::of(guid, &mut worn).fits(class, subclass_mask)
         })
 }
 
@@ -369,28 +447,37 @@ pub(crate) fn spell_usable(
 
 /// The resolved power cost, `GetPowerCost 0x6e31b0`: `manaCost`, plus the signed
 /// `(level - baseLevel) * manaCostPerlevel` (only creature spells carry it), plus
-/// `ManaCostPercentage` of a per-type basis: base mana for a mana spell, as the reference's
-/// `0x612c50`; else the max pool, where `0x612c50` takes 1000 for rage, 100 for focus and energy
-/// and base health for health. Then `SPELLMOD_COST` through `0x6e6af0` (`6e32e3`), clamped at 0.
+/// `ManaCostPercentage` of the reference's per-type basis (`0x612c50`): base health for health,
+/// base mana for mana, 1000 for rage, 100 for focus and energy, and 0 otherwise. Then
+/// `SPELLMOD_COST` through `0x6e6af0` (`6e32e3`), clamped at 0.
 /// The reference's per-school unit modifiers are not applied.
 ///
 /// One cost for leg 12, the press-path gate and the tooltip, as `0x6e31b0` serves all six of its
 /// callers. The press-path gate refuses an unaffordable cast without sending anything
 /// (`0x609657`), so an unmodified cost refuses casts a talented character can afford.
 pub(crate) fn power_cost(d: &SpellDisplay, store: &ObjectStore, mods: &SpellModifiers) -> u32 {
-    let power_type = d.power_type as i32;
-    let base = if d.mana_cost_pct == 0 {
-        0
-    } else if d.power_type == 0 {
-        store.0.unit_base_mana().unwrap_or(0)
-    } else if power_type < 0 {
-        store.0.unit_max_health().unwrap_or(0)
-    } else {
-        store.0.unit_max_power(power_type as u8).unwrap_or(0)
-    };
     // The level term reads `baseLevel` (`+0x70`), as `0x6e31b0` does, but the reference scales a
     // caster value / 5 there (vmangos: the level / 5); only creature spells have a per-level cost.
-    let level_delta = i64::from(store.0.unit_level().unwrap_or(0)) - i64::from(d.base_level);
+    power_cost_at(d, &store.0, store.0.unit_level().unwrap_or(0), mods)
+}
+
+/// [`power_cost`] against `unit`'s fields at the level term `level`, the value `0x6e31b0` reads
+/// through the caster's `[vtbl+0xa8]` over 5 (`6e3242`-`6e3254`). With the unit selector set, the
+/// tooltip's caster is the player's charm, else its summon (`6e31fe`-`6e3228`), whose own basis
+/// `0x612c50` is called (`6e327d`).
+pub(crate) fn power_cost_at(
+    d: &SpellDisplay,
+    unit: &benilla_protocol::ObjectFields,
+    level: u32,
+    mods: &SpellModifiers,
+) -> u32 {
+    let base = match cost_basis(d) {
+        CostBasis::None => 0,
+        CostBasis::BaseMana => unit.unit_base_mana().unwrap_or(0),
+        CostBasis::BaseHealth => unit.unit_base_health().unwrap_or(0),
+        CostBasis::Fixed(value) => value,
+    };
+    let level_delta = i64::from(level) - i64::from(d.base_level);
     let cost = i64::from(d.mana_cost)
         + level_delta * i64::from(d.mana_cost_per_level)
         + i64::from(base) * i64::from(d.mana_cost_pct) / 100;
@@ -399,6 +486,38 @@ pub(crate) fn power_cost(d: &SpellDisplay, store: &ObjectStore, mods: &SpellModi
     u32::try_from(mods.apply(d, OP_COST, cost)).unwrap_or(0)
 }
 
+/// What [`power_cost_at`] scales `d`'s percentage cost by: `0x612c50`, a jump table on the power
+/// type plus 2 (`612c53`-`612c5e`), on the caster's fields.
+#[derive(Clone, Copy, PartialEq, Eq, Debug)]
+pub(crate) enum CostBasis {
+    /// No percentage, or a type the table sends to 0 (`612c97`): the cost reads no unit field.
+    None,
+    /// Mana: `UNIT_FIELD_BASE_MANA`, unit block `+0x270` (`612c65`-`612c6b`).
+    BaseMana,
+    /// Health (-2): `UNIT_FIELD_BASE_HEALTH`, unit block `+0x274` (`612c87`-`612c8d`).
+    BaseHealth,
+    /// A constant, not the pool: 1000 for rage (`612c7e`), 100 for focus and energy (`612c75`).
+    Fixed(u32),
+}
+
+pub(crate) fn cost_basis(d: &SpellDisplay) -> CostBasis {
+    if d.mana_cost_pct == 0 {
+        return CostBasis::None;
+    }
+    match d.power_type as i32 {
+        -2 => CostBasis::BaseHealth,
+        0 => CostBasis::BaseMana,
+        1 => CostBasis::Fixed(1000),
+        2 | 3 => CostBasis::Fixed(100),
+        _ => CostBasis::None,
+    }
+}
+
+/// Whether [`power_cost_at`]'s level term moves the cost: only a spell with a per-level cost.
+pub(crate) fn cost_reads_level(d: &SpellDisplay) -> bool {
+    d.mana_cost_per_level != 0
+}
+
 /// Whether the caster can afford `d`, for leg 12 (`0x6e3fba`) and the press-path gate
 /// (`0x60962c`): `UNIT_FIELD_POWER[type]`, or `UNIT_FIELD_HEALTH` for any negative PowerType
 /// (`0x609631`; Bloodrage's -2), against [`power_cost`].
@@ -646,6 +765,64 @@ mod tests {
         )
     }
 
+    /// Bloodrage (2687) takes 20% of base health, even when gear raises max health.
+    #[test]
+    fn bloodrage_cost_uses_base_health_for_cost_and_gates() {
+        let bloodrage = SpellDisplay {
+            power_type: (-2i32) as u32,
+            mana_cost_pct: 20,
+            ..Default::default()
+        };
+        let mods = SpellModifiers::default();
+        let with_gear = player(&[(22, 400), (28, 4_000), (163, 1_689)]);
+        assert_eq!(power_cost(&bloodrage, &with_gear, &mods), 337);
+        assert!(can_afford(&bloodrage, &with_gear, &mods));
+        assert_eq!(walk(&bloodrage, &with_gear), (true, false));
+
+        let below_cost = player(&[(22, 336), (28, 4_000), (163, 1_689)]);
+        assert!(!can_afford(&bloodrage, &below_cost, &mods));
+        assert_eq!(walk(&bloodrage, &below_cost), (false, true));
+
+        let without_gear = player(&[(22, 400), (28, 1_689), (163, 1_689)]);
+        assert_eq!(power_cost(&bloodrage, &without_gear, &mods), 337);
+    }
+
+    /// `0x612c50`'s jump table (`0x612ca0`, indexed by the type plus 2): base health for -2, base
+    /// mana, fixed bases for rage, focus and energy, and 0 for -1, happiness and past the table.
+    #[test]
+    fn percentage_cost_bases_follow_power_type() {
+        let store = player(&[
+            (28, 4_000), // max health
+            (29, 2_000), // max mana
+            (30, 800),   // max rage
+            (31, 80),    // max focus
+            (32, 120),   // max energy
+            (33, 500),   // max happiness
+            (162, 1_500),
+            (163, 1_689),
+        ]);
+        let mods = SpellModifiers::default();
+        let cases = [
+            (-3, 0),
+            (-2, 337),
+            (-1, 0),
+            (0, 300),
+            (1, 200),
+            (2, 20),
+            (3, 20),
+            (4, 0),
+            (5, 0),
+        ];
+        for (power_type, cost) in cases {
+            let spell = SpellDisplay {
+                power_type: power_type as u32,
+                mana_cost_pct: 20,
+                ..Default::default()
+            };
+            assert_eq!(power_cost(&spell, &store, &mods), cost, "type {power_type}");
+        }
+    }
+
     /// A -30% cost cell turns an unaffordable 100-mana spell into an affordable 70 with 80 mana.
     #[test]
     fn a_talent_cost_cut_reaches_the_cost_and_the_press_path_gate() {
diff --git a/crates/benilla-app/src/spell/validator.rs b/crates/benilla-app/src/spell/validator.rs
index bab56f06..1f6bcb2f 100644
--- a/crates/benilla-app/src/spell/validator.rs
+++ b/crates/benilla-app/src/spell/validator.rs
@@ -4,7 +4,8 @@
 //! called by [`super::cast_send`]'s ladder in its order. Only `TryCast` reaches `0x6094f0`, never
 //! the greying walk `0x6e3d60`.
 
-use benilla_formats::{SpellDisplay, SpellRange};
+use super::SpellModifiers;
+use benilla_formats::{RangeUnit, SpellDisplay, SpellRange};
 
 /// The range refusals `CanTargetUnit 0x6e4440` emits: "Out of range." and "Target too close".
 pub(super) const ERR_OUT_OF_RANGE: u8 = 0x59;
@@ -13,15 +14,23 @@ pub(super) const ERR_TOO_CLOSE: u8 = 0x76;
 /// The range refusal, before `ArmCast`/`SendCast`, so an out-of-range press never runs the commit
 /// tail (the ranged sheath snap `0x6e5930` included): squared 3D distance against
 /// [`benilla_formats::min_max_range`], beyond max² out of range, inside a nonzero min² too close.
-/// No range row or no distance passes; the server judges.
+/// `target` is the bound unit, the target `IsTargetInRange 0x6e47b0` hands `GetMinMaxRange`
+/// (`0x6e47ca`): its reach pads a ranged row and its motion, with the caster's, earns the moving
+/// bonus. The function looks the auto-attack target up only when that target is no unit, which a
+/// bound unit never is, so none is passed. No range row or no distance passes; the server judges.
 pub(super) fn cast_range_refusal(
     spell: &SpellDisplay,
     row: Option<&SpellRange>,
-    self_reach: f32,
-    target_reach: Option<f32>,
+    caster: RangeUnit,
+    target: Option<RangeUnit>,
     dist_sq: Option<f32>,
+    mods: &SpellModifiers,
 ) -> Option<u8> {
-    let (min, max) = benilla_formats::min_max_range(spell, row, self_reach, target_reach)?;
+    let targets = benilla_formats::RangeTargets {
+        target,
+        attack_target: None,
+    };
+    let (min, max) = mods.min_max_range(spell, row, caster, targets)?;
     let d2 = dist_sq?;
     if d2 > max * max {
         return Some(ERR_OUT_OF_RANGE);
@@ -235,15 +244,17 @@ mod tests {
     /// `IsTargetInRange 0x6e47b0`'s two compares, on Auto Shot's {8, 35} row plus the reach pad.
     #[test]
     fn cast_range_refusal_follows_the_two_compares() {
+        let mods = SpellModifiers::default();
         let d = spell_with_range(114, 0);
         let auto_shot = SpellRange {
             min: 8.0,
             max: 35.0,
             flags: 0,
         };
-        let reach = Some(1.5);
+        let me = RangeUnit::still(1.5);
+        let reach = Some(RangeUnit::still(1.5));
         // Both bounds carry the bare reach pad (self 1.5 + target 1.5): min = 11, max = 38.
-        let refuse = |d2: f32| cast_range_refusal(&d, Some(&auto_shot), 1.5, reach, Some(d2));
+        let refuse = |d2: f32| cast_range_refusal(&d, Some(&auto_shot), me, reach, Some(d2), &mods);
         assert_eq!(refuse(3.0 * 3.0), Some(ERR_TOO_CLOSE));
         assert_eq!(refuse(20.0 * 20.0), None);
         assert_eq!(refuse(60.0 * 60.0), Some(ERR_OUT_OF_RANGE));
@@ -254,9 +265,17 @@ mod tests {
             max: 35.0,
             flags: 0,
         };
-        let refuse = |d2: f32| cast_range_refusal(&d, Some(&fireball), 1.5, reach, Some(d2));
+        let refuse = |d2: f32| cast_range_refusal(&d, Some(&fireball), me, reach, Some(d2), &mods);
         assert_eq!(refuse(0.1), None);
         assert_eq!(refuse(60.0 * 60.0), Some(ERR_OUT_OF_RANGE));
+        // The bound target is the pad's second reach (`0x6e47ca`): 35 + 1.5 + 1.5 = 38.
+        assert_eq!(refuse(37.0 * 37.0), None);
+        assert_eq!(refuse(39.0 * 39.0), Some(ERR_OUT_OF_RANGE));
+        // With no unit bound the row stands as it is: 35.
+        assert_eq!(
+            cast_range_refusal(&d, Some(&fireball), me, None, Some(37.0 * 37.0), &mods),
+            Some(ERR_OUT_OF_RANGE)
+        );
 
         // A melee row has min 0: never too close.
         let melee = SpellRange {
@@ -266,20 +285,70 @@ mod tests {
         };
         let melee_spell = spell_with_range(2, 0);
         assert_eq!(
-            cast_range_refusal(&melee_spell, Some(&melee), 1.5, reach, Some(0.1)),
+            cast_range_refusal(&melee_spell, Some(&melee), me, reach, Some(0.1), &mods),
             None
         );
         assert_eq!(
-            cast_range_refusal(&melee_spell, Some(&melee), 1.5, reach, Some(15.0 * 15.0)),
+            cast_range_refusal(
+                &melee_spell,
+                Some(&melee),
+                me,
+                reach,
+                Some(15.0 * 15.0),
+                &mods
+            ),
             Some(ERR_OUT_OF_RANGE)
         );
 
         // No row or no distance passes.
-        assert_eq!(cast_range_refusal(&d, None, 1.5, reach, Some(1.0)), None);
         assert_eq!(
-            cast_range_refusal(&d, Some(&auto_shot), 1.5, reach, None),
+            cast_range_refusal(&d, None, me, reach, Some(1.0), &mods),
             None
         );
+        assert_eq!(
+            cast_range_refusal(&d, Some(&auto_shot), me, reach, None, &mods),
+            None
+        );
+    }
+
+    /// A warrior running after a running mob presses Hamstring (the melee row) at 7 yards:
+    /// `GetMinMaxRange` adds the moving bonus to the 5.0 floor (`0x6e3648`-`0x6e36a2`), so the
+    /// press goes out to 7.667, and a standing pair is refused at the same distance.
+    #[test]
+    fn cast_range_refusal_lets_two_running_units_reach_the_moving_bonus() {
+        let mods = SpellModifiers::default();
+        let hamstring = spell_with_range(2, 0);
+        let melee = SpellRange {
+            min: 0.0,
+            max: 5.0,
+            flags: 1,
+        };
+        let running = RangeUnit {
+            motion: benilla_formats::UnitMotion {
+                flags: 1,
+                speed: 7.0,
+                walk_speed: 2.5,
+            },
+            ..RangeUnit::still(1.5)
+        };
+        let press = |caster, target, yards: f32| {
+            cast_range_refusal(
+                &hamstring,
+                Some(&melee),
+                caster,
+                Some(target),
+                Some(yards * yards),
+                &mods,
+            )
+        };
+        let standing = RangeUnit::still(1.5);
+        assert_eq!(press(running, running, 7.0), None);
+        assert_eq!(press(running, running, 7.5), None);
+        assert_eq!(press(running, running, 8.0), Some(ERR_OUT_OF_RANGE));
+        assert_eq!(press(standing, standing, 7.0), Some(ERR_OUT_OF_RANGE));
+        assert_eq!(press(running, standing, 7.0), Some(ERR_OUT_OF_RANGE));
+        assert_eq!(press(standing, running, 7.0), Some(ERR_OUT_OF_RANGE));
+        assert_eq!(press(standing, standing, 5.0), None);
     }
 
     /// The mounted refusal (`0x609c6c`) and its bit-24 exemption (`0x609c6f`).
diff --git a/crates/benilla-app/src/target/by_name.rs b/crates/benilla-app/src/target/by_name.rs
index 476b1c76..f301f57c 100644
--- a/crates/benilla-app/src/target/by_name.rs
+++ b/crates/benilla-app/src/target/by_name.rs
@@ -170,16 +170,7 @@ fn rank(query: &str, name: &str, dist2: f32, mode: Match) -> Option<Rank> {
 #[allow(clippy::type_complexity)] // one bundled param, the app's convention for big query sets
 pub(crate) struct ByNameScan<'w, 's> {
     /// Every known unit, our own avatar included: the reference has no self-exclusion here.
-    units: Query<
-        'w,
-        's,
-        (
-            Entity,
-            &'static Guid,
-            &'static Transform,
-            Option<&'static ObjectStore>,
-        ),
-    >,
+    units: UnitQuery<'w, 's>,
     self_q: Query<
         'w,
         's,
@@ -255,8 +246,7 @@ impl ByNameScan<'_, '_> {
         )
     }
 
-    /// Resolve a name to a unit, logging one `by-name:` line per call, ungated since it runs per
-    /// command: the candidates counted, the winner and on what.
+    /// Resolve a name to a unit through [`scan_units`], the mode argument deciding the filter.
     fn resolve(
         &self,
         query: &str,
@@ -264,130 +254,198 @@ impl ByNameScan<'_, '_> {
         filter: Filter,
         mode: Match,
     ) -> Option<(Entity, u64, String)> {
-        let query = query.trim();
-        if query.is_empty() {
-            return None;
-        }
-        let Some(origin) = self.origin() else {
-            info!("by-name: \"{query}\" — no active player object; nothing resolves");
-            return None;
-        };
-        let mut considered = 0usize;
-        let mut nameless = 0usize;
-        let mut best: Option<(Entity, u64, Rank, String)> = None;
-        for (entity, guid, tf, store) in &self.units {
-            if !search.accepts(guid.0) {
-                continue;
-            }
-            if filter == Filter::AssistableAlive && !self.assistable_alive(store) {
-                continue;
-            }
-            let Some(name) = self.names.peek(guid.0) else {
-                nameless += 1;
-                continue;
-            };
-            considered += 1;
-            let dist2 = tf.translation.distance_squared(origin);
-            let Some(r) = rank(query, name, dist2, mode) else {
-                continue;
-            };
-            if best.as_ref().is_none_or(|(_, _, b, _)| r.beats(*b)) {
-                best = Some((entity, guid.0, r, name.to_string()));
-            }
-        }
-        match &best {
-            Some((_, guid, r, name)) => info!(
-                "by-name: \"{query}\" ({search:?}) -> \"{name}\" guid {guid:#x} \
-                 ({}, prefix {}, {:.1} yd) over {considered} named candidates ({nameless} unnamed)",
-                if r.exact { "exact" } else { "prefix" },
-                r.prefix,
-                r.dist2.sqrt(),
-            ),
-            None => info!(
-                "by-name: \"{query}\" ({search:?}) -> NO MATCH over {considered} named candidates \
-                 ({nameless} unnamed, {mode:?}); target left untouched"
-            ),
-        }
-        best.map(|(e, g, _, name)| (e, g, name))
+        scan_units(
+            self.units
+                .iter()
+                .map(|(e, g, tf, store)| (e, g.0, tf.translation, store)),
+            self.origin(),
+            &self.names,
+            query,
+            search,
+            mode,
+            |store| filter != Filter::AssistableAlive || self.assistable_alive(store),
+        )
     }
 }
 
-/// Drain `/target <name>` through [`scan::commit`], the stop, select, re-swing path a click takes.
-/// A miss leaves the target alone, as neither failure edge in `0x489db4` calls `SetSelection`, and
-/// prints nothing; the reference prints message `0x127` `ERR_UNIT_NOT_FOUND` there, or `0xb8`
+/// One unit query's candidates, shared by [`ByNameScan`] and [`PlayerLookup`].
+type UnitQuery<'w, 's> = Query<
+    'w,
+    's,
+    (
+        Entity,
+        &'static Guid,
+        &'static Transform,
+        Option<&'static ObjectStore>,
+    ),
+>;
+
+/// The resolver's walk (`0x493aa0`): a name to a unit, logging one `by-name:` line per call,
+/// ungated since it runs per command: the candidates counted, the winner and on what. `keep` is
+/// the per-candidate filter mode; `origin` is the active player's position, without which the
+/// reference resolves nothing (`0x493ae0`).
+fn scan_units<'a>(
+    units: impl Iterator<Item = (Entity, u64, Vec3, Option<&'a ObjectStore>)>,
+    origin: Option<Vec3>,
+    names: &NameCache,
+    query: &str,
+    search: NameSearch,
+    mode: Match,
+    keep: impl Fn(Option<&ObjectStore>) -> bool,
+) -> Option<(Entity, u64, String)> {
+    let query = query.trim();
+    if query.is_empty() {
+        return None;
+    }
+    let Some(origin) = origin else {
+        info!("by-name: \"{query}\" — no active player object; nothing resolves");
+        return None;
+    };
+    let mut considered = 0usize;
+    let mut nameless = 0usize;
+    let mut best: Option<(Entity, u64, Rank, String)> = None;
+    for (entity, guid, pos, store) in units {
+        if !search.accepts(guid) || !keep(store) {
+            continue;
+        }
+        let Some(name) = names.peek(guid) else {
+            nameless += 1;
+            continue;
+        };
+        considered += 1;
+        let dist2 = pos.distance_squared(origin);
+        let Some(r) = rank(query, name, dist2, mode) else {
+            continue;
+        };
+        if best.as_ref().is_none_or(|(_, _, b, _)| r.beats(*b)) {
+            best = Some((entity, guid, r, name.to_string()));
+        }
+    }
+    match &best {
+        Some((_, guid, r, name)) => info!(
+            "by-name: \"{query}\" ({search:?}) -> \"{name}\" guid {guid:#x} \
+             ({}, prefix {}, {:.1} yd) over {considered} named candidates ({nameless} unnamed)",
+            if r.exact { "exact" } else { "prefix" },
+            r.prefix,
+            r.dist2.sqrt(),
+        ),
+        None => info!(
+            "by-name: \"{query}\" ({search:?}) -> NO MATCH over {considered} named candidates \
+             ({nameless} unnamed, {mode:?}); target left untouched"
+        ),
+    }
+    best.map(|(e, g, _, name)| (e, g, name))
+}
+
+/// The player-only name search for a caller that holds the [`NameCache`] mutably and so cannot
+/// take [`ByNameScan`]: `DoEmote`'s target (`0x49fdb1`).
+#[derive(SystemParam)]
+pub(crate) struct PlayerLookup<'w, 's> {
+    /// World positions, [`GlobalTransform`]: the chat drain already reads it, where `Transform`
+    /// would put it in an undeclared order against every system that moves a unit.
+    units: Query<'w, 's, (Entity, &'static Guid, &'static GlobalTransform)>,
+    self_q: Query<'w, 's, &'static GlobalTransform, With<SelfPlayer>>,
+}
+
+impl PlayerLookup<'_, '_> {
+    /// `0x493aa0` with typemask `0x10`, filter mode 0 and no exact-only flag, as `/assist <name>`
+    /// calls it: any player in the object list, whole name or longest prefix. Selects nothing.
+    pub(crate) fn find(&self, names: &NameCache, name: &str) -> Option<(Entity, u64)> {
+        let origin = self.self_q.single().ok().map(|tf| tf.translation());
+        scan_units(
+            self.units
+                .iter()
+                .map(|(e, g, tf)| (e, g.0, tf.translation(), None)),
+            origin,
+            names,
+            name,
+            NameSearch::PlayerOnly,
+            Match::PrefixOk,
+            |_| true,
+        )
+        .map(|(e, g, _)| (e, g))
+    }
+}
+
+/// `/target <name>` and the Lua `TargetByName(name, exactMatch)` through [`scan::commit`], the
+/// stop, select, re-swing path a click takes. `exact` is the Lua second argument, which `0x489d8e`
+/// reads with default 0 as the resolver's exact-only flag (consumed at `0x493cab`). A miss leaves
+/// the target alone, as neither failure edge in `0x489db4` calls `SetSelection`, and prints
+/// nothing; the reference prints message `0x127` `ERR_UNIT_NOT_FOUND` there, or `0xb8`
 /// `ERR_GENERIC_NO_TARGET` for an empty name.
+pub(super) fn target_named(
+    scan_params: &ByNameScan,
+    commit: &mut SelectCommit,
+    name: &str,
+    exact: bool,
+) {
+    let Some((entity, guid, _)) = scan_params.resolve(
+        name,
+        NameSearch::AnyUnit,
+        Filter::AcceptAll,
+        if exact {
+            Match::ExactOnly
+        } else {
+            Match::PrefixOk
+        },
+    ) else {
+        return;
+    };
+    commit.commit(entity, guid);
+}
+
+/// `/assist [name]` and the Lua `AssistByName`: the basis is a named player, or bare the current
+/// selection (`AssistUnit("target")`, `ChatFrame.lua:744`), and [`SelectCommit::assist`] selects
+/// its target.
+pub(super) fn assist_named(
+    scan_params: &ByNameScan,
+    commit: &mut SelectCommit,
+    name: Option<&str>,
+    how: &str,
+) {
+    let basis = match name {
+        Some(name) => scan_params
+            .resolve(
+                name,
+                NameSearch::PlayerOnly,
+                Filter::AcceptAll,
+                Match::PrefixOk,
+            )
+            .map(|(e, _, _)| e),
+        None => commit.selection.target,
+    };
+    let Some(basis) = basis else {
+        info!("assist ({how}): no basis unit; nothing to assist");
+        return;
+    };
+    // From here on this is `AssistUnit`'s tail too, one function as in the reference.
+    commit.assist(basis, how);
+}
+
+/// Drain the chat layer's `/target <name>` asks.
 pub(super) fn target_by_name_requests(
     mut requests: MessageReader<TargetByNameRequest>,
     scan_params: ByNameScan,
     mut commit: SelectCommit,
 ) {
     for request in requests.read() {
-        let Some((entity, guid, _)) = scan_params.resolve(
-            &request.name,
-            NameSearch::AnyUnit,
-            Filter::AcceptAll,
-            Match::PrefixOk,
-        ) else {
-            continue;
-        };
-        commit.commit(entity, guid);
+        target_named(&scan_params, &mut commit, &request.name, false);
     }
 }
 
-/// Drain the Lua `TargetByName(name, exactMatch)` asks, the `/target` path plus the second
-/// argument, which `0x489d8e` reads with default 0 as the resolver's exact-only flag (consumed at
-/// `0x493cab`).
-pub(super) fn script_target_by_name_requests(
-    script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-    scan_params: ByNameScan,
-    mut commit: SelectCommit,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    for (name, exact) in script.take_target_by_name_requests() {
-        let Some((entity, guid, _)) = scan_params.resolve(
-            &name,
-            NameSearch::AnyUnit,
-            Filter::AcceptAll,
-            if exact {
-                Match::ExactOnly
-            } else {
-                Match::PrefixOk
-            },
-        ) else {
-            continue;
-        };
-        commit.commit(entity, guid);
-    }
-}
-
-/// Drain `/assist [name]`: the basis is a named player, or bare the current selection
-/// (`AssistUnit("target")`, `ChatFrame.lua:744`), and [`SelectCommit::assist`] selects its target.
+/// Drain the chat layer's `/assist [name]` asks.
 pub(super) fn assist_requests(
     mut requests: MessageReader<AssistRequest>,
     scan_params: ByNameScan,
     mut commit: SelectCommit,
 ) {
     for request in requests.read() {
-        // The basis: a named player, or bare, whatever is selected.
-        let basis = match &request.name {
-            Some(name) => scan_params
-                .resolve(
-                    name,
-                    NameSearch::PlayerOnly,
-                    Filter::AcceptAll,
-                    Match::PrefixOk,
-                )
-                .map(|(e, _, _)| e),
-            None => commit.selection.target,
-        };
-        let Some(basis) = basis else {
-            info!("assist (/assist): no basis unit; nothing to assist");
-            continue;
-        };
-        // From here on this is `AssistUnit`'s tail too, one function as in the reference.
-        commit.assist(basis, "/assist");
+        assist_named(
+            &scan_params,
+            &mut commit,
+            request.name.as_deref(),
+            "/assist",
+        );
     }
 }
 
@@ -403,6 +461,7 @@ pub(super) fn follow_requests(
     cast: Res<crate::spell::PendingCast>,
     mut errors: ResMut<crate::ui_action::UiErrorKeys>,
     mut follow: ResMut<crate::player::FollowState>,
+    mut approach: ResMut<crate::player::Approach>,
 ) {
     for request in requests.read() {
         let resolved = match request {
@@ -445,6 +504,8 @@ pub(super) fn follow_requests(
         match resolved {
             Some((guid, name)) => {
                 info!("follow: now following \"{name}\" guid {guid:#x}");
+                // The arm `0x611130` cancels what runs first: one auto-move cell.
+                approach.stop();
                 follow.start(guid, name);
             }
             None => {
@@ -460,7 +521,7 @@ pub(super) fn follow_requests(
 #[allow(clippy::type_complexity)] // one bundled param, the app's convention for big query sets
 pub(crate) struct SelectCommit<'w, 's> {
     pub(super) selection: ResMut<'w, Selection>,
-    seam: crate::creature_anim::AttackSeam<'w, 's>,
+    pub(crate) seam: crate::creature_anim::AttackSeam<'w, 's>,
     // Our own body: the guid, the store `can_attack` reads, and whether we are mid-swing.
     me: Query<
         'w,
@@ -525,12 +586,33 @@ impl SelectCommit<'_, '_> {
         }
     }
 
+    /// Whether we are mid-swing, which a deselect stops.
+    pub(super) fn engaged(&self) -> bool {
+        self.me.single().is_ok_and(|(_, _, engaged)| engaged)
+    }
+
+    /// Deselect (`0x493540(0,0)`), a no-op with nothing selected; see [`super::click::clear`].
+    pub(super) fn clear(&mut self) {
+        let engaged = self.engaged();
+        super::click::deselect(&mut self.selection, &mut self.seam, engaged);
+    }
+
+    /// `0x48f3a0`'s select on a looted object, which tests `TYPEMASK_UNIT` first (`0x48f3af`).
+    pub(crate) fn select_unit(&mut self, guid: u64) {
+        let Some(&entity) = self.index.0.get(&guid) else {
+            return;
+        };
+        if self.stores.get(entity).is_ok_and(ObjectStore::is_unit) {
+            self.commit(entity, guid);
+        }
+    }
+
     /// Select a resolved guid, `0x489a40`'s arm 1, through [`scan::commit`].
     pub(super) fn commit(&mut self, entity: Entity, guid: u64) {
         let me = self.me.single().ok();
-        // `scan::commit` takes the new target's attackability from its caller: the same
-        // `can_attack` the cursor and TAB pass.
-        let attackable = super::relations::can_attack(
+        // The re-swing's gate is `StartAttack`'s on the new target (`0x5ecc16`): alive, then
+        // `CanAttack`, so a body is switched to and never swung at.
+        let attackable = scan::attack_target_valid(
             self.stores.get(entity).ok(),
             self.factions.as_deref(),
             &self.reputations,
diff --git a/crates/benilla-app/src/target/click.rs b/crates/benilla-app/src/target/click.rs
index 53942be4..3f27b934 100644
--- a/crates/benilla-app/src/target/click.rs
+++ b/crates/benilla-app/src/target/click.rs
@@ -1,7 +1,5 @@
 //! The click router: a clean left-click selects, a clean right-click takes the context action,
-//! and the UI's selection asks and Esc commit into the same [`super::Selection`].
-
-use benilla_ui::script::SelectionRequest;
+//! and a loot close's deselect clears the same [`super::Selection`].
 
 use super::lock::GoLockInputs;
 use super::*;
@@ -134,7 +132,7 @@ pub(super) fn select_on_click(
                 return;
             }
             if click_cfg.deselect_on_click && (!payload_held.0 || occlusion.distance.is_finite()) {
-                clear(&mut selection, &mut seam, engaged);
+                deselect(&mut selection, &mut seam, engaged);
             }
         }
     }
@@ -164,63 +162,553 @@ fn interaction_already_open_on(target: u64, interact: &crate::ui_session::Intera
     interact.1 == Some(target)
 }
 
-/// On a clean right-click, select the press pick's unit and act by the cursor's classification
-/// (the INTERACT leg `0x492820`): a GameObject, a corpse, an attack, loot, skin, or the
-/// `UNIT_NPC_FLAGS` ladder ([`service_arm`]). The range gray (`unable`) suppresses every send but
-/// attack, which the server holds until in reach; there is no auto-approach yet.
-// `ui_feedback` is the overflow bundle past the 16-SystemParam ceiling.
-#[allow(clippy::type_complexity)]
+/// The refusals and openers the dispatchers raise.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct Feedback<'w> {
+    errors: ResMut<'w, crate::ui_action::UiErrorKeys>,
+    cast_errors: ResMut<'w, crate::ui_action::CastErrors>,
+    mail: ResMut<'w, crate::ui_mail::MailOpen>,
+    item_text: ResMut<'w, crate::ui_item_text::ItemTextOpen>,
+    // The opener queue: this system cannot also hold `CastLadder` (a second `Items` and
+    // `CastErrors` borrow), so the lock verdict goes to `ui_action::drain::drain_go_openers`.
+    openers: ResMut<'w, crate::ui_action::GoOpenerCasts>,
+    // The stone's refusals need the roster, so they run in `drain_meeting_stone_joins`.
+    stone_uses: MessageWriter<'w, crate::ui_dialog_verbs::MeetingStoneUse>,
+}
+
+impl Feedback<'_> {
+    /// Whether a walk started; the leash's refusal says `ERR_AUTOFOLLOW_TOO_FAR` (`0x61110c`).
+    fn walked(&mut self, started: Result<(), crate::player::Refused>) -> bool {
+        match started {
+            Ok(()) => true,
+            Err(crate::player::Refused::TooFar) => {
+                self.errors
+                    .0
+                    .push(crate::ui_action::UiError::key("ERR_AUTOFOLLOW_TOO_FAR"));
+                false
+            }
+            Err(crate::player::Refused::Silent) => false,
+        }
+    }
+}
+
+enum MeleeApproach {
+    Face(Vec3),
+    Walk { at: Vec3, stop: f32 },
+}
+
+/// The dispatchers, which take the object (`0x5f0130`, `0x5df2a0`, `0x5df130`, `0x5f86b0`,
+/// `0x5f05e0`): a right-click reaches them through [`act_on_right_click`] and a crate's
+/// [`Interact`] through [`act_on_interact`], both with Click to Move's walk, an approach's arrival
+/// through [`act_on_arrival`] without it.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct Dispatch<'w, 's> {
+    seam: crate::creature_anim::AttackSeam<'w, 's>,
+    self_player: Query<'w, 's, (Entity, &'static Guid, Has<Engaged>), With<SelfPlayer>>,
+    // Through `creature_anim::gesture`, the chat path's entry, as the reference's dispatcher does.
+    gestures: ResMut<'w, crate::creature_anim::GestureQueue>,
+    go_inputs: GoLockInputs<'w, 's>,
+    player_actions: Res<'w, crate::ui_action::PlayerActions>,
+    // The skin leg's spells (`[0xb700e4]`, `[0xb700e8]`), already gated by the classifier.
+    learned: Res<'w, crate::ui_action::LearnedAbilities>,
+    // The GameObject leg also reads the object's anim state (the Action gate).
+    stores: Query<
+        'w,
+        's,
+        (
+            &'static ObjectStore,
+            Option<&'static crate::go_anim::GoAnim>,
+        ),
+    >,
+    places: Query<'w, 's, &'static Transform>,
+    service: ServiceArms<'w>,
+    feedback: Feedback<'w>,
+    auto: crate::player::AutoMove<'w, 's>,
+}
+
+/// The Loot walk's stop radius: the arm (`0x611130`) takes the square root (`0x6111ab`) of what
+/// the mode's stop function stores, and Loot's is the linear melee reach (`0x6112b6`), 5.0 for a
+/// corpse (`0x611317`).
+fn loot_stop(reach: f32) -> f32 {
+    reach.sqrt()
+}
+
+impl Dispatch<'_, '_> {
+    fn me(&self) -> Option<(Entity, u64, bool)> {
+        self.self_player
+            .single()
+            .ok()
+            .map(|(e, g, engaged)| (e, g.0, engaged))
+    }
+
+    fn self_store(&self) -> Option<&ObjectStore> {
+        let (me, ..) = self.me()?;
+        self.stores.get(me).ok().map(|(s, _)| s)
+    }
+
+    /// The reference's one mounted predicate, the player's `UNIT_FIELD_MOUNTDISPLAYID`.
+    fn mounted(&self) -> bool {
+        self.self_store()
+            .is_some_and(|s| s.0.unit_mount_display_id() != 0)
+    }
+
+    /// Centre to centre, as the cursor measures.
+    fn dist_sq(&self, target: Entity) -> Option<f32> {
+        let (me, ..) = self.me()?;
+        let a = self.places.get(me).ok()?.translation;
+        Some(a.distance_squared(self.places.get(target).ok()?.translation))
+    }
+
+    fn melee_reach(&self, target: Entity) -> f32 {
+        match (self.stores.get(target).ok(), self.self_store()) {
+            (Some((it, _)), Some(me)) => cursor_mode::melee_reach(it, me),
+            _ => cursor_mode::MELEE_FLOOR,
+        }
+    }
+
+    fn approach(
+        &mut self,
+        verb: crate::player::ApproachVerb,
+        target: Entity,
+        guid: u64,
+        subject: crate::player::Subject,
+        stop: f32,
+    ) -> bool {
+        let Ok(at) = self.places.get(target).map(|t| t.translation) else {
+            return false;
+        };
+        let started = self.auto.start(verb, guid, subject, at, stop);
+        self.feedback.walked(started)
+    }
+
+    /// `0x60fcc0`'s two arms for an attack: inside the melee reach `max(rA + rB + 1.3333, 5)` a
+    /// turn to face the enemy (`0x6100a0`), beyond it a walk to where it stands, stopping at the
+    /// square root (`0x6111ab`) of the reach less its offset (`0x61131d`), measured between the
+    /// player and itself, as the arm names the player's own guid (`0x60fe5f`).
+    fn melee_approach(&self, target: Entity) -> Option<MeleeApproach> {
+        let d2 = self.dist_sq(target)?;
+        let at = self.places.get(target).ok()?.translation;
+        let reach = self.melee_reach(target);
+        if d2 < reach * reach {
+            return Some(MeleeApproach::Face(at));
+        }
+        let own = self.self_store().map_or(cursor_mode::MELEE_FLOOR, |me| {
+            cursor_mode::melee_reach(me, me)
+        });
+        let stop = (own - cursor_mode::MELEE_OFFSET).sqrt();
+        Some(MeleeApproach::Walk { at, stop })
+    }
+
+    /// A GameObject out of its use range (`0x5f3346`, error `0xe1`): the approach (`0x610300`) when
+    /// `walk` and the object is no fishing bobber (`0x5f8705`), which stops short of this object's
+    /// range. A walk that does not start, the leash's `ERR_AUTOFOLLOW_TOO_FAR` first, leaves
+    /// `ERR_USE_TOO_FAR` (`0x5f874b`). Deviation: the reference's arm reads the last object's
+    /// stop (`0x611336` before `0x610383` stores this one's), so its first walk has no stop.
+    fn walk_to_object(&mut self, entity: Entity, guid: u64, go_type: i32, walk: bool) -> bool {
+        let walked = walk
+            && go_type != cursor_mode::GO_TYPE_FISHINGNODE
+            && self.approach(
+                crate::player::ApproachVerb::Use,
+                entity,
+                guid,
+                crate::player::Subject::GameObject,
+                crate::player::RANGE_STOP_FRACTION
+                    * cursor_mode::go_interact_range_sq(go_type).sqrt(),
+            );
+        if !walked {
+            self.feedback
+                .errors
+                .0
+                .push(crate::ui_action::UiError::key("ERR_USE_TOO_FAR"));
+        }
+        walked
+    }
+
+    /// `0x5f86b0`, `OnUse` past its highlightable gate: the GameObject's own mounted gate, its type's
+    /// use handler, then its lock. A usable object out of `in_reach` goes to
+    /// [`Self::walk_to_object`].
+    fn use_gameobject(&mut self, entity: Entity, guid: u64, in_reach: bool, walk: bool) {
+        let self_mounted = self.mounted();
+        let self_store = self
+            .me()
+            .and_then(|(e, ..)| self.stores.get(e).ok())
+            .map(|(s, _)| s);
+        let go = self
+            .stores
+            .get(entity)
+            .ok()
+            .map(|(s, anim)| (s, crate::go_anim::go_state(anim, s)));
+        // The GameObject's own mounted gate (`0x5f31a8`) returns before the opener: no packet, no
+        // cast. It applies only without a Lock.dbc row (`0x5f8180`, a pointer test, so an
+        // all-empty row counts, unlike `LockCatalog::is_locked`); a locked object is refused by
+        // its opener cast. Only MAILBOX is exempt (`0x5f31bb`). Silent: the key has no text or
+        // sound, and `0x4945b0` drops the empty string.
+        let lock_id = self.go_inputs.templates.get(guid).map_or(0, |t| t.lock_id);
+        let has_lock_row = lock_id != 0
+            && self
+                .go_inputs
+                .locks
+                .as_deref()
+                .is_some_and(|l| l.0.slots(lock_id).is_some());
+        let go_type = go.map_or(-1, |(s, _)| s.0.gameobject_type_id());
+        if self_mounted && !has_lock_row && go_type != cursor_mode::GO_TYPE_MAILBOX {
+            debug!(
+                "right-click gameobject {guid:#x}: refused, mounted (lock-less type {go_type}, silent)"
+            );
+            return;
+        }
+        // MAILBOX (type 19) opens locally: its use handler `0x5f6820` sends no
+        // `CMSG_GAMEOBJ_USE`, and `MAIL_SHOW` → `CheckInbox` asks for the list.
+        if go_type == cursor_mode::GO_TYPE_MAILBOX {
+            if in_reach {
+                debug!("right-click mailbox: open mail window {guid:#x}");
+                self.feedback.mail.click(guid);
+            } else {
+                self.walk_to_object(entity, guid, go_type, walk);
+            }
+            return;
+        }
+        // TEXT (type 9) opens locally (`0x5f58c0` → `0x4e32e0(goGuid, 0)`; vmangos' `Use` has no
+        // type-9 case); a re-click closes it, and the page is read at paint time.
+        if go_type == cursor_mode::GO_TYPE_TEXT {
+            if !in_reach {
+                self.walk_to_object(entity, guid, go_type, walk);
+            } else if self.feedback.item_text.toggle_closed(guid) {
+                debug!("right-click text gameobject: re-click closes {guid:#x}");
+            } else {
+                debug!("right-click text gameobject: read {guid:#x}");
+                self.feedback.item_text.open_pages(guid);
+            }
+            return;
+        }
+        // MEETINGSTONE (type 23) has its own use slot `0x5f69d0`: four client-side refusals, then
+        // `CMSG 0x292 {u64 goGuid}` (`0x4c9ff0`), never `CMSG_GAMEOBJ_USE`, whose type-23 arm in
+        // vmangos does nothing (`GameObject.cpp:1836`). Types 9, 19, 23 and 28 override the shared
+        // sender `0x5f33e0`.
+        if go_type == cursor_mode::GO_TYPE_MEETINGSTONE {
+            if in_reach {
+                debug!("right-click meeting stone: {guid:#x}");
+                self.feedback
+                    .stone_uses
+                    .write(crate::ui_dialog_verbs::MeetingStoneUse { go_guid: guid });
+            } else {
+                self.walk_to_object(entity, guid, go_type, walk);
+            }
+            return;
+        }
+        // By lock: used, opened by its opener cast, or refused locally (`0x5f3427..`).
+        match resolve_go_action(
+            guid,
+            &mut self.go_inputs,
+            &self.player_actions.spells,
+            go,
+            self_store,
+            &self.seam.net,
+        ) {
+            GoAction::Use | GoAction::OpenLock(_) | GoAction::OpenByKey(_) if !in_reach => {
+                self.walk_to_object(entity, guid, go_type, walk);
+            }
+            GoAction::Use => {
+                debug!("right-click gameobject use: {guid:#x}");
+                if benilla_assets::trace::enabled_for("use") {
+                    benilla_assets::trace::line(
+                        "use",
+                        &format!("SEND CMSG_GAMEOBJ_USE guid={guid:#x}"),
+                    );
+                }
+                let _ = self.seam.net.0.send(ClientCommand::GameObjUse { guid });
+            }
+            // Both opener arms queue for the one cast path, as the reference reaches `TryCast
+            // 0x6e4b60` from the use sender (`0x5f35c0`) like a button press.
+            GoAction::OpenLock(spell_id) => {
+                debug!("right-click gameobject open-lock: cast {spell_id} at {guid:#x}");
+                self.feedback
+                    .openers
+                    .0
+                    .push(crate::ui_action::GoOpener::Spell {
+                        spell_id,
+                        go_guid: guid,
+                    });
+            }
+            GoAction::OpenByKey(it) => {
+                debug!(
+                    "right-click gameobject open-by-key: use item ({},{}) blk {} at {guid:#x}",
+                    it.bag_index, it.slot, it.spell_index
+                );
+                self.feedback
+                    .openers
+                    .0
+                    .push(crate::ui_action::GoOpener::Key(it));
+            }
+            GoAction::Refuse(err) => {
+                debug!("right-click gameobject {guid:#x}: locked, refused ({err:?})");
+                if let Some(err) = err {
+                    self.feedback.errors.0.push(err);
+                }
+            }
+        }
+    }
+
+    /// `0x5df130`: `CMSG_LOOT` at a lootable corpse, walked to first when `walk` and beyond its
+    /// 5 yd (`0x5df1c3`), stopping at [`loot_stop`] of 5. A walk that does not start falls through
+    /// to the send.
+    fn loot_corpse(&mut self, entity: Entity, guid: u64, walk: bool) {
+        if walk
+            && self
+                .dist_sq(entity)
+                .is_some_and(|d2| d2 > cursor_mode::CORPSE_INTERACT_RANGE_SQ)
+            && self.approach(
+                crate::player::ApproachVerb::Loot,
+                entity,
+                guid,
+                crate::player::Subject::Corpse,
+                loot_stop(cursor_mode::MELEE_FLOOR),
+            )
+        {
+            return;
+        }
+        debug!("right-click corpse loot: {guid:#x}");
+        let _ = self.seam.net.0.send(ClientCommand::Loot { guid });
+        // Predicted, as for a unit corpse (`[player+0x1d28]` armed at the send).
+        self.seam.loot_latch.0 = Some(guid);
+    }
+
+    /// `0x5df2a0`: `CMSG_LOOT` at a dead unit, which `can_loot` (`CanLootNow 0x5ec110`) must
+    /// allow, walked to first when `walk` and beyond melee reach. A walk that does not start falls
+    /// through to the send.
+    fn loot_unit(&mut self, entity: Entity, guid: u64, can_loot: bool, walk: bool) {
+        if !can_loot {
+            return;
+        }
+        let reach = self.melee_reach(entity);
+        if walk
+            && self.dist_sq(entity).is_some_and(|d2| d2 > reach * reach)
+            && self.approach(
+                crate::player::ApproachVerb::Loot,
+                entity,
+                guid,
+                crate::player::Subject::Unit { dead: true },
+                loot_stop(reach),
+            )
+        {
+            return;
+        }
+        debug!("right-click loot: {guid:#x}");
+        let _ = self.seam.net.0.send(ClientCommand::Loot { guid });
+        // Predicted at the send, as the reference's sender (`0x5df253`) arms `[player+0x1d28]` and
+        // kneels before any reply; the anim driver reads the latch.
+        self.seam.loot_latch.0 = Some(guid);
+    }
+
+    /// `0x5f05e0`: the skin cast at a body. Out of reach it walks there when `walk`, and either way
+    /// casts nothing (`0x5f06c4`).
+    fn skin(
+        &mut self,
+        entity: Entity,
+        guid: u64,
+        spell_id: u32,
+        subject: crate::player::Subject,
+        in_reach: bool,
+        walk: bool,
+    ) {
+        if !in_reach {
+            if walk {
+                let reach = match subject {
+                    crate::player::Subject::Corpse => cursor_mode::MELEE_FLOOR,
+                    _ => self.melee_reach(entity),
+                };
+                let stop = crate::player::RANGE_STOP_FRACTION * reach;
+                self.approach(
+                    crate::player::ApproachVerb::Skin,
+                    entity,
+                    guid,
+                    subject,
+                    stop,
+                );
+            }
+            return;
+        }
+        // The cast's mounted check (`0x6094f0`, reason `0x39`), the one place a rider is told
+        // anything; the record comes off [`GoLockInputs`]' catalog, this system's only `Spells`.
+        let mounted = self.mounted();
+        let def = self
+            .go_inputs
+            .spells
+            .as_ref()
+            .and_then(|s| s.catalog.get(spell_id));
+        if crate::spell::validator::cast_mounted_refusal(mounted, def) {
+            debug!("right-click skin: refused locally — mounted (0x39)");
+            self.feedback.cast_errors.push_local(spell_id, 0x39);
+        } else {
+            debug!("right-click skin: {guid:#x} (spell {spell_id})");
+            let _ = self.seam.net.0.send(ClientCommand::CastSpell {
+                spell_id,
+                target: Some(guid),
+            });
+        }
+    }
+
+    /// `0x5f0130`: the NPC-service ladder. Out of the 5.5556 yd reach it walks there when `walk`,
+    /// returning before the ladder and the gesture (`0x5f022f`), and otherwise sends nothing.
+    fn talk(&mut self, entity: Entity, guid: u64, in_reach: bool, walk: bool) {
+        if !in_reach {
+            if walk {
+                self.approach(
+                    crate::player::ApproachVerb::Talk,
+                    entity,
+                    guid,
+                    crate::player::Subject::Unit { dead: false },
+                    crate::player::TALK_STOP,
+                );
+            }
+            return;
+        }
+        // The reference's own `UNIT_NPC_FLAGS` ladder (`0x5f0289`), not the cursor kind, which its
+        // cursor ladder (`0x482336`) projects lossily; the re-click gate comes first.
+        if interaction_already_open_on(guid, &self.service.interact) {
+            debug!("right-click interact: {guid:#x} — its window is already open, nothing sent");
+            return;
+        }
+        let npc_flags = self
+            .stores
+            .get(entity)
+            .map(|(s, _)| s.0.unit_npc_flags())
+            .unwrap_or(0);
+        let me = self.me();
+        let self_store = self.self_store();
+        // Peeked, not taken: the cursor clears only once a sale goes out. The reference sends the
+        // cursor's stored guid; we resolve the held `(bag, slot)`, which a pickup locks, and a slot
+        // with no guid opens the list instead.
+        let cursor_sale = self
+            .service
+            .script
+            .as_deref()
+            .and_then(|s| s.cursor_item())
+            .and_then(|item| {
+                let slot0 = u8::try_from(item.slot.saturating_sub(1)).unwrap_or(0);
+                self_store.and_then(|s| {
+                    crate::ui_items::slot_guid(&s.0, item.bag, slot0, &self.go_inputs.objects)
+                })
+            });
+        let ghost = self_store.is_some_and(|s| s.0.player_is_ghost());
+        let Some(arm) = service_arm(npc_flags, self.service.quest.status(guid)) else {
+            // `0x5f05ca`: no consulted bit does nothing, gesture included.
+            debug!("right-click interact: {guid:#x} matches no service bit — nothing sent");
+            return;
+        };
+        match service_action(arm, guid, ghost, cursor_sale) {
+            ServiceAction::Send(cmd) => {
+                debug!("right-click interact: {guid:#x} ({arm:?})");
+                let _ = self.seam.net.0.send(cmd);
+            }
+            ServiceAction::SellFromCursor(cmd) => {
+                debug!("right-click interact: {guid:#x} (vendor — selling the held item)");
+                let _ = self.seam.net.0.send(cmd);
+                // The sell clear: the slot stays greyed until the server's update.
+                if let Some(script) = self.service.script.as_deref_mut() {
+                    script.take_cursor_item_for_sale();
+                }
+            }
+            ServiceAction::AskBinder => {
+                debug!("right-click interact: {guid:#x} (innkeeper — CONFIRM_BINDER, no packet)");
+                self.service.binder.ask(guid);
+            }
+            ServiceAction::AskSpiritHealer => {
+                debug!(
+                    "right-click interact: {guid:#x} (spirit healer — CONFIRM_XP_LOSS, no packet)"
+                );
+                self.service.death.ask_spirit_healer(guid);
+            }
+            ServiceAction::AcquireSpiritGuide => {
+                debug!("right-click interact: {guid:#x} (spirit guide — adopting, 0x2E2)");
+                let outcome = self.service.spirit.click_guide(guid);
+                if outcome.cancel_aura {
+                    if let Some(script) = self.service.script.as_deref_mut() {
+                        script.fire_event("AREA_SPIRIT_HEALER_OUT_OF_RANGE", vec![]);
+                    }
+                    let _ = self.seam.net.0.send(ClientCommand::CancelAura {
+                        spell_id: crate::ui_dialog_verbs::AREA_SPIRIT_HEALER_AURA,
+                    });
+                }
+                if let Some(healer) = outcome.query {
+                    let _ = self
+                        .seam
+                        .net
+                        .0
+                        .send(ClientCommand::AreaSpiritHealerQuery { healer });
+                }
+            }
+            ServiceAction::Silent(why) => {
+                debug!("right-click interact: {guid:#x} ({arm:?}) — silent: {why}");
+            }
+        }
+        // Talk on every taken arm, silent ones too (each arm of `0x5f0130` ends `call
+        // 0x60bb30(0)`); the anim's WeaponFlags `0x10` stows a drawn weapon for good.
+        if let Some((_, my_guid, _)) = me {
+            self.gestures
+                .push(my_guid, crate::creature_anim::Gesture::Talk);
+        }
+    }
+}
+
+/// On a clean right-click, the INTERACT leg `0x492820` on the press pick: select it, then
+/// [`interact`].
 pub(super) fn act_on_right_click(
     mut clicks: MessageReader<WorldRightClick>,
     // The press pick: the reference picks once, on the down edge (`0x481f00`).
     press: Res<PressPick>,
     mut selection: ResMut<Selection>,
-    mut seam: crate::creature_anim::AttackSeam,
-    self_player: Query<(Entity, &Guid, Has<Engaged>), With<SelfPlayer>>,
-    // Through `creature_anim::gesture`, the chat path's entry, as the reference's dispatcher does.
-    mut gestures: ResMut<crate::creature_anim::GestureQueue>,
-    mut go_inputs: GoLockInputs,
-    player_actions: Res<crate::ui_action::PlayerActions>,
-    // The skin leg's spell (`[0xb700e4]`), already gated by the classifier.
-    learned: Res<crate::ui_action::LearnedAbilities>,
-    // The GameObject leg also reads the object's anim state (the Action gate).
-    stores: Query<(&ObjectStore, Option<&crate::go_anim::GoAnim>)>,
-    mut service: ServiceArms,
-    ui_feedback: (
-        ResMut<crate::ui_action::UiErrorKeys>,
-        ResMut<crate::ui_action::CastErrors>,
-        ResMut<crate::ui_mail::MailOpen>,
-        ResMut<crate::ui_item_text::ItemTextOpen>,
-        // The opener queue: this system cannot also hold `CastLadder` (a second `Items` and
-        // `CastErrors` borrow), so the lock verdict goes to `ui_action::drain::drain_go_openers`.
-        ResMut<crate::ui_action::GoOpenerCasts>,
-        // The stone's refusals need the roster, so they run in `drain_meeting_stone_joins`.
-        MessageWriter<crate::ui_dialog_verbs::MeetingStoneUse>,
-    ),
+    mut dispatch: Dispatch,
+    payload_held: Res<crate::ui_script::CursorPayloadHeld>,
 ) {
-    let (mut ui_error_keys, mut cast_errors, mut mail, mut item_text, mut openers, mut stone_uses) =
-        ui_feedback;
     if clicks.read().last().is_none() {
         return;
     }
+    // The router's other legs (`0x481f60`): the world hit walks there (`0x5e0378`), and nothing
+    // walks along the ray when the cursor is empty (`0x492d50`).
+    if press.hovered.any().is_none() && !press.hovered.refused && press.object.target.is_none() {
+        match (press.occlusion.point, press.occlusion.ray) {
+            (Some(at), _) => {
+                dispatch.auto.walk_to_ground(at);
+            }
+            (None, Some(ray)) if !payload_held.0 => {
+                dispatch.auto.walk_toward_sky(*ray);
+            }
+            _ => {}
+        }
+        return;
+    }
+    interact(&mut dispatch, &press, Select::First(&mut selection));
+}
+
+/// Where [`interact`] selects its unit, if it does: the world click's entry (`0x492820`) selects
+/// first, whatever leg follows; a crate's [`Interact`] runs the dispatcher alone, and only its
+/// attack leg selects, through StartAttack (`0x5ecb70`, `SetSelection` at `0x5eccaa`).
+enum Select<'a, 'w> {
+    First(&'a mut ResMut<'w, Selection>),
+    OnAttack(&'a mut ResMut<'w, Selection>),
+}
+
+/// Act on a pick by the cursor's classification of it: a GameObject, a corpse, an attack, loot,
+/// skin, or the `UNIT_NPC_FLAGS` ladder ([`service_arm`]); only the click selects first
+/// (`0x493540`), and the attack leg of an [`Interact`] selects through StartAttack. The range gray
+/// (`unable`) suppresses every send but attack, which the server holds until in reach; with Click
+/// to Move on, each dispatcher walks there instead (`CanAutoInteract` is their approach flag,
+/// `0x60c170`, `0x5d6c6f`).
+fn interact(dispatch: &mut Dispatch, press: &PressPick, mut select: Select) {
     let (hovered, hovered_object, cursor) = (&press.hovered, &press.object, &press.cursor);
-    // The reference's one mounted predicate, the player's `UNIT_FIELD_MOUNTDISPLAYID`.
-    let self_store = self_player
-        .single()
-        .ok()
-        .and_then(|(e, _, _)| stores.get(e).ok())
-        .map(|(s, _)| s);
-    let self_mounted = self_store.is_some_and(|s| s.0.unit_mount_display_id() != 0);
+    let walk = dispatch.auto.can_auto_interact();
+    let self_mounted = dispatch.mounted();
     // A GameObject is used, never falling through to units: `OnUse 0x5f8660` gates on
     // highlightable (our `Point` cursor, silent), then usable (`0x5f3130`), whose lock arm toasts
-    // first, even out of range. Out of range (`unable`) this shows nothing; the reference shows
-    // `ERR_USE_TOO_FAR` (`0x5f874b`) unless its auto-walk `0x610300` starts (`AutoInteract` on).
+    // first, even out of range.
     if go_is_nearest(hovered, hovered_object) {
-        // Traced (tag `use`): a `Point` cursor and the range gray both refuse silently here.
+        // Traced (tag `use`): a `Point` cursor refuses silently; the range gray raises
+        // `ERR_USE_TOO_FAR`.
         if benilla_assets::trace::enabled_for("use") {
             let ty = hovered_object
                 .target
-                .and_then(|e| stores.get(e).ok())
+                .and_then(|e| dispatch.stores.get(e).ok())
                 .map_or(-1, |(s, _)| s.0.gameobject_type_id());
             benilla_assets::trace::line(
                 "use",
@@ -233,109 +721,21 @@ pub(super) fn act_on_right_click(
             );
         }
         if cursor.kind != cursor_mode::CursorKind::Point {
-            if let Some(guid) = hovered_object.guid {
-                let go = hovered_object
-                    .target
-                    .and_then(|e| stores.get(e).ok())
-                    .map(|(s, anim)| (s, crate::go_anim::go_state(anim, s)));
-                // The GameObject's own mounted gate (`0x5f31a8`) returns before the opener: no
-                // packet, no cast. It applies only without a Lock.dbc row (`0x5f8180`, a pointer
-                // test, so an all-empty row counts, unlike `LockCatalog::is_locked`); a locked
-                // object is refused by its opener cast. Only MAILBOX is exempt (`0x5f31bb`).
-                // Silent: the key has no text or sound, and `0x4945b0` drops the empty string.
-                let lock_id = go_inputs.templates.get(guid).map_or(0, |t| t.lock_id);
-                let has_lock_row = lock_id != 0
-                    && go_inputs
-                        .locks
-                        .as_deref()
-                        .is_some_and(|l| l.0.slots(lock_id).is_some());
-                let go_type = go.map_or(-1, |(s, _)| s.0.gameobject_type_id());
-                if self_mounted && !has_lock_row && go_type != cursor_mode::GO_TYPE_MAILBOX {
-                    debug!(
-                        "right-click gameobject {guid:#x}: refused, mounted (lock-less type {go_type}, silent)"
-                    );
-                    return;
-                }
-                // MAILBOX (type 19) opens locally: its use handler `0x5f6820` sends no
-                // `CMSG_GAMEOBJ_USE`, and `MAIL_SHOW` → `CheckInbox` asks for the list.
-                if go.is_some_and(|(s, _)| s.0.gameobject_type_id() == cursor_mode::GO_TYPE_MAILBOX)
-                {
-                    if !cursor.unable {
-                        debug!("right-click mailbox: open mail window {guid:#x}");
-                        mail.click(guid);
-                    }
-                    return;
-                }
-                // TEXT (type 9) opens locally (`0x5f58c0` → `0x4e32e0(goGuid, 0)`; vmangos' `Use`
-                // has no type-9 case); a re-click closes it, and the page is read at paint time.
-                if go.is_some_and(|(s, _)| s.0.gameobject_type_id() == cursor_mode::GO_TYPE_TEXT) {
-                    if !cursor.unable {
-                        if item_text.toggle_closed(guid) {
-                            debug!("right-click text gameobject: re-click closes {guid:#x}");
-                        } else {
-                            debug!("right-click text gameobject: read {guid:#x}");
-                            item_text.open_pages(guid);
-                        }
-                    }
-                    return;
-                }
-                // MEETINGSTONE (type 23) has its own use slot `0x5f69d0`: four client-side
-                // refusals, then `CMSG 0x292 {u64 goGuid}` (`0x4c9ff0`), never `CMSG_GAMEOBJ_USE`,
-                // whose type-23 arm in vmangos does nothing (`GameObject.cpp:1836`). Types 9, 19,
-                // 23 and 28 override the shared sender `0x5f33e0`.
-                if go.is_some_and(|(s, _)| {
-                    s.0.gameobject_type_id() == cursor_mode::GO_TYPE_MEETINGSTONE
-                }) {
-                    if !cursor.unable {
-                        debug!("right-click meeting stone: {guid:#x}");
-                        stone_uses.write(crate::ui_dialog_verbs::MeetingStoneUse { go_guid: guid });
-                    }
-                    return;
-                }
-                // By lock: used, opened by its opener cast, or refused locally (`0x5f3427..`).
-                match resolve_go_action(
-                    guid,
-                    &mut go_inputs,
-                    &player_actions.spells,
-                    go,
-                    self_store,
-                    &seam.net,
-                ) {
-                    GoAction::Use if cursor.unable => {}
-                    GoAction::OpenLock(_) | GoAction::OpenByKey(_) if cursor.unable => {}
-                    GoAction::Use => {
-                        debug!("right-click gameobject use: {guid:#x}");
-                        if benilla_assets::trace::enabled_for("use") {
-                            benilla_assets::trace::line(
-                                "use",
-                                &format!("SEND CMSG_GAMEOBJ_USE guid={guid:#x}"),
-                            );
-                        }
-                        let _ = seam.net.0.send(ClientCommand::GameObjUse { guid });
-                    }
-                    // Both opener arms queue for the one cast path, as the reference reaches
-                    // `TryCast 0x6e4b60` from the use sender (`0x5f35c0`) like a button press.
-                    GoAction::OpenLock(spell_id) => {
-                        debug!("right-click gameobject open-lock: cast {spell_id} at {guid:#x}");
-                        openers.0.push(crate::ui_action::GoOpener::Spell {
-                            spell_id,
-                            go_guid: guid,
-                        });
-                    }
-                    GoAction::OpenByKey(it) => {
-                        debug!(
-                            "right-click gameobject open-by-key: use item ({},{}) blk {} at {guid:#x}",
-                            it.bag_index, it.slot, it.spell_index
-                        );
-                        openers.0.push(crate::ui_action::GoOpener::Key(it));
-                    }
-                    GoAction::Refuse(err) => {
-                        debug!("right-click gameobject {guid:#x}: locked, refused ({err:?})");
-                        if let Some(err) = err {
-                            ui_error_keys.0.push(err);
-                        }
-                    }
-                }
+            if let (Some(entity), Some(guid)) = (hovered_object.target, hovered_object.guid) {
+                // Walking, the range arm (`0x5f330c`) is the object's own: the PickLock cursor
+                // never grays, and the gray folds the lock in.
+                let in_reach = if walk {
+                    let go_type = dispatch
+                        .stores
+                        .get(entity)
+                        .map_or(-1, |(s, _)| s.0.gameobject_type_id());
+                    dispatch
+                        .dist_sq(entity)
+                        .is_some_and(|d2| d2 <= cursor_mode::go_interact_range_sq(go_type))
+                } else {
+                    !cursor.unable
+                };
+                dispatch.use_gameobject(entity, guid, in_reach, walk);
             }
         }
         return;
@@ -347,7 +747,7 @@ pub(super) fn act_on_right_click(
     // skin cast (`0x5f05e0`). Your own corpse takes neither: the resurrect prompt comes from the
     // 40 yd `CORPSE_IN_RANGE` poll (`0x492130`), never a click.
     if let (Some(entity), Some(guid)) = (hovered.corpse, hovered.corpse_guid) {
-        let store = stores.get(entity).ok().map(|(s, _)| s);
+        let store = dispatch.stores.get(entity).ok().map(|(s, _)| s);
         if benilla_assets::trace::enabled_for("use") {
             benilla_assets::trace::line(
                 "use",
@@ -361,47 +761,42 @@ pub(super) fn act_on_right_click(
                 ),
             );
         }
+        let (lootable, insignia) = (
+            store.is_some_and(|s| s.0.corpse_lootable()),
+            store.is_some_and(|s| s.0.corpse_pvp_insignia()),
+        );
         // A rider fails leg 1 (`0x5d6c2a jg`) with no error and falls to leg 2, silently.
-        if !self_mounted && store.is_some_and(|s| s.0.corpse_lootable()) {
+        if !self_mounted && lootable {
             // Not standing: the client-local red `ERR_LOOT_NOTSTANDING`, no packet (`0x5d6c3b` →
             // `GetStandState 0x5ed570`, non-zero → `0x496720(0x85)`).
-            let standing = self_store.is_none_or(|s| s.0.unit_stand_state() == 0);
-            if !standing {
+            if dispatch
+                .self_store()
+                .is_some_and(|s| s.0.unit_stand_state() != 0)
+            {
                 debug!("right-click corpse loot: refused, not standing ({guid:#x})");
-                ui_error_keys
+                dispatch
+                    .feedback
+                    .errors
                     .0
                     .push(crate::ui_action::UiError::key("ERR_LOOT_NOTSTANDING"));
                 return;
             }
             // Range rides the cursor's gray, so the pouch is never lit where the click refuses.
             if !cursor.unable {
-                debug!("right-click corpse loot: {guid:#x}");
-                let _ = seam.net.0.send(ClientCommand::Loot { guid });
-                // Predicted, as for a unit corpse (`[player+0x1d28]` armed at the send).
-                seam.loot_latch.0 = Some(guid);
+                dispatch.loot_corpse(entity, guid, walk);
             }
-        } else if store.is_some_and(|s| s.0.corpse_pvp_insignia()) {
+        } else if insignia {
             // Leg 2. `skin_player_corpse` mirrors `[0xb700e8]`, `None` for every 1.12.1 player,
             // so this is inert as in the reference; the unfriendly test is not built.
-            if let Some(spell_id) = learned.skin_player_corpse {
-                if !cursor.unable {
-                    // The cast's mounted check, where a mounted click lands; the record comes off
-                    // [`GoLockInputs`]' catalog, this system's only `Spells` handle.
-                    let def = go_inputs
-                        .spells
-                        .as_ref()
-                        .and_then(|s| s.catalog.get(spell_id));
-                    if crate::spell::validator::cast_mounted_refusal(self_mounted, def) {
-                        debug!("right-click corpse insignia: refused locally — mounted (0x39)");
-                        cast_errors.push_local(spell_id, 0x39);
-                    } else {
-                        debug!("right-click corpse insignia: {guid:#x} (spell {spell_id})");
-                        let _ = seam.net.0.send(ClientCommand::CastSpell {
-                            spell_id,
-                            target: Some(guid),
-                        });
-                    }
-                }
+            if let Some(spell_id) = dispatch.learned.skin_player_corpse {
+                dispatch.skin(
+                    entity,
+                    guid,
+                    spell_id,
+                    crate::player::Subject::Corpse,
+                    !cursor.unable,
+                    walk,
+                );
             }
         }
         return;
@@ -412,7 +807,7 @@ pub(super) fn act_on_right_click(
     // The dispatcher's attack arm (`0x60c18c`), not the sword: a dead, ghost or mounted player
     // still takes it and is refused inside (`0x60c1a1`, `0x60c1bc`), never reaching a service.
     let attack = press.attack_fork.0;
-    let target = stores.get(entity).ok().map(|(s, _)| s);
+    let target = dispatch.stores.get(entity).ok().map(|(s, _)| s);
     // ── The dead-target fork of the unit dispatcher `0x60bea0` ──
     // Loot routes by classification (dead and `UNIT_DYNFLAG_LOOTABLE`), not the cursor kind, whose
     // Pickup(8) a live vendor shares. A rider skips the loot leg for the skin leg (`0x60bf98`),
@@ -423,7 +818,7 @@ pub(super) fn act_on_right_click(
         dead_fork,
         target.is_some_and(|s| s.0.unit_lootable()),
         target.is_some_and(|s| s.0.unit_flags() & cursor_mode::UNIT_FLAG_SKINNABLE != 0),
-        learned.skinning.is_some(),
+        dispatch.learned.skinning.is_some(),
     );
     if benilla_assets::trace::enabled_for("use") {
         benilla_assets::trace::line(
@@ -447,72 +842,92 @@ pub(super) fn act_on_right_click(
             ),
         );
     }
-    let me = self_player.single().ok();
+    let me = dispatch.me();
     // A mid-combat click on a vendor or corpse switches and stops, never swings (`0x5ecb70`); the
     // sword, not the fork, as the re-swing also needs the player's own legs.
-    let outcome = scan::commit(
-        &mut selection,
-        &mut seam,
-        entity,
-        guid,
-        target,
-        me.is_some_and(|(_, _, e)| e),
-        me.map(|(_, g, _)| g.0),
-        press.attack(),
-    );
+    // Deref'd only where it commits: a leg that does not select leaves the change tick alone.
+    let commit = |seam: &mut crate::creature_anim::AttackSeam,
+                  selection: &mut ResMut<Selection>| {
+        scan::commit(
+            selection,
+            seam,
+            entity,
+            guid,
+            target,
+            me.is_some_and(|(_, _, e)| e),
+            me.map(|(_, g, _)| g),
+            press.attack(),
+        )
+    };
+    let mut outcome = match &mut select {
+        Select::First(selection) => commit(&mut dispatch.seam, selection),
+        Select::OnAttack(_) => scan::CommitOutcome::default(),
+    };
     match unit_branch(attack, dead_fork, leg) {
         UnitBranch::Attack => {
+            // `0x60c22b`, past the dead and mounted gates (`0x60c1a1`, `0x60c1bc`) and before
+            // StartAttack, so a refused swing still walks.
+            let refused = dispatch
+                .self_store()
+                .is_some_and(|s| s.0.is_dead_or_ghost() || s.0.unit_mount_display_id() > 0);
+            match dispatch.melee_approach(entity).filter(|_| !refused) {
+                Some(MeleeApproach::Face(at)) => {
+                    dispatch.auto.face(at);
+                }
+                Some(MeleeApproach::Walk { at, stop }) => {
+                    let started = dispatch.auto.walk_into_melee(at, stop);
+                    dispatch.feedback.walked(started);
+                }
+                None => {}
+            }
             // Silent after the select: the click's `0x60c247 call 0x5ecb70` has no `DisplayError`,
             // and the red `ERR_ATTACK_*` lines are `0x612df0`'s (the Attack action, pet attack,
             // TryCast). The predicate is `0x612df0`'s; `0x5ecb70`'s own set is not transcribed.
-            if crate::ui_action::attack_actor_blocked(self_store, me.map(|(_, g, _)| g.0)).is_some()
+            if crate::ui_action::attack_actor_blocked(dispatch.self_store(), me.map(|(_, g, _)| g))
+                .is_some()
             {
                 // refused: the selection stands, no swing, nothing said
             } else {
+                // StartAttack's own select (`0x5eccaa`), past its gates and before the swing
+                // (`0x5eccfd`): the click's commit, with its stop and re-swing mid-combat.
+                if let Select::OnAttack(selection) = &mut select {
+                    outcome = commit(&mut dispatch.seam, selection);
+                }
                 debug!("right-click attack: {guid:#x}");
                 // `0x5ecb70`'s body through the seam; `swung` means the commit's re-swing already
                 // went out, which `0x5eccda` keeps from sending twice.
                 let engaged = me.is_some_and(|(_, _, e)| e);
-                seam.start(guid, engaged || outcome.swung, false);
+                dispatch.seam.start(guid, engaged || outcome.swung, false);
             }
         }
         UnitBranch::Dead(DeadUnitLeg::Loot) => {
-            // `CMSG_LOOT`, no talk gesture; the stand-state check (`0x60bfb7` → `0x60c007 push
-            // 0x85`) matches the corpse leg's.
-            if self_store.is_some_and(|s| s.0.unit_stand_state() != 0) {
+            // The stand-state check (`0x60bfb7` → `0x60c007 push 0x85`) matches the corpse leg's.
+            if dispatch
+                .self_store()
+                .is_some_and(|s| s.0.unit_stand_state() != 0)
+            {
                 debug!("right-click loot: refused, not standing ({guid:#x})");
-                ui_error_keys
+                dispatch
+                    .feedback
+                    .errors
                     .0
                     .push(crate::ui_action::UiError::key("ERR_LOOT_NOTSTANDING"));
-            } else if !cursor.unable {
-                debug!("right-click loot: {guid:#x}");
-                let _ = seam.net.0.send(ClientCommand::Loot { guid });
-                // Predicted at the send, as the reference's sender (`0x5df253`) arms
-                // `[player+0x1d28]` and kneels before any reply; the anim driver reads the latch.
-                seam.loot_latch.0 = Some(guid);
+            } else {
+                dispatch.loot_unit(entity, guid, !cursor.unable, walk);
             }
         }
         UnitBranch::Dead(DeadUnitLeg::Skin) => {
             // The skin leg (`0x60c01f`): the known Skinning spell (`[0xb700e4]`) at a corpse the
-            // loot leg declined, lootable ones included while mounted. Its cast mounted check
-            // (`0x6094f0`, reason `0x39`) is the one place a rider is told anything.
-            if !cursor.unable {
-                if let Some(spell_id) = learned.skinning {
-                    let def = go_inputs
-                        .spells
-                        .as_ref()
-                        .and_then(|s| s.catalog.get(spell_id));
-                    if crate::spell::validator::cast_mounted_refusal(self_mounted, def) {
-                        debug!("right-click skin: refused locally — mounted (0x39)");
-                        cast_errors.push_local(spell_id, 0x39);
-                    } else {
-                        debug!("right-click skin: {guid:#x} (spell {spell_id})");
-                        let _ = seam.net.0.send(ClientCommand::CastSpell {
-                            spell_id,
-                            target: Some(guid),
-                        });
-                    }
-                }
+            // loot leg declined, lootable ones included while mounted.
+            if let Some(spell_id) = dispatch.learned.skinning {
+                dispatch.skin(
+                    entity,
+                    guid,
+                    spell_id,
+                    crate::player::Subject::Unit { dead: true },
+                    !cursor.unable,
+                    walk,
+                );
             }
         }
         // Terminal: a dead unit that took no leg does nothing; only the alive branch (`0x60c162`)
@@ -520,95 +935,116 @@ pub(super) fn act_on_right_click(
         UnitBranch::Dead(DeadUnitLeg::Nothing) => {
             debug!("right-click unit {guid:#x}: dead fork took no leg — nothing sent");
         }
-        UnitBranch::Service if !cursor.unable => {
-            // The reference's own `UNIT_NPC_FLAGS` ladder (`0x5f0289`), not the cursor kind, which
-            // its cursor ladder (`0x482336`) projects lossily; the re-click gate comes first.
-            if interaction_already_open_on(guid, &service.interact) {
-                debug!(
-                    "right-click interact: {guid:#x} — its window is already open, nothing sent"
-                );
-                return;
+        UnitBranch::Service => dispatch.talk(entity, guid, !cursor.unable, walk),
+    }
+}
+
+/// Interact with an object by running its own virtual dispatcher (slot `+0x60`): `0x60bea0` for a
+/// unit or player, `0x5d6bf0` for a corpse, `0x5f8660` for a GameObject. It skips the world click's
+/// select-first entry (`0x492820`); the attack leg selects through StartAttack (`0x5ecb70`), and
+/// the service, loot, skin, corpse and GameObject legs select nothing.
+#[derive(Message, Clone, Copy, PartialEq, Eq, Debug)]
+pub struct Interact(pub Entity);
+
+/// Each [`Interact`], its object classified as a press over it would be.
+pub(super) fn act_on_interact(
+    mut requests: MessageReader<Interact>,
+    mut selection: ResMut<Selection>,
+    kinds: Query<(&Guid, &crate::net::NetEntity)>,
+    mut set: ParamSet<(cursor_mode::CursorInputs, Dispatch)>,
+) {
+    use benilla_protocol::EntityKind;
+    for &Interact(entity) in requests.read() {
+        let Ok((guid, net)) = kinds.get(entity) else {
+            continue;
+        };
+        let mut pick = PressPick::default();
+        match net.kind {
+            EntityKind::Unit | EntityKind::Player => {
+                (pick.hovered.target, pick.hovered.guid) = (Some(entity), Some(guid.0));
             }
-            let npc_flags = stores
+            EntityKind::Corpse => {
+                (pick.hovered.corpse, pick.hovered.corpse_guid) = (Some(entity), Some(guid.0));
+            }
+            EntityKind::GameObject => {
+                (pick.object.target, pick.object.guid) = (Some(entity), Some(guid.0));
+            }
+            EntityKind::DynamicObject | EntityKind::Other => continue,
+        }
+        (pick.cursor, pick.attack_fork) =
+            cursor_mode::classify(&set.p0(), &pick.hovered, &pick.object);
+        interact(&mut set.p1(), &pick, Select::OnAttack(&mut selection));
+    }
+}
+
+/// The verb an approach owed, once it arrived (`0x60fa20`, run at the stop): the dispatcher alone,
+/// with no select, no cursor and no walk but Use's. Each looks its object up by type (`0x468460`),
+/// and the loot's asks for a unit (`0x60fa41`), so a corpse object walked to is not looted.
+pub(super) fn act_on_arrival(
+    mut dispatch: Dispatch,
+    index: Res<crate::net::GuidIndex>,
+    kinds: Query<&crate::net::NetEntity>,
+) {
+    use crate::player::{ApproachVerb, Subject};
+    use benilla_protocol::EntityKind;
+    let Some((verb, guid)) = dispatch.auto.approach.arrived.take() else {
+        return;
+    };
+    let Some(&entity) = index.0.get(&guid) else {
+        return;
+    };
+    let kind = kinds.get(entity).ok().map(|k| k.kind);
+    let unit = matches!(kind, Some(EntityKind::Unit | EntityKind::Player));
+    let d2 = dispatch.dist_sq(entity).unwrap_or(f32::INFINITY);
+    debug!(
+        "approach: arrived for {verb:?} at {guid:#x}, {:.2} yd",
+        d2.sqrt()
+    );
+    match verb {
+        ApproachVerb::Talk if unit => dispatch.talk(entity, guid, d2 <= SERVICE_RANGE_SQ, false),
+        // `0x5df2a0`'s own lootable test (`0x6003a0`), which the click's dead fork made earlier.
+        ApproachVerb::Loot if unit => {
+            if dispatch
+                .stores
                 .get(entity)
-                .map(|(s, _)| s.0.unit_npc_flags())
-                .unwrap_or(0);
-            // Peeked, not taken: the cursor clears only once a sale goes out. The reference sends
-            // the cursor's stored guid; we resolve the held `(bag, slot)`, which a pickup locks,
-            // and a slot with no guid opens the list instead.
-            let cursor_sale = service
-                .script
-                .as_deref()
-                .and_then(|s| s.cursor_item())
-                .and_then(|item| {
-                    let slot0 = u8::try_from(item.slot.saturating_sub(1)).unwrap_or(0);
-                    self_store.and_then(|s| {
-                        crate::ui_items::slot_guid(&s.0, item.bag, slot0, &go_inputs.objects)
-                    })
-                });
-            let Some(arm) = service_arm(npc_flags, service.quest.status(guid)) else {
-                // `0x5f05ca`: no consulted bit does nothing, gesture included.
-                debug!("right-click interact: {guid:#x} matches no service bit — nothing sent");
-                return;
-            };
-            match service_action(
-                arm,
-                guid,
-                self_store.is_some_and(|s| s.0.player_is_ghost()),
-                cursor_sale,
-            ) {
-                ServiceAction::Send(cmd) => {
-                    debug!("right-click interact: {guid:#x} ({arm:?})");
-                    let _ = seam.net.0.send(cmd);
-                }
-                ServiceAction::SellFromCursor(cmd) => {
-                    debug!("right-click interact: {guid:#x} (vendor — selling the held item)");
-                    let _ = seam.net.0.send(cmd);
-                    // The sell clear: the slot stays greyed until the server's update.
-                    if let Some(script) = service.script.as_deref_mut() {
-                        script.take_cursor_item_for_sale();
-                    }
-                }
-                ServiceAction::AskBinder => {
-                    debug!(
-                        "right-click interact: {guid:#x} (innkeeper — CONFIRM_BINDER, no packet)"
-                    );
-                    service.binder.ask(guid);
-                }
-                ServiceAction::AskSpiritHealer => {
-                    debug!("right-click interact: {guid:#x} (spirit healer — CONFIRM_XP_LOSS, no packet)");
-                    service.death.ask_spirit_healer(guid);
-                }
-                ServiceAction::AcquireSpiritGuide => {
-                    debug!("right-click interact: {guid:#x} (spirit guide — adopting, 0x2E2)");
-                    let outcome = service.spirit.click_guide(guid);
-                    if outcome.cancel_aura {
-                        if let Some(script) = service.script.as_deref_mut() {
-                            script.fire_event("AREA_SPIRIT_HEALER_OUT_OF_RANGE", vec![]);
-                        }
-                        let _ = seam.net.0.send(ClientCommand::CancelAura {
-                            spell_id: crate::ui_dialog_verbs::AREA_SPIRIT_HEALER_AURA,
-                        });
-                    }
-                    if let Some(healer) = outcome.query {
-                        let _ = seam
-                            .net
-                            .0
-                            .send(ClientCommand::AreaSpiritHealerQuery { healer });
-                    }
-                }
-                ServiceAction::Silent(why) => {
-                    debug!("right-click interact: {guid:#x} ({arm:?}) — silent: {why}");
-                }
-            }
-            // Talk on every taken arm, silent ones too (each arm of `0x5f0130` ends `call
-            // 0x60bb30(0)`); the anim's WeaponFlags `0x10` stows a drawn weapon for good.
-            if let Some((_, my_guid, _)) = me {
-                gestures.push(my_guid.0, crate::creature_anim::Gesture::Talk);
+                .is_ok_and(|(s, _)| s.0.unit_lootable())
+            {
+                let reach = dispatch.melee_reach(entity);
+                let can_loot = dispatch.auto.can_auto_interact() || d2 <= reach * reach;
+                dispatch.loot_unit(entity, guid, can_loot, false);
             }
         }
-        // Beyond the 5.5556 yd service range nothing is sent (no auto-approach yet).
-        UnitBranch::Service => {}
+        ApproachVerb::Use if kind == Some(EntityKind::GameObject) => {
+            let go_type = dispatch
+                .stores
+                .get(entity)
+                .map_or(-1, |(s, _)| s.0.gameobject_type_id());
+            // Still out of range, `0x5f86b0`'s range arm walks again (`0x610300`).
+            let walk = dispatch.auto.can_auto_interact();
+            dispatch.use_gameobject(
+                entity,
+                guid,
+                d2 <= cursor_mode::go_interact_range_sq(go_type),
+                walk,
+            );
+        }
+        // The spell by the target: a corpse or a player's body takes `[0xb700e8]` (`0x5f0608`).
+        ApproachVerb::Skin => {
+            let spell = if matches!(kind, Some(EntityKind::Corpse | EntityKind::Player)) {
+                dispatch.learned.skin_player_corpse
+            } else {
+                dispatch.learned.skinning
+            };
+            if let Some(spell_id) = spell {
+                let subject = if kind == Some(EntityKind::Corpse) {
+                    Subject::Corpse
+                } else {
+                    Subject::Unit { dead: true }
+                };
+                dispatch.skin(entity, guid, spell_id, subject, true, false);
+            }
+        }
+        _ => {}
     }
 }
 
@@ -991,26 +1427,16 @@ pub(crate) fn service_action(
     }
 }
 
-/// Drain `ClearTarget()`, the last leg of the Esc chain (`UIParent.lua:1492`), so the target drops
-/// only when no cast, window or focused edit box took the press first.
+/// Drain the guid-scoped deselects ([`DeselectGuid`]). `ClearTarget()`, the last leg of the Esc
+/// chain (`UIParent.lua:1492`), is a script call and lands in call order
+/// ([`crate::script_calls`]).
 pub(super) fn clear_target_requests(
-    script: Option<NonSendMut<benilla_ui::script::UiScript>>,
     mut selection: ResMut<Selection>,
     mut seam: crate::creature_anim::AttackSeam,
     engaged: Query<(), (With<Engaged>, With<SelfPlayer>)>,
     mut guid_asks: MessageReader<DeselectGuid>,
 ) {
-    let asked = guid_asks.read().any(|ask| selection.guid == Some(ask.0));
-    let Some(mut script) = script else {
-        if asked {
-            clear(&mut selection, &mut seam, !engaged.is_empty());
-        }
-        return;
-    };
-    // Both drained every frame: a `||` short-circuiting on `asked` would leave the VM's
-    // ClearTarget flag armed and clear the next frame's target.
-    let vm_clear = script.take_target_clear();
-    if asked || vm_clear {
+    if guid_asks.read().any(|ask| selection.guid == Some(ask.0)) {
         clear(&mut selection, &mut seam, !engaged.is_empty());
     }
 }
@@ -1020,67 +1446,23 @@ pub(super) fn clear_target_requests(
 #[derive(bevy::ecs::message::Message, Clone, Copy, Debug)]
 pub(crate) struct DeselectGuid(pub(crate) u64);
 
-/// Drain the UI's selection asks in order through the shared SetSelection path. `TargetUnit`
-/// (`0x4899d0`), `AssistUnit` (`0x489b80`) and `TargetLastEnemy` share the reference's helper
-/// `0x489a40`: a resolved unit or a roster member is committed, anything else is a no-op, never a
-/// deselect. Here a token must name a streamed unit, so an out-of-range roster member is a no-op
-/// (the guid-only selection is not built).
-pub(super) fn selection_requests(
-    script: Option<NonSendMut<UiScript>>,
-    // The one unit-token resolver, shared with the reach feed so `TargetUnit("target")` and
-    // `CheckInteractDistance("target", …)` name the same unit.
-    tokens: crate::ui_unit::UnitTokens,
-    // `TargetLastEnemy`'s memory (`[0xb4e2e8]`), stamped by `scan::remember_last_enemy`.
-    last_enemy: Res<scan::LastEnemy>,
-    // The SetSelection tail shared with `/target` and `/assist`, classification included.
-    mut commit: super::by_name::SelectCommit,
-    mut assist_by_name: MessageWriter<super::by_name::AssistRequest>,
+/// `SetSelection(0,0)` (`0x493540` → `0x4938f3`): the deselect of Esc, a click off and a target's
+/// death, which stamps the outgoing target into the last-target pair before [`clear`]. A no-op
+/// with nothing selected, the setter's dedup.
+pub(super) fn deselect(
+    selection: &mut Selection,
+    seam: &mut crate::creature_anim::AttackSeam,
+    engaged: bool,
 ) {
-    let Some(mut script) = script else {
-        return;
-    };
-    let requests = script.take_selection_requests();
-    if requests.is_empty() {
-        return;
-    }
-    for request in requests {
-        match request {
-            SelectionRequest::Unit(token) => {
-                if let Some((entity, guid)) = tokens.resolve(&token, &commit.selection) {
-                    commit.commit(entity, guid);
-                }
-            }
-            // `0x489ba9 call 0x515940(token)`, then the shared tail. An unresolvable token is
-            // silent here; the reference shows message `0xb8` `ERR_GENERIC_NO_TARGET` (`0x489c0e`).
-            SelectionRequest::Assist(token) => match tokens.resolve(&token, &commit.selection) {
-                Some((basis, _)) => commit.assist(basis, "AssistUnit"),
-                None => info!("assist (AssistUnit): \"{token}\" names nothing; silent no-op"),
-            },
-            // `0x489c40`, `/assist <name>`: a player name, prefix-matched by the app's name scan.
-            SelectionRequest::AssistByName(name) => {
-                assist_by_name.write(super::by_name::AssistRequest { name: Some(name) });
-            }
-            // `0x489b45` → `0x489a40`. Empty memory is a no-op (the shim `0x489b40` tests nothing),
-            // unlike `TargetLastTarget 0x489b00`, which reaches `0x493540(0,0)` and deselects.
-            SelectionRequest::LastEnemy => {
-                let Some(guid) = last_enemy.0 else {
-                    info!("TargetLastEnemy: nothing hostile has been targeted yet; no-op");
-                    continue;
-                };
-                match tokens.held(guid) {
-                    Some((entity, guid)) => commit.commit(entity, guid),
-                    // Stale: a no-op, and the memory stays, as the reference never clears it.
-                    None => info!(
-                        "TargetLastEnemy: {guid:#x} is no longer streamed; target left untouched"
-                    ),
-                }
-            }
-        }
+    if selection.guid.is_some() {
+        selection.last = selection.guid;
     }
+    clear(selection, seam, engaged);
 }
 
-/// Drop the target and send `CMSG_SET_SELECTION` 0 (a no-op with none); when `engaged`, melee
-/// stops too, as on the reference's Esc, click-off or target death. Weapons stay drawn.
+/// Drop the target and send `CMSG_SET_SELECTION` 0 (a no-op with none): the teardown `0x493910`
+/// with its send, which a despawn and a dead unit's loot close reach without `SetSelection`, so the
+/// last-target pair is left. When `engaged`, melee stops too. Weapons stay drawn.
 pub(super) fn clear(
     selection: &mut Selection,
     seam: &mut crate::creature_anim::AttackSeam,
@@ -1583,6 +1965,7 @@ mod tests {
             world.insert_resource(Selection {
                 target: Some(Entity::PLACEHOLDER),
                 guid: Some(HELD),
+                ..Default::default()
             });
             world.insert_resource(PressPick {
                 hovered: pick,
@@ -1624,94 +2007,6 @@ mod tests {
         );
     }
 
-    /// The selection queue from Lua, through the binding bodies of ASSISTTARGET (`AssistUnit`) and
-    /// TARGETLASTHOSTILE (`TargetLastEnemy`): an empty basis, a garbage token and a stale memory
-    /// are each a no-op (`0x489a40`'s bare `ret`), never a deselect or a panic.
-    #[test]
-    fn the_selection_queue_runs_assist_and_last_enemy_without_ever_deselecting() {
-        use crate::net::NetCommands;
-        use benilla_ui::script::UiScript;
-        use bevy::ecs::system::RunSystemOnce;
-
-        const ME: u64 = 1;
-        const BASIS: u64 = 0xB0A2;
-        const VICTIM: u64 = 0xC0DE;
-        const GONE: u64 = 0x6017;
-        // `UNIT_FIELD_TARGET` is a 2-field guid at index 16; HEALTH/MAXHEALTH keep the units live.
-        let store =
-            |pairs: &[(u16, u32)]| ObjectStore(benilla_protocol::ObjectFields::from_pairs(pairs));
-
-        let (tx, _rx) = crossbeam_channel::unbounded();
-        let mut world = World::new();
-        world.insert_resource(NetCommands(tx));
-        world.init_resource::<crate::spell::QueuedMeleeSpell>();
-        world.init_resource::<crate::spell::AutoRepeatActive>();
-        world.init_resource::<crate::ui_loot::LootState>();
-        world.init_resource::<crate::ui_loot::LootLatch>();
-        world.init_resource::<Messages<crate::creature_anim::SheathRequest>>();
-        world.init_resource::<crate::ui_party::GroupState>();
-        world.init_resource::<crate::net::GuidIndex>();
-        world.init_resource::<crate::net::Reputations>();
-        world.init_resource::<super::AssistAttack>();
-        world.init_resource::<Selection>();
-        world.init_resource::<scan::LastEnemy>();
-        world.init_resource::<Messages<super::by_name::AssistRequest>>();
-        world.insert_non_send_resource(UiScript::new().expect("a bare VM"));
-
-        world.spawn((SelfPlayer, Guid(ME), store(&[(22, 100), (28, 100)])));
-        // The basis is pointing at the victim; the victim points at nobody.
-        let basis = world
-            .spawn((
-                Guid(BASIS),
-                store(&[(22, 100), (28, 100), (16, VICTIM as u32)]),
-            ))
-            .id();
-        let victim = world
-            .spawn((Guid(VICTIM), store(&[(22, 100), (28, 100)])))
-            .id();
-        let index = &mut world.resource_mut::<crate::net::GuidIndex>().0;
-        index.insert(BASIS, basis);
-        index.insert(VICTIM, victim);
-
-        let run = |world: &mut World, lua: &str| {
-            world
-                .non_send_resource_mut::<UiScript>()
-                .eval::<()>(lua)
-                .expect("the binding runs");
-            world
-                .run_system_once(selection_requests)
-                .expect("the drain runs as a one-shot system");
-            world.resource::<Selection>().guid
-        };
-        let set = |world: &mut World, target: Option<(Entity, u64)>| {
-            let mut sel = world.resource_mut::<Selection>();
-            sel.target = target.map(|(e, _)| e);
-            sel.guid = target.map(|(_, g)| g);
-        };
-
-        // Assist the current target: one hop onto its target.
-        set(&mut world, Some((basis, BASIS)));
-        assert_eq!(run(&mut world, r#"AssistUnit("target")"#), Some(VICTIM));
-
-        // The victim targets nobody: assisting it is a no-op, not a deselect.
-        assert_eq!(run(&mut world, r#"AssistUnit("target")"#), Some(VICTIM));
-
-        assert_eq!(run(&mut world, r#"AssistUnit("nosuchunit")"#), Some(VICTIM));
-        assert_eq!(run(&mut world, r#"TargetUnit("nosuchunit")"#), Some(VICTIM));
-
-        // TargetLastEnemy with nothing remembered: also a no-op.
-        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
-
-        world.resource_mut::<scan::LastEnemy>().0 = Some(VICTIM);
-        set(&mut world, None);
-        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
-
-        // A stale memory (the unit despawned, so its guid is in no index) leaves the target alone.
-        world.resource_mut::<scan::LastEnemy>().0 = Some(GONE);
-        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
-        set(&mut world, None);
-        assert_eq!(run(&mut world, "TargetLastEnemy()"), None);
-    }
     use crate::net::{ClientCommand, NetCommands, ObjectStore};
     use bevy::ecs::system::RunSystemOnce;
 
@@ -1757,6 +2052,14 @@ mod tests {
         world.init_resource::<crate::ui_item_text::ItemTextOpen>();
         world.init_resource::<crate::ui_action::GoOpenerCasts>();
         world.init_resource::<Messages<crate::ui_dialog_verbs::MeetingStoneUse>>();
+        world.init_resource::<crate::player::Approach>();
+        world.init_resource::<crate::player::FollowState>();
+        world.init_resource::<crate::player::Player>();
+        world.init_resource::<crate::ui_script::CursorPayloadHeld>();
+        world.init_resource::<Messages<Interact>>();
+        world.init_resource::<crate::net::Reputations>();
+        world.init_resource::<crate::ui_loot::LootConfig>();
+        world.init_resource::<ButtonInput<KeyCode>>();
         world.spawn((SelfPlayer, Guid(ME)));
         let boar = world
             .spawn((Guid(BOAR), store(&[(F_HEALTH, 100), (F_MAXHEALTH, 100)])))
@@ -1911,8 +2214,513 @@ mod tests {
         );
     }
 
-    /// Out of interact range the click sends nothing, like the shared arms; the reference shows
-    /// `ERR_USE_TOO_FAR` unless its auto-walk (`0x610300`) starts.
+    #[test]
+    fn a_right_click_on_a_gameobject_leaves_the_selection_untouched() {
+        const STONE: u64 = 0x5703;
+        let (mut world, _boar) = right_click_world();
+        let stone = world
+            .spawn((Guid(STONE), store(&[(GO_TYPE_FIELD, 23)])))
+            .id();
+        *world.resource_mut::<PressPick>() = PressPick {
+            object: HoveredObject {
+                target: Some(stone),
+                guid: Some(STONE),
+                distance: 5.0,
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Interact,
+                unable: false,
+            },
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.clear_trackers();
+        world.run_system_once(act_on_right_click).unwrap();
+        assert!(!world.is_resource_changed::<Selection>());
+    }
+
+    const VENDOR: u64 = 0x7E0D;
+
+    /// Our body alive at the origin, Click to Move set as `walk`, and a vendor at `at`.
+    fn walking_world(
+        at: Vec3,
+        walk: bool,
+    ) -> (World, Entity, crossbeam_channel::Receiver<ClientCommand>) {
+        const F_NPC_FLAGS: u16 = 147;
+        let (tx, rx) = crossbeam_channel::unbounded::<ClientCommand>();
+        let (mut world, _boar) = right_click_world();
+        world.insert_resource(NetCommands(tx));
+        world.resource_mut::<crate::player::Approach>().enabled = walk;
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .unwrap();
+        world.entity_mut(me).insert((
+            store(&[(F_HEALTH, 100), (F_MAXHEALTH, 100)]),
+            Transform::default(),
+        ));
+        let vendor = world
+            .spawn((
+                Guid(VENDOR),
+                store(&[(F_HEALTH, 100), (F_MAXHEALTH, 100), (F_NPC_FLAGS, 0x4)]),
+                Transform::from_translation(at),
+                crate::net::NetEntity {
+                    kind: benilla_protocol::EntityKind::Unit,
+                    display_id: None,
+                    scale: 1.0,
+                },
+            ))
+            .id();
+        world
+            .resource_mut::<crate::net::GuidIndex>()
+            .0
+            .insert(VENDOR, vendor);
+        (world, vendor, rx)
+    }
+
+    fn click_vendor(world: &mut World, vendor: Entity) {
+        *world.resource_mut::<PressPick>() = PressPick {
+            hovered: Hovered {
+                target: Some(vendor),
+                guid: Some(VENDOR),
+                distance: 14.0,
+                ..Hovered::default()
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Buy,
+                unable: true,
+            },
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+    }
+
+    /// `0x5f0130`: out of reach, `CanAutoInteract` starts the walk and nothing goes out; with the
+    /// option off the click stays refused.
+    #[test]
+    fn a_far_vendor_click_walks_only_with_click_to_move_on() {
+        for walk in [true, false] {
+            let (mut world, vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), walk);
+            click_vendor(&mut world, vendor);
+            assert_eq!(
+                world.resource::<crate::player::Approach>().active(),
+                walk,
+                "AutoInteract {walk}"
+            );
+            let sent: Vec<ClientCommand> = rx.try_iter().collect();
+            assert!(
+                !sent
+                    .iter()
+                    .any(|c| matches!(c, ClientCommand::ListInventory { .. })),
+                "no list before the walk ends: {sent:?}"
+            );
+        }
+    }
+
+    /// `0x60fa20` on arrival: the ladder alone, with no select and no walk of its own.
+    #[test]
+    fn an_arrival_opens_the_vendor_it_walked_to() {
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(2.5, 0.0, 0.0), true);
+        world.resource_mut::<crate::player::Approach>().arrived =
+            Some((crate::player::ApproachVerb::Talk, VENDOR));
+        world.run_system_once(act_on_arrival).unwrap();
+        let sent: Vec<ClientCommand> = rx.try_iter().collect();
+        assert!(
+            matches!(
+                sent.as_slice(),
+                [ClientCommand::ListInventory { guid: VENDOR }]
+            ),
+            "{sent:?}"
+        );
+        assert!(world
+            .resource::<crate::player::Approach>()
+            .arrived
+            .is_none());
+    }
+
+    const CHEST: u64 = 0xC4E5;
+
+    fn spawn_object(world: &mut World, go_type: u32, at: Vec3) -> Entity {
+        let object = world
+            .spawn((
+                Guid(CHEST),
+                store(&[(GO_TYPE_FIELD, go_type)]),
+                Transform::from_translation(at),
+                crate::net::NetEntity {
+                    kind: benilla_protocol::EntityKind::GameObject,
+                    display_id: None,
+                    scale: 1.0,
+                },
+            ))
+            .id();
+        world
+            .resource_mut::<crate::net::GuidIndex>()
+            .0
+            .insert(CHEST, object);
+        object
+    }
+
+    fn spawn_chest(world: &mut World, at: Vec3) -> Entity {
+        spawn_object(world, 3, at)
+    }
+
+    /// Right-click the object out of reach (the cursor grayed, as for a far object), and the red
+    /// error keys the click raised.
+    fn click_far_object(world: &mut World, object: Entity, distance: f32) -> Vec<&'static str> {
+        *world.resource_mut::<PressPick>() = PressPick {
+            object: HoveredObject {
+                target: Some(object),
+                guid: Some(CHEST),
+                distance,
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Interact,
+                unable: true,
+            },
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+        world
+            .resource::<crate::ui_action::UiErrorKeys>()
+            .0
+            .iter()
+            .map(|e| e.key)
+            .collect()
+    }
+
+    /// A crate's [`Interact`] on `entity`, the selection's change tick cleared first.
+    fn interact_with(world: &mut World, entity: Entity) {
+        world.clear_trackers();
+        world
+            .resource_mut::<Messages<Interact>>()
+            .write(Interact(entity));
+        world.run_system_once(act_on_interact).unwrap();
+    }
+
+    /// The vendor leg (`0x5f0130`) runs the dispatcher alone: no select.
+    #[test]
+    fn an_interaction_opens_a_vendor_in_reach_and_leaves_the_selection() {
+        let (mut world, vendor, rx) = walking_world(Vec3::new(2.5, 0.0, 0.0), false);
+        interact_with(&mut world, vendor);
+        let sent: Vec<ClientCommand> = rx.try_iter().collect();
+        assert!(
+            matches!(
+                sent.as_slice(),
+                [ClientCommand::ListInventory { guid: VENDOR }]
+            ),
+            "{sent:?}"
+        );
+        assert_eq!(world.resource::<Selection>().guid, None);
+        assert!(!world.is_resource_changed::<Selection>());
+    }
+
+    #[test]
+    fn a_far_vendor_interaction_walks_only_with_click_to_move_on() {
+        for walk in [true, false] {
+            let (mut world, vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), walk);
+            interact_with(&mut world, vendor);
+            assert_eq!(
+                world.resource::<crate::player::Approach>().active(),
+                walk,
+                "AutoInteract {walk}"
+            );
+            let sent: Vec<ClientCommand> = rx.try_iter().collect();
+            assert!(sent.is_empty(), "{sent:?}");
+        }
+    }
+
+    /// `0x5f8660` → `0x5f86b0`: in reach the object is used; out of reach, with no walk, the range
+    /// arm raises `ERR_USE_TOO_FAR` (`0x5f874b`) and sends nothing. Neither selects.
+    #[test]
+    fn an_interaction_uses_a_gameobject_in_reach_and_refuses_one_out_of_it() {
+        for (x, used) in [(2.0, true), (30.0, false)] {
+            let (mut world, _vendor, rx) = walking_world(Vec3::ZERO, false);
+            let chest = spawn_chest(&mut world, Vec3::new(x, 0.0, 0.0));
+            interact_with(&mut world, chest);
+            let sent: Vec<ClientCommand> = rx.try_iter().collect();
+            assert_eq!(
+                matches!(sent.as_slice(), [ClientCommand::GameObjUse { guid: CHEST }]),
+                used,
+                "{x} yd: {sent:?}"
+            );
+            let keys: Vec<&str> = world
+                .resource::<crate::ui_action::UiErrorKeys>()
+                .0
+                .iter()
+                .map(|e| e.key)
+                .collect();
+            assert_eq!(
+                keys,
+                if used {
+                    vec![]
+                } else {
+                    vec!["ERR_USE_TOO_FAR"]
+                },
+                "{x} yd"
+            );
+            assert!(!world.is_resource_changed::<Selection>(), "{x} yd");
+        }
+    }
+
+    const WOLF: u64 = 0xF130_0000_0000_0299;
+
+    /// Our body hostile to nobody in particular and a wolf three yards off, the attack cursor on
+    /// it.
+    fn wolf_world() -> (World, Entity, crossbeam_channel::Receiver<ClientCommand>) {
+        const F_UNIT_FLAGS: u16 = benilla_protocol::field::FIELD_UNIT_FLAGS;
+        let (mut world, _vendor, rx) = walking_world(Vec3::ZERO, false);
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .unwrap();
+        world.entity_mut(me).insert(store(&[
+            (F_HEALTH, 100),
+            (F_MAXHEALTH, 100),
+            (F_UNIT_FLAGS, 0x8),
+        ]));
+        let wolf = world
+            .spawn((
+                Guid(WOLF),
+                store(&[(F_HEALTH, 100), (F_MAXHEALTH, 100)]),
+                Transform::from_xyz(3.0, 0.0, 0.0),
+                crate::net::NetEntity {
+                    kind: benilla_protocol::EntityKind::Unit,
+                    display_id: None,
+                    scale: 1.0,
+                },
+            ))
+            .id();
+        (world, wolf, rx)
+    }
+
+    /// The attack leg `0x60c247` calls StartAttack (`0x5ecb70`), which selects the target
+    /// (`SetSelection`, `0x5eccaa`) before the swing (`0x5eccfd`), as the right-click does.
+    #[test]
+    fn an_interaction_attacks_an_attackable_unit_and_selects_it() {
+        let (mut world, wolf, rx) = wolf_world();
+        interact_with(&mut world, wolf);
+        let sent: Vec<ClientCommand> = rx.try_iter().collect();
+        let at = |want: fn(&ClientCommand) -> bool| sent.iter().position(want);
+        let select = at(|c| matches!(c, ClientCommand::SetSelection { guid: WOLF }));
+        let swing = at(|c| matches!(c, ClientCommand::AttackSwing { guid: WOLF }));
+        assert!(
+            select.is_some() && swing.is_some() && select < swing,
+            "{sent:?}"
+        );
+        assert_eq!(world.resource::<Selection>().guid, Some(WOLF));
+    }
+
+    /// Mid-combat on another target the select is the click's: stop, select, swing.
+    #[test]
+    fn an_interaction_switching_targets_mid_combat_stops_selects_and_swings() {
+        const OLD: u64 = 0xF130_0000_0000_0111;
+        let (mut world, wolf, rx) = wolf_world();
+        let old = world.spawn((Guid(OLD), store(&[(F_HEALTH, 100)]))).id();
+        {
+            let mut selection = world.resource_mut::<Selection>();
+            selection.guid = Some(OLD);
+            selection.target = Some(old);
+        }
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .unwrap();
+        world.entity_mut(me).insert(Engaged(OLD));
+        interact_with(&mut world, wolf);
+        let sent: Vec<&str> = rx
+            .try_iter()
+            .map(|c| match c {
+                ClientCommand::AttackStop => "stop",
+                ClientCommand::SetSelection { guid: WOLF } => "select",
+                ClientCommand::AttackSwing { guid: WOLF } => "swing",
+                _ => "other",
+            })
+            .collect();
+        assert_eq!(sent, ["stop", "select", "swing"]);
+        assert_eq!(world.resource::<Selection>().guid, Some(WOLF));
+    }
+
+    /// `0x5df2a0`: beyond melee reach the walk comes first and nothing is looted yet.
+    #[test]
+    fn a_far_body_to_loot_is_walked_to_before_the_loot() {
+        const BODY: u64 = 0xB0D7;
+        const F_DYNAMIC_FLAGS: u16 = 143;
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let body = world
+            .spawn((
+                Guid(BODY),
+                store(&[(F_HEALTH, 0), (F_MAXHEALTH, 100), (F_DYNAMIC_FLAGS, 0x1)]),
+                Transform::from_xyz(0.0, 0.0, -12.0),
+            ))
+            .id();
+        *world.resource_mut::<PressPick>() = PressPick {
+            hovered: Hovered {
+                target: Some(body),
+                guid: Some(BODY),
+                distance: 12.0,
+                ..Hovered::default()
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Pickup,
+                unable: false,
+            },
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+        assert!(world.resource::<crate::player::Approach>().active());
+        assert!(!rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::Loot { .. })));
+    }
+
+    /// `0x611130`: a Loot walk stops at the square root (`0x6111ab`) of the linear melee reach
+    /// `0x6112b6` stores: `sqrt(5)` for a corpse (`0x611317`), `sqrt(max(rA + rB + 1.3333, 5))`
+    /// for a unit.
+    #[test]
+    fn a_loot_walk_stops_at_the_square_root_of_the_melee_reach() {
+        const BODY: u64 = 0xB0D7;
+        const CORPSE: u64 = 0xC0D5;
+        const F_DYNAMIC_FLAGS: u16 = 143;
+        const F_COMBAT_REACH: u16 = 130;
+        let loot_click = |world: &mut World, hovered: Hovered| {
+            *world.resource_mut::<PressPick>() = PressPick {
+                hovered,
+                cursor: WorldCursor {
+                    kind: cursor_mode::CursorKind::Pickup,
+                    unable: false,
+                },
+                ..PressPick::default()
+            };
+            world
+                .resource_mut::<Messages<WorldRightClick>>()
+                .write(WorldRightClick);
+            world.run_system_once(act_on_right_click).unwrap();
+        };
+        // A unit of reach 4 against our default 1.5: 4 + 1.5 + 1.3333 = 6.8333.
+        let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let body = world
+            .spawn((
+                Guid(BODY),
+                store(&[
+                    (F_HEALTH, 0),
+                    (F_MAXHEALTH, 100),
+                    (F_DYNAMIC_FLAGS, 0x1),
+                    (F_COMBAT_REACH, 4.0_f32.to_bits()),
+                ]),
+                Transform::from_xyz(0.0, 0.0, -12.0),
+            ))
+            .id();
+        loot_click(
+            &mut world,
+            Hovered {
+                target: Some(body),
+                guid: Some(BODY),
+                distance: 12.0,
+                ..Hovered::default()
+            },
+        );
+        let stop = world
+            .resource::<crate::player::Approach>()
+            .stop_distance()
+            .expect("the unit walk starts");
+        assert!(
+            (stop - (4.0_f32 + 1.5 + 1.333_333_3).sqrt()).abs() < 1e-3,
+            "{stop}"
+        );
+        // A corpse object has no unit to look up: reach 5.0, stop sqrt(5).
+        let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let corpse = world
+            .spawn((
+                Guid(CORPSE),
+                store(&[(benilla_protocol::field::FIELD_CORPSE_DYNAMIC_FLAGS, 0x1)]),
+                Transform::from_xyz(0.0, 0.0, -12.0),
+            ))
+            .id();
+        loot_click(
+            &mut world,
+            Hovered {
+                corpse: Some(corpse),
+                corpse_guid: Some(CORPSE),
+                distance: 12.0,
+                ..Hovered::default()
+            },
+        );
+        let stop = world
+            .resource::<crate::player::Approach>()
+            .stop_distance()
+            .expect("the corpse walk starts");
+        assert!((stop - 5.0_f32.sqrt()).abs() < 1e-5, "{stop}");
+    }
+
+    /// `0x5f86b0` → `0x610300`: a far object's use walks first, its range read off the object.
+    #[test]
+    fn a_far_object_is_walked_to_before_its_use() {
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let chest = spawn_chest(&mut world, Vec3::new(0.0, 0.0, -20.0));
+        *world.resource_mut::<PressPick>() = PressPick {
+            object: HoveredObject {
+                target: Some(chest),
+                guid: Some(CHEST),
+                distance: 20.0,
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Interact,
+                unable: true,
+            },
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+        assert!(world.resource::<crate::player::Approach>().active());
+        assert!(!rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::GameObjUse { .. })));
+    }
+
+    /// An arrival short of the object's range walks again, as `0x5f86b0`'s range arm does.
+    #[test]
+    fn an_object_still_out_of_range_on_arrival_is_walked_to_again() {
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        spawn_chest(&mut world, Vec3::new(0.0, 0.0, -20.0));
+        world.resource_mut::<crate::player::Approach>().arrived =
+            Some((crate::player::ApproachVerb::Use, CHEST));
+        world.run_system_once(act_on_arrival).unwrap();
+        assert!(world.resource::<crate::player::Approach>().active());
+        assert!(!rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::GameObjUse { .. })));
+    }
+
+    /// The arm's leash (`0x6110a0`): at 80 yd "Target is too far away." and no walk.
+    #[test]
+    fn a_vendor_80_yards_off_is_too_far_to_walk_to() {
+        let (mut world, vendor, _rx) = walking_world(Vec3::new(80.0, 0.0, 0.0), true);
+        click_vendor(&mut world, vendor);
+        assert!(!world.resource::<crate::player::Approach>().active());
+        let keys: Vec<&str> = world
+            .resource::<crate::ui_action::UiErrorKeys>()
+            .0
+            .iter()
+            .map(|e| e.key)
+            .collect();
+        assert_eq!(keys, vec!["ERR_AUTOFOLLOW_TOO_FAR"]);
+    }
+
+    /// Out of interact range the click sends nothing and raises `ERR_USE_TOO_FAR` (`0x5f874b`),
+    /// the stone's own use slot (`0x5f69d0`) never running.
     #[test]
     fn an_out_of_range_meeting_stone_click_sends_nothing() {
         const STONE: u64 = 0x5702;
@@ -1944,5 +2752,254 @@ mod tests {
             .next()
             .is_none());
         assert!(rx.try_iter().next().is_none());
+        let keys: Vec<&str> = world
+            .resource::<crate::ui_action::UiErrorKeys>()
+            .0
+            .iter()
+            .map(|e| e.key)
+            .collect();
+        assert_eq!(keys, vec!["ERR_USE_TOO_FAR"]);
+    }
+
+    /// `0x5f86b0`: the usable test (`0x5f3130`) refuses out of range with `0xe1`, and with the
+    /// option off the auto-walk (`0x610300`) is false, so `0x5f874b` raises `ERR_USE_TOO_FAR`: for
+    /// the shared arms and the mailbox, text and stone, whose slot `+0x18` is the same test.
+    #[test]
+    fn a_far_object_click_is_too_far_with_click_to_move_off() {
+        for go_type in [3, 9, 19, 23] {
+            let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), false);
+            let object = spawn_object(&mut world, go_type, Vec3::new(0.0, 0.0, -20.0));
+            let keys = click_far_object(&mut world, object, 20.0);
+            assert_eq!(keys, vec!["ERR_USE_TOO_FAR"], "type {go_type}");
+            assert!(!world.resource::<crate::player::Approach>().active());
+            assert!(rx.try_iter().next().is_none(), "type {go_type}");
+        }
+    }
+
+    /// The arm's leash (`0x6110a0`) refuses the walk with `0x126`, and `0x610300` returns false, so
+    /// `0xe1` follows.
+    #[test]
+    fn a_leashed_far_object_click_raises_both_errors_in_order() {
+        let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let chest = spawn_chest(&mut world, Vec3::new(0.0, 0.0, -90.0));
+        let keys = click_far_object(&mut world, chest, 90.0);
+        assert_eq!(keys, vec!["ERR_AUTOFOLLOW_TOO_FAR", "ERR_USE_TOO_FAR"]);
+        assert!(!world.resource::<crate::player::Approach>().active());
+    }
+
+    /// A walk that starts raises nothing.
+    #[test]
+    fn a_walkable_far_object_click_raises_no_error() {
+        let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let chest = spawn_chest(&mut world, Vec3::new(0.0, 0.0, -20.0));
+        let keys = click_far_object(&mut world, chest, 20.0);
+        assert!(keys.is_empty(), "{keys:?}");
+        assert!(world.resource::<crate::player::Approach>().active());
+    }
+
+    /// A fishing node, out of its 100 yd, never takes the walk (`0x5f8705`) and goes straight to
+    /// `0x5f874b`.
+    #[test]
+    fn a_far_fishing_node_is_too_far_even_with_click_to_move_on() {
+        let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let node = spawn_object(
+            &mut world,
+            cursor_mode::GO_TYPE_FISHINGNODE as u32,
+            Vec3::new(0.0, 0.0, -120.0),
+        );
+        let keys = click_far_object(&mut world, node, 120.0);
+        assert_eq!(keys, vec!["ERR_USE_TOO_FAR"]);
+        assert!(!world.resource::<crate::player::Approach>().active());
+    }
+
+    fn right_click_world_at(world: &mut World, occlusion: PickOcclusion) {
+        *world.resource_mut::<PressPick>() = PressPick {
+            occlusion,
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+    }
+
+    /// `0x5e0378`: a right-click on the ground walks there through `CanAutoInteract`, sending
+    /// nothing and keeping the selection; a held payload is dropped (`0x492ca9`) and the walk
+    /// still starts.
+    #[test]
+    fn a_ground_right_click_walks_there_only_with_click_to_move_on() {
+        for (walk, held) in [(true, false), (true, true), (false, false)] {
+            let (mut world, vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), walk);
+            world
+                .resource_mut::<crate::ui_script::CursorPayloadHeld>()
+                .0 = held;
+            // `0x5e0320` returns without deselecting: the vendor stays the target.
+            let vendor_guid = world.get::<Guid>(vendor).unwrap().0;
+            let mut selection = world.resource_mut::<Selection>();
+            selection.target = Some(vendor);
+            selection.guid = Some(vendor_guid);
+            right_click_world_at(
+                &mut world,
+                PickOcclusion {
+                    distance: 10.0,
+                    point: Some(Vec3::new(0.0, 0.0, -10.0)),
+                    ..PickOcclusion::default()
+                },
+            );
+            let approach = world.resource::<crate::player::Approach>();
+            assert_eq!(approach.active(), walk, "AutoInteract {walk}, held {held}");
+            if walk {
+                assert!((approach.stop_distance().unwrap() - 0.5).abs() < 1e-6);
+            }
+            assert!(rx.try_iter().next().is_none());
+            assert_eq!(world.resource::<Selection>().guid, Some(vendor_guid));
+        }
+    }
+
+    fn attack_wolf_at(at: Vec3, reach: f32) -> (World, crossbeam_channel::Receiver<ClientCommand>) {
+        const F_COMBAT_REACH: u16 = 130;
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let wolf = world
+            .spawn((
+                Guid(WOLF),
+                store(&[
+                    (F_HEALTH, 100),
+                    (F_MAXHEALTH, 100),
+                    (F_COMBAT_REACH, reach.to_bits()),
+                ]),
+                Transform::from_translation(at),
+            ))
+            .id();
+        *world.resource_mut::<PressPick>() = PressPick {
+            hovered: Hovered {
+                target: Some(wolf),
+                guid: Some(WOLF),
+                distance: at.length(),
+                ..Hovered::default()
+            },
+            cursor: WorldCursor {
+                kind: cursor_mode::CursorKind::Attack,
+                unable: false,
+            },
+            attack_fork: cursor_mode::AttackFork(true),
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+        (world, rx)
+    }
+
+    /// `0x60c22b` → `0x60fcc0`: out of melee the walk arms before the swing, stopping at
+    /// `sqrt(max(2·own reach + 1.3333, 5) − 1.3333)`, the enemy's own reach not counted
+    /// (`0x60fe5f`, `0x6112b6`, `0x61131d`, `0x6111ab`).
+    #[test]
+    fn an_enemy_out_of_melee_is_walked_into_before_the_swing() {
+        let (world, rx) = attack_wolf_at(Vec3::new(0.0, 0.0, -12.0), 4.0);
+        let stop = world
+            .resource::<crate::player::Approach>()
+            .stop_distance()
+            .expect("the melee walk starts");
+        assert!(
+            (stop - (5.0_f32 - 1.333_333_3).sqrt()).abs() < 1e-3,
+            "{stop}"
+        );
+        assert!(rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::AttackSwing { guid: WOLF })));
+    }
+
+    /// Inside `max(rA + rB + 1.3333, 5)` the attack turns to face the enemy where it stands
+    /// (`0x60fd80`) and swings.
+    #[test]
+    fn an_enemy_in_melee_is_faced_without_a_walk() {
+        let (world, rx) = attack_wolf_at(Vec3::new(0.0, 0.0, -6.0), 4.0);
+        assert!(world.resource::<crate::player::Approach>().facing());
+        assert!(rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::AttackSwing { guid: WOLF })));
+    }
+
+    /// The mounted gate (`0x60c1bc`) skips the walk and the swing alike.
+    #[test]
+    fn a_mounted_attack_does_not_walk() {
+        const F_MOUNT: u16 = benilla_protocol::field::FIELD_UNIT_MOUNTDISPLAYID;
+        let (mut world, _vendor, rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .unwrap();
+        world.entity_mut(me).insert(store(&[
+            (F_HEALTH, 100),
+            (F_MAXHEALTH, 100),
+            (F_MOUNT, 14_337),
+        ]));
+        let wolf = world
+            .spawn((
+                Guid(WOLF),
+                store(&[(F_HEALTH, 100), (F_MAXHEALTH, 100)]),
+                Transform::from_xyz(0.0, 0.0, -12.0),
+            ))
+            .id();
+        *world.resource_mut::<PressPick>() = PressPick {
+            hovered: Hovered {
+                target: Some(wolf),
+                guid: Some(WOLF),
+                distance: 12.0,
+                ..Hovered::default()
+            },
+            attack_fork: cursor_mode::AttackFork(true),
+            ..PressPick::default()
+        };
+        world
+            .resource_mut::<Messages<WorldRightClick>>()
+            .write(WorldRightClick);
+        world.run_system_once(act_on_right_click).unwrap();
+        assert!(!world.resource::<crate::player::Approach>().active());
+        assert!(
+            !rx.try_iter()
+                .any(|c| matches!(c, ClientCommand::AttackSwing { .. })),
+            "the mounted gate skips StartAttack too"
+        );
+    }
+
+    /// The melee row's 80 yd leash (`0x60e652`) refuses with `ERR_AUTOFOLLOW_TOO_FAR` (`0x61110c`);
+    /// the swing still goes out (`0x60c247`).
+    #[test]
+    fn an_enemy_80_yards_off_is_too_far_to_walk_into() {
+        let (world, rx) = attack_wolf_at(Vec3::new(0.0, 0.0, -85.0), 1.5);
+        assert!(!world.resource::<crate::player::Approach>().active());
+        assert_eq!(
+            world.resource::<crate::ui_action::UiErrorKeys>().0,
+            vec![crate::ui_action::UiError::key("ERR_AUTOFOLLOW_TOO_FAR")]
+        );
+        assert!(rx
+            .try_iter()
+            .any(|c| matches!(c, ClientCommand::AttackSwing { guid: WOLF })));
+    }
+
+    /// `0x492d30`: a right-click on nothing walks along the ray, but not with a payload held
+    /// (`0x492d50`), which that click only drops.
+    #[test]
+    fn a_sky_right_click_walks_along_the_ray_with_an_empty_cursor() {
+        for held in [false, true] {
+            let (mut world, _vendor, _rx) = walking_world(Vec3::new(14.0, 0.0, 0.0), true);
+            world
+                .resource_mut::<crate::ui_script::CursorPayloadHeld>()
+                .0 = held;
+            right_click_world_at(
+                &mut world,
+                PickOcclusion {
+                    ray: Dir3::new(Vec3::new(0.0, 0.3, -1.0)).ok(),
+                    ..PickOcclusion::default()
+                },
+            );
+            assert_eq!(
+                world.resource::<crate::player::Approach>().active(),
+                !held,
+                "payload held {held}"
+            );
+        }
     }
 }
diff --git a/crates/benilla-app/src/target/cursor_mode.rs b/crates/benilla-app/src/target/cursor_mode.rs
index 57167d01..29ab82a6 100644
--- a/crates/benilla-app/src/target/cursor_mode.rs
+++ b/crates/benilla-app/src/target/cursor_mode.rs
@@ -149,13 +149,17 @@ const ATTACK_RANGE_SQ: f32 = 109.2025;
 /// Melee interact reach `max(reachA + reachB + 1.333, 5.0)` (`0x80b058`, `0x80a1e8`): 5.0 is a
 /// floor, so large creatures reach farther. Gates skin (`0x6e3480`) and loot (`CanLootNow
 /// 0x5ec110`), center to center, boundary-inclusive.
-const MELEE_OFFSET: f32 = 1.333_33;
-const MELEE_FLOOR: f32 = 5.0;
+pub(super) const MELEE_OFFSET: f32 = 1.333_33;
+pub(super) const MELEE_FLOOR: f32 = 5.0;
+
+pub(super) fn melee_reach(target: &ObjectStore, me: &ObjectStore) -> f32 {
+    (target.0.unit_combat_reach() + me.0.unit_combat_reach() + MELEE_OFFSET).max(MELEE_FLOOR)
+}
 
 /// A corpse's interact reach, squared: a flat 5 yd, since a corpse has no combat reach and the
 /// melee formula falls to its floor. `CanLootNow 0x5ec110` and the `CMSG_LOOT` sender `0x5df130`
 /// both compare against 25.0.
-const CORPSE_INTERACT_RANGE_SQ: f32 = 25.0;
+pub(super) const CORPSE_INTERACT_RANGE_SQ: f32 = 25.0;
 
 /// `GAMEOBJECT_TYPE_GENERIC`: decoration whose highlightable slot is constant false (`0x5f47f0`),
 /// so it never shows an interact cursor.
@@ -203,7 +207,7 @@ pub(crate) const GO_TYPE_FISHINGNODE: i32 = 17;
 /// `GAMEOBJECT_TYPE_CHAIR` (7): its own range predicate `0x5f5670` accepts within 3.0 yd
 /// (`[0xc4d808]`, written only by `0x5f98b0` as 3.0 squared).
 pub(crate) const GO_TYPE_CHAIR: i32 = 7;
-fn go_interact_range_sq(type_id: i32) -> f32 {
+pub(super) fn go_interact_range_sq(type_id: i32) -> f32 {
     match type_id {
         GO_TYPE_FISHINGNODE => 100.0 * 100.0,
         // Measured to the object; the reference (seats from `0x5f5760`) and vmangos
@@ -493,6 +497,8 @@ struct CorpseFacts {
     dist_sq: f32,
     /// The already-looting override: `[player+0x1d28/2c] == corpse GUID`.
     looting_this: bool,
+    /// `CanAutoInteract`, which `CanLootNow` asks first and then skips its range (`0x5ec11b`).
+    can_auto_interact: bool,
     auto_loot: bool,
     /// Key 0, shift.
     shift_held: bool,
@@ -502,7 +508,7 @@ fn corpse_cursor(f: CorpseFacts) -> Option<(CursorKind, bool)> {
     // Leg 1, lootable: able within `CanLootNow 0x5ec110`'s reach or while this corpse's loot
     // window is open; Pickup or LootAll by key 0 (`0x41f8f0` at `0x4827f8`), grayed at `0x482818`.
     if f.lootable {
-        let able = f.dist_sq <= CORPSE_INTERACT_RANGE_SQ || f.looting_this;
+        let able = f.can_auto_interact || f.dist_sq <= CORPSE_INTERACT_RANGE_SQ || f.looting_this;
         return Some((loot_cursor(f.auto_loot, f.shift_held), !able));
     }
     // Leg 2, the PvP insignia (`0x482875..0x4828a2`), inert in 1.12.1 as no player holds a
@@ -514,34 +520,80 @@ fn corpse_cursor(f: CorpseFacts) -> Option<(CursorKind, bool)> {
     None // the reference's "else clear": Point
 }
 
-/// Resolve this frame's [`WorldCursor`]; no hover, or nothing resolvable, reads Point.
-#[allow(clippy::type_complexity)]
+/// Resolve this frame's [`WorldCursor`] over the hover.
 pub(super) fn classify_cursor(
     hovered: Res<Hovered>,
     hovered_object: Res<HoveredObject>,
-    factions: Option<Res<Factions>>,
-    reputations: Res<Reputations>,
+    inputs: CursorInputs,
     (mut cursor, mut fork): (ResMut<WorldCursor>, ResMut<AttackFork>),
-    // `control_lost` is the attack leg's `[0xb4b3e4]` clear.
-    player: Res<crate::player::Player>,
-    units: Query<(
-        &Transform,
-        Option<&ObjectStore>,
-        Option<&crate::go_anim::GoAnim>,
-    )>,
-    self_q: Query<(&Transform, &ObjectStore), With<SelfPlayer>>,
-    go_inputs: super::lock::GoLockInputs,
-    player_actions: Res<crate::ui_action::PlayerActions>,
-    // `[0xb700e4]` and `[0xb700e8]`, the skin legs' learned-spell latches.
-    learned: Res<crate::ui_action::LearnedAbilities>,
-    quest: Res<crate::ui_quest::QuestGiver>,
-    loot_cfg: Res<crate::ui_loot::LootConfig>,
-    keys: Res<ButtonInput<KeyCode>>,
-    // `[player+0x1d28/2c]`, the object whose loot window is open.
-    loot_latch: Res<crate::ui_loot::LootLatch>,
-    // `[0xb72038]`, the queued area; absent in a headless build, which reads as not queued.
-    stone: Option<Res<crate::ui_dialog_verbs::MeetingStone>>,
 ) {
+    let (want, want_fork) = classify(&inputs, &hovered, &hovered_object);
+    if *cursor != want {
+        *cursor = want;
+    }
+    if *fork != want_fork {
+        *fork = want_fork;
+    }
+}
+
+#[derive(bevy::ecs::system::SystemParam)]
+pub(super) struct CursorInputs<'w, 's> {
+    factions: Option<Res<'w, Factions>>,
+    reputations: Res<'w, Reputations>,
+    // `control_lost` is the attack leg's `[0xb4b3e4]` clear.
+    player: Res<'w, crate::player::Player>,
+    approach: Res<'w, crate::player::Approach>,
+    #[allow(clippy::type_complexity)]
+    units: Query<
+        'w,
+        's,
+        (
+            &'static Transform,
+            Option<&'static ObjectStore>,
+            Option<&'static crate::go_anim::GoAnim>,
+        ),
+    >,
+    self_q: Query<'w, 's, (&'static Transform, &'static ObjectStore), With<SelfPlayer>>,
+    go_inputs: super::lock::GoLockInputs<'w, 's>,
+    player_actions: Res<'w, crate::ui_action::PlayerActions>,
+    // `[0xb700e4]` and `[0xb700e8]`, the skin legs' learned-spell latches.
+    learned: Res<'w, crate::ui_action::LearnedAbilities>,
+    quest: Res<'w, crate::ui_quest::QuestGiver>,
+    loot_cfg: Res<'w, crate::ui_loot::LootConfig>,
+    keys: Res<'w, ButtonInput<KeyCode>>,
+    // `[player+0x1d28/2c]`, the object whose loot window is open.
+    loot_latch: Res<'w, crate::ui_loot::LootLatch>,
+    // `[0xb72038]`, the queued area; absent in a headless build, which reads as not queued.
+    stone: Option<Res<'w, crate::ui_dialog_verbs::MeetingStone>>,
+}
+
+/// The cursor and the attack fork over a pick; no pick, or nothing resolvable, reads Point.
+pub(super) fn classify(
+    inputs: &CursorInputs,
+    hovered: &Hovered,
+    hovered_object: &HoveredObject,
+) -> (WorldCursor, AttackFork) {
+    let CursorInputs {
+        factions,
+        reputations,
+        player,
+        approach,
+        units,
+        self_q,
+        go_inputs,
+        player_actions,
+        learned,
+        quest,
+        loot_cfg,
+        keys,
+        loot_latch,
+        stone,
+    } = inputs;
+    let can_auto_interact = crate::player::can_auto_interact(
+        approach.enabled,
+        self_q.single().ok().map(|(_, s)| s),
+        player,
+    );
     // A GameObject that is not highlightable clears the cursor, as the reference's handler does.
     let resolve_go = || {
         let (go_tf, store, anim) = units.get(hovered_object.target?).ok()?;
@@ -606,8 +658,7 @@ pub(super) fn classify_cursor(
         let store = store?;
         let (self_tf, self_store) = self_q.single().ok()?;
         let dist_sq = unit_tf.translation.distance_squared(self_tf.translation);
-        let reach = (store.0.unit_combat_reach() + self_store.0.unit_combat_reach() + MELEE_OFFSET)
-            .max(MELEE_FLOOR);
+        let reach = melee_reach(store, self_store);
         let in_melee = dist_sq <= reach * reach;
 
         let dead = store.0.unit_is_dead();
@@ -616,7 +667,10 @@ pub(super) fn classify_cursor(
                 // Grayed by `CanLootNow 0x5ec110`'s melee reach; the reference's mid-loot state
                 // block and open-loot-window override are not applied to units.
                 let shift = keys.pressed(KeyCode::ShiftLeft) || keys.pressed(KeyCode::ShiftRight);
-                return Some((loot_cursor(loot_cfg.auto_loot, shift), !in_melee));
+                return Some((
+                    loot_cursor(loot_cfg.auto_loot, shift),
+                    !(can_auto_interact || in_melee),
+                ));
             }
             // Skin also needs the learn latch `[0xb700e4 + 4×isPlayerTarget]` (`0x482589`): a
             // player who has learned no Skinning spell sees Point.
@@ -631,7 +685,7 @@ pub(super) fn classify_cursor(
         if super::can_interact(
             Some(store),
             factions.as_deref(),
-            &reputations,
+            reputations,
             Some(self_store),
         ) {
             let status = hovered.guid.and_then(|g| quest.status(g));
@@ -645,7 +699,7 @@ pub(super) fn classify_cursor(
         if !super::can_attack(
             Some(store),
             factions.as_deref(),
-            &reputations,
+            reputations,
             Some(self_store),
         ) {
             return None;
@@ -666,11 +720,12 @@ pub(super) fn classify_cursor(
             skin_latch: learned.skin_player_corpse.is_some(),
             dist_sq: corpse_tf.translation.distance_squared(self_tf.translation),
             looting_this: loot_latch.0.is_some() && loot_latch.0 == hovered.corpse_guid,
+            can_auto_interact,
             auto_loot: loot_cfg.auto_loot,
             shift_held: shift,
         })
     };
-    let resolved = if go_is_nearest(&hovered, &hovered_object) {
+    let resolved = if go_is_nearest(hovered, hovered_object) {
         resolve_go()
     } else if hovered.corpse.is_some() {
         resolve_corpse()
@@ -678,14 +733,7 @@ pub(super) fn classify_cursor(
         resolve_unit()
     };
     let (kind, unable) = resolved.unwrap_or((CursorKind::Point, false));
-    let want = WorldCursor { kind, unable };
-    if *cursor != want {
-        *cursor = want;
-    }
-    let want_fork = AttackFork(attack_fork.get());
-    if *fork != want_fork {
-        *fork = want_fork;
-    }
+    (WorldCursor { kind, unable }, AttackFork(attack_fork.get()))
 }
 
 #[cfg(test)]
@@ -693,6 +741,25 @@ mod tests {
     use super::*;
     use benilla_protocol::messages::dialog_status;
 
+    /// `CanLootNow 0x5ec110` skips its range under `CanAutoInteract` (`0x5ec11b`), so the click
+    /// that walks there finds a lit pouch.
+    #[test]
+    fn click_to_move_lights_a_far_corpses_pouch() {
+        let far = CorpseFacts {
+            lootable: true,
+            dist_sq: 400.0,
+            ..CorpseFacts::default()
+        };
+        assert_eq!(corpse_cursor(far), Some((CursorKind::Pickup, true)));
+        assert_eq!(
+            corpse_cursor(CorpseFacts {
+                can_auto_interact: true,
+                ..far
+            }),
+            Some((CursorKind::Pickup, false))
+        );
+    }
+
     #[test]
     fn the_corpse_classifier_has_two_legs_and_no_own_corpse_leg() {
         let near = 25.0; // exactly the gate, which is inclusive
diff --git a/crates/benilla-app/src/target/hover.rs b/crates/benilla-app/src/target/hover.rs
index d5d2dd94..2b3de0f8 100644
--- a/crates/benilla-app/src/target/hover.rs
+++ b/crates/benilla-app/src/target/hover.rs
@@ -35,8 +35,7 @@ pub(super) fn update_pick_occlusion(
     occluders: Query<(), With<PickOccluder>>,
     mut occlusion: ResMut<PickOcclusion>,
 ) {
-    occlusion.distance = f32::INFINITY;
-    occlusion.point = None;
+    *occlusion = PickOcclusion::default();
     let (Ok((camera, cam_tf)), Ok(window)) = (camera.single(), window.single()) else {
         return;
     };
@@ -46,6 +45,7 @@ pub(super) fn update_pick_occlusion(
     let Ok(ray) = camera.viewport_to_world(cam_tf, cursor) else {
         return;
     };
+    occlusion.ray = Some(ray.direction);
     if let Some(hit) = spatial.cast_ray_predicate(
         ray.origin,
         ray.direction,
@@ -87,7 +87,7 @@ pub(super) struct PickPose<'w, 's> {
 /// the picker's param limit.
 #[derive(bevy::ecs::system::SystemParam)]
 pub(super) struct TargetHoverState<'w, 's> {
-    /// For `IsSelectable`'s `UNIT_FIELD_CREATEDBY` clause.
+    /// For `IsSelectable`'s `UNIT_FIELD_CREATEDBY` clause and the pick filter's possession clause.
     self_guid: Res<'w, crate::net::SelfGuid>,
     /// `0x6e61a0`'s pick flag `0x20`, as the frame began.
     picks_self: Res<'w, crate::spell::PicksSelf>,
@@ -96,16 +96,39 @@ pub(super) struct TargetHoverState<'w, 's> {
     /// The corpse reaction gate's inputs (`0x6067d0`).
     factions: Option<Res<'w, super::Factions>>,
     self_store: Query<'w, 's, &'static ObjectStore, With<SelfPlayer>>,
+    /// The unit and player filter while a word stands (`0x480610`).
+    units: crate::spell::targeting::PickChecks<'w, 's>,
 }
 
 impl TargetHoverState<'_, '_> {
+    /// `0x480610`'s two exclusions, which come first and which a pick whose flags carry `0x20`
+    /// skips (`48062c`, [`crate::spell::PicksSelf`]; `0x481050` ORs it in only for a word
+    /// `0x6e61a0` passes, so outside targeting they always run): the active player (`480638`),
+    /// and a unit they possess, an Eye of Kilrogg or a Mind Controlled target
+    /// ([`super::is_possessed_by`], `48064f`-`480674`), so the cursor and the click pass through
+    /// it to what lies behind.
+    fn excludes(&self, is_self: bool, store: Option<&ObjectStore>) -> bool {
+        !self.picks_self.0 && (is_self || super::is_possessed_by(store, self.self_guid.0))
+    }
+
     /// Whether an object of this kind is a candidate of this pick, the posed pass and the box
-    /// fallback alike: every unit and player, and a corpse (`0x480816`) always outside targeting,
-    /// whose pick flags carry `0x40`, and while targeting only one `0x6e6260` passes. A corpse
-    /// whose store has not streamed is refused then.
-    fn is_candidate(&self, kind: EntityKind, store: Option<&ObjectStore>) -> bool {
+    /// fallback alike: every unit and player outside targeting but the two [`Self::excludes`]
+    /// drops, and while targeting the ones `0x480610` passes for the word
+    /// ([`crate::spell::targeting::PickChecks::admits_unit`]); a corpse (`0x480816`) always
+    /// outside targeting, whose pick flags carry `0x40`, and while targeting only one `0x6e6260`
+    /// passes. A corpse whose store has not streamed is refused then. `is_self` is the active
+    /// player's own body. The hover and the press, which latches this pick, share it.
+    fn is_candidate(
+        &self,
+        entity: Entity,
+        kind: EntityKind,
+        is_self: bool,
+        store: Option<&ObjectStore>,
+    ) -> bool {
         match kind {
-            EntityKind::Unit | EntityKind::Player => true,
+            EntityKind::Unit | EntityKind::Player => {
+                !self.excludes(is_self, store) && self.units.admits_unit(entity, store)
+            }
             EntityKind::Corpse => {
                 let Some(word) = self.corpse_pick.0 else {
                     return true;
@@ -245,15 +268,11 @@ pub(super) fn update_hover(
     let mut candidates: Vec<(Entity, u8, Vec<AssetId<Mesh>>, Vec<Mat4>)> = Vec::new();
     // Units with skinned parts: out of the box fallback even when the broad phase rejects them.
     let mut faithful: HashSet<Entity> = HashSet::new();
-    let picks_self = target_state.picks_self.0;
     for (entity, is_self, gt, net, anims, drv, store, children, mount_child, drawn, held) in &roots
     {
-        if is_self && !picks_self {
-            continue;
-        }
         // Units, players and corpses: the reference picks every CGObject in one trace and
         // switches on type at the end, below.
-        if !target_state.is_candidate(net.kind, store) {
+        if !target_state.is_candidate(entity, net.kind, is_self, store) {
             continue;
         }
         // Not drawn, not clickable. Checked before `faithful.insert`, so an undrawn unit is out by
@@ -349,16 +368,15 @@ pub(super) fn update_hover(
         if faithful.contains(&parent) {
             continue; // posed-mesh-tested above
         }
-        if !picks_self && roots.get(parent).is_ok_and(|root| root.1) {
-            continue;
-        }
         // The same candidates as the posed pick. A bone pile lands here: its corpse model has no
         // skeleton, so only this box test can pick it.
         let Ok((_, parent_net)) = units.get(parent) else {
             continue;
         };
-        let store = roots.get(parent).ok().and_then(|root| root.6);
-        if !target_state.is_candidate(parent_net.kind, store) {
+        let root = roots.get(parent).ok();
+        let is_self = root.as_ref().is_some_and(|root| root.1);
+        let store = root.and_then(|root| root.6);
+        if !target_state.is_candidate(parent, parent_net.kind, is_self, store) {
             continue;
         }
         if let Some(t) = ray_mesh_bounds(origin, dir, aabb, gt) {
@@ -770,6 +788,7 @@ pub(super) fn update_hovered_object(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::spell::targeting::corpse_fixture as fx;
     use bevy::ecs::system::RunSystemOnce;
 
     fn card(bone: u16, owner: Entity) -> BillboardCard {
@@ -892,6 +911,7 @@ mod tests {
         world.insert_resource(PickOcclusion {
             distance: f32::INFINITY,
             point: None,
+            ray: None,
         });
         world.init_resource::<crate::vplates::PlateHover>();
         world.init_resource::<Hovered>();
@@ -900,6 +920,8 @@ mod tests {
         world.insert_resource(crate::net::SelfGuid(Some(1)));
         world.init_resource::<crate::spell::PicksSelf>();
         world.init_resource::<crate::spell::CorpsePick>();
+        world.init_resource::<crate::spell::targeting::UnitPick>();
+        world.insert_resource(crate::net::Reputations(Vec::new()));
         let mut camera = Camera::default();
         camera.computed.clip_from_view = Mat4::perspective_infinite_reverse_rh(1.0, 1.0, 0.1);
         camera.computed.target_info = Some(RenderTargetInfo {
@@ -1034,6 +1056,349 @@ mod tests {
         assert!(!hover(friend(), Some(0x0040)), "a ground word");
     }
 
+    /// A unit or player at depth `z` on the cursor's ray with one drawn pick box, of this store.
+    fn unit_at(world: &mut World, guid: u64, z: f32, store: ObjectStore) -> Entity {
+        let at = GlobalTransform::from_translation(Vec3::new(0.0, 0.0, z));
+        let body = world
+            .spawn((
+                Guid(guid),
+                NetEntity {
+                    kind: EntityKind::Unit,
+                    display_id: None,
+                    scale: 1.0,
+                },
+                at,
+                InheritedVisibility::VISIBLE,
+                store,
+            ))
+            .id();
+        world.spawn((
+            ChildOf(body),
+            CreaturePickPart,
+            Aabb::from_min_max(Vec3::splat(-1.0), Vec3::splat(1.0)),
+            at,
+            InheritedVisibility::VISIBLE,
+        ));
+        body
+    }
+
+    /// A store of `UNIT_FIELD_FACTIONTEMPLATE` (35), `UNIT_FIELD_FLAGS` (46) and
+    /// `UNIT_FIELD_HEALTH` (22), on [`fx::factions`]' rows: template 1 the caster's Human, 2 an Orc.
+    fn unit_store(template: u32, flags: u32, health: u32) -> ObjectStore {
+        ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (35, template),
+            (46, flags),
+            (22, health),
+        ]))
+    }
+
+    /// A living player of the caster's faction: assistable, not attackable.
+    fn friend() -> ObjectStore {
+        unit_store(1, 0x8, 100)
+    }
+
+    /// A living Orc creature: attackable, not assistable.
+    fn foe() -> ObjectStore {
+        unit_store(2, 0, 100)
+    }
+
+    /// The pick over `word`, the way a frame runs it: the word published, its flags `0x20` and the
+    /// unit legs both, then the pick.
+    fn pick_under(world: &mut World, word: Option<u16>) -> Hovered {
+        let mut targeting = world.resource_mut::<crate::spell::SpellTargeting>();
+        match word {
+            Some(word) => targeting.enter(fx::RESURRECTION, crate::spell::CastCommit::Spell, word),
+            None => targeting.clear(),
+        }
+        world
+            .run_system_cached(crate::spell::targeting::publish_unit_pick)
+            .expect("the word publishes");
+        world
+            .run_system_cached(crate::spell::targeting::publish_picks_self)
+            .expect("the self bit publishes");
+        world
+            .run_system_cached(update_hover)
+            .expect("the pick runs");
+        *world.resource::<Hovered>()
+    }
+
+    /// Us, a human away from the ray, the faction tables, and the units a case puts on it.
+    fn unit_pick_world() -> World {
+        let mut world = pick_world();
+        world.insert_resource(fx::factions());
+        world.init_resource::<crate::spell::SpellTargeting>();
+        world.spawn((
+            SelfPlayer,
+            Guid(1),
+            GlobalTransform::from_translation(Vec3::new(50.0, 0.0, 0.0)),
+            fx::caster(1.5),
+        ));
+        world
+    }
+
+    /// `0x480610` while a word stands: a unit the word cannot take is no candidate, so the one
+    /// behind it takes the pick, where outside targeting the nearer wins whatever it is. The
+    /// front unit is 5 yards nearer the camera than the rear one.
+    #[test]
+    fn a_unit_the_word_cannot_take_lets_the_pick_through_to_the_one_behind() {
+        const HEAL: u16 = 0x0100;
+        const ENEMY: u16 = 0x0080;
+        const RESURRECTION: u16 = 0x8000;
+        const SKINNING: u16 = 0x0402;
+        // (word, the front unit it refuses, the rear unit it takes, what stands behind it)
+        let cases: [(&str, u16, ObjectStore, ObjectStore); 6] = [
+            ("a foe before a friend, under a heal", HEAL, foe(), friend()),
+            (
+                "a corpse before a friend, under a heal",
+                HEAL,
+                unit_store(1, 0x8, 0),
+                friend(),
+            ),
+            (
+                "a friend before a foe, under an enemy word",
+                ENEMY,
+                friend(),
+                foe(),
+            ),
+            (
+                "the living before a corpse, under Resurrection",
+                RESURRECTION,
+                friend(),
+                unit_store(1, 0x8, 0),
+            ),
+            (
+                "the living before a corpse, under Skinning",
+                SKINNING,
+                foe(),
+                unit_store(2, 0, 0),
+            ),
+            (
+                "a unit immune to players before a friend, under a heal",
+                HEAL,
+                unit_store(1, 0x108, 100),
+                friend(),
+            ),
+        ];
+        for (what, word, front_store, rear_store) in cases {
+            let mut world = unit_pick_world();
+            let front = unit_at(&mut world, 10, 5.0, front_store);
+            let rear = unit_at(&mut world, 11, 0.0, rear_store);
+            // Outside targeting the nearer unit wins, whoever it is.
+            assert_eq!(
+                pick_under(&mut world, None).target,
+                Some(front),
+                "{what}: outside targeting"
+            );
+            let hovered = pick_under(&mut world, Some(word));
+            assert_eq!(
+                hovered.target,
+                Some(rear),
+                "{what}: the word takes the rear"
+            );
+            assert_eq!(hovered.guid, Some(11), "{what}");
+            assert_eq!(
+                pick_under(&mut world, None).target,
+                Some(front),
+                "{what}: and back outside targeting"
+            );
+        }
+    }
+
+    /// The control of the table above: the same front unit is the pick when the word takes it.
+    #[test]
+    fn a_unit_the_word_takes_keeps_the_pick_in_front_of_the_one_behind() {
+        let cases: [(&str, u16, ObjectStore); 4] = [
+            ("a friend under a heal", 0x0100, friend()),
+            ("a foe under an enemy word", 0x0080, foe()),
+            ("a corpse under Resurrection", 0x8000, unit_store(1, 0x8, 0)),
+            ("a foe under a plain unit word", 0x0002, foe()),
+        ];
+        for (what, word, front_store) in cases {
+            let mut world = unit_pick_world();
+            let front = unit_at(&mut world, 10, 5.0, front_store);
+            let rear_store = if word == 0x8000 {
+                unit_store(1, 0x8, 0)
+            } else {
+                friend()
+            };
+            unit_at(&mut world, 11, 0.0, rear_store);
+            assert_eq!(
+                pick_under(&mut world, Some(word)).target,
+                Some(front),
+                "{what}"
+            );
+        }
+    }
+
+    /// With nothing behind it, a unit the word cannot take leaves the pick empty, which is no
+    /// refusal: `IsSelectable` grades the winner only, and there is none.
+    #[test]
+    fn a_lone_unit_the_word_cannot_take_is_no_pick_at_all() {
+        let mut world = unit_pick_world();
+        unit_at(&mut world, 10, 0.0, foe());
+        let hovered = pick_under(&mut world, Some(0x0100));
+        assert_eq!((hovered.target, hovered.guid), (None, None));
+        assert!(!hovered.refused);
+        assert_eq!(hovered.distance, f32::MAX);
+    }
+
+    /// A living Orc creature whose `UNIT_FIELD_FLAGS` are `flags`, with its `UNIT_FIELD_CHARMEDBY`
+    /// (10) and `UNIT_FIELD_CREATEDBY` (14) the guids `charmed_by` and `created_by`, 0 for none.
+    fn owned(flags: u32, charmed_by: u32, created_by: u32) -> ObjectStore {
+        ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (35, 2),
+            (46, flags),
+            (22, 100),
+            (10, charmed_by),
+            (11, 0),
+            (14, created_by),
+            (15, 0),
+        ]))
+    }
+
+    /// The word's plain unit bit (`0x0002`), which `0x6e61a0` takes the player for (`0x850e`), and
+    /// the enemy bit (`0x0080`), which it does not.
+    const SELF_WORD: u16 = 0x0002;
+    const ENEMY_WORD: u16 = 0x0080;
+
+    /// `0x480610`, `48064f`-`480676`: a unit flagged `UNIT_FLAG_POSSESSED` whose charmer, else
+    /// creator, is the active player is no candidate outside targeting, or while a word without
+    /// `0x20` stands, so the pick passes through it to the unit behind. Us is guid 1.
+    #[test]
+    fn a_unit_you_possess_lets_the_pick_through_to_the_one_behind() {
+        let possessed = crate::target::UNIT_FLAG_POSSESSED;
+        let cases: [(&str, ObjectStore); 3] = [
+            (
+                "a Mind Controlled unit, charmed by us",
+                owned(possessed, 1, 0),
+            ),
+            ("an Eye of Kilrogg, created by us", owned(possessed, 0, 1)),
+            (
+                "charmed by us, created by another: the charmer comes first",
+                owned(possessed, 1, 7),
+            ),
+        ];
+        for (what, front_store) in cases {
+            let mut world = unit_pick_world();
+            let front = unit_at(&mut world, 10, 5.0, front_store);
+            let rear = unit_at(&mut world, 11, 0.0, foe());
+            for word in [None, Some(ENEMY_WORD)] {
+                let hovered = pick_under(&mut world, word);
+                assert_eq!(
+                    hovered.target,
+                    Some(rear),
+                    "{what}: the rear, word {word:?}"
+                );
+                assert_eq!(hovered.guid, Some(11), "{what}: word {word:?}");
+            }
+            // The word that takes us takes it too: the exclusions are skipped (`48062c`).
+            assert_eq!(
+                pick_under(&mut world, Some(SELF_WORD)).target,
+                Some(front),
+                "{what}: while flag 0x20 stands"
+            );
+            assert_eq!(
+                pick_under(&mut world, None).target,
+                Some(rear),
+                "{what}: and excluded again once the word ends"
+            );
+        }
+    }
+
+    /// With nothing behind it, the unit you possess leaves the pick empty, which is no refusal.
+    #[test]
+    fn a_lone_unit_you_possess_is_no_pick_at_all() {
+        let mut world = unit_pick_world();
+        unit_at(
+            &mut world,
+            10,
+            0.0,
+            owned(crate::target::UNIT_FLAG_POSSESSED, 1, 0),
+        );
+        let hovered = pick_under(&mut world, None);
+        assert_eq!((hovered.target, hovered.guid), (None, None));
+        assert!(!hovered.refused);
+    }
+
+    /// The exclusion asks for the flag, then for us: an owned unit that is not possessed, a unit
+    /// someone else possesses, and one whose charmer is another even where its creator is us, all
+    /// stay candidates.
+    #[test]
+    fn a_unit_you_do_not_possess_keeps_the_pick() {
+        let possessed = crate::target::UNIT_FLAG_POSSESSED;
+        let cases: [(&str, ObjectStore); 5] = [
+            ("possessed, charmed by another", owned(possessed, 2, 0)),
+            ("possessed, created by another", owned(possessed, 0, 2)),
+            (
+                "possessed, charmed by another, created by us: the charmer comes first",
+                owned(possessed, 2, 1),
+            ),
+            (
+                "our own pet, created by us but not possessed",
+                owned(0, 0, 1),
+            ),
+            ("possessed by no one", owned(possessed, 0, 0)),
+        ];
+        for (what, front_store) in cases {
+            let mut world = unit_pick_world();
+            let front = unit_at(&mut world, 10, 5.0, front_store);
+            unit_at(&mut world, 11, 0.0, foe());
+            for word in [None, Some(ENEMY_WORD), Some(SELF_WORD)] {
+                assert_eq!(
+                    pick_under(&mut world, word).target,
+                    Some(front),
+                    "{what}: word {word:?}"
+                );
+            }
+        }
+    }
+
+    /// `0x481116`: only a word with unit bits (`0x878e`) puts units and players in the pick. A
+    /// ground word, a lock word and a bag-item word pick none, so a unit in front of the ground
+    /// or the chest is no obstacle, and a unit word does pick them.
+    #[test]
+    fn only_a_word_with_unit_bits_picks_units() {
+        let mut world = unit_pick_world();
+        let front = unit_at(&mut world, 10, 5.0, friend());
+        for word in [0x0040, 0x0020, 0x4800, 0x0800, 0x0010] {
+            let hovered = pick_under(&mut world, Some(word));
+            assert_eq!(hovered.target, None, "{word:#06x}");
+            assert!(!hovered.refused, "{word:#06x}");
+        }
+        for word in [0x0002, 0x0100] {
+            assert_eq!(
+                pick_under(&mut world, Some(word)).target,
+                Some(front),
+                "{word:#06x}"
+            );
+        }
+    }
+
+    /// The press latches the hover's pick, so the click reaches what the cursor showed: the unit
+    /// behind, not the one in front the word refuses.
+    #[test]
+    fn the_press_latches_the_pick_the_word_left() {
+        use crate::target::{latch_press_pick, PressPick};
+
+        let mut world = unit_pick_world();
+        unit_at(&mut world, 10, 5.0, foe());
+        let rear = unit_at(&mut world, 11, 0.0, friend());
+        world.init_resource::<HoveredObject>();
+        world.init_resource::<PressPick>();
+        world.init_resource::<crate::target::WorldCursor>();
+        world.init_resource::<crate::target::cursor_mode::AttackFork>();
+        world.init_resource::<ButtonInput<MouseButton>>();
+
+        pick_under(&mut world, Some(0x0100));
+        world
+            .resource_mut::<ButtonInput<MouseButton>>()
+            .press(MouseButton::Left);
+        world
+            .run_system_cached(latch_press_pick)
+            .expect("the press latches");
+        assert_eq!(world.resource::<PressPick>().hovered.target, Some(rear));
+    }
+
     /// Naxxramas's "Unholy Axe" is an `InvisibleStalker` body with no vertices holding a real axe,
     /// which is its whole pick surface.
     #[test]
diff --git a/crates/benilla-app/src/target/lock.rs b/crates/benilla-app/src/target/lock.rs
index 70586e7c..85ceb91e 100644
--- a/crates/benilla-app/src/target/lock.rs
+++ b/crates/benilla-app/src/target/lock.rs
@@ -13,7 +13,7 @@
 //! ([`benilla_formats::SpellDisplay::open_lock_skill`]) reaches the requirement (`0x5f850f`),
 //! `Skill[i]` or `GAMEOBJECT_LEVEL × 5` when that is zero (`0x5f84be`). The value's level term is
 //! the player's skill in the spell's own line (`0x6e384d → 0x6e3130 → [vtbl+0xa8] = 0x5ea690`,
-//! [`spell_skill_value`]), not the character level.
+//! [`crate::spell::spell_skill_value`]), not the character level.
 
 use std::collections::BTreeSet;
 
@@ -32,7 +32,8 @@ pub(crate) struct GoLockInputs<'w, 's> {
     pub(crate) locks: Option<Res<'w, crate::go_templates::Locks>>,
     pub(crate) lock_types: Option<Res<'w, crate::go_templates::LockTypes>>,
     pub(crate) spells: Option<Res<'w, crate::ui_action::Spells>>,
-    /// The spell to skill-line hop of [`spell_skill_value`]; absent, the skill reads 0.
+    /// The spell to skill-line hop of [`crate::spell::spell_skill_value`]; absent, the skill reads
+    /// 0.
     pub(crate) skill_lines: Option<Res<'w, crate::ui_spellbook::SkillLines>>,
     pub(crate) items: Res<'w, crate::items::Items>,
     /// The object index the key-item scan walks the bags through.
@@ -140,7 +141,7 @@ pub(crate) fn resolve_lock(
                     }
                     // `0x5f84f8`: set on the LockType match, before the value test.
                     matched_spell.get_or_insert(id);
-                    let skill = spell_skill_value(me, skill_lines, id);
+                    let skill = crate::spell::spell_skill_value(me, skill_lines, id);
                     let provides = spell.open_lock_skill(skill).unwrap_or(0);
                     if provides >= required_skill(slot, go.level) {
                         return LockOutcome::OpenBySpell(id);
@@ -166,40 +167,6 @@ pub(crate) fn resolve_lock(
     }
 }
 
-/// The player's skill in `spell_id`'s own line, the opener value's level term: `0x5ea690` hops
-/// spell to SkillLineAbility line (`0x6de040`), then `0x5ea520` reads that line's
-/// `PLAYER_SKILL_INFO` slot. Every missing input reads 0, like the reference's null paths.
-fn spell_skill_value(
-    me: Option<&ObjectStore>,
-    skill_lines: Option<&benilla_formats::SkillLineCatalog>,
-    spell_id: u32,
-) -> u32 {
-    let Some(line) = skill_lines.and_then(|c| c.spell_to_line(spell_id)) else {
-        return 0;
-    };
-    let Some(store) = me else { return 0 };
-    line_skill_value(
-        (0..benilla_protocol::messages::PLAYER_SKILL_SLOTS)
-            .filter_map(|slot| store.0.player_skill(slot)),
-        line,
-    )
-}
-
-/// `0x5ea520`'s sum on the line's first slot: `value + temp_bonus + perm_bonus`
-/// (`0x5ea56d`..`0x5ea580`), floored at 0 since the bonuses are signed.
-fn line_skill_value(
-    slots: impl Iterator<Item = benilla_protocol::messages::PlayerSkillSlot>,
-    line: u32,
-) -> u32 {
-    for s in slots {
-        if u32::from(s.skill_id) == line {
-            let v = i32::from(s.value) + i32::from(s.temp_bonus) + i32::from(s.perm_bonus);
-            return v.max(0) as u32;
-        }
-    }
-    0
-}
-
 /// `0x5f8260`, the targeting cursor's question for the pending spell (`[0xceac58]`) over a
 /// GameObject, from the object dispatcher `0x4828d0` through `0x6e6460`. Unlike [`resolve_lock`]
 /// it matches the spell's own `OPEN_LOCK` effects against each slot's `Index` and compares no skill
diff --git a/crates/benilla-app/src/target/mod.rs b/crates/benilla-app/src/target/mod.rs
index 9e0460e5..61a15f9a 100644
--- a/crates/benilla-app/src/target/mod.rs
+++ b/crates/benilla-app/src/target/mod.rs
@@ -40,6 +40,8 @@ mod reticle;
 // `pub(crate)` for the hover inspector too: its faction catalog feeds `go_highlightable`.
 pub(crate) mod ring;
 mod scan;
+mod script;
+pub(crate) use script::ScriptSelect;
 
 /// `Faction.dbc` and our reputation table as one [`SystemParam`], since every reaction function
 /// takes both; `factions` is `Option` so a UI-only harness runs without client data.
@@ -60,17 +62,22 @@ pub(crate) use flash::CombatFlash;
 pub(crate) use price_discount::vendor_price_discount;
 #[cfg(test)]
 pub(crate) use price_discount::{stormwind_fixture, HUMAN_WARRIOR};
-// The attack-with-no-target request, and the same nearest-enemy core called synchronously for the
-// pet bar's Attack, whose order must leave in the frame it was pressed.
-pub(crate) use relations::{can_assist, can_attack, can_interact, corpse_friendly};
-pub(crate) use scan::{attack_order_target, AttackNearestRequest, TargetScan};
+pub(crate) use relations::{
+    can_assist, can_attack, can_interact, corpse_friendly, is_possessed_by, UNIT_FLAG_POSSESSED,
+};
+// The attack validator's target half, run in the call that asks, for the player's Attack and the
+// pet bar's; the melee probe's press with nothing selected.
+pub(crate) use scan::{AttackNearestRequest, AttackPick};
 // The chat layer's by-name asks (`/target`, `/assist`).
-pub(crate) use by_name::{AssistRequest, TargetByNameRequest};
+pub(crate) use by_name::{AssistRequest, PlayerLookup, TargetByNameRequest};
+// The one SetSelection path, for the loot response's select (`0x48f3a0`).
+pub(crate) use by_name::SelectCommit;
 // The reaction decode and its faction catalog, which also tint the target frame
 // (`TargetFrame_CheckFaction`); `duel_rung` is the same walk, for `/reaction`.
 pub(crate) use ring::{duel_rung, ring_reaction, ring_variant, Factions, RingVariant};
 
 pub(crate) use click::DeselectGuid;
+pub use click::Interact;
 
 /// Our target, set the instant we click, as the 1.12 client does without waiting for the server,
 /// and cleared on deselect or when it streams out. `CMSG_SET_SELECTION` carries the guid, which the
@@ -79,6 +86,10 @@ pub(crate) use click::DeselectGuid;
 pub(crate) struct Selection {
     pub(crate) target: Option<Entity>,
     pub(crate) guid: Option<u64>,
+    /// The last-target pair `[0xb4e2e0]` that `TargetLastTarget` reads: `SetSelection` stamps the
+    /// outgoing selection, none included, on every change it makes, a select or a deselect
+    /// (`0x49361d`-`0x493628`); a teardown clear (`0x493910` alone) leaves it.
+    pub(crate) last: Option<u64>,
 }
 
 /// This frame's character-model pick, by [`hover::update_hover`]. At most one slot is set: the
@@ -107,6 +118,16 @@ impl Hovered {
     pub(crate) fn any(&self) -> Option<Entity> {
         self.target.or(self.corpse)
     }
+
+    /// The unit `"mouseover"` names: the hovered unit, unless a nearer GameObject won the pick.
+    /// The publisher `0x492890` writes whatever won to `0xb4e2c8`/`0xb4e2cc` (`0x492927`,
+    /// `0x492938`), and the token resolver re-resolves it as a unit (`0x515bca mov ecx,8`), so a
+    /// GameObject, a corpse or nothing names nobody (`0x515bd9 je`).
+    pub(crate) fn mouseover(&self, go: &HoveredObject) -> Option<(Entity, u64)> {
+        self.target
+            .zip(self.guid)
+            .filter(|_| !go_is_nearest(self, go))
+    }
 }
 
 /// The GameObject under the cursor this frame, by [`hover::update_hovered_object`]: usable, never
@@ -126,6 +147,8 @@ pub(crate) struct PickOcclusion {
     pub(crate) distance: f32,
     /// The world hit point, which the ground-targeting cursor rides, as in the reference.
     pub(crate) point: Option<Vec3>,
+    /// The cursor ray's direction, which a right-click on the sky walks along (`0x492d6c`).
+    pub(crate) ray: Option<Dir3>,
 }
 
 impl Default for PickOcclusion {
@@ -133,6 +156,7 @@ impl Default for PickOcclusion {
         Self {
             distance: f32::INFINITY,
             point: None,
+            ray: None,
         }
     }
 }
@@ -268,6 +292,7 @@ impl Plugin for TargetPlugin {
             .add_message::<TargetByNameRequest>()
             .add_message::<AssistRequest>()
             .add_message::<click::DeselectGuid>()
+            .add_message::<Interact>()
             .add_systems(
                 Startup,
                 (
@@ -308,34 +333,35 @@ impl Plugin for TargetPlugin {
                     // order is free.
                     crate::spell::targeting::commit_ground_cast_on_click,
                     crate::spell::targeting::commit_object_cast_on_click,
-                    click::act_on_right_click,
-                    click::clear_target_requests,
-                    // The UI's unit-token drains. `SpellTargetUnit` first: it binds the cursor's
-                    // cast and never moves the selection. Then the selection asks (`TargetUnit`,
-                    // `AssistUnit`, `TargetLastEnemy`: one drain, as the reference has one
-                    // `0x489a40`) and `DropItemOnUnit`'s pet leg, independent of each other.
+                    // The verb a walk owes runs at its stop, ahead of this frame's click.
                     (
-                        crate::spell::targeting::drain_spell_target_unit,
-                        (
-                            click::selection_requests,
-                            crate::ui_action::drop_item::drop_item_on_unit,
-                        ),
+                        click::act_on_arrival,
+                        click::act_on_right_click,
+                        click::act_on_interact,
                     )
                         .chain(),
-                    // The by-name asks: `/target`, the Lua `TargetByName` and `/assist` commit
-                    // through `scan::commit`; `/follow` hands its subject to `crate::player`.
+                    // The loot close's guid-scoped deselect.
+                    click::clear_target_requests,
+                    // The script calls that touch the selection, the cast or the targeting cursor
+                    // (`TargetUnit`, `/target`, `ClearTarget`, `/cast`, `UseAction`, …), applied
+                    // in the order the script made them; then `DropItemOnUnit`'s pet leg.
+                    (
+                        crate::script_calls::apply_script_calls,
+                        crate::ui_action::drop_item::drop_item_on_unit,
+                    )
+                        .chain(),
+                    // The chat layer's by-name asks: `/target` and `/assist` commit through
+                    // `scan::commit`; `/follow` hands its subject to `crate::player`.
                     (
                         by_name::target_by_name_requests,
-                        by_name::script_target_by_name_requests,
                         by_name::assist_requests,
                         by_name::follow_requests,
                     )
                         .chain(),
                     scan::auto_acquire_attacker,
-                    // The one cycler's two sides (`0x493f60`, modes 1 and 2), chained: they share
-                    // `TabHistory`, which a side switch clears.
-                    (scan::tab_target, scan::target_nearest_friend_requests).chain(),
-                    scan::acquire_and_attack,
+                    // The melee probe's press, the player's Attack; the TAB keys and ATTACKTARGET
+                    // run their bodies' `TargetNearestEnemy` and `AttackTarget` as script calls.
+                    crate::ui_action::attack_nearest_probe,
                     flash::drive_flash,
                     // The last-enemy stamp before the ring's death-clear, so a hostile that dies
                     // selected is still remembered (the reference's `TargetLastEnemy` has no
diff --git a/crates/benilla-app/src/target/relations.rs b/crates/benilla-app/src/target/relations.rs
index 5e69e49e..fedb36cb 100644
--- a/crates/benilla-app/src/target/relations.rs
+++ b/crates/benilla-app/src/target/relations.rs
@@ -86,6 +86,23 @@ pub(crate) fn is_selectable(store: Option<&ObjectStore>, self_guid: Option<u64>)
         || (self_guid.is_some() && store.0.unit_created_by() == self_guid)
 }
 
+/// `UNIT_FLAG_POSSESSED`, `UNIT_FIELD_FLAGS` bit 24 (vmangos `UnitDefines.h:569`), which the
+/// reference reads as `[[unit+0x110]+0xA3] & 1`.
+pub(crate) const UNIT_FLAG_POSSESSED: u32 = 0x0100_0000;
+
+/// Whether the active player possesses this unit (Mind Control, an Eye of Kilrogg, Eyes of the
+/// Beast): `UNIT_FLAG_POSSESSED` set and `UNIT_FIELD_CHARMEDBY`, else `UNIT_FIELD_CREATEDBY`, the
+/// active player's guid. The own-pet resolver `0x5ee5a0` (`0x5ee626`, `0x5ee62f`) and the world
+/// pick's filter `0x480610` (`0x48064f`-`0x480674`) read this same clause. No store, no owner or
+/// no active player is no possession.
+pub(crate) fn is_possessed_by(store: Option<&ObjectStore>, self_guid: Option<u64>) -> bool {
+    let (Some(store), Some(me)) = (store, self_guid) else {
+        return false;
+    };
+    store.0.unit_flags() & UNIT_FLAG_POSSESSED != 0
+        && store.0.unit_owner(OwnerFallback::CreatedBy) == Some(me)
+}
+
 /// `0x6067d0(player, corpse)`, the corpse's reaction gate: `0x6064c0` compares the player's
 /// template (`UNIT_FIELD_FACTIONTEMPLATE`) toward the dead player's race's (`0x5d7120`: the race
 /// byte of `CORPSE_FIELD_BYTES_1`, then `ChrRaces.dbc` column 2) with the template comparator
@@ -201,4 +218,40 @@ mod tests {
         }
         assert!(!gate(0) && !gate(10), "a race with no row");
     }
+
+    /// `0x480658`-`0x480667`: the flag, then the charmer if there is one, else the creator; an
+    /// unset owner or an unknown active player is no possession.
+    #[test]
+    fn possession_is_the_flag_and_the_charmer_else_the_creator() {
+        let store = |flags: u32, charmed_by: u32, created_by: u32| {
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (46, flags),
+                (10, charmed_by),
+                (11, 0),
+                (14, created_by),
+                (15, 0),
+            ]))
+        };
+        let me = Some(0x77);
+        let flag = UNIT_FLAG_POSSESSED;
+        assert!(
+            is_possessed_by(Some(&store(flag, 0x77, 0)), me),
+            "charmed by us"
+        );
+        assert!(
+            is_possessed_by(Some(&store(flag, 0, 0x77)), me),
+            "created by us"
+        );
+        assert!(
+            !is_possessed_by(Some(&store(flag, 0x99, 0x77)), me),
+            "a charmer other than us comes before our creation"
+        );
+        assert!(!is_possessed_by(Some(&store(0, 0x77, 0x77)), me), "no flag");
+        assert!(!is_possessed_by(Some(&store(flag, 0, 0)), me), "no owner");
+        assert!(
+            !is_possessed_by(Some(&store(flag, 0, 0)), None),
+            "no active player"
+        );
+        assert!(!is_possessed_by(None, me), "no descriptor");
+    }
 }
diff --git a/crates/benilla-app/src/target/reticle.rs b/crates/benilla-app/src/target/reticle.rs
index 3c2e4cbd..a8633776 100644
--- a/crates/benilla-app/src/target/reticle.rs
+++ b/crates/benilla-app/src/target/reticle.rs
@@ -10,7 +10,7 @@
 //! object-placement spell (effect `0x51`); that model is not built.
 //!
 //! The radius is `ground_cast_radius` (`GetCurrentCastRadius 0x6e6350`, clamped to 20.0 in
-//! `0x4820f0`), with no spell mod applied. Out of range forces it to 0.0, and 0.0 draws at the
+//! `0x4820f0`), after spell-mod op 6. Out of range forces it to 0.0, and 0.0 draws at the
 //! 1.3888889 default. With no world hit nothing is drawn: the
 //! reference resets its draw state every hover pass. Over a unit the decal lands on the ground
 //! behind it, since a dest-only word's pick skips the object trace (`0x480e7b`).
@@ -82,6 +82,7 @@ pub(super) fn update_reticle(
     occlusion: Res<PickOcclusion>,
     cursor: Res<WorldCursor>,
     spells: Option<Res<Spells>>,
+    spell_mods: Res<crate::spell::SpellModifiers>,
     self_store: Query<&ObjectStore, With<SelfPlayer>>,
     decals: WorldDecal,
     mut state: ResMut<ReticleState>,
@@ -103,7 +104,7 @@ pub(super) fn update_reticle(
             .ok()
             .and_then(|s| s.0.unit_level())
             .unwrap_or(1);
-        ground_cast_radius(spells.as_deref(), spell_id, level)
+        ground_cast_radius(spells.as_deref(), spell_id, level, &spell_mods)
     } else {
         0.0
     };
@@ -197,9 +198,11 @@ mod tests {
             world.init_resource::<ReticleState>();
             world.init_resource::<WorldCursor>();
             world.init_resource::<SpellTargeting>();
+            world.init_resource::<crate::spell::SpellModifiers>();
             world.insert_resource(PickOcclusion {
                 distance: 10.0,
                 point: Some(Vec3::ZERO),
+                ray: None,
             });
             world
                 .resource_mut::<SpellTargeting>()
diff --git a/crates/benilla-app/src/target/ring.rs b/crates/benilla-app/src/target/ring.rs
index 1bbebd10..51639be4 100644
--- a/crates/benilla-app/src/target/ring.rs
+++ b/crates/benilla-app/src/target/ring.rs
@@ -13,7 +13,7 @@ use benilla_assets::{LockRecover, WorldAssets};
 use benilla_world::decal::{DecalFrame, WorldDecal};
 use benilla_world::particles::buffer::EffectVertex;
 
-use super::click::clear;
+use super::click::{clear, deselect};
 use super::{CombatFlash, Selection, SelectionRadius};
 use crate::creature_anim::Engaged;
 use benilla_world::view::WorldCamera;
@@ -277,7 +277,8 @@ pub(super) fn update_ring(
                         .is_some_and(|g| *last_vitals == Some((g, false)));
                 *last_vitals = selection.guid.map(|g| (g, is_dead));
                 if died {
-                    clear(&mut selection, &mut seam, !engaged.is_empty());
+                    // `SetSelection(0,0)` at `0x605901`, so the dead target becomes the last one.
+                    deselect(&mut selection, &mut seam, !engaged.is_empty());
                     *last_vitals = None;
                     state.shown = false;
                     state.verts.clear();
@@ -1103,7 +1104,7 @@ mod tests {
         use crossbeam_channel::Receiver;
 
         use crate::net::{ClientCommand, Guid, GuidIndex, NetCommands, ObjectStore, SelfPlayer};
-        use crate::target::{attack_order_target, Selection, TargetScan};
+        use crate::target::{AttackPick, Selection};
         use benilla_world::model_fade::DespawnFade;
 
         const ME: u64 = 0x0000_0000_0000_0007;
@@ -1122,7 +1123,10 @@ mod tests {
                 transport_progress: None,
                 transport: None,
                 spline: None,
+                // `OBJECT_FIELD_TYPE` (2) 0x9, object and unit, as a creature's create carries it:
+                // `SetSelection`'s `IsSelectable` refuses any other type.
                 fields: ObjectFields::from_pairs(&[
+                    (2, 0x9),
                     (FIELD_UNIT_HEALTH, 100),
                     (FIELD_UNIT_MAXHEALTH, 100),
                     (FIELD_UNIT_LEVEL, 9),
@@ -1161,6 +1165,7 @@ mod tests {
             *world.resource_mut::<Selection>() = Selection {
                 target: Some(mob),
                 guid: Some(MOB),
+                ..Default::default()
             };
             // Control: a live target keeps its selection through a ring pass.
             world
@@ -1221,11 +1226,11 @@ mod tests {
                 *world.resource_mut::<Selection>() = Selection::default();
                 world
                     .run_system_once(
-                        |scan: TargetScan,
+                        |mut pick: AttackPick,
                          mut sel: ResMut<Selection>,
                          mut seam: crate::creature_anim::AttackSeam,
                          mut errors: ResMut<crate::ui_action::UiErrorKeys>| {
-                            attack_order_target(&scan, &mut sel, &mut seam, &mut errors)
+                            pick.target(None, &mut sel, &mut seam, &mut errors)
                         },
                     )
                     .expect("the scan runs on the built client")
diff --git a/crates/benilla-app/src/target/scan.rs b/crates/benilla-app/src/target/scan.rs
index 0712343c..12fcc4f2 100644
--- a/crates/benilla-app/src/target/scan.rs
+++ b/crates/benilla-app/src/target/scan.rs
@@ -52,7 +52,7 @@ fn tab_trace_on() -> bool {
 
 /// The reference's scan mode: the `TargetNearest*` shims (`0x489a80` enemy 1, `0x489aa0` friend 2,
 /// `0x489ac0`/`0x489ae0` party and raid 3/4) all call one cycler, `0x493f60(reverse, mode)`, and
-/// the mode reaches only the per-candidate filter `0x493e40`. Modes 3 and 4 are not built.
+/// the mode reaches only the per-candidate filter `0x493e40`.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(crate) enum ScanSide {
     /// Mode 1 (`0x493e73`): alive by the reads-dead triple `0x605f90`, and `CanAttack 0x606980`.
@@ -61,6 +61,25 @@ pub(crate) enum ScanSide {
     /// `IsPvP 0x605ff0` leg refuses a creature without `UNIT_FLAG_PVP`; then health > 0 with no
     /// dynflag leg, so a feigning ally counts.
     Friend,
+    /// Mode 3 (`0x493eed`): not us, then `0x4e7f70`, a member of our party slots. No health, dead
+    /// or reaction leg.
+    Party,
+    /// Mode 4 (`0x493f15`): not us, then `0x4918e0`, party (`0x4e7f70`) or raid roster
+    /// (`0x4baee0`).
+    Raid,
+}
+
+impl ScanSide {
+    /// The side a `TargetNearest*` call's mode names.
+    pub(crate) fn of(mode: benilla_ui::script::NearestMode) -> Self {
+        use benilla_ui::script::NearestMode;
+        match mode {
+            NearestMode::Enemy => Self::Enemy,
+            NearestMode::Friend => Self::Friend,
+            NearestMode::PartyMember => Self::Party,
+            NearestMode::RaidMember => Self::Raid,
+        }
+    }
 }
 
 /// `score`, lower is better, includes the fighting-me bonus; `on_screen` is the tier-1 gate.
@@ -199,6 +218,8 @@ pub(crate) struct TargetScan<'w, 's> {
     stores: Query<'w, 's, &'static ObjectStore>,
     /// The owner chase's guid → entity map; `Option` because a UI-only harness has no net stack.
     index: Option<Res<'w, GuidIndex>>,
+    /// The party slots and raid roster modes 3 and 4 test; `Option` for the same harnesses.
+    group: Option<Res<'w, crate::ui_party::GroupState>>,
 }
 
 impl TargetScan<'_, '_> {
@@ -206,6 +227,7 @@ impl TargetScan<'_, '_> {
     fn is_valid(
         &self,
         side: ScanSide,
+        guid: u64,
         store: Option<&ObjectStore>,
         self_store: Option<&ObjectStore>,
     ) -> bool {
@@ -232,6 +254,16 @@ impl TargetScan<'_, '_> {
                     |owner| self.store_of(owner).cloned(),
                 ) && !store.is_some_and(|s| s.0.unit_is_dead())
             }
+            // Modes 3 and 4 open on `cmp esi,ecx`, the candidate is not us, which our own body's
+            // absence from [`Self::units`] already gives.
+            ScanSide::Party => self
+                .group
+                .as_ref()
+                .is_some_and(|g| g.party_slots().any(|m| m.guid == guid)),
+            ScanSide::Raid => self.group.as_ref().is_some_and(|g| {
+                g.party_slots().any(|m| m.guid == guid)
+                    || (g.group_type == 1 && g.members.iter().any(|m| m.guid == guid))
+            }),
         }
     }
 
@@ -257,33 +289,6 @@ impl TargetScan<'_, '_> {
         self.stores.get(entity).ok()
     }
 
-    /// `0x6130a3`'s keep test: the actor's reaction to the held guid alone (`0x61309b`), not the
-    /// final gate's `CanAttack`; an unstreamed guid is not hostile (`0x613099`). Actor → target is
-    /// [`reaction_from_player`] (the at-war bit), never `ring_reaction`. The reference's actor is
-    /// the caller, a pet on the pet arm (`0x4bd40d`), which vmangos gives its owner's faction
-    /// (`Pet.cpp:248`).
-    fn reaction_hostile(&self, guid: u64) -> bool {
-        let self_store = self.self_store();
-        self.units
-            .iter()
-            .find(|(_, _, g, _, _)| g.0 == guid)
-            .is_some_and(|(_, _, _, _, store)| {
-                reaction_from_player(
-                    self.factions.as_deref(),
-                    &self.reputations,
-                    store,
-                    self_store,
-                ) < 4
-            })
-    }
-
-    fn unit_by_guid(&self, guid: u64) -> Option<(Entity, Option<&ObjectStore>)> {
-        self.units
-            .iter()
-            .find(|(_, _, g, _, _)| g.0 == guid)
-            .map(|(e, _, _, _, store)| (e, store))
-    }
-
     /// Filter, project, score and sort every known unit, fresh each press.
     fn build(&self, side: ScanSide) -> Vec<Candidate> {
         let Ok((self_tf, self_store, self_guid)) = self.self_q.single() else {
@@ -323,13 +328,15 @@ impl TargetScan<'_, '_> {
             if !matches!(net.kind, EntityKind::Unit | EntityKind::Player) {
                 continue;
             }
-            if !self.is_valid(side, store, self_store) {
+            if !self.is_valid(side, guid_c.0, store, self_store) {
                 trace_unit(
                     guid_c.0,
                     tf,
                     match side {
                         ScanSide::Enemy => "REJECT dead-or-unattackable",
                         ScanSide::Friend => "REJECT dead-or-unassistable",
+                        ScanSide::Party => "REJECT not-in-party",
+                        ScanSide::Raid => "REJECT not-in-party-or-raid",
                     },
                 );
                 continue;
@@ -457,6 +464,8 @@ pub(super) fn commit(
         return CommitOutcome::default(); // the setter's dedup
     }
     let had_old = selection.guid.is_some();
+    // The last-target stamp (`0x49361d`-`0x493628`), past the two early outs.
+    selection.last = selection.guid;
     if let Some(old) = selection.guid {
         // The old target's teardown (`0x4936cc` → `0x493910`) closes its loot first.
         seam.close_loot_on(old);
@@ -482,7 +491,7 @@ pub(super) fn commit(
 
 /// One press on either side, as every `TargetNearest*` shim shares `0x493f60`: score the live
 /// world, pool by tier, walk the history forward or back, and [`commit`].
-fn cycle(
+pub(super) fn cycle(
     side: ScanSide,
     reverse: bool,
     now: f64,
@@ -574,140 +583,114 @@ fn cycle(
     }
 }
 
-/// The `TARGETNEARESTENEMY` and `TARGETPREVIOUSENEMY` bindings (TAB, SHIFT-TAB); the dispatch has
-/// already applied the typing gate and the modifier match.
-pub(super) fn tab_target(
-    binds: Res<crate::bindings::BindingsState>,
-    time: Res<Time>,
-    scan: TargetScan,
-    mut history: ResMut<TabHistory>,
-    mut selection: ResMut<Selection>,
-    mut seam: crate::creature_anim::AttackSeam,
-    engaged: Query<(), (With<Engaged>, With<SelfPlayer>)>,
-) {
-    let reverse = binds.fired(crate::bindings::cmd::TARGET_PREVIOUS_ENEMY);
-    if !reverse && !binds.fired(crate::bindings::cmd::TARGET_NEAREST_ENEMY) {
-        return;
-    }
-    cycle(
-        ScanSide::Enemy,
-        reverse,
-        time.elapsed_secs_f64(),
-        &scan,
-        &mut history,
-        &mut selection,
-        &mut seam,
-        !engaged.is_empty(),
-    );
+/// The target half of the attack validator `0x612df0` (`0x61305d`–`0x613198`), shared by the
+/// player's Attack (`0x6131aa`) and the pet bar's (`0x4bd40d`): what it reads beyond the
+/// selection, the cycler it runs as `TargetNearestEnemy` (`0x6130b5`, `0x493f60(0, 1)`), and
+/// whether we are swinging, which that cycle's selection switch reads.
+#[derive(SystemParam)]
+pub(crate) struct AttackPick<'w, 's> {
+    scan: TargetScan<'w, 's>,
+    history: ResMut<'w, TabHistory>,
+    time: Res<'w, Time>,
+    engaged: Query<'w, 's, (), (With<Engaged>, With<SelfPlayer>)>,
 }
 
-/// Drain `TargetNearestFriend([reverse])` (`0x489aa0` → `0x493f60(reverse, 2)`), one cycle per
-/// call in call order; the stock bindings reach it through their `Bindings.xml` bodies.
-pub(super) fn target_nearest_friend_requests(
-    script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-    time: Res<Time>,
-    scan: TargetScan,
-    mut history: ResMut<TabHistory>,
-    mut selection: ResMut<Selection>,
-    mut seam: crate::creature_anim::AttackSeam,
-    engaged: Query<(), (With<Engaged>, With<SelfPlayer>)>,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    let presses = script.take_target_nearest_friend_requests();
-    if presses.is_empty() {
-        return;
+impl AttackPick<'_, '_> {
+    /// Whether we are attacking (`0x60ecb0`), as the server last echoed it.
+    pub(crate) fn engaged(&self) -> bool {
+        !self.engaged.is_empty()
     }
-    let now = time.elapsed_secs_f64();
-    let engaged = !engaged.is_empty();
-    for reverse in presses {
-        cycle(
-            ScanSide::Friend,
-            reverse,
-            now,
-            &scan,
-            &mut history,
-            &mut selection,
-            &mut seam,
-            engaged,
-        );
+
+    /// Our own descriptor and guid, the actor of the player's Attack.
+    pub(crate) fn player(&self) -> (Option<&ObjectStore>, Option<u64>) {
+        (self.scan.self_store(), self.scan.self_guid())
     }
-}
 
-/// The attack acquire (`0x6130b5`) is `TargetNearestEnemy()` itself, `0x493f60(0, 1)`, so it moves
-/// the player's target. Deviation: a repeated acquire returns the same head, where the reference's
-/// cursor walks on, because this module re-scores the live world on every call.
-fn acquire_nearest_enemy(
-    scan: &TargetScan,
-    selection: &mut Selection,
-    seam: &mut crate::creature_anim::AttackSeam,
-    errors: &mut crate::ui_action::UiErrorKeys,
-) -> Option<(Entity, u64)> {
-    let cands = scan.build(ScanSide::Enemy);
-    let Some(c) = cands.first() else {
-        // `0x6130d9`: still nothing after the acquire, error `0xa0`.
-        debug!("attack acquire: nothing to attack (ERR_NO_ATTACK_TARGET)");
-        errors
-            .0
-            .push(crate::ui_action::UiError::key("ERR_NO_ATTACK_TARGET"));
-        return None;
-    };
-    // Not engaged: every path here held no selection or a non-hostile one.
-    commit(
-        selection,
-        seam,
-        c.entity,
-        c.guid,
-        scan.store_at(c.entity),
-        false,
-        scan.self_guid(),
-        false,
-    );
-    Some((c.entity, c.guid))
-}
-
-/// `0x612df0`'s target arm: the selection (`0x61306b`) if the actor is hostile to it (`0x6130a3`),
-/// else an acquire (`0x6130b5`), then the final gate (`0x613167`). The result is the guid
-/// `CMSG_PET_ACTION` carries (`0x4bd491`); a dead selection is `ERR_INVALID_ATTACK_TARGET`, not a
-/// reason to acquire.
-pub(crate) fn attack_order_target(
-    scan: &TargetScan,
-    selection: &mut Selection,
-    seam: &mut crate::creature_anim::AttackSeam,
-    errors: &mut crate::ui_action::UiErrorKeys,
-) -> Option<u64> {
-    let guid = match keeps_held_target(selection.guid, |g| scan.reaction_hostile(g)) {
-        Some(kept) => kept,
-        None => acquire_nearest_enemy(scan, selection, seam, errors)?.1,
-    };
-    // `0x613167`'s target legs; its actor legs (`0x61312e`) ran in the caller.
-    let store = scan.unit_by_guid(guid).and_then(|(_, s)| s);
-    if !attack_target_valid(
-        store,
-        scan.factions.as_deref(),
-        &scan.reputations,
-        scan.self_store(),
-    ) {
-        debug!("attack order: {guid:#x} fails the final gate (ERR_INVALID_ATTACK_TARGET)");
-        errors
-            .0
-            .push(crate::ui_action::UiError::key("ERR_INVALID_ATTACK_TARGET"));
-        return None;
+    /// The guid the swing, the pet's order or the cast goes at, or `None` once the refusal is
+    /// raised. The candidate is the guid the caller passed, else the selection (`0x61306b`):
+    /// `AttackTarget` passes none (`0x489b50` → `0x6131a0(0,0)`), nor does the pet bar
+    /// (`0x4be42b`); TryCast passes the caster on a self-cast press (`0x4e610e`). An empty
+    /// candidate (`0x61307f`) or a unit the actor is friendly toward (`0x6130a3`, dropped at
+    /// `0x6130a8`), the caster included, runs `TargetNearestEnemy` (`0x6130b5`), which commits its
+    /// pick before this returns, so a call after this one reads it. The target is then the
+    /// selection as it stands (`0x6130c1`): a fruitless scan leaves a friendly unit selected for
+    /// the final gate to refuse, and only an empty selection is `ERR_NO_ATTACK_TARGET`
+    /// (`0x6130d9`).
+    pub(crate) fn target(
+        &mut self,
+        passed: Option<u64>,
+        selection: &mut Selection,
+        seam: &mut crate::creature_anim::AttackSeam,
+        errors: &mut crate::ui_action::UiErrorKeys,
+    ) -> Option<u64> {
+        if !passed.or(selection.guid).is_some_and(|g| self.keeps(g)) {
+            let engaged = self.engaged();
+            cycle(
+                ScanSide::Enemy,
+                false,
+                self.time.elapsed_secs_f64(),
+                &self.scan,
+                &mut self.history,
+                selection,
+                seam,
+                engaged,
+            );
+        }
+        let Some(guid) = selection.guid else {
+            debug!("attack: nothing to attack (ERR_NO_ATTACK_TARGET)");
+            errors
+                .0
+                .push(crate::ui_action::UiError::key("ERR_NO_ATTACK_TARGET"));
+            return None;
+        };
+        // `0x613118`, the second resolve: a miss refuses with no message (`0x613123`).
+        let Some(store) = self.scan.store_of(guid) else {
+            debug!("attack: {guid:#x} does not resolve, refused silently");
+            return None;
+        };
+        // The final gate's target legs; its actor legs (`0x61312e`, `0x613139`) repeat phase A's
+        // dead and mounted refusals, which the caller ran.
+        if !attack_target_valid(
+            Some(store),
+            self.scan.factions.as_deref(),
+            &self.scan.reputations,
+            self.scan.self_store(),
+        ) {
+            debug!("attack: {guid:#x} fails the final gate (ERR_INVALID_ATTACK_TARGET)");
+            errors
+                .0
+                .push(crate::ui_action::UiError::key("ERR_INVALID_ATTACK_TARGET"));
+            return None;
+        }
+        Some(guid)
     }
-    Some(guid)
-}
 
-/// `0x6130a3`: keep a selection the actor is hostile to. A friendly or neutral one is dropped
-/// (`0x6130a8`) and the acquire runs, so pet-Attack with a quest giver selected retargets a mob.
-fn keeps_held_target(selection: Option<u64>, hostile: impl Fn(u64) -> bool) -> Option<u64> {
-    selection.filter(|&g| hostile(g))
+    /// `0x6130a3`'s keep test: the actor's reaction to the held unit alone (`0x61309b`), not the
+    /// final gate's `CanAttack`, so a neutral mob is kept. A guid that does not resolve
+    /// (`0x613099`) is kept as well, for the second resolve to refuse. Actor → target is
+    /// [`reaction_from_player`] (the at-war bit), never `ring_reaction`. The reference's actor is
+    /// the caller, a pet on the pet arm (`0x4bd40d`), which vmangos gives its owner's faction
+    /// (`Pet.cpp:248`). The reaction to oneself is 4 before any faction rung (`0x606200`), so a
+    /// passed caster is never kept, FFA flag or not.
+    fn keeps(&self, guid: u64) -> bool {
+        if self.scan.self_guid() == Some(guid) {
+            return false;
+        }
+        self.scan.store_of(guid).is_none_or(|store| {
+            reaction_from_player(
+                self.scan.factions.as_deref(),
+                &self.scan.reputations,
+                Some(store),
+                self.scan.self_store(),
+            ) < 4
+        })
+    }
 }
 
 /// The final gate's target legs (`0x613152`–`0x613169`): alive, where a zero-health target passes
 /// iff `UNIT_DYNAMIC_FLAGS` bit 5 is set (`0x613159`), and the full `CanAttack 0x606980`. A target
 /// with no descriptor fails [`can_attack`]; the reference always holds a live unit here.
-fn attack_target_valid(
+pub(super) fn attack_target_valid(
     store: Option<&ObjectStore>,
     factions: Option<&Factions>,
     reputations: &Reputations,
@@ -719,49 +702,10 @@ fn attack_target_valid(
     alive && can_attack(store, factions, reputations, self_store)
 }
 
-/// The attack action fired with no selection: acquire and swing (`0x612df0` at `0x6130b5`).
+/// The melee probe's press with nothing selected: the player's Attack, which acquires.
 #[derive(Message)]
 pub(crate) struct AttackNearestRequest;
 
-/// Acquire the best candidate and start attacking it; the TAB history is untouched.
-pub(super) fn acquire_and_attack(
-    mut requests: MessageReader<AttackNearestRequest>,
-    scan: TargetScan,
-    mut selection: ResMut<Selection>,
-    mut seam: crate::creature_anim::AttackSeam,
-    self_store: Query<&crate::net::ObjectStore, With<SelfPlayer>>,
-    mut ui_error_keys: ResMut<crate::ui_action::UiErrorKeys>,
-) {
-    if requests.read().last().is_none() {
-        return;
-    }
-    if selection.guid.is_some() {
-        return; // selected since the action: the normal path owns it
-    }
-    // `0x612df0`'s actor checks precede the acquire: a mounted, stunned or dead press never scans.
-    let self_guid = scan
-        .self_q
-        .iter()
-        .next()
-        .and_then(|(_, _, g)| g)
-        .map(|g| g.0);
-    if crate::ui_action::attack_actor_refusal(
-        self_store.iter().next(),
-        self_guid,
-        &mut ui_error_keys,
-    ) {
-        return;
-    }
-    let Some((_, guid)) =
-        acquire_nearest_enemy(&scan, &mut selection, &mut seam, &mut ui_error_keys)
-    else {
-        return;
-    };
-    debug!("attack acquire: best candidate {guid:#x} → select + swing");
-    // `0x6131a0`: StartAttack through the seam, with no stop in flight.
-    seam.start(guid, false, false);
-}
-
 /// `TargetLastEnemy`'s memory, the reference's last-attackable guid `[0xb4e2e8]`, read at
 /// `0x489b45` and written at `0x49377d` in `SetSelection`. Never cleared: an unresolved guid is a
 /// bare `ret` in the select helper `0x489a40`, not a deselect.
@@ -1169,15 +1113,6 @@ mod tests {
         assert_eq!(pick_forward(&[], &[], None), None);
     }
 
-    /// `0x6130a3`: a friendly selection is a reason to acquire, not an error.
-    #[test]
-    fn phase_b_keeps_only_a_hostile_selection() {
-        let hostile = |g: u64| g == 0xBAD;
-        assert_eq!(keeps_held_target(Some(0xBAD), hostile), Some(0xBAD));
-        assert_eq!(keeps_held_target(Some(0x600D), hostile), None, "friendly");
-        assert_eq!(keeps_held_target(None, hostile), None, "no selection");
-    }
-
     /// `0x613152`–`0x613169`: a zero-health target is invalid unless dynamic-flag bit 5 is set.
     #[test]
     fn the_attack_orders_final_gate_reads_health_then_can_attack() {
@@ -1350,6 +1285,72 @@ mod tests {
         assert_eq!(pool(&mut world, ScanSide::Friend), [ALLY, ALLY_FEIGN]);
     }
 
+    /// Modes 3 and 4 (`0x493eed`, `0x493f15`): the party slots, then party or raid roster, with no
+    /// health or reaction leg, so a dead party member counts and a stranger never does.
+    #[test]
+    fn the_party_and_raid_modes_take_only_the_roster() {
+        use benilla_protocol::messages::GroupMemberEntry;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const PARTY: u64 = 0x11;
+        const PARTY_DEAD: u64 = 0x12;
+        const RAID: u64 = 0x13;
+        const STRANGER: u64 = 0x14;
+        let mut world = World::new();
+        world.init_resource::<Reputations>();
+        world.init_resource::<NameCache>();
+        world.spawn((
+            SelfPlayer,
+            Transform::default(),
+            Guid(1),
+            store(&[(F_HEALTH, 100)]),
+        ));
+        for (guid, x, health) in [
+            (PARTY, 5.0, 100),
+            (PARTY_DEAD, 6.0, 0),
+            (RAID, 7.0, 100),
+            (STRANGER, 3.0, 100),
+        ] {
+            world.spawn((
+                NetEntity {
+                    kind: EntityKind::Player,
+                    display_id: None,
+                    scale: 1.0,
+                },
+                Guid(guid),
+                Transform::from_xyz(x, 0.0, 0.0),
+                store(&[(F_HEALTH, health), (F_MAXHEALTH, 100)]),
+            ));
+        }
+        let member = |guid, flags| GroupMemberEntry {
+            name: String::new(),
+            guid,
+            status: 1,
+            flags,
+        };
+        // A raid: our subgroup 0 holds PARTY and PARTY_DEAD; RAID is in subgroup 1.
+        world.insert_resource(crate::ui_party::GroupState {
+            in_group: true,
+            group_type: 1,
+            members: vec![member(PARTY, 0), member(PARTY_DEAD, 0), member(RAID, 1)],
+            ..Default::default()
+        });
+        let pool = |world: &mut World, side: ScanSide| {
+            world
+                .run_system_once(move |scan: TargetScan| {
+                    scan.build(side).iter().map(|c| c.guid).collect::<Vec<_>>()
+                })
+                .expect("the scan runs as a one-shot system")
+        };
+        assert_eq!(pool(&mut world, ScanSide::Party), [PARTY, PARTY_DEAD]);
+        assert_eq!(pool(&mut world, ScanSide::Raid), [PARTY, PARTY_DEAD, RAID]);
+        // Out of a raid, mode 4's raid half has no roster: it is the party test.
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .group_type = 0;
+        assert_eq!(pool(&mut world, ScanSide::Raid), [PARTY, PARTY_DEAD]);
+    }
+
     #[test]
     fn a_body_the_draw_election_culled_is_still_a_candidate() {
         use bevy::ecs::system::RunSystemOnce;
diff --git a/crates/benilla-app/src/target/script.rs b/crates/benilla-app/src/target/script.rs
new file mode 100644
index 00000000..9aca36fb
--- /dev/null
+++ b/crates/benilla-app/src/target/script.rs
@@ -0,0 +1,446 @@
+//! The selection calls of the script call stream ([`crate::script_calls`]), each committed through
+//! the one SetSelection path when its turn comes, so a later call in the same pass reads it.
+
+use bevy::prelude::*;
+
+use benilla_ui::script::SelectionRequest;
+
+use super::by_name::{self, ByNameScan, SelectCommit};
+use super::scan;
+
+/// Everything the selection calls read and write.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct ScriptSelect<'w, 's> {
+    /// The app's unit-token resolver. The VM's own reads the same grammar
+    /// ([`benilla_ui::script::parse_unit_token`]), so `TargetUnit("party1target")` and
+    /// `CheckInteractDistance("party1target", …)` name the same unit.
+    tokens: crate::ui_unit::UnitTokens<'w, 's>,
+    /// `TargetLastEnemy`'s memory (`[0xb4e2e8]`), stamped by `scan::remember_last_enemy`.
+    last_enemy: Res<'w, scan::LastEnemy>,
+    /// The SetSelection tail shared with the world click, `/target` and `/assist`, classification
+    /// included.
+    commit: SelectCommit<'w, 's>,
+    by_name: ByNameScan<'w, 's>,
+    /// The TAB cycler's inputs, for the `TargetNearest*` calls.
+    scan: scan::TargetScan<'w, 's>,
+    history: ResMut<'w, scan::TabHistory>,
+    time: Res<'w, Time>,
+}
+
+impl ScriptSelect<'_, '_> {
+    /// `TargetUnit` (`0x4899d0`), `AssistUnit` (`0x489b80`) and `TargetLastEnemy` share the
+    /// reference's helper `0x489a40`: a resolved unit or a roster member is committed, anything
+    /// else is a no-op, never a deselect. Here a token must name a streamed unit, so an
+    /// out-of-range roster member is a no-op (the guid-only selection is not built).
+    pub(crate) fn select(&mut self, request: SelectionRequest) {
+        match request {
+            SelectionRequest::Unit(token) => {
+                if let Some((entity, guid)) = self.tokens.resolve(&token, &self.commit.selection) {
+                    self.commit.commit(entity, guid);
+                }
+            }
+            // `0x489ba9 call 0x515940(token)`, then the shared tail. An unresolvable token is
+            // silent here; the reference shows message `0xb8` `ERR_GENERIC_NO_TARGET` (`0x489c0e`).
+            SelectionRequest::Assist(token) => {
+                match self.tokens.resolve(&token, &self.commit.selection) {
+                    Some((basis, _)) => self.commit.assist(basis, "AssistUnit"),
+                    None => info!("assist (AssistUnit): \"{token}\" names nothing; silent no-op"),
+                }
+            }
+            // `0x489c40`, `/assist <name>`: a player name, prefix-matched by the app's name scan.
+            SelectionRequest::AssistByName(name) => {
+                by_name::assist_named(&self.by_name, &mut self.commit, Some(&name), "AssistByName");
+            }
+            // `0x489b45` → `0x489a40`. Empty memory is a no-op (the shim `0x489b40` tests nothing),
+            // unlike `TargetLastTarget 0x489b00`, which reaches `0x493540(0,0)` and deselects.
+            SelectionRequest::LastEnemy => {
+                let Some(guid) = self.last_enemy.0 else {
+                    info!("TargetLastEnemy: nothing hostile has been targeted yet; no-op");
+                    return;
+                };
+                match self.tokens.held(guid) {
+                    Some((entity, guid)) => self.commit.commit(entity, guid),
+                    // Stale: a no-op, and the memory stays, as the reference never clears it.
+                    None => info!(
+                        "TargetLastEnemy: {guid:#x} is no longer streamed; target left untouched"
+                    ),
+                }
+            }
+        }
+    }
+
+    /// `TargetByName(name, exactMatch)` (`0x489d60`), the stock `/target`.
+    pub(crate) fn target_by_name(&mut self, name: &str, exact: bool) {
+        by_name::target_named(&self.by_name, &mut self.commit, name, exact);
+    }
+
+    /// `TargetNearest*([reverse])` (`0x489a80`/`0x489aa0`/`0x489ac0`/`0x489ae0` →
+    /// `0x493f60(reverse, mode)`), one cycle of the cycler the TAB key runs.
+    pub(crate) fn target_nearest(&mut self, mode: benilla_ui::script::NearestMode, reverse: bool) {
+        let engaged = self.commit.engaged();
+        scan::cycle(
+            scan::ScanSide::of(mode),
+            reverse,
+            self.time.elapsed_secs_f64(),
+            &self.scan,
+            &mut self.history,
+            &mut self.commit.selection,
+            &mut self.commit.seam,
+            engaged,
+        );
+    }
+
+    /// `TargetLastTarget()` (`0x489b00`): a held last-target pair goes to `0x489a40` as a stack
+    /// copy, so a streamed unit is committed (which stamps the outgoing target, swapping the two)
+    /// and an unstreamed one is a no-op (the roster fallback is not built, as for
+    /// `TargetLastEnemy`); an empty pair deselects through `0x493540(0,0)` (`0x489b2d`).
+    pub(crate) fn target_last_target(&mut self) {
+        match self.commit.selection.last {
+            Some(guid) => match self.tokens.held(guid) {
+                Some((entity, guid)) => self.commit.commit(entity, guid),
+                None => info!("TargetLastTarget: {guid:#x} is no longer streamed; no-op"),
+            },
+            None => self.commit.clear(),
+        }
+    }
+
+    /// `ClearTarget()` (`0x489ff0`): deselect whatever the calls before it left selected.
+    pub(crate) fn clear_target(&mut self) {
+        self.commit.clear();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// A world holding what [`ScriptSelect`] reads, with a bare VM and no units.
+    fn script_world() -> World {
+        use crate::net::NetCommands;
+        use benilla_ui::script::UiScript;
+
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let mut world = World::new();
+        world.insert_resource(NetCommands(tx));
+        world.init_resource::<crate::spell::QueuedMeleeSpell>();
+        world.init_resource::<crate::spell::AutoRepeatActive>();
+        world.init_resource::<crate::ui_loot::LootState>();
+        world.init_resource::<crate::ui_loot::LootLatch>();
+        world.init_resource::<Messages<crate::creature_anim::SheathRequest>>();
+        world.init_resource::<crate::ui_party::GroupState>();
+        world.init_resource::<crate::net::GuidIndex>();
+        world.init_resource::<crate::net::Reputations>();
+        world.init_resource::<super::super::AssistAttack>();
+        world.init_resource::<super::super::Selection>();
+        world.init_resource::<scan::LastEnemy>();
+        world.init_resource::<crate::names::NameCache>();
+        world.init_resource::<scan::TabHistory>();
+        world.init_resource::<Time>();
+        world.insert_non_send_resource(UiScript::new().expect("a bare VM"));
+        world
+    }
+
+    /// The selection calls from Lua, through the binding bodies of ASSISTTARGET (`AssistUnit`) and
+    /// TARGETLASTHOSTILE (`TargetLastEnemy`): an empty basis, a garbage token and a stale memory
+    /// are each a no-op (`0x489a40`'s bare `ret`), never a deselect or a panic.
+    #[test]
+    fn the_selection_calls_run_assist_and_last_enemy_without_ever_deselecting() {
+        use crate::net::{Guid, ObjectStore, SelfPlayer};
+        use benilla_ui::script::UiScript;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 1;
+        const BASIS: u64 = 0xB0A2;
+        const VICTIM: u64 = 0xC0DE;
+        const GONE: u64 = 0x6017;
+        // `UNIT_FIELD_TARGET` is a 2-field guid at index 16; HEALTH/MAXHEALTH keep the units live.
+        let store =
+            |pairs: &[(u16, u32)]| ObjectStore(benilla_protocol::ObjectFields::from_pairs(pairs));
+
+        let mut world = script_world();
+
+        world.spawn((SelfPlayer, Guid(ME), store(&[(22, 100), (28, 100)])));
+        // The basis is pointing at the victim; the victim points at nobody.
+        let basis = world
+            .spawn((
+                Guid(BASIS),
+                store(&[(22, 100), (28, 100), (16, VICTIM as u32)]),
+            ))
+            .id();
+        let victim = world
+            .spawn((Guid(VICTIM), store(&[(22, 100), (28, 100)])))
+            .id();
+        let index = &mut world.resource_mut::<crate::net::GuidIndex>().0;
+        index.insert(BASIS, basis);
+        index.insert(VICTIM, victim);
+
+        let run = |world: &mut World, lua: &str| {
+            world
+                .non_send_resource_mut::<UiScript>()
+                .eval::<()>(lua)
+                .expect("the binding runs");
+            world
+                .run_system_once(
+                    |mut script: NonSendMut<UiScript>, mut select: ScriptSelect| {
+                        for request in script.take_selection_requests() {
+                            select.select(request);
+                        }
+                    },
+                )
+                .expect("the applier runs as a one-shot system");
+            world.resource::<super::super::Selection>().guid
+        };
+        let set = |world: &mut World, target: Option<(Entity, u64)>| {
+            let mut sel = world.resource_mut::<super::super::Selection>();
+            sel.target = target.map(|(e, _)| e);
+            sel.guid = target.map(|(_, g)| g);
+        };
+
+        // Assist the current target: one hop onto its target.
+        set(&mut world, Some((basis, BASIS)));
+        assert_eq!(run(&mut world, r#"AssistUnit("target")"#), Some(VICTIM));
+
+        // The victim targets nobody: assisting it is a no-op, not a deselect.
+        assert_eq!(run(&mut world, r#"AssistUnit("target")"#), Some(VICTIM));
+
+        assert_eq!(run(&mut world, r#"AssistUnit("nosuchunit")"#), Some(VICTIM));
+        assert_eq!(run(&mut world, r#"TargetUnit("nosuchunit")"#), Some(VICTIM));
+
+        // TargetLastEnemy with nothing remembered: also a no-op.
+        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
+
+        world.resource_mut::<scan::LastEnemy>().0 = Some(VICTIM);
+        set(&mut world, None);
+        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
+
+        // A stale memory (the unit despawned, so its guid is in no index) leaves the target alone.
+        world.resource_mut::<scan::LastEnemy>().0 = Some(GONE);
+        assert_eq!(run(&mut world, "TargetLastEnemy()"), Some(VICTIM));
+        set(&mut world, None);
+        assert_eq!(run(&mut world, "TargetLastEnemy()"), None);
+    }
+
+    /// `TargetUnit("partypet1")`, the TARGETPARTYPET1 binding and the pet half of
+    /// TARGETPARTYMEMBER1, commits the pet the member's descriptor names (`0x515970` to `0x4e81d0`);
+    /// a slot with no member, or one whose pet is not held, is a no-op, never a deselect.
+    #[test]
+    fn target_unit_selects_a_party_pet() {
+        use crate::net::{Guid, ObjectStore, SelfPlayer};
+        use benilla_protocol::messages::{member_status, GroupMemberEntry};
+        use benilla_ui::script::UiScript;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 1;
+        const MEMBER: u64 = 0x1234;
+        const PET: u64 = 0xF140_0000_0000_0077;
+        // HEALTH/MAXHEALTH keep the units live; `UNIT_FIELD_SUMMON` is the 2-field guid at 8.
+        let store =
+            |pairs: &[(u16, u32)]| ObjectStore(benilla_protocol::ObjectFields::from_pairs(pairs));
+
+        let mut world = script_world();
+        world.spawn((SelfPlayer, Guid(ME), store(&[(22, 100), (28, 100)])));
+        let pet = world
+            .spawn((Guid(PET), store(&[(22, 100), (28, 100)])))
+            .id();
+        let member = world
+            .spawn((
+                Guid(MEMBER),
+                store(&[
+                    (22, 100),
+                    (28, 100),
+                    (8, PET as u32),
+                    (9, (PET >> 32) as u32),
+                ]),
+            ))
+            .id();
+        let index = &mut world.resource_mut::<crate::net::GuidIndex>().0;
+        index.insert(PET, pet);
+        index.insert(MEMBER, member);
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .apply_list(
+                0,
+                0,
+                vec![GroupMemberEntry {
+                    name: "Brisca".into(),
+                    guid: MEMBER,
+                    status: member_status::ONLINE,
+                    flags: 0,
+                }],
+                ME,
+                None,
+                Some(ME),
+            );
+
+        let run = |world: &mut World, lua: &str| {
+            world
+                .non_send_resource_mut::<UiScript>()
+                .eval::<()>(lua)
+                .expect("the binding runs");
+            world
+                .run_system_once(
+                    |mut script: NonSendMut<UiScript>, mut select: ScriptSelect| {
+                        for request in script.take_selection_requests() {
+                            select.select(request);
+                        }
+                    },
+                )
+                .expect("the applier runs as a one-shot system");
+            world.resource::<super::super::Selection>().guid
+        };
+
+        assert_eq!(run(&mut world, r#"TargetUnit("party1")"#), Some(MEMBER));
+        assert_eq!(run(&mut world, r#"TargetUnit("partypet1")"#), Some(PET));
+        assert_eq!(run(&mut world, r#"TargetUnit("PartyPet1")"#), Some(PET));
+        // No second member, and slot 0 and 5 are no slot: each leaves the selection alone.
+        for token in ["partypet2", "partypet0", "partypet5"] {
+            assert_eq!(
+                run(&mut world, &format!(r#"TargetUnit("{token}")"#)),
+                Some(PET),
+                "{token}"
+            );
+        }
+        // Out of view, the pet is named but not held: nothing to select, no deselect.
+        world.resource_mut::<crate::net::GuidIndex>().0.remove(&PET);
+        assert_eq!(run(&mut world, r#"TargetUnit("party1")"#), Some(MEMBER));
+        assert_eq!(run(&mut world, r#"TargetUnit("partypet1")"#), Some(MEMBER));
+    }
+
+    /// `TargetUnit` and `AssistUnit` take the tokens the reference's resolver takes (`0x515970`,
+    /// from `0x489a08` and `0x489ba9`): a base then a hop off each held unit's target, so
+    /// `party1target` names the unit party1 targets and `AssistUnit("party1target")` its target's.
+    /// A chain that breaks, and text that is not a hop, is a no-op, never a deselect.
+    #[test]
+    fn target_and_assist_unit_follow_a_target_chain() {
+        use crate::net::{Guid, ObjectStore, SelfPlayer};
+        use benilla_protocol::messages::{member_status, GroupMemberEntry};
+        use benilla_ui::script::UiScript;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 1;
+        const MEMBER: u64 = 0x1234;
+        const PET: u64 = 0xF140_0000_0000_0077;
+        const VICTIM: u64 = 0xC0DE;
+        const THIRD: u64 = 0xF130_0000_0000_0003;
+        // `OBJECT_FIELD_TYPE` 2 (a hop is off a unit, typemask 8), `UNIT_FIELD_SUMMON` 8 and
+        // `UNIT_FIELD_TARGET` 16, the latter two each a 2-field guid.
+        let unit = |kind: u32, summon: u64, target: u64| {
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (2, kind),
+                (8, summon as u32),
+                (9, (summon >> 32) as u32),
+                (16, target as u32),
+                (17, (target >> 32) as u32),
+            ]))
+        };
+        const PLAYER: u32 = 0x19;
+        const CREATURE: u32 = 0x09;
+
+        let mut world = script_world();
+        // We target the victim, party1 targets the victim, the victim targets `THIRD`, our pet
+        // targets `THIRD`; `THIRD` targets nobody.
+        world.spawn((SelfPlayer, Guid(ME), unit(PLAYER, PET, VICTIM)));
+        let member = world.spawn((Guid(MEMBER), unit(PLAYER, 0, VICTIM))).id();
+        let victim = world.spawn((Guid(VICTIM), unit(CREATURE, 0, THIRD))).id();
+        let third = world.spawn((Guid(THIRD), unit(CREATURE, 0, 0))).id();
+        let pet = world.spawn((Guid(PET), unit(CREATURE, 0, THIRD))).id();
+        let index = &mut world.resource_mut::<crate::net::GuidIndex>().0;
+        index.insert(MEMBER, member);
+        index.insert(VICTIM, victim);
+        index.insert(THIRD, third);
+        index.insert(PET, pet);
+        world
+            .resource_mut::<crate::ui_party::GroupState>()
+            .apply_list(
+                0,
+                0,
+                vec![GroupMemberEntry {
+                    name: "Brisca".into(),
+                    guid: MEMBER,
+                    status: member_status::ONLINE,
+                    flags: 0,
+                }],
+                ME,
+                None,
+                Some(ME),
+            );
+        let mut bar = crate::ui_pet::PetBar::default();
+        bar.spells.pet_guid = PET;
+        world.insert_resource(bar);
+
+        let run = |world: &mut World, lua: &str| {
+            world
+                .non_send_resource_mut::<UiScript>()
+                .eval::<()>(lua)
+                .expect("the binding runs");
+            world
+                .run_system_once(
+                    |mut script: NonSendMut<UiScript>, mut select: ScriptSelect| {
+                        for request in script.take_selection_requests() {
+                            select.select(request);
+                        }
+                    },
+                )
+                .expect("the applier runs as a one-shot system");
+            world.resource::<super::super::Selection>().guid
+        };
+        let reset = |world: &mut World| {
+            let mut sel = world.resource_mut::<super::super::Selection>();
+            sel.target = None;
+            sel.guid = None;
+        };
+
+        assert_eq!(run(&mut world, r#"TargetUnit("party1")"#), Some(MEMBER));
+        assert_eq!(
+            run(&mut world, r#"TargetUnit("party1target")"#),
+            Some(VICTIM)
+        );
+        assert_eq!(
+            run(&mut world, r#"TargetUnit("party1targettarget")"#),
+            Some(THIRD)
+        );
+        // `THIRD` targets nobody: the chain ends there, and the selection stays.
+        for token in [
+            "party1targettargettarget",
+            "party1targetfoo",
+            "party1foo",
+            "party2target",
+            "npctarget",
+        ] {
+            assert_eq!(
+                run(&mut world, &format!(r#"TargetUnit("{token}")"#)),
+                Some(THIRD),
+                "{token}"
+            );
+        }
+
+        reset(&mut world);
+        assert_eq!(
+            run(&mut world, r#"TargetUnit("PARTY1TARGET")"#),
+            Some(VICTIM)
+        );
+        reset(&mut world);
+        assert_eq!(
+            run(&mut world, r#"TargetUnit("playertarget")"#),
+            Some(VICTIM)
+        );
+        reset(&mut world);
+        assert_eq!(run(&mut world, r#"TargetUnit("pettarget")"#), Some(THIRD));
+        reset(&mut world);
+        assert_eq!(run(&mut world, r#"TargetUnit("partypet1target")"#), None);
+
+        // Assisting a unit selects its target; its target is a chain's end, so one hop further.
+        reset(&mut world);
+        assert_eq!(run(&mut world, r#"AssistUnit("party1")"#), Some(VICTIM));
+        reset(&mut world);
+        assert_eq!(
+            run(&mut world, r#"AssistUnit("party1target")"#),
+            Some(THIRD)
+        );
+        assert_eq!(
+            run(&mut world, r#"AssistUnit("party1targettarget")"#),
+            Some(THIRD),
+            "THIRD targets nobody: silent, nothing deselected"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/textinput/keymap.rs b/crates/benilla-app/src/textinput/keymap.rs
index 88aa2b81..7065ab2c 100644
--- a/crates/benilla-app/src/textinput/keymap.rs
+++ b/crates/benilla-app/src/textinput/keymap.rs
@@ -1,12 +1,15 @@
 //! The per-OS text-editing keymap: a keypress and modifiers to an engine [`EditAction`] or a
 //! host-side clipboard operation. The Windows/Linux table is the reference's key handler
-//! (`0x77b160`: Ctrl+arrows by word, Ctrl+A/C/X/V, Ctrl/Shift+Insert, Shift+Delete).
+//! (`0x77b160`: Ctrl+arrows by word, Ctrl+HOME/END to the text's edge, Ctrl+A/C/X/V,
+//! Ctrl/Shift+Insert, Shift+Delete).
 //! Deviation: macOS takes the Cocoa text-field chords and Ctrl+Backspace/Delete delete a word,
 //! because editing follows each OS's own text fields.
 
 use benilla_ui::script::{EditAction, EditUnit};
 use bevy::input::keyboard::KeyCode;
 
+use crate::bindings::chord::KeyName;
+
 /// The modifier snapshot a chord is read against; `sup` is Cmd on macOS, the OS key elsewhere.
 #[derive(Clone, Copy, Default)]
 pub(crate) struct Mods {
@@ -29,8 +32,24 @@ pub(crate) enum Chord {
     Paste,
 }
 
-/// What `key` under `m` means; `None` falls through to character input.
-pub(crate) fn chord(key: KeyCode, m: Mods, mac: bool) -> Option<Chord> {
+/// What `key`, which the layout names `name`, means under `m`; `None` falls through to character
+/// input.
+pub(crate) fn chord(key: KeyCode, name: Option<KeyName>, m: Mods, mac: bool) -> Option<Chord> {
+    // Ctrl (Cmd on a Mac) with the keys the layout names A, C, X and V: the reference's handler
+    // switches on the key's code (`0x77b1fb`), the name its bindings use, so on AZERTY select-all
+    // is the key labelled A. On the PC `!m.alt` excludes AltGr, which arrives as Ctrl+Alt and types
+    // letters on European layouts (Polish AltGr+A is `ą`); must agree with the char-input branch
+    // in `input.rs`.
+    let held = if mac { m.sup } else { m.ctrl && !m.alt };
+    if let (true, Some(KeyName::Char(letter))) = (held, name) {
+        match letter {
+            'A' => return Some(Chord::Edit(EditAction::SelectAll)),
+            'C' => return Some(Chord::Copy),
+            'X' => return Some(Chord::Cut),
+            'V' => return Some(Chord::Paste),
+            _ => {}
+        }
+    }
     if mac {
         chord_mac(key, m)
     } else {
@@ -38,10 +57,11 @@ pub(crate) fn chord(key: KeyCode, m: Mods, mac: bool) -> Option<Chord> {
     }
 }
 
-/// macOS, the Cocoa text-field chords: Option is a word, Cmd the line edge; plain Up/Down recall
-/// history. Cocoa's Emacs Ctrl set is left unbound.
+/// macOS, the Cocoa text-field chords: Option+Left/Right is a word and Cmd+Left/Right the line's
+/// edge; Cmd+Up/Down and Shift+Up/Down go to the text's edge, and Up/Down, plain or with Option,
+/// move a row, or recall history in a single-line box. Cocoa's Emacs Ctrl set is left unbound.
 fn chord_mac(key: KeyCode, m: Mods) -> Option<Chord> {
-    use EditUnit::{Char, Edge, Word};
+    use EditUnit::{Char, Edge, Line, Row, Word};
     let mv = |unit, back| {
         Some(Chord::Edit(EditAction::Move {
             unit,
@@ -54,24 +74,25 @@ fn chord_mac(key: KeyCode, m: Mods) -> Option<Chord> {
         KeyCode::ArrowLeft | KeyCode::ArrowRight => {
             let back = key == KeyCode::ArrowLeft;
             if m.sup {
-                mv(Edge, back)
+                mv(Line, back)
             } else if m.alt {
                 mv(Word, back)
             } else {
                 mv(Char, back)
             }
         }
-        // Cmd+Up/Down is the box's start/end; Shift extends there.
+        // Cmd+Up/Down go to the text's start or end and Shift+Up/Down select to it, as a Cocoa
+        // text field's do. Option is the reference's Alt, which its UP and DOWN arms do not read
+        // (`0x77b64e`, `0x77b675`), and the one modifier that keeps the arrows in an alt-arrow box
+        // (`0x77b1b3`): the chat box's history recall.
         KeyCode::ArrowUp | KeyCode::ArrowDown => {
             let back = key == KeyCode::ArrowUp;
             if m.sup || m.shift {
                 mv(Edge, back)
-            } else if m.alt || m.ctrl {
+            } else if m.ctrl {
                 None
-            } else if back {
-                Some(Chord::Edit(EditAction::HistoryPrev))
             } else {
-                Some(Chord::Edit(EditAction::HistoryNext))
+                mv(Row, back)
             }
         }
         KeyCode::Home => mv(Edge, true),
@@ -94,17 +115,13 @@ fn chord_mac(key: KeyCode, m: Mods) -> Option<Chord> {
                 del(Char, false)
             }
         }
-        KeyCode::KeyA if m.sup => Some(Chord::Edit(EditAction::SelectAll)),
-        KeyCode::KeyC if m.sup => Some(Chord::Copy),
-        KeyCode::KeyX if m.sup => Some(Chord::Cut),
-        KeyCode::KeyV if m.sup => Some(Chord::Paste),
         _ => None,
     }
 }
 
 /// Windows/Linux: the reference's chords (`0x77b160`) plus the Ctrl word deletes.
 fn chord_pc(key: KeyCode, m: Mods) -> Option<Chord> {
-    use EditUnit::{Char, Edge, Word};
+    use EditUnit::{Char, Edge, Line, Row, Word};
     let mv = |unit, back| {
         Some(Chord::Edit(EditAction::Move {
             unit,
@@ -123,15 +140,11 @@ fn chord_pc(key: KeyCode, m: Mods) -> Option<Chord> {
                 mv(Char, back)
             }
         }
-        // Plain Up/Down only: history recall.
-        KeyCode::ArrowUp if !(m.ctrl || m.alt || m.shift || m.sup) => {
-            Some(Chord::Edit(EditAction::HistoryPrev))
-        }
-        KeyCode::ArrowDown if !(m.ctrl || m.alt || m.shift || m.sup) => {
-            Some(Chord::Edit(EditAction::HistoryNext))
-        }
-        KeyCode::Home => mv(Edge, true),
-        KeyCode::End => mv(Edge, false),
+        // UP/DOWN read only Shift, as the extend flag (`0x77b65d`, `0x77b684`): a row in a
+        // multi-line box, history in a single-line one.
+        KeyCode::ArrowUp | KeyCode::ArrowDown if !m.sup => mv(Row, key == KeyCode::ArrowUp),
+        // HOME/END stop at a newline; Ctrl goes to the text's edge (`0x77b49e`, `0x77b4de`).
+        KeyCode::Home | KeyCode::End => mv(if m.ctrl { Edge } else { Line }, key == KeyCode::Home),
         // Shift+Delete cuts, as the reference does (`0x77b160`).
         KeyCode::Backspace => {
             if m.ctrl {
@@ -152,12 +165,6 @@ fn chord_pc(key: KeyCode, m: Mods) -> Option<Chord> {
         // The reference's other CUA mirrors: Ctrl+Insert copies, Shift+Insert pastes.
         KeyCode::Insert if m.ctrl => Some(Chord::Copy),
         KeyCode::Insert if m.shift => Some(Chord::Paste),
-        // `!m.alt` excludes AltGr, which arrives as Ctrl+Alt and types letters on European
-        // layouts (Polish AltGr+A is `ą`); must agree with the char-input branch in `input.rs`.
-        KeyCode::KeyA if m.ctrl && !m.alt => Some(Chord::Edit(EditAction::SelectAll)),
-        KeyCode::KeyC if m.ctrl && !m.alt => Some(Chord::Copy),
-        KeyCode::KeyX if m.ctrl && !m.alt => Some(Chord::Cut),
-        KeyCode::KeyV if m.ctrl && !m.alt => Some(Chord::Paste),
         _ => None,
     }
 }
@@ -180,6 +187,11 @@ mod tests {
     const ALT: Mods = Mods { alt: true, ..NONE };
     const SUP: Mods = Mods { sup: true, ..NONE };
 
+    /// A key's name on a US layout.
+    fn us(key: KeyCode) -> Option<KeyName> {
+        crate::bindings::chord::key_token(key, &Default::default())
+    }
+
     fn edit(c: Option<Chord>) -> EditAction {
         match c {
             Some(Chord::Edit(a)) => a,
@@ -192,7 +204,12 @@ mod tests {
         use EditAction::*;
         use EditUnit::*;
         assert_eq!(
-            edit(chord(KeyCode::ArrowLeft, NONE, true)),
+            edit(chord(
+                KeyCode::ArrowLeft,
+                us(KeyCode::ArrowLeft),
+                NONE,
+                true
+            )),
             Move {
                 unit: Char,
                 back: true,
@@ -200,7 +217,12 @@ mod tests {
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::ArrowRight, ALT, true)),
+            edit(chord(
+                KeyCode::ArrowRight,
+                us(KeyCode::ArrowRight),
+                ALT,
+                true
+            )),
             Move {
                 unit: Word,
                 back: false,
@@ -208,9 +230,9 @@ mod tests {
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::ArrowLeft, SUP, true)),
+            edit(chord(KeyCode::ArrowLeft, us(KeyCode::ArrowLeft), SUP, true)),
             Move {
-                unit: Edge,
+                unit: Line,
                 back: true,
                 extend: false
             }
@@ -218,6 +240,7 @@ mod tests {
         assert_eq!(
             edit(chord(
                 KeyCode::ArrowRight,
+                us(KeyCode::ArrowRight),
                 Mods { shift: true, ..ALT },
                 true
             )),
@@ -227,10 +250,29 @@ mod tests {
                 extend: true
             }
         );
-        assert_eq!(edit(chord(KeyCode::ArrowUp, NONE, true)), HistoryPrev);
-        assert_eq!(edit(chord(KeyCode::ArrowDown, NONE, true)), HistoryNext);
         assert_eq!(
-            edit(chord(KeyCode::ArrowUp, SHIFT, true)),
+            edit(chord(KeyCode::ArrowUp, us(KeyCode::ArrowUp), NONE, true)),
+            Move {
+                unit: Row,
+                back: true,
+                extend: false
+            }
+        );
+        assert_eq!(
+            edit(chord(
+                KeyCode::ArrowDown,
+                us(KeyCode::ArrowDown),
+                NONE,
+                true
+            )),
+            Move {
+                unit: Row,
+                back: false,
+                extend: false
+            }
+        );
+        assert_eq!(
+            edit(chord(KeyCode::ArrowUp, us(KeyCode::ArrowUp), SHIFT, true)),
             Move {
                 unit: Edge,
                 back: true,
@@ -238,7 +280,7 @@ mod tests {
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::ArrowDown, SUP, true)),
+            edit(chord(KeyCode::ArrowDown, us(KeyCode::ArrowDown), SUP, true)),
             Move {
                 unit: Edge,
                 back: false,
@@ -246,32 +288,44 @@ mod tests {
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::Backspace, SUP, true)),
+            edit(chord(KeyCode::Backspace, us(KeyCode::Backspace), SUP, true)),
             Delete {
                 unit: Edge,
                 back: true
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::Backspace, ALT, true)),
+            edit(chord(KeyCode::Backspace, us(KeyCode::Backspace), ALT, true)),
             Delete {
                 unit: Word,
                 back: true
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::Delete, ALT, true)),
+            edit(chord(KeyCode::Delete, us(KeyCode::Delete), ALT, true)),
             Delete {
                 unit: Word,
                 back: false
             }
         );
-        assert_eq!(edit(chord(KeyCode::KeyA, SUP, true)), SelectAll);
-        assert_eq!(chord(KeyCode::KeyC, SUP, true), Some(Chord::Copy));
-        assert_eq!(chord(KeyCode::KeyX, SUP, true), Some(Chord::Cut));
-        assert_eq!(chord(KeyCode::KeyV, SUP, true), Some(Chord::Paste));
-        assert_eq!(chord(KeyCode::KeyA, CTRL, true), None);
-        assert_eq!(chord(KeyCode::KeyA, NONE, true), None);
+        assert_eq!(
+            edit(chord(KeyCode::KeyA, us(KeyCode::KeyA), SUP, true)),
+            SelectAll
+        );
+        assert_eq!(
+            chord(KeyCode::KeyC, us(KeyCode::KeyC), SUP, true),
+            Some(Chord::Copy)
+        );
+        assert_eq!(
+            chord(KeyCode::KeyX, us(KeyCode::KeyX), SUP, true),
+            Some(Chord::Cut)
+        );
+        assert_eq!(
+            chord(KeyCode::KeyV, us(KeyCode::KeyV), SUP, true),
+            Some(Chord::Paste)
+        );
+        assert_eq!(chord(KeyCode::KeyA, us(KeyCode::KeyA), CTRL, true), None);
+        assert_eq!(chord(KeyCode::KeyA, us(KeyCode::KeyA), NONE, true), None);
     }
 
     #[test]
@@ -279,7 +333,12 @@ mod tests {
         use EditAction::*;
         use EditUnit::*;
         assert_eq!(
-            edit(chord(KeyCode::ArrowLeft, CTRL, false)),
+            edit(chord(
+                KeyCode::ArrowLeft,
+                us(KeyCode::ArrowLeft),
+                CTRL,
+                false
+            )),
             Move {
                 unit: Word,
                 back: true,
@@ -287,44 +346,195 @@ mod tests {
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::ArrowRight, SHIFT, false)),
+            edit(chord(
+                KeyCode::ArrowRight,
+                us(KeyCode::ArrowRight),
+                SHIFT,
+                false
+            )),
             Move {
                 unit: Char,
                 back: false,
                 extend: true
             }
         );
-        assert_eq!(edit(chord(KeyCode::ArrowUp, NONE, false)), HistoryPrev);
-        assert_eq!(chord(KeyCode::ArrowUp, SHIFT, false), None);
         assert_eq!(
-            edit(chord(KeyCode::End, SHIFT, false)),
+            edit(chord(KeyCode::ArrowUp, us(KeyCode::ArrowUp), NONE, false)),
             Move {
-                unit: Edge,
+                unit: Row,
+                back: true,
+                extend: false
+            }
+        );
+        assert_eq!(
+            edit(chord(
+                KeyCode::ArrowDown,
+                us(KeyCode::ArrowDown),
+                SHIFT,
+                false
+            )),
+            Move {
+                unit: Row,
                 back: false,
                 extend: true
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::Backspace, CTRL, false)),
+            edit(chord(KeyCode::End, us(KeyCode::End), SHIFT, false)),
+            Move {
+                unit: Line,
+                back: false,
+                extend: true
+            }
+        );
+        assert_eq!(
+            edit(chord(
+                KeyCode::Backspace,
+                us(KeyCode::Backspace),
+                CTRL,
+                false
+            )),
             Delete {
                 unit: Word,
                 back: true
             }
         );
         assert_eq!(
-            edit(chord(KeyCode::Delete, CTRL, false)),
+            edit(chord(KeyCode::Delete, us(KeyCode::Delete), CTRL, false)),
             Delete {
                 unit: Word,
                 back: false
             }
         );
-        assert_eq!(edit(chord(KeyCode::KeyA, CTRL, false)), SelectAll);
-        assert_eq!(chord(KeyCode::KeyC, CTRL, false), Some(Chord::Copy));
-        assert_eq!(chord(KeyCode::KeyV, CTRL, false), Some(Chord::Paste));
-        assert_eq!(chord(KeyCode::Insert, CTRL, false), Some(Chord::Copy));
-        assert_eq!(chord(KeyCode::Insert, SHIFT, false), Some(Chord::Paste));
-        assert_eq!(chord(KeyCode::Delete, SHIFT, false), Some(Chord::Cut));
-        assert_eq!(chord(KeyCode::KeyA, SUP, false), None);
+        assert_eq!(
+            edit(chord(KeyCode::KeyA, us(KeyCode::KeyA), CTRL, false)),
+            SelectAll
+        );
+        assert_eq!(
+            chord(KeyCode::KeyC, us(KeyCode::KeyC), CTRL, false),
+            Some(Chord::Copy)
+        );
+        assert_eq!(
+            chord(KeyCode::KeyV, us(KeyCode::KeyV), CTRL, false),
+            Some(Chord::Paste)
+        );
+        assert_eq!(
+            chord(KeyCode::Insert, us(KeyCode::Insert), CTRL, false),
+            Some(Chord::Copy)
+        );
+        assert_eq!(
+            chord(KeyCode::Insert, us(KeyCode::Insert), SHIFT, false),
+            Some(Chord::Paste)
+        );
+        assert_eq!(
+            chord(KeyCode::Delete, us(KeyCode::Delete), SHIFT, false),
+            Some(Chord::Cut)
+        );
+        assert_eq!(chord(KeyCode::KeyA, us(KeyCode::KeyA), SUP, false), None);
+    }
+
+    /// On a Mac, Cmd+Left/Right go to the caret's line's start or end, as a Cocoa text view's do;
+    /// in a single-line box, with no newline typed, that is the text's edge.
+    #[test]
+    fn mac_cmd_left_right_go_to_the_lines_edge() {
+        use EditAction::Move;
+        use EditUnit::Line;
+        for (key, back) in [(KeyCode::ArrowLeft, true), (KeyCode::ArrowRight, false)] {
+            assert_eq!(
+                edit(chord(key, us(key), SUP, true)),
+                Move {
+                    unit: Line,
+                    back,
+                    extend: false
+                }
+            );
+            assert_eq!(
+                edit(chord(key, us(key), Mods { shift: true, ..SUP }, true)),
+                Move {
+                    unit: Line,
+                    back,
+                    extend: true
+                }
+            );
+        }
+    }
+
+    /// On a Mac, Option is the reference's Alt: Option+Up/Down reach the UP and DOWN arms
+    /// (`0x77b64e`, `0x77b675`), which read only Shift, so the alt-arrow chat box recalls its
+    /// history with them (`0x77b1b3`, then `0x77d030`/`0x77cfd0`). Ctrl stays unbound.
+    #[test]
+    fn mac_option_up_down_move_a_row_or_recall_history() {
+        use EditAction::Move;
+        use EditUnit::Row;
+        for (key, back) in [(KeyCode::ArrowUp, true), (KeyCode::ArrowDown, false)] {
+            assert_eq!(
+                edit(chord(key, us(key), ALT, true)),
+                Move {
+                    unit: Row,
+                    back,
+                    extend: false
+                }
+            );
+            assert_eq!(chord(key, us(key), CTRL, true), None);
+        }
+    }
+
+    /// The reference's UP and DOWN arms read only Shift (`0x77b64e`, `0x77b675`), so Ctrl and Alt
+    /// reach them too: Alt+Up is how the alt-arrow chat box recalls its history. HOME and END
+    /// stop at a newline and Ctrl+HOME/END go to the text's edge (`0x77b499`, `0x77b4d9`).
+    #[test]
+    fn pc_up_down_take_any_modifier_and_home_end_split_on_ctrl() {
+        use EditAction::Move;
+        use EditUnit::*;
+        for m in [NONE, CTRL, ALT, Mods { shift: true, ..ALT }] {
+            assert_eq!(
+                edit(chord(KeyCode::ArrowUp, us(KeyCode::ArrowUp), m, false)),
+                Move {
+                    unit: Row,
+                    back: true,
+                    extend: m.shift
+                }
+            );
+        }
+        assert_eq!(
+            chord(KeyCode::ArrowDown, us(KeyCode::ArrowDown), SUP, false),
+            None
+        );
+        for (key, back) in [(KeyCode::Home, true), (KeyCode::End, false)] {
+            assert_eq!(
+                edit(chord(key, us(key), NONE, false)),
+                Move {
+                    unit: Line,
+                    back,
+                    extend: false
+                }
+            );
+            assert_eq!(
+                edit(chord(
+                    key,
+                    us(key),
+                    Mods {
+                        shift: true,
+                        ..CTRL
+                    },
+                    false
+                )),
+                Move {
+                    unit: Edge,
+                    back,
+                    extend: true
+                }
+            );
+            // macOS keeps the text-field chord: HOME and END go to the text's edge.
+            assert_eq!(
+                edit(chord(key, us(key), NONE, true)),
+                Move {
+                    unit: Edge,
+                    back,
+                    extend: false
+                }
+            );
+        }
     }
 
     /// AltGr arrives as Ctrl+Alt and types letters on European layouts (Polish `ą`, `ć`, `ź`).
@@ -337,17 +547,48 @@ mod tests {
         };
         for key in [KeyCode::KeyA, KeyCode::KeyC, KeyCode::KeyX, KeyCode::KeyV] {
             assert_eq!(
-                chord(key, ALTGR, false),
+                chord(key, us(key), ALTGR, false),
                 None,
                 "AltGr+{key:?} must reach character input, not act as a clipboard chord"
             );
         }
         assert_eq!(
-            edit(chord(KeyCode::KeyA, CTRL, false)),
+            edit(chord(KeyCode::KeyA, us(KeyCode::KeyA), CTRL, false)),
             EditAction::SelectAll
         );
-        assert_eq!(chord(KeyCode::KeyC, CTRL, false), Some(Chord::Copy));
-        assert_eq!(chord(KeyCode::KeyX, CTRL, false), Some(Chord::Cut));
-        assert_eq!(chord(KeyCode::KeyV, CTRL, false), Some(Chord::Paste));
+        assert_eq!(
+            chord(KeyCode::KeyC, us(KeyCode::KeyC), CTRL, false),
+            Some(Chord::Copy)
+        );
+        assert_eq!(
+            chord(KeyCode::KeyX, us(KeyCode::KeyX), CTRL, false),
+            Some(Chord::Cut)
+        );
+        assert_eq!(
+            chord(KeyCode::KeyV, us(KeyCode::KeyV), CTRL, false),
+            Some(Chord::Paste)
+        );
+    }
+
+    /// Select-all, copy, cut and paste follow the layout's names, as the reference's handler
+    /// switches on the key's code (`0x77b1fb`): on AZERTY they sit on the keys labelled A, C, X
+    /// and V, wherever those are.
+    #[test]
+    fn the_clipboard_chords_sit_on_the_keys_the_layout_names() {
+        let azerty_a = Some(KeyName::Char('A'));
+        let azerty_q = Some(KeyName::Char('Q'));
+        for mac in [false, true] {
+            let held = if mac { SUP } else { CTRL };
+            assert_eq!(
+                edit(chord(KeyCode::KeyQ, azerty_a, held, mac)),
+                EditAction::SelectAll,
+                "the key labelled A (mac: {mac})"
+            );
+            assert_eq!(
+                chord(KeyCode::KeyA, azerty_q, held, mac),
+                None,
+                "the key labelled Q (mac: {mac})"
+            );
+        }
     }
 }
diff --git a/crates/benilla-app/src/textinput/mod.rs b/crates/benilla-app/src/textinput/mod.rs
index e3d010fa..2578bbd9 100644
--- a/crates/benilla-app/src/textinput/mod.rs
+++ b/crates/benilla-app/src/textinput/mod.rs
@@ -74,11 +74,13 @@ pub(crate) enum FieldKey {
     Passthrough,
 }
 
-/// Feed one key press to `field`. `wl_display` comes from [`wayland_display`], `None` off Wayland.
+/// Feed one key press to `field`, its letters named by `layout`. `wl_display` comes from
+/// [`wayland_display`], `None` off Wayland.
 pub(crate) fn feed_key(
     field: &mut EditBoxState,
     ev: &KeyboardInput,
     mods: Mods,
+    layout: &crate::bindings::LayoutNames,
     clipboard: &mut HostClipboard,
     wl_display: Option<*mut c_void>,
     filter: CharFilter,
@@ -93,7 +95,8 @@ pub(crate) fn feed_key(
     ) {
         return FieldKey::Passthrough;
     }
-    if let Some(chord) = chord(ev.key_code, mods, cfg!(target_os = "macos")) {
+    let name = crate::bindings::chord::key_token(ev.key_code, layout);
+    if let Some(chord) = chord(ev.key_code, name, mods, cfg!(target_os = "macos")) {
         match chord {
             Chord::Edit(action) => {
                 field.apply(action);
diff --git a/crates/benilla-app/src/ui_action/drain.rs b/crates/benilla-app/src/ui_action/drain.rs
index afa1526a..a734e009 100644
--- a/crates/benilla-app/src/ui_action/drain.rs
+++ b/crates/benilla-app/src/ui_action/drain.rs
@@ -11,7 +11,7 @@ use benilla_ui::script::UiScript;
 
 use crate::net::{ClientCommand, NetCommands};
 
-use crate::spell::{cast_target, CastCommit, CastLadder};
+use crate::spell::{cast_target, CastLadder};
 
 use super::{attack_actor_refusal, PlayerActions, UiErrorKeys, SPELL_ATTACK};
 
@@ -55,50 +55,79 @@ pub(super) fn item_action_route(
     }
 }
 
-/// The ATTACKTARGET binding (default T): the action bar's attack arm without a slot, as in the
-/// reference, where `AttackTarget` and `UseAction`'s Attack both land in `0x612df0`.
-pub(super) fn attack_target_binding(
-    binds: Res<crate::bindings::BindingsState>,
-    targeting: cast_target::CastTargeting,
-    mut acquire: MessageWriter<crate::target::AttackNearestRequest>,
-    mut ui_errors: ResMut<UiErrorKeys>,
-    mut ladder: CastLadder,
+/// The melee probe's press with nothing selected, the player's Attack
+/// ([`AttackPress::attack_target`]), as the ATTACKTARGET binding's `AttackTarget()` is.
+pub(crate) fn attack_nearest_probe(
+    mut probe: MessageReader<crate::target::AttackNearestRequest>,
+    mut press: AttackPress,
 ) {
-    if !binds.fired(crate::bindings::cmd::ATTACK_TARGET) {
-        return;
+    if probe.read().last().is_some() && press.selection.guid.is_none() {
+        press.attack_target();
     }
-    if attack_actor_refusal(
-        targeting.self_store.iter().next(),
-        targeting.context().self_guid,
-        &mut ui_errors,
-    ) {
-        return;
+}
+
+/// What the player's Attack reads and writes: `AttackTarget` (`0x489b50`), the ATTACKTARGET
+/// binding and `UseAction`'s Attack slot (through `TryCast`, `0x6e4c90`) all run `0x6131a0`.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct AttackPress<'w, 's> {
+    pick: crate::target::AttackPick<'w, 's>,
+    selection: ResMut<'w, crate::target::Selection>,
+    seam: crate::creature_anim::AttackSeam<'w, 's>,
+    ui_errors: ResMut<'w, UiErrorKeys>,
+}
+
+impl AttackPress<'_, '_> {
+    /// `0x6131a0`: the attack validator `0x612df0` (`0x6131aa`) runs first, its actor checks then
+    /// its target pick, which may move the selection; a refusal ends the press. Then the toggle:
+    /// attacking (`0x60ecb0`) stops (`0x5ecac0`), else it starts at the validator's target
+    /// (`0x5ecb70`). Only the start cancels auto-repeat (`0x5ecd8c`), so stopping melee leaves
+    /// Auto Shot running.
+    pub(crate) fn attack_target(&mut self) {
+        let Some(guid) = self.validate(None) else {
+            return;
+        };
+        let Self { pick, seam, .. } = self;
+        let Ok(e) = seam.me.single() else {
+            return;
+        };
+        let engaged = pick.engaged();
+        debug!(
+            "attack {} at {guid:#x}",
+            if engaged { "toggled off" } else { "swing" }
+        );
+        crate::creature_anim::toggle_attack_local(
+            e,
+            guid,
+            engaged,
+            &mut seam.queued_melee,
+            &mut seam.auto_repeat,
+            &mut seam.sheath,
+            &mut seam.ecs,
+            &seam.net,
+        );
     }
-    match targeting.selection.guid {
-        Some(guid) => {
-            let Ok((e, engaged)) = ladder.self_player.single() else {
-                return;
-            };
-            debug!(
-                "bindings: ATTACKTARGET {} at {guid:#x}",
-                if engaged { "toggled off" } else { "swing" }
-            );
-            // The action button's own toggle (`0x6131a0`).
-            crate::creature_anim::toggle_attack_local(
-                e,
-                guid,
-                engaged,
-                &mut ladder.queued_melee,
-                &mut ladder.auto_repeat,
-                &mut ladder.sheath,
-                &mut ladder.ecs,
-                &ladder.commands,
-            );
-        }
-        None => {
-            debug!("bindings: ATTACKTARGET with no target — acquiring nearest");
-            acquire.write(crate::target::AttackNearestRequest);
+
+    /// TryCast's attack pick (`0x6e4efb`) for a spell press held there
+    /// ([`crate::spell::HeldForPick`]): the validator alone, with no swing after it. Whether the
+    /// cast goes on, at the unit the pick left selected.
+    pub(crate) fn pick_for_cast(&mut self, held: crate::spell::HeldCast) -> bool {
+        let caster = self.pick.player().1.filter(|_| held.on_self);
+        self.validate(caster).is_some()
+    }
+
+    /// The attack validator `0x612df0`: its actor checks, then its target pick.
+    fn validate(&mut self, passed: Option<u64>) -> Option<u64> {
+        let Self {
+            pick,
+            selection,
+            seam,
+            ui_errors,
+        } = self;
+        let (me, my_guid) = pick.player();
+        if attack_actor_refusal(me, my_guid, ui_errors) {
+            return None;
         }
+        pick.target(passed, selection, seam, ui_errors)
     }
 }
 
@@ -148,225 +177,194 @@ pub(super) fn drain_go_openers(
     }
 }
 
-/// Applies the self-cast modifier, `UseAction`'s `onSelf` (`SELFACTIONBUTTON1`-`12`): the caster
-/// replaces the selection as the bind candidate, guid and store both, the pair the autoSelfCast
-/// fallback swaps (`0x6e53d7`). Where `UseAction 0x4e5ee0` applies `onSelf` is untraced; this
-/// fills `ArmCast 0x6e5250`'s explicit guid (`0x6e5393`); a forced-self leg would look the same.
-fn self_bound<'a>(
-    mut ctx: cast_target::CastContext<'a>,
-    press: benilla_ui::script::ActionUse,
-) -> cast_target::CastContext<'a> {
-    if press.on_self {
-        ctx.selection_guid = ctx.self_guid;
-        ctx.rel.target_store = ctx.rel.self_store;
-    }
-    ctx
-}
-
-pub(super) fn drain_action_uses(
-    script: Option<NonSendMut<UiScript>>,
-    actions: Res<PlayerActions>,
-    targeting: cast_target::CastTargeting,
-    mut acquire: MessageWriter<crate::target::AttackNearestRequest>,
+/// What a `UseAction` press reads and writes.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct ActionPress<'w, 's> {
+    actions: Res<'w, PlayerActions>,
+    targeting: cast_target::CastTargeting<'w, 's>,
     // The by-key error line. Not a `CastLadder` field: Bevy panics, at runtime and not in unit
     // tests, on a resource reachable twice from one system.
-    mut ui_errors: ResMut<UiErrorKeys>,
-    mut ladder: CastLadder,
-    mut gate: crate::ui_bind_confirm::BindGate,
-) {
+    ui_errors: ResMut<'w, UiErrorKeys>,
+    ladder: CastLadder<'w, 's>,
+    gate: crate::ui_bind_confirm::BindGate<'w>,
+}
+
+/// What a `UseAction` press leaves to another applier.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[must_use]
+pub(crate) enum UseOutcome {
+    Done,
+    /// The Attack slot passed `TryCast`'s dead rung: the player's Attack ([`AttackPress`]) runs.
+    Attack,
+}
+
+/// `UseAction` (`0x4e5ee0`) on the pressed slot: a cast, an item use or a macro run, at the
+/// selection as the calls before it left it, or the Attack slot, which it hands back for the
+/// player's Attack to run. A macro's lines run inside it (`0x4e6098 call 0x4f1460`), so the calls
+/// they make queue for [`crate::script_calls`] to apply next.
+pub(crate) fn use_action(
+    p: &mut ActionPress,
+    script: &mut UiScript,
+    press: benilla_ui::script::ActionUse,
+) -> UseOutcome {
+    let ActionPress {
+        actions,
+        targeting,
+        ui_errors,
+        ladder,
+        gate,
+    } = p;
     let selection = &targeting.selection;
-    let Some(mut script) = script else {
-        return;
+    let action = press.action;
+    let slot = match u8::try_from(action.saturating_sub(1)) {
+        Ok(s) => s,
+        Err(_) => return UseOutcome::Done,
     };
-    for press in script.take_action_uses() {
-        let action = press.action;
-        let slot = match u8::try_from(action.saturating_sub(1)) {
-            Ok(s) => s,
-            Err(_) => continue,
-        };
-        match actions.buttons.get(&slot) {
-            Some(b) if b.kind == ACTION_KIND_SPELL && b.action == SPELL_ATTACK => {
-                // `UseAction` casts Attack through TryCast, so its dead rung comes first: "You are
-                // dead", where the binding, which skips TryCast, reads "Can't attack while dead."
-                if ladder.dead_refusal(SPELL_ATTACK, targeting.self_store.iter().next()) {
-                    continue;
-                }
-                // The attack validator's actor gates (`0x612df0`) precede both the swing and the
-                // nearest-enemy scan (`0x6130b5`), so both arms gate here.
-                if attack_actor_refusal(
-                    targeting.self_store.iter().next(),
-                    targeting.context().self_guid,
-                    &mut ui_errors,
-                ) {
-                    continue;
-                }
-                match selection.guid {
-                    Some(guid) => {
-                        // A toggle (`0x6131a0`, via `TryCast`'s effect-0x4e short-circuit
-                        // `0x6e4c7a`): attacking (`0x60ecb0`) stops (`0x5ecac0`), else starts
-                        // (`0x5ecb70`). Only the start cancels auto-repeat (`0x5ecd8c`), so
-                        // stopping melee leaves Auto Shot running.
-                        let Ok((e, engaged)) = ladder.self_player.single() else {
-                            continue;
-                        };
-                        debug!(
-                            "ui_action: attack {} at {guid:#x}",
-                            if engaged { "toggled off" } else { "swing" }
-                        );
-                        crate::creature_anim::toggle_attack_local(
-                            e,
-                            guid,
-                            engaged,
-                            &mut ladder.queued_melee,
-                            &mut ladder.auto_repeat,
-                            &mut ladder.sheath,
-                            &mut ladder.ecs,
-                            &ladder.commands,
-                        );
-                    }
-                    // No target: the reference swings at the nearest enemy (`0x6130b5`).
-                    None => {
-                        debug!("ui_action: attack with no target — acquiring nearest");
-                        acquire.write(crate::target::AttackNearestRequest);
-                    }
-                }
+    match actions.buttons.get(&slot) {
+        Some(b) if b.kind == ACTION_KIND_SPELL && b.action == SPELL_ATTACK => {
+            // `UseAction` casts Attack through TryCast, so its dead rung comes first: "You are
+            // dead", where the binding, which skips TryCast, reads "Can't attack while dead."
+            // Then TryCast's effect-0x4e short-circuit runs the Attack toggle (`0x6e4c90`).
+            if ladder.dead_refusal(SPELL_ATTACK, targeting.self_store.iter().next()) {
+                return UseOutcome::Done;
             }
-            Some(b) if b.kind == ACTION_KIND_SPELL => {
-                // In `UseAction 0x4e5ee0` only: re-pressing the spell whose targeting cursor is
-                // up cancels it before `TryCast` (`GetTargetingSpellId 0x6e48e0`,
-                // `StopTargeting 0x6e4900`). A spellbook re-press aborts and re-enters.
-                if ladder.ground.spell() == Some(b.action) {
-                    debug!(
-                        "ui_action: cast {} re-pressed — targeting toggles off",
-                        b.action
-                    );
-                    ladder.ground.clear();
-                    continue;
-                }
-                // A live `ActiveIconID` spell re-pressed cancels its aura (`0x4e55f0`, cancel
-                // `0x4e60c1`). The form-match toggle is `CastSpell`'s alone, not `UseAction`'s.
-                if let Some(d) = ladder.spells.as_ref().and_then(|s| s.catalog.get(b.action)) {
-                    if let Some(store) = targeting.self_store.iter().next() {
-                        if super::toggle::active_action_toggle(b.action, d, store) {
-                            debug!("ui_action: cast {} re-pressed — aura cancels", b.action);
-                            let _ = ladder
-                                .commands
-                                .0
-                                .send(crate::net::ClientCommand::CancelAura { spell_id: b.action });
-                            continue;
-                        }
-                    }
-                }
-                debug!(
-                    "ui_action: cast {} (target {:?}{})",
-                    b.action,
-                    selection.guid,
-                    if press.on_self { ", on self" } else { "" }
-                );
-                ladder.send(
-                    b.action,
-                    &self_bound(targeting.context(), press),
-                    CastCommit::Spell,
-                );
-            }
-            // An item action names an entry, so the click finds a copy. A miss only logs, with no
-            // red error line: nothing was attempted.
-            Some(b) if b.kind == ACTION_KIND_ITEM => {
-                let Some(store) = targeting.self_store.iter().next() else {
-                    continue;
-                };
-                let template = ladder
-                    .items
-                    .template(b.action, 0, &ladder.commands)
-                    .cloned();
-                // The reference bails on a null template too; the icon resolve usually cached it.
-                let Some(template) = template else {
-                    debug!(
-                        "ui_action: item action {action} (entry {}) has no template yet — skipped",
-                        b.action
-                    );
-                    continue;
-                };
-                let route = item_action_route(&template, |s| {
-                    crate::ui_items::find_item(&store.0, &ladder.objects, b.action, s)
-                });
-                let ((bag_index, slot0, guid), equip) = match route {
-                    ItemRoute::Use(pos) => (pos, false),
-                    ItemRoute::Equip(pos) => (pos, true),
-                    ItemRoute::Nowhere => {
-                        debug!(
-                            "ui_action: item action {action} (entry {}) is nowhere in the inventory — skipped",
-                            b.action
-                        );
-                        continue;
-                    }
-                };
-                if equip {
-                    // No quest guard: the bar tests only `InventoryType` (`0x4e5fdd`), unlike
-                    // the bag click (`StartQuest`, `0x4fa3c4`), so a quest-starter equips.
-                    debug!("ui_action: item action {action} auto-equip (wire {bag_index}/{slot0})");
-                    // The shared auto-equip sender, so a BoE asks before binding, as from a bag.
-                    crate::ui_items::send_auto_equip(
-                        &mut script,
-                        &mut gate,
-                        &ladder.objects,
-                        &ladder.items,
-                        &ladder.commands,
-                        bag_index,
-                        slot0,
-                        Some(guid),
-                        false,
-                    );
-                } else {
-                    // The shared `CGItem::Use` fork (called at `0x4e607b`): a quest-starter offers
-                    // its quest, and the use runs the whole cast ladder. The wire's third byte is
-                    // the spell block ordinal, not a flag.
-                    let spell_index = template.use_spell_index().unwrap_or(0);
-                    debug!(
-                        "ui_action: item action {action} use (wire {bag_index}/{slot0}, spell #{spell_index})"
-                    );
-                    crate::ui_items::send_item_use(
-                        crate::ui_items::ItemUse {
-                            guid: Some(guid),
-                            start_quest: template.start_quest,
-                            bag_index,
-                            slot: slot0,
-                            entry: b.action,
-                            spell_index,
-                            use_spell: template.use_spell.map(|u| u.spell_id),
-                            on_object: None,
-                            is_charter: template.flags
-                                & benilla_protocol::messages::ITEM_FLAG_CHARTER
-                                != 0,
-                        },
-                        &targeting.context(),
-                        &mut ladder,
-                        &mut script,
-                        &mut gate,
-                        false,
-                        &mut ui_errors,
-                    );
-                }
-            }
-            // The macro arm (`0x4e5ee0` calls `0x4f1460`): each body line goes through the chat
-            // input, as if typed.
-            Some(b) if b.kind == ACTION_KIND_MACRO => {
-                if !crate::ui_macro::run_macro(&mut script, b.action) {
-                    debug!(
-                        "ui_action: macro action {action} (macro {}) is empty",
-                        b.action
-                    );
-                }
-            }
-            Some(b) => {
-                debug!(
-                    "ui_action: action {action} kind {:#04x} has no use path",
-                    b.kind
-                );
-            }
-            None => debug!("ui_action: UseAction({action}) on an empty slot"),
+            return UseOutcome::Attack;
         }
+        Some(b) if b.kind == ACTION_KIND_SPELL => {
+            // In `UseAction 0x4e5ee0` only: re-pressing the spell whose targeting cursor is
+            // up cancels it before `TryCast` (`GetTargetingSpellId 0x6e48e0`,
+            // `StopTargeting 0x6e4900`). A spellbook re-press aborts and re-enters.
+            if ladder.ground.spell() == Some(b.action) {
+                debug!(
+                    "ui_action: cast {} re-pressed — targeting toggles off",
+                    b.action
+                );
+                ladder.ground.clear();
+                return UseOutcome::Done;
+            }
+            // A live `ActiveIconID` spell re-pressed cancels its aura (`0x4e55f0`, cancel
+            // `0x4e60c1`). The form-match toggle is `CastSpell`'s alone, not `UseAction`'s.
+            if let Some(d) = ladder.spells.as_ref().and_then(|s| s.catalog.get(b.action)) {
+                if let Some(store) = targeting.self_store.iter().next() {
+                    if super::toggle::active_action_toggle(b.action, d, store) {
+                        debug!("ui_action: cast {} re-pressed — aura cancels", b.action);
+                        let _ = ladder
+                            .commands
+                            .0
+                            .send(crate::net::ClientCommand::CancelAura { spell_id: b.action });
+                        return UseOutcome::Done;
+                    }
+                }
+            }
+            debug!(
+                "ui_action: cast {} (target {:?}{})",
+                b.action,
+                selection.guid,
+                if press.on_self { ", on self" } else { "" }
+            );
+            ladder.send_spell(
+                b.action,
+                &targeting.context().self_bound(press.on_self),
+                press.on_self,
+            );
+        }
+        // An item action names an entry, so the click finds a copy. A miss only logs, with no
+        // red error line: nothing was attempted.
+        Some(b) if b.kind == ACTION_KIND_ITEM => {
+            let Some(store) = targeting.self_store.iter().next() else {
+                return UseOutcome::Done;
+            };
+            let template = ladder
+                .items
+                .template(b.action, 0, &ladder.commands)
+                .cloned();
+            // The reference bails on a null template too; the icon resolve usually cached it.
+            let Some(template) = template else {
+                debug!(
+                    "ui_action: item action {action} (entry {}) has no template yet — skipped",
+                    b.action
+                );
+                return UseOutcome::Done;
+            };
+            let route = item_action_route(&template, |s| {
+                crate::ui_items::find_item(&store.0, &ladder.objects, b.action, s)
+            });
+            let ((bag_index, slot0, guid), equip) = match route {
+                ItemRoute::Use(pos) => (pos, false),
+                ItemRoute::Equip(pos) => (pos, true),
+                ItemRoute::Nowhere => {
+                    debug!(
+                        "ui_action: item action {action} (entry {}) is nowhere in the inventory — skipped",
+                        b.action
+                    );
+                    return UseOutcome::Done;
+                }
+            };
+            if equip {
+                // No quest guard: the bar tests only `InventoryType` (`0x4e5fdd`), unlike
+                // the bag click (`StartQuest`, `0x4fa3c4`), so a quest-starter equips.
+                debug!("ui_action: item action {action} auto-equip (wire {bag_index}/{slot0})");
+                // The shared auto-equip sender, so a BoE asks before binding, as from a bag.
+                crate::ui_items::send_auto_equip(
+                    script,
+                    gate,
+                    &ladder.objects,
+                    &ladder.items,
+                    &ladder.commands,
+                    bag_index,
+                    slot0,
+                    Some(guid),
+                    false,
+                );
+            } else {
+                // The shared `CGItem::Use` fork (called at `0x4e607b`): a quest-starter offers
+                // its quest, and the use runs the whole cast ladder. The wire's third byte is
+                // the spell block ordinal, not a flag.
+                let spell_index = template.use_spell_index().unwrap_or(0);
+                debug!(
+                    "ui_action: item action {action} use (wire {bag_index}/{slot0}, spell #{spell_index})"
+                );
+                crate::ui_items::send_item_use(
+                    crate::ui_items::ItemUse {
+                        guid: Some(guid),
+                        start_quest: template.start_quest,
+                        bag_index,
+                        slot: slot0,
+                        entry: b.action,
+                        spell_index,
+                        use_spell: template.use_spell.map(|u| u.spell_id),
+                        on_object: None,
+                        is_charter: template.flags & benilla_protocol::messages::ITEM_FLAG_CHARTER
+                            != 0,
+                    },
+                    &targeting.context(),
+                    ladder,
+                    script,
+                    gate,
+                    false,
+                    ui_errors,
+                );
+            }
+        }
+        // The macro arm (`0x4e5ee0` calls `0x4f1460`): each body line goes through the chat
+        // input, as if typed.
+        Some(b) if b.kind == ACTION_KIND_MACRO => {
+            if !crate::ui_macro::run_macro(script, b.action) {
+                debug!(
+                    "ui_action: macro action {action} (macro {}) is empty",
+                    b.action
+                );
+            }
+        }
+        Some(b) => {
+            debug!(
+                "ui_action: action {action} kind {:#04x} has no use path",
+                b.kind
+            );
+        }
+        None => debug!("ui_action: UseAction({action}) on an empty slot"),
     }
+    UseOutcome::Done
 }
 
 /// Applies the queued `PickupAction`/`PlaceAction` writes (packed 0 clears) to the store, which
diff --git a/crates/benilla-app/src/ui_action/errors.rs b/crates/benilla-app/src/ui_action/errors.rs
index 0847a3e6..6ba6d1d1 100644
--- a/crates/benilla-app/src/ui_action/errors.rs
+++ b/crates/benilla-app/src/ui_action/errors.rs
@@ -352,7 +352,8 @@ pub(crate) fn attack_actor_blocked(
     actor: Option<&ObjectStore>,
     self_guid: Option<u64>,
 ) -> Option<&'static str> {
-    // An unresolved actor skips the chain, as in the reference (`0x4bd403`).
+    // An unresolved actor skips the chain, as in the reference (`0x4bd403`), though the pet bar's
+    // own gate (`0x4bd1f2`) never lets an unresolved pet reach it.
     let fields = &actor?.0;
     // `0x605f30` (`0x612e10`): dead, or a player's ghost flag, since a ghost has health 1.
     let key = if fields.is_dead_or_ghost() {
diff --git a/crates/benilla-app/src/ui_action/mod.rs b/crates/benilla-app/src/ui_action/mod.rs
index 5efe070d..ee7dfb27 100644
--- a/crates/benilla-app/src/ui_action/mod.rs
+++ b/crates/benilla-app/src/ui_action/mod.rs
@@ -16,6 +16,8 @@ use benilla_assets::{AssetSet, LockRecover, WorldAssets};
 
 mod cast_fail;
 mod drain;
+// A `UseAction` press, applied in call order by `crate::script_calls`.
+pub(crate) use drain::{attack_nearest_probe, use_action, ActionPress, AttackPress, UseOutcome};
 #[cfg(test)]
 mod drain_tests;
 pub(crate) mod drop_item;
@@ -31,7 +33,8 @@ mod weapon_icon;
 
 /// Every feed that pushes cooldown triples runs `.before` this set: [`state::feed_action_state`]
 /// fires the cooldown events synchronously, so a triple pushed later goes unread until the next
-/// cooldown change.
+/// cooldown change. The pet list's flush, `ui_pet::bar::fire_pet_cooldown_events`, runs `.after`
+/// it on the same rule.
 #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct CooldownEvents;
 
@@ -97,17 +100,33 @@ pub(crate) struct Spells {
 }
 
 impl Spells {
-    /// The cast time in ms (`GetCastTime 0x6e3340`), level-scaled from the `CastingTimeIndex`
-    /// row; a missing row reads 0. Spell-mod op `0xa` is not applied, so a talent-shortened cast
-    /// shows its base length.
+    /// The cast time in ms as `GetCastTime 0x6e3340` returns it for argument 1, the tooltip's
+    /// (`52eb4b`): the level-scaled `CastingTimeIndex` row, then spell-mod op 10 (`0x6e33b7`),
+    /// with no clamp, so row 18's negative time survives. A missing row returns 0 before the
+    /// modifier (`0x6e338a`). The cast-speed multiply (`0x6e3422`) is not applied.
+    pub(crate) fn cast_time_unclamped_ms(
+        &self,
+        def: &benilla_formats::SpellDisplay,
+        caster_level: u32,
+        mods: &crate::spell::SpellModifiers,
+    ) -> i32 {
+        self.cast_times
+            .get(def.casting_time_index)
+            .map_or(0, |row| {
+                let resolved = row.resolved_ms(caster_level, def.base_level);
+                mods.apply(def, crate::spell::OP_CAST_TIME, resolved)
+            })
+    }
+
+    /// [`Self::cast_time_unclamped_ms`] for argument 0, the cast validator's (`0x609e16`): a
+    /// result at or below zero reads 0 (`0x6e3461`-`0x6e3470`).
     pub(crate) fn cast_time_ms(
         &self,
         def: &benilla_formats::SpellDisplay,
         caster_level: u32,
+        mods: &crate::spell::SpellModifiers,
     ) -> u32 {
-        self.cast_times
-            .get(def.casting_time_index)
-            .map_or(0, |row| row.resolved_ms(caster_level, def.base_level))
+        self.cast_time_unclamped_ms(def, caster_level, mods).max(0) as u32
     }
 }
 
@@ -240,9 +259,6 @@ impl Plugin for UiActionPlugin {
                         .in_set(CooldownEvents)
                         .after(feed::feed_actions),
                     drain::drain_action_sets.after(UiInput),
-                    drain::drain_action_uses.after(UiInput),
-                    // The ATTACKTARGET binding, after the dispatch wrote this frame's key fires.
-                    drain::attack_target_binding.after(UiInput),
                     // The target chain queues the openers earlier in the frame.
                     drain::drain_go_openers.after(UiInput),
                     // The latches must be current before the target chain's cursor reads them.
diff --git a/crates/benilla-app/src/ui_action/state.rs b/crates/benilla-app/src/ui_action/state.rs
index 283703d1..9ede17f4 100644
--- a/crates/benilla-app/src/ui_action/state.rs
+++ b/crates/benilla-app/src/ui_action/state.rs
@@ -12,6 +12,7 @@ use std::time::Instant;
 
 use bevy::prelude::*;
 
+use benilla_formats::RangeTargets;
 use benilla_protocol::messages::{ACTION_KIND_ITEM, ACTION_KIND_MACRO, ACTION_KIND_SPELL};
 use benilla_ui::script::{ActionState, UiScript};
 
@@ -76,7 +77,8 @@ pub(super) fn feed_action_state(
     mut cooldowns: ResMut<Cooldowns>,
     clock: Res<crate::ui_script::UiClock>,
     auto_repeat: Res<AutoRepeatActive>,
-    // One tuple for Bevy's 16-param ceiling: cast tracking, macro bindings and spell mods.
+    // One tuple for Bevy's 16-param ceiling: cast tracking, macro bindings, spell mods and the
+    // range units.
     cast_state: (
         Res<crate::spell::PendingCast>,
         Res<crate::spell::QueuedMeleeSpell>,
@@ -84,6 +86,8 @@ pub(super) fn feed_action_state(
         Res<crate::spell::SpellTargeting>,
         Res<crate::ui_macro::MacroBoundSpells>,
         Res<crate::spell::SpellModifiers>,
+        // The caster's and the target's reach and motion, which the range compare reads.
+        crate::spell::RangeUnits,
     ),
     self_q: Query<(&ObjectStore, &Transform, Has<Engaged>, Option<&Casting>), With<SelfPlayer>>,
     selection: Res<Selection>,
@@ -116,7 +120,7 @@ pub(super) fn feed_action_state(
         memory.last_cd_trace = Some(now);
     }
 
-    let (pending, queued_melee, channel, targeting, bound, spell_mods) = &cast_state;
+    let (pending, queued_melee, channel, targeting, bound, spell_mods, range_units) = &cast_state;
     let me = self_q.iter().next();
     // The bags, walked once per frame for every reagent, totem and item count below.
     let carried = me
@@ -128,14 +132,15 @@ pub(super) fn feed_action_state(
         .unwrap_or(0);
     let casting_spell = me.and_then(|(_, _, _, c)| c.map(|c| c.spell_id));
     let current_cast = pending.current(now).or(casting_spell);
-    let self_reach = me.map_or(1.5, |(s, _, _, _)| s.0.unit_combat_reach());
+    let caster = range_units.caster();
     let self_pos = me.map(|(_, t, _, _)| t.translation);
-    // The target's reach and squared distance (the reference tests dx²+dy²+dz², `0x6e47b0`).
-    let target = selection
-        .guid
-        .and_then(|g| objects.entity(g))
-        .and_then(|e| units.get(e).ok());
-    let target_reach = target.map(|(s, _)| s.0.unit_combat_reach());
+    // The target's reach, motion and squared distance (the reference tests dx²+dy²+dz²,
+    // `0x6e47b0`).
+    let target_entity = selection.guid.and_then(|g| objects.entity(g));
+    let target = target_entity.and_then(|e| units.get(e).ok());
+    let target_unit = target_entity
+        .filter(|_| target.is_some())
+        .and_then(|e| range_units.unit(e));
     let dist_sq = match (self_pos, target) {
         (Some(a), Some((_, t))) => Some(a.distance_squared(t.translation)),
         _ => None,
@@ -213,14 +218,26 @@ pub(super) fn feed_action_state(
                 } else {
                     st.usable = true;
                 }
-                // The range verdict against the target (`0x4e56f0`); nil without one.
                 let row = spells.as_ref().and_then(|s| s.ranges.get(d.range_index));
-                let resolved = benilla_formats::min_max_range(d, row, self_reach, target_reach);
-                st.has_range = resolved
+                // `ActionHasRange 0x4e5810` asks `GetMinMaxRange` with a null target (`0x4e5852`)
+                // and tests `|min|` and `|max|` against `FLT_EPSILON`. The auto-attack target the
+                // melee arm falls back to cannot move that: its max is at least the 5.0 floor.
+                st.has_range = spell_mods
+                    .min_max_range(d, row, caster, RangeTargets::default())
                     .is_some_and(|(min, max)| min.abs() > f32::EPSILON || max.abs() > f32::EPSILON);
-                st.in_range = match (resolved, dist_sq) {
-                    (Some((min, max)), Some(d2)) if st.has_range => {
-                        Some(d2 >= min * min && d2 <= max * max)
+                // `IsActionInRange 0x4e56f0` runs `CanTargetUnit 0x6e4440`, which binds the selected
+                // target, then `IsTargetInRange 0x6e47b0`, which hands `GetMinMaxRange` that target
+                // (`0x6e47ca`): its reach pads a ranged row, and its motion with the caster's earns
+                // the moving bonus. Nil without a target.
+                st.in_range = match dist_sq {
+                    Some(d2) if st.has_range => {
+                        let targets = RangeTargets {
+                            target: target_unit,
+                            attack_target: None,
+                        };
+                        spell_mods
+                            .min_max_range(d, row, caster, targets)
+                            .map(|(min, max)| d2 >= min * min && d2 <= max * max)
                     }
                     _ => None,
                 };
@@ -445,6 +462,7 @@ mod tests {
             .init_resource::<crate::spell::QueuedMeleeSpell>()
             .init_resource::<crate::spell::ActiveChannel>()
             .init_resource::<crate::spell::SpellTargeting>()
+            .init_resource::<crate::spell::HeldForPick>()
             .init_resource::<Selection>()
             .init_resource::<crate::net::GuidIndex>()
             .init_resource::<crate::net::Reputations>()
@@ -476,6 +494,252 @@ mod tests {
         );
     }
 
+    /// `IsActionInRange` (`0x4e56f0`) hands `GetMinMaxRange` the selected unit, so a ranged row
+    /// pads by that unit's reach and the player's alone: a Fireball (0-35) button reads in range
+    /// out to 38 yards from a 1.5-reach target, whoever the player swings at, and `ActionHasRange`
+    /// (`0x4e5810`, a null target) says the button has a range.
+    #[test]
+    fn a_ranged_button_pads_its_range_by_the_selected_target_alone() {
+        use benilla_protocol::messages::ActionButton;
+        use benilla_protocol::ObjectFields;
+
+        const FIREBALL: u32 = 133;
+        const SWUNG_AT: u64 = 0xA1;
+        const SELECTED: u64 = 0xB2;
+        /// `UNIT_FIELD_COMBATREACH`.
+        const REACH: u16 = 130;
+
+        let verdict = |distance: f32| {
+            let (tx, _rx) = crossbeam_channel::unbounded();
+            let mut app = App::new();
+            let mut actions = PlayerActions::default();
+            actions.buttons.insert(
+                0,
+                ActionButton {
+                    slot: 0,
+                    action: FIREBALL,
+                    kind: ACTION_KIND_SPELL,
+                },
+            );
+            let fireball = SpellDisplay {
+                range_index: 4,
+                ..Default::default()
+            };
+            let row = benilla_formats::SpellRange {
+                min: 0.0,
+                max: 35.0,
+                flags: 0,
+            };
+            app.insert_resource(actions)
+                .insert_resource(crate::ui_macro::MacroBoundSpells::default())
+                .insert_resource(Spells {
+                    catalog: benilla_formats::SpellCatalog::from_displays(
+                        [(FIREBALL, fireball)].into_iter().collect(),
+                    ),
+                    forms: Default::default(),
+                    ranges: benilla_formats::SpellRangeCatalog::from_rows(
+                        [(4, row)].into_iter().collect(),
+                    ),
+                    cast_times: Default::default(),
+                    durations: Default::default(),
+                    radii: Default::default(),
+                })
+                .init_resource::<Cooldowns>()
+                .init_resource::<crate::spell::SpellModifiers>()
+                .init_resource::<crate::ui_script::UiClock>()
+                .init_resource::<AutoRepeatActive>()
+                .init_resource::<crate::spell::PendingCast>()
+                .init_resource::<crate::spell::QueuedMeleeSpell>()
+                .init_resource::<crate::spell::ActiveChannel>()
+                .init_resource::<crate::spell::SpellTargeting>()
+                .init_resource::<crate::spell::HeldForPick>()
+                .init_resource::<crate::net::GuidIndex>()
+                .init_resource::<crate::net::Reputations>()
+                .init_resource::<Items>()
+                .insert_resource(NetCommands(tx));
+            // The player swings at a 4.0-reach unit, close by.
+            let swung_at = app
+                .world_mut()
+                .spawn((
+                    Transform::from_xyz(2.0, 0.0, 0.0),
+                    ObjectStore(ObjectFields::from_pairs(&[
+                        (22, 100),
+                        (REACH, 4.0f32.to_bits()),
+                    ])),
+                ))
+                .id();
+            app.world_mut().spawn((
+                SelfPlayer,
+                Engaged(SWUNG_AT),
+                Transform::default(),
+                ObjectStore(ObjectFields::from_pairs(&[(22, 100), (23, 500)])),
+            ));
+            // The selected unit keeps the descriptor's default 1.5 reach.
+            let selected = app
+                .world_mut()
+                .spawn((
+                    Transform::from_xyz(distance, 0.0, 0.0),
+                    ObjectStore(ObjectFields::from_pairs(&[(22, 100)])),
+                ))
+                .id();
+            let mut index = app.world_mut().resource_mut::<crate::net::GuidIndex>();
+            index.0.insert(SWUNG_AT, swung_at);
+            index.0.insert(SELECTED, selected);
+            app.insert_resource(Selection {
+                target: Some(selected),
+                guid: Some(SELECTED),
+                last: None,
+            });
+            app.insert_non_send_resource(UiScript::new().unwrap());
+            app.add_systems(Update, feed_action_state);
+            app.update();
+            let script = app.world().non_send_resource::<UiScript>();
+            assert!(script
+                .eval::<bool>("return ActionHasRange(1) == 1")
+                .unwrap());
+            script
+                .eval::<i64>("return IsActionInRange(1) or -1")
+                .unwrap()
+        };
+
+        // 35 + the caster's 1.5 + the selected unit's 1.5 = 38.
+        assert_eq!(verdict(37.5), 1, "inside the padded max");
+        assert_eq!(
+            verdict(38.5),
+            0,
+            "past it: the swing's 4.0 reach pads nothing"
+        );
+    }
+
+    /// `IsActionInRange` hands `GetMinMaxRange` the selected unit, so a melee button reads in
+    /// range out to 7.667 yards while the player and the selected mob both run, and to the 5.0
+    /// floor otherwise (`0x6e3648`-`0x6e36a2`).
+    #[test]
+    fn a_melee_button_reaches_the_moving_bonus_while_both_units_run() {
+        use benilla_protocol::messages::ActionButton;
+        use benilla_protocol::ObjectFields;
+
+        const HAMSTRING: u32 = 1715;
+        const SELECTED: u64 = 0xB2;
+
+        let verdict = |caster_runs: bool, mob_runs: bool, distance: f32| {
+            let (tx, _rx) = crossbeam_channel::unbounded();
+            let mut app = App::new();
+            let mut actions = PlayerActions::default();
+            actions.buttons.insert(
+                0,
+                ActionButton {
+                    slot: 0,
+                    action: HAMSTRING,
+                    kind: ACTION_KIND_SPELL,
+                },
+            );
+            let melee = benilla_formats::SpellRange {
+                min: 0.0,
+                max: 5.0,
+                flags: 1,
+            };
+            app.insert_resource(actions)
+                .insert_resource(crate::ui_macro::MacroBoundSpells::default())
+                .insert_resource(Spells {
+                    catalog: benilla_formats::SpellCatalog::from_displays(
+                        [(
+                            HAMSTRING,
+                            SpellDisplay {
+                                range_index: 2,
+                                ..Default::default()
+                            },
+                        )]
+                        .into_iter()
+                        .collect(),
+                    ),
+                    forms: Default::default(),
+                    ranges: benilla_formats::SpellRangeCatalog::from_rows(
+                        [(2, melee)].into_iter().collect(),
+                    ),
+                    cast_times: Default::default(),
+                    durations: Default::default(),
+                    radii: Default::default(),
+                })
+                .init_resource::<Cooldowns>()
+                .init_resource::<crate::spell::SpellModifiers>()
+                .init_resource::<crate::ui_script::UiClock>()
+                .init_resource::<AutoRepeatActive>()
+                .init_resource::<crate::spell::PendingCast>()
+                .init_resource::<crate::spell::QueuedMeleeSpell>()
+                .init_resource::<crate::spell::ActiveChannel>()
+                .init_resource::<crate::spell::SpellTargeting>()
+                .init_resource::<crate::spell::HeldForPick>()
+                .init_resource::<crate::net::GuidIndex>()
+                .init_resource::<crate::net::Reputations>()
+                .init_resource::<Items>()
+                .insert_resource(crate::player::Player::with_move_flags(if caster_runs {
+                    crate::creature_anim::move_flags::FORWARD
+                } else {
+                    0
+                }))
+                .insert_resource(NetCommands(tx));
+            let speeds = crate::net::UnitSpeeds(benilla_protocol::MoveSpeeds {
+                walk: 2.5,
+                run: 7.0,
+                run_back: 4.5,
+                swim: 4.7,
+                swim_back: 2.5,
+                turn_rate: 3.1,
+            });
+            app.world_mut().spawn((
+                SelfPlayer,
+                crate::net::Embodied,
+                speeds,
+                Transform::default(),
+                ObjectStore(ObjectFields::from_pairs(&[(22, 100), (23, 500)])),
+            ));
+            // A mob at the descriptor's default 1.5 reach; a live spline at 8 yd/s is its run.
+            let mob = app
+                .world_mut()
+                .spawn((
+                    speeds,
+                    Transform::from_xyz(distance, 0.0, 0.0),
+                    ObjectStore(ObjectFields::from_pairs(&[(22, 100)])),
+                ))
+                .id();
+            if mob_runs {
+                app.world_mut().entity_mut(mob).insert(crate::net::Spline {
+                    points: vec![[distance, 0.0, 0.0], [distance + 16.0, 0.0, 0.0]],
+                    start: Instant::now(),
+                    duration: std::time::Duration::from_secs(2),
+                    id: 1,
+                    grounded: true,
+                    run_mode: true,
+                    deck: None,
+                });
+            }
+            app.world_mut()
+                .resource_mut::<crate::net::GuidIndex>()
+                .0
+                .insert(SELECTED, mob);
+            app.insert_resource(Selection {
+                target: Some(mob),
+                guid: Some(SELECTED),
+                last: None,
+            });
+            app.insert_non_send_resource(UiScript::new().unwrap());
+            app.add_systems(Update, feed_action_state);
+            app.update();
+            let script = app.world().non_send_resource::<UiScript>();
+            script
+                .eval::<i64>("return IsActionInRange(1) or -1")
+                .unwrap()
+        };
+
+        // 1.5 + 1.5 + 1.3333 is under the 5.0 floor; the bonus goes on the floor: 7.667.
+        assert_eq!(verdict(true, true, 7.5), 1, "both running: inside 7.667");
+        assert_eq!(verdict(true, true, 8.0), 0, "past it");
+        assert_eq!(verdict(false, true, 7.5), 0, "the player stands");
+        assert_eq!(verdict(true, false, 7.5), 0, "the mob stands");
+        assert_eq!(verdict(false, false, 4.9), 1, "the floor");
+    }
+
     /// An item slot's on-use spell takes the `0x6e3d60` walk (`0x4e5050`), and every shipped
     /// Food/Drink spell has `Attributes` bit 28, `ATTR_NOT_IN_COMBAT` (the walk's leg 8).
     #[test]
@@ -539,6 +803,7 @@ mod tests {
                 .init_resource::<crate::spell::QueuedMeleeSpell>()
                 .init_resource::<crate::spell::ActiveChannel>()
                 .init_resource::<crate::spell::SpellTargeting>()
+                .init_resource::<crate::spell::HeldForPick>()
                 .init_resource::<Selection>()
                 .init_resource::<crate::net::GuidIndex>()
                 .init_resource::<crate::net::Reputations>()
diff --git a/crates/benilla-app/src/ui_auction/mod.rs b/crates/benilla-app/src/ui_auction/mod.rs
index 388e2609..49c4e440 100644
--- a/crates/benilla-app/src/ui_auction/mod.rs
+++ b/crates/benilla-app/src/ui_auction/mod.rs
@@ -11,8 +11,8 @@ use bevy::prelude::*;
 
 use benilla_protocol::messages::{auction_filter, AuctionListEntry};
 use benilla_ui::script::{
-    AuctionCategory, AuctionItemRow, AuctionListState, AuctionState, AuctionSubCategory, UiScript,
-    BIDDER, LIST, OWNER,
+    AuctionCategory, AuctionHighBidder, AuctionItemRow, AuctionListState, AuctionState,
+    AuctionSubCategory, UiScript, BIDDER, LIST, OWNER,
 };
 
 use crate::entities::ItemDisplays;
@@ -87,8 +87,10 @@ pub(crate) struct AuctionRow {
     pub(crate) current_bid: u32,
     /// The time-left bucket, `1..=4`.
     pub(crate) time_left: u32,
-    /// Whether the player holds the high bid.
-    pub(crate) high_bidder: bool,
+    /// Whether the player holds the high bid; the status sort's key.
+    pub(crate) player_holds_bid: bool,
+    /// `GetAuctionItemInfo`'s eleventh value, per [`high_bidder`].
+    pub(crate) high_bidder: AuctionHighBidder,
     pub(crate) owner: Option<String>,
     pub(crate) link: Option<String>,
 }
@@ -301,9 +303,41 @@ fn time_left_bucket(ms: u32) -> u32 {
     }
 }
 
-/// One wire entry as a display row, through the ask-once template and name caches; a `None`
-/// fills in when its answer lands. The link carries the row's enchant, property and suffix.
+/// `GetAuctionItemInfo`'s `highBidder` for a row of `list` (`0x4cf12a`–`0x4cf1a0`). On an
+/// `"owner"` row the player owns (`0x4cf131`–`0x4cf142` compare its owner guid with the player's),
+/// the bidder guid (vmangos `AuctionHouseMgr.cpp:840`) goes through the name cache: nil with no
+/// bid (`0x4cf150`) or until the asked name lands (`0x4cf16e`), whose arrival re-fires the owned
+/// list's update (`0x4cf2b0`), here the feed's diff. Any other row: `1` if the player holds the
+/// bid, else nil (`0x4cf17b`–`0x4cf1a0`).
+fn high_bidder(
+    list: usize,
+    entry: &AuctionListEntry,
+    self_guid: Option<u64>,
+    names: &NameCache,
+    commands: &NetCommands,
+) -> AuctionHighBidder {
+    let owned = list == OWNER && self_guid.is_some_and(|g| g == entry.owner_guid);
+    if owned {
+        if entry.bidder_guid == 0 {
+            return AuctionHighBidder::Nil;
+        }
+        return names
+            .resolve(entry.bidder_guid, commands)
+            .map_or(AuctionHighBidder::Nil, |n| {
+                AuctionHighBidder::Name(n.to_string())
+            });
+    }
+    if self_guid.is_some_and(|g| g == entry.bidder_guid) {
+        AuctionHighBidder::Player
+    } else {
+        AuctionHighBidder::Nil
+    }
+}
+
+/// One wire entry of `list` as a display row, through the ask-once template and name caches; a
+/// `None` fills in when its answer lands. The link carries the row's enchant, property and suffix.
 fn resolve_row(
+    list: usize,
     entry: &AuctionListEntry,
     self_guid: Option<u64>,
     items: &Items,
@@ -343,7 +377,8 @@ fn resolve_row(
         buyout: entry.buyout,
         current_bid: entry.current_bid,
         time_left: time_left_bucket(entry.time_left_ms),
-        high_bidder: self_guid.is_some_and(|g| g == entry.bidder_guid),
+        player_holds_bid: self_guid.is_some_and(|g| g == entry.bidder_guid),
+        high_bidder: high_bidder(list, entry, self_guid, names, commands),
         owner: names
             .resolve(entry.owner_guid, commands)
             .map(str::to_string),
@@ -390,7 +425,9 @@ pub(crate) fn categories(
         .collect()
 }
 
+/// List `list`'s rows in display order.
 fn rows_for(
+    list: usize,
     slot: &AuctionListSlot,
     self_guid: Option<u64>,
     items: &Items,
@@ -402,7 +439,7 @@ fn rows_for(
     let mut rows: Vec<AuctionRow> = slot
         .entries
         .iter()
-        .map(|e| resolve_row(e, self_guid, items, icons, names, commands, rolls))
+        .map(|e| resolve_row(list, e, self_guid, items, icons, names, commands, rolls))
         .collect();
     slot.sort.apply(&mut rows);
     rows
@@ -422,7 +459,7 @@ fn to_script_row(r: &AuctionRow) -> AuctionItemRow {
         min_increment: r.min_increment,
         buyout_price: r.buyout,
         bid_amount: r.current_bid,
-        high_bidder: r.high_bidder,
+        high_bidder: r.high_bidder.clone(),
         owner: r.owner.clone(),
         time_left: r.time_left,
         link: r.link.clone(),
@@ -512,6 +549,7 @@ fn feed_auction(
         let lists = [LIST, BIDDER, OWNER].map(|i| {
             let slot = &auction.lists[i];
             let rows = rows_for(
+                i,
                 slot,
                 self_guid,
                 &items,
@@ -685,6 +723,7 @@ fn drain_auction(
     if !bids.is_empty() || !cancels.is_empty() {
         for bid in bids {
             let rows = rows_for(
+                bid.list,
                 &auction.lists[bid.list],
                 self_guid,
                 &items,
@@ -703,6 +742,7 @@ fn drain_auction(
         }
         for index in cancels {
             let rows = rows_for(
+                OWNER,
                 &auction.lists[OWNER],
                 self_guid,
                 &items,
@@ -900,6 +940,203 @@ mod tests {
         assert!(!open.sell_slot_taken);
     }
 
+    const ME: u64 = 0x77;
+    const BIDDER_GUID: u64 = 0x99;
+
+    /// A wire row owned by `owner` with `bidder` on it (0 for no bid).
+    fn entry(owner: u64, bidder: u64) -> AuctionListEntry {
+        AuctionListEntry {
+            auction_id: 1,
+            item_entry: 2589,
+            perm_enchant: 0,
+            random_property_id: 0,
+            suffix_factor: 0,
+            count: 1,
+            spell_charges: 0,
+            owner_guid: owner,
+            start_bid: 1000,
+            min_increment: if bidder == 0 { 0 } else { 125 },
+            buyout: 0,
+            time_left_ms: 60_000,
+            bidder_guid: bidder,
+            current_bid: if bidder == 0 { 0 } else { 2500 },
+        }
+    }
+
+    fn name_queries(rx: &crossbeam_channel::Receiver<ClientCommand>) -> Vec<u64> {
+        rx.try_iter()
+            .filter_map(|c| match c {
+                ClientCommand::NameQuery { guid } => Some(guid),
+                _ => None,
+            })
+            .collect()
+    }
+
+    /// The player's own auction names its bidder from the cache (`0x4cf144`–`0x4cf174`).
+    #[test]
+    fn an_owned_row_names_its_bidder() {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let commands = NetCommands(tx);
+        let mut names = NameCache::default();
+        names.insert_player(BIDDER_GUID, "Bidder".into(), None);
+        assert_eq!(
+            high_bidder(OWNER, &entry(ME, BIDDER_GUID), Some(ME), &names, &commands),
+            AuctionHighBidder::Name("Bidder".into())
+        );
+        assert!(name_queries(&rx).is_empty(), "a cached name asks nothing");
+    }
+
+    /// An unknown bidder is nil and asked for; no bid is nil and asks nothing (`0x4cf150`).
+    #[test]
+    fn an_owned_row_is_nil_until_the_name_lands_and_with_no_bid() {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let commands = NetCommands(tx);
+        let mut names = NameCache::default();
+        assert_eq!(
+            high_bidder(OWNER, &entry(ME, BIDDER_GUID), Some(ME), &names, &commands),
+            AuctionHighBidder::Nil
+        );
+        assert_eq!(
+            name_queries(&rx),
+            vec![BIDDER_GUID],
+            "the name goes out once"
+        );
+
+        assert_eq!(
+            high_bidder(OWNER, &entry(ME, 0), Some(ME), &names, &commands),
+            AuctionHighBidder::Nil
+        );
+        assert!(name_queries(&rx).is_empty(), "no bidder, no query");
+
+        names.insert_player(BIDDER_GUID, "Bidder".into(), None);
+        assert_eq!(
+            high_bidder(OWNER, &entry(ME, BIDDER_GUID), Some(ME), &names, &commands),
+            AuctionHighBidder::Name("Bidder".into())
+        );
+    }
+
+    /// Browse, Bids and an owner row the player does not own answer `1` or nil, never a name,
+    /// even with the bidder's name cached (`0x4cf17b`–`0x4cf1a0`).
+    #[test]
+    fn other_rows_answer_one_or_nil() {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let commands = NetCommands(tx);
+        let mut names = NameCache::default();
+        names.insert_player(BIDDER_GUID, "Bidder".into(), None);
+        const SELLER: u64 = 0x55;
+        for list in [LIST, BIDDER] {
+            assert_eq!(
+                high_bidder(list, &entry(SELLER, ME), Some(ME), &names, &commands),
+                AuctionHighBidder::Player
+            );
+            assert_eq!(
+                high_bidder(
+                    list,
+                    &entry(SELLER, BIDDER_GUID),
+                    Some(ME),
+                    &names,
+                    &commands
+                ),
+                AuctionHighBidder::Nil
+            );
+            assert_eq!(
+                high_bidder(list, &entry(SELLER, 0), Some(ME), &names, &commands),
+                AuctionHighBidder::Nil
+            );
+            // The player's own auction, seen on a browse page, is not named either.
+            assert_eq!(
+                high_bidder(list, &entry(ME, BIDDER_GUID), Some(ME), &names, &commands),
+                AuctionHighBidder::Nil
+            );
+        }
+        // The owner list gates on the row's owner, not the list alone (`0x4cf131`).
+        assert_eq!(
+            high_bidder(OWNER, &entry(SELLER, ME), Some(ME), &names, &commands),
+            AuctionHighBidder::Player
+        );
+        assert_eq!(
+            high_bidder(
+                OWNER,
+                &entry(SELLER, BIDDER_GUID),
+                Some(ME),
+                &names,
+                &commands
+            ),
+            AuctionHighBidder::Nil
+        );
+        assert!(name_queries(&rx).is_empty());
+    }
+
+    /// A bidder's name landing after the owned list re-fires `AUCTION_OWNED_LIST_UPDATE` and the
+    /// row then answers it (the `0x4cf2b0` callback fires event `0x1a9`).
+    #[test]
+    fn a_landed_bidder_name_refires_the_owned_list() {
+        let mut app = App::new();
+        app.init_resource::<AuctionOpen>()
+            .init_resource::<Items>()
+            .init_resource::<NameCache>()
+            .init_resource::<Time>()
+            .init_resource::<crate::ui_chat::ChatLog>()
+            .init_resource::<crate::sound::MessageSounds>();
+        let (tx, rx) = crossbeam_channel::unbounded();
+        app.insert_resource(NetCommands(tx));
+        app.world_mut()
+            .resource_mut::<NameCache>()
+            .insert_player(ME, "Seller".into(), None);
+        let script = UiScript::new().unwrap();
+        script
+            .run(
+                r#"
+                SEEN = {}
+                local f = CreateFrame("Frame")
+                f:RegisterEvent("AUCTION_OWNED_LIST_UPDATE")
+                f:SetScript("OnEvent", function() table.insert(SEEN, event) end)
+            "#,
+            )
+            .unwrap();
+        app.insert_non_send_resource(script);
+        app.world_mut().spawn((SelfPlayer, crate::net::Guid(ME)));
+        {
+            let mut open = app.world_mut().resource_mut::<AuctionOpen>();
+            open.open(0x1234, 1);
+            open.set_list(OWNER, vec![entry(ME, BIDDER_GUID)], 1);
+        }
+
+        // One registered system, so its `VmMemo` locals persist from frame to frame.
+        let feed = app.world_mut().register_system(feed_auction);
+        let step = |app: &mut App| -> (Vec<String>, Option<String>) {
+            app.world_mut().run_system(feed).unwrap();
+            let mut s = app.world_mut().non_send_resource_mut::<UiScript>();
+            s.resolve();
+            let seen = s.eval::<Vec<String>>("return SEEN").unwrap();
+            s.run("SEEN = {}").unwrap();
+            let bidder = s
+                .eval::<Option<String>>(
+                    r#"local _,_,_,_,_,_,_,_,_,_,h = GetAuctionItemInfo("owner", 1) return h"#,
+                )
+                .unwrap();
+            (seen, bidder)
+        };
+
+        // The window opens with the page; the bidder is unknown, so nil and asked for.
+        let (_, bidder) = step(&mut app);
+        assert_eq!(bidder, None);
+        assert_eq!(name_queries(&rx), vec![BIDDER_GUID]);
+
+        let (seen, bidder) = step(&mut app);
+        assert!(seen.is_empty(), "nothing new, nothing fired: {seen:?}");
+        assert_eq!(bidder, None);
+
+        app.world_mut().resource_mut::<NameCache>().insert_player(
+            BIDDER_GUID,
+            "Bidder".into(),
+            None,
+        );
+        let (seen, bidder) = step(&mut app);
+        assert_eq!(bidder.as_deref(), Some("Bidder"));
+        assert_eq!(seen, vec!["AUCTION_OWNED_LIST_UPDATE".to_string()]);
+    }
+
     #[test]
     fn an_unbid_row_shows_its_opening_price() {
         let unbid = AuctionRow {
diff --git a/crates/benilla-app/src/ui_auction/sort.rs b/crates/benilla-app/src/ui_auction/sort.rs
index c6651699..d95ab8b3 100644
--- a/crates/benilla-app/src/ui_auction/sort.rs
+++ b/crates/benilla-app/src/ui_auction/sort.rs
@@ -69,7 +69,7 @@ fn compare_by(key: &str, a: &AuctionRow, b: &AuctionRow) -> Ordering {
         // Highest first, which also sinks a 0 (no buyout) to the bottom.
         "buyout" => b.buyout.cmp(&a.buyout),
         // Our own bids first; the reference also ranks another bidder's above no bid.
-        "status" => b.high_bidder.cmp(&a.high_bidder),
+        "status" => b.player_holds_bid.cmp(&a.player_holds_bid),
         "name" => name_of(a).cmp(name_of(b)),
         "seller" => owner_of(a).cmp(owner_of(b)),
         _ => Ordering::Equal,
@@ -179,13 +179,13 @@ mod tests {
         let mut rows = vec![
             AuctionRow {
                 quality: Some(1),
-                high_bidder: false,
+                player_holds_bid: false,
                 name: Some("Common".into()),
                 ..Default::default()
             },
             AuctionRow {
                 quality: Some(4),
-                high_bidder: true,
+                player_holds_bid: true,
                 name: Some("Epic".into()),
                 ..Default::default()
             },
diff --git a/crates/benilla-app/src/ui_aura.rs b/crates/benilla-app/src/ui_aura.rs
index d24d58be..199c7b2c 100644
--- a/crates/benilla-app/src/ui_aura.rs
+++ b/crates/benilla-app/src/ui_aura.rs
@@ -1,7 +1,11 @@
-//! The aura feed: the `UNIT_FIELD_AURA` blocks of the player, the target, the target's target and
-//! the pet as the ordered [`AuraState`] lists the aura bindings read, with the player's durations.
-//! The player's list keeps the reference cache's insertion order (`0xbc6040`, repacked by
-//! `PlayerAuras_Update 0x4e4170`); any other unit's reads its descriptor by ascending slot.
+//! The aura feed: the `UNIT_FIELD_AURA` blocks of the player and of every unit a token can name as
+//! the ordered [`AuraState`] lists the aura bindings read, with the player's durations, and the
+//! unit-token resolver's inputs the bindings reach them through ([`units`]). The player's list
+//! keeps the reference cache's insertion order (`0xbc6040`, repacked by `PlayerAuras_Update
+//! 0x4e4170`); any other unit's reads its descriptor by ascending slot, or, for a group member or
+//! pet with no live object, its roster record.
+
+mod units;
 
 use std::collections::HashMap;
 
@@ -75,19 +79,12 @@ pub(crate) struct PlayerAuraCache {
     auras: Vec<CachedAura>,
 }
 
-impl PlayerAuraCache {
-    /// The live aura spell ids, pre-fed to `ui_tooltip` for a buff-bar hover's `SetPlayerBuff`.
-    pub(crate) fn spell_ids(&self) -> impl Iterator<Item = u32> + '_ {
-        self.auras.iter().map(|a| a.spell_id)
-    }
-}
-
 /// [`feed_auras`] fires `PLAYER_AURAS_CHANGED` and `UNIT_AURA` inline, so a feed whose state their
 /// handlers re-read (the stance feed) runs `.before(AuraEvents)` or they read last frame's.
 #[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
 pub(crate) struct AuraEvents;
 
-/// Adds the aura feed and the `CancelUnitBuff` drain.
+/// Adds the aura feed and the `CancelPlayerBuff`/`CancelTrackingBuff` drain.
 pub(crate) struct UiAuraPlugin;
 
 impl Plugin for UiAuraPlugin {
@@ -154,11 +151,8 @@ struct AuraFeedMemo {
     last: Vec<AuraProjection>,
     /// The tracking spell: a tracking switch changes no list, but the minimap needs the event.
     tracking_last: Option<u32>,
-    /// The target's guid and projection: the guid makes a switch between equal lists re-fire.
-    /// The pet's and the target's target's are keyed the same way.
-    target_last: Option<(u64, Vec<AuraProjection>)>,
-    pet_last: Option<(u64, Vec<AuraProjection>)>,
-    tot_last: Option<(u64, Vec<AuraProjection>)>,
+    /// Every other unit's list, by guid, the resolver's inputs and their pushes.
+    units: units::UnitAuras,
 }
 
 /// The `BENILLA_AURA_TRACE` period in seconds; a set value that is not a positive number means 1 s.
@@ -225,42 +219,75 @@ fn projection_of(list: &[AuraState]) -> Vec<AuraProjection> {
         .collect()
 }
 
+/// One aura as `UnitBuff 0x519500` and `UnitDebuff 0x5198f0` return it for a unit not the player:
+/// no duration, which the 1.12 wire carries for the player alone.
+fn unit_aura_state(
+    catalog: Option<&SpellCatalog>,
+    slot: u8,
+    spell_id: u32,
+    count: u8,
+    flags: u8,
+) -> AuraState {
+    let display = catalog.and_then(|cat| cat.get(spell_id));
+    AuraState {
+        spell_id,
+        name: display.map(|d| d.name.clone()),
+        icon: display.and_then(|d| d.icon.clone()),
+        count,
+        debuff_type: display
+            .zip(catalog)
+            .and_then(|(d, cat)| cat.dispel_name(d))
+            .map(str::to_string),
+        duration: 0.0,
+        expiration_time: 0.0,
+        helpful: slot < UNIT_AURA_POSITIVE_SLOTS,
+        cancelable: flags & AURA_FLAG_CANCELABLE != 0,
+        // `untilCancelled` is the player cache record's alone (`0xbc6040` `+0xc`).
+        until_cancelled: false,
+        channeled: display.is_some_and(|d| d.attributes_ex & SPELL_ATTR_EX_IS_CHANNELED != 0),
+    }
+}
+
+/// What one aura of a unit not the player is listed from: its slot, spell, stack count and
+/// `AURAFLAGS` nibble. A list is a pure function of these and the spell catalog.
+type AuraInput = (u8, u32, u8, u8);
+
+/// The list [`AuraInput`]s make.
+fn aura_list(catalog: Option<&SpellCatalog>, inputs: &[AuraInput]) -> Vec<AuraState> {
+    inputs
+        .iter()
+        .map(|&(slot, spell, count, flags)| unit_aura_state(catalog, slot, spell, count, flags))
+        .collect()
+}
+
 /// Another unit's auras as `UnitBuff 0x519500` and `UnitDebuff 0x5198f0` read them: ascending
 /// slot within each half, no durations, through the display filter. `buffs_visible` false drops
 /// the helpful half, the unit-level gate's nil at every index ([`buffs_visible_on`]).
-fn other_unit_auras(
-    store: &ObjectStore,
-    catalog: Option<&SpellCatalog>,
+fn other_unit_inputs<'a>(
+    store: &'a ObjectStore,
+    catalog: Option<&'a SpellCatalog>,
     buffs_visible: bool,
-) -> Vec<AuraState> {
+) -> impl Iterator<Item = AuraInput> + 'a {
     store
         .0
         .unit_auras()
-        .filter(|a| buffs_visible || a.slot >= UNIT_AURA_POSITIVE_SLOTS)
-        .filter(|a| shown_in_aura_ui(catalog, a.spell_id))
-        .map(|a| {
-            let display = catalog.and_then(|cat| cat.get(a.spell_id));
-            AuraState {
-                spell_id: a.spell_id,
-                name: display.map(|d| d.name.clone()),
-                icon: display.and_then(|d| d.icon.clone()),
-                count: a.stacks,
-                debuff_type: display
-                    .zip(catalog)
-                    .and_then(|(d, cat)| cat.dispel_name(d))
-                    .map(str::to_string),
-                // The 1.12 wire carries durations for the player alone.
-                duration: 0.0,
-                expiration_time: 0.0,
-                helpful: a.slot < UNIT_AURA_POSITIVE_SLOTS,
-                cancelable: a.flags & AURA_FLAG_CANCELABLE != 0,
-                // `untilCancelled` is the player cache record's alone (`0xbc6040` `+0xc`).
-                until_cancelled: false,
-                channeled: display
-                    .is_some_and(|d| d.attributes_ex & SPELL_ATTR_EX_IS_CHANNELED != 0),
-            }
-        })
-        .collect()
+        .filter(move |a| buffs_visible || a.slot >= UNIT_AURA_POSITIVE_SLOTS)
+        .filter(move |a| shown_in_aura_ui(catalog, a.spell_id))
+        .map(|a| (a.slot, a.spell_id, a.stacks, a.flags))
+}
+
+/// A roster record's aura block as the two bindings' roster walk reads it (`0x519763`-`0x5197d2`,
+/// `0x519b53`-`0x519bc5`): ascending slot, the display filter alone (`0x51979f`, `0x519b8f`), no
+/// unit gate and no `AURAFLAGS`, which the record does not hold. The stack count is always 1
+/// (`0x51980f`, `0x519c2d`), and nothing is cancelable.
+fn record_inputs<'a>(
+    slots: impl Iterator<Item = (u8, u16)> + 'a,
+    catalog: Option<&'a SpellCatalog>,
+) -> impl Iterator<Item = AuraInput> + 'a {
+    slots
+        .map(|(slot, spell)| (slot, u32::from(spell)))
+        .filter(move |&(_, spell)| spell != 0 && shown_in_aura_ui(catalog, spell))
+        .map(|(slot, spell)| (slot, spell, 1, 0))
 }
 
 /// `UnitBuff 0x519500`'s unit-level gate, before any slot: a unit's buffs are listed only if it
@@ -350,13 +377,25 @@ fn tracking_state_of(
     })
 }
 
+/// The units the resolver's guid globals name, from `UnitTokens`' own sources.
+#[derive(bevy::ecs::system::SystemParam)]
+struct AuraUnits<'w> {
+    selection: Res<'w, Selection>,
+    pet: Res<'w, crate::ui_pet::PetBar>,
+    // `Option`: a UI-only harness lacks their plugins; without the party's no group token names
+    // anyone.
+    group: Option<Res<'w, crate::ui_party::GroupState>>,
+    hovered: Option<Res<'w, crate::target::Hovered>>,
+    hovered_go: Option<Res<'w, crate::target::HoveredObject>>,
+    interact: Option<Res<'w, crate::ui_session::InteractNpc>>,
+}
+
 fn feed_auras(
     script: Option<NonSendMut<UiScript>>,
     self_q: Query<(&ObjectStore, &Guid), With<SelfPlayer>>,
-    selection: Res<Selection>,
+    units: AuraUnits,
     stores: Query<&ObjectStore>,
     spells: Option<Res<Spells>>,
-    pet: Res<crate::ui_pet::PetBar>,
     index: Res<GuidIndex>,
     // The `UnitBuff` gate's inputs, the same reaction the selection ring and nameplates use.
     factions: Option<Res<Factions>>,
@@ -473,83 +512,55 @@ fn feed_auras(
         }
     }
 
-    // The target's rows. A self-target mirrors the player list in cache order, where the
-    // reference's `UnitBuff` reads by slot.
-    let target_list: Option<Vec<AuraState>> =
-        selection.target.zip(selection.guid).and_then(|(e, guid)| {
-            if guid == self_guid.0 {
-                return Some(list.clone());
-            }
-            // Not `store`: that is the player's, the gate's second argument.
-            let target_store = stores.get(e).ok()?;
-            let buffs = buffs_visible_on(
-                target_store,
+    let held = |guid: u64| index.0.get(&guid).and_then(|&e| stores.get(e).ok());
+    let pet_guid = units.pet.spells.pet_guid;
+    // `UnitBuff`'s unit gate on a live unit. `unit` is never `store`, the player's, which is the
+    // gate's second argument. The pet is ungated; the reference gates a pet too, but `CanAssist`'s
+    // player-controlled arm (`0x60673e`-`0x60679f`, the controlling players' duel and FFA-PvP
+    // state) passes for your own pet, leaving only the charm, selectable and reaction clauses to
+    // hide its buffs.
+    let buffs_visible = |guid: u64, unit: &ObjectStore| {
+        guid == pet_guid
+            || buffs_visible_on(
+                unit,
                 Some(store),
                 factions.as_deref(),
                 &reputations,
-                |owner| {
-                    index
-                        .0
-                        .get(&owner)
-                        .and_then(|&e| stores.get(e).ok())
-                        .cloned()
-                },
-            );
-            Some(other_unit_auras(target_store, catalog, buffs))
-        });
+                |owner| held(owner).cloned(),
+            )
+    };
+    let target_guid = units.selection.guid.unwrap_or(0);
+    let catalog_moved = spells.as_ref().is_some_and(|s| s.is_changed());
+    let unit_changed = memo.units.feed(
+        &mut script,
+        units::Inputs {
+            group: units.group.as_deref(),
+            me: (self_guid.0, changed),
+            pet: pet_guid,
+            target: target_guid,
+            // The world pick, as `UnitTokens` resolves `"mouseover"`.
+            mouseover: units
+                .hovered
+                .as_deref()
+                .and_then(|h| {
+                    h.mouseover(&units.hovered_go.as_deref().copied().unwrap_or_default())
+                })
+                .map_or(0, |(_, guid)| guid),
+            npc: units.interact.as_deref().and_then(|i| i.1).unwrap_or(0),
+            held,
+            buffs_visible,
+            catalog,
+            catalog_moved,
+        },
+    );
 
-    // The pet's list: the stock pet frame's four buttons draw its buffs (`PetFrame.lua:37,56`).
-    let pet_guid = pet.spells.pet_guid;
-    let pet_list: Option<Vec<AuraState>> = (pet_guid != 0)
-        .then(|| index.0.get(&pet_guid))
-        .flatten()
-        .and_then(|&e| stores.get(e).ok())
-        // Ungated; the reference gates a pet too, but `CanAssist`'s player-controlled arm
-        // (`0x60673e`-`0x60679f`, the controlling players' duel and FFA-PvP state) passes for
-        // your own pet, leaving only the charm, selectable and reaction clauses to hide its buffs.
-        .map(|store| other_unit_auras(store, catalog, true));
-
-    // The target's target's list, for the ToT frame's four debuff buttons, through the one-hop
-    // `UNIT_FIELD_TARGET` read. When that is you, it is the player list, as for a self-target.
-    let tot_guid = selection
-        .target
-        .and_then(|e| stores.get(e).ok())
-        .and_then(|s| s.0.unit_target())
-        .filter(|g| *g != 0)
-        .unwrap_or(0);
-    let tot_list: Option<Vec<AuraState>> = (tot_guid != 0)
-        .then(|| index.0.get(&tot_guid))
-        .flatten()
-        .and_then(|&e| {
-            if tot_guid == self_guid.0 {
-                return Some(list.clone());
-            }
-            let tot_store = stores.get(e).ok()?;
-            let buffs = buffs_visible_on(
-                tot_store,
-                Some(store),
-                factions.as_deref(),
-                &reputations,
-                |owner| {
-                    index
-                        .0
-                        .get(&owner)
-                        .and_then(|&e| stores.get(e).ok())
-                        .cloned()
-                },
-            );
-            Some(other_unit_auras(tot_store, catalog, buffs))
-        });
-
-    let target_cur = selection
-        .guid
-        .zip(target_list.as_deref())
-        .map(|(guid, l)| (guid, projection_of(l)));
-    let target_changed = target_cur.is_some() && target_cur != memo.target_last;
-    memo.target_last = target_cur;
-
-    if target_changed && std::env::var_os("BENILLA_AURA_DUMP").is_some() {
-        let l = target_list.as_deref().unwrap_or_default();
+    if unit_changed.contains(&"target") && std::env::var_os("BENILLA_AURA_DUMP").is_some() {
+        let l = if target_guid == self_guid.0 {
+            Some(list.as_slice())
+        } else {
+            memo.units.list(target_guid)
+        };
+        let l = l.unwrap_or_default();
         info!("aura dump: {} aura(s) on the target rows", l.len());
         for a in l {
             info!(
@@ -562,25 +573,7 @@ fn feed_auras(
         }
     }
 
-    let pet_cur = (pet_guid != 0)
-        .then_some(pet_list.as_deref())
-        .flatten()
-        .map(|l| (pet_guid, projection_of(l)));
-    let pet_changed = pet_cur.is_some() && pet_cur != memo.pet_last;
-    memo.pet_last = pet_cur;
-
-    let tot_cur = (tot_guid != 0)
-        .then_some(tot_list.as_deref())
-        .flatten()
-        .map(|l| (tot_guid, projection_of(l)));
-    let tot_changed = tot_cur.is_some() && tot_cur != memo.tot_last;
-    memo.tot_last = tot_cur;
-
-    script.set_auras("player", Some(list));
-    // Clearing a token fires nothing: the frames react to `PLAYER_TARGET_CHANGED` and `UNIT_PET`.
-    script.set_auras("target", target_list);
-    script.set_auras("pet", pet_list);
-    script.set_auras("targettarget", tot_list);
+    script.set_player_auras(list);
     script.set_tracking(tracking);
     if changed {
         script.fire_event("UNIT_AURA", vec![ScriptValue::Str("player".into())]);
@@ -588,14 +581,12 @@ fn feed_auras(
         // `MiniMapTrackingFrame` register it, the unit frames `UNIT_AURA`.
         script.fire_event("PLAYER_AURAS_CHANGED", vec![]);
     }
-    if pet_changed {
-        script.fire_event("UNIT_AURA", vec![ScriptValue::Str("pet".into())]);
-    }
-    if target_changed {
-        script.fire_event("UNIT_AURA", vec![ScriptValue::Str("target".into())]);
-    }
-    if tot_changed {
-        script.fire_event("UNIT_AURA", vec![ScriptValue::Str("targettarget".into())]);
+    // The reference fires these from the live descriptor's aura fields and the record's aura bits
+    // (`0x5e57d8`, the pet's `0x5e58f1`), to every token naming the guid (`0x515e50`); a token
+    // naming a new unit fires too, and a token clearing fires nothing, since the frames react to
+    // their own events (`PLAYER_TARGET_CHANGED`, `UNIT_PET`, `PARTY_MEMBERS_CHANGED`).
+    for token in unit_changed {
+        script.fire_event("UNIT_AURA", vec![ScriptValue::Str(token.into())]);
     }
 }
 
@@ -629,9 +620,8 @@ fn end_session_aura_state(
     mut cache: ResMut<PlayerAuraCache>,
 ) {
     if let Some(mut script) = script {
-        script.set_auras("player", None);
-        script.set_auras("target", None);
-        script.set_auras("targettarget", None);
+        script.clear_auras();
+        script.set_unit_guids(&Default::default());
         script.set_tracking(None);
     }
     cache.auras.clear();
@@ -639,7 +629,8 @@ fn end_session_aura_state(
     // No `AuraFeedMemory` reset: its edge keys die with the VM.
 }
 
-/// A `CMSG_CANCEL_AURA` per queued `CancelUnitBuff`, naming the spell, not the slot (`0x6e7040`).
+/// A `CMSG_CANCEL_AURA` per queued `CancelPlayerBuff` or `CancelTrackingBuff`, naming the spell,
+/// not the slot (`0x6e7040`).
 fn drain_aura_cancels(script: Option<NonSendMut<UiScript>>, net: Res<NetCommands>) {
     let Some(mut script) = script else {
         return;
@@ -653,6 +644,16 @@ fn drain_aura_cancels(script: Option<NonSendMut<UiScript>>, net: Res<NetCommands
 mod tests {
     use super::*;
 
+    /// [`other_unit_inputs`] as the list.
+    fn other_unit_auras(
+        store: &ObjectStore,
+        catalog: Option<&SpellCatalog>,
+        buffs_visible: bool,
+    ) -> Vec<AuraState> {
+        let inputs: Vec<AuraInput> = other_unit_inputs(store, catalog, buffs_visible).collect();
+        aura_list(catalog, &inputs)
+    }
+
     /// The plugin on a bare app: without a `UiScript` the systems that need one skip.
     fn aura_app() -> App {
         let (tx, _) = crossbeam_channel::unbounded();
diff --git a/crates/benilla-app/src/ui_aura/units.rs b/crates/benilla-app/src/ui_aura/units.rs
new file mode 100644
index 00000000..f1d7d23d
--- /dev/null
+++ b/crates/benilla-app/src/ui_aura/units.rs
@@ -0,0 +1,1059 @@
+//! Every unit's aura list but the player's, one per guid, and the unit-token resolver's inputs
+//! (`0x515970`, [`UnitGuids`]) that `UnitBuff 0x519500` and `UnitDebuff 0x5198f0` read them through:
+//! the guid globals, the group tables, and each held unit a `target` chain can reach. A list is the
+//! live unit's slots, gated as any unit's; a group member or pet with no live object diverts to its
+//! roster record's block (`0x519592`-`0x5195a4` to `0x519735`, `0x519b25`). Lists are built only for
+//! guids some token can name, once per guid whatever names it, and rebuilt only when what they are
+//! built from moves: a 40-man raid names up to 80 units, and their targets.
+
+use std::collections::hash_map::{Entry, HashMap};
+
+use benilla_formats::SpellCatalog;
+use benilla_ui::script::{AuraState, UiScript, UnitGuids};
+
+use super::{aura_list, other_unit_inputs, record_inputs, AuraInput};
+use crate::net::ObjectStore;
+use crate::ui_party::{
+    raid_row_guids, GroupState, PARTY_PET_TOKENS, PARTY_TOKENS, RAID_PET_TOKENS, RAID_TOKENS,
+};
+
+/// The tokens `UNIT_AURA` fires for besides `"player"`, in firing order: [`EVENT_UNITS`], then the
+/// group's, each resolved by [`event_guid`].
+const EVENT_UNITS: [&str; 3] = ["pet", "target", "targettarget"];
+
+const EVENT_TOKEN_COUNT: usize = EVENT_UNITS.len()
+    + PARTY_TOKENS.len()
+    + PARTY_PET_TOKENS.len()
+    + RAID_TOKENS.len()
+    + RAID_PET_TOKENS.len();
+
+fn event_tokens() -> impl Iterator<Item = &'static str> {
+    EVENT_UNITS
+        .into_iter()
+        .chain(PARTY_TOKENS)
+        .chain(PARTY_PET_TOKENS)
+        .chain(RAID_TOKENS)
+        .chain(RAID_PET_TOKENS)
+}
+
+/// The guid [`event_tokens`]' `i`-th names, 0 for nobody.
+fn event_guid(g: &UnitGuids, i: usize) -> u64 {
+    let at = |t: &[u64], i: usize| t.get(i).copied().unwrap_or(0);
+    match i {
+        0 => g.pet,
+        1 => g.target,
+        // One hop, as the resolver's `target` loop makes it: off a held target only.
+        2 => g.held.get(&g.target).copied().unwrap_or(0),
+        3..=6 => g.party[i - 3],
+        7..=10 => g.party_pets[i - 7],
+        11..=50 => at(&g.raid, i - 11),
+        _ => at(&g.raid_pets, i - 51),
+    }
+}
+
+/// The group tables of [`UnitGuids`]: `party1..4` are the own subgroup's slots and `partypetN`
+/// their pets (`0x4e81d0`); `raidN` is `GetRaidRosterInfo` row N, as every other raid-token reader
+/// resolves it, and `raidpetN` that row's pet (`0x491960`).
+fn fill_group<'a>(
+    g: &mut UnitGuids,
+    group: Option<&GroupState>,
+    me: u64,
+    held: impl Fn(u64) -> Option<&'a ObjectStore>,
+) {
+    g.party = [0; 4];
+    g.party_pets = [0; 4];
+    g.raid.clear();
+    g.raid_pets.clear();
+    let Some(group) = group else {
+        return;
+    };
+    let live = |m: u64| held(m).map(|s| &s.0);
+    for (i, m) in group.party_slots().take(4).enumerate() {
+        g.party[i] = m.guid;
+        g.party_pets[i] = group.party_pet_guid(m.guid, live(m.guid)).unwrap_or(0);
+    }
+    g.raid = raid_row_guids(group, Some(me));
+    g.raid_pets.extend(
+        g.raid
+            .iter()
+            .map(|&m| group.raid_pet_guid(m, live(m)).unwrap_or(0)),
+    );
+}
+
+/// What [`UnitAuras::feed`] reads this frame.
+pub(super) struct Inputs<'g, 'a, H, V> {
+    pub(super) group: Option<&'g GroupState>,
+    /// Our guid, and whether the player's list moved this frame: a token naming us reads the
+    /// player's list, which the caller pushes.
+    pub(super) me: (u64, bool),
+    /// `pet`, `target`, `mouseover` and `npc`'s guids, 0 for none.
+    pub(super) pet: u64,
+    pub(super) target: u64,
+    pub(super) mouseover: u64,
+    pub(super) npc: u64,
+    /// The object manager's lookup (`0x468460`).
+    pub(super) held: H,
+    /// `UnitBuff`'s unit gate on a live unit, by guid.
+    pub(super) buffs_visible: V,
+    pub(super) catalog: Option<&'a SpellCatalog>,
+    /// The spell catalog was replaced, so every list is rebuilt.
+    pub(super) catalog_moved: bool,
+}
+
+/// One guid's list, shared by every token naming it.
+struct GuidList {
+    /// What the list was built from; the list is rebuilt only when these move.
+    inputs: Vec<AuraInput>,
+    list: Vec<AuraState>,
+    /// Taken from [`UnitAuras::versions`] each time the list changes.
+    version: u64,
+    /// The frame that last read it; an entry no token can name this frame is dropped.
+    frame: u64,
+}
+
+/// The per-guid lists and the resolver's inputs, for one VM.
+#[derive(Default)]
+pub(super) struct UnitAuras {
+    /// The resolver's inputs as last built.
+    guids: UnitGuids,
+    by_guid: HashMap<u64, GuidList>,
+    /// Each list version the VM holds, by guid.
+    pushed: HashMap<u64, u64>,
+    /// Each event token's last `(guid, version)`, by [`event_tokens`] index.
+    fired: Vec<Option<(u64, u64)>>,
+    /// The last version handed out; every list change takes the next, so none repeats.
+    versions: u64,
+    /// The player's list version, for a token naming us.
+    player_version: u64,
+    catalog_present: bool,
+    frame: u64,
+    /// Kept to save the allocations: the inputs being read, and the walk over the guids a token
+    /// can name, each with whether its roster record may stand in for it.
+    scratch: Vec<AuraInput>,
+    walk: Vec<(u64, bool)>,
+}
+
+impl UnitAuras {
+    /// Build the resolver's inputs and every nameable guid's list, push what moved, and return
+    /// the tokens `UNIT_AURA` fires for: every event token naming a unit whose list moved
+    /// (`0x515e50`), or that names a new unit. A token clearing fires nothing.
+    pub(super) fn feed<'a, H, V>(
+        &mut self,
+        script: &mut UiScript,
+        inputs: Inputs<'_, 'a, H, V>,
+    ) -> Vec<&'static str>
+    where
+        H: Fn(u64) -> Option<&'a ObjectStore>,
+        V: Fn(u64, &ObjectStore) -> bool,
+    {
+        let Inputs {
+            group,
+            me: (me, player_moved),
+            pet,
+            target,
+            mouseover,
+            npc,
+            held,
+            buffs_visible,
+            catalog,
+            catalog_moved,
+        } = inputs;
+        self.frame += 1;
+        if catalog_moved || catalog.is_some() != self.catalog_present {
+            self.catalog_present = catalog.is_some();
+            self.by_guid.clear();
+        }
+        if player_moved || self.player_version == 0 {
+            self.versions += 1;
+            self.player_version = self.versions;
+        }
+
+        // The resolver's inputs and the lists, in one walk over every guid a token can name: the
+        // bases, then each held unit their `target` chains reach. A group token's guid lists off
+        // its roster record while out of view; any other lists only while held.
+        let mut g = std::mem::take(&mut self.guids);
+        let mut walk = std::mem::take(&mut self.walk);
+        (g.player, g.pet, g.target, g.mouseover, g.npc) = (me, pet, target, mouseover, npc);
+        fill_group(&mut g, group, me, &held);
+        g.held.clear();
+        walk.clear();
+        walk.extend([me, pet, target, mouseover, npc].map(|g| (g, false)));
+        walk.extend(g.party.iter().chain(&g.party_pets).map(|&g| (g, true)));
+        walk.extend(g.raid.iter().chain(&g.raid_pets).map(|&g| (g, true)));
+        while let Some((guid, record_ok)) = walk.pop() {
+            if guid == 0 || g.held.contains_key(&guid) {
+                continue;
+            }
+            let store = held(guid);
+            if let Some(unit) = store.filter(|s| s.is_unit()) {
+                let next = unit.0.unit_target().unwrap_or(0);
+                g.held.insert(guid, next);
+                walk.push((next, false));
+            }
+            if guid != me {
+                self.refresh(guid, store, record_ok, group, &buffs_visible, catalog);
+            }
+        }
+        script.set_unit_guids(&g);
+        self.guids = g;
+        self.walk = walk;
+        let frame = self.frame;
+        self.by_guid.retain(|_, e| e.frame == frame);
+
+        for (&guid, e) in &self.by_guid {
+            if self.pushed.insert(guid, e.version) != Some(e.version) {
+                script.set_unit_auras(guid, Some(e.list.clone()));
+            }
+        }
+        let by_guid = &self.by_guid;
+        self.pushed.retain(|guid, _| {
+            let keep = by_guid.contains_key(guid);
+            if !keep {
+                script.set_unit_auras(*guid, None);
+            }
+            keep
+        });
+
+        self.fired.resize(EVENT_TOKEN_COUNT, None);
+        let mut fire = Vec::new();
+        for (i, token) in event_tokens().enumerate() {
+            let guid = event_guid(&self.guids, i);
+            let cur = match guid {
+                0 => None,
+                g if g == me => Some((g, self.player_version)),
+                g => self.by_guid.get(&g).map(|e| (g, e.version)),
+            };
+            if cur != self.fired[i] && cur.is_some() {
+                fire.push(token);
+            }
+            self.fired[i] = cur;
+        }
+        fire
+    }
+
+    /// `guid`'s list as last built, `None` for a unit with none.
+    pub(super) fn list(&self, guid: u64) -> Option<&[AuraState]> {
+        self.by_guid.get(&guid).map(|e| e.list.as_slice())
+    }
+
+    /// Rebuild `guid`'s list this frame if what it is built from moved: the live unit's gated
+    /// slots (`store`, the object manager's answer), else, for a guid a group token names, the
+    /// roster record's block. A guid neither held nor a group token's gets no list, as
+    /// `UnitBuff`'s roster walk finds nothing for it.
+    fn refresh(
+        &mut self,
+        guid: u64,
+        store: Option<&ObjectStore>,
+        record_ok: bool,
+        group: Option<&GroupState>,
+        buffs_visible: &impl Fn(u64, &ObjectStore) -> bool,
+        catalog: Option<&SpellCatalog>,
+    ) {
+        if self
+            .by_guid
+            .get(&guid)
+            .is_some_and(|e| e.frame == self.frame)
+        {
+            return;
+        }
+        self.scratch.clear();
+        match store {
+            Some(store) => self.scratch.extend(other_unit_inputs(
+                store,
+                catalog,
+                buffs_visible(guid, store),
+            )),
+            None if record_ok => {
+                if let Some(group) = group {
+                    self.scratch
+                        .extend(record_inputs(group.roster_aura_slots(guid), catalog));
+                }
+            }
+            None => return,
+        }
+        match self.by_guid.entry(guid) {
+            Entry::Occupied(mut e) => {
+                let e = e.get_mut();
+                e.frame = self.frame;
+                if e.inputs != self.scratch {
+                    std::mem::swap(&mut e.inputs, &mut self.scratch);
+                    let list = aura_list(catalog, &e.inputs);
+                    if list != e.list {
+                        e.list = list;
+                        self.versions += 1;
+                        e.version = self.versions;
+                    }
+                }
+            }
+            Entry::Vacant(e) => {
+                self.versions += 1;
+                let inputs = self.scratch.clone();
+                let list = aura_list(catalog, &inputs);
+                e.insert(GuidList {
+                    inputs,
+                    list,
+                    version: self.versions,
+                    frame: self.frame,
+                });
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use benilla_protocol::messages::{
+        member_status, GroupMemberEntry, ObjectFields, PartyMemberStatsInfo,
+    };
+    use benilla_ui::script::UiScript;
+    use bevy::prelude::*;
+
+    use crate::char_select::ClientState;
+    use crate::net::{Guid, GuidIndex, NetCommands, ObjectStore, Reputations, SelfPlayer};
+    use crate::ui_party::GroupState;
+
+    const ME: u64 = 0x10;
+    const MEMBER: u64 = 0x1234;
+    const PET: u64 = 0xF140_0000_0000_0077;
+    const AURA: u16 = 47;
+    const AURAFLAGS: u16 = 95;
+    const SUMMON: u16 = 8;
+    /// `UNIT_FIELD_FLAGS`; bit 27 is `UNIT_FLAG_AURAS_VISIBLE`, which opens `UnitBuff`'s gate.
+    const FLAGS: u16 = 46;
+
+    /// The feed on a bare app with a VM, us, and a party of one, `MEMBER`, with no record.
+    fn party_app() -> App {
+        let (tx, _) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin))
+            .insert_state(ClientState::InWorld)
+            .init_resource::<crate::target::Selection>()
+            .init_resource::<crate::ui_pet::PetBar>()
+            .init_resource::<GuidIndex>()
+            .init_resource::<Reputations>()
+            .init_resource::<GroupState>()
+            .insert_resource(NetCommands(tx))
+            .add_plugins(super::super::UiAuraPlugin);
+        app.insert_non_send_resource(UiScript::new().unwrap());
+        app.world_mut()
+            .non_send_resource::<UiScript>()
+            .run(
+                r#"
+                SEEN = {}
+                local f = CreateFrame("Frame")
+                f:RegisterEvent("UNIT_AURA")
+                -- The group's tokens only: the player's list fires on the first frame too.
+                f:SetScript("OnEvent", function()
+                    if arg1 ~= "player" then table.insert(SEEN, arg1) end
+                end)
+            "#,
+            )
+            .unwrap();
+        let me = app
+            .world_mut()
+            .spawn((ObjectStore(ObjectFields::default()), Guid(ME), SelfPlayer))
+            .id();
+        app.world_mut().resource_mut::<GuidIndex>().0.insert(ME, me);
+        let member = GroupMemberEntry {
+            name: "Brisca".into(),
+            guid: MEMBER,
+            status: member_status::ONLINE,
+            flags: 0,
+        };
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            0,
+            0,
+            vec![member],
+            ME,
+            None,
+            Some(ME),
+        );
+        app
+    }
+
+    /// Stream `guid` in with these fields, as the object manager holds it.
+    fn stream(app: &mut App, guid: u64, fields: &[(u16, u32)]) {
+        let e = app
+            .world_mut()
+            .spawn(ObjectStore(ObjectFields::from_pairs(fields)))
+            .id();
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .insert(guid, e);
+    }
+
+    fn stats(app: &mut App, full: bool, info: PartyMemberStatsInfo) {
+        stats_of(app, MEMBER, full, info);
+    }
+
+    fn stats_of(app: &mut App, guid: u64, full: bool, info: PartyMemberStatsInfo) {
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .apply_stats(guid, full, info);
+    }
+
+    /// The spell ids of `token`'s pushed debuffs (`harmful`) or buffs, after checking that
+    /// `UnitDebuff` (or `UnitBuff`) enumerates exactly that many, index 1 up to the nil.
+    fn listed(app: &mut App, token: &str, harmful: bool) -> Vec<i64> {
+        let verb = if harmful { "UnitDebuff" } else { "UnitBuff" };
+        let s = app.world_mut().non_send_resource::<UiScript>();
+        let ids = s.aura_spell_ids(token, !harmful);
+        let enumerated = s
+            .eval::<usize>(&format!(
+                r#"local n = 0
+                   for i = 1, 48 do
+                       local _, count = {verb}("{token}", i)
+                       if count == nil then break end
+                       n = n + 1
+                   end
+                   return n"#
+            ))
+            .unwrap();
+        assert_eq!(
+            enumerated,
+            ids.len(),
+            "{verb}(\"{token}\", i) enumerates the list"
+        );
+        ids.into_iter().map(i64::from).collect()
+    }
+
+    fn seen(app: &mut App) -> Vec<String> {
+        app.world_mut()
+            .non_send_resource::<UiScript>()
+            .eval::<Vec<String>>("local s = SEEN SEEN = {} return s")
+            .unwrap()
+    }
+
+    /// A live member reads its own `UNIT_FIELD_AURA` slots; `UnitBuff` keeps the unit gate, open
+    /// here through `UNIT_FLAG_AURAS_VISIBLE` (`0x5195bc`), and a stale slot stays out.
+    #[test]
+    fn a_live_members_auras_come_off_its_descriptor() {
+        let mut app = party_app();
+        stream(
+            &mut app,
+            MEMBER,
+            &[
+                (FLAGS, 0x0800_0000),
+                (AURA, 1126),
+                (AURA + 1, 6673), // stale: nibble 0x1 has no effect bit
+                (AURA + 33, 589),
+                (AURA + 34, 11976),
+                (AURAFLAGS, 0x0000_0018),
+                (AURAFLAGS + 4, 0x0000_0880),
+            ],
+        );
+        // A record that disagrees, to show the live object wins.
+        stats(
+            &mut app,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::ONLINE),
+                auras_negative: Some(vec![(40, 770)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "party1", true), [589, 11976]);
+        assert_eq!(listed(&mut app, "party1", false), [1126]);
+        assert!(
+            listed(&mut app, "party2", true).is_empty(),
+            "no second member"
+        );
+        assert_eq!(seen(&mut app), ["party1"]);
+    }
+
+    /// With no live object, both bindings walk the record's block (`0x519735`, `0x519b25`), with
+    /// no unit gate, a stack count of 1 (`0x51980f`), and nil for an offline record (`0x519741`).
+    #[test]
+    fn an_out_of_range_member_reads_the_stats_aura_block() {
+        let mut app = party_app();
+        stats(
+            &mut app,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::ONLINE),
+                auras: Some(vec![(0, 1126), (3, 21562)]),
+                auras_negative: Some(vec![(33, 589)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(
+            listed(&mut app, "party1", false),
+            [1126, 21562],
+            "buffs, ungated: no factions, which would close the live gate"
+        );
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+        let count = app
+            .world_mut()
+            .non_send_resource::<UiScript>()
+            .eval::<i64>(r#"local _, count = UnitDebuff("party1", 1) return count"#)
+            .unwrap();
+        assert_eq!(count, 1);
+        assert_eq!(seen(&mut app), ["party1"]);
+
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                status: Some(member_status::OFFLINE),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert!(listed(&mut app, "party1", false).is_empty());
+        assert!(listed(&mut app, "party1", true).is_empty());
+    }
+
+    /// The list writes the record's online bit too (`0x4e8361`-`0x4e837b`), so a status-only
+    /// `SMSG_GROUP_LIST` for a member out of view takes their last auras: `UnitBuff` and
+    /// `UnitDebuff` answer nil behind a clear bit (`0x519741`, `0x519b31`), and an online list brings them back.
+    #[test]
+    fn a_status_only_list_takes_an_out_of_view_members_auras_and_an_online_one_returns_them() {
+        let mut app = party_app();
+        stats(
+            &mut app,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::ONLINE),
+                auras: Some(vec![(0, 1126)]),
+                auras_negative: Some(vec![(33, 589)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "party1", false), [1126]);
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+
+        let relist = |app: &mut App, status: u8| {
+            let member = GroupMemberEntry {
+                name: "Brisca".into(),
+                guid: MEMBER,
+                status,
+                flags: 0,
+            };
+            app.world_mut().resource_mut::<GroupState>().apply_list(
+                0,
+                0,
+                vec![member],
+                ME,
+                None,
+                Some(ME),
+            );
+            app.update();
+        };
+        relist(&mut app, member_status::OFFLINE);
+        let nil = app
+            .world_mut()
+            .non_send_resource::<UiScript>()
+            .eval::<bool>(
+                r#"return UnitBuff("party1", 1) == nil and UnitDebuff("party1", 1) == nil"#,
+            )
+            .unwrap();
+        assert!(nil, "the record kept the auras, the clear bit hides them");
+        assert!(listed(&mut app, "party1", false).is_empty());
+        assert!(listed(&mut app, "party1", true).is_empty());
+
+        relist(&mut app, member_status::ONLINE);
+        assert_eq!(listed(&mut app, "party1", false), [1126]);
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+    }
+
+    /// The record is slot-indexed: deltas patch named slots, the halves split at slot 32, and each
+    /// walk is ascending slot whatever order the slots filled in.
+    #[test]
+    fn record_auras_list_in_slot_order_and_split_buffs_from_debuffs() {
+        let mut app = party_app();
+        stats(
+            &mut app,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::ONLINE),
+                auras: Some(vec![(5, 1126)]),
+                auras_negative: Some(vec![(40, 770)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        let _ = seen(&mut app);
+        // A later aura in a lower slot, then a debuff, as two deltas.
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                auras: Some(vec![(2, 21562)]),
+                ..Default::default()
+            },
+        );
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                auras_negative: Some(vec![(34, 589)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "party1", false), [21562, 1126]);
+        assert_eq!(listed(&mut app, "party1", true), [589, 770]);
+        assert_eq!(seen(&mut app), ["party1"]);
+
+        // Slot 5 falls off: the delta names it with a 0, and only it goes.
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                auras: Some(vec![(5, 0)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "party1", false), [21562]);
+        assert_eq!(listed(&mut app, "party1", true), [589, 770]);
+        assert_eq!(seen(&mut app), ["party1"]);
+
+        // A delta that moves no aura fires nothing.
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                cur_hp: Some(7),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert!(seen(&mut app).is_empty());
+    }
+
+    /// `partypetN` names the member's `CHARM`, else `SUMMON`, while the member is held, else the
+    /// record's pet guid (`0x4e81d0`); the pet's list is its own descriptor while held, else the
+    /// pet record's block (`0x496420`, `+0xe4`).
+    #[test]
+    fn a_party_pet_reads_its_descriptor_or_the_pet_block() {
+        let mut app = party_app();
+        stats(
+            &mut app,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::ONLINE),
+                pet_guid: Some(PET),
+                pet_auras: Some(vec![(1, 1126)]),
+                pet_auras_negative: Some(vec![(32, 770)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "partypet1", false), [1126]);
+        assert_eq!(listed(&mut app, "partypet1", true), [770]);
+        assert!(listed(&mut app, "partypet2", true).is_empty());
+        assert_eq!(seen(&mut app), ["party1", "partypet1"]);
+
+        // A pet-aura delta moves the pet's list and fires for its token alone.
+        stats(
+            &mut app,
+            false,
+            PartyMemberStatsInfo {
+                pet_auras_negative: Some(vec![(32, 0), (33, 589)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "partypet1", true), [589]);
+        assert_eq!(seen(&mut app), ["partypet1"]);
+
+        // Member and pet in view: the pet guid comes off the member's SUMMON, the list off the
+        // pet's own slots.
+        stream(
+            &mut app,
+            MEMBER,
+            &[(SUMMON, PET as u32), (SUMMON + 1, (PET >> 32) as u32)],
+        );
+        stream(
+            &mut app,
+            PET,
+            &[(AURA + 35, 11976), (AURAFLAGS + 4, 0x0000_2000)],
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "partypet1", true), [11976]);
+        assert!(listed(&mut app, "partypet1", false).is_empty());
+        assert!(seen(&mut app).contains(&"partypet1".to_string()));
+    }
+
+    // == The raid tokens ==
+
+    /// In our subgroup, so `party1` and `raid2`.
+    const MATE: u64 = 0x2001;
+    /// Subgroup 2, `raid5` only.
+    const FAR: u64 = 0x2004;
+    const FAR_PET: u64 = 0xF140_0000_0000_0099;
+
+    /// A raid of five: us (row 1, subgroup 1), `MATE` (subgroup 1), two in subgroup 2 and `FAR`
+    /// in subgroup 3, in wire order, none streamed and none with a record.
+    fn raid_app() -> App {
+        let mut app = party_app();
+        relist_raid(&mut app, member_status::ONLINE);
+        app.update();
+        let _ = seen(&mut app);
+        app
+    }
+
+    /// The raid's list as `raid_app` sends it, with `MATE`'s status byte as given.
+    fn relist_raid(app: &mut App, mate: u8) {
+        let member = |name: &str, guid, status, subgroup| GroupMemberEntry {
+            name: name.into(),
+            guid,
+            status,
+            flags: subgroup,
+        };
+        let online = member_status::ONLINE;
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            crate::ui_party::GROUPTYPE_RAID,
+            0,
+            vec![
+                member("Mate", MATE, mate, 0),
+                member("Two", 0x2002, online, 1),
+                member("Three", 0x2003, online, 1),
+                member("Far", FAR, online, 2),
+            ],
+            ME,
+            None,
+            Some(ME),
+        );
+    }
+
+    fn online(auras_negative: Vec<(u8, u16)>) -> PartyMemberStatsInfo {
+        PartyMemberStatsInfo {
+            status: Some(member_status::ONLINE),
+            auras_negative: Some(auras_negative),
+            ..Default::default()
+        }
+    }
+
+    /// A raid member in view reads its own `UNIT_FIELD_AURA` slots under `raidN`, whatever its
+    /// subgroup, and its buffs keep the unit gate.
+    #[test]
+    fn a_live_raid_members_auras_come_off_its_descriptor() {
+        let mut app = raid_app();
+        stream(
+            &mut app,
+            FAR,
+            &[
+                (AURA, 1126),
+                (AURA + 33, 589),
+                (AURAFLAGS, 0x0000_0008),
+                (AURAFLAGS + 4, 0x0000_0080),
+            ],
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "raid5", true), [589]);
+        assert!(
+            listed(&mut app, "raid5", false).is_empty(),
+            "no factions, so `CanAssist` fails and the gate drops the buffs"
+        );
+        assert_eq!(seen(&mut app), ["raid5"]);
+        for token in ["party1", "party2", "raid6"] {
+            assert!(listed(&mut app, token, true).is_empty(), "{token}");
+        }
+    }
+
+    /// Out of range, `raidN` walks the member's record, which vmangos keeps current for every raid
+    /// member we do not see; `raidpetN` walks the pet block the same record names.
+    #[test]
+    fn an_out_of_range_raid_member_and_its_pet_read_the_record() {
+        let mut app = raid_app();
+        stats_of(
+            &mut app,
+            FAR,
+            true,
+            PartyMemberStatsInfo {
+                pet_guid: Some(FAR_PET),
+                pet_auras: Some(vec![(1, 1126)]),
+                pet_auras_negative: Some(vec![(33, 770)]),
+                ..online(vec![(32, 589), (35, 11976)])
+            },
+        );
+        app.update();
+        assert_eq!(listed(&mut app, "raid5", true), [589, 11976]);
+        let count = app
+            .world_mut()
+            .non_send_resource::<UiScript>()
+            .eval::<i64>(r#"local _, count = UnitDebuff("raid5", 1) return count"#)
+            .unwrap();
+        assert_eq!(count, 1);
+        assert_eq!(listed(&mut app, "raidpet5", false), [1126]);
+        assert_eq!(listed(&mut app, "raidpet5", true), [770]);
+        assert_eq!(seen(&mut app), ["raid5", "raidpet5"]);
+        assert!(
+            listed(&mut app, "raidpet4", true).is_empty(),
+            "a petless member's raidpet token names nobody"
+        );
+    }
+
+    /// `UNIT_AURA` fires for every token naming a unit whose list moved (`0x515e50`), and for
+    /// nothing else; a delta that moves no aura fires nothing.
+    #[test]
+    fn unit_aura_fires_for_each_token_naming_the_member_whose_list_moved() {
+        let mut app = raid_app();
+        stats_of(&mut app, MATE, true, online(vec![(32, 589)]));
+        stats_of(&mut app, FAR, true, online(vec![(32, 770)]));
+        app.update();
+        let mut first = seen(&mut app);
+        first.sort();
+        assert_eq!(first, ["party1", "raid2", "raid5"]);
+
+        stats_of(&mut app, MATE, false, online(vec![(33, 11976)]));
+        app.update();
+        assert_eq!(seen(&mut app), ["party1", "raid2"]);
+        assert_eq!(listed(&mut app, "raid2", true), [589, 11976]);
+        assert_eq!(listed(&mut app, "party1", true), [589, 11976]);
+
+        stats_of(
+            &mut app,
+            FAR,
+            false,
+            PartyMemberStatsInfo {
+                cur_hp: Some(7),
+                ..Default::default()
+            },
+        );
+        app.update();
+        assert!(seen(&mut app).is_empty());
+    }
+
+    /// The raid roster's twin of the list write (`0x4ba947`-`0x4ba960`): a status-only raid list
+    /// hides an out-of-view row's auras under `raidN` and its party slot alike, and an online list
+    /// returns them.
+    #[test]
+    fn a_status_only_raid_list_takes_an_out_of_view_rows_auras_and_an_online_one_returns_them() {
+        let mut app = raid_app();
+        stats_of(&mut app, MATE, true, online(vec![(32, 589)]));
+        app.update();
+        assert_eq!(listed(&mut app, "raid2", true), [589]);
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+
+        relist_raid(&mut app, member_status::OFFLINE);
+        app.update();
+        assert!(listed(&mut app, "raid2", true).is_empty());
+        assert!(listed(&mut app, "party1", true).is_empty());
+
+        relist_raid(&mut app, member_status::ONLINE);
+        app.update();
+        assert_eq!(listed(&mut app, "raid2", true), [589]);
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+    }
+
+    /// A raid token past the roster, a raid token outside a raid, and an offline member's pet
+    /// all answer nil.
+    #[test]
+    fn a_raid_token_naming_nobody_answers_nil() {
+        let mut app = party_app();
+        stats(&mut app, true, online(vec![(32, 589)]));
+        app.update();
+        assert_eq!(listed(&mut app, "party1", true), [589]);
+        for token in ["raid1", "raid2"] {
+            assert!(
+                listed(&mut app, token, true).is_empty(),
+                "a party is no raid: {token}"
+            );
+        }
+
+        let mut app = raid_app();
+        stats_of(
+            &mut app,
+            FAR,
+            true,
+            PartyMemberStatsInfo {
+                status: Some(member_status::OFFLINE),
+                pet_guid: Some(FAR_PET),
+                pet_auras_negative: Some(vec![(33, 770)]),
+                auras_negative: Some(vec![(32, 589)]),
+                ..Default::default()
+            },
+        );
+        app.update();
+        for token in ["raid5", "raidpet5", "raid6", "raid40", "raidpet40"] {
+            assert!(listed(&mut app, token, true).is_empty(), "{token}");
+        }
+    }
+
+    /// Row 1 is us: the player's own list, as `"player"` answers it.
+    #[test]
+    fn our_raid_row_mirrors_the_player_list() {
+        let mut app = raid_app();
+        let me = app.world_mut().resource::<GuidIndex>().0[&ME];
+        *app.world_mut().get_mut::<ObjectStore>(me).unwrap() =
+            ObjectStore(ObjectFields::from_pairs(&[
+                (AURA + 32, 589),
+                (AURAFLAGS + 4, 0x0000_0008),
+            ]));
+        app.update();
+        assert_eq!(listed(&mut app, "player", true), [589]);
+        assert_eq!(listed(&mut app, "raid1", true), [589]);
+        assert_eq!(seen(&mut app), ["raid1"]);
+    }
+
+    /// A frame where nothing moved builds no list: the feed compares the inputs, not the lists.
+    #[test]
+    fn an_unchanged_raid_rebuilds_no_list() {
+        let mut app = raid_app();
+        stats_of(&mut app, FAR, true, online(vec![(32, 589)]));
+        app.update();
+        let versions = |app: &mut App| {
+            app.world_mut()
+                .resource_scope(|world, mut mem: Mut<super::super::AuraFeedMemory>| {
+                    let script = world.non_send_resource::<UiScript>();
+                    mem.vm.get(script).units.versions
+                })
+        };
+        let before = versions(&mut app);
+        for _ in 0..3 {
+            app.update();
+        }
+        assert_eq!(versions(&mut app), before);
+        stats_of(&mut app, FAR, false, online(vec![(33, 770)]));
+        app.update();
+        assert_eq!(
+            versions(&mut app),
+            before + 1,
+            "one list moved, one rebuilt"
+        );
+    }
+
+    // == Any token the resolver parses ==
+
+    /// `OBJECT_FIELD_TYPE`; a unit's typemask is `0x9`, a player's `0x19`.
+    const TYPE: u16 = 2;
+    /// `UNIT_FIELD_TARGET`'s low dword; the high half is the next index.
+    const TARGET: u16 = 16;
+    const MOB: u64 = 0xF130_0000_0000_0001;
+    const ADD: u64 = 0xF130_0000_0000_0002;
+
+    /// A unit of typemask `ty` targeting `target`, with one debuff in slot 32.
+    fn unit_fields(ty: u32, target: u64, debuff: u32) -> Vec<(u16, u32)> {
+        vec![
+            (TYPE, ty),
+            (TARGET, target as u32),
+            (TARGET + 1, (target >> 32) as u32),
+            (AURA + 32, debuff),
+            (AURAFLAGS + 4, 0x0000_0008),
+        ]
+    }
+
+    /// We target `MOB`, which targets party1, who targets `ADD`, which targets us; the mouse is over
+    /// `ADD`, and our pet targets `MOB`. Each carries its own debuff: us 6788, `MOB` 589, party1
+    /// 11976, `ADD` 770.
+    fn chain_app() -> App {
+        let mut app = party_app();
+        app.init_resource::<crate::target::Hovered>();
+        let me = app.world_mut().resource::<GuidIndex>().0[&ME];
+        *app.world_mut().get_mut::<ObjectStore>(me).unwrap() =
+            ObjectStore(ObjectFields::from_pairs(&unit_fields(0x19, MOB, 6788)));
+        stream(&mut app, MOB, &unit_fields(0x9, MEMBER, 589));
+        stream(&mut app, MEMBER, &unit_fields(0x19, ADD, 11976));
+        stream(&mut app, ADD, &unit_fields(0x9, ME, 770));
+        stream(&mut app, PET, &unit_fields(0x9, MOB, 1));
+        app.world_mut()
+            .resource_mut::<crate::ui_pet::PetBar>()
+            .spells
+            .pet_guid = PET;
+        let (mob, add) = {
+            let index = &app.world().resource::<GuidIndex>().0;
+            (index[&MOB], index[&ADD])
+        };
+        let mut selection = app.world_mut().resource_mut::<crate::target::Selection>();
+        (selection.target, selection.guid) = (Some(mob), Some(MOB));
+        let mut hovered = app.world_mut().resource_mut::<crate::target::Hovered>();
+        (hovered.target, hovered.guid) = (Some(add), Some(ADD));
+        app.update();
+        app
+    }
+
+    /// `UnitDebuff` reads the list of whatever unit the token names, through the resolver
+    /// (`0x515970`, called at `0x519542`): the mouseover, a member's target, any depth of `target`
+    /// chain, in any case, and the player's own list at the end of a chain that comes back to us.
+    #[test]
+    fn every_token_reads_the_list_of_the_unit_it_names() {
+        let mut app = chain_app();
+        for (token, want) in [
+            ("mouseover", 770),
+            ("MouseOver", 770),
+            ("party1target", 770),
+            ("PARTY1TARGET", 770),
+            ("target", 589),
+            ("targettarget", 11976),
+            ("targettargettarget", 770),
+            ("targettargettargettarget", 6788),
+            ("pettarget", 589),
+            ("playertarget", 589),
+            ("mouseovertargettarget", 589),
+            ("PLAYER", 6788),
+            ("Player", 6788),
+        ] {
+            assert_eq!(listed(&mut app, token, true), [want], "{token}");
+        }
+        assert_eq!(
+            listed(&mut app, "PLAYER", true),
+            listed(&mut app, "player", true)
+        );
+    }
+
+    /// `UNIT_AURA` fires for the tokens it fired for before, never for a chain or the mouseover,
+    /// which the reference's fan-out (`0x515c50`) does not list.
+    #[test]
+    fn unit_aura_still_fires_for_the_fixed_tokens_alone() {
+        let mut app = chain_app();
+        let mut first = seen(&mut app);
+        first.sort();
+        assert_eq!(first, ["party1", "pet", "target", "targettarget"]);
+
+        // `ADD`'s list moves: it is the mouseover, party1's target and three hops off ours, and
+        // no token that fires names it.
+        let add = app.world().resource::<GuidIndex>().0[&ADD];
+        let mut fields = unit_fields(0x9, ME, 770);
+        fields.push((AURA + 33, 589));
+        fields[4].1 = 0x0000_0088;
+        *app.world_mut().get_mut::<ObjectStore>(add).unwrap() =
+            ObjectStore(ObjectFields::from_pairs(&fields));
+        app.update();
+        assert!(seen(&mut app).is_empty());
+        assert_eq!(listed(&mut app, "mouseover", true), [770, 589]);
+        assert_eq!(listed(&mut app, "party1target", true), [770, 589]);
+    }
+
+    /// A nearer GameObject wins the pick, and the publisher writes its guid, which the resolver
+    /// rejects as a unit (`0x515bd9 je`): the unit behind it is no longer the mouseover.
+    #[test]
+    fn a_nearer_gameobject_takes_the_mouseover_from_the_unit_behind_it() {
+        let mut app = chain_app();
+        assert_eq!(listed(&mut app, "mouseover", true), [770]);
+        app.world_mut()
+            .resource_mut::<crate::target::Hovered>()
+            .distance = 10.0;
+        let chest = app.world_mut().spawn_empty().id();
+        app.insert_resource(crate::target::HoveredObject {
+            target: Some(chest),
+            guid: Some(0xF110_0000_0000_0004),
+            distance: 5.0,
+        });
+        app.update();
+        assert!(listed(&mut app, "mouseover", true).is_empty());
+        assert!(listed(&mut app, "mouseovertarget", true).is_empty());
+    }
+
+    /// A raid member's target that is out of view but on the roster reads its record, as
+    /// `UnitDebuff`'s roster walk finds it (`0x519b25`); a hop off a unit not held is nobody.
+    #[test]
+    fn a_raid_members_target_reads_whatever_the_guid_holds() {
+        let mut app = raid_app();
+        stats_of(&mut app, FAR, true, online(vec![(32, 589)]));
+        // `raid3` is 0x2002, in view and targeting `FAR`, which is not.
+        stream(&mut app, 0x2002, &unit_fields(0x19, FAR, 770));
+        app.update();
+        assert_eq!(listed(&mut app, "raid3", true), [770]);
+        assert_eq!(listed(&mut app, "raid3target", true), [589]);
+        assert_eq!(listed(&mut app, "raid5", true), [589]);
+        assert!(listed(&mut app, "raid5target", true).is_empty());
+        assert!(listed(&mut app, "raid3targettarget", true).is_empty());
+    }
+}
diff --git a/crates/benilla-app/src/ui_battlefield.rs b/crates/benilla-app/src/ui_battlefield.rs
index e20f0406..cc410bc6 100644
--- a/crates/benilla-app/src/ui_battlefield.rs
+++ b/crates/benilla-app/src/ui_battlefield.rs
@@ -153,11 +153,12 @@ fn slot_view(
         let deadline = *at + std::time::Duration::from_millis(u64::from(delta));
         view.port_expiration_ms = ms(deadline.saturating_duration_since(now));
     }
-    // Status 1: the raw estimate, and `[slot+0x1c] = now − Δ` read back as `now − stamp`.
+    // Status 1: the raw estimate, and `[slot+0x1c] = now − Δ` read back as `now − stamp`, which is
+    // the time since the status plus Δ, taken forwards so no `Instant` precedes the clock's origin.
     if let Some((estimate, waited)) = status.queued {
         view.estimated_wait_ms = estimate;
-        let stamp = *at - std::time::Duration::from_millis(u64::from(waited));
-        view.time_waited_ms = ms(now.saturating_duration_since(stamp));
+        let since = now.saturating_duration_since(*at);
+        view.time_waited_ms = ms(since + std::time::Duration::from_millis(u64::from(waited)));
     }
     view
 }
@@ -211,9 +212,8 @@ fn feed_battlefield(
 
     let slots = queue
         .slots()
-        .iter()
-        .map(|s| slot_view(s.as_ref(), catalog, now))
-        .collect();
+        .each_ref()
+        .map(|s| slot_view(s.as_ref(), catalog, now));
     script.set_battlefield_queue(slots, queue.instance_expiration_ms(now));
 
     if std::mem::take(&mut state.show) {
@@ -390,6 +390,26 @@ mod tests {
         }
     }
 
+    #[test]
+    fn a_waited_span_longer_than_any_uptime_reads_forwards() {
+        let at = Instant::now();
+        let mut queued = status(0, 489, 1);
+        queued.queued = Some((0, u32::MAX));
+        let v = slot_view(Some(&(queued.clone(), at)), None, at);
+        assert_eq!(
+            v.time_waited_ms,
+            u32::MAX,
+            "49.7 days waited, no stamp needed"
+        );
+        let later = at + std::time::Duration::from_secs(9);
+        let v = slot_view(Some(&(queued, at)), None, later);
+        assert_eq!(
+            v.time_waited_ms,
+            u32::MAX,
+            "saturates as the getter's u32 does"
+        );
+    }
+
     #[test]
     fn the_slot_view_reduces_the_clocks() {
         let at = Instant::now();
diff --git a/crates/benilla-app/src/ui_chat.rs b/crates/benilla-app/src/ui_chat.rs
index 4d292c10..3d3be2f8 100644
--- a/crates/benilla-app/src/ui_chat.rs
+++ b/crates/benilla-app/src/ui_chat.rs
@@ -30,8 +30,10 @@ mod input;
 /// The language gate: the exemptions and fluency lookup behind the chat garble.
 mod language;
 /// `LoggingChat`/`LoggingCombat`: the two log files `/chatlog` and `/combatlog` toggle.
-mod logging;
+pub(crate) mod logging;
 mod net;
+#[cfg(test)]
+mod notice_tests;
 /// The `AUTO_JOIN_GUILD_CHANNEL` cascade, the one place the client joins or leaves
 /// `GuildRecruitment - City` on its own.
 mod recruitment;
@@ -58,6 +60,11 @@ pub(crate) use settings::restore_chat_looks;
 
 pub(crate) struct UiChatPlugin;
 
+/// The chat line drain, whose `DoEmote` arm writes the local [`crate::creature_anim::EmoteAnim`]:
+/// the animation chain runs after it, so the same frame's driver sees the play.
+#[derive(SystemSet, Debug, Clone, PartialEq, Eq, Hash)]
+pub(crate) struct ChatDrain;
+
 impl Plugin for UiChatPlugin {
     fn build(&self, app: &mut App) {
         net::register(app);
@@ -150,7 +157,7 @@ impl Plugin for UiChatPlugin {
                     // After the clears, so a press that stamps the clock and drops the flag is
                     // settled before the idle timer reads it.
                     idle::idle_handler,
-                    input::drain_chat_input,
+                    input::drain_chat_input.in_set(ChatDrain),
                     // After the box's drain, so a `SendChatMessage` or `SendAddonMessage` from a
                     // slash handler it just ran goes out this frame.
                     input::drain_addon_chat_sends,
diff --git a/crates/benilla-app/src/ui_chat/away.rs b/crates/benilla-app/src/ui_chat/away.rs
index bcc9f15f..dba075fa 100644
--- a/crates/benilla-app/src/ui_chat/away.rs
+++ b/crates/benilla-app/src/ui_chat/away.rs
@@ -187,18 +187,18 @@ pub(crate) fn movement_clears_afk(
     mut chat: ResMut<ChatLog>,
     mut mirror: ResMut<AfkMirror>,
 ) {
-    use crate::bindings::cmd;
+    use crate::bindings::Input;
     if !mirror.is_afk() || cvars.flag("autoClearAFK") == Some(false) {
         return;
     }
     let moved = [
-        cmd::JUMP,
-        cmd::MOVE_FORWARD,
-        cmd::MOVE_BACKWARD,
-        cmd::STRAFE_LEFT,
-        cmd::STRAFE_RIGHT,
-        cmd::TURN_LEFT,
-        cmd::TURN_RIGHT,
+        Input::Jump,
+        Input::MoveForward,
+        Input::MoveBackward,
+        Input::StrafeLeft,
+        Input::StrafeRight,
+        Input::TurnLeft,
+        Input::TurnRight,
     ]
     .iter()
     .any(|&c| binds.just_pressed(c));
@@ -215,6 +215,7 @@ pub(crate) fn movement_clears_afk(
         kind: crate::net::ChatKind::Afk,
         target: None,
         text: String::new(),
+        language: None,
     });
 }
 
diff --git a/crates/benilla-app/src/ui_chat/commands.rs b/crates/benilla-app/src/ui_chat/commands.rs
index 48fa6fdb..8f187250 100644
--- a/crates/benilla-app/src/ui_chat/commands.rs
+++ b/crates/benilla-app/src/ui_chat/commands.rs
@@ -2,7 +2,9 @@
 //! player's own strings define, read off the UI VM's globals the way `ChatEdit_ParseText` walks
 //! them (`ChatFrame.lua:2164-2200`): `SLASH_<INDEX><n>` for the actions, `EMOTE<i>_CMD<j>` →
 //! `EMOTE<i>_TOKEN` for the emotes. An action wins over an emote alias of the same name, as the
-//! reference tries `SlashCmdList` first; benilla's own commands, literals, go in after both.
+//! reference tries `SlashCmdList` first; benilla's dev instruments, literals, go in after both.
+//! benilla's player commands (`/reload`, `/errors`) are its layer's `SlashCmdList` rows, which a
+//! line this table does not know reaches through the drain's unknown-command arm.
 
 use std::collections::HashMap;
 
@@ -50,16 +52,6 @@ pub(crate) enum SlashIndex {
     MacroHelp,
     /// `/console <line>`: `ConsoleExec(msg)`, as the reference's handler (`ChatFrame.lua:671`).
     Console,
-    /// `/reload`, the rebuild `/console reloadUI` runs. Deviation: 1.12 has no such alias (later
-    /// clients added it); kept so a player can reload the interface after toggling addons.
-    ReloadUi,
-    /// `/errors`, `/err`: opens benilla's script error log. Deviation: 1.12 has only the
-    /// `ScriptErrors` modal, which shows a burst's first error and keeps none; addon users need
-    /// the list, so it is in every build.
-    ScriptErrors,
-    /// `/convertraid`: convert the party to a raid (`CMSG_GROUP_RAID_CONVERT`, leader only).
-    /// Deviation: 1.12's only trigger is the Raid tab's Convert button (`RaidFrame.xml`).
-    ConvertRaid,
 }
 
 impl SlashIndex {
@@ -101,15 +93,11 @@ impl SlashIndex {
             Self::MacroUi => "MACRO",
             Self::MacroHelp => "MACROHELP",
             Self::Console => "CONSOLE",
-            // No shipped strings under these three keys: their aliases are literals in `build`.
-            Self::ReloadUi => "RELOADUI",
-            Self::ScriptErrors => "BENILLASCRIPTERRORS",
-            Self::ConvertRaid => "BENILLACONVERTRAID",
         }
     }
 
     /// Every registered index; any other command answers `HELP_TEXT_SIMPLE`, as unknown ones do.
-    const ALL: [Self; 38] = [
+    const ALL: [Self; 35] = [
         Self::Reply,
         Self::Join,
         Self::Leave,
@@ -145,9 +133,6 @@ impl SlashIndex {
         Self::MacroUi,
         Self::MacroHelp,
         Self::Console,
-        Self::ReloadUi,
-        Self::ScriptErrors,
-        Self::ConvertRaid,
     ];
 }
 
@@ -199,8 +184,8 @@ pub(crate) enum Command {
 #[derive(Resource, Default)]
 pub(crate) struct SlashCommands {
     by_alias: HashMap<String, Command>,
-    /// Aliases per source, logged at boot: `(slash, emote, benilla additions, dev instruments)`.
-    counts: (usize, usize, usize, usize),
+    /// Aliases per source, logged at boot: `(slash, emote, dev instruments)`.
+    counts: (usize, usize, usize),
 }
 
 impl SlashCommands {
@@ -246,27 +231,7 @@ impl SlashCommands {
         }
         let emote_aliases = by_alias.len() - slash_aliases;
 
-        // 3 · benilla's player-facing additions, in every build; after the walks, so shipped wins.
-        insert(
-            &mut by_alias,
-            "reload",
-            Command::Slash(SlashIndex::ReloadUi),
-        );
-        for alias in ["errors", "err"] {
-            insert(
-                &mut by_alias,
-                alias,
-                Command::Slash(SlashIndex::ScriptErrors),
-            );
-        }
-        insert(
-            &mut by_alias,
-            "convertraid",
-            Command::Slash(SlashIndex::ConvertRaid),
-        );
-        let added_aliases = by_alias.len() - slash_aliases - emote_aliases;
-
-        // 4 · the dev instruments, dev builds only; a player build answers them as unknown.
+        // 3 · the dev instruments, dev builds only; a player build answers them as unknown.
         let before_dev = by_alias.len();
         if crate::run_mode::dev_affordances() {
             for dev in DevCmd::ALL {
@@ -279,13 +244,13 @@ impl SlashCommands {
 
         Self {
             by_alias,
-            counts: (slash_aliases, emote_aliases, added_aliases, dev_aliases),
+            counts: (slash_aliases, emote_aliases, dev_aliases),
         }
     }
 
     /// Distinct aliases per source (the shipped strings repeat: `EMOTE87_CMD1` and `_CMD2` are
     /// both `"/sit"`); a player build reports 0 dev aliases.
-    pub(super) fn counts(&self) -> (usize, usize, usize, usize) {
+    pub(super) fn counts(&self) -> (usize, usize, usize) {
         self.counts
     }
 }
@@ -298,6 +263,23 @@ fn insert(map: &mut HashMap<String, Command>, alias: &str, cmd: Command) {
     }
 }
 
+/// The dev instruments as `SlashCmdList` rows (`BENILLA_<COMMAND>`), so a typed one reaches the
+/// drain through the stock `ChatEdit_ParseText`; registered on a freshly loaded VM in a build with
+/// dev affordances only, so a player build answers them `HELP_TEXT_SIMPLE`, as 1.12 does.
+pub(crate) fn register_dev_commands(script: &benilla_ui::script::UiScript, dev: bool) {
+    if !dev {
+        return;
+    }
+    for cmd in DevCmd::ALL {
+        let aliases: Vec<String> = cmd.aliases().iter().map(|a| format!("/{a}")).collect();
+        let aliases: Vec<&str> = aliases.iter().map(String::as_str).collect();
+        let key = format!("BENILLA_{}", cmd.aliases()[0].to_ascii_uppercase());
+        if let Err(e) = script.register_host_slash_command(&key, &aliases) {
+            warn!("chat: registering /{}: {e}", cmd.aliases()[0]);
+        }
+    }
+}
+
 /// Build the table in `PostStartup`, after `Startup` has inserted the VM and the emote catalog.
 pub(crate) fn build_slash_commands(
     mut commands: Commands,
@@ -314,11 +296,11 @@ pub(crate) fn build_slash_commands(
         |name| globals.get::<String>(name).ok().filter(|s| !s.is_empty()),
         |token| emotes.text_id(token),
     );
-    let (slash, emote, added, dev) = table.counts();
+    let (slash, emote, dev) = table.counts();
     // The shipped 1.12 data gives the counts `real_alias_table_resolves_the_shipped_commands` pins.
     info!(
         "chat: slash table — {slash} command aliases, {emote} emote aliases, \
-         {added} benilla additions, {dev} instrument aliases"
+         {dev} instrument aliases"
     );
     if emote == 0 {
         error!("chat: NO emote aliases — every /wave-style command is dead (GlobalStrings?)");
diff --git a/crates/benilla-app/src/ui_chat/edit.rs b/crates/benilla-app/src/ui_chat/edit.rs
index b65e81ac..f9cac67e 100644
--- a/crates/benilla-app/src/ui_chat/edit.rs
+++ b/crates/benilla-app/src/ui_chat/edit.rs
@@ -3,6 +3,8 @@
 
 use bevy::prelude::*;
 
+use benilla_ui::script::sstr_to_int;
+
 use crate::net::ChatKind;
 
 /// The sendable chat types, as the wire kind an addon's `SendChatMessage` token maps to.
@@ -142,26 +144,6 @@ impl ChannelSlot {
     }
 }
 
-/// Storm's `SStrToInt` (`0x64ac60`): an optional `-`, then decimal digits up to the first other
-/// byte, with no whitespace skip, no `+` and no overflow check (`10·n + d` wraps); no digit is 0.
-fn sstr_to_int(s: &str) -> i32 {
-    let (neg, digits) = match s.strip_prefix('-') {
-        Some(rest) => (true, rest),
-        None => (false, s),
-    };
-    let n = digits
-        .bytes()
-        .take_while(u8::is_ascii_digit)
-        .fold(0i32, |n, d| {
-            n.wrapping_mul(10).wrapping_add(i32::from(d - b'0'))
-        });
-    if neg {
-        n.wrapping_neg()
-    } else {
-        n
-    }
-}
-
 /// `id`'s `ZONECHANNELS` bit, `1 << (ChannelID - 1)`; nothing outside `1..=32` has one.
 pub(crate) fn zone_bit(id: u32) -> u32 {
     if id == 0 || id > 32 {
diff --git a/crates/benilla-app/src/ui_chat/feed.rs b/crates/benilla-app/src/ui_chat/feed.rs
index 19a2172d..7f9d20b3 100644
--- a/crates/benilla-app/src/ui_chat/feed.rs
+++ b/crates/benilla-app/src/ui_chat/feed.rs
@@ -596,6 +596,17 @@ pub(super) struct SpeakerEffects<'w> {
     gestures: ResMut<'w, crate::creature_anim::GestureQueue>,
 }
 
+/// `UNIT_FIELD_FLAGS` bit `0x20000000` (`PREVENT_ANIM`: Polymorph, Kidney Shot, Gouge, Sleep).
+const UNIT_FLAG_PREVENT_ANIM: u32 = 0x2000_0000;
+
+/// Whether the speaker's flags suppress the chat talk gesture. Only the handler's own copy of
+/// the selector tests the bit (`0x49d7f7`, the one `0xa0` test of `0x20000000` in the image),
+/// which runs when the sender's name is already cached (`tries == 0`); a line held for the name
+/// query gestures from the deferred copies (`0x49cf2b`, `0x49d3bb`), which do not.
+pub(super) fn gesture_prevented(tries: u16, speaker_flags: Option<u32>) -> bool {
+    tries == 0 && speaker_flags.is_some_and(|f| f & UNIT_FLAG_PREVENT_ANIM != 0)
+}
+
 /// Drain [`ChatLog`]: resolve names (ask-once, bounded), build the events and [`route`] them.
 pub(super) fn feed_chat(
     script: Option<NonSendMut<benilla_ui::script::UiScript>>,
@@ -758,6 +769,12 @@ pub(super) fn feed_chat(
                 // The gesture reads the raw type and `plain`, not the garbled text: the selector is
                 // in the parser (`0x49d560`, `0x49d820`-`0x49d8ae`) on the buffer `0x49dbc2` hands
                 // `0x49a870`, so a Horde `lol` laughs for every observer.
+                // The immediate path alone refuses a speaker that cannot animate (`0x49d7f7`).
+                let speaker_flags = guids
+                    .0
+                    .get(&msg.sender_guid)
+                    .and_then(|e| stores.get(*e).ok())
+                    .map(|s| s.0.unit_flags());
                 if let Some(gesture) =
                     crate::creature_anim::select_gesture(msg.chat_type, &plain, |n| {
                         script
@@ -766,6 +783,7 @@ pub(super) fn feed_chat(
                             .get::<String>(format!("LAUGH_WORD{n}"))
                             .ok()
                     })
+                    .filter(|_| !gesture_prevented(tries, speaker_flags))
                 {
                     speaker.gestures.push(msg.sender_guid, gesture);
                 }
@@ -793,17 +811,19 @@ pub(super) fn feed_chat(
                     });
                     continue;
                 }
-                // Not stamped: a guid-tail notice (a member joining or leaving, a kick, a
-                // moderation change) has arg7-arg9 empty, so the stock filter
-                // (`ChatFrame.lua:1374-1392`) finds no channel for it and it never prints; the
-                // reference stamps it as it stamps speech.
-                if let Some(event) = notice_event(
+                // Stamped against the channel list as it stands at delivery: the reference hands
+                // the composer `0x49a870` the notice's channel name, directly when the names are
+                // cached (`0x49c59f`-`0x49c5b0`), else from the queued line's node (`+0x2c`) in
+                // the name-query callback (`0x49cfb4`-`0x49cfc1`), and the composer looks it up
+                // among the joined channels (`0x49aa1e`-`0x49aa31`). Unstamped, arg7-arg9 are
+                // empty and the stock filter (`ChatFrame.lua:1374-1392`) drops the line.
+                if let Some(mut event) = notice_event(
                     notice,
                     channel,
                     Some(a.unwrap_or_else(|| "Unknown".into())),
                     b,
                 ) {
-                    route(&mut script, &mut windows, &event);
+                    deliver(&mut script, &mut windows, &mut channels, &mut event);
                 }
             }
             Pending::Addon {
diff --git a/crates/benilla-app/src/ui_chat/idle.rs b/crates/benilla-app/src/ui_chat/idle.rs
index d34ac27d..af38230e 100644
--- a/crates/benilla-app/src/ui_chat/idle.rs
+++ b/crates/benilla-app/src/ui_chat/idle.rs
@@ -4,10 +4,10 @@
 //!
 //! The logout is a camp, not a kick: `0x5ab000` sends the game menu's `CMSG_LOGOUT_REQUEST`, which
 //! the server refuses in combat, grants at once when resting, or counts down for 20 seconds
-//! (vmangos `MiscHandler.cpp:284-339`). The reference skips the whole 30-minute leg, line
-//! included, while the logout-pending byte `[session+0x1b1d]` is set (`0x482eee`); here
-//! [`crate::ui_logout`] holds that byte and drops only the repeated request, so `IDLE_MESSAGE`
-//! prints again every frame.
+//! (vmangos `MiscHandler.cpp:284-339`). The 30-minute leg, line and request together, is skipped
+//! while the logout-pending byte `[session+0x1b1d]` is set (`0x482eee`, `0x482ef5`), the byte the
+//! request itself sets (`0x5ab05b`) and a cancel or a refusal clears: one line and one request per
+//! logout, and the leg arms again once the byte clears. [`crate::ui_logout`] holds that byte.
 
 use std::time::Duration;
 
@@ -75,7 +75,8 @@ pub(crate) struct IdleAction {
     pub(crate) sit: bool,
     /// `0x482fba call 0x5eb740(NULL)`.
     pub(crate) afk: bool,
-    /// `0x482f1a` and `0x5ab000`: `IDLE_MESSAGE` and the logout request.
+    /// `0x482f1a` and `0x5ab000`: `IDLE_MESSAGE` and the logout request. The band only: the leg's
+    /// own gate, the logout-pending byte (`0x482ef5`), is the handler's to read.
     pub(crate) camp: bool,
 }
 
@@ -89,9 +90,10 @@ pub(crate) struct IdleGates {
     /// `UNIT_FIELD_MOUNTDISPLAYID > 0`, the sit's.
     pub(crate) mounted: bool,
     /// The sit's fourth gate (`0x482f84 call 0x6103a0`): for a solo player, the movement-action
-    /// mode `[0xc4d888]` at its in-world `0xc`. `/follow` sets 3 (`FollowUnit 0x489e00`) and
-    /// autorun never moves it, so a follower whose target has stopped is not seated.
-    pub(crate) following: bool,
+    /// mode `[0xc4d888]` at its in-world `0xc`. `/follow` sets 3 (`FollowUnit 0x489e00`), Click to
+    /// Move 5 to 9, and autorun never moves it, so a follower whose target has stopped is not
+    /// seated.
+    pub(crate) auto_moving: bool,
     /// `UNIT_FIELD_FLAGS` bit 20 (`0x100000`), the AFK's, not the sit's.
     pub(crate) on_taxi: bool,
     /// The optimistic mirror `[0xb6e5cc]`: the AFK's second gate, and its anti-repeat.
@@ -99,7 +101,8 @@ pub(crate) struct IdleGates {
 }
 
 /// Resolve the timer against the gates. The bands are exclusive (`0x482ee5 jl 0x482f39`): the
-/// thirty-minute leg neither sits nor marks AFK.
+/// thirty-minute leg neither sits nor marks AFK. Its one gate, the logout-pending byte, is not a
+/// descriptor field, so [`idle_handler`] applies it to `camp`.
 pub(crate) fn idle_action(idle: Duration, gates: IdleGates) -> IdleAction {
     if idle < AUTO_AFK_AFTER {
         // `0x482ed8 jl 0x482fbf`: all three legs sit below this.
@@ -112,7 +115,7 @@ pub(crate) fn idle_action(idle: Duration, gates: IdleGates) -> IdleAction {
         };
     }
     IdleAction {
-        sit: gates.stand_state == 0 && !gates.in_combat && !gates.mounted && !gates.following,
+        sit: gates.stand_state == 0 && !gates.in_combat && !gates.mounted && !gates.auto_moving,
         afk: !gates.on_taxi && !gates.afk,
         camp: false,
     }
@@ -129,6 +132,8 @@ pub(crate) fn idle_handler(
     commands: Res<crate::net::NetCommands>,
     mut stand: MessageWriter<crate::player::StandStateRequest>,
     follow: Res<crate::player::FollowState>,
+    approach: Res<crate::player::Approach>,
+    logout: Res<crate::ui_logout::LogoutState>,
 ) {
     let idle = time.elapsed().saturating_sub(last.0);
     if idle < AUTO_AFK_AFTER {
@@ -145,7 +150,7 @@ pub(crate) fn idle_handler(
             mounted: store.0.unit_mount_display_id() != 0,
             on_taxi: flags & crate::player::UNIT_FLAG_TAXI_FLIGHT != 0,
             afk: mirror.is_afk(),
-            following: follow.guid.is_some(),
+            auto_moving: follow.guid.is_some() || approach.active(),
         }
     });
     let action = match gates {
@@ -179,9 +184,12 @@ pub(crate) fn idle_handler(
             kind: crate::net::ChatKind::Afk,
             target: None,
             text: out.body,
+            language: None,
         });
     }
-    if action.camp {
+    // `0x482eee call 0x5ab0d0; 0x482ef5 jne`: while a logout is pending the whole leg is skipped,
+    // the line with the request, so it runs once per logout and again after a cancel.
+    if action.camp && !logout.pending() {
         if let Some(line) = strings("IDLE_MESSAGE") {
             push_system(&mut chat, line);
         }
@@ -319,7 +327,7 @@ mod tests {
                  `[0xc4d888]` non-`0xc` implies translating, which `stand_state_refused` refuses \
                  downstream. The AFK mark is untouched: it is not one of the sit's gates",
                 IdleGates {
-                    following: true,
+                    auto_moving: true,
                     ..open()
                 },
                 IdleAction {
@@ -495,6 +503,8 @@ mod tests {
             .init_resource::<ChatLog>()
             .init_resource::<LastInput>()
             .init_resource::<crate::player::FollowState>()
+            .init_resource::<crate::player::Approach>()
+            .init_resource::<crate::ui_logout::LogoutState>()
             .add_message::<crate::player::StandStateRequest>()
             .insert_resource(NetCommands(tx));
         // `LastInput` stays at zero and the clock walks forward, so "idle" is just the elapsed.
@@ -536,7 +546,7 @@ mod tests {
         assert!(
             matches!(
                 sent.as_slice(),
-                [ClientCommand::Chat { kind: crate::net::ChatKind::Afk, target: None, text }]
+                [ClientCommand::Chat { kind: crate::net::ChatKind::Afk, target: None, text, .. }]
                     if text == "Away from Keyboard"
             ),
             "{sent:?}"
@@ -595,6 +605,68 @@ mod tests {
             .is_none());
     }
 
+    /// `0x482ef5`: the leg, line and request, is skipped while the logout it asked for is pending,
+    /// and arms again once a cancel clears the byte (`0x5aaf80`). The pending byte is the real
+    /// drain's, run after the handler as the app orders it and before it as well, so the gate
+    /// holds whichever frame the byte is set in.
+    #[test]
+    fn thirty_minutes_idle_prints_and_asks_once_per_logout() {
+        use benilla_ui::script::{SessionRequest, UiScript};
+
+        for idle_first in [true, false] {
+            let (mut app, rx) = world(1_800_000, &[]);
+            app.init_resource::<crate::ui_script::ReloadUiPending>()
+                .init_resource::<crate::cinematic::Cinematic>()
+                .add_message::<AppExit>()
+                .insert_resource(crate::net::SelfGuid(Some(0x4000_0000_0000_0009)));
+            // One schedule for every frame, so any state a system keeps between frames persists.
+            let mut schedule = Schedule::default();
+            if idle_first {
+                schedule.add_systems((idle_handler, crate::ui_logout::drain_logout).chain());
+            } else {
+                schedule.add_systems((crate::ui_logout::drain_logout, idle_handler).chain());
+            }
+            let mut frame = |app: &mut App| schedule.run(app.world_mut());
+            let requests = |rx: &crossbeam_channel::Receiver<ClientCommand>| {
+                rx.try_iter()
+                    .filter(|c| matches!(c, ClientCommand::Logout))
+                    .count()
+            };
+
+            for _ in 0..60 {
+                frame(&mut app);
+            }
+            assert_eq!(
+                lines(&app).len(),
+                1,
+                "one IDLE_MESSAGE for sixty frames while the request is pending (idle first: \
+                 {idle_first})"
+            );
+            assert_eq!(requests(&rx), 1, "and one CMSG_LOGOUT_REQUEST");
+
+            // The CAMP dialog's cancel: `CancelLogout` clears the byte, and idle continues.
+            app.world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .queue_session_request(SessionRequest::CancelLogout);
+            app.world_mut()
+                .run_system_once(crate::ui_logout::drain_logout)
+                .unwrap();
+            assert!(!app
+                .world()
+                .resource::<crate::ui_logout::LogoutState>()
+                .pending());
+            for _ in 0..60 {
+                frame(&mut app);
+            }
+            assert_eq!(
+                lines(&app).len(),
+                2,
+                "the leg arms again after the cancel, and again only once"
+            );
+            assert_eq!(requests(&rx), 1, "one more request");
+        }
+    }
+
     /// Through the real system, so the descriptor decode is under test too.
     #[test]
     fn the_descriptor_bits_reach_the_gates() {
diff --git a/crates/benilla-app/src/ui_chat/input/mod.rs b/crates/benilla-app/src/ui_chat/input/mod.rs
index 12736c23..b3095a3b 100644
--- a/crates/benilla-app/src/ui_chat/input/mod.rs
+++ b/crates/benilla-app/src/ui_chat/input/mod.rs
@@ -29,12 +29,27 @@ fn target_player_name(
     names.resolve(guid, commands).map(str::to_string)
 }
 
-/// The target guid a `CMSG_TEXT_EMOTE` carries: the selection, except that an emote at yourself
-/// goes out untargeted (`0x5ef611`), so 1.12 has no self-emote sentence. Compared by entity, which
-/// agrees with the guid: [`Selection`]'s one writer sets both from one streamed entity.
-pub(super) fn emote_target(selection: &Selection, me: Option<Entity>) -> u64 {
-    match selection.guid {
-        Some(guid) if !(me.is_some() && selection.target == me) => guid,
+/// The target guid a `CMSG_TEXT_EMOTE` carries (`DoEmote`'s caller, `0x49fdb1`): the selection,
+/// unless the argument is a non-empty word not starting with `%`, which names a player through
+/// `named` (the `0x493aa0` player search) and sends guid 0 on a miss. Either way an emote at
+/// yourself goes out untargeted (`0x5ef611`), so 1.12 has no self-emote sentence. Compared by
+/// entity, which agrees with the guid: [`Selection`]'s one writer sets both from one streamed
+/// entity.
+pub(super) fn emote_target(
+    arg: Option<&str>,
+    selection: &Selection,
+    named: impl FnOnce(&str) -> Option<(Entity, u64)>,
+    me: Option<Entity>,
+) -> u64 {
+    let (entity, guid) = match arg.filter(|a| !a.is_empty() && !a.starts_with('%')) {
+        Some(name) => match named(name) {
+            Some((entity, guid)) => (Some(entity), Some(guid)),
+            None => (None, None),
+        },
+        None => (selection.target, selection.guid),
+    };
+    match guid {
+        Some(guid) if !(me.is_some() && entity == me) => guid,
         _ => 0,
     }
 }
@@ -60,6 +75,9 @@ pub(super) struct ChatProbes<'w, 's> {
     kinds: Query<'w, 's, &'static crate::net::NetEntity>,
     /// `/partytest raid` seats us as the leader, and the wire names a leader by guid.
     self_guid: Res<'w, crate::net::SelfGuid>,
+    /// Our own auto-attack target, a gate of `DoEmote`'s local play.
+    engaged: Query<'w, 's, (), (With<SelfPlayer>, With<crate::creature_anim::Engaged>)>,
+    loot_kneel: Option<Res<'w, crate::ui_loot::LootKneel>>,
 }
 
 /// What the drain hands to another subsystem's setter, bundled for the same ceiling. Chat never
@@ -70,9 +88,13 @@ pub(super) struct ChatOut<'w, 's> {
     console: Commands<'w, 's>,
     stand: MessageWriter<'w, crate::player::StandStateRequest>,
     sheath: MessageWriter<'w, crate::creature_anim::SheathRequest>,
+    /// `DoEmote`'s local play (`0x5ef660`).
+    anim: MessageWriter<'w, crate::creature_anim::EmoteAnim>,
     target: MessageWriter<'w, crate::target::TargetByNameRequest>,
     assist: MessageWriter<'w, crate::target::AssistRequest>,
     follow: MessageWriter<'w, crate::player::FollowRequest>,
+    /// `/wave <name>`'s player search, which selects nothing.
+    players: crate::target::PlayerLookup<'w, 's>,
     /// `/partytest ping` seats a group member's ping through the wire arm's `seat`.
     ping: ResMut<'w, crate::minimap::MinimapPing>,
     /// The red error line by GlobalStrings key. The system's only `UiErrorKeys` access: a second
@@ -91,7 +113,13 @@ fn engine_verbs(
     for e in script.take_emote_requests() {
         // The token is the `EmotesText.dbc` name (`EMOTE<i>_TOKEN`, "WAVE").
         match emotes.and_then(|c| c.text_id(&e.token)) {
-            Some(id) => out.push((String::new(), ParsedChat::TextEmote(id))),
+            Some(text_id) => out.push((
+                String::new(),
+                ParsedChat::TextEmote {
+                    text_id,
+                    arg: e.target,
+                },
+            )),
             None => warn!(
                 "chat: DoEmote({:?}): no EmotesText row for that token",
                 e.token
@@ -164,13 +192,15 @@ pub(super) fn drain_chat_input(
         guids,
         kinds,
         self_guid,
+        engaged,
+        loot_kneel,
     } = &probes;
     let Some(mut script) = script else {
         return;
     };
     let mut queue = engine_verbs(&mut script, emotes.as_deref());
-    // benilla's own commands, from the `SlashCmdList` entries in `ScriptLogFrame.xml` once the
-    // stock `ChatEdit_ParseText` has found no built-in, and probe lines.
+    // The dev instruments, from their host `SlashCmdList` rows once the stock `ChatEdit_ParseText`
+    // has found no built-in (dev builds), and probe lines.
     for raw in script.take_chat_input() {
         let msg = raw.trim();
         if msg.is_empty() {
@@ -183,6 +213,7 @@ pub(super) fn drain_chat_input(
                 kind: super::edit::SendType::Say.wire(),
                 target: None,
                 text: msg.to_string(),
+                language: None,
             };
             if commands.0.send(cmd).is_err() {
                 warn!("chat: not connected; line dropped");
@@ -536,11 +567,6 @@ pub(super) fn drain_chat_input(
                     let _ = commands.0.send(ClientCommand::GroupInvite { name });
                 }
             }
-            // The server judges it: a raid-typed `SMSG_GROUP_LIST`, or an
-            // `SMSG_PARTY_COMMAND_RESULT` error.
-            ParsedChat::ConvertRaid => {
-                let _ = commands.0.send(ClientCommand::GroupRaidConvert);
-            }
             ParsedChat::Uninvite { name } => {
                 if let Some(name) =
                     name.or_else(|| target_player_name(&selection, &names, &commands))
@@ -654,22 +680,25 @@ pub(super) fn drain_chat_input(
                 }
             }
             // `DoEmote` (`0x5ef560`): the gates in the client's order, then posture and packet.
-            ParsedChat::TextEmote(text_id) => {
+            ParsedChat::TextEmote { text_id, arg } => {
                 let (stand_state, flags) = self_player
                     .single()
                     .map_or((0, 0), |(_, m, _)| (m.stand_state, m.flags));
                 let swimming = flags & move_flags::SWIMMING != 0;
                 let emote_id = emotes.as_deref().and_then(|e| e.text_emote(text_id));
-                // A chat-only text emote (no Emotes.dbc row) has no flags or posture: it sends.
                 let posture = emote_id.and_then(|id| emotes.as_deref()?.posture_state(id));
-                // Gate A (`CheckEmoteEligible`, `0x47db40`) suppresses the anim and the packet,
-                // except its `0x4000` arm, which refuses out loud.
+                // `DoEmote`'s gates (`0x5ef57e`-`0x5ef5c3`): a possessed unit, then the `Emotes.dbc`
+                // row, then `CheckEmoteEligible` (`0x47db40`); only its `0x4000` arm refuses out
+                // loud. A chat-only text emote (`EmoteID` 0) reads row 0.
+                let self_unit_flags = self_store.single().map_or(0, |s| s.0.unit_flags());
                 let gate = match emotes.as_deref() {
-                    Some(e) => emote_id
-                        .and_then(|id| e.emote_flags(id))
-                        .map_or(EmoteGate::Send, |f| {
-                            emote_send_eligible(f, stand_state, swimming, flags)
-                        }),
+                    Some(e) => emote_gate(
+                        e.emote_flags(emote_id.unwrap_or(0)),
+                        self_unit_flags,
+                        stand_state,
+                        swimming,
+                        flags,
+                    ),
                     None => EmoteGate::Send,
                 };
                 // `DoEmote`'s half of the `0x4000` arm (`0x5ef5d0`): the red line only while
@@ -716,8 +745,38 @@ pub(super) fn drain_chat_input(
                         .stand
                         .write(crate::player::StandStateRequest { state: state as u8 });
                 }
+                // The play (`0x5ef660`, `0x5fe2f0` at `0x5ef66f`) is the posture branch's else: a posture emote plays no clip,
+                // and the rest play here only while moving. Its `SMSG_EMOTE` echo then finds the
+                // id armed and is skipped (`0x5fcd56`).
+                else if let (Some(anim), Ok((entity, m, _)), Ok(store)) = (
+                    emote_id.and_then(|id| emotes.as_deref()?.anim(id)),
+                    self_player.single(),
+                    self_store.single(),
+                ) {
+                    let fields = &store.0;
+                    let gate = crate::creature_anim::LocalPlay {
+                        reads_dead: fields.unit_reads_dead(),
+                        stand_state: m.stand_state,
+                        move_flags: m.flags,
+                        vertical_speed: m.vertical_speed,
+                        flying: m.flying,
+                        loot_kneel: loot_kneel.as_deref().is_some_and(|k| k.0),
+                        channeling: fields.unit_channel_spell() != 0,
+                        engaged: !engaged.is_empty(),
+                    };
+                    if crate::creature_anim::local_play_eligible(&gate) {
+                        chat_out.anim.write(crate::creature_anim::EmoteAnim {
+                            entity,
+                            anim_id: anim as u16,
+                            seq: play_seq.next(),
+                            via_player: false,
+                        });
+                    }
+                }
                 let target = emote_target(
+                    arg.as_deref(),
                     &selection,
+                    |name| chat_out.players.find(&names, name),
                     self_player.single().ok().map(|(entity, _, _)| entity),
                 );
                 match commands
@@ -799,10 +858,6 @@ pub(super) fn drain_chat_input(
             ParsedChat::Quit => {
                 script.queue_session_request(benilla_ui::script::SessionRequest::Quit)
             }
-            // The deferred rebuild `ReloadUI()` queues.
-            ParsedChat::ReloadUi => {
-                script.queue_session_request(benilla_ui::script::SessionRequest::ReloadUi)
-            }
             // Deferred to the world, since a command is `fn(&mut World, &str)`; its lines print
             // as system text.
             ParsedChat::Console { line } => {
@@ -1324,6 +1379,28 @@ pub(super) fn emote_send_eligible(
     EmoteGate::Send
 }
 
+/// `UNIT_FLAG_POSSESSED`, `UNIT_FIELD_FLAGS` bit 24: `DoEmote` returns silently for a unit that
+/// has it (`0x5ef57e`, `descriptor+0xa3 & 1`).
+const UNIT_FLAG_POSSESSED: u32 = 0x0100_0000;
+
+/// `DoEmote`'s entry gates (`0x5ef560`) in the client's order: the unit's own `UNIT_FIELD_FLAGS`
+/// (`0x5ef57e`), the `Emotes.dbc` row by `EmoteID` (`0x5ef59c`-`0x5ef5b3`; `None` is a missing
+/// row, which returns), then `CheckEmoteEligible` over the row's flags.
+pub(super) fn emote_gate(
+    row_flags: Option<u32>,
+    unit_flags: u32,
+    stand_state: u8,
+    swimming: bool,
+    move_flags: u32,
+) -> EmoteGate {
+    match row_flags {
+        Some(flags) if unit_flags & UNIT_FLAG_POSSESSED == 0 => {
+            emote_send_eligible(flags, stand_state, swimming, move_flags)
+        }
+        _ => EmoteGate::Suppressed,
+    }
+}
+
 /// `PLAYER_FLAGS_DND` (`0x4`) off our live descriptor. Live, not mirrored, as in the reference
 /// (`0x49f3f0`): AFK keeps an optimistic global and DND nothing, so a second `/dnd` before the
 /// server's update re-marks where a second `/afk` clears.
@@ -1342,7 +1419,7 @@ fn auto_clear_afk(cvars: &crate::cvars::Cvars) -> bool {
 
 /// Turn `SendChatMessage` calls into sends. No slash grammar runs here: an addon sending
 /// `"/dance"` says six characters. An unknown chat-type token prints a system line and sends
-/// nothing.
+/// nothing; an empty line of any other type but AFK and DND sends nothing and prints nothing.
 pub(super) fn drain_addon_chat_sends(
     script: Option<NonSendMut<benilla_ui::script::UiScript>>,
     commands: Res<NetCommands>,
@@ -1371,6 +1448,11 @@ pub(super) fn drain_addon_chat_sends(
             ));
             continue;
         };
+        // An empty line of any type but AFK and DND ends the call here, after the type check and
+        // ahead of the target checks, the AFK clear and the tutorial acknowledge (`0x49f2a1`).
+        if send.ends_at_empty_line() {
+            continue;
+        }
         // A channel target is a slot number, sent as that slot's name; with no such slot the call
         // ends here (`0x49f4ea`), ahead of the AFK clear and the tutorial acknowledge.
         if kind == super::edit::SendType::Channel {
@@ -1414,6 +1496,7 @@ pub(super) fn drain_addon_chat_sends(
                     kind: crate::net::ChatKind::Afk,
                     target: None,
                     text: String::new(),
+                    language: None,
                 });
             }
         }
@@ -1442,6 +1525,12 @@ pub(super) fn drain_addon_chat_sends(
             kind: wire,
             target: send.target,
             text,
+            // Every type but AFK carries the language the binding resolved (`0x49f6f9`); the AFK
+            // arm's own builder, `SetAFK` (`0x5eb740`), never reads the argument.
+            language: match wire {
+                crate::net::ChatKind::Afk => None,
+                _ => send.language,
+            },
         };
         if commands.0.send(cmd).is_err() {
             warn!("chat: not connected; addon line dropped");
diff --git a/crates/benilla-app/src/ui_chat/input/parse.rs b/crates/benilla-app/src/ui_chat/input/parse.rs
index 6094d78d..48b198c6 100644
--- a/crates/benilla-app/src/ui_chat/input/parse.rs
+++ b/crates/benilla-app/src/ui_chat/input/parse.rs
@@ -1,8 +1,8 @@
 //! What a submitted slash line means: [`parse_line`] resolves it through the boot-built command
 //! table ([`super::super::commands`], the shipped `GlobalStrings.lua` aliases) into a
-//! [`ParsedChat`] for [`super`] to execute. A typed line reaches it only through benilla's own
-//! `SlashCmdList` entries, once the stock `ChatEdit_ParseText` finds no built-in; a probe's line
-//! reaches it directly.
+//! [`ParsedChat`] for [`super`] to execute. A typed line reaches it only through the dev
+//! instruments' `SlashCmdList` rows (dev builds), once the stock `ChatEdit_ParseText` finds no
+//! built-in; a probe's line reaches it directly.
 
 use crate::ui_chat::commands::{Command, DevCmd, SlashCommands, SlashIndex};
 
@@ -49,13 +49,10 @@ pub(in crate::ui_chat) enum ParsedChat {
     Liquid,
     /// `/reaction [name]`: every input and rung of the reaction ladder for one unit.
     Reaction { name: Option<String> },
-    /// `/convertraid` (`CMSG_GROUP_RAID_CONVERT`), benilla's own: 1.12 converts only from the
-    /// RaidFrame's Convert button.
-    ConvertRaid,
     /// `/help`.
     Help,
     /// An `EmotesText` command (`/wave` is 101), sent as `CMSG_TEXT_EMOTE` at the selection.
-    TextEmote(u32),
+    TextEmote { text_id: u32, arg: Option<String> },
     /// A channel verb the stock handler parsed and the VM queued; never from [`parse_line`].
     Channel(benilla_ui::script::ChannelCommand),
     /// `/castvis`: a locally synthesized [`crate::creature_anim::CastEvent`], at the selection
@@ -102,8 +99,6 @@ pub(in crate::ui_chat) enum ParsedChat {
     Follow { name: Option<String> },
     /// `/macrohelp`: `ChatFrame_DisplayMacroHelpText`'s five `MACRO_HELP_TEXT_LINE`s.
     MacroHelp,
-    /// `/reload`, benilla's own: the in-world rebuild `ReloadUI()` queues.
-    ReloadUi,
     /// A `/console` line the CVar store did not consume, for the `ConsoleCommand` registry
     /// ([`crate::console::execute`]).
     Console { line: String },
@@ -133,7 +128,10 @@ pub(in crate::ui_chat) fn parse_line(table: &SlashCommands, line: &str) -> Parse
     match table.lookup(cmd) {
         Some(Command::Slash(index)) => slash_command(index, args),
         // The alias table did the `DoEmote(token)` resolve at boot: `/lol` arrives as LAUGH's id.
-        Some(Command::Emote { text_id }) => ParsedChat::TextEmote(text_id),
+        Some(Command::Emote { text_id }) => ParsedChat::TextEmote {
+            text_id,
+            arg: (!args.is_empty()).then(|| args.to_string()),
+        },
         Some(Command::Dev(dev)) => dev_command(dev, args),
         // `HELP_TEXT_SIMPLE`'s case, after the drain offers the line to `SlashCmdList`.
         None => ParsedChat::Unknown,
@@ -288,18 +286,6 @@ fn slash_command(index: SlashIndex, args: &str) -> ParsedChat {
             body: "ShowMacroFrame()".into(),
         },
         S::MacroHelp => ParsedChat::MacroHelp,
-        // `/reload` is the rebuild `/console reloadUI` runs (`0x4035f0`, which reads no arguments).
-        S::ReloadUi => ParsedChat::ReloadUi,
-        S::ConvertRaid => ParsedChat::ConvertRaid,
-        // `/errors`, benilla's own: toggles the script error log, a FrameXML window;
-        // `/errors clear` empties it.
-        S::ScriptErrors => ParsedChat::Lua {
-            body: if args.trim().eq_ignore_ascii_case("clear") {
-                "BenillaScriptLog_Clear()".into()
-            } else {
-                "BenillaScriptLog_Toggle()".into()
-            },
-        },
         // `SlashCmdList["CONSOLE"]` (`ChatFrame.lua:671`) is `ConsoleExec(msg)`. A typed line runs
         // it; one that skipped the edit box calls the same verb, so a CVar line writes the CVar
         // and anything else comes back through `engine_verbs`.
diff --git a/crates/benilla-app/src/ui_chat/logging.rs b/crates/benilla-app/src/ui_chat/logging.rs
index 1cfe12b8..bf27ae42 100644
--- a/crates/benilla-app/src/ui_chat/logging.rs
+++ b/crates/benilla-app/src/ui_chat/logging.rs
@@ -1,9 +1,9 @@
 //! The `LoggingChat`/`LoggingCombat` files, `WoWChatLog.txt` and `WoWCombatLog.txt`: the stock
 //! `/chatlog` and `/combatlog` flip the VM's flag and print the notice (`ChatFrame.lua:675-695`);
-//! this appends each line as the window shows it, stamped `M/D HH:MM:SS.mmm` in UTC, as the
-//! process has no local time zone. Deviation: the files live in `benilla-config/Logs/`, not the
-//! install's `Logs`, because the install is read-only. A file that fails to open leaves the flag
-//! set: Lua already printed "enabled".
+//! this appends each line as the window shows it, stamped `M/D HH:MM:SS.mmm` in local time.
+//! Deviation: the files live in `benilla-config/Logs/`, not the install's `Logs`, because the
+//! install is read-only. A file that fails to open leaves the flag set: Lua already printed
+//! "enabled".
 
 use std::io::Write as _;
 
@@ -71,36 +71,59 @@ impl ChatLogFiles {
     }
 }
 
-/// `M/D HH:MM:SS.mmm` of now, UTC.
-fn stamp() -> String {
+/// `M/D HH:MM:SS.mmm` of now, local time: the reference's log-line stamp
+/// (`"%u/%u %02u:%02u:%02u.%03u  "`, `0x866aa0`, from `GetLocalTime` at `0x65a871`), which
+/// `crate::ui_script::load_log` shares.
+pub(crate) fn stamp() -> String {
+    let [month, day, hour, min, sec, milli] = local_now();
+    format!("{month}/{day} {hour:02}:{min:02}:{sec:02}.{milli:03}")
+}
+
+/// `[month, day, hour, minute, second, millisecond]` of now, from the reference's `GetLocalTime`.
+#[cfg(windows)]
+fn local_now() -> [u32; 6] {
+    use windows_sys::Win32::{Foundation::SYSTEMTIME, System::SystemInformation::GetLocalTime};
+    // SAFETY: `GetLocalTime` fully writes the out-param and reads nothing from it; zeroed is
+    // valid for a struct of plain integers.
+    let t = unsafe {
+        let mut t = std::mem::zeroed::<SYSTEMTIME>();
+        GetLocalTime(&mut t);
+        t
+    };
+    [
+        t.wMonth,
+        t.wDay,
+        t.wHour,
+        t.wMinute,
+        t.wSecond,
+        t.wMilliseconds,
+    ]
+    .map(u32::from)
+}
+
+/// `[month, day, hour, minute, second, millisecond]` of now, in the process's time zone.
+#[cfg(unix)]
+fn local_now() -> [u32; 6] {
     let now = std::time::SystemTime::now()
         .duration_since(std::time::UNIX_EPOCH)
         .unwrap_or_default();
-    let secs = now.as_secs();
-    let (_, month, day) = civil_from_days((secs / 86_400) as i64);
-    let of_day = secs % 86_400;
-    format!(
-        "{month}/{day} {:02}:{:02}:{:02}.{:03}",
-        of_day / 3600,
-        (of_day / 60) % 60,
-        of_day % 60,
-        now.subsec_millis()
-    )
+    let [month, day, hour, min, sec] = local_fields(now.as_secs() as i64);
+    [month, day, hour, min, sec, now.subsec_millis()]
 }
 
-/// Days since 1970-01-01 → `(year, month, day)`, proleptic Gregorian: the `civil_from_days`
-/// algorithm.
-fn civil_from_days(z: i64) -> (i64, u32, u32) {
-    let z = z + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let y = yoe + era * 400;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = (doy - (153 * mp + 2) / 5 + 1) as u32;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 } as u32;
-    (if m <= 2 { y + 1 } else { y }, m, d)
+/// `[month, day, hour, minute, second]` of an epoch second, through `localtime_r`; UTC when that
+/// fails, which POSIX allows only on `EOVERFLOW`, a year past `int`.
+#[cfg(unix)]
+fn local_fields(secs: i64) -> [u32; 5] {
+    let time = secs as libc::time_t;
+    // SAFETY: `localtime_r` fully writes the out-param and reads nothing from it; zeroed is valid
+    // for its integers and its nullable zone-name pointer.
+    let mut tm = unsafe { std::mem::zeroed::<libc::tm>() };
+    if unsafe { libc::localtime_r(&time, &mut tm) }.is_null() {
+        let c = benilla_ui::civil::from_unix(secs);
+        return [c.month, c.day, c.hour, c.min, c.sec];
+    }
+    [tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec].map(|v| v as u32)
 }
 
 /// The VM's two flags → the two files, on the frame either flag moves.
@@ -127,15 +150,24 @@ pub(super) fn plugin(app: &mut App) {
     );
 }
 
-#[cfg(test)]
+#[cfg(all(test, unix))]
 mod tests {
-    use super::civil_from_days;
+    use crate::local_state::test_env::{EnvGuard, ENV_LOCK};
 
+    extern "C" {
+        fn tzset();
+    }
+
+    /// Under a zone 5:45 east of UTC, the epoch reads 05:45, and 20:00 UTC is past local midnight.
     #[test]
-    fn the_civil_conversion_lands_on_known_dates() {
-        assert_eq!(civil_from_days(0), (1970, 1, 1));
-        assert_eq!(civil_from_days(19_723), (2024, 1, 1));
-        assert_eq!(civil_from_days(20_700), (2026, 9, 4));
-        assert_eq!(civil_from_days(-1), (1969, 12, 31));
+    fn the_stamp_fields_follow_the_local_zone() {
+        let _lock = ENV_LOCK.lock().unwrap_or_else(|e| e.into_inner());
+        let tz = EnvGuard::set("TZ", "NPT-05:45");
+        // SAFETY: `tzset` rereads `TZ`; the lock keeps other env tests out.
+        unsafe { tzset() };
+        let fields = [super::local_fields(0), super::local_fields(72_000)];
+        drop(tz);
+        unsafe { tzset() };
+        assert_eq!(fields, [[1, 1, 5, 45, 0], [1, 2, 1, 45, 0]]);
     }
 }
diff --git a/crates/benilla-app/src/ui_chat/notice_tests.rs b/crates/benilla-app/src/ui_chat/notice_tests.rs
new file mode 100644
index 00000000..66033912
--- /dev/null
+++ b/crates/benilla-app/src/ui_chat/notice_tests.rs
@@ -0,0 +1,253 @@
+//! The guid-tail channel notices through [`super::feed::feed_chat`] to the stock chat frame: the
+//! reference hands every notice's channel name to its composer `0x49a870` (the cached leg
+//! `0x49c59f`-`0x49c5b0`, the name-query leg `0x49cfb4`-`0x49cfc1`), which numbers it off the
+//! joined channels (`0x49aa1e`-`0x49aa48`) and fills arg7-arg9 from that record (`0x49b10c`-
+//! `0x49b12a`). Without that stamp the stock filter (`ChatFrame.lua:1373-1392`) prints nothing.
+
+use bevy::ecs::system::RunSystemOnce;
+use bevy::prelude::*;
+
+use benilla_protocol::messages::{channel_notice as n, ChannelNoticeTail};
+use benilla_ui::script::UiScript;
+
+use super::tests::{chat_vm, lines_in_window, SPY};
+
+const ANN: u64 = 0x11;
+const BOB: u64 = 0x12;
+
+/// A world holding everything [`super::feed::feed_chat`] reads, the stock chat stack in its VM,
+/// `ChatFrame1` carrying `Mychan`, and our slots `World`, `Trade - City` and `Mychan` (3).
+struct Feed {
+    world: World,
+    /// The outbound side of `NetCommands`, where the name queries land.
+    sent: crossbeam_channel::Receiver<crate::net::ClientCommand>,
+}
+
+impl Feed {
+    fn new() -> Self {
+        let s = chat_vm();
+        s.run(SPY).unwrap();
+        s.run(
+            r#"
+            for _, e in { "CHAT_MSG_CHANNEL_JOIN", "CHAT_MSG_CHANNEL_LEAVE",
+                          "CHAT_MSG_CHANNEL_NOTICE", "CHAT_MSG_CHANNEL_NOTICE_USER" } do
+                BenillaChatSpy:RegisterEvent(e)
+            end
+            -- The text the stock handler hands the window, links and all.
+            local add = ChatFrame1.AddMessage
+            ChatFrame1.AddMessage = function(self, text, r, g, b, id)
+                LastAdded = text
+                return add(self, text, r, g, b, id)
+            end
+            -- `/join Mychan`'s window half (`ChatFrame.lua`'s `ChatFrame_AddChannel`).
+            ChatFrame_AddChannel(ChatFrame1, "Mychan")
+        "#,
+        )
+        .unwrap();
+
+        let mut channels = super::edit::ChannelState::default();
+        for name in ["World", "Trade - City", "Mychan"] {
+            channels.claim_slot(name);
+        }
+        let (tx, sent) = crossbeam_channel::unbounded();
+
+        let mut world = World::new();
+        world.insert_non_send_resource(s);
+        world.insert_resource(super::ChatLog::default());
+        world.insert_resource(super::frames::ChatWindows::default());
+        world.insert_resource(channels);
+        world.insert_resource(crate::names::NameCache::default());
+        world.insert_resource(crate::chat_bubble::BubbleQueue::default());
+        world.insert_resource(crate::chat_bubble::BubbleConfig::default());
+        world.insert_resource(crate::creature_anim::GestureQueue::default());
+        world.insert_resource(crate::net::NetCommands(tx));
+        world.insert_resource(crate::net::SelfGuid::default());
+        world.insert_resource(crate::net::GuidIndex::default());
+        world.insert_resource(crate::world_state::WorldStates::default());
+        world.insert_resource(super::language::ChatLanguages::default());
+        world.insert_resource(crate::items::Items::default());
+        world.insert_resource(crate::text_filter::TextFilter::default());
+        world.insert_resource(crate::text_filter::TextFilterSwitches::default());
+        Feed { world, sent }
+    }
+
+    fn name(&mut self, guid: u64, name: &str) {
+        self.world
+            .resource_mut::<crate::names::NameCache>()
+            .insert_player(guid, name.into(), None);
+    }
+
+    fn push(&mut self, notice: u8, channel: &str, tail: ChannelNoticeTail) {
+        self.world
+            .resource_mut::<super::ChatLog>()
+            .push_channel_notice(notice, channel.into(), &tail);
+    }
+
+    /// One frame of the drain.
+    fn drain(&mut self) {
+        self.world.run_system_once(super::feed::feed_chat).unwrap();
+    }
+
+    fn script(&self) -> &UiScript {
+        self.world.non_send_resource::<UiScript>()
+    }
+
+    fn lines(&self) -> i64 {
+        lines_in_window(self.script())
+    }
+
+    fn last_added(&self) -> String {
+        self.script()
+            .eval::<String>("return LastAdded or ''")
+            .unwrap()
+    }
+
+    fn spy(&self) -> (String, String) {
+        let s = self.script();
+        (
+            s.eval::<String>("return SpyEvent").unwrap(),
+            s.eval::<String>("return SpyLine").unwrap(),
+        )
+    }
+}
+
+/// Another member's join, name cached: arg4 `"3. Mychan"`, arg7 0 (a custom channel has no
+/// ChannelID), arg8 3 and arg9 `"Mychan"`, and the stock frame prints the line.
+#[test]
+fn a_members_join_reaches_the_stock_frame_numbered() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut f = Feed::new();
+    f.name(ANN, "Ann");
+    let before = f.lines();
+    f.push(n::JOINED, "Mychan", ChannelNoticeTail::Guid(ANN));
+    f.drain();
+
+    assert_eq!(f.lines(), before + 1, "the stock filter found the channel");
+    // `CHAT_CHANNEL_JOIN_GET` behind the `[arg4] ` prefix (`ChatFrame.lua:1451`, `:1463-1465`).
+    assert_eq!(
+        f.last_added(),
+        "[3. Mychan] |Hplayer:Ann|h[Ann]|h joined channel."
+    );
+    assert_eq!(
+        f.spy(),
+        (
+            "CHAT_MSG_CHANNEL_JOIN".to_string(),
+            "|Ann||3. Mychan|||0|3|Mychan|0".to_string()
+        )
+    );
+    assert!(f.script().errors().is_empty(), "{:?}", f.script().errors());
+}
+
+/// A join whose name is not cached waits on the name query, then prints stamped, as the
+/// reference's queued node carries the channel name to the callback (`0x49cfb4`-`0x49cfc1`).
+#[test]
+fn a_join_resolved_after_its_name_query_is_stamped_too() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut f = Feed::new();
+    let before = f.lines();
+    f.push(n::LEFT, "Mychan", ChannelNoticeTail::Guid(ANN));
+    f.drain();
+    assert_eq!(f.lines(), before, "held for the name");
+    assert!(
+        matches!(
+            f.sent.try_recv(),
+            Ok(crate::net::ClientCommand::NameQuery { guid: ANN })
+        ),
+        "and the name was asked for"
+    );
+
+    f.name(ANN, "Ann");
+    f.drain();
+    assert_eq!(
+        f.spy(),
+        (
+            "CHAT_MSG_CHANNEL_LEAVE".to_string(),
+            "|Ann||3. Mychan|||0|3|Mychan|0".to_string()
+        )
+    );
+    assert_eq!(f.lines(), before + 1);
+    assert_eq!(
+        f.last_added(),
+        "[3. Mychan] |Hplayer:Ann|h[Ann]|h left channel."
+    );
+}
+
+/// The owner change and a kick, `CHANNEL_NOTICE_USER` lines of one and two names.
+#[test]
+fn owner_change_and_kick_notices_print() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut f = Feed::new();
+    f.name(ANN, "Ann");
+    f.name(BOB, "Bob");
+
+    let before = f.lines();
+    f.push(n::OWNER_CHANGED, "Mychan", ChannelNoticeTail::Actor(BOB));
+    f.drain();
+    assert_eq!(
+        f.spy(),
+        (
+            "CHAT_MSG_CHANNEL_NOTICE_USER".to_string(),
+            "OWNER_CHANGED|Bob||3. Mychan|||0|3|Mychan|0".to_string()
+        )
+    );
+    assert_eq!(f.lines(), before + 1);
+    assert_eq!(f.last_added(), "[3. Mychan] Owner changed to Bob.");
+
+    f.push(
+        n::PLAYER_KICKED,
+        "Mychan",
+        ChannelNoticeTail::Actors {
+            target: ANN,
+            source: BOB,
+        },
+    );
+    f.drain();
+    assert_eq!(f.lines(), before + 2);
+    assert_eq!(f.last_added(), "[3. Mychan] Player Ann kicked by Bob.");
+    assert!(f.script().errors().is_empty(), "{:?}", f.script().errors());
+}
+
+/// An invite names a channel we are not in, so it stays unstamped (the miss leg `0x49aa86`,
+/// `0x49b12f`) and prints only through the stock filter's `INVITE` exemption (`ChatFrame.lua:1374`).
+#[test]
+fn an_invite_to_a_channel_we_are_not_in_still_prints() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut f = Feed::new();
+    f.name(ANN, "Ann");
+    let before = f.lines();
+    f.push(n::INVITE, "Otherchan", ChannelNoticeTail::Actor(ANN));
+    f.drain();
+    assert_eq!(
+        f.spy().1,
+        "INVITE|Ann||Otherchan|||0|0||0",
+        "no record, so the bare name and zeroes"
+    );
+    assert_eq!(f.lines(), before + 1);
+    assert_eq!(
+        f.last_added(),
+        "Ann has invited you to join the channel 'Otherchan'."
+    );
+}
+
+/// Our own join, a notice with no guid tail, goes the ready-event path and still prints once.
+#[test]
+fn our_own_join_notice_is_unchanged() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut f = Feed::new();
+    let before = f.lines();
+    f.push(
+        n::YOU_JOINED,
+        "Mychan",
+        ChannelNoticeTail::YouJoined { flags: 0 },
+    );
+    f.drain();
+    assert_eq!(
+        f.spy(),
+        (
+            "CHAT_MSG_CHANNEL_NOTICE".to_string(),
+            "YOU_JOINED|||3. Mychan|||0|3|Mychan|0".to_string()
+        )
+    );
+    assert_eq!(f.lines(), before + 1);
+    assert_eq!(f.last_added(), "Joined Channel: [3. Mychan]");
+}
diff --git a/crates/benilla-app/src/ui_chat/tests.rs b/crates/benilla-app/src/ui_chat/tests.rs
index 9eaa0046..27c39408 100644
--- a/crates/benilla-app/src/ui_chat/tests.rs
+++ b/crates/benilla-app/src/ui_chat/tests.rs
@@ -1,5 +1,5 @@
 use super::event::{default_color, ChatEvent, ChatEventKind as K};
-use super::input::{emote_send_eligible, emote_target, EmoteGate, ParsedChat};
+use super::input::{emote_gate, emote_send_eligible, emote_target, EmoteGate, ParsedChat};
 
 thread_local! {
     /// The shipped `GlobalStrings.lua`, run in a VM once per test thread; built lazily, so a
@@ -163,22 +163,62 @@ fn emoting_at_your_own_selection_sends_an_untargeted_emote() {
     let sel = Selection {
         target: Some(me),
         guid: Some(0xdead_beef),
+        ..Default::default()
     };
-    assert_eq!(emote_target(&sel, Some(me)), 0);
+    assert_eq!(emote_target(None, &sel, no_name, Some(me)), 0);
 
     let sel = Selection {
         target: Some(them),
         guid: Some(0xdead_beef),
+        ..Default::default()
     };
-    assert_eq!(emote_target(&sel, Some(me)), 0xdead_beef);
+    assert_eq!(emote_target(None, &sel, no_name, Some(me)), 0xdead_beef);
 
     // No selection is untargeted, and with no self entity yet a selection goes out untouched.
-    assert_eq!(emote_target(&Selection::default(), Some(me)), 0);
+    assert_eq!(
+        emote_target(None, &Selection::default(), no_name, Some(me)),
+        0
+    );
     let sel = Selection {
         target: Some(them),
         guid: Some(0xdead_beef),
+        ..Default::default()
     };
-    assert_eq!(emote_target(&sel, None), 0xdead_beef);
+    assert_eq!(emote_target(None, &sel, no_name, None), 0xdead_beef);
+}
+
+fn no_name(_: &str) -> Option<(bevy::prelude::Entity, u64)> {
+    None
+}
+
+/// `0x49fdb1`: a word not starting with `%` names a player and replaces the selection; a miss is
+/// guid 0; no argument or a `%` word is the selection.
+#[test]
+fn an_emote_argument_targets_the_named_player_and_not_the_selection() {
+    use crate::target::Selection;
+    use bevy::prelude::Entity;
+
+    let me = Entity::from_raw_u32(7).unwrap();
+    let bob = Entity::from_raw_u32(9).unwrap();
+    let sel = Selection {
+        target: Some(Entity::from_raw_u32(11).unwrap()),
+        guid: Some(0x5e1),
+        ..Default::default()
+    };
+    let find = |n: &str| (n == "Bob").then_some((bob, 0xb0b));
+    assert_eq!(emote_target(Some("Bob"), &sel, find, Some(me)), 0xb0b);
+    assert_eq!(
+        emote_target(Some("Nobody"), &sel, find, Some(me)),
+        0,
+        "a miss is untargeted"
+    );
+    for arg in [None, Some(""), Some("%t"), Some("%x")] {
+        let panics = |_: &str| -> Option<(Entity, u64)> { panic!("no search for {arg:?}") };
+        assert_eq!(emote_target(arg, &sel, panics, Some(me)), 0x5e1, "{arg:?}");
+    }
+    // Naming yourself is the self-target edge: untargeted.
+    let own = |_: &str| Some((me, 0x111));
+    assert_eq!(emote_target(Some("Me"), &sel, own, Some(me)), 0);
 }
 
 #[test]
@@ -370,25 +410,25 @@ fn channel_notices_compose_by_the_notice_law() {
 // ── the Lua face: the CHAT_MSG_* fire ───────────────────────────────────────────────────────────
 
 /// A fresh VM with the chat stack the app loads, so `ChatFrame1` is the real window.
-fn chat_vm() -> benilla_ui::script::UiScript {
+pub(super) fn chat_vm() -> benilla_ui::script::UiScript {
     let mut s = benilla_ui::script::UiScript::new().unwrap();
     // The chat tabs call the dropdown kit (`CloseDropDownMenus` on a click), which reads
-    // `TOOLTIP_DEFAULT_COLOR`: both load ahead of ChatFrame.xml, as in `benilla.toc`.
+    // `TOOLTIP_DEFAULT_COLOR`: both load ahead of ChatFrame.xml, as in `FrameXML.toc`.
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
         "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         "Interface\\FrameXML\\UIPanelTemplates.lua",
         "Interface\\FrameXML\\UIPanelTemplates.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\ChatFrame.xml",
         "Interface\\FrameXML\\FloatingChatFrame.xml",
     ] {
         crate::ui_script::load_ui_for_test(&s, file);
@@ -401,7 +441,7 @@ fn chat_vm() -> benilla_ui::script::UiScript {
 
 /// An addon that records a `CHAT_MSG_*` fire: the count, the event and `arg1..arg10` joined with
 /// `|`, which raises on a `nil` in any slot.
-const SPY: &str = r#"
+pub(super) const SPY: &str = r#"
     SpyN, SpyEvent, SpyLine = 0, "", ""
     Spy = CreateFrame("Frame", "BenillaChatSpy")
     Spy:SetScript("OnEvent", function()
@@ -413,7 +453,7 @@ const SPY: &str = r#"
 "#;
 
 /// How many lines `ChatFrame1` is holding (`GetNumMessages`).
-fn lines_in_window(s: &benilla_ui::script::UiScript) -> i64 {
+pub(super) fn lines_in_window(s: &benilla_ui::script::UiScript) -> i64 {
     s.eval::<i64>("return ChatFrame1:GetNumMessages()").unwrap()
 }
 
@@ -1185,16 +1225,24 @@ fn action_commands_parse() {
     );
 }
 
+fn emote(text_id: u32, arg: Option<&str>) -> ParsedChat {
+    ParsedChat::TextEmote {
+        text_id,
+        arg: arg.map(str::to_string),
+    }
+}
+
 #[test]
 fn emote_aliases_resolve_through_the_table() {
     let _data = benilla_formats::wow_data_or_skip!();
     let t = stub_table();
     let parse_line = |line: &str| super::input::parse_line(&t, line);
-    assert_eq!(parse_line("/wave"), ParsedChat::TextEmote(101));
+    assert_eq!(parse_line("/wave"), emote(101, None));
     // An alias that is not its token's `EmotesText` name resolves too, as `/lol` (LAUGH) does.
-    assert_eq!(parse_line("/hello"), ParsedChat::TextEmote(101));
+    assert_eq!(parse_line("/hello"), emote(101, None));
     // An emote takes an argument (`DoEmote(token, msg)`): the command is the first word only.
-    assert_eq!(parse_line("/wave Bob"), ParsedChat::TextEmote(101));
+    assert_eq!(parse_line("/wave Bob"), emote(101, Some("Bob")));
+    assert_eq!(parse_line("/wave %t"), emote(101, Some("%t")));
     assert_eq!(parse_line("/nosuch"), ParsedChat::Unknown);
 }
 
@@ -1326,7 +1374,7 @@ fn real_alias_table_resolves_the_shipped_commands() {
     let parse_line = |line: &str| super::input::parse_line(&table, line);
 
     // `/sit` is EmotesText 86, whose `Emotes.dbc` row 13 (STATE_SIT) sets stand state 1.
-    assert_eq!(parse_line("/sit"), ParsedChat::TextEmote(86));
+    assert_eq!(parse_line("/sit"), emote(86, None));
     assert_eq!(
         cat.text_emote(86).and_then(|e| cat.posture_state(e)),
         Some(1)
@@ -1338,7 +1386,7 @@ fn real_alias_table_resolves_the_shipped_commands() {
         ("/liedown", 3),
         ("/kneel", 8),
     ] {
-        let ParsedChat::TextEmote(text_id) = parse_line(line) else {
+        let ParsedChat::TextEmote { text_id, .. } = parse_line(line) else {
             panic!("{line} is an emote");
         };
         let posture = cat.text_emote(text_id).and_then(|e| cat.posture_state(e));
@@ -1360,7 +1408,7 @@ fn real_alias_table_resolves_the_shipped_commands() {
         "/strong",
     ] {
         assert!(
-            matches!(parse_line(line), ParsedChat::TextEmote(_)),
+            matches!(parse_line(line), ParsedChat::TextEmote { .. }),
             "{line} resolves to an emote"
         );
     }
@@ -1434,7 +1482,11 @@ fn real_alias_table_resolves_the_shipped_commands() {
         );
     }
     assert_eq!(parse_line("/macrohelp"), ParsedChat::MacroHelp);
-    assert_eq!(parse_line("/convertraid"), ParsedChat::ConvertRaid);
+    // 1.12 has none of these: `/convertraid` (the Raid tab's button converts), and benilla's
+    // `/reload` and `/errors`, which are its layer's `SlashCmdList` rows, not this table's.
+    for line in ["/convertraid", "/reload", "/errors", "/err"] {
+        assert_eq!(parse_line(line), ParsedChat::Unknown, "{line}");
+    }
     // `/console` from a line that skipped the stock edit box forwards to the stock handler's verb.
     assert_eq!(
         parse_line("/console fpsJournal 1"),
@@ -1473,9 +1525,8 @@ fn real_alias_table_resolves_the_shipped_commands() {
         }
     }
     // The shipped surface: 68 distinct aliases over 36 `SlashCmdList` indices and 225 emote
-    // commands over 169 `EmotesText` names (aliases repeat; EMOTE27 "UNUSED" has no row). Then
-    // benilla's own `/reload`, `/errors`, `/err` and `/convertraid`, which are not 1.12 commands,
-    // in every build, and 7 instrument aliases, in dev builds only.
+    // commands over 169 `EmotesText` names (aliases repeat; EMOTE27 "UNUSED" has no row), then 7
+    // instrument aliases, in dev builds only.
     let instruments = if crate::run_mode::dev_affordances() {
         7
     } else {
@@ -1483,8 +1534,8 @@ fn real_alias_table_resolves_the_shipped_commands() {
     };
     assert_eq!(
         table.counts(),
-        (68, 225, 4, instruments),
-        "(slash, emote, benilla addition, instrument) aliases"
+        (68, 225, instruments),
+        "(slash, emote, instrument) aliases"
     );
 }
 
@@ -1560,6 +1611,52 @@ const CHEER: u32 = 0x0800;
 const SALUTE: u32 = 0x0800;
 const LAUGH: u32 = 0x0980;
 
+/// `0x5ef57e`: a unit with `UNIT_FLAG_POSSESSED` (`UNIT_FIELD_FLAGS & 0x01000000`) refuses every
+/// emote, silently; a missing `Emotes.dbc` row returns too (`0x5ef5b1`).
+#[test]
+fn a_possessed_unit_or_a_missing_row_refuses_the_emote() {
+    assert_eq!(emote_gate(Some(0), 0, 0, false, 0), EmoteGate::Send);
+    assert_eq!(
+        emote_gate(Some(0), 0x0100_0000, 0, false, 0),
+        EmoteGate::Suppressed
+    );
+    assert_eq!(
+        emote_gate(Some(0), 0x0100_0008, 0, false, 0),
+        EmoteGate::Suppressed
+    );
+    assert_eq!(
+        emote_gate(Some(0), 0x0200_0000, 0, false, 0),
+        EmoteGate::Send,
+        "a neighbour bit"
+    );
+    assert_eq!(emote_gate(None, 0, 0, false, 0), EmoteGate::Suppressed);
+}
+
+/// A chat-only text emote has `EmoteID` 0, so `DoEmote` reads `Emotes.dbc` row 0 (flags 0), which
+/// lacks `0x200`: dead (7) and asleep (3) refuse it, as they refuse a `/wave` (`0x47db8e`).
+#[test]
+fn a_chat_only_emote_reads_row_zero_and_is_refused_dead_or_asleep() {
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    let cat = benilla_formats::load_emote_sound_catalog(&mut chain).expect("emote catalog");
+    let smile = cat.text_id("smile").expect("SMILE");
+    assert_eq!(cat.text_emote(smile), None, "SMILE is chat-only");
+    let row = cat.emote_flags(cat.text_emote(smile).unwrap_or(0));
+    assert_eq!(row, Some(0), "row 0, no flags");
+    assert_eq!(
+        emote_gate(row, 0, 7, false, 0),
+        EmoteGate::Suppressed,
+        "dead"
+    );
+    assert_eq!(
+        emote_gate(row, 0, 3, false, 0),
+        EmoteGate::Suppressed,
+        "asleep"
+    );
+    assert_eq!(emote_gate(row, 0, 0, false, 0), EmoteGate::Send, "standing");
+    assert_eq!(emote_gate(row, 0, 1, false, 0), EmoteGate::Send, "sitting");
+}
+
 #[test]
 fn seated_stand_required_emotes_are_suppressed() {
     let _data = benilla_formats::wow_data_or_skip!();
@@ -1818,6 +1915,42 @@ fn the_talk_gesture_reads_the_plaintext_not_the_garbled_line() {
     );
 }
 
+/// `0x49d7f7`: a speaker whose `UNIT_FIELD_FLAGS` hold `0x20000000` (Polymorph, Kidney Shot, ...)
+/// plays no talk gesture on the immediate path; the copies behind a name query (`0x49ccc0`,
+/// `0x49d230`) have no such test.
+#[test]
+fn a_speaker_that_cannot_animate_queues_no_talk_gesture() {
+    use super::feed::gesture_prevented;
+    use crate::creature_anim::select_gesture;
+    use benilla_protocol::messages::CHAT_MSG_SAY;
+
+    let laugh_words = |n: u32| (n == 1).then(|| "lol".to_string());
+    let speak = |tries: u16, flags: Option<u32>| {
+        select_gesture(CHAT_MSG_SAY, "lol", laugh_words)
+            .filter(|_| !gesture_prevented(tries, flags))
+            .into_iter()
+            .count()
+    };
+    assert_eq!(speak(0, Some(0x2000_0000)), 0, "a polymorphed speaker");
+    assert_eq!(speak(0, Some(0x2000_0000 | 0x8)), 0, "among other bits");
+    assert_eq!(speak(0, Some(0)), 1, "an unflagged speaker laughs");
+    assert_eq!(
+        speak(0, Some(0x1000_0000 | 0x0100_0000)),
+        1,
+        "neighbouring bits do not gate"
+    );
+    assert_eq!(
+        speak(0, None),
+        1,
+        "an unstreamed speaker is the queue's call, not this gate"
+    );
+    assert_eq!(
+        speak(3, Some(0x2000_0000)),
+        1,
+        "a line held for the name has no such test"
+    );
+}
+
 // ── the combat log reaches addons ────────────────────────────────────────────────────────────
 
 /// Combat-log addons parse arg1 with patterns built from the GlobalStrings, so arg1 is the whole
@@ -2453,6 +2586,56 @@ fn afk_then_dnd_clears_the_afk_first() {
     assert!(!world.resource::<super::away::AfkMirror>().is_afk());
 }
 
+/// `SendChatMessage`'s language through the real drain: the id the binding resolved rides every
+/// type's packet (`0x49f6f9`) but AFK's, whose `SetAFK` (`0x5eb740`) never reads it.
+#[test]
+fn a_named_language_rides_the_chat_command() {
+    use crate::net::{ChatKind, ClientCommand, NetCommands};
+    use bevy::ecs::system::RunSystemOnce;
+
+    let mut world = bevy::prelude::World::new();
+    let mut script = benilla_ui::script::UiScript::new().expect("VM");
+    script.set_language_table(vec![(2, "Darnassian".into()), (7, "Common".into())]);
+    world.insert_non_send_resource(script);
+    let (tx, rx) = crossbeam_channel::unbounded();
+    world.insert_resource(NetCommands(tx));
+    world.init_resource::<super::feed::ChatLog>();
+    world.init_resource::<super::away::AfkMirror>();
+    world.init_resource::<crate::cvars::Cvars>();
+    world.init_resource::<super::edit::ChannelState>();
+    world
+        .non_send_resource::<benilla_ui::script::UiScript>()
+        .run(
+            r#"
+            SendChatMessage("ishnu", "SAY", "darnassian")
+            SendChatMessage("hi", "WHISPER", "Darnassian", "Bob")
+            SendChatMessage("hi")
+            DEFAULT_AFK_MESSAGE = "Away from Keyboard"
+            SendChatMessage("brb", "AFK", "Darnassian")
+            "#,
+        )
+        .expect("lua");
+    world
+        .run_system_once(super::input::drain_addon_chat_sends)
+        .expect("drain");
+    let sent: Vec<(ChatKind, Option<u32>)> = rx
+        .try_iter()
+        .map(|c| match c {
+            ClientCommand::Chat { kind, language, .. } => (kind, language),
+            other => panic!("unexpected command {other:?}"),
+        })
+        .collect();
+    assert_eq!(
+        sent,
+        vec![
+            (ChatKind::Say, Some(2)),
+            (ChatKind::Whisper, Some(2)),
+            (ChatKind::Say, None),
+            (ChatKind::Afk, None),
+        ]
+    );
+}
+
 /// `SendChatMessage`'s `CHANNEL` target through the real drain: `SStrToInt` into `0x49be50`
 /// (`0x49f4d9`-`0x49f4ea`), so the packet carries the numbered slot's name, and a number naming
 /// no confirmed slot, or a name, sends nothing at all.
@@ -2505,7 +2688,9 @@ fn a_channel_send_carries_the_numbered_slots_name() {
     let sent: Vec<(ChatKind, Option<String>, String)> = rx
         .try_iter()
         .map(|c| match c {
-            ClientCommand::Chat { kind, target, text } => (kind, target, text),
+            ClientCommand::Chat {
+                kind, target, text, ..
+            } => (kind, target, text),
             other => panic!("unexpected command {other:?}"),
         })
         .collect();
@@ -2526,3 +2711,81 @@ fn a_channel_send_carries_the_numbered_slots_name() {
         ]
     );
 }
+
+/// `SendChatMessage`'s empty-line gate through the real drain (`0x49f28d`-`0x49f2a1`): an empty
+/// line, or one whose first byte is NUL, of any type but AFK and DND sends nothing and leaves a
+/// standing AFK set, since the gate is ahead of the AFK clear. The type check comes first, so an
+/// unknown type still reports.
+#[test]
+fn an_empty_line_sends_nothing_but_afk_and_dnd() {
+    use super::edit::{ChannelSlot, ChannelState};
+    use crate::net::{ChatKind, ClientCommand, NetCommands};
+    use bevy::ecs::system::RunSystemOnce;
+
+    let mut world = bevy::prelude::World::new();
+    world.insert_non_send_resource(benilla_ui::script::UiScript::new().expect("VM"));
+    let (tx, rx) = crossbeam_channel::unbounded();
+    world.insert_resource(NetCommands(tx));
+    world.init_resource::<super::feed::ChatLog>();
+    world.insert_resource(super::away::AfkMirror(2));
+    world.init_resource::<crate::cvars::Cvars>();
+    world.insert_resource(ChannelState {
+        joined: vec![Some(ChannelSlot::joined("General - Elwynn Forest"))],
+        ..Default::default()
+    });
+    let script = |world: &bevy::prelude::World, lua: &str| {
+        world
+            .non_send_resource::<benilla_ui::script::UiScript>()
+            .run(lua)
+            .expect("lua");
+    };
+    let sent = |rx: &crossbeam_channel::Receiver<ClientCommand>| -> Vec<(ChatKind, String)> {
+        rx.try_iter()
+            .map(|c| match c {
+                ClientCommand::Chat { kind, text, .. } => (kind, text),
+                other => panic!("unexpected command {other:?}"),
+            })
+            .collect()
+    };
+    script(
+        &world,
+        r#"
+        MARKED_AFK_MESSAGE = "You are now AFK: %s"
+        CLEARED_AFK = "You are no longer AFK."
+        DEFAULT_AFK_MESSAGE = "Away from Keyboard"
+        SendChatMessage("")
+        SendChatMessage("", "PARTY")
+        SendChatMessage("", "WHISPER", nil, "Bob")
+        SendChatMessage("", "CHANNEL", nil, 1)
+        SendChatMessage("\0hidden", "YELL")
+        SendChatMessage("", "BOGUS")
+        "#,
+    );
+    world
+        .run_system_once(super::input::drain_addon_chat_sends)
+        .expect("drain");
+    assert_eq!(sent(&rx), vec![], "no empty line reaches the wire");
+    assert_eq!(
+        world.resource::<super::feed::ChatLog>().pending_lines(),
+        vec!["Unknown chat type \"BOGUS\"."],
+        "no AFK clear; the type check precedes the gate"
+    );
+    assert!(world.resource::<super::away::AfkMirror>().is_afk());
+
+    // A line with text clears the standing AFK and says itself; an empty AFK marks it again.
+    script(
+        &world,
+        r#"SendChatMessage("hi") SendChatMessage("", "AFK")"#,
+    );
+    world
+        .run_system_once(super::input::drain_addon_chat_sends)
+        .expect("drain");
+    assert_eq!(
+        sent(&rx),
+        vec![
+            (ChatKind::Afk, String::new()),
+            (ChatKind::Say, "hi".into()),
+            (ChatKind::Afk, "Away from Keyboard".into()),
+        ]
+    );
+}
diff --git a/crates/benilla-app/src/ui_craft.rs b/crates/benilla-app/src/ui_craft.rs
index a668746f..4b9fc387 100644
--- a/crates/benilla-app/src/ui_craft.rs
+++ b/crates/benilla-app/src/ui_craft.rs
@@ -97,6 +97,7 @@ fn feed_craft(
     open: Res<CraftOpen>,
     actions: Res<PlayerActions>,
     spells: Option<Res<Spells>>,
+    spell_mods: Res<crate::spell::SpellModifiers>,
     skill_lines: Option<Res<SkillLines>>,
     focus: Option<Res<SpellFocus>>,
     icons: Option<Res<ItemDisplays>>,
@@ -123,13 +124,20 @@ fn feed_craft(
             .line(line)
             .map(|l| l.name.clone())
             .unwrap_or_else(|| format!("Skill {line}"));
-        let text = crate::ui_script::token_text(&script);
+        let global = |key: &str| benilla_ui::strings::global(script.lua(), key);
         let ctx = benilla_formats::TokenContext {
             durations: &spells.durations,
             radii: &spells.radii,
+            ranges: Some(&spells.ranges),
+            skill: &|id| {
+                crate::spell::spell_skill_value(Some(store), Some(&skill_lines.catalog), id)
+            },
             lookup: &|id| spells.catalog.get(id),
-            home_area: None,
-            text: &text,
+            mods: Some(&*spell_mods),
+            unmodified_points: false,
+            home_area: &|| None,
+            global: &global,
+            printf: &crate::ui_script::token_printf,
         };
         // Admission (`0x5e9c20`): known, not hidden (`Attributes & 0x20`), and `castUI` equal to
         // the craft type. The client walks its per-type list (`CGPlayer_C + 0x1cd0 + 0x10*type`)
diff --git a/crates/benilla-app/src/ui_dialog_verbs.rs b/crates/benilla-app/src/ui_dialog_verbs.rs
index cebb87bb..036bf8db 100644
--- a/crates/benilla-app/src/ui_dialog_verbs.rs
+++ b/crates/benilla-app/src/ui_dialog_verbs.rs
@@ -181,7 +181,9 @@ pub(crate) struct BattlefieldQueue {
     active: Option<(usize, u32)>,
     /// The instance's run-time stamp (`[0xb6ebbc]`) and expiration (`[0xb6ebb8]`): set by status
     /// 3, zeroed by any other non-clearing status for any slot, as the handler `0x4aa850` does.
-    run_started: Option<Instant>,
+    /// The stamp is kept as the status's arrival and the wire's elapsed span, read forwards, so no
+    /// `Instant` precedes the clock's origin.
+    run_started: Option<(Instant, std::time::Duration)>,
     instance_expiration: Option<Instant>,
     /// Status 3 fires `UPDATE_BATTLEFIELD_SCORE` before `_STATUS` (`0x4aaa5a`, then `0x4aab05`).
     score_dirty: bool,
@@ -223,7 +225,7 @@ impl BattlefieldQueue {
                 self.instance_expiration = (expires_ms != 0)
                     .then(|| now + std::time::Duration::from_millis(u64::from(expires_ms)));
                 self.run_started = (elapsed_ms != 0)
-                    .then(|| now - std::time::Duration::from_millis(u64::from(elapsed_ms)));
+                    .then(|| (now, std::time::Duration::from_millis(u64::from(elapsed_ms))));
                 self.score_dirty = true;
             }
             None => {
@@ -258,8 +260,8 @@ impl BattlefieldQueue {
 
     /// `GetBattlefieldInstanceRunTime()`: ms since the status-3 stamp, 0 with none.
     pub(crate) fn run_time_ms(&self, now: Instant) -> u32 {
-        self.run_started.map_or(0, |t| {
-            now.saturating_duration_since(t)
+        self.run_started.map_or(0, |(at, elapsed)| {
+            (now.saturating_duration_since(at) + elapsed)
                 .as_millis()
                 .min(u128::from(u32::MAX)) as u32
         })
@@ -1588,6 +1590,30 @@ mod tests {
         assert_eq!(q.map_id(2), None, "a zero map clears the slot");
     }
 
+    #[test]
+    fn a_run_longer_than_any_uptime_reads_forwards() {
+        let mut q = BattlefieldQueue::default();
+        let now = Instant::now();
+        q.apply_at(
+            BattlefieldStatus {
+                slot: 0,
+                map_id: 489,
+                bracket: 0,
+                instance_id: 3,
+                status: 3,
+                time_ms: None,
+                in_progress: Some((0, u32::MAX)),
+                queued: None,
+            },
+            now,
+        );
+        assert_eq!(
+            q.run_time_ms(now),
+            u32::MAX,
+            "49.7 days elapsed, no stamp needed"
+        );
+    }
+
     #[test]
     fn the_instance_clocks_follow_the_status_handler() {
         let mut q = BattlefieldQueue::default();
@@ -1606,6 +1632,11 @@ mod tests {
         assert_eq!(q.active_map(), Some(489));
         assert_eq!(q.instance_expiration_ms(now), 90_000);
         assert_eq!(q.run_time_ms(now), 30_000);
+        assert_eq!(
+            q.run_time_ms(now + std::time::Duration::from_secs(2)),
+            32_000,
+            "the stamp runs on from the status"
+        );
         assert!(q.take_score_dirty());
         // A queued status for slot 2 zeroes both clocks too.
         let mut queued = active.clone();
diff --git a/crates/benilla-app/src/ui_gossip/mod.rs b/crates/benilla-app/src/ui_gossip/mod.rs
index a4488ddd..9186fb0e 100644
--- a/crates/benilla-app/src/ui_gossip/mod.rs
+++ b/crates/benilla-app/src/ui_gossip/mod.rs
@@ -214,7 +214,6 @@ fn snapshot(state: &GossipState) -> Option<GossipMenu> {
             .map(|o| GossipOptionView {
                 label: o.message.clone(),
                 icon_type: gossip_icon_type(o.icon).into(),
-                coded: o.coded,
             })
             .collect(),
     })
@@ -584,10 +583,12 @@ mod tests {
         let (mut app, _rx) = feed_app(|s| {
             s.set_screen_size(1024.0, 768.0);
             s.set_text_measurer(Box::new(crate::ui_script::FixedWidthFont(6.0)));
-            for f in crate::ui_script::test_ui::GOSSIP_UI {
+            for f in crate::ui_script::test_ui::production_order(&[
+                crate::ui_script::test_ui::GOSSIP_UI,
+                &[r"Interface\FrameXML\GossipFrame.xml"],
+            ]) {
                 crate::ui_script::test_ui::load_ui(s, f);
             }
-            crate::ui_script::test_ui::load_ui(s, r"Interface\FrameXML\GossipFrame.xml");
             s.run(RECORDER).unwrap();
         });
         // What the window shows: visible?, the greeting, the first row's label, the kits played.
diff --git a/crates/benilla-app/src/ui_guild/sort.rs b/crates/benilla-app/src/ui_guild/sort.rs
index 454ce442..f5c86f7e 100644
--- a/crates/benilla-app/src/ui_guild/sort.rs
+++ b/crates/benilla-app/src/ui_guild/sort.rs
@@ -60,21 +60,18 @@ impl SortField {
             SortField::Level => a.info.level.cmp(&b.info.level),
             SortField::Name => icmp(&a.info.name, &b.info.name),
             // By the localized DBC name, not the id (`0x4d0e67`, `0x4d0ded`); an id the DBC does
-            // not resolve abstains rather than sorting first (`0x4d0ea1`, `0x4d0e27`).
-            SortField::Zone => abstaining(&a.info.zone, &b.info.zone),
-            SortField::Class => abstaining(&a.info.class, &b.info.class),
+            // not resolve ties with another miss and sorts after a hit (`0x4d0ea1`, `0x4d0e27`).
+            SortField::Zone => misses_last(&a.info.zone, &b.info.zone),
+            SortField::Class => misses_last(&a.info.class, &b.info.class),
             SortField::Group => Ordering::Equal,
             SortField::Online => match (a.info.online, b.info.online) {
                 (true, true) => Ordering::Equal,
                 (true, false) => Ordering::Less,
                 (false, true) => Ordering::Greater,
                 // Both offline: the more recently seen first, on the raw days float (`0x4d0f19`).
-                // Deviation: an exact tie is `Equal` where the reference answers ±1, because
-                // Rust's sort requires a total order.
-                (false, false) => a
-                    .last_online_days
-                    .partial_cmp(&b.last_online_days)
-                    .unwrap_or(Ordering::Equal),
+                // Deviation: an exact tie is `Equal` where the reference answers ±1, and a NaN
+                // has a place (`total_cmp`), because Rust's sort requires a total order.
+                (false, false) => a.last_online_days.total_cmp(&b.last_online_days),
             },
             SortField::Note => icmp(&a.info.note, &b.info.note),
         }
@@ -88,12 +85,15 @@ fn icmp(a: &str, b: &str) -> Ordering {
         .cmp(b.bytes().map(|c| c.to_ascii_lowercase()))
 }
 
-/// [`icmp`], but an empty value on either side abstains: the zone and class arms' DBC miss.
-fn abstaining(a: &str, b: &str) -> Ordering {
-    if a.is_empty() || b.is_empty() {
-        return Ordering::Equal;
+/// [`icmp`] with an empty value (the zone and class arms' DBC miss) after every name; two misses
+/// tie. Deviation: the reference ties a miss with a hit (`0x4d0e27`, `0x4d0ea1`), no total order.
+fn misses_last(a: &str, b: &str) -> Ordering {
+    match (a.is_empty(), b.is_empty()) {
+        (true, true) => Ordering::Equal,
+        (true, false) => Ordering::Greater,
+        (false, true) => Ordering::Less,
+        (false, false) => icmp(a, b),
     }
-    icmp(a, b)
 }
 
 /// The reference's eight-slot `{key, direction}` chain (`0xb72680`), most recent first: `0x4d0fb0`
@@ -289,7 +289,7 @@ mod tests {
     }
 
     #[test]
-    fn the_online_tiebreak_and_the_dbc_miss_abstention() {
+    fn the_online_tiebreak_and_the_dbc_miss_order() {
         let mut sort = SortStack::default();
         sort.select(SortField::Online);
         let recent = RosterRow {
@@ -302,9 +302,83 @@ mod tests {
         };
         assert_eq!(sort.compare(&recent, &ancient, true), Ordering::Less);
 
-        assert_eq!(abstaining("", "Ironforge"), Ordering::Equal);
-        assert_eq!(abstaining("Ironforge", ""), Ordering::Equal);
-        assert_eq!(abstaining("Elwynn", "Ironforge"), Ordering::Less);
+        assert_eq!(misses_last("", "Ironforge"), Ordering::Greater);
+        assert_eq!(misses_last("Ironforge", ""), Ordering::Less);
+        assert_eq!(misses_last("", ""), Ordering::Equal);
+        assert_eq!(misses_last("Elwynn", "Ironforge"), Ordering::Less);
         assert_eq!(icmp("alice", "Alice"), Ordering::Equal, "case-insensitive");
     }
+
+    /// Mixed rows: resolved and empty zone and class, offline with a NaN and a repeat days value.
+    fn mixed() -> Vec<RosterRow> {
+        let zones = ["", "Elwynn", "Ironforge", "elwynn"];
+        let classes = ["Mage", "", "Warrior"];
+        let days = [0.5, f32::NAN, 90.0, 0.5];
+        let mut rows = Vec::new();
+        for i in 0..24usize {
+            let mut r = row(&format!("P{i}"), i % 3 == 0, 60, 0);
+            r.info.zone = zones[i % 4].to_string();
+            r.info.class = classes[(i / 2) % 3].to_string();
+            r.last_online_days = days[(i / 3) % 4];
+            rows.push(r);
+        }
+        rows
+    }
+
+    #[test]
+    fn every_key_is_a_total_order_over_mixed_rows() {
+        let rows = mixed();
+        for field in [SortField::Zone, SortField::Class, SortField::Online] {
+            let le = |a: &RosterRow, b: &RosterRow| field.compare(a, b) != Ordering::Greater;
+            for a in &rows {
+                for b in &rows {
+                    assert_eq!(
+                        field.compare(a, b),
+                        field.compare(b, a).reverse(),
+                        "{field:?} antisymmetric"
+                    );
+                    for c in &rows {
+                        if le(a, b) && le(b, c) {
+                            assert!(le(a, c), "{field:?} transitive");
+                        }
+                        if field.compare(a, b) == Ordering::Equal
+                            && field.compare(b, c) == Ordering::Equal
+                        {
+                            assert_eq!(
+                                field.compare(a, c),
+                                Ordering::Equal,
+                                "{field:?} equivalence"
+                            );
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn sorting_a_mixed_roster_puts_misses_after_hits() {
+        for (field, get) in [
+            (
+                SortField::Zone,
+                (|r: &RosterRow| r.info.zone.clone()) as fn(&RosterRow) -> String,
+            ),
+            (SortField::Class, |r: &RosterRow| r.info.class.clone()),
+        ] {
+            let mut sort = SortStack::default();
+            sort.select(field);
+            let mut rows = mixed();
+            sort.order(&mut rows, true);
+            let first_miss = rows.iter().position(|r| get(r).is_empty()).unwrap();
+            assert!(
+                rows[first_miss..].iter().all(|r| get(r).is_empty()),
+                "{field:?}"
+            );
+            assert!(first_miss > 0 && rows.len() > 20);
+        }
+        let mut sort = SortStack::default();
+        sort.select(SortField::Online);
+        let mut rows = mixed();
+        sort.order(&mut rows, true);
+    }
 }
diff --git a/crates/benilla-app/src/ui_hide.rs b/crates/benilla-app/src/ui_hide.rs
deleted file mode 100644
index ed11ba65..00000000
--- a/crates/benilla-app/src/ui_hide.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-//! TOGGLEUI, the hide-the-interface binding (`ALT-Z`), and its state: while it is set the quad
-//! pass draws nothing and the UI's pointer feed stops hit-testing.
-
-use bevy::prelude::*;
-
-use crate::char_select::{ClientState, InWorldGated};
-use crate::ui_script::UiInput;
-
-/// Whether the player UI is hidden: nothing in `ui_pass::UiQuads` is drawn and the UI takes no
-/// mouse, while widgets keep ticking. The keyboard stays live, as in the reference. Open windows
-/// stay open, where the stock binding runs `CloseAllWindows()` first (`Bindings.xml:655-661`).
-#[derive(Resource, Default)]
-pub(crate) struct UiHidden(pub bool);
-
-pub(crate) struct UiHidePlugin;
-
-impl Plugin for UiHidePlugin {
-    fn build(&self, app: &mut App) {
-        app.init_resource::<UiHidden>()
-            .add_systems(
-                Update,
-                // After `UiInput`: an EditBox that took this frame's keys has published its
-                // capture flag by then.
-                toggle_ui_hidden.after(UiInput).in_set(InWorldGated),
-            )
-            .add_systems(OnExit(ClientState::InWorld), show_ui);
-    }
-}
-
-fn toggle_ui_hidden(binds: Res<crate::bindings::BindingsState>, mut hidden: ResMut<UiHidden>) {
-    if !binds.fired(crate::bindings::cmd::TOGGLE_UI) {
-        return;
-    }
-    hidden.0 = !hidden.0;
-    info!(
-        "ui: {} (TOGGLEUI)",
-        if hidden.0 { "HIDDEN" } else { "shown" }
-    );
-}
-
-/// Leaving the world clears the hide: the binding is in-world only, so a UI hidden at logout would
-/// come back invisible with no way to see why.
-fn show_ui(mut hidden: ResMut<UiHidden>) {
-    hidden.0 = false;
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_fired_toggleui_flips_the_flag_both_ways() {
-        let mut app = App::new();
-        app.add_systems(Update, toggle_ui_hidden)
-            .init_resource::<UiHidden>()
-            .insert_resource(crate::bindings::BindingsState::test_fired(&[
-                crate::bindings::cmd::TOGGLE_UI,
-            ]));
-        app.update();
-        assert!(app.world().resource::<UiHidden>().0, "fired → hidden");
-        app.update();
-        assert!(!app.world().resource::<UiHidden>().0, "fired again → shown");
-        app.world_mut()
-            .insert_resource(crate::bindings::BindingsState::default());
-        app.update();
-        assert!(!app.world().resource::<UiHidden>().0, "no fire → no change");
-    }
-}
diff --git a/crates/benilla-app/src/ui_items/drain.rs b/crates/benilla-app/src/ui_items/drain.rs
index 39a5d3ec..2e8d5028 100644
--- a/crates/benilla-app/src/ui_items/drain.rs
+++ b/crates/benilla-app/src/ui_items/drain.rs
@@ -145,24 +145,39 @@ pub(super) fn drain_bag_autostores(
     }
 }
 
-/// Sends the doll right-clicks `UseInventoryItem` queued through [`super::send_item_use`], as the
-/// reference's doll click reaches the same `CGItem::Use` a bag click does (`0x4c7af0`): a worn
-/// quest-starter offers its quest. Ids outside 1..=19 are refused.
-pub(super) fn drain_inventory_uses(
-    script: Option<NonSendMut<UiScript>>,
-    self_q: Query<&ObjectStore, With<SelfPlayer>>,
-    targeting: crate::spell::cast_target::CastTargeting,
-    mut ladder: crate::spell::CastLadder,
-    mut ui_errors: ResMut<crate::ui_action::UiErrorKeys>,
-    mut gate: crate::ui_bind_confirm::BindGate,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    for id in script.take_inventory_uses() {
+/// What a `UseContainerItem` or `UseInventoryItem` call reads and writes.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct ScriptItemUse<'w, 's> {
+    self_q: Query<'w, 's, &'static ObjectStore, With<SelfPlayer>>,
+    merchant: Res<'w, crate::ui_merchant::MerchantOpen>,
+    bank: Res<'w, crate::ui_bank::BankOpen>,
+    equip_sound: MessageWriter<'w, crate::sound::AutoEquipSound>,
+    item_text: ResMut<'w, crate::ui_item_text::ItemTextOpen>,
+    targeting: crate::spell::cast_target::CastTargeting<'w, 's>,
+    pending_items: ResMut<'w, PendingItemOps>,
+    // The loot latch the open arm sets, so `SMSG_LOOT_RESPONSE` admits an item loot.
+    loot_latch: ResMut<'w, crate::ui_loot::LootLatch>,
+    ladder: crate::spell::CastLadder<'w, 's>,
+    ui_errors: ResMut<'w, crate::ui_action::UiErrorKeys>,
+    gate: crate::ui_bind_confirm::BindGate<'w>,
+}
+
+impl ScriptItemUse<'_, '_> {
+    /// `UseInventoryItem(id)`, a doll right-click, sent through [`super::send_item_use`], as the
+    /// reference's doll click reaches the same `CGItem::Use` a bag click does (`0x4c7af0`): a worn
+    /// quest-starter offers its quest. Ids outside 1..=19 are refused.
+    pub(crate) fn use_inventory_item(&mut self, script: &mut UiScript, id: u32) {
+        let Self {
+            self_q,
+            targeting,
+            ladder,
+            ui_errors,
+            gate,
+            ..
+        } = self;
         if !(1..=19).contains(&id) {
             debug!("ui_items: UseInventoryItem({id}) out of range — ignored");
-            continue;
+            return;
         }
         let slot = (id - 1) as u8;
         let (guid, start_quest, spell_index, use_spell, entry, is_charter) = self_q
@@ -196,81 +211,30 @@ pub(super) fn drain_inventory_uses(
                 is_charter,
             },
             &targeting.context(),
-            &mut ladder,
-            &mut script,
-            &mut gate,
+            ladder,
+            script,
+            gate,
             false,
-            &mut ui_errors,
+            ui_errors,
         );
     }
-}
 
-pub(super) fn drain_container_uses(
-    script: Option<NonSendMut<UiScript>>,
-    self_q: Query<&ObjectStore, With<SelfPlayer>>,
-    merchant: Res<crate::ui_merchant::MerchantOpen>,
-    bank: Res<crate::ui_bank::BankOpen>,
-    mut equip_sound: MessageWriter<crate::sound::AutoEquipSound>,
-    mut item_text: ResMut<crate::ui_item_text::ItemTextOpen>,
-    targeting: crate::spell::cast_target::CastTargeting,
-    mut pending_items: ResMut<PendingItemOps>,
-    // The loot latch the open arm sets, so `SMSG_LOOT_RESPONSE` admits an item loot.
-    mut loot_latch: ResMut<crate::ui_loot::LootLatch>,
-    mut ladder: crate::spell::CastLadder,
-    mut ui_errors: ResMut<crate::ui_action::UiErrorKeys>,
-    mut gate: crate::ui_bind_confirm::BindGate,
-    mut purse: crate::ui_merchant::RepairPurse,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    let me = self_q.iter().next();
-    // Repair-mode clicks (the reference's `0x4f9c7b` route) repair the one item: the purse test
-    // first (`0x4f9cc8`), then `ITEM_REPAIR` as it goes out (`0x4f9ce4`).
-    for (bag, slot) in script.take_container_repairs() {
-        let (Some(vendor), Some(me)) = (merchant.vendor, me) else {
-            continue;
-        };
-        let slot0 = u8::try_from(slot.saturating_sub(1)).unwrap_or(0);
-        match slot_guid(&me.0, bag, slot0, &ladder.objects) {
-            Some(guid) => {
-                if purse.refuses(&mut script, &merchant, me, [guid]) {
-                    continue;
-                }
-                debug!("ui_items: repair lua bag {bag} slot {slot} (item {guid:#x})");
-                script.queue_sound_kit("ITEM_REPAIR");
-                let _ = ladder.commands.0.send(ClientCommand::RepairItem {
-                    vendor,
-                    item_guid: guid,
-                });
-            }
-            None => debug!("ui_items: repair on empty slot (bag {bag} slot {slot}) — ignored"),
-        }
-    }
-    // The paper doll's repair clicks (`0x4c7714`, `0x4c79c4`), the same arm on a worn item.
-    for id in script.take_inventory_repairs() {
-        let (Some(vendor), Some(me)) = (merchant.vendor, me) else {
-            continue;
-        };
-        let item_guid = u8::try_from(id.wrapping_sub(1))
-            .ok()
-            .and_then(|slot0| slot_guid(&me.0, EQUIPMENT_BAG, slot0, &ladder.objects));
-        match item_guid {
-            Some(guid) if (1..=19).contains(&id) => {
-                if purse.refuses(&mut script, &merchant, me, [guid]) {
-                    continue;
-                }
-                debug!("ui_items: repair worn lua slot {id} (item {guid:#x})");
-                script.queue_sound_kit("ITEM_REPAIR");
-                let _ = ladder.commands.0.send(ClientCommand::RepairItem {
-                    vendor,
-                    item_guid: guid,
-                });
-            }
-            _ => debug!("ui_items: repair on worn lua slot {id}, empty or out of range — ignored"),
-        }
-    }
-    for (bag, slot) in script.take_container_uses() {
+    /// `UseContainerItem(bag, slot)` outside repair mode: a sale with a merchant open, a bank
+    /// move with the bank open, else the reference's equip-vs-use fork and use dispatcher.
+    pub(crate) fn use_container_item(&mut self, script: &mut UiScript, bag: i64, slot: u32) {
+        let Self {
+            self_q,
+            merchant,
+            bank,
+            equip_sound,
+            item_text,
+            targeting,
+            pending_items,
+            loot_latch,
+            ladder,
+            ui_errors,
+            gate,
+        } = self;
         let slot0 = u8::try_from(slot.saturating_sub(1)).ok();
         // With a merchant open, the click sells the whole stack (`CMSG_SELL_ITEM`, count 0).
         if let (true, Some(vendor)) = (merchant.is_open(), merchant.vendor) {
@@ -289,16 +253,16 @@ pub(super) fn drain_container_uses(
                 }
                 None => debug!("ui_items: sell on empty slot (bag {bag} slot {slot}) — ignored"),
             }
-            continue;
+            return;
         }
         let Some((bag_index, wire_slot)) = wire_pos(bag, slot) else {
             debug!("ui_items: UseContainerItem({bag}, {slot}) out of range — ignored");
-            continue;
+            return;
         };
         // With the bank open, a vault or bank-bag item withdraws (`CMSG_AUTOSTORE_BANK_ITEM`) and
         // any other deposits (`CMSG_AUTOBANK_ITEM`): the reference's bank flag, set for bags -1
         // and 5..10 (`0x4f9820`), picks the opcode (`0x4fa2f2`). Doll clicks come through
-        // `drain_inventory_uses`, so worn gear keeps its plain use.
+        // `use_inventory_item`, so worn gear keeps its plain use.
         if bank.is_open() {
             let withdrawing = bag == super::BANK_CONTAINER || (5..=10).contains(&bag);
             if withdrawing {
@@ -314,7 +278,7 @@ pub(super) fn drain_container_uses(
                     slot: wire_slot,
                 });
             }
-            continue;
+            return;
         }
         // `None` (empty, or the template in flight) falls through to a plain use.
         let clicked = self_q
@@ -351,8 +315,8 @@ pub(super) fn drain_container_uses(
             // This path never moves the cursor, so it plays the equip sound itself; a deferred
             // equip plays none, as the reference's sound rides the arm that sends.
             if send_auto_equip(
-                &mut script,
-                &mut gate,
+                script,
+                gate,
                 &ladder.objects,
                 &ladder.items,
                 &ladder.commands,
@@ -365,7 +329,7 @@ pub(super) fn drain_container_uses(
                     display_id: c.display_info_id,
                 });
             }
-            continue;
+            return;
         }
         // A wrapped gift unwraps with `CMSG_OPEN_ITEM` (`0x5d8d92`, emitter `0x5edd60`), first in
         // the dispatcher; vmangos swaps the entry back from `character_gifts`.
@@ -378,7 +342,7 @@ pub(super) fn drain_container_uses(
                 bag_index,
                 slot: wire_slot,
             });
-            continue;
+            return;
         }
         // Wrapping paper (`0x5d8d9d`'s other branch, `0x5edea0`) sends nothing: its slot locks and
         // the cursor becomes mode 2 until a left-click on a container slot sends `CMSG_WRAP_ITEM`.
@@ -388,7 +352,7 @@ pub(super) fn drain_container_uses(
                 c.guid
             );
             script.arm_gift_wrap(bag, slot);
-            continue;
+            return;
         }
         // A quest-starter (`0x5d8dd2`) offers its quest, ahead of the readable and open arms.
         if let Some(c) = clicked.filter(|c| c.start_quest != 0) {
@@ -409,13 +373,13 @@ pub(super) fn drain_container_uses(
                     is_charter: c.is_charter,
                 },
                 &targeting.context(),
-                &mut ladder,
-                &mut script,
-                &mut gate,
+                ladder,
+                script,
+                gate,
                 false,
-                &mut ui_errors,
+                ui_errors,
             );
-            continue;
+            return;
         }
         // A book, a template with `PageText` (`0x5d8e4c`), opens the reader with no packet
         // (`0x4e32e0`). It precedes the open arm, the inverse of the tooltip: an item both
@@ -430,7 +394,7 @@ pub(super) fn drain_container_uses(
                 );
                 item_text.open_pages(c.guid);
             }
-            continue;
+            return;
         }
         // A letter from mail (`ITEM_FIELD_ITEM_TEXT_ID`) opens the reader with no packet; vmangos's
         // `CMSG_READ_ITEM` wants a template `PageText`, so the text comes by item-text query.
@@ -444,7 +408,7 @@ pub(super) fn drain_container_uses(
                 );
                 item_text.open_letter(c.guid, c.item_text_id);
             }
-            continue;
+            return;
         }
         // A lootable template (`0x5d8f7c`, emitter `0x5edc80`) sends `CMSG_OPEN_ITEM`, which the
         // server answers with a loot window on the item (`SpellHandler.cpp:227`). Unlike the
@@ -472,7 +436,7 @@ pub(super) fn drain_container_uses(
                 bag_index,
                 slot: wire_slot,
             });
-            continue;
+            return;
         }
         // A plain use (food, potions, the hearthstone); quest-starters took the arm above.
         debug!("ui_items: use item (lua bag {bag} → wire {bag_index}/{wire_slot})");
@@ -489,15 +453,75 @@ pub(super) fn drain_container_uses(
                 is_charter: clicked.is_some_and(|c| c.is_charter),
             },
             &targeting.context(),
-            &mut ladder,
-            &mut script,
-            &mut gate,
+            ladder,
+            script,
+            gate,
             false,
-            &mut ui_errors,
+            ui_errors,
         );
     }
 }
 
+/// Sends the repair-mode clicks, bag and paper doll, as `CMSG_REPAIR_ITEM`.
+pub(super) fn drain_container_repairs(
+    script: Option<NonSendMut<UiScript>>,
+    self_q: Query<&ObjectStore, With<SelfPlayer>>,
+    merchant: Res<crate::ui_merchant::MerchantOpen>,
+    objects: Objects,
+    commands: Res<NetCommands>,
+    mut purse: crate::ui_merchant::RepairPurse,
+) {
+    let Some(mut script) = script else {
+        return;
+    };
+    let me = self_q.iter().next();
+    // Repair-mode clicks (the reference's `0x4f9c7b` route) repair the one item: the purse test
+    // first (`0x4f9cc8`), then `ITEM_REPAIR` as it goes out (`0x4f9ce4`).
+    for (bag, slot) in script.take_container_repairs() {
+        let (Some(vendor), Some(me)) = (merchant.vendor, me) else {
+            continue;
+        };
+        let slot0 = u8::try_from(slot.saturating_sub(1)).unwrap_or(0);
+        match slot_guid(&me.0, bag, slot0, &objects) {
+            Some(guid) => {
+                if purse.refuses(&mut script, &merchant, me, [guid]) {
+                    continue;
+                }
+                debug!("ui_items: repair lua bag {bag} slot {slot} (item {guid:#x})");
+                script.queue_sound_kit("ITEM_REPAIR");
+                let _ = commands.0.send(ClientCommand::RepairItem {
+                    vendor,
+                    item_guid: guid,
+                });
+            }
+            None => debug!("ui_items: repair on empty slot (bag {bag} slot {slot}) — ignored"),
+        }
+    }
+    // The paper doll's repair clicks (`0x4c7714`, `0x4c79c4`), the same arm on a worn item.
+    for id in script.take_inventory_repairs() {
+        let (Some(vendor), Some(me)) = (merchant.vendor, me) else {
+            continue;
+        };
+        let item_guid = u8::try_from(id.wrapping_sub(1))
+            .ok()
+            .and_then(|slot0| slot_guid(&me.0, EQUIPMENT_BAG, slot0, &objects));
+        match item_guid {
+            Some(guid) if (1..=19).contains(&id) => {
+                if purse.refuses(&mut script, &merchant, me, [guid]) {
+                    continue;
+                }
+                debug!("ui_items: repair worn lua slot {id} (item {guid:#x})");
+                script.queue_sound_kit("ITEM_REPAIR");
+                let _ = commands.0.send(ClientCommand::RepairItem {
+                    vendor,
+                    item_guid: guid,
+                });
+            }
+            _ => debug!("ui_items: repair on worn lua slot {id}, empty or out of range — ignored"),
+        }
+    }
+}
+
 /// One clicked bag slot, resolved once: the fields the reference's fork chain tests.
 #[derive(Clone, Copy)]
 struct Clicked {
@@ -717,11 +741,30 @@ pub(super) fn drain_container_destroys(
     }
 }
 
+/// The bag clicks as the frame applies them: the repair-mode drain, then the queued
+/// `UseContainerItem` calls through their applier.
+#[cfg(test)]
+fn run_container_clicks(world: &mut World) {
+    use benilla_ui::script::ScriptCall;
+    use bevy::ecs::system::RunSystemOnce;
+    world.run_system_once(drain_container_repairs).unwrap();
+    world
+        .run_system_once(
+            |mut script: NonSendMut<UiScript>, mut items: ScriptItemUse| {
+                crate::script_calls::in_call_order(&mut script, |script, call| {
+                    if let ScriptCall::UseContainerItem { bag, slot } = call {
+                        items.use_container_item(script, bag, slot);
+                    }
+                });
+            },
+        )
+        .unwrap();
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use benilla_protocol::messages::{ItemInfo, ObjectFields, ITEM_FLAG_LOOTABLE};
-    use bevy::ecs::system::RunSystemOnce;
 
     /// Small Barnacled Clam.
     const CLAM_ENTRY: u32 = 7973;
@@ -760,6 +803,7 @@ mod tests {
             .init_resource::<crate::spell::AutoRepeatActive>()
             .init_resource::<crate::ui_tradeskill::TradeSkillOpens>()
             .init_resource::<crate::spell::targeting::SpellTargeting>()
+            .init_resource::<crate::spell::HeldForPick>()
             .init_resource::<Items>()
             .init_resource::<crate::net::GuidIndex>()
             .insert_resource(NetCommands(tx));
@@ -790,9 +834,7 @@ mod tests {
         let script = UiScript::new().unwrap();
         script.run("UseContainerItem(0, 1)").unwrap();
         app.insert_non_send_resource(script);
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
         (app, rx)
     }
 
@@ -857,9 +899,7 @@ mod tests {
                 .run("ShowRepairCursor() UseContainerItem(0, 1)")
                 .unwrap();
         }
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
 
         assert!(matches!(
             rx.try_recv(),
@@ -918,9 +958,7 @@ mod tests {
                 .run("ShowRepairCursor() PickupInventoryItem(1)")
                 .unwrap();
         }
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
 
         assert!(matches!(
             rx.try_recv(),
@@ -1003,9 +1041,7 @@ mod tests {
             };
             script.run(click).unwrap();
         }
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
         let sounded = crate::ui_merchant::purse_fixture::sounded(app.world());
         let mut script = app.world_mut().non_send_resource_mut::<UiScript>();
         RepairClick {
@@ -1087,9 +1123,7 @@ mod tests {
             let script = app.world().non_send_resource::<UiScript>();
             script.run("UseContainerItem(0, 1)").unwrap();
         }
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
 
         assert!(
             rx.try_recv().is_err(),
@@ -1236,13 +1270,13 @@ mod bind_confirm_tests {
     fn load_ui(s: &UiScript) {
         // Chain files, so through the chain-aware reader.
         for file in [
-            "Interface\\FrameXML\\Fonts.xml",
-            r"Interface\FrameXML\MoneyFrame.lua",
-            r"Interface\FrameXML\MoneyFrame.xml",
-            r"Interface\FrameXML\UIParent.xml",
             "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
             "Interface\\FrameXML\\BasicControls.xml",
             "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
             "Interface\\FrameXML\\StaticPopup.xml",
         ] {
             crate::ui_script::load_ui_for_test(s, file);
@@ -1714,6 +1748,7 @@ mod bind_confirm_tests {
             .init_resource::<crate::spell::AutoRepeatActive>()
             .init_resource::<crate::ui_tradeskill::TradeSkillOpens>()
             .init_resource::<crate::spell::targeting::SpellTargeting>()
+            .init_resource::<crate::spell::HeldForPick>()
             .init_resource::<Items>()
             .init_resource::<crate::net::GuidIndex>()
             .insert_resource(NetCommands(tx));
@@ -1760,9 +1795,7 @@ mod bind_confirm_tests {
         script.set_container(0, Some(bag_with_the_axe(3)));
         script.run("UseContainerItem(0, 1)").unwrap();
         app.insert_non_send_resource(script);
-        app.world_mut()
-            .run_system_once(drain_container_uses)
-            .unwrap();
+        run_container_clicks(app.world_mut());
         (app, rx)
     }
 
diff --git a/crates/benilla-app/src/ui_items/feed.rs b/crates/benilla-app/src/ui_items/feed.rs
index ec0913e1..e66bd879 100644
--- a/crates/benilla-app/src/ui_items/feed.rs
+++ b/crates/benilla-app/src/ui_items/feed.rs
@@ -1,7 +1,7 @@
 //! The per-frame feeds into the VM: the container snapshots built from the player's descriptor,
 //! and the item-tooltip views every window reads.
 
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use bevy::prelude::*;
 
@@ -57,9 +57,12 @@ pub(crate) struct SlotGuids {
 fn spell_desc_text(
     spells: Option<&crate::ui_action::Spells>,
     id: u32,
+    // The player's skill in a spell's line, the `$`-tokens' level (`TokenContext::skill`).
+    skill: &dyn Fn(u32) -> u32,
     home_area: Option<&str>,
+    mods: Option<&crate::spell::SpellModifiers>,
     // The VM's strings for the keyed `$d`/`$s` tokens.
-    text: &dyn Fn(&str, &[i64]) -> Option<String>,
+    global: &dyn Fn(&str) -> Option<String>,
 ) -> Option<String> {
     let sp = spells?;
     let d = sp.catalog.get(id)?;
@@ -69,9 +72,14 @@ fn spell_desc_text(
             let ctx = benilla_formats::TokenContext {
                 durations: &sp.durations,
                 radii: &sp.radii,
+                ranges: Some(&sp.ranges),
+                skill,
                 lookup: &|i| sp.catalog.get(i),
-                home_area,
-                text,
+                mods: mods.map(|m| m as &dyn benilla_formats::SpellMods),
+                unmodified_points: false,
+                home_area: &|| home_area,
+                global,
+                printf: &crate::ui_script::token_printf,
             };
             Some(benilla_formats::substitute(desc, d, &ctx)).filter(|t| !t.is_empty())
         }
@@ -79,6 +87,29 @@ fn spell_desc_text(
     }
 }
 
+/// Only descriptions with substitution tokens can change when the caster's spell mods change.
+fn spell_has_mod_tokens(spells: Option<&crate::ui_action::Spells>, id: u32) -> bool {
+    spells
+        .and_then(|s| s.catalog.get(id))
+        .and_then(|d| d.description.as_deref())
+        .is_some_and(|desc| desc.contains('$'))
+}
+
+fn item_has_mod_tokens(t: &ItemInfo, spells: Option<&crate::ui_action::Spells>) -> bool {
+    t.spells
+        .iter()
+        .any(|slot| slot.spell_id != 0 && spell_has_mod_tokens(spells, slot.spell_id))
+}
+
+fn bonuses_have_mod_tokens(
+    bonuses: &[(u32, u32)],
+    spells: Option<&crate::ui_action::Spells>,
+) -> bool {
+    bonuses
+        .iter()
+        .any(|&(_, spell)| spell_has_mod_tokens(spells, spell))
+}
+
 /// The tooltip's "N Charges" count, 0 for no line. The builder (`0x52d8a0`) reads a template 0 as
 /// `-1` (`0x52da01`), prints nothing for `-1` (`0x52db51`) and otherwise the absolute value
 /// (`0x52db56`): food's `-1` shows no line, a `-5` pool "5 Charges". It prints per spell slot; one
@@ -102,23 +133,24 @@ fn standing_label(rank: u32, get: &dyn Fn(&str) -> Option<String>) -> Option<Str
 fn template_view(
     t: &ItemInfo,
     spells: Option<&crate::ui_action::Spells>,
+    mods: Option<&crate::spell::SpellModifiers>,
+    skill: &dyn Fn(u32) -> u32,
     skill_lines: Option<&benilla_formats::SkillLineCatalog>,
     home_area: Option<&str>,
     factions: Option<&benilla_formats::FactionCatalog>,
     sub_classes: Option<&benilla_formats::ItemSubClassCatalog>,
     classes: Option<&benilla_formats::ItemClassCatalog>,
     icons: Option<&ItemDisplays>,
-    // The VM's own `GlobalStrings.lua`, for the reputation-requirement line.
+    // The VM's own `GlobalStrings.lua`, for the reputation-requirement line and the `$`-engine's
+    // keyed tokens.
     get: &dyn Fn(&str) -> Option<String>,
-    // The same table, for the `$`-engine's keyed tokens.
-    text: &dyn Fn(&str, &[i64]) -> Option<String>,
 ) -> benilla_ui::script::ItemTemplateView {
     let spell_name = |id: u32| -> Option<String> {
         spells
             .and_then(|s| s.catalog.get(id))
             .map(|sd| sd.name.clone())
     };
-    let spell_text = |id: u32| spell_desc_text(spells, id, home_area, text);
+    let spell_text = |id: u32| spell_desc_text(spells, id, skill, home_area, mods, get);
     benilla_ui::script::ItemTemplateView {
         name: t.name.clone(),
         quality: t.quality,
@@ -215,18 +247,33 @@ pub(super) fn feed_item_sets(
     items: Res<Items>,
     commands: Res<NetCommands>,
     spells: Option<Res<crate::ui_action::Spells>>,
+    spell_mods: Res<crate::spell::SpellModifiers>,
     skill_lines: Option<Res<crate::ui_spellbook::SkillLines>>,
+    self_q: Query<&ObjectStore, With<SelfPlayer>>,
     mut pending: Local<
         crate::ui_script::VmMemo<std::collections::HashMap<u32, benilla_ui::script::ItemSetView>>,
     >,
+    mut mod_sensitive: Local<crate::ui_script::VmMemo<HashSet<u32>>>,
+    mut last_skills: Local<crate::ui_script::VmMemo<Option<crate::spell::SkillSnapshot>>>,
 ) {
     let Some(mut script) = script else {
         return;
     };
     let pending = pending.get(&script);
+    let mod_sensitive = mod_sensitive.get(&script);
+    let me = self_q.single().ok();
     for id in script.take_item_set_asks() {
         pending.entry(id).or_default();
     }
+    // The `$`-tokens' per-level terms follow the player's skills.
+    let skills = Some(crate::spell::skill_snapshot(me));
+    let skills_changed = *last_skills.get(&script) != skills;
+    *last_skills.get(&script) = skills;
+    if spell_mods.is_changed() || skills_changed {
+        for &id in mod_sensitive.iter() {
+            pending.entry(id).or_default();
+        }
+    }
     if pending.is_empty() {
         return;
     }
@@ -235,15 +282,21 @@ pub(super) fn feed_item_sets(
     };
     let spell_res = spells.as_deref();
     let skill_catalog = skill_lines.as_deref().map(|s| &s.catalog);
+    let skill = |id| crate::spell::spell_skill_value(me, skill_catalog, id);
     let mut done: Vec<u32> = Vec::new();
     let mut push: Vec<(u32, benilla_ui::script::ItemSetView)> = Vec::new();
-    // Dropped before the push, which needs the VM mutably.
-    let token_text = crate::ui_script::token_text(&script);
+    // Its borrow of the VM ends before the push, which needs the VM mutably.
+    let global = |key: &str| benilla_ui::strings::global(script.lua(), key);
     for (&set_id, last) in pending.iter_mut() {
         let Some(row) = sets.0.set(set_id) else {
             done.push(set_id); // no such row: drop the ask
             continue;
         };
+        if bonuses_have_mod_tokens(&row.bonuses, spell_res) {
+            mod_sensitive.insert(set_id);
+        } else {
+            mod_sensitive.remove(&set_id);
+        }
         let members: Vec<(u32, Option<String>)> = row
             .items
             .iter()
@@ -255,7 +308,8 @@ pub(super) fn feed_item_sets(
                 .bonuses
                 .iter()
                 .filter_map(|&(n, spell)| {
-                    spell_desc_text(spell_res, spell, None, &token_text).map(|desc| (n, desc))
+                    spell_desc_text(spell_res, spell, &skill, None, Some(&spell_mods), &global)
+                        .map(|desc| (n, desc))
                 })
                 .collect(),
             required_skill: row.required_skill,
@@ -277,7 +331,6 @@ pub(super) fn feed_item_sets(
             push.push((set_id, view));
         }
     }
-    drop(token_text);
     for (id, view) in push {
         script.set_item_set(id, view);
     }
@@ -322,6 +375,11 @@ pub(super) fn feed_item_stats(
     mut items: ResMut<Items>,
     commands: Res<NetCommands>,
     spells: Option<Res<crate::ui_action::Spells>>,
+    // The caster the `$`-tokens read: its spell modifiers and its skills.
+    (spell_mods, self_q): (
+        Res<crate::spell::SpellModifiers>,
+        Query<&ObjectStore, With<SelfPlayer>>,
+    ),
     skill_lines: Option<Res<crate::ui_spellbook::SkillLines>>,
     // The `$z` token: the bind point's area (`SMSG_BINDPOINTUPDATE`), named through `AreaTable`.
     home_bind: Option<Res<crate::net::HomeBind>>,
@@ -332,13 +390,21 @@ pub(super) fn feed_item_stats(
     classes: Option<Res<super::ItemClasses>>,
     icons: Option<Res<ItemDisplays>>,
     mut pending: Local<crate::ui_script::VmMemo<std::collections::HashSet<u32>>>,
+    mut mod_sensitive: Local<crate::ui_script::VmMemo<HashSet<u32>>>,
     mut last_home: Local<crate::ui_script::VmMemo<Option<String>>>,
+    mut last_skills: Local<crate::ui_script::VmMemo<Option<crate::spell::SkillSnapshot>>>,
 ) {
     let Some(mut script) = script else {
         return;
     };
     let pending = pending.get(&script);
+    let mod_sensitive = mod_sensitive.get(&script);
     let last_home = last_home.get(&script);
+    let me = self_q.single().ok();
+    // The `$`-tokens' per-level terms follow the player's skills.
+    let skills = Some(crate::spell::skill_snapshot(me));
+    let skills_changed = *last_skills.get(&script) != skills;
+    *last_skills.get(&script) = skills;
     // `GetBindLocation()`'s push, here so it and the `$z` token share one name, and ahead of the
     // pending gate below: the bind point can arrive while the feed idles.
     let home_area: Option<&str> = home_bind
@@ -355,11 +421,15 @@ pub(super) fn feed_item_stats(
 
     pending.extend(items.take_fresh());
     pending.extend(script.take_item_stat_asks());
+    if spell_mods.is_changed() || skills_changed {
+        pending.extend(mod_sensitive.iter().copied());
+    }
     if pending.is_empty() {
         return;
     }
     let spell_res = spells.as_deref();
     let skill_catalog = skill_lines.as_deref().map(|s| &s.catalog);
+    let skill = |id| crate::spell::spell_skill_value(me, skill_catalog, id);
     let ready: Vec<u32> = pending
         .iter()
         .copied()
@@ -380,11 +450,18 @@ pub(super) fn feed_item_stats(
             .filter_map(|id| {
                 pending.remove(&id);
                 let t = items.template(id, 0, &commands)?.clone();
+                if item_has_mod_tokens(&t, spell_res) {
+                    mod_sensitive.insert(id);
+                } else {
+                    mod_sensitive.remove(&id);
+                }
                 Some((
                     id,
                     template_view(
                         &t,
                         spell_res,
+                        Some(&spell_mods),
+                        &skill,
                         skill_catalog,
                         home_area,
                         factions.as_deref().map(|f| f.catalog()),
@@ -392,7 +469,6 @@ pub(super) fn feed_item_stats(
                         classes.as_deref().map(|c| &c.0),
                         icons.as_deref(),
                         &get,
-                        &crate::ui_script::token_text(&script),
                     ),
                 ))
             })
@@ -1778,6 +1854,44 @@ mod tests {
         }
     }
 
+    #[test]
+    fn modifier_refresh_tracks_only_item_and_set_descriptions_with_tokens() {
+        let displays = std::collections::HashMap::from([
+            (
+                1,
+                benilla_formats::SpellDisplay {
+                    description: Some("Restores 5 health.".into()),
+                    ..Default::default()
+                },
+            ),
+            (
+                2,
+                benilla_formats::SpellDisplay {
+                    description: Some("Restores $s1 health.".into()),
+                    ..Default::default()
+                },
+            ),
+        ]);
+        let spells = crate::ui_action::Spells {
+            catalog: benilla_formats::SpellCatalog::from_displays(displays),
+            forms: Default::default(),
+            ranges: Default::default(),
+            cast_times: Default::default(),
+            durations: Default::default(),
+            radii: Default::default(),
+        };
+        let mut item = crate::items::test_template("Token item");
+        item.spells = vec![slot(1, 0)];
+        assert!(!super::item_has_mod_tokens(&item, Some(&spells)));
+        item.spells.push(slot(2, 0));
+        assert!(super::item_has_mod_tokens(&item, Some(&spells)));
+        assert!(!super::bonuses_have_mod_tokens(&[(2, 1)], Some(&spells)));
+        assert!(super::bonuses_have_mod_tokens(
+            &[(2, 1), (4, 2)],
+            Some(&spells)
+        ));
+    }
+
     /// The builder's charge gate (`0x52da01`, `0x52db51`).
     #[test]
     fn charge_gate_matches_the_real_builder() {
@@ -1812,7 +1926,7 @@ mod tests {
         };
 
         // No string table: Fireball's description reaches no keyed token.
-        let no_strings = |_: &str, _: &[i64]| None;
+        let no_strings = |_: &str| None;
 
         // The lock chain's Opening and Closing spells, none with a description.
         for id in [3365u32, 3366, 6246, 6247, 6477, 21651] {
@@ -1822,7 +1936,7 @@ mod tests {
                 "spell {id} has a name — which is exactly what must NOT leak into the tooltip"
             );
             assert_eq!(
-                super::spell_desc_text(Some(&spells), id, None, &no_strings),
+                super::spell_desc_text(Some(&spells), id, &|_| 0, None, None, &no_strings),
                 None,
                 "spell {id} ({:?}) has no description, so the reference prints no trigger line",
                 d.name
@@ -1830,7 +1944,7 @@ mod tests {
         }
 
         // The control: Fireball (133), described, still yields its line.
-        let fireball = super::spell_desc_text(Some(&spells), 133, None, &no_strings)
+        let fireball = super::spell_desc_text(Some(&spells), 133, &|_| 0, None, None, &no_strings)
             .expect("a described spell still yields its line");
         assert!(
             fireball.contains("damage"),
diff --git a/crates/benilla-app/src/ui_items/mod.rs b/crates/benilla-app/src/ui_items/mod.rs
index 1f0ebc62..27388a7c 100644
--- a/crates/benilla-app/src/ui_items/mod.rs
+++ b/crates/benilla-app/src/ui_items/mod.rs
@@ -28,8 +28,10 @@ mod net;
 pub(crate) use drain::send_auto_equip;
 use drain::{
     drain_bag_autostores, drain_container_autoequips, drain_container_destroys,
-    drain_container_moves, drain_container_uses, drain_inventory_uses,
+    drain_container_moves, drain_container_repairs,
 };
+// `UseContainerItem` and `UseInventoryItem`, applied in call order by `crate::script_calls`.
+pub(crate) use drain::ScriptItemUse;
 use feed::{
     feed_containers, feed_item_sets, feed_item_stats, feed_player_req, feed_random_properties,
 };
@@ -947,8 +949,9 @@ impl Plugin for UiItemsPlugin {
                     // The roll table, pushed whole once per VM, before the first hover.
                     feed_random_properties.in_set(UnitFeed),
                     feed_player_req.in_set(UnitFeed),
-                    // After the input pass, so a click's UseContainerItem goes out the same frame.
-                    drain_container_uses.after(UiInput),
+                    // After the input pass, so a repair-mode click goes out the same frame; a
+                    // plain `UseContainerItem` is a script call.
+                    drain_container_repairs.after(UiInput),
                     // Pick, place and split: `CMSG_SWAP_INV_ITEM`, `CMSG_SWAP_ITEM` or
                     // `CMSG_SPLIT_ITEM`.
                     drain_container_moves.after(UiInput),
@@ -957,8 +960,6 @@ impl Plugin for UiItemsPlugin {
                     // `AutoEquipCursorItem`: `CMSG_AUTOEQUIP_ITEM`.
                     drain_container_autoequips.after(UiInput),
                     drain_bag_autostores.after(UiInput),
-                    // `UseInventoryItem`: `CMSG_USE_ITEM` at the equipped position.
-                    drain_inventory_uses.after(UiInput),
                     // The soulbind confirmations' answers (`EquipPendingItem`,
                     // `CancelPendingEquip`, `ConfirmBindOnUse`). A dialog is answered in a later
                     // frame than it was raised, so no order against the other drains is needed.
diff --git a/crates/benilla-app/src/ui_logout.rs b/crates/benilla-app/src/ui_logout.rs
index 86ebb3a3..0c6cc6e9 100644
--- a/crates/benilla-app/src/ui_logout.rs
+++ b/crates/benilla-app/src/ui_logout.rs
@@ -43,13 +43,18 @@ enum LogoutSignal {
 pub(crate) struct LogoutState {
     quitting: bool,
     /// The reference's `[session+0x1b1d]`: a request is out and unanswered. `0x5ab000` drops a
-    /// second request silently while it is set, which the idle logout, asking every frame, relies
-    /// on; `ForceLogout` (`0x5aaff0`) bypasses it and does not set it.
+    /// second request silently while it is set, and the idle handler skips its thirty-minute leg
+    /// on it (`0x482ef5`); `ForceLogout` (`0x5aaff0`) bypasses it and does not set it.
     pending: bool,
     signals: Vec<LogoutSignal>,
 }
 
 impl LogoutState {
+    /// The pending byte, as `0x5ab0d0` returns it.
+    pub(crate) fn pending(&self) -> bool {
+        self.pending
+    }
+
     /// `SMSG_LOGOUT_RESPONSE`, the module doc's table; an instant logout signals nothing.
     pub(crate) fn apply_response(&mut self, reason: u32, instant: bool) {
         // Logged: the server's inputs (combat, resting, account level) are invisible from here.
@@ -105,7 +110,7 @@ fn feed_logout(
 }
 
 /// Turn the Lua intents into packets; a forced quit, or a quit with no world session, exits.
-fn drain_logout(
+pub(crate) fn drain_logout(
     script: Option<NonSendMut<UiScript>>,
     mut logout: ResMut<LogoutState>,
     self_guid: Res<SelfGuid>,
@@ -203,8 +208,11 @@ impl Plugin for UiLogoutPlugin {
             Update,
             (
                 feed_logout.in_set(UiFeed),
-                drain_logout.after(UiInput),
-                exit_on_logout_complete.after(UiInput),
+                // After the idle handler, which reads the pending byte: its request is drained
+                // and the byte set in the frame it was asked, as `0x5ab05b` sets it in the call.
+                (drain_logout, exit_on_logout_complete)
+                    .after(UiInput)
+                    .after(crate::ui_chat::idle::idle_handler),
             ),
         );
     }
@@ -302,7 +310,7 @@ mod tests {
         assert_eq!(sent(&rx), 1, "the first ask goes out");
         assert!(app.world().resource::<LogoutState>().pending);
 
-        // The idle logout's shape: asking every frame while unanswered.
+        // A second ask while the first is unanswered, as a double-clicked Logout makes.
         for _ in 0..60 {
             ask(&mut app, SessionRequest::Logout);
         }
diff --git a/crates/benilla-app/src/ui_loot/mod.rs b/crates/benilla-app/src/ui_loot/mod.rs
index 443e66e0..f7e8e682 100644
--- a/crates/benilla-app/src/ui_loot/mod.rs
+++ b/crates/benilla-app/src/ui_loot/mod.rs
@@ -523,6 +523,8 @@ fn snapshot(
         rows,
         fishing: loot.fishing,
         master_candidates: who.names_for(loot),
+        // The feed's, which holds the object manager.
+        source_unit: false,
     })
 }
 
@@ -637,6 +639,24 @@ fn drain_receives(
 }
 
 /// Emits the queued pushes, then pushes the loot snapshot and fires the loot events on a change.
+/// The object manager as `SetLootPortrait` asks it (`0x468460`, typemask 8): whether the loot
+/// source is a unit object we hold.
+#[derive(bevy::ecs::system::SystemParam)]
+struct LootSourceObjects<'w, 's> {
+    index: Option<Res<'w, crate::net::GuidIndex>>,
+    stores: Query<'w, 's, &'static crate::net::ObjectStore>,
+}
+
+impl LootSourceObjects<'_, '_> {
+    fn is_unit(&self, guid: u64) -> bool {
+        self.index
+            .as_ref()
+            .and_then(|index| index.0.get(&guid))
+            .and_then(|&e| self.stores.get(e).ok())
+            .is_some_and(|s| s.is_unit())
+    }
+}
+
 fn feed_loot(
     script: Option<NonSendMut<UiScript>>,
     mut loot: ResMut<LootState>,
@@ -653,6 +673,7 @@ fn feed_loot(
     enchants: Option<Res<crate::items::Enchants>>,
     group: Res<GroupState>,
     names: Res<NameCache>,
+    objects: LootSourceObjects,
 ) {
     let Some(mut script) = script else {
         return;
@@ -676,7 +697,10 @@ fn feed_loot(
         group: &group,
         names: &names,
     };
-    let fresh = snapshot(&loot, &items, icons.as_deref(), &commands, rolls, who);
+    let fresh = snapshot(&loot, &items, icons.as_deref(), &commands, rolls, who).map(|mut snap| {
+        snap.source_unit = loot.source().is_some_and(|g| objects.is_unit(g));
+        snap
+    });
     if fresh == *last {
         return;
     }
@@ -839,7 +863,7 @@ fn close_on_move_start(
 }
 
 /// Sends what the Lua asked for, as the take dispatcher `0x4c2790(slot, flag)`: a row click
-/// (`BenillaTakeLootSlot`, flag 0) and the `LOOT_BIND` confirm (`LootSlot`, flag 1) stay apart,
+/// (a `LootButton`'s own, flag 0) and the `LOOT_BIND` confirm (`LootSlot`, flag 1) stay apart,
 /// so a second click on a bind-on-pickup row asks again.
 fn drain_loot(
     script: Option<NonSendMut<UiScript>>,
@@ -896,7 +920,7 @@ fn drain_loot(
                 // At the click, before any answer (`0x4c2926`): the item's ItemGroupSounds kit 0.
                 pickup.write(crate::sound::LootPickupSound { display_id });
             }
-            None => debug!("ui_loot: BenillaTakeLootSlot({index}) out of range — ignored"),
+            None => debug!("ui_loot: row {index} clicked out of range — ignored"),
         }
     }
 
@@ -1069,9 +1093,12 @@ mod tests {
     const SECOND_BOP: u32 = 18832;
 
     /// `rows` open on a corpse with every template landed, then `lua` and one drain.
+    /// A loot window over `rows` whose display rows `clicks` are clicked by the mouse, as a
+    /// `LootButton` takes (`0x4c1820`), then `lua` run, then one drain.
     fn drain_with(
         gold: u32,
         rows: Vec<LootItem>,
+        clicks: &[u32],
         lua: &str,
     ) -> (App, crossbeam_channel::Receiver<ClientCommand>) {
         let (tx, rx) = crossbeam_channel::unbounded();
@@ -1106,7 +1133,7 @@ mod tests {
             .resource_mut::<LootState>()
             .open(0x42, loot_type::CORPSE, gold, rows);
 
-        let script = UiScript::new().unwrap();
+        let mut script = UiScript::new().unwrap();
         script
             .run(
                 "BIND_CONFIRMS = {}\n\
@@ -1115,12 +1142,78 @@ mod tests {
                  f:SetScript(\"OnEvent\", function() tinsert(BIND_CONFIRMS, arg1) end)",
             )
             .unwrap();
+        script.set_screen_size(1024.0, 768.0);
+        for &row in clicks {
+            script
+                .run(&format!(
+                    "local b = CreateFrame(\"LootButton\", \"DrainRow\", UIParent)\n\
+                     b:SetPoint(\"BOTTOMLEFT\", 100, 100) b:SetWidth(50) b:SetHeight(50)\n\
+                     b:EnableMouse(true) b:Show() b:SetSlot({row})"
+                ))
+                .unwrap();
+            script.resolve();
+            script.mouse_button(125.0, 125.0, "LeftButton", true);
+            script.mouse_button(125.0, 125.0, "LeftButton", false);
+        }
         script.run(lua).unwrap();
         app.insert_non_send_resource(script);
         app.world_mut().run_system_once(drain_loot).unwrap();
         (app, rx)
     }
 
+    /// `SetLootPortrait` answers 1 only while the loot source is a unit object we hold
+    /// (`0x4c2bd1`-`0x4c2be9`): a creature's corpse, never a chest or a source out of view.
+    #[test]
+    fn the_loot_portrait_follows_a_unit_source_only() {
+        use benilla_protocol::ObjectFields;
+        for (unit, expected) in [(true, true), (false, false)] {
+            let (tx, _rx) = crossbeam_channel::unbounded();
+            let mut app = App::new();
+            app.add_message::<crate::sound::LootPickupSound>()
+                .init_resource::<LootState>()
+                .init_resource::<crate::ui_chat::ChatLog>()
+                .init_resource::<GroupState>()
+                .init_resource::<NameCache>()
+                .init_resource::<Items>()
+                .init_resource::<ButtonInput<KeyCode>>()
+                .init_resource::<LootConfig>()
+                .init_resource::<crate::net::GuidIndex>()
+                .insert_resource(NetCommands(tx))
+                .add_systems(bevy::prelude::Update, feed_loot);
+            // OBJECT_FIELD_TYPE (2): TYPEMASK_OBJECT | TYPEMASK_UNIT for a creature, | 0x20 for a
+            // game object.
+            let kind = if unit { 0x9 } else { 0x21 };
+            let e = app
+                .world_mut()
+                .spawn(crate::net::ObjectStore(ObjectFields::from_pairs(&[(
+                    2, kind,
+                )])))
+                .id();
+            app.world_mut()
+                .resource_mut::<crate::net::GuidIndex>()
+                .0
+                .insert(0x42, e);
+            app.world_mut().resource_mut::<LootState>().open(
+                0x42,
+                loot_type::CORPSE,
+                5,
+                Vec::new(),
+            );
+            let script = UiScript::new().unwrap();
+            script
+                .run(r#"CreateFrame("Frame", "LootHost"):CreateTexture("LootTex")"#)
+                .unwrap();
+            app.insert_non_send_resource(script);
+            app.update();
+            let answered = app
+                .world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .eval::<bool>("return SetLootPortrait(LootTex) == 1")
+                .unwrap();
+            assert_eq!(answered, expected, "unit source: {unit}");
+        }
+    }
+
     /// `0x4c2ac0` fires `LOOT_OPENED` once, at the last answer; here a negative one opens it too.
     #[test]
     fn the_window_waits_for_every_item_template() {
@@ -1220,7 +1313,7 @@ mod tests {
     /// The click arm's deferral (`0x4c28f2`-`0x4c2920`).
     #[test]
     fn a_bop_row_confirms_instead_of_sending() {
-        let (mut app, rx) = drain_with(0, vec![item(0, FELSTRIKER, 1)], "BenillaTakeLootSlot(1)");
+        let (mut app, rx) = drain_with(0, vec![item(0, FELSTRIKER, 1)], &[1], "");
         assert!(sent(&rx).is_empty(), "the deferred take sends nothing");
         assert_eq!(pending_confirm(&app), Some(1), "and stashes the row");
 
@@ -1234,11 +1327,7 @@ mod tests {
     /// The confirm arm (`0x4c27c0`).
     #[test]
     fn loot_slot_completes_the_pending_confirm_exactly_once() {
-        let (mut app, rx) = drain_with(
-            0,
-            vec![item(7, FELSTRIKER, 1)],
-            "BenillaTakeLootSlot(1) LootSlot(1)",
-        );
+        let (mut app, rx) = drain_with(0, vec![item(7, FELSTRIKER, 1)], &[1], "LootSlot(1)");
         assert!(
             matches!(
                 sent(&rx)[..],
@@ -1263,6 +1352,7 @@ mod tests {
         let (_app, rx) = drain_with(
             0,
             vec![item(0, TOUGH_JERKY, 1), item(1, FLURRY_AXE, 1)],
+            &[],
             "LootSlot(1) LootSlot(2)",
         );
         assert!(
@@ -1278,7 +1368,7 @@ mod tests {
             (WHITE_BOP, "quality 1 is below the floor of 2"),
             (TOUGH_JERKY, "neither"),
         ] {
-            let (app, rx) = drain_with(0, vec![item(3, entry, 1)], "BenillaTakeLootSlot(1)");
+            let (app, rx) = drain_with(0, vec![item(3, entry, 1)], &[1], "");
             assert!(
                 matches!(
                     sent(&rx)[..],
@@ -1300,7 +1390,8 @@ mod tests {
         let (mut app, rx) = drain_with(
             120, // gold, so display row 1 is the coin and the item is row 2
             vec![item(4, FELSTRIKER, 1)],
-            "BenillaTakeLootSlot(2)",
+            &[2],
+            "",
         );
         assert_eq!(
             pending_confirm(&app),
@@ -1325,7 +1416,7 @@ mod tests {
     /// `0x4c27d7`: the continuation returns on an emptied record.
     #[test]
     fn an_accept_for_a_row_that_was_taken_away_sends_nothing() {
-        let (mut app, rx) = drain_with(0, vec![item(2, FELSTRIKER, 1)], "BenillaTakeLootSlot(1)");
+        let (mut app, rx) = drain_with(0, vec![item(2, FELSTRIKER, 1)], &[1], "");
         assert_eq!(pending_confirm(&app), Some(1));
 
         app.world_mut().resource_mut::<LootState>().remove_slot(2);
@@ -1344,7 +1435,7 @@ mod tests {
     /// `0x4c1df5`: the response copier resets the stash.
     #[test]
     fn a_pending_confirm_does_not_survive_the_window() {
-        let (mut app, _rx) = drain_with(0, vec![item(0, FELSTRIKER, 1)], "BenillaTakeLootSlot(1)");
+        let (mut app, _rx) = drain_with(0, vec![item(0, FELSTRIKER, 1)], &[1], "");
         assert_eq!(pending_confirm(&app), Some(1));
 
         app.world_mut().resource_mut::<LootState>().clear();
diff --git a/crates/benilla-app/src/ui_loot/net.rs b/crates/benilla-app/src/ui_loot/net.rs
index ce24974f..ffd92655 100644
--- a/crates/benilla-app/src/ui_loot/net.rs
+++ b/crates/benilla-app/src/ui_loot/net.rs
@@ -1,7 +1,7 @@
 //! The loot window's packet handlers: the [`LootState`] session and the [`LootLatch`] the feed
 //! reads, the fishing verdicts, and the item push behind "You receive …".
 
-use benilla_protocol::messages::{ItemPushResult, LootItem};
+use benilla_protocol::messages::ItemPushResult;
 use benilla_protocol::{SessionEvent, SessionEventKind};
 use bevy::prelude::*;
 
@@ -25,23 +25,28 @@ pub(super) fn register(app: &mut App) {
         .net_handler(K::Disconnected, on_session_end);
 }
 
-fn on_response(
-    In(ev): In<SessionEvent>,
-    mut loot: ResMut<LootState>,
-    mut latch: ResMut<LootLatch>,
-    commands: Res<NetCommands>,
-) {
-    if let SessionEvent::LootResponse {
+/// An admitted response selects a looted unit (`0x5ebc35` → `0x48f3a0`) before the window opens
+/// (`0x4c1cb0`), so the outgoing target's teardown closes a window still open on it.
+fn on_response(In(ev): In<SessionEvent>, mut select: crate::target::SelectCommit) {
+    let SessionEvent::LootResponse {
         guid,
         loot_type,
         gold,
         items,
     } = ev
-    {
-        loot_response(
-            guid, loot_type, gold, items, &mut loot, &mut latch, &commands,
-        );
+    else {
+        return;
+    };
+    let seam = &mut select.seam;
+    if !admit_response(guid, loot_type, &mut seam.loot_latch, &seam.net) {
+        return;
     }
+    debug!(
+        "net: loot response {guid:#x} type {loot_type} gold {gold} {} item(s)",
+        items.len()
+    );
+    select.select_unit(guid);
+    select.seam.loot.open(guid, loot_type, gold, items);
 }
 
 fn on_error(
@@ -151,17 +156,9 @@ const SERVER_STARTED_LOOT: [u8; 3] = [2, 3, 4];
 /// `SMSG_LOOT_RESPONSE`'s item shape, behind the admission gate `0x5eb924`: it opens when the
 /// latch holds the packet's guid, or when the latch is cold and the type is server-started.
 /// Anything else is refused (`0x5eb963`): no window, a `CMSG_LOOT_RELEASE` for the packet's guid,
-/// and the latch cleared whatever it held. An open writes the latch (`0x5ebb60`) and plays no
-/// anim; a chest already knelt at its `SMSG_SPELL_GO` (`0x6e831b`).
-fn loot_response(
-    guid: u64,
-    loot_type: u8,
-    gold: u32,
-    items: Vec<LootItem>,
-    loot: &mut LootState,
-    latch: &mut LootLatch,
-    net: &NetCommands,
-) {
+/// and the latch cleared whatever it held. An admitted one writes the latch (`0x5ebb60`) and plays
+/// no anim; a chest already knelt at its `SMSG_SPELL_GO` (`0x6e831b`).
+fn admit_response(guid: u64, loot_type: u8, latch: &mut LootLatch, net: &NetCommands) -> bool {
     let accept = match latch.0 {
         Some(latched) => latched == guid,
         None => SERVER_STARTED_LOOT.contains(&loot_type),
@@ -176,15 +173,11 @@ fn loot_response(
             let _ = net.0.send(ClientCommand::LootRelease { guid });
         }
         latch.0 = None; // not guid-matched: `0x5eb9d2` clears whatever was there
-        return;
+        return false;
     }
-    debug!(
-        "net: loot response {guid:#x} type {loot_type} gold {gold} {} item(s)",
-        items.len()
-    );
-    loot.open(guid, loot_type, gold, items);
     // A fishing bobber first arms here and still does not kneel: `LootKneel` decides the pose.
     latch.0 = Some(guid);
+    true
 }
 
 /// `SMSG_FISH_ESCAPED` (the skill roll failed) or `SMSG_FISH_NOT_HOOKED` (clicked before the
@@ -513,48 +506,68 @@ mod tests {
     /// No `CMSG_LOOT` armed the latch; a chest's answer is wire type 2 (`0x5eb94b`-`0x5eb95b`).
     #[test]
     fn a_cold_latch_admits_a_server_started_loot_and_arms_on_it() {
-        let (net, rx) = net();
-        let mut loot = LootState::default();
-        let mut latch = LootLatch::default();
-        assert_eq!(latch.0, None, "no CMSG_LOOT was sent, so nothing armed it");
+        let (mut world, rx) = tabbed_world();
+        assert_eq!(
+            world.resource::<LootLatch>().0,
+            None,
+            "no CMSG_LOOT was sent, so nothing armed it"
+        );
 
-        loot_response(CHEST, 2, 0, Vec::new(), &mut loot, &mut latch, &net);
-        assert_eq!(latch.0, Some(CHEST), "the open window is the loot session");
-        assert_eq!(loot.source(), Some(CHEST), "…and the window opened");
+        respond(&mut world, CHEST, 2);
+        assert_eq!(
+            world.resource::<LootLatch>().0,
+            Some(CHEST),
+            "the open window is the loot session"
+        );
+        assert_eq!(
+            world.resource::<LootState>().source(),
+            Some(CHEST),
+            "…and the window opened"
+        );
         assert!(
             rx.try_recv().is_err(),
             "an accepted response bounces nothing"
         );
 
-        loot_release_response(CHEST, &mut loot, &mut latch, no_item!());
-        assert_eq!(latch.0, None, "the release ends the session");
+        world
+            .run_system_once_with(
+                on_release_response,
+                SessionEvent::LootReleaseResponse { guid: CHEST },
+            )
+            .expect("the handler runs as a one-shot system");
+        assert_eq!(
+            world.resource::<LootLatch>().0,
+            None,
+            "the release ends the session"
+        );
     }
 
     /// The `CMSG_LOOT` send armed the same guid: the match branch (`0x5eb93e`).
     #[test]
     fn a_matching_latch_admits_any_loot_type() {
-        let (net, _rx) = net();
-        let mut loot = LootState::default();
-        let mut latch = LootLatch(Some(CORPSE)); // the `CMSG_LOOT` send
-        loot_response(CORPSE, 1, 0, Vec::new(), &mut loot, &mut latch, &net);
-        assert_eq!(latch.0, Some(CORPSE));
-        assert_eq!(loot.source(), Some(CORPSE));
+        let (mut world, _rx) = tabbed_world();
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE); // the `CMSG_LOOT` send
+        respond(&mut world, CORPSE, 1);
+        assert_eq!(world.resource::<LootLatch>().0, Some(CORPSE));
+        assert_eq!(world.resource::<LootState>().source(), Some(CORPSE));
     }
 
     /// The refusal arm (`0x5eb963`): a type-1 answer on a cold latch answers nothing we asked.
     #[test]
     fn a_cold_latch_refuses_a_corpse_typed_response_and_bounces_it() {
-        let (net, rx) = net();
-        let mut loot = LootState::default();
-        let mut latch = LootLatch::default();
+        let (mut world, rx) = tabbed_world();
 
-        loot_response(CORPSE, 1, 0, Vec::new(), &mut loot, &mut latch, &net);
+        respond(&mut world, CORPSE, 1);
         assert_eq!(
-            loot.source(),
+            world.resource::<LootState>().source(),
             None,
             "no window for an unasked-for corpse answer"
         );
-        assert_eq!(latch.0, None, "…and nothing latched");
+        assert_eq!(
+            world.resource::<LootLatch>().0,
+            None,
+            "…and nothing latched"
+        );
         assert!(
             matches!(rx.try_recv(), Ok(ClientCommand::LootRelease { guid }) if guid == CORPSE),
             "the refusal releases the object the PACKET named"
@@ -564,12 +577,15 @@ mod tests {
     /// The refusal's clear is not guid-matched (`0x5eb9d2`): a response for B drops a latch on A.
     #[test]
     fn a_refusal_drops_whatever_latch_was_live_not_just_a_matching_one() {
-        let (net, rx) = net();
-        let mut loot = LootState::default();
-        let mut latch = LootLatch(Some(CORPSE));
+        let (mut world, rx) = tabbed_world();
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE);
 
-        loot_response(CHEST, 1, 0, Vec::new(), &mut loot, &mut latch, &net);
-        assert_eq!(latch.0, None, "A's latch is dropped by B's refusal");
+        respond(&mut world, CHEST, 1);
+        assert_eq!(
+            world.resource::<LootLatch>().0,
+            None,
+            "A's latch is dropped by B's refusal"
+        );
         assert!(
             matches!(rx.try_recv(), Ok(ClientCommand::LootRelease { guid }) if guid == CHEST),
             "…and it is B that gets released"
@@ -687,6 +703,367 @@ mod tests {
             .is_none());
     }
 
+    /// A live creature: `TYPEMASK_OBJECT | TYPEMASK_UNIT`, so it is the Tab target.
+    const KOBOLD: u64 = 0xF130_0000_0600_00CD;
+    /// A creature flagged `UNIT_FLAG_NOT_SELECTABLE`.
+    const UNSELECTABLE: u64 = 0xF130_0000_0700_00EF;
+
+    const OBJECT_FIELD_TYPE: u16 = 2;
+    const OBJECT_FIELD_ENTRY: u16 = 3;
+    /// `OBJECT_FIELD_TYPE` masks: `TYPEMASK_OBJECT` with `UNIT`, `PLAYER` or `GAMEOBJECT`.
+    const TYPE_UNIT: u32 = 0x09;
+    const TYPE_PLAYER: u32 = 0x19;
+    const TYPE_GAMEOBJECT: u32 = 0x21;
+    /// `UNIT_FLAG_NOT_SELECTABLE`.
+    const NOT_SELECTABLE: u32 = 1 << 25;
+    const KOBOLD_ENTRY: u32 = 6;
+    const CORPSE_ENTRY: u32 = 257;
+
+    /// Us, the Tab target selected, and a corpse, a chest and an unselectable unit beside it, all
+    /// streamed: the issue's spot, with what [`on_response`] reads and the selection commit writes.
+    fn tabbed_world() -> (World, crossbeam_channel::Receiver<ClientCommand>) {
+        let mut world = World::new();
+        let rx = seat_tabbed(&mut world);
+        (world, rx)
+    }
+
+    /// [`tabbed_world`]'s seating, into any world.
+    fn seat_tabbed(world: &mut World) -> crossbeam_channel::Receiver<ClientCommand> {
+        use crate::net::{Guid, GuidIndex, NetEntity, ObjectStore, SelfPlayer};
+        use benilla_protocol::field::{FIELD_UNIT_FLAGS, FIELD_UNIT_HEALTH};
+        use benilla_protocol::messages::{ObjectFields, ObjectType};
+        use benilla_protocol::EntityKind::{GameObject, Unit};
+        let unit = |kind, type_mask, pairs: &[(u16, u32)]| {
+            let mut fields = vec![(OBJECT_FIELD_TYPE, type_mask)];
+            fields.extend_from_slice(pairs);
+            (
+                NetEntity {
+                    kind,
+                    display_id: None,
+                    scale: 1.0,
+                },
+                ObjectStore(ObjectFields::from_pairs(&fields).into_created(match kind {
+                    GameObject => ObjectType::GameObject,
+                    _ => ObjectType::Unit,
+                })),
+            )
+        };
+        let (net, rx) = net();
+        world.insert_resource(net);
+        world.init_resource::<LootState>();
+        world.init_resource::<LootLatch>();
+        world.init_resource::<crate::spell::QueuedMeleeSpell>();
+        world.init_resource::<crate::spell::AutoRepeatActive>();
+        world.init_resource::<bevy::ecs::message::Messages<crate::creature_anim::SheathRequest>>();
+        world.init_resource::<GuidIndex>();
+        world.init_resource::<crate::net::Reputations>();
+        world.init_resource::<crate::target::AssistAttack>();
+        world.init_resource::<crate::target::Selection>();
+        world.init_resource::<PendingItemOps>();
+        world.init_resource::<LockTransitions>();
+        world.init_resource::<bevy::ecs::message::Messages<crate::target::DeselectGuid>>();
+        world.init_resource::<bevy::ecs::message::Messages<crate::player::StandStateRequest>>();
+        world.spawn((
+            SelfPlayer,
+            Guid(1),
+            unit(Unit, TYPE_PLAYER, &[(FIELD_UNIT_HEALTH, 100)]),
+        ));
+        for (guid, bundle) in [
+            (
+                KOBOLD,
+                unit(
+                    Unit,
+                    TYPE_UNIT,
+                    &[(OBJECT_FIELD_ENTRY, KOBOLD_ENTRY), (FIELD_UNIT_HEALTH, 100)],
+                ),
+            ),
+            (
+                CORPSE,
+                unit(
+                    Unit,
+                    TYPE_UNIT,
+                    &[(OBJECT_FIELD_ENTRY, CORPSE_ENTRY), (FIELD_UNIT_HEALTH, 0)],
+                ),
+            ),
+            (CHEST, unit(GameObject, TYPE_GAMEOBJECT, &[])),
+            (
+                UNSELECTABLE,
+                unit(
+                    Unit,
+                    TYPE_UNIT,
+                    &[(FIELD_UNIT_HEALTH, 0), (FIELD_UNIT_FLAGS, NOT_SELECTABLE)],
+                ),
+            ),
+        ] {
+            let e = world.spawn((Guid(guid), bundle)).id();
+            world.resource_mut::<GuidIndex>().0.insert(guid, e);
+        }
+        let kobold = world.resource::<GuidIndex>().0[&KOBOLD];
+        let mut selection = world.resource_mut::<crate::target::Selection>();
+        selection.target = Some(kobold);
+        selection.guid = Some(KOBOLD);
+        rx
+    }
+
+    /// A response for `guid` of `loot_type` with no rows, through the registered handler.
+    fn respond(world: &mut World, guid: u64, loot_type: u8) {
+        world
+            .run_system_once_with(
+                on_response,
+                SessionEvent::LootResponse {
+                    guid,
+                    loot_type,
+                    gold: 0,
+                    items: Vec::new(),
+                },
+            )
+            .expect("the handler runs as a one-shot system");
+    }
+
+    /// `0x5ebc35` → `0x48f3a0` → `SetSelection 0x493540` on the looted unit's guid.
+    #[test]
+    fn a_loot_window_opening_on_a_unit_selects_it() {
+        let (mut world, rx) = tabbed_world();
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE); // the `CMSG_LOOT` send
+        respond(&mut world, CORPSE, 1);
+        assert_eq!(world.resource::<LootState>().source(), Some(CORPSE));
+        let selection = world.resource::<crate::target::Selection>();
+        assert_eq!(
+            selection.guid,
+            Some(CORPSE),
+            "the looted body is the target"
+        );
+        assert_eq!(
+            selection.last,
+            Some(KOBOLD),
+            "…through SetSelection's stamp"
+        );
+        let sent: Vec<_> = rx.try_iter().collect();
+        assert!(
+            matches!(sent[..], [ClientCommand::SetSelection { guid }] if guid == CORPSE),
+            "{sent:?}"
+        );
+
+        // The setter's dedup: a second window on the selected body sends nothing.
+        respond(&mut world, CORPSE, 1);
+        assert!(rx.try_recv().is_err());
+    }
+
+    /// `0x48f3a0` tests `TYPEMASK_UNIT`; `SetSelection`'s `IsSelectable` refuses the flagged unit;
+    /// a refused response never reaches `0x5ebc35`.
+    #[test]
+    fn a_chest_an_unselectable_unit_and_a_refusal_leave_the_target() {
+        for (guid, latched, loot_type) in [
+            (CHEST, true, 1),
+            (UNSELECTABLE, true, 1),
+            (CORPSE, false, 1),
+        ] {
+            let (mut world, rx) = tabbed_world();
+            world.resource_mut::<LootLatch>().0 = latched.then_some(guid);
+            respond(&mut world, guid, loot_type);
+            assert_eq!(
+                world.resource::<crate::target::Selection>().guid,
+                Some(KOBOLD),
+                "{guid:#x}"
+            );
+            assert!(
+                !rx.try_iter()
+                    .any(|c| matches!(c, ClientCommand::SetSelection { .. })),
+                "{guid:#x}"
+            );
+        }
+    }
+
+    /// The selection comes before the window (`0x48f3be`, then `0x4c1cb0`): the outgoing target's
+    /// teardown closes the window still open on it, its release ahead of the new selection.
+    #[test]
+    fn the_selection_tears_down_the_old_targets_window_before_the_new_one_opens() {
+        let (mut world, rx) = tabbed_world();
+        world
+            .resource_mut::<LootState>()
+            .open(KOBOLD, 2, 0, Vec::new());
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE);
+        respond(&mut world, CORPSE, 1);
+        let sent: Vec<_> = rx.try_iter().collect();
+        assert!(
+            matches!(
+                sent[..],
+                [ClientCommand::LootRelease { guid: a }, ClientCommand::SetSelection { guid: b }]
+                    if a == KOBOLD && b == CORPSE
+            ),
+            "{sent:?}"
+        );
+        assert_eq!(world.resource::<LootState>().source(), Some(CORPSE));
+        // [`LootLatch`]'s deviation: the reference's teardown zeroes it here (`0x48f2c9`).
+        assert_eq!(world.resource::<LootLatch>().0, Some(CORPSE));
+    }
+
+    /// `SetSelection`'s switch while swinging (`0x493a08`, `0x4938a1`): the swing at the Tab target
+    /// stops, and none opens on the body.
+    #[test]
+    fn looting_while_swinging_at_the_tab_target_stops_the_swing() {
+        use crate::net::SelfPlayer;
+        let (mut world, rx) = tabbed_world();
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .expect("us");
+        world
+            .entity_mut(me)
+            .insert(crate::creature_anim::Engaged(KOBOLD));
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE);
+        respond(&mut world, CORPSE, 1);
+        let sent: Vec<_> = rx.try_iter().collect();
+        assert!(
+            matches!(
+                sent[..],
+                [ClientCommand::AttackStop, ClientCommand::SetSelection { guid }] if guid == CORPSE
+            ),
+            "{sent:?}"
+        );
+    }
+
+    /// `StartAttack`'s target gate (`0x5ecc16`-`0x5ecc29`): a body is no swing target even when
+    /// hostile, so looting one mid-swing stops and selects, and swings at nothing.
+    #[test]
+    fn looting_a_hostile_body_while_swinging_never_swings_at_it() {
+        use crate::net::{ObjectStore, SelfPlayer};
+        use benilla_protocol::field::{FIELD_UNIT_FACTIONTEMPLATE, FIELD_UNIT_HEALTH};
+        use benilla_protocol::messages::{ObjectFields, ObjectType};
+        const UNIT_FIELD_BYTES_0: u16 = 36;
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let (factions, stormwind, reps) = crate::target::stormwind_fixture(&mut chain, 0);
+        let me_store = ObjectStore(
+            ObjectFields::from_pairs(&[
+                (OBJECT_FIELD_TYPE, TYPE_PLAYER),
+                (FIELD_UNIT_HEALTH, 100),
+                (FIELD_UNIT_FACTIONTEMPLATE, stormwind),
+                (UNIT_FIELD_BYTES_0, crate::target::HUMAN_WARRIOR),
+            ])
+            .into_created(ObjectType::Player),
+        );
+        let creature = |template, health| {
+            ObjectStore(
+                ObjectFields::from_pairs(&[
+                    (OBJECT_FIELD_TYPE, TYPE_UNIT),
+                    (FIELD_UNIT_HEALTH, health),
+                    (FIELD_UNIT_FACTIONTEMPLATE, template),
+                ])
+                .into_created(ObjectType::Unit),
+            )
+        };
+        let hostile = (1u32..4096)
+            .find(|&t| {
+                crate::target::can_attack(
+                    Some(&creature(t, 100)),
+                    Some(&factions),
+                    &reps,
+                    Some(&me_store),
+                )
+            })
+            .expect("a template a Stormwind human can attack");
+
+        let (mut world, rx) = tabbed_world();
+        world.insert_resource(factions);
+        world.insert_resource(reps);
+        let me = world
+            .query_filtered::<Entity, With<SelfPlayer>>()
+            .single(&world)
+            .expect("us");
+        world
+            .entity_mut(me)
+            .insert((me_store, crate::creature_anim::Engaged(KOBOLD)));
+        let corpse = world.resource::<crate::net::GuidIndex>().0[&CORPSE];
+        world.entity_mut(corpse).insert(creature(hostile, 0));
+        world.resource_mut::<LootLatch>().0 = Some(CORPSE);
+        respond(&mut world, CORPSE, 1);
+        let sent: Vec<_> = rx.try_iter().collect();
+        assert!(
+            matches!(
+                sent[..],
+                [ClientCommand::AttackStop, ClientCommand::SetSelection { guid }] if guid == CORPSE
+            ),
+            "{sent:?}"
+        );
+    }
+
+    /// The issue's symptom on the stock frames: the Tab target is on `TargetFrame` when the body's
+    /// window opens, and the unit feed then names the body there (`TargetFrame.lua:63`,
+    /// `UnitFrame.lua:25`).
+    #[test]
+    fn the_stock_target_frame_names_the_looted_body() {
+        use benilla_ui::script::UiScript;
+        benilla_formats::wow_data_or_skip!();
+        let mut s = UiScript::new().expect("VM");
+        s.set_screen_size(1024.0, 768.0);
+        for f in crate::ui_script::test_ui::production_order(&[&[
+            "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\UIParent.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\MoneyFrame.lua",
+            "Interface\\FrameXML\\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\TextStatusBar.lua",
+            "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\BuffFrame.xml",
+            "Interface\\FrameXML\\CombatFeedback.xml",
+            "Interface\\FrameXML\\UnitPopup.xml",
+            "Interface\\FrameXML\\UnitFrame.xml",
+            "Interface\\FrameXML\\PlayerFrame.xml",
+            "Interface\\FrameXML\\PartyFrame.xml",
+            "Interface\\FrameXML\\TargetFrame.xml",
+        ]]) {
+            crate::ui_script::test_ui::load_ui(&s, f);
+        }
+
+        let mut app = App::new();
+        seat_tabbed(app.world_mut());
+        let mut names = crate::names::NameCache::default();
+        for (entry, name) in [
+            (KOBOLD_ENTRY, "Kobold Vermin"),
+            (CORPSE_ENTRY, "Kobold Worker"),
+        ] {
+            names.insert_creature(
+                entry,
+                Some(crate::names::CreatureRecord {
+                    name: name.into(),
+                    subname: None,
+                    creature_type: 7,
+                    pet_family: 0,
+                    rank: 0,
+                    type_flags: 0,
+                    civilian: false,
+                    racial_leader: false,
+                    display_id: 0,
+                }),
+            );
+        }
+        app.insert_resource(names)
+            .init_resource::<crate::ui_party::GroupState>()
+            .init_resource::<crate::ui_chat::ChatLog>()
+            .init_resource::<crate::sound::MessageSounds>()
+            .init_resource::<crate::ui_guild::GuildState>()
+            .insert_non_send_resource(s);
+        crate::ui_unit::add_unit_feed(&mut app);
+        let shown = |app: &mut App| -> String {
+            let s = app.world().non_send_resource::<UiScript>();
+            assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+            s.eval("return TargetFrame:IsShown() and TargetFrame.name:GetText() or ''")
+                .expect("the target frame's name")
+        };
+
+        app.update();
+        assert_eq!(shown(&mut app), "Kobold Vermin", "the Tab target");
+
+        app.world_mut().resource_mut::<LootLatch>().0 = Some(CORPSE);
+        respond(app.world_mut(), CORPSE, 1);
+        app.update();
+        assert_eq!(shown(&mut app), "Kobold Worker", "the looted body");
+    }
+
     /// Only a releasing arm reaches `UnlockItem 0x495420`, through the tail `0x5ebac2`.
     #[test]
     fn a_releasing_loot_error_on_the_opened_item_unlocks_it() {
diff --git a/crates/benilla-app/src/ui_macro/mod.rs b/crates/benilla-app/src/ui_macro/mod.rs
index 51049bfe..b426263b 100644
--- a/crates/benilla-app/src/ui_macro/mod.rs
+++ b/crates/benilla-app/src/ui_macro/mod.rs
@@ -172,7 +172,7 @@ fn rebind_macro_spells(
     mut bound: ResMut<MacroBoundSpells>,
     mut last_generation: Local<crate::ui_script::VmMemo<Option<u64>>>,
 ) {
-    let (Some(script), Some(table)) = (script, table) else {
+    let (Some(mut script), Some(table)) = (script, table) else {
         return;
     };
     // Per VM: a fresh VM restarts its generation at 0, which a bare memo would gate off for good.
@@ -191,6 +191,27 @@ fn rebind_macro_spells(
         };
         fresh.insert(index, run::bound_spell(&table, &m.body, &book));
     }
+    // The engine's copy, for `GetActionAutocast`, re-pushed on every recompute so a fresh VM has
+    // it. The book flag stays the player's: `run::bound_spell` resolves the player's book only.
+    script.set_macro_bindings(
+        fresh
+            .iter()
+            .map(|(&index, b)| {
+                let spell = match *b {
+                    BoundSpell::None => 0,
+                    BoundSpell::Unresolved => -1,
+                    BoundSpell::Spell(id) => id as i32,
+                };
+                (
+                    index,
+                    benilla_ui::script::MacroBinding {
+                        spell,
+                        pet_book: false,
+                    },
+                )
+            })
+            .collect(),
+    );
     if fresh != bound.0 {
         let spells = fresh
             .values()
diff --git a/crates/benilla-app/src/ui_mail/mod.rs b/crates/benilla-app/src/ui_mail/mod.rs
index 8dbf4fca..e4e68a69 100644
--- a/crates/benilla-app/src/ui_mail/mod.rs
+++ b/crates/benilla-app/src/ui_mail/mod.rs
@@ -51,6 +51,21 @@ const STATIONERY_ICON_GM: &str = "Interface\\Icons\\Mail_GMIcon";
 #[derive(Resource)]
 pub(crate) struct Stationery(pub(crate) benilla_formats::StationeryCatalog);
 
+/// `Package.dbc`'s rows, in file order; without them `GetNumPackages()` answers 0.
+#[derive(Resource)]
+pub(crate) struct Packages(pub(crate) Vec<benilla_formats::PackageRow>);
+
+/// A package row as the engine answers it: the icon under `StringLookups.dbc` row 3's folder
+/// (`0x4ae4ab`, the `"%s%s"` of folder and `\`, then the basename appended).
+fn package_view(row: &benilla_formats::PackageRow) -> benilla_ui::script::PackageView {
+    benilla_ui::script::PackageView {
+        id: row.id,
+        name: row.name.clone(),
+        icon: format!("Interface\\Icons\\{}", row.icon),
+        cost: row.cost,
+    }
+}
+
 /// A `SEND` result queued for [`feed_mail`]. `MAIL_FAILED` fires on every one, success included:
 /// the reference uses it as "the send resolved" (`0x4ad15f`), and the stock handler only
 /// re-enables the button.
@@ -422,6 +437,9 @@ struct MailFeedExtras<'w, 's> {
     enchants: Option<Res<'w, crate::items::Enchants>>,
     sink: crate::ui_action::MessageSink<'w>,
     stationeries: Local<'s, crate::ui_script::VmMemo<Vec<StationeryView>>>,
+    packages: Option<Res<'w, Packages>>,
+    /// The package rows went to this VM.
+    packages_pushed: Local<'s, crate::ui_script::VmMemo<bool>>,
 }
 
 fn feed_mail(
@@ -451,7 +469,16 @@ fn feed_mail(
         enchants,
         mut sink,
         stationeries: mut last_stationeries,
+        packages,
+        mut packages_pushed,
     } = extras;
+    if let Some(packages) = packages.as_deref() {
+        let pushed = packages_pushed.get(&script);
+        if !*pushed {
+            *pushed = true;
+            script.set_mail_packages(packages.0.iter().map(package_view).collect());
+        }
+    }
     let rolls = crate::items::RollCatalogs {
         props: props.as_deref(),
         enchants: enchants.as_deref(),
@@ -538,14 +565,14 @@ fn feed_mail(
         script.set_mail_stationeries(usable);
     }
     if opened {
-        // The selection clears on open and close (`0x4ace07`); `MAIL_SHOW`'s reset picks row 1.
-        script.clear_stationery();
-        // The open core (`0x4acd10`) resets the compose tab before `MAIL_SHOW`; the reset's
+        // The open core (`0x4acd10`) resets the compose tab before `MAIL_SHOW`, the stationery
+        // selection with it (`0x4ace07`), which `MAIL_SHOW`'s reset re-picks as row 1; the reset's
         // `MAIL_SEND_SUCCESS`, page-turn sound and all, is the reference's too.
         script.reset_compose_tab();
         script.fire_event("MAIL_SHOW", vec![]);
     } else if closed {
-        script.clear_stationery();
+        // The close core's silent reset (`0x4acd50` → `0x4acdc0(0)`).
+        script.reset_compose_tab_silently();
         script.fire_event("MAIL_CLOSED", vec![]);
         // The close core's tail (`0x4acdad`, `0x4acdb1`): after a read, or an arrival while open,
         // re-ask the server, stamping "no mail". `CloseMail` and the range close both land here.
@@ -699,6 +726,8 @@ fn drain_mail(
                 item_guid: item_guid.unwrap_or(0),
                 money: req.money,
                 cod: req.cod,
+                // The package id rides only with an item (`0x4ae8f3`).
+                package: if item_guid.is_some() { req.package } else { 0 },
             });
         }
     }
@@ -713,6 +742,22 @@ mod tests {
     use super::*;
     use benilla_protocol::messages::MailAttachment;
 
+    /// `GetPackageInfo`'s icon is the basename under `Interface\Icons` (`0x4ae4c6`, `0x4ae4eb`).
+    #[test]
+    fn a_package_row_answers_its_icon_under_the_icon_folder() {
+        let view = package_view(&benilla_formats::PackageRow {
+            id: 2,
+            icon: "INV_BOX_04".into(),
+            cost: 10,
+            name: "Test Package".into(),
+        });
+        assert_eq!(view.icon, "Interface\\Icons\\INV_BOX_04");
+        assert_eq!(
+            (view.id, view.cost, view.name.as_str()),
+            (2, 10, "Test Package")
+        );
+    }
+
     /// The result table at `0x4ad17c` (indexed at `0x4ad1a0`), asserted as the message ids its
     /// arms push.
     #[test]
diff --git a/crates/benilla-app/src/ui_merchant/mod.rs b/crates/benilla-app/src/ui_merchant/mod.rs
index 2b61a1eb..5e8e8914 100644
--- a/crates/benilla-app/src/ui_merchant/mod.rs
+++ b/crates/benilla-app/src/ui_merchant/mod.rs
@@ -1,20 +1,22 @@
 //! The merchant window's app side: [`MerchantOpen`] holds the `SMSG_LIST_INVENTORY` rows,
 //! [`feed_merchant`] pushes them with the buyback and repair rows, the purse and the refusals,
-//! [`feed_repair_all_cost`] the repair-all total, and [`drain_merchant`] sends the Lua intents. A
+//! [`feed_repair_costs`] the repair costs, and [`drain_merchant`] sends the Lua intents. A
 //! bag click sells through [`crate::ui_items`].
 
 use benilla_protocol::messages::{buy_result, sell_result, VendorItem};
 use benilla_world::interact::WorldRightPress;
 use bevy::prelude::*;
 
-use benilla_ui::script::{ItemStatsHead, MerchantItem, MerchantState, ScriptValue, UiScript};
+use benilla_ui::script::{
+    ItemStatsHead, MerchantItem, MerchantState, RepairCosts, ScriptValue, UiScript,
+};
 
 use crate::entities::ItemDisplays;
 use crate::items::Items;
 use crate::names::NameCache;
 use crate::net::{ClientCommand, Guid, NetCommands, ObjectStore, Objects, SelfPlayer};
 use crate::ui_items::{item_link, slot_guid, wire_pos};
-use crate::ui_script::{UiFeed, UiInput};
+use crate::ui_script::{gate, UiFeed, UiInput};
 use crate::ui_session::{close_npc_session_out_of_range, npc_switched, NpcSession};
 use benilla_protocol::messages::BAG_PLAYER_INVENTORY;
 
@@ -115,7 +117,7 @@ impl Plugin for UiMerchantPlugin {
                     feed_merchant.after(crate::ui_unit::UnitFeed).in_set(UiFeed),
                     // Before `feed_char`: the `UNIT_INVENTORY_CHANGED` a repair fires refreshes the
                     // Repair All button from this total (`PaperDollFrame.lua:717-724`).
-                    feed_repair_all_cost
+                    feed_repair_costs
                         .in_set(UiFeed)
                         .before(crate::ui_char::feed_char),
                     drain_merchant.after(UiInput),
@@ -202,7 +204,7 @@ fn resolve_item(
         item_id: item.entry,
         stats,
         link,
-        max_stack: template.map(|t| t.stackable.max(1)),
+        max_stack: template.map(|t| t.stackable),
     }
 }
 
@@ -300,47 +302,78 @@ fn item_repair_cost(
         .repair_cost(points, level, quality, class, subclass, discount)
 }
 
-/// The repair-all total over the reference's three sweeps (`0x4fbd60`): equipped slots 0-18, the
-/// backpack and the four bags' contents; never the bank, keyring or buyback. It sums the
-/// discounted, rounded per-item costs (`0x4fbe0b`); the total itself is never discounted.
-fn repair_all_cost(
+/// Each damaged carried or banked item's cost (`0x4faf30`), keyed as the bindings take it.
+fn repair_costs(
     store: &benilla_protocol::ObjectFields,
     objects: &Objects,
     items: &Items,
     tables: &RepairTables,
     commands: &NetCommands,
     discount: f64,
-) -> u32 {
-    let mut total: u64 = 0;
-    let mut add = |guid: u64, items: &Items| {
-        if guid != 0 {
-            total += u64::from(item_repair_cost(
-                guid, objects, items, tables, commands, discount,
-            ));
-        }
+) -> RepairCosts {
+    let cost = |guid: u64| {
+        (guid != 0)
+            .then(|| item_repair_cost(guid, objects, items, tables, commands, discount))
+            .filter(|&c| c > 0)
     };
+    let mut costs = RepairCosts::default();
     for i in 0..19u8 {
-        add(store.player_inv_slot(i).unwrap_or(0), items);
+        if let Some(c) = cost(store.player_inv_slot(i).unwrap_or(0)) {
+            costs.equipped.insert(u32::from(i) + 1, c);
+        }
     }
     for i in 0..16u8 {
-        add(store.player_pack_slot(i).unwrap_or(0), items);
+        if let Some(c) = cost(store.player_pack_slot(i).unwrap_or(0)) {
+            costs.bags.insert((0, u32::from(i) + 1), c);
+        }
     }
-    for bag in 19..23u8 {
-        let bag_guid = store.player_inv_slot(bag).unwrap_or(0);
+    for i in 0..crate::ui_items::BANK_SLOTS {
+        if let Some(c) = cost(store.player_bank_slot(i).unwrap_or(0)) {
+            costs
+                .bags
+                .insert((crate::ui_items::BANK_CONTAINER, u32::from(i) + 1), c);
+        }
+    }
+    // Bags 1-4 are inventory slots 19-22, bank bags 5-10 the bank bag slots.
+    let bags = (1..=4u8)
+        .map(|b| (i64::from(b), store.player_inv_slot(18 + b)))
+        .chain((0..crate::ui_items::BANK_BAGS).map(|i| {
+            (
+                crate::ui_items::BANK_BAG_ID_FIRST + i64::from(i),
+                store.player_bank_bag_slot(i),
+            )
+        }));
+    for (bag, bag_guid) in bags {
+        let bag_guid = bag_guid.unwrap_or(0);
         if bag_guid == 0 {
             continue;
         }
-        let slots: Vec<u64> = objects
-            .object(bag_guid)
-            .map(|b| {
-                let n = b.container_num_slots().unwrap_or(0).min(36) as u8;
-                (0..n).filter_map(|i| b.container_slot(i)).collect()
-            })
-            .unwrap_or_default();
-        for guid in slots {
-            add(guid, items);
+        let Some(b) = objects.object(bag_guid) else {
+            continue;
+        };
+        let n = b.container_num_slots().unwrap_or(0).min(36) as u8;
+        for j in 0..n {
+            if let Some(c) = b.container_slot(j).and_then(cost) {
+                costs.bags.insert((bag, u32::from(j) + 1), c);
+            }
         }
     }
+    costs
+}
+
+/// `GetRepairAllCost`'s sum of the per-item costs (`0x4fbd60`): equipped and bags, never the bank.
+fn repair_all_cost(costs: &RepairCosts) -> u32 {
+    let carried = costs
+        .bags
+        .iter()
+        .filter(|((bag, _), _)| (0..=4).contains(bag))
+        .map(|(_, c)| c);
+    let total: u64 = costs
+        .equipped
+        .values()
+        .chain(carried)
+        .map(|&c| u64::from(c))
+        .sum();
     total.min(u64::from(u32::MAX)) as u32
 }
 
@@ -414,42 +447,89 @@ impl RepairPurse<'_, '_> {
     }
 }
 
-/// Push `GetRepairAllCost`'s total, which the reference sweeps at the call (`0x4fbd60`): every
-/// frame a repairing vendor is open, 0 otherwise.
-fn feed_repair_all_cost(
+/// What [`feed_repair_costs`] watches and last pushed.
+#[derive(Default)]
+struct RepairFeedMemo {
+    templates: gate::Watch,
+    discount: gate::Watch,
+    repairer: gate::Watch,
+    pushed: Option<(u32, RepairCosts)>,
+}
+
+/// Push each item's repair cost, and `GetRepairAllCost`'s total while a repairer is open.
+fn feed_repair_costs(
     script: Option<NonSendMut<UiScript>>,
     open: Res<MerchantOpen>,
-    objects: Objects,
+    mut inv: crate::items::Inventory,
     items: Res<Items>,
     commands: Res<NetCommands>,
-    self_q: Query<&ObjectStore, With<SelfPlayer>>,
     units: Query<(&Guid, &ObjectStore), Without<SelfPlayer>>,
     reactions: crate::target::ReactionInputs,
     tables: Option<Res<RepairTables>>,
-    mut last: Local<crate::ui_script::VmMemo<Option<u32>>>,
+    mut memo: Local<crate::ui_script::VmMemo<RepairFeedMemo>>,
 ) {
     let Some(mut script) = script else {
         return;
     };
-    let last = last.get(&script);
-    let vendor =
-        vendor_store(&open, &units).filter(|store| store.0.unit_npc_flags() & NPC_FLAG_REPAIR != 0);
-    let total = match (vendor, self_q.iter().next(), tables.as_deref()) {
-        (Some(vendor), Some(store), Some(t)) => {
-            // The open merchant's discount for the player (`0x4faf8a`).
-            let discount = crate::target::vendor_price_discount(
-                reactions.factions.as_deref(),
-                &reactions.reputations,
-                vendor,
-                store,
-            );
-            repair_all_cost(&store.0, &objects, &items, t, &commands, discount)
-        }
-        _ => 0,
+    let (memo, vm_reset) = memo.get_reset(&script);
+    // No self store at logout: keep the last push, as `feed_char` does.
+    let Some(player) = inv.self_store.iter().next() else {
+        return;
     };
-    if *last != Some(total) {
+    let vendor = vendor_store(&open, &units);
+    // The open vendor's price discount (`0x4faf8a`), 0 with none open.
+    let discount = vendor.map_or(0.0, |vendor| {
+        crate::target::vendor_price_discount(
+            reactions.factions.as_deref(),
+            &reactions.reputations,
+            vendor,
+            player,
+        )
+    });
+    let repairer = vendor.is_some_and(|store| store.0.unit_npc_flags() & NPC_FLAG_REPAIR != 0);
+    let objects_moved = inv.changes.moved();
+    let self_changed = !inv.self_changed.is_empty();
+    let templates_moved = memo.templates.moved(items.template_epoch());
+    let discount_moved = memo.discount.moved(discount.to_bits());
+    let repairer_moved = memo.repairer.moved(u64::from(repairer));
+    let tables_added = tables.as_ref().is_some_and(|t| t.is_added());
+    gate::trace(
+        "feed_repair_costs",
+        &[
+            ("vm_reset", vm_reset),
+            ("objects", objects_moved),
+            ("self", self_changed),
+            ("templates", templates_moved),
+            ("discount", discount_moved),
+            ("repairer", repairer_moved),
+            ("tables", tables_added),
+        ],
+    );
+    let gate = gate::Gate::new(
+        vm_reset
+            || objects_moved
+            || self_changed
+            || templates_moved
+            || discount_moved
+            || repairer_moved
+            || tables_added,
+    );
+    if gate.skip() {
+        return;
+    }
+    let costs = tables.as_deref().map_or_else(RepairCosts::default, |t| {
+        repair_costs(&player.0, &inv.objects, &items, t, &commands, discount)
+    });
+    let total = if repairer { repair_all_cost(&costs) } else { 0 };
+    if memo
+        .pushed
+        .as_ref()
+        .is_none_or(|(t, c)| *t != total || *c != costs)
+    {
+        gate.audit("feed_repair_costs", "the repair costs");
         script.set_repair_all_cost(total);
-        *last = Some(total);
+        script.set_repair_costs(costs.clone());
+        memo.pushed = Some((total, costs));
     }
 }
 
@@ -812,6 +892,54 @@ pub(crate) mod purse_fixture {
         ]))
     }
 
+    /// [`seat`] and the player with the sword at `slot_field`; returns the player's entity too.
+    pub(crate) fn repair_app(slot_field: u16) -> (App, Entity) {
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.init_resource::<Items>()
+            .init_resource::<crate::net::GuidIndex>()
+            .init_resource::<MerchantOpen>()
+            .init_resource::<crate::net::Reputations>()
+            .insert_resource(NetCommands(tx));
+        seat(app.world_mut());
+        let me = app
+            .world_mut()
+            .spawn((SelfPlayer, Guid(0x5e1f), player(slot_field, 0)))
+            .id();
+        (app, me)
+    }
+
+    /// A VM with the sword at live id 16, backpack slot 1 and bank slot 1, and a tooltip `TT`.
+    pub(crate) fn sword_vm() -> UiScript {
+        let mut script = UiScript::new().unwrap();
+        let mut inv: benilla_ui::script::InventorySlots = Default::default();
+        inv[16] = Some(benilla_ui::script::InvSlotView {
+            item_id: SWORD_ENTRY,
+            ..Default::default()
+        });
+        script.set_inventory_slots(inv);
+        let mut bag = benilla_ui::script::ContainerState {
+            num_slots: 16,
+            ..Default::default()
+        };
+        bag.slots.insert(
+            1,
+            benilla_ui::script::ContainerSlot {
+                item_id: SWORD_ENTRY,
+                count: 1,
+                ..Default::default()
+            },
+        );
+        script.set_container(0, Some(bag.clone()));
+        script.set_container(crate::ui_items::BANK_CONTAINER, Some(bag));
+        script
+            .run(
+                r#"CreateFrame("GameTooltip", "TT"):SetOwner(CreateFrame("Frame"), "ANCHOR_NONE")"#,
+            )
+            .unwrap();
+        script
+    }
+
     /// The message's string, and a recorder of the `UI_ERROR_MESSAGE` lines [`shown`] reads.
     pub(crate) fn record_errors(script: &UiScript) {
         script
@@ -856,7 +984,7 @@ mod tests {
         let mut app = crate::game_plugins::schedule_tests::headless_client();
         assert!(crate::test_support::runs_before(
             &mut app,
-            feed_repair_all_cost,
+            feed_repair_costs,
             crate::ui_char::feed_char
         ));
     }
@@ -948,14 +1076,90 @@ mod tests {
         }));
         app.insert_non_send_resource(script);
 
-        app.world_mut()
-            .run_system_once(feed_repair_all_cost)
-            .unwrap();
+        app.world_mut().run_system_once(feed_repair_costs).unwrap();
         let script = app.world_mut().non_send_resource_mut::<UiScript>();
         let got = script.eval::<i64>("return (GetRepairAllCost())").unwrap();
         assert_eq!(got, i64::from(want), "the undiscounted total is {full}");
     }
 
+    /// `RepairAllItems()` through the feed and the drain, at [`purse_fixture`]'s vendor carrying
+    /// `npc_flags`, with the sword at `slot_field` and `money` copper: the packets, the
+    /// `UI_ERROR_MESSAGE` lines and the message rows queued for their sound.
+    fn repair_all(
+        npc_flags: u32,
+        slot_field: u16,
+        money: u32,
+    ) -> (Vec<ClientCommand>, Vec<String>, Vec<&'static str>) {
+        use benilla_protocol::field::FIELD_UNIT_NPC_FLAGS;
+        use benilla_protocol::ObjectFields;
+        use bevy::ecs::system::RunSystemOnce;
+        use purse_fixture::*;
+
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.init_resource::<Items>()
+            .init_resource::<crate::net::GuidIndex>()
+            .init_resource::<MerchantOpen>()
+            .init_resource::<MerchantErrors>()
+            .init_resource::<NameCache>()
+            .init_resource::<crate::net::Reputations>()
+            .init_resource::<crate::ui_chat::ChatLog>()
+            .init_resource::<crate::sound::MessageSounds>()
+            .insert_resource(NetCommands(tx));
+        seat(app.world_mut());
+        let mut units = app.world_mut().query::<(&Guid, &mut ObjectStore)>();
+        for (guid, mut store) in units.iter_mut(app.world_mut()) {
+            if guid.0 == VENDOR {
+                let flags = ObjectFields::from_pairs(&[(FIELD_UNIT_NPC_FLAGS, npc_flags)]);
+                store.0.merge(flags);
+            }
+        }
+        app.world_mut()
+            .spawn((SelfPlayer, Guid(0x5e1f), player(slot_field, money)));
+        let script = UiScript::new().unwrap();
+        record_errors(&script);
+        app.insert_non_send_resource(script);
+        app.world_mut().run_system_once(feed_merchant).unwrap();
+        while rx.try_recv().is_ok() {} // the feed's name query for the vendor
+        app.world()
+            .non_send_resource::<UiScript>()
+            .run("RepairAllItems()")
+            .unwrap();
+        app.world_mut().run_system_once(drain_merchant).unwrap();
+        let sent = rx.try_iter().collect();
+        let lines = shown(app.world().non_send_resource::<UiScript>());
+        (sent, lines, sounded(app.world()))
+    }
+
+    /// At a vendor that does not repair, `RepairAllItems` sends nothing and says nothing: it
+    /// returns (`0x4fbff0`) unless `0x4fadb0` finds the repair flag on the open merchant, before
+    /// its purse test. The same worn sword at a repairer goes out.
+    #[test]
+    fn repair_all_does_nothing_at_a_vendor_that_does_not_repair() {
+        use crate::target::cursor_mode::npc_flags::VENDOR as NPC_FLAG_VENDOR;
+        use benilla_protocol::field::FIELD_PLAYER_INV_SLOT_HEAD;
+        use purse_fixture::*;
+
+        let (_, discounted) = sword_prices();
+        let main_hand = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 15;
+        for money in [discounted, discounted - 1] {
+            let (sent, lines, rows) = repair_all(NPC_FLAG_VENDOR, main_hand, money);
+            assert!(sent.is_empty(), "{money} copper: no repair goes out");
+            assert!(
+                lines.is_empty() && rows.is_empty(),
+                "{money} copper: no purse refusal"
+            );
+        }
+        let (sent, ..) = repair_all(NPC_FLAG_VENDOR | NPC_FLAG_REPAIR, main_hand, discounted);
+        assert!(matches!(
+            sent.as_slice(),
+            [ClientCommand::RepairItem {
+                vendor: VENDOR,
+                item_guid: 0
+            }]
+        ));
+    }
+
     /// `RepairAllItems` prices only the equipped slots for its purse test (`0x4fc026`–`0x4fc063`,
     /// `0x4fc08e`): the sword worn and over the purse is refused with `ERR_NOT_ENOUGH_MONEY` and
     /// no send; the same sword in the backpack, which `GetRepairAllCost` would count, leaves a worn
@@ -963,35 +1167,13 @@ mod tests {
     #[test]
     fn repair_all_tests_the_purse_against_the_worn_gear_alone() {
         use benilla_protocol::field::FIELD_PLAYER_INV_SLOT_HEAD;
-        use bevy::ecs::system::RunSystemOnce;
         use purse_fixture::*;
 
         let (_, discounted) = sword_prices();
-        let repair_all = |slot_field: u16| {
-            let (tx, rx) = crossbeam_channel::unbounded();
-            let mut app = App::new();
-            app.init_resource::<Items>()
-                .init_resource::<crate::net::GuidIndex>()
-                .init_resource::<MerchantOpen>()
-                .init_resource::<crate::net::Reputations>()
-                .init_resource::<crate::ui_chat::ChatLog>()
-                .init_resource::<crate::sound::MessageSounds>()
-                .insert_resource(NetCommands(tx));
-            seat(app.world_mut());
-            app.world_mut()
-                .spawn((SelfPlayer, Guid(0x5e1f), player(slot_field, discounted - 1)));
-            let script = UiScript::new().unwrap();
-            record_errors(&script);
-            script.run("RepairAllItems()").unwrap();
-            app.insert_non_send_resource(script);
-            app.world_mut().run_system_once(drain_merchant).unwrap();
-            let sent: Vec<ClientCommand> = rx.try_iter().collect();
-            let lines = shown(app.world().non_send_resource::<UiScript>());
-            (sent, lines, sounded(app.world()))
-        };
 
         // The main hand (slot 15).
-        let (sent, lines, rows) = repair_all(FIELD_PLAYER_INV_SLOT_HEAD + 2 * 15);
+        let main_hand = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 15;
+        let (sent, lines, rows) = repair_all(NPC_FLAG_REPAIR, main_hand, discounted - 1);
         assert!(sent.is_empty(), "worn, one copper short: nothing goes out");
         assert_eq!(lines, [NOT_ENOUGH_MONEY]);
         assert_eq!(
@@ -1001,7 +1183,8 @@ mod tests {
         );
 
         // Backpack slot 1, inventory slot 23.
-        let (sent, lines, rows) = repair_all(FIELD_PLAYER_INV_SLOT_HEAD + 2 * 23);
+        let backpack_1 = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 23;
+        let (sent, lines, rows) = repair_all(NPC_FLAG_REPAIR, backpack_1, discounted - 1);
         assert!(
             matches!(
                 sent.as_slice(),
@@ -1015,6 +1198,141 @@ mod tests {
         assert!(lines.is_empty() && rows.is_empty());
     }
 
+    /// An item's cost is discounted at the vendor and full once it closes (`0x4faf30`).
+    #[test]
+    fn each_items_cost_takes_the_open_vendors_discount() {
+        use benilla_protocol::field::FIELD_PLAYER_INV_SLOT_HEAD;
+        use bevy::ecs::system::RunSystemOnce;
+        use purse_fixture::*;
+
+        let (full, discounted) = sword_prices();
+        let priced = |slot_field: u16, read: &str| {
+            let (mut app, _) = repair_app(slot_field);
+            app.insert_non_send_resource(sword_vm());
+            let read_cost = |app: &mut App| {
+                app.world_mut().run_system_once(feed_repair_costs).unwrap();
+                let script = app.world().non_send_resource::<UiScript>();
+                script.eval::<i64>(read).unwrap()
+            };
+            let at_vendor = read_cost(&mut app);
+            app.world_mut().resource_mut::<MerchantOpen>().clear();
+            (at_vendor, read_cost(&mut app))
+        };
+        let want = (i64::from(discounted), i64::from(full));
+
+        // Main hand, inventory slot 15.
+        let worn = priced(
+            FIELD_PLAYER_INV_SLOT_HEAD + 2 * 15,
+            r#"local _, _, c = TT:SetInventoryItem("player", 16) return c"#,
+        );
+        assert_eq!(worn, want, "worn: at the vendor, then with none open");
+        // Backpack slot 1, inventory slot 23.
+        let carried = priced(
+            FIELD_PLAYER_INV_SLOT_HEAD + 2 * 23,
+            "local _, c = TT:SetBagItem(0, 1) return c",
+        );
+        assert_eq!(
+            carried, want,
+            "in the backpack: at the vendor, then with none open"
+        );
+    }
+
+    /// Each gate input alone reopens the feed, through `App::update` so the memo persists; a bank
+    /// item is priced but left out of the total (`0x4fbd60`).
+    #[test]
+    fn each_input_alone_reopens_the_repair_cost_gate() {
+        use benilla_protocol::field::{FIELD_PLAYER_INV_SLOT_HEAD, FIELD_UNIT_FLAGS};
+        use benilla_protocol::ObjectFields;
+        use purse_fixture::*;
+
+        /// `ITEM_FIELD_DURABILITY`, absolute.
+        const ITEM_DURABILITY: u16 = 46;
+        let main_hand = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 15;
+        let backpack_1 = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 23;
+        // `PLAYER_FIELD_BANK_SLOT_1`, inventory slot 39.
+        let bank_1 = FIELD_PLAYER_INV_SLOT_HEAD + 2 * 39;
+
+        let (mut app, me) = repair_app(main_hand);
+        app.add_systems(Update, feed_repair_costs);
+        let tables = app.world_mut().remove_resource::<RepairTables>().unwrap();
+        let mut script = sword_vm();
+        script.set_merchant(Some(MerchantState {
+            can_repair: true,
+            ..Default::default()
+        }));
+        app.insert_non_send_resource(script);
+
+        let entity =
+            |app: &App, guid: u64| app.world().resource::<crate::net::GuidIndex>().0[&guid];
+        let write = |app: &mut App, e: Entity, pairs: &[(u16, u32)]| {
+            let mut store = app.world_mut().get_mut::<ObjectStore>(e).unwrap();
+            store.0.merge(ObjectFields::from_pairs(pairs));
+        };
+        // (worn, backpack, bank, `GetRepairAllCost`) after one frame.
+        let frame = |app: &mut App| {
+            app.update();
+            app.world()
+                .non_send_resource::<UiScript>()
+                .eval::<(i64, i64, i64, i64)>(
+                    r#"local _, _, worn = TT:SetInventoryItem("player", 16)
+                       local _, carried = TT:SetBagItem(0, 1)
+                       local _, banked = TT:SetBagItem(-1, 1)
+                       return worn, carried, banked, (GetRepairAllCost())"#,
+                )
+                .unwrap()
+        };
+        let vendor = app
+            .world_mut()
+            .query::<(Entity, &Guid)>()
+            .iter(app.world())
+            .find(|(_, g)| g.0 == VENDOR)
+            .unwrap()
+            .0;
+        let hi = (SWORD >> 32) as u32;
+        let moved =
+            |from: u16, to: u16| [(from, 0), (from + 1, 0), (to, SWORD as u32), (to + 1, hi)];
+
+        assert_eq!(frame(&mut app), (0, 0, 0, 0), "no tables, no prices");
+        // 1 copper a point, less 0.1: 40 points cost 36.
+        app.insert_resource(tables);
+        assert_eq!(frame(&mut app), (36, 0, 0, 36), "the tables arrive");
+        let sword = entity(&app, SWORD);
+        write(&mut app, sword, &[(ITEM_DURABILITY, 55)]);
+        assert_eq!(
+            frame(&mut app),
+            (18, 0, 0, 18),
+            "a repair's write: 20 points"
+        );
+        write(&mut app, me, &moved(main_hand, bank_1));
+        assert_eq!(
+            frame(&mut app),
+            (0, 0, 18, 0),
+            "banked: priced, not in the total"
+        );
+        write(&mut app, me, &moved(bank_1, backpack_1));
+        assert_eq!(frame(&mut app), (0, 18, 0, 18), "the sword in the backpack");
+        write(&mut app, vendor, &[(FIELD_UNIT_FLAGS, 0)]);
+        assert_eq!(
+            frame(&mut app),
+            (0, 20, 0, 20),
+            "no PvP flag, no honor discount"
+        );
+        app.world_mut().resource_mut::<MerchantOpen>().clear();
+        assert_eq!(
+            frame(&mut app),
+            (0, 20, 0, 0),
+            "the repairer gone: no total"
+        );
+        app.world_mut()
+            .resource_mut::<Items>()
+            .insert_template(SWORD_ENTRY, None);
+        assert_eq!(
+            frame(&mut app),
+            (0, 0, 0, 0),
+            "an unknown template prices nothing"
+        );
+    }
+
     fn row(entry: u32, slot: u32, count: u32) -> VendorItem {
         VendorItem {
             slot,
diff --git a/crates/benilla-app/src/ui_party/feed.rs b/crates/benilla-app/src/ui_party/feed.rs
index 16b8d144..5a89297c 100644
--- a/crates/benilla-app/src/ui_party/feed.rs
+++ b/crates/benilla-app/src/ui_party/feed.rs
@@ -11,6 +11,7 @@ use benilla_ui::script::{
 };
 use bevy::prelude::*;
 
+use crate::creature_type::CreatureTypeSources;
 use crate::names::NameCache;
 use crate::net::{
     ClientCommand, FieldChanged, FieldEdges, Guid, GuidIndex, NetCommands, ObjectStore, SelfPlayer,
@@ -18,6 +19,7 @@ use crate::net::{
 use crate::target::Selection;
 use crate::ui_script::gate;
 
+use super::pets::{self, Roster};
 use super::GroupState;
 
 // ─── The VM feed and drain ───────────────────────────────────────────────────────────────────────
@@ -25,7 +27,8 @@ use super::GroupState;
 /// What the feed last pushed: the values its event edges fire on.
 #[derive(Default)]
 pub(super) struct FedParty {
-    roster: Vec<u64>,
+    /// The group lists the feed has answered with `PARTY_MEMBERS_CHANGED`.
+    lists_applied: u32,
     leader: u64,
     loot: Option<GroupLootInfo>,
     invite: Option<String>,
@@ -39,7 +42,12 @@ pub(super) struct FedParty {
     names_generation: gate::Watch,
     area: gate::Watch,
     raid_units: Vec<Option<UnitState>>,
-    /// The raid roster's identity (guid, rank, subgroup, online): `RAID_ROSTER_UPDATE`'s edge.
+    /// `partypet1..4` and `raidpet1..40`, with the `UNIT_PET` edges (see [`pets`]).
+    pets: pets::FedPets,
+    /// The group lists' `RAID_ROSTER_UPDATE`s the feed has answered.
+    roster_updates: u32,
+    /// The raid roster's identity (guid, rank, subgroup, online): the edge that stands in for the
+    /// `RAID_ROSTER_UPDATE` sites no list carries.
     raid_key: Vec<(u64, u32, u32, bool)>,
     saved: Vec<SavedInstanceInfo>,
     saved_answers: u32,
@@ -51,12 +59,38 @@ pub(super) struct FedParty {
 
 pub(crate) const PARTY_TOKENS: [&str; 4] = ["party1", "party2", "party3", "party4"];
 
+/// `partypet1..partypet4`, the pet of each [`PARTY_TOKENS`] slot (`0x4e81d0`).
+pub(crate) const PARTY_PET_TOKENS: [&str; 4] = ["partypet1", "partypet2", "partypet3", "partypet4"];
+
 /// A new list or a new answer: `RaidFrame.lua:43-52` decides the Raid Info button on the second
 /// `UPDATE_INSTANCE_INFO`, which an unchanging empty list reaches only through the answer count.
 fn saved_instances_moved(saved: &[SavedInstanceInfo], answers: u32, fed: &FedParty) -> bool {
     saved != fed.saved || answers != fed.saved_answers
 }
 
+/// The `PARTY_MEMBERS_CHANGED`s the lists applied since the feed's last look owe: one each, as the
+/// reference signals once per packet (`0x5e6c61`). A fresh VM saw none of them, so it gets one
+/// catch-up for a group whose list landed before it, never the history; a count that ran backwards
+/// is a new session's, all of whose lists are new.
+fn members_changed_owed(applied: u32, seen: u32, fresh_vm: bool) -> u32 {
+    match (fresh_vm, applied.checked_sub(seen)) {
+        (true, _) => u32::from(applied != 0),
+        (false, Some(owed)) => owed,
+        (false, None) => applied,
+    }
+}
+
+/// The `RAID_ROSTER_UPDATE`s the lists applied since the feed's last look owe: one each, as the
+/// reference signals once per list (`0x4babef`, `0x4ba57b`). A fresh VM is owed none, since the
+/// roster edge gives the raid it finds its one catch-up; a count that ran backwards is a new
+/// session's, all of whose lists are new.
+fn roster_updates_owed(applied: u32, seen: u32, fresh_vm: bool) -> u32 {
+    if fresh_vm {
+        return 0;
+    }
+    applied.checked_sub(seen).unwrap_or(applied)
+}
+
 /// The `raid1..raid40` unit tokens, one per `MAX_RAID_MEMBERS` (40, `RaidFrame.lua:2`).
 #[rustfmt::skip]
 pub(crate) const RAID_TOKENS: [&str; 40] = [
@@ -67,6 +101,17 @@ pub(crate) const RAID_TOKENS: [&str; 40] = [
     "raid38", "raid39", "raid40",
 ];
 
+/// `raidpet1..raidpet40`, the pet of each [`RAID_TOKENS`] row (`0x491960`).
+#[rustfmt::skip]
+pub(crate) const RAID_PET_TOKENS: [&str; 40] = [
+    "raidpet1", "raidpet2", "raidpet3", "raidpet4", "raidpet5", "raidpet6", "raidpet7",
+    "raidpet8", "raidpet9", "raidpet10", "raidpet11", "raidpet12", "raidpet13", "raidpet14",
+    "raidpet15", "raidpet16", "raidpet17", "raidpet18", "raidpet19", "raidpet20", "raidpet21",
+    "raidpet22", "raidpet23", "raidpet24", "raidpet25", "raidpet26", "raidpet27", "raidpet28",
+    "raidpet29", "raidpet30", "raidpet31", "raidpet32", "raidpet33", "raidpet34", "raidpet35",
+    "raidpet36", "raidpet37", "raidpet38", "raidpet39", "raidpet40",
+];
+
 /// `SMSG_GROUP_LIST`'s first byte for a raid; 0 is a party (vmangos `Group/Group.h:119`).
 pub(crate) const GROUPTYPE_RAID: u8 = 1;
 
@@ -76,8 +121,9 @@ pub(crate) const GROUP_MEMBER_SUBGROUP: u8 = 0x07;
 /// Push the roster and the party unit snapshots into the VM and fire the party events on their
 /// edges. A member's unit state is their live descriptor when streamed, else their roster record.
 pub(super) fn feed_party(
-    // `ChrClasses.dbc` field 16, `UnitHasRelicSlot`'s input; without it no class has a relic slot.
-    classes: Option<Res<crate::chr_classes::ChrClassTable>>,
+    // `ChrClasses.dbc` field 16, `UnitHasRelicSlot`'s input, and the form table the creature type
+    // reads.
+    tables: crate::ui_unit::SnapshotTables,
     script: Option<NonSendMut<UiScript>>,
     group: Res<GroupState>,
     index: Res<GuidIndex>,
@@ -87,7 +133,7 @@ pub(super) fn feed_party(
     mut edges: MessageReader<FieldChanged>,
     self_q: Query<(Entity, &Guid, &ObjectStore), With<SelfPlayer>>,
     factions: Option<Res<crate::target::Factions>>,
-    names: Res<NameCache>,
+    names: pets::Names,
     areas: Option<Res<crate::area::AreaTableRes>>,
     // The area under us, through the accessor `crate::area` uses: `terrain_stream::CurrentArea`
     // would cross the world-API wall (`tests/world_api_wall.rs`).
@@ -109,13 +155,16 @@ pub(super) fn feed_party(
             line,
         ));
     }
-    let chr = classes.as_deref().map(|t| &t.0);
+    let chr = tables.classes();
+    let types = tables.types(&names);
     // The gate also opens on a despawn, which `Changed` misses. Solo, it almost always stays shut.
     let names_moved = fed.names_generation.moved(names.generation());
     let area_moved = fed.area.moved(here.area().map_or(u64::MAX, u64::from));
     let group_changed = group.is_changed();
     let index_changed = index.is_changed();
-    // Only the stores the merged view reads: a crowd's other stores change every frame.
+    let look = pets::Lookup::new(&index, &stores, &names, types);
+    // Only the stores the merged view reads: a crowd's other stores change every frame. The
+    // members' pets are the group's too, `partypetN` and `raidpetN` reading their descriptors.
     let stores_changed = self_q
         .iter()
         .next()
@@ -125,7 +174,13 @@ pub(super) fn feed_party(
                 .0
                 .get(&m.guid)
                 .is_some_and(|&e| changed_stores.get(e).is_ok())
-        });
+        })
+        || pets::store_changed(
+            &look,
+            &group,
+            self_q.iter().next().map(|(_, g, store)| (g.0, store)),
+            &changed_stores,
+        );
     let stores_removed = !removed_stores.is_empty();
     let factions_changed = factions.as_ref().is_some_and(|r| r.is_changed());
     let areas_changed = areas.as_ref().is_some_and(|r| r.is_changed());
@@ -269,6 +324,7 @@ pub(super) fn feed_party(
                 &group,
                 own_group.clone(),
                 chr,
+                types,
             )
         });
         if fed.units[i] != snap {
@@ -307,6 +363,25 @@ pub(super) fn feed_party(
         }
     }
 
+    // ── partypet1..partypet4 ────────────────────────────────────────────────
+    //
+    // Each slot's pet, off its descriptor or its record, after the members' own tokens and before
+    // the roster event whose handler asks `UnitExists("partypetN")` (`PartyMemberFrame.lua:73`).
+    for (i, token) in PARTY_PET_TOKENS.iter().enumerate() {
+        let owner = slots.get(i).map_or(0, |m| m.guid);
+        let now = pets::member_pet(&look, &group, owner, look.store(owner), Roster::Party);
+        pets::feed_token(
+            &mut script,
+            &gate,
+            &edges,
+            &mut fed.pets.party[i],
+            token,
+            Some(PARTY_TOKENS[i]),
+            owner,
+            now,
+        );
+    }
+
     // ── raid1..raid40 ──────────────────────────────────────────────────────
     //
     // Token N is `GetRaidRosterInfo` row N, both in `raid_row_guids`' order. Our own row comes off
@@ -318,14 +393,12 @@ pub(super) fn feed_party(
             if Some(*guid) == self_guid {
                 let (_, _, store) = self_pair?;
                 let name = names.peek(*guid).map(str::to_string);
-                let mut s = crate::ui_unit::snapshot(store, name, 0, chr);
+                let mut s = crate::ui_unit::snapshot(store, *guid, name, 0, chr, types);
                 s.is_player = true;
-                s.guid = *guid;
                 s.raid_target = group.raid_target_index(*guid);
                 s.faction_group = own_group.clone();
                 // A same-faction friendly player, as in `member_unit_state`.
                 s.reaction = 5;
-                s.is_connected = true;
                 Some(s)
             } else {
                 let m = group.members.iter().find(|m| m.guid == *guid)?;
@@ -336,6 +409,7 @@ pub(super) fn feed_party(
                     &group,
                     own_group.clone(),
                     chr,
+                    types,
                 ))
             }
         });
@@ -355,11 +429,45 @@ pub(super) fn feed_party(
         }
     }
 
-    let roster: Vec<u64> = group.members.iter().map(|m| m.guid).collect();
-    if roster != fed.roster {
-        gate.audit("feed_party", "the roster edge");
+    // ── raidpet1..raidpet40 ────────────────────────────────────────────────
+    //
+    // Row N's pet. Our own row's pet is `"pet"`, whose own feed fires `UNIT_PET("player")`.
+    fed.pets
+        .raid
+        .resize_with(RAID_PET_TOKENS.len(), Default::default);
+    for (i, token) in RAID_PET_TOKENS.iter().enumerate() {
+        let owner = raid_guids.get(i).copied().unwrap_or(0);
+        let ours = Some(owner) == self_guid;
+        let held = if ours {
+            self_pair.map(|(_, _, store)| store)
+        } else {
+            look.store(owner)
+        };
+        let now = pets::member_pet(&look, &group, owner, held, Roster::Raid);
+        pets::feed_token(
+            &mut script,
+            &gate,
+            &edges,
+            &mut fed.pets.raid[i],
+            token,
+            (!ours).then_some(RAID_TOKENS[i]),
+            owner,
+            now,
+        );
+    }
+
+    // ── PARTY_MEMBERS_CHANGED ───────────────────────────────────────────────
+    //
+    // Signalled after every `SMSG_GROUP_LIST`'s member loop (`0x5e6c61`), whatever the list changed:
+    // a status, the flags, the leader or nothing at all, and an empty list reaches it too
+    // (`0x5e6b3c`). Each list in this drain fires its own, after the snapshots above.
+    let owed = members_changed_owed(group.lists_applied, fed.lists_applied, vm_reset);
+    fed.lists_applied = group.lists_applied;
+    if owed != 0 {
+        gate.audit("feed_party", "a group list");
+    }
+    for _ in 0..owed {
         script.fire_event("PARTY_MEMBERS_CHANGED", vec![]);
-        fed.roster = roster;
     }
     if group.leader != fed.leader {
         gate.audit("feed_party", "the leader edge");
@@ -373,14 +481,26 @@ pub(super) fn feed_party(
     }
     // ── RAID_ROSTER_UPDATE ──────────────────────────────────────────────────
     //
-    // Fired when the roster's identity moves (members, order, rank, subgroup, online), not on
-    // level or health, which `RaidGroupFrame_OnEvent` re-reads on `UNIT_LEVEL` and `UNIT_HEALTH`.
-    // The reference fires it after each raid `SMSG_GROUP_LIST` rebuild (`0x4babef`, or `0x4bada6`
-    // once the member names it waits on land), on leaving a raid (`0x4ba57b`) and when world entry
-    // fills in our own row (`0x4ba1a2`).
-    if raid_key != fed.raid_key {
+    // The reference signals it from four places, and `GroupState` counts the two that a list
+    // drives; each list in this drain fires its own. A raid list's roster rebuild signals with no
+    // member name pending, whatever the list changed (`0x4babef`; nothing gates the signal on a difference),
+    // and a list that is not a raid signals for the roster it drops (`0x4ba57b`). The other two
+    // have no list behind them: the last pending name's answer (`0x4bada6`) and world entry filling
+    // in our own row (`0x4ba1a2`). The roster's identity (members, order, rank, subgroup, online)
+    // stands in for them when no list signalled: it moves as our own row arrives, and a list held
+    // back by a pending name fires on it when it moves. Level and health are not in it, which
+    // `RaidGroupFrame_OnEvent` re-reads on `UNIT_LEVEL` and `UNIT_HEALTH`.
+    let owed = roster_updates_owed(group.roster_updates, fed.roster_updates, vm_reset);
+    fed.roster_updates = group.roster_updates;
+    let roster_moved = raid_key != fed.raid_key;
+    fed.raid_key = raid_key;
+    if owed != 0 {
+        gate.audit("feed_party", "a raid roster list");
+        for _ in 0..owed {
+            script.fire_event("RAID_ROSTER_UPDATE", vec![]);
+        }
+    } else if roster_moved {
         gate.audit("feed_party", "the raid-roster edge");
-        fed.raid_key = raid_key;
         script.fire_event("RAID_ROSTER_UPDATE", vec![]);
     }
 
@@ -642,15 +762,21 @@ fn member_unit_state(
     // `ChrClasses.dbc`, for the relic slot alone: only the live leg has a class byte to key it
     // by, so an unstreamed paladin reads no relic slot.
     classes: Option<&benilla_formats::ChrClasses>,
+    // The creature type resolves from the live descriptor alone, so an unstreamed member has none.
+    types: CreatureTypeSources<'_>,
 ) -> UnitState {
     let mut s = match store {
-        Some(store) => crate::ui_unit::snapshot(store, Some(m.name.clone()), 0, classes),
+        Some(store) => {
+            crate::ui_unit::snapshot(store, m.guid, Some(m.name.clone()), 0, classes, types)
+        }
         // Unstreamed: the roster record, snapshotted from the descriptor at despawn (`0x5f0880`),
         // seated at 1/1 for a member never seen (`0x4e82d0`) and patched by the wire. The
         // reference's getters read the descriptor, then the party record (`0x496400`), then the
-        // pet record (`0x496420`); a `partyN` token is never a pet, so the pet leg cannot arise.
+        // pet record (`0x496420`); a `partyN` token names a player, so only `partypetN` reaches
+        // that last leg ([`pets`]).
         None => UnitState {
             exists: true,
+            guid: m.guid,
             name: Some(m.name.clone()),
             health: stats.and_then(|s| s.cur_hp).map_or(0, u32::from),
             max_health: stats.and_then(|s| s.max_hp).map_or(0, u32::from),
@@ -659,11 +785,14 @@ fn member_unit_state(
             // Divided as on the live leg (`UnitMana`'s record path, `0x517744`-`0x51775e`).
             power: stats.map_or(0, PartyMemberStatsInfo::shown_power),
             max_power: stats.map_or(0, PartyMemberStatsInfo::shown_max_power),
+            // Connected is the record's own online bit (`+0x08 & 1`, `0x517dd3`), which each list
+            // rewrites from its row's status (`0x4e836e`-`0x4e837b`) and a stats packet's status
+            // moves alone, so the roster byte is not read. A held member never gets here, its 1 is
+            // `snapshot`'s (`0x517daf`); a member with no record has no bit to read.
+            is_connected: stats.is_some_and(PartyMemberStatsInfo::is_online),
             // Dead and ghost from the record, as the reference's `UnitIsDead` (`0x517b5d`,
             // `+0x08 & 4`) and `UnitIsGhost` (`0x517c32`, `& 8`) read it: fresher than the roster
-            // byte, which only `SMSG_GROUP_LIST` moves. Connected stays the roster's, though the
-            // reference reads the record's bit 0 (`0x517dd3`); its no-object PvP and FFA reads are
-            // untraced, and `UnitIsAFK`/`UnitIsDND` are not 1.12 bindings.
+            // byte, which only `SMSG_GROUP_LIST` moves. 1.12 has no AFK or DND predicate to feed.
             dead: stats.is_some_and(|s| s.status.unwrap_or(0) & member_status::DEAD != 0),
             ghost: stats.is_some_and(|s| s.status.unwrap_or(0) & member_status::GHOST != 0),
             ..Default::default()
@@ -672,14 +801,10 @@ fn member_unit_state(
     s.is_player = true;
     // A party member is always a same-faction friendly player: the popup's `UnitCanCooperate`
     // gate reads the reaction, which neither leg resolves for a party token.
-    s.guid = m.guid;
     s.raid_target = group.raid_target_index(m.guid);
     s.reaction = 5;
     s.faction_group = own_group;
-    // The roster status byte overlays both legs.
-    s.is_connected = m.status & member_status::ONLINE != 0;
-    s.is_afk = m.status & member_status::AFK != 0;
-    s.is_dnd = m.status & member_status::DND != 0;
+    // The roster status byte overlays both legs, but for `is_connected`, which is the record leg's.
     s.is_pvp_ffa = m.status & member_status::PVP_FFA != 0;
     s.pvp = s.pvp || m.status & member_status::PVP != 0;
     s.ghost = s.ghost || m.status & member_status::GHOST != 0;
@@ -923,6 +1048,41 @@ fn test_apply_local(
     req: &PartyRequest,
     self_guid: Option<u64>,
     target_guid: Option<u64>,
+) -> bool {
+    let was_raid = group.group_type == GROUPTYPE_RAID;
+    let handled = apply_test_intent(group, req, self_guid, target_guid);
+    // The server answers each of these with a fresh `SMSG_GROUP_LIST`, which the reference signals
+    // `PARTY_MEMBERS_CHANGED` for whether or not it changed anything (`0x5e6c61`). A raid's list
+    // also signals `RAID_ROSTER_UPDATE` (`0x4babef`), and the one that ends a raid for the roster
+    // it drops (`0x4ba57b`).
+    if matches!(
+        req,
+        PartyRequest::Leave
+            | PartyRequest::UninviteUnit(_)
+            | PartyRequest::PromoteUnit(_)
+            | PartyRequest::LootMethod { .. }
+            | PartyRequest::LootThreshold(_)
+            | PartyRequest::ConvertToRaid
+            | PartyRequest::SetSubgroup { .. }
+            | PartyRequest::SwapSubgroup { .. }
+            | PartyRequest::UninviteRaid(_)
+            | PartyRequest::PromoteName(_)
+            | PartyRequest::AssistantLeader { .. }
+    ) {
+        group.count_list();
+        if was_raid || group.group_type == GROUPTYPE_RAID {
+            group.count_roster_update();
+        }
+    }
+    handled
+}
+
+/// [`test_apply_local`]'s mirror edit: the intent's effect on the group, whatever list answers it.
+fn apply_test_intent(
+    group: &mut GroupState,
+    req: &PartyRequest,
+    self_guid: Option<u64>,
+    target_guid: Option<u64>,
 ) -> bool {
     match req {
         PartyRequest::Leave => {
@@ -1176,11 +1336,17 @@ pub(crate) fn synthetic_roster(
         (0xF003, 0, 1105, 31, 0, seat(-300.0, 0.0)),
         (0xF004, 0, 0, 0, 0, None),
     ] {
+        // A server's full stats carry the status, which the record's online bit is read from.
+        let status = group
+            .members
+            .iter()
+            .find(|m| m.guid == guid)
+            .map(|m| m.status);
         group.apply_stats(
             guid,
             true,
             PartyMemberStatsInfo {
-                status: None,
+                status,
                 cur_hp: Some(hp),
                 max_hp: Some(max),
                 level: Some(level),
@@ -1276,11 +1442,16 @@ pub(crate) fn synthetic_raid(
     for (i, _) in ROSTER.iter().enumerate() {
         let guid = 0xF100 + i as u64;
         let dead = i == 3;
+        let status = group
+            .members
+            .iter()
+            .find(|m| m.guid == guid)
+            .map(|m| m.status);
         group.apply_stats(
             guid,
             true,
             PartyMemberStatsInfo {
-                status: None,
+                status,
                 cur_hp: Some(if dead {
                     0
                 } else {
@@ -1321,8 +1492,12 @@ pub(crate) fn synthetic_raid(
     lines
 }
 
+#[cfg(test)]
+mod roster_update_tests;
+
 #[cfg(test)]
 mod tests {
+    use super::super::pets::tests::{app, app_with, flag, frame, member, party, stream, ME};
     use super::*;
 
     #[test]
@@ -1334,6 +1509,7 @@ mod tests {
             flags: 0,
         };
         let record = PartyMemberStatsInfo {
+            status: Some(member_status::ONLINE),
             cur_hp: Some(2400),
             max_hp: Some(3000),
             level: Some(41),
@@ -1342,7 +1518,15 @@ mod tests {
             max_power: Some(1000),
             ..PartyMemberStatsInfo::default()
         };
-        let s = member_unit_state(&m, Some(&record), None, &GroupState::default(), None, None);
+        let s = member_unit_state(
+            &m,
+            Some(&record),
+            None,
+            &GroupState::default(),
+            None,
+            None,
+            Default::default(),
+        );
         assert_eq!(
             (s.health, s.max_health),
             (2400, 3000),
@@ -1357,7 +1541,15 @@ mod tests {
         assert!(s.exists && s.is_player && s.is_connected);
 
         // No record at all (a real roster always seats one): an existing player with empty bars.
-        let bare = member_unit_state(&m, None, None, &GroupState::default(), None, None);
+        let bare = member_unit_state(
+            &m,
+            None,
+            None,
+            &GroupState::default(),
+            None,
+            None,
+            Default::default(),
+        );
         assert_eq!((bare.health, bare.max_health, bare.power), (0, 0, 0));
         assert!(bare.exists);
     }
@@ -1377,7 +1569,15 @@ mod tests {
             status: Some(member_status::ONLINE | member_status::DEAD),
             ..PartyMemberStatsInfo::default()
         };
-        let s = member_unit_state(&m, Some(&dead), None, &GroupState::default(), None, None);
+        let s = member_unit_state(
+            &m,
+            Some(&dead),
+            None,
+            &GroupState::default(),
+            None,
+            None,
+            Default::default(),
+        );
         assert!(
             s.dead,
             "the record says dead even though the roster echo does not"
@@ -1388,7 +1588,15 @@ mod tests {
             status: Some(member_status::ONLINE | member_status::GHOST),
             ..PartyMemberStatsInfo::default()
         };
-        let s = member_unit_state(&m, Some(&ghost), None, &GroupState::default(), None, None);
+        let s = member_unit_state(
+            &m,
+            Some(&ghost),
+            None,
+            &GroupState::default(),
+            None,
+            None,
+            Default::default(),
+        );
         assert!(s.ghost);
         assert!(!s.dead, "a released ghost is not `dead` — only a ghost");
 
@@ -1404,10 +1612,419 @@ mod tests {
             &GroupState::default(),
             None,
             None,
+            Default::default(),
         );
         assert!(s.dead);
     }
 
+    /// Send member 1 alone as the party or raid roster with `status`, as a server's list does: the
+    /// member's record, which [`party`] seated, takes its online bit from the list.
+    fn seat(app: &mut App, group_type: u8, status: u8) {
+        let mut group = app.world_mut().resource_mut::<GroupState>();
+        group.apply_list(
+            group_type,
+            0,
+            vec![GroupMemberEntry {
+                name: "M1".into(),
+                guid: member(1),
+                status,
+                flags: 0,
+            }],
+            ME,
+            None,
+            Some(ME),
+        );
+    }
+
+    /// `UnitIsConnected` (`0x517d50`) answers 1 for any unit the object manager holds
+    /// (`0x517daf`), whatever the roster's status byte says; the record is not read.
+    #[test]
+    fn a_held_member_reads_connected_whatever_the_roster_status_says() {
+        let mut app = app();
+        party(&mut app, 1, false);
+        stream(&mut app, member(1), &[]);
+        frame(&mut app);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('party1')"),
+            Some(1.0),
+            "held, roster and record without the online bit"
+        );
+
+        seat(&mut app, GROUPTYPE_RAID, member_status::OFFLINE);
+        frame(&mut app);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('raid1')"),
+            Some(1.0),
+            "the raid token reads the same view"
+        );
+    }
+
+    /// The reported shape: a member goes link-dead while still in view. The roster marks them
+    /// offline and the reference keeps them connected until the object leaves (`0x517daf`), then
+    /// reads the record's online bit (`0x517dd3`).
+    #[test]
+    fn a_held_member_going_offline_reads_disconnected_only_once_the_object_leaves() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        let held = stream(&mut app, member(1), &[]);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), Some(1.0));
+
+        seat(&mut app, 0, member_status::OFFLINE);
+        frame(&mut app);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('party1')"),
+            Some(1.0),
+            "link-dead, still in view"
+        );
+
+        app.world_mut().despawn(held);
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .remove(&member(1));
+        frame(&mut app);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('party1')"),
+            None,
+            "out of view, the record's clear online bit decides"
+        );
+    }
+
+    /// With no object, the record's online bit (`+0x08 & 1`) is the answer: clear is nil
+    /// (`0x517dfd`).
+    #[test]
+    fn an_unheld_member_with_the_online_bit_clear_reads_nil() {
+        let mut app = app();
+        party(&mut app, 1, false);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), None);
+
+        seat(&mut app, GROUPTYPE_RAID, member_status::OFFLINE);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('raid1')"), None);
+    }
+
+    /// Set, it is 1 (`0x517dd7`).
+    #[test]
+    fn an_unheld_member_with_the_online_bit_set_reads_connected() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), Some(1.0));
+
+        seat(&mut app, GROUPTYPE_RAID, member_status::ONLINE);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('raid1')"), Some(1.0));
+    }
+
+    /// The answer is the record's bit, not the roster byte the list also carries: a stats packet's
+    /// status moves the record alone (`0x5e54b7`-`0x5e54d8`), and `UnitIsConnected` reads the record
+    /// (`0x517dca`-`0x517dd3`), so the two can disagree between lists.
+    #[test]
+    fn an_unheld_members_connected_follows_the_record_when_only_a_stats_packet_moves_it() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), Some(1.0));
+
+        let status = |app: &mut App, status: u8| {
+            app.world_mut().resource_mut::<GroupState>().apply_stats(
+                member(1),
+                false,
+                PartyMemberStatsInfo {
+                    status: Some(status),
+                    ..Default::default()
+                },
+            );
+            frame(app);
+        };
+        status(&mut app, member_status::OFFLINE);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('party1')"),
+            None,
+            "the record went offline, the roster byte still says online"
+        );
+        status(&mut app, member_status::ONLINE);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), Some(1.0));
+
+        // The list writes the same bit, so the next one agrees with the byte it carries.
+        seat(&mut app, 0, member_status::OFFLINE);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), None);
+        status(&mut app, member_status::ONLINE);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('party1')"),
+            Some(1.0),
+            "the record online again, the roster byte still offline"
+        );
+
+        seat(&mut app, GROUPTYPE_RAID, member_status::ONLINE);
+        frame(&mut app);
+        status(&mut app, member_status::OFFLINE);
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('raid1')"),
+            None,
+            "the raid row"
+        );
+    }
+
+    /// A frame that counts the `PARTY_MEMBERS_CHANGED`s the VM is told of; [`changed`] takes them.
+    fn watch_members_changed(app: &mut App) {
+        let script = app.world_mut().non_send_resource_mut::<UiScript>();
+        script
+            .run(
+                r#"
+                CHANGED = 0
+                local f = CreateFrame("Frame")
+                f:RegisterEvent("PARTY_MEMBERS_CHANGED")
+                f:SetScript("OnEvent", function() CHANGED = CHANGED + 1 end)
+                "#,
+            )
+            .unwrap();
+    }
+
+    /// Run a frame and count the `PARTY_MEMBERS_CHANGED`s it fired.
+    fn changed(app: &mut App) -> u32 {
+        frame(app);
+        let script = app.world_mut().non_send_resource_mut::<UiScript>();
+        let fired: f64 = script.eval("return CHANGED").unwrap();
+        script.run("CHANGED = 0").unwrap();
+        fired as u32
+    }
+
+    /// `SMSG_GROUP_LIST` as the server re-sends it: party members `1..` with their status byte,
+    /// under `leader` and `loot`, and nothing else told to the client.
+    fn resend(app: &mut App, statuses: &[u8], leader: u64, loot: Option<GroupLootInfo>) {
+        let list = statuses
+            .iter()
+            .enumerate()
+            .map(|(i, &status)| GroupMemberEntry {
+                name: format!("M{}", i + 1),
+                guid: member(i as u64 + 1),
+                status,
+                flags: 0,
+            })
+            .collect();
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .apply_list(0, 0, list, leader, loot, Some(ME));
+    }
+
+    const ON: u8 = member_status::ONLINE;
+    const OFF: u8 = member_status::OFFLINE;
+
+    /// The reported shape: a member out of view logs off, and the server sends the list again with
+    /// their status alone moved. The reference signals after every list (`0x5e6c61`), so the party
+    /// frame rereads them.
+    #[test]
+    fn a_list_that_moves_only_a_members_status_fires_party_members_changed() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 2, true);
+        assert_eq!(changed(&mut app), 1, "the first look answers the list");
+        assert_eq!(changed(&mut app), 0, "a steady frame is silent");
+
+        resend(&mut app, &[OFF, ON], ME, None);
+        assert_eq!(changed(&mut app), 1, "member 1 went offline");
+        resend(&mut app, &[OFF, ON | member_status::AFK], ME, None);
+        assert_eq!(changed(&mut app), 1, "member 2 went away");
+        assert_eq!(changed(&mut app), 0);
+    }
+
+    /// The leader and the loot method ride the same list, and neither moves a guid.
+    #[test]
+    fn a_list_that_moves_only_the_leader_or_the_loot_method_fires_party_members_changed() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 2, true);
+        changed(&mut app);
+
+        resend(&mut app, &[ON, ON], member(1), None);
+        assert_eq!(changed(&mut app), 1, "a new leader");
+        let master = GroupLootInfo {
+            method: 2,
+            master: member(1),
+            threshold: 3,
+        };
+        resend(&mut app, &[ON, ON], member(1), Some(master));
+        assert_eq!(changed(&mut app), 1, "a new loot method");
+        let raised = GroupLootInfo {
+            threshold: 4,
+            ..master
+        };
+        resend(&mut app, &[ON, ON], member(1), Some(raised));
+        assert_eq!(changed(&mut app), 1, "a new threshold");
+    }
+
+    /// The handler has no compare against the roster it holds (`0x5e6a40`): a list that says what
+    /// the last one said is signalled all the same.
+    #[test]
+    fn an_identical_list_fires_party_members_changed_again() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 2, true);
+        changed(&mut app);
+
+        resend(&mut app, &[ON, ON], ME, None);
+        assert_eq!(changed(&mut app), 1);
+        resend(&mut app, &[ON, ON], ME, None);
+        assert_eq!(changed(&mut app), 1);
+    }
+
+    /// Each packet signals, so the lists one drain applies fire once apiece, after the snapshots
+    /// the last of them left.
+    #[test]
+    fn each_list_of_one_drain_fires_its_own_party_members_changed() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 2, true);
+        changed(&mut app);
+
+        resend(&mut app, &[OFF, ON], ME, None);
+        resend(&mut app, &[OFF, OFF], ME, None);
+        resend(&mut app, &[ON, ON], ME, None);
+        assert_eq!(changed(&mut app), 3);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), Some(1.0));
+    }
+
+    /// An empty list jumps straight to the signal (`0x5e6b3c`), the all-zero "you left" list and a
+    /// solo leader's alike, and a second one to a group already empty is not skipped.
+    #[test]
+    fn an_empty_list_fires_party_members_changed() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 1, true);
+        changed(&mut app);
+
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .apply_list(0, 0, vec![], 0, None, Some(ME));
+        assert_eq!(changed(&mut app), 1, "the leave list");
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .apply_list(0, 0, vec![], 0, None, Some(ME));
+        assert_eq!(
+            changed(&mut app),
+            1,
+            "and again, with nobody left to change"
+        );
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .apply_list(0, 0, vec![], ME, None, Some(ME));
+        assert_eq!(changed(&mut app), 1, "a leader with no one yet");
+    }
+
+    /// A VM minted after the lists landed was told of none of them: one catch-up for a group, not
+    /// the history, and silence for a player who never had one.
+    #[test]
+    fn a_fresh_vm_answers_the_lists_that_landed_before_it_once() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        party(&mut app, 2, true);
+        resend(&mut app, &[OFF, ON], ME, None);
+        resend(&mut app, &[OFF, OFF], ME, None);
+        assert_eq!(changed(&mut app), 1);
+        assert_eq!(changed(&mut app), 0);
+
+        let mut solo = self::app();
+        watch_members_changed(&mut solo);
+        assert_eq!(changed(&mut solo), 0, "no list, no event");
+    }
+
+    #[test]
+    fn the_lists_owed_are_the_count_since_the_last_look() {
+        assert_eq!(members_changed_owed(3, 3, false), 0, "nothing landed");
+        assert_eq!(members_changed_owed(5, 3, false), 2, "one apiece");
+        assert_eq!(
+            members_changed_owed(2, 4, false),
+            2,
+            "the session ended and began again"
+        );
+        assert_eq!(members_changed_owed(0, 4, false), 0);
+        assert_eq!(
+            members_changed_owed(7, 0, true),
+            1,
+            "a fresh VM: the group, once"
+        );
+        assert_eq!(members_changed_owed(0, 0, true), 0);
+    }
+
+    /// The sandbox stands in for the server, whose echo of each group intent is a list.
+    #[test]
+    fn the_sandbox_answers_a_group_intent_with_a_party_members_changed() {
+        let mut app = app();
+        watch_members_changed(&mut app);
+        synthetic_roster(&mut app.world_mut().resource_mut::<GroupState>(), None);
+        assert_eq!(changed(&mut app), 1);
+
+        let (me, mob) = (Some(ME), None);
+        let intents = [
+            PartyRequest::UninviteUnit("party2".into()),
+            PartyRequest::PromoteUnit("party1".into()),
+            PartyRequest::LootThreshold(4),
+            PartyRequest::Leave,
+        ];
+        for req in intents {
+            let mut group = app.world_mut().resource_mut::<GroupState>();
+            assert!(test_apply_local(&mut group, &req, me, mob));
+            assert_eq!(changed(&mut app), 1, "{req:?}");
+        }
+        let mut group = app.world_mut().resource_mut::<GroupState>();
+        let mark = PartyRequest::SetRaidTarget {
+            unit: "player".into(),
+            index: 1,
+        };
+        assert!(test_apply_local(&mut group, &mark, me, mob));
+        assert_eq!(changed(&mut app), 0, "a mark is no list");
+    }
+
+    /// The stock party frame, loaded whole off the player's own chain: a member out of view logs
+    /// off, and the server sends the list again with their status alone moved. The stock frame
+    /// repaints on the event that list signals: `UnitFrameManaBar_Update` greys the bar for a
+    /// member who is not connected, and `PartyMemberFrame_UpdatePet` hides their pet frame
+    /// (`PartyMemberFrame.lua:73`).
+    #[test]
+    fn the_stock_party_frame_greys_a_member_who_logs_off_out_of_view() {
+        benilla_formats::wow_data_or_skip!();
+        let mut script = UiScript::new().unwrap();
+        script.set_screen_size(1024.0, 768.0);
+        let failures = crate::ui_script::load_default_ui(&script);
+        assert!(failures.is_empty(), "load failures: {failures:?}");
+        let mut app = app_with(script);
+        let bar = |app: &mut App| {
+            app.world_mut()
+                .non_send_resource::<UiScript>()
+                .eval::<(f64, f64, f64)>("return PartyMemberFrame1ManaBar:GetStatusBarColor()")
+                .unwrap()
+        };
+
+        party(&mut app, 1, true);
+        frame(&mut app);
+        assert_eq!(bar(&mut app), (0.0, 0.0, 1.0), "the mana colour");
+        assert_eq!(
+            flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"),
+            Some(1.0)
+        );
+
+        // The list alone, as the server sends it: the member's record is not touched.
+        resend(&mut app, &[OFF], ME, None);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitIsConnected('party1')"), None);
+        assert_eq!(bar(&mut app), (0.5, 0.5, 0.5), "the disconnected grey");
+        assert_eq!(flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"), None);
+
+        resend(&mut app, &[ON], ME, None);
+        frame(&mut app);
+        assert_eq!(bar(&mut app), (0.0, 0.0, 1.0), "back online");
+        assert_eq!(
+            flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"),
+            Some(1.0)
+        );
+        let errors = app.world().non_send_resource::<UiScript>().errors();
+        assert!(errors.is_empty(), "script errors: {errors:?}");
+    }
+
     #[test]
     fn a_second_empty_answer_is_still_a_saved_instance_edge() {
         let mut fed = FedParty::default();
diff --git a/crates/benilla-app/src/ui_party/feed/roster_update_tests.rs b/crates/benilla-app/src/ui_party/feed/roster_update_tests.rs
new file mode 100644
index 00000000..e13da0d1
--- /dev/null
+++ b/crates/benilla-app/src/ui_party/feed/roster_update_tests.rs
@@ -0,0 +1,357 @@
+//! `RAID_ROSTER_UPDATE` as the reference signals it: once per group list that rebuilds the raid
+//! roster with no member name pending (`0x4babef`) and once per list that drops the roster held
+//! (`0x4ba57b`), with the roster edge standing in for the two signals no list carries.
+
+use super::super::pets::tests::{app, app_with, flag, frame, member, ME};
+use super::*;
+
+const ON: u8 = member_status::ONLINE;
+const DEAD: u8 = member_status::ONLINE | member_status::DEAD;
+const GHOST: u8 = member_status::ONLINE | member_status::GHOST;
+
+/// A frame that counts the `RAID_ROSTER_UPDATE`s the VM is told of; [`fired`] takes them.
+fn watch(app: &mut App) {
+    let script = app.world_mut().non_send_resource_mut::<UiScript>();
+    script
+        .run(
+            r#"
+            ROSTER = 0
+            local f = CreateFrame("Frame")
+            f:RegisterEvent("RAID_ROSTER_UPDATE")
+            f:SetScript("OnEvent", function() ROSTER = ROSTER + 1 end)
+            "#,
+        )
+        .unwrap();
+}
+
+/// Run a frame and count the `RAID_ROSTER_UPDATE`s it fired.
+fn fired(app: &mut App) -> u32 {
+    frame(app);
+    let script = app.world_mut().non_send_resource_mut::<UiScript>();
+    let fired: f64 = script.eval("return ROSTER").unwrap();
+    script.run("ROSTER = 0").unwrap();
+    fired as u32
+}
+
+/// `SMSG_GROUP_LIST` as the server sends it: members `1..` with their status byte, led by us, of
+/// the given group type. `names_pending` is what the name cache told the handler.
+fn send(app: &mut App, group_type: u8, statuses: &[u8], names_pending: bool) {
+    let list = statuses
+        .iter()
+        .enumerate()
+        .map(|(i, &status)| GroupMemberEntry {
+            name: format!("M{}", i + 1),
+            guid: member(i as u64 + 1),
+            status,
+            flags: 0,
+        })
+        .collect();
+    app.world_mut()
+        .resource_mut::<GroupState>()
+        .apply_list_awaiting(group_type, 0, list, ME, None, Some(ME), names_pending);
+}
+
+fn raid(app: &mut App, statuses: &[u8]) {
+    send(app, GROUPTYPE_RAID, statuses, false);
+}
+
+fn party(app: &mut App, statuses: &[u8]) {
+    send(app, 0, statuses, false);
+}
+
+/// The all-zero list: "not in a group".
+fn all_zero(app: &mut App) {
+    app.world_mut()
+        .resource_mut::<GroupState>()
+        .apply_list(0, 0, vec![], 0, None, Some(ME));
+}
+
+/// `GetNumRaidMembers()`, the rows the VM reads.
+fn rows(app: &mut App) -> f64 {
+    let script = app.world_mut().non_send_resource::<UiScript>();
+    script.eval("return GetNumRaidMembers()").unwrap()
+}
+
+/// `GetRaidRosterInfo`'s ninth return for row `row`.
+fn dead(app: &mut App, row: u32) -> Option<f64> {
+    flag(
+        app,
+        &format!(
+            "(function() local _, _, _, _, _, _, _, _, dead = GetRaidRosterInfo({row}) \
+             return dead end)()"
+        ),
+    )
+}
+
+/// The reported shape: a raid member dies, then releases, out of view. The list that says so moves
+/// their status alone, no guid, rank, subgroup or online bit, and the writer signals all the same
+/// (`0x4babef`, with no compare against the old roster).
+#[test]
+fn a_raid_list_that_moves_only_a_members_dead_bit_fires_raid_roster_update() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1, "the first look answers the list");
+    assert_eq!(fired(&mut app), 0, "a steady frame is silent");
+    assert_eq!(dead(&mut app, 1), None);
+
+    raid(&mut app, &[DEAD, ON]);
+    assert_eq!(fired(&mut app), 1, "member 1 died");
+    assert_eq!(dead(&mut app, 1), Some(1.0), "and the roster says so");
+    raid(&mut app, &[GHOST, ON]);
+    assert_eq!(fired(&mut app), 1, "member 1 released");
+    assert_eq!(dead(&mut app, 1), None);
+    assert_eq!(fired(&mut app), 0);
+}
+
+/// Nothing gates the writer's signal on a difference: a list that says what the last said signals.
+#[test]
+fn an_identical_raid_list_fires_raid_roster_update_again() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    fired(&mut app);
+
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1);
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1);
+    assert_eq!(fired(&mut app), 0, "a frame with no list is silent");
+}
+
+/// A party's list runs no roster writer: the raid leg of the handler is the only caller (`0x5e6eb4`),
+/// and the other leg finds no roster to drop (`0x4ba550`).
+#[test]
+fn a_party_list_fires_no_raid_roster_update() {
+    let mut app = app();
+    watch(&mut app);
+    party(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 0, "the list that seats the party");
+    party(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 0, "an identical one");
+    party(&mut app, &[DEAD, ON]);
+    assert_eq!(fired(&mut app), 0, "a status alone");
+    all_zero(&mut app);
+    assert_eq!(
+        fired(&mut app),
+        0,
+        "and the all-zero list with no raid held"
+    );
+}
+
+/// With a member name pending the writer signals nothing (`0x4babdf`); the name answer does later
+/// (`0x4bada6`), which is not built, so the roster edge signals a list that moves the roster's
+/// identity, as it always has.
+#[test]
+fn a_raid_list_with_a_name_pending_fires_only_on_the_roster_edge() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    fired(&mut app);
+
+    send(&mut app, GROUPTYPE_RAID, &[DEAD, ON], true);
+    assert_eq!(fired(&mut app), 0, "a status alone, a name pending");
+    send(&mut app, GROUPTYPE_RAID, &[DEAD, ON], true);
+    assert_eq!(fired(&mut app), 0, "an identical list, a name pending");
+    send(&mut app, GROUPTYPE_RAID, &[DEAD, ON, ON], true);
+    assert_eq!(fired(&mut app), 1, "a member joined: the roster moved");
+    send(&mut app, GROUPTYPE_RAID, &[DEAD, ON, ON], false);
+    assert_eq!(fired(&mut app), 1, "the names held: the list fires");
+}
+
+/// A list that is not a raid, with a raid held, drops it and signals once (`0x4ba57b`): the raid
+/// turned party and the all-zero list alike, each list of the drain apiece.
+#[test]
+fn a_list_that_drops_the_raid_fires_raid_roster_update_once() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    fired(&mut app);
+
+    party(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1, "the raid became a party");
+    party(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 0, "no raid held");
+
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1);
+    all_zero(&mut app);
+    assert_eq!(fired(&mut app), 1, "the group ended");
+    all_zero(&mut app);
+    assert_eq!(fired(&mut app), 0, "and nothing to end");
+
+    // In one drain: the list that rebuilds, then the one that drops.
+    raid(&mut app, &[ON, ON]);
+    fired(&mut app);
+    raid(&mut app, &[DEAD, ON]);
+    all_zero(&mut app);
+    assert_eq!(fired(&mut app), 2, "one apiece");
+}
+
+/// Each packet signals, so the lists one drain applies fire once apiece.
+#[test]
+fn each_raid_list_of_one_drain_fires_its_own_raid_roster_update() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    fired(&mut app);
+
+    raid(&mut app, &[DEAD, ON]);
+    raid(&mut app, &[DEAD, DEAD]);
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 3);
+}
+
+/// World entry fills in our own row (`0x4ba1a2`), with no list behind it: the roster edge fires as
+/// our row arrives, once.
+#[test]
+fn our_own_row_arriving_fires_raid_roster_update_once() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    assert_eq!(fired(&mut app), 1, "the list, before we are in the world");
+    assert_eq!(rows(&mut app), 2.0);
+
+    app.world_mut().spawn((
+        Guid(ME),
+        ObjectStore(benilla_protocol::messages::ObjectFields::from_pairs(&[])),
+        SelfPlayer,
+    ));
+    assert_eq!(fired(&mut app), 1, "our row filled in");
+    assert_eq!(rows(&mut app), 3.0, "us, then the two");
+    assert_eq!(fired(&mut app), 0);
+}
+
+/// A VM minted after the lists landed was told of none: the raid it finds gets its one catch-up
+/// from the roster edge, never the history, and a player who holds no raid gets nothing, however
+/// many lists ended raids before.
+#[test]
+fn a_fresh_vm_finds_a_raid_once_and_a_party_not_at_all() {
+    let mut app = app();
+    watch(&mut app);
+    raid(&mut app, &[ON, ON]);
+    raid(&mut app, &[DEAD, ON]);
+    raid(&mut app, &[DEAD, DEAD]);
+    assert_eq!(fired(&mut app), 1);
+    assert_eq!(fired(&mut app), 0);
+
+    let mut ended = self::app();
+    watch(&mut ended);
+    raid(&mut ended, &[ON, ON]);
+    party(&mut ended, &[ON, ON]);
+    assert_eq!(fired(&mut ended), 0, "the raid ended before the first look");
+
+    let mut solo = self::app();
+    watch(&mut solo);
+    assert_eq!(fired(&mut solo), 0);
+}
+
+#[test]
+fn the_roster_updates_owed_are_the_count_since_the_last_look() {
+    assert_eq!(roster_updates_owed(3, 3, false), 0, "nothing landed");
+    assert_eq!(roster_updates_owed(5, 3, false), 2, "one apiece");
+    assert_eq!(
+        roster_updates_owed(2, 4, false),
+        2,
+        "the session ended and began again"
+    );
+    assert_eq!(
+        roster_updates_owed(7, 0, true),
+        0,
+        "a fresh VM's catch-up is the roster edge's"
+    );
+}
+
+/// The sandbox stands in for the server, whose echo of each group intent is a list: a raid's list
+/// signals `RAID_ROSTER_UPDATE` though the intent moves nobody (a loot threshold), the one that
+/// ends the raid signals once, and a party's list signals none.
+#[test]
+fn the_sandbox_answers_a_raid_intent_with_a_raid_roster_update() {
+    let mut app = app();
+    watch(&mut app);
+    synthetic_roster(&mut app.world_mut().resource_mut::<GroupState>(), None);
+    assert_eq!(fired(&mut app), 0, "a party's list");
+
+    let intent = |app: &mut App, req: PartyRequest| {
+        let mut group = app.world_mut().resource_mut::<GroupState>();
+        assert!(test_apply_local(&mut group, &req, Some(ME), None));
+    };
+    intent(&mut app, PartyRequest::LootThreshold(4));
+    assert_eq!(fired(&mut app), 0, "a party intent");
+    intent(&mut app, PartyRequest::ConvertToRaid);
+    assert_eq!(fired(&mut app), 1, "the party became a raid");
+    intent(&mut app, PartyRequest::LootThreshold(4));
+    assert_eq!(fired(&mut app), 1, "a raid intent that moves no member");
+    intent(&mut app, PartyRequest::PromoteUnit("party1".into()));
+    assert_eq!(
+        fired(&mut app),
+        1,
+        "once, though the leader's rank moved too"
+    );
+    intent(
+        &mut app,
+        PartyRequest::SetRaidTarget {
+            unit: "player".into(),
+            index: 1,
+        },
+    );
+    assert_eq!(fired(&mut app), 0, "a mark is no list");
+    intent(&mut app, PartyRequest::Leave);
+    assert_eq!(fired(&mut app), 1, "the raid ended");
+}
+
+/// The stock raid UI, loaded whole off the player's own chain: a raid member dies out of view and
+/// the list that says so moves nothing but their dead bit. The raid tab's grid also repaints on
+/// `PARTY_MEMBERS_CHANGED` (`RaidFrame_OnEvent`), which every list signals, but a group pullout
+/// re-reads its rows on `RAID_ROSTER_UPDATE` alone (`RaidPullout_OnEvent`); this harness sends no
+/// member stats, so no `UNIT_HEALTH` repaints the row in its place.
+#[test]
+fn the_stock_raid_ui_repaints_a_member_who_dies_out_of_view() {
+    benilla_formats::wow_data_or_skip!();
+    let mut script = UiScript::new().unwrap();
+    script.set_screen_size(1024.0, 768.0);
+    let failures = crate::ui_script::load_default_ui(&script);
+    assert!(failures.is_empty(), "load failures: {failures:?}");
+    crate::ui_script::test_ui::seat_chain_addon(&mut script, "Blizzard_RaidUI");
+    let mut app = app_with(script);
+    // A warrior, so the alive colour is the class's and the dead one is not.
+    app.world_mut().resource_mut::<NameCache>().insert_player(
+        member(1),
+        "M1".into(),
+        Some((1, 1, 0)),
+    );
+    let colour = |app: &mut App, call: &str| {
+        let (r, g, b): (f32, f32, f32) = app
+            .world_mut()
+            .non_send_resource::<UiScript>()
+            .eval(&format!("return {call}"))
+            .unwrap();
+        [r, g, b].map(|c| (c * 100.0).round() as i32)
+    };
+    let text_colour = |app: &mut App| colour(app, "RaidGroupButton1Name:GetTextColor()");
+    let pullout_colour = |app: &mut App| colour(app, "RaidPullout1Button1Name:GetTextColor()");
+    let (warrior, red) = ([78, 61, 43], [100, 10, 10]);
+
+    // The first list loads the raid UI (`RaidFrame_LoadUI`); the drag on group 1's label, whose
+    // handler runs with `this` set, opens the group's pullout (`Blizzard_RaidUI.xml:172`).
+    raid(&mut app, &[ON, ON]);
+    frame(&mut app);
+    app.world_mut()
+        .non_send_resource_mut::<UiScript>()
+        .run("this = RaidGroup1Label RaidPullout_GenerateGroupFrame()")
+        .unwrap();
+    assert_eq!(text_colour(&mut app), warrior, "the grid's row");
+    assert_eq!(pullout_colour(&mut app), warrior, "the pullout's row");
+
+    raid(&mut app, &[DEAD, ON]);
+    frame(&mut app);
+    assert_eq!(text_colour(&mut app), red, "the grid repaints");
+    assert_eq!(pullout_colour(&mut app), red, "and so does the pullout");
+
+    raid(&mut app, &[ON, ON]);
+    frame(&mut app);
+    assert_eq!(text_colour(&mut app), warrior);
+    assert_eq!(pullout_colour(&mut app), warrior);
+    let errors = app.world().non_send_resource::<UiScript>().errors();
+    assert!(errors.is_empty(), "script errors: {errors:?}");
+}
diff --git a/crates/benilla-app/src/ui_party/mod.rs b/crates/benilla-app/src/ui_party/mod.rs
index b2b2d242..9fc57699 100644
--- a/crates/benilla-app/src/ui_party/mod.rs
+++ b/crates/benilla-app/src/ui_party/mod.rs
@@ -7,7 +7,8 @@ use std::collections::HashMap;
 
 use crate::ui_action::UiError;
 use benilla_protocol::messages::{
-    party_operation, party_result, GroupLootInfo, GroupMemberEntry, PartyMemberStatsInfo,
+    party_operation, party_result, patch_auras, GroupLootInfo, GroupMemberEntry,
+    PartyMemberStatsInfo,
 };
 use bevy::prelude::*;
 
@@ -15,9 +16,11 @@ use crate::ui_script::{UiFeed, UiInput};
 
 mod feed;
 pub(crate) mod net;
+mod pets;
+mod records;
 pub(crate) use feed::{
-    raid_row_guid, synthetic_raid, synthetic_roster, GROUPTYPE_RAID, GROUP_MEMBER_SUBGROUP,
-    PARTY_TOKENS, RAID_TOKENS,
+    raid_row_guid, raid_row_guids, synthetic_raid, synthetic_roster, GROUPTYPE_RAID,
+    GROUP_MEMBER_SUBGROUP, PARTY_PET_TOKENS, PARTY_TOKENS, RAID_PET_TOKENS, RAID_TOKENS,
 };
 
 pub(crate) struct UiPartyPlugin;
@@ -49,6 +52,16 @@ pub struct GroupState {
     pub own_flags: u8,
     /// The other members in wire order; the list never contains the recipient.
     pub members: Vec<GroupMemberEntry>,
+    /// How many `SMSG_GROUP_LIST`s landed, the all-zero and an unchanged one included. The
+    /// reference signals `PARTY_MEMBERS_CHANGED` after each (`0x5e6c61`), with no compare against
+    /// the roster it holds, and an empty list reaches it too (`0x5e6b3c`).
+    pub lists_applied: u32,
+    /// How many `RAID_ROSTER_UPDATE`s the lists signalled, which the feed answers one for one. A raid
+    /// list signals after its roster rebuild once no member name is pending (`0x4babef`), with no
+    /// compare against the roster it replaces; a list that is not a raid signals once for the roster
+    /// it drops (`0x4ba57b`). A raid list with a name pending signals nothing then, and the name
+    /// answer signals later (`0x4bada6`).
+    pub roster_updates: u32,
     /// The leave ack, `SMSG_GROUP_UNINVITE` and `SMSG_GROUP_DESTROYED` empty the reference's party
     /// slots and leader (`0x4e84a0`, `0x4e8250(0)`) and keep its raid roster; the next list then
     /// finds no slot held.
@@ -58,7 +71,8 @@ pub struct GroupState {
     pub loot: Option<GroupLootInfo>,
     /// The inviter's name while the invite popup is up.
     pub pending_invite: Option<String>,
-    /// Each member's record by guid, seated at 1/1 and patched by `SMSG_PARTY_MEMBER_STATS`.
+    /// Each member's record by guid, seated at 1/1, patched by `SMSG_PARTY_MEMBER_STATS`, and given
+    /// its online bit again by each `SMSG_GROUP_LIST` that lists the member.
     pub stats: HashMap<u64, PartyMemberStatsInfo>,
     /// The marked guid per raid-target icon 0-7 (star to skull), 0 when unset.
     pub raid_targets: [u64; 8],
@@ -90,7 +104,8 @@ pub struct ListOutcome {
 impl GroupState {
     /// Apply one `SMSG_GROUP_LIST` and return what it shows, in the reference's order: the party
     /// slots' joins, the new-group line, the party slots' leaves, then the raid roster's lines.
-    /// Kick, leave (`0x5e690b`) and disband lines come from their opcodes.
+    /// Kick, leave (`0x5e690b`) and disband lines come from their opcodes. Every name is taken as
+    /// held: [`Self::apply_list_awaiting`] is the one that says otherwise.
     pub fn apply_list(
         &mut self,
         group_type: u8,
@@ -100,6 +115,26 @@ impl GroupState {
         loot: Option<GroupLootInfo>,
         self_guid: Option<u64>,
     ) -> ListOutcome {
+        self.apply_list_awaiting(
+            group_type, own_flags, members, leader, loot, self_guid, false,
+        )
+    }
+
+    /// [`Self::apply_list`] told what the name cache holds: `names_pending` when a row of a raid
+    /// list has no cached name yet, the reference's pending count (`[0xb713f0]`, raised at `0x4ba9d0`
+    /// for each row whose name lookup misses), which holds `RAID_ROSTER_UPDATE` back (`0x4babdf`).
+    pub fn apply_list_awaiting(
+        &mut self,
+        group_type: u8,
+        own_flags: u8,
+        members: Vec<GroupMemberEntry>,
+        leader: u64,
+        loot: Option<GroupLootInfo>,
+        self_guid: Option<u64>,
+        names_pending: bool,
+    ) -> ListOutcome {
+        // Every path of the handler reaches the event, the leave list and a party's list alike.
+        self.count_list();
         let mut out = ListOutcome::default();
         let raid = group_type == GROUPTYPE_RAID;
         // The two stores as this list finds them: the party slots unless an opcode emptied them,
@@ -164,9 +199,15 @@ impl GroupState {
             } else {
                 out.lines.push(UiError::key("ERR_RAID_YOU_JOINED"));
             }
+            // The rebuild ends in the signal unless a name is pending (`0x4babdf`-`0x4babef`).
+            if !names_pending {
+                self.count_roster_update();
+            }
         } else if raid_held {
-            // `0x4ba550`: a list that is not a raid drops the held roster (`0x4ba55f`).
+            // `0x4ba550`: a list that is not a raid drops the held roster (`0x4ba55f`), and says so
+            // (`0x4ba57b`). With no roster held it signals no `RAID_ROSTER_UPDATE`.
             out.lines.push(UiError::key("ERR_RAID_YOU_LEFT"));
+            self.count_roster_update();
         }
 
         // The all-zero list means "not in a group" (vmangos `Server/Packets/Group.h:257`); only
@@ -183,6 +224,16 @@ impl GroupState {
 
         self.stats
             .retain(|guid, _| members.iter().any(|m| m.guid == *guid));
+        // Each listed member's record takes its online bit from the row's status byte and keeps the
+        // rest: a known member's record is passed back to `0x4e82d0` (`0x5e6ddb`-`0x5e6de8`), which
+        // writes the bit last (`0x4e8361`-`0x4e837b`), and the raid roster's twin does the same to
+        // its row's record (`0x4ba947`-`0x4ba960`). A member new to the roster has no record yet;
+        // `net::list` seats its placeholder.
+        for m in &members {
+            if let Some(record) = self.stats.get_mut(&m.guid) {
+                record.set_online(m.listed_online());
+            }
+        }
 
         self.in_group = true;
         self.group_type = group_type;
@@ -196,6 +247,18 @@ impl GroupState {
         out
     }
 
+    /// Count one `SMSG_GROUP_LIST`, which the feed answers with one `PARTY_MEMBERS_CHANGED`. The
+    /// `/partytest` sandbox calls it for each group intent whose echo the server would send as a
+    /// list.
+    pub(super) fn count_list(&mut self) {
+        self.lists_applied = self.lists_applied.wrapping_add(1);
+    }
+
+    /// Count one `RAID_ROSTER_UPDATE` a list signals, which the feed answers with one.
+    pub(super) fn count_roster_update(&mut self) {
+        self.roster_updates = self.roster_updates.wrapping_add(1);
+    }
+
     /// The `party1..party4` slots: our own subgroup in packet order, at most four (`0x5e6baa`
     /// compares the flags under `0x7f`). A slot's member can change on any resync.
     pub fn party_slots(&self) -> impl Iterator<Item = &GroupMemberEntry> {
@@ -280,11 +343,12 @@ impl GroupState {
         }
     }
 
-    /// `SMSG_PARTY_MEMBER_STATS`: a delta merges field by field, `_FULL` replaces the record.
+    /// `SMSG_PARTY_MEMBER_STATS`: a delta patches the record field by field (`0x5e519d`, seeded from
+    /// the stored record), `_FULL` patches an emptied one (`0x5e51b1`). An aura block is patched
+    /// slot by slot ([`patch_auras`]).
     pub fn apply_stats(&mut self, guid: u64, full: bool, info: PartyMemberStatsInfo) {
         if full {
-            self.stats.insert(guid, info);
-            return;
+            self.stats.insert(guid, PartyMemberStatsInfo::default());
         }
         let entry = self.stats.entry(guid).or_default();
         macro_rules! merge {
@@ -310,20 +374,18 @@ impl GroupState {
             pet_cur_power,
             pet_max_power,
         );
-        if info.auras.is_some() {
-            entry.auras = info.auras;
-        }
-        if info.auras_negative.is_some() {
-            entry.auras_negative = info.auras_negative;
-        }
         if info.pet_name.is_some() {
             entry.pet_name = info.pet_name;
         }
-        if info.pet_auras.is_some() {
-            entry.pet_auras = info.pet_auras;
-        }
-        if info.pet_auras_negative.is_some() {
-            entry.pet_auras_negative = info.pet_auras_negative;
+        for (record, patch) in [
+            (&mut entry.auras, info.auras),
+            (&mut entry.auras_negative, info.auras_negative),
+            (&mut entry.pet_auras, info.pet_auras),
+            (&mut entry.pet_auras_negative, info.pet_auras_negative),
+        ] {
+            if let Some(patch) = patch {
+                patch_auras(record, &patch);
+            }
         }
     }
 
@@ -373,6 +435,8 @@ impl GroupState {
             // nothing on a disband (`Group::RemoveAllInvites`).
             pending_invite,
             // Session state the feed fires edges on: kept until `clear_session`.
+            lists_applied: _,
+            roster_updates: _,
             saved_instances: _,
             saved_instances_answers: _,
             ready_check: _,
@@ -471,6 +535,151 @@ mod tests {
         assert!(g.saved_instances.is_empty());
     }
 
+    #[test]
+    fn every_list_counts_whatever_it_changes() {
+        let mut g = GroupState::default();
+        let list = |g: &mut GroupState, members: Vec<GroupMemberEntry>, leader| {
+            g.apply_list(0, 0, members, leader, None, Some(ME));
+            g.lists_applied
+        };
+        assert_eq!(g.lists_applied, 0, "no list yet");
+
+        let alice = member("Alice", 0xA11CE);
+        assert_eq!(list(&mut g, vec![alice.clone()], 0xA11CE), 1);
+        assert_eq!(
+            list(&mut g, vec![alice.clone()], 0xA11CE),
+            2,
+            "the same list again"
+        );
+        let away = GroupMemberEntry {
+            status: 0,
+            ..alice.clone()
+        };
+        assert_eq!(list(&mut g, vec![away], 0xA11CE), 3, "a status alone");
+        assert_eq!(list(&mut g, vec![alice], ME), 4, "a leader alone");
+        assert_eq!(list(&mut g, vec![], ME), 5, "a leader with no members");
+        assert_eq!(list(&mut g, vec![], 0), 6, "the all-zero list");
+        assert_eq!(list(&mut g, vec![], 0), 7, "and another, with nobody held");
+
+        g.leave_group();
+        assert_eq!(g.lists_applied, 7, "leaving is not a list");
+        g.clear_session();
+        assert_eq!(g.lists_applied, 0);
+    }
+
+    /// The raid roster writer signals after each rebuild (`0x4babef`), and nothing gates the signal
+    /// on a difference from the roster it replaces, so a list that moves a member's status alone, or
+    /// nothing, counts.
+    #[test]
+    fn every_raid_list_counts_a_roster_update_whatever_it_changes() {
+        use benilla_protocol::messages::member_status;
+        let mut g = GroupState::default();
+        let raid = |g: &mut GroupState, members: Vec<GroupMemberEntry>| {
+            g.apply_list(1, 0, members, 1, None, Some(ME));
+            g.roster_updates
+        };
+        assert_eq!(g.roster_updates, 0, "no list yet");
+
+        let (alice, bob) = (sub("Alice", 1, 0), sub("Bob", 2, 1));
+        assert_eq!(
+            raid(&mut g, vec![alice.clone(), bob.clone()]),
+            1,
+            "seats the raid"
+        );
+        assert_eq!(
+            raid(&mut g, vec![alice.clone(), bob.clone()]),
+            2,
+            "the same list again"
+        );
+        let dead = GroupMemberEntry {
+            status: member_status::ONLINE | member_status::DEAD,
+            ..bob
+        };
+        assert_eq!(raid(&mut g, vec![alice.clone(), dead]), 3, "a status alone");
+        assert_eq!(raid(&mut g, vec![alice]), 4, "a member gone");
+        assert_eq!(
+            raid(&mut g, vec![]),
+            5,
+            "a raid list naming nobody still rebuilds"
+        );
+
+        g.leave_group();
+        assert_eq!(g.roster_updates, 5, "leaving is not a list");
+        g.clear_session();
+        assert_eq!(g.roster_updates, 0);
+    }
+
+    /// A list that is not a raid runs no roster writer, so a party's list signals nothing; one that
+    /// finds a raid held drops it and signals once (`0x4ba57b`), the all-zero list among them, and
+    /// with none held there is nothing to say.
+    #[test]
+    fn a_list_that_is_not_a_raid_counts_a_roster_update_only_for_the_raid_it_drops() {
+        let mut g = GroupState::default();
+        let list = |g: &mut GroupState, group_type: u8, members: Vec<GroupMemberEntry>, leader| {
+            g.apply_list(group_type, 0, members, leader, None, Some(ME));
+            g.roster_updates
+        };
+        let party = vec![sub("Alice", 1, 0)];
+
+        assert_eq!(list(&mut g, 0, party.clone(), 1), 0, "a party's list");
+        assert_eq!(list(&mut g, 0, party.clone(), 1), 0, "and again");
+        assert_eq!(
+            list(&mut g, 0, vec![], 0),
+            0,
+            "the all-zero list with no raid held"
+        );
+
+        assert_eq!(
+            list(&mut g, 1, party.clone(), 1),
+            1,
+            "the party becomes a raid"
+        );
+        assert_eq!(
+            list(&mut g, 0, party.clone(), 1),
+            2,
+            "the raid becomes a party"
+        );
+        assert_eq!(list(&mut g, 0, party.clone(), 1), 2, "nothing held to drop");
+
+        assert_eq!(list(&mut g, 1, party, 1), 3);
+        assert_eq!(
+            list(&mut g, 0, vec![], 0),
+            4,
+            "the all-zero list ends the raid"
+        );
+        assert_eq!(
+            list(&mut g, 0, vec![], 0),
+            4,
+            "and a second has none to end"
+        );
+    }
+
+    /// The rebuild counts the rows whose name is still to come and signals only with none
+    /// (`0x4babdf`); the list lands all the same, and a list that drops a raid asks no name.
+    #[test]
+    fn a_raid_list_with_a_name_pending_counts_no_roster_update() {
+        let mut g = GroupState::default();
+        let raid = vec![sub("Alice", 1, 0), sub("Bob", 2, 1)];
+        let awaiting = |g: &mut GroupState, group_type: u8, pending: bool| {
+            g.apply_list_awaiting(group_type, 0, raid.clone(), 1, None, Some(ME), pending);
+            g.roster_updates
+        };
+
+        assert_eq!(awaiting(&mut g, 1, true), 0, "a name pending");
+        assert_eq!(
+            g.group_type, GROUPTYPE_RAID,
+            "the roster is rebuilt regardless"
+        );
+        assert_eq!(g.members.len(), 2);
+        assert_eq!(awaiting(&mut g, 1, false), 1, "every name held");
+        assert_eq!(awaiting(&mut g, 1, true), 1, "pending again");
+        assert_eq!(
+            awaiting(&mut g, 0, true),
+            2,
+            "the drop does not wait on a name"
+        );
+    }
+
     #[test]
     fn leaving_the_group_keeps_the_session_tickets() {
         let lockout = benilla_protocol::messages::RaidInstanceEntry {
diff --git a/crates/benilla-app/src/ui_party/net.rs b/crates/benilla-app/src/ui_party/net.rs
index bce20103..b39e2dd4 100644
--- a/crates/benilla-app/src/ui_party/net.rs
+++ b/crates/benilla-app/src/ui_party/net.rs
@@ -3,14 +3,12 @@
 //! catalog row gives the text, the surface and the sound. [`member_deactivated`] and
 //! [`roster_deactivated`] are the object layer's hooks on a roster member's stream-out.
 
-use benilla_protocol::messages::{
-    member_status, GroupLootInfo, GroupMemberEntry, PartyMemberStatsInfo,
-};
+use benilla_protocol::messages::{GroupLootInfo, GroupMemberEntry, PartyMemberStatsInfo};
 use bevy::prelude::*;
 
 use benilla_protocol::{SessionEvent, SessionEventKind};
 
-use super::GroupState;
+use super::{GroupState, GROUPTYPE_RAID};
 use crate::names::NameCache;
 use crate::net::{ClientCommand, GuidIndex, NetCommands, NetHandlerApp, ObjectStore, SelfGuid};
 use crate::sound::MessageSounds;
@@ -238,6 +236,9 @@ fn leader_changed(
 /// `SMSG_GROUP_LIST`: apply the roster, seat new members' records and re-ask the questgiver sweep
 /// (shared-quest availability follows the roster). Every member is name-queried once: the
 /// answer's race, class and gender are the only source of them for a member we never see streamed.
+/// A raid's rebuild counts the rows whose name is still to come (`0x4ba9b6`-`0x4ba9d0`), ours
+/// among them once others are listed (`0x5e6e73`), and signals `RAID_ROSTER_UPDATE` only with none
+/// (`0x4babdf`-`0x4babef`).
 fn list(
     group: &mut GroupState,
     errors: &mut UiErrorKeys,
@@ -253,16 +254,30 @@ fn list(
     index: &GuidIndex,
     net_commands: &NetCommands,
 ) {
+    let mut names_pending = false;
     for m in &members {
-        let _ = names.resolve(m.guid, net_commands);
+        names_pending |= names.resolve(m.guid, net_commands).is_none();
+    }
+    if group_type == GROUPTYPE_RAID && !members.is_empty() {
+        if let Some(own) = self_guid.0 {
+            names_pending |= names.resolve(own, net_commands).is_none();
+        }
     }
     // Taken before `apply_list` consumes the list; `seat_new_records` then treats a member with
     // no record as new, the reference's `srcRec == 0`.
     let seats: Vec<(u64, bool)> = members
         .iter()
-        .map(|m| (m.guid, m.status & member_status::ONLINE != 0))
+        .map(|m| (m.guid, m.listed_online()))
         .collect();
-    let shown = group.apply_list(group_type, own_flags, members, leader, loot, self_guid.0);
+    let shown = group.apply_list_awaiting(
+        group_type,
+        own_flags,
+        members,
+        leader,
+        loot,
+        self_guid.0,
+        names_pending,
+    );
     push_group_lines(errors, shown.lines);
     if shown.invite_accept {
         sounds.push_cue(INVITE_ACCEPT_SOUND);
@@ -272,9 +287,10 @@ fn list(
 }
 
 /// `SMSG_GROUP_LIST`'s record leg (`0x4e82d0`, raid twin `0x4ba5f0`): a known member's record
-/// carries over and nothing is sent; a new member gets the 1/1 placeholder and, when we hold no
-/// object for them, a stats request (`0x4e83f1`, raid `0x4bab6e`). Every member therefore owns a
-/// record, so an unseen one shows full bars, not 0/0, until their stats land.
+/// carries over, its online bit rewritten by [`GroupState::apply_list`], and nothing is sent; a new
+/// member gets the 1/1 placeholder and, when we hold no object for them, a stats request
+/// (`0x4e83f1`, raid `0x4bab6e`). A listed member therefore owns a record, so an unseen one shows
+/// full bars, not 0/0, until their stats land.
 fn seat_new_records(
     group: &mut GroupState,
     seats: &[(u64, bool)],
@@ -298,13 +314,16 @@ fn seat_new_records(
 }
 
 /// The despawn hook, the reference's deactivate virtual `0x5e9aa0` (object destroyed or out of
-/// range): for a roster member, snapshot the live descriptor into their record (`0x5f0880`), then
-/// request their stats (`0x4e8646`). Nothing happens off the roster or without an object, since
-/// the hook is a virtual on the object.
-pub(crate) fn member_deactivated(
+/// range): for a roster member, snapshot the live descriptor into their record (`0x5f0880`), their
+/// pet's too while `held` finds it, with the name `names` holds for it, then request their stats
+/// (`0x4e8646`). Nothing happens off the roster or without an object, since the hook is a virtual
+/// on the object.
+pub(crate) fn member_deactivated<'a>(
     guid: u64,
     group: &mut GroupState,
-    store: Option<&ObjectStore>,
+    store: Option<&'a ObjectStore>,
+    held: impl Fn(u64) -> Option<&'a ObjectStore>,
+    names: &NameCache,
     net_commands: &NetCommands,
 ) {
     let Some(store) = store else {
@@ -313,11 +332,16 @@ pub(crate) fn member_deactivated(
     if !group.members.iter().any(|m| m.guid == guid) {
         return;
     }
+    let pet_guid = store.0.unit_pet_guid();
+    let pet = pet_guid.and_then(held);
+    let pet_name = pet_guid
+        .zip(pet)
+        .and_then(|(g, p)| names.peek_unit(g, Some(p)));
     group
         .stats
         .entry(guid)
         .or_default()
-        .snapshot_descriptor(&store.0);
+        .snapshot_descriptor(&store.0, pet.map(|p| &p.0), pet_name);
     let _ = net_commands
         .0
         .send(ClientCommand::RequestPartyMemberStats { guid });
@@ -329,6 +353,7 @@ pub(crate) fn roster_deactivated(
     group: &mut GroupState,
     index: &GuidIndex,
     stores: &Query<&mut ObjectStore>,
+    names: &NameCache,
     net_commands: &NetCommands,
 ) {
     let streamed: Vec<u64> = group
@@ -337,9 +362,9 @@ pub(crate) fn roster_deactivated(
         .map(|m| m.guid)
         .filter(|g| index.0.contains_key(g))
         .collect();
+    let held = |g: u64| index.0.get(&g).and_then(|e| stores.get(*e).ok());
     for guid in streamed {
-        let store = index.0.get(&guid).and_then(|e| stores.get(*e).ok());
-        member_deactivated(guid, group, store, net_commands);
+        member_deactivated(guid, group, held(guid), held, names, net_commands);
     }
 }
 
@@ -361,6 +386,7 @@ mod tests {
     use super::*;
     use crate::net::ClientCommand;
     use benilla_protocol::guid;
+    use benilla_protocol::messages::member_status;
 
     fn member(g: u64, name: &str) -> GroupMemberEntry {
         GroupMemberEntry {
@@ -439,6 +465,69 @@ mod tests {
         assert_eq!(names.player_traits(leader), Some((1, 4, 1)));
     }
 
+    /// The rebuild counts the rows whose name has not landed (`0x4ba9b6`-`0x4ba9d0`), ours among
+    /// them once others are listed (`0x5e6e73`), and the roster event waits for none (`0x4babdf`).
+    #[test]
+    fn a_raid_list_signals_the_roster_only_once_every_name_is_held() {
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let net = NetCommands(tx);
+        let (mut group, mut errors, mut quest) = (
+            GroupState::default(),
+            UiErrorKeys::default(),
+            QuestGiver::default(),
+        );
+        let mut names = NameCache::default();
+        let player_guid = |counter: u64| counter | (u64::from(guid::HIGH_PLAYER) << 48);
+        let (me, a, b) = (player_guid(1), player_guid(7), player_guid(8));
+        let mut raid = |group: &mut GroupState, names: &NameCache, group_type: u8| {
+            list(
+                group,
+                &mut errors,
+                &mut MessageSounds::default(),
+                &mut quest,
+                group_type,
+                0,
+                vec![member(a, "Aldwyn"), member(b, "Brisca")],
+                a,
+                None,
+                &SelfGuid(Some(me)),
+                names,
+                &GuidIndex::default(),
+                &net,
+            );
+            group.roster_updates
+        };
+
+        assert_eq!(raid(&mut group, &names, 1), 0, "no name held");
+        names.insert_player(a, "Aldwyn".into(), Some((1, 4, 1)));
+        assert_eq!(
+            raid(&mut group, &names, 1),
+            0,
+            "one member's name still to come"
+        );
+        names.insert_player(b, "Brisca".into(), Some((1, 5, 0)));
+        assert_eq!(
+            raid(&mut group, &names, 1),
+            0,
+            "our own row's name still to come"
+        );
+        names.insert_player(me, "Me".into(), None);
+        assert_eq!(raid(&mut group, &names, 1), 1, "every name held");
+        assert_eq!(raid(&mut group, &names, 1), 2, "and the same list again");
+
+        // A party's list runs no roster writer; it names nothing, and drops the raid it finds.
+        assert_eq!(
+            raid(&mut group, &NameCache::default(), 0),
+            3,
+            "the raid dropped"
+        );
+        assert_eq!(
+            raid(&mut group, &NameCache::default(), 0),
+            3,
+            "a party's list"
+        );
+    }
+
     #[test]
     fn a_join_queues_the_invite_accept_chime_and_a_resync_does_not() {
         let (tx, _rx) = crossbeam_channel::unbounded();
@@ -528,7 +617,14 @@ mod tests {
             (LEVEL, 41),
             (BYTES_0, 1 << 24), // POWER_RAGE in BYTES_0 byte 3
         ]));
-        member_deactivated(guid, &mut group, Some(&store), &net);
+        member_deactivated(
+            guid,
+            &mut group,
+            Some(&store),
+            |_| None,
+            &NameCache::default(),
+            &net,
+        );
 
         let rec = group.stats.get(&guid).expect("the member has a record");
         assert_eq!(
@@ -550,6 +646,66 @@ mod tests {
         assert_eq!(asked(&rx), vec![guid], "and the server is asked, once");
     }
 
+    /// `0x5f098d`-`0x5f09f2`: a slot is copied when its id is set and its `AURAFLAGS` nibble has an
+    /// effect bit; the pet block comes off the pet's own object (`0x5f0a1f`-`0x5f0b72`).
+    #[test]
+    fn a_members_despawn_snapshots_their_auras_and_their_pets() {
+        const AURA: u16 = 47;
+        const AURAFLAGS: u16 = 95;
+        const SUMMON: u16 = 8;
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let net = NetCommands(tx);
+        let guid = 0x1234;
+        let pet_guid = 0xF140_0000_0000_0077;
+        let mut group = grouped(&[member(guid, "Brisca")]);
+
+        let store = ObjectStore(benilla_protocol::messages::ObjectFields::from_pairs(&[
+            (AURA, 1126),     // slot 0, live (nibble 0x8)
+            (AURA + 1, 6673), // slot 1, a stale id: its nibble has no effect bit
+            (AURA + 33, 589), // slot 33, live
+            (AURAFLAGS, 0x0000_0018),
+            (AURAFLAGS + 4, 0x0000_0020),
+            (SUMMON, pet_guid as u32),
+            (SUMMON + 1, (pet_guid >> 32) as u32),
+        ]));
+        // `UNIT_FIELD_PETNUMBER`, the key the pet-name cache files a pet's name under.
+        const PETNUMBER: u16 = 139;
+        let pet = ObjectStore(benilla_protocol::messages::ObjectFields::from_pairs(&[
+            (HEALTH, 900),
+            (PETNUMBER, 4),
+            (AURA + 40, 770),
+            (AURAFLAGS + 5, 0x0000_0002),
+        ]));
+        let held = |g: u64| (g == pet_guid).then_some(&pet);
+        let mut names = NameCache::default();
+        names.insert_pet(4, "Whelp".into());
+        member_deactivated(guid, &mut group, Some(&store), held, &names, &net);
+
+        let rec = group.stats.get(&guid).expect("the member has a record");
+        assert_eq!(
+            rec.auras,
+            Some(vec![(0, 1126)]),
+            "the stale slot 1 is dropped"
+        );
+        assert_eq!(rec.auras_negative, Some(vec![(33, 589)]));
+        assert_eq!(rec.pet_guid, Some(pet_guid));
+        assert_eq!(
+            rec.pet_name.as_deref(),
+            Some("Whelp"),
+            "the pet's cached name rides into the record, as `0x5f0a63`-`0x5f0a70` copy it (`+0x88`)"
+        );
+        assert_eq!(rec.pet_cur_hp, Some(900));
+        assert_eq!(rec.pet_auras, Some(vec![]));
+        assert_eq!(rec.pet_auras_negative, Some(vec![(40, 770)]));
+
+        // The pet not held: its block is emptied, not left as it was.
+        member_deactivated(guid, &mut group, Some(&store), |_| None, &names, &net);
+        let rec = group.stats.get(&guid).unwrap();
+        assert_eq!((rec.pet_guid, rec.pet_auras_negative.clone()), (None, None));
+        assert_eq!(rec.pet_name, None, "and its name with it (`0x5f0a0f`)");
+        assert_eq!(rec.auras, Some(vec![(0, 1126)]));
+    }
+
     #[test]
     fn a_despawn_that_is_not_a_party_member_asks_nothing() {
         let (tx, rx) = crossbeam_channel::unbounded();
@@ -560,12 +716,26 @@ mod tests {
         let store = ObjectStore(benilla_protocol::messages::ObjectFields::from_pairs(&[(
             HEALTH, 40,
         )]));
-        member_deactivated(0xdead, &mut group, Some(&store), &net);
+        member_deactivated(
+            0xdead,
+            &mut group,
+            Some(&store),
+            |_| None,
+            &NameCache::default(),
+            &net,
+        );
         assert!(asked(&rx).is_empty());
         assert!(!group.stats.contains_key(&0xdead));
 
         // The object gate alone: a roster member we hold no object for asks nothing.
-        member_deactivated(0x1234, &mut group, None, &net);
+        member_deactivated(
+            0x1234,
+            &mut group,
+            None,
+            |_| None,
+            &NameCache::default(),
+            &net,
+        );
         assert!(asked(&rx).is_empty());
     }
 
@@ -641,4 +811,66 @@ mod tests {
             "and the record it already had survives the resync"
         );
     }
+
+    /// A re-sent list that moves only a member's status rewrites the online bit of the record the
+    /// member already owns (`0x4e82d0`), asks nothing, and leaves the rest of the record.
+    #[test]
+    fn a_resent_list_moves_a_known_members_online_bit_and_keeps_its_record() {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let net = NetCommands(tx);
+        let (mut group, mut errors, mut quest) = (
+            GroupState::default(),
+            UiErrorKeys::default(),
+            QuestGiver::default(),
+        );
+        let names = NameCache::default();
+        let far = 0x22u64;
+        let mut send = |group: &mut GroupState, status: u8| {
+            let row = GroupMemberEntry {
+                status,
+                ..member(far, "Brisca")
+            };
+            list(
+                group,
+                &mut errors,
+                &mut MessageSounds::default(),
+                &mut quest,
+                0,
+                0,
+                vec![row],
+                far,
+                None,
+                &SelfGuid::default(),
+                &names,
+                &GuidIndex::default(),
+                &net,
+            );
+        };
+
+        send(&mut group, member_status::ONLINE);
+        group.apply_stats(
+            far,
+            false,
+            PartyMemberStatsInfo {
+                cur_hp: Some(900),
+                pet_guid: Some(0xF140_0000_0000_0077),
+                ..PartyMemberStatsInfo::default()
+            },
+        );
+        assert!(group.stats[&far].is_online(), "seated from the row");
+        let _ = asked(&rx);
+
+        send(&mut group, member_status::OFFLINE);
+        let rec = &group.stats[&far];
+        assert!(!rec.is_online(), "the row's byte moved the record's bit");
+        assert_eq!(
+            (rec.cur_hp, rec.pet_guid),
+            (Some(900), Some(0xF140_0000_0000_0077)),
+            "and nothing else"
+        );
+        assert!(asked(&rx).is_empty(), "no stats request for a known member");
+
+        send(&mut group, member_status::ONLINE);
+        assert!(group.stats[&far].is_online());
+    }
 }
diff --git a/crates/benilla-app/src/ui_party/pets.rs b/crates/benilla-app/src/ui_party/pets.rs
new file mode 100644
index 00000000..669cab8f
--- /dev/null
+++ b/crates/benilla-app/src/ui_party/pets.rs
@@ -0,0 +1,1049 @@
+//! The group pets' unit tokens, `partypet1..4` and `raidpet1..40`: each member's pet as the
+//! per-token snapshot the `Unit*` getters read, and the `UNIT_PET` edge that tells a party frame
+//! its member's pet came, went or changed. [`super::feed`] drives it from the party feed's gate.
+//!
+//! A pet the object manager holds is an ordinary live unit. One it does not hold is answered from
+//! the owner's roster record, the way the reference's getters fall through: the live descriptor,
+//! then the member record, then the pet record (`0x496420`). `UnitExists` answers 1 for it through
+//! the roster fallback (`0x491900`), which needs no object, and `UnitLevel`, `UnitIsDead` and
+//! `UnitIsGhost` have no pet leg, so they read as they do for a unit the client knows nothing of.
+
+use bevy::ecs::system::SystemParam;
+use bevy::prelude::*;
+
+use benilla_ui::script::{ScriptValue, UiScript, UnitState};
+
+use crate::creature_type::CreatureTypeSources;
+use crate::names::NameCache;
+use crate::net::{FieldEdges, GuidIndex, NetCommands, ObjectStore};
+use crate::ui_script::gate;
+
+use super::GroupState;
+
+/// Which roster a pet token counts its owner in: the two resolve the pet's guid apart
+/// (`0x4e81d0` behind the owner's online bit, `0x491960` with none).
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub(super) enum Roster {
+    Party,
+    Raid,
+}
+
+/// The name cache with the handle that asks it, one parameter of [`super::feed::feed_party`],
+/// which sits at Bevy's 16-parameter limit: a held pet's name is asked of the server once, as any
+/// held unit's is. It derefs to the cache.
+#[derive(SystemParam)]
+pub(super) struct Names<'w> {
+    cache: Res<'w, NameCache>,
+    commands: Res<'w, NetCommands>,
+}
+
+impl std::ops::Deref for Names<'_> {
+    type Target = NameCache;
+
+    fn deref(&self) -> &NameCache {
+        &self.cache
+    }
+}
+
+/// What the pets' snapshots read: the object manager, the name cache and the creature-type
+/// resolver's sources.
+pub(super) struct Lookup<'a, 'w, 's, 'q> {
+    index: &'a GuidIndex,
+    stores: &'a Query<'w, 's, &'q ObjectStore>,
+    names: &'a NameCache,
+    commands: &'a NetCommands,
+    types: CreatureTypeSources<'a>,
+}
+
+impl<'a, 'w, 's, 'q> Lookup<'a, 'w, 's, 'q> {
+    pub(super) fn new(
+        index: &'a GuidIndex,
+        stores: &'a Query<'w, 's, &'q ObjectStore>,
+        names: &'a Names,
+        types: CreatureTypeSources<'a>,
+    ) -> Self {
+        Self {
+            index,
+            stores,
+            names: &names.cache,
+            commands: &names.commands,
+            types,
+        }
+    }
+
+    /// The held object's descriptor (`0x468460`).
+    pub(super) fn store(&self, guid: u64) -> Option<&ObjectStore> {
+        self.stores.get(*self.index.0.get(&guid)?).ok()
+    }
+}
+
+/// The guid `partypetN` or `raidpetN` names for `owner`, off its descriptor while held, else its
+/// record (see [`GroupState::party_pet_guid`], [`GroupState::raid_pet_guid`]).
+fn pet_guid(
+    group: &GroupState,
+    owner: u64,
+    held: Option<&ObjectStore>,
+    roster: Roster,
+) -> Option<u64> {
+    let live = held.map(|s| &s.0);
+    match roster {
+        Roster::Party => group.party_pet_guid(owner, live),
+        Roster::Raid => group.raid_pet_guid(owner, live),
+    }
+}
+
+/// Whether a held pet of any group member has moved, for the party feed's gate. Every member is
+/// asked as a raid row, whose record leg has no online test: a superset of the party slots'.
+pub(super) fn store_changed(
+    look: &Lookup<'_, '_, '_, '_>,
+    group: &GroupState,
+    own: Option<(u64, &ObjectStore)>,
+    changed: &Query<(), Changed<ObjectStore>>,
+) -> bool {
+    let moved = |owner: u64, held: Option<&ObjectStore>| {
+        pet_guid(group, owner, held, Roster::Raid)
+            .and_then(|pet| look.index.0.get(&pet))
+            .is_some_and(|&e| changed.get(e).is_ok())
+    };
+    group.members.iter().any(|m| moved(m.guid, look.store(m.guid)))
+        // Our own pet is a raid row's only, a party's slots being the others'.
+        || (group.group_type == super::GROUPTYPE_RAID
+            && own.is_some_and(|(guid, store)| moved(guid, Some(store))))
+}
+
+/// One pet token's inputs for a frame: the guid `UNIT_PET` keys on, and the token's own guid and
+/// snapshot. The two differ for a party slot whose owner has no object and reads offline: the
+/// record's pet guid is still what the owner's stats named, while `partypetN` names nobody
+/// (`0x4e8227`).
+#[derive(Default)]
+pub(super) struct PetNow {
+    /// The owner's pet guid as the stats handler's diff sees it ([`GroupState::pet_edge_guid`]).
+    edge: Option<u64>,
+    /// The guid the token names and the snapshot the getters read, or `None` for a member with no
+    /// pet the roster or the descriptor names ([`GroupState::party_pet_guid`],
+    /// [`GroupState::raid_pet_guid`]).
+    token: Option<(u64, UnitState)>,
+}
+
+/// One member's pet for its token and its `UNIT_PET` edge; nothing for an empty slot, `owner` 0.
+pub(super) fn member_pet(
+    look: &Lookup<'_, '_, '_, '_>,
+    group: &GroupState,
+    owner: u64,
+    held: Option<&ObjectStore>,
+    roster: Roster,
+) -> PetNow {
+    if owner == 0 {
+        return PetNow::default();
+    }
+    let edge = group.pet_edge_guid(owner, held.map(|s| &s.0));
+    let Some(guid) = pet_guid(group, owner, held, roster) else {
+        return PetNow { edge, token: None };
+    };
+    let mut state = match look.store(guid) {
+        // A held pet is a live unit like any: every getter reads its descriptor (`0x468460`), and
+        // `UnitIsConnected` answers 1 for any object (`0x517daf`), as `snapshot` does. No
+        // reaction: the pet frame reads none, as the `"pet"` token's.
+        Some(store) => {
+            let name = look
+                .names
+                .resolve_unit(guid, Some(store), look.commands)
+                .map(str::to_string);
+            crate::ui_unit::snapshot(store, guid, name, 0, None, look.types)
+        }
+        None => record_state(
+            group,
+            guid,
+            owner,
+            group.roster_names_pet(owner, held.is_some()),
+        ),
+    };
+    // Judged by guid alone, with no object needed.
+    state.raid_target = group.raid_target_index(guid);
+    PetNow {
+        edge,
+        token: Some((guid, state)),
+    }
+}
+
+/// A pet with no object, off the pet record that names it (`0x496420`); with no record, a bare
+/// snapshot that carries only the guid.
+///
+/// The getters' record leg (`UnitHealth 0x5174d0`, `UnitHealthMax 0x5175b0`, `UnitMana 0x517670`,
+/// `UnitManaMax 0x5177e0`, `UnitPowerType 0x517940`) reads the pet block's `+0xdc`, `+0xde`,
+/// `+0xe0`, `+0xe2` and `+0xd8`, the two power figures divided as a live unit's. `UnitName`
+/// (`0x5171da`) reads the block's name buffer whole, so an unnamed pet is the empty string, not
+/// `UNKNOWNOBJECT`. `UnitIsConnected` is existence-only there (`0x517dfb`). `UnitLevel`,
+/// `UnitIsDead`, `UnitIsGhost` and `UnitIsDeadOrGhost` never look at a pet record: 0, nil, nil,
+/// nil, which the snapshot's defaults are.
+///
+/// The roster names the pet's owner with no object, on the terms it answers `UnitExists`: the
+/// party half of `UnitPlayerOrPetInParty` compares guids alone (`0x4e8fa0`).
+fn record_state(group: &GroupState, guid: u64, owner: u64, exists: bool) -> UnitState {
+    let record = group.pet_record(guid);
+    UnitState {
+        exists,
+        guid,
+        owner: if exists { owner } else { 0 },
+        name: record.map(|r| r.pet_name.clone().unwrap_or_default()),
+        health: record.map_or(0, |r| u32::from(r.pet_cur_hp.unwrap_or(0))),
+        max_health: record.map_or(0, |r| u32::from(r.pet_max_hp.unwrap_or(0))),
+        power_type: record.map_or(0, |r| r.shown_pet_power_type()),
+        power: record.map_or(0, |r| r.shown_pet_power()),
+        max_power: record.map_or(0, |r| r.shown_pet_max_power()),
+        is_connected: record.is_some(),
+        ..Default::default()
+    }
+}
+
+/// What one pet token last pushed: the owner and the pet guid the edge keyed on, `UNIT_PET`'s
+/// trigger, and the snapshot, [`fire_transitions`](crate::ui_unit::fire_transitions)' per-field
+/// diff.
+#[derive(Default)]
+pub(super) struct FedPet {
+    owner: u64,
+    edge: Option<u64>,
+    state: Option<UnitState>,
+}
+
+/// Every pet token's memo: `partypet1..4` and `raidpet1..40`.
+#[derive(Default)]
+pub(super) struct FedPets {
+    pub(super) party: [FedPet; 4],
+    pub(super) raid: Vec<FedPet>,
+}
+
+/// Push one pet token's snapshot and fire what moved, in the reference's order (`0x5e5720`):
+/// `UNIT_PET` for the owner's token, then the pet's own `UNIT_*` events for its own.
+///
+/// `UNIT_PET` fires when the same owner's pet guid changes ([`PetNow::edge`]): a pet arriving,
+/// going or being replaced, off the record or the descriptor alike. The token's own guid and
+/// snapshot are not that edge, so a member going online or offline with the same pet moves the
+/// snapshot and fires no `UNIT_PET`. An owner that changes is the roster's edge
+/// (`PARTY_MEMBERS_CHANGED`), which the party frame answers by rereading, and the first look is
+/// no edge. `owner_token` is `None` where the owner's own feed fires it.
+pub(super) fn feed_token(
+    script: &mut UiScript,
+    gate: &gate::Gate,
+    edges: &FieldEdges,
+    fed: &mut FedPet,
+    token: &str,
+    owner_token: Option<&str>,
+    owner: u64,
+    now: PetNow,
+) {
+    let PetNow { edge, token: now } = now;
+    let state = now.map(|(_, state)| state);
+    let moved = owner != 0 && fed.owner == owner && fed.edge != edge;
+    let changed = fed.state != state;
+    if changed {
+        gate.audit("feed_party", "a group pet-token snapshot");
+        script.set_unit(token, state.clone());
+    }
+    if let Some(owner_token) = owner_token.filter(|_| moved) {
+        gate.audit("feed_party", "a group pet edge");
+        script.fire_event("UNIT_PET", vec![ScriptValue::Str(owner_token.to_string())]);
+    }
+    if let Some(cur) = state.as_ref().filter(|_| changed) {
+        crate::ui_unit::fire_transitions(script, token, fed.state.as_ref(), cur, edges);
+    }
+    *fed = FedPet { owner, edge, state };
+}
+
+#[cfg(test)]
+pub(in crate::ui_party) mod tests {
+    use super::*;
+    use crate::net::{FieldChanged, Guid};
+    use benilla_protocol::messages::{
+        member_status, GroupMemberEntry, ObjectFields, PartyMemberStatsInfo,
+    };
+
+    /// Unit descriptor field indices, build 5875: the pair a member's `SUMMON` holds, and a pet's
+    /// health, maximum health and pet number.
+    const SUMMON: u16 = 8;
+    const HEALTH: u16 = 22;
+    const MAXHEALTH: u16 = 28;
+    const PETNUMBER: u16 = 139;
+
+    pub(in crate::ui_party) const ME: u64 = 0x10;
+
+    /// The `i`-th party member, and its pet.
+    pub(in crate::ui_party) fn member(i: u64) -> u64 {
+        0x1000 + i
+    }
+    fn pet(i: u64) -> u64 {
+        0xF140_0000_0000_0000 + i
+    }
+
+    fn store(pairs: &[(u16, u32)]) -> ObjectStore {
+        ObjectStore(ObjectFields::from_pairs(pairs))
+    }
+
+    fn summon(guid: u64) -> [(u16, u32); 2] {
+        [(SUMMON, guid as u32), (SUMMON + 1, (guid >> 32) as u32)]
+    }
+
+    /// The frames of a group feed running [`super::super::feed::feed_party`] on a VM whose one
+    /// spy frame logs the unit events pets raise, as `"EVENT:token"`.
+    pub(in crate::ui_party) fn app_with(script: UiScript) -> App {
+        let mut app = App::new();
+        app.add_message::<FieldChanged>()
+            .init_resource::<GroupState>()
+            .init_resource::<GuidIndex>()
+            .init_resource::<NameCache>()
+            .init_resource::<crate::ui_chat::ChatLog>();
+        let (tx, rx) = crossbeam_channel::unbounded();
+        // Kept alive for the run: a dropped receiver would fail the name queries.
+        std::mem::forget(rx);
+        app.insert_resource(NetCommands(tx));
+        benilla_world::world_point::init_world_point_resources(app.world_mut());
+        script
+            .run(
+                r#"
+                SEEN = {}
+                local f = CreateFrame("Frame")
+                for _, e in ipairs({ "UNIT_PET", "UNIT_HEALTH", "UNIT_MAXHEALTH", "UNIT_MANA",
+                                     "UNIT_NAME_UPDATE" }) do
+                    f:RegisterEvent(e)
+                end
+                f:SetScript("OnEvent", function()
+                    table.insert(SEEN, event .. ":" .. tostring(arg1))
+                end)
+                "#,
+            )
+            .unwrap();
+        app.insert_non_send_resource(script);
+        app.add_systems(Update, super::super::feed::feed_party);
+        app
+    }
+
+    pub(in crate::ui_party) fn app() -> App {
+        app_with(UiScript::new().unwrap())
+    }
+
+    /// A party of `n`, each `online` on the wire and in its record, the record naming pet `i`.
+    pub(in crate::ui_party) fn party(app: &mut App, n: u64, online: bool) {
+        let status = if online {
+            member_status::ONLINE
+        } else {
+            member_status::OFFLINE
+        };
+        let list = (1..=n)
+            .map(|i| GroupMemberEntry {
+                name: format!("M{i}"),
+                guid: member(i),
+                status,
+                flags: 0,
+            })
+            .collect();
+        let mut group = app.world_mut().resource_mut::<GroupState>();
+        group.apply_list(0, 0, list, ME, None, Some(ME));
+        for i in 1..=n {
+            group.apply_stats(
+                member(i),
+                true,
+                PartyMemberStatsInfo {
+                    status: Some(status),
+                    cur_hp: Some(2000),
+                    max_hp: Some(3000),
+                    pet_guid: Some(pet(i)),
+                    pet_name: Some("Whelp".into()),
+                    pet_cur_hp: Some(400),
+                    pet_max_hp: Some(500),
+                    pet_power_type: Some(0),
+                    pet_cur_power: Some(30),
+                    pet_max_power: Some(60),
+                    ..Default::default()
+                },
+            );
+        }
+    }
+
+    /// `SMSG_GROUP_LIST` re-sent with only the members' status bytes moved: members `1..` of the
+    /// party or raid, one per status.
+    fn relist(app: &mut App, group_type: u8, statuses: &[u8]) {
+        let list = statuses
+            .iter()
+            .enumerate()
+            .map(|(i, &status)| GroupMemberEntry {
+                name: format!("M{}", i + 1),
+                guid: member(i as u64 + 1),
+                status,
+                flags: 0,
+            })
+            .collect();
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            group_type,
+            0,
+            list,
+            ME,
+            None,
+            Some(ME),
+        );
+    }
+
+    /// Hold `guid` in the object manager.
+    pub(in crate::ui_party) fn stream(app: &mut App, guid: u64, pairs: &[(u16, u32)]) -> Entity {
+        let e = app.world_mut().spawn((Guid(guid), store(pairs))).id();
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .insert(guid, e);
+        e
+    }
+
+    fn set_fields(app: &mut App, e: Entity, pairs: &[(u16, u32)]) {
+        app.world_mut()
+            .entity_mut(e)
+            .get_mut::<ObjectStore>()
+            .unwrap()
+            .0
+            .merge(ObjectFields::from_pairs(pairs));
+    }
+
+    /// Run a frame and take the pet events it fired; `UNIT_PET`, or a unit event naming a pet.
+    pub(in crate::ui_party) fn frame(app: &mut App) -> Vec<String> {
+        app.update();
+        let mut s = app.world_mut().non_send_resource_mut::<UiScript>();
+        s.resolve();
+        let seen: Vec<String> = s.eval("return SEEN").unwrap();
+        s.run("SEEN = {}").unwrap();
+        seen.into_iter()
+            .filter(|e| e.starts_with("UNIT_PET:") || e.contains("pet"))
+            .collect()
+    }
+
+    /// A number the VM answers, for the getters.
+    fn num(app: &mut App, code: &str) -> f64 {
+        app.world_mut()
+            .non_send_resource::<UiScript>()
+            .eval(&format!("return {code}"))
+            .unwrap()
+    }
+
+    /// A string or nil the VM answers.
+    fn text(app: &mut App, code: &str) -> Option<String> {
+        app.world_mut()
+            .non_send_resource::<UiScript>()
+            .eval(&format!("return {code}"))
+            .unwrap()
+    }
+
+    /// A predicate answers the number 1 or nil, never a boolean.
+    pub(in crate::ui_party) fn flag(app: &mut App, code: &str) -> Option<f64> {
+        app.world_mut()
+            .non_send_resource::<UiScript>()
+            .eval(&format!("return {code}"))
+            .unwrap()
+    }
+
+    /// A pet the object manager holds is a live unit: `UnitExists` and `UnitIsVisible` answer 1,
+    /// and the getters read its descriptor and its cached name.
+    #[test]
+    fn a_held_party_pet_reads_its_own_descriptor() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        stream(&mut app, member(1), &summon(pet(1)));
+        stream(
+            &mut app,
+            pet(1),
+            &[(HEALTH, 900), (MAXHEALTH, 1000), (PETNUMBER, 4)],
+        );
+        app.world_mut()
+            .resource_mut::<NameCache>()
+            .insert_pet(4, "Fang".into());
+        frame(&mut app);
+
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), Some(1.0));
+        assert_eq!(flag(&mut app, "UnitIsVisible('partypet1')"), Some(1.0));
+        assert_eq!(flag(&mut app, "UnitIsConnected('partypet1')"), Some(1.0));
+        assert_eq!(
+            text(&mut app, "UnitName('partypet1')").as_deref(),
+            Some("Fang")
+        );
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 900.0);
+        assert_eq!(num(&mut app, "UnitHealthMax('partypet1')"), 1000.0);
+        assert_eq!(
+            flag(&mut app, "UnitExists('partypet2')"),
+            None,
+            "no second member"
+        );
+        assert_eq!(
+            flag(&mut app, "UnitExists('party1')"),
+            Some(1.0),
+            "the member is unchanged"
+        );
+    }
+
+    /// A pet the object manager does not hold answers from its online owner's record, as the
+    /// getters fall through the party record to the pet record (`0x496420`): `UnitExists` is 1
+    /// through the roster fallback with no object, `UnitIsVisible` is nil, and `UnitLevel` has no
+    /// pet leg.
+    #[test]
+    fn an_unheld_party_pet_reads_its_online_owners_record() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        // A rage pet: the record's power is raw, and divides at the read as a live unit's does.
+        app.world_mut().resource_mut::<GroupState>().apply_stats(
+            member(1),
+            false,
+            PartyMemberStatsInfo {
+                pet_power_type: Some(1),
+                pet_cur_power: Some(570),
+                pet_max_power: Some(1000),
+                ..Default::default()
+            },
+        );
+        frame(&mut app);
+
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), Some(1.0));
+        assert_eq!(
+            flag(&mut app, "UnitIsVisible('partypet1')"),
+            None,
+            "no object"
+        );
+        assert_eq!(
+            text(&mut app, "UnitName('partypet1')").as_deref(),
+            Some("Whelp")
+        );
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 400.0);
+        assert_eq!(num(&mut app, "UnitHealthMax('partypet1')"), 500.0);
+        assert_eq!(num(&mut app, "UnitPowerType('partypet1')"), 1.0);
+        assert_eq!(num(&mut app, "UnitMana('partypet1')"), 57.0);
+        assert_eq!(num(&mut app, "UnitManaMax('partypet1')"), 100.0);
+        assert_eq!(
+            num(&mut app, "UnitLevel('partypet1')"),
+            0.0,
+            "`UnitLevel` has no pet leg"
+        );
+        assert_eq!(
+            flag(&mut app, "UnitIsConnected('partypet1')"),
+            Some(1.0),
+            "existence alone (`0x517dfb`)"
+        );
+        assert_eq!(
+            flag(&mut app, "UnitPlayerOrPetInParty('partypet1')"),
+            Some(1.0),
+            "the roster names it by guid alone (`0x4e8fa0`)"
+        );
+        for dead in ["UnitIsDead", "UnitIsGhost", "UnitIsDeadOrGhost"] {
+            assert_eq!(
+                flag(&mut app, &format!("{dead}('partypet1')")),
+                None,
+                "{dead}"
+            );
+        }
+    }
+
+    /// A pet is found only behind its owner's online bit (`0x4e8227`, `0x4e8884`): an offline
+    /// member's record names nobody.
+    #[test]
+    fn an_offline_owners_party_pet_is_nobody() {
+        let mut app = app();
+        party(&mut app, 1, false);
+        frame(&mut app);
+
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), None);
+        assert_eq!(text(&mut app, "UnitName('partypet1')"), None);
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 0.0);
+        assert_eq!(flag(&mut app, "UnitIsConnected('partypet1')"), None);
+    }
+
+    /// `PARTY_MEMBERS_CHANGED` and first sight announce nothing about pets: `UNIT_PET` fires when
+    /// the same member's pet guid moves, off the record.
+    #[test]
+    fn unit_pet_fires_with_the_owners_token_when_the_records_pet_changes() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        let first = frame(&mut app);
+        assert!(
+            !first.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "the first look is no edge: {first:?}"
+        );
+        assert!(frame(&mut app).is_empty(), "a steady frame is silent");
+
+        // A new pet.
+        app.world_mut().resource_mut::<GroupState>().apply_stats(
+            member(1),
+            false,
+            PartyMemberStatsInfo {
+                pet_guid: Some(pet(9)),
+                ..Default::default()
+            },
+        );
+        let changed = frame(&mut app);
+        assert_eq!(
+            changed.iter().filter(|e| *e == "UNIT_PET:party1").count(),
+            1,
+            "{changed:?}"
+        );
+        // Dismissed.
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .stats
+            .get_mut(&member(1))
+            .unwrap()
+            .pet_guid = None;
+        assert!(frame(&mut app).contains(&"UNIT_PET:party1".to_string()));
+        assert_eq!(
+            flag(&mut app, "UnitExists('partypet1')"),
+            None,
+            "and the token clears"
+        );
+        // Back.
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .stats
+            .get_mut(&member(1))
+            .unwrap()
+            .pet_guid = Some(pet(1));
+        assert!(frame(&mut app).contains(&"UNIT_PET:party1".to_string()));
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), Some(1.0));
+    }
+
+    /// The reported shape: a member with a pet logs off out of view, and the server sends the list
+    /// again with their status alone moved. The list rewrites the record's online bit
+    /// (`0x4e8361`-`0x4e837b`), so the pet is nobody at once (`0x4e8227`) and comes back with the
+    /// next list; no list reaches the stats diff (`0x5e5510`'s callers are `0x5e54a8` and `0x5f0c1c`), so
+    /// neither fires `UNIT_PET`.
+    #[test]
+    fn a_status_only_list_takes_an_out_of_view_members_pet_and_fires_no_unit_pet() {
+        let mut app = app();
+        party(&mut app, 2, true);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), Some(1.0));
+
+        relist(
+            &mut app,
+            0,
+            &[member_status::OFFLINE, member_status::ONLINE],
+        );
+        let offline = frame(&mut app);
+        assert!(
+            !offline.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "{offline:?}"
+        );
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), None);
+        assert_eq!(text(&mut app, "UnitName('partypet1')"), None);
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 0.0);
+        assert_eq!(
+            flag(&mut app, "UnitExists('partypet2')"),
+            Some(1.0),
+            "the member still listed online keeps theirs"
+        );
+        assert_eq!(
+            app.world().resource::<GroupState>().stats[&member(1)].pet_guid,
+            Some(pet(1)),
+            "the list keeps the rest of the record"
+        );
+
+        relist(&mut app, 0, &[member_status::ONLINE, member_status::ONLINE]);
+        let online = frame(&mut app);
+        assert!(
+            !online.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "{online:?}"
+        );
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), Some(1.0));
+        assert_eq!(
+            text(&mut app, "UnitName('partypet1')").as_deref(),
+            Some("Whelp")
+        );
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 400.0);
+    }
+
+    /// The edge is the record's own pet guid, whatever the online bit: a stats packet that moves
+    /// an offline out-of-view owner's pet guid fires `UNIT_PET` for it (`0x5e55fb`-`0x5e5617`,
+    /// `0x5e57e9`), though `partypetN` still names nobody behind the bit.
+    #[test]
+    fn unit_pet_fires_when_an_offline_owners_pet_guid_moves() {
+        let mut app = app();
+        party(&mut app, 1, false);
+        frame(&mut app);
+        assert!(frame(&mut app).is_empty(), "a steady frame is silent");
+
+        app.world_mut().resource_mut::<GroupState>().apply_stats(
+            member(1),
+            false,
+            PartyMemberStatsInfo {
+                pet_guid: Some(pet(9)),
+                ..Default::default()
+            },
+        );
+        let changed = frame(&mut app);
+        assert_eq!(
+            changed.iter().filter(|e| *e == "UNIT_PET:party1").count(),
+            1,
+            "{changed:?}"
+        );
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), None);
+
+        app.world_mut().resource_mut::<GroupState>().apply_stats(
+            member(1),
+            false,
+            PartyMemberStatsInfo {
+                pet_guid: Some(0),
+                ..Default::default()
+            },
+        );
+        assert!(
+            frame(&mut app).contains(&"UNIT_PET:party1".to_string()),
+            "the pet dismissed"
+        );
+    }
+
+    /// A raid's rows take the same list: the record's bit moves, the offline row's pet does not
+    /// exist (`0x4bb040`) and its party slot's is nobody, and no `UNIT_PET` fires for either token.
+    #[test]
+    fn a_status_only_raid_list_takes_an_offline_rows_pet_and_fires_no_unit_pet() {
+        let mut app = app();
+        party(&mut app, 2, true);
+        let (on, off) = (member_status::ONLINE, member_status::OFFLINE);
+        relist(&mut app, super::super::GROUPTYPE_RAID, &[on, on]);
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "UnitExists('raidpet2')"), Some(1.0));
+
+        relist(&mut app, super::super::GROUPTYPE_RAID, &[on, off]);
+        let offline = frame(&mut app);
+        assert!(
+            !offline.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "{offline:?}"
+        );
+        assert_eq!(flag(&mut app, "UnitExists('raidpet2')"), None);
+        assert_eq!(num(&mut app, "UnitHealth('raidpet2')"), 0.0);
+        assert_eq!(flag(&mut app, "UnitExists('partypet2')"), None);
+        assert_eq!(
+            flag(&mut app, "UnitExists('raidpet1')"),
+            Some(1.0),
+            "the row listed online keeps its pet"
+        );
+
+        relist(&mut app, super::super::GROUPTYPE_RAID, &[on, on]);
+        let online = frame(&mut app);
+        assert!(
+            !online.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "{online:?}"
+        );
+        assert_eq!(flag(&mut app, "UnitExists('raidpet2')"), Some(1.0));
+        assert_eq!(flag(&mut app, "UnitExists('partypet2')"), Some(1.0));
+    }
+
+    /// The same edge off a held member's descriptor (`SUMMON`), where no stats packet moves.
+    #[test]
+    fn unit_pet_fires_when_a_held_members_summon_changes() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        let owner = stream(&mut app, member(1), &summon(pet(1)));
+        frame(&mut app);
+
+        set_fields(&mut app, owner, &summon(pet(2)));
+        assert!(frame(&mut app).contains(&"UNIT_PET:party1".to_string()));
+        set_fields(&mut app, owner, &summon(0));
+        assert!(frame(&mut app).contains(&"UNIT_PET:party1".to_string()));
+        assert_eq!(flag(&mut app, "UnitExists('partypet1')"), None);
+    }
+
+    /// A held pet's health moving fires the unit event with the pet's own token, which its frame's
+    /// bar listens to. The pet's store is the only input that moved, so its gate input carries it.
+    #[test]
+    fn unit_health_fires_with_the_pets_token_when_its_health_changes() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        stream(&mut app, member(1), &summon(pet(1)));
+        let held = stream(&mut app, pet(1), &[(HEALTH, 900), (MAXHEALTH, 1000)]);
+        frame(&mut app);
+        assert!(frame(&mut app).is_empty(), "a steady frame is silent");
+
+        set_fields(&mut app, held, &[(HEALTH, 700)]);
+        assert_eq!(frame(&mut app), ["UNIT_HEALTH:partypet1"]);
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 700.0);
+        set_fields(&mut app, held, &[(MAXHEALTH, 1200)]);
+        assert_eq!(frame(&mut app), ["UNIT_MAXHEALTH:partypet1"]);
+    }
+
+    /// The same off the record, where a stats packet moves it.
+    #[test]
+    fn unit_health_fires_with_the_pets_token_when_the_records_pet_health_changes() {
+        let mut app = app();
+        party(&mut app, 1, true);
+        frame(&mut app);
+
+        app.world_mut().resource_mut::<GroupState>().apply_stats(
+            member(1),
+            false,
+            PartyMemberStatsInfo {
+                pet_cur_hp: Some(250),
+                ..Default::default()
+            },
+        );
+        assert_eq!(frame(&mut app), ["UNIT_HEALTH:partypet1"]);
+        assert_eq!(num(&mut app, "UnitHealth('partypet1')"), 250.0);
+    }
+
+    /// A raid's pets are its rows' (`0x491960`): the record leg has no online test at the
+    /// resolver, but `UnitExists`' roster fallback (`0x4bb040`) has one, so an offline member's
+    /// pet resolves to a guid the client never holds and does not exist.
+    #[test]
+    fn raid_pets_follow_their_rows_and_an_offline_rows_pet_does_not_exist() {
+        let mut app = app();
+        party(&mut app, 2, true);
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            super::super::GROUPTYPE_RAID,
+            0,
+            (1..=2)
+                .map(|i| GroupMemberEntry {
+                    name: format!("M{i}"),
+                    guid: member(i),
+                    status: member_status::ONLINE,
+                    flags: 0,
+                })
+                .collect(),
+            ME,
+            None,
+            Some(ME),
+        );
+        // Row 2 has gone offline.
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .stats
+            .get_mut(&member(2))
+            .unwrap()
+            .status = Some(member_status::OFFLINE);
+        let first = frame(&mut app);
+        assert!(
+            !first.iter().any(|e| e.starts_with("UNIT_PET:")),
+            "{first:?}"
+        );
+
+        assert_eq!(flag(&mut app, "UnitExists('raidpet1')"), Some(1.0));
+        assert_eq!(
+            text(&mut app, "UnitName('raidpet1')").as_deref(),
+            Some("Whelp")
+        );
+        assert_eq!(num(&mut app, "UnitHealth('raidpet1')"), 400.0);
+        assert_eq!(
+            flag(&mut app, "UnitExists('raidpet2')"),
+            None,
+            "an offline row's pet"
+        );
+        assert_eq!(num(&mut app, "UnitHealth('raidpet2')"), 0.0);
+        assert_eq!(
+            flag(&mut app, "UnitIsUnit('raidpet1', 'partypet1')"),
+            Some(1.0),
+            "a row and its party slot name one pet"
+        );
+
+        // A raid pet's arrival is announced to the row's token as well as the slot's.
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .stats
+            .get_mut(&member(1))
+            .unwrap()
+            .pet_guid = Some(pet(9));
+        let changed = frame(&mut app);
+        assert!(
+            changed.contains(&"UNIT_PET:party1".to_string()),
+            "{changed:?}"
+        );
+        assert!(
+            changed.contains(&"UNIT_PET:raid1".to_string()),
+            "{changed:?}"
+        );
+    }
+
+    /// The stock party frame, loaded whole off the player's own chain, shows a member's pet frame
+    /// once `UnitExists("partypet1")` answers (`PartyMemberFrame.lua:73`), and hides it on the
+    /// `UNIT_PET` that names the member (`PartyMemberFrame.lua:189`).
+    #[test]
+    fn the_stock_party_frame_shows_and_hides_its_pet_frame() {
+        benilla_formats::wow_data_or_skip!();
+        let mut script = UiScript::new().unwrap();
+        script.set_screen_size(1024.0, 768.0);
+        let failures = crate::ui_script::load_default_ui(&script);
+        assert!(failures.is_empty(), "load failures: {failures:?}");
+        let mut app = app_with(script);
+        assert_eq!(
+            text(&mut app, "SHOW_PARTY_PETS").as_deref(),
+            Some("1"),
+            "the stock default the pet frame gates on"
+        );
+        assert_eq!(flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"), None);
+
+        party(&mut app, 1, true);
+        frame(&mut app);
+        assert_eq!(
+            flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"),
+            Some(1.0),
+            "an online member with a pet the client does not hold"
+        );
+        assert_eq!(
+            flag(&mut app, "PartyMemberFrame2PetFrame:IsShown()"),
+            None,
+            "and no other slot's"
+        );
+        // The frame's portrait binds the token the portrait booths bake for it.
+        let mut script = app.world_mut().non_send_resource_mut::<UiScript>();
+        script.resolve();
+        let bound: Vec<String> = script
+            .extract()
+            .into_iter()
+            .filter_map(|q| match q.content {
+                benilla_ui::script::QuadContent::Texture {
+                    portrait_unit: Some(unit),
+                    ..
+                } => Some(unit),
+                _ => None,
+            })
+            .filter(|unit| unit.starts_with("partypet"))
+            .collect();
+        assert_eq!(
+            bound,
+            ["partypet1"],
+            "the pet frame draws the bake of its own token"
+        );
+
+        // The pet is dismissed: `UNIT_PET` names the member, and the frame hides.
+        app.world_mut()
+            .resource_mut::<GroupState>()
+            .stats
+            .get_mut(&member(1))
+            .unwrap()
+            .pet_guid = None;
+        frame(&mut app);
+        assert_eq!(flag(&mut app, "PartyMemberFrame1PetFrame:IsShown()"), None);
+        let errors = app.world().non_send_resource::<UiScript>().errors();
+        assert!(errors.is_empty(), "script errors: {errors:?}");
+    }
+
+    /// The resolver's inputs for the creature-type tests: Cat Form's row, and entry 69's template
+    /// a Demon (an imp), so a pet's type is told from the race's Humanoid.
+    fn seed_creature_types(app: &mut App) {
+        let mut spells = crate::ui_action::Spells::empty_for_tests();
+        spells.forms.insert(
+            CAT_FORM,
+            benilla_formats::ShapeshiftForm {
+                creature_type: 1,
+                ..Default::default()
+            },
+        );
+        app.insert_resource(spells);
+        app.world_mut().resource_mut::<NameCache>().insert_creature(
+            69,
+            Some(crate::names::CreatureRecord {
+                name: "Imp".into(),
+                subname: None,
+                creature_type: 3,
+                pet_family: 0,
+                rank: 0,
+                type_flags: 0,
+                civilian: false,
+                racial_leader: false,
+                display_id: 0,
+            }),
+        );
+    }
+
+    /// `UNIT_FIELD_BYTES_0` and `_1`, `OBJECT_FIELD_ENTRY`, a Night Elf and Cat Form.
+    const BYTES_0: u16 = 36;
+    const BYTES_1: u16 = 138;
+    const OBJECT_FIELD_ENTRY: u16 = 3;
+    const NIGHT_ELF: u32 = 4;
+    const CAT_FORM: u32 = 1;
+
+    /// `UnitCreatureType` on the party's tokens goes through the one resolver (`0x605570`): a
+    /// held member in Cat Form is a Beast and an unshifted one a Humanoid by race, a held pet
+    /// answers its template's type, and a member the object manager does not hold answers nil,
+    /// as the token resolver finds no object for it (`0x51a2b1`).
+    #[test]
+    fn party_tokens_read_the_creature_type_through_the_resolver() {
+        let mut app = app();
+        seed_creature_types(&mut app);
+        party(&mut app, 2, true);
+        let fields = |form: u32| {
+            [
+                &[(BYTES_0, NIGHT_ELF), (BYTES_1, form << 16)][..],
+                &summon(pet(1)),
+            ]
+            .concat()
+        };
+        let druid = stream(&mut app, member(1), &fields(CAT_FORM));
+        stream(&mut app, pet(1), &[(OBJECT_FIELD_ENTRY, 69)]);
+        frame(&mut app);
+
+        let creature_type =
+            |app: &mut App, token: &str| text(app, &format!("UnitCreatureType('{token}')"));
+        assert_eq!(creature_type(&mut app, "party1").as_deref(), Some("Beast"));
+        assert_eq!(
+            creature_type(&mut app, "partypet1").as_deref(),
+            Some("Demon"),
+            "the pet's template"
+        );
+        assert_eq!(
+            creature_type(&mut app, "party2"),
+            None,
+            "a member the object manager does not hold"
+        );
+
+        set_fields(&mut app, druid, &[(BYTES_1, 0)]);
+        frame(&mut app);
+        assert_eq!(
+            creature_type(&mut app, "party1").as_deref(),
+            Some("Humanoid"),
+            "out of form: the race's type"
+        );
+    }
+
+    /// The raid rows read the same resolver, our own row off our descriptor.
+    #[test]
+    fn raid_tokens_read_the_creature_type_through_the_resolver() {
+        let mut app = app();
+        seed_creature_types(&mut app);
+        party(&mut app, 1, true);
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            super::super::GROUPTYPE_RAID,
+            0,
+            vec![GroupMemberEntry {
+                name: "M1".into(),
+                guid: member(1),
+                status: member_status::ONLINE,
+                flags: 0,
+            }],
+            ME,
+            None,
+            Some(ME),
+        );
+        let me = app
+            .world_mut()
+            .spawn((
+                crate::net::SelfPlayer,
+                Guid(ME),
+                store(&[(BYTES_0, NIGHT_ELF), (BYTES_1, CAT_FORM << 16)]),
+            ))
+            .id();
+        stream(
+            &mut app,
+            member(1),
+            &[(BYTES_0, NIGHT_ELF), (BYTES_1, CAT_FORM << 16)],
+        );
+        frame(&mut app);
+
+        let creature_type =
+            |app: &mut App, token: &str| text(app, &format!("UnitCreatureType('{token}')"));
+        assert_eq!(
+            creature_type(&mut app, "raid1").as_deref(),
+            Some("Beast"),
+            "our own row"
+        );
+        assert_eq!(
+            creature_type(&mut app, "raid2").as_deref(),
+            Some("Beast"),
+            "a held member's row"
+        );
+        set_fields(&mut app, me, &[(BYTES_1, 0)]);
+        frame(&mut app);
+        assert_eq!(
+            creature_type(&mut app, "raid1").as_deref(),
+            Some("Humanoid"),
+            "out of form: our race's type"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/ui_party/records.rs b/crates/benilla-app/src/ui_party/records.rs
new file mode 100644
index 00000000..7a3ac629
--- /dev/null
+++ b/crates/benilla-app/src/ui_party/records.rs
@@ -0,0 +1,252 @@
+//! The roster records' readers for a guid the object manager does not hold: the member record
+//! (`0x496400`), the pet record (`0x496420`) and the party and raid pets' guids (`0x4e81d0`,
+//! `0x491960`).
+
+use benilla_protocol::messages::{ObjectFields, PartyMemberStatsInfo};
+
+use super::GroupState;
+
+impl GroupState {
+    /// The member record for `guid`, party or raid (`0x496400`).
+    fn member_record(&self, guid: u64) -> Option<&PartyMemberStatsInfo> {
+        self.stats.get(&guid)
+    }
+
+    /// The record whose pet block names `guid` (`0x496420`); a pet is found only while its owner's
+    /// record reads online, party (`0x4e8860`) or raid (`0x4bb130`).
+    pub(crate) fn pet_record(&self, guid: u64) -> Option<&PartyMemberStatsInfo> {
+        self.stats
+            .values()
+            .find(|r| guid != 0 && r.pet_guid == Some(guid) && r.is_online())
+    }
+
+    /// Whether the roster fallback of `UnitExists` (`0x491900`) names `member`'s pet, which the
+    /// object manager may not hold and which `partypetN` or `raidpetN` resolved to a guid: a held
+    /// member answers off its descriptor's `CHARM`/`SUMMON` (`0x4e814d`, `0x4bb022`), an unheld one
+    /// off its record's pet guid while the record reads online (`0x4e816b`, `0x4bb040`). That test
+    /// is the party pet's own online gate already, but not the raid pet's guid, which the resolver
+    /// reads off the record with none (`0x4919ae`).
+    pub(crate) fn roster_names_pet(&self, member: u64, member_held: bool) -> bool {
+        member_held
+            || self
+                .member_record(member)
+                .is_some_and(PartyMemberStatsInfo::is_online)
+    }
+
+    /// `partypetN`'s guid for the member `member` (`0x4e81d0`): `CHARM`, else `SUMMON`, off the
+    /// member's descriptor while it is held (`0x4e8204`-`0x4e821a`), else the record's pet guid
+    /// while the record reads online (`0x4e8227`-`0x4e8236`).
+    pub(crate) fn party_pet_guid(&self, member: u64, live: Option<&ObjectFields>) -> Option<u64> {
+        self.pet_guid_of(member, live, true)
+    }
+
+    /// `raidpetN`'s guid for the raid member `member` (`0x491960`): `CHARM`, else `SUMMON`, off the
+    /// member's descriptor while it is held (`0x491993`-`0x4919a9`), else the record's pet guid
+    /// with no online test (`0x4919ae`), where `partypetN` has one.
+    pub(crate) fn raid_pet_guid(&self, member: u64, live: Option<&ObjectFields>) -> Option<u64> {
+        self.pet_guid_of(member, live, false)
+    }
+
+    /// The guid `UNIT_PET` for the owner `member` keys on, party or raid: `CHARM`, else `SUMMON`, off
+    /// the member's descriptor while it is held, else the record's pet guid, with no online test.
+    /// The stats handler's diff fires it on a moved pet guid (`0x5e55fb`-`0x5e5617`, `0x5e57e9`); a
+    /// moved status byte sets another bit (`0x5e5519`-`0x5e552a`), which is health and power events,
+    /// and the list's own write of the online bit fires nothing (`0x4e8361`). A `partypetN` that
+    /// appears or vanishes behind the bit is therefore no move of this guid.
+    pub(crate) fn pet_edge_guid(&self, member: u64, live: Option<&ObjectFields>) -> Option<u64> {
+        self.pet_guid_of(member, live, false)
+    }
+
+    fn pet_guid_of(
+        &self,
+        member: u64,
+        live: Option<&ObjectFields>,
+        online_only: bool,
+    ) -> Option<u64> {
+        match live {
+            Some(fields) => fields.unit_pet_guid(),
+            None => self
+                .member_record(member)
+                .filter(|r| !online_only || r.is_online())
+                .and_then(|r| r.pet_guid)
+                .filter(|&g| g != 0),
+        }
+    }
+
+    /// The aura slots `UnitBuff` and `UnitDebuff` walk for a guid with no live object
+    /// (`0x519735`, `0x519b25`), ascending, buffs then debuffs: a member record's block (`+0x1a`)
+    /// unless it reads offline, which answers nothing and never tries the pet records
+    /// (`0x519741`); on a miss, the block of the pet record naming the guid (`+0xe4`, `0x519760`).
+    pub(crate) fn roster_aura_slots(&self, guid: u64) -> impl Iterator<Item = (u8, u16)> + '_ {
+        let blocks = match self.member_record(guid) {
+            Some(r) if !r.is_online() => None,
+            Some(r) => Some((&r.auras, &r.auras_negative)),
+            None => self
+                .pet_record(guid)
+                .map(|r| (&r.pet_auras, &r.pet_auras_negative)),
+        };
+        blocks
+            .into_iter()
+            .flat_map(|(buffs, debuffs)| buffs.iter().chain(debuffs).flatten().copied())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use benilla_protocol::messages::{member_status, GroupMemberEntry};
+
+    const MEMBER: u64 = 0x1234;
+    const PET: u64 = 0xF140_0000_0000_0077;
+
+    fn group_with(record: PartyMemberStatsInfo) -> GroupState {
+        let mut g = GroupState::default();
+        g.apply_list(
+            0,
+            0,
+            vec![GroupMemberEntry {
+                name: "Brisca".into(),
+                guid: MEMBER,
+                status: member_status::ONLINE,
+                flags: 0,
+            }],
+            MEMBER,
+            None,
+            None,
+        );
+        g.stats.insert(MEMBER, record);
+        g
+    }
+
+    fn record(status: u8) -> PartyMemberStatsInfo {
+        PartyMemberStatsInfo {
+            status: Some(status),
+            auras: Some(vec![(0, 1126), (4, 21562)]),
+            auras_negative: Some(vec![(32, 589)]),
+            pet_guid: Some(PET),
+            pet_auras: Some(vec![(2, 1126)]),
+            pet_auras_negative: Some(vec![(40, 770)]),
+            ..PartyMemberStatsInfo::default()
+        }
+    }
+
+    #[test]
+    fn a_member_record_answers_its_own_block_and_an_offline_one_answers_nothing() {
+        let g = group_with(record(member_status::ONLINE));
+        let slots = |g: &GroupState, guid| g.roster_aura_slots(guid).collect::<Vec<_>>();
+        assert_eq!(
+            slots(&g, MEMBER),
+            [(0, 1126), (4, 21562), (32, 589)],
+            "buffs then debuffs, ascending slot"
+        );
+        assert_eq!(slots(&g, PET), [(2, 1126), (40, 770)]);
+        assert!(slots(&g, 0x9999).is_empty(), "a miss everywhere");
+
+        let g = group_with(record(member_status::OFFLINE));
+        assert!(slots(&g, MEMBER).is_empty());
+        assert!(
+            slots(&g, PET).is_empty(),
+            "an offline owner's pet is not found"
+        );
+    }
+
+    /// `0x4e82d0` copies the saved record back and then sets or clears bit 0 of its status byte
+    /// from the row's (`0x4e8361`-`0x4e837b`); the raid roster's twin does the same to its row's
+    /// record (`0x4ba947`-`0x4ba960`). Both test the row's byte as non-zero.
+    #[test]
+    fn a_list_rewrites_a_known_members_online_bit_and_keeps_the_rest_of_the_record() {
+        use crate::ui_party::GROUPTYPE_RAID;
+        for group_type in [0, GROUPTYPE_RAID] {
+            let mut g = group_with(record(
+                member_status::ONLINE | member_status::DEAD | member_status::PVP,
+            ));
+            let relist = |g: &mut GroupState, status: u8| {
+                let row = |guid, name: &str| GroupMemberEntry {
+                    name: name.into(),
+                    guid,
+                    status,
+                    flags: 0,
+                };
+                g.apply_list(
+                    group_type,
+                    0,
+                    vec![row(MEMBER, "Brisca"), row(0x5678, "Aldwyn")],
+                    MEMBER,
+                    None,
+                    None,
+                );
+            };
+
+            relist(&mut g, member_status::OFFLINE);
+            assert_eq!(
+                g.stats[&MEMBER],
+                record(member_status::DEAD | member_status::PVP),
+                "the bit clears and the rest of the record stays as it was"
+            );
+            assert!(g.roster_aura_slots(MEMBER).next().is_none());
+            assert_eq!(g.party_pet_guid(MEMBER, None), None);
+
+            relist(&mut g, member_status::ONLINE | member_status::AFK);
+            assert_eq!(
+                g.stats[&MEMBER],
+                record(member_status::ONLINE | member_status::DEAD | member_status::PVP),
+                "the bit sets, and the row's other bits are not copied"
+            );
+            assert_eq!(g.party_pet_guid(MEMBER, None), Some(PET));
+
+            relist(&mut g, member_status::AFK);
+            assert!(
+                g.stats[&MEMBER].is_online(),
+                "a non-zero byte is online, bit 0 or not"
+            );
+            assert!(
+                !g.stats.contains_key(&0x5678),
+                "a member new to the roster gets its record from the seat, not here"
+            );
+        }
+    }
+
+    #[test]
+    fn the_party_pet_guid_is_the_live_charm_then_summon_else_the_records() {
+        let g = group_with(record(member_status::ONLINE));
+        assert_eq!(g.party_pet_guid(MEMBER, None), Some(PET));
+
+        let summon = ObjectFields::from_pairs(&[(8, 0x55), (9, 0)]);
+        assert_eq!(g.party_pet_guid(MEMBER, Some(&summon)), Some(0x55));
+        let both = ObjectFields::from_pairs(&[(6, 0x66), (7, 0), (8, 0x55), (9, 0)]);
+        assert_eq!(
+            g.party_pet_guid(MEMBER, Some(&both)),
+            Some(0x66),
+            "CHARM first"
+        );
+        // A held member with neither is petless, whatever the record says.
+        assert_eq!(
+            g.party_pet_guid(MEMBER, Some(&ObjectFields::default())),
+            None
+        );
+
+        let g = group_with(record(member_status::OFFLINE));
+        assert_eq!(g.party_pet_guid(MEMBER, None), None);
+    }
+
+    /// `raidpetN` reads the same fields as `partypetN`, but its record leg has no online test
+    /// (`0x4919ae`, against `partypetN`'s `0x4e8227`).
+    #[test]
+    fn the_raid_pet_guid_reads_the_record_whatever_its_online_bit() {
+        let g = group_with(record(member_status::ONLINE));
+        assert_eq!(g.raid_pet_guid(MEMBER, None), Some(PET));
+        let summon = ObjectFields::from_pairs(&[(8, 0x55), (9, 0)]);
+        assert_eq!(g.raid_pet_guid(MEMBER, Some(&summon)), Some(0x55));
+        assert_eq!(
+            g.raid_pet_guid(MEMBER, Some(&ObjectFields::default())),
+            None
+        );
+
+        let g = group_with(record(member_status::OFFLINE));
+        assert_eq!(g.raid_pet_guid(MEMBER, None), Some(PET));
+        assert!(
+            g.roster_aura_slots(PET).next().is_none(),
+            "named, but the pet record is not found behind an offline owner"
+        );
+    }
+}
diff --git a/crates/benilla-app/src/ui_pass.rs b/crates/benilla-app/src/ui_pass.rs
index 2b0be66c..902b347c 100644
--- a/crates/benilla-app/src/ui_pass.rs
+++ b/crates/benilla-app/src/ui_pass.rs
@@ -734,12 +734,8 @@ fn rebuild_ui_mesh(
     mut pools: Local<BatchPools>,
     white: Option<Res<UiWhiteTexture>>,
     windows: Query<&Window, With<PrimaryWindow>>,
-    // The hide binding and the cost meter's pair, bundled under clippy's argument ceiling.
-    mut hide_and_meter: (
-        Res<crate::ui_hide::UiHidden>,
-        ResMut<UiMeshCost>,
-        Res<crate::ui_script::UiCostWanted>,
-    ),
+    mut mesh_cost: ResMut<UiMeshCost>,
+    cost_wanted: Res<crate::ui_script::UiCostWanted>,
 ) {
     // Forget the materials of removed images first, before any early return, since a missed read
     // leaks: a cached material holds a strong image handle and, prepared, its GPU texture.
@@ -756,11 +752,9 @@ fn rebuild_ui_mesh(
     if !retired.is_empty() {
         pools.materials.retain(|key, _| !retired.contains(&key.0));
     }
-    let (hidden, mesh_cost, cost_wanted) =
-        (&hide_and_meter.0, &mut hide_and_meter.1, &hide_and_meter.2);
     // The meter is off unless asked (the hover recorder, `WOW_UI_COST=1`): one bool test.
     let cost_on = cost_wanted.0 || crate::ui_script::extract::ui_cost_enabled();
-    **mesh_cost = UiMeshCost::default();
+    *mesh_cost = UiMeshCost::default();
     let t_rebuild = cost_on.then(std::time::Instant::now);
     let mut t_mark = t_rebuild;
     let mut lap = move || -> u128 {
@@ -773,22 +767,7 @@ fn rebuild_ui_mesh(
     };
     let (meshes, materials) = (&mut stores.0, &mut stores.1);
     let q = quads.as_mut();
-    // TOGGLEUI hides at the draw, not the producers: both lanes keep filling, so the UI returns as
-    // it was ([`crate::ui_hide::UiHidden`]). The world is in neither lane (it is this camera's
-    // first draw), so retiring every batch leaves the world. While dark, the change flag is still
-    // swallowed and the append-lane mirror kept current, so neither lane reports a stale
-    // "unchanged" on return. The edge is `UiHidden`'s own change tick.
-    if hidden.is_changed() {
-        q.dirty = true;
-    }
-    let lanes_hidden = hidden.0;
-    if lanes_hidden {
-        q.last_overlays.clone_from(&q.overlays);
-        // Nothing moves a pixel while dark, so only the toggle edge rebuilds.
-        if !q.dirty {
-            return;
-        }
-    } else if !q.dirty && q.overlays == q.last_overlays {
+    if !q.dirty && q.overlays == q.last_overlays {
         return;
     }
     // `WOW_UI_DIFF=1`: names what re-triggered the rebuild, the base lane's dirty flag or the
@@ -832,7 +811,7 @@ fn rebuild_ui_mesh(
         retire_batches(&mut pools, &mut commands);
         return;
     };
-    let lanes_empty = lanes_hidden || (q.quads.is_empty() && q.overlays.is_empty());
+    let lanes_empty = q.quads.is_empty() && q.overlays.is_empty();
     if lanes_empty {
         retire_batches(&mut pools, &mut commands);
         q.dirty = false;
@@ -846,11 +825,7 @@ fn rebuild_ui_mesh(
     let to_world = move |p: Vec2| Vec2::new(p.x - half_w, half_h - p.y);
 
     // Stable, so equal keys keep producer order, the base lane before the append lane.
-    let mut sorted: Vec<&UiQuad> = if lanes_hidden {
-        Vec::new()
-    } else {
-        q.quads.iter().chain(q.overlays.iter()).collect()
-    };
+    let mut sorted: Vec<&UiQuad> = q.quads.iter().chain(q.overlays.iter()).collect();
     sorted.sort_by_key(|q| q.z_key);
     let n_sorted = sorted.len();
     let us_sort = lap();
@@ -1158,7 +1133,7 @@ fn rebuild_ui_mesh(
     pools.offsets.truncate(used);
     if cost_on {
         let us_write = lap();
-        **mesh_cost = UiMeshCost {
+        *mesh_cost = UiMeshCost {
             rebuilt: true,
             total: t_rebuild.map_or(0, |t| t.elapsed().as_micros()),
             sort: us_sort,
@@ -1186,7 +1161,6 @@ mod tests {
             .init_resource::<UiQuads>()
             .init_resource::<UiMeshCost>()
             .init_resource::<crate::ui_script::UiCostWanted>()
-            .init_resource::<crate::ui_hide::UiHidden>()
             .insert_resource(UiWhiteTexture(Handle::default()))
             .add_systems(Update, rebuild_ui_mesh);
         app.world_mut().spawn((Window::default(), PrimaryWindow));
@@ -1225,35 +1199,6 @@ mod tests {
             .count()
     }
 
-    fn set_hidden(app: &mut App, hidden: bool) {
-        app.world_mut().resource_mut::<crate::ui_hide::UiHidden>().0 = hidden;
-    }
-
-    /// Un-hiding brings back the same content, though neither lane changed while dark and the
-    /// rebuild would otherwise take its early-out.
-    #[test]
-    fn toggleui_retires_the_batches_and_restores_them() {
-        let mut app = rebuild_app();
-        app.update();
-        assert_eq!(batches(&mut app), 1, "one batch drawn to begin with");
-
-        set_hidden(&mut app, true);
-        app.update();
-        assert_eq!(batches(&mut app), 0, "hidden ⇒ nothing drawn");
-        // A flagged frame while dark still takes the dark path.
-        app.world_mut().resource_mut::<UiQuads>().dirty = true;
-        app.update();
-        assert_eq!(batches(&mut app), 0, "hidden stays hidden");
-
-        set_hidden(&mut app, false);
-        app.update();
-        assert_eq!(
-            batches(&mut app),
-            1,
-            "the UI comes back on the same content"
-        );
-    }
-
     /// The cache's strong handle would otherwise pin the image and its GPU texture for good.
     #[test]
     fn a_removed_image_does_not_keep_its_material_alive() {
@@ -1320,32 +1265,6 @@ mod tests {
             .any(|(_, m)| m.texture.as_ref().is_some_and(|t| t.id() == id))
     }
 
-    /// The world is the UI camera's first draw (`benilla_world::ffx_glow::FfxBackdrop`), not a
-    /// batch, so dark leaves the world and nothing else; a batch alive while dark is a bug.
-    #[test]
-    fn toggleui_retires_every_batch_and_the_world_is_none_of_them() {
-        let mut app = rebuild_app();
-        app.update();
-        let lit = batches(&mut app);
-        assert!(lit >= 1, "content drawn to begin with");
-
-        set_hidden(&mut app, true);
-        app.update();
-        assert_eq!(
-            batches(&mut app),
-            0,
-            "dark ⇒ nothing drawn: the world is this camera's own pass, not a batch"
-        );
-
-        set_hidden(&mut app, false);
-        app.update();
-        assert_eq!(
-            batches(&mut app),
-            lit,
-            "the UI comes back over the same world"
-        );
-    }
-
     /// The greyscale is a per-material uniform: merged, the first quad would decide both (a talent
     /// tree greying in blocks).
     #[test]
diff --git a/crates/benilla-app/src/ui_pet/bar.rs b/crates/benilla-app/src/ui_pet/bar.rs
index b7ca095c..89a5a9d4 100644
--- a/crates/benilla-app/src/ui_pet/bar.rs
+++ b/crates/benilla-app/src/ui_pet/bar.rs
@@ -11,25 +11,19 @@ use benilla_protocol::messages::{
 };
 use benilla_ui::script::{PetActionView, UiScript};
 
-use crate::net::{GuidIndex, ObjectStore};
+use crate::net::ObjectStore;
+use crate::target::UNIT_FLAG_POSSESSED;
 use crate::ui_action::Spells;
 
-use super::drain::UNIT_FLAG_POSSESSED;
-use super::PetBar;
-
-/// `GetPetActionsUsable()` (`0x4bcf70`): false while the state's bit 27 is set or the pet is
-/// stunned, confused or fleeing. Its other four steps test ownership, which a held bar implies.
-pub(super) fn actions_usable(bar: &PetBar, pet_flags: Option<u32>) -> bool {
-    !bar.spells.bar_disabled()
-        && pet_flags.is_none_or(|f| f & benilla_protocol::messages::PET_UNUSABLE_UNIT_FLAGS == 0)
-}
+use super::{PetBar, PetUnit};
 
 /// What the feed last pushed, so `PET_BAR_UPDATE` fires on a change; the key's leading `u32` is
 /// [`PetBar::bar_signals`], so a press that changes nothing still repaints.
 #[derive(Default)]
 pub(super) struct PetBarMemory {
     pushed: Option<(u32, bool, bool, bool, Vec<PetActionView>)>,
-    /// The ten cooldown triples as last pushed: `PET_BAR_UPDATE_COOLDOWN`'s edge.
+    /// The ten cooldown triples as last pushed, so a cooldown alone is pushed with no event: its
+    /// events are [`fire_pet_cooldown_events`]'s.
     cooldowns: Vec<Option<(i64, u32, bool)>>,
 }
 
@@ -173,15 +167,15 @@ pub(super) fn active_aura_press(
     crate::ui_action::toggle::active_action_toggle(spell_id, spell?, pet?).then_some(spell_id)
 }
 
-/// Push the ten slot views on a change: `PET_BAR_UPDATE`, or `PET_BAR_UPDATE_COOLDOWN` when only
-/// cooldowns moved, the reference's fire from the pet's cooldown bank (`0x6e2e8e`).
+/// Push the ten slot views on a change, and `PET_BAR_UPDATE` when the bar itself moved. A change
+/// of the cooldowns alone is pushed without an event: the pet's cooldown events fire off the
+/// list's generation, so a natural expiry fires none, as in the reference.
 pub(super) fn feed_pet_bar(
     script: Option<NonSendMut<UiScript>>,
     bar: Res<PetBar>,
     spells: Option<Res<Spells>>,
     clock: Res<crate::ui_script::UiClock>,
-    index: Res<GuidIndex>,
-    stores: Query<&ObjectStore>,
+    pet: PetUnit,
     mut memory: Local<crate::ui_script::VmMemo<PetBarMemory>>,
 ) {
     let Some(mut script) = script else {
@@ -191,17 +185,20 @@ pub(super) fn feed_pet_bar(
     let now = Instant::now();
     let (anchor, ui_now) = (clock.anchor, clock.ui_now);
     let has_bar = bar.has_bar();
-    // An unstreamed pet leaves usability to bit 27 alone, and no slot shows active.
-    let pet_store = index
-        .0
-        .get(&bar.spells.pet_guid)
-        .and_then(|&e| stores.get(e).ok());
+    // An unstreamed pet is not usable (`0x4bd034`), and no slot shows active.
+    let pet_store = pet.store(bar.spells.pet_guid);
     let pet_flags = pet_store.map(|s| s.0.unit_flags());
-    let usable = actions_usable(&bar, pet_flags);
-    // `PickupPetAction`'s gate alone (`0x4be1c1`): a possessed unit's bar cannot be rearranged,
-    // but its buttons work, so possession stays out of `usable`.
-    let pickup_allowed = pet_flags.unwrap_or(0) & UNIT_FLAG_POSSESSED == 0;
+    let usable = pet.actions_usable(&bar);
+    // `PickupPetAction`'s gate alone: the pet's object must resolve (`0x4be1f7`) and not be
+    // possessed (`0x4be20a`). A possessed unit's bar cannot be rearranged but its buttons work,
+    // so possession stays out of `usable`; an unstreamed pet has no flags to test and lifts nothing.
+    let pickup_allowed = pet_flags.is_some_and(|flags| flags & UNIT_FLAG_POSSESSED == 0);
     let pet_attacking = bar.attacking;
+    // `GetPetTimeRemaining`'s expiry on the VM clock, signed both ways around the anchor sample.
+    script.set_pet_expiry(bar.expires.map(|t| match t.checked_duration_since(anchor) {
+        Some(ahead) => ui_now + ahead.as_secs_f64(),
+        None => ui_now - anchor.duration_since(t).as_secs_f64(),
+    }));
 
     let fresh: Vec<PetActionView> = if has_bar {
         bar.spells
@@ -232,7 +229,7 @@ pub(super) fn feed_pet_bar(
     };
 
     // `bar_signals` in the key repaints a press that moved nothing (`0x4bc940`/`0x4bc960`); the
-    // cooldown triples are keyed apart, their edge being the bank's.
+    // cooldown triples are keyed apart, since they carry no `PET_BAR_UPDATE`.
     let cooldowns: Vec<Option<(i64, u32, bool)>> = fresh.iter().map(|s| s.cooldown).collect();
     let content: Vec<PetActionView> = fresh
         .iter()
@@ -259,7 +256,35 @@ pub(super) fn feed_pet_bar(
         );
         memory.pushed = Some(key);
         script.fire_event("PET_BAR_UPDATE", vec![]);
-    } else if cooldowns_changed {
-        script.fire_event("PET_BAR_UPDATE_COOLDOWN", vec![]);
     }
 }
+
+/// The flush behind every mutation of the pet's cooldown list: `0x4b31b0` fires
+/// `ACTIONBAR_UPDATE_COOLDOWN` (`0x4e5c60`, event `0xd8`) then `SPELL_UPDATE_COOLDOWN` (`0x106`),
+/// and `0x4bce90` fires `PET_BAR_UPDATE_COOLDOWN` (`0x162`). Its callers are the pet's
+/// `SMSG_SPELL_GO` leg (`0x6e85fc`), `StartGlobalCooldown` for the list (`0x6e2e77`, `0x6e2e8e`),
+/// `SMSG_SPELL_COOLDOWN` for the pet's guid (`0x6e95b0`, `0x6e95b9`), `SMSG_COOLDOWN_EVENT` and
+/// `SMSG_CLEAR_COOLDOWN` (`0x6e3071`, `0x6e3080`) and `SMSG_COOLDOWN_CHEAT` (`0x6e9712`,
+/// `0x6e971c`); each is a change of [`Cooldowns::generation`](crate::spell::Cooldowns), and one
+/// frame's changes fire it once. `SMSG_PET_SPELLS` seeds without it, so the events never fire for
+/// a rebuild. Runs after [`CooldownEvents`](crate::ui_action::CooldownEvents): every feed that
+/// pushes a pet cooldown, the bar's and the book's, has pushed by then, so the handlers read the
+/// new list.
+pub(super) fn fire_pet_cooldown_events(
+    script: Option<NonSendMut<UiScript>>,
+    bar: Res<PetBar>,
+    mut memory: Local<crate::ui_script::VmMemo<crate::ui_script::gate::Watch>>,
+) {
+    let Some(mut script) = script else {
+        return;
+    };
+    // A new VM starts from the list as it stands: the reference flushes on a mutation, not at load.
+    let (watch, fresh) = memory.get_reset(&script);
+    let moved = watch.moved(bar.cooldowns.generation);
+    if !moved || fresh {
+        return;
+    }
+    script.fire_event("ACTIONBAR_UPDATE_COOLDOWN", vec![]);
+    script.fire_event("SPELL_UPDATE_COOLDOWN", vec![]);
+    script.fire_event("PET_BAR_UPDATE_COOLDOWN", vec![]);
+}
diff --git a/crates/benilla-app/src/ui_pet/drain.rs b/crates/benilla-app/src/ui_pet/drain.rs
index d5b8edcc..33fbbb23 100644
--- a/crates/benilla-app/src/ui_pet/drain.rs
+++ b/crates/benilla-app/src/ui_pet/drain.rs
@@ -3,6 +3,8 @@
 //! (`PetHandler.cpp:203-300`), and sends `SMSG_PET_MODE` only from `Pet::SetEnabled`
 //! (`Pet.cpp:2362-2377`), so the client applies them itself until the next `SMSG_PET_SPELLS`.
 
+use std::time::Instant;
+
 use bevy::prelude::*;
 
 use benilla_protocol::messages::{
@@ -11,91 +13,112 @@ use benilla_protocol::messages::{
 use benilla_ui::script::UiScript;
 
 use crate::net::{ClientCommand, NetCommands, ObjectStore};
-use crate::target::Selection;
+use crate::target::{is_possessed_by, Selection};
 use crate::ui_action::Spells;
 
 use super::bar::active_aura_press;
 use super::{PetBar, PetUnit};
 
-/// `UNIT_FLAG_POSSESSED`, `UNIT_FIELD_FLAGS` bit 24 (vmangos `UnitDefines.h:569`), which the
-/// reference reads as `[[pet+0x110]+0xA3] & 1`.
-pub(super) const UNIT_FLAG_POSSESSED: u32 = 0x0100_0000;
+/// What a pet bar press reads and writes: `CastPetAction`, `PetAttack` and the other orders, and
+/// the pet book's `CastSpell(id, "pet")`.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct PetPress<'w, 's> {
+    pub(crate) bar: ResMut<'w, PetBar>,
+    pub(crate) selection: ResMut<'w, Selection>,
+    pub(crate) commands: Res<'w, NetCommands>,
+    pub(crate) pet: PetUnit<'w, 's>,
+    pub(crate) spells: Option<Res<'w, Spells>>,
+    /// The talent modifiers the pet GCD's op 21 goes through: the player's tables, which gate on
+    /// the spell's family and never on the caster (`0x6e6b30`).
+    spell_mods: Res<'w, crate::spell::SpellModifiers>,
+    ui_errors: ResMut<'w, crate::ui_action::UiErrorKeys>,
+    pick: crate::target::AttackPick<'w, 's>,
+    seam: crate::creature_anim::AttackSeam<'w, 's>,
+}
 
-/// Send the bar's intents under [`PetBar`]'s pet guid, never one from the VM, so an intent queued
-/// as the pet leaves dies here. `CMSG_PET_ACTION` echoes the slot's word, which the server
-/// dispatches on its type, with our selection as the target; `HandlePetAction` drops a target
-/// the spell does not want.
-pub(super) fn drain_pet_actions(
-    script: Option<NonSendMut<UiScript>>,
-    mut bar: ResMut<PetBar>,
-    mut selection: ResMut<Selection>,
-    commands: Res<NetCommands>,
-    pet: PetUnit,
-    spells: Option<Res<Spells>>,
-    mut ui_errors: ResMut<crate::ui_action::UiErrorKeys>,
-    scan: crate::target::TargetScan,
-    mut seam: crate::creature_anim::AttackSeam,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    let pressed = script.take_pet_actions();
-    let orders = script.take_pet_orders();
-    let toggles = script.take_pet_autocast_toggles();
-    let stops = script.take_pet_stop_attacks();
-    let writes = script.take_pet_set_actions();
-    if pressed.is_empty()
-        && orders.is_empty()
-        && toggles.is_empty()
-        && stops == 0
-        && writes.is_empty()
-    {
-        return;
+impl PetPress<'_, '_> {
+    /// `CastPetAction(slot)`, a 1-based bar slot.
+    pub(crate) fn press_slot(&mut self, slot: u32) {
+        if let Some(entry) = slot_entry(&self.bar, slot) {
+            self.press(slot, entry);
+        }
     }
-    let pet_guid = bar.spells.pet_guid;
-    if pet_guid == 0 {
-        debug!("ui_pet: dropping queued pet intents — the bar is gone");
-        return;
-    }
-    let pet_store = pet.store(pet_guid);
-    let possessing = possessing(pet_store, pet.self_guid.0);
 
-    // A slot press and a scripted order (`PetAttack` and the like) are one press: both reach the
-    // reference's one dispatcher (`0x4bd1d0`). The slot number only labels logs.
-    let presses: Vec<(u32, PetActionEntry)> = pressed
-        .into_iter()
-        .filter_map(|slot| slot_entry(&bar, slot).map(|e| (slot, e)))
-        .chain(
-            orders
-                .into_iter()
-                .map(|packed| (0, PetActionEntry::from(packed))),
-        )
-        .collect();
-    for (slot, entry) in presses {
+    /// The guid the pet book's `CastSpell(id, "pet", onSelf)` aims at: the selection, or with
+    /// `onSelf` the active player (`0x4b4345`). A zero guid falls back to the selection
+    /// (`0x4b34af`), so a missing player leaves it.
+    pub(crate) fn spell_target(&self, on_self: bool) -> u64 {
+        let caster = if on_self { self.pet.self_guid.0 } else { None };
+        caster.or(self.selection.guid).unwrap_or(0)
+    }
+
+    /// `PetAttack` and the other one-shot orders, as their slot's packed word. A slot press and
+    /// an order are one press: both reach the reference's one dispatcher (`0x4bd1d0`). The slot
+    /// number only labels logs.
+    pub(crate) fn order(&mut self, packed: u32) {
+        self.press(0, PetActionEntry::from(packed));
+    }
+
+    /// Send under [`PetBar`]'s pet guid, never one from the VM, so a press queued as the pet
+    /// leaves dies here. `CMSG_PET_ACTION` echoes the slot's word, which the server dispatches on
+    /// its type, with our selection as the target; `HandlePetAction` drops a target the spell
+    /// does not want. The dispatcher's first act is the usability predicate (`0x4bd1f2`), and a
+    /// zero answer leaves for the epilogue (`0x4bd1f9`) ahead of everything below it.
+    fn press(&mut self, slot: u32, entry: PetActionEntry) {
+        let Self {
+            bar,
+            selection,
+            commands,
+            pet,
+            spells,
+            spell_mods,
+            ui_errors,
+            pick,
+            seam,
+        } = self;
+        let Some(pet_store) = pet.usable_pet(bar) else {
+            debug!("ui_pet: slot {slot} refused, the pet's actions are not usable — no packet");
+            return;
+        };
+        let pet_guid = bar.spells.pet_guid;
+        let possessing = possessing(Some(pet_store), pet.self_guid.0);
         // A press on a spell the pet is running cancels its aura and sends no `CMSG_PET_ACTION`
         // (`0x4bd240`-`0x4bd2ad`); nothing latches, the icon follows the pet's aura field.
         let display = entry
             .is_spell()
             .then(|| spells.as_ref().and_then(|s| s.catalog.get(entry.action())))
             .flatten();
-        if let Some(spell_id) = active_aura_press(entry, pet_store, display) {
+        if let Some(spell_id) = active_aura_press(entry, Some(pet_store), display) {
             debug!("ui_pet: slot {slot} cancels its own aura (spell {spell_id}) — no PetAction");
             let _ = commands
                 .0
                 .send(ClientCommand::PetCancelAura { pet_guid, spell_id });
-            continue;
+            return;
         }
+        // The spell arm leaves for the epilogue, before its GCD and its send, unless the slot's
+        // `Spell.dbc` record resolves (`0x4bd2e7`-`0x4bd2fe`); an id past the table's maximum has
+        // none. Its lookups of the active player and the pet (`0x4bd31a`-`0x4bd324`,
+        // `0x4bd346`-`0x4bd34f`) repeat the predicate's, on the same guids and typemasks, and
+        // cannot fail past it. Commands and reactions have no exit of their own (`0x4bd391`,
+        // `0x4bd3a3`).
+        let spell = if entry.is_spell() {
+            let Some(spell) = display else {
+                debug!(
+                    "ui_pet: slot {slot} (spell {}) has no record — no packet",
+                    entry.action()
+                );
+                return;
+            };
+            Some(spell)
+        } else {
+            None
+        };
         // Only Attack runs `0x612df0`, the attack validator with the pet as actor, whose target
         // pick can move the selection; every other press sends the selection as is (`0x4bd212`).
         let mut target_guid = selection.guid.unwrap_or(0);
         let refused = if is_attack_order(entry) {
-            crate::ui_action::attack_actor_refusal(pet_store, pet.self_guid.0, &mut ui_errors)
-                || match crate::target::attack_order_target(
-                    &scan,
-                    &mut selection,
-                    &mut seam,
-                    &mut ui_errors,
-                ) {
+            crate::ui_action::attack_actor_refusal(Some(pet_store), pet.self_guid.0, ui_errors)
+                || match pick.target(None, selection, seam, ui_errors) {
                     Some(guid) => {
                         target_guid = guid;
                         false
@@ -105,9 +128,19 @@ pub(super) fn drain_pet_actions(
         } else {
             false
         };
-        if !commit_press(&mut bar, entry, refused, possessing) {
+        if !commit_press(bar, entry, refused, possessing) {
             debug!("ui_pet: slot {slot} refused by the attack validator — no packet");
-            continue;
+            return;
+        }
+        if let Some(spell) = spell {
+            arm_pet_gcd(
+                bar,
+                entry.action(),
+                spell,
+                possessing,
+                spell_mods,
+                Instant::now(),
+            );
         }
         debug!(
             "ui_pet: press slot {slot} (action {} kind {:#04x}) at {target_guid:#x}",
@@ -120,10 +153,69 @@ pub(super) fn drain_pet_actions(
             target_guid,
         });
     }
+}
+
+/// The spell arm's tail (`0x4bd355`-`0x4bd36e`) for a press past the usability gate whose
+/// `Spell.dbc` record resolved: one that neither cancels an aura nor takes the generic cast entry
+/// `0x6e4b60` (`AttributesEx4 & 0x20`, or the bar's unit possessed) calls `StartGlobalCooldown
+/// 0x6e2de0(spellId, 1)` before the send (`0x4bd444`): the spell's own `StartRecovery*` pair,
+/// under op 21, into the pet's list (`0xcecaec + 0x18`). The insert moves the list's generation,
+/// which carries the flush that follows it (`0x6e2e77`, `0x6e2e8e`) to
+/// `bar::fire_pet_cooldown_events`.
+///
+/// The pet's GCD starts in three places, and this arm is one. A `SMSG_SPELL_COOLDOWN` addressed
+/// to the pet's guid inserts the same pair for every entry whose spell lacks `Attributes` bit 25
+/// (`0x6e9553`-`0x6e9598`, `Cooldowns::apply_wire_cooldown`). The generic cast send starts it too
+/// (`0x6e58fb`), with the list picked by the caster's charmed-by, else summoned-by, guid
+/// (`0x6e58c2`-`0x6e58f3`); the possessed and client-targeted presses above reach it through
+/// `0x6e4b60`. The `SMSG_SPELL_GO` pet leg inserts the spell's own timers and no GCD (`0x6e85f7`).
+pub(super) fn arm_pet_gcd(
+    bar: &mut PetBar,
+    spell_id: u32,
+    spell: &benilla_formats::SpellDisplay,
+    possessing: bool,
+    mods: &crate::spell::SpellModifiers,
+    now: Instant,
+) {
+    if !possessing && !spell.allows_client_targeting() {
+        bar.cooldowns.start_gcd(spell_id, spell, now, mods);
+    }
+}
+
+/// Send the bar's other intents under [`PetBar`]'s pet guid: the autocast toggles, the stops and
+/// the drag writes. A toggle asks the usability predicate first (`0x4bcbcf`), so on an unusable
+/// pet it flips nothing and sends nothing. The stops do not (`0x4bd650`); the drag's writes were
+/// gated where the VM applied them (`0x4bc9d0`), on the answer the bar last pushed.
+pub(super) fn drain_pet_actions(
+    script: Option<NonSendMut<UiScript>>,
+    mut bar: ResMut<PetBar>,
+    commands: Res<NetCommands>,
+    pet: PetUnit,
+) {
+    let Some(mut script) = script else {
+        return;
+    };
+    let toggles = script.take_pet_autocast_toggles();
+    let stops = script.take_pet_stop_attacks();
+    let writes = script.take_pet_set_actions();
+    if toggles.is_empty() && stops == 0 && writes.is_empty() {
+        return;
+    }
+    let pet_guid = bar.spells.pet_guid;
+    if pet_guid == 0 {
+        debug!("ui_pet: dropping queued pet intents — the bar is gone");
+        return;
+    }
     // The repaint is `latch_press`'s alone, not every click's: a refused `TogglePetAutocast`
     // (`0x4bcbf7`: any right-click on a token) signals nothing, so after `OnClick`'s
     // `SetChecked(0)` that button stays unlit until the next repaint, as in the reference.
     for slot in toggles {
+        if !pet.actions_usable(&bar) {
+            debug!(
+                "ui_pet: autocast toggle on slot {slot} refused, the pet's actions are not usable"
+            );
+            continue;
+        }
         let Some(flipped) = toggle_slot_autocast(&mut bar, slot) else {
             continue;
         };
@@ -221,14 +313,12 @@ pub(crate) fn pet_stop_on_old_target_clear(
 
 /// `0x5ee5a0`: the unit the player possesses, which must be the bar's unit for an Attack press to
 /// latch (`0x4bd420`, `0x4bd42e`). It needs `UNIT_FLAG_POSSESSED` (`0x5ee626`) and charmed-by,
-/// else created-by, us (`0x5ee62f`); vmangos sets that flag only with possession (Mind Control,
-/// Eyes of the Beast), never for an ordinary pet. The reference also tests the active mover
-/// (`0x5ee5bc`, `0x5ee5e9`), not modelled here: vmangos sets the mover with the flag.
+/// else created-by, us (`0x5ee62f`), [`is_possessed_by`]; vmangos sets that flag only with
+/// possession (Mind Control, Eyes of the Beast), never for an ordinary pet. The reference also
+/// tests the active mover (`0x5ee5bc`, `0x5ee5e9`), not modelled here: vmangos sets the mover
+/// with the flag.
 pub(super) fn possessing(store: Option<&ObjectStore>, self_guid: Option<u64>) -> bool {
-    store.is_some_and(|s| {
-        s.0.unit_flags() & UNIT_FLAG_POSSESSED != 0
-            && s.0.unit_owner(benilla_protocol::OwnerFallback::CreatedBy) == self_guid
-    })
+    is_possessed_by(store, self_guid)
 }
 
 /// The Attack order, the one press validated before it sends: the type-7 arm branches only on
diff --git a/crates/benilla-app/src/ui_pet/flush_tests.rs b/crates/benilla-app/src/ui_pet/flush_tests.rs
new file mode 100644
index 00000000..11e6142f
--- /dev/null
+++ b/crates/benilla-app/src/ui_pet/flush_tests.rs
@@ -0,0 +1,575 @@
+//! The flush behind every mutation of the pet's cooldown list, whole client headless: each packet
+//! that reaches the list arrives as the session event it is, and the pet's feeds run after it.
+//! `0x4b31b0` fires `ACTIONBAR_UPDATE_COOLDOWN` then `SPELL_UPDATE_COOLDOWN` and `0x4bce90` fires
+//! `PET_BAR_UPDATE_COOLDOWN`; none of the callers fires `PET_BAR_UPDATE`.
+
+use std::time::{Duration, Instant};
+
+use benilla_formats::SpellDisplay;
+use benilla_protocol::messages::{PetSpellCooldown, PetSpells};
+use benilla_protocol::SessionEvent;
+
+use super::press_tests::{claw, growl, listen, listening_vm, rig, Rig, CLAW, GROWL, ME, PET};
+use super::PetBar;
+use crate::net::ObjectStore;
+
+/// The three events, in the reference's order.
+const FLUSH: [&str; 3] = [
+    "ACTIONBAR_UPDATE_COOLDOWN",
+    "SPELL_UPDATE_COOLDOWN",
+    "PET_BAR_UPDATE_COOLDOWN",
+];
+
+/// `UNIT_FIELD_SUMMONEDBY`, low word, the owner test the GO's pet leg reads (`0x6e859a`).
+const SUMMONEDBY: u16 = 12;
+
+/// Our own pet by the field the GO's pet leg reads: `SUMMONEDBY` us.
+fn summoned_pet() -> ObjectStore {
+    ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+        (SUMMONEDBY, ME as u32),
+        (SUMMONEDBY + 1, 0),
+    ]))
+}
+
+/// The rig's VM.
+fn ui(rig: &mut Rig) -> bevy::ecs::change_detection::Mut<'_, benilla_ui::script::UiScript> {
+    rig.app
+        .world_mut()
+        .non_send_resource_mut::<benilla_ui::script::UiScript>()
+}
+
+/// Claw as the pet book lists it: named, iconed, and with the ordinary pet GCD.
+fn claw_book_spell() -> SpellDisplay {
+    SpellDisplay {
+        icon: Some("Interface\\Icons\\Ability_Druid_Rake".into()),
+        ..claw()
+    }
+}
+
+/// A rig with Growl (a 5 s recovery of its own) on slot 1 of `PET`'s bar.
+fn growl_rig() -> Rig {
+    rig(vec![(GROWL, growl())], &[GROWL], Some(summoned_pet()))
+}
+
+/// `SMSG_SPELL_GO` of `spell_id` by `caster`, as the session decodes a plain cast.
+fn go(caster: u64, spell_id: u32) -> SessionEvent {
+    SessionEvent::SpellGo {
+        caster,
+        spell_id,
+        cast_flags: 0,
+        hits: vec![],
+        misses: vec![],
+        target: None,
+        go_target: None,
+        dest: None,
+        ammo_display_id: None,
+        item_caster: None,
+    }
+}
+
+impl Rig {
+    /// The packets, handled as the session hands them to the client.
+    fn receive(&mut self, events: Vec<SessionEvent>) {
+        crate::net::handlers::dispatch(self.app.world_mut(), events);
+    }
+
+    fn generation(&self) -> u64 {
+        self.app.world().resource::<PetBar>().cooldowns.generation
+    }
+
+    /// How many records the pet's list holds, elapsed ones included.
+    fn record_count(&self) -> usize {
+        self.app
+            .world()
+            .resource::<PetBar>()
+            .cooldowns
+            .record_count()
+    }
+
+    /// Whether the pet's list still holds a record that has run out.
+    fn elapsed_pending(&self) -> bool {
+        self.app
+            .world()
+            .resource::<PetBar>()
+            .cooldowns
+            .sweep_pending(Instant::now())
+    }
+}
+
+/// `0x6e85f7` inserts into the pet's list, `0x6e85fc` and `0x6e8601` flush. The bar takes no
+/// `PET_BAR_UPDATE` from it, which the spellbook's pet tab would take as a repaint of its own.
+#[test]
+fn a_pets_spell_go_fires_the_flush_and_no_bar_update() {
+    let mut rig = growl_rig();
+
+    rig.receive(vec![go(PET, GROWL)]);
+
+    assert_eq!(rig.frame(), FLUSH);
+    assert!(rig.frame().is_empty(), "once, not every frame");
+}
+
+/// The GO's owner test (`0x6e859a`) admits our pet and nobody else's: no insert, no flush.
+#[test]
+fn a_strangers_pet_go_flushes_nothing() {
+    let strangers = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+        (SUMMONEDBY, 0x99),
+        (SUMMONEDBY + 1, 0),
+    ]));
+    let mut rig = rig(vec![(GROWL, growl())], &[GROWL], Some(strangers));
+
+    rig.receive(vec![go(PET, GROWL)]);
+
+    assert_eq!(rig.generation(), 0);
+    assert!(rig.frame().is_empty());
+}
+
+/// `0x6e95b0`, `0x6e95b9`: the flush follows `SMSG_SPELL_COOLDOWN` for the pet's guid, and for it
+/// alone; the player's own list flushes through the action state's feed.
+#[test]
+fn a_pet_addressed_spell_cooldown_fires_the_flush() {
+    let mut rig = growl_rig();
+
+    rig.receive(vec![SessionEvent::SpellCooldowns {
+        caster: ME,
+        cooldowns: vec![(GROWL, 3000)],
+    }]);
+    assert!(
+        rig.frame().is_empty(),
+        "the player's list is not the pet's flush"
+    );
+
+    rig.receive(vec![SessionEvent::SpellCooldowns {
+        caster: PET,
+        cooldowns: vec![(GROWL, 3000)],
+    }]);
+    assert_eq!(rig.frame(), FLUSH);
+}
+
+/// `0x6e3071`-`0x6e3080` (`SMSG_COOLDOWN_EVENT`, `SMSG_CLEAR_COOLDOWN`) and `0x6e9712`-`0x6e971c`
+/// (`SMSG_COOLDOWN_CHEAT`): each flushes for the pet's list as for a spell cast.
+#[test]
+fn the_pets_event_clear_and_cheat_packets_fire_the_flush() {
+    // Attributes bit 25: the record parks until the event.
+    let parked = || SpellDisplay {
+        attributes: 1 << 25,
+        ..growl()
+    };
+    let mut rig = rig(vec![(GROWL, parked())], &[GROWL], Some(summoned_pet()));
+    let park = |rig: &mut Rig| {
+        rig.receive(vec![SessionEvent::SpellCooldowns {
+            caster: PET,
+            cooldowns: vec![(GROWL, 3000)],
+        }]);
+        assert_eq!(rig.frame(), FLUSH, "parked");
+    };
+
+    park(&mut rig);
+    rig.receive(vec![SessionEvent::CooldownEvent {
+        spell_id: GROWL,
+        caster: PET,
+    }]);
+    assert_eq!(rig.frame(), FLUSH, "the parked timers start");
+
+    rig.receive(vec![SessionEvent::ClearCooldown {
+        spell_id: GROWL,
+        caster: PET,
+    }]);
+    assert_eq!(rig.frame(), FLUSH, "the record goes");
+
+    park(&mut rig);
+    rig.receive(vec![SessionEvent::CooldownCheat { caster: PET }]);
+    assert_eq!(rig.frame(), FLUSH, "the GM wipe");
+}
+
+/// The frame's mutations are one flush for the frame, as the player's list has them.
+#[test]
+fn several_mutations_in_a_frame_fire_the_flush_once() {
+    let mut rig = growl_rig();
+
+    rig.receive(vec![
+        go(PET, GROWL),
+        SessionEvent::SpellCooldowns {
+            caster: PET,
+            cooldowns: vec![(GROWL, 3000)],
+        },
+    ]);
+
+    assert_eq!(rig.frame(), FLUSH);
+}
+
+/// `SMSG_PET_SPELLS` seeds the list through `0x6e2c60`, which flushes nothing, and ends in
+/// `SetPet`'s `SignalEvent(0x161)` (`0x4bc90c`) whatever the packet changed: a packet that moves
+/// only the cooldowns is one `PET_BAR_UPDATE`, not the flush.
+#[test]
+fn the_pet_spells_packet_signals_the_bar_and_never_flushes() {
+    let mut rig = growl_rig();
+    let same_bar = PetSpells {
+        cooldowns: vec![PetSpellCooldown {
+            spell_id: GROWL,
+            category: 82,
+            spell_cd_ms: 4000,
+            category_cd_ms: 0,
+        }],
+        ..rig.app.world().resource::<PetBar>().spells.clone()
+    };
+
+    rig.receive(vec![SessionEvent::PetSpells(Box::new(same_bar))]);
+    assert_eq!(
+        rig.frame(),
+        ["PET_BAR_UPDATE"],
+        "the bar is what it was and its cooldown is new: the packet's own signal repaints it"
+    );
+    let (_, duration, enable) = rig.cooldown(1);
+    assert!(
+        (duration - 4.0).abs() < 1e-9 && enable == 1,
+        "and the seeded cooldown reached the bar: {duration}"
+    );
+    assert_eq!(rig.generation(), 0, "a seed is no mutation of the flush");
+
+    // The teardown clears the list and flushes nothing either.
+    rig.receive(vec![SessionEvent::PetSpells(Box::default())]);
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"]);
+}
+
+/// A reset moves no counter back: a mutation, the teardown, a new bar, and the next mutation
+/// flushes once. A counter that fell back to 0 would read as a mutation at the teardown.
+#[test]
+fn a_teardown_and_a_new_bar_do_not_hide_the_next_flush() {
+    let mut rig = growl_rig();
+    rig.receive(vec![go(PET, GROWL)]);
+    assert_eq!(rig.frame(), FLUSH);
+    let held = rig.generation();
+
+    rig.receive(vec![SessionEvent::PetSpells(Box::default())]);
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"], "the teardown");
+    assert_eq!(rig.generation(), held, "the counter is where it was");
+
+    let mut bar = rig.app.world().resource::<PetBar>().spells.clone();
+    bar.pet_guid = PET;
+    bar.bar[0] = benilla_protocol::messages::PetActionEntry::from(
+        GROWL | (u32::from(benilla_protocol::messages::PET_ACT_ENABLED) << 24),
+    );
+    rig.receive(vec![SessionEvent::PetSpells(Box::new(bar))]);
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"], "the new bar");
+
+    rig.receive(vec![go(PET, GROWL)]);
+    assert_eq!(rig.frame(), FLUSH);
+}
+
+/// The stock `Cooldown` frame ends its own sweep, and the reference flushes no event for the end
+/// of a cooldown: an elapsed record moves neither the list nor the events.
+#[test]
+fn a_natural_expiry_fires_nothing() {
+    let brief = || SpellDisplay {
+        name: "Brief".into(),
+        recovery_ms: 30,
+        ..Default::default()
+    };
+    let mut rig = rig(vec![(GROWL, brief())], &[GROWL], Some(summoned_pet()));
+    rig.receive(vec![go(PET, GROWL)]);
+    assert_eq!(rig.frame(), FLUSH);
+    assert!(rig.cooldown(1).1 > 0.0, "running");
+
+    std::thread::sleep(Duration::from_millis(80));
+
+    assert!(
+        rig.frame().is_empty(),
+        "its end is the frame's, not an event"
+    );
+    assert_eq!(
+        rig.cooldown(1).1,
+        0.0,
+        "and the sweep is gone from the push"
+    );
+}
+
+/// A new VM meets the list as it stands: the flush is for a mutation, not for a load.
+#[test]
+fn a_new_vm_is_not_flushed_for_a_list_that_already_moved() {
+    let mut rig = growl_rig();
+    rig.receive(vec![go(PET, GROWL)]);
+    assert_eq!(rig.frame(), FLUSH);
+
+    // The interface reloads: a new VM, the bar pushed into it afresh.
+    rig.app.world_mut().insert_non_send_resource(listening_vm());
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"], "the bar, and no flush");
+
+    rig.receive(vec![go(PET, GROWL)]);
+    assert_eq!(rig.frame(), FLUSH, "the next mutation is a flush");
+}
+
+/// The flush reads what the feeds pushed: it runs after the bar's feed and the book's, which
+/// push the pet's cooldown triples the handlers ask for, and (declared through the cooldown
+/// events) after the player's own flush. Skips where bevy carries no system names.
+#[test]
+fn the_flush_runs_after_every_feed_that_pushes_a_pet_cooldown() {
+    use crate::game_plugins::schedule_tests::{census, headless_client, SyncPoints};
+    use bevy::prelude::Update;
+    use std::collections::{HashMap, HashSet};
+
+    let mut app = headless_client();
+    let c = census(&mut app, Update, SyncPoints::Declared);
+    let named = |needle: &str| {
+        let hits: Vec<_> = c
+            .systems
+            .iter()
+            .filter(|(_, s)| s.name.ends_with(needle))
+            .map(|(k, _)| *k)
+            .collect();
+        (!hits.is_empty()).then(|| {
+            assert_eq!(hits.len(), 1, "one system named {needle}");
+            hits[0]
+        })
+    };
+    let Some(fire) = named("::fire_pet_cooldown_events") else {
+        eprintln!("skipped: this build carries no system names");
+        return;
+    };
+    let mut after: HashMap<_, Vec<_>> = HashMap::new();
+    for (a, b) in &c.dependencies {
+        after.entry(*a).or_default().push(*b);
+    }
+    let runs_before = |first| {
+        let (mut seen, mut stack) = (HashSet::new(), vec![first]);
+        while let Some(n) = stack.pop() {
+            if n == fire {
+                return true;
+            }
+            if seen.insert(n) {
+                stack.extend(after.get(&n).into_iter().flatten().copied());
+            }
+        }
+        false
+    };
+    for feed in ["::feed_pet_bar", "::feed_pet_book", "::feed_action_state"] {
+        let key = named(feed).unwrap_or_else(|| panic!("{feed} is scheduled"));
+        assert!(runs_before(key), "{feed} runs before the pet's flush");
+    }
+}
+
+/// The stock spellbook (`SpellBookFrame.lua:209`-`231`): a `SpellButton` redraws on
+/// `SPELL_UPDATE_COOLDOWN`, and on `PET_BAR_UPDATE` while the pet tab is open, and never hears
+/// `PET_BAR_UPDATE_COOLDOWN`. So the GCD a pet-bar press starts sweeps the pet tab's button
+/// through the flush's `SPELL_UPDATE_COOLDOWN` alone.
+#[test]
+fn a_pet_gcd_sweeps_the_spellbooks_pet_tab_button() {
+    benilla_formats::wow_data_or_skip!();
+    use benilla_protocol::messages::{PetActionEntry, PET_ACT_ENABLED};
+
+    let mut rig = rig(
+        vec![(CLAW, claw_book_spell())],
+        &[CLAW],
+        Some(summoned_pet()),
+    );
+    {
+        let world = rig.app.world_mut();
+        // Our class, so the book reads a token (`0x4b4463`); no `ChrClasses` row, so "PET".
+        world.spawn((
+            crate::net::SelfPlayer,
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(36, 3 << 8)])),
+        ));
+        world.insert_resource(crate::chr_classes::ChrClassTable(Default::default()));
+        world.resource_mut::<PetBar>().spells.spells = vec![PetActionEntry::from(
+            CLAW | (u32::from(PET_ACT_ENABLED) << 24),
+        )];
+    }
+
+    let mut script = benilla_ui::script::UiScript::new().unwrap();
+    script.set_screen_size(1024.0, 768.0);
+    let failures = crate::ui_script::load_default_ui(&script);
+    assert!(failures.is_empty(), "load failures: {failures:?}");
+    listen(&script);
+    rig.app.world_mut().insert_non_send_resource(script);
+
+    // The book arrives, and the window opens on its pet tab.
+    rig.frame();
+    let mut s = ui(&mut rig);
+    s.run("ToggleSpellBook(BOOKTYPE_PET)").unwrap();
+    s.resolve();
+    assert!(
+        s.eval::<bool>("return SpellBookFrame.bookType == BOOKTYPE_PET")
+            .unwrap(),
+        "the pet tab is open"
+    );
+    assert_eq!(
+        s.eval::<String>("return SpellButton1SpellName:GetText()")
+            .unwrap(),
+        "Claw"
+    );
+    assert!(
+        !s.eval::<bool>("return SpellButton1Cooldown:IsShown()")
+            .unwrap(),
+        "no cooldown yet"
+    );
+
+    // A press on the bar's Claw starts the pet's GCD.
+    rig.press(1);
+    rig.frame();
+
+    let mut s = ui(&mut rig);
+    s.resolve();
+    assert!(
+        s.eval::<bool>("return SpellButton1Cooldown:IsShown()")
+            .unwrap(),
+        "the GCD sweeps the spellbook's button"
+    );
+    assert!(
+        (s.eval::<f64>("return SpellButton1Cooldown.duration")
+            .unwrap()
+            - 1.5)
+            .abs()
+            < 1e-9,
+        "and it is the 1.5 s the press started"
+    );
+    let errors = s.errors();
+    assert!(errors.is_empty(), "script errors: {errors:?}");
+}
+
+/// A spell of no catalog record but the test's own, parked until its cooldown event.
+const PARKED: u32 = 9_001;
+
+/// Claw with a short GCD, so a press's record runs out inside a test.
+fn brisk_claw() -> SpellDisplay {
+    SpellDisplay {
+        start_recovery_ms: 40,
+        ..claw()
+    }
+}
+
+/// A parked spell: `Attributes` bit 25, its timers wait for `SMSG_COOLDOWN_EVENT`.
+fn parked() -> SpellDisplay {
+    SpellDisplay {
+        name: "Parked".into(),
+        attributes: 1 << 25,
+        ..Default::default()
+    }
+}
+
+/// Long enough for every `brisk_claw` GCD to have run out.
+fn let_the_gcds_run_out() {
+    std::thread::sleep(Duration::from_millis(120));
+}
+
+/// Every pet GCD and every recovery the GO leg inserts is a record, and the insert is where the
+/// list is bounded: after forty presses whose GCDs have all run out, the next press leaves the
+/// list with its live records and its own, a running recovery and a parked record among them.
+#[test]
+fn an_insert_leaves_the_pets_list_its_live_records_alone() {
+    let mut rig = rig(
+        vec![(CLAW, brisk_claw()), (GROWL, growl()), (PARKED, parked())],
+        &[CLAW, GROWL, PARKED],
+        Some(summoned_pet()),
+    );
+    rig.receive(vec![
+        go(PET, GROWL),
+        // Ten milliseconds, parked until `SMSG_COOLDOWN_EVENT`.
+        SessionEvent::SpellCooldowns {
+            caster: PET,
+            cooldowns: vec![(PARKED, 10)],
+        },
+    ]);
+    assert_eq!(
+        rig.record_count(),
+        2,
+        "Growl's recovery and the parked record"
+    );
+    for _ in 0..40 {
+        rig.press(1);
+    }
+    let_the_gcds_run_out();
+    assert!(rig.elapsed_pending(), "the forty GCDs have run out");
+
+    rig.press(1);
+
+    assert!(!rig.elapsed_pending(), "the insert dropped them");
+    assert_eq!(
+        rig.record_count(),
+        3,
+        "Growl's recovery, the parked record and the new GCD"
+    );
+    rig.frame();
+    assert_eq!(rig.cooldown(2).1, 5.0, "Growl still sweeps its 5 s");
+    let parked = rig.cooldown(3);
+    assert!(
+        parked.1 > 0.0 && parked.2 == 0,
+        "the parked record reads disabled: {parked:?}"
+    );
+}
+
+/// The reference flushes no event for a cooldown's end, and the insert's prune is that end: the
+/// insert is the list's one mutation, so the frame fires the flush once, for it, and nothing
+/// else. An insert that arms nothing changes nothing.
+#[test]
+fn an_inserts_prune_fires_only_the_inserts_own_flush() {
+    let mut rig = rig(
+        vec![(CLAW, brisk_claw()), (GROWL, growl())],
+        &[CLAW, GROWL],
+        Some(summoned_pet()),
+    );
+    for _ in 0..5 {
+        rig.press(1);
+    }
+    assert_eq!(rig.frame(), FLUSH, "the presses' own flush");
+    let held = rig.generation();
+    let_the_gcds_run_out();
+    assert!(rig.elapsed_pending());
+
+    // Growl has no GCD pair: nothing is armed, so nothing is dropped or flushed.
+    rig.press(2);
+    assert!(
+        rig.frame().is_empty(),
+        "an insert that arms nothing fires nothing"
+    );
+    assert_eq!(rig.generation(), held);
+
+    rig.press(1);
+    assert!(!rig.elapsed_pending(), "the insert dropped the five");
+    assert_eq!(rig.frame(), FLUSH, "the insert's flush, once");
+    assert_eq!(
+        rig.generation(),
+        held + 1,
+        "the prune is no mutation of its own"
+    );
+    assert!(rig.frame().is_empty(), "and nothing follows");
+}
+
+/// An insert's prune is invisible to `GetPetActionCooldown`: a running recovery and a parked
+/// record whose timers have run down push what they pushed before, the same start included.
+#[test]
+fn an_insert_changes_no_bar_read_of_the_records_that_stay() {
+    let mut rig = rig(
+        vec![(CLAW, brisk_claw()), (GROWL, growl()), (PARKED, parked())],
+        &[CLAW, GROWL, PARKED],
+        Some(summoned_pet()),
+    );
+    rig.receive(vec![
+        go(PET, GROWL),
+        SessionEvent::SpellCooldowns {
+            caster: PET,
+            cooldowns: vec![(PARKED, 10)],
+        },
+    ]);
+    for _ in 0..5 {
+        rig.press(1);
+    }
+    assert_eq!(rig.frame(), FLUSH);
+    let (running, parked_read) = (rig.cooldown(2), rig.cooldown(3));
+    assert_eq!(running.1, 5.0, "Growl sweeps its 5 s");
+    assert!(
+        parked_read.1 > 0.0 && parked_read.2 == 0,
+        "the parked record shows disabled: {parked_read:?}"
+    );
+    let_the_gcds_run_out();
+    assert!(rig.elapsed_pending());
+
+    rig.press(1);
+    assert!(!rig.elapsed_pending(), "the insert pruned");
+    rig.frame();
+
+    assert_eq!(
+        rig.cooldown(2),
+        running,
+        "the running recovery, its start too"
+    );
+    assert_eq!(rig.cooldown(3), parked_read, "the parked record");
+}
diff --git a/crates/benilla-app/src/ui_pet/menu.rs b/crates/benilla-app/src/ui_pet/menu.rs
index 8e018344..495e8ea3 100644
--- a/crates/benilla-app/src/ui_pet/menu.rs
+++ b/crates/benilla-app/src/ui_pet/menu.rs
@@ -2,7 +2,8 @@
 //! `PetCanBeAbandoned()`, Rename when `PetCanBeRenamed()` too, and Dismiss otherwise. `PetAbandon`
 //! (`0x4be4c0`, `0x4bd740`) sends `CMSG_PET_ABANDON`; `PetDismiss` (`0x4be4d0`) sends no packet
 //! itself but hands the Dismiss command word to the bar's dispatcher (`0x4bd1d0`), so it leaves as
-//! `CMSG_PET_ACTION`. vmangos unsummons a summon on either, so sending the wrong one goes unseen.
+//! `CMSG_PET_ACTION`, and only past the dispatcher's usability predicate (`0x4bd1f2`). vmangos
+//! unsummons a summon on either, so sending the wrong one goes unseen.
 
 use bevy::prelude::*;
 
@@ -56,6 +57,7 @@ pub(super) fn drain_pet_menu(
     bar: Res<PetBar>,
     commands: Res<NetCommands>,
     mut ui_errors: ResMut<UiErrorKeys>,
+    pet: PetUnit,
 ) {
     let Some(mut script) = script else {
         return;
@@ -76,9 +78,14 @@ pub(super) fn drain_pet_menu(
         debug!("ui_pet: abandoning pet {pet_guid:#x}");
         let _ = commands.0.send(ClientCommand::PetAbandon { pet_guid });
     }
-    // `0x4bd6e0` stages `0x07000003` at target 0.
+    // `0x4bd6e0` stages `0x07000003` at target 0 and enters the dispatcher, whose first act is the
+    // usability predicate (`0x4bd1f2`): a pet that fails it is not sent the word.
     let dismiss_word = PET_COMMAND_DISMISS | (u32::from(PET_ACT_COMMAND) << 24);
     for _ in 0..dismisses {
+        if !pet.actions_usable(&bar) {
+            debug!("ui_pet: dismiss refused, the pet's actions are not usable — no packet");
+            continue;
+        }
         debug!("ui_pet: dismissing pet {pet_guid:#x} ({dismiss_word:#010x})");
         let _ = commands.0.send(ClientCommand::PetAction {
             pet_guid,
diff --git a/crates/benilla-app/src/ui_pet/mod.rs b/crates/benilla-app/src/ui_pet/mod.rs
index d0f60d7d..e18ee462 100644
--- a/crates/benilla-app/src/ui_pet/mod.rs
+++ b/crates/benilla-app/src/ui_pet/mod.rs
@@ -3,12 +3,15 @@
 //! data (vmangos `CharmInfo::InitPetActionBar`), not a layout: a possessed or charmed unit fills
 //! the same ten words differently, so nothing here assumes them.
 
+use std::time::Instant;
+
 use bevy::prelude::*;
 
 use benilla_protocol::messages::PetSpells;
 
 use crate::net::{GuidIndex, ObjectStore};
 use crate::spell::Cooldowns;
+use crate::ui_action::CooldownEvents;
 use crate::ui_script::UiInput;
 use crate::ui_unit::UnitFeed;
 
@@ -17,15 +20,24 @@ mod drain;
 mod menu;
 mod net;
 mod unit;
+mod usable;
 
-use bar::feed_pet_bar;
+use bar::{feed_pet_bar, fire_pet_cooldown_events};
 use drain::drain_pet_actions;
+// A pet bar press, applied in call order by `crate::script_calls`.
 pub(crate) use drain::pet_stop_on_old_target_clear;
+pub(crate) use drain::PetPress;
 use menu::{drain_pet_menu, feed_pet_menu};
 use unit::feed_pet_unit;
 
+#[cfg(test)]
+mod flush_tests;
+#[cfg(test)]
+mod press_tests;
 #[cfg(test)]
 mod tests;
+#[cfg(test)]
+mod usable_tests;
 
 /// The pet action bar's state. A zero `spells.pet_guid` means no bar: the teardown packet carries
 /// only that guid.
@@ -33,8 +45,10 @@ mod tests;
 pub(crate) struct PetBar {
     /// The last `SMSG_PET_SPELLS`, with `SMSG_PET_MODE` and local presses folded in.
     pub(crate) spells: PetSpells,
-    /// The pet's own cooldowns: the reference keeps a `SPELLHISTORY` per unit. Seeded from
-    /// `SMSG_PET_SPELLS`, topped up by `SMSG_SPELL_COOLDOWN` for the pet's guid.
+    /// The pet's own cooldowns, the list at `0xcecb04`. Seeded from `SMSG_PET_SPELLS`, topped up
+    /// by `SMSG_SPELL_COOLDOWN` for the pet's guid, by the pet's own `SMSG_SPELL_GO` and by a
+    /// press's GCD. Each mutation but the seed fires the flush, off [`Cooldowns::generation`]
+    /// (`bar::fire_pet_cooldown_events`).
     pub(crate) cooldowns: Cooldowns,
     /// The client's `[0xb714b0]`, a local latch: all of `IsPetAttackActive`, and the only thing
     /// that lights Attack (`0x4bdf16`-`0x4bdf22`). Raised only for a possessed unit (`0x4bd420`),
@@ -45,6 +59,9 @@ pub(crate) struct PetBar {
     /// `0x4bc960`), and `OnClick`'s `SetChecked(0)` needs that repaint to relight a press on the
     /// current mode, so the count is in the feed's dedup key. Wrapping: only a change is read.
     pub(crate) bar_signals: u32,
+    /// `[0xb714a8]`: the charm or possess expiry, the packet's duration past its arrival; `None`
+    /// when the duration is 0, as for a hunter's or warlock's own pet.
+    pub(crate) expires: Option<Instant>,
 }
 
 impl PetBar {
@@ -52,6 +69,17 @@ impl PetBar {
     pub(crate) fn has_bar(&self) -> bool {
         self.spells.pet_guid != 0
     }
+
+    /// No pet: every field back to its default, the cooldown list emptied with its counters kept
+    /// ([`Cooldowns::clear_silent`]), for the teardown packet and the session end.
+    pub(crate) fn clear(&mut self) {
+        let mut cooldowns = std::mem::take(&mut self.cooldowns);
+        cooldowns.clear_silent();
+        *self = Self {
+            cooldowns,
+            ..Default::default()
+        };
+    }
 }
 
 pub(crate) struct UiPetPlugin;
@@ -63,21 +91,32 @@ impl Plugin for UiPetPlugin {
             Update,
             (
                 // Feeds ride the unit feed, before the VM ticks; drains run after the input pass so
-                // a click is sent that frame. The old-target clear precedes the bar feed so Attack
+                // a click is sent that frame (a press is a script call, `PetPress`). The old-target
+                // clear precedes the bar feed so Attack
                 // goes dark the frame the selection moves.
                 pet_stop_on_old_target_clear
                     .in_set(UnitFeed)
                     .before(feed_pet_bar),
                 // After the pet snapshot: these feeds' events reach Lua at once, and their
-                // handlers read `HasPetUI()`, which `crate::ui_pet_stats` pushes.
+                // handlers read `HasPetUI()`, which `crate::ui_pet_stats` pushes. The bar pushes
+                // its cooldown triples before the cooldown events and the pet's flush fires after
+                // them, so the buttons it wakes read the new list.
                 feed_pet_bar
                     .in_set(UnitFeed)
-                    .after(crate::ui_pet_stats::PetSnapshot),
+                    .after(crate::ui_pet_stats::PetSnapshot)
+                    .before(CooldownEvents),
+                fire_pet_cooldown_events
+                    .in_set(UnitFeed)
+                    .after(CooldownEvents),
                 feed_pet_unit
                     .in_set(UnitFeed)
                     .after(crate::ui_pet_stats::PetSnapshot),
                 feed_pet_menu.in_set(UnitFeed),
-                drain_pet_actions.after(UiInput),
+                // After this frame's presses, as the one drain before it ran them ahead of the
+                // toggles, stops and writes.
+                drain_pet_actions
+                    .after(UiInput)
+                    .after(crate::script_calls::apply_script_calls),
                 drain_pet_menu.after(UiInput),
             ),
         );
@@ -85,14 +124,13 @@ impl Plugin for UiPetPlugin {
 }
 
 /// The unit behind [`PetBar`]'s cached guid, plus our own guid for the ownership tests the
-/// reference makes before trusting the pet's fields (`0x5ff780`, `0x612e33`).
+/// reference makes before trusting the pet's fields (`0x5ff780`, `0x612e33`), and the usability
+/// predicate every pet-bar verb the reference guards asks of them ([`PetUnit::usable_pet`]).
 #[derive(bevy::ecs::system::SystemParam)]
 pub(crate) struct PetUnit<'w, 's> {
     index: Res<'w, GuidIndex>,
     stores: Query<'w, 's, &'static ObjectStore>,
     self_guid: Res<'w, crate::net::SelfGuid>,
-    /// The per-field edges, for `fire_transitions`' watch-bridge arms.
-    pub(super) edges: MessageReader<'w, 's, crate::net::FieldChanged>,
 }
 
 impl PetUnit<'_, '_> {
@@ -102,6 +140,12 @@ impl PetUnit<'_, '_> {
         self.stores.get(e).ok()
     }
 
+    /// The active player's descriptor, `None` while its object is not streamed: the lookup the
+    /// usability predicate makes on the client's player guid (`0x4bcf89`, typemask `0x10`).
+    pub(crate) fn player_store(&self) -> Option<&ObjectStore> {
+        self.store(self.self_guid.0?)
+    }
+
     /// The pet's entity under [`Self::store`]'s contract, for the pet paper doll's model.
     pub(crate) fn entity(&self, pet_guid: u64) -> Option<Entity> {
         let e = *self.index.0.get(&pet_guid)?;
diff --git a/crates/benilla-app/src/ui_pet/net.rs b/crates/benilla-app/src/ui_pet/net.rs
index f7cc309b..ef68bd42 100644
--- a/crates/benilla-app/src/ui_pet/net.rs
+++ b/crates/benilla-app/src/ui_pet/net.rs
@@ -32,7 +32,7 @@ pub(super) fn register(app: &mut App) {
 
 /// A lost socket sends no zero-guid `SMSG_PET_SPELLS`, so the session end resets the bar itself.
 fn on_session_end(In(_): In<SessionEvent>, mut bar: ResMut<PetBar>) {
-    *bar = PetBar::default();
+    bar.clear();
 }
 
 fn on_spells(In(ev): In<SessionEvent>, catalog: Option<Res<Spells>>, mut bar: ResMut<PetBar>) {
@@ -96,7 +96,7 @@ fn pet_spells(spells: PetSpells, catalog: Option<&Spells>, bar: &mut PetBar) {
         if bar.spells.pet_guid != 0 {
             debug!("net: pet bar torn down");
         }
-        *bar = PetBar::default();
+        bar.clear();
         return;
     }
     // A new pet guid clears the attack latch (`0x4bc8ce`); a re-send from the same pet keeps it.
@@ -154,12 +154,18 @@ fn pet_spells(spells: PetSpells, catalog: Option<&Spells>, bar: &mut PetBar) {
             .join(" · ")
     );
     let now = Instant::now();
-    bar.cooldowns = crate::spell::Cooldowns::default();
+    // `SetPet` (`0x4bc7e0`) re-arms the expiry on every packet, and a 0 duration clears it.
+    bar.expires = (spells.duration_ms != 0)
+        .then(|| now + std::time::Duration::from_millis(u64::from(spells.duration_ms)));
+    bar.cooldowns.clear_silent();
     for cd in &spells.cooldowns {
         let display = catalog.and_then(|c| c.catalog.get(cd.spell_id));
         bar.cooldowns.seed_pet(cd, display, now);
     }
     bar.spells = spells;
+    // `SetPet` (`0x4bc7e0`) ends in `SignalEvent(0x161)` on every packet (`0x4bc90c`), whatever
+    // changed: the one repaint a packet that moves only the pet's cooldowns gets.
+    bar.bar_signals = bar.bar_signals.wrapping_add(1);
 }
 
 /// `SMSG_PET_MODE`: the state word alone, applied only to the bar of the pet it names.
@@ -282,6 +288,28 @@ mod tests {
         assert!(!bar.has_bar());
     }
 
+    /// `SetPet` (`0x4bc7e0`): each packet re-arms the expiry from its own duration, 0 clears it,
+    /// and the teardown clears it too.
+    #[test]
+    fn each_pet_packet_rearms_or_clears_the_expiry() {
+        let mut bar = PetBar::default();
+        let mut charm = a_bar(0x2A);
+        charm.duration_ms = 60_000;
+        let before = Instant::now();
+        pet_spells(charm.clone(), None, &mut bar);
+        let left = bar.expires.expect("armed").duration_since(before);
+        assert!(
+            left >= std::time::Duration::from_secs(60) && left < std::time::Duration::from_secs(61)
+        );
+
+        pet_spells(a_bar(0x2A), None, &mut bar);
+        assert_eq!(bar.expires, None, "a 0 duration clears it");
+        pet_spells(charm, None, &mut bar);
+        assert!(bar.expires.is_some());
+        pet_spells(PetSpells::default(), None, &mut bar);
+        assert_eq!(bar.expires, None, "the teardown clears it");
+    }
+
     #[test]
     fn pet_mode_only_writes_its_own_bar() {
         let mut bar = PetBar::default();
diff --git a/crates/benilla-app/src/ui_pet/press_tests.rs b/crates/benilla-app/src/ui_pet/press_tests.rs
new file mode 100644
index 00000000..d4fe0c95
--- /dev/null
+++ b/crates/benilla-app/src/ui_pet/press_tests.rs
@@ -0,0 +1,587 @@
+//! A pet bar spell press and the pet's global cooldown: the spell arm of `0x4bd1d0` starts it
+//! (`0x4bd367`-`0x4bd36e`), whole client headless, with the press applied as the script call it is.
+//! The rig is shared with `flush_tests`, whose packets reach the same list.
+
+use std::collections::HashMap;
+use std::time::Instant;
+
+use bevy::ecs::schedule::Schedule;
+use bevy::ecs::system::RunSystemOnce;
+use bevy::prelude::*;
+use crossbeam_channel::Receiver;
+
+use benilla_formats::{SpellCatalog, SpellDisplay};
+use benilla_protocol::messages::{
+    PetActionEntry, PET_ACT_COMMAND, PET_ACT_ENABLED, PET_ACT_REACTION, PET_COMMAND_ATTACK,
+    PET_COMMAND_FOLLOW, PET_COMMAND_STAY, PET_REACT_AGGRESSIVE,
+};
+
+use crate::net::{ClientCommand, Guid, GuidIndex, NetCommands, ObjectStore, SelfGuid, SelfPlayer};
+use crate::spell::Cooldowns;
+use crate::ui_action::Spells;
+
+use super::bar::{feed_pet_bar, fire_pet_cooldown_events};
+use super::drain::PetPress;
+use super::PetBar;
+
+pub(super) const ME: u64 = 0x10;
+pub(super) const PET: u64 = 0x2A;
+/// `UNIT_FIELD_CHARMEDBY`, `UNIT_FIELD_SUMMONEDBY` and `UNIT_FIELD_CREATEDBY`, low words; the high
+/// words stay 0.
+pub(super) const CHARMEDBY: u16 = 10;
+pub(super) const SUMMONEDBY: u16 = 12;
+pub(super) const CREATEDBY: u16 = 14;
+pub(super) const FLAGS: u16 = 46;
+/// `UNIT_FIELD_AURA` slot 0 and `UNIT_FIELD_AURAFLAGS`, a nibble per slot.
+pub(super) const AURA: u16 = 47;
+pub(super) const AURAFLAGS: u16 = 95;
+
+pub(super) const CLAW: u32 = 16829;
+pub(super) const BITE: u32 = 17258;
+pub(super) const GROWL: u32 = 14918;
+pub(super) const COWER: u32 = 1742;
+
+/// Claw's shape: no timer of its own, and the ordinary pet GCD, category 133 for 1500 ms.
+pub(super) fn claw() -> SpellDisplay {
+    SpellDisplay {
+        name: "Claw".into(),
+        start_recovery_category: 133,
+        start_recovery_ms: 1500,
+        ..Default::default()
+    }
+}
+
+/// Bite's shape: the same GCD pair, and a 10 s category timer of its own.
+pub(super) fn bite() -> SpellDisplay {
+    SpellDisplay {
+        name: "Bite".into(),
+        category: 19,
+        category_recovery_ms: 10_000,
+        ..claw()
+    }
+}
+
+/// Growl's shape: a 5 s category timer and no GCD pair.
+pub(super) fn growl() -> SpellDisplay {
+    SpellDisplay {
+        name: "Growl".into(),
+        category: 82,
+        category_recovery_ms: 5_000,
+        ..Default::default()
+    }
+}
+
+/// Cower's shape here: a toggle with an active icon, so a press with its aura up cancels it.
+pub(super) fn cower() -> SpellDisplay {
+    SpellDisplay {
+        name: "Cower".into(),
+        active_icon_id: 122,
+        ..claw()
+    }
+}
+
+/// Our own pet as vmangos fills it, `SUMMONEDBY` and `CREATEDBY` us (`Pet.cpp:264`, `:287`), no
+/// flags: the predicate's owner test reads `SUMMONEDBY` (`0x4bd054`).
+pub(super) fn owned_pet() -> ObjectStore {
+    owned_pet_with(&[])
+}
+
+/// [`owned_pet`] with more fields set, which win over its own.
+pub(super) fn owned_pet_with(extra: &[(u16, u32)]) -> ObjectStore {
+    let mut pairs = vec![
+        (SUMMONEDBY, ME as u32),
+        (SUMMONEDBY + 1, 0),
+        (CREATEDBY, ME as u32),
+        (CREATEDBY + 1, 0),
+    ];
+    pairs.retain(|(index, _)| !extra.iter().any(|(set, _)| set == index));
+    pairs.extend_from_slice(extra);
+    ObjectStore(benilla_protocol::ObjectFields::from_pairs(&pairs))
+}
+
+/// Our own player: `OBJECT_FIELD_TYPE` 0x19, alive.
+pub(super) fn player() -> ObjectStore {
+    player_with(&[])
+}
+
+/// [`player`] with more fields set.
+pub(super) fn player_with(extra: &[(u16, u32)]) -> ObjectStore {
+    let mut pairs = vec![(2, 0x19), (22, 100), (28, 100)];
+    pairs.extend_from_slice(extra);
+    ObjectStore(benilla_protocol::ObjectFields::from_pairs(&pairs))
+}
+
+pub(super) struct Rig {
+    pub(super) app: App,
+    commands: Receiver<ClientCommand>,
+    /// The pet's feeds as a schedule of their own, so their `Local` memory lives across runs.
+    pub(super) feed: Schedule,
+}
+
+/// A VM whose listener records every event the pet's lists fire into `SEEN`, in order.
+pub(super) fn listening_vm() -> benilla_ui::script::UiScript {
+    let script = benilla_ui::script::UiScript::new().expect("a VM");
+    listen(&script);
+    script
+}
+
+/// The listener [`listening_vm`] carries, on a VM that has one already.
+pub(super) fn listen(script: &benilla_ui::script::UiScript) {
+    script
+        .run(
+            r#"
+            SEEN = {}
+            local f = CreateFrame("Frame")
+            f:RegisterEvent("PET_BAR_UPDATE")
+            f:RegisterEvent("PET_BAR_UPDATE_COOLDOWN")
+            f:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN")
+            f:RegisterEvent("SPELL_UPDATE_COOLDOWN")
+            f:SetScript("OnEvent", function() table.insert(SEEN, event) end)
+        "#,
+        )
+        .expect("the listener registers");
+}
+
+/// The whole client, headless, with `PET` on the bar and `catalog` as the spell table. Slot `n`
+/// (1-based) holds `slots[n - 1]` as an enabled spell word. `pet` is its object, or none
+/// streamed.
+pub(super) fn rig(
+    catalog: Vec<(u32, SpellDisplay)>,
+    slots: &[u32],
+    pet: Option<ObjectStore>,
+) -> Rig {
+    let mut app = crate::game_plugins::schedule_tests::headless_client();
+    let (tx, commands) = crossbeam_channel::unbounded();
+    app.insert_resource(NetCommands(tx));
+    let world = app.world_mut();
+    world.resource_mut::<SelfGuid>().0 = Some(ME);
+    // Our own object, which a spell press needs to resolve (`0x4bd31a`).
+    let me = world
+        .spawn((Guid(ME), SelfPlayer, Transform::default(), player()))
+        .id();
+    world.resource_mut::<GuidIndex>().0.insert(ME, me);
+    if let Some(store) = pet {
+        let entity = world.spawn((Guid(PET), store)).id();
+        world.resource_mut::<GuidIndex>().0.insert(PET, entity);
+    }
+    world.insert_resource(Spells {
+        catalog: SpellCatalog::from_displays(catalog.into_iter().collect::<HashMap<_, _>>()),
+        ..Spells::empty_for_tests()
+    });
+    let mut bar = world.resource_mut::<PetBar>();
+    bar.spells.pet_guid = PET;
+    for (i, &spell_id) in slots.iter().enumerate() {
+        bar.spells.bar[i] = PetActionEntry::from(spell_id | (u32::from(PET_ACT_ENABLED) << 24));
+    }
+    world.insert_non_send_resource(listening_vm());
+    // The order the plugin gives them: the feeds that push a pet cooldown, then the flush.
+    let mut feed = Schedule::default();
+    feed.add_systems(
+        (
+            crate::ui_pet_book::feed_pet_book,
+            feed_pet_bar,
+            fire_pet_cooldown_events,
+        )
+            .chain(),
+    );
+    let mut rig = Rig {
+        app,
+        commands,
+        feed,
+    };
+    // The bar arriving is `PET_BAR_UPDATE`'s; every test reads what a press adds to it.
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"], "the bar arrives");
+    rig
+}
+
+impl Rig {
+    /// The bar's feeds for one frame, and the events they fired.
+    pub(super) fn frame(&mut self) -> Vec<String> {
+        self.feed.run(self.app.world_mut());
+        let mut script = self
+            .app
+            .world_mut()
+            .non_send_resource_mut::<benilla_ui::script::UiScript>();
+        script.resolve();
+        let seen = script.eval::<Vec<String>>("return SEEN").unwrap();
+        script.run("SEEN = {}").unwrap();
+        seen
+    }
+
+    /// `CastPetAction(slot)`, applied.
+    pub(super) fn press(&mut self, slot: u32) {
+        self.app
+            .world_mut()
+            .run_system_once(move |mut press: PetPress| press.press_slot(slot))
+            .expect("the press applies as a one-shot system");
+    }
+
+    /// `PetAttack` and the other one-shot orders, as their slot's packed word, applied.
+    pub(super) fn order(&mut self, packed: u32) {
+        self.app
+            .world_mut()
+            .run_system_once(move |mut press: PetPress| press.order(packed))
+            .expect("the order applies as a one-shot system");
+    }
+
+    /// The commands sent so far.
+    pub(super) fn sent(&self) -> Vec<ClientCommand> {
+        self.commands.try_iter().collect()
+    }
+
+    /// `GetPetActionCooldown(slot)`, off what the last feed pushed: `(start, duration, enable)`.
+    pub(super) fn cooldown(&mut self, slot: u32) -> (f64, f64, i32) {
+        self.app
+            .world_mut()
+            .non_send_resource_mut::<benilla_ui::script::UiScript>()
+            .eval(&format!("return GetPetActionCooldown({slot})"))
+            .unwrap()
+    }
+
+    /// What the pet's own list reads for `spell_id`, as the bar's reader asks it.
+    fn pet_reads(&self, spell_id: u32, spell: &SpellDisplay) -> (u32, u32) {
+        let info = self.app.world().resource::<PetBar>().cooldowns.info(
+            spell_id,
+            0,
+            Some(spell),
+            Instant::now(),
+        );
+        (info.remaining_ms, info.duration_ms)
+    }
+
+    /// Whether the pet's own list took no record at all, whichever category a reader asks in.
+    pub(super) fn pet_list_untouched(&self) -> bool {
+        self.app.world().resource::<PetBar>().cooldowns.generation == 0
+    }
+
+    /// Whether the player's own list was touched at all.
+    fn player_list_untouched(&self) -> bool {
+        self.app.world().resource::<Cooldowns>().generation == 0
+    }
+}
+
+pub(super) fn pet_actions(sent: &[ClientCommand]) -> usize {
+    sent.iter()
+        .filter(|c| matches!(c, ClientCommand::PetAction { .. }))
+        .count()
+}
+
+/// `0x4bd367`: the press starts the GCD on the pet's list before it sends, and every slot on the
+/// bar sharing the category reads it through `GetPetActionCooldown`.
+#[test]
+fn a_spell_press_starts_the_pets_gcd_for_every_slot_sharing_its_category() {
+    let mut rig = rig(
+        vec![(CLAW, claw()), (BITE, bite()), (GROWL, growl())],
+        &[CLAW, BITE, GROWL],
+        Some(owned_pet()),
+    );
+
+    rig.press(1);
+
+    assert_eq!(pet_actions(&rig.sent()), 1, "and the press still sends");
+    let (remaining, duration) = rig.pet_reads(CLAW, &claw());
+    assert_eq!(duration, 1500, "the spell's StartRecoveryTime");
+    assert!(remaining > 0 && remaining <= 1500, "running: {remaining}");
+    assert_eq!(
+        rig.pet_reads(BITE, &bite()).1,
+        1500,
+        "a spell sharing category 133 reads the same GCD, its own timers unstarted"
+    );
+    assert_eq!(
+        rig.pet_reads(GROWL, &growl()),
+        (0, 0),
+        "a spell outside the category reads nothing"
+    );
+    assert!(rig.player_list_untouched(), "list 1 is the pet's, not ours");
+
+    // `0x6e2e77`, `0x6e2e8e`: the flush, in the reference's order, and no bar update with it.
+    assert_eq!(
+        rig.frame(),
+        [
+            "ACTIONBAR_UPDATE_COOLDOWN",
+            "SPELL_UPDATE_COOLDOWN",
+            "PET_BAR_UPDATE_COOLDOWN"
+        ]
+    );
+    let (start, duration, enable) = rig.cooldown(1);
+    assert!(start > 0.0 && (duration - 1.5).abs() < 1e-9 && enable == 1);
+    let (_, duration, enable) = rig.cooldown(2);
+    assert!(
+        (duration - 1.5).abs() < 1e-9 && enable == 1,
+        "the second slot sweeps the GCD: {duration}"
+    );
+    assert_eq!(rig.cooldown(3), (0.0, 0.0, 1), "Growl shows no sweep");
+}
+
+/// `0x6e2e0f`-`0x6e2e21`: a spell with neither `StartRecovery*` field starts nothing.
+#[test]
+fn a_spell_without_a_gcd_pair_starts_none() {
+    let free = || SpellDisplay {
+        start_recovery_category: 0,
+        start_recovery_ms: 0,
+        ..claw()
+    };
+    let mut rig = rig(vec![(CLAW, free())], &[CLAW], Some(owned_pet()));
+
+    rig.press(1);
+
+    assert_eq!(pet_actions(&rig.sent()), 1);
+    assert!(rig.pet_list_untouched());
+    assert_eq!(rig.pet_reads(CLAW, &claw()), (0, 0));
+    assert!(rig.frame().is_empty(), "no cooldown edge either");
+}
+
+/// `0x4bd35e`-`0x4bd365`: a possessed unit's press returns into the generic cast entry
+/// (`0x6e4b60`), which starts its own GCD at its send (`0x6e58fb`), so this arm starts none.
+#[test]
+fn a_possessed_units_press_starts_no_pet_gcd() {
+    let charmed = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+        (CHARMEDBY, ME as u32),
+        (CHARMEDBY + 1, 0),
+        (FLAGS, crate::target::UNIT_FLAG_POSSESSED),
+    ]));
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], Some(charmed));
+
+    rig.press(1);
+
+    assert!(rig.pet_list_untouched());
+    assert!(rig.frame().is_empty());
+}
+
+/// `0x4bd355`: `AttributesEx4 & 0x20` takes the same route out of the arm.
+#[test]
+fn a_client_targeted_spell_press_starts_no_pet_gcd() {
+    let ground = || SpellDisplay {
+        attributes_ex4: 0x20,
+        ..claw()
+    };
+    let mut rig = rig(vec![(CLAW, ground())], &[CLAW], Some(owned_pet()));
+
+    rig.press(1);
+
+    assert!(rig.pet_list_untouched());
+    assert!(rig.frame().is_empty());
+}
+
+/// `0x4bd24f`: a press on a running aura cancels it and returns before the arm.
+#[test]
+fn an_aura_cancel_press_starts_no_pet_gcd() {
+    let running = owned_pet_with(&[(AURA, COWER), (AURAFLAGS, 0x3)]);
+    let mut rig = rig(vec![(COWER, cower())], &[COWER], Some(running));
+
+    rig.press(1);
+
+    let sent = rig.sent();
+    assert_eq!(pet_actions(&sent), 0, "the cancel sends no pet action");
+    assert!(sent.iter().any(|c| matches!(
+        c,
+        ClientCommand::PetCancelAura {
+            spell_id: COWER,
+            ..
+        }
+    )));
+    assert!(rig.pet_list_untouched());
+    assert!(rig.frame().is_empty());
+
+    // The same spell with its aura down is an ordinary press, and starts the GCD.
+    let mut rig = self::rig(vec![(COWER, cower())], &[COWER], Some(owned_pet()));
+    rig.press(1);
+    assert_eq!(rig.pet_reads(COWER, &cower()).1, 1500);
+}
+
+/// What a press latched: the mode word, its signal count and the attack latch.
+pub(super) fn latched(rig: &Rig) -> (u32, u32, bool) {
+    let bar = rig.app.world().resource::<PetBar>();
+    (bar.spells.state, bar.bar_signals, bar.attacking)
+}
+
+/// Everything a refused spell press leaves untouched: no command on the wire, nothing latched, no
+/// GCD on the pet's list, no event.
+pub(super) fn assert_press_refused(rig: &mut Rig, before: (u32, u32, bool)) {
+    assert!(rig.sent().is_empty(), "no packet of any kind");
+    assert_eq!(latched(rig), before, "nothing latched");
+    assert!(rig.pet_list_untouched(), "no GCD armed");
+    assert!(rig.frame().is_empty(), "no event");
+}
+
+/// `0x4bd1f2`: the dispatcher leaves for the epilogue, before the arm, its GCD and its send, when
+/// the pet's object does not resolve, as it is while the pet is out of view and the bar stands on
+/// its guid.
+#[test]
+fn a_spell_press_with_no_pet_object_sends_nothing_and_arms_nothing() {
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], None);
+    let before = latched(&rig);
+
+    rig.press(1);
+
+    assert_press_refused(&mut rig, before);
+}
+
+/// `0x4bd2e7`-`0x4bd2fe`: an id past the `Spell.dbc` table's maximum, or one inside it with no
+/// record, leaves the arm the same way; so does the unused slot's spell 0, which has none.
+#[test]
+fn a_spell_press_with_no_catalog_row_sends_nothing() {
+    // Slots 1-3: a row the catalog lacks, the unused slot's spell 0, and the top of the id range.
+    // Slot 4: the control, whose row it holds.
+    let mut rig = rig(
+        vec![(BITE, bite())],
+        &[CLAW, 0, u32::from(u16::MAX), BITE],
+        Some(owned_pet()),
+    );
+    let before = latched(&rig);
+
+    for slot in 1..=3 {
+        rig.press(slot);
+        assert_press_refused(&mut rig, before);
+    }
+
+    rig.press(4);
+    assert_eq!(pet_actions(&rig.sent()), 1, "the control sends");
+}
+
+/// `0x4bd1f2`: the predicate also needs the active player's object (`0x4bcf92`).
+#[test]
+fn a_spell_press_with_no_player_object_sends_nothing() {
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], Some(owned_pet()));
+    rig.app
+        .world_mut()
+        .resource_mut::<GuidIndex>()
+        .0
+        .remove(&ME);
+    // The bar greys as the player leaves, which is its own repaint.
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"]);
+    let before = latched(&rig);
+
+    rig.press(1);
+
+    assert_press_refused(&mut rig, before);
+}
+
+/// `0x4bd1f2`: the aura leg (`0x4bd240`) sits behind the predicate, so with the active player
+/// unresolved a running aura is not cancelled either.
+#[test]
+fn an_aura_cancel_press_with_no_player_object_sends_nothing() {
+    let running = owned_pet_with(&[(AURA, COWER), (AURAFLAGS, 0x3)]);
+    let mut rig = rig(vec![(COWER, cower())], &[COWER], Some(running));
+    rig.app
+        .world_mut()
+        .resource_mut::<GuidIndex>()
+        .0
+        .remove(&ME);
+    assert_eq!(rig.frame(), ["PET_BAR_UPDATE"], "the bar greys");
+    let before = latched(&rig);
+
+    rig.press(1);
+
+    assert_press_refused(&mut rig, before);
+}
+
+/// `0x4bd1f2`: a reaction and the Follow and Stay commands have no exit of their own (`0x4bd391`,
+/// `0x4bd3a3`), only the predicate's, so with the pet's object unresolved none latches or sends.
+#[test]
+fn a_command_or_reaction_press_with_no_pet_object_sends_nothing() {
+    let word = |kind: u8, action: u32| action | (u32::from(kind) << 24);
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], None);
+    for packed in [
+        word(PET_ACT_COMMAND, PET_COMMAND_FOLLOW),
+        word(PET_ACT_COMMAND, PET_COMMAND_STAY),
+        word(PET_ACT_REACTION, PET_REACT_AGGRESSIVE),
+    ] {
+        rig.app.world_mut().resource_mut::<PetBar>().spells.bar[0] = PetActionEntry::from(packed);
+        rig.frame();
+        let before = latched(&rig);
+
+        rig.press(1);
+
+        assert_press_refused(&mut rig, before);
+    }
+}
+
+/// Op 21 applies to `StartRecoveryTime` first (`0x6e2e2c`), the player's table for a pet's
+/// spell as for ours.
+#[test]
+fn the_pets_gcd_takes_the_players_op_21() {
+    let shaved = || SpellDisplay {
+        spell_family: 9,
+        spell_family_flags: 1,
+        ..claw()
+    };
+    let mut rig = rig(vec![(CLAW, shaved())], &[CLAW], Some(owned_pet()));
+    {
+        let mut mods = rig
+            .app
+            .world_mut()
+            .resource_mut::<crate::spell::SpellModifiers>();
+        mods.set_class_family(9);
+        mods.set(true, 0, crate::spell::OP_GCD, -500);
+    }
+
+    rig.press(1);
+
+    assert_eq!(rig.pet_reads(CLAW, &shaved()).1, 1000);
+}
+
+/// `0x4bd1f2`: the Attack command's own null-pet branch (`0x4bd403`-`0x4bd405`) repeats the lookup
+/// the predicate made (`0x4bd034`) on the same guid and typemask, so it never runs: with the pet's
+/// object unresolved the press leaves at the gate and sends nothing, at the selection or any
+/// other target.
+#[test]
+fn an_attack_press_with_no_pet_object_sends_nothing() {
+    const FOE: u64 = 0x77;
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], None);
+    let world = rig.app.world_mut();
+    // A player-controlled attacker, whose `CanAttack` arm needs no faction table.
+    let me = world.resource::<GuidIndex>().0[&ME];
+    world
+        .entity_mut(me)
+        .insert(ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (2, 0x19),
+            (22, 100),
+            (28, 100),
+            (FLAGS, 0x8),
+        ])));
+    let foe = world
+        .spawn((
+            Guid(FOE),
+            Transform::default(),
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (22, 100),
+                (28, 100),
+            ])),
+        ))
+        .id();
+    world.resource_mut::<GuidIndex>().0.insert(FOE, foe);
+    *world.resource_mut::<crate::target::Selection>() = crate::target::Selection {
+        target: Some(foe),
+        guid: Some(FOE),
+        ..Default::default()
+    };
+    let attack = PET_COMMAND_ATTACK | (u32::from(PET_ACT_COMMAND) << 24);
+    world.resource_mut::<PetBar>().spells.bar[0] = PetActionEntry::from(attack);
+    rig.frame();
+    let before = latched(&rig);
+
+    rig.press(1);
+
+    assert_press_refused(&mut rig, before);
+
+    // The same press with the pet streamed in goes out at the selection, and an ordinary pet's
+    // Attack raises no latch.
+    let world = rig.app.world_mut();
+    let pet = world
+        .spawn((Guid(PET), owned_pet_with(&[(22, 100), (28, 100)])))
+        .id();
+    world.resource_mut::<GuidIndex>().0.insert(PET, pet);
+
+    rig.press(1);
+
+    let sent = rig.sent();
+    assert!(
+        matches!(
+            sent.as_slice(),
+            [ClientCommand::PetAction { pet_guid: PET, packed, target_guid: FOE }] if *packed == attack
+        ),
+        "{sent:?}"
+    );
+    assert!(!latched(&rig).2, "an ordinary pet's Attack raises no latch");
+}
diff --git a/crates/benilla-app/src/ui_pet/tests.rs b/crates/benilla-app/src/ui_pet/tests.rs
index fe797681..3022534c 100644
--- a/crates/benilla-app/src/ui_pet/tests.rs
+++ b/crates/benilla-app/src/ui_pet/tests.rs
@@ -9,6 +9,7 @@ use benilla_protocol::messages::{
 use benilla_ui::script::PetActionView;
 
 use crate::net::{ClientCommand, NetCommands, ObjectStore};
+use crate::target::UNIT_FLAG_POSSESSED;
 
 use super::bar::*;
 use super::drain::*;
@@ -160,28 +161,6 @@ fn a_disabled_bar_reads_passive_and_lights_no_command() {
     );
 }
 
-#[test]
-fn usability_is_the_disabled_bit_and_the_pets_crowd_control() {
-    let mut bar = PetBar {
-        spells: state(PET_COMMAND_FOLLOW, PET_REACT_DEFENSIVE),
-        ..Default::default()
-    };
-    assert!(actions_usable(&bar, Some(0)));
-    assert!(
-        actions_usable(&bar, None),
-        "a missing descriptor is not a no"
-    );
-
-    for flag in [0x0004_0000, 0x0040_0000, 0x0080_0000] {
-        assert!(!actions_usable(&bar, Some(flag)), "flag {flag:#x} disables");
-    }
-    // Those three are stunned, confused, fleeing; POSSESSED is not among them.
-    assert!(actions_usable(&bar, Some(0x0100_0000)));
-
-    bar.spells.state |= PET_STATE_BAR_DISABLED;
-    assert!(!actions_usable(&bar, Some(0)));
-}
-
 #[test]
 fn spell_slots_read_their_autocast_off_bits_31_and_30() {
     let bar = state(PET_COMMAND_FOLLOW, PET_REACT_DEFENSIVE);
@@ -761,9 +740,10 @@ fn the_dismiss_word_is_the_carved_literal() {
     assert!(!entry.is_spell(), "dismiss is a command, never a cast");
 }
 
-/// The reference fires `PET_BAR_UPDATE_COOLDOWN` from the pet's cooldown bank (`0x6e2e8e`).
+/// A cooldown moves no bar: the feed pushes the new triple and fires nothing, for its events are
+/// the list's flush (`0x4b31b0`, `0x4bce90`), which `flush_tests` covers.
 #[test]
-fn a_cooldown_alone_fires_the_cooldown_event_and_not_the_bar_update() {
+fn a_cooldown_alone_is_pushed_with_no_event_from_the_bar_feed() {
     use bevy::prelude::*;
     use std::collections::HashMap;
     const CLAW: u32 = 3010;
@@ -779,6 +759,7 @@ fn a_cooldown_alone_fires_the_cooldown_event_and_not_the_bar_update() {
     let mut app = App::new();
     app.init_resource::<crate::ui_script::UiClock>()
         .init_resource::<crate::net::GuidIndex>()
+        .init_resource::<crate::net::SelfGuid>()
         .insert_resource(crate::ui_action::Spells {
             catalog: benilla_formats::SpellCatalog::from_displays(HashMap::from([(CLAW, claw())])),
             ..crate::ui_action::Spells::empty_for_tests()
@@ -818,11 +799,11 @@ fn a_cooldown_alone_fires_the_cooldown_event_and_not_the_bar_update() {
     app.world_mut()
         .resource_mut::<PetBar>()
         .cooldowns
-        .start_spell(CLAW, &claw(), 0, std::time::Instant::now());
+        .start_spell(CLAW, &claw(), 0, std::time::Instant::now(), None);
     assert_eq!(
         seen(&mut app),
-        vec!["PET_BAR_UPDATE_COOLDOWN".to_string()],
-        "a cooldown alone is the bank's edge, not the bar's"
+        Vec::<String>::new(),
+        "a cooldown alone is neither the bar's event nor this feed's"
     );
     let (start, duration, enable): (f64, f64, i32) = app
         .world_mut()
@@ -902,3 +883,155 @@ fn the_session_end_tears_the_pet_bar_down() {
     );
     assert!(bar.spells.bar[3].is_empty());
 }
+
+/// `UnitIsConnected` answers 1 for any unit the object manager holds (`0x517daf`), so the real
+/// `"pet"` feed's snapshot reads connected, and the stock pet frame's `UnitFrameManaBar_Update`
+/// takes its live leg: the pet's own power in its type's colour, not the disconnected leg's
+/// maximum in grey (UnitFrame.lua:214-216).
+#[test]
+fn a_held_pet_reads_connected_and_its_stock_power_bar_shows_its_power() {
+    use bevy::prelude::*;
+    benilla_formats::wow_data_or_skip!();
+    const PET: u64 = 0xF140_0000_0000_002A;
+    // `UNIT_FIELD_` HEALTH, MAXHEALTH, LEVEL, BYTES_0 (power type in byte 3), and focus, the power
+    // type a hunter's pet runs on, at POWER1 + 2 and MAXPOWER1 + 2.
+    const FOCUS: u32 = 2;
+    let fields = [
+        (22, 72),
+        (28, 100),
+        (34, 60),
+        (36, FOCUS << 24),
+        (25, 45),
+        (31, 80),
+    ];
+
+    let mut script = benilla_ui::script::UiScript::new().unwrap();
+    script.set_screen_size(1024.0, 768.0);
+    let failures = crate::ui_script::load_default_ui(&script);
+    assert!(failures.is_empty(), "load failures: {failures:?}");
+
+    let mut app = App::new();
+    app.add_message::<crate::net::FieldChanged>()
+        .init_resource::<crate::net::GuidIndex>()
+        .init_resource::<crate::net::SelfGuid>()
+        .init_resource::<crate::names::NameCache>()
+        .insert_resource(PetBar {
+            spells: PetSpells {
+                pet_guid: PET,
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .add_systems(Update, feed_pet_unit);
+    let (tx, rx) = crossbeam_channel::unbounded();
+    // Kept alive for the run: a dropped receiver would fail the name query.
+    std::mem::forget(rx);
+    app.insert_resource(NetCommands(tx));
+    let pet = app
+        .world_mut()
+        .spawn((
+            crate::net::Guid(PET),
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&fields)),
+        ))
+        .id();
+    app.world_mut()
+        .resource_mut::<crate::net::GuidIndex>()
+        .0
+        .insert(PET, pet);
+    app.insert_non_send_resource(script);
+
+    app.update();
+    let mut script = app
+        .world_mut()
+        .non_send_resource_mut::<benilla_ui::script::UiScript>();
+    script.resolve();
+    let (connected, shown, value, max, r, g, b) = script
+        .eval::<(Option<f64>, Option<f64>, f64, f64, f64, f64, f64)>(
+            "local _, max = PetFrameManaBar:GetMinMaxValues() \
+             local r, g, b = PetFrameManaBar:GetStatusBarColor() \
+             return UnitIsConnected('pet'), PetFrame:IsShown(), PetFrameManaBar:GetValue(), \
+                    max, r, g, b",
+        )
+        .unwrap();
+    assert_eq!(connected, Some(1.0), "a held pet is connected");
+    assert_eq!(shown, Some(1.0), "the feed's UNIT_PET showed the frame");
+    assert_eq!(
+        (value, max),
+        (45.0, 80.0),
+        "the pet's power, not its maximum"
+    );
+    assert_eq!(
+        (r, g, b),
+        (1.0, 0.5, 0.25),
+        "FOCUS, not the disconnected grey"
+    );
+    let errors = script.errors();
+    assert!(errors.is_empty(), "script errors: {errors:?}");
+}
+
+/// `UnitCreatureType("pet")` (`0x51a280`) names the pet's template through the resolver
+/// `0x605570`, keyed by the descriptor's `OBJECT_FIELD_ENTRY`: a held Imp is a Demon.
+#[test]
+fn a_held_pet_names_its_templates_creature_type() {
+    use bevy::prelude::*;
+    const PET: u64 = 0xF140_0000_0000_002A;
+    /// `OBJECT_FIELD_ENTRY`, and the Imp's template entry.
+    const OBJECT_FIELD_ENTRY: u16 = 3;
+    const IMP: u32 = 416;
+
+    let mut names = crate::names::NameCache::default();
+    names.insert_creature(
+        IMP,
+        Some(crate::names::CreatureRecord {
+            name: "Imp".into(),
+            subname: None,
+            creature_type: 3,
+            pet_family: 0,
+            rank: 0,
+            type_flags: 0,
+            civilian: false,
+            racial_leader: false,
+            display_id: 0,
+        }),
+    );
+    let mut app = App::new();
+    app.add_message::<crate::net::FieldChanged>()
+        .init_resource::<crate::net::GuidIndex>()
+        .init_resource::<crate::net::SelfGuid>()
+        .insert_resource(names)
+        .insert_resource(PetBar {
+            spells: PetSpells {
+                pet_guid: PET,
+                ..Default::default()
+            },
+            ..Default::default()
+        })
+        .add_systems(Update, feed_pet_unit);
+    let (tx, rx) = crossbeam_channel::unbounded();
+    // Kept alive for the run: a dropped receiver would fail the name query.
+    std::mem::forget(rx);
+    app.insert_resource(NetCommands(tx));
+    let pet = app
+        .world_mut()
+        .spawn((
+            crate::net::Guid(PET),
+            ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[(
+                OBJECT_FIELD_ENTRY,
+                IMP,
+            )])),
+        ))
+        .id();
+    app.world_mut()
+        .resource_mut::<crate::net::GuidIndex>()
+        .0
+        .insert(PET, pet);
+    app.insert_non_send_resource(benilla_ui::script::UiScript::new().unwrap());
+
+    app.update();
+    let answer = app
+        .world_mut()
+        .non_send_resource_mut::<benilla_ui::script::UiScript>()
+        .eval::<Option<String>>("return UnitCreatureType('pet')")
+        .unwrap();
+    assert_eq!(answer.as_deref(), Some("Demon"));
+}
diff --git a/crates/benilla-app/src/ui_pet/unit.rs b/crates/benilla-app/src/ui_pet/unit.rs
index bdb8d8d5..31d3471a 100644
--- a/crates/benilla-app/src/ui_pet/unit.rs
+++ b/crates/benilla-app/src/ui_pet/unit.rs
@@ -5,6 +5,7 @@ use bevy::prelude::*;
 
 use benilla_ui::script::{ScriptValue, UiScript, UnitState};
 
+use crate::creature_type::CreatureTypeSources;
 use crate::names::NameCache;
 use crate::net::{NetCommands, ObjectStore};
 use crate::ui_script::gate;
@@ -38,18 +39,22 @@ pub(super) const UNIT_FLAG_PET_IN_COMBAT: u32 = 0x0000_0800;
 pub(super) fn feed_pet_unit(
     script: Option<NonSendMut<UiScript>>,
     bar: Res<PetBar>,
-    mut pet: PetUnit,
+    pet: PetUnit,
+    // The per-field edges, for `fire_transitions`' watch-bridge arms.
+    mut field_edges: MessageReader<crate::net::FieldChanged>,
     changed_stores: Query<(), Changed<ObjectStore>>,
     mut removed_stores: RemovedComponents<ObjectStore>,
     mut names: ResMut<NameCache>,
     commands: Res<NetCommands>,
+    // The form table, the creature-type resolver's first stage.
+    spells: Option<Res<crate::ui_action::Spells>>,
     mut memory: Local<crate::ui_script::VmMemo<PetUnitMemory>>,
 ) {
     let Some(mut script) = script else {
         return;
     };
     let (memory, vm_reset) = memory.get_reset(&script);
-    let edges = crate::net::FieldEdges::collect(&mut pet.edges);
+    let edges = crate::net::FieldEdges::collect(&mut field_edges);
     let names_moved = memory.names_generation.moved(names.generation());
     let bar_changed = bar.is_changed();
     let stores_changed = !changed_stores.is_empty();
@@ -81,9 +86,8 @@ pub(super) fn feed_pet_unit(
                 .resolve_unit(pet_guid, Some(store), &commands)
                 .map(str::to_string);
             // No `ChrClasses.dbc`: the reference reads a class only for TYPEMASK_PLAYER.
-            let mut s = snapshot(store, name, 0, None);
-            s.guid = pet_guid;
-            s
+            let types = CreatureTypeSources::of_resources(&names, spells.as_deref());
+            snapshot(store, pet_guid, name, 0, None, types)
         });
 
     let dirty = match (&fresh, &memory.pushed) {
diff --git a/crates/benilla-app/src/ui_pet/usable.rs b/crates/benilla-app/src/ui_pet/usable.rs
new file mode 100644
index 00000000..0de724e5
--- /dev/null
+++ b/crates/benilla-app/src/ui_pet/usable.rs
@@ -0,0 +1,74 @@
+//! The pet-usability predicate `0x4bcf70`, asked once and by everything the reference lets it
+//! gate: `GetPetActionsUsable` (`0x4be0b3`), the dispatcher behind `CastPetAction` and the orders
+//! (`0x4bd1f2`), both autocast toggles (`0x4bcbcf`, `0x4bccce`) and the bar write the drag makes
+//! (`0x4bc9d0`, for the drop `0x4bce33` and the pickup's blank `0x4be27f`). A zero answer leaves
+//! each of them at its epilogue, before anything is latched, armed, cancelled or sent.
+
+use benilla_protocol::messages::{OwnerFallback, PET_UNUSABLE_UNIT_FLAGS};
+
+use crate::net::ObjectStore;
+
+use super::{PetBar, PetUnit};
+
+/// `0x4bcf70`, every exit in the order the bytes take them. `me` is the client's active player
+/// guid (`0x468550`); `player` is that guid's object and `pet` the bar's cached guid's (typemasks
+/// `0x10` and `8`), each `None` while it is not streamed.
+pub(super) fn actions_usable(
+    bar: &PetBar,
+    me: Option<u64>,
+    player: Option<&ObjectStore>,
+    pet: Option<&ObjectStore>,
+) -> bool {
+    // `0x4bcf92`: the active player must resolve.
+    let (Some(me), Some(player)) = (me, player) else {
+        return false;
+    };
+    // `0x4bcf98`-`0x4bcfa4`: a charmed player, whose `UNIT_FIELD_CHARMEDBY` pair is nonzero, has
+    // no pet bar to work.
+    if player.0.unit_charmed_by().is_some() {
+        return false;
+    }
+    // `0x4bcfbf`-`0x4bd012`: a view held on some unit, `PLAYER_FARSIGHT` (player field 712, at
+    // `[[player+0xe68]+0x830]`), must be on the pet: Eyes of the Beast keeps the bar, Far Sight or
+    // Mind Vision on anything else takes it. The two compares of the player's own guid against the
+    // active guid (`0x4bcfb7`, `0x4bcfe0`) are the lookup's key against itself, so the branch that
+    // zeroes the held guid (`0x4bcfe8`) has no way in.
+    if player
+        .0
+        .player_farsight()
+        .is_some_and(|held| held != bar.spells.pet_guid)
+    {
+        return false;
+    }
+    // `0x4bd034`-`0x4bd03d`: the cached guid must resolve to a unit.
+    let Some(pet) = pet else {
+        return false;
+    };
+    // `0x4bd03f`-`0x4bd067`: the pet's charmed-by guid, or its summoned-by guid while that is
+    // zero, must be the active player's.
+    if pet.0.unit_owner(OwnerFallback::SummonedBy) != Some(me) {
+        return false;
+    }
+    // `0x4bd06f`-`0x4bd08b`: stunned (`0x40000`), confused (`0x400000`) and fleeing (`0x800000`).
+    // Health is never read.
+    if pet.0.unit_flags() & PET_UNUSABLE_UNIT_FLAGS != 0 {
+        return false;
+    }
+    // `0x4bd08d`: bit 27 of the bar state `[0xb71468]`, which only the server writes.
+    !bar.spells.bar_disabled()
+}
+
+impl PetUnit<'_, '_> {
+    /// [`actions_usable`] for the bar as it stands: the pet's object when the predicate holds,
+    /// `None` when it does not. A caller past the gate holds the pet the predicate resolved, which
+    /// the dispatcher's own later lookups of the same guid find again (`0x4bd346`, `0x4bd403`).
+    pub(crate) fn usable_pet(&self, bar: &PetBar) -> Option<&ObjectStore> {
+        let pet = self.store(bar.spells.pet_guid);
+        pet.filter(|_| actions_usable(bar, self.self_guid.0, self.player_store(), pet))
+    }
+
+    /// `GetPetActionsUsable()`, and the gate every pet-bar verb the reference guards asks.
+    pub(crate) fn actions_usable(&self, bar: &PetBar) -> bool {
+        self.usable_pet(bar).is_some()
+    }
+}
diff --git a/crates/benilla-app/src/ui_pet/usable_tests.rs b/crates/benilla-app/src/ui_pet/usable_tests.rs
new file mode 100644
index 00000000..658561ba
--- /dev/null
+++ b/crates/benilla-app/src/ui_pet/usable_tests.rs
@@ -0,0 +1,705 @@
+//! The pet-usability predicate `0x4bcf70` and every verb it gates, whole client headless: each of
+//! its exits alone must grey `GetPetActionsUsable`, and must stop a press, an order, both autocast
+//! toggles and the drag's writes, while a pet that trips none of them takes all of it as before.
+
+use bevy::ecs::system::RunSystemOnce;
+use bevy::prelude::*;
+
+use benilla_protocol::messages::{
+    PetActionEntry, PET_ACT_COMMAND, PET_ACT_ENABLED, PET_ACT_REACTION, PET_COMMAND_ATTACK,
+    PET_COMMAND_FOLLOW, PET_COMMAND_STAY, PET_REACT_AGGRESSIVE, PET_STATE_BAR_DISABLED,
+};
+
+use crate::net::{ClientCommand, Guid, GuidIndex};
+use crate::target::UNIT_FLAG_POSSESSED;
+
+use super::press_tests::{
+    claw, latched, owned_pet, owned_pet_with, pet_actions, player_with, rig, Rig, CHARMEDBY, CLAW,
+    FLAGS, ME, PET, SUMMONEDBY,
+};
+use super::PetBar;
+
+/// `PLAYER_FARSIGHT`, low word: the view's anchor, the guid `0x4bcfbf`-`0x4bd012` holds against the
+/// pet's.
+const FARSIGHT: u16 = 712;
+/// Some other guid than ours or the pet's.
+const OTHER: u64 = 0x99;
+/// A foe the Attack order can be aimed at.
+const FOE: u64 = 0x77;
+
+fn guid_pair(field: u16, guid: u64) -> [(u16, u32); 2] {
+    [(field, guid as u32), (field + 1, (guid >> 32) as u32)]
+}
+
+/// The player, replaced: player-controlled, so the Attack order's validator needs no faction
+/// table, and carrying `extra`.
+fn set_player(rig: &mut Rig, extra: &[(u16, u32)]) {
+    let world = rig.app.world_mut();
+    let me = world.resource::<GuidIndex>().0[&ME];
+    let mut fields = vec![(FLAGS, 0x8)];
+    fields.extend_from_slice(extra);
+    world.entity_mut(me).insert(player_with(&fields));
+}
+
+/// The pet, replaced by [`owned_pet_with`] `extra`: alive, so the Attack order's validator passes.
+fn set_pet(rig: &mut Rig, extra: &[(u16, u32)]) {
+    let world = rig.app.world_mut();
+    let pet = world.resource::<GuidIndex>().0[&PET];
+    let mut fields = vec![(22, 100), (28, 100)];
+    fields.extend_from_slice(extra);
+    world.entity_mut(pet).insert(owned_pet_with(&fields));
+}
+
+const ATTACK: u32 = PET_COMMAND_ATTACK | ((PET_ACT_COMMAND as u32) << 24);
+const FOLLOW: u32 = PET_COMMAND_FOLLOW | ((PET_ACT_COMMAND as u32) << 24);
+const STAY: u32 = PET_COMMAND_STAY | ((PET_ACT_COMMAND as u32) << 24);
+const AGGRESSIVE: u32 = PET_REACT_AGGRESSIVE | ((PET_ACT_REACTION as u32) << 24);
+const CLAW_WORD: u32 = CLAW | ((PET_ACT_ENABLED as u32) << 24);
+
+/// A usable pet on a bar with Claw (autocast on) in slot 1, and in the pet's book, with the foe
+/// selected for the Attack order. Fed once, so the VM holds what the bar last pushed.
+fn scene() -> Rig {
+    let mut rig = rig(vec![(CLAW, claw())], &[CLAW], Some(owned_pet()));
+    set_player(&mut rig, &[]);
+    set_pet(&mut rig, &[]);
+    let world = rig.app.world_mut();
+    world.resource_mut::<PetBar>().spells.spells = vec![PetActionEntry::from(CLAW_WORD)];
+    let foe = world
+        .spawn((
+            Guid(FOE),
+            Transform::default(),
+            crate::net::ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+                (22, 100),
+                (28, 100),
+            ])),
+        ))
+        .id();
+    world.resource_mut::<GuidIndex>().0.insert(FOE, foe);
+    *world.resource_mut::<crate::target::Selection>() = crate::target::Selection {
+        target: Some(foe),
+        guid: Some(FOE),
+        ..Default::default()
+    };
+    rig.frame();
+    rig
+}
+
+/// One state of the world to try every verb in.
+struct Case {
+    name: &'static str,
+    apply: fn(&mut Rig),
+    /// What `0x4bcf70` answers.
+    usable: bool,
+    /// Whether `PickupPetAction`'s own gate lets the drag start: the pet's object must resolve
+    /// (`0x4be1f7`) and not be `UNIT_FLAG_POSSESSED` (`0x4be20a`), which is no exit of the
+    /// predicate, whose possession never blocks and whose unresolved pet is one of its exits.
+    draggable: bool,
+}
+
+/// One way `0x4bcf70` answers zero, and nothing else changed.
+type Exit = (&'static str, fn(&mut Rig));
+
+/// Every exit of the predicate, each alone, in the order the bytes take them.
+const EXITS: [Exit; 11] = [
+    ("the active player does not resolve (0x4bcf92)", |rig| {
+        rig.app
+            .world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .remove(&ME);
+    }),
+    ("the player is charmed (0x4bcf98)", |rig| {
+        set_player(rig, &guid_pair(CHARMEDBY, OTHER));
+    }),
+    (
+        "the player's far sight is on another unit (0x4bcfbf)",
+        |rig| set_player(rig, &guid_pair(FARSIGHT, OTHER)),
+    ),
+    ("the pet does not resolve (0x4bd034)", |rig| {
+        rig.app
+            .world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .remove(&PET);
+    }),
+    ("the pet is summoned by another (0x4bd054)", |rig| {
+        set_pet(rig, &guid_pair(SUMMONEDBY, OTHER));
+    }),
+    (
+        "the pet has no summoner, whatever created it (0x4bd054)",
+        |rig| set_pet(rig, &guid_pair(SUMMONEDBY, 0)),
+    ),
+    (
+        "the pet is charmed by another, summoned by us (0x4bd048)",
+        |rig| set_pet(rig, &guid_pair(CHARMEDBY, OTHER)),
+    ),
+    ("the pet is stunned (0x4bd075)", |rig| {
+        set_pet(rig, &[(FLAGS, 0x0004_0000)]);
+    }),
+    ("the pet is confused (0x4bd089)", |rig| {
+        set_pet(rig, &[(FLAGS, 0x0040_0000)]);
+    }),
+    ("the pet is fleeing (0x4bd081)", |rig| {
+        set_pet(rig, &[(FLAGS, 0x0080_0000)]);
+    }),
+    ("bit 27 of the bar state (0x4bd08d)", |rig| {
+        rig.app.world_mut().resource_mut::<PetBar>().spells.state |= PET_STATE_BAR_DISABLED;
+    }),
+];
+
+/// Pets that trip none of the exits, however much like one: each still works.
+const USABLE: [Exit; 5] = [
+    ("an untouched pet", |_| {}),
+    ("far sight on the pet itself, Eyes of the Beast", |rig| {
+        set_player(rig, &guid_pair(FARSIGHT, PET));
+    }),
+    (
+        "the pet charmed by us and summoned by another: the charmed-by wins",
+        |rig| {
+            let mut fields = guid_pair(CHARMEDBY, ME).to_vec();
+            fields.extend(guid_pair(SUMMONEDBY, OTHER));
+            set_pet(rig, &fields);
+        },
+    ),
+    ("the pet possessed, which greys nothing", |rig| {
+        set_pet(rig, &[(FLAGS, UNIT_FLAG_POSSESSED)]);
+    }),
+    ("the pet in combat", |rig| set_pet(rig, &[(FLAGS, 0x0800)])),
+];
+
+/// Every exit alone, then every pet that trips none: the cases the rest of the file runs each
+/// verb over.
+fn all_cases() -> impl Iterator<Item = Case> {
+    let usable = USABLE.iter().map(|&(name, apply)| Case {
+        name,
+        apply,
+        usable: true,
+        draggable: !name.contains("possessed"),
+    });
+    let exits = EXITS.iter().map(|&(name, apply)| Case {
+        name,
+        apply,
+        usable: false,
+        // Every other exit still lifts the action; only a pet that does not resolve returns first.
+        draggable: !name.starts_with("the pet does not resolve"),
+    });
+    usable.chain(exits)
+}
+
+/// What a press did, by name, so one assert says which effect leaked and for which case.
+fn effects(rig: &Rig, sent: Vec<ClientCommand>) -> Vec<&'static str> {
+    let mut out: Vec<&'static str> = sent
+        .iter()
+        .map(|c| match c {
+            ClientCommand::PetAction { .. } => "PetAction",
+            ClientCommand::PetCancelAura { .. } => "PetCancelAura",
+            _ => "another command",
+        })
+        .collect();
+    if !rig.pet_list_untouched() {
+        out.push("a GCD armed");
+    }
+    out
+}
+
+fn ui<R>(rig: &mut Rig, f: impl FnOnce(&mut benilla_ui::script::UiScript) -> R) -> R {
+    let mut script = rig
+        .app
+        .world_mut()
+        .non_send_resource_mut::<benilla_ui::script::UiScript>();
+    f(&mut script)
+}
+
+/// `GetPetActionsUsable()` as the Lua reads it after the feed ran.
+fn usable_answer(rig: &mut Rig) -> bool {
+    rig.frame();
+    ui(rig, |s| {
+        s.eval::<bool>("return GetPetActionsUsable() ~= nil")
+            .unwrap()
+    })
+}
+
+/// `0x4be0b3`: the display answers nil for each exit alone, and 1 for every pet that trips none.
+#[test]
+fn each_exit_alone_makes_get_pet_actions_usable_nil() {
+    for Case {
+        name,
+        apply,
+        usable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        assert_eq!(usable_answer(&mut rig), usable, "{name}");
+    }
+}
+
+/// `0x4bd1f2`: a spell press, and the orders: every one leaves at the gate, before the aura cancel,
+/// the latch, the GCD and the send.
+#[test]
+fn each_exit_alone_stops_a_press_and_every_order() {
+    for Case {
+        name,
+        apply,
+        usable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+        let before = latched(&rig);
+
+        rig.press(1);
+        let sent = rig.sent();
+        let got = effects(&rig, sent);
+        if usable {
+            // A possessed unit's press takes the generic cast entry, which arms its own GCD.
+            assert!(got.contains(&"PetAction"), "{name}: a spell press: {got:?}");
+        } else {
+            assert_eq!(got, Vec::<&str>::new(), "{name}: a spell press");
+            assert_eq!(latched(&rig), before, "{name}: nothing latched");
+        }
+
+        for (word, order) in [
+            (FOLLOW, "Follow"),
+            (STAY, "Stay"),
+            (AGGRESSIVE, "Aggressive"),
+            (ATTACK, "Attack"),
+        ] {
+            let before = latched(&rig);
+            rig.order(word);
+            let sent = rig.sent();
+            let went = sent
+                .iter()
+                .any(|c| matches!(c, ClientCommand::PetAction { packed, .. } if *packed == word));
+            assert_eq!(went, usable, "{name}: {order} sends only on a usable pet");
+            if !usable {
+                assert_eq!(latched(&rig), before, "{name}: {order} latched nothing");
+            }
+        }
+    }
+}
+
+/// `0x4bcbcf`: the bar's `TogglePetAutocast` flips the word and sends only for a usable pet.
+#[test]
+fn each_exit_alone_stops_the_bars_autocast_toggle() {
+    for Case {
+        name,
+        apply,
+        usable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+        let word = rig.app.world().resource::<PetBar>().spells.bar[0];
+
+        ui(&mut rig, |s| s.run("TogglePetAutocast(1)").unwrap());
+        rig.app
+            .world_mut()
+            .run_system_once(super::drain::drain_pet_actions)
+            .expect("the drain runs");
+
+        let sent = rig.sent();
+        let flipped = rig.app.world().resource::<PetBar>().spells.bar[0] != word;
+        assert_eq!(flipped, usable, "{name}: the word flips only when usable");
+        assert_eq!(
+            sent.iter()
+                .filter(|c| matches!(c, ClientCommand::PetSetAction { .. }))
+                .count(),
+            usize::from(usable),
+            "{name}: the toggle is sent only when usable"
+        );
+    }
+}
+
+/// `0x4bccce`: the pet book's `ToggleSpellAutocast` flips the word, repaints and sends only for a
+/// usable pet.
+#[test]
+fn each_exit_alone_stops_the_pet_books_autocast_toggle() {
+    for Case {
+        name,
+        apply,
+        usable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+        let (word, signals) = {
+            let bar = rig.app.world().resource::<PetBar>();
+            (bar.spells.spells[0], bar.bar_signals)
+        };
+
+        ui(&mut rig, |s| {
+            s.run("ToggleSpellAutocast(1, BOOKTYPE_PET)").unwrap()
+        });
+        rig.app
+            .world_mut()
+            .run_system_once(crate::ui_pet_book::drain_pet_book)
+            .expect("the drain runs");
+
+        let sent = rig.sent();
+        let bar = rig.app.world().resource::<PetBar>();
+        assert_eq!(
+            bar.spells.spells[0] != word,
+            usable,
+            "{name}: the book's word flips only when usable"
+        );
+        assert_eq!(
+            bar.bar_signals != signals,
+            usable,
+            "{name}: the bar repaints only when usable"
+        );
+        assert_eq!(
+            sent.iter()
+                .filter(|c| matches!(c, ClientCommand::PetSpellAutocast { .. }))
+                .count(),
+            usize::from(usable),
+            "{name}: the toggle is sent only when usable"
+        );
+    }
+}
+
+/// `0x4bd6e0`: the pet menu's Dismiss hands its command word to the dispatcher, so it is refused
+/// at `0x4bd1f2` like any other order.
+#[test]
+fn each_exit_alone_stops_the_menus_dismiss() {
+    const DISMISS: u32 = 0x0700_0003;
+    for Case {
+        name,
+        apply,
+        usable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+
+        ui(&mut rig, |s| s.run("PetDismiss()").unwrap());
+        rig.app
+            .world_mut()
+            .run_system_once(super::menu::drain_pet_menu)
+            .expect("the drain runs");
+
+        let went = rig
+            .sent()
+            .iter()
+            .any(|c| matches!(c, ClientCommand::PetAction { packed, .. } if *packed == DISMISS));
+        assert_eq!(went, usable, "{name}: Dismiss sends only on a usable pet");
+    }
+}
+
+/// `0x4bc9d0`, from the drop `0x4bce33` and the pickup's blank `0x4be27f`: lifting Claw and
+/// dropping it on the next slot writes and sends nothing on an unusable pet, and two writes on a
+/// usable one.
+#[test]
+fn each_exit_alone_stops_the_drags_writes() {
+    for Case {
+        name,
+        apply,
+        usable,
+        draggable,
+    } in all_cases()
+    {
+        let writes = usable && draggable;
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+        let bar_before = rig.app.world().resource::<PetBar>().spells.bar;
+
+        ui(&mut rig, |s| {
+            s.run("PickupPetAction(1) PickupPetAction(2)").unwrap();
+        });
+        rig.app
+            .world_mut()
+            .run_system_once(super::drain::drain_pet_actions)
+            .expect("the drain runs");
+
+        let sent = rig.sent();
+        let bar = rig.app.world().resource::<PetBar>().spells.bar;
+        assert_eq!(
+            sent.iter()
+                .filter(|c| matches!(c, ClientCommand::PetSetAction { .. }))
+                .count(),
+            if writes { 2 } else { 0 },
+            "{name}: the pickup's blank and the drop send only when usable"
+        );
+        assert_eq!(
+            bar != bar_before,
+            writes,
+            "{name}: the bar's words move only when usable"
+        );
+    }
+}
+
+/// `0x4be1f7`-`0x4be20a`: `PickupPetAction` looks the pet up and returns at once with no object,
+/// then again on `UNIT_FLAG_POSSESSED`, so a drag from an unstreamed or a possessed pet's bar lifts
+/// nothing. Every other state lifts the action, an unusable pet included: `0x4bc9d0` refuses only
+/// the pickup's blank, never the lift (`0x4be25d`).
+#[test]
+fn the_pickup_lifts_only_with_the_pets_object_held_and_not_possessed() {
+    for Case {
+        name,
+        apply,
+        draggable,
+        ..
+    } in all_cases()
+    {
+        let mut rig = scene();
+        apply(&mut rig);
+        rig.frame();
+
+        ui(&mut rig, |s| s.run("PickupPetAction(1)").unwrap());
+        let held = ui(&mut rig, |s| {
+            matches!(
+                s.cursor_payload(),
+                Some(benilla_ui::script::CursorPayload::PetAction(c)) if c.src_slot == 1
+            )
+        });
+        assert_eq!(
+            held, draggable,
+            "{name}: the action is lifted onto the cursor"
+        );
+    }
+}
+
+/// The same lookup sits above the cursor fork, so a held action is neither dropped nor cleared
+/// while the pet's object is gone: the drop's `ClearCursor` (`0x4be220`) is past it.
+#[test]
+fn a_held_action_stays_held_while_the_pet_is_out_of_view() {
+    let mut rig = scene();
+    ui(&mut rig, |s| s.run("PickupPetAction(1)").unwrap());
+    rig.app
+        .world_mut()
+        .resource_mut::<GuidIndex>()
+        .0
+        .remove(&PET);
+    rig.frame();
+    rig.app
+        .world_mut()
+        .run_system_once(super::drain::drain_pet_actions)
+        .expect("the drain runs");
+    let _ = rig.sent();
+
+    ui(&mut rig, |s| s.run("PickupPetAction(2)").unwrap());
+    rig.app
+        .world_mut()
+        .run_system_once(super::drain::drain_pet_actions)
+        .expect("the drain runs");
+
+    assert!(
+        matches!(
+            ui(&mut rig, |s| s.cursor_payload()),
+            Some(benilla_ui::script::CursorPayload::PetAction(c)) if c.src_slot == 1
+        ),
+        "the payload is still on the cursor"
+    );
+    assert!(
+        !rig.sent()
+            .iter()
+            .any(|c| matches!(c, ClientCommand::PetSetAction { .. })),
+        "and nothing was written"
+    );
+}
+
+/// The whole default UI on the rig's world in place of its listening VM: the stock pet bar, and
+/// the fed pet under it.
+fn with_stock_ui(rig: &mut Rig) {
+    let mut script = benilla_ui::script::UiScript::new().expect("a VM");
+    script.set_screen_size(1024.0, 768.0);
+    // The in-game UI loads on world entry, so a player exists.
+    script.set_unit(
+        "player",
+        Some(benilla_ui::script::UnitState {
+            exists: true,
+            name: Some("Probefour".into()),
+            level: 60,
+            ..Default::default()
+        }),
+    );
+    let failures = crate::ui_script::load_default_ui(&script);
+    assert!(failures.is_empty(), "manifest load errors: {failures:#?}");
+    rig.app.world_mut().insert_non_send_resource(script);
+}
+
+/// The feeds, then the VM's clock and layout, so the bar's slide and repaint have happened.
+fn settle(rig: &mut Rig) {
+    rig.feed.run(rig.app.world_mut());
+    ui(rig, |s| {
+        for _ in 0..3 {
+            s.tick(0.05);
+        }
+        s.resolve();
+    });
+}
+
+/// Whether the button's icon quad draws greyscale: `PetActionBar_Update`'s `SetDesaturation` on
+/// `PetActionButton1Icon` (`PetActionBarFrame.lua:129-134`).
+fn icon_is_grey(rig: &mut Rig, icon: &str) -> bool {
+    ui(rig, |s| {
+        s.extract()
+            .iter()
+            .find_map(|q| match &q.content {
+                benilla_ui::script::QuadContent::Texture {
+                    path: Some(p),
+                    desaturated,
+                    ..
+                } if p == icon => Some(*desaturated),
+                _ => None,
+            })
+            .unwrap_or_else(|| panic!("the icon {icon} is on screen"))
+    })
+}
+
+/// A left click on `PetActionButton1`, at its own centre, and the frame's script calls applied.
+fn click_first_button(rig: &mut Rig) {
+    let (x, y): (f32, f32) = ui(rig, |s| {
+        s.eval("return PetActionButton1:GetCenter()").unwrap()
+    });
+    ui(rig, |s| {
+        s.mouse_button(x, y, "LeftButton", true);
+        s.mouse_button(x, y, "LeftButton", false);
+    });
+    rig.app
+        .world_mut()
+        .run_system_once(crate::script_calls::apply_script_calls)
+        .expect("the frame's script calls apply");
+}
+
+/// With the default UI loaded, the stock bar reads `GetPetActionsUsable` for its icons and clicks
+/// `CastPetAction` whatever it answered, so the engine's gate is the only one: a stunned pet's bar
+/// greys, and clicking it sends nothing (`0x4bd1f2`), where the same click on the pet before it was
+/// stunned went out.
+#[test]
+fn the_stock_bar_greys_a_stunned_pet_and_its_click_sends_nothing() {
+    benilla_formats::wow_data_or_skip!();
+    const ICON: &str = "Interface\\Icons\\Ability_Druid_Rake";
+    let display = benilla_formats::SpellDisplay {
+        icon: Some(ICON.into()),
+        ..claw()
+    };
+    let mut rig = rig(vec![(CLAW, display)], &[CLAW], Some(owned_pet()));
+    with_stock_ui(&mut rig);
+    settle(&mut rig);
+
+    assert!(
+        !icon_is_grey(&mut rig, ICON),
+        "a usable pet's icon is in colour"
+    );
+    click_first_button(&mut rig);
+    assert_eq!(
+        pet_actions(&rig.sent()),
+        1,
+        "and its button presses, as before"
+    );
+
+    set_pet(&mut rig, &[(FLAGS, 0x0004_0000)]);
+    settle(&mut rig);
+
+    assert!(icon_is_grey(&mut rig, ICON), "a stunned pet's bar greys");
+    let before = latched(&rig);
+    click_first_button(&mut rig);
+    assert!(
+        rig.sent().is_empty(),
+        "the click on the greyed button sends nothing"
+    );
+    assert_eq!(latched(&rig), before);
+
+    // The same click again once the stun ends.
+    set_pet(&mut rig, &[]);
+    settle(&mut rig);
+    assert!(!icon_is_grey(&mut rig, ICON));
+    click_first_button(&mut rig);
+    assert_eq!(pet_actions(&rig.sent()), 1);
+}
+
+/// `0x4bd06f`-`0x4bd08b` read three flags and never the pet's health: a dead pet's bar is usable,
+/// its press goes out, and only the Attack order's own validator refuses it (`0x612e10`).
+#[test]
+fn a_dead_pet_is_still_usable() {
+    let mut rig = scene();
+    set_pet(&mut rig, &[(22, 0)]);
+
+    assert!(usable_answer(&mut rig));
+    rig.press(1);
+    assert_eq!(pet_actions(&rig.sent()), 1, "the spell press goes out");
+    rig.order(FOLLOW);
+    assert_eq!(pet_actions(&rig.sent()), 1, "and so does Follow");
+    rig.order(ATTACK);
+    assert_eq!(
+        pet_actions(&rig.sent()),
+        0,
+        "the attack validator refuses the dead actor, past the gate"
+    );
+}
+
+/// The predicate on its own, over every field it reads, so the exit table above is what the
+/// function says and not what the rig happens to build.
+#[test]
+fn the_predicate_reads_exactly_the_reference_fields() {
+    use super::usable::actions_usable;
+    let store = |fields: &[(u16, u32)]| {
+        crate::net::ObjectStore(benilla_protocol::ObjectFields::from_pairs(fields))
+    };
+    let bar = PetBar {
+        spells: benilla_protocol::messages::PetSpells {
+            pet_guid: PET,
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+    let me = Some(ME);
+    let player = store(&[(2, 0x19)]);
+    let pet = owned_pet();
+
+    assert!(actions_usable(&bar, me, Some(&player), Some(&pet)));
+    assert!(!actions_usable(&bar, None, Some(&player), Some(&pet)));
+    assert!(!actions_usable(&bar, me, None, Some(&pet)));
+    assert!(!actions_usable(&bar, me, Some(&player), None));
+
+    // The owner is `CHARMEDBY` when set, else `SUMMONEDBY`, and never `CREATEDBY`.
+    let created_only = store(&[(14, ME as u32), (15, 0)]);
+    assert!(!actions_usable(
+        &bar,
+        me,
+        Some(&player),
+        Some(&created_only)
+    ));
+    let unowned = store(&[]);
+    assert!(!actions_usable(&bar, me, Some(&player), Some(&unowned)));
+
+    // A far-sight guid of zero is no view; the pet's own guid is the one that stays usable.
+    let zero_view = store(&[(FARSIGHT, 0), (FARSIGHT + 1, 0)]);
+    assert!(actions_usable(&bar, me, Some(&zero_view), Some(&pet)));
+    let on_pet = store(&[(FARSIGHT, PET as u32), (FARSIGHT + 1, 0)]);
+    assert!(actions_usable(&bar, me, Some(&on_pet), Some(&pet)));
+    let elsewhere = store(&[(FARSIGHT, OTHER as u32), (FARSIGHT + 1, 0)]);
+    assert!(!actions_usable(&bar, me, Some(&elsewhere), Some(&pet)));
+    // The high word counts: a view whose low word is the pet's and whose high word is not.
+    let high_only = store(&[(FARSIGHT, PET as u32), (FARSIGHT + 1, 1)]);
+    assert!(!actions_usable(&bar, me, Some(&high_only), Some(&pet)));
+
+    // Each of the three flags alone, and no other.
+    for flag in [0x0004_0000, 0x0040_0000, 0x0080_0000] {
+        let hurt = owned_pet_with(&[(FLAGS, flag)]);
+        assert!(
+            !actions_usable(&bar, me, Some(&player), Some(&hurt)),
+            "flag {flag:#x} disables"
+        );
+    }
+    let possessed = owned_pet_with(&[(FLAGS, UNIT_FLAG_POSSESSED)]);
+    assert!(actions_usable(&bar, me, Some(&player), Some(&possessed)));
+
+    let mut disabled = PetBar {
+        spells: bar.spells.clone(),
+        ..Default::default()
+    };
+    disabled.spells.state |= PET_STATE_BAR_DISABLED;
+    assert!(!actions_usable(&disabled, me, Some(&player), Some(&pet)));
+}
diff --git a/crates/benilla-app/src/ui_pet_book.rs b/crates/benilla-app/src/ui_pet_book.rs
index d0bf3421..38ac0a22 100644
--- a/crates/benilla-app/src/ui_pet_book.rs
+++ b/crates/benilla-app/src/ui_pet_book.rs
@@ -22,9 +22,8 @@ use benilla_protocol::messages::PetActionEntry;
 use benilla_ui::script::{PetBookState, SpellSlotView, UiScript};
 
 use crate::net::{ClientCommand, GuidIndex, NetCommands, ObjectStore, SelfPlayer};
-use crate::target::Selection;
 use crate::ui_action::Spells;
-use crate::ui_pet::PetBar;
+use crate::ui_pet::{PetBar, PetUnit};
 use crate::ui_script::UiInput;
 use crate::ui_unit::UnitFeed;
 
@@ -39,9 +38,11 @@ impl Plugin for UiPetBookPlugin {
                 feed_pet_book
                     .in_set(UnitFeed)
                     .before(crate::ui_action::CooldownEvents),
-                // After the input pass; it writes back into `PetBar`, whose next feed carries the
-                // mirrored autocast bit.
-                drain_pet_book.after(UiInput),
+                // After the input pass and this frame's pet book casts; it writes back into
+                // `PetBar`, whose next feed carries the mirrored autocast bit.
+                drain_pet_book
+                    .after(UiInput)
+                    .after(crate::script_calls::apply_script_calls),
             ),
         );
     }
@@ -49,11 +50,11 @@ impl Plugin for UiPetBookPlugin {
 
 /// What the feed last pushed, so `SPELLS_CHANGED` fires only on a real change.
 #[derive(Default)]
-struct FeedMemory {
+pub(crate) struct FeedMemory {
     pushed: PetBookState,
 }
 
-fn feed_pet_book(
+pub(crate) fn feed_pet_book(
     script: Option<NonSendMut<UiScript>>,
     bar: Res<PetBar>,
     spells: Option<Res<Spells>>,
@@ -116,16 +117,18 @@ fn feed_pet_book(
         script.set_pet_book(fresh.clone());
         memory.pushed = fresh;
         // One `SPELLS_CHANGED` for both books off the shared re-sort (`0x4b2fd0` tail-jumps
-        // `SignalEvent(0x104)`). Cooldown and autocast repaint the pet page through
-        // `PET_BAR_UPDATE` (`SpellBookFrame.lua:214`, `227-231`), which `ui_pet`'s feed fires.
+        // `SignalEvent(0x104)`). A cooldown repaints the pet page through the flush's
+        // `SPELL_UPDATE_COOLDOWN` (`SpellBookFrame.lua:209`, `221`), which `ui_pet`'s
+        // `fire_pet_cooldown_events` fires after this feed's push; autocast, through
+        // `PET_BAR_UPDATE` (`227-231`), which `ui_pet`'s feed fires.
         if changed {
             script.fire_event("SPELLS_CHANGED", vec![]);
         }
     }
 }
 
-/// Whether the book itself changed; a slot's cooldown, autocast or ring reaches the buttons
-/// through `PET_BAR_UPDATE` instead.
+/// Whether the book itself changed; a slot's cooldown reaches the buttons through the flush's
+/// `SPELL_UPDATE_COOLDOWN`, its autocast and ring through `PET_BAR_UPDATE`, instead.
 fn book_changed(fresh: &PetBookState, old: &PetBookState) -> bool {
     fresh.token != old.token
         || fresh.slots.len() != old.slots.len()
@@ -167,21 +170,54 @@ fn slot_view(
     }
 }
 
-/// Drains the pet book's two intents.
-fn drain_pet_book(
+/// `CastSpell(id, "pet", onSelf)`: cancel first, as on the bar (`0x4b33af`-`0x4b3461`), a spell
+/// whose aura is on the pet sending `CMSG_PET_CANCEL_AURA` (0x26B) instead of the order; else
+/// `CMSG_PET_ACTION` at the selection as the calls before it left it, or with `onSelf` at the
+/// player. Unlike the bar's press it asks no usability predicate: no call site of `0x4bcf70` is
+/// in this path.
+pub(crate) fn cast_pet_spell(p: &mut crate::ui_pet::PetPress, spell_id: u32, on_self: bool) {
+    let pet_guid = p.bar.spells.pet_guid;
+    if pet_guid == 0 {
+        debug!("ui_pet_book: dropping a queued pet book cast — the bar is gone");
+        return;
+    }
+    let target_guid = p.spell_target(on_self);
+    let display = p.spells.as_ref().and_then(|s| s.catalog.get(spell_id));
+    if let (Some(d), Some(store)) = (display, p.pet.store(pet_guid)) {
+        if crate::ui_action::toggle::active_action_toggle(spell_id, d, store) {
+            debug!("ui_pet_book: cast {spell_id} cancels the pet's own aura");
+            let _ = p
+                .commands
+                .0
+                .send(ClientCommand::PetCancelAura { pet_guid, spell_id });
+            return;
+        }
+    }
+    // The word built for the send (`0x4b350a`-`0x4b3516`): type 1, the spell branch, autocast
+    // bits clear; with no target passed it aims at the selection (`0x4b34af`).
+    let packed = 0x0100_0000 | (spell_id & 0xFFFF);
+    debug!("ui_pet_book: cast {spell_id} (target {target_guid:#x})");
+    let _ = p.commands.0.send(ClientCommand::PetAction {
+        pet_guid,
+        packed,
+        target_guid,
+    });
+}
+
+/// Drains the pet book's `ToggleSpellAutocast` intents. Each asks the usability predicate before
+/// it looks anything up (`0x4bccce`), so an unusable pet's toggle flips, repaints and sends
+/// nothing.
+pub(crate) fn drain_pet_book(
     script: Option<NonSendMut<UiScript>>,
     mut bar: ResMut<PetBar>,
-    selection: Res<Selection>,
     commands: Res<NetCommands>,
-    spells: Option<Res<Spells>>,
-    pet: crate::ui_pet::PetUnit,
+    pet: PetUnit,
 ) {
     let Some(mut script) = script else {
         return;
     };
-    let casts = script.take_pet_spell_casts();
     let autocasts = script.take_pet_spell_autocasts();
-    if casts.is_empty() && autocasts.is_empty() {
+    if autocasts.is_empty() {
         return;
     }
     let pet_guid = bar.spells.pet_guid;
@@ -189,34 +225,11 @@ fn drain_pet_book(
         debug!("ui_pet_book: dropping queued pet book intents — the bar is gone");
         return;
     }
-    let target_guid = selection.guid.unwrap_or(0);
-    let pet_store = pet.store(pet_guid);
-
-    for spell_id in casts {
-        // Cancel first, as on the bar (`0x4b33af`-`0x4b3461`): a spell whose aura is on the pet
-        // sends `CMSG_PET_CANCEL_AURA` (0x26B) instead of the order.
-        let display = spells.as_ref().and_then(|s| s.catalog.get(spell_id));
-        if let (Some(d), Some(store)) = (display, pet_store) {
-            if crate::ui_action::toggle::active_action_toggle(spell_id, d, store) {
-                debug!("ui_pet_book: cast {spell_id} cancels the pet's own aura");
-                let _ = commands
-                    .0
-                    .send(ClientCommand::PetCancelAura { pet_guid, spell_id });
-                continue;
-            }
-        }
-        // The word built for the send (`0x4b350a`-`0x4b3516`): type 1, the spell branch, autocast
-        // bits clear; with no target passed it aims at the selection (`0x4b34af`).
-        let packed = 0x0100_0000 | (spell_id & 0xFFFF);
-        debug!("ui_pet_book: cast {spell_id} (target {target_guid:#x})");
-        let _ = commands.0.send(ClientCommand::PetAction {
-            pet_guid,
-            packed,
-            target_guid,
-        });
-    }
-
     for spell_id in autocasts {
+        if !pet.actions_usable(&bar) {
+            debug!("ui_pet_book: autocast {spell_id} refused, the pet's actions are not usable");
+            continue;
+        }
         let Some(on) = flip_autocast(&mut bar.spells, spell_id) else {
             continue;
         };
diff --git a/crates/benilla-app/src/ui_petition/feed.rs b/crates/benilla-app/src/ui_petition/feed.rs
index 38b6147e..32bc555b 100644
--- a/crates/benilla-app/src/ui_petition/feed.rs
+++ b/crates/benilla-app/src/ui_petition/feed.rs
@@ -173,6 +173,8 @@ pub(super) fn drain_petition(
     self_guid: Res<SelfGuid>,
     selection: Res<crate::target::Selection>,
     commands: Res<NetCommands>,
+    tabard: Res<crate::ui_tabard::TabardOpen>,
+    mut errors: ResMut<crate::ui_action::UiErrorKeys>,
 ) {
     let Some(mut script) = script else {
         return;
@@ -212,6 +214,19 @@ pub(super) fn drain_petition(
             }
             // Sends nothing.
             PetitionRequest::CloseRegistrar => registrar.close(),
+            PetitionRequest::TabardInfo => {
+                let npc = registrar.npc().unwrap_or(0);
+                if let Some(store) = self_q.iter().next() {
+                    tabard_vendor_activate(
+                        npc,
+                        tabard.npc().unwrap_or(0),
+                        store,
+                        &commands,
+                        &mut errors,
+                    );
+                }
+                registrar.close();
+            }
             PetitionRequest::ClosePetition => {
                 petition.decline_on_close(me, &commands);
                 petition.close();
@@ -263,3 +278,77 @@ pub(super) fn drain_petition(
         }
     }
 }
+
+/// `0x5e00e0`, the designer's opener, for `GetTabardInfo` with the registrar's guid `npc`
+/// (`0x4f5338`): nothing while the designer is open on that guid (`0x5e00e6`-`0x5e00fc`, so two
+/// zero guids send nothing), the refusal while the player's `UNIT_FIELD_DISPLAYID` is not its
+/// `UNIT_FIELD_NATIVEDISPLAYID` (`0x5e0102`-`0x5e0116`, error `0x130`), else the packet.
+fn tabard_vendor_activate(
+    npc: u64,
+    designer: u64,
+    player: &ObjectStore,
+    commands: &NetCommands,
+    errors: &mut crate::ui_action::UiErrorKeys,
+) {
+    if designer == npc {
+        return;
+    }
+    if player.0.unit_displayid() != player.0.unit_native_displayid() {
+        errors.0.push(crate::ui_action::UiError::key(
+            "ERR_EMBLEMERROR_NOTABARDGEOSET",
+        ));
+        return;
+    }
+    let _ = commands.0.send(ClientCommand::TabardVendorActivate { npc });
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::ui_action::UiErrorKeys;
+    use benilla_protocol::ObjectFields;
+
+    /// The player's display ids, `UNIT_FIELD_DISPLAYID` (131) and `UNIT_FIELD_NATIVEDISPLAYID`.
+    fn player(display: u32, native: u32) -> ObjectStore {
+        ObjectStore(ObjectFields::from_pairs(&[(131, display), (132, native)]))
+    }
+
+    fn run(npc: u64, designer: u64, me: &ObjectStore) -> (Vec<ClientCommand>, Vec<&'static str>) {
+        let (tx, rx) = crossbeam_channel::unbounded();
+        let mut errors = UiErrorKeys::default();
+        tabard_vendor_activate(npc, designer, me, &NetCommands(tx), &mut errors);
+        (
+            rx.try_iter().collect(),
+            errors.0.iter().map(|e| e.key).collect(),
+        )
+    }
+
+    #[test]
+    fn get_tabard_info_opens_the_designer_for_the_registrar() {
+        let (sent, errors) = run(0x42, 0, &player(49, 49));
+        assert!(
+            matches!(
+                sent.as_slice(),
+                [ClientCommand::TabardVendorActivate { npc: 0x42 }]
+            ),
+            "{sent:?}"
+        );
+        assert!(errors.is_empty());
+    }
+
+    #[test]
+    fn get_tabard_info_sends_nothing_to_a_designer_already_open_on_that_npc() {
+        let (sent, errors) = run(0x42, 0x42, &player(49, 49));
+        assert!(sent.is_empty() && errors.is_empty());
+        // With no registrar and no designer both guids are 0: equal, so nothing.
+        let (sent, _) = run(0, 0, &player(49, 49));
+        assert!(sent.is_empty());
+    }
+
+    #[test]
+    fn get_tabard_info_refuses_a_shapeshifted_player() {
+        let (sent, errors) = run(0x42, 0, &player(2281, 49));
+        assert!(sent.is_empty());
+        assert_eq!(errors, ["ERR_EMBLEMERROR_NOTABARDGEOSET"]);
+    }
+}
diff --git a/crates/benilla-app/src/ui_quest/mod.rs b/crates/benilla-app/src/ui_quest/mod.rs
index 26d0948f..8979e37b 100644
--- a/crates/benilla-app/src/ui_quest/mod.rs
+++ b/crates/benilla-app/src/ui_quest/mod.rs
@@ -389,7 +389,7 @@ fn panel_event(panel: QuestPanel) -> &'static str {
 
 /// Push the quest view into the VM and fire its events: a panel's open event on a new panel,
 /// `QUEST_ITEM_UPDATE` on a content change, `QUEST_FINISHED` on close.
-fn feed_quest(
+pub(crate) fn feed_quest(
     script: Option<NonSendMut<UiScript>>,
     mut giver: ResMut<QuestGiver>,
     objects: crate::net::Objects,
diff --git a/crates/benilla-app/src/ui_saved.rs b/crates/benilla-app/src/ui_saved.rs
index d5388072..a718e605 100644
--- a/crates/benilla-app/src/ui_saved.rs
+++ b/crates/benilla-app/src/ui_saved.rs
@@ -26,8 +26,8 @@ impl Plugin for UiSavedPlugin {
 /// A malformed or unreadable file warns and is held ([`UiScript::hold_saved_file`]), so the
 /// shutdown write leaves it alone. Read as bytes: the writer keeps a Lua string's raw bytes.
 ///
-/// `host_settings` seats the `RegisterForSave` globals kept in `config.toml` (the nameplate pair):
-/// after the chunk, so a stale line here cannot outvote `config.toml`, and before the event, where
+/// `host_settings` seats what the host carries into a `RegisterForSave` global (a plate setting
+/// left in `config.toml`): after the chunk, so it outranks the file, and before the event, where
 /// the consumers run (`UIParent_OnEvent` → `UpdateNameplates`).
 pub(crate) fn load_saved_variables(
     script: &mut UiScript,
diff --git a/crates/benilla-app/src/ui_script/action_bar_tests.rs b/crates/benilla-app/src/ui_script/action_bar_tests.rs
index e9f415c8..ef05f764 100644
--- a/crates/benilla-app/src/ui_script/action_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/action_bar_tests.rs
@@ -11,19 +11,38 @@ fn shipped_action_bar_drives_end_to_end() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\UIParent.xml");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    let frames = super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml")
-        + super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml")
-        + super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
+    // The three stock bar files, counted as they load; `ExhaustionTick_Update` reads
+    // `ReputationWatchBar`, which ReputationFrame.xml declares.
+    const BAR: [&str; 3] = [
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+    ];
+    let mut frames = 0;
+    for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        r"Interface\FrameXML\OptionsFrameTemplates.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        BAR[0],
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        BAR[1],
+        r"Interface\FrameXML\ReputationFrame.xml",
+        BAR[2],
+    ] {
+        let built = super::test_ui::load_ui(&s, file);
+        if BAR.contains(&file) {
+            frames += built;
+        }
+    }
     assert_eq!(
         frames, 80,
         "what the three stock files declare: MainMenuBar.xml's 8 — the bar, the XP StatusBar, \
@@ -35,13 +54,6 @@ fn shipped_action_bar_drives_end_to_end() {
          overlay frame, no performance-bar button"
     );
 
-    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
-    super::test_ui::load_ui(&s, r"Interface\FrameXML\ReputationFrame.xml");
-
     // A warrior in Battle Stance: bonus offset 1, actions 73..84.
     s.set_bonus_bar_offset(1);
     s.set_action(
@@ -157,35 +169,33 @@ fn shipped_action_bar_drives_end_to_end() {
 }
 
 fn load_action_bar(s: &UiScript) {
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\Cooldown.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\TextStatusBar.lua");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\TextStatusBar.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\Fonts.xml");
-    super::test_ui::load_ui(s, r"Interface\FrameXML\UIParent.xml");
     super::test_ui::load_ui(s, "Interface\\FrameXML\\GlobalStrings.lua");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\MainMenuBar.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\Fonts.xml");
+    super::test_ui::load_ui(s, r"Interface\FrameXML\BasicControls.xml"); // `TEXT`
+    super::test_ui::load_ui(s, r"Interface\FrameXML\LocaleProperties.lua"); // `GetText`
+    super::test_ui::load_ui(s, r"Interface\FrameXML\UIParent.xml");
     super::test_ui::load_ui(s, r"Interface\FrameXML\MoneyFrame.lua");
     super::test_ui::load_ui(s, r"Interface\FrameXML\MoneyFrame.xml");
     super::test_ui::load_ui(s, "Interface\\FrameXML\\GameTooltip.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-
-    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\Fonts.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     super::test_ui::load_ui(s, r"Interface\FrameXML\UIPanelTemplates.lua");
     super::test_ui::load_ui(s, r"Interface\FrameXML\UIPanelTemplates.xml");
     super::test_ui::load_ui(s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
-    super::test_ui::load_ui(s, r"Interface\FrameXML\ReputationFrame.xml");
-    // StaticPopup.xml: the keybindings page adds its two confirm dialogs to `StaticPopupDialogs`.
-    super::test_ui::load_ui(s, r"Interface\FrameXML\BasicControls.xml"); // `TEXT`
-    super::test_ui::load_ui(s, r"Interface\FrameXML\LocaleProperties.lua"); // `GetText`
-    super::test_ui::load_ui(s, r"Interface\FrameXML\StaticPopup.xml");
-    super::test_ui::load_ui(s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     // `UIOptionsFrame_Init` declares `LOCK_ACTIONBAR` and `ALWAYS_SHOW_MULTIBARS`
     // (UIOptionsFrame.lua:93-107), before our window, whose rows take their defaults from them.
     super::test_ui::load_ui(s, r"Interface\FrameXML\OptionsFrame.lua");
     super::test_ui::load_ui(s, r"Interface\FrameXML\UIOptionsFrame.xml");
+    // StaticPopup.xml: the keybindings page adds its two confirm dialogs to `StaticPopupDialogs`.
+    super::test_ui::load_ui(s, r"Interface\FrameXML\StaticPopup.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\TextStatusBar.lua");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\MainMenuBar.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\Cooldown.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\ActionBarFrame.xml");
+    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
+    super::test_ui::load_ui(s, r"Interface\FrameXML\ReputationFrame.xml");
+    super::test_ui::load_ui(s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     super::test_ui::load_ui(s, "ScrollTemplates.xml");
     super::test_ui::load_ui(s, "KeyBindingsPage.xml");
     super::test_ui::load_ui(s, "OptionsFrame.xml");
@@ -830,13 +840,10 @@ fn drag_drop_onto_another_button_hops_the_displaced_action() {
         "Interface\\Icons\\Spell_A",
         "slot 2 now shows the placed action"
     );
-    let (kind, src) = s
-        .eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-        .unwrap();
-    assert_eq!(
-        (kind.as_str(), src),
-        ("action", 2),
-        "the displaced action hopped on, sourced from slot 2"
+    assert!(
+        matches!(s.cursor_payload(), Some(benilla_ui::script::CursorPayload::Action(c)) if c.src_slot == 2),
+        "the displaced action hopped on, sourced from slot 2: {:?}",
+        s.cursor_payload()
     );
 
     // Two independent sends across the one gesture: the pickup's clear, then the place's write.
@@ -1014,32 +1021,22 @@ fn shipped_bag_frame_drives_end_to_end() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    // `BAG_UI` is `benilla.toc`'s order for a bag window. The bag buttons are parented to
-    // `MainMenuBarArtFrame`, so the main bar's files follow Cooldown.xml, and
     // `ContainerFrameItemButton_OnClick` reads `StackSplitFrame` and `MerchantFrame`
-    // (ContainerFrame.lua:581, 586), so both load after the bags.
+    // (ContainerFrame.lua:581, 586), which the bag kit leaves to its caller.
     let mut bar_frames = 0;
-    for file in BAG_UI {
+    for file in super::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\StackSplitFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+        ],
+    ]) {
         let frames = load_ui(&s, file);
-        if *file == "Interface\\FrameXML\\Cooldown.xml" {
-            load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-            load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-            load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-            load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
-            load_ui(&s, r"Interface\FrameXML\UIParent.xml");
-            load_ui(&s, "ScrollTemplates.xml"); // our scroll kits
-            load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-            load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
-            load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-            load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-        }
-        if *file == "Interface\\FrameXML\\MainMenuBarBagButtons.xml" {
+        if file == "Interface\\FrameXML\\MainMenuBarBagButtons.xml" {
             bar_frames = frames;
         }
     }
-    load_ui(&s, "Interface\\FrameXML\\StackSplitFrame.xml");
-    load_ui(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_ui(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     assert_eq!(
         bar_frames, 16,
@@ -1470,40 +1467,37 @@ fn the_main_bar_pages_and_a_bonus_page_still_outranks_it() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         // Fonts first: the reputation pane's check boxes read `RED_FONT_COLOR` in their OnLoad.
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "KeyBindingsPage.xml",
         // `UIOptionsFrame_Init`'s uvars and `UIOptionsFrameCheckButtons`, which
         // `MultiActionBarFrame_OnLoad` writes (MultiActionBars.lua:8-22), so ahead of the bars.
         r"Interface\FrameXML\OptionsFrame.lua",
         r"Interface\FrameXML\UIOptionsFrame.xml",
-        "OptionsFrame.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\MultiActionBars.xml",
+        // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
+        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "ScrollTemplates.xml",
+        "KeyBindingsPage.xml",
+        "OptionsFrame.xml",
     ] {
         super::test_ui::load_ui(&s, file);
     }
@@ -1626,26 +1620,24 @@ fn bonus_bar_slides_up_with_sound_and_down_without() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIParent.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.xml");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-
-    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
+    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
     super::test_ui::load_ui(&s, r"Interface\FrameXML\ReputationFrame.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     s.fire_event("PLAYER_ENTERING_WORLD", vec![]);
     s.tick(10.0); // a nonzero clock epoch
     let _ = s.take_sounds();
@@ -1838,26 +1830,24 @@ fn bonus_bar_turnaround_continues_from_position() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIParent.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.xml");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-
-    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
+    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
     super::test_ui::load_ui(&s, r"Interface\FrameXML\ReputationFrame.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     s.tick(10.0);
     let _ = s.take_sounds();
 
@@ -1909,26 +1899,24 @@ fn the_page_arrows_do_not_steal_each_other_s_clicks() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIParent.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\MoneyFrame.xml");
     super::test_ui::load_ui(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-
-    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     super::test_ui::load_ui(&s, r"Interface\FrameXML\OptionsFrameTemplates.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\MainMenuBar.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\Cooldown.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
+    // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
     super::test_ui::load_ui(&s, r"Interface\FrameXML\ReputationFrame.xml");
+    super::test_ui::load_ui(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     // The rested marker is declared shown in DIALOG strata over the arrows (MainMenuBar.xml:415);
     // `ExhaustionTick_Update` hides it on PLAYER_ENTERING_WORLD when `GetXPExhaustion()` is nil
     // (MainMenuBar.lua:29-31), or it eats every click.
diff --git a/crates/benilla-app/src/ui_script/addons.rs b/crates/benilla-app/src/ui_script/addons.rs
index f40efae2..81fba5a6 100644
--- a/crates/benilla-app/src/ui_script/addons.rs
+++ b/crates/benilla-app/src/ui_script/addons.rs
@@ -1,15 +1,16 @@
 //! Where interfaces come from: addon discovery under [`root`] and the load walk ([`Walk::load`]).
-//! An [`Addon`] is a name, a parsed `.toc` and the [`Source`] its files come from. benilla's own
-//! interface is one too, with the compiled-in tree as its source, but not for the lifecycle: like
-//! FrameXML it loads outside `AddOn_Load` ([`super::manifest::load_ingame_ui`]) and gets no
-//! `ADDON_LOADED`.
+//! An [`Addon`] is a name, a parsed `.toc` and the [`Source`] its files come from. The core
+//! interface (the chain's own FrameXML) and benilla's layer (the compiled-in tree) are two more,
+//! but not for the lifecycle: they load outside `AddOn_Load`
+//! ([`super::manifest::load_ingame_ui`]), get no `ADDON_LOADED` and have no registry row.
 
-use std::collections::{HashMap, HashSet};
+use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 
 use bevy::prelude::*;
 
-use benilla_ui::script::{ScriptValue, UiScript};
+use benilla_ui::script::{EnableHash, ScriptValue, UiScript};
+use benilla_ui::status::{self, Status};
 use benilla_ui::toc::Toc;
 
 use super::content;
@@ -23,7 +24,7 @@ pub(crate) const LOAD_INSTRUCTION_BUDGET: u64 = 200_000_000;
 
 /// Where one interface's files come from.
 pub(super) enum Source {
-    /// benilla's own interface: the compiled-in tree, shadowed by `assets/ui` in a dev build.
+    /// The layer's own files: the compiled-in tree, shadowed by `assets/ui` in a dev build.
     Builtin,
     /// The AddOns root on disk, not this addon's own folder: a request under `Interface/AddOns/`
     /// maps onto it, so a dependent can reach a shared library addon beside it.
@@ -34,8 +35,8 @@ pub(super) enum Source {
 
 /// One loadable interface: a name, its parsed manifest, and where its files come from.
 pub(super) struct Addon {
-    /// The folder name (`"benilla"` for the builtin): what the AddOn API keys on and what
-    /// `ADDON_LOADED` carries.
+    /// The folder name (`"FrameXML"` for the core and `"benilla"` for the layer, which have no
+    /// registry row): what the AddOn API keys on and what `ADDON_LOADED` carries.
     pub(super) name: String,
     /// The parsed `.toc`: the ordered file list plus every directive.
     pub(super) toc: Toc,
@@ -48,15 +49,18 @@ impl Addon {
         Addon { name, toc, source }
     }
 
-    /// benilla's own interface, which is in the binary and so cannot be missing.
-    pub(super) fn builtin() -> Self {
-        let toc = content::read(super::manifest::MANIFEST)
+    /// benilla's layer, [`super::manifest::LAYER_MANIFEST`], which is in the binary and so cannot
+    /// be missing.
+    pub(super) fn layer() -> Self {
+        Self::shipped(super::manifest::LAYER_MANIFEST)
+    }
+
+    /// The interface one shipped `.toc` names.
+    fn shipped(manifest: &str) -> Self {
+        let toc = content::read(manifest)
             .map(|t| Toc::parse(&t))
             .unwrap_or_else(|| {
-                error!(
-                    "ui_script: {} is not in the shipped UI — no interface will load",
-                    super::manifest::MANIFEST
-                );
+                error!("ui_script: {manifest} is not in the shipped UI — it will not load");
                 Toc::default()
             });
         Addon {
@@ -67,7 +71,7 @@ impl Addon {
     }
 
     /// One file's bytes, by a path already resolved into the source's path space. A `Dir` reads
-    /// under the AddOns root, then the chain ([`read_addon_file`]); only the flat builtin falls
+    /// under the AddOns root, then the chain ([`read_addon_file`]); only the flat shipped tree falls
     /// back to the basename, which for a `Dir` would rescue an escaping path. Bytes, not text: a
     /// `.lua` reaches Lua as it is on disk.
     fn read(&self, req: &str) -> Option<Vec<u8>> {
@@ -85,7 +89,7 @@ impl Addon {
     }
 
     /// The base this addon's manifest entries resolve against: `Interface/AddOns/<Folder>` for a
-    /// `Dir`, empty for the builtin's flat tree and the chain's full paths.
+    /// `Dir`, empty for the shipped flat tree and the chain's full paths.
     fn prefix(&self) -> String {
         match &self.source {
             Source::Builtin | Source::Chain => String::new(),
@@ -95,7 +99,7 @@ impl Addon {
 
     /// The chunk name, which addons parse: `"@%s"` (`0x8716e0`) over the resolved install path,
     /// built by `0x704bc0` for every `.lua`, as for `<Script file=>`. Ace2 libraries find their
-    /// addon by splitting a `debugstack` frame on `\AddOns\` (`AceDB-2.0.lua:742`). The builtin's
+    /// addon by splitting a `debugstack` frame on `\AddOns\` (`AceDB-2.0.lua:742`). The shipped
     /// flat tree keeps [`benilla_ui::script::addon_chunk_name`].
     fn chunk_name(&self, file: &str, path: &str) -> String {
         match &self.source {
@@ -104,16 +108,29 @@ impl Addon {
         }
     }
 
-    /// Load this addon's `.toc`-listed files, in listed order. Each error is logged as it happens
-    /// and also returned, tagged `"<Addon>/<file>: <error>"`, for the tests to assert empty.
-    fn load(&self, script: &UiScript) -> Vec<String> {
-        self.load_files(script, &self.toc.files)
+    /// Load this addon's `.toc`-listed files, in listed order, reporting into `toc`, the `.toc`'s
+    /// load record. Each error is logged as it happens and also returned, tagged
+    /// `"<Addon>/<file>: <error>"`, for the tests to assert empty.
+    fn load(&self, script: &UiScript, toc: &mut Status) -> Vec<String> {
+        self.load_files_into(script, &self.toc.files, toc)
     }
 
-    /// [`Addon::load`] over an explicit slice, for the builtin's two-phase boot. A manifest lists
-    /// both kinds of file (the reference's `FrameXML.toc` opens with `GlobalStrings.lua`): a `.lua`
-    /// runs as a chunk in the shared state, anything else is parsed as FrameXML and materialized.
+    /// [`Addon::load_files_into`] with the load record dropped.
     pub(super) fn load_files(&self, script: &UiScript, files: &[String]) -> Vec<String> {
+        self.load_files_into(script, files, &mut Status::default())
+    }
+
+    /// [`Addon::load`] over an explicit slice. A manifest lists both kinds of file (the
+    /// reference's `FrameXML.toc` opens with `GlobalStrings.lua`): a `.lua` runs as a chunk in the
+    /// shared state, anything else is parsed as FrameXML and materialized. What the reference's
+    /// `.toc` runner (`0x6edb90`) reports goes into `toc`: a file that did not open or parse, and
+    /// each document's own record under its banner.
+    pub(super) fn load_files_into(
+        &self,
+        script: &UiScript,
+        files: &[String],
+        toc: &mut Status,
+    ) -> Vec<String> {
         let mut failures = Vec::new();
         // The `<Include>` / `<Script file=>` provider; `read` is the sandbox.
         let provider = |req: &str| -> Option<Vec<u8>> { self.read(req) };
@@ -121,10 +138,12 @@ impl Addon {
             // Resolved once into the source's path space, for `read` and the loader alike.
             let path = benilla_ui::loader::join_ref(&self.prefix(), file);
             let Some(bytes) = self.read(&path) else {
+                toc.report(status::FAILURE, status::missing(&path, is_lua(file)));
                 let e = format!("{}/{file}: not found", self.name);
-                // Severity follows whose manifest is wrong. Ours (the builtin, or a `benilla.toc`
-                // line the player's chain lacks) is an ERROR. A player's addon is the package's
-                // fault, which the reference skips silently, and an ERROR line fails `smoke.sh`.
+                // Severity follows whose manifest is wrong. Ours, or the core's (a shipped file, or
+                // a `FrameXML.toc` row the player's chain lacks), is an ERROR. A player's addon is
+                // the package's fault, which the reference skips silently, and an ERROR line fails
+                // `smoke.sh`.
                 match self.source {
                     Source::Builtin | Source::Chain => error!("ui_script: {e}"),
                     Source::Dir(_) => warn!("ui_script: {e}"),
@@ -152,6 +171,7 @@ impl Addon {
             let doc = match benilla_ui::framexml::parse(&benilla_ui::source::decode(&bytes)) {
                 Ok(d) => d,
                 Err(e) => {
+                    toc.report(status::FAILURE, status::unparsed(&path));
                     let e = format!("{}/{file}: {e}", self.name);
                     error!("ui_script: parsing {e}");
                     // No dialog, as the reference only logs it (FrameXML.log); still retained.
@@ -162,7 +182,12 @@ impl Addon {
             };
             // The loader resolves relative references against the document's own directory, and
             // names the file a raise came from.
-            let report = benilla_ui::loader::load_in(script, &doc, &path, &provider);
+            let mut report = benilla_ui::loader::load_in(script, &doc, &path, &provider);
+            std::mem::take(&mut report.status).close_into(
+                toc,
+                script.framexml_debug(),
+                status::file_banner(&path),
+            );
             // `FrameXML_Debug` traces go to the log only: the reference files them at severity 0
             // (`0x6ee2bc`) in a per-document record whose surface is untraced.
             for t in &report.traces {
@@ -175,7 +200,7 @@ impl Addon {
             }
             // A file the document names and the provider lacks is a `.toc` line naming no file:
             // never a script error, as the reference logs `Couldn't open %s` and carries on, but a
-            // `failures` entry, so our boot tests catch one in a `benilla.toc` document.
+            // `failures` entry, so our boot tests catch one in a core or layer document.
             for m in &report.missing_files {
                 let e = format!("{}/{file}: {m}", self.name);
                 match self.source {
@@ -527,13 +552,14 @@ pub(crate) fn installed_rows() -> Vec<InstalledAddOn> {
 
 /// The reference's `ADDONSTATELIST` (`0xbe1bd0`): a node per character in `SMSG_CHAR_ENUM` order,
 /// rebuilt whole (`0x51f0b0` clears it, then callback `0x472300` fills a node per record through
-/// `AddOnList_LoadCharacter 0x51ebe0`), each holding that character's explicit `AddOns.txt` rows.
-/// A character with no file is an empty node, whose enable bit is answered from the others.
+/// `AddOnList_LoadCharacter 0x51ebe0`), each holding that character's enable hash. A character
+/// with no file is an empty node, whose enable bit is answered from the others.
 #[derive(Default)]
 pub(crate) struct EnableStore {
-    /// `(character, explicit rows)` in character-list order; names lowercased, as every compare in
-    /// the reference is `SStrCmpI`.
-    nodes: Vec<(String, HashMap<String, bool>)>,
+    /// The realm half of every node's file.
+    realm: String,
+    /// `(character, enable hash)` in character-list order.
+    nodes: Vec<(String, EnableHash)>,
 }
 
 impl EnableStore {
@@ -548,26 +574,36 @@ impl EnableStore {
                     .and_then(|p| std::fs::read(p).ok())
                     .map(|b| parse_enable_state(&benilla_ui::source::decode(&b)))
                     .unwrap_or_default();
-                let hash = rows
-                    .into_iter()
-                    // Last line wins, like the reference's hash insert (`0x51eeef`).
-                    .map(|(name, on)| (name.to_ascii_lowercase(), on))
-                    .collect();
-                (character.clone(), hash)
+                (character.clone(), EnableHash::from_rows(rows))
             })
             .collect();
-        Self { nodes }
+        Self {
+            realm: realm.to_string(),
+            nodes,
+        }
+    }
+
+    /// A node per character, none with a row, as for characters with no file; for tests that
+    /// must not read the state folder.
+    #[cfg(test)]
+    pub(crate) fn blank(realm: &str, characters: &[String]) -> Self {
+        Self {
+            realm: realm.to_string(),
+            nodes: characters
+                .iter()
+                .map(|c| (c.clone(), EnableHash::default()))
+                .collect(),
+        }
     }
 
     /// `0x51e470(addon, NULL, useDefault = 0)`, the explicit-only aggregate over the nodes with a
     /// row (`0x51e5df je 0x51e60a`): `Some(v)` when all say `v` (the reference's 2 or 0), `None`
     /// when they are mixed or there are none.
     fn aggregate(&self, addon: &str) -> Option<bool> {
-        let key = addon.to_ascii_lowercase();
         let mut total = 0usize;
         let mut on = 0usize;
         for (_, hash) in &self.nodes {
-            if let Some(&v) = hash.get(&key) {
+            if let Some(v) = hash.get(addon) {
                 total += 1;
                 on += usize::from(v);
             }
@@ -581,7 +617,7 @@ impl EnableStore {
     }
 
     /// The bit a character gets, `0x51e470(addon, character, useDefault = 1)` (0 or 2 as a bool):
-    /// * an explicit row in their file wins;
+    /// * an explicit row in their hash wins;
     /// * a node with no row takes [`Self::aggregate`] (`0x51e5f0`'s self-recursion), then
     ///   `## DefaultState` where that is undecided;
     /// * no node at all, or no character, takes `## DefaultState`: the walk passes each
@@ -596,13 +632,33 @@ impl EnableStore {
         let Some(node) = character.and_then(|c| self.node(c)) else {
             return default_state;
         };
-        match node.get(&addon.to_ascii_lowercase()) {
-            Some(&explicit) => explicit,
+        match node.get(addon) {
+            Some(explicit) => explicit,
             None => self.aggregate(addon).unwrap_or(default_state),
         }
     }
 
-    fn node(&self, character: &str) -> Option<&HashMap<String, bool>> {
+    /// The setter `0x51ea20`: `None` is every node (the glue's All), a name its one node; a name
+    /// with no node is a no-op, as the setter never creates one.
+    pub(crate) fn set(&mut self, addon: &str, character: Option<&str>, on: bool) {
+        for (name, hash) in &mut self.nodes {
+            if character.is_none_or(|c| name.eq_ignore_ascii_case(c)) {
+                hash.set(addon, on);
+            }
+        }
+    }
+
+    /// The writer `0x51ef20`, glue `SaveAddOns` (`0x46d990`): each dirty node's file, rewritten
+    /// from its hash; a clean node is skipped (`0x51ef59`) and its file left as it is.
+    pub(crate) fn save(&mut self) {
+        for (name, hash) in &mut self.nodes {
+            if let Some(rows) = hash.take_dirty() {
+                write_enable_state(Some(&(self.realm.clone(), name.clone())), &rows);
+            }
+        }
+    }
+
+    pub(crate) fn node(&self, character: &str) -> Option<&EnableHash> {
         self.nodes
             .iter()
             .find(|(name, _)| name.eq_ignore_ascii_case(character))
@@ -622,40 +678,25 @@ fn store_nodes(identity: Option<&(String, String)>, roster: &[String]) -> Vec<St
     names
 }
 
-/// Write a character's enable state, from the AddOns screen and at logout, merged into the file:
-/// the reference's writer `0x51ef20` emits its enable hash a line per entry (`0x853968`), built by
-/// `0x51ebe0` from the file, so an uninstalled addon's row survives and names keep their spelling.
-pub(crate) fn write_enable_state(identity: Option<&(String, String)>, states: &[(String, bool)]) {
+/// Write one character's enable hash as its whole file, a line per entry (`0x853968`), as the
+/// writer `0x51ef20` creates it afresh (`CREATE_ALWAYS`). The hash holds every row the file had,
+/// so an uninstalled addon's row survives and a name keeps its spelling.
+pub(crate) fn write_enable_state(identity: Option<&(String, String)>, rows: &[(String, bool)]) {
     let Some(path) = enable_state_path(identity) else {
         return; // no character picked, or no state folder
     };
-    let mut merged: Vec<(String, bool)> = std::fs::read(&path)
-        .ok()
-        .map(|b| parse_enable_state(&benilla_ui::source::decode(&b)))
-        .unwrap_or_default();
-    for (name, on) in states {
-        match merged
-            .iter_mut()
-            .find(|(n, _)| n.eq_ignore_ascii_case(name))
-        {
-            Some(row) => row.1 = *on,
-            None => merged.push((name.clone(), *on)),
-        }
-    }
-    match crate::local_state::write_atomic(&path, &render_enable_state(&merged)) {
-        Ok(()) => info!("addons: wrote {} ({} rows)", path.display(), merged.len()),
+    match crate::local_state::write_atomic(&path, &render_enable_state(rows)) {
+        Ok(()) => info!("addons: wrote {} ({} rows)", path.display(), rows.len()),
         Err(e) => warn!("addons: cannot write {}: {e}", path.display()),
     }
 }
 
-/// Write the enable state back at shutdown, the reference's last step (`0x490c88`, after the
-/// saved-variables files), through the AddOns screen's merging writer.
+/// Write the current character's enable hash at shutdown, the reference's last step (`0x490c88`,
+/// after the saved-variables files), only when a verb changed it this session.
 pub(super) fn save_enable_state(script: &UiScript, identity: Option<&(String, String)>) {
-    let states = script.addon_enable_states();
-    if states.is_empty() {
-        return; // nothing registered: a glue-only run or a capture
+    if let Some(rows) = script.take_addon_enable_rows() {
+        write_enable_state(identity, &rows);
     }
-    write_enable_state(identity, &states);
 }
 
 /// Write every loaded addon's declared saved variables at shutdown (`0x490c83`, after the flat
@@ -738,6 +779,13 @@ pub(super) fn load_third_party(
         crate::local_state::addon_saved_account_dir(),
         identity.and_then(|(r, c)| crate::local_state::addon_saved_character_dir(r, c)),
     );
+    // The verbs write through the character's own hash, so logout saves only what they changed.
+    script.set_addon_enable_hash(
+        character
+            .and_then(|c| store.node(c))
+            .cloned()
+            .unwrap_or_default(),
+    );
     if addons.is_empty() {
         return Vec::new();
     }
@@ -877,7 +925,17 @@ impl Walk {
             return Err(());
         }
 
-        self.failures.extend(addon.load(script));
+        // The add-on's record: its `.toc`'s under that banner (`0x6eddc8`), then its own banner
+        // (`0x51f464`), merged into the UI load's.
+        let debug = script.framexml_debug();
+        let mut toc = Status::default();
+        self.failures.extend(addon.load(script, &mut toc));
+        let mut own = Status::default();
+        let toc_path = status::addon_toc_path(&addon.name);
+        toc.close_into(&mut own, debug, status::toc_banner(&toc_path));
+        let mut block = Status::default();
+        own.close_into(&mut block, debug, status::addon_banner(&addon.name));
+        script.report_load_status(block);
         // `Bindings.xml` (`0x51f400`), after the files whose functions a binding calls, through
         // the addon's own sandboxed reader; absent is normal.
         let bindings_xml = benilla_ui::loader::join_ref(&addon.prefix(), "Bindings.xml");
@@ -1065,7 +1123,7 @@ mod tests {
     }
 
     /// Every chain row is LoadOnDemand and chain-sourced, the eight windows the interface opens
-    /// through them are rows, and `benilla.toc` lists none, like the reference's `FrameXML.toc`.
+    /// through them are rows, and the core, the chain's `FrameXML.toc`, lists none.
     #[test]
     fn the_chain_carries_blizzards_load_on_demand_addons_as_registry_rows() {
         let _data = benilla_formats::wow_data_or_skip!();
@@ -1104,12 +1162,13 @@ mod tests {
             );
         }
         assert!(
-            !Addon::builtin()
+            !super::super::reference_ui::core()
+                .expect("the player's FrameXML.toc")
                 .toc
                 .files
                 .iter()
                 .any(|f| f.replace('/', "\\").starts_with("Interface\\AddOns\\")),
-            "benilla.toc lists a Blizzard addon eagerly; the reference loads every one on demand"
+            "the core lists a Blizzard addon eagerly; the reference loads every one on demand"
         );
         // The glue's list is the player's folder alone.
         assert!(installed_rows()
@@ -1210,7 +1269,7 @@ mod tests {
         };
 
         let script = UiScript::new().unwrap();
-        let failures = addon.load(&script);
+        let failures = addon.load(&script, &mut Status::default());
         assert!(
             failures.is_empty(),
             "a listed Bindings.xml costs log lines, not script errors: {failures:?}"
@@ -1254,7 +1313,7 @@ mod tests {
         };
 
         let script = UiScript::new().unwrap();
-        assert!(addon.load(&script).is_empty());
+        assert!(addon.load(&script, &mut Status::default()).is_empty());
 
         // The exact pattern the libraries run, on each file's own traceback.
         let folder = |global: &str| -> Option<String> {
@@ -1375,7 +1434,7 @@ mod tests {
         };
         let mut script = UiScript::new().unwrap();
         script.set_screen_size(1024.0, 768.0);
-        let failures = addon.load(&script);
+        let failures = addon.load(&script, &mut Status::default());
         assert!(failures.is_empty(), "addon load errors: {failures:#?}");
 
         assert_eq!(
@@ -1618,9 +1677,8 @@ mod tests {
         }];
         let mut w = Walk::default();
         let _ = w.load(&mut script, &all, "EventProbe");
-        // The builtin, loaded as production loads it: its own manifest, not the walk.
-        let builtin = Addon::builtin();
-        let _ = builtin.load_files(&script, builtin.toc.files.get(..1).unwrap_or_default());
+        // The core, loaded as production loads it: the chain's own toc, not the walk.
+        let _ = super::super::manifest::load_core(&script);
 
         let log = event_log(&script);
         assert!(
@@ -1843,9 +1901,10 @@ mod tests {
         );
     }
 
-    /// A row for an addon not installed now survives the AddOns screen's write.
+    /// A row for an addon not installed now survives the AddOns screen's write: the loader put it
+    /// in the hash, and the writer writes the hash.
     #[test]
-    fn the_addons_screen_write_merges_with_what_is_already_on_disk() {
+    fn the_addons_screen_write_keeps_the_rows_the_file_had() {
         let _l = crate::local_state::test_env::ENV_LOCK
             .lock()
             .unwrap_or_else(std::sync::PoisonError::into_inner);
@@ -1855,7 +1914,10 @@ mod tests {
         std::fs::create_dir_all(path.parent().unwrap()).unwrap();
         std::fs::write(&path, "Gone: disabled\nStays: enabled\n").unwrap();
 
-        write_enable_state(Some(&id), &[("Stays".into(), false), ("New".into(), true)]);
+        let mut store = EnableStore::load("Realm", &["Char".to_string()]);
+        store.set("Stays", Some("char"), false);
+        store.set("New", None, true);
+        store.save();
 
         let written = std::fs::read_to_string(&path).unwrap();
         assert!(
@@ -2098,6 +2160,51 @@ mod tests {
         let _ = std::fs::remove_dir_all(home.parent().unwrap());
     }
 
+    /// A runtime `LoadAddOn`'s misses are one block appended to `Logs\FrameXML.log`
+    /// (`0x46aac0`): the add-on's banner, its toc's, then each document by its own record, an
+    /// included miss under its includer's banner (`0x6ee21c`).
+    #[test]
+    fn a_load_addon_appends_its_misses_as_one_block() {
+        let _l = crate::local_state::test_env::ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let _c = crate::local_state::test_env::EnvGuard::unset("WOW_CAPTURE");
+        let (home, _h) = hermetic_root("lod-log");
+        write_addon(
+            &home,
+            "Demand",
+            "## Interface: 11200\n## LoadOnDemand: 1\nlate.xml\ngone.xml\ngone.lua\n",
+            &[("late.xml", "<Ui><Include file=\"nope.xml\"/></Ui>")],
+        );
+        let mut script = UiScript::new().unwrap();
+        script.set_screen_size(1024.0, 768.0);
+        let _ = load_third_party(&mut script, None, &[], true);
+        seat_stock_addon_reply(&mut script);
+        assert!(script.take_load_log_writes().is_empty());
+        script.run("LoadAddOn('Demand')").unwrap();
+        assert_eq!(
+            script.take_load_log_writes(),
+            vec![benilla_ui::status::LogWrite::Append(
+                [
+                    "Loading add-on Demand",
+                    "** Loading table of contents Interface\\AddOns\\Demand\\Demand.toc",
+                    "++ Loading file Interface\\AddOns\\Demand\\late.xml",
+                    "Couldn't open Interface\\AddOns\\Demand\\nope.xml",
+                    "Couldn't open Interface\\AddOns\\Demand\\gone.xml",
+                    "Error loading Interface\\AddOns\\Demand\\gone.lua",
+                ]
+                .map(String::from)
+                .to_vec()
+            )]
+        );
+        script.run("LoadAddOn('Demand')").unwrap();
+        assert!(
+            script.take_load_log_writes().is_empty(),
+            "an already loaded add-on reports nothing"
+        );
+        let _ = std::fs::remove_dir_all(home.parent().unwrap());
+    }
+
     /// A LoadOnDemand options package on a dependency the startup walk loaded (`/msbt`'s shape):
     /// without the walk's `mark_addon_loaded` stamp the gate answers `DEP_NOT_DEMAND_LOADED`.
     #[test]
@@ -2365,16 +2472,10 @@ mod tests {
         save_enable_state(&script, Some(&id));
 
         let written = std::fs::read_to_string(home.join("addons/Realm-Char.txt")).unwrap();
-        // Registry order: the chain's Blizzard rows, then the folder's two (`0x51c777` before
-        // `0x51c78f`, tail-inserted), one line per registry row.
-        let mut expected = String::new();
-        for a in chain_addons() {
-            expected.push_str(&format!("{}: enabled\n", a.name));
-        }
-        expected.push_str("Drop: disabled\nKeep: enabled\n");
         assert_eq!(
-            written, expected,
-            "the reference's own one-line-per-addon format"
+            written, "Drop: disabled\n",
+            "one line per hash entry (`0x51f006`), and the hash holds only the toggled addon: no \
+             `Keep`, no `Blizzard_*` row"
         );
 
         let mut next = UiScript::new().unwrap();
@@ -2387,6 +2488,94 @@ mod tests {
         let _ = std::fs::remove_dir_all(home.parent().unwrap());
     }
 
+    /// A session whose verbs changed nothing leaves the node clean, and the writer skips a clean
+    /// node (`0x51ef59`): no file is created, and one that exists keeps its bytes, even through
+    /// a verb that sets a row to the value it already has and a toggle `ResetDisabledAddOns`
+    /// reverts (`0x48e830` reloads the hash clean, `0x51ec59`).
+    #[test]
+    fn a_session_that_toggles_nothing_writes_nothing() {
+        let _l = crate::local_state::test_env::ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let _c = crate::local_state::test_env::EnvGuard::unset("WOW_CAPTURE");
+        let (home, _h) = hermetic_root("untouched");
+        write_addon(&home, "Keep", "## Interface: 11200\n", &[]);
+        write_addon(&home, "Off", "## Interface: 11200\n", &[]);
+        let fresh = ("Realm".to_string(), "Fresh".to_string());
+        let mut script = UiScript::new().unwrap();
+        let _ = load_third_party(&mut script, Some(&fresh), &[], true);
+        crate::ui_script::shutdown_ui_state(&mut script, Some(&fresh), true);
+        assert!(
+            !enable_state_path(Some(&fresh)).unwrap().exists(),
+            "a login and logout with no toggle creates no AddOns file"
+        );
+
+        let id = ("Realm".to_string(), "Char".to_string());
+        let path = enable_state_path(Some(&id)).unwrap();
+        std::fs::create_dir_all(path.parent().unwrap()).unwrap();
+        let before = "off: disabled\nstray line\n";
+        std::fs::write(&path, before).unwrap();
+        for (lua, why) in [
+            ("DisableAddOn('Off')", "a row set to the value it has"),
+            (
+                "DisableAddOn('Keep') ResetDisabledAddOns()",
+                "a toggle reverted",
+            ),
+        ] {
+            let mut script = UiScript::new().unwrap();
+            let _ = load_third_party(&mut script, Some(&id), &[], true);
+            script.run(lua).unwrap();
+            crate::ui_script::shutdown_ui_state(&mut script, Some(&id), true);
+            assert_eq!(
+                std::fs::read_to_string(&path).unwrap(),
+                before,
+                "{why} leaves the file as it was"
+            );
+        }
+        let _ = std::fs::remove_dir_all(home.parent().unwrap());
+    }
+
+    /// The issue's example end to end, through the logout writer and the query `0x51e470`: Alice
+    /// and Bob have both played with `Shared` installed, then Bob turns it off. Alice, with no
+    /// row of her own, and a character created afterwards both follow Bob.
+    #[test]
+    fn a_character_that_never_chose_follows_the_realms_other_characters() {
+        let _l = crate::local_state::test_env::ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let _c = crate::local_state::test_env::EnvGuard::unset("WOW_CAPTURE");
+        let (home, _h) = hermetic_root("follow");
+        write_addon(
+            &home,
+            "Shared",
+            "## Interface: 11200\nran.lua\n",
+            &[("ran.lua", "SharedRan = true")],
+        );
+        let roster = ["Alice".to_string(), "Bob".to_string()];
+        let session = |who: &str, roster: &[String], lua: &str| -> bool {
+            let id = ("Realm".to_string(), who.to_string());
+            let mut script = UiScript::new().unwrap();
+            script.set_screen_size(1024.0, 768.0);
+            let _ = load_third_party(&mut script, Some(&id), roster, true);
+            let ran = script.eval::<bool>("return SharedRan == true").unwrap();
+            script.run(lua).unwrap();
+            crate::ui_script::shutdown_ui_state(&mut script, Some(&id), true);
+            ran
+        };
+        assert!(session("Alice", &roster, ""), "enabled by default");
+        assert!(session("Bob", &roster, "DisableAddOn('Shared')"));
+        assert!(
+            !session("Alice", &roster, ""),
+            "Alice's first logout wrote no row, so she follows Bob's disable"
+        );
+        let with_new = ["Alice".to_string(), "Bob".to_string(), "Newbie".to_string()];
+        assert!(
+            !session("Newbie", &with_new, ""),
+            "and so does a character created afterwards"
+        );
+        let _ = std::fs::remove_dir_all(home.parent().unwrap());
+    }
+
     // ───────────────────────────── saved variables ─────────────────────────────
 
     /// The account file, then the per-character one (`0x51f4b5`, `0x51f53b`), then `ADDON_LOADED`
diff --git a/crates/benilla-app/src/ui_script/bag_tests.rs b/crates/benilla-app/src/ui_script/bag_tests.rs
index 2edc37e6..75f0ec4d 100644
--- a/crates/benilla-app/src/ui_script/bag_tests.rs
+++ b/crates/benilla-app/src/ui_script/bag_tests.rs
@@ -101,12 +101,16 @@ fn b_opens_the_backpack_alone_and_closes_every_bag() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     s.set_container(
@@ -171,12 +175,16 @@ fn shift_b_toggles_every_bag_at_once() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_container(
         0,
@@ -249,12 +257,16 @@ fn bag_bar_buttons_light_while_their_bag_is_open() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_container(
         0,
@@ -357,12 +369,16 @@ fn bag_tooltip_hangs_left_when_the_slot_sits_in_the_right_half() {
     s.set_screen_size(1024.0, 768.0);
     // The stock tooltip sizes from its lines, so reading its rect needs a text measurer.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -430,12 +446,16 @@ fn hovered_bag_tooltip_fills_itself_when_the_stats_land() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -533,12 +553,16 @@ fn vendor_bag_hover_shows_sell_price_and_arms_the_pouch_cursor() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -667,12 +691,16 @@ fn readable_letter_hover_shows_the_inspect_magnifier() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -734,12 +762,16 @@ fn drag_across_two_slots_queues_the_same_move_a_click_pickup_would() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -816,12 +848,16 @@ fn a_second_bag_window_feeds_and_paints_via_the_bag_bar() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -887,12 +923,16 @@ fn equipped_bag_window_snug_fits_its_row_count() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     // (bag, slots, height): 6 is 72+32+10, 8 is 94+32+10, 10 is 72+73+10, 20 is 94+155+10, and the
@@ -943,13 +983,17 @@ fn equipped_bag_window_snug_fits_its_row_count() {
 
 /// Open a backpack holding a five-stack in slot 1; returns that slot button's centre.
 fn open_backpack_with_a_five_stack(s: &mut UiScript) -> (f32, f32) {
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\StackSplitFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(s, file);
     }
-    load_xml(s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\StackSplitFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -1260,12 +1304,16 @@ fn bag_slot_cooldown_sweeps_through_the_xml() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.tick(100.0); // a nonzero clock epoch
 
@@ -1314,14 +1362,18 @@ fn the_bar_bag_buttons_name_themselves_on_hover() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     // `GetBindingKey` reads the registered command set, seeded as the app seeds it.
-    s.register_bindings(&crate::bindings::registry_commands());
+    crate::ui_script::load_stock_bindings(&mut s);
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.resolve();
 
     hover(&mut s, "MainMenuBarBackpackButton");
@@ -1440,13 +1492,17 @@ fn drawn_with(s: &mut UiScript, needle: &str) -> usize {
 /// The bar and bag files the keyring spans, plus `UIErrorsFrame.xml`: `PutKeyInKeyRing` reports a
 /// full ring through `UIErrorsFrame`.
 fn keyring_surface(s: &UiScript) {
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\UIErrorsFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(s, file);
     }
-    load_xml(s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\UIErrorsFrame.xml");
 }
 
 /// The first key shows the keyring button, swaps the bar's two right-hand strips to the keyring
@@ -1574,8 +1630,11 @@ fn the_keyring_button_opens_a_keyring_window() {
         .unwrap();
     assert_eq!(shown, 8, "only the level-unlocked keyring slots are drawn");
     assert_eq!(
-        s.eval::<i64>("return BenillaGetContainerItemID(KEYRING_CONTAINER, 1)")
-            .unwrap(),
+        s.eval::<i64>(
+            "local _, _, id = string.find(GetContainerItemLink(KEYRING_CONTAINER, 1), 'item:(%d+)') \
+             return tonumber(id)"
+        )
+        .unwrap(),
         7146
     );
 
@@ -1588,6 +1647,52 @@ fn the_keyring_button_opens_a_keyring_window() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
+/// A hovered key's tooltip comes through the stock keyring arm of `ContainerFrameItemButton_OnEnter`
+/// (`ContainerFrame.lua:616-619`): `SetInventoryItem("player", KeyRingButtonIDToInvSlotID(id))`,
+/// the key's inventory slot 82 and up, answered from the keyring container.
+#[test]
+fn a_hovered_key_shows_its_tooltip_through_its_inventory_slot() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
+    keyring_surface(&s);
+    s.set_money(0);
+    s.set_has_key(true);
+    seat_player_at_level(&mut s, 44);
+    s.set_container(-2, Some(keyring(8, true)));
+    s.fire_event("BAG_UPDATE", vec![benilla_ui::script::ScriptValue::Int(-2)]);
+    s.run("KeyRingButton:Click()").unwrap();
+    assert!(open(&s, -2), "fixture: the keyring is open");
+    // Which slot the tooltip is asked for: the frame's own field shadows the method table.
+    s.run(
+        r#"local method = GameTooltip.SetInventoryItem
+           GameTooltip.SetInventoryItem = function(self, unit, slot)
+               ASKED = unit .. ":" .. slot
+               return method(self, unit, slot)
+           end"#,
+    )
+    .unwrap();
+    s.resolve();
+
+    let key = bag_slot_button(&s, -2, 1);
+    hover(&mut s, &key);
+    assert!(s.errors().is_empty(), "hover errors: {:?}", s.errors());
+    assert_eq!(
+        s.eval::<Option<String>>("return ASKED").unwrap().as_deref(),
+        Some("player:82"),
+        "the stock arm asks for key 1's inventory slot"
+    );
+    assert!(s.eval::<bool>("return GameTooltip:IsVisible()").unwrap());
+    assert_eq!(
+        s.eval::<String>("return GameTooltipTextLeft1:GetText()")
+            .unwrap(),
+        "The Scarlet Key"
+    );
+    unhover(&mut s);
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
 /// Dropping a held key on the button files it in the first free keyring slot (stock
 /// `PutKeyInKeyRing`); a full keyring refuses the drop.
 #[test]
@@ -1680,12 +1785,16 @@ fn an_item_push_drops_its_icon_into_the_bag_that_took_it() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1600.0, 900.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     // `ForcedBackpackItem.m2` (`benilla-extract m2seq`, `m2batch`): one sequence (id 0, 1000 ms,
     // clamp) and a 0.02707 × 0.07962 box, which is 42.41 × 124.72 at 16:9, where a layout unit is
     // 768·√(a²+1) = 1566.4 FrameXML units.
@@ -1837,12 +1946,16 @@ fn an_addon_that_hooks_toggle_backpack_receives_the_click() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
 
     // Bagnon's idiom: capture the original, replace the global.
@@ -1882,12 +1995,16 @@ fn the_bag_slots_carry_the_references_names_and_icon_names() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     for i in 0..4 {
         assert!(
@@ -1932,12 +2049,16 @@ fn the_backpack_buttons_ring_follows_its_own_window_through_real_clicks() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kit
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     // Stock `ToggleBag` opens nothing for a size-0 container, so the backpack is fed.
     s.set_container(
diff --git a/crates/benilla-app/src/ui_script/battlefield_minimap_tests.rs b/crates/benilla-app/src/ui_script/battlefield_minimap_tests.rs
index 02a76c56..f4acefd7 100644
--- a/crates/benilla-app/src/ui_script/battlefield_minimap_tests.rs
+++ b/crates/benilla-app/src/ui_script/battlefield_minimap_tests.rs
@@ -8,16 +8,12 @@ use benilla_ui::script::{
     WorldStateUiView, ARROW_MODEL,
 };
 
-/// The manifest's one warning. Deviation: `gxRefresh`, read at `OptionsFrame.lua:300`, is not
-/// registered, because nothing here can set a refresh rate.
-const MANIFEST_WARNINGS: [&str; 1] = ["unknown CVar 'gxRefresh' (not host-registered) — ignored"];
-
 fn quiet(s: &UiScript) {
     assert!(s.errors().is_empty(), "script errors: {:#?}", s.errors());
-    assert_eq!(
-        s.warnings(),
-        MANIFEST_WARNINGS,
-        "host warnings beyond the manifest's own"
+    assert!(
+        s.warnings().is_empty(),
+        "host warnings: {:#?}",
+        s.warnings()
     );
 }
 
diff --git a/crates/benilla-app/src/ui_script/battlefield_tests.rs b/crates/benilla-app/src/ui_script/battlefield_tests.rs
index 9b7b238a..6b97d0f1 100644
--- a/crates/benilla-app/src/ui_script/battlefield_tests.rs
+++ b/crates/benilla-app/src/ui_script/battlefield_tests.rs
@@ -23,11 +23,11 @@ fn session() -> UiScript {
     // `FloatingChatFrame.lua:9`'s value, read by the icon's fade-in (`BattlefieldFrame.lua:142`).
     s.run("CHAT_FRAME_FADE_TIME = 0.15").unwrap();
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\Localization.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
@@ -77,7 +77,7 @@ fn the_queue_icon_follows_the_slots_across_update_battlefield_status() {
     let mut s = session();
     assert!(!visible(&s, "MiniMapBattlefieldFrame"), "no queue at load");
 
-    s.set_battlefield_queue(vec![slot(529, "Arathi Basin", 1, 0), empty(), empty()], 0);
+    s.set_battlefield_queue([slot(529, "Arathi Basin", 1, 0), empty(), empty()], 0);
     s.fire_event("UPDATE_BATTLEFIELD_STATUS", vec![]);
     assert!(
         visible(&s, "MiniMapBattlefieldFrame"),
@@ -103,7 +103,7 @@ fn the_queue_icon_follows_the_slots_across_update_battlefield_status() {
     assert!(!visible(&s, "StaticPopup1"), "queued is not yet a question");
 
     // Status 2, ready to enter: the confirm dialog and the port countdown.
-    s.set_battlefield_queue(vec![slot(529, "Arathi Basin", 2, 3), empty(), empty()], 0);
+    s.set_battlefield_queue([slot(529, "Arathi Basin", 2, 3), empty(), empty()], 0);
     s.fire_event("UPDATE_BATTLEFIELD_STATUS", vec![]);
     assert!(
         visible(&s, "StaticPopup1"),
@@ -127,7 +127,7 @@ fn the_queue_icon_follows_the_slots_across_update_battlefield_status() {
     s.run("StaticPopup1Button1:Click()").unwrap();
     assert_eq!(s.take_battlefield_port_requests(), vec![(1, true)]);
 
-    s.set_battlefield_queue(vec![empty(), empty(), empty()], 0);
+    s.set_battlefield_queue([empty(), empty(), empty()], 0);
     s.fire_event("UPDATE_BATTLEFIELD_STATUS", vec![]);
     assert!(
         !visible(&s, "MiniMapBattlefieldFrame"),
@@ -154,7 +154,7 @@ fn the_list_window_opens_on_battlefields_show_and_joins_the_selection() {
         }),
         group_queue: true,
     });
-    s.set_battlefield_queue(vec![empty(), empty(), empty()], 0);
+    s.set_battlefield_queue([empty(), empty(), empty()], 0);
     assert!(!visible(&s, "BattlefieldFrame"));
     s.fire_event("BATTLEFIELDS_SHOW", vec![]);
     assert!(visible(&s, "BattlefieldFrame"), "the event shows the panel");
@@ -228,7 +228,7 @@ fn the_list_rows_carry_the_queue_status() {
         }),
         ..Default::default()
     });
-    s.set_battlefield_queue(vec![slot(529, "Arathi Basin", 1, 4), empty(), empty()], 0);
+    s.set_battlefield_queue([slot(529, "Arathi Basin", 1, 4), empty(), empty()], 0);
     s.fire_event("BATTLEFIELDS_SHOW", vec![]);
     assert_eq!(
         s.eval::<String>("return BattlefieldZone2Status:GetText()")
@@ -243,3 +243,14 @@ fn the_list_rows_carry_the_queue_status() {
          (`FontString:GetText 0x79d690` substitutes nil)"
     );
 }
+
+#[test]
+fn a_party_leader_change_before_any_queue_push_updates_the_list_cleanly() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = session();
+    s.take_errors();
+    // A party login fires PARTY_LEADER_CHANGED, which runs `BattlefieldFrame_Update`; it reads
+    // `GetBattlefieldStatus(1..3)` and concatenates the name of any status but "none" (line 242).
+    s.fire_event("PARTY_LEADER_CHANGED", vec![]);
+    assert_eq!(s.take_errors(), Vec::<String>::new());
+}
diff --git a/crates/benilla-app/src/ui_script/binder_tests.rs b/crates/benilla-app/src/ui_script/binder_tests.rs
index b85690dd..8b9db5e2 100644
--- a/crates/benilla-app/src/ui_script/binder_tests.rs
+++ b/crates/benilla-app/src/ui_script/binder_tests.rs
@@ -9,15 +9,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.set_binder_pending(true);
     s
diff --git a/crates/benilla-app/src/ui_script/buff_tests.rs b/crates/benilla-app/src/ui_script/buff_tests.rs
index 6aa7bea1..1dd38505 100644
--- a/crates/benilla-app/src/ui_script/buff_tests.rs
+++ b/crates/benilla-app/src/ui_script/buff_tests.rs
@@ -11,29 +11,27 @@ fn harness() -> UiScript {
     // The one-letter duration strings, which `SecondsToTimeAbbrev` formats unguarded.
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    // `BuffButton_Update` asks `GameTooltip:IsOwned(this)` unguarded (`BuffFrame.lua:104`).
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    // `SecondsToTimeAbbrev` comes with `UIParent.xml` (`UIParent.lua:1034`).
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    // `SecondsToTimeAbbrev` comes with `UIParent.xml` (`UIParent.lua:1034`).
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    // `BuffButton_Update` asks `GameTooltip:IsOwned(this)` unguarded (`BuffFrame.lua:104`).
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
+    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
+    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     // Timers on for these tests; the 1.12 default is "0" (`UIOptionsFrame.lua:104`).
     s.run("SHOW_BUFF_DURATIONS = \"1\"").unwrap();
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     // As the app does: `BuffFrame_OnLoad` never calls `BuffButtons_UpdatePositions`, which 1.12
     // runs on `VARIABLES_LOADED` (`UIOptionsFrame.lua:206`).
     super::manifest::apply_buff_durations(&s).unwrap();
@@ -69,7 +67,7 @@ fn aura(
 
 /// Push the list and fire `PLAYER_AURAS_CHANGED`, as the app's feed does (`BuffFrame.lua:113`).
 fn push(s: &mut UiScript, auras: Vec<AuraState>) {
-    s.set_auras("player", Some(auras));
+    s.set_player_auras(auras);
     s.fire_event("PLAYER_AURAS_CHANGED", vec![]);
 }
 
@@ -351,7 +349,7 @@ fn a_refreshed_duration_reaches_the_bar_with_no_aura_event() {
     assert_eq!(text(&s, "BuffButton0Duration"), "19 s");
 
     // The refresh: a new expiry and no event.
-    s.set_auras("player", Some(vec![mark(300.0)]));
+    s.set_player_auras(vec![mark(300.0)]);
     frame(&mut s, 0.1);
     assert_eq!(
         text(&s, "BuffButton0Duration"),
@@ -367,14 +365,14 @@ fn a_refreshed_duration_reaches_the_bar_with_no_aura_event() {
     // timed aura with no stamp yet shows "0 s" and pulses until the stamp joins.
     let mut pending = mark(0.0);
     pending.until_cancelled = false; // a timed spell, stamp not yet arrived
-    s.set_auras("player", Some(vec![pending]));
+    s.set_player_auras(vec![pending]);
     frame(&mut s, 0.1);
     assert_eq!(
         text(&s, "BuffButton0Duration"),
         "0 s",
         "the reference draws the floor of a timed aura it has no stamp for, not a blank"
     );
-    s.set_auras("player", Some(vec![mark(60.0)])); // the stamp joins, still no event
+    s.set_player_auras(vec![mark(60.0)]); // the stamp joins, still no event
     frame(&mut s, 0.1);
     assert_eq!(
         text(&s, "BuffButton0Duration"),
@@ -885,17 +883,14 @@ fn the_duration_line_reads_the_real_global_strings() {
 
     // `secs_left` seconds remaining at GetTime = 10, read back as the tooltip's last line.
     let mut line = |secs_left: f64| -> String {
-        s.set_auras(
-            "player",
-            Some(vec![AuraState {
-                spell_id: 1459,
-                name: Some("Arcane Intellect".into()),
-                duration: 86_400.0,
-                expiration_time: 10.0 + secs_left,
-                helpful: true,
-                ..Default::default()
-            }]),
-        );
+        s.set_player_auras(vec![AuraState {
+            spell_id: 1459,
+            name: Some("Arcane Intellect".into()),
+            duration: 86_400.0,
+            expiration_time: 10.0 + secs_left,
+            helpful: true,
+            ..Default::default()
+        }]);
         s.run(
             r#"
             BENILLA_TIP:SetOwner(BENILLA_ANCHOR, "ANCHOR_RIGHT")
diff --git a/crates/benilla-app/src/ui_script/cast_tests.rs b/crates/benilla-app/src/ui_script/cast_tests.rs
index 0854e8df..60493c84 100644
--- a/crates/benilla-app/src/ui_script/cast_tests.rs
+++ b/crates/benilla-app/src/ui_script/cast_tests.rs
@@ -9,9 +9,9 @@ use super::test_ui::load_ui as load_xml;
 fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     // The stock file sets `CastingBarText` to the `FAILED` global (`CastingBarFrame.lua:61`).
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
     s
 }
@@ -424,22 +424,22 @@ fn managed_positions_track_the_bottom_bar_stack() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // TOOLTIP_DEFAULT_COLOR for the dropdowns
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
 
     // The load-time pass with no bars shown: the bare bases.
     s.run("UIParent_ManageFramePositions()").unwrap();
diff --git a/crates/benilla-app/src/ui_script/character_tests.rs b/crates/benilla-app/src/ui_script/character_tests.rs
index 67b25a90..a4189c76 100644
--- a/crates/benilla-app/src/ui_script/character_tests.rs
+++ b/crates/benilla-app/src/ui_script/character_tests.rs
@@ -442,10 +442,11 @@ fn clicking_an_occupied_doll_slot_picks_it_up_and_locks_it() {
     assert!(s.errors().is_empty(), "click errors: {:?}", s.errors());
 
     assert!(s.eval::<bool>("return CursorHasItem()").unwrap());
-    let (kind, id) = s
-        .eval::<(String, i64)>("local k, id = GetCursorInfo() return k, id")
-        .unwrap();
-    assert_eq!((kind.as_str(), id), ("item", 1234));
+    assert!(
+        matches!(s.cursor_payload(), Some(benilla_ui::script::CursorPayload::Item(c)) if c.item_id == 1234),
+        "the cursor holds item 1234: {:?}",
+        s.cursor_payload()
+    );
     assert!(
         s.eval::<bool>("return IsInventoryItemLocked(1)").unwrap(),
         "the picked slot locks"
@@ -1082,20 +1083,20 @@ fn an_addons_tab_click_selects_through_the_generic_entry_point() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     // `PanelTemplates_SelectTab` asks `GameTooltip:IsOwned(tab)` (`UIPanelTemplates.lua:130`).
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\CharacterFrameTemplates.xml"); // the window tab
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     // Tabs named `<frame>Tab1..N`, as `PanelTemplates_UpdateTabs` looks them up, each with its id.
     s.run(
diff --git a/crates/benilla-app/src/ui_script/chat_options_tests.rs b/crates/benilla-app/src/ui_script/chat_options_tests.rs
index 2c2ec228..4b87d9a6 100644
--- a/crates/benilla-app/src/ui_script/chat_options_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_options_tests.rs
@@ -22,27 +22,23 @@ fn bake_strings(s: &UiScript) {
 fn chat_with_menu() -> UiScript {
     let mut s = UiScript::new().unwrap();
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\ColorPickerFrame.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\UIPanelTemplates.lua",
-        "Interface\\FrameXML\\UIPanelTemplates.xml",
         "Interface\\FrameXML\\FloatingChatFrame.xml",
+        "Interface\\FrameXML\\ColorPickerFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/chat_resize_tests.rs b/crates/benilla-app/src/ui_script/chat_resize_tests.rs
index 8fb70081..a383853c 100644
--- a/crates/benilla-app/src/ui_script/chat_resize_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_resize_tests.rs
@@ -7,33 +7,29 @@ use super::test_ui::load_ui as load_xml;
 fn chat_ui() -> UiScript {
     let mut s = UiScript::new().unwrap();
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\ColorPickerFrame.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        // A tab-drag stop's `FCF_ValidateChatFramePosition` reads `MainMenuBar:GetHeight()`.
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
+        // A tab-drag stop's `FCF_ValidateChatFramePosition` reads `MainMenuBar:GetHeight()`.
         "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\UIPanelTemplates.lua",
-        "Interface\\FrameXML\\UIPanelTemplates.xml",
         "Interface\\FrameXML\\FloatingChatFrame.xml",
+        "Interface\\FrameXML\\ColorPickerFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/chat_tests.rs b/crates/benilla-app/src/ui_script/chat_tests.rs
index 556f462b..0d07bae2 100644
--- a/crates/benilla-app/src/ui_script/chat_tests.rs
+++ b/crates/benilla-app/src/ui_script/chat_tests.rs
@@ -8,28 +8,28 @@ use super::test_ui::load_ui as load_xml;
 /// The chat stack, fonts first so `inherits="ChatFontNormal"` resolves.
 fn chat_frame() -> UiScript {
     let mut s = UiScript::new().unwrap();
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    // UIParent's OnUpdate runs `FCF_OnUpdate`, the dock's driver, as in the reference.
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     // `FCF_Tab_OnClick` uses the dropdown kit, whose backdrop reads GameTooltip.lua's colour.
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    // UIParent's OnUpdate runs `FCF_OnUpdate`, the dock's driver, as in the reference.
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    // `FCF_ValidateChatFramePosition` reads `MainMenuBar:GetHeight()`, so the bar loads first.
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    // `FCF_ValidateChatFramePosition` reads `MainMenuBar:GetHeight()`, so the bar loads first.
+    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
+    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
+    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
     super::fire_chat_login(&mut s);
     s.set_screen_size(1600.0, 900.0);
@@ -166,6 +166,37 @@ fn input_editbox_enter_drains_the_typed_line() {
     assert!(s.take_chat_sends().is_empty(), "drained");
 }
 
+/// The chat menu's Language list sets `editBox.language` (`ChatFrame.lua:2403-2405`) and
+/// `ChatEdit_SendText` passes it on every send (`:1950-1954`), so `/s` and `/y` speak the pick.
+#[test]
+fn the_edit_box_speaks_the_language_picked_in_the_chat_menu() {
+    benilla_formats::wow_data_or_skip!();
+    let mut s = chat_frame();
+    s.set_language_table(vec![(2, "Darnassian".into()), (7, "Common".into())]);
+    s.set_known_languages(vec!["Darnassian".into(), "Common".into()]);
+    for line in ["/s before", "/s ishnu", "/y alah"] {
+        if line == "/s ishnu" {
+            s.run("ChatFrameEditBox.language = GetLanguageByIndex(1)")
+                .unwrap();
+        }
+        assert!(s.focus_editbox("ChatFrameEditBox"));
+        s.char_input(line);
+        assert!(s.key_input("ENTER"));
+    }
+    let sends = s.take_chat_sends();
+    assert_eq!(
+        sends
+            .iter()
+            .map(|c| (c.text.as_str(), c.chat_type.as_str(), c.language))
+            .collect::<Vec<_>>(),
+        vec![
+            ("before", "SAY", None),
+            ("ishnu", "SAY", Some(2)),
+            ("alah", "YELL", Some(2)),
+        ]
+    );
+}
+
 #[test]
 fn input_escape_closes_without_submitting() {
     benilla_formats::wow_data_or_skip!();
@@ -213,7 +244,11 @@ fn chat_box_arrows_edit_and_history_recalls() {
     );
     assert!(s.focus_editbox("ChatFrameEditBox"));
     s.char_input("dra");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(EditAction::Move {
+        unit: EditUnit::Row,
+        back: true,
+        extend: false,
+    });
     // `ChatEdit_AddHistory` filed "/y hi" (`ChatFrame.lua:1916-1937`); the recall's `OnTextSet`
     // parse (l.2077-2079) turns it back into YELL with "hi".
     assert!(
@@ -227,7 +262,11 @@ fn chat_box_arrows_edit_and_history_recalls() {
         s.eval::<String>("return ChatFrameEditBox:GetText()")
             .unwrap()
     );
-    s.editbox_action(EditAction::HistoryNext);
+    s.editbox_action(EditAction::Move {
+        unit: EditUnit::Row,
+        back: false,
+        extend: false,
+    });
     assert_eq!(
         s.eval::<String>("return ChatFrameEditBox:GetText()")
             .unwrap(),
@@ -245,14 +284,15 @@ fn chat_click_dismisses_a_stuck_spell_but_not_an_item() {
     use benilla_ui::script::{
         ContainerSlot, ContainerState, SpellBookState, SpellSlotView, SpellTabView,
     };
-    let mut s = super::spellbook_tests::spellbook_ui(1024.0, 768.0);
-    for f in [
-        "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-        "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\FloatingChatFrame.xml",
-    ] {
-        load_xml(&s, f);
-    }
+    let mut s = super::spellbook_tests::spellbook_ui_with(
+        1024.0,
+        768.0,
+        &[
+            "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
+            "Interface\\FrameXML\\ChatFrame.xml",
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+        ],
+    );
     s.fire_event("PLAYER_ENTERING_WORLD", vec![]);
     s.set_spellbook(SpellBookState {
         tabs: vec![SpellTabView {
@@ -885,25 +925,20 @@ fn the_chat_menu_builds_its_rows_on_the_references_kit() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         r"Interface\FrameXML\UIMenu.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UIPanelTemplates.lua",
-        "Interface\\FrameXML\\UIPanelTemplates.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\ChatFrame.xml",
         "Interface\\FrameXML\\FloatingChatFrame.xml",
     ] {
         load_xml(&s, f);
@@ -1080,7 +1115,7 @@ fn a_glass_windows_plate_fades_in_on_every_hover_under_the_full_manifest() {
 
 /// Leaving and re-entering within `CHAT_FRAME_FADE_TIME` traps the stock Lua (the tab fade's
 /// finished callback nils `oldAlpha` under a live hover): the bare chat stack must trap, and the
-/// shipped manifest, with `install_chat_plate_guard`, must not.
+/// shipped interface, with the layer's `FrameXMLFixes.xml`, must not.
 #[test]
 fn a_quick_exit_and_reentry_keeps_the_plates_hover_fade() {
     benilla_formats::wow_data_or_skip!();
@@ -1147,7 +1182,7 @@ fn a_quick_exit_and_reentry_keeps_the_plates_hover_fade() {
         "the trapped state: tab up, oldAlpha nil, hover stuck"
     );
 
-    // The shipped interface, with the guard the manifest load installs.
+    // The shipped interface, with the guard the layer installs.
     let mut shipped = UiScript::new().unwrap();
     shipped.set_screen_size(1600.0, 900.0);
     super::test_ui::load_ui(&shipped, "Interface\\FrameXML\\GlobalStrings.lua");
diff --git a/crates/benilla-app/src/ui_script/cinematic_tests.rs b/crates/benilla-app/src/ui_script/cinematic_tests.rs
index c5f03d0e..72a752f2 100644
--- a/crates/benilla-app/src/ui_script/cinematic_tests.rs
+++ b/crates/benilla-app/src/ui_script/cinematic_tests.rs
@@ -10,15 +10,17 @@ use super::test_ui::load_ui as load_xml;
 fn ui_with_the_cinematic_frame() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    // `TakeScreenshot` (`WorldFrame.lua:46`), which the SCREENSHOT binding's body calls.
+    load_xml(&s, r"Interface\FrameXML\WorldFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua"); // StaticPopup's money row
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\CinematicFrame.xml");
     s.resolve();
@@ -95,8 +97,8 @@ fn the_host_has_a_reference_name_for_the_keys_it_now_delivers() {
         (KeyCode::F1, "F1"),
     ] {
         assert_eq!(
-            key_token(code),
-            Some(name),
+            key_token(code, &Default::default()).map(|n| n.to_string()),
+            Some(name.to_string()),
             "{code:?} must reach a keyboard frame under the reference's own name"
         );
     }
@@ -107,9 +109,7 @@ fn the_screenshot_key_is_handed_back_to_its_binding() {
     benilla_formats::wow_data_or_skip!();
     let mut s = ui_with_the_cinematic_frame();
     // `GetBindingKey("SCREENSHOT")` must answer, or the handler's screenshot arm is skipped.
-    s.register_bindings(&crate::bindings::registry_commands());
-    s.seed_binding_set(1, None);
-    s.load_binding_set(1);
+    crate::ui_script::load_stock_bindings(&mut s);
     let key = s
         .keybind_snapshot()
         .into_iter()
@@ -118,23 +118,22 @@ fn the_screenshot_key_is_handed_back_to_its_binding() {
         .expect("SCREENSHOT ships a default chord");
 
     start_cinematic(&mut s);
-    let _ = s.take_keybind_requests();
+    let _ = s.take_screenshot_asks();
 
     assert!(
         s.frame_key_input(&key),
         "the frame consumes {key} like any other key"
     );
     assert_eq!(
-        s.take_keybind_requests(),
-        vec![benilla_ui::script::keybind::KeybindRequest::Run(
-            "SCREENSHOT".into()
-        )],
-        "the screenshot key must reach its binding through RunBinding"
+        s.take_screenshot_asks(),
+        1,
+        "the screenshot key must reach its binding's body through RunBinding"
     );
 
-    // ESCAPE still skips, and queues nothing on the binding channel.
+    // ESCAPE still skips, and asks for no screenshot.
     assert!(s.frame_key_input("ESCAPE"));
-    assert!(s.take_keybind_requests().is_empty());
+    assert_eq!(s.take_screenshot_asks(), 0);
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
 }
 
 /// `ShowUIPanel`'s `area = "full"` row (`UIParent.lua:31`) routes to `SetFullScreenFrame`, which
diff --git a/crates/benilla-app/src/ui_script/color_picker_tests.rs b/crates/benilla-app/src/ui_script/color_picker_tests.rs
index 99198aa0..ae550e5e 100644
--- a/crates/benilla-app/src/ui_script/color_picker_tests.rs
+++ b/crates/benilla-app/src/ui_script/color_picker_tests.rs
@@ -5,24 +5,24 @@ use benilla_ui::script::{QuadContent, UiScript};
 
 use super::test_ui::load_ui as load_xml;
 
-/// The files the picker needs, in manifest order, ending with the window.
+/// The files the picker needs, in the production order, ending with the window.
 fn picker() -> UiScript {
     let mut s = UiScript::new().unwrap();
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\ColorPickerFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/combat_text_tests.rs b/crates/benilla-app/src/ui_script/combat_text_tests.rs
index c74d8a63..170346da 100644
--- a/crates/benilla-app/src/ui_script/combat_text_tests.rs
+++ b/crates/benilla-app/src/ui_script/combat_text_tests.rs
@@ -10,8 +10,8 @@ fn load_combat_text() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua"); // ENTERING_COMBAT & co.
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml"); // TEXT()
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml"); // TEXT()
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     super::test_ui::seat_chain_addon(&mut s, "Blizzard_CombatText");
     // The options window's defaults block (`UIOptionsFrame.lua:125`), seated by hand, master on.
diff --git a/crates/benilla-app/src/ui_script/combo_frame_tests.rs b/crates/benilla-app/src/ui_script/combo_frame_tests.rs
index 20332f3d..670db95d 100644
--- a/crates/benilla-app/src/ui_script/combo_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/combo_frame_tests.rs
@@ -13,26 +13,24 @@ use super::test_ui::load_ui as load_xml;
 fn load_combo_frame() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\CombatFeedback.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PlayerFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PartyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\TargetFrame.xml");
diff --git a/crates/benilla-app/src/ui_script/content.rs b/crates/benilla-app/src/ui_script/content.rs
index c106c16b..521e1986 100644
--- a/crates/benilla-app/src/ui_script/content.rs
+++ b/crates/benilla-app/src/ui_script/content.rs
@@ -2,7 +2,7 @@
 //! missing; `load_ui_files` and its `<Include>` provider read them here, never through `std::fs`.
 //! A dev build reads the source tree first, so an edit needs no recompile.
 
-/// The shipped UI tree: `benilla.toc` and every file it names.
+/// The shipped UI tree: `layer.toc` and every file of ours it names.
 static UI: include_dir::Dir<'_> = include_dir::include_dir!("$CARGO_MANIFEST_DIR/assets/ui");
 
 /// The text of one shipped UI file, by path relative to `assets/ui`; the basename fallback for a
@@ -20,8 +20,10 @@ fn read_source_tree(req: &str) -> Option<String> {
     std::fs::read_to_string(dir.join(req)).ok()
 }
 
-/// FNV-1a (not cryptographic) over the manifest and each file it names, in load order, as eight
-/// hex digits: a stamp that tells two runs whether they loaded the same interface.
+/// FNV-1a (not cryptographic) over the core's load list, then the layer's manifest and each file
+/// it names when this run loads it, in load order, as eight hex digits: a stamp that tells two runs
+/// whether they loaded the same interface. The core counts by its rows' names alone, in the toc's
+/// order: their bytes are the player's install.
 pub(crate) fn digest() -> String {
     let mut h: u64 = 0xcbf2_9ce4_8422_2325;
     let mut eat = |bytes: &[u8]| {
@@ -30,15 +32,24 @@ pub(crate) fn digest() -> String {
             h = h.wrapping_mul(0x1000_0000_01b3);
         }
     };
-    eat(super::manifest::MANIFEST.as_bytes());
-    if let Some(toc) = read(super::manifest::MANIFEST) {
-        eat(toc.as_bytes());
-    }
-    for name in super::addons::Addon::builtin().toc.files {
-        // Only a chain entry's name counts: its bytes are the player's install.
+    eat(super::reference_ui::TOC.as_bytes());
+    for name in super::reference_ui::core()
+        .map(|core| core.toc.files)
+        .unwrap_or_default()
+    {
         eat(name.as_bytes());
-        if let Some(text) = read(&name) {
-            eat(text.as_bytes());
+    }
+    if super::manifest::layer_enabled() {
+        let manifest = super::manifest::LAYER_MANIFEST;
+        eat(manifest.as_bytes());
+        if let Some(toc) = read(manifest) {
+            eat(toc.as_bytes());
+        }
+        for name in super::addons::Addon::layer().toc.files {
+            eat(name.as_bytes());
+            if let Some(text) = read(&name) {
+                eat(text.as_bytes());
+            }
         }
     }
     format!("{:08x}", h as u32)
@@ -57,7 +68,7 @@ mod tests {
         for name in crate::ui_script::manifest::shipped_manifest_files() {
             assert!(
                 super::read(&name).is_some(),
-                "benilla.toc names {name}, which is not in assets/ui"
+                "a manifest names {name}, which is not in assets/ui"
             );
         }
     }
diff --git a/crates/benilla-app/src/ui_script/death_tests.rs b/crates/benilla-app/src/ui_script/death_tests.rs
index 9847b163..0cc0ee71 100644
--- a/crates/benilla-app/src/ui_script/death_tests.rs
+++ b/crates/benilla-app/src/ui_script/death_tests.rs
@@ -8,15 +8,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s
 }
diff --git a/crates/benilla-app/src/ui_script/delete_item_tests.rs b/crates/benilla-app/src/ui_script/delete_item_tests.rs
index 6b467d94..2d139b7e 100644
--- a/crates/benilla-app/src/ui_script/delete_item_tests.rs
+++ b/crates/benilla-app/src/ui_script/delete_item_tests.rs
@@ -5,7 +5,7 @@
 use benilla_ui::script::{ContainerSlot, ContainerState, UiScript};
 
 use super::test_ui::{
-    bag_open, bag_slot_button, load_ui as load_xml, load_world_frame, world_click, BAG_UI,
+    bag_open, bag_slot_button, load_ui as load_xml, world_click, BAG_UI, WORLD_FRAME_UI,
 };
 
 /// A backpack holding a 5-stack of `item_id` at `quality`, the parameter the popup forks on.
@@ -44,25 +44,31 @@ fn one_item_backpack(item_id: u32, name: &str, quality: u32) -> ContainerState {
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    // The stock `DELETE_GOOD_ITEM`'s `OnHide` hands focus back to `ChatFrameEditBox`.
-    load_xml(&s, r"Interface\FrameXML\UIMenu.xml");
-    load_xml(&s, r"Interface\FrameXML\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // TOOLTIP_DEFAULT_COLOR, for dropdowns
-    load_xml(&s, r"Interface\FrameXML\UIDropDownMenu.xml");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, r"Interface\FrameXML\FloatingChatFrame.xml"); // declares ChatFrameEditBox
-
     // The drop is a click on the full-screen world frame, so it must be loaded.
-    load_world_frame(&s);
+    for file in super::test_ui::production_order(&[
+        &[
+            r"Interface\FrameXML\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            r"Interface\FrameXML\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml", // TOOLTIP_DEFAULT_COLOR, for dropdowns
+            r"Interface\FrameXML\UIMenu.xml",
+            r"Interface\FrameXML\UIDropDownMenu.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\StaticPopup.xml",
+            // The stock `DELETE_GOOD_ITEM`'s `OnHide` hands focus back to `ChatFrameEditBox`,
+            // which FloatingChatFrame.xml declares.
+            r"Interface\FrameXML\ChatFrame.xml",
+            r"Interface\FrameXML\FloatingChatFrame.xml",
+        ],
+        WORLD_FRAME_UI,
+    ]) {
+        load_xml(&s, file);
+    }
     s.set_money(0);
     s
 }
@@ -71,14 +77,18 @@ fn setup() -> UiScript {
 fn bag_setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            // `ContainerFrame_Update` reads `MerchantFrame:IsShown()` on any slot the tooltip owns.
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+        WORLD_FRAME_UI, // the drop target
+    ]) {
         load_xml(&s, file);
     }
-    // `ContainerFrame_Update` reads `MerchantFrame:IsShown()` on any slot the tooltip owns.
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_world_frame(&s); // the drop target
 
     // `BAG_UI` leaves out `CharacterFrame.xml`, so `PaperDollFrame` has no hidden parent and would
     // cover the world; the real client never shows it here.
diff --git a/crates/benilla-app/src/ui_script/dressup_tests.rs b/crates/benilla-app/src/ui_script/dressup_tests.rs
index 83ed448d..e391591d 100644
--- a/crates/benilla-app/src/ui_script/dressup_tests.rs
+++ b/crates/benilla-app/src/ui_script/dressup_tests.rs
@@ -12,49 +12,47 @@ use super::test_ui::{bag_slot_button, click, load_ui as load_xml, BAG_UI, CHARAC
 /// A real 1.12 item link: Tough Jerky (117), quality white.
 const JERKY_LINK: &str = "|cffffffff|Hitem:117|h[Tough Jerky]|h|r";
 
-/// The room's own files, in manifest order; both loaders end with these.
+/// The room's own files, in the production order; both loaders end with these.
 const ROOM_UI: &[&str] = &[
-    "Interface\\FrameXML\\UIDropDownMenu.xml",
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-    "Interface\\FrameXML\\UnitPopup.xml",
-    "Interface\\FrameXML\\ItemRef.xml",
-    "ScrollTemplates.xml", // our scroll kits
-    "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-    "Interface\\FrameXML\\MerchantFrame.xml",
-    "Interface\\FrameXML\\StackSplitFrame.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
     "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-    "Interface\\FrameXML\\GlobalStrings.lua",
-    "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\ChatFrame.xml",
+    "Interface\\FrameXML\\UIDropDownMenu.xml",
     "Interface\\FrameXML\\UIPanelTemplates.lua",
     "Interface\\FrameXML\\UIPanelTemplates.xml",
+    "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+    "Interface\\FrameXML\\StackSplitFrame.xml",
+    "Interface\\FrameXML\\UnitPopup.xml",
+    "Interface\\FrameXML\\ChatFrame.xml",
+    "Interface\\FrameXML\\FloatingChatFrame.xml",
+    "Interface\\FrameXML\\MerchantFrame.xml",
+    "Interface\\FrameXML\\ItemRef.xml",
     // After the panel kit: the room's Close and Reset buttons inherit its templates at load.
     "Interface\\FrameXML\\DressUpFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\FloatingChatFrame.xml",
+    "ScrollTemplates.xml", // our scroll kits
 ];
 
 /// The room with no bag window, for the click sites that never touch a container.
 fn load_room(s: &UiScript) {
-    for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-    ] {
-        load_xml(s, file);
-    }
-    for file in ROOM_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\StaticPopup.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+        ],
+        ROOM_UI,
+    ]) {
         load_xml(s, file);
     }
 }
@@ -62,11 +60,11 @@ fn load_room(s: &UiScript) {
 /// The room over the stock bag windows; `UIParent.xml` leads because every window parents to it
 /// and `BAG_UI` has no line for it.
 fn load_room_with_bags(s: &UiScript) {
-    load_xml(s, r"Interface\FrameXML\UIParent.xml");
-    for file in BAG_UI {
-        load_xml(s, file);
-    }
-    for file in ROOM_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        &[r"Interface\FrameXML\UIParent.xml"],
+        BAG_UI,
+        ROOM_UI,
+    ]) {
         load_xml(s, file);
     }
 }
@@ -77,23 +75,23 @@ fn load_room_with_bags(s: &UiScript) {
 fn shown_paper_doll() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in CHARACTER_UI {
-        super::test_ui::load_ui_strict(&s, file);
-    }
-    for file in [
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UIPanelTemplates.lua",
-        "Interface\\FrameXML\\UIPanelTemplates.xml",
-        // After the panel kit its buttons inherit from.
-        "Interface\\FrameXML\\DressUpFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\FloatingChatFrame.xml",
-    ] {
+    for file in crate::ui_script::test_ui::production_order(&[
+        CHARACTER_UI,
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            "Interface\\FrameXML\\UIMenu.xml",
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\UIPanelTemplates.lua",
+            "Interface\\FrameXML\\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\ChatFrame.xml",
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            // After the panel kit its buttons inherit from.
+            "Interface\\FrameXML\\DressUpFrame.xml",
+        ],
+    ]) {
         super::test_ui::load_ui_strict(&s, file);
     }
     s.set_unit(
diff --git a/crates/benilla-app/src/ui_script/duel_tests.rs b/crates/benilla-app/src/ui_script/duel_tests.rs
index 6326d799..0fbcf455 100644
--- a/crates/benilla-app/src/ui_script/duel_tests.rs
+++ b/crates/benilla-app/src/ui_script/duel_tests.rs
@@ -7,15 +7,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s
 }
diff --git a/crates/benilla-app/src/ui_script/durability_tests.rs b/crates/benilla-app/src/ui_script/durability_tests.rs
index ddc1e950..3d9b166d 100644
--- a/crates/benilla-app/src/ui_script/durability_tests.rs
+++ b/crates/benilla-app/src/ui_script/durability_tests.rs
@@ -9,18 +9,18 @@ fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\BattlefieldFrame.xml",
         "Interface\\FrameXML\\Minimap.xml",
         "Interface\\FrameXML\\DurabilityFrame.xml",
@@ -28,9 +28,9 @@ fn harness() -> UiScript {
         load_xml(&s, f);
     }
     // Deviation: the seat refreshes on every alert recompute, because the stock one goes stale
-    // when a side glyph appears while shown and hangs the shield off the screen edge. The app
-    // installs this after every load.
-    super::manifest::install_durability_reseat(&s).unwrap();
+    // when a side glyph appears while shown and hangs the shield off the screen edge. The layer
+    // installs this after every stock file.
+    load_xml(&s, "FrameXMLFixes.xml");
     s
 }
 
@@ -350,31 +350,30 @@ fn the_quest_tracker_stacks_below_the_durability_guy() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\BattlefieldFrame.xml",
         "Interface\\FrameXML\\Minimap.xml",
-        "ScrollTemplates.xml",
-        "Interface\\FrameXML\\DurabilityFrame.xml",
-        "Interface\\FrameXML\\BasicControls.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
         "Interface\\FrameXML\\ItemButtonTemplate.xml",
         "Interface\\FrameXML\\QuestFrame.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
         "Interface\\FrameXML\\QuestLogFrame.xml",
+        "Interface\\FrameXML\\DurabilityFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, f);
     }
-    super::manifest::install_durability_reseat(&s).unwrap();
+    load_xml(&s, "FrameXMLFixes.xml");
 
     let mut inv: InventorySlots = Default::default();
     inv[18] = slot(2504, Some((0, 20)));
diff --git a/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs b/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
index 338a93d3..9bb0c010 100644
--- a/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
+++ b/crates/benilla-app/src/ui_script/enchant_confirm_tests.rs
@@ -7,15 +7,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s
 }
diff --git a/crates/benilla-app/src/ui_script/errors_tests.rs b/crates/benilla-app/src/ui_script/errors_tests.rs
index e8cf5179..d946a56c 100644
--- a/crates/benilla-app/src/ui_script/errors_tests.rs
+++ b/crates/benilla-app/src/ui_script/errors_tests.rs
@@ -91,28 +91,28 @@ fn an_error_toast_draws_over_an_open_panel_window() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    // A missing template only warns at load, so an under-loaded list fails at its first update.
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // ours: the scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    // A missing template only warns at load, so an under-loaded list fails at its first update.
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
+    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // ours: the scroll kits
 
     // A left-slot panel opens, then the toast: stratum, not order, must decide.
     s.eval::<()>("ShowUIPanel(QuestLogFrame)").unwrap();
diff --git a/crates/benilla-app/src/ui_script/escape_tests.rs b/crates/benilla-app/src/ui_script/escape_tests.rs
index 26c79cd1..d57cf4e1 100644
--- a/crates/benilla-app/src/ui_script/escape_tests.rs
+++ b/crates/benilla-app/src/ui_script/escape_tests.rs
@@ -45,27 +45,27 @@ fn escape_closes_bag_and_panel_releases_loot_and_keeps_the_held_item() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
-        load_xml(&s, file);
-    }
     // `LOOT_UI` whole: a missing `ItemButtonTemplate` is only a load warning, so it fails silently.
-    for file in super::test_ui::LOOT_UI {
-        if BAG_UI.contains(file) {
-            continue; // a file loads once; `BAG_UI` carried it
-        }
+    for file in super::test_ui::production_order(&[
+        BAG_UI,
+        super::test_ui::LOOT_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            // Stock `ContainerFrame.lua` reads `MerchantFrame:IsShown()`.
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "Interface\\FrameXML\\LootFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    // Stock `ContainerFrame.lua` reads `MerchantFrame:IsShown()`.
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_container(0, Some(one_item_backpack()));
 
     // Open the bag and the loot window; drain their open sounds.
     s.run("MainMenuBarBackpackButton:Click()").unwrap();
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
@@ -128,22 +128,26 @@ fn escape_is_consumed_by_a_focused_editbox_and_leaves_windows_open() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            "Interface\\FrameXML\\UIMenu.xml", // the kit the chat menus build from
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\UIPanelTemplates.lua",
+            "Interface\\FrameXML\\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\ChatFrame.xml",
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
     s.set_money(0);
     s.set_container(0, Some(one_item_backpack()));
 
@@ -169,22 +173,23 @@ fn escape_closes_the_options_window_before_opening_the_menu() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\GameMenuFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "ScrollTemplates.xml"); // the Keybindings page's faux-scroll kit
     load_xml(&s, "KeyBindingsPage.xml");
     load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "GameMenuFrame.xml");
+    load_xml(&s, "GameMenuAdapters.xml");
 
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
     assert!(s
@@ -221,22 +226,26 @@ fn escape_closes_an_open_stack_split_frame() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            "Interface\\FrameXML\\UIMenu.xml",
+            "Interface\\FrameXML\\UIPanelTemplates.lua",
+            "Interface\\FrameXML\\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\StackSplitFrame.xml",
+            "Interface\\FrameXML\\ChatFrame.xml", // ChatFrameEditBox, for the shift fork
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml", // read by the stock bag-slot click
+            "ScrollTemplates.xml",                    // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml"); // read by the stock bag-slot click
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml"); // ChatFrameEditBox, for the shift fork
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\StackSplitFrame.xml");
     s.set_money(0);
 
     let mut slots = std::collections::HashMap::new();
@@ -299,14 +308,19 @@ fn escape_ladder_cast_then_windows_then_target_one_eater_per_press() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            // The dropdown backdrop reads `TOOLTIP_DEFAULT_COLOR`, which `BAG_UI`'s tooltip file
+            // sets.
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    // The dropdown backdrop reads `TOOLTIP_DEFAULT_COLOR`, which `BAG_UI`'s tooltip file sets.
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_container(0, Some(one_item_backpack()));
     s.run("MainMenuBarBackpackButton:Click()").unwrap();
@@ -379,12 +393,16 @@ fn escape_ladder_cast_then_windows_then_target_one_eater_per_press() {
     );
 
     // Press 4, no target: `ClearTarget` answers nil; the menu it falls through to is not loaded.
+    // Its deselect queues either way and finds nothing selected when it applies.
     s.set_unit("target", None);
     s.run("ToggleGameMenu()").unwrap();
-    assert!(
-        !s.take_target_clear(),
-        "ClearTarget answers nil with no target — nothing queued"
+    assert!(s.take_target_clear(), "the bare press reaches ClearTarget");
+    assert_eq!(
+        s.eval::<Option<i64>>("return ClearTarget()").unwrap(),
+        None,
+        "ClearTarget answers nil with no target"
     );
+    let _ = s.take_target_clear();
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
@@ -395,12 +413,16 @@ fn escape_ladder_targeting_rung_after_cast_before_windows() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_container(0, Some(one_item_backpack()));
     s.run("MainMenuBarBackpackButton:Click()").unwrap();
@@ -455,17 +477,18 @@ fn an_addon_frame_registered_in_uispecialframes_closes_on_escape() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\GameMenuFrame.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "GameMenuFrame.xml");
+    load_xml(&s, "GameMenuAdapters.xml");
 
     s.run(
         r#"
diff --git a/crates/benilla-app/src/ui_script/exp_bar_tests.rs b/crates/benilla-app/src/ui_script/exp_bar_tests.rs
index 0a804d56..f5db8e86 100644
--- a/crates/benilla-app/src/ui_script/exp_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/exp_bar_tests.rs
@@ -6,25 +6,25 @@ fn exp_bar_harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
         // `ExhaustionTick_Update` reads `ReputationWatchBar`, which `ReputationFrame.xml`
         // declares; the two template files before it are what its check boxes inherit.
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
     ] {
         super::test_ui::load_ui(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/extract/mod.rs b/crates/benilla-app/src/ui_script/extract/mod.rs
index 8afc849a..972afda4 100644
--- a/crates/benilla-app/src/ui_script/extract/mod.rs
+++ b/crates/benilla-app/src/ui_script/extract/mod.rs
@@ -557,6 +557,8 @@ pub(super) fn tick_script(
     for w in script.take_warnings() {
         warn!("ui_script: {w}");
     }
+    // A runtime `LoadAddOn`'s record, appended to `Logs\FrameXML.log`.
+    super::load_log::write(script.take_load_log_writes());
 
     // ── The handover ────────────────────────────────────────────────────────────────────────
     *pass = super::UiPassState {
@@ -661,23 +663,8 @@ pub(super) fn paint_script(
     // The focused editbox's per-byte advances, measured as it draws, for click and scroll.
     if let Some(atlas) = font_atlas.as_deref_mut() {
         if let Some(req) = script.editbox_advances_request() {
-            let spec = crate::ui_text::FontSpec {
-                path: req.font.as_deref(),
-                // At the drawn size, divided by the seam alone: screen UI units, like the mouse.
-                height: crate::ui_text::drawn_px(req.height, None, s * req.scale),
-                outline: req.outline,
-                alpha_gradient: None, // alpha never changes metrics
-            };
-            let cum: Vec<f32> = crate::ui_text::line_advances(&mut atlas.lock(), &req.text, spec)
-                .iter()
-                .map(|a| a / s)
-                .collect();
-            // A multiline box also gets the draw's row starts and pitch, in UI units.
-            let (rows, cell_h) = match req.wrap_width {
-                Some(w) => crate::ui_text::line_rows(&mut atlas.lock(), &req.text, w * s, spec),
-                None => (vec![0], 0.0),
-            };
-            script.set_editbox_advances(req.id, req.key, cum, rows, cell_h / s);
+            let (cum, rows, cell_h) = crate::ui_text::editbox_advances(&mut atlas.lock(), s, &req);
+            script.set_editbox_advances(req.id, req.key, cum, rows, cell_h);
         }
     }
     // The focused editbox's text UI: its Text quad, scroll window, caret and selection spans,
@@ -1278,7 +1265,7 @@ fn convert_entry(
                     },
                     color: [1.0, 1.0, 1.0, eq.alpha],
                     // `SetPortraitTexture` cuts the inscribed circle, as the reference stamps into
-                    // its 64² bake's alpha; `BenillaSetBoothTexture` samples square.
+                    // its 64² bake's alpha.
                     circular,
                     premultiplied,
                     clip,
@@ -2094,15 +2081,15 @@ mod extract_gate_tests {
         let mut app = app_with_marker();
         app.world_mut()
             .non_send_resource_mut::<UiScript>()
-            .run("BenillaSetBoothTexture(marker, 'paperdoll')")
+            .run("SetPortraitTexture(marker, 'target')")
             .unwrap();
-        // The booth publishes a live bake for that slot; without an entry the region draws nothing.
+        // The booth publishes a live bake for that unit; without an entry the region draws nothing.
         let bake = app
             .world_mut()
             .resource_mut::<Assets<Image>>()
             .add(Image::default());
         app.world_mut().resource_mut::<PortraitImages>().0.insert(
-            "paperdoll".to_string(),
+            "target".to_string(),
             crate::portrait::PortraitSource::Live(bake.clone()),
         );
         app.update();
diff --git a/crates/benilla-app/src/ui_script/extract/text.rs b/crates/benilla-app/src/ui_script/extract/text.rs
index acfbf53b..00d95d38 100644
--- a/crates/benilla-app/src/ui_script/extract/text.rs
+++ b/crates/benilla-app/src/ui_script/extract/text.rs
@@ -107,8 +107,13 @@ pub(super) fn emit(
         let (x0, top, cell_h) =
             crate::ui_text::line_origin(&mut atlas.lock(), drawn, host.rect, draw_justify, spec);
         ebox_geom = Some((x0, top, cell_h));
-        text_clip = Some(host.clip.map_or(host.rect, |c| c.intersect(host.rect)));
+        // A single-line box shows only what fits its text region (`0x77d858` sets the window's
+        // substring), so the whole string drawn here is cut at the region. A multi-line region is
+        // only as tall as its text, and the reference clips neither it nor the caret texture
+        // (`E+0x368`), which after a trailing break stands a line below it: only a ScrollFrame's
+        // clip applies.
         if !ui.multi_line {
+            text_clip = Some(host.clip.map_or(host.rect, |c| c.intersect(host.rect)));
             draw_text = drawn;
             draw_rect = Rect::new(x0, host.rect.min.y, x0 + 100_000.0, host.rect.max.y);
             draw_justify = crate::ui_text::Justify {
@@ -419,3 +424,133 @@ mod tests {
         assert_eq!(gaps, [1, 2].into_iter().collect());
     }
 }
+
+/// The focused multi-line box's caret through the whole UI pass, on the client faces: the region
+/// that draws its text is only as tall as that text, and the caret must not be cut to it.
+#[cfg(test)]
+mod caret_tests {
+    use bevy::prelude::*;
+    use bevy::window::PrimaryWindow;
+
+    use benilla_ui::script::UiScript;
+
+    use super::super::{paint_script, tick_script, UiQuad, UiQuads};
+    use crate::portrait::PortraitImages;
+    use crate::ui_text::UiFontAtlas;
+
+    /// A focused 270-wide multi-line box at 14 px on a 1024×768 window (`s = 1`), holding `text`.
+    fn app_with_focused_box(text: &str) -> App {
+        let script = UiScript::new().unwrap();
+        script
+            .run(&format!(
+                r#"
+            E = CreateFrame("EditBox", "E")
+            E:SetPoint("TOPLEFT", 100, -100)
+            E:SetWidth(270); E:SetHeight(200)
+            E:SetFont("Fonts\\FRIZQT__.TTF", 14)
+            E:SetMultiLine(true)
+            E:SetFocus()
+            E:SetText({text:?})
+        "#
+            ))
+            .unwrap();
+        let mut app = App::new();
+        app.insert_non_send_resource(script);
+        app.insert_resource(UiFontAtlas::for_test(1.0).expect("the client faces open"));
+        app.init_resource::<UiQuads>();
+        app.init_resource::<crate::ui_script::UiPassState>();
+        app.init_resource::<Assets<Image>>();
+        app.init_resource::<PortraitImages>();
+        app.init_resource::<crate::portrait::BoothPanes>();
+        app.init_resource::<crate::ui_models::UiModelTiles>();
+        app.init_resource::<crate::minimap::MinimapWidget>();
+        app.init_resource::<crate::ui_script::UiFrameCost>();
+        app.init_resource::<crate::ui_script::UiCostWanted>();
+        app.init_resource::<Time>();
+        app.init_resource::<Time<Real>>();
+        app.init_resource::<crate::ui_script::UiClock>();
+        app.init_resource::<crate::ui_script::UiScaleCvar>();
+        app.world_mut().spawn((
+            Window {
+                resolution: UVec2::new(1024, 768).into(),
+                ..default()
+            },
+            PrimaryWindow,
+        ));
+        app.add_systems(Update, (tick_script, paint_script).chain());
+        // The box seats and sizes itself, the host answers the advances, then the caret draws.
+        for _ in 0..4 {
+            app.update();
+        }
+        app
+    }
+
+    /// The caret: the one untextured white quad.
+    fn caret(app: &App) -> UiQuad {
+        let quads = &app.world().resource::<UiQuads>().quads;
+        let mut carets = quads
+            .iter()
+            .filter(|q| q.texture.is_none() && q.color[..3] == [1.0, 1.0, 1.0]);
+        let c = carets
+            .next()
+            .expect("the focused box draws its caret")
+            .clone();
+        assert!(carets.next().is_none(), "one caret");
+        c
+    }
+
+    /// Whole and visible: a line tall, and no clip cuts any of it.
+    fn assert_whole(c: &UiQuad) {
+        assert!(c.rect.height() >= 10.0, "a line tall: {:?}", c.rect);
+        if let Some(clip) = c.clip {
+            assert_eq!(
+                clip.intersect(c.rect),
+                c.rect,
+                "the clip cuts the caret: {clip:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn an_empty_focused_multi_line_box_draws_its_whole_caret() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let app = app_with_focused_box("");
+        assert_whole(&caret(&app));
+    }
+
+    /// After a trailing break the caret stands on the line the break opened, below the text.
+    #[test]
+    fn a_caret_after_a_trailing_newline_is_drawn_whole_below_the_text() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let one = caret(&app_with_focused_box("abc"));
+        let after = caret(&app_with_focused_box("abc\n"));
+        assert_whole(&after);
+        assert_eq!(
+            after.rect.min.y,
+            one.rect.min.y + one.rect.height(),
+            "one line down: {:?} against {:?}",
+            after.rect,
+            one.rect
+        );
+    }
+
+    /// The last line's descenders hang below its measured line, as a drop shadow would: no clip
+    /// cuts them.
+    #[test]
+    fn a_focused_multi_line_boxs_last_line_keeps_its_descenders() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let app = app_with_focused_box("gjpqy");
+        let quads = &app.world().resource::<UiQuads>().quads;
+        let glyphs: Vec<&UiQuad> = quads.iter().filter(|q| q.texture.is_some()).collect();
+        assert_eq!(glyphs.len(), 5, "the five glyphs draw");
+        for g in glyphs {
+            if let Some(clip) = g.clip {
+                assert_eq!(
+                    clip.intersect(g.rect),
+                    g.rect,
+                    "a clip cuts a glyph: {clip:?}"
+                );
+            }
+        }
+    }
+}
diff --git a/crates/benilla-app/src/ui_script/fade_tests.rs b/crates/benilla-app/src/ui_script/fade_tests.rs
index 7c056f68..1a1f495d 100644
--- a/crates/benilla-app/src/ui_script/fade_tests.rs
+++ b/crates/benilla-app/src/ui_script/fade_tests.rs
@@ -10,14 +10,14 @@ fn a_started_fade_ramps_off_uiparents_tick_and_completes() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.resolve();
     s.run(r#"CreateFrame("Frame", "BenillaFadeProbe")"#)
@@ -62,14 +62,14 @@ fn a_flash_alternates_then_stops() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.resolve();
 
diff --git a/crates/benilla-app/src/ui_script/faux_scroll_tests.rs b/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
index 9b72cbd0..20774d74 100644
--- a/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
+++ b/crates/benilla-app/src/ui_script/faux_scroll_tests.rs
@@ -22,9 +22,9 @@ fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, "ScrollTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     load_inline(
         &s,
         r#"<Ui>
@@ -367,9 +367,9 @@ fn scrolling_edit_helpers_answer_bare_calls_from_a_handler() {
     benilla_formats::wow_data_or_skip!();
     let s = UiScript::new().unwrap();
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, "ScrollTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     load_inline(
         &s,
         r#"<Ui>
diff --git a/crates/benilla-app/src/ui_script/frame_flag_gate.rs b/crates/benilla-app/src/ui_script/frame_flag_gate.rs
index 5eec88f3..f5fcec0c 100644
--- a/crates/benilla-app/src/ui_script/frame_flag_gate.rs
+++ b/crates/benilla-app/src/ui_script/frame_flag_gate.rs
@@ -401,7 +401,7 @@ fn the_shipped_frames_carry_the_references_flags() {
     assert!(
         // The floor guards the pairing, not the census: the paired count falls as each of our
         // files declaring a reference-named frame retires.
-        compared > 5,
+        compared >= 1,
         "only {compared} frames compared — the pairing broke, and the sweep guards nothing"
     );
     assert!(
diff --git a/crates/benilla-app/src/ui_script/game_menu_addon_tests.rs b/crates/benilla-app/src/ui_script/game_menu_addon_tests.rs
new file mode 100644
index 00000000..257b948a
--- /dev/null
+++ b/crates/benilla-app/src/ui_script/game_menu_addon_tests.rs
@@ -0,0 +1,389 @@
+//! The stock ESC menu's rungs under the addons that reshape it (ShaguTweaks, MCP, pfUI), with the
+//! layer on and without it: every stock rung stays in the chain, anchored `TOP`, so an addon's
+//! insert lays out as on 1.12.1. Without the layer, the menu is the stock one.
+
+use std::path::Path;
+
+use benilla_ui::script::UiScript;
+
+use crate::local_state::test_env::ENV_LOCK;
+
+/// The production in-game load with the ESC menu open: the layer on unless `stock_ui`, and the
+/// AddOns root filled by `addons`. Fails on any load error or raise.
+fn open_menu_with(tag: &str, stock_ui: bool, addons: impl FnOnce(&Path)) -> UiScript {
+    let (mut s, failures) = super::layer_tests::production_load_with(tag, stock_ui, "", addons);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    s.run("ShowUIPanel(GameMenuFrame)").unwrap();
+    s.resolve();
+    assert!(s.eval::<bool>("return GameMenuFrame:IsVisible()").unwrap());
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+    s
+}
+
+/// An addon of `files`, each a name and its text, in the AddOns root.
+fn write_addon(root: &Path, name: &str, files: &[(&str, &str)]) {
+    let dir = root.join(name);
+    std::fs::create_dir_all(&dir).unwrap();
+    for (file, body) in files {
+        std::fs::write(dir.join(file), body).unwrap();
+    }
+}
+
+/// The corpus addon `name`, copied whole into the AddOns root.
+fn copy_addon(corpus: &Path, root: &Path, name: &str) {
+    let dir = root.join(name);
+    std::fs::create_dir_all(&dir).unwrap();
+    for entry in std::fs::read_dir(corpus.join(name)).unwrap().flatten() {
+        if entry.file_type().unwrap().is_file() {
+            std::fs::copy(entry.path(), dir.join(entry.file_name())).unwrap();
+        }
+    }
+}
+
+/// A shown rung's `(top, bottom)` down from the frame's top, and whether it is centred in it.
+fn rung(s: &UiScript, name: &str) -> (f64, f64, bool) {
+    let (top, bottom, left, right, ftop, fleft, fright) = s
+        .eval::<(f64, f64, f64, f64, f64, f64, f64)>(&format!(
+            "local f = GameMenuFrame return {name}:GetTop(), {name}:GetBottom(), \
+             {name}:GetLeft(), {name}:GetRight(), f:GetTop(), f:GetLeft(), f:GetRight()"
+        ))
+        .unwrap_or_else(|e| panic!("{name}: {e}"));
+    let centred = ((left - fleft) - (fright - right)).abs() < 1e-3;
+    (ftop - top, ftop - bottom, centred)
+}
+
+/// The shown rungs of the open menu, top to bottom: the children of `GameMenuFrame` that draw.
+fn shown_rungs(s: &UiScript) -> Vec<String> {
+    let mut names: Vec<String> = s
+        .eval(
+            "local out = {} for _, c in ipairs({ GameMenuFrame:GetChildren() }) do \
+             if c:IsVisible() then table.insert(out, c:GetName()) end end return out",
+        )
+        .unwrap();
+    names.sort_by(|a, b| rung(s, a).0.total_cmp(&rung(s, b).0));
+    names
+}
+
+/// No two shown rungs overlap, each is centred, and each is 21 tall.
+fn assert_a_clean_ladder(s: &UiScript) -> Vec<String> {
+    let names = shown_rungs(s);
+    for pair in names.windows(2) {
+        let (above, below) = (rung(s, &pair[0]), rung(s, &pair[1]));
+        assert!(
+            below.0 >= above.1 - 1e-3,
+            "{} (down {}..{}) overlaps {} (down {}..{})",
+            pair[1],
+            below.0,
+            below.1,
+            pair[0],
+            above.0,
+            above.1
+        );
+    }
+    for name in &names {
+        let (top, bottom, centred) = rung(s, name);
+        assert!(
+            (bottom - top - 21.0).abs() < 1e-3,
+            "{name} is {} tall",
+            bottom - top
+        );
+        assert!(centred, "{name} is off centre in the menu");
+    }
+    names
+}
+
+/// ShaguTweaks' insert (`config.lua:313-324`), restated in its own calls: narrow and deepen the
+/// menu, hang a new rung under Interface Options, then hang Key Bindings under the new rung.
+const SHAGU_ADVANCED_OPTIONS: &str = r#"
+local panel = CreateFrame("Frame", nil, UIParent)
+panel:Hide()
+GameMenuFrame:SetWidth(GameMenuFrame:GetWidth() - 10)
+GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 10)
+local rung = CreateFrame("Button", "GameMenuButtonAdvancedOptions", GameMenuFrame, "GameMenuButtonTemplate")
+rung:SetPoint("TOP", GameMenuButtonUIOptions, "BOTTOM", 0, -1)
+rung:SetText("Advanced Options")
+rung:SetScript("OnClick", function() HideUIPanel(GameMenuFrame); panel:Show() end)
+GameMenuButtonKeybindings:ClearAllPoints()
+GameMenuButtonKeybindings:SetPoint("TOP", rung, "BOTTOM", 0, -1)
+"#;
+
+fn shagu(root: &Path) {
+    write_addon(
+        root,
+        "ZZShagu",
+        &[
+            ("ZZShagu.toc", "## Interface: 11200\nconfig.lua\n"),
+            ("config.lua", SHAGU_ADVANCED_OPTIONS),
+        ],
+    );
+}
+
+/// ShaguTweaks anchors its Advanced Options under `GameMenuButtonUIOptions` and re-anchors
+/// `GameMenuButtonKeybindings` under it (`GameMenuFrame.xml:78`, `:93`): it loads without a raise,
+/// the button lands 1 under the Options rung, and every rung below moves down by its height and
+/// the gap, 22, as the stock rungs do on the stock menu.
+#[test]
+fn shagutweaks_advanced_options_lands_under_the_options_rung_and_pushes_the_rest_down() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    for stock_ui in [false, true] {
+        let tag = if stock_ui { "shagu-stock" } else { "shagu" };
+        let base = open_menu_with(&format!("{tag}-base"), stock_ui, |_| {});
+        let s = open_menu_with(tag, stock_ui, shagu);
+        let before = shown_rungs(&base);
+        let after = assert_a_clean_ladder(&s);
+
+        let options = rung(&s, "GameMenuButtonOptions");
+        let advanced = rung(&s, "GameMenuButtonAdvancedOptions");
+        // Under the Options rung on ours, as the era menu has no Sound or UI Options rung.
+        let above = if stock_ui {
+            "GameMenuButtonUIOptions"
+        } else {
+            "GameMenuButtonOptions"
+        };
+        assert!(
+            (advanced.0 - (rung(&s, above).1 + 1.0)).abs() < 1e-3,
+            "stock_ui {stock_ui}: Advanced Options at {advanced:?}, 1 under {above}"
+        );
+        let at = after
+            .iter()
+            .position(|n| n == "GameMenuButtonAdvancedOptions")
+            .expect("the button is shown");
+        assert_eq!(after[at - 1], above, "stock_ui {stock_ui}: {after:?}");
+        let mut expected = before.clone();
+        expected.insert(at, "GameMenuButtonAdvancedOptions".into());
+        assert_eq!(after, expected, "stock_ui {stock_ui}: the ladder");
+        for name in &after[at + 1..] {
+            let moved = (rung(&s, name).0 - options.0)
+                - (rung(&base, name).0 - rung(&base, "GameMenuButtonOptions").0);
+            assert!(
+                (moved - 22.0).abs() < 1e-3,
+                "stock_ui {stock_ui}: {name} moved {moved} down, not 22"
+            );
+        }
+    }
+}
+/// MCP's AddOns button (`MCP.xml:108-127`) anchors `TOP` under Macros, sets Logout's `TOP` under
+/// itself without `ClearAllPoints` and grows the menu by 25: Logout's one `TOP` anchor is replaced,
+/// so Logout, Exit Game and Return to Game move down under it, as on the stock menu.
+#[test]
+fn mcps_addons_button_lands_under_macros_and_pushes_logout_down() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let corpus = benilla_formats::addon_corpus_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    for stock_ui in [false, true] {
+        let tag = if stock_ui { "mcp-stock" } else { "mcp" };
+        let base = open_menu_with(&format!("{tag}-base"), stock_ui, |_| {});
+        let s = open_menu_with(tag, stock_ui, |root| copy_addon(&corpus, root, "MCP"));
+        let after = assert_a_clean_ladder(&s);
+
+        let macros = rung(&s, "GameMenuButtonMacros");
+        let addons = rung(&s, "GameMenuButtonAddOns");
+        let logout = rung(&s, "GameMenuButtonLogout");
+        assert!(
+            (addons.0 - (macros.1 + 1.0)).abs() < 1e-3,
+            "stock_ui {stock_ui}: AddOns {addons:?} 1 under Macros {macros:?}"
+        );
+        assert!(
+            (logout.0 - (addons.1 + 1.0)).abs() < 1e-3,
+            "stock_ui {stock_ui}: Logout {logout:?} 1 under AddOns {addons:?}"
+        );
+        let at = after
+            .iter()
+            .position(|n| n == "GameMenuButtonAddOns")
+            .unwrap();
+        assert_eq!(after[at - 1], "GameMenuButtonMacros");
+        assert_eq!(
+            after[at + 1..],
+            [
+                "GameMenuButtonLogout",
+                "GameMenuButtonQuit",
+                "GameMenuButtonContinue"
+            ]
+        );
+        let height = |s: &UiScript| s.eval::<f64>("return GameMenuFrame:GetHeight()").unwrap();
+        assert!(
+            (height(&s) - height(&base) - 25.0).abs() < 1e-3,
+            "stock_ui {stock_ui}: the menu grows by MCP's 25"
+        );
+        let span = |s: &UiScript, a: &str, b: &str| rung(s, b).0 - rung(s, a).0;
+        for (a, b) in [
+            ("GameMenuButtonLogout", "GameMenuButtonQuit"),
+            ("GameMenuButtonQuit", "GameMenuButtonContinue"),
+        ] {
+            assert!(
+                (span(&s, a, b) - span(&base, a, b)).abs() < 1e-3,
+                "stock_ui {stock_ui}: {b} still follows {a}"
+            );
+        }
+    }
+}
+
+/// pfUI's game-menu skin (`skins/blizzard/game_menu.lua`) in its shape: it narrows the menu by 30,
+/// finds the unnamed MAIN_MENU title among the regions, adds a button at the top, shifts
+/// `GameMenuButtonOptions`' own point down 22 through `GetPoint`, and skins every stock rung that
+/// exists. The rungs stay centred in the narrower frame, as the stock ones do, with no raise.
+const PFUI_SHAPED_SKIN: &str = r#"
+GameMenuFrame:SetWidth(GameMenuFrame:GetWidth() - 30)
+GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + 6)
+
+local title
+for _, region in ipairs({ GameMenuFrame:GetRegions() }) do
+  if region:GetObjectType() == "FontString" and region:GetDrawLayer() == "ARTWORK"
+      and region:GetText() and string.find(region:GetText(), MAIN_MENU, 1) then
+    title = region
+  end
+end
+title:SetTextColor(1, 1, 1, 1)
+title:ClearAllPoints()
+title:SetPoint("TOP", GameMenuFrame, "TOP", 0, 16)
+
+local button = CreateFrame("Button", "GameMenuButtonPFUI", GameMenuFrame, "GameMenuButtonTemplate")
+button:SetPoint("TOP", 0, -10)
+button:SetText("pfUI Config")
+
+local point, relativeTo, relativePoint, xOffset, yOffset = GameMenuButtonOptions:GetPoint()
+GameMenuButtonOptions:SetPoint(point, relativeTo, relativePoint, xOffset, yOffset - 22)
+
+ZZPFUI_SKINNED = 0
+for _, rung in pairs({ GameMenuButtonOptions, GameMenuButtonSoundOptions, GameMenuButtonUIOptions,
+    GameMenuButtonKeybindings, GameMenuButtonMacros, GameMenuButtonRatings, GameMenuButtonLogout,
+    GameMenuButtonQuit, GameMenuButtonContinue }) do
+  if rung then ZZPFUI_SKINNED = ZZPFUI_SKINNED + 1 end
+end
+"#;
+
+#[test]
+fn a_pfui_shaped_skin_keeps_every_rung_centred_in_the_narrowed_menu() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    for stock_ui in [false, true] {
+        let tag = if stock_ui { "pfui-stock" } else { "pfui" };
+        let s = open_menu_with(tag, stock_ui, |root| {
+            write_addon(
+                root,
+                "ZZpfUI",
+                &[
+                    ("ZZpfUI.toc", "## Interface: 11200\nskin.lua\n"),
+                    ("skin.lua", PFUI_SHAPED_SKIN),
+                ],
+            );
+        });
+        let after = assert_a_clean_ladder(&s);
+        assert_eq!(
+            after[0], "GameMenuButtonPFUI",
+            "stock_ui {stock_ui}: {after:?}"
+        );
+        assert_eq!(
+            after[1], "GameMenuButtonOptions",
+            "stock_ui {stock_ui}: {after:?}"
+        );
+        assert_eq!(
+            s.eval::<i64>("return ZZPFUI_SKINNED").unwrap(),
+            8,
+            "stock_ui {stock_ui}: every stock rung is there to skin"
+        );
+    }
+}
+
+/// Booted without the layer, as `WOW_STOCK_UI=1` does, the ESC menu is the stock one: its eight
+/// rungs at the stock file's geometry (`GameMenuFrame.xml:5-185`), each opening its stock window.
+#[test]
+fn the_stock_ui_menu_is_the_stock_menu_and_every_rung_opens_its_stock_window() {
+    use benilla_ui::script::SessionRequest;
+    let _data = benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let mut s = open_menu_with("stock-menu", true, |_| {});
+    let rungs = assert_a_clean_ladder(&s);
+    assert_eq!(
+        rungs,
+        [
+            "GameMenuButtonOptions",
+            "GameMenuButtonSoundOptions",
+            "GameMenuButtonUIOptions",
+            "GameMenuButtonKeybindings",
+            "GameMenuButtonMacros",
+            "GameMenuButtonLogout",
+            "GameMenuButtonQuit",
+            "GameMenuButtonContinue",
+        ]
+    );
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GameMenuFrame:GetWidth(), GameMenuFrame:GetHeight()")
+            .unwrap(),
+        (195.0, 246.0)
+    );
+    // Options' centre 37 under the top, then 1-unit gaps, and 16 above Return to Game.
+    let tops: Vec<f64> = rungs.iter().map(|n| rung(&s, n).0).collect();
+    let want = [26.5, 48.5, 70.5, 92.5, 114.5, 136.5, 158.5, 195.5];
+    for ((name, got), want) in rungs.iter().zip(&tops).zip(want) {
+        assert!((got - want).abs() < 1e-3, "{name} at {got}, not {want}");
+    }
+    let labels: Vec<String> = s
+        .eval(
+            "local out = {} for _, n in ipairs({ 'Options', 'SoundOptions', 'UIOptions', \
+             'Keybindings', 'Macros', 'Logout', 'Quit', 'Continue' }) do \
+             table.insert(out, getglobal('GameMenuButton' .. n):GetText()) end return out",
+        )
+        .unwrap();
+    let globals: Vec<String> = s
+        .eval(
+            "return { VIDEOOPTIONS_MENU, SOUNDOPTIONS_MENU, UIOPTIONS_MENU, KEY_BINDINGS, MACROS, \
+             LOGOUT, EXIT_GAME, RETURN_TO_GAME }",
+        )
+        .unwrap();
+    assert_eq!(labels, globals);
+    assert!(!s
+        .eval::<bool>("return BenillaGameMenuButtonEditMode ~= nil")
+        .unwrap());
+
+    for (rung, window) in [
+        ("Options", "OptionsFrame"),
+        ("SoundOptions", "SoundOptionsFrame"),
+        ("UIOptions", "UIOptionsFrame"),
+        ("Keybindings", "KeyBindingFrame"),
+        ("Macros", "MacroFrame"),
+    ] {
+        s.run("HideUIPanel(GameMenuFrame) ShowUIPanel(GameMenuFrame)")
+            .unwrap();
+        s.run(&format!("GameMenuButton{rung}:Click()")).unwrap();
+        assert!(
+            s.eval::<bool>(&format!(
+                "return {window} ~= nil and {window}:IsVisible() and true or false"
+            ))
+            .unwrap(),
+            "{rung} opens {window}"
+        );
+        s.run(&format!("HideUIPanel({window})")).unwrap();
+        // The stock video window's own show and hide read video CVars and verbs benilla does not
+        // register yet (`OptionsFrame.lua:146`, `:260`); what the menu does is the click above.
+        let errors = s.take_errors();
+        assert!(
+            errors
+                .iter()
+                .all(|e| rung == "Options" && e.contains("OptionsFrame.lua")),
+            "{rung}: {errors:?}"
+        );
+    }
+    for (rung, request) in [
+        ("Logout", SessionRequest::Logout),
+        ("Quit", SessionRequest::Quit),
+    ] {
+        s.run("ShowUIPanel(GameMenuFrame)").unwrap();
+        let _ = s.take_session_requests();
+        s.run(&format!("GameMenuButton{rung}:Click()")).unwrap();
+        assert_eq!(s.take_session_requests(), vec![request], "{rung}");
+    }
+    s.run("ShowUIPanel(GameMenuFrame) GameMenuButtonContinue:Click()")
+        .unwrap();
+    assert!(!s.eval::<bool>("return GameMenuFrame:IsVisible()").unwrap());
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
diff --git a/crates/benilla-app/src/ui_script/game_menu_tests.rs b/crates/benilla-app/src/ui_script/game_menu_tests.rs
index 02a3d4b8..e14b3887 100644
--- a/crates/benilla-app/src/ui_script/game_menu_tests.rs
+++ b/crates/benilla-app/src/ui_script/game_menu_tests.rs
@@ -1,4 +1,5 @@
-//! Tests for our `GameMenuFrame.xml`, the frame ESC opens. The bags in its way are the stock
+//! Tests for the frame ESC opens: the stock `GameMenuFrame.xml` as the layer's
+//! `GameMenuAdapters.xml` reshapes it. The bags in its way are the stock
 //! `ContainerFrame1..12`, recycled, so tests ask [`bag_open`] rather than naming a frame.
 
 use benilla_ui::script::{
@@ -7,33 +8,28 @@ use benilla_ui::script::{
 
 use super::test_ui::{bag_open, load_ui as load_xml, BAG_UI};
 
-/// The menu over what it needs (`GameMenuButtonTemplate` is `UIPanelTemplates.xml:403`), with
-/// `extra` in its way, deduped so no file loads twice.
+/// The stock menu over what it needs (`GameMenuButtonTemplate` is `UIPanelTemplates.xml:403`),
+/// with `extra` in its way and the layer's reshaping, each file once, in the production order.
 fn harness_with(extra: &[&str]) -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    let files: Vec<&str> = [
+    const MENU: &[&str] = &[
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         // Before the menu: its `parent="UIParent"` resolves at load.
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\GameMenuFrame.xml",
         "Interface\\FrameXML\\StaticPopup.xml",
-    ]
-    .into_iter()
-    .chain(extra.iter().copied())
-    .chain(std::iter::once("GameMenuFrame.xml"))
-    .collect();
-    let mut loaded = std::collections::HashSet::new();
-    for file in files {
-        if loaded.insert(file) {
-            load_xml(&s, file);
-        }
+        "GameMenuAdapters.xml",
+    ];
+    for file in super::test_ui::production_order(&[MENU, extra]) {
+        load_xml(&s, file);
     }
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
     s
@@ -43,14 +39,9 @@ fn harness() -> UiScript {
     harness_with(&[])
 }
 
-/// [`harness_with`] over the stock bag stack, with `before` ahead of it and `after` behind.
-fn bag_harness_with(before: &[&str], after: &[&str]) -> UiScript {
-    let files: Vec<&str> = before
-        .iter()
-        .copied()
-        .chain(BAG_UI.iter().copied())
-        .chain(after.iter().copied())
-        .collect();
+/// [`harness_with`] over the stock bag stack and `extra`.
+fn bag_harness_with(extra: &[&str]) -> UiScript {
+    let files: Vec<&str> = BAG_UI.iter().chain(extra).copied().collect();
     harness_with(&files)
 }
 
@@ -58,8 +49,8 @@ fn bag_harness_with(before: &[&str], after: &[&str]) -> UiScript {
 /// replace 1.12's; without the AddOns rung, as the character-select screen is the only addon UI.
 const LADDER: [&str; 7] = [
     "GameMenuButtonOptions",
-    "GameMenuButtonEditMode",
-    "GameMenuButtonSupport",
+    "BenillaGameMenuButtonEditMode",
+    "BenillaGameMenuButtonSupport",
     "GameMenuButtonMacros",
     "GameMenuButtonLogout",
     "GameMenuButtonQuit",
@@ -114,7 +105,10 @@ fn the_unbacked_entries_are_disabled_and_the_rest_are_live() {
     let s = harness();
     s.run("ShowUIPanel(GameMenuFrame)").unwrap();
 
-    for name in ["GameMenuButtonEditMode", "GameMenuButtonSupport"] {
+    for name in [
+        "BenillaGameMenuButtonEditMode",
+        "BenillaGameMenuButtonSupport",
+    ] {
         assert!(
             !s.eval::<bool>(&format!("return {name}:IsEnabled() ~= 0"))
                 .unwrap(),
@@ -134,10 +128,10 @@ fn the_unbacked_entries_are_disabled_and_the_rest_are_live() {
             "{name} is live"
         );
     }
-    // Edit Mode reads the era's `HUD_EDIT_MODE_MENU` and Continue 1.12's `RETURN_TO_GAME`; Options
-    // is a literal, as 1.12's `OPTIONS_MENU` is "Options Menu".
+    // Edit Mode is the era's label and Continue 1.12's `RETURN_TO_GAME`; Options is a literal, as
+    // 1.12's `OPTIONS_MENU` is "Options Menu".
     assert_eq!(
-        s.eval::<String>("return GameMenuButtonEditMode:GetText()")
+        s.eval::<String>("return BenillaGameMenuButtonEditMode:GetText()")
             .unwrap(),
         "Edit Mode"
     );
@@ -158,14 +152,11 @@ fn the_unbacked_entries_are_disabled_and_the_rest_are_live() {
 #[test]
 fn escape_opens_the_menu_only_when_nothing_else_wants_the_press_and_then_closes_it() {
     let _data = benilla_formats::wow_data_or_skip!();
-    let mut s = bag_harness_with(
-        &[],
-        &[
-            "ScrollTemplates.xml",
-            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-            "Interface\\FrameXML\\MerchantFrame.xml",
-        ],
-    );
+    let mut s = bag_harness_with(&[
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
+        "ScrollTemplates.xml",
+    ]);
     s.set_money(0);
     s.set_container(0, Some(backpack()));
 
@@ -198,14 +189,11 @@ fn escape_opens_the_menu_only_when_nothing_else_wants_the_press_and_then_closes_
 #[test]
 fn the_clicked_form_closes_everything_and_opens_the_menu_in_one_go() {
     let _data = benilla_formats::wow_data_or_skip!();
-    let mut s = bag_harness_with(
-        &[],
-        &[
-            "ScrollTemplates.xml",
-            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-            "Interface\\FrameXML\\MerchantFrame.xml",
-        ],
-    );
+    let mut s = bag_harness_with(&[
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
+        "ScrollTemplates.xml",
+    ]);
     s.set_money(0);
     s.set_container(0, Some(backpack()));
     s.run("MainMenuBarBackpackButton:Click()").unwrap();
@@ -228,30 +216,28 @@ fn the_clicked_form_closes_everything_and_opens_the_menu_in_one_go() {
 #[test]
 fn the_open_menu_takes_the_screen_and_refuses_every_other_panel() {
     let _data = benilla_formats::wow_data_or_skip!();
-    let mut s = bag_harness_with(
-        &[],
-        &[
-            "ScrollTemplates.xml",
-            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-            "Interface\\FrameXML\\MerchantFrame.xml",
-            // The stock loot window, as `test_ui::LOOT_UI`.
-            "Interface\\FrameXML\\UIDropDownMenu.xml",
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-            "Interface\\FrameXML\\UnitPopup.xml",
-            "Interface\\FrameXML\\TextStatusBar.lua",
-            "Interface\\FrameXML\\TextStatusBar.xml",
-            "Interface\\FrameXML\\UnitFrame.xml",
-            "Interface\\FrameXML\\BuffFrame.xml",
-            "Interface\\FrameXML\\PartyFrame.xml",
-            "Interface\\FrameXML\\ItemButtonTemplate.xml",
-            "Interface\\FrameXML\\LootFrame.xml",
-        ],
-    );
+    let mut s = bag_harness_with(&[
+        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
+        // The stock loot window, as `test_ui::LOOT_UI`.
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\BuffFrame.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
+        "Interface\\FrameXML\\PartyFrame.xml",
+        "Interface\\FrameXML\\ItemButtonTemplate.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
+        "Interface\\FrameXML\\LootFrame.xml",
+        "ScrollTemplates.xml",
+    ]);
     s.set_money(0);
     s.set_container(0, Some(backpack()));
     s.run("MainMenuBarBackpackButton:Click()").unwrap();
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
@@ -500,19 +486,19 @@ fn the_world_map_cannot_open_behind_the_menu_and_gives_its_slot_back() {
     let s = harness_with(&[
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml", // the map's zone pickers initialize at OnLoad
-        "ScrollTemplates.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
-        // The map calls `UpdateMicroButtons` unguarded (`WorldMapFrame.xml:599`, `:606`).
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\MainMenuBar.xml",
+        // The map calls `UpdateMicroButtons` unguarded (`WorldMapFrame.xml:599`, `:606`).
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
         r"Interface\FrameXML\WorldMapFrame.xml",
+        "ScrollTemplates.xml",
     ]);
 
     s.run("ToggleWorldMap()").unwrap();
@@ -553,34 +539,32 @@ fn the_world_map_cannot_open_behind_the_menu_and_gives_its_slot_back() {
 fn nothing_opens_behind_the_world_map_and_escape_closes_it_first() {
     let _data = benilla_formats::wow_data_or_skip!();
     let s = harness_with(&[
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        // The action bar the micro buttons sit on: the map calls `UpdateMicroButtons` unguarded.
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
-        r"Interface\FrameXML\WorldMapFrame.xml",
-        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-        "Interface\\FrameXML\\MerchantFrame.xml",
         // The stock loot window, as `test_ui::LOOT_UI`.
         "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+        // The action bar the micro buttons sit on: the map calls `UpdateMicroButtons` unguarded.
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\ItemButtonTemplate.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
         "Interface\\FrameXML\\LootFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        r"Interface\FrameXML\WorldMapFrame.xml",
+        "ScrollTemplates.xml",
     ]);
     s.run("ToggleWorldMap()").unwrap();
 
@@ -609,26 +593,22 @@ fn nothing_opens_behind_the_world_map_and_escape_closes_it_first() {
 fn the_bag_row_greys_under_the_menu_without_any_of_it_disappearing() {
     let _data = benilla_formats::wow_data_or_skip!();
     // The action bar, whose `MainMenuBarArtFrame` parents the bag bar, ahead of the bag stack.
-    let mut s = bag_harness_with(
-        &[
-            "Interface\\FrameXML\\Cooldown.xml",
-            "Interface\\FrameXML\\ActionButtonTemplate.xml",
-            "Interface\\FrameXML\\TextStatusBar.lua",
-            "Interface\\FrameXML\\TextStatusBar.xml",
-            "Interface\\FrameXML\\Fonts.xml",
-            r"Interface\FrameXML\UIParent.xml",
-            "ScrollTemplates.xml",
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\MainMenuBar.xml",
-            "Interface\\FrameXML\\GameTooltip.xml",
-            "Interface\\FrameXML\\ActionBarFrame.xml",
-            "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        ],
-        &[
-            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-            "Interface\\FrameXML\\MerchantFrame.xml",
-        ],
-    );
+    let mut s = bag_harness_with(&[
+        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "ScrollTemplates.xml",
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
+    ]);
     s.set_money(0);
     s.set_container(0, Some(backpack()));
     s.resolve();
@@ -740,17 +720,17 @@ fn backpack() -> ContainerState {
     }
 }
 
-/// The menu wears the options window's `ERA_WINDOW_SCALE` on show, as the era client draws the two
-/// at one density; loaded with OptionsFrame.xml, which defines it.
+/// The menu wears the options window's `BENILLA_ERA_WINDOW_SCALE` on show, as the era client draws
+/// the two at one density; loaded with OptionsFrame.xml, which defines it.
 #[test]
 fn the_menu_rides_the_shared_era_window_scale() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness_with(&[
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
+        "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
     ]);
@@ -758,7 +738,7 @@ fn the_menu_rides_the_shared_era_window_scale() {
     s.resolve();
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
     let k = s.eval::<f64>("return GameMenuFrame:GetScale()").unwrap();
-    let want = s.eval::<f64>("return ERA_WINDOW_SCALE").unwrap();
+    let want = s.eval::<f64>("return BENILLA_ERA_WINDOW_SCALE").unwrap();
     assert!((k - want).abs() < 1e-6, "menu scale {k} != knob {want}");
     assert!((want - 0.78).abs() < 1e-6, "the knob itself moved: {want}");
 }
diff --git a/crates/benilla-app/src/ui_script/group_loot_tests.rs b/crates/benilla-app/src/ui_script/group_loot_tests.rs
index ba90ebb4..eb41c100 100644
--- a/crates/benilla-app/src/ui_script/group_loot_tests.rs
+++ b/crates/benilla-app/src/ui_script/group_loot_tests.rs
@@ -31,43 +31,60 @@ fn text_color(quads: &[ExtractedQuad], t: &str) -> Option<[f32; 4]> {
     })?
 }
 
-/// The four popups, declared in stock `LootFrame.xml`. The caller loads `UIParent.xml`, whose
-/// `UIParent_OnEvent` routes `START_LOOT_ROLL` (`UIParent.lua:513-516`).
-fn load_group_loot(s: &UiScript) {
+/// The four popups, declared in stock `LootFrame.xml`, which a kit loads after `UIParent.xml`,
+/// whose `UIParent_OnEvent` routes `START_LOOT_ROLL` (`UIParent.lua:513-516`).
+const GROUP_LOOT: &[&str] = &[
+    r"Interface\FrameXML\UIDropDownMenu.xml",
     // `GroupLootDropDown`'s OnLoad runs its initializer at once, which reads `MAX_PARTY_MEMBERS`
     // (`LootFrame.lua:217`), a constant of `PartyMemberFrame.lua`.
-    load_xml(s, r"Interface\FrameXML\UIDropDownMenu.xml");
-    load_xml(s, r"Interface\FrameXML\PartyMemberFrame.lua");
-    load_xml(s, r"Interface\FrameXML\LootFrame.xml");
+    r"Interface\FrameXML\PartyMemberFrame.lua",
+    r"Interface\FrameXML\LootFrame.xml",
+];
+
+/// The bars the popups stack over and the kits they reach for.
+const BARS: &[&str] = &[
+    // The loot window's labels (`ITEMS`, `PREV`, `NEXT`) are GlobalStrings keys; a missing one is
+    // a loader warning, which `load_ui_no_warnings` fails.
+    r"Interface\FrameXML\GlobalStrings.lua",
+    "Interface\\FrameXML\\Fonts.xml",
+    r"Interface\FrameXML\BasicControls.xml",
+    r"Interface\FrameXML\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
+    "Interface\\FrameXML\\GameTooltip.xml", // the vote and item hovers
+    // `UIPanelCloseButton`, which each popup's pass button inherits (`LootFrame.xml:364`).
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
+    r"Interface\FrameXML\StaticPopup.xml",
+    "Interface\\FrameXML\\TextStatusBar.lua",
+    "Interface\\FrameXML\\TextStatusBar.xml",
+    "Interface\\FrameXML\\MainMenuBar.xml",
+    "Interface\\FrameXML\\Cooldown.xml",
+    "Interface\\FrameXML\\ActionButtonTemplate.xml",
+    "Interface\\FrameXML\\ActionBarFrame.xml",
+    r"Interface\FrameXML\ItemButtonTemplate.xml",
+    "Interface\\FrameXML\\BonusActionBarFrame.xml",
+];
+
+/// The bars and the popups, in the production order; returns the frames `LootFrame.xml` built,
+/// with no loader warning of any kind.
+fn setup_counted(extra: &[&str]) -> (UiScript, usize) {
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    let mut built = 0;
+    for file in super::test_ui::production_order(&[BARS, GROUP_LOOT, extra]) {
+        if file.ends_with("LootFrame.xml") {
+            built = load_xml_no_warnings(&s, file);
+        } else {
+            load_xml(&s, file);
+        }
+    }
+    (s, built)
 }
 
 fn setup() -> UiScript {
-    let mut s = UiScript::new().unwrap();
-    s.set_screen_size(1024.0, 768.0);
-    // The loot window's labels (`ITEMS`, `PREV`, `NEXT`) are GlobalStrings keys; a missing one is
-    // a loader warning, which `load_ui_no_warnings` fails.
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\ItemButtonTemplate.xml");
-    // `UIPanelCloseButton`, which each popup's pass button inherits (`LootFrame.xml:364`).
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // the vote and item hovers
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-    s
+    setup_counted(&[]).0
 }
 
 /// The resolved rolls' links as `ui_loot_roll` builds them: quality colour, four-field `|Hitem:`.
@@ -123,15 +140,9 @@ fn rolls() -> LootRollsState {
 #[test]
 fn shipped_group_loot_frame_loads_clean_and_starts_hidden() {
     let _data = benilla_formats::wow_data_or_skip!();
-    let s = setup();
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIDropDownMenu.xml");
-    load_xml(&s, r"Interface\FrameXML\PartyMemberFrame.lua");
+    let (s, built) = setup_counted(&[]);
     // The popups come inside the whole loot window, so the frame count is only a floor.
-    assert!(
-        load_xml_no_warnings(&s, r"Interface\FrameXML\LootFrame.xml") > 4,
-        "the loot window brought its frames"
-    );
+    assert!(built > 4, "the loot window brought its frames");
 
     for i in 1..=4 {
         let name = format!("GroupLootFrame{i}");
@@ -149,7 +160,6 @@ fn shipped_group_loot_frame_loads_clean_and_starts_hidden() {
 fn start_loot_roll_claims_frames_in_order_and_paints_the_roll() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = setup();
-    load_group_loot(&s);
     s.set_loot_rolls(rolls());
 
     s.fire_event(
@@ -235,7 +245,6 @@ fn start_loot_roll_claims_frames_in_order_and_paints_the_roll() {
 fn the_bop_confirm_popup_lands_the_withheld_vote() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = setup();
-    load_group_loot(&s);
     s.set_loot_rolls(rolls());
 
     // The app fires this after draining the confirm queue (`ui_loot_roll::drain_loot_rolls`).
@@ -293,7 +302,6 @@ fn the_bop_confirm_popup_lands_the_withheld_vote() {
 fn cancel_loot_roll_hides_only_that_frame() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = setup();
-    load_group_loot(&s);
     s.set_loot_rolls(rolls());
 
     s.fire_event(
@@ -335,7 +343,6 @@ fn cancel_loot_roll_hides_only_that_frame() {
 fn in_flight_roll_opens_without_a_name_or_icon() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = setup();
-    load_group_loot(&s);
     s.set_loot_rolls(rolls());
 
     s.fire_event(
@@ -383,7 +390,6 @@ fn in_flight_roll_opens_without_a_name_or_icon() {
 fn nothing_repaints_a_frame_that_opened_before_its_snapshot() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = setup();
-    load_group_loot(&s);
 
     // The order the app must never produce: the event first, against a model with no such roll.
     s.fire_event(
@@ -440,20 +446,26 @@ fn managed_positions_engage_for_the_bare_frame_name() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     // `GameTooltip.xml` brings `TOOLTIP_DEFAULT_COLOR`, which the dropdown lists read in their
     // OnLoad (`UIDropDownMenuTemplates.xml:186`).
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_group_loot(&s);
+    for file in super::test_ui::production_order(&[
+        &[
+            r"Interface\FrameXML\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            r"Interface\FrameXML\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\StaticPopup.xml",
+        ],
+        GROUP_LOOT,
+    ]) {
+        load_xml(&s, file);
+    }
 
     let bottom = |s: &UiScript| s.eval::<f64>("return GroupLootFrame1:GetBottom()").unwrap();
 
@@ -494,19 +506,12 @@ fn managed_positions_engage_for_the_bare_frame_name() {
 #[test]
 fn ctrl_and_shift_on_the_roll_icon_preview_and_post_its_link() {
     let _data = benilla_formats::wow_data_or_skip!();
-    let mut s = setup();
-    load_group_loot(&s);
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\DressUpFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    let (mut s, _) = setup_counted(&[
+        "Interface\\FrameXML\\UIMenu.xml", // the kit the chat menus build from
+        "Interface\\FrameXML\\ChatFrame.xml",
+        "Interface\\FrameXML\\FloatingChatFrame.xml",
+        "Interface\\FrameXML\\DressUpFrame.xml",
+    ]);
     s.set_loot_rolls(rolls());
 
     // Roll 8 is not bind-on-pickup, so the dice below vote without a confirm.
@@ -570,7 +575,6 @@ fn ctrl_and_shift_on_the_roll_icon_preview_and_post_its_link() {
 fn the_roll_template_carries_the_reference_name_and_the_parts_addons_reach_for() {
     let _data = benilla_formats::wow_data_or_skip!();
     let s = setup();
-    load_group_loot(&s);
 
     // `CreateFrame` raises on an unknown template, so this call is the check.
     s.run(r#"Probe = CreateFrame("Frame", "ProbeRoll", nil, "GroupLootFrameTemplate")"#)
@@ -607,10 +611,12 @@ fn the_stock_group_loot_frame_survives_an_in_flight_roll() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
     s.set_loot_rolls(rolls());
 
     // Roll 9 is in flight and roll 99 unknown: both answer the reference's miss tail, quality 1
diff --git a/crates/benilla-app/src/ui_script/help_frame_tests.rs b/crates/benilla-app/src/ui_script/help_frame_tests.rs
index 488ef431..6a615011 100644
--- a/crates/benilla-app/src/ui_script/help_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/help_frame_tests.rs
@@ -1,7 +1,10 @@
 //! The stock GM help window (`HelpFrame.xml`): the two faces of `UPDATE_TICKET`, the ticket
 //! toast and its repoll, and the status ask on show.
 
-use benilla_ui::script::{GmTicketIntent, ScriptValue, UiScript};
+use benilla_ui::script::{
+    EditAction, EditBoxAdvanceRequest, EditUnit, GmTicketIntent, MeasureRequest, ScriptValue,
+    TextMeasure, UiScript,
+};
 
 use super::test_ui::load_ui as load_xml;
 
@@ -10,35 +13,34 @@ fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "ScrollTemplates.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
         // Before StaticPopup.xml, whose coin row inherits `SmallMoneyFrameTemplate`.
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
         // `HelpFrame_OnShow` calls `UpdateMicroButtons()` before `GetGMStatus()`
         // (`HelpFrame.lua:178`), so the micro row and the bar's button kit load too.
         "Interface\\FrameXML\\Cooldown.xml",
         "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
         "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
         // `TicketStatusFrame_OnEvent` re-anchors `TemporaryEnchantFrame` before it arms the
         // repoll (`HelpFrame.lua:494`).
         "Interface\\FrameXML\\BuffFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
         "Interface\\FrameXML\\HelpFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
@@ -188,3 +190,112 @@ fn toggling_the_window_opens_it_and_asks_for_the_queue_status() {
     s.run("ToggleHelpFrame()").unwrap();
     assert!(!s.eval::<bool>("return HelpFrame:IsVisible()").unwrap());
 }
+
+/// The ticket text is a multi-line box and the scroll child itself (`HelpFrame.xml`, 541×357 in
+/// the 378-tall `HelpFrameOpenTicketScrollFrame`): the box sizes itself to its wrapped text
+/// (`0x77d4d0` @`0x77d8ad`), so `ScrollingEdit_OnTextChanged`'s recompute ranges over all of it.
+#[test]
+fn the_ticket_text_grows_with_its_lines_and_its_scroll_frame_ranges_over_them() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = setup();
+    // Wide glyphs and the stand-in's 12-unit line: the box's 500-letter cap must still wrap
+    // past the frame.
+    const GLYPH: f64 = 60.0;
+    s.set_text_measurer(Box::new(super::FixedWidthFont(GLYPH as f32)));
+    s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"OpenTicket\")")
+        .unwrap();
+    s.resolve();
+    s.tick(0.016);
+    s.resolve();
+    assert_eq!(
+        s.eval::<f64>("return HelpFrameOpenTicketText:GetHeight()")
+            .unwrap(),
+        12.0,
+        "empty, the box is one line: the authored 357 lasts until the first flush"
+    );
+
+    s.run(r#"HelpFrameOpenTicketText:SetText(string.rep("x", 400))"#)
+        .unwrap();
+    s.tick(0.016);
+    s.resolve();
+    // Wrapped at the box's own 541: no insets.
+    let height = (400.0 * GLYPH / 541.0).ceil() * 12.0;
+    assert_eq!(
+        s.eval::<f64>("return HelpFrameOpenTicketText:GetHeight()")
+            .unwrap(),
+        height
+    );
+    assert_eq!(
+        s.eval::<f64>("return HelpFrameOpenTicketScrollFrame:GetVerticalScrollRange()")
+            .unwrap(),
+        height - 378.0
+    );
+    assert_eq!(
+        s.eval::<f64>(
+            "local _, max = HelpFrameOpenTicketScrollFrameScrollBar:GetMinMaxValues() return max"
+        )
+        .unwrap(),
+        height - 378.0,
+        "the range reached the scroll bar through OnScrollRangeChanged"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// A stand-in font engine: each byte 7 wide, each line 14 tall, a multi-line box's rows starting
+/// after each newline, a trailing one opening an empty row as the reference's break routine does
+/// (`0x5c250b`–`0x5c2522`); the texts here never wrap.
+struct Rows;
+
+impl TextMeasure for Rows {
+    fn measure(&mut self, req: &MeasureRequest) -> (f32, f32, f32) {
+        let natural = req.text.split('\n').map(str::len).max().unwrap_or(0) as f32 * 7.0;
+        (natural, req.text.split('\n').count() as f32 * 14.0, natural)
+    }
+
+    fn editbox_advances(
+        &mut self,
+        req: &EditBoxAdvanceRequest,
+    ) -> Option<(Vec<f32>, Vec<usize>, f32)> {
+        let cum = (0..=req.text.len()).map(|i| i as f32 * 7.0).collect();
+        if req.wrap_width.is_none() {
+            return Some((cum, vec![0], 0.0));
+        }
+        let breaks = req.text.match_indices('\n').map(|(i, _)| i + 1);
+        let rows = std::iter::once(0).chain(breaks).collect();
+        Some((cum, rows, 14.0))
+    }
+}
+
+/// The ticket text is multi-line: UP moves the caret a row at its letter column (`0x77cb20`), and
+/// Shift+HOME selects back to the line's start (`0x77c980`), not the ticket's.
+#[test]
+fn the_ticket_texts_caret_moves_by_rows_and_lines() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = setup();
+    s.set_text_measurer(Box::new(Rows));
+    s.run("ShowUIPanel(HelpFrame) HelpFrame_ShowFrame(\"OpenTicket\")")
+        .unwrap();
+    s.resolve();
+    s.run(
+        "HelpFrameOpenTicketText:SetText('Stuck in\\nthe mine') \
+         HelpFrameOpenTicketText:SetFocus()",
+    )
+    .unwrap();
+    s.tick(0.016);
+    s.resolve();
+    let mv = |s: &mut UiScript, unit, back, extend| {
+        assert!(s.editbox_action(EditAction::Move { unit, back, extend }));
+    };
+    // From the end, column 8: the end of "Stuck in".
+    mv(&mut s, EditUnit::Row, true, false);
+    s.char_input(",");
+    mv(&mut s, EditUnit::Edge, false, false);
+    mv(&mut s, EditUnit::Line, true, true);
+    s.char_input("a cave");
+    assert_eq!(
+        s.eval::<String>("return HelpFrameOpenTicketText:GetText()")
+            .unwrap(),
+        "Stuck in,\na cave"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
diff --git a/crates/benilla-app/src/ui_script/honor_frame_tests.rs b/crates/benilla-app/src/ui_script/honor_frame_tests.rs
index b2d8e578..c164c821 100644
--- a/crates/benilla-app/src/ui_script/honor_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/honor_frame_tests.rs
@@ -304,6 +304,9 @@ fn the_real_global_strings_name_the_rank() {
 use benilla_ui::script::InspectHonorData;
 use std::collections::HashMap;
 
+/// The inspected player's guid, which `"target"` resolves to and the reach map is keyed by.
+const TARGET: u64 = 0x0000_0001_0000_2AB3;
+
 /// A live, inspectable unit at squared distance `d2`.
 fn reach(d2: f64) -> benilla_ui::script::UnitReach {
     benilla_ui::script::UnitReach {
@@ -339,25 +342,25 @@ fn shown_inspect_honor_page() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         // `TEXT`, the stock level line's formatter.
         "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "ScrollTemplates.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         // The inspect window's tabs inherit its tab template.
         r"Interface\FrameXML\CharacterFrameTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
         // Before the inspect addon, as `inherits=` resolves at load: its slot buttons inherit
         // `ItemButtonTemplate`, its honor rows `HonorFrame.xml`'s row templates.
         "Interface\\FrameXML\\ItemButtonTemplate.xml",
         "Interface\\FrameXML\\HonorFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
@@ -366,11 +369,16 @@ fn shown_inspect_honor_page() -> UiScript {
     super::test_ui::seat_chain_addon(&mut s, "Blizzard_InspectUI");
     s.run("InspectFrame_LoadUI()").unwrap();
     s.set_unit("target", Some(alliance_player()));
+    s.set_unit_guids(&benilla_ui::script::UnitGuids {
+        target: TARGET,
+        held: HashMap::from([(TARGET, 0)]),
+        ..Default::default()
+    });
     // The player is needed too: the page titles the target through `GetPVPRankInfo`
     // (`InspectHonorFrame.lua:50`), which keys off the local player's side and sex.
     s.set_unit("player", Some(alliance_player()));
     // 4 yards (d² = 16), inside `CanInspect`'s d² of 100; the window refuses to open otherwise.
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(16.0))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(16.0))]));
     s.set_inspect_honor(Some(inspect_reply()));
     s.run(r#"InspectUnit("target")"#).unwrap();
     s.run(r#"ToggleInspect("InspectHonorFrame")"#).unwrap();
diff --git a/crates/benilla-app/src/ui_script/input.rs b/crates/benilla-app/src/ui_script/input.rs
index c2f6897e..dd1b5801 100644
--- a/crates/benilla-app/src/ui_script/input.rs
+++ b/crates/benilla-app/src/ui_script/input.rs
@@ -24,8 +24,6 @@ pub(super) struct PointerFeed<'w> {
     hovered_object: Res<'w, crate::target::HoveredObject>,
     occlusion: Res<'w, crate::target::PickOcclusion>,
     payload_held: ResMut<'w, CursorPayloadHeld>,
-    /// TOGGLEUI ([`crate::ui_hide::UiHidden`]): a hidden UI takes no mouse at all.
-    hidden: Res<'w, crate::ui_hide::UiHidden>,
     /// A headless probe drives the pointer ([`super::SyntheticPointer`]), not the real cursor.
     synthetic: Res<'w, super::SyntheticPointer>,
     /// A capture owns the pointer ([`super::CapturePointerPinned`]): no OS cursor in the shot.
@@ -47,6 +45,18 @@ impl PointerFeed<'_> {
     }
 }
 
+/// The buttons the pointer feed hands the UI, by the names its handlers read (`arg1` of `OnClick`,
+/// `OnMouseDown` and `OnMouseUp`, and the ones `RegisterForClicks` takes,
+/// `Blizzard_BindingUI.xml:10`); buttons 4 and 5 on the physical buttons the binding chords call
+/// BUTTON4 and BUTTON5 (`bindings::chord`).
+const UI_MOUSE_BUTTONS: [(MouseButton, &str); 5] = [
+    (MouseButton::Left, "LeftButton"),
+    (MouseButton::Right, "RightButton"),
+    (MouseButton::Middle, "MiddleButton"),
+    (MouseButton::Forward, "Button4"),
+    (MouseButton::Back, "Button5"),
+];
+
 /// One `OnMouseWheel` call per whole notch, `arg1 = ±1`, the fraction carried in `notches`: a
 /// trackpad gesture arrives as a `Pixel` trickle, and the stock handlers act on the sign alone
 /// (`ScrollFrameTemplate_OnMouseWheel` scrolls half a pane per call, `UIPanelTemplates.lua:150`).
@@ -82,12 +92,13 @@ pub(super) fn feed_ui_input(
         ResMut<UiKeyboardCapture>,
         NonSendMut<HostClipboard>,
     ),
+    // The characters the active layout makes, which name a key for a keyboard frame.
+    layout: Res<crate::bindings::LayoutNames>,
     // The uiScale dial folded into the seam scale.
     ui_scale: Res<super::UiScaleCvar>,
 ) {
     let (keyboard, keys, capture, clipboard) = (&mut kbd.0, &kbd.1, &mut kbd.2, &mut kbd.3);
     let world_pick = pointer.world_pick();
-    let ui_hidden = pointer.hidden.0;
     // The OS pointer is not ours while a probe drives a gesture through the real pointer path or a
     // capture pins it: skip the mouse half whole, else-arm included, whose `pointer_left_window`
     // would disarm the probe's gesture between its press and release.
@@ -120,13 +131,13 @@ pub(super) fn feed_ui_input(
     let ctrl = keys.pressed(KeyCode::ControlLeft) || keys.pressed(KeyCode::ControlRight);
     let alt = keys.pressed(KeyCode::AltLeft) || keys.pressed(KeyCode::AltRight);
     script.set_modifiers(shift, ctrl, alt);
-    // ── Mouse ── A cursor off the window, or a UI hidden by TOGGLEUI, skips only the mouse feed.
+    // ── Mouse ── A cursor off the window skips only the mouse feed.
     // The headless hover probe's aim stands in for a missing cursor, so `PointerOverUi` rises and
     // falls over a panel in an automated run as it does for a person; a real pointer always wins.
     if let Some(cursor) = window
         .cursor_position()
         .or_else(crate::target::hover_probe_point)
-        .filter(|_| !ui_hidden && !synthetic)
+        .filter(|_| !synthetic)
     {
         // The window cursor is logical px, y-down from the top left; the UI is y-up in 768-high
         // units under uiScale: flip through the window height, then undo the extract seam's scale.
@@ -162,11 +173,7 @@ pub(super) fn feed_ui_input(
                 );
             }
         }
-        for (btn, name) in [
-            (MouseButton::Left, "LeftButton"),
-            (MouseButton::Right, "RightButton"),
-            (MouseButton::Middle, "MiddleButton"),
-        ] {
+        for (btn, name) in UI_MOUSE_BUTTONS {
             if buttons.just_pressed(btn) {
                 // A left press that would drop into the world (`world_drop_click`: any payload over
                 // terrain or nothing) is consumed now: the drop fires on the release, but the world
@@ -227,8 +234,11 @@ pub(super) fn feed_ui_input(
             KeyCode::Tab => Some("TAB"),
             _ => None,
         };
+        // What the layout names the key: the clipboard chords' letters, and a keyboard frame's
+        // `arg1` below.
+        let token = crate::bindings::chord::key_token(ev.key_code, &layout);
         // Dispatched unconditionally: unfocused, they fall through to the camera and turn keys.
-        let chord = keymap::chord(ev.key_code, mods, mac);
+        let chord = keymap::chord(ev.key_code, token, mods, mac);
         // A keyboard frame gets these by name before their chord runs (a dialog needs BACKSPACE);
         // `frame_key_input` declines at a focused box, so no frame steals its editing keys. `true`
         // suppresses the chord and the key's binding (the reference's existence gate, `0x76b7d0`).
@@ -253,14 +263,15 @@ pub(super) fn feed_ui_input(
         }
         // Every other key reaches a keyboard frame by name too: the reference's key-down walk
         // takes its `arg1` from the table the binding chord uses (`0x4b66b0`), `chord::key_token`
-        // here, and the gate is existence, not handling: a shown keyboard frame with an
-        // `OnKeyDown` swallows the key whatever its script does (`0x76b7d0`, `0x76ba25`).
+        // under the active layout here, so the Key Bindings window stores the name the key's
+        // press dispatches by. The gate is existence, not handling: a shown keyboard frame with
+        // an `OnKeyDown` swallows the key whatever its script does (`0x76b7d0`, `0x76ba25`).
         // Consumption suppresses only the key's binding: `OnChar` is a separate dispatcher
         // (`0x765df0`), so the stack-split spinner still gets a digit its `OnKeyDown` ate, and it
         // is not a focus change, so it releases nothing held.
         else if named.is_none() {
-            if let Some(token) = crate::bindings::chord::key_token(ev.key_code) {
-                if script.frame_key_input(token) {
+            if let Some(token) = token {
+                if script.frame_key_input(&token.to_string()) {
                     capture.consumed.push(ev.key_code);
                 }
             }
@@ -274,7 +285,7 @@ pub(super) fn feed_ui_input(
             }
         } else if let Some(chord) = chord {
             // The gate is on the key, not the action: a gated arrow never reaches the box (the
-            // reference's `return 0`), while HOME/END, which also make `Move { unit: Edge }`, do.
+            // reference's `return 0`), while HOME/END, which also make a `Move`, do.
             let gated_arrow = capture.arrows_fall_through
                 && matches!(
                     ev.key_code,
@@ -390,6 +401,32 @@ mod tests {
         assert!(sum <= 1.0, "…and they may move at most one notch: {sum}");
     }
 
+    /// Every button 1.12's frames take reaches the UI, under the name its binding chord agrees
+    /// with, so the Key Bindings page binds mouse 4 and 5 from a click.
+    #[test]
+    fn the_ui_takes_all_five_buttons_under_the_chords_names() {
+        let names: Vec<&str> = UI_MOUSE_BUTTONS.iter().map(|(_, n)| *n).collect();
+        assert_eq!(
+            names,
+            [
+                "LeftButton",
+                "RightButton",
+                "MiddleButton",
+                "Button4",
+                "Button5"
+            ]
+        );
+        for (i, (button, _)) in UI_MOUSE_BUTTONS.iter().enumerate() {
+            let chord = crate::bindings::chord::Chord::parse(&format!("BUTTON{}", i + 1));
+            assert_eq!(
+                chord.map(|c| c.key),
+                Some(crate::bindings::chord::BindKey::Mouse(*button)),
+                "BUTTON{} is {button:?}",
+                i + 1
+            );
+        }
+    }
+
     #[test]
     fn a_line_notch_fires_once() {
         let mut s = wheel_pane();
diff --git a/crates/benilla-app/src/ui_script/inspect_tests.rs b/crates/benilla-app/src/ui_script/inspect_tests.rs
index 0adb9f5f..0dfc3175 100644
--- a/crates/benilla-app/src/ui_script/inspect_tests.rs
+++ b/crates/benilla-app/src/ui_script/inspect_tests.rs
@@ -5,10 +5,22 @@
 use std::collections::HashMap;
 
 use benilla_ui::script::{
-    InspectView, InvSlotView, InventorySlots, QuadContent, SoundRequest, UiScript, UnitReach,
-    UnitState,
+    InspectView, InvSlotView, InventorySlots, QuadContent, SoundRequest, UiScript, UnitGuids,
+    UnitReach, UnitState,
 };
 
+/// The inspected player's guid, which `"target"` resolves to and the reach map is keyed by.
+const TARGET: u64 = 0x0000_0001_0000_2AB3;
+
+/// The resolver's inputs with `"target"` a held unit, so a verb's token reaches [`TARGET`]'s entry.
+fn target_guids() -> UnitGuids {
+    UnitGuids {
+        target: TARGET,
+        held: HashMap::from([(TARGET, 0)]),
+        ..Default::default()
+    }
+}
+
 /// A live, inspectable unit at squared distance `dist_sq`. `inspectable` carries the server's
 /// non-distance refusals and only `CanInspect` reads it; these tests are about distance.
 fn reach(dist_sq: f64) -> UnitReach {
@@ -96,29 +108,31 @@ fn armed() -> UiScript {
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     // `TEXT`, which the stock `InspectPaperDollFrame_SetLevel` formats its level line through.
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kit
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     // The inspect window's tabs inherit its tab template.
     load_xml(&s, r"Interface\FrameXML\CharacterFrameTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     // Before the window, as `inherits=` resolves at load: the slot buttons inherit
     // `ItemButtonTemplate`, the honor page the honor row templates `HonorFrame.xml` brings.
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\HonorFrame.xml");
+    // Our scroll kit.
+    load_xml(&s, "ScrollTemplates.xml");
     // A LoadOnDemand addon, seated off the chain as a registry row and loaded by the stock
     // `InspectFrame_LoadUI` (`UIParent.lua:170`), which `InspectUnit` calls (`UIParent.lua:223`).
     super::test_ui::seat_chain_addon(&mut s, "Blizzard_InspectUI");
     s.run("InspectFrame_LoadUI()").unwrap();
     s.set_unit("target", Some(target_unit()));
+    s.set_unit_guids(&target_guids());
     s.set_inspect(Some(inspect_view("target")));
     // 4 yards away (d² = 16), inside the 10-yard gate (100.0).
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(16.0))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(16.0))]));
     s
 }
 
@@ -131,18 +145,18 @@ fn shipped_inspect_frame_loads_clean() {
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\CharacterFrameTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\HonorFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     super::test_ui::seat_chain_addon(&mut s, "Blizzard_InspectUI");
     s.run("InspectFrame_LoadUI()").unwrap();
     // Each slot carries its `GetInventorySlotInfo` id (1..=19, no ammo slot) as its frame ID, set
@@ -168,7 +182,7 @@ fn inspect_unit_refuses_out_of_range() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = armed();
     // 11 yards (d² = 121), past the 100.0 threshold.
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(121.0))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(121.0))]));
 
     s.run(r#"InspectUnit("target")"#).unwrap();
     assert!(s.errors().is_empty(), "errors: {:?}", s.errors());
@@ -181,7 +195,7 @@ fn inspect_unit_refuses_out_of_range() {
         "out of range: no CMSG_INSPECT request is queued"
     );
 
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(99.9))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(99.9))]));
     s.run(r#"InspectUnit("target")"#).unwrap();
     assert!(
         s.eval::<bool>("return InspectFrame:IsVisible()").unwrap(),
@@ -205,7 +219,7 @@ fn range_predicates_transcribe_the_verified_thresholds() {
         (100.0, true, false),
         (100.1, false, false),
     ] {
-        s.set_unit_reach(HashMap::from([("target".to_string(), reach(d2))]));
+        s.set_unit_reach(HashMap::from([(TARGET, reach(d2))]));
         assert_eq!(
             s.eval::<bool>(r#"return CanInspect("target") ~= nil"#)
                 .unwrap(),
@@ -220,7 +234,7 @@ fn range_predicates_transcribe_the_verified_thresholds() {
         );
     }
     // Type 4 is the 30-yard row (900.0).
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(899.0))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(899.0))]));
     assert!(s
         .eval::<bool>(r#"return CheckInteractDistance("target", 4) ~= nil"#)
         .unwrap());
@@ -243,7 +257,7 @@ fn range_predicates_transcribe_the_verified_thresholds() {
     );
 
     // The `type` argument's degenerate arms, each the reference's answer.
-    s.set_unit_reach(HashMap::from([("target".to_string(), reach(1.0))]));
+    s.set_unit_reach(HashMap::from([(TARGET, reach(1.0))]));
     for bad in ["0", "5", "-1", "0.5"] {
         assert!(
             s.eval::<bool>(&format!(
diff --git a/crates/benilla-app/src/ui_script/instance_tests.rs b/crates/benilla-app/src/ui_script/instance_tests.rs
index daa6f204..45a5930a 100644
--- a/crates/benilla-app/src/ui_script/instance_tests.rs
+++ b/crates/benilla-app/src/ui_script/instance_tests.rs
@@ -75,24 +75,24 @@ fn the_self_menu_row_gates_on_the_binding_and_confirms_before_sending() {
     )
     .unwrap();
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua", // `GetText`, the gender and plural lookup
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua", // `GetText`, the gender and plural lookup
-        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UnitPopup.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PlayerFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\TargetFrame.xml",
diff --git a/crates/benilla-app/src/ui_script/keybindings_tests.rs b/crates/benilla-app/src/ui_script/keybindings_tests.rs
index ab529494..54fe2744 100644
--- a/crates/benilla-app/src/ui_script/keybindings_tests.rs
+++ b/crates/benilla-app/src/ui_script/keybindings_tests.rs
@@ -2,43 +2,33 @@
 //! over the engine's binding table. Deviation: it is the era Settings panel's page, because 1.12's
 //! settings screens are much worse to use; capture and set follow 1.12's `Blizzard_BindingUI`.
 
-use benilla_ui::script::keybind::{KeybindCommand, KeybindRequest};
+use benilla_ui::script::keybind::KeybindRequest;
 use benilla_ui::script::{QuadContent, UiScript};
 
-use crate::bindings::commands::SPECS;
-
-/// The page's files in manifest order, the registry seeded first, as `seed_bindings_for_vm` does.
+/// The page's files in the production order over the stock commands and the install's defaults.
 pub(crate) fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
-    let cmds: Vec<KeybindCommand> = SPECS
-        .iter()
-        .map(|spec| KeybindCommand {
-            name: spec.name,
-            category: spec.category,
-            run_on_up: spec.run_on_up(),
-            default1: spec.d1,
-            default2: spec.d2,
-        })
-        .collect();
-    s.register_bindings(&cmds);
+    crate::ui_script::load_stock_bindings(&mut s);
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        // Before our files, as the core loads before the layer: it sources UIParent.lua again.
+        r"Interface\FrameXML\GameMenuFrame.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "GameMenuFrame.xml",
+        "GameMenuAdapters.xml",
     ] {
         // Strict for ours: an unknown template only warns, so a skinless window would pass.
         if file == "KeyBindingsPage.xml" || file == "OptionsFrame.xml" {
@@ -51,10 +41,19 @@ pub(crate) fn harness() -> UiScript {
     s
 }
 
+/// The install's defaults live, as a first login's account set is, on a VM whose load registered
+/// the stock commands.
+pub(crate) fn seed_defaults(s: &mut UiScript) {
+    s.set_default_bindings(crate::ui_script::default_bindings());
+    s.load_binding_set(1);
+}
+
 /// A label as the page resolves it: the GlobalStrings global named `token`, else `raw`.
 pub(crate) fn label(s: &UiScript, token: &str, raw: &str) -> String {
-    s.eval::<String>(&format!(r#"return KeyBindings_String("{token}", "{raw}")"#))
-        .unwrap()
+    s.eval::<String>(&format!(
+        r#"return BenillaKeyBindings_String("{token}", "{raw}")"#
+    ))
+    .unwrap()
 }
 
 /// Open the options window on the Keybindings page.
@@ -66,6 +65,53 @@ pub(crate) fn on_page(s: &mut UiScript) {
 
 const ROW: &str = "BenillaOptionsFrameContainerBodyKeybindingsRow";
 
+/// Whether the window takes keys and the wheel: a selected capsule arms it, as 1.12's
+/// keyboard-enabled `KeyBindingFrame` (`Blizzard_BindingUI.xml:73`).
+pub(crate) fn armed(s: &UiScript) -> bool {
+    s.eval::<bool>(
+        "return BenillaOptionsFrame:IsKeyboardEnabled() == 1 \
+            and BenillaOptionsFrame:IsMouseWheelEnabled() == 1 \
+            and BenillaKeyBindingsPage.selected ~= nil",
+    )
+    .unwrap()
+}
+
+/// A key press as the host feeds it (`ui_script::input`): ENTER, ESCAPE and TAB through the named
+/// walk, every other key through the frame walk by its 1.12 name. Answers whether a frame took it.
+pub(crate) fn press(s: &mut UiScript, key: &str) -> bool {
+    match key {
+        "ENTER" | "ESCAPE" | "TAB" => s.key_input(key),
+        _ => s.frame_key_input(key),
+    }
+}
+
+/// A frame's centre in screen pixels, where the pointer feed hits it.
+pub(crate) fn centre(s: &mut UiScript, frame: &str) -> (f32, f32) {
+    s.resolve();
+    let (l, r, t, b, k): (f64, f64, f64, f64, f64) = s
+        .eval(&format!(
+            "local f = {frame} \
+             local k = (f.GetEffectiveScale and f or f:GetParent()):GetEffectiveScale() \
+             return f:GetLeft(), f:GetRight(), f:GetTop(), f:GetBottom(), k"
+        ))
+        .unwrap();
+    (((l + r) * 0.5 * k) as f32, ((t + b) * 0.5 * k) as f32)
+}
+
+/// A click of `button` on `frame` through the pointer feed.
+pub(crate) fn click(s: &mut UiScript, frame: &str, button: &str) {
+    let (x, y) = centre(s, frame);
+    s.mouse_move(x, y);
+    s.mouse_button(x, y, button, true);
+    s.mouse_button(x, y, button, false);
+}
+
+/// One wheel notch over the page, through the pointer feed.
+pub(crate) fn wheel(s: &mut UiScript, delta: f32) {
+    let (x, y) = centre(s, "BenillaOptionsFrameContainerBodyKeybindings");
+    s.mouse_wheel(x, y, delta);
+}
+
 #[test]
 fn the_page_is_an_options_category_with_the_collapsed_honest_tree() {
     benilla_formats::wow_data_or_skip!();
@@ -87,11 +133,18 @@ fn the_page_is_an_options_category_with_the_collapsed_honest_tree() {
     assert!(s
         .eval::<bool>("return BenillaOptionsFrameContainerDefaults:IsEnabled() ~= 0")
         .unwrap());
-    // The categories in `Bindings.xml` order, each a header collapsed by default, as in the era.
-    let mut expected: Vec<&str> = Vec::new();
-    for spec in SPECS {
-        if !expected.contains(&spec.category) {
-            expected.push(spec.category);
+    // The categories in `Bindings.xml` order, each a header collapsed by default, as in the era;
+    // the spacer headers over multibars 2-4 continue the section above (the page's deviation).
+    let stock = benilla_ui::bindings_xml::parse(
+        &crate::ui_script::stock_bindings_file().expect("the install's Bindings.xml"),
+    )
+    .unwrap();
+    let mut expected: Vec<String> = Vec::new();
+    for b in &stock {
+        let Some(h) = &b.header else { continue };
+        let token = format!("BINDING_HEADER_{h}");
+        if b.platform.is_none() && !token.starts_with("BINDING_HEADER_BLANK") {
+            expected.push(token);
         }
     }
     for (i, token) in expected.iter().enumerate() {
@@ -105,7 +158,9 @@ fn the_page_is_an_options_category_with_the_collapsed_honest_tree() {
             .unwrap(),
         "all sections collapsed: nothing past the headers"
     );
-    assert!(expected.contains(&"BINDING_HEADER_MULTIACTIONBAR"));
+    assert!(expected
+        .iter()
+        .any(|h| h == "BINDING_HEADER_MULTIACTIONBAR"));
     s.run(&format!("{ROW}1Header:Click()")).unwrap();
     assert_eq!(
         s.eval::<String>(&format!("return {ROW}2Description:GetText()"))
@@ -122,7 +177,7 @@ fn the_page_is_an_options_category_with_the_collapsed_honest_tree() {
         r#"BINDING_HEADER_MOVEMENT = "Movement Keys"
              BINDING_NAME_MOVEANDSTEER = "Move and Steer"
              KEY_BUTTON3 = "Middle Mouse"
-             KeyBindingsPage_Update()"#,
+             BenillaKeyBindingsPage_Update()"#,
     )
     .unwrap();
     assert_eq!(
@@ -165,21 +220,23 @@ fn the_capture_flow_binds_steals_and_refuses_like_112() {
     on_page(&mut s);
     s.run(&format!("{ROW}1Header:Click()")).unwrap(); // expand Movement
     s.take_keybind_requests();
-    // Row 3 is MOVEFORWARD (W, UP); selecting its Key 1 capsule arms the capture.
-    assert!(!s.bind_capture_armed());
+    // Unarmed, the window takes no key: it reaches the game's bindings.
+    assert!(!armed(&s));
+    assert!(!press(&mut s, "J"), "an unarmed page lets a key through");
+    // Row 3 is MOVEFORWARD (W, UP); selecting its Key 1 capsule arms the window.
     s.run(&format!("{ROW}3Key1Button:Click()")).unwrap();
-    assert!(
-        s.bind_capture_armed(),
-        "a selected capsule arms the capture"
-    );
+    assert!(armed(&s), "a selected capsule arms the window");
     assert!(
         s.eval::<bool>("return BenillaOptionsFrameContainerUnbind:IsEnabled() ~= 0")
             .unwrap(),
         "Unbind arms with the selection"
     );
+    // A lone modifier is no key (`Blizzard_BindingUI.lua:172-174`): still armed.
+    assert!(press(&mut s, "SHIFT"), "the armed window takes it");
+    assert!(armed(&s), "…and waits for a real key");
     // J, a key no command holds, takes slot 1 from W; UP stays in slot 2 and the bind saves.
-    s.run(r#"KeyBindings_OnHostKey("J")"#).unwrap();
-    assert!(!s.bind_capture_armed(), "a completed bind disarms");
+    assert!(press(&mut s, "J"), "the armed window takes the key");
+    assert!(!armed(&s), "a completed bind disarms");
     assert!(s
         .eval::<bool>(
             r#"local k1, k2 = GetBindingKey("MOVEFORWARD"); return k1 == "J" and k2 == "UP""#
@@ -199,7 +256,7 @@ fn the_capture_flow_binds_steals_and_refuses_like_112() {
     // T is ATTACKTARGET's only key, so taking it names the victim in red (1.12's
     // `KEY_UNBOUND_ERROR`, `Blizzard_BindingUI.lua:185-190`).
     s.run(&format!("{ROW}3Key2Button:Click()")).unwrap();
-    s.run(r#"KeyBindings_OnHostKey("T")"#).unwrap();
+    press(&mut s, "T");
     assert_eq!(
         s.eval::<String>(r#"return GetBindingAction("T")"#).unwrap(),
         "MOVEFORWARD"
@@ -211,9 +268,28 @@ fn the_capture_flow_binds_steals_and_refuses_like_112() {
             .contains(&victim),
         "the newly-bare victim is named"
     );
+    // A chord: the modifiers held at the press prefix the key, ALT-CTRL-SHIFT order
+    // (`Blizzard_BindingUI.lua:175-183`).
+    s.run(&format!("{ROW}3Key2Button:Click()")).unwrap();
+    s.set_modifiers(true, true, false);
+    press(&mut s, "K");
+    s.set_modifiers(false, false, false);
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("CTRL-SHIFT-K")"#)
+            .unwrap(),
+        "MOVEFORWARD"
+    );
+    // ESC while armed binds Escape: 1.12's armed branch has no ESCAPE filter.
+    s.run(&format!("{ROW}3Key2Button:Click()")).unwrap();
+    assert!(press(&mut s, "ESCAPE"));
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("ESCAPE")"#)
+            .unwrap(),
+        "MOVEFORWARD"
+    );
     // The wheel binds onto a press+release command too: `0x4b7490` never reads the command.
     s.run(&format!("{ROW}3Key1Button:Click()")).unwrap();
-    s.run(r#"KeyBindings_OnHostKey("MOUSEWHEELUP")"#).unwrap();
+    wheel(&mut s, 1.0);
     assert!(
         s.eval::<bool>(r#"local k1 = GetBindingKey("MOVEFORWARD"); return k1 == "MOUSEWHEELUP""#)
             .unwrap(),
@@ -231,7 +307,7 @@ fn the_capture_flow_binds_steals_and_refuses_like_112() {
     // A key string the engine rejects restores the slot's old key and shows the only refusal text
     // 1.12 has, the wheel's (`KeyBindingFrame_SetBinding`, `Blizzard_BindingUI.lua:260-270`).
     s.run(&format!("{ROW}3Key1Button:Click()")).unwrap();
-    s.run(r#"KeyBindings_OnHostKey("SCROLLLOCK")"#).unwrap();
+    press(&mut s, "SCROLLLOCK");
     assert!(
         s.eval::<bool>(r#"local k1 = GetBindingKey("MOVEFORWARD"); return k1 == "MOUSEWHEELUP""#)
             .unwrap(),
@@ -243,15 +319,130 @@ fn the_capture_flow_binds_steals_and_refuses_like_112() {
         "Can't bind mousewheel to actions with up and down states"
     );
     s.run(&format!("{ROW}3Key1Button:Click()")).unwrap();
-    assert!(s.bind_capture_armed());
+    assert!(armed(&s));
     s.run(&format!(r#"{ROW}3Key1Button:Click("RightButton")"#))
         .unwrap();
-    assert!(!s.bind_capture_armed(), "right-click deselects");
-    // Hiding the window disarms: an armed capture with no window would swallow all input.
+    assert!(!armed(&s), "right-click deselects");
+    // Hiding the window disarms.
     s.run(&format!("{ROW}3Key1Button:Click()")).unwrap();
-    assert!(s.bind_capture_armed());
+    assert!(armed(&s));
     s.run("HideUIPanel(BenillaOptionsFrame)").unwrap();
-    assert!(!s.bind_capture_armed(), "OnHide disarms");
+    assert!(!armed(&s), "OnHide disarms");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// Mouse buttons 3-5 bind through the clicks 1.12's window takes: a capsule's own `OnClick`
+/// (`Blizzard_BindingUI.lua:246`) and the window's (`Blizzard_BindingUI.xml:538-540`), here the
+/// page's `OnMouseUp`; left and right clicks only select.
+#[test]
+fn mouse_buttons_bind_through_the_capsules_and_the_page() {
+    benilla_formats::wow_data_or_skip!();
+    let mut s = harness();
+    on_page(&mut s);
+    s.run(&format!("{ROW}1Header:Click()")).unwrap(); // expand Movement
+    let capsule = format!("{ROW}3Key1Button");
+    click(&mut s, &capsule, "LeftButton");
+    assert!(armed(&s), "a left click selects");
+    click(&mut s, &capsule, "MiddleButton");
+    assert!(!armed(&s));
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("BUTTON3")"#)
+            .unwrap(),
+        "MOVEFORWARD",
+        "a middle click on the armed capsule binds BUTTON3"
+    );
+    // Over the page, away from any capsule: mouse 4 with SHIFT held.
+    click(&mut s, &capsule, "LeftButton");
+    s.set_modifiers(true, false, false);
+    click(&mut s, &format!("{ROW}3Description"), "Button4");
+    s.set_modifiers(false, false, false);
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("SHIFT-BUTTON4")"#)
+            .unwrap(),
+        "MOVEFORWARD"
+    );
+    // Unarmed, a middle click on a capsule selects it, as 1.12's does.
+    click(&mut s, &format!("{ROW}4Key2Button"), "MiddleButton");
+    assert!(armed(&s));
+    s.run("BenillaKeyBindings_SetSelected(nil)").unwrap();
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// Loading the stock `Blizzard_BindingUI` (an addon manager's Load button does) defines its own
+/// `KeyBindingButton_OnClick` and popup (`Blizzard_BindingUI.lua:228`, `:10`) and changes no other
+/// window: the page keeps binding and leaving the character set. The stock window reads the 1.12
+/// list: a `HEADER_*` row draws a section header, a command's keys fill Key 1 and Key 2.
+#[test]
+fn the_page_works_after_the_stock_binding_ui_loads_and_the_stock_window_reads_the_list() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = crate::local_state::test_env::ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (mut s, failures) =
+        super::layer_tests::production_load_with("bindingui", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    seed_defaults(&mut s);
+    s.run(r#"assert(LoadAddOn("Blizzard_BindingUI") == 1)"#)
+        .unwrap();
+    assert!(s
+        .eval::<bool>("return KeyBindingFrame ~= nil and KeyBindingButton_OnClick ~= nil")
+        .unwrap());
+
+    on_page(&mut s);
+    s.run(&format!("{ROW}1Header:Click()")).unwrap(); // expand Movement
+    s.take_keybind_requests();
+    click(&mut s, &format!("{ROW}3Key1Button"), "LeftButton");
+    assert!(armed(&s), "the page's capsule still arms its own window");
+    assert!(
+        s.eval::<bool>("return KeyBindingFrame.selected == nil")
+            .unwrap(),
+        "the stock window is untouched"
+    );
+    press(&mut s, "J");
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("J")"#).unwrap(),
+        "MOVEFORWARD"
+    );
+    assert_eq!(s.take_keybind_requests(), vec![KeybindRequest::Save(1)]);
+    // The character set, both ways, through the page's own popup.
+    let check = "BenillaOptionsFrameContainerBodyKeybindingsCharacterRowCheck";
+    s.run(&format!("{check}:Click()")).unwrap();
+    assert_eq!(s.current_binding_set(), 2);
+    s.run(&format!("{check}:Click()")).unwrap();
+    s.run("StaticPopup1Button1:Click()").unwrap();
+    assert_eq!(
+        s.current_binding_set(),
+        1,
+        "leaving the character set works"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+    s.run("HideUIPanel(BenillaOptionsFrame)").unwrap();
+
+    // The stock window over the same list.
+    s.run("ShowUIPanel(KeyBindingFrame)").unwrap();
+    assert!(s
+        .eval::<bool>("return KeyBindingFrame:IsVisible()")
+        .unwrap());
+    assert!(s
+        .eval::<bool>(
+            "return KeyBindingFrameBinding1Header:IsVisible() \
+                and KeyBindingFrameBinding1Header:GetText() == BINDING_HEADER_MOVEMENT"
+        )
+        .unwrap());
+    assert_eq!(
+        s.eval::<String>("return KeyBindingFrameBinding2Key1Button:GetText()")
+            .unwrap(),
+        s.eval::<String>(r#"return GetBindingText("BUTTON3", "KEY_")"#)
+            .unwrap(),
+        "Move and Steer's first key in the Key 1 column"
+    );
+    assert_eq!(
+        s.eval::<String>("return KeyBindingFrameBinding3Key2Button:GetText()")
+            .unwrap(),
+        s.eval::<String>(r#"return GetBindingText("UP", "KEY_")"#)
+            .unwrap(),
+        "Move Forward's second key in the Key 2 column"
+    );
     assert!(s.errors().is_empty(), "{:?}", s.errors());
 }
 
@@ -280,7 +471,7 @@ fn unbind_reset_and_the_live_commit_replace_okay_cancel() {
     // Deviation: a bind saves at once, as the era panel commits, where 1.12 had Okay and Cancel;
     // closing the window keeps it.
     s.run(&format!("{ROW}9Key1Button:Click()")).unwrap();
-    s.run(r#"KeyBindings_OnHostKey("G")"#).unwrap();
+    press(&mut s, "G");
     assert_eq!(s.take_keybind_requests(), vec![KeybindRequest::Save(1)]);
     s.run("BenillaOptionsFrameCloseButton:Click()").unwrap();
     assert_eq!(
@@ -381,8 +572,8 @@ fn search_surfaces_bindings_as_live_rows_under_the_redirect_head() {
         .unwrap());
     s.run("BenillaOptionsFrameContainerBodyKeybindSearch1Key1Button:Click()")
         .unwrap();
-    assert!(s.bind_capture_armed());
-    s.run(r#"KeyBindings_OnHostKey("H")"#).unwrap();
+    assert!(armed(&s));
+    press(&mut s, "H");
     assert_eq!(
         s.eval::<String>(r#"return GetBindingAction("H")"#).unwrap(),
         "JUMP"
@@ -471,8 +662,8 @@ fn the_wheel_bubbles_from_the_rows_and_the_bar_rides_the_gutter() {
     on_page(&mut s);
     // Every section open: over 100 rows overflow the list's 19 slots.
     s.run(
-        r#"for i = 1, table.getn(KeyBindingsPage.sections) do KeyBindings_ExpandSection(i, true) end
-           KeyBindingsPage_Update()"#,
+        r#"for i = 1, table.getn(BenillaKeyBindingsPage.sections) do BenillaKeyBindings_ExpandSection(i, true) end
+           BenillaKeyBindingsPage_Update()"#,
     )
     .unwrap();
     const SF: &str = "BenillaOptionsFrameContainerBodyKeybindingsScrollFrame";
@@ -533,8 +724,8 @@ fn the_wheel_bubbles_from_the_rows_and_the_bar_rides_the_gutter() {
     );
     let set_all = |s: &UiScript, open: bool| {
         s.run(&format!(
-            "for i = 1, table.getn(KeyBindingsPage.sections) do KeyBindings_ExpandSection(i, {}) end
-             KeyBindingsPage_Update()",
+            "for i = 1, table.getn(BenillaKeyBindingsPage.sections) do BenillaKeyBindings_ExpandSection(i, {}) end
+             BenillaKeyBindingsPage_Update()",
             if open { "true" } else { "nil" }
         ))
         .unwrap();
@@ -600,9 +791,11 @@ fn the_wheel_bubbles_from_the_rows_and_the_bar_rides_the_gutter() {
         after_capsule > after_name,
         "a spin over a CAPSULE bubbles to the page too: {after_name} -> {after_capsule}"
     );
-    // While a capsule is armed a spin binds, never scrolls; the page's guard catches a spin the
-    // host lets through.
+    // While a capsule is armed a spin binds, never scrolls.
     s.run(&format!("{ROW}2Key1Button:Click()")).unwrap();
+    let armed_command = s
+        .eval::<String>(&format!("return {ROW}2Key1Button.commandName"))
+        .unwrap();
     s.mouse_wheel(wx, wy, -1.0);
     assert_eq!(
         s.eval::<f64>(&format!("return FauxScrollFrame_GetOffset({SF})"))
@@ -610,7 +803,12 @@ fn the_wheel_bubbles_from_the_rows_and_the_bar_rides_the_gutter() {
         after_capsule,
         "armed: the wheel must not scroll"
     );
-    s.run("KeyBindings_SetSelected(nil)").unwrap();
+    assert_eq!(
+        s.eval::<String>(r#"return GetBindingAction("MOUSEWHEELDOWN")"#)
+            .unwrap(),
+        armed_command,
+        "armed: the spin binds"
+    );
     assert!(s.errors().is_empty(), "{:?}", s.errors());
 }
 
@@ -623,11 +821,14 @@ fn the_pet_lane_is_registered_under_the_action_bar_header() {
     let mut s = harness();
     on_page(&mut s);
 
+    // The header row a command sits under: the last `HEADER_*` row above it.
     let category = |s: &mut UiScript, name: &str| {
         s.eval::<String>(&format!(
-            r#"for i = 1, GetNumBindings() do
-                   local n, c = GetBinding(i)
-                   if n == "{name}" then return c end
+            r#"local header
+               for i = 1, GetNumBindings() do
+                   local n = GetBinding(i)
+                   if strsub(n, 1, 6) == "HEADER" then header = n end
+                   if n == "{name}" then return header end
                end"#
         ))
         .unwrap()
@@ -636,7 +837,7 @@ fn the_pet_lane_is_registered_under_the_action_bar_header() {
         let name = format!("BONUSACTIONBUTTON{i}");
         assert_eq!(
             category(&mut s, &name),
-            "BINDING_HEADER_ACTIONBAR",
+            "HEADER_ACTIONBAR",
             "{name} files under the action bar, as 1.12 does"
         );
         let key = s
@@ -680,29 +881,114 @@ fn the_pet_lane_is_registered_under_the_action_bar_header() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
-/// `loadstring` on each command body: running one would need FrameXML this test does not load.
+/// `loadstring` on each stock command body: the reference compiles each at load (`0x704c70`),
+/// and running one would need FrameXML this test does not load.
 #[test]
 fn every_command_body_compiles() {
-    use crate::bindings::commands::Kind;
-
+    benilla_formats::wow_data_or_skip!();
+    let stock = benilla_ui::bindings_xml::parse(
+        &crate::ui_script::stock_bindings_file().expect("the install's Bindings.xml"),
+    )
+    .unwrap();
     let s = UiScript::new().unwrap();
-    for spec in SPECS {
-        let bodies: Vec<&str> = match &spec.kind {
-            Kind::Held | Kind::Host => Vec::new(),
-            Kind::Edge(body) => vec![*body],
-            Kind::EdgeUpDown(down, up) => vec![*down, *up],
-        };
-        for body in bodies {
-            s.run(&format!(
-                "local f, err = loadstring({body:?});                  if not f then BenillaBodyError = {name:?} .. \": \" .. err end",
-                body = body,
-                name = spec.name
-            ))
-            .unwrap_or_else(|e| panic!("{}: {e}", spec.name));
-        }
+    for b in &stock {
+        s.run(&format!(
+            "local f, err = loadstring({body:?}); \
+             if not f then BenillaBodyError = {name:?} .. \": \" .. err end",
+            body = b.body,
+            name = b.name
+        ))
+        .unwrap_or_else(|e| panic!("{}: {e}", b.name));
     }
     let bad: Vec<String> = s.errors();
     assert!(bad.is_empty(), "script errors: {bad:?}");
     s.run("if BenillaBodyError then error(BenillaBodyError) end")
         .unwrap_or_else(|e| panic!("a command body is not valid Lua: {e}"));
 }
+
+/// Every function and object a stock command body names exists once the in-game UI has loaded:
+/// the engine's behaviour sits behind the Lua globals the bodies call. Read off each body: a
+/// `Name(` call is a function, an `Object:` or `Object.` receiver a frame or table.
+#[test]
+fn every_stock_body_calls_what_the_load_defines() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = crate::local_state::test_env::ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = super::layer_tests::production_load_with("bindcalls", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let stock = benilla_ui::bindings_xml::parse(
+        &crate::ui_script::stock_bindings_file().expect("the install's Bindings.xml"),
+    )
+    .unwrap();
+    const KEYWORDS: [&str; 14] = [
+        "if", "then", "else", "elseif", "end", "not", "and", "or", "local", "function", "return",
+        "do", "while", "for",
+    ];
+    let mut missing = Vec::new();
+    for b in stock.iter().filter(|b| b.platform.is_none()) {
+        let body = b.body.as_bytes();
+        let mut i = 0;
+        while i < body.len() {
+            let c = body[i];
+            if !(c.is_ascii_alphabetic() || c == b'_') {
+                i += 1;
+                continue;
+            }
+            let start = i;
+            while i < body.len() && (body[i].is_ascii_alphanumeric() || body[i] == b'_') {
+                i += 1;
+            }
+            // A field or method name is its receiver's, not a global.
+            if start > 0 && matches!(body[start - 1], b'.' | b':') {
+                continue;
+            }
+            let name = &b.body[start..i];
+            let next = b.body[i..].trim_start().chars().next();
+            let want = match next {
+                Some('(') if !KEYWORDS.contains(&name) => "function",
+                Some(':') | Some('.') => "table",
+                _ => continue,
+            };
+            let kind: String = s.eval(&format!("return type({name})")).unwrap();
+            if kind != want {
+                missing.push(format!("{}: {name} is {kind}", b.name));
+            }
+        }
+    }
+    assert!(missing.is_empty(), "unresolved: {missing:#?}");
+}
+
+/// ALT-Z runs the stock TOGGLEUI body (`Bindings.xml:655-661`): `CloseAllWindows()` and
+/// `UIParent:Hide()`, then `UIParent:Show()`, so the interface under `UIParent` stops drawing and
+/// an open window is closed, as in the reference.
+#[test]
+fn toggleui_hides_uiparent_and_closes_the_windows() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = crate::local_state::test_env::ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (mut s, failures) = super::layer_tests::production_load_with("toggleui", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    s.run("ShowUIPanel(GameMenuFrame)").unwrap();
+    assert!(s
+        .eval::<bool>("return GameMenuFrame:IsVisible() == 1")
+        .unwrap());
+    s.resolve();
+    let lit = s.extract().len();
+    assert!(s.execute_binding("TOGGLEUI", true).unwrap());
+    s.resolve();
+    assert!(s
+        .eval::<bool>("return UIParent:IsVisible() == nil")
+        .unwrap());
+    assert!(s
+        .eval::<bool>("return GameMenuFrame:IsShown() == nil")
+        .unwrap());
+    assert!(
+        s.extract().len() < lit,
+        "the frames under UIParent stop drawing"
+    );
+    assert!(s.execute_binding("TOGGLEUI", true).unwrap());
+    assert!(s.eval::<bool>("return UIParent:IsVisible() == 1").unwrap());
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
diff --git a/crates/benilla-app/src/ui_script/layer_tests.rs b/crates/benilla-app/src/ui_script/layer_tests.rs
new file mode 100644
index 00000000..bd6eb28f
--- /dev/null
+++ b/crates/benilla-app/src/ui_script/layer_tests.rs
@@ -0,0 +1,1059 @@
+//! benilla's layer ([`super::manifest::LAYER_MANIFEST`]) loads as more of the stock load: after
+//! every core file, before the first third-party addon, with no `ADDON_LOADED` and no AddOn API
+//! row, as 1.12.1 loads FrameXML (`UI_Init 0x48fbf0`: `FrameXML.toc` at `0x48ffed`, the addons at
+//! `0x4900a3`, only the latter through `AddOn_Load`); and a dev build boots without it.
+
+use benilla_ui::script::{EditAction, EditUnit, QuadContent, ScriptValue, UiScript};
+
+use crate::local_state::test_env::{EnvGuard, ENV_LOCK};
+
+/// Records each global's first definition in order: `__newindex` fires only for a new key, so a
+/// file that redefines a stock function is not logged, and one that loads stock code is.
+const DEFINE_LOG: &str = r#"
+DEFINE_LOG = {}
+setmetatable(getfenv(0), { __newindex = function(t, k, v)
+    table.insert(DEFINE_LOG, k)
+    rawset(t, k, v)
+end })
+"#;
+
+/// Records every `ADDON_LOADED` from before the load.
+const ADDON_LOADED_LOG: &str = r#"
+ADDON_LOADED_LOG = {}
+local f = CreateFrame("Frame")
+f:RegisterEvent("ADDON_LOADED")
+f:SetScript("OnEvent", function() table.insert(ADDON_LOADED_LOG, arg1) end)
+"#;
+
+/// A VM after the production in-game load, with one third-party addon, `ZZOrder`, in a hermetic
+/// AddOns root; the layer on unless `stock_ui`. Returns the VM and the load's failures.
+fn production_load(tag: &str, stock_ui: bool) -> (UiScript, Vec<String>) {
+    let before = format!("{DEFINE_LOG}\n{ADDON_LOADED_LOG}");
+    production_load_with(tag, stock_ui, &before, |root| {
+        let dir = root.join("ZZOrder");
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join("ZZOrder.toc"), "## Interface: 11200\nprobe.lua\n").unwrap();
+        std::fs::write(
+            dir.join("probe.lua"),
+            "ZZORDER_SAW_LAYER = BenillaOptionsFrame ~= nil\n",
+        )
+        .unwrap();
+    })
+}
+
+/// The production in-game load, the layer on unless `stock_ui`, over a hermetic AddOns root that
+/// `addons` fills; `before` runs ahead of the load. The caller holds [`ENV_LOCK`]. Returns the VM
+/// and the load's failures.
+pub(super) fn production_load_with(
+    tag: &str,
+    stock_ui: bool,
+    before: &str,
+    addons: impl FnOnce(&std::path::Path),
+) -> (UiScript, Vec<String>) {
+    let tmp = std::env::temp_dir().join(format!("benilla-layer-{tag}-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&tmp);
+    let home = tmp.join("benilla-config");
+    let root = home.join("AddOns");
+    std::fs::create_dir_all(&root).unwrap();
+    addons(&root);
+    let _c = EnvGuard::unset("WOW_CAPTURE");
+    let _h = EnvGuard::set("BENILLA_HOME", home.to_str().unwrap());
+
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    s.set_unit(
+        "player",
+        Some(benilla_ui::script::UnitState {
+            exists: true,
+            name: Some("Probesix".into()),
+            level: 60,
+            class: Some("Warrior".into()),
+            class_file: Some("WARRIOR".into()),
+            ..Default::default()
+        }),
+    );
+    // A reply that hid nothing, so `GetNumAddOns` counts the registry.
+    s.note_addon_info_reply(&[]);
+    s.register_cvars(crate::cvars::registered_pairs());
+    s.run(before).unwrap();
+    // The layer passed in, not set through `WOW_STOCK_UI`: every test in this process reads it.
+    let mut failures = Vec::new();
+    failures.extend(super::manifest::load_ingame_ui_with(
+        &mut s,
+        None,
+        &[],
+        true,
+        !stock_ui,
+    ));
+    failures.extend(s.errors());
+    let _ = std::fs::remove_dir_all(&tmp);
+    (s, failures)
+}
+
+/// Where `name` was first defined in [`DEFINE_LOG`].
+fn defined_at(log: &[String], name: &str) -> usize {
+    log.iter()
+        .position(|n| n == name)
+        .unwrap_or_else(|| panic!("{name} was never defined in the load"))
+}
+
+/// The stock FrameXML's own globals, from the captured 1.12.1 `_G` (`reference/1.12-globals.tsv`):
+/// the `framexml` rows a FrameXML file defines at load, LoadOnDemand ones aside.
+fn stock_framexml_globals() -> std::collections::HashSet<String> {
+    let tsv = include_str!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/../../reference/1.12-globals.tsv"
+    ));
+    tsv.lines()
+        .filter(|l| !l.starts_with('#'))
+        .filter_map(|l| {
+            let mut cols = l.split('\t');
+            let (name, kind, origin) = (cols.next()?, cols.next()?, cols.next()?);
+            (origin == "framexml" && kind != "lod").then(|| name.to_string())
+        })
+        .collect()
+}
+
+/// The layer loads after every stock file and before the first third-party addon: the core's last
+/// rows define before the layer's first, the layer's last before the addon, and nothing first
+/// defined from the layer's start on is a stock FrameXML global.
+#[test]
+fn the_layer_loads_after_every_stock_file_and_before_the_addons() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load("order", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let log: Vec<String> = s.eval("return DEFINE_LOG").unwrap();
+
+    // The core's last row that defines a global (RaidWarning.xml; ClassTrainerFrameTemplates.xml
+    // declares templates alone), the layer's first file (ScrollTemplates.xml) and last
+    // (FrameXMLFixes.xml is all redefinitions, so ScriptLogFrame.xml), then the addon.
+    let order = [
+        "RaidWarningFrame_OnLoad",
+        "BenillaScrollBar_Step",
+        "BenillaScriptLog_Toggle",
+        "ZZORDER_SAW_LAYER",
+    ];
+    let at: Vec<usize> = order.iter().map(|n| defined_at(&log, n)).collect();
+    for w in 0..order.len() - 1 {
+        assert!(
+            at[w] < at[w + 1],
+            "{} (#{}) must be defined before {} (#{})",
+            order[w],
+            at[w],
+            order[w + 1],
+            at[w + 1]
+        );
+    }
+    let stock = stock_framexml_globals();
+    assert!(stock.len() > 5000, "the reference's _G parse is broken");
+    // The engine sets `this`, `event` and `arg1`-`arg9` around each handler it runs.
+    let dispatch = |n: &str| {
+        n == "this"
+            || n == "event"
+            || n.strip_prefix("arg")
+                .is_some_and(|d| d.len() == 1 && d.as_bytes()[0].is_ascii_digit())
+    };
+    let late: Vec<&String> = log[at[1]..]
+        .iter()
+        .filter(|n| stock.contains(n.as_str()) && !dispatch(n))
+        .collect();
+    assert!(
+        late.is_empty(),
+        "stock FrameXML globals first defined after the layer began — a stock file loaded inside \
+         or after the layer: {late:?}"
+    );
+    assert!(
+        s.eval::<bool>("return ZZORDER_SAW_LAYER").unwrap(),
+        "the addon's file scope sees the layer"
+    );
+}
+
+/// The layer is no addon: no `ADDON_LOADED` of its own, no row in the AddOn API, and no row on the
+/// character-select AddOns screen.
+#[test]
+fn the_layer_is_absent_from_the_addon_api() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load("api", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+
+    let loaded: Vec<String> = s.eval("return ADDON_LOADED_LOG").unwrap();
+    assert_eq!(
+        loaded,
+        ["ZZOrder"],
+        "only the third-party addon announces itself"
+    );
+
+    let names: Vec<String> = s
+        .eval(
+            "local out = {} \
+             for i = 1, GetNumAddOns() do table.insert(out, (GetAddOnInfo(i))) end \
+             return out",
+        )
+        .unwrap();
+    assert!(
+        names.iter().any(|n| n == "ZZOrder"),
+        "the probe sees the registry: {names:?}"
+    );
+    for name in ["benilla", "layer"] {
+        assert!(
+            !names.iter().any(|n| n.eq_ignore_ascii_case(name)),
+            "{name} is a row in the AddOn API: {names:?}"
+        );
+        assert!(
+            !s.eval::<bool>(&format!(
+                "return IsAddOnLoaded(\"{name}\") and true or false"
+            ))
+            .unwrap(),
+            "IsAddOnLoaded(\"{name}\") answers"
+        );
+    }
+    assert!(
+        !super::addons::installed_rows()
+            .iter()
+            .any(|a| a.name.eq_ignore_ascii_case("benilla")),
+        "the AddOns screen lists benilla"
+    );
+}
+
+/// `WOW_STOCK_UI=1` drops the layer in a dev build alone; a player build always loads it.
+#[test]
+fn the_stock_ui_switch_is_a_dev_builds_alone() {
+    use super::manifest::layer_enabled_by;
+    assert!(
+        !layer_enabled_by(true, Some("1")),
+        "a dev build boots without it"
+    );
+    assert!(
+        layer_enabled_by(false, Some("1")),
+        "a player build ignores the switch"
+    );
+    assert!(layer_enabled_by(true, None) && layer_enabled_by(true, Some("0")));
+}
+
+/// Booted without the layer, as `WOW_STOCK_UI=1` does: no layer file loads and the stock files
+/// raise nothing.
+#[test]
+fn the_stock_ui_switch_boots_the_core_without_the_layer() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load("stock", true);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let log: Vec<String> = s.eval("return DEFINE_LOG").unwrap();
+    // One global from each layer file that defines a new one.
+    for name in [
+        "BenillaScrollBar_Step",
+        "BenillaKeyBindings_OnKeyDown",
+        "BenillaOptionsFrame_SelectCategory",
+        "BenillaGameMenuButtonEditMode",
+        "BENILLA_BAG_WAS_OPEN",
+        "BenillaScriptLog_Toggle",
+    ] {
+        assert!(
+            !log.iter().any(|n| n == name),
+            "{name} is defined: a layer file loaded under WOW_STOCK_UI=1"
+        );
+    }
+    assert!(!s.eval::<bool>("return BenillaOptionsFrame ~= nil").unwrap());
+    assert!(!s.eval::<bool>("return ZZORDER_SAW_LAYER").unwrap());
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
+/// Types `line` into the chat box and sends it through the stock `ChatEdit_ParseText`
+/// (`ChatFrame.lua:2087`), counting the `HELP_TEXT_SIMPLE` lines it prints.
+fn type_line(s: &UiScript, line: &str) -> i64 {
+    s.run(&format!(
+        r#"HELPS = 0
+           local box = ChatFrameEditBox
+           box.chatFrame = box.chatFrame or DEFAULT_CHAT_FRAME
+           local frame = box.chatFrame
+           local add = frame.AddMessage
+           frame.AddMessage = function(f, text, r, g, b, id)
+               if text == HELP_TEXT_SIMPLE then HELPS = HELPS + 1 end
+               return add(f, text, r, g, b, id)
+           end
+           box:SetText({line:?})
+           ChatEdit_ParseText(box, 1)
+           frame.AddMessage = add"#
+    ))
+    .unwrap_or_else(|e| panic!("{line}: {e}"));
+    s.eval("return HELPS").unwrap()
+}
+
+/// The layer's player commands are plain `SlashCmdList` rows: `/reload` runs `ReloadUI()`,
+/// `/errors` (`/err`) toggles the log and `/errors clear` empties it. 1.12 has no `/convertraid`
+/// (the Raid tab's button converts, `RaidFrame.lua:63-71`), so it answers `HELP_TEXT_SIMPLE`, and
+/// the forwarding hook `SubmitChatInput` is gone.
+#[test]
+fn the_layers_commands_are_slash_rows_and_convertraid_is_unknown() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (mut s, failures) = production_load("slash", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    assert!(s.eval::<bool>("return SubmitChatInput == nil").unwrap());
+
+    s.take_session_requests();
+    assert_eq!(type_line(&s, "/reload"), 0);
+    assert_eq!(
+        s.take_session_requests(),
+        [benilla_ui::script::SessionRequest::ReloadUi],
+        "/reload is ReloadUI()"
+    );
+    assert!(
+        s.take_chat_input().is_empty(),
+        "nothing is handed to the host"
+    );
+
+    assert_eq!(type_line(&s, "/errors"), 0);
+    assert!(s
+        .eval::<bool>("return BenillaScriptLogFrame:IsVisible()")
+        .unwrap());
+    assert_eq!(type_line(&s, "/err"), 0);
+    assert!(!s
+        .eval::<bool>("return BenillaScriptLogFrame:IsVisible()")
+        .unwrap());
+    s.run("BenillaScriptLog_Record('kept')").unwrap();
+    assert_eq!(type_line(&s, "/errors  clear "), 0);
+    assert_eq!(
+        s.eval::<i64>("return table.getn(BenillaScriptLog.rows)")
+            .unwrap(),
+        0,
+        "/errors clear empties the log"
+    );
+
+    assert_eq!(type_line(&s, "/convertraid"), 1, "the unknown-command line");
+    assert!(s.take_chat_input().is_empty());
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
+/// In a player build the dev instruments are no `SlashCmdList` row, so a typed one answers
+/// `HELP_TEXT_SIMPLE` once and hands the host nothing to re-run; in a dev build each is a host row
+/// that hands the host its line.
+#[test]
+fn the_dev_commands_are_host_rows_in_a_dev_build_alone() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let lines = [
+        "/chattest",
+        "/shot",
+        "/liquid",
+        "/castvis",
+        "/partytest ping",
+        "/reaction",
+        "/react Probe",
+    ];
+
+    let (mut s, failures) = production_load("devcmds-player", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    crate::ui_chat::commands::register_dev_commands(&s, false);
+    for line in lines {
+        assert_eq!(
+            type_line(&s, line),
+            1,
+            "{line}: the unknown-command line, once"
+        );
+        assert!(
+            s.take_chat_input().is_empty(),
+            "{line}: nothing queued to loop"
+        );
+        let cmd = line[1..].split(' ').next().unwrap();
+        assert!(!s.has_slash_command(cmd), "{cmd} is no SlashCmdList row");
+    }
+    drop(s);
+
+    let (mut s, failures) = production_load("devcmds-dev", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    crate::ui_chat::commands::register_dev_commands(&s, true);
+    for line in lines {
+        assert_eq!(type_line(&s, line), 0, "{line}");
+        let queued = s.take_chat_input();
+        assert_eq!(queued.len(), 1, "{line}: {queued:?}");
+        // An alias queues under the command's first one, as the row's handler knows only that.
+        let want = line.replacen("/react ", "/reaction ", 1);
+        assert_eq!(queued[0].trim(), want, "{line}");
+    }
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
+/// The `/errors` log collects off the Lua error handler, ahead of the stock `_ERRORMESSAGE`
+/// (`BasicControls.xml:16`), which still shows the `ScriptErrors` dialog: an addon's runtime error,
+/// an error in one of the layer's own handlers, and one raised in the stock load before the layer
+/// loaded (the engine hands caught errors to the handler after the load).
+#[test]
+fn the_error_log_collects_off_the_error_handler() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let before = r#"
+        local pre = CreateFrame("Button", "ZZPreLayer")
+        pre:SetScript("OnClick", function() error("before the layer") end)
+        pre:Click()
+    "#;
+    let (mut s, failures) = production_load_with("errlog", false, before, |root| {
+        let dir = root.join("ZZErr");
+        std::fs::create_dir_all(&dir).unwrap();
+        std::fs::write(dir.join("ZZErr.toc"), "## Interface: 11200\nerr.lua\n").unwrap();
+        std::fs::write(
+            dir.join("err.lua"),
+            "ZZErrButton = CreateFrame('Button', 'ZZErrButton')\n\
+             ZZErrButton:SetScript('OnClick', function() error('an addon boom') end)\n",
+        )
+        .unwrap();
+    });
+    assert!(
+        failures.iter().all(|f| f.contains("before the layer")),
+        "load failures: {failures:#?}"
+    );
+    s.run("ZZErrButton:Click()").unwrap();
+    // A layer handler raising: the window's OnShow calls this.
+    s.run("BenillaOptionsFrame_UpdateScale = function() error('a layer boom') end")
+        .unwrap();
+    s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
+    s.dispatch_script_errors_to_handler();
+
+    let rows: Vec<String> = s
+        .eval(
+            "local out = {} \
+             for _, row in ipairs(BenillaScriptLog.rows) do table.insert(out, row.message) end \
+             return out",
+        )
+        .unwrap();
+    for want in ["before the layer", "an addon boom", "a layer boom"] {
+        assert!(
+            rows.iter().any(|r| r.contains(want)),
+            "{want:?} is in the log: {rows:#?}"
+        );
+    }
+    assert!(
+        s.eval::<bool>("return ScriptErrors:IsVisible()").unwrap(),
+        "the stock handler still runs after the log"
+    );
+    let shown: String = s.eval("return ScriptErrors_Message:GetText()").unwrap();
+    assert!(
+        shown.contains("before the layer"),
+        "the first error shows: {shown}"
+    );
+    // A repeat is one row with a count.
+    s.run("ZZErrButton:Click() ZZErrButton:Click()").unwrap();
+    s.dispatch_script_errors_to_handler();
+    assert_eq!(
+        s.eval::<i64>(
+            "for _, row in ipairs(BenillaScriptLog.rows) do \
+                if strfind(row.message, 'an addon boom', 1, 1) then return row.count end \
+             end"
+        )
+        .unwrap(),
+        3
+    );
+}
+
+/// Every global the layer defines takes the `Benilla` prefix (a slash alias its `SLASH_BENILLA_`
+/// form, as `ChatEdit_ParseText` reads it), so no layer name meets a stock or an addon one; a stock
+/// global the layer redefines keeps its name and is not a new definition here.
+#[test]
+fn every_global_the_layer_defines_takes_the_benilla_prefix() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load("prefix", false);
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let log: Vec<String> = s.eval("return DEFINE_LOG").unwrap();
+    let start = defined_at(&log, "BenillaScrollBar_Step");
+    let end = defined_at(&log, "ZZORDER_SAW_LAYER");
+    let dispatch = |n: &str| {
+        n == "this"
+            || n == "event"
+            || n.strip_prefix("arg")
+                .is_some_and(|d| !d.is_empty() && d.bytes().all(|b| b.is_ascii_digit()))
+    };
+    let unprefixed: Vec<&String> = log[start..end]
+        .iter()
+        .filter(|n| {
+            !(n.starts_with("Benilla")
+                || n.starts_with("BENILLA_")
+                || n.starts_with("SLASH_BENILLA_"))
+                && !dispatch(n)
+        })
+        .collect();
+    assert!(
+        unprefixed.is_empty(),
+        "layer globals without the Benilla prefix: {unprefixed:?}"
+    );
+}
+
+/// A login as the reference runs one on `s`, over a saved-variables file in `home` holding
+/// `saved`: the chunk and `VARIABLES_LOADED` inside the UI load, then the world entry's clear
+/// (`0x401639`, after the load at `0x401602`), then `PLAYER_ENTERING_WORLD`; a `ReloadUI()`
+/// (`entry` false) skips the clear. The bits start as `before`. Returns the app holding the VM and
+/// the plate bits.
+fn log_in(
+    s: UiScript,
+    home: &std::path::Path,
+    saved: Option<&str>,
+    entry: bool,
+    before: crate::vplates::VPlateMode,
+) -> bevy::app::App {
+    use bevy::prelude::*;
+    std::fs::create_dir_all(home).unwrap();
+    if let Some(saved) = saved {
+        std::fs::write(home.join("saved-variables.lua"), saved).unwrap();
+    }
+    let mut app = App::new();
+    app.add_systems(Update, crate::vplates::apply_plate_verbs)
+        .insert_resource(before)
+        .insert_non_send_resource(s);
+    crate::ui_saved::load_saved_variables(
+        &mut app.world_mut().non_send_resource_mut::<UiScript>(),
+        |_| {},
+    );
+    app.update();
+    if entry {
+        crate::vplates::clear_at_world_entry(app.world_mut());
+    }
+    app.world_mut()
+        .non_send_resource_mut::<UiScript>()
+        .fire_event("PLAYER_ENTERING_WORLD", vec![]);
+    app.update();
+    app
+}
+
+fn plates(app: &bevy::app::App) -> (bool, bool) {
+    let m = app.world().resource::<crate::vplates::VPlateMode>();
+    (m.enemies, m.friends)
+}
+
+fn plate_globals(app: &bevy::app::App) -> (Option<i64>, Option<i64>) {
+    app.world()
+        .non_send_resource::<UiScript>()
+        .eval("return NAMEPLATES_ON, FRIENDNAMEPLATES_ON")
+        .unwrap()
+}
+
+/// On the stock UI alone benilla is 1.12.1: the stock `UpdateNameplates` shows the friendly
+/// plates and hides them at once (`UIOptionsFrame.lua:775-776`), so they are off after the entry
+/// though the saved variable says on, and the saved variable is left as it was.
+#[test]
+fn on_the_stock_ui_friendly_plates_are_off_after_entry_and_the_saved_value_stands() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load_with("plates-stock", true, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let home = std::env::temp_dir().join(format!("benilla-plates-stock-{}", std::process::id()));
+    let _c = EnvGuard::unset("WOW_CAPTURE");
+    let _h = EnvGuard::set("BENILLA_HOME", home.to_str().unwrap());
+
+    let app = log_in(
+        s,
+        &home,
+        Some("NAMEPLATES_ON = 1\nFRIENDNAMEPLATES_ON = 1\n"),
+        true,
+        Default::default(),
+    );
+    assert_eq!(plates(&app), (true, false), "enemy on, friendly off");
+    assert_eq!(
+        plate_globals(&app),
+        (Some(1), Some(1)),
+        "both saved variables untouched"
+    );
+    let _ = std::fs::remove_dir_all(&home);
+}
+
+/// With the layer, plates the player turned on stay on: after the entry, through the logout's
+/// save, and after a `ReloadUI()` on the saved file.
+#[test]
+fn with_the_layer_plates_turned_on_stay_on_after_entry_and_reload() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = production_load_with("plates-layer", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let home = std::env::temp_dir().join(format!("benilla-plates-layer-{}", std::process::id()));
+    let _c = EnvGuard::unset("WOW_CAPTURE");
+    let _h = EnvGuard::set("BENILLA_HOME", home.to_str().unwrap());
+
+    let mut app = log_in(
+        s,
+        &home,
+        Some("NAMEPLATES_ON = 1\nFRIENDNAMEPLATES_ON = 1\n"),
+        true,
+        Default::default(),
+    );
+    assert_eq!(plates(&app), (true, true), "both on after the entry");
+
+    // The session's end writes the file, the friendly global included.
+    crate::ui_saved::save(&mut app.world_mut().non_send_resource_mut::<UiScript>());
+    let file = std::fs::read_to_string(home.join("saved-variables.lua")).unwrap();
+    for line in ["NAMEPLATES_ON = 1", "FRIENDNAMEPLATES_ON = 1"] {
+        assert!(file.contains(line), "{line} saved: {file}");
+    }
+
+    // `ReloadUI()`: a new VM over the file just written, and no clear.
+    let before = *app.world().resource::<crate::vplates::VPlateMode>();
+    let (s, failures) = production_load_with("plates-reload", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let app = log_in(s, &home, None, false, before);
+    assert_eq!(plates(&app), (true, true), "both on after the reload");
+    assert_eq!(plate_globals(&app), (Some(1), Some(1)));
+    let _ = std::fs::remove_dir_all(&home);
+}
+
+/// A frame's rect from its window's top-left corner, y down: `(left, top, right, bottom)`.
+fn window_rect(s: &UiScript, window: &str, frame: &str) -> (f32, f32, f32, f32) {
+    s.eval(&format!(
+        "local w, f = {window}, {frame} \
+         return f:GetLeft() - w:GetLeft(), w:GetTop() - f:GetTop(), \
+                f:GetRight() - w:GetLeft(), w:GetTop() - f:GetBottom()"
+    ))
+    .unwrap_or_else(|e| panic!("{frame} in {window}: {e}"))
+}
+
+/// The `/errors` window wears the ClassTrainer art, so its frames sit where the class trainer's own
+/// do on it (`Blizzard_TrainerUI.xml`, resized by `ClassTrainer_SetToClassTrainer`,
+/// `Blizzard_TrainerUI.lua:469-475`): the rows, the list, the detail under it, and the two buttons
+/// in the art's sockets (`ClassTrainerTrainButton` and `ClassTrainerCancelButton`, 80x22 centred
+/// at 224 and 305, -420). The detail ends above the buttons, as the trainer's does at -407.
+#[test]
+fn the_error_log_lays_out_on_the_trainer_art_as_the_class_trainer_does() {
+    benilla_formats::wow_data_or_skip!();
+    let mut s = super::trainer_tests::trainer_script();
+    // The file registers its commands in the stock table, which `ChatFrame.lua` declares and this
+    // kit stops short of.
+    s.run("SlashCmdList = {}").unwrap();
+    super::test_ui::load_ui_strict(&s, "ScriptLogFrame.xml");
+
+    // The class trainer's layout, read off its own frames once it has laid itself out.
+    s.set_money(50);
+    s.set_trainer(Some(super::trainer_tests::menu()));
+    s.fire_event(
+        "TRAINER_SHOW",
+        vec![ScriptValue::Str("Sana Winterhoof".into())],
+    );
+    s.resolve();
+    let trainer = |s: &UiScript, frame: &str| window_rect(s, "ClassTrainerFrame", frame);
+    let ref_rows = s
+        .eval::<i64>("return CLASS_TRAINER_SKILLS_DISPLAYED")
+        .unwrap();
+    let ref_list = trainer(&s, "ClassTrainerListScrollFrame");
+    let ref_detail = trainer(&s, "ClassTrainerDetailScrollFrame");
+    let ref_buttons = [
+        trainer(&s, "ClassTrainerTrainButton"),
+        trainer(&s, "ClassTrainerCancelButton"),
+    ];
+    let ref_rows_rects: Vec<_> = (1..=ref_rows)
+        .map(|i| trainer(&s, &format!("ClassTrainerSkill{i}")))
+        .collect();
+    // The reference's own numbers, so a drifted harness cannot pass this against itself.
+    assert_eq!(ref_rows, 11);
+    assert_eq!(ref_list, (21.0, 96.0, 317.0, 280.0));
+    assert_eq!(ref_detail, (21.0, 288.0, 317.0, 407.0));
+    assert_eq!(ref_buttons[0], (184.0, 409.0, 264.0, 431.0));
+    assert_eq!(ref_buttons[1], (265.0, 409.0, 345.0, 431.0));
+
+    s.set_trainer(None);
+    s.fire_event("TRAINER_CLOSED", vec![]);
+    s.run("ShowUIPanel(BenillaScriptLogFrame)").unwrap();
+    // Enough rows to fill the list, so every row shows.
+    s.run("for i = 1, 30 do BenillaScriptLog_Record('error ' .. i) end")
+        .unwrap();
+    for _ in 0..4 {
+        s.resolve();
+        s.tick(0.016);
+    }
+    s.resolve();
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+    let ours = |s: &UiScript, frame: &str| window_rect(s, "BenillaScriptLogFrame", frame);
+
+    let window = ours(&s, "BenillaScriptLogFrame");
+    assert_eq!(window, (0.0, 0.0, 384.0, 512.0), "the standard panel size");
+    let clear = ours(&s, "BenillaScriptLogClearButton");
+    let close = ours(&s, "BenillaScriptLogCloseBottomButton");
+    let detail = ours(&s, "BenillaScriptLogDetailScroll");
+    let list = ours(&s, "BenillaScriptLogListScrollFrame");
+
+    // The buttons take the trainer's two sockets, at its size, inside the window's rect.
+    assert_eq!(clear, ref_buttons[0], "Clear sits where Train does");
+    assert_eq!(close, ref_buttons[1], "Close sits where Exit does");
+    for (name, b) in [("Clear", clear), ("Close", close)] {
+        assert!(
+            b.0 >= window.0 && b.1 >= window.1 && b.2 <= window.2 && b.3 <= window.3,
+            "{name} {b:?} lies inside the {window:?} window"
+        );
+    }
+    // The detail pane is the trainer's, and its bottom clears both buttons' tops.
+    assert_eq!(
+        detail, ref_detail,
+        "the detail sits where the trainer's does"
+    );
+    assert!(
+        detail.3 < clear.1 && detail.3 < close.1,
+        "the detail's bottom {} is above the buttons' top {}",
+        detail.3,
+        clear.1.min(close.1)
+    );
+    // The list is the trainer's, with its rows.
+    assert_eq!(list, ref_list, "the list sits where the trainer's does");
+    assert_eq!(
+        s.eval::<i64>("return BENILLA_SCRIPTLOG_ROWS").unwrap(),
+        ref_rows,
+        "as many rows as the trainer's list"
+    );
+    assert!(
+        s.eval::<bool>(&format!(
+            "return getglobal('BenillaScriptLogRow{}') == nil",
+            ref_rows + 1
+        ))
+        .unwrap(),
+        "no row beyond the list"
+    );
+    for (i, want) in ref_rows_rects.iter().enumerate() {
+        let row = ours(&s, &format!("BenillaScriptLogRow{}", i + 1));
+        // The trainer widens a row to 323 while its scroll bar is hidden and keeps the template's
+        // 293 beside it (`Blizzard_TrainerUI.lua:133-137`); the log's rows are the 293.
+        assert_eq!(
+            (row.0, row.1, row.2, row.3),
+            (want.0, want.1, want.0 + 293.0, want.3),
+            "row {} sits where the trainer's does",
+            i + 1
+        );
+        assert!(
+            row.1 >= list.1 && row.3 <= list.3,
+            "row {} {row:?} lies inside the list {list:?}",
+            i + 1
+        );
+    }
+}
+
+/// A traceback long enough to wrap the detail box and to pass any small `letters` cap, with a
+/// newline and a lone `|` in it, which the box must hold byte for byte.
+const LONG_ERROR: &str = "Interface/AddOns/Boom/Boom.lua:12: bad argument | #1\\nStack:\\n";
+
+/// The `/errors` window open on the trainer's kit with `LONG_ERROR` logged and its row selected,
+/// settled a few frames. Returns the script and the message as Lua holds it.
+fn error_log_selected() -> (UiScript, String) {
+    let mut s = super::trainer_tests::trainer_script();
+    s.run("SlashCmdList = {}").unwrap();
+    super::test_ui::load_ui_strict(&s, "ScriptLogFrame.xml");
+    s.run("ShowUIPanel(BenillaScriptLogFrame)").unwrap();
+    s.run(&format!(
+        "MSG = \"{LONG_ERROR}\" .. string.rep(\"  [C]: in function `Boom'\\n\", 60)"
+    ))
+    .unwrap();
+    s.run("BenillaScriptLog_Record(MSG)").unwrap();
+    settle(&mut s);
+    s.run("BenillaScriptLogRow1:Click()").unwrap();
+    settle(&mut s);
+    let msg = s.eval::<String>("return MSG").unwrap();
+    assert!(msg.len() > 1500, "a message past any small letters cap");
+    (s, msg)
+}
+
+/// A few frames: the layout resolves after Lua runs, and an edit's `OnTextChanged` fires on the tick.
+fn settle(s: &mut UiScript) {
+    for _ in 0..5 {
+        s.resolve();
+        s.tick(0.016);
+    }
+    s.resolve();
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
+/// A left click near the detail box's top left, inside its pane whatever the text's height, which
+/// focuses it as the game's mouse does.
+fn click_detail(s: &mut UiScript) {
+    let (x, y) = s
+        .eval::<(f64, f64)>(
+            "return BenillaScriptLogDetailText:GetLeft() + 20, BenillaScriptLogDetailText:GetTop() - 8",
+        )
+        .unwrap();
+    s.mouse_button(x as f32, y as f32, "LeftButton", true);
+    s.mouse_button(x as f32, y as f32, "LeftButton", false);
+    settle(s);
+    assert_eq!(
+        s.focused_editbox_name().as_deref(),
+        Some("BenillaScriptLogDetailText"),
+        "the click focused the detail box"
+    );
+}
+
+fn detail_text(s: &UiScript) -> String {
+    s.eval("return BenillaScriptLogDetailText:GetText()")
+        .unwrap()
+}
+
+/// The kit's stand-in font (`trainer_script`'s `FixedWidthFont(7.0)`): every character this wide,
+/// every wrapped line this tall.
+const CHAR_W: f64 = 7.0;
+const LINE_H: f64 = 12.0;
+/// The detail box's `<TextInsets>` (left, right, top, bottom) and width, from the XML.
+const DETAIL_INSETS: (f64, f64, f64, f64) = (6.0, 20.0, 6.0, 20.0);
+const DETAIL_WIDTH: f64 = 296.0;
+
+/// The height the reference gives a multi-line box (`0x77d4d0` @`0x77d8ad`): its insets plus its
+/// text, wrapped at the box's width less its side insets, one line when short or empty.
+fn detail_box_height(chars: usize) -> f64 {
+    let wrap = DETAIL_WIDTH - (DETAIL_INSETS.0 + DETAIL_INSETS.1);
+    let natural = chars as f64 * CHAR_W;
+    let lines = if natural > wrap {
+        (natural / wrap).ceil()
+    } else {
+        1.0
+    };
+    DETAIL_INSETS.2 + DETAIL_INSETS.3 + lines * LINE_H
+}
+
+fn detail_geometry(s: &UiScript) -> (f64, f64, f64, f64, f64) {
+    s.eval(
+        "return BenillaScriptLogDetailText:GetWidth(), BenillaScriptLogDetailText:GetHeight(), \
+                BenillaScriptLogDetailScrollChild:GetHeight(), \
+                BenillaScriptLogDetailScroll:GetHeight(), \
+                BenillaScriptLogDetailScroll:GetVerticalScrollRange()",
+    )
+    .unwrap()
+}
+
+/// The selected error's text is in a multi-line EditBox, whole: no `letters` cap, no change to a
+/// newline or a `|`. Opening the window takes no focus, so the movement keys keep working until a
+/// click (the stock mail body's `autoFocus="false"`, `MailFrame.xml:616`). The box is as tall as
+/// its insets and its text, so the scroll frame ranges over the whole traceback and shows its bar;
+/// the text draws once, where the FontString drew it.
+#[test]
+fn the_error_logs_detail_is_a_box_holding_the_whole_error() {
+    benilla_formats::wow_data_or_skip!();
+    let (mut s, msg) = error_log_selected();
+    assert_eq!(
+        s.eval::<String>("return BenillaScriptLogDetailText:GetObjectType()")
+            .unwrap(),
+        "EditBox"
+    );
+    assert_eq!(detail_text(&s), msg, "the full message, traceback and all");
+    assert_eq!(
+        s.eval::<i64>("return BenillaScriptLogDetailText:GetMaxLetters()")
+            .unwrap(),
+        0,
+        "no letters cap"
+    );
+
+    // Nothing took the keyboard on its own: a key with no box focused is not consumed.
+    assert!(!s.has_keyboard_focus());
+    assert!(!s.char_input("w"), "no autoFocus box waits for a key");
+    assert!(!s.has_keyboard_focus());
+
+    // The box sizes itself: insets plus the wrapped text, which is taller than the pane.
+    let want = detail_box_height(msg.chars().count());
+    let (width, height, child, pane, range) = detail_geometry(&s);
+    assert_eq!(width, DETAIL_WIDTH);
+    assert!(want > pane, "sanity: the text is taller than the pane");
+    assert_eq!(height, want, "insets + lines * line height");
+    // The scroll child stays the pane's size; the range is the box's overhang, 20 below the text.
+    assert_eq!(child, pane, "the child is not sized to the text");
+    assert_eq!(range, want - pane, "the range covers the whole traceback");
+    assert!(
+        s.eval::<bool>("return BenillaScriptLogDetailScrollBar:IsShown()")
+            .unwrap(),
+        "the bar shows for a range"
+    );
+
+    // The text draws once, at the 6-in, 6-down seat the FontString had.
+    let (left, top) = s
+        .eval::<(f64, f64)>(
+            "return BenillaScriptLogDetailScroll:GetLeft(), BenillaScriptLogDetailScroll:GetTop()",
+        )
+        .unwrap();
+    let drawn: Vec<_> = s
+        .extract()
+        .into_iter()
+        .filter(|q| matches!(&q.content, QuadContent::Text { text: Some(t), .. } if *t == msg))
+        .collect();
+    assert_eq!(drawn.len(), 1, "the message draws once: {drawn:#?}");
+    let rect = drawn[0].rect.expect("the drawn text has a rect");
+    assert_eq!(
+        (f64::from(rect.left), f64::from(rect.top)),
+        (left + DETAIL_INSETS.0, top - DETAIL_INSETS.2),
+        "6 in and 6 down from the pane's corner"
+    );
+    assert_eq!(
+        f64::from(rect.right - rect.left),
+        DETAIL_WIDTH - (DETAIL_INSETS.0 + DETAIL_INSETS.1),
+        "wrapped at 270"
+    );
+
+    // The wheel over the box scrolls the pane, a step a notch.
+    let (x, y) = (left + 40.0, top - 40.0);
+    s.mouse_wheel(x as f32, y as f32, -1.0);
+    assert_eq!(
+        s.eval::<f64>("return BenillaScriptLogDetailScroll:GetVerticalScroll()")
+            .unwrap(),
+        20.0
+    );
+
+    // Another error's text resizes it: one short line, no range, no bar.
+    s.run("BenillaScriptLog_Record('short') BenillaScriptLogRow2:Click()")
+        .unwrap();
+    settle(&mut s);
+    assert_eq!(detail_text(&s), "short");
+    let (_, height, child, pane, range) = detail_geometry(&s);
+    assert_eq!(height, detail_box_height(5));
+    assert_eq!(height, 38.0, "sanity: 6 + 12 + 20");
+    assert_eq!((child, range), (pane, 0.0));
+    assert!(
+        !s.eval::<bool>("return BenillaScriptLogDetailScrollBar:IsShown()")
+            .unwrap(),
+        "no range, no bar"
+    );
+}
+
+/// A click anywhere in the pane focuses the box and selects all of it, as a click on the text
+/// does: below a short text the click lands on the scroll child, which hands focus to the box
+/// (`SendMailScrollChildFrame`'s `OnMouseUp`, `MailFrame.xml:651`).
+#[test]
+fn a_click_below_the_detail_text_focuses_the_box_and_selects_it_all() {
+    benilla_formats::wow_data_or_skip!();
+    let (mut s, _) = error_log_selected();
+    s.run("BenillaScriptLog_Record('short') BenillaScriptLogRow2:Click()")
+        .unwrap();
+    settle(&mut s);
+    assert_eq!(detail_text(&s), "short");
+    assert_eq!(
+        detail_geometry(&s).1,
+        38.0,
+        "a box far shorter than the pane"
+    );
+    // The pane's foot, 6 up from its bottom edge: well below the box.
+    let (x, y) = s
+        .eval::<(f64, f64)>(
+            "return BenillaScriptLogDetailScroll:GetLeft() + 40, BenillaScriptLogDetailScroll:GetBottom() + 6",
+        )
+        .unwrap();
+    assert!(
+        y < s
+            .eval::<f64>("return BenillaScriptLogDetailText:GetBottom()")
+            .unwrap(),
+        "sanity: the click is below the box"
+    );
+    assert!(!s.has_keyboard_focus());
+    s.mouse_button(x as f32, y as f32, "LeftButton", true);
+    s.mouse_button(x as f32, y as f32, "LeftButton", false);
+    settle(&mut s);
+    assert_eq!(
+        s.focused_editbox_name().as_deref(),
+        Some("BenillaScriptLogDetailText"),
+        "the pane's foot focused the box"
+    );
+    assert_eq!(
+        s.editbox_copy().as_deref(),
+        Some("short"),
+        "all of it selected"
+    );
+}
+
+/// A click selects the whole error, so Ctrl+C (`UiScript::editbox_copy`) copies all of it; an
+/// error arriving meanwhile leaves that selection alone, and another row takes the keyboard off
+/// the box with the new text.
+#[test]
+fn a_click_on_the_detail_selects_all_and_copy_returns_the_whole_error() {
+    benilla_formats::wow_data_or_skip!();
+    let (mut s, msg) = error_log_selected();
+    assert_eq!(s.editbox_copy(), None, "nothing to copy before a click");
+    click_detail(&mut s);
+    assert_eq!(s.editbox_copy().as_deref(), Some(msg.as_str()));
+
+    // The window's update repaints on every new error, and must not collapse the selection.
+    s.run("BenillaScriptLog_Record('another error')").unwrap();
+    settle(&mut s);
+    assert_eq!(s.editbox_copy().as_deref(), Some(msg.as_str()));
+
+    // Another row: the text changes and the box lets go of the keyboard.
+    s.run("BenillaScriptLogRow2:Click()").unwrap();
+    settle(&mut s);
+    assert_eq!(detail_text(&s), "another error");
+    assert!(!s.has_keyboard_focus());
+    click_detail(&mut s);
+    assert_eq!(s.editbox_copy().as_deref(), Some("another error"));
+}
+
+/// Typing, pasting, Enter, Backspace and cut leave the text as it was, the selection is put back
+/// so a copy still takes it all, and the restore's own change stops after one more round, bar the
+/// box's resize, whose re-seat fires once more with the text unchanged (`0x77ba7f`).
+#[test]
+fn an_edit_of_the_detail_box_is_undone() {
+    benilla_formats::wow_data_or_skip!();
+    let (mut s, msg) = error_log_selected();
+    click_detail(&mut s);
+    s.run(
+        "CHANGES = 0 \
+         local handler = BenillaScriptLogDetail_OnTextChanged \
+         BenillaScriptLogDetail_OnTextChanged = function() CHANGES = CHANGES + 1 handler() end",
+    )
+    .unwrap();
+
+    // With everything selected, a typed letter replaces the whole text until the tick restores it.
+    assert!(s.char_input("x"));
+    assert_eq!(
+        detail_text(&s),
+        "x",
+        "the edit lands first, as in the reference"
+    );
+    settle(&mut s);
+    assert_eq!(detail_text(&s), msg, "typing");
+    // The edit shrank the multi-line box to one line and the restore grows it back, and each
+    // resize re-seats the text, raising the text bit again.
+    assert_eq!(
+        s.eval::<i64>("return CHANGES").unwrap(),
+        3,
+        "the edit, its restore, then the restore's resize"
+    );
+    assert_eq!(
+        s.editbox_copy().as_deref(),
+        Some(msg.as_str()),
+        "still all selected"
+    );
+
+    assert!(s.paste("pasted\nlines"));
+    settle(&mut s);
+    assert_eq!(detail_text(&s), msg, "pasting");
+
+    assert!(s.key_input("ENTER"));
+    settle(&mut s);
+    assert_eq!(detail_text(&s), msg, "Enter");
+
+    s.editbox_action(EditAction::Delete {
+        unit: EditUnit::Char,
+        back: true,
+    });
+    settle(&mut s);
+    assert_eq!(detail_text(&s), msg, "Backspace");
+
+    // A cut still copies, then the box takes the text back.
+    assert_eq!(s.editbox_cut().as_deref(), Some(msg.as_str()));
+    settle(&mut s);
+    assert_eq!(detail_text(&s), msg, "cut");
+    assert_eq!(s.editbox_copy().as_deref(), Some(msg.as_str()));
+}
+
+/// Escape clears the box's focus (`MailFrame.xml:644`), and leaves its text.
+#[test]
+fn escape_clears_the_detail_boxs_focus() {
+    benilla_formats::wow_data_or_skip!();
+    let (mut s, msg) = error_log_selected();
+    click_detail(&mut s);
+    assert!(s.key_input("ESCAPE"));
+    settle(&mut s);
+    assert!(!s.has_keyboard_focus(), "Escape let go of the keyboard");
+    assert_eq!(detail_text(&s), msg);
+}
diff --git a/crates/benilla-app/src/ui_script/lifecycle.rs b/crates/benilla-app/src/ui_script/lifecycle.rs
index 66363ebc..2a7bbedf 100644
--- a/crates/benilla-app/src/ui_script/lifecycle.rs
+++ b/crates/benilla-app/src/ui_script/lifecycle.rs
@@ -1,6 +1,6 @@
 //! The UI session's lifecycle, all edges and nothing per-frame: `Startup` installs a boot VM
-//! (strings, emote tokens, fonts); world entry builds a fresh VM and loads the in-game UI and
-//! every addon onto it; leaving the world runs the reference's shutdown tail and installs a boot
+//! (strings and emote tokens); world entry builds a fresh VM and loads the in-game UI and every
+//! addon onto it; leaving the world runs the reference's shutdown tail and installs a boot
 //! VM again; `ReloadUI()` is the two edges back to back without leaving the world.
 
 use bevy::prelude::*;
@@ -9,40 +9,41 @@ use benilla_assets::LockRecover;
 use benilla_ui::script::UiScript;
 
 use super::manifest::silenced_ui_load;
-use super::{
-    load_font_registry, load_ingame_ui, CursorPayloadHeld, PlayerUiHover, UiClock,
-    UiKeyboardCapture,
-};
+use super::{load_ingame_ui, CursorPayloadHeld, PlayerUiHover, UiClock, UiKeyboardCapture};
 use crate::ui_script::addons;
 
 pub(crate) fn setup_script(world: &mut World) {
     install_boot_vm(world);
 }
 
-/// Build and install a boot VM: strings, emote tokens and the font-object registry, no frames.
-/// Installed at `Startup`, at every [`end_ui_session`] and at every world entry, so no login
-/// shares a session id (and so a [`super::VmMemo`]) with the character screen before it. The
-/// registry is here because the glyph atlas bakes from it on the first `Update`; the reference
-/// re-loads `Fonts.xml` per rebuild too, as a font object dies with its session (the native
-/// `CSimpleFont` with the frame-script owner `0x7839c0`, torn down at `0x490c97`).
+/// Build and install a boot VM, the one the world holds outside an in-game UI session: the
+/// strings the feeds resolve lines from and the emote tokens `/`-commands are built from
+/// (`ui_chat::commands`), no frames and no font objects. Installed at `Startup` and at every
+/// [`end_ui_session`].
 fn install_boot_vm(world: &mut World) {
+    let Some(script) = new_vm(world) else {
+        return;
+    };
+    load_global_strings(world, &script);
+    load_emote_tokens(world, &script);
+    world.insert_non_send_resource(script);
+}
+
+/// A fresh VM on the process clock with the addon asset probes wired, or `None` (the world's VM
+/// removed) when the VM cannot start.
+fn new_vm(world: &mut World) -> Option<UiScript> {
     let mut script = match UiScript::new() {
         Ok(s) => s,
         Err(e) => {
             error!("ui_script: VM init failed: {e}");
             world.remove_non_send_resource::<UiScript>();
-            return;
+            return None;
         }
     };
     seed_vm_clock(world, &mut script);
     install_addon_asset_resolvers(world, &mut script);
-    load_global_strings(world, &script);
-    load_emote_tokens(world, &script);
-    if ui_wanted(world) {
-        // Errors are logged per file as they happen; the returned list is for the tests.
-        let _ = load_font_registry(&script);
-    }
-    world.insert_non_send_resource(script);
+    info!("ui_script: new VM, session {}", script.session());
+    Some(script)
 }
 
 /// Start the new VM's `GetTime()` where the process already is and re-anchor [`UiClock`] to it,
@@ -146,13 +147,17 @@ pub(crate) fn arm_entry_ui_load(world: &mut World) {
 }
 
 /// Retire the glue VM and build the one the entry load runs on: the reference re-makes its Lua
-/// state inside `UI_Init` (`0x48fe97`, in `0x48fbf0`). The glue VM's CVars fold first, since the
-/// character screen can write one (the AddOns panel's out-of-date toggle) and this is the last
+/// state inside `UI_Init` (`0x48fe97`, in `0x48fbf0`), so no login shares a session id (and so a
+/// [`super::VmMemo`]) with the character screen before it. The glue VM's CVars fold first, since
+/// the character screen can write one (the AddOns panel's out-of-date toggle) and this is the last
 /// moment its table exists. Everything else is re-seeded onto the new VM or is a
-/// [`super::VmMemo`], which is meant to reset here.
+/// [`super::VmMemo`], which is meant to reset here. It starts bare: `FrameXML.toc` runs
+/// `GlobalStrings.lua` and `Fonts.xml` as its first rows, and `ChatFrame.lua` the emote tokens.
 fn mint_entry_vm(world: &mut World) {
     crate::cvars::fold_dying_vm_cvars(world);
-    install_boot_vm(world);
+    if let Some(script) = new_vm(world) {
+        world.insert_non_send_resource(script);
+    }
 }
 
 /// Put the parked boot VM back into the world, if one is parked.
@@ -211,6 +216,8 @@ pub(crate) fn run_pending_entry_load(world: &mut World) {
     world.remove_resource::<PendingEntryUiLoad>();
     let start = std::time::Instant::now();
     load_ingame_ui_on_world_entry(world);
+    // The world entry's own step after the UI load, which a `ReloadUI()` never takes.
+    crate::vplates::clear_at_world_entry(world);
     // Every entry logs the load's cost, whether the cover hid it, and the session every
     // `VmMemo` keys on.
     info!(
@@ -306,6 +313,13 @@ pub(crate) fn load_ingame_ui_on_world_entry(world: &mut World) {
         .and_then(|r| r.realm.as_ref().map(|r| r.name.clone()))
         .unwrap_or_default();
     script.set_realm_name(&realm);
+    // `CGGameUI::InitializeGame` flags these read-only before `UI_Init` loads anything
+    // (`0x48f566`-`0x48f584`), so an in-game `SetCVar` of one raises, logout handlers included;
+    // `ShutdownGame` clears them (`0x491240`), and here the flags die with this VM. The host's
+    // own realm writes are engine writes, which the flag does not stop.
+    for name in benilla_ui::script::IN_WORLD_READ_ONLY_CVARS {
+        script.set_cvar_read_only(name, true);
+    }
     // The player too, before the addon walk. The record first: the reference's
     // `UnitName`/`UnitRace`/`UnitClass`/`UnitSex` read only a copy of the char-enum row made at the
     // Enter World commit (`0x5abd9e`) and never cleared, and each rebuilt VM is told once. The
@@ -329,11 +343,13 @@ pub(crate) fn load_ingame_ui_on_world_entry(world: &mut World) {
         .is_none_or(crate::cvars::Cvars::addon_version_check);
     // Per-VM `Update` claims the load itself reads, seeded now: the zone-channel catalog (empty,
     // `General` would be filed and joined as a custom channel), the binding table (stock
-    // `ActionButton_OnLoad` paints the hotkeys) and the default language (`ChatFrame_OnEvent`'s
-    // `PLAYER_ENTERING_WORLD` arm stores it, `ChatFrame.lua:1275-1276`).
+    // `ActionButton_OnLoad` paints the hotkeys), the default language (`ChatFrame_OnEvent`'s
+    // `PLAYER_ENTERING_WORLD` arm stores it, `ChatFrame.lua:1275-1276`) and the language table a
+    // file-scope `SendChatMessage` names its tongue from.
     crate::ui_chat::seed_zone_channel_catalog(world, &mut script);
     crate::bindings::seed_bindings_for_vm(world, &mut script);
     crate::ui_unit::seed_default_language(world, &mut script);
+    crate::ui_unit::seed_language_table(world, &mut script);
     // The world map's continent and zone lists: static DBC data in the reference, read at file
     // scope (Astrolabe builds its whole zone table from `GetMapContinents`/`GetMapZones` there).
     crate::ui_world_map::seed_world_map_catalog(world, &mut script);
@@ -346,13 +362,21 @@ pub(crate) fn load_ingame_ui_on_world_entry(world: &mut World) {
         let z = world.resource::<crate::minimap::MinimapZoom>();
         (z.outdoor, z.inside)
     };
-    let plates = world
-        .get_resource::<crate::vplates::VPlateMode>()
-        .copied()
-        .unwrap_or_default();
+    // A plate setting `config.toml` still holds, carried into FrameXML's saved variables once.
+    // Only by a load with the layer, which registers `FRIENDNAMEPLATES_ON` for save; a stock-UI
+    // load leaves it for the next layered one.
+    let legacy_plates = if super::manifest::layer_enabled() {
+        world
+            .get_resource_mut::<crate::cvars::Cvars>()
+            .map(|mut cvars| crate::vplates::take_legacy_settings(&mut cvars))
+            .unwrap_or_default()
+    } else {
+        Default::default()
+    };
     // No sound during the load edge, as in the reference's `UI_Init` (`0x48fbfa` → `0x49016d`).
     silenced_ui_load(&mut script, |script| {
         let _ = load_ingame_ui(script, identity.as_ref(), &roster, version_check);
+        crate::ui_chat::commands::register_dev_commands(script, crate::run_mode::dev_affordances());
         // The new Minimap's zoom indices from the persisted CVars, as the reference's minimap reset
         // copies each CVar into its live index; `Minimap:SetZoom` owns them from here.
         script.set_minimap_zoom(zoom.0, zoom.1);
@@ -363,36 +387,18 @@ pub(crate) fn load_ingame_ui_on_world_entry(world: &mut World) {
         // events (`ChatFrame.lua:1261-1273`).
         finish_ui_load_with(
             script,
-            // `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` before `VARIABLES_LOADED`, whose
-            // `UIParent_OnEvent` arm runs the first `UpdateNameplates()` (`UIParent.lua:231-234`).
-            |script| crate::vplates::push_plate_globals(script, plates),
+            // Before `VARIABLES_LOADED`, whose `UIParent_OnEvent` arm runs the first
+            // `UpdateNameplates()` (`UIParent.lua:231-234`).
+            |script| crate::vplates::seat_legacy_settings(script, &legacy_plates),
             |script| {
                 crate::ui_chat::restore_chat_looks(world, script);
             },
         );
     });
-    // Deviation: failed addons are reported in chat, because otherwise an addon that does not
-    // load says nothing on screen. Counted from the deduplicated diagnostics log as `/errors`
-    // lists them, after the whole load edge (handlers included); the VM is fresh, so every `Load`
-    // row is this load's.
-    let failed = script
-        .diagnostics()
-        .iter()
-        .filter(|d| d.kind == benilla_ui::script::diagnostics::DiagnosticKind::Load)
-        .count();
-    if failed > 0 {
-        if let Some(mut chat) = world.get_resource_mut::<crate::ui_chat::ChatLog>() {
-            // Queued: the chat feed drains `ChatLog` once the UI is up.
-            chat.push_event(crate::ui_chat::ChatEvent::text_only(
-                crate::ui_chat::ChatEventKind::System,
-                format!(
-                    "{failed} addon load {} — type /errors to see {}.",
-                    if failed == 1 { "failure" } else { "failures" },
-                    if failed == 1 { "it" } else { "them" }
-                ),
-            ));
-        }
-    }
+    // The load's record goes to `Logs\FrameXML.log` (`0x490187`-`0x4901b6`), after any
+    // `LoadAddOn` block the load ran; nothing reaches chat.
+    script.finish_ui_load_log();
+    super::load_log::write(script.take_load_log_writes());
     // `DAMAGE_TEXT_FONT` binds at the end of the load, after every addon's `ADDON_LOADED` (where
     // MikScrollingBattleText and pfUI assign it). The reference reads it eagerly, once per world
     // entry (`0x6c8470`, called at `0x401620` in `0x401570`, after the UI load at `0x401602`),
@@ -549,8 +555,7 @@ pub(crate) fn shutdown_ui_state(
 /// shutdown tail, then end this session's Lua state, so no frame, global or addon upvalue reaches
 /// the next login. The reference's state outlives `0x490bd0` and is replaced twice through
 /// `0x703b80`, in `ShutdownGame` (at `0x491231`) and then in the glue build (`0x46a7b0`), so the
-/// character screen runs on a state of its own. Ours is a fresh boot VM, which also carries the
-/// font registry the shared glyph atlas needs.
+/// character screen runs on a state of its own. Ours is a fresh boot VM.
 pub(crate) fn end_ui_session(world: &mut World) {
     // A VM still parked (the load never ran) goes back into the world first.
     unpark_boot_vm(world);
@@ -670,7 +675,8 @@ pub(crate) fn finish_ui_load(script: &mut UiScript) {
 }
 
 /// [`finish_ui_load`] with its two host seams. `host_settings` runs between the saved-variables
-/// chunk and `VARIABLES_LOADED`, pushing the settings benilla keeps in `config.toml`. `between`
+/// chunk and `VARIABLES_LOADED`, carrying over a setting `config.toml` held before it moved into
+/// the saved variables. `between`
 /// is the chat-cache restore's `UPDATE_CHAT_WINDOWS` + `UPDATE_CHAT_COLOR` burst, after
 /// `VARIABLES_LOADED` and before `PLAYER_LOGIN`, where the reference registers its reader
 /// (`0x4900d6` → `0x498a20`). On a fresh login the reference's cache (`0x5afe50`) defers that
@@ -807,6 +813,35 @@ mod tests {
         assert!(world.get_non_send_resource::<ParkedBootVm>().is_none());
     }
 
+    /// The plate bits clear at the world entry (`0x401639`, in the entry setup `0x401570`) and
+    /// not at a `ReloadUI()`, which never runs that setup. A capture world, so no UI is built.
+    #[test]
+    fn the_world_entry_clears_the_plate_bits_and_a_reload_does_not() {
+        use crate::vplates::VPlateMode;
+        let on = VPlateMode {
+            enemies: true,
+            friends: true,
+        };
+        let world_with = |on: VPlateMode| {
+            let mut world = World::new();
+            world.insert_resource(State::new(crate::char_select::ClientState::InWorld));
+            world.insert_resource(crate::run_mode::CaptureMode);
+            world.insert_resource(on);
+            world
+        };
+
+        let mut world = world_with(on);
+        world.insert_resource(PendingEntryUiLoad);
+        run_pending_entry_load(&mut world);
+        assert_eq!(*world.resource::<VPlateMode>(), VPlateMode::default());
+
+        let mut world = world_with(on);
+        world.insert_resource(ReloadUiPending(true));
+        run_pending_reload(&mut world);
+        assert!(!world.resource::<ReloadUiPending>().0, "the reload ran");
+        assert_eq!(*world.resource::<VPlateMode>(), on, "a reload keeps them");
+    }
+
     /// The reference re-makes its Lua state inside `UI_Init` (`0x48fe97`).
     #[test]
     fn the_world_entry_builds_its_own_vm_rather_than_adopting_the_glue_phases() {
diff --git a/crates/benilla-app/src/ui_script/load_log.rs b/crates/benilla-app/src/ui_script/load_log.rs
new file mode 100644
index 00000000..cab30361
--- /dev/null
+++ b/crates/benilla-app/src/ui_script/load_log.rs
@@ -0,0 +1,102 @@
+//! `Logs\FrameXML.log` (`0x842ecc`): the UI loads' records ([`benilla_ui::status`]), written a
+//! line at a time as the reference's log layer writes one (`0x65ac20`): the stamp
+//! `"%u/%u %02u:%02u:%02u.%03u  "` (`0x866aa0`), the text, then `"\r\n"` (`0x82edfc`). Deviation:
+//! the file is `benilla-config/Logs/FrameXML.log`, since the install is read-only.
+
+use std::io::Write as _;
+
+use bevy::prelude::*;
+
+use benilla_ui::status::LogWrite;
+
+/// The log's name, the reference's.
+const FILE: &str = "FrameXML.log";
+
+/// Write the VM's drains in the order they were made. A drain with no lines opens nothing, so a
+/// clean UI load leaves the last load's file in place, as the reference's lazy open does
+/// (`0x65a930`).
+pub(super) fn write(writes: Vec<LogWrite>) {
+    if writes.iter().all(|w| lines(w).is_empty()) {
+        return;
+    }
+    let Some(dir) = crate::local_state::logs_dir() else {
+        return; // hermetic capture, or no state folder
+    };
+    write_under(&dir, writes);
+}
+
+fn lines(write: &LogWrite) -> &[String] {
+    match write {
+        LogWrite::Rewrite(lines) | LogWrite::Append(lines) => lines,
+    }
+}
+
+/// [`write`] into `dir`.
+fn write_under(dir: &std::path::Path, writes: Vec<LogWrite>) {
+    let path = dir.join(FILE);
+    for w in writes {
+        let (append, lines) = match w {
+            LogWrite::Rewrite(lines) => (false, lines),
+            LogWrite::Append(lines) => (true, lines),
+        };
+        if lines.is_empty() {
+            continue;
+        }
+        let mut body = String::new();
+        for line in &lines {
+            body.push_str(&crate::ui_chat::logging::stamp());
+            body.push_str("  ");
+            body.push_str(line);
+            body.push_str("\r\n");
+        }
+        let written = std::fs::create_dir_all(dir).and_then(|()| {
+            let mut file = std::fs::OpenOptions::new()
+                .create(true)
+                .write(true)
+                .append(append)
+                .truncate(!append)
+                .open(&path)?;
+            file.write_all(body.as_bytes())
+        });
+        if let Err(e) = written {
+            warn!("ui_script: cannot write {}: {e}", path.display());
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn read(dir: &std::path::Path) -> Vec<String> {
+        std::fs::read_to_string(dir.join(FILE))
+            .unwrap()
+            .split("\r\n")
+            .filter(|l| !l.is_empty())
+            // `M/D HH:MM:SS.mmm` and two spaces.
+            .map(|l| l.splitn(3, ' ').nth(2).unwrap().trim_start().to_string())
+            .collect()
+    }
+
+    /// A UI load's drain replaces the file, a `LoadAddOn` drain appends, and an empty UI drain
+    /// leaves the last file standing.
+    #[test]
+    fn a_load_rewrites_a_load_addon_appends_and_a_clean_load_touches_nothing() {
+        let dir = std::env::temp_dir().join(format!("benilla-framexml-log-{}", std::process::id()));
+        std::fs::remove_dir_all(&dir).ok();
+        write_under(&dir, vec![LogWrite::Rewrite(vec!["first load".into()])]);
+        write_under(&dir, vec![LogWrite::Rewrite(vec!["second load".into()])]);
+        write_under(&dir, vec![LogWrite::Append(vec!["on demand".into()])]);
+        assert_eq!(read(&dir), ["second load", "on demand"]);
+        write_under(&dir, vec![LogWrite::Rewrite(vec![])]);
+        assert_eq!(read(&dir), ["second load", "on demand"]);
+        let raw = std::fs::read_to_string(dir.join(FILE)).unwrap();
+        let first = raw.split("\r\n").next().unwrap();
+        let (stamp, text) = first.split_at(first.find("  ").unwrap());
+        assert_eq!(text, "  second load");
+        let (date, time) = stamp.split_once(' ').unwrap();
+        assert!(date.split('/').all(|p| p.parse::<u32>().is_ok()), "{date}");
+        assert_eq!(time.len(), "HH:MM:SS.mmm".len(), "{time}");
+        std::fs::remove_dir_all(&dir).ok();
+    }
+}
diff --git a/crates/benilla-app/src/ui_script/loot_tests.rs b/crates/benilla-app/src/ui_script/loot_tests.rs
index 3eea03dc..0283751d 100644
--- a/crates/benilla-app/src/ui_script/loot_tests.rs
+++ b/crates/benilla-app/src/ui_script/loot_tests.rs
@@ -42,6 +42,7 @@ fn text_color(quads: &[ExtractedQuad], t: &str) -> Option<[f32; 4]> {
 
 fn coin_and_two_items() -> LootState {
     LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![
@@ -260,10 +261,12 @@ fn loot_empty_roll_plays_the_empty_open_kit() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     s.set_loot(Some(coin_and_two_items()));
     s.fire_event("LOOT_OPENED", vec![]);
@@ -277,6 +280,7 @@ fn loot_empty_roll_plays_the_empty_open_kit() {
     assert!(s.take_sounds().is_empty(), "loot close is silent (C-side)");
 
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![],
@@ -297,10 +301,12 @@ fn fishing_loot_open_plays_the_reel_and_swaps_the_portrait() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
     let has_icon = |quads: &[ExtractedQuad], needle: &str| {
         quads.iter().any(|q| {
             matches!(&q.content, QuadContent::Texture { path: Some(p), .. } if p.contains(needle))
@@ -347,10 +353,12 @@ fn shipped_loot_frame_pages_five_items() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     let rows: Vec<Option<LootRow>> = (0..5)
         .map(|i| {
@@ -367,6 +375,7 @@ fn shipped_loot_frame_pages_five_items() {
         })
         .collect();
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: rows.clone(),
@@ -407,6 +416,7 @@ fn shipped_loot_frame_pages_five_items() {
     cleared[1] = None;
     cleared[2] = None;
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: cleared,
@@ -435,13 +445,17 @@ fn shipped_loot_pushed_to_center_by_merchant() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "Interface\\FrameXML\\LootFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     s.set_loot(Some(coin_and_two_items()));
     s.fire_event("LOOT_OPENED", vec![]);
@@ -498,10 +512,12 @@ fn the_loot_window_draws_over_the_party_frames() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     // The party frame first: showing the window later is not what lifts it.
     s.eval::<()>("PartyMemberFrame1:Show()").unwrap();
@@ -544,27 +560,28 @@ fn ctrl_and_shift_on_a_loot_row_preview_and_post_without_looting() {
     const WOOL_LINK: &str = "|cffffffff|Hitem:2589:0:0:0|h[Wool Cloth]|h|r";
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml", // UIParent and UIParent.lua
+            "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\UIPanelTemplates.lua",
+            "Interface\\FrameXML\\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\ChatFrame.xml",
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            "Interface\\FrameXML\\LootFrame.xml",
+            "Interface\\FrameXML\\DressUpFrame.xml",
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    for file in [
-        r"Interface\FrameXML\UIParent.xml", // UIParent and UIParent.lua
-        "Interface\\FrameXML\\LootFrame.xml",
-        "Interface\\FrameXML\\DressUpFrame.xml",
-        "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UIPanelTemplates.lua",
-        "Interface\\FrameXML\\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\FloatingChatFrame.xml",
-    ] {
-        load_xml(&s, file);
-    }
 
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![
@@ -678,10 +695,12 @@ fn shipped_loot_frame_hands_a_master_row_to_a_candidate() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     let row = |name: &str, quality: u32| {
         Some(LootRow {
@@ -696,6 +715,7 @@ fn shipped_loot_frame_hands_a_master_row_to_a_candidate() {
         })
     };
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: vec![Some("Thrall".into()), Some("Cairne".into())],
         rows: vec![row("Wool Cloth", 2), row("Thunderfury", 4)],
@@ -814,10 +834,12 @@ fn the_master_loot_menu_groups_raid_candidates_by_subgroup() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     // A raid: `GetNumRaidMembers() > 0` is the nested arm's whole gate (LootFrame.lua:189).
     s.set_party(PartyState {
@@ -834,6 +856,7 @@ fn the_master_loot_menu_groups_raid_candidates_by_subgroup() {
     candidates[1] = Some("Cairne".to_string());
     candidates[10] = Some("Sylvanas".to_string());
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: candidates,
         rows: vec![Some(LootRow {
@@ -891,10 +914,12 @@ fn the_loot_bind_confirm_raises_the_dialog_and_okay_calls_loot_slot() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
     s.set_loot(Some(coin_and_two_items()));
     s.fire_event("LOOT_OPENED", vec![]);
     let _ = s.take_loot_picks();
@@ -976,10 +1001,12 @@ fn a_row_click_takes_rather_than_continues() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
     s.set_loot(Some(coin_and_two_items()));
     s.fire_event("LOOT_OPENED", vec![]);
     let quads = s.extract();
@@ -1002,13 +1029,16 @@ fn loot_row_awaiting_its_template_opens_clean() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
 
     // One row in flight: the wire gives the icon (by display id) and the count, nothing else.
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
@@ -1069,6 +1099,7 @@ fn loot_row_awaiting_its_template_opens_clean() {
     // (`0x4c2ac0`) fires `LOOT_OPENED` as the pending count falls to zero.
     s.fire_event("LOOT_CLOSED", vec![]);
     s.set_loot(Some(LootState {
+        source_unit: false,
         fishing: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
@@ -1101,10 +1132,12 @@ fn stock_loot_rows_wear_the_item_button_art_and_light_under_the_cursor() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::LOOT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::LOOT_UI,
+        &["Interface\\FrameXML\\LootFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\LootFrame.xml");
     s.set_loot(Some(coin_and_two_items()));
     s.fire_event("LOOT_OPENED", vec![]);
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
diff --git a/crates/benilla-app/src/ui_script/macro_tests.rs b/crates/benilla-app/src/ui_script/macro_tests.rs
index 16973dea..61a2b078 100644
--- a/crates/benilla-app/src/ui_script/macro_tests.rs
+++ b/crates/benilla-app/src/ui_script/macro_tests.rs
@@ -64,20 +64,19 @@ fn harness_with(player: &str) -> UiScript {
         r"Interface\FrameXML\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml", // `TEXT`
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
         // `PanelTemplates_SelectTab` reads `GameTooltip` unguarded (`UIPanelTemplates.lua:130`).
         "Interface\\FrameXML\\GameTooltip.xml",
-        // ScrollTemplates before UIPanelTemplates, the manifest's order.
-        "ScrollTemplates.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml", // the window's OnShow/OnHide call it
         // `ClassTrainerListScrollFrameTemplate`, which the icon chooser's scroll frame inherits.
         r"Interface\FrameXML\ClassTrainerFrameTemplates.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml", // the window's OnShow/OnHide call it
+        "ScrollTemplates.xml",
     ] {
         super::test_ui::load_ui(&s, file);
     }
@@ -293,11 +292,6 @@ fn dragging_a_macro_button_loads_the_cursor_with_the_macro_payload() {
         matches!(&payload, Some(CursorPayload::Macro(m)) if m.index == 1),
         "the macro payload, carrying its index: {payload:?}"
     );
-    assert_eq!(
-        s.eval::<(String, i64)>("local k, i = GetCursorInfo() return k, i")
-            .unwrap(),
-        ("macro".to_string(), 1)
-    );
 
     // A bar slot packs the MACRO tag (0x40 << 24) with the macro index.
     let mut s = s;
diff --git a/crates/benilla-app/src/ui_script/manifest.rs b/crates/benilla-app/src/ui_script/manifest.rs
index e0d01c42..269d5f59 100644
--- a/crates/benilla-app/src/ui_script/manifest.rs
+++ b/crates/benilla-app/src/ui_script/manifest.rs
@@ -1,6 +1,7 @@
-//! The in-game interface: its manifest, [`MANIFEST`], and the boot split that loads it in two
-//! phases. An entry with a path is the reference's own file off the player's patch chain, a bare
-//! filename is one we ship, and the manifest's order is the load order across both.
+//! The in-game interface: the core, the player's own stock FrameXML as their chain's
+//! `FrameXML.toc` lists it ([`reference_ui::core`]) and then its `Bindings.xml`
+//! ([`load_core_bindings`]), then benilla's layer, [`LAYER_MANIFEST`], every entry of which is
+//! ours and loads after the whole core.
 
 use bevy::prelude::*;
 
@@ -9,16 +10,34 @@ use benilla_ui::script::UiScript;
 use super::addons::Addon;
 use super::reference_ui;
 
-/// The built-in interface's manifest, relative to `assets/ui`.
-pub(super) const MANIFEST: &str = "benilla.toc";
+/// benilla's own interface, one layer on the stock one, relative to `assets/ui`.
+pub(super) const LAYER_MANIFEST: &str = "layer.toc";
 
-/// The manifest's entries in load order, from both stores.
-#[cfg(test)]
-pub(super) fn manifest_files() -> Vec<String> {
-    Addon::builtin().toc.files
+/// Whether this run loads the layer: always in a player build; a dev build boots the stock UI
+/// alone under `WOW_STOCK_UI=1`.
+pub(super) fn layer_enabled() -> bool {
+    layer_enabled_by(
+        crate::run_mode::dev_affordances(),
+        std::env::var("WOW_STOCK_UI").ok().as_deref(),
+    )
 }
 
-/// The manifest's entries that name a file we ship rather than one off the player's install.
+/// [`layer_enabled`] over its two facts: a dev build, and the switch's value.
+pub(super) fn layer_enabled_by(dev_build: bool, stock_ui: Option<&str>) -> bool {
+    !(dev_build && stock_ui == Some("1"))
+}
+
+/// Every entry in load order: the core's rows, none without an install, then the layer's.
+#[cfg(test)]
+pub(super) fn manifest_files() -> Vec<String> {
+    let mut files = reference_ui::core()
+        .map(|core| core.toc.files)
+        .unwrap_or_default();
+    files.extend(Addon::layer().toc.files);
+    files
+}
+
+/// The entries that name a file we ship rather than one off the player's install: the layer's.
 #[cfg(test)]
 pub(super) fn shipped_manifest_files() -> Vec<String> {
     manifest_files()
@@ -27,48 +46,19 @@ pub(super) fn shipped_manifest_files() -> Vec<String> {
         .collect()
 }
 
-/// Runs `UIParent_ManageFramePositions` after the manifest has loaded, then installs the load-time
-/// repairs below. Never after `Fonts.xml` alone: `UIParent.lua` defines the pass.
+/// Runs `UIParent_ManageFramePositions` after the interface has loaded, then the buff pass below.
 fn bootstrap_positions(script: &UiScript) -> Vec<String> {
     if let Err(e) = script.run("UIParent_ManageFramePositions()") {
         error!("ui_script: managed-positions bootstrap: {e}");
         return vec![format!("managed-positions bootstrap: {e}")];
     }
-    if let Err(e) = install_durability_reseat(script) {
-        error!("ui_script: durability re-seat hook: {e}");
-        return vec![format!("durability re-seat hook: {e}")];
-    }
     if let Err(e) = apply_buff_durations(script) {
         error!("ui_script: buff-duration layout: {e}");
         return vec![format!("buff-duration layout: {e}")];
     }
-    if let Err(e) = install_chat_plate_guard(script) {
-        error!("ui_script: chat plate guard: {e}");
-        return vec![format!("chat plate guard: {e}")];
-    }
     Vec::new()
 }
 
-/// Deviation: the stock `FCF_ChatTabFadeFinished` (`FloatingChatFrame.lua:989-992`) nils `oldAlpha`
-/// even under a live hover, so leaving and re-entering within `CHAT_FRAME_FADE_TIME` (a flick to
-/// the scroll buttons, outside the hover box, does it) stops the plate fading in (l.873) for the
-/// rest of the session; this keeps `oldAlpha` while `hover` is set. Redefined, not wrapped, so a
-/// `ReloadUI` re-run cannot stack.
-pub(super) fn install_chat_plate_guard(script: &UiScript) -> Result<(), String> {
-    script.run(CHAT_PLATE_GUARD).map_err(|e| e.to_string())
-}
-
-const CHAT_PLATE_GUARD: &str = r#"
-if FCF_ChatTabFadeFinished then
-    function FCF_ChatTabFadeFinished(chatTab, chatFrame)
-        chatTab:Hide()
-        if not chatFrame.hover then
-            chatFrame.oldAlpha = nil
-        end
-    end
-end
-"#;
-
 /// Runs `BuffButtons_UpdatePositions` at load, which `BuffFrame_OnLoad` never calls: until the
 /// stock `UIOptionsFrame.lua`'s `VARIABLES_LOADED` arm runs it (l.206), the second buff row and
 /// the debuff row keep `BuffFrame.xml`'s anchors whatever `SHOW_BUFF_DURATIONS` says.
@@ -83,7 +73,8 @@ pub(super) fn apply_buff_durations(script: &UiScript) -> Result<(), String> {
 /// bags, whose columns `updateContainerFrameAnchors` lays out by `GetScreenHeight()`.
 /// Deviation: [`FULLSCREEN_QUADS_RESEAT`] re-sizes the full-screen quads, which the stock files
 /// size only in their OnLoads, because a resize or `uiScale` change here keeps the loaded UI and
-/// the blackout would stop short of the new screen.
+/// the blackout would stop short of the new screen. Host-side, not in the layer: it adapts the
+/// engine's resizable window, and changes nothing the stock UI does at a fixed size.
 pub(super) fn on_screen_resized(script: &UiScript) {
     let _ = script.run("if UIParent_ManageFramePositions then UIParent_ManageFramePositions() end");
     if let Err(e) = script.run(FULLSCREEN_QUADS_RESEAT) {
@@ -125,26 +116,6 @@ if UpperBlackBar and LowerBlackBar then
 end
 "#;
 
-/// Deviation: re-runs `UIParent_ManageFramePositions` after `DurabilityFrame`'s own OnEvent. The
-/// pass seats the frame 20 further in while a side glyph shows (`UIParent.lua:1759-1768`), but the
-/// stock frame runs it only from OnShow/OnHide, so a glyph appearing while the frame is shown
-/// leaves the shield's overhang off the screen edge. Latched, so a `ReloadUI` cannot stack it; the
-/// stock handler runs first, unchanged, on the `this`/`event`/`arg1` already set for the dispatch.
-pub(super) fn install_durability_reseat(script: &UiScript) -> Result<(), String> {
-    script.run(DURABILITY_RESEAT).map_err(|e| e.to_string())
-}
-
-const DURABILITY_RESEAT: &str = r#"
-if DurabilityFrame and not DurabilityFrame.benillaReseat then
-    DurabilityFrame.benillaReseat = 1
-    local refOnEvent = DurabilityFrame:GetScript("OnEvent")
-    DurabilityFrame:SetScript("OnEvent", function()
-        if refOnEvent then refOnEvent() end
-        UIParent_ManageFramePositions()
-    end)
-end
-"#;
-
 /// Runs a UI load in the counted sound-suppression scope, as `CGGameUI::Initialize` (`0x48fbf0`,
 /// called at login `0x48f681` and `/reloadui` `0x495669`) runs its own: enter (`0x458f50`) at
 /// `0x48fbfa`, leave (`0x458f60`) at `0x49016d`, and `PlaySoundByName` (`0x458030`) drops every
@@ -161,17 +132,19 @@ pub(super) fn silenced_ui_load<S: std::borrow::Borrow<UiScript>, R>(
     out
 }
 
-/// Loads every [`MANIFEST`] entry at once, then the load-time repairs. Production splits this
-/// load at boot ([`load_font_registry`], [`load_ingame_ui`]), so the callers are the tests and
-/// [`crate::addon_harness`]. Returns every failure; a loader error is tagged
-/// `"<Addon>/<file>: <error>"`.
+/// Loads the core, then the layer unless [`layer_enabled`] says no, then the load-time repairs:
+/// [`load_ingame_ui`] without the addons, for the tests and [`crate::addon_harness`]. Returns every
+/// failure; a loader error is tagged `"<Addon>/<file>: <error>"`.
 pub(crate) fn load_default_ui(script: &UiScript) -> Vec<String> {
     // The client's CVar table first: the stock `UIOptionsFrame.xml` reads CVars in its OnLoads,
     // and a bare `UiScript::new()` has only `benilla-ui`'s own. A re-register only refreshes
     // defaults.
     script.register_cvars(crate::cvars::registered_pairs());
     let mut failures = silenced_ui_load(&mut &*script, |script| {
-        let mut failures = load_manifest(script, &Addon::builtin().toc.files);
+        let mut failures = load_core(script);
+        if layer_enabled() {
+            failures.extend(load_layer(script));
+        }
         failures.extend(bootstrap_positions(script));
         failures
     });
@@ -186,43 +159,119 @@ pub(crate) fn load_default_ui(script: &UiScript) -> Vec<String> {
     failures
 }
 
-/// Loads a slice of [`MANIFEST`] entries, each from its own store and one at a time, so the
-/// manifest's order is the load order across both.
-fn load_manifest(script: &UiScript, files: &[String]) -> Vec<String> {
-    let builtin = Addon::builtin();
-    let reference = reference_ui::addon(
-        files
-            .iter()
-            .filter(|f| reference_ui::is_chain_entry(f))
-            .cloned()
-            .collect(),
-    );
-    let mut failures = Vec::new();
-    for file in files {
-        let from = if reference_ui::is_chain_entry(file) {
-            &reference
-        } else {
-            &builtin
-        };
-        failures.extend(from.load_files(script, std::slice::from_ref(file)));
-    }
+/// The core: every row of the chain's `FrameXML.toc`, in its order, each file in document order,
+/// then the chain's `Bindings.xml`. A chain without the toc builds no stock interface: the runner
+/// reports `"Couldn't open %s"` (`0x846ff4`) at severity 2 (`0x6edc3f`) and returns 0, which
+/// `UI_Init` never reads (`0x48fff2`), going on to `Bindings.xml` and the addons. benilla goes on
+/// the same way and reports it as a load failure, an `ERROR` line and a row in `/errors`.
+pub(super) fn load_core(script: &UiScript) -> Vec<String> {
+    let Some(core) = reference_ui::core() else {
+        let e = format!(
+            "{}: not found — the stock interface is not built",
+            reference_ui::TOC
+        );
+        error!("ui_script: {e}");
+        script.report_load_failure(&e);
+        // Into the UI load's own record, before any banner (`0x6edc3f`).
+        let mut log = benilla_ui::status::Status::default();
+        log.report(
+            benilla_ui::status::FAILURE,
+            benilla_ui::status::missing(reference_ui::TOC, false),
+        );
+        script.report_load_status(log);
+        let mut failures = vec![e];
+        failures.extend(load_core_bindings(script));
+        return failures;
+    };
+    let mut toc = benilla_ui::status::Status::default();
+    let mut failures = core.load_files_into(script, &core.toc.files, &mut toc);
+    let mut log = benilla_ui::status::Status::default();
+    let banner = benilla_ui::status::toc_banner(reference_ui::TOC);
+    toc.close_into(&mut log, script.framexml_debug(), banner);
+    script.report_load_status(log);
+    failures.extend(load_core_bindings(script));
     failures
 }
 
-/// The font-object registry alone, `Fonts.xml`, loaded at `Startup`.
-/// Deviation: it loads before the login screen because benilla's glue screens share its glyph
-/// atlas; the reference's glue has its own `GlueFonts.xml`. The font objects declared outside it
-/// (FRIZQT 13, 14 and 20, un-outlined) repeat combinations it has, so the atlas plan loses nothing.
-pub(crate) fn load_font_registry(script: &UiScript) -> Vec<String> {
-    load_manifest(
-        script,
-        Addon::builtin().toc.files.get(..1).unwrap_or_default(),
-    )
+/// The stock key-binding commands, `UI_Init`'s next step after the toc walk: the chain's
+/// `Interface\FrameXML\Bindings.xml` (`0x842f9c`), when the chain has it (`0x48fff9`), through
+/// the loader addons' files go through (`0x4b6f70`, called at `0x490018` here and `0x51f443` for
+/// an addon). Every command benilla has is a row of this file, its body the file's own Lua.
+pub(super) fn load_core_bindings(script: &UiScript) -> Vec<String> {
+    let Some(bytes) = reference_ui::read(reference_ui::BINDINGS) else {
+        warn!(
+            "ui_script: {} is not in the patch chain — no key binding has a command",
+            reference_ui::BINDINGS
+        );
+        return Vec::new();
+    };
+    match benilla_ui::bindings_xml::parse(&benilla_ui::source::decode(&bytes)) {
+        Ok(bindings) => {
+            script.register_bindings(&bindings);
+            info!(
+                "bindings: {} commands registered from {}",
+                bindings.len(),
+                reference_ui::BINDINGS
+            );
+            Vec::new()
+        }
+        // `"Couldn't parse XML in %s"` (`0x846fd8`) at severity 2 (`0x4b700c`).
+        Err(e) => {
+            let e = format!("{}: {e}", reference_ui::BINDINGS);
+            error!("ui_script: {e}");
+            script.report_load_failure(&e);
+            vec![e]
+        }
+    }
 }
 
-/// The in-game UI, every entry after `Fonts.xml`, then every third-party addon, on entering the
-/// world. The reference loads both in `CGGameUI::Initialize` (`0x48fbf0`), reached only from world
-/// entry (`0x401570` from `0x46c236`), its addons at `0x4900a3` (`0x51f600`).
+/// The defaults, set 0, off the player's chain: `WTF\DefaultBindings.wtf` (`0x846e44`), which
+/// `0x4b62b0` reads line by line (`0x4b6140`); empty when the chain lacks it.
+pub(crate) fn default_bindings() -> Vec<benilla_ui::script::keybind::KeyBinding> {
+    match reference_ui::read(reference_ui::DEFAULT_BINDINGS) {
+        Some(bytes) => {
+            benilla_ui::script::keybind::parse_bindings_wtf(&String::from_utf8_lossy(&bytes))
+        }
+        None => {
+            warn!(
+                "ui_script: {} is not in the patch chain — every command ships unbound",
+                reference_ui::DEFAULT_BINDINGS
+            );
+            Vec::new()
+        }
+    }
+}
+
+/// The chain's `Bindings.xml` text, for the tests that hold benilla against it.
+#[cfg(test)]
+pub(crate) fn stock_bindings_file() -> Option<String> {
+    reference_ui::read(reference_ui::BINDINGS)
+        .map(|bytes| benilla_ui::source::decode(&bytes).into_owned())
+}
+
+/// The stock bindings on a VM a test built by hand: the defaults loaded live, as a first login's
+/// account set is, and the core's commands.
+#[cfg(test)]
+pub(crate) fn load_stock_bindings(script: &mut UiScript) {
+    script.set_default_bindings(default_bindings());
+    script.load_binding_set(1);
+    assert!(
+        load_core_bindings(script).is_empty(),
+        "the stock Bindings.xml loads"
+    );
+}
+
+/// Every [`LAYER_MANIFEST`] entry, in order, after the whole core: the layer loads as more of the
+/// stock load, with no `ADDON_LOADED` and no registry row, as FrameXML does (`0x48ffed`).
+fn load_layer(script: &UiScript) -> Vec<String> {
+    let layer = Addon::layer();
+    layer.load_files(script, &layer.toc.files)
+}
+
+/// The in-game UI, the core, then the layer unless [`layer_enabled`] says no, then every
+/// third-party addon, on entering the world. The reference loads both in `CGGameUI::Initialize`
+/// (`0x48fbf0`), reached only from world entry (`0x401570` from `0x46c236`): `FrameXML.toc` at
+/// `0x48ffed`, its addons at `0x4900a3` (`0x51f600`).
 ///
 /// `identity`, `(realm, character)`, names the character's AddOn enable-state file, as the
 /// reference keys `AddOns.txt` per character; `roster`, the realm's characters, decides an addon
@@ -233,14 +282,25 @@ pub(crate) fn load_ingame_ui(
     identity: Option<&(String, String)>,
     roster: &[String],
     version_check: bool,
+) -> Vec<String> {
+    load_ingame_ui_with(script, identity, roster, version_check, layer_enabled())
+}
+
+/// [`load_ingame_ui`] with the layer decided by the caller.
+pub(super) fn load_ingame_ui_with(
+    script: &mut UiScript,
+    identity: Option<&(String, String)>,
+    roster: &[String],
+    version_check: bool,
+    layer: bool,
 ) -> Vec<String> {
     // Bounded, addons included: a chunk that never returns fails as a load error instead of
     // freezing the loading screen. The caller disarms the budget once the edge is done.
     script.set_instruction_budget(super::addons::LOAD_INSTRUCTION_BUDGET);
-    let mut failures = load_manifest(
-        script,
-        Addon::builtin().toc.files.get(1..).unwrap_or_default(),
-    );
+    let mut failures = load_core(script);
+    if layer {
+        failures.extend(load_layer(script));
+    }
     failures.extend(bootstrap_positions(script));
     // Each addon's `ADDON_LOADED` fires as that addon finishes, as the reference does (`0x51f5ad`).
     failures.extend(super::addons::load_third_party(
@@ -255,22 +315,174 @@ pub(crate) fn load_ingame_ui(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::ui_script::reference_ui::fixture;
 
-    /// `Fonts.xml` must stay entry 0: [`load_font_registry`] loads entry 0 at startup and
-    /// [`load_ingame_ui`] the rest.
+    /// A chain whose `FrameXML.toc` lists `rows`, each a `.lua` that appends its own letter to
+    /// `LOAD_LOG`, and one `.xml` whose `<Script file=>` does the same.
+    fn lay_letters(toc: &str) -> fixture::Guard {
+        const B: &[u8] = b"LOAD_LOG = (LOAD_LOG or '') .. 'b'";
+        const A: &[u8] = b"LOAD_LOG = (LOAD_LOG or '') .. 'a'";
+        const X: &[u8] = br#"<Ui><Script file="x.lua"/></Ui>"#;
+        const XL: &[u8] = b"LOAD_LOG = (LOAD_LOG or '') .. 'x'";
+        fixture::lay(&[
+            (reference_ui::TOC, Some(toc.as_bytes())),
+            (r"Interface\FrameXML\b.lua", Some(B)),
+            (r"Interface\FrameXML\a.lua", Some(A)),
+            (r"Interface\FrameXML\x.xml", Some(X)),
+            (r"Interface\FrameXML\x.lua", Some(XL)),
+        ])
+    }
+
+    /// The core's load list is the chain's `FrameXML.toc`: every file line, in its order, under the
+    /// toc's own directory; directives, comments and blank lines load nothing.
     #[test]
-    fn the_manifest_is_a_toc_that_starts_with_the_font_registry() {
-        let toc = Addon::builtin().toc;
-        assert_eq!(toc.interface_versions(), vec![11200]);
-        assert_eq!(toc.directive("Title"), Some("benilla"));
+    fn the_cores_load_list_is_the_chain_tocs_rows_in_order() {
+        let _chain =
+            lay_letters("## Interface: 11200\r\n# a comment\r\nb.lua\r\n\r\nx.xml\r\na.lua\r\n");
+        let core = reference_ui::core().expect("the laid toc");
         assert_eq!(
-            toc.files.first().map(String::as_str),
-            Some("Interface\\FrameXML\\Fonts.xml"),
-            "the font registry is the manifest's first entry — the loader splits there"
+            core.toc.files,
+            [
+                r"Interface\FrameXML\b.lua",
+                r"Interface\FrameXML\x.xml",
+                r"Interface\FrameXML\a.lua"
+            ]
         );
     }
 
-    /// A shipped `.xml` the manifest does not list never loads, with no error to say so.
+    /// The load follows the toc: the same files under a reordered toc load in the new order, each
+    /// `.xml` running its own `<Script file=>` in place.
+    #[test]
+    fn a_reordered_toc_reorders_the_load() {
+        for (toc, want) in [
+            ("b.lua\nx.xml\na.lua\n", "bxa"),
+            ("a.lua\nb.lua\nx.xml\n", "abx"),
+        ] {
+            let _chain = lay_letters(toc);
+            let s = UiScript::new().unwrap();
+            let failures = load_core(&s);
+            assert!(failures.is_empty(), "{toc:?}: {failures:#?}");
+            assert_eq!(
+                s.eval::<String>("return LOAD_LOG").unwrap(),
+                want,
+                "{toc:?}"
+            );
+        }
+    }
+
+    /// A chain without `FrameXML.toc` builds no stock interface and says so, once, as a load
+    /// failure: the reference's runner reports `"Couldn't open %s"` at severity 2 (`0x6edc3f`).
+    #[test]
+    fn a_chain_without_the_toc_builds_no_core_and_says_so() {
+        let _chain = fixture::lay(&[(reference_ui::TOC, None)]);
+        assert!(reference_ui::core().is_none());
+        let s = UiScript::new().unwrap();
+        let failures = load_core(&s);
+        assert_eq!(failures.len(), 1, "{failures:#?}");
+        assert!(
+            failures[0].contains(reference_ui::TOC) && failures[0].contains("not found"),
+            "{failures:?}"
+        );
+        assert!(
+            s.diagnostics().iter().any(|d| {
+                d.kind == benilla_ui::script::diagnostics::DiagnosticKind::Load
+                    && d.message.contains(reference_ui::TOC)
+            }),
+            "the player's /errors carries it"
+        );
+    }
+
+    /// The core never reads our tree: a toc row that names one of the layer's files loads the
+    /// chain's file of that name or reports it missing, never ours.
+    #[test]
+    fn the_core_never_loads_a_file_of_ours() {
+        let ours = Addon::layer().toc.files;
+        let row = ours
+            .iter()
+            .find(|f| f.as_str() == "ScrollTemplates.xml")
+            .expect("the layer ships ScrollTemplates.xml");
+        let toc = format!("{row}\n");
+        let _chain = fixture::lay(&[
+            (reference_ui::TOC, Some(toc.as_bytes())),
+            (&format!(r"Interface\FrameXML\{row}"), None),
+        ]);
+        let s = UiScript::new().unwrap();
+        let failures = load_core(&s);
+        assert!(
+            failures.len() == 1 && failures[0].contains("not found"),
+            "{failures:#?}"
+        );
+        assert!(
+            !s.eval::<bool>("return BenillaScrollBar_Step ~= nil")
+                .unwrap(),
+            "the core loaded the layer's own ScrollTemplates.xml"
+        );
+    }
+
+    /// Against the player's own install: the core's load list is their `FrameXML.toc`'s file
+    /// lines, read here byte by byte, in order, and every one resolves off their chain.
+    #[test]
+    fn the_cores_load_list_is_the_players_own_toc() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let bytes = reference_ui::read(reference_ui::TOC).expect("the player's FrameXML.toc");
+        let text = String::from_utf8_lossy(&bytes);
+        let want: Vec<String> = text
+            .trim_start_matches('\u{feff}')
+            .split("\r\n")
+            .flat_map(|l| l.split('\n'))
+            .map(str::trim)
+            .filter(|l| !l.is_empty() && !l.starts_with('#'))
+            .map(|l| format!(r"Interface\FrameXML\{l}"))
+            .collect();
+        let core = reference_ui::core().expect("the player's FrameXML.toc");
+        assert_eq!(core.toc.files, want);
+        assert!(want.len() >= 90, "only {} rows parsed", want.len());
+        for row in &core.toc.files {
+            assert!(
+                reference_ui::read(row).is_some(),
+                "FrameXML.toc lists {row}, which the chain does not hold"
+            );
+        }
+    }
+
+    /// Order shows: the frames registered for one event run in registration order (`SignalEvent`,
+    /// `0x703e50`, walks its tail-appended list), so the toc's row order is their handlers' order.
+    /// `ExhaustionTick` (`MainMenuBar.lua:13`) and `PlayerFrame` (`PlayerFrame.lua:17`) both take
+    /// `PLAYER_UPDATE_RESTING`, and the toc lists `MainMenuBar.xml` above `PlayerFrame.xml`.
+    #[test]
+    fn two_stock_frames_on_one_event_run_in_the_tocs_order() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let _l = crate::local_state::test_env::ENV_LOCK
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        let toc = reference_ui::read(reference_ui::TOC).expect("the player's FrameXML.toc");
+        let toc = String::from_utf8_lossy(&toc);
+        let at = |leaf: &str| {
+            toc.lines()
+                .position(|l| l.trim() == leaf)
+                .unwrap_or_else(|| panic!("FrameXML.toc lists {leaf}"))
+        };
+        assert!(
+            at("MainMenuBar.xml") < at("PlayerFrame.xml"),
+            "the stock toc's order"
+        );
+        let (mut s, failures) =
+            super::super::layer_tests::production_load_with("event-order", false, "", |_| {});
+        assert!(failures.is_empty(), "load failures: {failures:#?}");
+        s.run(
+            r#"EVENT_ORDER = {}
+            for _, name in ipairs({ "PlayerFrame", "ExhaustionTick" }) do
+                local who = name
+                getglobal(who):SetScript("OnEvent", function() table.insert(EVENT_ORDER, who) end)
+            end"#,
+        )
+        .unwrap();
+        s.fire_event("PLAYER_UPDATE_RESTING", vec![]);
+        let order: Vec<String> = s.eval("return EVENT_ORDER").unwrap();
+        assert_eq!(order, ["ExhaustionTick", "PlayerFrame"]);
+    }
+
+    /// A shipped `.xml` the layer does not list never loads, with no error to say so.
     #[test]
     fn the_manifest_lists_every_shipped_file_and_nothing_else() {
         let mut listed = shipped_manifest_files();
@@ -295,109 +507,116 @@ mod tests {
         }
     }
 
-    /// Every chain entry the manifest names is in the player's 1.12 patch chain.
+    /// A patched chain's `Bindings.xml`, rows reordered, a body edited, and the loader's skips.
+    const PATCHED_BINDINGS: &[u8] = br#"<Bindings>
+    <Binding name="TOGGLEBACKPACK" header="INTERFACE">Probe("bag")</Binding>
+    <Binding name="JUMP" header="MOVEMENT">Probe("edited jump")</Binding>
+    <Binding name="TOGGLESTATS" hidden="true" debug="true">Probe("debug")</Binding>
+    <Binding name="EMPTYROW"></Binding>
+    <Bindings><Binding name="NESTEDROW">Probe("nested")</Binding></Bindings>
+    <Binding name="ITUNES_PLAYPAUSE" header="ITUNES_REMOTE" platform="mac">Probe("mac")</Binding>
+</Bindings>"#;
+
+    /// The core's commands are the chain's `Bindings.xml`, loaded after the toc's files (which
+    /// see none) as `UI_Init` does (`0x48ffed`, then `0x490018`): its order, its headers and its
+    /// bodies are what registers and runs, the defaults are the chain's `DefaultBindings.wtf`, and
+    /// a debug, an empty, a nested and a Mac row are no commands.
     #[test]
-    fn every_chain_entry_resolves_off_the_players_install() {
-        let _data = benilla_formats::wow_data_or_skip!();
-        let chain: Vec<String> = manifest_files()
-            .into_iter()
-            .filter(|f| reference_ui::is_chain_entry(f))
-            .collect();
-        for entry in &chain {
+    fn the_cores_commands_are_the_chain_bindings_xml() {
+        const TOC_LUA: &[u8] =
+            b"TOC_SAW = GetNumBindings() function Probe(n) PROBED = (PROBED or '') .. n end";
+        let _chain = fixture::lay(&[
+            (reference_ui::TOC, Some(b"a.lua\r\n")),
+            (r"Interface\FrameXML\a.lua", Some(TOC_LUA)),
+            (reference_ui::BINDINGS, Some(PATCHED_BINDINGS)),
+            (
+                reference_ui::DEFAULT_BINDINGS,
+                Some(b"bind J JUMP\r\nbind B TOGGLEBACKPACK\r\nbind CTRL-Y TOGGLESTATS\r\n"),
+            ),
+        ]);
+        let mut s = UiScript::new().unwrap();
+        s.set_default_bindings(default_bindings());
+        s.load_binding_set(1);
+        let failures = load_core(&s);
+        assert!(failures.is_empty(), "{failures:#?}");
+        assert_eq!(s.eval::<i64>("return TOC_SAW").unwrap(), 0);
+        let rows: Vec<Vec<String>> = s
+            .eval(
+                "local out = {} \
+                 for i = 1, GetNumBindings() do out[i] = { GetBinding(i) } end \
+                 return out",
+            )
+            .unwrap();
+        let row = |v: &[&str]| v.iter().map(|x| x.to_string()).collect::<Vec<_>>();
+        assert_eq!(
+            rows,
+            [
+                row(&["HEADER_INTERFACE"]),
+                row(&["TOGGLEBACKPACK", "B"]),
+                row(&["HEADER_MOVEMENT"]),
+                row(&["JUMP", "J"]),
+            ]
+        );
+        assert!(s.execute_binding("JUMP", true).unwrap());
+        assert_eq!(s.eval::<String>("return PROBED").unwrap(), "edited jump");
+        for skipped in ["TOGGLESTATS", "EMPTYROW", "NESTEDROW", "ITUNES_PLAYPAUSE"] {
             assert!(
-                reference_ui::read(entry).is_some(),
-                "benilla.toc sources {entry} off the patch chain, which does not hold it"
+                !s.execute_binding(skipped, true).unwrap(),
+                "{skipped} is no command"
             );
         }
+        assert_eq!(
+            s.eval::<String>(r#"return GetBindingAction("CTRL-Y")"#)
+                .unwrap(),
+            "TOGGLESTATS",
+            "a default key on a command the file never declared is still the key table's"
+        );
     }
 
-    /// The stock pass (`UIParent.lua:1592-1775`) indexes these frames unguarded, so a file that
-    /// runs it at load must follow every file it reads, as the reference's toc orders them.
+    /// A chain without `Bindings.xml` loads no command and fails nothing (`0x48fff9` skips it).
     #[test]
-    fn every_load_time_runner_of_the_managed_pass_follows_what_it_reads() {
-        let files = manifest_files();
-        let at = |leaf: &str| {
-            files
-                .iter()
-                .position(|f| f.ends_with(&format!("\\{leaf}")))
-                .unwrap_or_else(|| panic!("the manifest lists {leaf}"))
-        };
-        // What the pass reads by name (`UIParent.lua:1598-1775`), and the file that declares it.
-        const READS: &[(&str, &str)] = &[
-            (
-                "MultiBarLeft / MultiBarRight / MultiBarBottomLeft",
-                "MultiActionBars.xml",
-            ),
-            (
-                "PetActionBarFrame + SlidingActionBarTexture0/1",
-                "PetActionBarFrame.xml",
-            ),
-            ("ReputationWatchBar", "ReputationFrame.xml"),
-            (
-                "MainMenuExpBar / MainMenuBarMaxLevelBar / MainMenuBar",
-                "MainMenuBar.xml",
-            ),
-            ("CastingBarFrame", "CastingBarFrame.xml"),
-            ("QuestTimerFrame", "QuestTimerFrame.xml"),
-            ("QuestWatchFrame", "QuestLogFrame.xml"),
-            ("DurabilityFrame + its three glyphs", "DurabilityFrame.xml"),
-            ("MinimapCluster", "Minimap.xml"),
-            (
-                "ChatFrame1 / ChatFrame2 (+ FCF_DockUpdate)",
-                "FloatingChatFrame.xml",
-            ),
-            // The shapeshift arm (l.1705-1732): the stance bar's file declares these and also runs
-            // the pass, so it must precede the other runner.
-            (
-                "ShapeshiftBarLeft / Middle / Right",
-                "BonusActionBarFrame.xml",
-            ),
-        ];
-        // Who runs it at load: an OnLoad, or the OnShow of a frame its OnLoad shows.
-        const RUNNERS: &[(&str, &str)] = &[
-            (
-                "ShapeshiftBar_OnLoad → Show → OnShow",
-                "BonusActionBarFrame.xml",
-            ),
-            ("WorldStateAlwaysUpFrame OnLoad", "WorldStateFrame.xml"),
-        ];
-        for (what, runner) in RUNNERS {
-            for (name, read) in READS {
-                if read == runner {
-                    continue; // its own declarations precede its own OnLoad
-                }
-                assert!(
-                    at(read) < at(runner),
-                    "{runner} ({what}) loads at {} but reads {name}, declared by {read} at {} — \
-                     the pass raises at load and never seats the frame it was run for. Move the \
-                     runner below the read, as the reference's toc has it.",
-                    at(runner),
-                    at(read)
-                );
-            }
-        }
+    fn a_chain_without_bindings_xml_declares_no_command() {
+        let _chain = fixture::lay(&[
+            (reference_ui::TOC, Some(b"")),
+            (reference_ui::BINDINGS, None),
+        ]);
+        let s = UiScript::new().unwrap();
+        assert!(load_core(&s).is_empty());
+        assert_eq!(s.eval::<i64>("return GetNumBindings()").unwrap(), 0);
     }
 
+    /// The install's own file read as the loader reads it: 219 commands once the nine debug rows
+    /// are skipped, the Mac rows among them for the Mac build alone; the six `MOVEVIEW*` rows sit
+    /// in an XML comment.
     #[test]
-    fn nothing_declares_a_uiparent_child_before_uiparent_itself_loads() {
-        let files = manifest_files();
-        let at = files
-            .iter()
-            .position(|f| f == r"Interface\FrameXML\UIParent.xml")
-            .expect("the manifest lists UIParent.xml");
-        let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
-        for early in &files[..at] {
-            // A chain entry is a stock file off the player's install, not one on disk here.
-            if reference_ui::is_chain_entry(early) {
-                continue;
-            }
-            let text = std::fs::read_to_string(dir.join(early)).unwrap();
-            assert!(
-                !text.contains(r#"parent="UIParent""#),
-                "{early} loads before UIParent.xml (position {at}) but declares a \
-                 UIParent child — the loader would warn and silently drop it. Move \
-                 UIParent.xml up, or the declaration down."
-            );
+    fn the_installs_bindings_xml_reads_as_the_loader_reads_it() {
+        benilla_formats::wow_data_or_skip!();
+        let binds = benilla_ui::bindings_xml::parse(&stock_bindings_file().unwrap()).unwrap();
+        assert_eq!(binds.len(), 219);
+        assert_eq!(binds.iter().filter(|b| b.run_on_up).count(), 94);
+        assert_eq!(binds.iter().filter(|b| b.header.is_some()).count(), 13);
+        assert_eq!(binds.iter().filter(|b| b.hidden).count(), 3);
+        assert_eq!(binds.iter().filter(|b| b.platform.is_some()).count(), 5);
+        let names: Vec<&str> = binds.iter().map(|b| b.name.as_str()).collect();
+        for gone in ["TOGGLESTATS", "RESETPERFORMANCEVALUES", "MOVEVIEWIN"] {
+            assert!(!names.contains(&gone), "{gone}");
         }
+        for kept in [
+            "MOVEANDSTEER",
+            "PITCHUP",
+            "TURNORACTION",
+            "TOGGLEUI",
+            "RAIDTARGETNONE",
+        ] {
+            assert!(names.contains(&kept), "{kept}");
+        }
+        assert_eq!(binds[0].header.as_deref(), Some("MOVEMENT"));
+
+        // Registered on this client, the PC build: every row but the five Mac ones, so the list
+        // walks 211 visible commands and 12 headers, `ITUNES_REMOTE` riding on a Mac row.
+        let mut s = UiScript::new().unwrap();
+        load_stock_bindings(&mut s);
+        assert_eq!(s.eval::<i64>("return GetNumBindings()").unwrap(), 223);
+        assert!(!s.execute_binding("ITUNES_PLAYPAUSE", true).unwrap());
     }
 }
diff --git a/crates/benilla-app/src/ui_script/merchant_tests.rs b/crates/benilla-app/src/ui_script/merchant_tests.rs
index 4275bd72..daa35387 100644
--- a/crates/benilla-app/src/ui_script/merchant_tests.rs
+++ b/crates/benilla-app/src/ui_script/merchant_tests.rs
@@ -1,8 +1,8 @@
 //! The stock merchant window (`MerchantFrame.xml`), engine-only, fed a synthetic stock and purse.
 
 use benilla_ui::script::{
-    ContainerState, DressUpIntent, ExtractedQuad, ItemStatsHead, MerchantItem, MerchantState,
-    QuadContent, ScriptValue, SoundRequest, UiScript,
+    ContainerState, CursorPayload, DressUpIntent, ExtractedQuad, ItemStatsHead, MerchantItem,
+    MerchantState, QuadContent, ScriptValue, SoundRequest, UiScript,
 };
 
 use super::test_ui::{bag_open, load_ui as load_xml, BAG_UI};
@@ -40,13 +40,15 @@ fn shipped_merchant_frame_drives_end_to_end() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
-        load_xml(&s, f);
-    }
     // The census: every row is a container plus an `ItemButtonTemplate` button, and every price a
     // `SmallMoneyFrameTemplate` (`MerchantFrame.xml:4-115`).
+    const MERCHANT: &str = "Interface\\FrameXML\\MerchantFrame.xml";
     assert_eq!(
-        load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml"),
+        super::test_ui::load_kit_counting(
+            &s,
+            &[super::test_ui::MERCHANT_UI, &[MERCHANT]],
+            MERCHANT
+        ),
         90,
         "the stock file's own shape — see the census note above"
     );
@@ -298,11 +300,15 @@ fn merchant_show_hide_plays_open_and_close_kits() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     assert!(
         s.take_sounds().is_empty(),
@@ -335,12 +341,16 @@ fn vendor_open_opens_the_backpack_and_layers_the_sound() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     equip_bag(&mut s, 0, "Backpack", 16);
     let _ = s.take_sounds(); // ignore anything from load (frames are hidden; nothing should)
@@ -378,12 +388,16 @@ fn vendor_leaves_an_already_open_backpack_alone() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     equip_bag(&mut s, 0, "Backpack", 16);
 
@@ -410,6 +424,66 @@ fn vendor_leaves_an_already_open_backpack_alone() {
     );
 }
 
+/// A centre panel opened over a vendor keeps a backpack the player had open before it: the stock
+/// `ShowUIPanel` calls `CloseAllBags` (`UIParent.lua:699-702`), whose `CloseBackpack()` honours
+/// the was-open memory (`ContainerFrame.lua:702-707`, `:210-218`), and then closes bags 1 and up,
+/// the ones the vendor opened included.
+#[test]
+fn a_centre_panel_over_a_vendor_keeps_the_backpack_the_player_had_open() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
+        load_xml(&s, file);
+    }
+    s.set_money(0);
+    equip_bag(&mut s, 0, "Backpack", 16);
+    equip_bag(&mut s, 1, "Small Pouch", 6);
+    equip_bag(&mut s, 4, "Small Pouch", 6);
+
+    s.run("MainMenuBarBackpackButton:Click()").unwrap();
+    assert!(
+        bag_open(&s, 0),
+        "fixture: the player's own backpack is up first"
+    );
+    s.set_merchant(Some(MerchantState::default()));
+    s.fire_event("MERCHANT_SHOW", vec![]);
+    assert!(
+        bag_open(&s, 1) && bag_open(&s, 4),
+        "fixture: the vendor opens the equipped bags"
+    );
+
+    // A centre-area panel, as the Help micro button's `HelpFrame` is (`UIParent.lua:35`).
+    s.run(
+        r#"local f = CreateFrame("Frame", "CentrePanelProbe", UIParent)
+           f:Hide()
+           UIPanelWindows["CentrePanelProbe"] = { area = "center", pushable = 0 }
+           ShowUIPanel(CentrePanelProbe)"#,
+    )
+    .unwrap();
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+    assert!(
+        s.eval::<bool>("return CentrePanelProbe:IsShown() == 1")
+            .unwrap(),
+        "fixture: the centre panel opened"
+    );
+    assert!(
+        bag_open(&s, 0),
+        "the backpack the player had open before the vendor stays open"
+    );
+    assert!(
+        !bag_open(&s, 1) && !bag_open(&s, 4),
+        "bags 1-4 close, the vendor's included"
+    );
+}
+
 /// Deviation: the vendor opens every equipped bag, not only the backpack as the stock
 /// `OpenBackpack` does, so every bag is up to sell from. `ContainerFrameAdapters.xml` replaces the
 /// verb after the stock file loads; with the stock body live, bag 2 would not open.
@@ -418,12 +492,16 @@ fn vendor_opens_and_closes_all_equipped_bags() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for file in BAG_UI {
+    for file in crate::ui_script::test_ui::production_order(&[
+        BAG_UI,
+        &[
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, file);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     equip_bag(&mut s, 0, "Backpack", 16);
     equip_bag(&mut s, 2, "Small Pouch", 6);
@@ -454,11 +532,15 @@ fn merchant_switch_plays_close_then_open_and_queues_the_consumable_close() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     s.set_money(0);
     s.set_merchant(Some(MerchantState::default()));
@@ -494,12 +576,16 @@ fn shipped_merchant_hover_scopes_highlight_and_anchors_item_tooltip() {
     s.set_screen_size(1024.0, 768.0);
     // The stock tooltip sizes from its lines, so the harness needs a measurer.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     s.set_merchant(Some(MerchantState {
         items: vec![
@@ -697,11 +783,15 @@ fn merchant_tabs_drive_buyback_page_and_repair_pair() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(500);
 
     let buyback_item = |name: &str, price: u32| MerchantItem {
@@ -814,10 +904,12 @@ fn merchant_tabs_fit_their_labels() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &["Interface\\FrameXML\\MerchantFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     s.set_money(0);
     s.set_merchant(Some(MerchantState::default()));
     s.fire_event("MERCHANT_SHOW", vec![ScriptValue::Str("Vendor".into())]);
@@ -849,11 +941,15 @@ fn shipped_merchant_frame_arms_the_buy_cursor_on_hover() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     // A purse of 50c: row 1 (25c) is affordable, row 2 (100c) is not.
     s.set_money(50);
@@ -936,14 +1032,18 @@ fn trade_recipient_money_renders_the_digit_not_ellipsis() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\MoneyInputFrame.lua", // for TradeFrame.xml's OnLoad
+            "Interface\\FrameXML\\MoneyInputFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml", // read by the stock bag-slot click
+            "Interface\\FrameXML\\TradeFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml"); // read by the stock bag-slot click
-    load_xml(&s, "Interface\\FrameXML\\MoneyInputFrame.lua"); // for TradeFrame.xml's OnLoad
-    load_xml(&s, "Interface\\FrameXML\\MoneyInputFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\TradeFrame.xml");
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
 
     let target = benilla_ui::script::TradeSideState {
@@ -990,25 +1090,25 @@ fn ctrl_and_shift_on_a_vendor_row_preview_and_post_without_buying() {
     const WATER_LINK: &str = "|cffffffff|Hitem:159:0:0:0|h[Refreshing Spring Water]|h|r";
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\BasicControls.xml",
+            r"Interface\FrameXML\UIParent.xml", // UIParent and UIParent.lua
+            "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\ChatFrame.xml",
+            // Not the panel templates or the dialogs, which MERCHANT_UI has: loading the stock
+            // money kit's frames twice trips its global-named update.
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "Interface\\FrameXML\\DressUpFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    ]) {
         load_xml(&s, f);
     }
-    for file in [
-        r"Interface\FrameXML\UIParent.xml", // UIParent and UIParent.lua
-        "ScrollTemplates.xml",              // our scroll kits
-        "Interface\\FrameXML\\MerchantFrame.xml",
-        "Interface\\FrameXML\\DressUpFrame.xml",
-        "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        // Not the panel templates or the dialogs, which MERCHANT_UI has: loading the stock money
-        // kit's frames twice trips its global-named update.
-        "Interface\\FrameXML\\FloatingChatFrame.xml",
-    ] {
-        load_xml(&s, file);
-    }
 
     s.set_money(12_345);
     s.set_merchant(Some(MerchantState {
@@ -1092,3 +1192,88 @@ fn ctrl_and_shift_on_a_vendor_row_preview_and_post_without_buying() {
     );
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
+
+#[test]
+fn shift_click_takes_one_bundle_and_splits_a_single() {
+    benilla_formats::wow_data_or_skip!();
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    for f in crate::ui_script::test_ui::production_order(&[
+        super::test_ui::MERCHANT_UI,
+        &[
+            "Interface\\FrameXML\\UIMenu.xml",
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            "Interface\\FrameXML\\ChatFrame.xml",
+            "Interface\\FrameXML\\FloatingChatFrame.xml",
+            "Interface\\FrameXML\\StackSplitFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+        ],
+    ]) {
+        load_xml(&s, f);
+    }
+    s.set_money(10_000);
+    s.set_merchant(Some(MerchantState {
+        items: vec![
+            MerchantItem {
+                name: Some("Refreshing Spring Water".into()),
+                price: 25,
+                quantity: 5,
+                num_available: -1,
+                item_id: 159,
+                max_stack: Some(20),
+                ..Default::default()
+            },
+            MerchantItem {
+                name: Some("Flask of Oil".into()),
+                price: 100,
+                quantity: 1,
+                num_available: -1,
+                item_id: 814,
+                max_stack: Some(20),
+                ..Default::default()
+            },
+        ],
+        ..Default::default()
+    }));
+    s.fire_event("MERCHANT_SHOW", vec![]);
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+
+    let shift_click = |s: &mut UiScript, row: u32, button: &str| {
+        let (x, y) = super::test_ui::centre_of(s, &format!("MerchantItem{row}ItemButton"));
+        s.set_modifiers(true, false, false);
+        s.mouse_button(x, y, button, true);
+        s.mouse_button(x, y, button, false);
+        s.set_modifiers(false, false, false);
+    };
+    let split_shown = |s: &UiScript| s.eval::<bool>("return StackSplitFrame:IsShown()").unwrap();
+
+    shift_click(&mut s, 1, "LeftButton");
+    assert!(!split_shown(&s), "a bundle row opens no split");
+    assert!(
+        matches!(s.cursor_payload(), Some(CursorPayload::Merchant(m)) if m.item_id == 159),
+        "the left arm picks one bundle up: {:?}",
+        s.cursor_payload()
+    );
+    s.run("ClearCursor()").unwrap();
+
+    shift_click(&mut s, 1, "RightButton");
+    assert!(!split_shown(&s), "a bundle row opens no split");
+    assert_eq!(
+        s.take_merchant_buys(),
+        vec![(1, 1)],
+        "the right arm buys one bundle"
+    );
+
+    shift_click(&mut s, 2, "RightButton");
+    assert!(split_shown(&s), "a single row opens the split");
+    assert_eq!(
+        s.eval::<i64>("return StackSplitFrame.maxStack").unwrap(),
+        20,
+        "the split spans the stack size, under what the purse affords"
+    );
+    assert!(
+        s.take_merchant_buys().is_empty(),
+        "the split buys nothing until it is chosen"
+    );
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
diff --git a/crates/benilla-app/src/ui_script/micro_menu_tests.rs b/crates/benilla-app/src/ui_script/micro_menu_tests.rs
index ea171d6b..ccd2e443 100644
--- a/crates/benilla-app/src/ui_script/micro_menu_tests.rs
+++ b/crates/benilla-app/src/ui_script/micro_menu_tests.rs
@@ -18,22 +18,22 @@ fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        r"Interface\FrameXML\UIParent.xml",
         // The labels each button's OnLoad reads, through `TEXT()`.
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
     ] {
         super::test_ui::load_ui(&s, file);
     }
@@ -216,7 +216,7 @@ fn every_micro_button_hovers_with_its_reference_explanation() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     s.run("SHOW_NEWBIE_TIPS = \"1\"").unwrap();
-    s.register_bindings(&crate::bindings::registry_commands());
+    crate::ui_script::load_stock_bindings(&mut s);
     assert_eq!(
         s.eval::<Option<i64>>("return SetBinding(\"C\", \"TOGGLECHARACTER0\")")
             .unwrap(),
diff --git a/crates/benilla-app/src/ui_script/minimap_tests.rs b/crates/benilla-app/src/ui_script/minimap_tests.rs
index fb194ec4..47cdecb2 100644
--- a/crates/benilla-app/src/ui_script/minimap_tests.rs
+++ b/crates/benilla-app/src/ui_script/minimap_tests.rs
@@ -120,16 +120,13 @@ fn game_time_session(hour: u32, minute: u32) -> UiScript {
     s.run("function GetMinimapZoneText() return '' end")
         .unwrap();
     s.run("function PlaySound() end").unwrap();
-    s.run(&format!(
-        "__benilla_game_hour = {hour}; __benilla_game_minute = {minute}"
-    ))
-    .unwrap();
+    s.set_game_time(hour, minute);
     // `GameTime.lua` reads `TwentyFourHourTime`, which `LocalizeFrames` sets; the reference calls
     // that on `VARIABLES_LOADED` (`UIParent.lua:231-232`), and this session has no UIParent.
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\Localization.xml");
     s.run("LocalizeFrames()").unwrap();
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     // `TEXT()`, which the tooltip formatting goes through.
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
@@ -162,8 +159,7 @@ fn game_time_frame_slides_the_sun_moon_window_on_the_game_clock() {
     let day = (0.0, 50.0 / 128.0, 0.0, 50.0 / 64.0);
     assert_eq!(tod_window(&s), day, "mid-morning shows the sun half");
 
-    s.run("__benilla_game_hour = 21; __benilla_game_minute = 0")
-        .unwrap();
+    s.set_game_time(21, 0);
     s.tick(0.016);
     assert_eq!(
         tod_window(&s),
@@ -171,11 +167,10 @@ fn game_time_frame_slides_the_sun_moon_window_on_the_game_clock() {
         "9:00 PM sharp is the moon half"
     );
 
-    s.run("__benilla_game_hour = 5; __benilla_game_minute = 29")
-        .unwrap();
+    s.set_game_time(5, 29);
     s.tick(0.016);
     assert_eq!(tod_window(&s).0, 0.5, "5:29 AM is still the moon");
-    s.run("__benilla_game_minute = 30").unwrap();
+    s.set_game_time(5, 30);
     s.tick(0.016);
     assert_eq!(tod_window(&s), day, "5:30 AM sharp flips to the sun");
 }
@@ -209,7 +204,7 @@ fn hovering_the_indicator_shows_and_live_updates_the_game_time_tooltip() {
     assert_eq!(text(&s), "21:07");
 
     // While owned, `GameTimeFrame_Update` refreshes the tooltip (`GameTime.lua:20-22`).
-    s.run("__benilla_game_minute = 8").unwrap();
+    s.set_game_time(21, 8);
     s.tick(0.016);
     assert_eq!(text(&s), "21:08", "the owned tooltip follows the clock");
 
@@ -352,11 +347,11 @@ fn the_meeting_stone_icon_follows_the_queue_across_meetingstone_changed() {
         .unwrap();
     s.run("function PlaySound() end").unwrap();
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\Localization.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
diff --git a/crates/benilla-app/src/ui_script/mirror_timer_tests.rs b/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
index 4d0114d4..104d941e 100644
--- a/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
+++ b/crates/benilla-app/src/ui_script/mirror_timer_tests.rs
@@ -8,7 +8,10 @@ use super::test_ui::load_ui as load_xml;
 fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     // `UIParent_OnEvent`'s `MIRROR_TIMER_START` arm calls `MirrorTimer_Show` (`UIParent.lua:374`).
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     // `MirrorTimer_Show` bounds its free-bar search by `STATICPOPUP_NUMDIALOGS`
@@ -17,9 +20,6 @@ fn harness() -> UiScript {
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\MirrorTimer.xml");
     s
diff --git a/crates/benilla-app/src/ui_script/mod.rs b/crates/benilla-app/src/ui_script/mod.rs
index c03e41b6..79338c8d 100644
--- a/crates/benilla-app/src/ui_script/mod.rs
+++ b/crates/benilla-app/src/ui_script/mod.rs
@@ -16,6 +16,9 @@ pub(crate) mod addons;
 mod content;
 pub(crate) mod extract;
 mod input;
+#[cfg(test)]
+mod layer_tests;
+mod load_log;
 mod manifest;
 
 /// The stock FrameXML this client runs off the player's own patch chain; its header is the rule.
@@ -30,8 +33,11 @@ pub(crate) mod gate;
 pub(crate) use session::VmMemo;
 
 // Not test-only: the addon harness loads the whole shipped interface under each addon.
+pub(crate) use manifest::default_bindings;
 pub(crate) use manifest::load_default_ui;
-pub(crate) use manifest::{load_font_registry, load_ingame_ui};
+pub(crate) use manifest::load_ingame_ui;
+#[cfg(test)]
+pub(crate) use manifest::{load_stock_bindings, stock_bindings_file};
 
 /// Whether the pointer is over any UI (the egui dev overlay or a player-UI frame), combined by
 /// [`arbitrate_pointer_over_ui`]; gameplay reads it, so it is not the dev plugin's.
@@ -654,18 +660,16 @@ pub(crate) fn fire_chat_login(s: &mut benilla_ui::script::UiScript) {
     }
 }
 
-/// The `benilla_formats::TokenContext::text` seam: a `GlobalStrings` key, its `%d` holes filled.
-pub(crate) fn token_text(
-    script: &benilla_ui::script::UiScript,
-) -> impl Fn(&str, &[i64]) -> Option<String> + '_ {
-    |key: &str, args: &[i64]| {
-        let template = benilla_ui::strings::global(script.lua(), key)?;
-        let args: Vec<_> = args
-            .iter()
-            .map(|n| benilla_ui::strings::Arg::D(*n))
-            .collect();
-        Some(benilla_ui::strings::fill(&template, &args))
-    }
+/// The `benilla_formats::TokenContext::printf` seam: `SStrPrintf` over the template filler.
+pub(crate) fn token_printf(template: &str, args: &[benilla_formats::TokenNumber]) -> String {
+    let args: Vec<_> = args
+        .iter()
+        .map(|n| match n {
+            benilla_formats::TokenNumber::Int(v) => benilla_ui::strings::Arg::D(*v),
+            benilla_formats::TokenNumber::Float(v) => benilla_ui::strings::Arg::F(*v),
+        })
+        .collect();
+    benilla_ui::strings::fill(template, &args)
 }
 
 /// [`test_ui::load_ui`] for a test module outside `ui_script`, such as `ui_action::feed_tests`.
@@ -751,6 +755,10 @@ mod panel_template_tests;
 #[cfg(test)]
 mod shape_gate;
 
+/// The surface gate: the production load's globals and widget methods against the 1.12 tables.
+#[cfg(test)]
+mod surface_gate;
+
 /// The event argument-shape gate: every fire site against `reference/1.12-events.tsv`.
 #[cfg(test)]
 mod event_shape_gate;
@@ -814,6 +822,8 @@ mod tooltip_template_tests;
 #[cfg(test)]
 mod escape_tests;
 
+#[cfg(test)]
+mod game_menu_addon_tests;
 #[cfg(test)]
 mod game_menu_tests;
 
@@ -948,6 +958,10 @@ mod errors_tests;
 #[cfg(test)]
 mod shipped_xml_tests;
 
+/// The stock Video Options window off the chain: open, Okay, Defaults and Cancel.
+#[cfg(test)]
+mod video_options_tests;
+
 #[cfg(test)]
 mod bottom_hud_tests;
 
diff --git a/crates/benilla-app/src/ui_script/multibar_stance_tests.rs b/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
index 2b9f8941..41a55340 100644
--- a/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
+++ b/crates/benilla-app/src/ui_script/multibar_stance_tests.rs
@@ -5,42 +5,55 @@ use benilla_ui::script::{ActionSlot, QuadContent, ScriptValue, SpellTooltipView,
 
 use super::test_ui::load_ui as load_xml;
 
-/// The main bar's stock files, with UIParent.xml for the manage pass the stance bar's OnShow runs
-/// and GameTooltip.xml for the OnLeave a bar hiding under the cursor fires.
-fn load_action_bar(s: &UiScript) {
-    for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        // `MultiActionBarFrame_OnLoad` writes `UIOptionsFrameCheckButtons`, so UIOptionsFrame.xml
-        // loads first, as in FrameXML.toc (l.21, l.39); it also declares `ALWAYS_SHOW_MULTIBARS`.
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        r"Interface\FrameXML\OptionsFrame.lua",
-        r"Interface\FrameXML\UIOptionsFrame.xml",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "ScrollTemplates.xml",
-        "KeyBindingsPage.xml",
-        "OptionsFrame.xml",
-    ] {
-        load_xml(s, file);
+/// The main bar's and the four extra bars' stock files, with UIParent.xml for the manage pass the
+/// stance bar's OnShow runs and GameTooltip.xml for the OnLeave a bar hiding under the cursor
+/// fires, and `extra` merged in; returns the frames MultiActionBars.xml built.
+fn load_action_bar(s: &UiScript, extra: &[&str]) -> usize {
+    const MULTIBARS: &str = "Interface\\FrameXML\\MultiActionBars.xml";
+    let mut built = 0;
+    for file in super::test_ui::production_order(&[
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\OptionsFrameTemplates.xml",
+            // `MultiActionBarFrame_OnLoad` writes `UIOptionsFrameCheckButtons`, so
+            // UIOptionsFrame.xml loads first, as in FrameXML.toc (l.21, l.39); it also declares
+            // `ALWAYS_SHOW_MULTIBARS`.
+            r"Interface\FrameXML\OptionsFrame.lua",
+            r"Interface\FrameXML\UIOptionsFrame.xml",
+            "Interface\\FrameXML\\StaticPopup.xml",
+            "Interface\\FrameXML\\TextStatusBar.lua",
+            "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\MainMenuBar.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+            "Interface\\FrameXML\\ActionButtonTemplate.xml",
+            "Interface\\FrameXML\\ActionBarFrame.xml",
+            MULTIBARS,
+            // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml
+            // declares.
+            r"Interface\FrameXML\ReputationFrame.xml",
+            "Interface\\FrameXML\\BonusActionBarFrame.xml",
+            "ScrollTemplates.xml",
+            "KeyBindingsPage.xml",
+            "OptionsFrame.xml",
+        ],
+        extra,
+    ]) {
+        let frames = load_xml(s, file);
+        if file == MULTIBARS {
+            built = frames;
+        }
     }
+    built
 }
 
 /// Raise exactly the bars named, through the globals the Options rows write.
@@ -66,8 +79,7 @@ fn shipped_multibars_drive_end_to_end() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    let frames = super::test_ui::load_ui(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    let frames = load_action_bar(&s, &[]);
     assert_eq!(
         frames, 100,
         "what stock MultiActionBars.xml declares: the four bar frames and their 48 buttons, \
@@ -241,23 +253,9 @@ fn shipped_stance_bar_drives_end_to_end() {
     s.set_screen_size(1024.0, 768.0);
     // `ShapeshiftBarFrame` is parented to `MainMenuBar` and its update calls
     // `CooldownFrame_SetTimer` (BonusActionBarFrame.lua:201), so both load first.
-    load_action_bar(&s);
+    load_action_bar(&s, &[]);
     // Bar 1 up: the stance bar's OnShow runs the manage pass (BonusActionBarFrame.xml:350-352),
     // whose `ShapeshiftBarFrame` row adds 45 only while bar 1 is up (UIParent.lua:1583, 1605).
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
     show_bars(&s, &[1]);
     assert!(
         s.eval::<bool>("return ShapeshiftBarFrame ~= nil and ShapeshiftButton10 ~= nil")
@@ -411,35 +409,32 @@ fn multibar_hover_renders_the_buttons_own_action() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\MultiActionBars.xml",
+        // `ExhaustionTick_Update` reads `ReputationWatchBar`, which ReputationFrame.xml declares.
+        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "Interface\\FrameXML\\MultiActionBars.xml",
     ] {
         load_xml(&s, file);
     }
@@ -518,21 +513,7 @@ fn multibar_hover_renders_the_buttons_own_action() {
 fn the_vertical_multibars_exist_hidden_on_the_reference_pages() {
     benilla_formats::wow_data_or_skip!();
     let s = UiScript::new().unwrap();
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
 
     for bar in ["MultiBarRight", "MultiBarLeft"] {
         assert!(
@@ -573,21 +554,7 @@ fn every_extra_bar_stays_down_until_its_own_toggle_is_set() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
 
     const BARS: [&str; 4] = [
         "MultiBarBottomLeft",
@@ -650,22 +617,7 @@ fn raising_a_bottom_bar_moves_the_managed_bottom_stack() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
-    load_xml(&s, "Interface\\FrameXML\\CastingBarFrame.xml");
+    load_action_bar(&s, &[r"Interface\FrameXML\CastingBarFrame.xml"]);
 
     // Read the row's y off the anchor, so a hidden cast bar answers too.
     let cast_y = |s: &UiScript| {
@@ -709,21 +661,7 @@ fn viewable_action_bar_pages_follow_the_bar_toggles() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
 
     let viewable = |s: &UiScript| {
         s.eval::<String>(
@@ -771,21 +709,7 @@ fn the_grid_option_holds_the_extra_bars_empty_wells_open() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
     show_bars(&s, &[1]);
 
     let well = |s: &UiScript| {
@@ -852,21 +776,7 @@ fn a_held_payload_ghosts_the_empty_wells_it_opens() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
     s.set_action(
         1,
         Some(ActionSlot {
@@ -975,21 +885,7 @@ fn a_bar_toggle_sends_the_byte_its_globals_pack_to() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
     let _ = s.take_action_bar_toggle_sends();
 
     // The Options row's sequence: assign, update the bars, send.
@@ -1052,21 +948,7 @@ fn the_shipped_setter_passes_exactly_four_arguments() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
 
     // Lua 5.0's `arg.n`: `...` as a value is not in the 1.12 client's grammar.
     s.run(
@@ -1098,23 +980,7 @@ fn the_stance_bar_sits_where_the_pass_puts_it() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    load_action_bar(&s, &[]);
     s.set_shapeshift_forms(vec![ShapeshiftFormView {
         spell_id: 2457,
         texture: Some("Interface\\Icons\\Stance_A".into()),
@@ -1159,23 +1025,7 @@ fn the_stance_shelf_follows_the_bottom_left_bar() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    load_action_bar(&s, &[]);
 
     let form = |id: u32| ShapeshiftFormView {
         spell_id: id,
@@ -1271,23 +1121,7 @@ fn the_stance_shelf_is_as_long_as_the_form_count() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
+    load_action_bar(&s, &[]);
     show_bars(&s, &[]); // unraised: the shelf art is the state under test
 
     let form = |id: u32| ShapeshiftFormView {
@@ -1370,22 +1204,8 @@ fn an_extra_bars_empty_well_keeps_its_bound_hotkey_label() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     // The real command set, so `MULTIACTIONBAR1BUTTONn` is bindable; it ships unbound.
-    s.register_bindings(&crate::bindings::registry_commands());
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    crate::ui_script::load_stock_bindings(&mut s);
+    load_action_bar(&s, &[]);
     show_bars(&s, &[1]);
     s.set_action(
         61,
@@ -1466,8 +1286,7 @@ fn the_middle_strip_tiles_along_its_length_only() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
     show_bars(&s, &[]); // bars down: the shelf is the state under test
 
     let form = |id: u32| ShapeshiftFormView {
@@ -1533,8 +1352,7 @@ fn a_forms_state_change_leaves_the_shelf_down_over_the_raised_bar() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_action_bar(&s);
-    load_xml(&s, "Interface\\FrameXML\\MultiActionBars.xml");
+    load_action_bar(&s, &[]);
     // A recorder for the two events a push may announce.
     s.run(
         "STANCE_LOG = {} local f = CreateFrame('Frame') \
diff --git a/crates/benilla-app/src/ui_script/options_tests.rs b/crates/benilla-app/src/ui_script/options_tests.rs
index 2b904b3b..01e5150c 100644
--- a/crates/benilla-app/src/ui_script/options_tests.rs
+++ b/crates/benilla-app/src/ui_script/options_tests.rs
@@ -10,44 +10,42 @@ fn harness() -> UiScript {
 
 /// Load the manifest slice onto `s`, so a page test can seed CVars before the XML loads, as the
 /// app does. GameTooltip.xml precedes UIDropDownMenu.xml for the kit's `TOOLTIP_DEFAULT_COLOR`.
-fn harness_on(mut s: UiScript) -> UiScript {
+fn harness_on(s: UiScript) -> UiScript {
+    harness_with(s, &[])
+}
+
+/// [`harness_on`] with a page's `definers` merged in: the files its rows read, each loaded once
+/// and in the production order.
+fn harness_with(mut s: UiScript, definers: &[&str]) -> UiScript {
     s.set_screen_size(1024.0, 768.0);
-    // Each file loads once: a page harness may have loaded it already, and a second load of the
-    // money kit's frames breaks `MoneyFrame_Update`, which writes through `getglobal(name)`.
-    let loaded = |s: &UiScript, file: &str| -> bool {
-        s.eval::<bool>(&format!(
-            "return (BENILLA_TEST_LOADED or {{}})[{file:?}] == true"
-        ))
-        .unwrap_or(false)
-    };
-    for file in [
+    const WINDOW: &[&str] = &[
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         // Before every window that names `parent="UIParent"`, which resolves at load.
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        // Before our files, as the core loads before the layer: it sources UIParent.lua again.
+        r"Interface\FrameXML\GameMenuFrame.xml",
         // The stock options kit, hidden: `UIOptionsFrame_Init` assigns the option globals our
         // rows capture at OnLoad, and these declare the tables the Graphics rows and census read.
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
         r"Interface\FrameXML\OptionsFrame.lua",
         r"Interface\FrameXML\UIOptionsFrame.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "ScrollTemplates.xml", // the page scroll and the Keybindings list
         "KeyBindingsPage.xml", // the Keybindings page's templates and script
         "OptionsFrame.xml",
-        "GameMenuFrame.xml",
-    ] {
+        "GameMenuAdapters.xml",
+    ];
+    for file in super::test_ui::production_order(&[definers, WINDOW]) {
         // Our window loads strict: a missing template there fails instead of only warning.
-        if loaded(&s, file) {
-            continue;
-        }
         if file == "OptionsFrame.xml" {
             super::test_ui::load_ui_strict(&s, file);
         } else {
@@ -175,7 +173,7 @@ fn the_selected_row_wears_the_gold_wash_and_hover_runs_blue() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     // Scale 1, so rects and the pointer share coordinates; at 1024x768 the fit clamp stays above 1.
-    s.run("ERA_WINDOW_SCALE = 1").unwrap();
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap();
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
 
     assert_eq!(
@@ -277,7 +275,7 @@ fn the_selected_row_wears_the_gold_wash_and_hover_runs_blue() {
 fn the_ground_dim_draws_over_the_tile_and_clear_of_the_rope() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    s.run("ERA_WINDOW_SCALE = 1").unwrap();
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap();
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
     s.resolve();
 
@@ -516,7 +514,7 @@ fn a_track_press_seats_the_thumb_and_keeps_dragging() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness_on(audio_harness());
     s.set_cvar_host("MasterVolume", "0.1");
-    s.run("ERA_WINDOW_SCALE = 1").unwrap(); // pointer and rects share coordinates
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap(); // pointer and rects share coordinates
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
     s.run("BenillaOptionsFrameCategoryListRowAudio:Click()")
         .unwrap();
@@ -629,83 +627,65 @@ fn audio_harness() -> UiScript {
 fn combat_harness() -> UiScript {
     let mut s = audio_harness();
     s.set_screen_size(1024.0, 768.0);
-    load_definers(&s, &[r"Interface\FrameXML\UIParent.xml"]);
     super::test_ui::seat_chain_addon(&mut s, "Blizzard_CombatText");
     harness_on(s)
 }
 
-/// Load `files` ahead of the window, in order, each recorded so `harness_on` loads it only once.
-fn load_definers(s: &UiScript, files: &[&str]) {
-    for file in files {
-        super::test_ui::load_ui(s, file);
-        s.run(&format!(
-            "BENILLA_TEST_LOADED = BENILLA_TEST_LOADED or {{}} BENILLA_TEST_LOADED[{file:?}] = true"
-        ))
-        .unwrap();
-    }
-}
-
 /// The Interface page's harness, with its rows' consumers loaded ahead of the window: the unit
 /// frames, the buff bar, the XP bar, the quest windows and the tutorial frame.
 fn interface_harness() -> UiScript {
     let mut s = audio_harness();
     s.set_screen_size(1024.0, 768.0);
-    load_definers(
-        &s,
+    harness_with(
+        s,
         &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
             "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua calls at load
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
             r"Interface\FrameXML\MoneyFrame.lua",
             r"Interface\FrameXML\MoneyFrame.xml",
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            r"Interface\FrameXML\UIParent.xml",
-            r"Interface\FrameXML\UIPanelTemplates.lua",
-            r"Interface\FrameXML\UIPanelTemplates.xml",
-            "Interface\\FrameXML\\BasicControls.xml",
-            "Interface\\FrameXML\\LocaleProperties.lua",
-            "Interface\\FrameXML\\StaticPopup.xml",
             // The unit frames and the kits ahead of them: their dropdowns initialize at load, and
             // the dropdown kit reads `GameTooltip`'s `TOOLTIP_DEFAULT_COLOR`.
             "Interface\\FrameXML\\GameTooltip.xml",
             "Interface\\FrameXML\\UIDropDownMenu.xml",
-            "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua calls at load
-            "Interface\\FrameXML\\UnitPopup.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\OptionsFrameTemplates.xml",
+            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+            "Interface\\FrameXML\\StaticPopup.xml",
             "Interface\\FrameXML\\TextStatusBar.lua",
             "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\MainMenuBar.xml",
+            r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+            "Interface\\FrameXML\\ActionButtonTemplate.xml",
+            "Interface\\FrameXML\\ActionBarFrame.xml",
             "Interface\\FrameXML\\BuffFrame.xml",
-            "Interface\\FrameXML\\UnitFrame.xml",
             "Interface\\FrameXML\\CombatFeedback.xml",
+            "Interface\\FrameXML\\UnitPopup.xml",
+            "Interface\\FrameXML\\UnitFrame.xml",
             "Interface\\FrameXML\\PlayerFrame.xml",
             "Interface\\FrameXML\\PartyFrame.xml",
             "Interface\\FrameXML\\TargetFrame.xml",
             "Interface\\FrameXML\\PetFrame.xml",
-            // For `OpacityFrameSlider`, which `PartyMemberBackground` sets on `VARIABLES_LOADED`.
-            "Interface\\FrameXML\\ColorPickerFrame.xml",
-            "Interface\\FrameXML\\Cooldown.xml",
-            "Interface\\FrameXML\\ActionButtonTemplate.xml",
-            "Interface\\FrameXML\\MainMenuBar.xml",
-            "Interface\\FrameXML\\ActionBarFrame.xml",
-            "Interface\\FrameXML\\BonusActionBarFrame.xml",
+            "Interface\\FrameXML\\ItemButtonTemplate.xml",
             // `ExhaustionTick_Update` reads `ReputationWatchBar`, which `ReputationFrame.xml`
             // declares, after the templates its check boxes inherit.
-            r"Interface\FrameXML\UIPanelTemplates.lua",
-            r"Interface\FrameXML\UIPanelTemplates.xml",
-            r"Interface\FrameXML\OptionsFrameTemplates.xml",
             r"Interface\FrameXML\ReputationFrame.xml",
-            "ScrollTemplates.xml",
-            "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-            "Interface\\FrameXML\\MerchantFrame.xml",
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\BasicControls.xml",
-            "Interface\\FrameXML\\ItemButtonTemplate.xml",
             "Interface\\FrameXML\\QuestFrame.xml",
-            r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
             "Interface\\FrameXML\\QuestLogFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "Interface\\FrameXML\\BonusActionBarFrame.xml",
             // The Show Tutorials setter, like the reference's Save arm, reaches
             // `TutorialFrameCheckButton` and `TutorialFrame_HideAllAlerts` unguarded.
             "Interface\\FrameXML\\TutorialFrame.xml",
+            // For `OpacityFrameSlider`, which `PartyMemberBackground` sets on `VARIABLES_LOADED`.
+            "Interface\\FrameXML\\ColorPickerFrame.xml",
+            "ScrollTemplates.xml",
         ],
-    );
-    harness_on(s)
+    )
 }
 
 /// The Chat page's harness: the chat frames ahead of the window, for `SetChatMouseOverDelay` and
@@ -713,31 +693,26 @@ fn interface_harness() -> UiScript {
 fn chat_harness() -> UiScript {
     let mut s = audio_harness();
     s.set_screen_size(1024.0, 768.0);
-    load_definers(
-        &s,
+    harness_with(
+        s,
         &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
             "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
             r"Interface\FrameXML\MoneyFrame.lua",
             r"Interface\FrameXML\MoneyFrame.xml",
-            r"Interface\FrameXML\UIParent.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            "Interface\\FrameXML\\UIMenu.xml", // the kit the chat and emote menus build on
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
             r"Interface\FrameXML\UIPanelTemplates.lua",
             r"Interface\FrameXML\UIPanelTemplates.xml",
-            "Interface\\FrameXML\\LocaleProperties.lua",
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\BasicControls.xml",
             "Interface\\FrameXML\\StaticPopup.xml",
-            "Interface\\FrameXML\\GameTooltip.xml",
-            "Interface\\FrameXML\\UIDropDownMenu.xml",
-            "Interface\\FrameXML\\UIMenu.xml", // the kit the chat and emote menus build on
-            "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\BasicControls.xml",
             "Interface\\FrameXML\\ChatFrame.xml",
-            "Interface\\FrameXML\\UIPanelTemplates.lua",
-            "Interface\\FrameXML\\UIPanelTemplates.xml",
             "Interface\\FrameXML\\FloatingChatFrame.xml",
         ],
-    );
-    harness_on(s)
+    )
 }
 
 /// The Action Bars page's harness: the stock bars its rows move, and the options windows ahead of
@@ -745,46 +720,42 @@ fn chat_harness() -> UiScript {
 fn actionbars_harness() -> UiScript {
     let mut s = audio_harness();
     s.set_screen_size(1024.0, 768.0);
-    load_definers(
-        &s,
+    harness_with(
+        s,
         &[
-            "Interface\\FrameXML\\Fonts.xml",
-            r"Interface\FrameXML\UIParent.xml",
-            "Interface\\FrameXML\\Cooldown.xml",
-            "Interface\\FrameXML\\ActionButtonTemplate.xml",
-            "Interface\\FrameXML\\TextStatusBar.lua",
-            "Interface\\FrameXML\\TextStatusBar.xml",
             "Interface\\FrameXML\\GlobalStrings.lua",
-            "Interface\\FrameXML\\MainMenuBar.xml",
+            "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
             r"Interface\FrameXML\MoneyFrame.lua",
             r"Interface\FrameXML\MoneyFrame.xml",
             "Interface\\FrameXML\\GameTooltip.xml",
-            "Interface\\FrameXML\\ActionBarFrame.xml",
-            "Interface\\FrameXML\\BonusActionBarFrame.xml",
-            // `ExhaustionTick_Update` reads `ReputationWatchBar`, which `ReputationFrame.xml`
-            // declares, after the templates its check boxes inherit.
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
             r"Interface\FrameXML\UIPanelTemplates.lua",
             r"Interface\FrameXML\UIPanelTemplates.xml",
             r"Interface\FrameXML\OptionsFrameTemplates.xml",
-            r"Interface\FrameXML\ReputationFrame.xml",
-            "Interface\\FrameXML\\ActionBarFrame.xml",
-            "Interface\\FrameXML\\UIDropDownMenu.xml",
-            "ScrollTemplates.xml",
-            r"Interface\FrameXML\UIPanelTemplates.lua",
-            r"Interface\FrameXML\UIPanelTemplates.xml",
-            "Interface\\FrameXML\\BasicControls.xml",
-            "Interface\\FrameXML\\LocaleProperties.lua",
-            "Interface\\FrameXML\\StaticPopup.xml",
-            "KeyBindingsPage.xml",
             // `UIOptionsFrame_Init` assigns the globals these rows capture at OnLoad as their
             // default, and `MultiActionBars.xml` writes into `UIOptionsFrameCheckButtons` at load.
             r"Interface\FrameXML\OptionsFrame.lua",
             r"Interface\FrameXML\UIOptionsFrame.xml",
-            "OptionsFrame.xml",
+            "Interface\\FrameXML\\StaticPopup.xml",
+            "Interface\\FrameXML\\TextStatusBar.lua",
+            "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\MainMenuBar.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+            "Interface\\FrameXML\\ActionButtonTemplate.xml",
+            "Interface\\FrameXML\\ActionBarFrame.xml",
             "Interface\\FrameXML\\MultiActionBars.xml",
+            // `ExhaustionTick_Update` reads `ReputationWatchBar`, which `ReputationFrame.xml`
+            // declares, after the templates its check boxes inherit.
+            r"Interface\FrameXML\ReputationFrame.xml",
+            "Interface\\FrameXML\\BonusActionBarFrame.xml",
+            "ScrollTemplates.xml",
+            "KeyBindingsPage.xml",
+            "OptionsFrame.xml",
         ],
-    );
-    harness_on(s)
+    )
 }
 
 /// Sliders read the stored value with the era's rounded-percent readout; checkboxes read the flag.
@@ -1301,87 +1272,54 @@ fn the_world_detail_slider_writes_the_cvar_and_the_readout_names_its_stop() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
-/// On the real manifest and CVar table: `UIParent_OnEvent` calls `UpdateNameplates()` on
-/// `VARIABLES_LOADED` and `PLAYER_ENTERING_WORLD` (`UIParent.lua:234`, `:367`), and here its verbs
-/// write the CVar pair that is the store. The setting survives only with both the host seeding
-/// `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` first and our `UpdateNameplates` without the stock
-/// friendly show-then-hide (`UIOptionsFrame.lua:775-776`).
+/// 1.12's slider 8, Spell Detail Level (`OptionsFrame.lua:32`), over `spellEffectLevel` on its
+/// 0..2 grid, labelled and tipped from the stock GlobalStrings.
 #[test]
-fn a_world_entry_leaves_the_saved_nameplate_setting_alone() {
-    let _data = benilla_formats::wow_data_or_skip!();
-    let mut s = UiScript::new().unwrap();
-    s.set_screen_size(1024.0, 768.0);
-    // The client never loads the manifest without a player.
-    s.set_unit(
-        "player",
-        Some(benilla_ui::script::UnitState {
-            exists: true,
-            name: Some("Probefour".into()),
-            level: 60,
-            ..Default::default()
-        }),
-    );
-    let failures = super::load_default_ui(&s);
-    assert!(failures.is_empty(), "loader errors: {failures:?}");
-    let _ = s.errors();
-
-    // Both halves on, restored from `config.toml`: a host write, which queues nothing.
-    let plates = crate::vplates::VPlateMode {
-        enemies: true,
-        friends: true,
-    };
-    let saved = |s: &mut UiScript| {
-        s.set_cvar_host(crate::vplates::CVAR_ENEMIES, "1");
-        s.set_cvar_host(crate::vplates::CVAR_FRIENDS, "1");
-        assert!(s.take_cvar_changes().is_empty(), "the host write is silent");
-    };
-
-    // The control: with the globals nil, the entry writes both halves off.
-    saved(&mut s);
-    s.fire_event("VARIABLES_LOADED", vec![]);
-    s.fire_event("PLAYER_ENTERING_WORLD", vec![]);
-    assert_eq!(
-        (
-            s.cvar(crate::vplates::CVAR_ENEMIES),
-            s.cvar(crate::vplates::CVAR_FRIENDS)
-        ),
-        (Some("0".into()), Some("0".into())),
-        "nil globals ⇒ the replay writes the store off — this is what the report saw"
-    );
-    let _ = s.take_cvar_changes();
-
-    // With the globals seeded by the host, the entry changes nothing.
-    saved(&mut s);
-    crate::vplates::push_plate_globals(&s, plates);
-    assert_eq!(
-        s.eval::<i64>("return NAMEPLATES_ON").unwrap(),
-        1,
-        "the reference's own truthiness — the NUMBER 1, never the truthy `0`"
-    );
-    s.fire_event("VARIABLES_LOADED", vec![]);
-    s.fire_event("PLAYER_ENTERING_WORLD", vec![]);
-    assert_eq!(
-        (
-            s.cvar(crate::vplates::CVAR_ENEMIES),
-            s.cvar(crate::vplates::CVAR_FRIENDS)
-        ),
-        (Some("1".into()), Some("1".into())),
-        "the player's setting survives the entry"
-    );
-    assert!(
-        s.take_cvar_changes().is_empty(),
-        "and queues nothing, so `config.toml` is never dirtied by a world entry"
-    );
-    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
-
-    // An addon that moves a global and calls the verb still writes the CVar.
-    s.run("FRIENDNAMEPLATES_ON = nil UpdateNameplates()")
+fn the_spell_detail_slider_reads_and_writes_the_spell_effect_level() {
+    benilla_formats::wow_data_or_skip!();
+    const ROW: &str = "BenillaOptionsFrameContainerBodyGraphicsRowSpellDetail";
+    let mut s = audio_harness();
+    s.set_cvar_host("spellEffectLevel", "1");
+    let mut s = harness_on(s);
+    s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
+    s.run("BenillaOptionsFrameCategoryListRowGraphics:Click()")
         .unwrap();
     assert_eq!(
-        s.take_cvar_changes(),
-        vec![(crate::vplates::CVAR_FRIENDS.to_string(), "0".to_string())],
-        "UpdateNameplates keeps its contract — it is adapted, not stubbed"
+        s.eval::<String>(&format!("return {ROW}Label:GetText()"))
+            .unwrap(),
+        s.eval::<String>("return SPELL_DETAIL").unwrap()
     );
+    assert_eq!(
+        s.eval::<String>(&format!("return {ROW}.tip")).unwrap(),
+        "OPTION_TOOLTIP_SPELL_DETAIL"
+    );
+    assert!(s
+        .eval::<bool>(&format!(
+            "return {ROW}ControlSlider:GetValue() == 1 and {ROW}ControlValue:GetText() == \"Medium\""
+        ))
+        .unwrap());
+    assert!(
+        s.take_cvar_changes().is_empty(),
+        "reading the CVar on select must not write it back"
+    );
+    // The reference's grid (`OptionsFrameSliders[8]`): 0 to 2, one apart.
+    assert!(s
+        .eval::<bool>(&format!(
+            "local lo, hi = {ROW}ControlSlider:GetMinMaxValues() \
+             return lo == 0 and hi == 2 and {ROW}ControlSlider:GetValueStep() == 1"
+        ))
+        .unwrap());
+    s.run(&format!("{ROW}ControlSlider:SetValue(0)")).unwrap();
+    assert_eq!(
+        s.take_cvar_changes(),
+        vec![("spellEffectLevel".to_string(), "0".to_string())]
+    );
+    assert_eq!(
+        s.eval::<String>(&format!("return {ROW}ControlValue:GetText()"))
+            .unwrap(),
+        "Low"
+    );
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
 #[test]
@@ -1427,19 +1365,46 @@ fn the_nameplates_page_toggles_the_unit_name_cvars() {
     }
     let _ = s.take_sounds();
 
-    // The CVars the V and Shift-V bindings write, so the window and the keys agree.
+    // The plate rows move the verbs and FrameXML's globals together, as the V and Shift-V
+    // bindings do, so the window and the keys agree and the saved variables carry it; no CVar.
+    use benilla_ui::script::{PLATE_BIT_ENEMY, PLATE_BIT_FRIEND};
+    let _ = s.take_nameplate_bit_writes();
+    let globals = |s: &UiScript| {
+        s.eval::<(Option<i64>, Option<i64>)>("return NAMEPLATES_ON, FRIENDNAMEPLATES_ON")
+            .unwrap()
+    };
+    s.run("BenillaOptionsFrameContainerBodyNameplatesRowFriendlyPlatesCheck:Click()")
+        .unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(0), PLATE_BIT_FRIEND);
+    assert_eq!(globals(&s), (None, Some(1)));
+    s.run("BenillaOptionsFrameContainerBodyNameplatesRowEnemyPlatesCheck:Click()")
+        .unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(0), PLATE_BIT_ENEMY);
+    assert_eq!(globals(&s), (Some(1), Some(1)));
     s.run("BenillaOptionsFrameContainerBodyNameplatesRowFriendlyPlatesCheck:Click()")
         .unwrap();
     assert_eq!(
-        s.take_cvar_changes(),
-        vec![(crate::vplates::CVAR_FRIENDS.to_string(), "1".to_string())]
+        s.take_nameplate_bit_writes()
+            .apply(PLATE_BIT_ENEMY | PLATE_BIT_FRIEND),
+        PLATE_BIT_ENEMY,
+        "unticking hides"
     );
-    s.run("BenillaOptionsFrameContainerBodyNameplatesRowEnemyPlatesCheck:Click()")
-        .unwrap();
     assert_eq!(
-        s.take_cvar_changes(),
-        vec![(crate::vplates::CVAR_ENEMIES.to_string(), "1".to_string())]
+        globals(&s),
+        (Some(1), None),
+        "the number 1 or nil, never a truthy \"0\""
     );
+    assert!(s.take_cvar_changes().is_empty(), "no plate CVar");
+    // A key moved the global behind the window's back: the rows read it.
+    s.run("FRIENDNAMEPLATES_ON = 1 BenillaOptionsFrameCategoryListRowNameplates:Click()")
+        .unwrap();
+    assert!(s
+        .eval::<bool>(
+            "return BenillaOptionsFrameContainerBodyNameplatesRowFriendlyPlatesCheck:GetChecked()"
+        )
+        .unwrap());
+    s.run("FRIENDNAMEPLATES_ON = nil").unwrap();
+    let _ = s.take_nameplate_bit_writes();
     let _ = s.take_sounds();
 
     // The interface panel's click kit (`PlayClickSound`, `OptionsFrame.lua:509-515`), not the
@@ -1758,7 +1723,7 @@ fn volumetric_fog_dropdown_is_localised_and_live() {
     // data-free checkout; the complete window additionally needs stock FrameXML.
     let xml = include_str!("../../assets/ui/OptionsFrame.xml");
     let strings = &xml[xml.find("BENILLA_ADVGFX_STRINGS = {").unwrap()
-        ..xml.find("OPTIONS_PAGE_ROWS = {").unwrap()];
+        ..xml.find("BENILLA_OPTIONS_PAGE_ROWS = {").unwrap()];
     let row = xml.split("<Frame name=\"$parentRowVolumetricFog\"").nth(1).unwrap();
     let on_load = row.split("<OnLoad>").nth(1).unwrap().split("</OnLoad>").next().unwrap();
     for (locale, title, labels) in [
@@ -1769,19 +1734,19 @@ fn volumetric_fog_dropdown_is_localised_and_live() {
         s.run(&format!("function GetLocale() return '{locale}' end")).unwrap();
         s.run(strings).unwrap();
         s.run(r#"
-            self = {}
-            function OptionsRow_OnLoad(row, cvar, title, tip)
+            this = {}
+            function BenillaOptionsRow_OnLoad(row, cvar, title, tip)
                 row.cvar, row.title, row.tip = cvar, title, tip
             end
-            function OptionsDropdownRow_Setup(row, choices) row.choices = choices end
+            function BenillaOptionsDropdownRow_Setup(row, choices) row.choices = choices end
         "#).unwrap();
         s.run(on_load).unwrap();
-        assert_eq!(s.eval::<String>("return self.title").unwrap(), title);
-        assert!(s.eval::<bool>("return getglobal(self.tip) == BENILLA_ADVGFX.tips.VOLUMETRIC_FOG and string.len(getglobal(self.tip)) > 80").unwrap());
+        assert_eq!(s.eval::<String>("return this.title").unwrap(), title);
+        assert!(s.eval::<bool>("return getglobal(this.tip) == BENILLA_ADVGFX.tips.VOLUMETRIC_FOG and string.len(getglobal(this.tip)) > 80").unwrap());
         for (tier, label) in labels.iter().enumerate() {
-            assert_eq!(s.eval::<String>(&format!("return self.choices[{}].text", tier + 1)).unwrap(), *label);
+            assert_eq!(s.eval::<String>(&format!("return this.choices[{}].text", tier + 1)).unwrap(), *label);
             let _ = s.take_cvar_changes();
-            s.run(&format!("SetCVar(self.cvar, self.choices[{}].value)", tier + 1)).unwrap();
+            s.run(&format!("SetCVar(this.cvar, this.choices[{}].value)", tier + 1)).unwrap();
             assert_eq!(s.take_cvar_changes(), vec![("volumetricFog".to_string(), tier.to_string())]);
         }
         if benilla_formats::wow_data().is_none() {
@@ -1792,12 +1757,12 @@ fn volumetric_fog_dropdown_is_localised_and_live() {
         s.run(&format!("function GetLocale() return '{locale}' end")).unwrap();
         let mut s = harness_on(s);
         s.run("ShowUIPanel(BenillaOptionsFrame) BenillaOptionsFrameCategoryListRowAdvancedGraphics:Click()").unwrap();
-        assert_eq!(s.eval::<String>("return OPTIONS_PAGE_ROWS.AdvancedGraphics[5]").unwrap(), "RowVolumetricFog");
+        assert_eq!(s.eval::<String>("return BENILLA_OPTIONS_PAGE_ROWS.AdvancedGraphics[5]").unwrap(), "RowVolumetricFog");
         assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowVolumetricFogLabel:GetText()")).unwrap(), title);
         assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowVolumetricFogDropdownText:GetText()")).unwrap(), labels[1]);
         let _ = s.take_cvar_changes();
         for (tier, label) in labels.iter().enumerate() {
-            s.run(&format!("OptionsRow_Set({ADVGFX}RowVolumetricFog, '{tier}') OptionsDropdown_ShowValue({ADVGFX}RowVolumetricFog)")).unwrap();
+            s.run(&format!("BenillaOptionsRow_Set({ADVGFX}RowVolumetricFog, '{tier}') BenillaOptionsDropdown_ShowValue({ADVGFX}RowVolumetricFog)")).unwrap();
             assert_eq!(s.take_cvar_changes(), vec![("volumetricFog".to_string(), tier.to_string())]);
             assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowVolumetricFogDropdownText:GetText()")).unwrap(), *label);
         }
@@ -1811,7 +1776,7 @@ fn ambient_occlusion_dropdown_is_localised_and_live() {
     benilla_formats::wow_data_or_skip!();
     let xml = include_str!("../../assets/ui/OptionsFrame.xml");
     let strings = &xml[xml.find("BENILLA_ADVGFX_STRINGS = {").unwrap()
-        ..xml.find("OPTIONS_PAGE_ROWS = {").unwrap()];
+        ..xml.find("BENILLA_OPTIONS_PAGE_ROWS = {").unwrap()];
     let row = xml.split("<Frame name=\"$parentRowAmbientOcclusion\"").nth(1).unwrap();
     let on_load = row.split("<OnLoad>").nth(1).unwrap().split("</OnLoad>").next().unwrap();
     for (locale, title, labels) in [
@@ -1822,20 +1787,20 @@ fn ambient_occlusion_dropdown_is_localised_and_live() {
         s.run(&format!("function GetLocale() return '{locale}' end")).unwrap();
         s.run(strings).unwrap();
         s.run(r#"
-            self = {}
-            function OptionsRow_OnLoad(row, cvar, title, tip)
+            this = {}
+            function BenillaOptionsRow_OnLoad(row, cvar, title, tip)
                 row.cvar, row.title, row.tip = cvar, title, tip
             end
-            function OptionsDropdownRow_Setup(row, choices) row.choices = choices end
+            function BenillaOptionsDropdownRow_Setup(row, choices) row.choices = choices end
         "#).unwrap();
         s.run(on_load).unwrap();
-        assert_eq!(s.eval::<String>("return self.title").unwrap(), title);
-        assert!(s.eval::<bool>("return getglobal(self.tip) == BENILLA_ADVGFX.tips.AMBIENT_OCCLUSION and string.len(getglobal(self.tip)) > 80").unwrap());
+        assert_eq!(s.eval::<String>("return this.title").unwrap(), title);
+        assert!(s.eval::<bool>("return getglobal(this.tip) == BENILLA_ADVGFX.tips.AMBIENT_OCCLUSION and string.len(getglobal(this.tip)) > 80").unwrap());
         // High first: the registered default is Off, and rewriting the same value is no change.
         for (tier, label) in labels.iter().enumerate().rev() {
-            assert_eq!(s.eval::<String>(&format!("return self.choices[{}].text", tier + 1)).unwrap(), *label);
+            assert_eq!(s.eval::<String>(&format!("return this.choices[{}].text", tier + 1)).unwrap(), *label);
             let _ = s.take_cvar_changes();
-            s.run(&format!("SetCVar(self.cvar, self.choices[{}].value)", tier + 1)).unwrap();
+            s.run(&format!("SetCVar(this.cvar, this.choices[{}].value)", tier + 1)).unwrap();
             assert_eq!(s.take_cvar_changes(), vec![("ambientOcclusion".to_string(), tier.to_string())]);
         }
     }
@@ -1846,7 +1811,7 @@ fn ambient_occlusion_dropdown_is_localised_and_live() {
 fn lamp_fog_dropdown_is_localised_and_live() {
     let xml = include_str!("../../assets/ui/OptionsFrame.xml");
     let strings = &xml[xml.find("BENILLA_ADVGFX_STRINGS = {").unwrap()
-        ..xml.find("OPTIONS_PAGE_ROWS = {").unwrap()];
+        ..xml.find("BENILLA_OPTIONS_PAGE_ROWS = {").unwrap()];
     let row = xml.split("<Frame name=\"$parentRowLampFog\"").nth(1).unwrap();
     let on_load = row.split("<OnLoad>").nth(1).unwrap().split("</OnLoad>").next().unwrap();
     for (locale, title, labels) in [
@@ -1863,34 +1828,34 @@ fn lamp_fog_dropdown_is_localised_and_live() {
         s.run(strings).unwrap();
         s.run(
             r#"
-            self = {}
-            function OptionsRow_OnLoad(row, cvar, title, tip)
+            this = {}
+            function BenillaOptionsRow_OnLoad(row, cvar, title, tip)
                 row.cvar, row.title, row.tip = cvar, title, tip
             end
-            function OptionsDropdownRow_Setup(row, choices) row.choices = choices end
+            function BenillaOptionsDropdownRow_Setup(row, choices) row.choices = choices end
         "#,
         )
         .unwrap();
         s.run(on_load).unwrap();
-        assert_eq!(s.eval::<String>("return self.title").unwrap(), title);
+        assert_eq!(s.eval::<String>("return this.title").unwrap(), title);
         assert!(s
             .eval::<bool>(
-                "return getglobal(self.tip) == BENILLA_ADVGFX.tips.LAMP_FOG and string.len(getglobal(self.tip)) > 80",
+                "return getglobal(this.tip) == BENILLA_ADVGFX.tips.LAMP_FOG and string.len(getglobal(this.tip)) > 80",
             )
             .unwrap());
         // `lampFog` registers at Off, so seed away from the first choice before asserting that
         // every selection produces the expected live write (the CVar layer suppresses no-ops).
-        s.run("SetCVar(self.cvar, '2')").unwrap();
+        s.run("SetCVar(this.cvar, '2')").unwrap();
         let _ = s.take_cvar_changes();
         for (tier, label) in labels.iter().enumerate() {
             assert_eq!(
-                s.eval::<String>(&format!("return self.choices[{}].text", tier + 1))
+                s.eval::<String>(&format!("return this.choices[{}].text", tier + 1))
                     .unwrap(),
                 *label
             );
             let _ = s.take_cvar_changes();
             s.run(&format!(
-                "SetCVar(self.cvar, self.choices[{}].value)",
+                "SetCVar(this.cvar, this.choices[{}].value)",
                 tier + 1
             ))
             .unwrap();
@@ -1915,15 +1880,15 @@ fn water_quality_writes_numeric_tiers_with_localised_labels() {
         s.run("ShowUIPanel(BenillaOptionsFrame) BenillaOptionsFrameCategoryListRowAdvancedGraphics:Click()").unwrap();
         // MONKEY (volumetric fog): account for the atmosphere row after water.
         // MONKEY (integration): Graphics Preset + Render Distance lead the page, then every programme row (sky, post, dither, fog, wet, wind, ao, lamp fog, window split, zone skyboxes): 33.
-        assert_eq!(s.eval::<usize>("return table.getn(OPTIONS_PAGE_ROWS.AdvancedGraphics)").unwrap(), 33);
-        assert_eq!(s.eval::<String>("return OPTIONS_PAGE_ROWS.AdvancedGraphics[4]").unwrap(), "RowWaterQuality");
-        assert_eq!(s.eval::<String>("return OPTIONS_PAGE_ROWS.AdvancedGraphics[23]").unwrap(), "RowLavaGlow");
+        assert_eq!(s.eval::<usize>("return table.getn(BENILLA_OPTIONS_PAGE_ROWS.AdvancedGraphics)").unwrap(), 33);
+        assert_eq!(s.eval::<String>("return BENILLA_OPTIONS_PAGE_ROWS.AdvancedGraphics[4]").unwrap(), "RowWaterQuality");
+        assert_eq!(s.eval::<String>("return BENILLA_OPTIONS_PAGE_ROWS.AdvancedGraphics[23]").unwrap(), "RowLavaGlow");
         assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowWaterQualityDropdownText:GetText()")).unwrap(), labels[1]);
         assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowLavaGlowLabel:GetText()")).unwrap(), lava_label);
         assert!(s.eval::<bool>("return BENILLA_TOOLTIP_WATER_QUALITY == BENILLA_ADVGFX.tips.WATER_QUALITY and BENILLA_TOOLTIP_LAVA_GLOW == BENILLA_ADVGFX.tips.LAVA_GLOW").unwrap());
         let _ = s.take_cvar_changes();
         for (tier, label) in labels.iter().enumerate() {
-            s.run(&format!("OptionsRow_Set({ADVGFX}RowWaterQuality, '{tier}') OptionsDropdown_ShowValue({ADVGFX}RowWaterQuality)")).unwrap();
+            s.run(&format!("BenillaOptionsRow_Set({ADVGFX}RowWaterQuality, '{tier}') BenillaOptionsDropdown_ShowValue({ADVGFX}RowWaterQuality)")).unwrap();
             assert_eq!(s.take_cvar_changes(), vec![("waterQuality".to_string(), tier.to_string())]);
             assert_eq!(s.eval::<String>(&format!("return {ADVGFX}RowWaterQualityDropdownText:GetText()")).unwrap(), *label);
         }
@@ -2089,12 +2054,12 @@ fn the_lighting_quality_row_writes_one_cvar_and_leaves_the_members_to_the_host()
         .unwrap();
     let _ = s.take_cvar_changes();
 
-    // The entry click's own body (`OptionsDropdownEntry_OnClick`), which is the row's Set
+    // The entry click's own body (`BenillaOptionsDropdownEntry_OnClick`), which is the row's Set
     // followed by the capsule's redisplay — driven directly so the test does not depend on the
     // shared dropdown kit's list geometry.
     s.run(&format!(
-        "OptionsRow_Set({ADVGFX}RowLightingQuality, \"Low\") \
-         OptionsDropdown_ShowValue({ADVGFX}RowLightingQuality)"
+        "BenillaOptionsRow_Set({ADVGFX}RowLightingQuality, \"Low\") \
+         BenillaOptionsDropdown_ShowValue({ADVGFX}RowLightingQuality)"
     ))
     .unwrap();
     assert_eq!(
@@ -2167,7 +2132,7 @@ fn the_advanced_graphics_masters_grey_what_they_gate() {
     s.run("BenillaOptionsFrameCategoryListRowAdvancedGraphics:Click()")
         .unwrap();
 
-    // A greyed row wears the DISABLE font — 1.12's own signal, and the one `OptionsRow_SetEnabled`
+    // A greyed row wears the DISABLE font — 1.12's own signal, and the one `BenillaOptionsRow_SetEnabled`
     // sets on every flavour of row whatever else it does to the control. Compared as an OBJECT,
     // not a name: `GetFontObject` answers the object (`script::font`).
     let live = |s: &UiScript, row: &str| -> bool {
@@ -2340,6 +2305,39 @@ fn the_controls_checkboxes_write_flags_with_the_interface_panel_kit() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
+/// Click-to-Move (`UIOptionsFrame.lua:7`) moves `AutoInteract`, which boots off as 1.12's Western
+/// client registers it (`0x603374`).
+#[test]
+fn the_controls_page_offers_click_to_move_on_autointeract() {
+    benilla_formats::wow_data_or_skip!();
+    let mut s = harness_on(audio_harness());
+    s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
+    let _ = s.take_cvar_changes();
+    let row = "BenillaOptionsFrameContainerBodyControlsRowClickToMove";
+    assert_eq!(
+        s.eval::<String>(&format!("return {row}Label:GetText()"))
+            .unwrap(),
+        "Click-to-Move"
+    );
+    assert!(
+        !s.eval::<bool>(&format!("return {row}Check:GetChecked()"))
+            .unwrap(),
+        "off by default"
+    );
+
+    s.run(&format!("{row}Check:Click()")).unwrap();
+    assert_eq!(
+        s.take_cvar_changes(),
+        vec![("AutoInteract".to_string(), "1".to_string())]
+    );
+    assert_eq!(
+        s.eval::<String>("return GetCVar(\"AutoInteract\")")
+            .unwrap(),
+        "1"
+    );
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
 #[test]
 fn defaults_resets_the_controls_page_to_registered_defaults() {
     benilla_formats::wow_data_or_skip!();
@@ -2377,7 +2375,7 @@ fn defaults_resets_the_controls_page_to_registered_defaults() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
-/// Run a few frames so the page body's fit converges: `OptionsScroll_Fit` reads the previous
+/// Run a few frames so the page body's fit converges: `BenillaOptionsScroll_Fit` reads the previous
 /// frame's rects.
 fn settle(s: &mut UiScript) {
     for _ in 0..4 {
@@ -2480,11 +2478,14 @@ fn a_broad_search_scrolls_the_page_instead_of_overflowing_it() {
         clip.bottom
     );
 
-    // Widget coordinates here, not the extract's pixels: the window carries `ERA_WINDOW_SCALE`.
+    // Widget coordinates here, not the extract's pixels: the window carries `BENILLA_ERA_WINDOW_SCALE`.
     let sf_bottom: f32 = s
         .eval("return BenillaOptionsFrameContainerScroll:GetBottom()")
         .unwrap();
-    let tail = |s: &UiScript| -> f32 { s.eval("return OptionsScroll_ContentBottom()").unwrap() };
+    let tail = |s: &UiScript| -> f32 {
+        s.eval("return BenillaOptionsScroll_ContentBottom()")
+            .unwrap()
+    };
     assert!(
         tail(&s) < sf_bottom,
         "the tail starts below the fold ({} vs {sf_bottom})",
@@ -2606,7 +2607,7 @@ fn the_page_scroll_bar_wears_the_trough_with_its_arrows_in_the_sockets() {
 
 // ── The row tooltips ─────────────────────────────────────────────────────────────
 
-/// Hover a row's label half, 60 units in at mid-height. Callers pin `ERA_WINDOW_SCALE = 1` first,
+/// Hover a row's label half, 60 units in at mid-height. Callers pin `BENILLA_ERA_WINDOW_SCALE = 1` first,
 /// so the row's rect and the pointer share coordinates.
 fn hover_label(s: &mut UiScript, frame: &str) {
     s.resolve();
@@ -2650,7 +2651,7 @@ fn a_hovered_row_raises_its_1_12_description_on_the_era_seat() {
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
     s.run("OPTION_TOOLTIP_GAMEFIELD_DESELECT = \"Checking this will prevent the deselection.\"")
         .unwrap();
-    s.run("ERA_WINDOW_SCALE = 1").unwrap();
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap();
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
 
     let row = "BenillaOptionsFrameContainerBodyControlsRowStickyTarget";
@@ -2719,7 +2720,7 @@ fn a_row_with_no_1_12_string_raises_no_plate() {
     let mut s = harness_on(audio_harness());
     s.run("OPTION_TOOLTIP_GAMEFIELD_DESELECT = \"Sticky's own description.\"")
         .unwrap();
-    s.run("ERA_WINDOW_SCALE = 1").unwrap();
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap();
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
     hover_label(
         &mut s,
@@ -2739,10 +2740,10 @@ fn a_row_with_no_1_12_string_raises_no_plate() {
     );
 
     // Sticky's plate up, then straight into the mute row with no OnLeave in between.
-    s.run("OptionsRow_Hover(BenillaOptionsFrameContainerBodyControlsRowStickyTarget, 1)")
+    s.run("BenillaOptionsRow_Hover(BenillaOptionsFrameContainerBodyControlsRowStickyTarget, 1)")
         .unwrap();
     assert!(s.eval::<bool>("return GameTooltip:IsVisible()").unwrap());
-    s.run("OptionsRow_Hover(BenillaOptionsFrameContainerBodyControlsRowAutoLoot, 1)")
+    s.run("BenillaOptionsRow_Hover(BenillaOptionsFrameContainerBodyControlsRowAutoLoot, 1)")
         .unwrap();
     assert!(
         !s.eval::<bool>("return GameTooltip:IsVisible()").unwrap(),
@@ -2770,7 +2771,7 @@ fn every_row_tooltip_key_resolves_in_the_real_global_strings() {
     let listing: String = s
         .eval(
             "local out = {} \
-             for page, rows in pairs(OPTIONS_PAGE_ROWS) do \
+             for page, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do \
                for _, rkey in ipairs(rows) do \
                  local row = getglobal(\"BenillaOptionsFrameContainerBody\" .. page .. rkey) \
                  table.insert(out, page .. rkey .. \"=\" .. (row.tip or \"\")) \
@@ -2914,11 +2915,11 @@ fn every_row_tooltip_key_resolves_in_the_real_global_strings() {
         );
         checked += 1;
     }
-    // 81 rows less the three untipped below; four of the 78 carry a `BENILLA_` key, and a dropdown
+    // 83 rows less the three untipped below; four of the 80 carry a `BENILLA_` key, and a dropdown
     // row is checked on the key it wears at rest.
     // MONKEY (graphics programme): the Advanced Graphics page's tipped rows (lighting, water,
-    // lava, fog, daylight, Graphics Preset, Render Distance, ...) add 20. 78 -> 98.
-    assert_eq!(checked, 98, "every tipped row carries a live key");
+    // lava, fog, daylight, Graphics Preset, Render Distance, ...) add 20. Upstream 80 -> 100.
+    assert_eq!(checked, 100, "every tipped row carries a live key");
     assert_eq!(
         untipped,
         vec![
@@ -2952,7 +2953,7 @@ fn every_flavor_of_row_raises_its_plate_from_the_page_it_lives_on() {
     let mut s = harness_on(audio_harness());
     // Stand-in strings for every key the rows name.
     s.run(
-        "for page, rows in pairs(OPTIONS_PAGE_ROWS) do \
+        "for page, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do \
            for _, rkey in ipairs(rows) do \
              local row = getglobal(\"BenillaOptionsFrameContainerBody\" .. page .. rkey) \
              if row.tip then setglobal(row.tip, \"described: \" .. rkey) end \
@@ -2960,7 +2961,7 @@ fn every_flavor_of_row_raises_its_plate_from_the_page_it_lives_on() {
          end",
     )
     .unwrap();
-    s.run("ERA_WINDOW_SCALE = 1").unwrap();
+    s.run("BENILLA_ERA_WINDOW_SCALE = 1").unwrap();
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
 
     let mut raised = 0;
@@ -2981,7 +2982,7 @@ fn every_flavor_of_row_raises_its_plate_from_the_page_it_lives_on() {
             .unwrap();
         let rows: String = s
             .eval(&format!(
-                "return table.concat(OPTIONS_PAGE_ROWS.{page}, \",\")"
+                "return table.concat(BENILLA_OPTIONS_PAGE_ROWS.{page}, \",\")"
             ))
             .unwrap();
         for rkey in rows.split(',') {
@@ -3017,13 +3018,13 @@ fn every_flavor_of_row_raises_its_plate_from_the_page_it_lives_on() {
             s.errors()
         );
     }
-    // Every tipped row: the same 78 the key census counts.
-    // MONKEY (graphics programme): the Advanced Graphics page's described rows add 19. 78 -> 97.
-    assert_eq!(raised, 97, "every row but Auto Loot raises a description");
+    // Every tipped row: the same 80 the key census counts.
+    // MONKEY (graphics programme): the Advanced Graphics page's described rows add 19. 80 -> 99.
+    assert_eq!(raised, 99, "every row but Auto Loot raises a description");
 }
 
 /// 1.12's AdvancedOptionsCombatText box as saved-global rows: a click writes the global, never a
-/// CVar, and runs the family's apply, `CombatText_UpdateOrLoad`.
+/// CVar, and runs the family's apply, `BenillaCombatText_UpdateOrLoad`.
 #[test]
 fn the_combat_page_writes_saved_variable_globals_and_applies_them() {
     benilla_formats::wow_data_or_skip!();
@@ -3872,7 +3873,7 @@ fn the_defaults_button_is_armed_by_rows_not_by_a_category() {
     s.run("ShowUIPanel(BenillaOptionsFrame)").unwrap();
 
     let keys: Vec<String> = s
-        .eval::<String>("return table.concat(OPTIONS_CATEGORY_KEYS, \",\")")
+        .eval::<String>("return table.concat(BENILLA_OPTIONS_CATEGORY_KEYS, \",\")")
         .unwrap()
         .split(',')
         .map(str::to_string)
@@ -3885,8 +3886,8 @@ fn the_defaults_button_is_armed_by_rows_not_by_a_category() {
     for key in &keys {
         let has_rows = s
             .eval::<bool>(&format!(
-                "return OPTIONS_PAGE_ROWS[\"{key}\"] ~= nil and \
-                 getn(OPTIONS_PAGE_ROWS[\"{key}\"]) > 0"
+                "return BENILLA_OPTIONS_PAGE_ROWS[\"{key}\"] ~= nil and \
+                 getn(BENILLA_OPTIONS_PAGE_ROWS[\"{key}\"]) > 0"
             ))
             .unwrap();
         assert!(
@@ -4178,8 +4179,7 @@ fn the_status_bar_text_row_pins_the_numerals_the_moment_it_is_clicked() {
         s.take_cvar_changes(),
         vec![("statusBarText".to_string(), "1".to_string())]
     );
-    // No repaint and no XP tick: only the queued `CVAR_UPDATE`.
-    s.tick(0.0);
+    // No repaint, no XP tick and no frame: only the `CVAR_UPDATE` the click fired.
     assert!(
         s.eval::<bool>("return MainMenuBarExpText:IsShown()")
             .unwrap(),
@@ -4188,7 +4188,6 @@ fn the_status_bar_text_row_pins_the_numerals_the_moment_it_is_clicked() {
 
     s.run("BenillaOptionsFrameContainerBodyInterfaceRowStatusTextCheck:Click()")
         .unwrap();
-    s.tick(0.0);
     assert!(!s
         .eval::<bool>("return MainMenuBarExpText:IsShown()")
         .unwrap());
@@ -4608,7 +4607,7 @@ fn the_two_option_tabs_fit_their_labels_at_the_drawn_scale() {
     assert_eq!(
         num(&mut s, "BenillaOptionsFrame:GetScale()"),
         0.78,
-        "ERA_WINDOW_SCALE"
+        "BENILLA_ERA_WINDOW_SCALE"
     );
 
     for tab in ["BenillaOptionsFrameGameTab", "BenillaOptionsFrameAddOnsTab"] {
@@ -4681,17 +4680,6 @@ fn without_a_seated_measurer_the_same_fit_reads_zero() {
 // nothing and reads back nil, so its box would offer a setting benilla does not have. A CVar is
 // registered only once something reads it.
 const UNBACKED_REFERENCE_CVARS: &[(&str, &str)] = &[
-    (
-        "autointeract",
-        "click-to-move — the one row here that is a whole movement mode rather than a knob. \
-         `CanAutoInteract 0x60f900` gates the world-click pick mask's bit 0 and inverts \
-         `0x5ec110`'s interaction-distance refusal, so an out-of-range corpse/GO/NPC/cast click \
-         queues an approach (`0x60fed0`, move kinds 6/7/9/0xa) instead of refusing. The commit \
-         itself puts NOTHING on the wire — it stamps a local goal at `0x611130` — and the packets \
-         are its consequences (a stand, then the original verb on arrival). benilla has only the \
-         keyboard controller and /follow (mode 3). Registered default is \"0\" on every locale but \
-         koKR (`0x603374` selects on the locale index), so stock West ships it OFF",
-    ),
     (
         "UnitNamePlayerPVPTitle",
         "the PvP rank prefix on the overhead name line — slot a4 of `0x608f50`, bit `0x20` of the \
@@ -4798,7 +4786,7 @@ fn every_registered_reference_cvar_has_a_row_on_our_own_window() {
     let ours: std::collections::HashSet<String> = s
         .eval::<Vec<String>>(
             "local out = {} \
-             for page, rows in pairs(OPTIONS_PAGE_ROWS) do \
+             for page, rows in pairs(BENILLA_OPTIONS_PAGE_ROWS) do \
                  for _, rkey in ipairs(rows) do \
                      local row = getglobal(\"BenillaOptionsFrameContainerBody\" .. page .. rkey) \
                      if row.cvar then table.insert(out, row.cvar) end \
@@ -5038,7 +5026,7 @@ fn the_guild_line_greys_with_player_names_and_the_follow_speed_with_the_style()
         .unwrap()
     };
     assert!(speed_thumb(&mut s));
-    s.run("SetCVar(\"cameraSmoothStyle\", \"0\") OptionsPage_Refresh(\"Controls\")")
+    s.run("SetCVar(\"cameraSmoothStyle\", \"0\") BenillaOptionsPage_Refresh(\"Controls\")")
         .unwrap();
     assert!(
         !speed_thumb(&mut s),
@@ -5052,7 +5040,7 @@ fn the_guild_line_greys_with_player_names_and_the_follow_speed_with_the_style()
              :IsMouseEnabled()"
         )
         .unwrap());
-    s.run("SetCVar(\"cameraSmoothStyle\", \"1\") OptionsPage_Refresh(\"Controls\")")
+    s.run("SetCVar(\"cameraSmoothStyle\", \"1\") BenillaOptionsPage_Refresh(\"Controls\")")
         .unwrap();
     assert!(speed_thumb(&mut s));
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
@@ -5068,7 +5056,7 @@ fn farclip_slider_range_is_the_view_range() {
         .nth(1)
         .expect("the farclip row");
     let args = row
-        .split("OptionsSliderRow_Setup(self, ")
+        .split("BenillaOptionsSliderRow_Setup(this, ")
         .nth(1)
         .and_then(|rest| rest.split(')').next())
         .expect("the slider setup call");
diff --git a/crates/benilla-app/src/ui_script/panel_template_tests.rs b/crates/benilla-app/src/ui_script/panel_template_tests.rs
index 7e377d7b..84ab0e32 100644
--- a/crates/benilla-app/src/ui_script/panel_template_tests.rs
+++ b/crates/benilla-app/src/ui_script/panel_template_tests.rs
@@ -6,29 +6,29 @@ use benilla_ui::script::UiScript;
 
 use super::test_ui::load_ui as load_xml;
 
-/// The files under test on the manifest prefix they sit on, in manifest order.
+/// The files under test on the manifest prefix they sit on, in the production order.
 fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        r"Interface\FrameXML\CharacterFrameTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        r"Interface\FrameXML\OptionsFrameTemplates.xml",
         // `UIOptionsCheckButtonTemplate`'s home (`UIOptionsFrame.xml:6`), after the dropdown kit
         // its window uses.
         r"Interface\FrameXML\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        r"Interface\FrameXML\OptionsFrameTemplates.xml",
+        r"Interface\FrameXML\CharacterFrameTemplates.xml",
         r"Interface\FrameXML\UIOptionsFrame.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/panel_tests.rs b/crates/benilla-app/src/ui_script/panel_tests.rs
index 10ce0c98..c7a08ca0 100644
--- a/crates/benilla-app/src/ui_script/panel_tests.rs
+++ b/crates/benilla-app/src/ui_script/panel_tests.rs
@@ -31,15 +31,14 @@ fn shipped_gossip_frame_drives_end_to_end() {
     // `GossipResize` reads `GetTextHeight()` right after `SetText`, so the harness installs the
     // synchronous measurer the app always has; without one a row sizes from last frame's text.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     // 43 frames, 32 of them the row pool that quests and options share (`NUMGOSSIPBUTTONS`).
     assert_eq!(
@@ -47,6 +46,7 @@ fn shipped_gossip_frame_drives_end_to_end() {
         43,
         "the stock file's own shape — ours materialized 41"
     );
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.resolve();
     let vendor_icon = |quads: &[ExtractedQuad]| {
@@ -68,12 +68,10 @@ fn shipped_gossip_frame_drives_end_to_end() {
             GossipOptionView {
                 label: "Let me browse your goods.".into(),
                 icon_type: "vendor".into(),
-                coded: false,
             },
             GossipOptionView {
                 label: "I wish to sign the petition.".into(),
                 icon_type: "gossip".into(),
-                coded: true,
             },
         ],
     }));
@@ -86,8 +84,7 @@ fn shipped_gossip_frame_drives_end_to_end() {
             .unwrap(),
         "Greetings, traveler. How may I help you?"
     );
-    // The coded row is enabled too: `GossipFrameOptionsUpdate` has no coded-option handling
-    // (`GossipFrame.lua:111-128`). A coded option is sent without a code; that path is not built.
+    // Every row is enabled: `GossipFrameOptionsUpdate` greys none (`GossipFrame.lua:111-128`).
     let states: (bool, bool, bool, bool) = s
         .eval(
             "return GossipTitleButton1:IsVisible(), GossipTitleButton1:IsEnabled() ~= 0,\n\
@@ -200,17 +197,17 @@ fn shipped_gossip_frame_renders_quest_rows_above_options() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_gossip(Some(GossipMenu {
         greeting: "A word, traveler.".into(),
@@ -229,7 +226,6 @@ fn shipped_gossip_frame_renders_quest_rows_above_options() {
         options: vec![GossipOptionView {
             label: "Let me browse your goods.".into(),
             icon_type: "vendor".into(),
-            coded: false,
         }],
     }));
     s.fire_event("GOSSIP_SHOW", vec![]);
@@ -322,23 +318,22 @@ fn shipped_gossip_rows_grow_to_their_wrapped_labels() {
     // `GossipResize` reads `GetTextHeight()` right after `SetText`, so the harness installs the
     // synchronous measurer the app always has; without one a row sizes from last frame's text.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     // Three options that wrap at the label's 275 px (`GossipFrame.xml:114`).
     let long = |t: &str| GossipOptionView {
         label: t.into(),
         icon_type: "gossip".into(),
-        coded: false,
     };
     s.set_gossip(Some(GossipMenu {
         greeting: "Make your choice!".into(),
@@ -423,17 +418,17 @@ fn gossip_show_hide_plays_open_and_close_kits() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     assert!(
         s.take_sounds().is_empty(),
@@ -467,18 +462,22 @@ fn shipped_panel_slot_replaces_gossip_with_merchant() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        &[
+            r"Interface\FrameXML\GlobalStrings.lua",
+            r"Interface\FrameXML\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\GossipFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+        super::test_ui::MERCHANT_UI,
+        &["Interface\\FrameXML\\MerchantFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     s.set_gossip(Some(GossipMenu {
         greeting: "Well met.".into(),
@@ -486,7 +485,6 @@ fn shipped_panel_slot_replaces_gossip_with_merchant() {
         options: vec![GossipOptionView {
             label: "Let me browse your goods.".into(),
             icon_type: "vendor".into(),
-            coded: false,
         }],
     }));
     s.fire_event("GOSSIP_SHOW", vec![]);
@@ -549,18 +547,22 @@ fn displacing_an_npc_window_ends_the_displaced_session() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        &[
+            r"Interface\FrameXML\GlobalStrings.lua",
+            r"Interface\FrameXML\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            "Interface\\FrameXML\\GossipFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+        super::test_ui::MERCHANT_UI,
+        &["Interface\\FrameXML\\MerchantFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     // The vendor holds the left slot; drain what opening it queued.
     s.set_merchant(Some(MerchantState::default()));
@@ -598,17 +600,21 @@ fn shipped_panel_slot_pushable_promotes_to_center() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    for f in super::test_ui::MERCHANT_UI {
+    for f in crate::ui_script::test_ui::production_order(&[
+        &[
+            r"Interface\FrameXML\GlobalStrings.lua",
+            r"Interface\FrameXML\BasicControls.xml",
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+        super::test_ui::MERCHANT_UI,
+        &["Interface\\FrameXML\\MerchantFrame.xml"],
+    ]) {
         load_xml(&s, f);
     }
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
 
     // A new frame starts shown, and `ShowUIPanel` ignores a visible one (`UIParent.lua:650`).
     s.run(
@@ -688,23 +694,23 @@ fn gossip_bank_option_hands_the_left_slot_to_the_bank() {
     let order_first = |bank_first: bool| {
         let mut s = UiScript::new().unwrap();
         s.set_screen_size(1024.0, 768.0);
-        load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-        load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml"); // the bank slots inherit it
-        load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-        load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-        load_xml(&s, r"Interface\FrameXML\UIParent.xml");
         load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+        load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
         load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
         load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-        load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-        load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
+        load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+        load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+        load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
         load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-        load_xml(&s, "ScrollTemplates.xml");
         // Before BankFrame: its buttons inherit these templates, and `inherits=` resolves at load.
         load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
         load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+        load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+        load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
+        load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml"); // the bank slots inherit it
         load_xml(&s, "Interface\\FrameXML\\BankFrame.xml");
         load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+        load_xml(&s, "ScrollTemplates.xml");
 
         s.set_gossip(Some(GossipMenu {
             greeting: "Welcome to the bank of Ironforge!".into(),
@@ -712,7 +718,6 @@ fn gossip_bank_option_hands_the_left_slot_to_the_bank() {
             options: vec![GossipOptionView {
                 label: "I would like to check my deposit box.".into(),
                 icon_type: "money".into(),
-                coded: false,
             }],
         }));
         s.fire_event("GOSSIP_SHOW", vec![]);
@@ -762,17 +767,17 @@ fn an_overflowing_gossip_menu_scrolls_instead_of_spilling() {
     // `GossipResize` reads `GetTextHeight()` right after `SetText`, so the harness installs the
     // synchronous measurer the app always has; without one a row sizes from last frame's text.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml"); // UIPanelScrollFrameTemplate
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml"); // UIPanelScrollFrameTemplate
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
 
     // Eight options of about four lines each, far past the 334 px frame (`GossipFrame.xml:225`).
     let long = |n: usize| GossipOptionView {
@@ -781,7 +786,6 @@ fn an_overflowing_gossip_menu_scrolls_instead_of_spilling() {
              broken the law of the land and it is my sworn duty to enforce it, whatever the cost."
         ),
         icon_type: "gossip".into(),
-        coded: false,
     };
     s.set_gossip(Some(GossipMenu {
         greeting: "Make your choice!".into(),
@@ -897,17 +901,17 @@ fn an_addons_own_frame_registered_in_uipanelwindows_takes_the_left_slot() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml"); // UIPanelScrollFrameTemplate
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml"); // UIPanelScrollFrameTemplate
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\GossipFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
 
     s.run(
         r#"AddonPanel = CreateFrame("Frame", "AddonPanel", UIParent)
@@ -964,16 +968,16 @@ fn an_addons_own_frame_registered_in_uipanelwindows_takes_the_left_slot() {
 fn the_panel_registry_rows_match_the_reference_bytes() {
     let _data = benilla_formats::wow_data_or_skip!();
     let s = UiScript::new().unwrap();
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     for probe in [
         // UIParent.lua:20
         "UIPanelWindows['ItemTextFrame'].area == 'left'",
@@ -1005,14 +1009,14 @@ fn a_dead_player_opens_only_whiledead_windows() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.set_unit(
         "player",
@@ -1072,14 +1076,14 @@ fn a_frame_arriving_at_center_puts_the_child_windows_away() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
 
     // MerchantFrame (pushable 0) holds left; TradeFrame (pushable 1) arrives at center
diff --git a/crates/benilla-app/src/ui_script/perf_bar_tests.rs b/crates/benilla-app/src/ui_script/perf_bar_tests.rs
index 8ac72e4c..6c37a9a3 100644
--- a/crates/benilla-app/src/ui_script/perf_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/perf_bar_tests.rs
@@ -9,20 +9,24 @@ use super::test_ui::load_ui as load_xml;
 fn harness(extra: &[&str]) -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-    for f in extra {
+    for f in crate::ui_script::test_ui::production_order(&[
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            "Interface\\FrameXML\\TextStatusBar.lua",
+            "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\MainMenuBar.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+            "Interface\\FrameXML\\ActionButtonTemplate.xml",
+            "Interface\\FrameXML\\ActionBarFrame.xml",
+            "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        ],
+        extra,
+    ]) {
         load_xml(&s, f);
     }
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
diff --git a/crates/benilla-app/src/ui_script/pet_bar_tests.rs b/crates/benilla-app/src/ui_script/pet_bar_tests.rs
index 22319ead..3dcb68be 100644
--- a/crates/benilla-app/src/ui_script/pet_bar_tests.rs
+++ b/crates/benilla-app/src/ui_script/pet_bar_tests.rs
@@ -4,39 +4,39 @@ use benilla_ui::script::{PetActionView, QuadContent, UiScript};
 
 use super::test_ui::load_ui as load_xml;
 
-/// The pet bar's chain in manifest order, then the chat window, whose edit box `ShowPetActionBar`
-/// raises over the sliding bar (PetActionBarFrame.lua:175).
+/// The pet bar's chain in the production order, then the chat window, whose edit box
+/// `ShowPetActionBar` raises over the sliding bar (PetActionBarFrame.lua:175).
 pub(super) fn load_pet_bar(s: &UiScript) {
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "Interface\\FrameXML\\UIMenu.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\MultiActionBars.xml",
+        "Interface\\FrameXML\\ChatFrame.xml",
+        "Interface\\FrameXML\\FloatingChatFrame.xml",
+        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\PetActionBarFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
         "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "Interface\\FrameXML\\MultiActionBars.xml",
-        "Interface\\FrameXML\\PetActionBarFrame.xml",
-        "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
-        "Interface\\FrameXML\\FloatingChatFrame.xml",
     ] {
         load_xml(s, file);
     }
@@ -443,7 +443,7 @@ fn dragging_a_pet_spell_between_slots_moves_it_through_the_shipped_handlers() {
         0,
         "the grid goes down with the payload"
     );
-    assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+    assert!(s.cursor_payload().is_none());
 }
 
 /// `LOCK_ACTIONBAR` stops both drag ends (PetActionBarFrame.lua:270,278) but not the shift-click
@@ -466,7 +466,7 @@ fn the_lock_stops_the_pet_bar_drag_but_not_its_shift_click() {
         s.take_pet_set_actions().is_empty(),
         "a locked bar sends nothing — the slot was never picked up"
     );
-    assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+    assert!(s.cursor_payload().is_none());
 
     s.set_modifiers(true, false, false);
     s.run("this = PetActionButton4; PetActionButton_OnClick(\"LeftButton\")")
@@ -590,7 +590,7 @@ fn hovered_pet_bar() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     // The app's registries: `BONUSACTIONBUTTON1` binds CTRL-1 and `UberTooltips` reads "1".
-    s.register_bindings(&crate::bindings::registry_commands());
+    crate::ui_script::load_stock_bindings(&mut s);
     s.register_cvars(crate::cvars::registered_pairs());
     load_pet_bar(&s);
     declare_token_strings(&s);
diff --git a/crates/benilla-app/src/ui_script/pet_frame_tests.rs b/crates/benilla-app/src/ui_script/pet_frame_tests.rs
index ae4e79df..7327e6a9 100644
--- a/crates/benilla-app/src/ui_script/pet_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/pet_frame_tests.rs
@@ -1,4 +1,5 @@
-//! The stock pet frame, `PetFrame.xml`, over synthetic `"pet"` snapshots and the feed's events.
+//! The stock pet frame, `PetFrame.xml`, over `"pet"` snapshots built from synthetic descriptors
+//! and the feed's events.
 //! `UNIT_PET` names the owner (`arg1 == "player"`, `0x4bc84f`) and every other `UNIT_*` names the
 //! pet: a frame that mixes the two repaints off the player's health.
 
@@ -14,18 +15,18 @@ fn load_pet_frame() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\CombatFeedback.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PlayerFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PartyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\TargetFrame.xml");
@@ -48,22 +49,28 @@ fn load_pet_frame() -> UiScript {
     s
 }
 
-/// A pet snapshot; `max_power == 0` is a powerless pet, which swaps the art.
+/// A pet snapshot off a descriptor through the real [`crate::ui_unit::snapshot`], as the `"pet"`
+/// feed builds it, so whatever that builder leaves unset (the connection flag included) reaches the
+/// stock frame here as it does in game; `max_power == 0` is a powerless pet, which swaps the art.
 fn pet(name: &str, health: u32, power: u32, max_power: u32, power_type: u8) -> UnitState {
-    UnitState {
-        exists: true,
-        name: Some(name.into()),
-        health,
-        max_health: 100,
-        level: 60,
-        power_type,
-        power,
-        max_power,
-        // The feed marks every unit it pushes connected; stock `UnitFrameManaBar_Update` greys a
-        // disconnected unit's bar (UnitFrame.lua:214-216).
-        is_connected: true,
-        ..UnitState::default()
-    }
+    // `UNIT_FIELD_` HEALTH, POWER1, MAXHEALTH, MAXPOWER1, LEVEL, BYTES_0 (the power type is its
+    // byte 3), the power pair at its type's slot.
+    const HEALTH: u16 = 22;
+    const POWER1: u16 = 23;
+    const MAXHEALTH: u16 = 28;
+    const MAXPOWER1: u16 = 29;
+    const LEVEL: u16 = 34;
+    const BYTES_0: u16 = 36;
+    let slot = u16::from(power_type);
+    let store = crate::net::ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+        (HEALTH, health),
+        (MAXHEALTH, 100),
+        (LEVEL, 60),
+        (BYTES_0, u32::from(power_type) << 24),
+        (POWER1 + slot, power),
+        (MAXPOWER1 + slot, max_power),
+    ]));
+    crate::ui_unit::snapshot(&store, 0, Some(name.into()), 0, None, Default::default())
 }
 
 /// Every texture path drawn this frame, with its vertex tint.
@@ -260,8 +267,15 @@ fn the_debuff_row_fills_from_the_pets_own_auras() {
     s.set_unit("pet", Some(pet("Grimjaw", 72, 45, 80, 0)));
     s.fire_event("UNIT_PET", vec![ScriptValue::Str("player".into())]);
 
-    s.set_auras(
-        "pet",
+    // `"pet"` resolves to the pet's guid, whose list the row reads.
+    const PET: u64 = 0xF140_0000_0000_0077;
+    s.set_unit_guids(&benilla_ui::script::UnitGuids {
+        player: 1,
+        pet: PET,
+        ..Default::default()
+    });
+    s.set_unit_auras(
+        PET,
         Some(vec![pet_buff(1000, "Rend", 1), pet_buff(1001, "Sunder", 3)]),
     );
     s.fire_event("UNIT_AURA", vec![ScriptValue::Str("pet".into())]);
@@ -289,7 +303,7 @@ fn the_debuff_row_fills_from_the_pets_own_auras() {
     );
     assert!(draws(&mut s, "Interface\\Icons\\Spell_1001"));
 
-    s.set_auras("pet", Some(vec![]));
+    s.set_unit_auras(PET, Some(vec![]));
     s.fire_event("UNIT_AURA", vec![ScriptValue::Str("pet".into())]);
     assert!(!s
         .eval::<bool>("return PetFrameDebuff1:IsVisible()")
diff --git a/crates/benilla-app/src/ui_script/pet_stable_tests.rs b/crates/benilla-app/src/ui_script/pet_stable_tests.rs
index 2e1f756a..543fd31a 100644
--- a/crates/benilla-app/src/ui_script/pet_stable_tests.rs
+++ b/crates/benilla-app/src/ui_script/pet_stable_tests.rs
@@ -12,13 +12,13 @@ const STABLE_UI: &[&str] = &[
     r"Interface\FrameXML\GlobalStrings.lua",
     r"Interface\FrameXML\Fonts.xml",
     r"Interface\FrameXML\BasicControls.xml",
-    r"Interface\FrameXML\ItemButtonTemplate.xml",
+    r"Interface\FrameXML\UIParent.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\GameTooltip.xml",
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
-    r"Interface\FrameXML\GameTooltip.xml",
+    r"Interface\FrameXML\ItemButtonTemplate.xml",
     r"Interface\FrameXML\PetStable.xml",
 ];
 
diff --git a/crates/benilla-app/src/ui_script/petition_tests.rs b/crates/benilla-app/src/ui_script/petition_tests.rs
index 517d2609..d2995a4a 100644
--- a/crates/benilla-app/src/ui_script/petition_tests.rs
+++ b/crates/benilla-app/src/ui_script/petition_tests.rs
@@ -54,7 +54,7 @@ function BuyGuildCharter(name) record("BuyGuildCharter:" .. name) end
 function RenamePetition(name) record("RenamePetition:" .. name) end
 "#;
 
-/// The windows' manifest slice in `benilla.toc` order, the fixture first; `MoneyFrame.xml` comes
+/// The windows' slice of the production load, the fixture first; `MoneyFrame.xml` comes
 /// before the registrar, whose price row inherits `MoneyFrameTemplate` at load.
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
@@ -64,29 +64,27 @@ fn setup() -> UiScript {
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    // `QuestFrame.xml` includes `QuestTitleButtonTemplate`, which the registrar's rows inherit.
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
     // `ChatFrameEditBox`, which the stock purchase button focuses unguarded
     // (`GuildRegistrarFrame.xml:271`).
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // TOOLTIP_DEFAULT_COLOR, for dropdowns
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml"); // ChatFrame's dropdowns inherit it
     load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit the chat menus build from
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml"); // ChatFrame's dropdowns inherit it
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    // `QuestFrame.xml` includes `QuestTitleButtonTemplate`, which the registrar's rows inherit.
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GuildRegistrarFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PetitionFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     s
 }
 
diff --git a/crates/benilla-app/src/ui_script/quest_share_tests.rs b/crates/benilla-app/src/ui_script/quest_share_tests.rs
index 3f35be65..f9b34c26 100644
--- a/crates/benilla-app/src/ui_script/quest_share_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_share_tests.rs
@@ -8,15 +8,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s
 }
diff --git a/crates/benilla-app/src/ui_script/quest_tests.rs b/crates/benilla-app/src/ui_script/quest_tests.rs
index bcf828e3..2564d741 100644
--- a/crates/benilla-app/src/ui_script/quest_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_tests.rs
@@ -11,18 +11,17 @@ fn questgiver_show_hide_plays_open_and_close_kits() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -71,18 +70,17 @@ fn panel_events_show_exactly_one_child_panel_and_hide_the_others() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -162,18 +160,17 @@ fn detail_panel_reward_grid_follows_the_refs_two_per_row_layout() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -258,18 +255,17 @@ fn reward_panel_choice_click_selects_and_completes_with_zero_based_index() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -335,18 +331,17 @@ fn greeting_goodbye_button_closes_the_window() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -383,18 +378,17 @@ fn detail_panel_action_buttons_resolve_to_real_onscreen_rects() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -506,18 +500,17 @@ fn write_on_still_fades_when_instant_text_is_off() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -580,18 +573,17 @@ fn npc_name_reaches_the_title_bar_on_open_and_on_refresh() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -657,18 +649,17 @@ fn greeting_panel_title_rows_grow_to_their_wrapped_titles() {
     // Stock sizes each row right after `SetText`, `GetTextHeight() + 2` (`QuestFrame.lua:245`), so
     // the measure must be synchronous, as the app's is.
     s.set_text_measurer(Box::new(super::FixedWidthFont(7.0)));
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
@@ -749,28 +740,25 @@ fn reward_rows_preview_and_post_without_selecting_the_choice() {
     benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml"); // ChatFrameEditBox lives here
+    load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\DressUpFrame.xml"); // DressUpItemLink lives here
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
-    load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml"); // ChatFrameEditBox lives here
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
 
     const SWORD: &str = "|cffffffff|Hitem:2299:0:0:0|h[Worn Sword]|h|r";
     const MACE: &str = "|cffffffff|Hitem:2300:0:0:0|h[Worn Mace]|h|r";
diff --git a/crates/benilla-app/src/ui_script/quest_timer_tests.rs b/crates/benilla-app/src/ui_script/quest_timer_tests.rs
index 77b96d4d..260d9fc6 100644
--- a/crates/benilla-app/src/ui_script/quest_timer_tests.rs
+++ b/crates/benilla-app/src/ui_script/quest_timer_tests.rs
@@ -14,6 +14,8 @@ fn harness() -> UiScript {
     // The title's `text="QUEST_TIMERS"` resolves at load; an unknown name draws as the key.
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     // `SecondsToTime` for every row, `UIParent_ManageFramePositions` for OnShow and OnHide.
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     // QuestLogFrame.xml brings `MAX_QUESTS` (`QuestLogFrame.lua:2`), the repaint's loop bound.
@@ -21,16 +23,13 @@ fn harness() -> UiScript {
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestTimerFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     s
 }
 
diff --git a/crates/benilla-app/src/ui_script/questlog_tests.rs b/crates/benilla-app/src/ui_script/questlog_tests.rs
index f02dd9ba..ee12972f 100644
--- a/crates/benilla-app/src/ui_script/questlog_tests.rs
+++ b/crates/benilla-app/src/ui_script/questlog_tests.rs
@@ -82,25 +82,24 @@ const HAMMER_LINK: &str = "|cffffffff|Hitem:2024:0:0:0|h[Militia Hammer]|h|r";
 fn shipped_questlog_frame_loads_clean() {
     let _data = benilla_formats::wow_data_or_skip!();
     let s = UiScript::new().unwrap();
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 }
 
 /// Open, read the list and the detail, wheel the list, abandon through the confirm, close.
@@ -109,25 +108,24 @@ fn shipped_questlog_frame_drives_end_to_end() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
 
@@ -288,32 +286,29 @@ fn shift_click_toggles_the_watch_checkbox_and_the_tracker_hud() {
     s.set_screen_size(1024.0, 768.0);
     // The check seats off measured widths during the update (`QuestLogFrame.lua:224-233`).
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml");
     // A shift-click reads `ChatFrameEditBox:IsVisible()` unguarded (`QuestLogFrame.lua:478`).
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
     // The app fires QUEST_LOG_UPDATE when the log lands; its `QuestWatch_Update` hides an empty
@@ -416,33 +411,30 @@ fn watch_guards_no_op_without_erroring() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml"); // the guards' red-line surface
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml");
     // A shift-click reads `ChatFrameEditBox:IsVisible()` unguarded (`QuestLogFrame.lua:478`).
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml"); // the guards' red-line surface
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
     s.run("ToggleQuestLog()").unwrap();
@@ -517,29 +509,28 @@ fn progress_auto_watches_for_five_minutes() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     // The options window sets `AUTO_QUEST_WATCH`, as the reference's `UIOptionsFrame_Init` does.
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "KeyBindingsPage.xml");
-    load_xml(&s, "OptionsFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
+    load_xml(&s, "KeyBindingsPage.xml");
+    load_xml(&s, "OptionsFrame.xml");
     s.set_quest_log(eight_entries());
 
     // The app fires this with the quest's log row, as the 1.12 client does: `0x4df880` searches
@@ -592,30 +583,28 @@ fn the_auto_watch_flag_is_the_references_uvar_and_gates_the_watch() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     // The options window sets `AUTO_QUEST_WATCH`, as the reference's `UIOptionsFrame_Init` does.
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
     load_xml(&s, "ScrollTemplates.xml");
     load_xml(&s, "KeyBindingsPage.xml");
     load_xml(&s, "OptionsFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "ScrollTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
     s.set_quest_log(eight_entries());
     assert_eq!(s.eval::<String>("return AUTO_QUEST_WATCH").unwrap(), "1");
 
@@ -645,26 +634,25 @@ fn the_row_tag_is_its_own_right_flush_string_and_the_state_word_wins() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     // The state words are the GlobalStrings `COMPLETE` and `FAILED`.
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     let mut state = eight_entries();
     // Row 1 tagged, row 2 tagged and complete, row 3 failed, row 4 a header.
@@ -727,25 +715,24 @@ fn empty_quest_log_hides_rows_and_disables_abandon() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(QuestLogState::default());
     s.run("ToggleQuestLog()").unwrap();
@@ -785,25 +772,24 @@ fn reward_rows_follow_the_refs_two_per_row_layout() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     let mut state = eight_entries();
     // Every row carries the detail, and the window paints the auto-selected one.
@@ -972,25 +958,24 @@ fn overflowing_detail_content_clips_to_the_scrollframe_rect() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(overflowing_entry());
     s.run("ToggleQuestLog()").unwrap();
@@ -1041,25 +1026,24 @@ fn wheel_over_the_detail_pane_changes_vertical_scroll() {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(overflowing_entry());
     s.run("ToggleQuestLog()").unwrap();
@@ -1099,25 +1083,24 @@ fn selection_change_resets_detail_scroll_but_a_quest_log_update_refresh_does_not
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(overflowing_entry());
     s.run("ToggleQuestLog()").unwrap();
@@ -1166,26 +1149,25 @@ fn reward_row_hover_serves_the_shared_item_tooltip() {
 
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
     s.run("ToggleQuestLog()").unwrap();
@@ -1257,17 +1239,17 @@ fn popup_children_inherit_the_dialog_stratum() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     s.run(
         "StaticPopupDialogs[\"TEST_STRATUM\"] = { text = \"Abandon?\", button1 = \"Yes\", \
          button2 = \"No\", timeout = 0 }\n\
@@ -1308,33 +1290,30 @@ fn reward_rows_preview_and_post_and_a_plain_click_stays_inert() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     // A shift-click reads `ChatFrameEditBox:IsVisible()` unguarded (`QuestLogFrame.lua:548`).
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\DressUpFrame.xml"); // DressUpItemLink lives here
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
     load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml"); // ChatFrameEditBox lives here
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\DressUpFrame.xml"); // DressUpItemLink lives here
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
     s.run("ToggleQuestLog()").unwrap();
@@ -1396,32 +1375,29 @@ fn shift_click_on_a_title_posts_the_quest_name_with_chat_open_and_watches_with_i
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     // A shift-click reads `ChatFrameEditBox:IsVisible()` unguarded (`QuestLogFrame.lua:478`).
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UIMenu.xml"); // the kit its menus build from
     load_xml(&s, "Interface\\FrameXML\\ChatFrame.xml"); // ChatFrameEditBox lives here
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
-    load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
     load_xml(&s, "Interface\\FrameXML\\FloatingChatFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(eight_entries());
     s.run("ToggleQuestLog()").unwrap();
@@ -1494,25 +1470,24 @@ fn share_quest_needs_both_a_sharable_selection_and_a_party() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(entries_sharable(&[1]));
     s.set_party(PartyState::default());
@@ -1571,25 +1546,24 @@ fn share_quest_is_dark_on_an_empty_log_even_in_a_party() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(QuestLogState::default());
     s.set_party(party(4));
@@ -1606,25 +1580,24 @@ fn share_quest_click_queues_the_selected_quests_id() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     s.set_quest_log(entries_sharable(&[1, 5]));
     s.set_party(party(1));
@@ -1648,25 +1621,24 @@ fn the_stock_title_width_cap_bites_and_is_sticky_per_row_button() {
     s.set_screen_size(1024.0, 768.0);
     // The cap reads `questTitleTag:GetWidth()` inside the update, so the harness needs a measurer.
     s.set_text_measurer(Box::new(super::FixedWidthFont(6.0)));
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
     load_xml(&s, "Interface\\FrameXML\\CharacterFrameTemplates.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
     load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
 
     // A long Dungeon-tagged title.
     const LONG: &str = "The Left Piece of Lord Valthalak's Amulet";
diff --git a/crates/benilla-app/src/ui_script/quiver_tests.rs b/crates/benilla-app/src/ui_script/quiver_tests.rs
index 006ad2d1..2351dbea 100644
--- a/crates/benilla-app/src/ui_script/quiver_tests.rs
+++ b/crates/benilla-app/src/ui_script/quiver_tests.rs
@@ -323,22 +323,23 @@ fn auto_shot_bar_drains_the_moment_an_ammo_lock_event_arrives() {
 /// Seat one active player buff by name and announce it the way the app's aura feed does.
 fn seat_a_buff(s: &mut UiScript, spell_id: u32, name: &str, icon: &str) {
     use benilla_ui::script::AuraState;
-    s.set_auras(
-        "player",
-        Some(vec![AuraState {
-            spell_id,
-            name: Some(name.into()),
-            icon: Some(icon.into()),
-            count: 0,
-            debuff_type: None,
-            duration: 0.0,
-            expiration_time: 0.0,
-            helpful: true,
-            cancelable: true,
-            until_cancelled: true,
-            channeled: false,
-        }]),
-    );
+    s.set_unit_guids(&benilla_ui::script::UnitGuids {
+        player: 1,
+        ..Default::default()
+    });
+    s.set_player_auras(vec![AuraState {
+        spell_id,
+        name: Some(name.into()),
+        icon: Some(icon.into()),
+        count: 0,
+        debuff_type: None,
+        duration: 0.0,
+        expiration_time: 0.0,
+        helpful: true,
+        cancelable: true,
+        until_cancelled: true,
+        channeled: false,
+    }]);
     s.fire_event("PLAYER_AURAS_CHANGED", vec![]);
 }
 
diff --git a/crates/benilla-app/src/ui_script/reference_ui.rs b/crates/benilla-app/src/ui_script/reference_ui.rs
index 50a7fa63..12e84344 100644
--- a/crates/benilla-app/src/ui_script/reference_ui.rs
+++ b/crates/benilla-app/src/ui_script/reference_ui.rs
@@ -2,9 +2,10 @@
 //! [`super::addons::Source`]; the parse, `<Include>` and `<Script file=>` resolution and chunk
 //! naming are [`super::addons::Addon`]'s.
 //!
-//! `assets/ui/benilla.toc` is the one load order. An entry with a path separator comes off the
-//! chain, a bare filename is a file we ship ([`is_chain_entry`]), and a name defined by both goes
-//! to the later line. Without client data the chain files are absent, and the log says so once.
+//! The core is the chain's own `FrameXML.toc` ([`core`]), its rows in its order, as `UI_Init`
+//! walks it; benilla's layer (`assets/ui/layer.toc`) follows it. An entry with a path separator
+//! comes off the chain, a bare filename is a file we ship ([`is_chain_entry`]). Without client
+//! data the chain files are absent, and the log says so once.
 
 use std::sync::OnceLock;
 
@@ -19,12 +20,43 @@ use super::addons::{Addon, Source};
 /// does, so an addon's `\AddOns\` debugstack pattern never matches a FrameXML frame.
 pub(super) const NAME: &str = "FrameXML";
 
-/// Whether a manifest entry comes off the player's chain: it has a path separator. Decidable
+/// Whether a test kit's entry comes off the player's chain: it has a path separator. Decidable
 /// because `assets/ui` is flat, which `manifest::tests` pins.
+#[cfg(test)]
 pub(super) fn is_chain_entry(entry: &str) -> bool {
     entry.contains('\\') || entry.contains('/')
 }
 
+/// The stock interface's table of contents, which `UI_Init` (`0x48fbf0`) hands to the `.toc`
+/// runner (`0x6edb90`) at `0x48ffed`, once per UI build, `ReloadUI` included.
+pub(super) const TOC: &str = r"Interface\FrameXML\FrameXML.toc";
+
+/// The stock key-binding commands, which `UI_Init` loads after the [`TOC`] walk (`0x490018`).
+pub(super) const BINDINGS: &str = r"Interface\FrameXML\Bindings.xml";
+
+/// The default key set, which `UI_Init` reads through `0x4b62b0` (`0x4900c7`).
+pub(super) const DEFAULT_BINDINGS: &str = r"WTF\DefaultBindings.wtf";
+
+/// The core interface: the chain's own [`TOC`], patched or not, as an [`Addon`] over the chain, or
+/// `None` when the chain has no such file.
+pub(super) fn core() -> Option<Addon> {
+    read(TOC).map(|bytes| core_from(&benilla_ui::source::decode(&bytes)))
+}
+
+/// The core over `toc`'s text: each file line prefixed with the toc's own directory, in the toc's
+/// order, as the runner builds its paths (`0x6edbe5`, `0x6edcf4`, `0x6edd0c`) and dispatches each
+/// in turn (`0x6edd51`).
+pub(super) fn core_from(toc: &str) -> Addon {
+    let dir = TOC.rsplit_once('\\').map_or("", |(d, _)| d);
+    addon(
+        Toc::parse(toc)
+            .files
+            .iter()
+            .map(|f| format!("{dir}\\{f}"))
+            .collect(),
+    )
+}
+
 /// The stock interface as an [`Addon`] over the chain; `files` are full chain paths.
 pub(super) fn addon(files: Vec<String>) -> Addon {
     Addon::new(
@@ -40,6 +72,10 @@ pub(super) fn addon(files: Vec<String>) -> Addon {
 /// One file's bytes off the player's patch chain, by internal path. Bytes, not a string: Lua
 /// takes a chunk as stored, and a cp1252 file is not valid UTF-8.
 pub(super) fn read(req: &str) -> Option<Vec<u8>> {
+    #[cfg(test)]
+    if let Some(overlaid) = fixture::read(req) {
+        return overlaid;
+    }
     let chain = chain()?;
     match chain.read(req) {
         Ok(bytes) => Some(bytes),
@@ -59,9 +95,9 @@ fn chain() -> Option<&'static Chain> {
         .get_or_init(|| {
             let Some(data) = benilla_formats::wow_data() else {
                 warn!(
-                    "ui_script: no client data — every interface file this client SOURCES off the \
-                     player's install (benilla.toc's `Interface\\…` entries) is absent, so the \
-                     windows they build do not exist and addons that call their globals will raise"
+                    "ui_script: no client data — the stock interface, `FrameXML.toc` and every \
+                     file it lists, is absent off the player's install, so its windows do not \
+                     exist and addons that call their globals will raise"
                 );
                 return None;
             };
@@ -76,6 +112,48 @@ fn chain() -> Option<&'static Chain> {
         .as_ref()
 }
 
+/// Files a test lays over the chain, per test thread: an entry with bytes reads as a chain file,
+/// one with `None` as a file the chain lacks, and any other path falls through to the chain.
+#[cfg(test)]
+pub(super) mod fixture {
+    use std::cell::RefCell;
+    use std::collections::HashMap;
+
+    thread_local! {
+        static OVERLAY: RefCell<HashMap<String, Option<Vec<u8>>>> = RefCell::new(HashMap::new());
+    }
+
+    fn key(path: &str) -> String {
+        path.replace('/', "\\").to_ascii_lowercase()
+    }
+
+    /// Lays `files` over the chain until the guard drops.
+    pub(in crate::ui_script) fn lay(files: &[(&str, Option<&[u8]>)]) -> Guard {
+        OVERLAY.with(|o| {
+            let mut o = o.borrow_mut();
+            o.clear();
+            for (path, bytes) in files {
+                o.insert(key(path), bytes.map(<[u8]>::to_vec));
+            }
+        });
+        Guard
+    }
+
+    /// The overlay's answer for `path`, `None` when it has no entry.
+    pub(super) fn read(path: &str) -> Option<Option<Vec<u8>>> {
+        OVERLAY.with(|o| o.borrow().get(&key(path)).cloned())
+    }
+
+    /// Clears the overlay on drop.
+    pub(in crate::ui_script) struct Guard;
+
+    impl Drop for Guard {
+        fn drop(&mut self) {
+            OVERLAY.with(|o| o.borrow_mut().clear());
+        }
+    }
+}
+
 #[cfg(test)]
 fn is_word(c: char) -> bool {
     c.is_alphanumeric() || c == '_'
@@ -349,7 +427,8 @@ mod tests {
             .map(str::to_string)
             .collect();
 
-        let migrated: Vec<String> = super::super::addons::Addon::builtin()
+        let migrated: Vec<String> = super::core()
+            .expect("the player's FrameXML.toc")
             .toc
             .files
             .iter()
@@ -554,7 +633,8 @@ mod tests {
             "the method probe is not working — it answered {got:?} for {control:?}"
         );
 
-        let migrated: std::collections::HashSet<String> = super::super::addons::Addon::builtin()
+        let migrated: std::collections::HashSet<String> = super::core()
+            .expect("the player's FrameXML.toc")
             .toc
             .files
             .iter()
@@ -870,7 +950,7 @@ mod tests {
         };
 
         // Every function each chain entry and its same-name `.lua` define.
-        let toc = &super::super::addons::Addon::builtin().toc.files;
+        let toc = &super::super::manifest::manifest_files();
         // Load order: each manifest entry at its line, ours included (`ours_wins` reads both
         // sides), then each reached addon's files after everything.
         let chain = gated_chain_entries();
@@ -1107,14 +1187,6 @@ mod tests {
         // Open gaps, each with the window and the click that reach it. The assertion below
         // refuses an entry whose gap has closed.
         const KNOWN: &[(&str, &str, &str)] = &[
-            (
-                "ContainerFrame.xml",
-                "KeyRingButtonIDToInvSlotID",
-                "an engine binding (`1.12-globals.tsv`). `ContainerFrame.lua:617` hovers a KEYRING \
-                 slot with it, so the raise needs the keyring open and a key hovered. Ours drives \
-                 keyring tooltips through `ContainerFrameAdapters.xml`'s wrapper, which is \
-                 why nothing has hit it — the wrapper answers first for our own rows.",
-            ),
             (
                 "SkillFrame.xml",
                 "BuySkillTier",
@@ -1142,13 +1214,6 @@ mod tests {
                  step/rank cost is non-zero — which no 1.12 server sends. Unreachable until the \
                  skill-point wire exists; not built.",
             ),
-            (
-                "DurabilityFrame.xml",
-                "UpdateInventoryAlertStatus",
-                "an engine binding. `DurabilityFrame.lua:81` calls it from the armor guy's own \
-                 update; our `inventory_alerts` snapshot is recomputed on every inventory push \
-                 instead, so the recompute exists and only the Lua verb that forces one does not.",
-            ),
             (
                 "Blizzard_GMSurveyUI.xml",
                 "GMSurveyAnswerSubmit",
@@ -1321,7 +1386,7 @@ mod tests {
     #[test]
     fn every_chain_xml_brings_its_own_lua() {
         let _data = benilla_formats::wow_data_or_skip!();
-        let toc = &super::super::addons::Addon::builtin().toc.files;
+        let toc = &super::super::manifest::manifest_files();
         let listed: std::collections::HashSet<&str> = toc
             .iter()
             .map(|f| f.rsplit(['\\', '/']).next().unwrap_or(f))
@@ -1463,7 +1528,7 @@ mod tests {
     #[test]
     fn nothing_we_ship_is_shadowed_by_a_later_chain_entry() {
         let _data = benilla_formats::wow_data_or_skip!();
-        let toc = &super::super::addons::Addon::builtin().toc.files;
+        let toc = &super::super::manifest::manifest_files();
         let mut ours: std::collections::HashMap<String, String> = std::collections::HashMap::new();
         let mut shadowed: Vec<String> = Vec::new();
         for entry in toc.iter() {
@@ -1493,7 +1558,7 @@ mod tests {
     #[test]
     fn every_template_the_manifest_inherits_is_declared_by_the_manifest() {
         let _data = benilla_formats::wow_data_or_skip!();
-        let toc = &super::super::addons::Addon::builtin().toc.files;
+        let toc = &super::super::manifest::manifest_files();
 
         let mut declared: std::collections::HashSet<String> = std::collections::HashSet::new();
         let mut wanted: Vec<(String, String)> = Vec::new();
@@ -1566,7 +1631,7 @@ mod tests {
     fn reached_addons() -> Vec<String> {
         let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
         let mut out: Vec<String> = Vec::new();
-        for entry in &super::super::addons::Addon::builtin().toc.files {
+        for entry in &super::super::manifest::manifest_files() {
             let texts = if super::is_chain_entry(entry) {
                 entry_sources(entry)
             } else {
@@ -1594,7 +1659,8 @@ mod tests {
     /// Every chain file the shipped interface loads, in load order: the manifest's chain entries,
     /// then each reached addon's files in its own toc order.
     fn gated_chain_entries() -> Vec<String> {
-        let mut out: Vec<String> = super::super::addons::Addon::builtin()
+        let mut out: Vec<String> = super::core()
+            .expect("the player's FrameXML.toc")
             .toc
             .files
             .iter()
diff --git a/crates/benilla-app/src/ui_script/screenshot_tests.rs b/crates/benilla-app/src/ui_script/screenshot_tests.rs
index 91e00b09..367c9dc9 100644
--- a/crates/benilla-app/src/ui_script/screenshot_tests.rs
+++ b/crates/benilla-app/src/ui_script/screenshot_tests.rs
@@ -9,17 +9,17 @@ fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml",
+        r"Interface\FrameXML\WorldFrame.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\StaticPopup.xml",
-        r"Interface\FrameXML\WorldFrame.xml",
     ] {
         load_xml(&s, f);
     }
diff --git a/crates/benilla-app/src/ui_script/session.rs b/crates/benilla-app/src/ui_script/session.rs
index 20e84ca8..26ef9918 100644
--- a/crates/benilla-app/src/ui_script/session.rs
+++ b/crates/benilla-app/src/ui_script/session.rs
@@ -176,6 +176,8 @@ mod tests {
         ("cursor.rs", "decode_failed"),
         ("cursor.rs", "last_set"),
         ("cursor.rs", "last_ptr"),
+        // The wheel's fraction toward its next notch, a fact about the device, not the VM.
+        ("bindings.rs", "notches"),
     ];
 
     use crate::test_support::{fn_parameter_lists, rust_files};
diff --git a/crates/benilla-app/src/ui_script/shape_gate.rs b/crates/benilla-app/src/ui_script/shape_gate.rs
index c21f56ec..a8b4f1fc 100644
--- a/crates/benilla-app/src/ui_script/shape_gate.rs
+++ b/crates/benilla-app/src/ui_script/shape_gate.rs
@@ -218,8 +218,10 @@ const BASELIB_PROBES: &[(&str, &str)] = &[
     ("rawequal", "1, 1"),
     ("rawget", "{}, 1"),
     ("rawset", "{}, 1, 1"),
-    // These write, but namespaced or self-restoring, so every later probe sees the same VM.
-    ("seterrorhandler", "geterrorhandler()"),
+    // These write, but namespaced or inert, so every later probe sees the same VM. The bare VM's
+    // handler slot is empty and takes a function alone (`0x702900`), so the probe hands it a no-op,
+    // which nothing here dispatches to.
+    ("seterrorhandler", "function() end"),
     ("setglobal", "\"BenillaShapeGateProbe\", 1"),
     ("setmetatable", "{}, nil"),
     ("tonumber", "\"1\""),
diff --git a/crates/benilla-app/src/ui_script/shipped_xml_tests.rs b/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
index b154d30d..800d1b74 100644
--- a/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
+++ b/crates/benilla-app/src/ui_script/shipped_xml_tests.rs
@@ -486,7 +486,7 @@ fn every_shipped_text_attribute_answers_against_the_real_global_strings() {
     };
 
     let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
-    let mut keys = 0;
+    let mut swept = 0;
     for entry in std::fs::read_dir(&dir).expect("assets/ui").flatten() {
         let path = entry.path();
         if path.extension().is_none_or(|e| e != "xml") {
@@ -505,7 +505,6 @@ fn every_shipped_text_attribute_answers_against_the_real_global_strings() {
                     "{file}: text=\"{value}\" is shaped like a GlobalStrings key but the real \
                      GlobalStrings.lua has no such string — it would render as its own key name"
                 );
-                keys += 1;
             } else {
                 assert!(
                     resolved.is_none(),
@@ -513,10 +512,11 @@ fn every_shipped_text_attribute_answers_against_the_real_global_strings() {
                      the loader would silently show that string's value instead of these words"
                 );
             }
+            swept += 1;
         }
     }
     // A floor, so the sweep cannot pass by matching nothing.
-    assert!(keys >= 1, "only {keys} key-shaped text= values swept");
+    assert!(swept >= 1, "only {swept} text= values swept");
 }
 
 /// No shipped script hands a GlobalStrings key to a text sink as its words: `SetText` cannot tell
@@ -707,71 +707,6 @@ fn every_texture_frame_outranks_its_status_bars() {
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
 
-/// The boot phase is inert: `Fonts.xml`, the only file loaded at `Startup`, is a pure registry and
-/// materializes no frames.
-#[test]
-fn the_boot_phase_materializes_no_frames() {
-    benilla_formats::wow_data_or_skip!();
-    let mut s = benilla_ui::script::UiScript::new().unwrap();
-    s.set_screen_size(1024.0, 768.0);
-    // Manifest entry 0, off the chain; `load_ui` fails on any loader error.
-    let frames = super::test_ui::load_ui(&s, "Interface\\FrameXML\\Fonts.xml");
-    assert_eq!(
-        frames, 0,
-        "the boot-phase load materialized {frames} frame(s) — the login screen is meant to carry none"
-    );
-}
-
-/// The boot-time font registry alone declares every (font, height, outline) the whole manifest
-/// does; a failure is a font object outside `Fonts.xml` with a new height or an outline.
-#[test]
-fn the_font_registry_alone_covers_the_whole_bake_plan() {
-    benilla_formats::wow_data_or_skip!();
-    let plan = |whole: bool| -> std::collections::BTreeSet<(String, String, String)> {
-        let mut s = benilla_ui::script::UiScript::new().unwrap();
-        s.set_screen_size(1024.0, 768.0);
-        if whole {
-            // The in-game UI loads on world entry, so a player always exists by then.
-            s.set_unit(
-                "player",
-                Some(benilla_ui::script::UnitState {
-                    exists: true,
-                    name: Some("Probefour".into()),
-                    level: 60,
-                    ..Default::default()
-                }),
-            );
-            let _ = super::load_default_ui(&s);
-        } else {
-            let _ = super::load_font_registry(&s);
-        }
-        s.font_objects()
-            .iter()
-            .map(|f| {
-                (
-                    f.font.clone().unwrap_or_default().to_ascii_lowercase(),
-                    format!("{:?}", f.height),
-                    format!("{:?}", f.outline),
-                )
-            })
-            .collect()
-    };
-    let whole = plan(true);
-    let registry_only = plan(false);
-    let missing: Vec<_> = whole.difference(&registry_only).collect();
-    assert!(
-        missing.is_empty(),
-        "these (font, height, outline) combinations exist in the full manifest but NOT in the \
-         boot-time font registry, so the atlas would never bake them: {missing:#?}"
-    );
-    // Never let this pass by finding nothing on both sides.
-    assert!(
-        registry_only.len() >= 19,
-        "only {} combinations swept — the registry sweep broke",
-        registry_only.len()
-    );
-}
-
 /// The shipped UI takes `VARIABLES_LOADED`, which the saved-variables load fires at every launch
 /// before any window has shown, without a script error.
 #[test]
@@ -801,8 +736,8 @@ fn the_shipped_ui_takes_variables_loaded_without_a_script_error() {
 }
 
 /// Every `<Font name=…>` the manifest declares is a `Font` global answering the FontInstance
-/// getters, in manifest order: `publish_global` never overwrites, so a same-named frame loaded
-/// first would keep a font unpublished.
+/// getters, in the production order: `publish_global` never overwrites, so a same-named frame
+/// loaded first would keep a font unpublished.
 #[test]
 fn every_shipped_font_object_is_published_as_a_lua_global() {
     benilla_formats::wow_data_or_skip!();
@@ -823,7 +758,7 @@ fn every_shipped_font_object_is_published_as_a_lua_global() {
 
     // The names come from the manifest's own entries, chain files included.
     let mut names: Vec<String> = Vec::new();
-    for entry in &super::addons::Addon::builtin().toc.files {
+    for entry in &super::manifest::manifest_files() {
         if !entry.to_ascii_lowercase().ends_with(".xml") {
             continue;
         }
@@ -1096,7 +1031,7 @@ fn every_declared_parent_really_attaches() {
     let declared = shipped_frame_parents();
     assert!(
         // A sanity floor for the scan, not a census.
-        declared.len() >= 2,
+        !declared.is_empty(),
         "only {} parent declarations found — the scan broke",
         declared.len()
     );
@@ -1445,7 +1380,7 @@ fn the_stock_sound_options_window_loads_hidden_and_the_alias_is_gone() {
     );
 
     // `IsOptionFrameOpen` names the stock options windows, all hidden; it sees ours through the
-    // wrapper `GameMenuFrame.xml` installs.
+    // wrapper `GameMenuAdapters.xml` installs.
     assert!(
         s.eval::<bool>("return IsOptionFrameOpen() and true or false")
             .unwrap(),
@@ -1453,9 +1388,57 @@ fn the_stock_sound_options_window_loads_hidden_and_the_alias_is_gone() {
     );
 }
 
+/// The stock Sound window's boxes write `this:GetChecked()` as is (`SoundOptionsFrame.lua:82`),
+/// which is nil once unticked, and `SetCVar` stores that as "0" (`0x488c98`); its sliders write
+/// `GetValue()`, a single-precision number stored as Lua's `%.14g` text (`0x6f7c80`).
+#[test]
+fn the_stock_sound_window_turns_a_box_off_and_stores_a_slider_as_lua_text() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = benilla_ui::script::UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    s.set_unit(
+        "player",
+        Some(benilla_ui::script::UnitState {
+            exists: true,
+            name: Some("Probefour".into()),
+            level: 60,
+            ..Default::default()
+        }),
+    );
+    let failures = super::load_default_ui(&s);
+    assert!(failures.is_empty(), "manifest load errors: {failures:#?}");
+    s.set_cvar_host("EnableMusic", "1");
+    s.run("this = SoundOptionsFrameOkay SoundOptionsFrame_Load()")
+        .unwrap();
+    let _ = s.take_cvar_changes();
+    let checked = "return SoundOptionsFrameCheckButton5:GetChecked() and true or false";
+    assert!(s.eval::<bool>(checked).unwrap(), "Enable Music starts on");
+
+    s.run("SoundOptionsFrameCheckButton5:Click()").unwrap();
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+    assert!(!s.eval::<bool>(checked).unwrap());
+    assert_eq!(
+        s.take_cvar_changes(),
+        vec![("EnableMusic".to_string(), "0".to_string())],
+        "the unticked box turns music off"
+    );
+    s.run("SoundOptionsFrameCheckButton5:Click()").unwrap();
+    assert_eq!(
+        s.take_cvar_changes(),
+        vec![("EnableMusic".to_string(), "1".to_string())]
+    );
+
+    s.run("SoundOptionsFrameSlider3:SetValue(0.4)").unwrap();
+    assert_eq!(
+        s.eval::<String>("return GetCVar(\"MusicVolume\")").unwrap(),
+        "0.40000000596046"
+    );
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
 /// The stock Video Options window loads hidden (`OptionsFrame.xml:5`) and owns the `OptionsFrame`
 /// name; ours is `BenillaOptionsFrame`, which the ESC menu opens and the stock "options window
-/// open?" consumers see only through the `GameMenuFrame.xml` wrappers.
+/// open?" consumers see only through the `GameMenuAdapters.xml` wrappers.
 #[test]
 fn the_stock_video_options_window_loads_hidden_and_owns_its_own_name() {
     let _data = benilla_formats::wow_data_or_skip!();
@@ -1940,21 +1923,28 @@ fn the_stock_options_windows_load_and_save_are_reachable_for_addons() {
     );
 }
 
-/// `assets/ui` does not grow: the interface is the stock 1.12 FrameXML off the player's own patch
-/// chain, and a new file means a window was authored rather than migrated. Point `benilla.toc` at
-/// `Interface\FrameXML\<Window>.xml`, delete ours, and build the engine verbs the stock file calls.
+/// benilla's own interface is one layer, and it does not grow: `layer.toc` names exactly these
+/// files, all ours (none off the chain), and `assets/ui` holds nothing else but that manifest. The
+/// core loads every stock window the player's `FrameXML.toc` lists; what changes the stock UI goes
+/// in one of these files.
 #[test]
-fn assets_ui_does_not_grow() {
-    const SHIPPED: &[&str] = &[
-        "ContainerFrameAdapters.xml",
-        "GameMenuFrame.xml",
+fn the_layer_does_not_grow() {
+    const LAYER: &[&str] = &[
+        "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "ScriptLogFrame.xml",
-        "ScrollTemplates.xml",
+        "GameMenuAdapters.xml",
+        "ContainerFrameAdapters.xml",
         "SpellBookAdapters.xml",
-        "benilla.toc",
+        "ScriptLogFrame.xml",
+        "FrameXMLFixes.xml",
     ];
+    assert_eq!(
+        super::addons::Addon::layer().toc.files,
+        LAYER,
+        "layer.toc changed. The layer does not grow (docs/METHOD.md): a file that retired comes \
+         off this list; a new one needs a reason this list can name."
+    );
     let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
     let mut found: Vec<String> = std::fs::read_dir(&dir)
         .expect("assets/ui")
@@ -1963,11 +1953,86 @@ fn assets_ui_does_not_grow() {
         .filter(|n| !n.starts_with('.'))
         .collect();
     found.sort();
-    let mut shipped: Vec<String> = SHIPPED.iter().map(|s| s.to_string()).collect();
+    let mut shipped: Vec<String> = LAYER
+        .iter()
+        .chain(&["layer.toc"])
+        .map(|s| s.to_string())
+        .collect();
     shipped.sort();
     assert_eq!(
         found, shipped,
-        "assets/ui changed. It does not grow: a window is migrated, not authored (docs/METHOD.md). \
-         A file that retired comes off this list; a new one needs a reason this list can name."
+        "assets/ui holds the layer's manifest and its files, nothing else"
     );
 }
+
+/// The layer speaks the 1.12 dialect: a handler body is the chunk itself (`0x704c70`), so it reads
+/// its frame from `this`, never `self`; the loader reads no `function=`; the strata table
+/// (`0x8119f8`) has no `BLIZZARD`; `SetDrawLayer` (`0x79a780`) takes a layer name alone; and a
+/// button's state textures take a texture, never a colour (`0x781970`).
+#[test]
+fn the_layer_speaks_the_1_12_dialect() {
+    fn handlers(el: &benilla_ui::framexml::Element, out: &mut Vec<(String, String)>) {
+        if el.tag == "Scripts" {
+            for h in &el.children {
+                out.push((h.tag.clone(), h.body.clone()));
+                assert!(
+                    h.attr("function").is_none(),
+                    "<{} function=…> is no 1.12 form",
+                    h.tag
+                );
+            }
+        }
+        for c in &el.children {
+            handlers(c, out);
+        }
+    }
+    let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
+    let files = super::addons::Addon::layer().toc.files;
+    assert!(files.len() >= 8, "the layer's toc lists {files:?}");
+    let word = |text: &str, w: &str| {
+        text.match_indices(w).any(|(i, _)| {
+            let before = text[..i].chars().next_back();
+            let after = text[i + w.len()..].chars().next();
+            !before.is_some_and(|c| c.is_alphanumeric() || c == '_')
+                && !after.is_some_and(|c| c.is_alphanumeric() || c == '_')
+        })
+    };
+    for file in files {
+        let text = std::fs::read_to_string(dir.join(&file)).expect("read");
+        let doc = benilla_ui::framexml::parse(&text).expect("parses");
+        let mut found = Vec::new();
+        for item in &doc.items {
+            use benilla_ui::framexml::TopLevel;
+            if let TopLevel::Template(el) | TopLevel::Instance(el) = item {
+                handlers(el, &mut found);
+            }
+        }
+        for (tag, body) in found {
+            assert!(!word(&body, "self"), "{file}: <{tag}> reads `self`: {body}");
+        }
+        assert!(!text.contains("BLIZZARD"), "{file}: BLIZZARD strata");
+        for line in text.lines().filter(|l| l.contains("SetDrawLayer(")) {
+            assert_eq!(
+                line.matches(',').count(),
+                0,
+                "{file}: SetDrawLayer takes the layer alone: {line}"
+            );
+        }
+        for verb in [
+            "SetNormalTexture(",
+            "SetPushedTexture(",
+            "SetHighlightTexture(",
+            "SetDisabledTexture(",
+            "SetCheckedTexture(",
+            "SetDisabledCheckedTexture(",
+        ] {
+            for line in text.lines().filter(|l| l.contains(verb)) {
+                let args = line.split(verb).nth(1).unwrap_or_default();
+                assert!(
+                    !args.trim_start().starts_with(|c: char| c.is_ascii_digit()),
+                    "{file}: {verb} takes a texture, never a colour: {line}"
+                );
+            }
+        }
+    }
+}
diff --git a/crates/benilla-app/src/ui_script/spellbook_tests.rs b/crates/benilla-app/src/ui_script/spellbook_tests.rs
index b83a554b..29d7808a 100644
--- a/crates/benilla-app/src/ui_script/spellbook_tests.rs
+++ b/crates/benilla-app/src/ui_script/spellbook_tests.rs
@@ -73,41 +73,49 @@ fn click(s: &mut UiScript, name: &str, button: &str) {
     s.mouse_button(x, y, button, false);
 }
 
-/// The stock spellbook in manifest order, over the multibar grids and `UpdateMicroButtons` its show
-/// and hide call (`SpellBookFrame.lua:94-104`, `:186-203`).
+/// The stock spellbook in the production order, over the multibar grids and `UpdateMicroButtons`
+/// its show and hide call (`SpellBookFrame.lua:94-104`, `:186-203`).
 pub(super) fn spellbook_ui(w: f32, h: f32) -> UiScript {
+    spellbook_ui_with(w, h, &[])
+}
+
+/// [`spellbook_ui`] with `extra` files merged into it in the production order.
+pub(super) fn spellbook_ui_with(w: f32, h: f32, extra: &[&str]) -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(w, h);
-    for f in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        "KeyBindingsPage.xml",
-        "OptionsFrame.xml",
-        "Interface\\FrameXML\\MultiActionBars.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
-        "Interface\\FrameXML\\SpellBookFrame.xml",
-        "SpellBookAdapters.xml",
-    ] {
+    for f in super::test_ui::production_order(&[
+        &[
+            "Interface\\FrameXML\\GlobalStrings.lua",
+            "Interface\\FrameXML\\Fonts.xml",
+            "Interface\\FrameXML\\BasicControls.xml",
+            "Interface\\FrameXML\\LocaleProperties.lua",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            "Interface\\FrameXML\\UIDropDownMenu.xml",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\OptionsFrameTemplates.xml",
+            "Interface\\FrameXML\\StaticPopup.xml",
+            "Interface\\FrameXML\\TextStatusBar.lua",
+            "Interface\\FrameXML\\TextStatusBar.xml",
+            "Interface\\FrameXML\\MainMenuBar.xml",
+            r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+            "Interface\\FrameXML\\Cooldown.xml",
+            "Interface\\FrameXML\\ActionButtonTemplate.xml",
+            "Interface\\FrameXML\\ActionBarFrame.xml",
+            "Interface\\FrameXML\\MultiActionBars.xml",
+            "Interface\\FrameXML\\SpellBookFrame.xml",
+            r"Interface\FrameXML\ReputationFrame.xml",
+            "Interface\\FrameXML\\BonusActionBarFrame.xml",
+            "ScrollTemplates.xml",
+            "KeyBindingsPage.xml",
+            "OptionsFrame.xml",
+            "SpellBookAdapters.xml",
+        ],
+        extra,
+    ]) {
         load_xml(&s, f);
     }
     s
@@ -117,21 +125,19 @@ pub(super) fn spellbook_ui(w: f32, h: f32) -> UiScript {
 fn shipped_spellbook_loads_clean() {
     benilla_formats::wow_data_or_skip!();
     let s = UiScript::new().unwrap();
+    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     let frames = load_xml(&s, "Interface\\FrameXML\\SpellBookFrame.xml");
+    load_xml(&s, "ScrollTemplates.xml");
     load_xml(&s, "SpellBookAdapters.xml");
     assert!(s.errors().is_empty(), "loader errors: {:?}", s.errors());
     assert_eq!(
@@ -189,7 +195,7 @@ fn shipped_spellbook_drives_end_to_end() {
     s.mouse_button(x1, y1, "LeftButton", true);
     s.mouse_button(x1, y1, "LeftButton", false);
     assert!(s.errors().is_empty(), "click errors: {:?}", s.errors());
-    assert_eq!(s.take_spell_casts(), vec![133]);
+    assert_eq!(s.take_spell_casts(), vec![(133, false)]);
     assert!(s.cursor_payload().is_none(), "a cast never picks up");
 
     s.set_modifiers(true, false, false);
@@ -197,14 +203,13 @@ fn shipped_spellbook_drives_end_to_end() {
     s.mouse_button(x1, y1, "LeftButton", false);
     s.set_modifiers(false, false, false);
     assert!(s.take_spell_casts().is_empty(), "shift-click never casts");
-    let (kind, _book_id, book_type, spell_id) = s
-        .eval::<(String, i64, String, i64)>(
-            "local k, slot, book, id = GetCursorInfo() return k, slot, book, id",
-        )
-        .unwrap();
-    assert_eq!(
-        (kind.as_str(), book_type.as_str(), spell_id),
-        ("spell", "spell", 133)
+    assert!(
+        matches!(
+            s.cursor_payload(),
+            Some(benilla_ui::script::CursorPayload::Spell(c)) if c.book_type == "spell" && c.spell_id == 133
+        ),
+        "the cursor holds spell 133 from the spell book: {:?}",
+        s.cursor_payload()
     );
 
     // An empty slot is hidden (`ActionButton.lua:214-215`) until a held payload opens the grid;
@@ -531,7 +536,7 @@ fn the_pet_tab_switches_books_and_renders_the_pets_spells() {
     // ── The clicks ────────────────────────────────────────────────────────────────────────────
     click(&mut s, "SpellButton1", "LeftButton");
     assert!(s.errors().is_empty(), "click errors: {:?}", s.errors());
-    assert_eq!(s.take_pet_spell_casts(), vec![2649]);
+    assert_eq!(s.take_pet_spell_casts(), vec![(2649, false)]);
     assert!(s.take_spell_casts().is_empty());
     assert!(s.take_pet_spell_autocasts().is_empty());
 
@@ -628,38 +633,35 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
         r"Interface\FrameXML\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml", // `TEXT`
+        "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        // The icon chooser's scroll frame inherits `ClassTrainerListScrollFrameTemplate`.
-        r"Interface\FrameXML\ClassTrainerFrameTemplates.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        // `ExhaustionTick_Update` reads `ReputationWatchBar` (`MainMenuBar.lua:52`, `:69`), which
-        // `ReputationFrame.xml` declares, after the templates its check boxes inherit.
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         // The multibar grids the spellbook toggles, whose file wants the options window's uvars.
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "KeyBindingsPage.xml",
-        "OptionsFrame.xml",
         "Interface\\FrameXML\\MultiActionBars.xml",
         "Interface\\FrameXML\\SpellBookFrame.xml",
+        // `ExhaustionTick_Update` reads `ReputationWatchBar` (`MainMenuBar.lua:52`, `:69`), which
+        // `ReputationFrame.xml` declares, after the templates its check boxes inherit.
+        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        // The icon chooser's scroll frame inherits `ClassTrainerListScrollFrameTemplate`.
+        r"Interface\FrameXML\ClassTrainerFrameTemplates.xml",
+        "ScrollTemplates.xml",
+        "KeyBindingsPage.xml",
+        "OptionsFrame.xml",
         "SpellBookAdapters.xml",
     ] {
         load_xml(&s, file);
@@ -708,7 +710,11 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
         "right-click errors: {:?}",
         s.errors()
     );
-    assert_eq!(s.take_spell_casts(), vec![133], "a right-click casts");
+    assert_eq!(
+        s.take_spell_casts(),
+        vec![(133, false)],
+        "a right-click casts"
+    );
     assert_eq!(
         body(&s),
         "",
@@ -717,7 +723,7 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
     assert!(s.cursor_payload().is_none());
 
     click(&mut s, "SpellButton1", "LeftButton");
-    assert_eq!(s.take_spell_casts(), vec![133]);
+    assert_eq!(s.take_spell_casts(), vec![(133, false)]);
     assert_eq!(body(&s), "");
 
     // ── Shift-click appends a whole `/cast` line and never casts ──────────────────────────────
@@ -781,9 +787,10 @@ fn the_macro_editor_takes_a_shift_click_and_only_a_shift_click() {
     click(&mut s, "SpellButton1", "LeftButton");
     s.set_modifiers(false, false, false);
     assert!(s.errors().is_empty(), "pickup errors: {:?}", s.errors());
-    let (kind, spell_id) = s
-        .eval::<(String, i64)>("local k, _, _, id = GetCursorInfo() return k, id")
-        .unwrap();
-    assert_eq!((kind.as_str(), spell_id), ("spell", 133));
+    assert!(
+        matches!(s.cursor_payload(), Some(benilla_ui::script::CursorPayload::Spell(c)) if c.spell_id == 133),
+        "the cursor holds spell 133: {:?}",
+        s.cursor_payload()
+    );
     assert!(s.take_spell_casts().is_empty());
 }
diff --git a/crates/benilla-app/src/ui_script/static_popup_tests.rs b/crates/benilla-app/src/ui_script/static_popup_tests.rs
index d221f8d2..bffc6aa2 100644
--- a/crates/benilla-app/src/ui_script/static_popup_tests.rs
+++ b/crates/benilla-app/src/ui_script/static_popup_tests.rs
@@ -8,15 +8,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s
 }
@@ -252,8 +252,8 @@ fn hide_and_find_address_one_instance_by_data_only_for_a_multiple_dialog() {
 fn the_verb_dialogs_open_from_their_events_and_call_their_verbs() {
     benilla_formats::wow_data_or_skip!();
     use benilla_ui::script::ScriptValue;
+    // `setup` carries UIParent.xml, whose `UIParent_OnEvent` holds the arms.
     let mut s = setup();
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml"); // the arms
     s.set_money(50_000);
     s.fire_event("CONFIRM_PET_UNLEARN", vec![ScriptValue::Int(12_345)]);
     s.tick(0.0);
diff --git a/crates/benilla-app/src/ui_script/summon_tests.rs b/crates/benilla-app/src/ui_script/summon_tests.rs
index 59f013b9..1183b807 100644
--- a/crates/benilla-app/src/ui_script/summon_tests.rs
+++ b/crates/benilla-app/src/ui_script/summon_tests.rs
@@ -19,15 +19,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.set_summon_confirm(SummonConfirmUiState {
         summoner: "Twomage".into(),
diff --git a/crates/benilla-app/src/ui_script/surface_gate.rs b/crates/benilla-app/src/ui_script/surface_gate.rs
new file mode 100644
index 00000000..497a444e
--- /dev/null
+++ b/crates/benilla-app/src/ui_script/surface_gate.rs
@@ -0,0 +1,143 @@
+//! The 1.12 surface of the production load as a gate: every global and widget method an addon
+//! reaches once the core and benilla's layer have loaded is one the 1.12.1 client has
+//! (`reference/1.12-globals.tsv`), one the engine exposes, or a `Benilla`-prefixed name the layer
+//! defines. The engine's own surface is gated on a bare VM in `benilla-ui`, name by name against
+//! the same table (`script::tests::reference_surface`, whose commented `BEYOND_1_12` is the one
+//! allowlist) and method by method against each class's registrar tables
+//! (`script::tests::widget_surface`); so here the load itself may add nothing else.
+
+use std::collections::{BTreeSet, HashSet};
+
+use benilla_ui::script::{widget_method_census, UiScript};
+
+use crate::local_state::test_env::ENV_LOCK;
+
+/// `reference/1.12-globals.tsv`'s names.
+fn reference_globals() -> HashSet<&'static str> {
+    let tsv = include_str!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/../../reference/1.12-globals.tsv"
+    ));
+    let names: HashSet<&str> = tsv
+        .lines()
+        .filter(|l| !l.starts_with('#'))
+        .filter_map(|l| l.split('\t').next())
+        .collect();
+    assert!(
+        names.len() > 19_000,
+        "the reference table looks truncated ({} names)",
+        names.len()
+    );
+    names
+}
+
+/// The string keys of `_G`.
+fn globals_of(s: &UiScript) -> BTreeSet<String> {
+    s.eval::<Vec<String>>(
+        "local out = {} for k in pairs(getfenv(0)) do \
+         if type(k) == 'string' then table.insert(out, k) end end return out",
+    )
+    .expect("dump the globals")
+    .into_iter()
+    .collect()
+}
+
+/// Every `(class, method)` a VM answers, as `Class:Method`. The WorldFrame type is one-shot
+/// (`0x6ee439`), spent once the stock `WorldFrame` exists, so a loaded VM cannot make a second;
+/// its methods are a Frame's, which the census asks of a Frame.
+fn methods_of(s: &UiScript) -> BTreeSet<String> {
+    widget_method_census(s)
+        .expect("the widget census")
+        .into_iter()
+        .filter_map(|(class, method)| {
+            if method == "!NOT-INSTANTIABLE" {
+                assert_eq!(class, "WorldFrame", "{class} could not be made");
+                return None;
+            }
+            Some(format!("{class}:{method}"))
+        })
+        .collect()
+}
+
+/// A name the layer may define: its prefix, or a slash alias's `SLASH_BENILLA_` form.
+fn layer_prefixed(n: &str) -> bool {
+    n.starts_with("Benilla") || n.starts_with("BENILLA_") || n.starts_with("SLASH_BENILLA_")
+}
+
+/// What the production load adds past 1.12 and past the engine, and the layer's own names: the
+/// globals (`Benilla`-prefixed ones the engine does not also define passing) and the methods.
+fn production_beyond(s: &UiScript, engine: &UiScript) -> (Vec<String>, Vec<String>) {
+    let reference = reference_globals();
+    let engine_globals = globals_of(engine);
+    let globals = globals_of(s)
+        .into_iter()
+        .filter(|n| !reference.contains(n.as_str()) && !engine_globals.contains(n))
+        .filter(|n| !layer_prefixed(n))
+        .collect();
+    let engine_methods = methods_of(engine);
+    let methods = methods_of(s)
+        .into_iter()
+        .filter(|m| !engine_methods.contains(m))
+        .collect();
+    (globals, methods)
+}
+
+/// The production load, core and layer, adds no global past 1.12 but the layer's own
+/// `Benilla`-prefixed names, and no widget method at all.
+#[test]
+fn the_production_load_stays_inside_the_1_12_surface() {
+    benilla_formats::wow_data_or_skip!();
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (s, failures) = super::layer_tests::production_load_with("surface", false, "", |_| {});
+    assert!(failures.is_empty(), "load failures: {failures:#?}");
+    let engine = UiScript::new().unwrap();
+    // The layer's globals are there to be checked: a load that defined none proves nothing.
+    assert!(
+        globals_of(&s)
+            .iter()
+            .any(|n| layer_prefixed(n) && !globals_of(&engine).contains(n)),
+        "the layer defined no global: it did not load"
+    );
+
+    let (globals, methods) = production_beyond(&s, &engine);
+    assert!(
+        globals.is_empty(),
+        "the production load exposes {} global(s) the 1.12.1 client does not:\n    {}\n\n\
+         A layer global takes the `Benilla` prefix; anything else gets its 1.12 spelling or goes.",
+        globals.len(),
+        globals.join(" ")
+    );
+    assert!(
+        methods.is_empty(),
+        "the production load adds {} widget method(s) the engine does not register:\n    {}",
+        methods.len(),
+        methods.join(" ")
+    );
+}
+
+/// The gate bites: a global past 1.12 put back into the loaded VM, an unprefixed layer-style one,
+/// an engine-only prefixed one and a method on a class's table are each caught.
+#[test]
+fn the_production_gate_catches_a_name_put_back() {
+    let s = UiScript::new().unwrap();
+    let engine = UiScript::new().unwrap();
+    assert_eq!(
+        production_beyond(&s, &engine),
+        (Vec::new(), Vec::new()),
+        "two bare VMs differ"
+    );
+    s.run(
+        "UnitAura = function() end \
+         BenillaLayerThing = 1 \
+         getmetatable(CreateFrame('GameTooltip')).__index.BenillaSetItemById = function() end",
+    )
+    .unwrap();
+    let (globals, methods) = production_beyond(&s, &engine);
+    assert_eq!(globals, vec!["UnitAura".to_string()]);
+    assert!(
+        methods.contains(&"GameTooltip:BenillaSetItemById".to_string()),
+        "{methods:?}"
+    );
+}
diff --git a/crates/benilla-app/src/ui_script/tabard_tests.rs b/crates/benilla-app/src/ui_script/tabard_tests.rs
index 7f9588b8..4ad7cb66 100644
--- a/crates/benilla-app/src/ui_script/tabard_tests.rs
+++ b/crates/benilla-app/src/ui_script/tabard_tests.rs
@@ -33,19 +33,19 @@ fn harness(rank: u32) -> UiScript {
         );
     }
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        "ScrollTemplates.xml", // ours: the scroll kits
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         r"Interface\FrameXML\TabardFrame.xml",
+        "ScrollTemplates.xml", // ours: the scroll kits
     ] {
         super::test_ui::load_ui(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/talent_wipe_tests.rs b/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
index b39195f4..20e62c5d 100644
--- a/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
+++ b/crates/benilla-app/src/ui_script/talent_wipe_tests.rs
@@ -10,15 +10,15 @@ use super::test_ui::load_ui as load_xml;
 fn setup() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\GlobalStrings.lua");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     s.set_talent_master_pending(true);
     s
diff --git a/crates/benilla-app/src/ui_script/target_aura_tests.rs b/crates/benilla-app/src/ui_script/target_aura_tests.rs
index 07769353..eb95e05a 100644
--- a/crates/benilla-app/src/ui_script/target_aura_tests.rs
+++ b/crates/benilla-app/src/ui_script/target_aura_tests.rs
@@ -1,39 +1,37 @@
 //! The stock target frame's aura rows (`TargetFrame.lua:263`) under a stubbed feed.
 //! BuffFrame.xml loads first for the `DebuffTypeColor` and `RefreshBuffs` the frames use.
 
-use benilla_ui::script::{AuraState, QuadContent, ScriptValue, UiScript, UnitState};
+use benilla_ui::script::{AuraState, QuadContent, ScriptValue, UiScript, UnitGuids, UnitState};
 
 use super::test_ui::load_ui as load_xml;
 
 fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    // UIParent.xml comes first: `UnitPopup.lua:47` reads its `ITEM_QUALITY_COLORS` at file scope.
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // TOOLTIP_DEFAULT_* for the dropdowns
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml"); // TargetFrameDropDown's template
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
     load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     load_xml(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-    // UIParent.xml comes first: `UnitPopup.lua:47` reads its `ITEM_QUALITY_COLORS` at file scope.
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\CombatFeedback.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PlayerFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PartyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\TargetFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PetFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
 
     // `TargetofTargetFrame` loads shown (`TargetFrame.xml:515`) and hides only after the rows
     // lay out (`TargetFrame.lua:66`), so a first target lays its rows out for the 5-wide wrap;
@@ -56,10 +54,18 @@ fn target(s: &mut UiScript, reaction: u8, auras: Vec<AuraState>) {
             ..UnitState::default()
         }),
     );
-    s.set_auras("target", Some(auras));
+    s.set_unit_guids(&UnitGuids {
+        player: 1,
+        target: TARGET,
+        ..Default::default()
+    });
+    s.set_unit_auras(TARGET, Some(auras));
     s.fire_event("PLAYER_TARGET_CHANGED", vec![]);
 }
 
+/// The target's guid, which `"target"` resolves to.
+const TARGET: u64 = 0xF130_0000_0000_0001;
+
 fn debuff(spell_id: u32, name: &str, count: u8, debuff_type: Option<&str>) -> AuraState {
     AuraState {
         spell_id,
@@ -235,7 +241,7 @@ fn reaching_the_wrap_shrinks_the_first_row_to_17px() {
     assert_eq!(size(&s, "TargetFrameBuff1"), (17.0, 17.0));
 
     // Below the wrap they grow back; the feed re-fires UNIT_AURA on the change.
-    s.set_auras("target", Some(vec![debuff(1000, "D0", 1, None)]));
+    s.set_unit_auras(TARGET, Some(vec![debuff(1000, "D0", 1, None)]));
     s.fire_event("UNIT_AURA", vec![ScriptValue::Str("target".into())]);
     assert_eq!(size(&s, "TargetFrameDebuff1"), (21.0, 21.0));
     assert_eq!(size(&s, "TargetFrameDebuff1Border"), (23.0, 23.0));
@@ -249,7 +255,7 @@ fn clearing_the_list_or_the_target_hides_the_buttons() {
     target(&mut s, 2, vec![debuff(589, "Pain", 1, Some("Magic"))]);
     assert!(shown(&s, "TargetFrameDebuff1"));
 
-    s.set_auras("target", Some(vec![]));
+    s.set_unit_auras(TARGET, Some(vec![]));
     s.fire_event("UNIT_AURA", vec![ScriptValue::Str("target".into())]);
     assert!(
         !shown(&s, "TargetFrameDebuff1"),
@@ -260,7 +266,7 @@ fn clearing_the_list_or_the_target_hides_the_buttons() {
     target(&mut s, 2, vec![debuff(589, "Pain", 1, Some("Magic"))]);
     assert!(shown(&s, "TargetFrameDebuff1"));
     s.set_unit("target", None);
-    s.set_auras("target", None);
+    s.set_unit_auras(TARGET, None);
     s.fire_event("PLAYER_TARGET_CHANGED", vec![]);
     assert!(!shown(&s, "TargetFrameDebuff1"), "no target, no buttons");
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
diff --git a/crates/benilla-app/src/ui_script/taxi_tests.rs b/crates/benilla-app/src/ui_script/taxi_tests.rs
index 1a17a62f..96b54a32 100644
--- a/crates/benilla-app/src/ui_script/taxi_tests.rs
+++ b/crates/benilla-app/src/ui_script/taxi_tests.rs
@@ -10,20 +10,21 @@ use super::test_ui::load_ui as load_xml;
 fn taxi_script() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml"); // TaxiNodeOnButtonEnter's tooltip
-    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml");
-    // UIErrorsFrame takes `DrawOneHopLines`' refusal; a missing `ERR_TAXINOPATHS` draws blank.
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    // TaxiNodeOnButtonEnter's tooltip.
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     // Without UIPanelTemplates, `TaxiCloseButton` loses its `UIPanelCloseButton` handler.
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.lua");
     load_xml(&s, "Interface\\FrameXML\\UIPanelTemplates.xml");
+    // UIErrorsFrame takes `DrawOneHopLines`' refusal; a missing `ERR_TAXINOPATHS` draws blank.
+    load_xml(&s, "Interface\\FrameXML\\UIErrorsFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     load_xml(&s, "Interface\\FrameXML\\TaxiFrame.xml");
     s
 }
diff --git a/crates/benilla-app/src/ui_script/test_ui.rs b/crates/benilla-app/src/ui_script/test_ui.rs
index 29d22ff6..f2436e9b 100644
--- a/crates/benilla-app/src/ui_script/test_ui.rs
+++ b/crates/benilla-app/src/ui_script/test_ui.rs
@@ -1,6 +1,7 @@
 //! The tests' interface loader: a bare filename is a file we ship under `assets/ui`, a path one off
-//! the player's patch chain ([`super::reference_ui::is_chain_entry`], the manifest's rule). It
-//! reads the source tree, not the compiled-in copy.
+//! the player's patch chain ([`super::reference_ui::is_chain_entry`]). It reads the source tree,
+//! not the compiled-in copy. A kit loads in the production order ([`production_rank`]), which
+//! every load checks.
 
 use benilla_ui::script::{QuadContent, UiScript};
 
@@ -83,6 +84,7 @@ pub(super) fn load_ui_no_warnings(s: &UiScript, entry: &str) -> usize {
 }
 
 fn load_entry(s: &UiScript, entry: &str, strict_templates: bool, no_warnings: bool) -> usize {
+    follow_production_order(s, entry);
     // The app registers its CVars before any file loads: stock `UIOptionsFrame.xml` reads two
     // camera CVars at `OnLoad` and raises on a nil. A value a test already set stands.
     s.register_cvars(crate::cvars::registered_pairs());
@@ -107,7 +109,7 @@ fn load_entry(s: &UiScript, entry: &str, strict_templates: bool, no_warnings: bo
             .expect("the multibar stand-ins");
     }
     // Our options window's Graphics rows read stock `OptionsFrameSliders` (`OptionsFrame.lua`) at
-    // OnLoad; the manifest loads it one seat above ours, so a kit seats it before our file.
+    // OnLoad; the core loads it before the layer, so a kit seats it before our file.
     if path
         .rsplit('/')
         .next()
@@ -130,9 +132,16 @@ fn load_entry(s: &UiScript, entry: &str, strict_templates: bool, no_warnings: bo
         s.run(MICRO_BUTTON_STAND_INS)
             .expect("the micro-button stand-ins");
     }
-    if leaf.eq_ignore_ascii_case("UIParent.xml") && super::reference_ui::is_chain_entry(&path) {
+    // The stock GameMenuFrame.xml sources UIParent.lua again, which drops the stand-ins' wrappers.
+    if (leaf.eq_ignore_ascii_case("UIParent.xml") || leaf.eq_ignore_ascii_case("GameMenuFrame.xml"))
+        && super::reference_ui::is_chain_entry(&path)
+    {
         s.run(UIPARENT_STAND_INS).expect("the UIParent stand-ins");
     }
+    if leaf.eq_ignore_ascii_case("GameMenuFrame.xml") && super::reference_ui::is_chain_entry(&path)
+    {
+        s.run(GAME_MENU_STAND_INS).expect("the game menu stand-ins");
+    }
     if leaf.eq_ignore_ascii_case("UIOptionsFrame.xml") {
         s.run(UIOPTIONS_STAND_INS)
             .expect("the stock options window's stand-ins");
@@ -159,6 +168,121 @@ fn load_entry(s: &UiScript, entry: &str, strict_templates: bool, no_warnings: bo
     report.frames
 }
 
+/// Where `entry` falls in the production load, for [`follow_production_order`]: a `FrameXML.toc`
+/// row at its row, a file a row pulls in (`<Include>` or `<Script file=>`, at any depth) just
+/// above the first row that does, a layer file after every row in `layer.toc`'s order, and `None`
+/// for anything else (a fixture, an on-demand addon's file). Read off the player's own toc.
+pub(super) fn production_rank(entry: &str) -> Option<usize> {
+    static RANKS: std::sync::OnceLock<std::collections::HashMap<String, usize>> =
+        std::sync::OnceLock::new();
+    let ranks = RANKS.get_or_init(|| {
+        let key = |path: &str| path.replace('/', "\\").to_ascii_lowercase();
+        let mut ranks = std::collections::HashMap::new();
+        let rows = super::reference_ui::core()
+            .map(|core| core.toc.files)
+            .unwrap_or_default();
+        for (i, row) in rows.iter().enumerate() {
+            ranks.insert(key(row), 2 * i + 1);
+        }
+        for (i, row) in rows.iter().enumerate() {
+            let mut queue = vec![row.clone()];
+            while let Some(file) = queue.pop() {
+                let Some(bytes) = super::reference_ui::read(&file) else {
+                    continue;
+                };
+                let text = String::from_utf8_lossy(&bytes);
+                for chunk in text.split('<').skip(1) {
+                    let tag = chunk.split('>').next().unwrap_or("").trim_start();
+                    if !tag.starts_with("Include") && !tag.starts_with("Script") {
+                        continue;
+                    }
+                    let Some(name) = tag
+                        .split("file=\"")
+                        .nth(1)
+                        .and_then(|r| r.split('"').next())
+                    else {
+                        continue;
+                    };
+                    let path = format!(r"Interface\FrameXML\{name}");
+                    if let std::collections::hash_map::Entry::Vacant(slot) = ranks.entry(key(&path))
+                    {
+                        slot.insert(2 * i);
+                        queue.push(path);
+                    }
+                }
+            }
+        }
+        let after = 2 * rows.len() + 2;
+        for (j, file) in super::addons::Addon::layer().toc.files.iter().enumerate() {
+            ranks.insert(key(file), after + j);
+        }
+        ranks
+    });
+    ranks
+        .get(&entry.replace('/', "\\").to_ascii_lowercase())
+        .copied()
+}
+
+/// A kit's files in the production order ([`production_rank`]): the lists merged, each file once,
+/// and a file with no rank (a fixture) kept behind the file listed before it.
+pub(crate) fn production_order<'a>(parts: &[&[&'a str]]) -> Vec<&'a str> {
+    let mut seen = std::collections::HashSet::new();
+    let mut keyed = Vec::new();
+    let mut last = 0;
+    for (i, file) in parts.iter().flat_map(|p| p.iter()).enumerate() {
+        if !seen.insert(file.replace('/', "\\").to_ascii_lowercase()) {
+            continue;
+        }
+        last = production_rank(file).unwrap_or(last);
+        keyed.push((last, i, *file));
+    }
+    keyed.sort_by_key(|&(rank, i, _)| (rank, i));
+    keyed.into_iter().map(|(_, _, file)| file).collect()
+}
+
+/// Loads `parts` in the production order ([`production_order`]) and returns the frames `counted`
+/// built.
+pub(crate) fn load_kit_counting(s: &UiScript, parts: &[&[&str]], counted: &str) -> usize {
+    let mut built = 0;
+    for file in production_order(parts) {
+        let frames = load_ui(s, file);
+        if file == counted {
+            built = frames;
+        }
+    }
+    built
+}
+
+thread_local! {
+    /// Per VM session, the furthest [`production_rank`] a kit has loaded and the file at it.
+    static KIT_AT: std::cell::RefCell<std::collections::HashMap<u64, (usize, String)>> =
+        std::cell::RefCell::new(std::collections::HashMap::new());
+}
+
+/// Panics when `entry` loads after a file the production load runs after it: a kit is a
+/// subsequence of the production load, `FrameXML.toc`'s order then `layer.toc`'s, so a test sees
+/// the order effects the player does (event dispatch, child and draw order, which definition
+/// wins).
+fn follow_production_order(s: &UiScript, entry: &str) {
+    let Some(rank) = production_rank(entry) else {
+        return;
+    };
+    KIT_AT.with(|at| {
+        let mut at = at.borrow_mut();
+        if let Some((furthest, file)) = at.get(&s.session()) {
+            assert!(
+                rank >= *furthest,
+                "{entry} loads after {file}, but the production load runs it first: a kit \
+                 follows FrameXML.toc's order, then layer.toc's"
+            );
+            if rank == *furthest {
+                return;
+            }
+        }
+        at.insert(s.session(), (rank, entry.to_string()));
+    });
+}
+
 /// What a kit owes stock `UIParent.xml`: no-op stand-ins, seated when it loads, for what its
 /// `<OnUpdate>`, `UIParent_OnEvent` and `ShowUIPanel` call from files a kit may stop short of. A
 /// `function X()` is a plain global write, so the real definition replaces a stand-in in any order.
@@ -241,7 +365,7 @@ pub(super) const UIPARENT_STAND_INS: &str = r#"
     -- names are real, and all three options windows are the REFERENCE's own files,
     -- loaded hidden — including `OptionsFrame`, the video window, which used to be our own
     -- window's name. Ours is `BenillaOptionsFrame` now and is not in this list: it is not a name
-    -- the reference indexes, and the wrappers in `GameMenuFrame.xml` are what tell these two
+    -- the reference indexes, and the wrappers in `GameMenuAdapters.xml` are what tell these two
     -- functions about it. A KIT is a prefix of the manifest and may load none of the four, which
     -- is what these stand-ins are for.
     local function benilla_seat_options()
@@ -263,6 +387,15 @@ pub(super) const UIPARENT_STAND_INS: &str = r#"
     end
 "#;
 
+/// What a kit owes stock `GameMenuFrame.xml`: its OnShow and OnHide (`GameMenuFrame.xml:188-195`)
+/// call the micro-button and bag-bar verbs unguarded, from files a kit may stop short of. Plain
+/// global writes, so the real definitions replace them in any order.
+pub(super) const GAME_MENU_STAND_INS: &str = r#"
+    UpdateMicroButtons = UpdateMicroButtons or function() end
+    Disable_BagButtons = Disable_BagButtons or function() end
+    Enable_BagButtons = Enable_BagButtons or function() end
+"#;
+
 /// What a kit owes stock `UIOptionsFrame.xml`: its `VARIABLES_LOADED` arm
 /// (`UIOptionsFrame.lua:193-227`) calls six functions from files a kit may not load, and a kit
 /// fires the event itself. Functions, so seating them at load is safe in any order.
@@ -334,34 +467,34 @@ pub(super) const MERCHANT_UI: &[&str] = &[
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
     "Interface\\FrameXML\\BasicControls.xml", // TEXT()
-    "Interface\\FrameXML\\ItemButtonTemplate.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
+    "Interface\\FrameXML\\GameTooltip.xml", // app load order: tooltip before merchant
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
     // The stock window tab, whose `<OnShow>` needs the `UIPanelTemplates` pair above it.
     r"Interface\FrameXML\CharacterFrameTemplates.xml",
-    "ScrollTemplates.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
     "Interface\\FrameXML\\StaticPopup.xml",
-    "Interface\\FrameXML\\GameTooltip.xml", // app load order: tooltip before merchant
+    "Interface\\FrameXML\\ItemButtonTemplate.xml",
+    "ScrollTemplates.xml",
 ];
 
-/// Stock `GossipFrame.xml`'s dependencies in `benilla.toc` order, shared with `ui_gossip`'s feed
+/// Stock `GossipFrame.xml`'s dependencies in the production order, shared with `ui_gossip`'s feed
 /// tests. The greeting pane inherits `UIPanelScrollFrameTemplate`, and a missing template only
 /// warns, losing the scrollbar silently. Needs client data.
 pub(crate) const GOSSIP_UI: &[&str] = &[
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
-    "ScrollTemplates.xml",
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
     r"Interface\FrameXML\GlobalStrings.lua",
     r"Interface\FrameXML\BasicControls.xml",
     r"Interface\FrameXML\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
     r"Interface\FrameXML\StaticPopup.xml",
+    "ScrollTemplates.xml",
 ];
 
 /// What stock `LootFrame.xml` needs to load and behave. `GlobalStrings.lua` because a bare VM
@@ -371,30 +504,29 @@ pub(crate) const GOSSIP_UI: &[&str] = &[
 pub(super) const LOOT_UI: &[&str] = &[
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
-    "Interface\\FrameXML\\ItemButtonTemplate.xml",
+    "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml", // UIParent.lua: the panel slot manager and the fades
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml", // UIParent.lua: the panel slot manager and the fades
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\StaticPopup.xml",
     "Interface\\FrameXML\\GameTooltip.xml", // TOOLTIP_DEFAULT_COLOR, read by the dropdown backdrop
     "Interface\\FrameXML\\UIDropDownMenu.xml", // GroupLootDropDown's OnLoad calls UIDropDownMenu_Initialize
-    // `UnitPopup.lua` reads `ITEM_QUALITY_COLORS` at file scope (`UnitPopup.lua:47-49`), so its
-    // declarer, `UIParent.lua:65`, precedes it.
-    "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-    "Interface\\FrameXML\\UnitPopup.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml",
     // Each `PartyMemberFrame<N>` and its pet frame run `UnitFrame_Initialize` (UnitFrame.lua) at
     // OnLoad, which calls `SetTextStatusBarText` (TextStatusBar.lua).
     "Interface\\FrameXML\\TextStatusBar.lua",
     "Interface\\FrameXML\\TextStatusBar.xml",
-    "Interface\\FrameXML\\UnitFrame.xml",
     // `RefreshBuffs`, which each party row's OnLoad reaches (`PartyMemberFrame.lua:60`), is in
     // BuffFrame.lua: the reference's toc has BuffFrame at 40 and PartyFrame at 45.
     "Interface\\FrameXML\\BuffFrame.xml",
+    // `UnitPopup.lua` reads `ITEM_QUALITY_COLORS` at file scope (`UnitPopup.lua:47-49`), so its
+    // declarer, `UIParent.lua:65`, precedes it.
+    "Interface\\FrameXML\\UnitPopup.xml",
+    "Interface\\FrameXML\\UnitFrame.xml",
     "Interface\\FrameXML\\PartyFrame.xml",
+    "Interface\\FrameXML\\ItemButtonTemplate.xml",
 ];
 
 /// What stock `CharacterFrame.xml`, `PaperDollFrame.xml` and `PetPaperDollFrame.xml` need to load
@@ -406,99 +538,97 @@ pub(super) const CHARACTER_UI: &[&str] = &[
     // The stock strings, which `PaperDollFrame_OnLoad` reads at load; there are no fallbacks.
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
+    "Interface\\FrameXML\\BasicControls.xml", // TEXT(), which those labels go through
     // `GetText`, the gendered-string helper `ReputationFrame.lua:65` calls for each standing.
     r"Interface\FrameXML\LocaleProperties.lua",
-    "Interface\\FrameXML\\BasicControls.xml", // TEXT(), which those labels go through
-    "Interface\\FrameXML\\ItemButtonTemplate.xml", // PaperDollItemSlotButtonTemplate's base
+    r"Interface\FrameXML\UIParent.xml", // Model_OnLoad/_Rotate*/_OnUpdate: the model turntable
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml", // Model_OnLoad/_Rotate*/_OnUpdate: the model turntable
     "Interface\\FrameXML\\GameTooltip.xml",
-    "Interface\\FrameXML\\Cooldown.xml", // CooldownFrameTemplate + CooldownFrame_SetTimer, per equipment slot
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\StaticPopup.xml",
+    "Interface\\FrameXML\\UIMenu.xml",
     // The unit frames' dropdowns call `UIDropDownMenu_Initialize` at load, so the kit and the menu
     // table precede them.
     "Interface\\FrameXML\\UIDropDownMenu.xml",
-    "Interface\\FrameXML\\UIMenu.xml",
-    "Interface\\FrameXML\\UnitPopup.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
+    // ReputationFrame's detail check boxes inherit its `OptionsCheckButtonTemplate`.
+    "Interface\\FrameXML\\OptionsFrameTemplates.xml",
+    // The stock window tab, whose `<OnShow>` needs the `UIPanelTemplates` pair above it.
+    r"Interface\FrameXML\CharacterFrameTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml",
     "Interface\\FrameXML\\TextStatusBar.lua",
     "Interface\\FrameXML\\TextStatusBar.xml",
+    "Interface\\FrameXML\\MainMenuBar.xml",
+    r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    "Interface\\FrameXML\\Cooldown.xml", // CooldownFrameTemplate + CooldownFrame_SetTimer, per equipment slot
+    "Interface\\FrameXML\\ActionButtonTemplate.xml",
+    "Interface\\FrameXML\\ActionBarFrame.xml",
+    "Interface\\FrameXML\\CombatFeedback.xml",
+    "Interface\\FrameXML\\UnitPopup.xml",
     // `UnitFrame_Initialize` and `CombatFeedback_Initialize`, called by the frames below at load.
     "Interface\\FrameXML\\UnitFrame.xml",
-    "Interface\\FrameXML\\CombatFeedback.xml",
     "Interface\\FrameXML\\PlayerFrame.xml",
     // `PetFrame.xml`'s debuff buttons inherit `PartyBuffButtonTemplate`, declared here; the
     // manifest reaches this file only through `PartyFrame.xml`'s `<Include>`.
     "Interface\\FrameXML\\PartyFrameTemplates.xml",
     "Interface\\FrameXML\\PetFrame.xml",
-    "Interface\\FrameXML\\ActionButtonTemplate.xml",
-    "Interface\\FrameXML\\MainMenuBar.xml",
-    "Interface\\FrameXML\\ActionBarFrame.xml",
-    "Interface\\FrameXML\\BonusActionBarFrame.xml",
-    r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    "Interface\\FrameXML\\ItemButtonTemplate.xml", // PaperDollItemSlotButtonTemplate's base
     // Every page must exist before the window opens: `CharacterFrame_ShowSubFrame` hides each
     // `CHARACTERFRAME_SUBFRAMES` page it is not showing, unguarded (`CharacterFrame.lua:25-32`).
-    "ScrollTemplates.xml", // our scroll kit
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
-    // The stock window tab, whose `<OnShow>` needs the `UIPanelTemplates` pair above it.
-    r"Interface\FrameXML\CharacterFrameTemplates.xml",
-    // ReputationFrame's detail check boxes inherit its `OptionsCheckButtonTemplate`.
-    "Interface\\FrameXML\\OptionsFrameTemplates.xml",
     "Interface\\FrameXML\\CharacterFrame.xml",
     "Interface\\FrameXML\\PaperDollFrame.xml",
     "Interface\\FrameXML\\PetPaperDollFrame.xml",
+    "Interface\\FrameXML\\SkillFrame.xml",
+    r"Interface\FrameXML\ReputationFrame.xml",
+    "Interface\\FrameXML\\HonorFrame.xml",
     // `updateContainerFrameAnchors`, which `ReputationWatchBar_Update` calls when the bar moves
     // (`ReputationFrame.lua:248`): in the reference the bar's presence reflows the bag row.
     "Interface\\FrameXML\\ContainerFrame.xml",
-    r"Interface\FrameXML\ReputationFrame.xml",
-    "Interface\\FrameXML\\SkillFrame.xml",
-    "Interface\\FrameXML\\HonorFrame.xml",
+    "Interface\\FrameXML\\BonusActionBarFrame.xml",
+    "ScrollTemplates.xml", // our scroll kit
 ];
 
 /// The manifest slice stock `FriendsFrame.xml` and `RaidFrame.xml` reach at load or on show, in its
 /// order; [`load_social_ui`] adds the raid tab's LoadOnDemand addon.
 pub(super) const SOCIAL_UI: &[&str] = &[
-    "Interface\\FrameXML\\Fonts.xml",
     "Interface\\FrameXML\\GlobalStrings.lua",
-    "Interface\\FrameXML\\LocaleProperties.lua",
+    "Interface\\FrameXML\\Fonts.xml",
     "Interface\\FrameXML\\BasicControls.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
     r"Interface\FrameXML\UIParent.xml",
-    "Interface\\FrameXML\\Cooldown.xml",
-    "Interface\\FrameXML\\ActionButtonTemplate.xml",
-    "Interface\\FrameXML\\TextStatusBar.lua",
-    "Interface\\FrameXML\\TextStatusBar.xml",
-    "Interface\\FrameXML\\MainMenuBar.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
     "Interface\\FrameXML\\GameTooltip.xml",
-    "Interface\\FrameXML\\ActionBarFrame.xml",
-    "Interface\\FrameXML\\BonusActionBarFrame.xml",
-    "ScrollTemplates.xml",
+    "Interface\\FrameXML\\UIMenu.xml",
+    "Interface\\FrameXML\\UIDropDownMenu.xml",
     "Interface\\FrameXML\\UIPanelTemplates.lua",
     "Interface\\FrameXML\\UIPanelTemplates.xml",
+    "Interface\\FrameXML\\OptionsFrameTemplates.xml",
     // The stock window tab, whose `<OnShow>` needs the `UIPanelTemplates` pair above it.
     r"Interface\FrameXML\CharacterFrameTemplates.xml",
-    "Interface\\FrameXML\\OptionsFrameTemplates.xml",
-    "Interface\\FrameXML\\ReputationFrame.xml",
     "Interface\\FrameXML\\StaticPopup.xml",
-    "Interface\\FrameXML\\UIDropDownMenu.xml",
-    "KeyBindingsPage.xml",
-    "OptionsFrame.xml",
-    "Interface\\FrameXML\\MultiActionBars.xml",
+    "Interface\\FrameXML\\TextStatusBar.lua",
+    "Interface\\FrameXML\\TextStatusBar.xml",
+    "Interface\\FrameXML\\MainMenuBar.xml",
     r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    "Interface\\FrameXML\\Cooldown.xml",
+    "Interface\\FrameXML\\ActionButtonTemplate.xml",
+    "Interface\\FrameXML\\ActionBarFrame.xml",
+    "Interface\\FrameXML\\MultiActionBars.xml",
+    "Interface\\FrameXML\\BuffFrame.xml",
+    "Interface\\FrameXML\\CombatFeedback.xml",
     "Interface\\FrameXML\\UnitPopup.xml",
-    "Interface\\FrameXML\\UIMenu.xml",
+    "Interface\\FrameXML\\UnitFrame.xml",
+    "Interface\\FrameXML\\PartyFrame.xml",
     "Interface\\FrameXML\\ChatFrame.xml",
     "Interface\\FrameXML\\FloatingChatFrame.xml",
-    "Interface\\FrameXML\\BuffFrame.xml",
-    "Interface\\FrameXML\\UnitFrame.xml",
-    "Interface\\FrameXML\\CombatFeedback.xml",
-    "Interface\\FrameXML\\PartyFrame.xml",
+    "Interface\\FrameXML\\ReputationFrame.xml",
     "Interface\\FrameXML\\FriendsFrame.xml",
     "Interface\\FrameXML\\RaidFrame.xml",
+    "Interface\\FrameXML\\BonusActionBarFrame.xml",
+    "ScrollTemplates.xml",
+    "KeyBindingsPage.xml",
+    "OptionsFrame.xml",
 ];
 
 /// Load [`SOCIAL_UI`], then the raid tab's LoadOnDemand addon as the app reaches it: seated off the
@@ -511,7 +641,7 @@ pub(super) fn load_social_ui(s: &mut UiScript) {
     s.run("RaidFrame_LoadUI()").unwrap();
 }
 
-/// The files a test needs before it can open a bag window, in `benilla.toc` order, trimmed to what
+/// The files a test needs before it can open a bag window, in the production order, trimmed to what
 /// the bags reach for. Needs client data: open with `benilla_formats::wow_data_or_skip!()`.
 pub(super) const BAG_UI: &[&str] = &[
     // The stock strings: the bar's hovers pass them to `GameTooltip:SetText`, which raises on nil.
@@ -519,54 +649,52 @@ pub(super) const BAG_UI: &[&str] = &[
     "Interface\\FrameXML\\Fonts.xml",
     // `TEXT()`, which the backpack button's OnEnter and `BagSlotButton_OnEnter` call.
     "Interface\\FrameXML\\BasicControls.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
     // `UIParent`: the twelve `ContainerFrame`s are its children, `updateContainerFrameAnchors`
     // anchors each open bag to its parent, and `OpenAllBags` returns unless `UIParent` is visible.
     r"Interface\FrameXML\UIParent.xml",
-    "ScrollTemplates.xml", // our scroll kit
-    "Interface\\FrameXML\\ItemButtonTemplate.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
     "Interface\\FrameXML\\GameTooltip.xml",
-    "Interface\\FrameXML\\Cooldown.xml",
-    // `MainMenuBar.xml` and its templates: the bag bar's `parent="MainMenuBarArtFrame"` resolves
-    // at load, and `MainMenuBar_UpdateKeyRing` puts the keyring on the bar.
-    "Interface\\FrameXML\\ActionButtonTemplate.xml",
-    "Interface\\FrameXML\\TextStatusBar.lua",
-    "Interface\\FrameXML\\TextStatusBar.xml",
-    "Interface\\FrameXML\\MainMenuBar.xml",
-    "Interface\\FrameXML\\ActionBarFrame.xml",
-    "Interface\\FrameXML\\BonusActionBarFrame.xml",
-    // `UpdateMicroButtons`, which the keyring's OnHide and OnShow call
-    // (`ContainerFrame.lua:117`, `:137`).
-    r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
+    "Interface\\FrameXML\\UIDropDownMenu.xml",
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
     // The dialog engine, after the `UIPanelCloseButton` it inherits.
     r"Interface\FrameXML\StaticPopup.xml",
-    "Interface\\FrameXML\\ContainerFrame.xml",
+    // `ContainerFrameItemButton_OnClick` hides `StackSplitFrame` on every plain click
+    // (`ContainerFrame.lua:581`) and opens it on the shift fork.
+    "Interface\\FrameXML\\StackSplitFrame.xml",
+    "Interface\\FrameXML\\TextStatusBar.lua",
+    "Interface\\FrameXML\\TextStatusBar.xml",
+    // `MainMenuBar.xml` and its templates: the bag bar's `parent="MainMenuBarArtFrame"` resolves
+    // at load, and `MainMenuBar_UpdateKeyRing` puts the keyring on the bar.
+    "Interface\\FrameXML\\MainMenuBar.xml",
+    // `UpdateMicroButtons`, which the keyring's OnHide and OnShow call
+    // (`ContainerFrame.lua:117`, `:137`).
+    r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    "Interface\\FrameXML\\Cooldown.xml",
+    "Interface\\FrameXML\\ActionButtonTemplate.xml",
+    "Interface\\FrameXML\\ActionBarFrame.xml",
+    // The chat edit box: the shift arm tests `ChatFrameEditBox:IsShown()`
+    // (`ContainerFrame.lua:568`) to choose between linking the item and splitting the stack.
+    "Interface\\FrameXML\\ChatFrame.xml",
+    "Interface\\FrameXML\\FloatingChatFrame.xml",
+    "Interface\\FrameXML\\ItemButtonTemplate.xml",
     // `BagSlotButtonTemplate` inherits `PaperDollItemSlotButtonTemplate`, and its OnLoad
     // (`PaperDollItemSlotButton_OnLoad`) gives each bag button its inventory-slot id, 20..23.
     // `CharacterFrame.xml` stays out: a missing `parent=` only warns.
     "Interface\\FrameXML\\PaperDollFrame.xml",
     // The stock bag bar, with `BagSlotButtonTemplate` and `KEYRING_CONTAINER`.
     "Interface\\FrameXML\\MainMenuBarBagButtons.xml",
-    // `ContainerFrameItemButton_OnClick` hides `StackSplitFrame` on every plain click
-    // (`ContainerFrame.lua:581`) and opens it on the shift fork.
-    "Interface\\FrameXML\\StackSplitFrame.xml",
-    // The chat edit box: the shift arm tests `ChatFrameEditBox:IsShown()`
-    // (`ContainerFrame.lua:568`) to choose between linking the item and splitting the stack.
-    "Interface\\FrameXML\\UIMenu.xml", // the kit ChatMenu/EmoteMenu/VoiceMacroMenu build from
-    "Interface\\FrameXML\\ChatFrame.xml",
-    "Interface\\FrameXML\\UIDropDownMenu.xml",
-    "Interface\\FrameXML\\UIPanelTemplates.lua",
-    "Interface\\FrameXML\\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\FloatingChatFrame.xml",
-    // Our adapters over the stock container files, loaded after them and the bar so they win.
-    "ContainerFrameAdapters.xml",
+    "Interface\\FrameXML\\ContainerFrame.xml",
     // `updateContainerFrameAnchors` measures every open bag against `BankFrame:GetRight()`
     // (`ContainerFrame.lua:505`) on every open and close, so the bank window is a hard dependency.
     "Interface\\FrameXML\\BankFrame.xml",
+    "Interface\\FrameXML\\BonusActionBarFrame.xml",
+    "ScrollTemplates.xml", // our scroll kit
+    // Our adapters over the stock container files, loaded after them and the bar so they win.
+    "ContainerFrameAdapters.xml",
 ];
 
 /// The name of the `ContainerFrame` showing bag `id`, asked of `IsBagOpen`: the reference recycles
@@ -629,13 +757,13 @@ pub(super) fn click(s: &mut UiScript, name: &str, button: &str) {
     s.mouse_button(x, y, button, false);
 }
 
-/// Seat stock `WorldFrame.xml` and `MirrorTimer.xml`: `WorldFrame_OnUpdate` loops to
+/// Stock `WorldFrame.xml` and `MirrorTimer.xml`: `WorldFrame_OnUpdate` loops to
 /// `MIRRORTIMER_NUMTIMERS`, which `MirrorTimer.lua` declares, and raises every tick without it.
 /// Its other loop reads `STATICPOPUP_NUMDIALOGS`, which every caller already loads.
-pub(super) fn load_world_frame(s: &UiScript) {
-    load_ui(s, r"Interface\FrameXML\WorldFrame.xml");
-    load_ui(s, r"Interface\FrameXML\MirrorTimer.xml");
-}
+pub(super) const WORLD_FRAME_UI: &[&str] = &[
+    r"Interface\FrameXML\WorldFrame.xml",
+    r"Interface\FrameXML\MirrorTimer.xml",
+];
 
 /// A completed left click on the game world, at a point the loaded `WorldFrame` owns: searched on
 /// a grid, since a harness's windows may cover any fixed point.
@@ -683,7 +811,7 @@ fn world_point(s: &mut UiScript) -> (f32, f32) {
 
 /// Seat one of the reference's LoadOnDemand Blizzard addons off the chain, so a harness's
 /// `UIParentLoadAddOn(name)` loads it as the app does. Needs client data.
-pub(super) fn seat_chain_addon(s: &mut UiScript, name: &str) {
+pub(crate) fn seat_chain_addon(s: &mut UiScript, name: &str) {
     let toc = super::reference_ui::read(&format!("Interface/AddOns/{name}/{name}.toc"))
         .map(|b| benilla_ui::toc::Toc::parse(&benilla_ui::source::decode(&b)))
         .unwrap_or_else(|| panic!("{name}: no toc off the chain"));
@@ -692,3 +820,51 @@ pub(super) fn seat_chain_addon(s: &mut UiScript, name: &str) {
     s.set_addon_chain_reader(Box::new(super::reference_ui::read));
     s.register_addons(vec![info], None, None, None);
 }
+
+#[cfg(test)]
+mod tests {
+    use benilla_ui::script::UiScript;
+
+    /// A kit that loads a file after one the production load runs after it fails at that load.
+    #[test]
+    fn a_kit_out_of_the_production_order_fails_at_the_load() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        let s = UiScript::new().unwrap();
+        super::load_ui(&s, r"Interface\FrameXML\Fonts.xml");
+        let late = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+            super::load_ui(&s, r"Interface\FrameXML\GlobalStrings.lua")
+        }));
+        let message = late.expect_err("GlobalStrings.lua after Fonts.xml loaded");
+        let message = message
+            .downcast_ref::<String>()
+            .cloned()
+            .unwrap_or_default();
+        assert!(
+            message.contains("the production load runs it first"),
+            "{message}"
+        );
+    }
+
+    /// The merged kit runs toc rows in the toc's order, a file a row includes just above it and a
+    /// layer file after them all, each once.
+    #[test]
+    fn a_merged_kit_takes_the_production_order() {
+        let _data = benilla_formats::wow_data_or_skip!();
+        assert_eq!(
+            super::production_order(&[
+                &["ScrollTemplates.xml", r"Interface\FrameXML\UIParent.xml"],
+                &[
+                    r"Interface\FrameXML\LocaleProperties.lua",
+                    r"Interface\FrameXML\GlobalStrings.lua",
+                    r"Interface\FrameXML\UIParent.xml",
+                ],
+            ]),
+            [
+                r"Interface\FrameXML\GlobalStrings.lua",
+                r"Interface\FrameXML\LocaleProperties.lua",
+                r"Interface\FrameXML\UIParent.xml",
+                "ScrollTemplates.xml",
+            ]
+        );
+    }
+}
diff --git a/crates/benilla-app/src/ui_script/tooltip_anchor_tests.rs b/crates/benilla-app/src/ui_script/tooltip_anchor_tests.rs
index d7f6938b..02e2e2ca 100644
--- a/crates/benilla-app/src/ui_script/tooltip_anchor_tests.rs
+++ b/crates/benilla-app/src/ui_script/tooltip_anchor_tests.rs
@@ -12,15 +12,19 @@ use super::test_ui::load_ui as load_xml;
 fn harness(extra: &[&str]) -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    // `FACTION_BAR_COLORS`, which `GameTooltip_UnitColor` indexes on every unit hover
-    // (`ReputationFrame.lua:3`).
-    load_xml(&s, r"Interface\FrameXML\ReputationFrame.lua");
-    for f in extra {
+    for f in crate::ui_script::test_ui::production_order(&[
+        &[
+            "Interface\\FrameXML\\Fonts.xml",
+            r"Interface\FrameXML\UIParent.xml",
+            r"Interface\FrameXML\MoneyFrame.lua",
+            r"Interface\FrameXML\MoneyFrame.xml",
+            "Interface\\FrameXML\\GameTooltip.xml",
+            // `FACTION_BAR_COLORS`, which `GameTooltip_UnitColor` indexes on every unit hover
+            // (`ReputationFrame.lua:3`).
+            r"Interface\FrameXML\ReputationFrame.lua",
+        ],
+        extra,
+    ]) {
         load_xml(&s, f);
     }
     // The stock tooltip sizes from its lines, so its rect needs a text measurer. Detailed tips
@@ -91,14 +95,14 @@ fn unit_frame_hover_takes_the_default_corner_and_drops_on_leave() {
         // The unit frames read GlobalStrings at load, and `UnitFrame_OnEnter` passes
         // `PARTY_OPTIONS_LABEL` to `SetText`, which raises on nil.
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-        "Interface\\FrameXML\\UnitPopup.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PlayerFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\TargetFrame.xml",
@@ -188,14 +192,14 @@ fn your_own_portrait_explains_the_menu_instead_of_showing_your_health() {
         // The unit frames read GlobalStrings at load, and `UnitFrame_OnEnter` passes
         // `PARTY_OPTIONS_LABEL` to `SetText`, which raises on nil.
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which UnitPopup.lua reads at file scope
-        "Interface\\FrameXML\\UnitPopup.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PlayerFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\TargetFrame.xml",
@@ -252,14 +256,14 @@ fn your_own_portrait_explains_the_menu_instead_of_showing_your_health() {
 fn action_button_hover_takes_the_default_corner() {
     benilla_formats::wow_data_or_skip!();
     let s = harness(&[
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BonusActionBarFrame.xml",
     ]);
@@ -288,27 +292,26 @@ fn action_button_hover_takes_the_default_corner() {
 fn ubertooltips_off_seats_action_bar_plates_beside_the_button() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness(&[
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\UIParent.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "ScrollTemplates.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
+        r"Interface\FrameXML\UIParent.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\StaticPopup.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\MultiActionBars.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "Interface\\FrameXML\\MultiActionBars.xml",
     ]);
     s.register_cvars(crate::cvars::registered_pairs());
     s.set_cvar_engine("UberTooltips", "0");
@@ -365,16 +368,14 @@ fn ubertooltips_off_seats_action_bar_plates_beside_the_button() {
 fn ubertooltips_off_seats_stance_plates_beside_the_button() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness(&[
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
         "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BonusActionBarFrame.xml",
     ]);
@@ -418,36 +419,31 @@ fn ubertooltips_off_seats_stance_plates_beside_the_button() {
 fn buff_hover_hangs_below_left_of_the_button() {
     benilla_formats::wow_data_or_skip!();
     let mut s = harness(&[
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
         r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
     ]);
-    s.set_auras(
-        "player",
-        Some(vec![AuraState {
-            spell_id: 1459,
-            name: Some("Arcane Intellect".into()),
-            icon: Some("Interface\\Icons\\Spell_Holy_MagicalSentry".into()),
-            count: 1,
-            debuff_type: None,
-            duration: 1800.0,
-            expiration_time: 1800.0,
-            helpful: true,
-            cancelable: true,
-            until_cancelled: false,
-            channeled: false,
-        }]),
-    );
+    s.set_player_auras(vec![AuraState {
+        spell_id: 1459,
+        name: Some("Arcane Intellect".into()),
+        icon: Some("Interface\\Icons\\Spell_Holy_MagicalSentry".into()),
+        count: 1,
+        debuff_type: None,
+        duration: 1800.0,
+        expiration_time: 1800.0,
+        helpful: true,
+        cancelable: true,
+        until_cancelled: false,
+        channeled: false,
+    }]);
     // The event the stock buff buttons register (`BuffFrame.lua:113`).
     s.fire_event("PLAYER_AURAS_CHANGED", vec![]);
     s.resolve();
diff --git a/crates/benilla-app/src/ui_script/tooltip_compare_tests.rs b/crates/benilla-app/src/ui_script/tooltip_compare_tests.rs
index 2dd22f2a..d7ba7536 100644
--- a/crates/benilla-app/src/ui_script/tooltip_compare_tests.rs
+++ b/crates/benilla-app/src/ui_script/tooltip_compare_tests.rs
@@ -10,14 +10,10 @@ use benilla_ui::script::{
 
 use super::test_ui::{bag_slot_button, hover, BAG_UI, CHARACTER_UI};
 
-/// Loads each file once across the overlapping lists, in first-seen order: loading a file twice
+/// Loads the lists merged, each file once, in the production order: loading a file twice
 /// redeclares its frames.
-fn load_once(s: &UiScript, seen: &mut Vec<&'static str>, files: &[&'static str]) {
-    for f in files {
-        if seen.contains(f) {
-            continue;
-        }
-        seen.push(f);
+fn load_once(s: &UiScript, parts: &[&[&str]]) {
+    for f in super::test_ui::production_order(parts) {
         super::test_ui::load_ui_strict(s, f);
     }
 }
@@ -26,9 +22,7 @@ fn load_once(s: &UiScript, seen: &mut Vec<&'static str>, files: &[&'static str])
 fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    let mut seen = Vec::new();
-    load_once(&s, &mut seen, CHARACTER_UI);
-    load_once(&s, &mut seen, &ROUTER_UI);
+    load_once(&s, &[CHARACTER_UI, &ROUTER_UI]);
     s.set_money(0);
     s.set_unit("player", Some(player()));
     s
@@ -36,10 +30,10 @@ fn harness() -> UiScript {
 
 /// `MerchantFrame.xml`, then `ItemRef.xml` with its `ItemRefTooltip`, in `FrameXML.toc` order.
 const ROUTER_UI: [&str; 4] = [
-    "ScrollTemplates.xml", // our scroll kits
     "Interface\\FrameXML\\CharacterFrameTemplates.xml",
     "Interface\\FrameXML\\MerchantFrame.xml",
     "Interface\\FrameXML\\ItemRef.xml",
+    "ScrollTemplates.xml", // our scroll kits
 ];
 
 /// Race and class carry both halves: stock `PaperDollFrame_SetLevel` formats them unguarded on
@@ -56,15 +50,12 @@ fn player() -> UnitState {
     }
 }
 
-/// [`harness`] with the stock bag windows. `CHARACTER_UI` leads, as in `FrameXML.toc`, because
-/// `BagSlotButtonTemplate` inherits `PaperDollItemSlotButtonTemplate` from `PaperDollFrame.xml`.
+/// [`harness`] with the stock bag windows: `BagSlotButtonTemplate` inherits
+/// `PaperDollItemSlotButtonTemplate` from `PaperDollFrame.xml`, which the toc lists first.
 fn harness_with_bags() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    let mut seen = Vec::new();
-    load_once(&s, &mut seen, CHARACTER_UI);
-    load_once(&s, &mut seen, BAG_UI);
-    load_once(&s, &mut seen, &ROUTER_UI);
+    load_once(&s, &[CHARACTER_UI, BAG_UI, &ROUTER_UI]);
     s.set_money(0);
     s
 }
@@ -248,6 +239,112 @@ fn doll_hover_renders_the_live_instance() {
     assert!(s.errors().is_empty(), "errors: {:?}", s.errors());
 }
 
+/// In repair mode a damaged item's hover adds `REPAIR_COST` and its coins, worn
+/// (`PaperDollFrame.lua:757-760`) or bagged (`ContainerFrame.lua:274-277`); out of it, neither.
+#[test]
+fn repair_mode_hover_shows_the_items_repair_cost() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = harness_with_bags();
+    s.set_unit("player", Some(player()));
+    let mut inv: InventorySlots = Default::default();
+    inv[16] = Some(InvSlotView {
+        item_id: 1300,
+        count: 1,
+        quality: 2,
+        name: Some("Worn Sword".into()),
+        link: Some("|cff1eff00|Hitem:1300:0:0:0|h[Worn Sword]|h|r".into()),
+        durability: Some((35, 75)),
+        equip_slots: vec![16],
+        ..Default::default()
+    });
+    s.set_inventory_slots(inv);
+    let mut slots = std::collections::HashMap::new();
+    slots.insert(
+        1,
+        ContainerSlot {
+            item_id: 1301,
+            count: 1,
+            quality: Some(2),
+            link: Some("|cff1eff00|Hitem:1301:0:0:0|h[Worn Helm]|h|r".into()),
+            durability: Some((10, 40)),
+            equip_slots: vec![1],
+            ..Default::default()
+        },
+    );
+    s.set_container(
+        0,
+        Some(ContainerState {
+            name: Some("Backpack".into()),
+            num_slots: 16,
+            slots,
+        }),
+    );
+    s.set_item_template(
+        1300,
+        ItemTemplateView {
+            class: 2,
+            subclass: 7,
+            max_durability: 75,
+            sell_price: 5,
+            ..armor_template("Worn Sword", 13)
+        },
+    );
+    s.set_item_template(
+        1301,
+        ItemTemplateView {
+            max_durability: 40,
+            sell_price: 5,
+            ..armor_template("Worn Helm", 1)
+        },
+    );
+    let mut costs = benilla_ui::script::RepairCosts::default();
+    costs.equipped.insert(16, 40);
+    costs.bags.insert((0, 1), 57);
+    s.set_repair_costs(costs);
+    s.set_merchant(Some(benilla_ui::script::MerchantState {
+        can_repair: true,
+        ..Default::default()
+    }));
+    // `MERCHANT_SHOW` opens the backpack.
+    s.fire_event("MERCHANT_SHOW", vec![]);
+    s.run(r#"ToggleCharacter("PaperDollFrame")"#).unwrap();
+    s.take_sounds();
+    let repair_line = |s: &UiScript| -> Option<String> {
+        s.eval::<bool>(
+            "for i = 1, GameTooltip:NumLines() do \
+               if getglobal('GameTooltipTextLeft' .. i):GetText() == REPAIR_COST then \
+                 return true end \
+             end return false",
+        )
+        .unwrap()
+        .then(|| {
+            s.eval::<String>("return GameTooltipMoneyFrameCopperButton:GetText()")
+                .unwrap()
+        })
+    };
+    let bag = bag_slot_button(&s, 0, 1);
+
+    hover(&mut s, &bag);
+    assert_eq!(repair_line(&s), None, "a bag hover out of repair mode");
+    hover(&mut s, "CharacterMainHandSlot");
+    assert_eq!(repair_line(&s), None, "a doll hover out of repair mode");
+
+    s.run("ShowRepairCursor()").unwrap();
+    hover(&mut s, &bag);
+    assert_eq!(
+        repair_line(&s).as_deref(),
+        Some("57"),
+        "the bag slot's cost"
+    );
+    hover(&mut s, "CharacterMainHandSlot");
+    assert_eq!(
+        repair_line(&s).as_deref(),
+        Some("40"),
+        "the worn sword's cost"
+    );
+    assert!(s.errors().is_empty(), "errors: {:?}", s.errors());
+}
+
 /// `MerchantItemButton`'s `OnEnter` (`MerchantFrame.xml:67`) seats plate 1 at the tooltip's
 /// `TOPRIGHT` (0, -10) and plate 2 off plate 1. The compare call passes p4 = 0, so a plate is the
 /// worn item's ordinary tooltip under a gray `Currently Equipped` line.
diff --git a/crates/benilla-app/src/ui_script/tot_frame_tests.rs b/crates/benilla-app/src/ui_script/tot_frame_tests.rs
index 0da18977..8186dc1b 100644
--- a/crates/benilla-app/src/ui_script/tot_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/tot_frame_tests.rs
@@ -33,31 +33,29 @@ fn unit(name: &str, guid: u64, health: u32) -> UnitState {
 fn load_tot() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
+    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
+    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
     load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
     load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
+    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
+    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     load_xml(&s, "Interface\\FrameXML\\Cooldown.xml");
     load_xml(&s, "Interface\\FrameXML\\ActionButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, "Interface\\FrameXML\\MainMenuBar.xml");
     load_xml(&s, "Interface\\FrameXML\\ActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\CombatFeedback.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PlayerFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PartyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\TargetFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PetFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\BonusActionBarFrame.xml");
     // The pair's defaults from stock `UIOptionsFrame_Init` (`UIOptionsFrame.lua:116-119`), which
     // this kit does not load.
     s.run(r#"SHOW_TARGET_OF_TARGET = "0" SHOW_TARGET_OF_TARGET_STATE = "5""#)
@@ -402,8 +400,9 @@ fn the_debuff_row_draws_what_the_unit_carries() {
     benilla_formats::wow_data_or_skip!();
     let mut s = load_tot();
     switch_on(&mut s);
-    s.set_auras(
-        "targettarget",
+    s.set_unit_guids(&unit_guids());
+    s.set_unit_auras(
+        TOT,
         Some(vec![
             debuff(1000, "Rend", None),
             debuff(1001, "Curse of Agony", Some("Curse")),
@@ -437,7 +436,8 @@ fn the_target_rows_wrap_short_while_the_frame_stands_beside_them() {
     benilla_formats::wow_data_or_skip!();
     let mut s = load_tot();
     // A hostile target, so the debuffs lead and the buffs hang off them.
-    s.set_auras("target", Some(vec![debuff(2000, "Sunder", None)]));
+    s.set_unit_guids(&unit_guids());
+    s.set_unit_auras(TARGET, Some(vec![debuff(2000, "Sunder", None)]));
     s.fire_event("UNIT_AURA", vec![ScriptValue::Str("target".into())]);
 
     let anchor = |s: &mut UiScript, frame: &str| -> String {
@@ -498,3 +498,17 @@ fn the_reconcile_takes_the_frame_down_when_the_token_goes_silent() {
     assert!(shown(&mut s), "and brings it back");
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
+
+const TARGET: u64 = 0xF130_0000_0000_0001;
+const TOT: u64 = 0xF130_0000_0000_0002;
+
+/// The resolver's inputs: `"target"` is `TARGET`, held and targeting `TOT`, so `"targettarget"`
+/// is `TOT`.
+fn unit_guids() -> benilla_ui::script::UnitGuids {
+    benilla_ui::script::UnitGuids {
+        player: 1,
+        target: TARGET,
+        held: [(TARGET, TOT)].into_iter().collect(),
+        ..Default::default()
+    }
+}
diff --git a/crates/benilla-app/src/ui_script/trainer_tests.rs b/crates/benilla-app/src/ui_script/trainer_tests.rs
index 8b564d17..7af7d278 100644
--- a/crates/benilla-app/src/ui_script/trainer_tests.rs
+++ b/crates/benilla-app/src/ui_script/trainer_tests.rs
@@ -9,7 +9,7 @@ use benilla_ui::script::{
 use super::test_ui::load_ui as load_xml;
 
 /// The trainer window with every state filter on, for the full tree at fixed indices.
-fn trainer_script() -> UiScript {
+pub(super) fn trainer_script() -> UiScript {
     let mut s = trainer_script_base();
     load_xml(
         &s,
@@ -25,38 +25,38 @@ fn trainer_script_base() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     s.set_text_measurer(Box::new(super::FixedWidthFont(7.0)));
-    // In manifest order (ScrollTemplates before UIPanelTemplates): the window calls
+    // In the production order: the window calls
     // `UpdateMicroButtons` and inherits the panel templates.
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\TextStatusBar.lua",
-        "Interface\\FrameXML\\TextStatusBar.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
-        "ScrollTemplates.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
         r"Interface\FrameXML\UIPanelTemplates.lua",
         r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\OptionsFrameTemplates.xml",
-        r"Interface\FrameXML\ReputationFrame.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
         "Interface\\FrameXML\\StaticPopup.xml",
-        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
+        "Interface\\FrameXML\\MultiActionBars.xml",
+        r"Interface\FrameXML\ReputationFrame.xml",
+        "Interface\\FrameXML\\MerchantFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "Interface\\FrameXML\\ClassTrainerFrameTemplates.xml",
+        "ScrollTemplates.xml",
         "KeyBindingsPage.xml",
         "OptionsFrame.xml",
-        "Interface\\FrameXML\\MultiActionBars.xml",
-        r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
-        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-        "Interface\\FrameXML\\MerchantFrame.xml",
-        "Interface\\FrameXML\\ClassTrainerFrameTemplates.xml",
     ] {
         load_xml(&s, f);
     }
@@ -148,7 +148,7 @@ fn service(
 /// A two-line warrior menu. Groups sort by name, services by level then name, so the tree is:
 ///   1 H:Arms · 2 Heroic Strike(avail,10c,l1) · 3 Cleave(unavail,l20,skill+ability) ·
 ///   4 H:Fury · 5 Rend(used,30c) · 6 Thunder Clap(avail,500c)
-fn menu() -> TrainerState {
+pub(super) fn menu() -> TrainerState {
     TrainerState {
         greeting: "Well met. Let me show you the way of the warrior.".into(),
         trainer_type: 0,
diff --git a/crates/benilla-app/src/ui_script/tutorial_tests.rs b/crates/benilla-app/src/ui_script/tutorial_tests.rs
index e1754c8a..ac1d87ff 100644
--- a/crates/benilla-app/src/ui_script/tutorial_tests.rs
+++ b/crates/benilla-app/src/ui_script/tutorial_tests.rs
@@ -9,11 +9,11 @@ fn session() -> UiScript {
     s.set_screen_size(1024.0, 768.0);
     s.run("function PlaySound() end").unwrap();
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\Localization.xml",
-        "Interface\\FrameXML\\LocaleProperties.lua",
         "Interface\\FrameXML\\BasicControls.xml",
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
diff --git a/crates/benilla-app/src/ui_script/ui_menu_tests.rs b/crates/benilla-app/src/ui_script/ui_menu_tests.rs
index 0e17429c..13d5cce3 100644
--- a/crates/benilla-app/src/ui_script/ui_menu_tests.rs
+++ b/crates/benilla-app/src/ui_script/ui_menu_tests.rs
@@ -11,20 +11,20 @@ fn chat_menu() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
-        r"Interface\FrameXML\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         r"Interface\FrameXML\GlobalStrings.lua",
+        r"Interface\FrameXML\Fonts.xml",
         r"Interface\FrameXML\BasicControls.xml",
         r"Interface\FrameXML\LocaleProperties.lua",
-        r"Interface\FrameXML\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         r"Interface\FrameXML\GameTooltip.xml",
         r"Interface\FrameXML\UIMenu.xml",
-        r"Interface\FrameXML\ChatFrame.xml",
         r"Interface\FrameXML\UIDropDownMenu.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        r"Interface\FrameXML\StaticPopup.xml",
+        r"Interface\FrameXML\ChatFrame.xml",
         r"Interface\FrameXML\FloatingChatFrame.xml",
     ] {
         load_xml(&s, f);
diff --git a/crates/benilla-app/src/ui_script/uiparent_tests.rs b/crates/benilla-app/src/ui_script/uiparent_tests.rs
index 4722f458..4f8dbc89 100644
--- a/crates/benilla-app/src/ui_script/uiparent_tests.rs
+++ b/crates/benilla-app/src/ui_script/uiparent_tests.rs
@@ -2,7 +2,7 @@
 
 use benilla_ui::script::UiScript;
 
-/// Fonts (for any `inherits=`), then UIParent, in manifest order.
+/// Fonts (for any `inherits=`), then UIParent, in the production order.
 fn ui_parent() -> UiScript {
     let mut s = UiScript::new().unwrap();
     for file in [
diff --git a/crates/benilla-app/src/ui_script/unit_frame_tests.rs b/crates/benilla-app/src/ui_script/unit_frame_tests.rs
index 35adaa79..9f759fef 100644
--- a/crates/benilla-app/src/ui_script/unit_frame_tests.rs
+++ b/crates/benilla-app/src/ui_script/unit_frame_tests.rs
@@ -4,30 +4,40 @@ use benilla_ui::script::{
 
 use super::test_ui::{hover, load_ui as load_xml, unhover};
 
-/// The unit frames' load prefix, in the manifest's order.
+/// The unit frames' load prefix, in the production order.
 fn load_unit_frames(s: &UiScript) {
-    // Stock `GlobalStrings.lua` first, as the app runs it: the unit-frame files read it at load
-    // (`CombatFeedback.lua:6-17`, `UnitFrame.lua:2-7`).
-    load_xml(s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(s, "Interface\\FrameXML\\TextStatusBar.lua");
-    load_xml(s, "Interface\\FrameXML\\TextStatusBar.xml");
-    load_xml(s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\GameTooltip.xml");
-    // `FACTION_BAR_COLORS` (`ReputationFrame.lua:3`) for stock `GameTooltip_UnitColor`.
-    load_xml(s, r"Interface\FrameXML\ReputationFrame.lua");
-    load_xml(s, "Interface\\FrameXML\\UIDropDownMenu.xml");
-    load_xml(s, "Interface\\FrameXML\\BasicControls.xml"); // `TEXT`, read by UnitPopup.lua at load
-    load_xml(s, "Interface\\FrameXML\\UnitPopup.xml");
-    load_xml(s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\UnitFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\CombatFeedback.xml");
-    load_xml(s, "Interface\\FrameXML\\PlayerFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\PartyFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\TargetFrame.xml");
-    load_xml(s, "Interface\\FrameXML\\PetFrame.xml");
+    load_unit_frames_with(s, &[]);
+}
+
+/// [`load_unit_frames`] with `extra` merged in.
+fn load_unit_frames_with(s: &UiScript, extra: &[&str]) {
+    const UNIT_FRAMES: &[&str] = &[
+        // Stock `GlobalStrings.lua` first, as the app runs it: the unit-frame files read it at load
+        // (`CombatFeedback.lua:6-17`, `UnitFrame.lua:2-7`).
+        "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, read by UnitPopup.lua at load
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
+        "Interface\\FrameXML\\GameTooltip.xml",
+        "Interface\\FrameXML\\UIDropDownMenu.xml",
+        "Interface\\FrameXML\\TextStatusBar.lua",
+        "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\BuffFrame.xml",
+        "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
+        "Interface\\FrameXML\\PlayerFrame.xml",
+        "Interface\\FrameXML\\PartyFrame.xml",
+        "Interface\\FrameXML\\TargetFrame.xml",
+        "Interface\\FrameXML\\PetFrame.xml",
+        // `FACTION_BAR_COLORS` (`ReputationFrame.lua:3`) for stock `GameTooltip_UnitColor`.
+        r"Interface\FrameXML\ReputationFrame.lua",
+    ];
+    for file in super::test_ui::production_order(&[UNIT_FRAMES, extra]) {
+        load_xml(s, file);
+    }
 }
 
 /// The stock unit frames driven by snapshots: bar fill, the target's hide and show, a late name.
@@ -556,25 +566,23 @@ fn shipped_target_frame_runs_the_level_law() {
     use benilla_ui::script::PlayerReqState;
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
-    load_unit_frames(&s);
     // `GetDifficultyColor`'s load chain: the stock quest log window.
-    load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, "ScrollTemplates.xml"); // our scroll kits
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\CharacterFrameTemplates.xml"); // the window tab
-    load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\MerchantFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\ItemButtonTemplate.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MainMenuBarMicroButtons.xml");
-    load_xml(&s, "Interface\\FrameXML\\QuestLogFrame.xml");
+    load_unit_frames_with(
+        &s,
+        &[
+            r"Interface\FrameXML\LocaleProperties.lua",
+            r"Interface\FrameXML\UIPanelTemplates.lua",
+            r"Interface\FrameXML\UIPanelTemplates.xml",
+            r"Interface\FrameXML\CharacterFrameTemplates.xml", // the window tab
+            r"Interface\FrameXML\StaticPopup.xml",
+            r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+            "Interface\\FrameXML\\ItemButtonTemplate.xml",
+            "Interface\\FrameXML\\QuestFrame.xml",
+            "Interface\\FrameXML\\QuestLogFrame.xml",
+            "Interface\\FrameXML\\MerchantFrame.xml",
+            "ScrollTemplates.xml", // our scroll kits
+        ],
+    );
     // Level 3 on both feeds, which the app keeps in step: the snapshot `UnitLevel("player")` reads
     // and the requirement state the −1 gate and `GetQuestGreenRange` read.
     s.set_player_req_state(PlayerReqState {
@@ -1139,31 +1147,31 @@ fn the_party_art_paints_over_the_bars() {
     s.set_screen_size(1024.0, 768.0);
     load_xml(&s, "Interface\\FrameXML\\GlobalStrings.lua");
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
-    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
-    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
     load_xml(&s, r"Interface\FrameXML\BasicControls.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
-    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
-    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
-    load_xml(&s, r"Interface\FrameXML\ReputationFrame.lua"); // FACTION_BAR_COLORS
-    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
     // Before UnitPopup, which reads `TEXT` and `ITEM_QUALITY_COLORS` (`UIParent.lua:65`) at load.
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
-    // The stock kit in the manifest's order. `TargetofTargetTextureFrame`'s OnLoad calls
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
+    load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
+    load_xml(&s, "Interface\\FrameXML\\GameTooltip.xml");
+    load_xml(&s, "Interface\\FrameXML\\UIDropDownMenu.xml");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
+    load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
+    load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
+    // The stock kit in the production order. `TargetofTargetTextureFrame`'s OnLoad calls
     // `RaiseFrameLevel` (`UIParent.lua:1894-1896`), loaded above.
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.lua");
     load_xml(&s, "Interface\\FrameXML\\TextStatusBar.xml");
     load_xml(&s, "Interface\\FrameXML\\BuffFrame.xml");
-    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\CombatFeedback.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitPopup.xml");
+    load_xml(&s, "Interface\\FrameXML\\UnitFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PlayerFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PartyFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\TargetFrame.xml");
     load_xml(&s, "Interface\\FrameXML\\PetFrame.xml");
+    load_xml(&s, r"Interface\FrameXML\ReputationFrame.lua"); // FACTION_BAR_COLORS
 
     s.set_unit(
         "party1",
diff --git a/crates/benilla-app/src/ui_script/unit_popup_tests.rs b/crates/benilla-app/src/ui_script/unit_popup_tests.rs
index f1200800..62ddc016 100644
--- a/crates/benilla-app/src/ui_script/unit_popup_tests.rs
+++ b/crates/benilla-app/src/ui_script/unit_popup_tests.rs
@@ -6,42 +6,42 @@ use benilla_ui::script::{FollowRequest, PartyRequest, UiScript, UnitState};
 
 use super::test_ui::load_ui as load_xml;
 
-/// The files the popups need, in `benilla.toc`'s order, ending with `FriendsFrame.xml`, home of
+/// The files the popups need, in the production order, ending with `FriendsFrame.xml`, home of
 /// `FriendsFrame_ShowDropdown` and `FriendsDropDown`.
 fn load_popup_frames(s: &UiScript) {
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, read at file scope below
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         // `SmallMoneyFrame_OnLoad`, which the chain's StaticPopup money rows call at load.
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        // `StaticPopupDialogs` and `PanelTemplates_*`, which FriendsFrame.xml reaches at load.
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, read at file scope below
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UnitPopup.xml",
-        "Interface\\FrameXML\\ItemRef.xml",
+        // `StaticPopupDialogs` and `PanelTemplates_*`, which FriendsFrame.xml reaches at load.
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PlayerFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\TargetFrame.xml",
         "Interface\\FrameXML\\PetFrame.xml",
-        "ScrollTemplates.xml",
-        "Interface\\FrameXML\\CharacterFrameTemplates.xml",
-        "Interface\\FrameXML\\FriendsFrame.xml",
+        "Interface\\FrameXML\\ChatFrame.xml",
         // Declares `ChatFrameEditBox`, which the rename dialog's OnHide refocuses.
         "Interface\\FrameXML\\FloatingChatFrame.xml",
+        "Interface\\FrameXML\\FriendsFrame.xml",
+        "Interface\\FrameXML\\ItemRef.xml",
+        "ScrollTemplates.xml",
     ] {
         load_xml(s, file);
     }
@@ -451,37 +451,37 @@ fn solo_target_inspect_click_reaches_inspect_unit() {
 /// The pet menu's files, with `StaticPopup.xml` for the rename and abandon dialogs.
 fn load_pet_menu_frames(s: &UiScript) {
     for file in [
+        "Interface\\FrameXML\\GlobalStrings.lua",
         "Interface\\FrameXML\\Fonts.xml",
+        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, read at file scope below
+        "Interface\\FrameXML\\LocaleProperties.lua",
         r"Interface\FrameXML\UIParent.xml",
         r"Interface\FrameXML\MoneyFrame.lua",
         r"Interface\FrameXML\MoneyFrame.xml",
-        "Interface\\FrameXML\\GlobalStrings.lua",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
-        "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, read at file scope below
-        "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIMenu.xml",
-        "Interface\\FrameXML\\ChatFrame.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml",
-        "Interface\\FrameXML\\UnitPopup.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\TextStatusBar.lua",
         "Interface\\FrameXML\\TextStatusBar.xml",
+        "Interface\\FrameXML\\MainMenuBar.xml",
+        "Interface\\FrameXML\\Cooldown.xml",
+        "Interface\\FrameXML\\ActionButtonTemplate.xml",
+        "Interface\\FrameXML\\ActionBarFrame.xml",
         "Interface\\FrameXML\\BuffFrame.xml",
-        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\CombatFeedback.xml",
+        "Interface\\FrameXML\\UnitPopup.xml",
+        "Interface\\FrameXML\\UnitFrame.xml",
         "Interface\\FrameXML\\PlayerFrame.xml",
         "Interface\\FrameXML\\PartyFrame.xml",
         "Interface\\FrameXML\\TargetFrame.xml",
         "Interface\\FrameXML\\PetFrame.xml",
-        "Interface\\FrameXML\\Cooldown.xml",
-        "Interface\\FrameXML\\ActionButtonTemplate.xml",
-        "Interface\\FrameXML\\MainMenuBar.xml",
-        "Interface\\FrameXML\\ActionBarFrame.xml",
-        "Interface\\FrameXML\\BonusActionBarFrame.xml",
+        "Interface\\FrameXML\\ChatFrame.xml",
         // Declares `ChatFrameEditBox`, which the rename dialog's OnHide refocuses.
         "Interface\\FrameXML\\FloatingChatFrame.xml",
+        "Interface\\FrameXML\\BonusActionBarFrame.xml",
     ] {
         load_xml(s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/video_options_tests.rs b/crates/benilla-app/src/ui_script/video_options_tests.rs
new file mode 100644
index 00000000..84d4ae5e
--- /dev/null
+++ b/crates/benilla-app/src/ui_script/video_options_tests.rs
@@ -0,0 +1,246 @@
+//! The stock Video Options window (`OptionsFrame.xml`/`.lua`, off the player's chain) standing on
+//! its own: open, every box and slider, Okay, Defaults and Cancel, with no Lua error and the
+//! values each verb stores.
+
+use benilla_ui::script::{ScreenResolution, UiScript, UnitState, VideoCaps};
+
+/// A loaded default UI with the display facts the window's `OnLoad`s and `_Load` read.
+fn video_ui() -> UiScript {
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    s.set_screen_resolutions(
+        vec![
+            ScreenResolution {
+                width: 1280,
+                height: 720,
+            },
+            ScreenResolution {
+                width: 1920,
+                height: 1080,
+            },
+        ],
+        Some(ScreenResolution {
+            width: 1600,
+            height: 900,
+        }),
+    );
+    s.set_video_caps(VideoCaps {
+        anisotropic: true,
+        pixel_shaders: true,
+        vertex_shaders: true,
+        trilinear: true,
+        triple_buffering: false,
+        max_anisotropy: 16,
+        hardware_cursor: true,
+    });
+    s.set_unit(
+        "player",
+        Some(UnitState {
+            exists: true,
+            name: Some("Probefour".into()),
+            level: 60,
+            class: Some("Warrior".into()),
+            class_file: Some("WARRIOR".into()),
+            ..Default::default()
+        }),
+    );
+    let failures = super::load_default_ui(&s);
+    assert!(failures.is_empty(), "manifest load errors: {failures:#?}");
+    s
+}
+
+fn cvar(s: &UiScript, name: &str) -> Option<String> {
+    s.eval::<Option<String>>(&format!("return GetCVar({name:?})"))
+        .unwrap()
+}
+
+fn slider(s: &UiScript, i: usize) -> f64 {
+    s.eval::<f64>(&format!("return OptionsFrameSlider{i}:GetValue()"))
+        .unwrap()
+}
+
+fn assert_clean(s: &UiScript, step: &str) {
+    let errors = s.errors();
+    assert!(errors.is_empty(), "{step} raised: {errors:#?}");
+    let unknown: Vec<String> = s
+        .warnings()
+        .into_iter()
+        .filter(|w| w.contains("unknown CVar"))
+        .collect();
+    assert!(
+        unknown.is_empty(),
+        "{step} touched an unregistered CVar: {unknown:#?}"
+    );
+}
+
+/// Every box's `(cvar, stored value, checked)`, over the window's own table
+/// (`OptionsFrameCheckButtons`, `OptionsFrame.lua:5-22`); the stored value is `"nil"` when absent.
+fn boxes(s: &UiScript) -> Vec<(String, String, bool, bool)> {
+    s.eval::<Vec<String>>(
+        r#"local out = {}
+        for _, v in OptionsFrameCheckButtons do
+            local b = getglobal("OptionsFrameCheckButton"..v.index)
+            local bit = function(x) if x then return "1" else return "0" end end
+            table.insert(out, v.cvar.."|"..(GetCVar(v.cvar) or "nil").."|"..bit(b:GetChecked())
+                .."|"..bit(b:IsEnabled() == 1))
+        end
+        return out"#,
+    )
+    .unwrap()
+    .into_iter()
+    .map(|row| {
+        let f: Vec<&str> = row.split('|').collect();
+        (f[0].to_string(), f[1].to_string(), f[2] == "1", f[3] == "1")
+    })
+    .collect()
+}
+
+/// Open, walk every box and slider, Okay; reopen and Defaults; reopen, move the gamma and Cancel.
+/// Each step runs the stock Lua to its end: an aborted `OptionsFrame_Load` leaves
+/// `OptionsFrame.gamma` nil for `OnHide`'s `SetGamma` (`OptionsFrame.lua:260`).
+#[test]
+fn the_stock_video_window_opens_saves_restores_defaults_and_cancels_clean() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let s = video_ui();
+
+    // ── Open: `OptionsFrame_Load` reads every slider through its verb or its CVar. ──
+    s.run("ShowUIPanel(OptionsFrame)").unwrap();
+    assert_clean(&s, "opening the window");
+    assert!(s.eval::<bool>("return OptionsFrame:IsShown()").unwrap());
+    // Environment Detail: `GetWorldDetail`, stop 1 at the registered `SmallCull` 0.04.
+    assert_eq!(slider(&s, 3), 1.0);
+    // Terrain Mip: `GetTerrainMip` is `1 - shadowLevel` (`0x488fbd`), `shadowLevel` "1".
+    assert_eq!(slider(&s, 4), 0.0);
+    // Texture Detail: `GetBaseMip` is `1 - baseMip` (`0x48928d`), `baseMip` "0".
+    assert_eq!(slider(&s, 5), 1.0);
+    // Spell Detail: the CVar path, `spellEffectLevel` "2".
+    assert_eq!(slider(&s, 8), 2.0);
+    // `OptionsFrame_Load:153-154` recorded both for `OnHide`.
+    assert_eq!(s.eval::<f64>("return OptionsFrame.gamma").unwrap(), 0.0);
+    assert_eq!(
+        s.eval::<Option<String>>("return OptionsFrame.desktopGamma")
+            .unwrap()
+            .as_deref(),
+        Some("0"),
+        "`DesktopGamma` registers \"0\" (`0x402d4d`)"
+    );
+
+    // Every box shows its CVar's stored value: all eighteen are registered, and an enabled box is
+    // ticked exactly when its value is "1" (`OptionsFrame_Load`'s `EnableCheckBox(button, 1,
+    // GetCVar(...))`).
+    let at_open = boxes(&s);
+    assert_eq!(at_open.len(), 18);
+    for (cvar, value, checked, enabled) in &at_open {
+        assert!(value == "0" || value == "1", "{cvar} stores {value:?}");
+        if *enabled {
+            assert_eq!(*checked, value == "1", "{cvar}'s box shows its value");
+        }
+    }
+
+    // ── Every box, then every slider to a position off its default. ──
+    for i in 1..=18 {
+        s.run(&format!("OptionsFrameCheckButton{i}:Click()"))
+            .unwrap();
+    }
+    for (i, v) in [
+        (1, "1.0"),
+        (2, "777"),
+        (3, "2"),
+        (4, "1"),
+        (5, "0"),
+        (6, "0.5"),
+        (7, "5"),
+        (8, "0"),
+        (9, "0"),
+    ] {
+        s.run(&format!("OptionsFrameSlider{i}:SetValue({v})"))
+            .unwrap();
+    }
+    assert_clean(&s, "walking the boxes and sliders");
+
+    // ── Okay: `OptionsFrame_Save`, then `OnHide`'s `OptionsFrame_Cancel`. ──
+    s.run("OptionsFrameOkay:Click()").unwrap();
+    assert_clean(&s, "Okay");
+    assert!(!s.eval::<bool>("return OptionsFrame:IsShown()").unwrap());
+    // `SetWorldDetail(2)`: `frillDensity` 48 and `smallCull` "%f" of 0.01 (`0x488e1e`, `0x488e56`).
+    assert_eq!(cvar(&s, "frillDensity").as_deref(), Some("48"));
+    assert_eq!(cvar(&s, "SmallCull").as_deref(), Some("0.010000"));
+    assert_eq!(s.eval::<f64>("return GetWorldDetail()").unwrap(), 2.0);
+    // `SetTerrainMip(1)` writes `1 - 1` as "%d" (`0x48901d`-`0x489025`).
+    assert_eq!(cvar(&s, "shadowLevel").as_deref(), Some("0"));
+    // `SetBaseMip(0)` writes `trunc(1 - 0)` as "%d" (`0x4892f5`-`0x489301`).
+    assert_eq!(cvar(&s, "baseMip").as_deref(), Some("1"));
+    assert_eq!(cvar(&s, "spellEffectLevel").as_deref(), Some("0"));
+    assert_eq!(cvar(&s, "farclip").as_deref(), Some("777"));
+    assert_eq!(cvar(&s, "gamma").as_deref(), Some("0.500000"));
+    // The Use Desktop Gamma box was ticked, `_Save` wrote "1" and the recorded value follows it.
+    assert_eq!(cvar(&s, "desktopGamma").as_deref(), Some("1"));
+    // `_Save` stored every box as it was left, and each moved box kept its click.
+    let saved = boxes(&s);
+    for (cvar, value, checked, _) in &saved {
+        assert_eq!(
+            value,
+            if *checked { "1" } else { "0" },
+            "{cvar} kept its box"
+        );
+    }
+    let moved: Vec<&str> = at_open
+        .iter()
+        .zip(&saved)
+        .filter(|(a, b)| a.1 != b.1)
+        .map(|(a, _)| a.0.as_str())
+        .collect();
+    for cvar in [
+        "ffxGlow",
+        "specular",
+        "movieSubtitle",
+        "lod",
+        "gxCursor",
+        "useWeatherShaders",
+    ] {
+        assert!(
+            moved.contains(&cvar),
+            "{cvar} was clicked and saved: {moved:?}"
+        );
+    }
+    // Enable All Shaders is copied into `ffx` (`OptionsFrame.lua:202-204`).
+    assert_eq!(cvar(&s, "ffx"), cvar(&s, "pixelShaders"));
+
+    // ── Defaults: `OptionsFrame_SetDefaults` reads `GetCVarDefault` for `smallCull`,
+    //    `shadowLevel` and `baseMip` (`:431-443`) and ends in `RestoreVideoDefaults`. ──
+    s.run("ShowUIPanel(OptionsFrame)").unwrap();
+    assert_clean(&s, "reopening for Defaults");
+    s.run("OptionsFrameDefaults:Click()").unwrap();
+    assert_clean(&s, "Defaults");
+    assert!(!s.eval::<bool>("return OptionsFrame:IsShown()").unwrap());
+    // `RestoreVideoDefaults` restores the graphics CVars benilla registers among `0x639a60`'s.
+    for (name, default) in [
+        ("farclip", "350"),
+        ("SmallCull", "0.04"),
+        ("shadowLevel", "1"),
+        ("baseMip", "0"),
+        ("doodadAnim", "1"),
+    ] {
+        assert_eq!(cvar(&s, name).as_deref(), Some(default), "{name} restored");
+    }
+
+    // ── Cancel: `OnHide` puts back the gamma and desktop gamma recorded at open. ──
+    s.run("ShowUIPanel(OptionsFrame)").unwrap();
+    let gamma_at_open = cvar(&s, "gamma");
+    let desktop_at_open = cvar(&s, "desktopGamma");
+    s.run("OptionsFrameCheckButton1:SetChecked(nil) OptionsFrameSlider6:SetValue(-0.5) SetGamma(-0.5)")
+        .unwrap();
+    s.run("OptionsFrameCancel:Click()").unwrap();
+    assert_clean(&s, "Cancel");
+    assert!(!s.eval::<bool>("return OptionsFrame:IsShown()").unwrap());
+    assert_eq!(
+        cvar(&s, "gamma"),
+        gamma_at_open,
+        "Cancel restores the gamma"
+    );
+    assert_eq!(
+        cvar(&s, "desktopGamma"),
+        desktop_at_open,
+        "…and the desktop gamma (`OptionsFrame.lua:261`)"
+    );
+}
diff --git a/crates/benilla-app/src/ui_script/world_entry_tests.rs b/crates/benilla-app/src/ui_script/world_entry_tests.rs
index 5f6e7a30..121ca3f6 100644
--- a/crates/benilla-app/src/ui_script/world_entry_tests.rs
+++ b/crates/benilla-app/src/ui_script/world_entry_tests.rs
@@ -80,7 +80,7 @@ fn hermetic_addon(
     (tmp, capture, benilla_home)
 }
 
-/// The world after `Startup` ([`super::setup_script`]): a VM with only the font registry.
+/// The world after `Startup` ([`super::setup_script`]): a boot VM, no frames.
 fn booted_world() -> World {
     let mut world = World::new();
     world.init_resource::<super::AddOnIdentity>();
@@ -270,6 +270,50 @@ fn the_login_arms_the_world_latch_and_the_logout_spends_it() {
     let _ = std::fs::remove_dir_all(&tmp);
 }
 
+/// `CGGameUI::InitializeGame` flags `realmList`, `realmName` and `scriptMemory` read-only for the
+/// world session (`0x48f566`-`0x48f584`) and `ShutdownGame` clears them (`0x491240`): an
+/// in-game `SetCVar` of one raises, through a reload too, and the character screen's does not.
+#[test]
+fn the_realm_cvars_are_read_only_to_lua_only_in_the_world() {
+    let _l = ENV_LOCK
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    let (tmp, _c, _h) = hermetic_probe("readonly");
+    let mut world = booted_world();
+    world.init_resource::<super::LeavingWorldArmed>();
+    let set = |world: &World, chunk: &str| {
+        let s = world.non_send_resource::<benilla_ui::script::UiScript>();
+        // A bare test world has no registry to seed the VM from.
+        s.register_cvars(crate::cvars::registered_pairs());
+        s.run(chunk).map_err(|e| e.to_string())
+    };
+
+    assert_eq!(
+        set(&world, "SetCVar(\"realmList\", \"glue.example.org\")"),
+        Ok(()),
+        "the character screen's VM may write it"
+    );
+
+    log_in_as(&mut world, "Onehunter", 1);
+    for name in ["realmList", "realmName"] {
+        let err = set(&world, &format!("SetCVar({name:?}, \"x\")")).expect_err(name);
+        assert!(err.contains(&format!("\"{name}\" is read-only")), "{err}");
+    }
+    assert_eq!(set(&world, "SetCVar(\"MusicVolume\", 0.5)"), Ok(()));
+
+    reload(&mut world, crate::char_select::ClientState::InWorld);
+    assert!(
+        set(&world, "SetCVar(\"realmList\", \"x\")").is_err(),
+        "a reload keeps the flag, as the reference's rows keep theirs"
+    );
+
+    super::end_ui_session(&mut world);
+    assert_eq!(set(&world, "SetCVar(\"realmList\", \"x\")"), Ok(()));
+
+    drop(world);
+    let _ = std::fs::remove_dir_all(&tmp);
+}
+
 /// The reference's one guard in the shutdown tail: `0x490bd0` tests the active player's GUID pair
 /// (`0x490bee call 0x468550`, `0x490bf3 or eax,edx`) and with none jumps (`0x490bf5 je 0x490c25`)
 /// past only the `PLAYER_LEAVING_WORLD` fire, `0x490c20 call 0x490a80`; in-world roots fire both.
@@ -361,7 +405,7 @@ fn logging_out_leaves_no_in_game_frames_behind() {
         world
             .get_non_send_resource::<benilla_ui::script::UiScript>()
             .is_some(),
-        "a boot VM stays: the character screen's text still bakes off the shared font registry"
+        "a boot VM stays, for the feeds that resolve lines outside the world"
     );
 
     drop(world);
@@ -821,8 +865,9 @@ fn the_login_one_shots_wait_for_the_in_game_ui() {
     let _ = std::fs::remove_dir_all(&tmp);
 }
 
-/// An addon that fails to load without raising (a `.toc` naming a file the package lacks) is kept
-/// in the log, readable from Lua by the error window, and announced in chat.
+/// An addon that fails to load without raising (a `.toc` naming a file the package lacks) reaches
+/// no Lua error handler, so the `/errors` log (which collects off the handler) does not hold it:
+/// the engine's record keeps it, and `Logs\FrameXML.log` names it as the reference's does.
 #[test]
 fn an_addon_that_fails_to_load_without_raising_is_readable_in_the_error_log() {
     benilla_formats::wow_data_or_skip!();
@@ -835,7 +880,7 @@ fn an_addon_that_fails_to_load_without_raising_is_readable_in_the_error_log() {
     std::fs::create_dir_all(&dir).expect("addon dir");
     std::fs::write(
         dir.join("AaMissing.toc"),
-        "## Interface: 11200\nBossnames\\BossNames.xml\n",
+        "## Interface: 11200\nBossnames\\BossNames.xml\nDatabase\\hash.lua\n",
     )
     .expect("toc");
     // …and no such file is written.
@@ -870,57 +915,20 @@ fn an_addon_that_fails_to_load_without_raising_is_readable_in_the_error_log() {
         row.message
     );
 
-    // 2. Readable from Lua through the window's own reads.
-    let count: i64 = script
-        .eval("local shown = BenillaGetNumScriptErrors() return shown")
-        .expect("BenillaGetNumScriptErrors is installed");
-    assert!(count >= 1, "the window's own read sees it");
-    let seen: String = script
-        .eval(
-            "local text = '' \
-             for i = 1, BenillaGetNumScriptErrors() do \
-                local seq, kind, message = BenillaGetScriptErrorInfo(i) \
-                if kind == 'load' then text = message end \
-             end \
-             return text",
-        )
-        .expect("BenillaGetScriptErrorInfo is installed");
-    assert!(
-        seen.contains("AaMissing"),
-        "the window walks the log and finds it: {seen:?}"
-    );
-
-    assert!(
-        script
-            .eval::<bool>("return BenillaScriptLogFrame ~= nil")
-            .expect("eval"),
-        "ScriptLogFrame.xml loaded and built the window"
-    );
-
-    // The repaint runs over a real row, so a nil global anywhere on its path raises here.
+    // 2. Not in the `/errors` log: it never reached the error handler.
     script
         .eval::<()>("BenillaScriptLog_Update() return nil")
-        .expect("the window repaints over a real log without raising");
-    // Some row shows it, not necessarily row 1: the log also holds the warnings a world entry
-    // raises before any addon loads.
-    let row_labels: Vec<String> = (1..=13)
-        .filter_map(|i| {
-            script
-                .eval::<Option<String>>(&format!("return BenillaScriptLogRow{i}Label:GetText()"))
-                .expect("eval")
-        })
-        .collect();
+        .expect("the window repaints without raising");
     assert!(
-        row_labels.iter().any(|l| l.contains("AaMissing")),
-        "a row shows the failure, trimmed to the row's width: {row_labels:?}"
-    );
-    let summary: String = script
-        .eval::<Option<String>>("return BenillaScriptLogSummary:GetText()")
-        .expect("eval")
-        .unwrap_or_default();
-    assert!(
-        summary.contains("problem"),
-        "the summary line counted them: {summary:?}"
+        !script
+            .eval::<bool>(
+                "for _, row in ipairs(BenillaScriptLog.rows) do \
+                    if strfind(row.message, 'AaMissing', 1, 1) then return true end \
+                 end \
+                 return false"
+            )
+            .expect("eval"),
+        "a failure no handler saw is not in the handler-fed log"
     );
 
     // 3. No dialog, since nothing raised: the reference answers an absent or unparseable file
@@ -933,12 +941,29 @@ fn an_addon_that_fails_to_load_without_raising_is_readable_in_the_error_log() {
          through `_ERRORMESSAGE` and through every addon handler that replaces it"
     );
 
-    // 4. Deviation: a chat line tells the player to look, where the reference stays silent,
-    // because an unannounced log goes unread.
+    // 4. Nothing in chat, and the reference's lines in `benilla-config/Logs/FrameXML.log`, each
+    // stamped `M/D HH:MM:SS.mmm` and ended `\r\n`: the add-on's banner, its toc's, then each
+    // miss by its arm (`0x6edaa0`, `0x704bc0`). The clean core and probe add nothing.
+    let lines = world.resource::<crate::ui_chat::ChatLog>().pending_lines();
+    assert!(
+        !lines.iter().any(|l| l.contains("AaMissing")),
+        "no chat line names the failure: {lines:?}"
+    );
+    let log = std::fs::read_to_string(tmp.join("benilla-config/Logs/FrameXML.log"))
+        .expect("the load wrote FrameXML.log");
+    let texts: Vec<&str> = log
+        .split_terminator("\r\n")
+        .map(|l| l.split_once("  ").expect("a stamp, then two spaces").1)
+        .collect();
     assert_eq!(
-        world.resource::<crate::ui_chat::ChatLog>().pending_len(),
-        1,
-        "world entry queued the 'N addon load failures — type /errors' line"
+        texts,
+        [
+            "Loading add-on AaMissing",
+            "** Loading table of contents Interface\\AddOns\\AaMissing\\AaMissing.toc",
+            "Couldn't open Interface\\AddOns\\AaMissing\\Bossnames\\BossNames.xml",
+            "Error loading Interface\\AddOns\\AaMissing\\Database\\hash.lua",
+        ],
+        "{log}"
     );
 
     drop(world);
@@ -1179,10 +1204,7 @@ fn a_clean_world_entry_raises_only_the_warnings_we_have_named() {
 
     // Deviation: the `OnInputLanguageChanged` script slot (`ChatFrame.xml:121`, the IME language
     // indicator) is refused, because benilla has no IME to fire it.
-    // Deviation: `gxRefresh`, read by stock `OptionsFrameRefreshDropDown_OnLoad`
-    // (`OptionsFrame.lua:300`), is not registered, because no target offers the exclusive mode-set
-    // a refresh rate needs; `GetRefreshRates` answers the reference's no-rates sentinel.
-    const KNOWN: [&str; 2] = ["OnInputLanguageChanged", "unknown CVar 'gxRefresh'"];
+    const KNOWN: [&str; 1] = ["OnInputLanguageChanged"];
 
     let unexpected: Vec<String> = script
         .diagnostics()
@@ -1300,8 +1322,8 @@ MapProbeZones = table.getn({ GetMapZones(1) })
     let _ = std::fs::remove_dir_all(&tmp);
 }
 
-/// Stock `ActionButton_OnLoad` paints its hotkey from `GetBindingKey` at load, and an addon that
-/// rebinds a stock command at file scope needs the command to exist.
+/// Stock `ActionButton_OnLoad` paints its hotkey from `GetBindingKey` at load, so the key table,
+/// the install's defaults, is seeded before any file runs; an addon's rebind takes at file scope.
 #[test]
 fn an_addon_reads_the_keybinding_table_at_file_scope() {
     const TOC: &str = "\
@@ -1324,13 +1346,14 @@ BindProbeSet = SetBinding(\"J\", \"TOGGLEWORLDMAP\")
     let script = world
         .get_non_send_resource::<benilla_ui::script::UiScript>()
         .expect("VM");
+    // The defaults are the install's `WTF\DefaultBindings.wtf`: none without one.
     assert_eq!(
         script
             .eval::<Option<String>>("BindProbeKey")
             .ok()
             .flatten()
             .as_deref(),
-        Some("M"),
+        benilla_formats::wow_data().map(|_| "M"),
         "an addon's file scope must read the stock binding — `M` is TOGGLEWORLDMAP's own default"
     );
     assert_eq!(
diff --git a/crates/benilla-app/src/ui_script/world_map_tests.rs b/crates/benilla-app/src/ui_script/world_map_tests.rs
index d5bc44e6..fb0f65f8 100644
--- a/crates/benilla-app/src/ui_script/world_map_tests.rs
+++ b/crates/benilla-app/src/ui_script/world_map_tests.rs
@@ -12,24 +12,24 @@ fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for file in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
         "Interface\\FrameXML\\UIDropDownMenu.xml", // the map's continent/zone pickers initialize into it at OnLoad
-        "ScrollTemplates.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         // The stock update walks `MAX_PARTY_MEMBERS` and `MAX_RAID_MEMBERS`, set by these two.
         r"Interface\FrameXML\PartyMemberFrame.lua",
         r"Interface\FrameXML\RaidFrame.lua",
         // The reference's own map, which <Include>s its blip templates itself.
         r"Interface\FrameXML\WorldMapFrame.xml",
+        "ScrollTemplates.xml",
     ] {
         super::test_ui::load_ui(&s, file);
     }
diff --git a/crates/benilla-app/src/ui_script/world_state_tests.rs b/crates/benilla-app/src/ui_script/world_state_tests.rs
index 8643244e..810e5569 100644
--- a/crates/benilla-app/src/ui_script/world_state_tests.rs
+++ b/crates/benilla-app/src/ui_script/world_state_tests.rs
@@ -9,17 +9,17 @@ pub(crate) fn harness() -> UiScript {
     let mut s = UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     for f in [
-        "Interface\\FrameXML\\Fonts.xml",
-        r"Interface\FrameXML\MoneyFrame.lua",
-        r"Interface\FrameXML\MoneyFrame.xml",
-        r"Interface\FrameXML\UIParent.xml",
-        r"Interface\FrameXML\UIPanelTemplates.lua",
-        r"Interface\FrameXML\UIPanelTemplates.xml",
         "Interface\\FrameXML\\GlobalStrings.lua",
+        "Interface\\FrameXML\\Fonts.xml",
         "Interface\\FrameXML\\BasicControls.xml",
         "Interface\\FrameXML\\LocaleProperties.lua",
-        "Interface\\FrameXML\\StaticPopup.xml",
+        r"Interface\FrameXML\UIParent.xml",
+        r"Interface\FrameXML\MoneyFrame.lua",
+        r"Interface\FrameXML\MoneyFrame.xml",
         "Interface\\FrameXML\\GameTooltip.xml",
+        r"Interface\FrameXML\UIPanelTemplates.lua",
+        r"Interface\FrameXML\UIPanelTemplates.xml",
+        "Interface\\FrameXML\\StaticPopup.xml",
         "Interface\\FrameXML\\WorldStateFrame.xml",
     ] {
         load_xml(&s, f);
diff --git a/crates/benilla-app/src/ui_script/zone_text_tests.rs b/crates/benilla-app/src/ui_script/zone_text_tests.rs
index c5d66559..84cec1fe 100644
--- a/crates/benilla-app/src/ui_script/zone_text_tests.rs
+++ b/crates/benilla-app/src/ui_script/zone_text_tests.rs
@@ -1,8 +1,8 @@
-//! Stock `ZoneText.xml`, driven by hand as `crate::area::feed_zone_events` drives it: host globals
-//! written, the event fired, the clock ticked. A plain `ZONE_CHANGED` re-caches the zone name
+//! Stock `ZoneText.xml`, driven by hand as `crate::area::feed_zone_events` drives it: zone caches
+//! pushed, the event fired, the clock ticked. A plain `ZONE_CHANGED` re-caches the zone name
 //! silently (`ZoneText.xml:92`), so a later `ZONE_CHANGED_NEW_AREA` on that name never splashes.
 
-use benilla_ui::script::UiScript;
+use benilla_ui::script::{UiScript, ZoneTexts};
 
 use super::test_ui::load_ui as load_xml;
 
@@ -16,14 +16,23 @@ fn text_of(s: &UiScript, fontstring: &str) -> String {
         .unwrap()
 }
 
-/// The host globals the app writes on an area change, in long brackets so an apostrophe survives.
-fn set_area(s: &UiScript, zone: &str, sub: &str, pvp: &str, faction: &str) {
-    s.run(&format!(
-        "__benilla_zone_name = [[{zone}]]; __benilla_subzone_name = [[{sub}]]; \
-         __benilla_pvp_type = [[{pvp}]]; __benilla_pvp_faction = [[{faction}]]; \
-         __benilla_pvp_arena = false"
-    ))
-    .unwrap();
+/// The zone caches the app pushes on an area change: the minimap line is the subzone, else the
+/// zone; an empty PvP word or faction is nil.
+fn area(zone: &str, sub: &str, pvp: &str, faction: &str) -> ZoneTexts {
+    let some = |t: &str| (!t.is_empty()).then(|| t.to_string());
+    ZoneTexts {
+        zone: zone.into(),
+        real_zone: zone.into(),
+        subzone: sub.into(),
+        minimap: if sub.is_empty() { zone } else { sub }.into(),
+        pvp_type: some(pvp),
+        pvp_faction: some(faction),
+        is_arena: false,
+    }
+}
+
+fn set_area(s: &mut UiScript, zone: &str, sub: &str, pvp: &str, faction: &str) {
+    s.set_zone_texts(area(zone, sub, pvp, faction));
 }
 
 fn harness() -> UiScript {
@@ -34,12 +43,12 @@ fn harness() -> UiScript {
     load_xml(&s, "Interface\\FrameXML\\Fonts.xml");
     // `TEXT()`, which AutoFollowStatus_OnEvent puts its message through.
     load_xml(&s, "Interface\\FrameXML\\BasicControls.xml");
+    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
+    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.lua");
     load_xml(&s, r"Interface\FrameXML\MoneyFrame.xml");
-    load_xml(&s, r"Interface\FrameXML\UIParent.xml");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.lua");
     load_xml(&s, r"Interface\FrameXML\UIPanelTemplates.xml");
-    load_xml(&s, r"Interface\FrameXML\LocaleProperties.lua");
     load_xml(&s, r"Interface\FrameXML\StaticPopup.xml");
     // The fading kit, its own `FrameXML.toc` entry.
     load_xml(&s, "Interface\\FrameXML\\FadingFrame.xml");
@@ -56,7 +65,7 @@ fn new_area_splashes_zone_pvp_and_subzone_then_fades_out() {
     assert!(!visible(&s, "ZoneTextFrame"));
     assert!(!visible(&s, "SubZoneTextFrame"));
 
-    set_area(&s, "Westfall", "", "friendly", "Alliance");
+    set_area(&mut s, "Westfall", "", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     assert!(visible(&s, "ZoneTextFrame"), "zone splash shows");
     assert_eq!(text_of(&s, "ZoneTextString"), "Westfall");
@@ -78,12 +87,12 @@ fn new_area_splashes_zone_pvp_and_subzone_then_fades_out() {
 fn subzone_hop_shows_only_the_small_line() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    set_area(&s, "Elwynn Forest", "", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     s.tick(4.0); // let the login splash finish
     assert!(!visible(&s, "ZoneTextFrame"));
 
-    set_area(&s, "Elwynn Forest", "Goldshire", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "Goldshire", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED", vec![]);
     assert!(visible(&s, "SubZoneTextFrame"), "subzone splash shows");
     assert!(
@@ -97,12 +106,18 @@ fn subzone_hop_shows_only_the_small_line() {
 fn plain_zone_changed_recaches_silently_so_new_area_wont_resplash() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    set_area(&s, "Elwynn Forest", "", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     s.tick(4.0);
     assert!(!visible(&s, "ZoneTextFrame"));
 
-    set_area(&s, "Westfall", "The Jansen Stead", "friendly", "Alliance");
+    set_area(
+        &mut s,
+        "Westfall",
+        "The Jansen Stead",
+        "friendly",
+        "Alliance",
+    );
     s.fire_event("ZONE_CHANGED", vec![]);
     assert!(
         !visible(&s, "ZoneTextFrame"),
@@ -114,7 +129,7 @@ fn plain_zone_changed_recaches_silently_so_new_area_wont_resplash() {
         "NEW_AREA on the already-cached zone text must not re-splash"
     );
 
-    set_area(&s, "Duskwood", "", "contested", "");
+    set_area(&mut s, "Duskwood", "", "contested", "");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     assert!(visible(&s, "ZoneTextFrame"));
     assert_eq!(text_of(&s, "PVPInfoTextString"), "Contested Territory");
@@ -127,7 +142,7 @@ fn abbey_grounds_subzone_hop_shows_no_territory_line() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     set_area(
-        &s,
+        &mut s,
         "Elwynn Forest",
         "Northshire Valley",
         "friendly",
@@ -137,7 +152,7 @@ fn abbey_grounds_subzone_hop_shows_no_territory_line() {
     s.tick(4.0); // both splashes fully faded
 
     set_area(
-        &s,
+        &mut s,
         "Elwynn Forest",
         "Northshire Abbey",
         "friendly",
@@ -159,7 +174,7 @@ fn abbey_interior_shows_the_room_in_the_small_line_alone() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     set_area(
-        &s,
+        &mut s,
         "Elwynn Forest",
         "Northshire Abbey",
         "friendly",
@@ -168,7 +183,7 @@ fn abbey_interior_shows_the_room_in_the_small_line_alone() {
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     s.tick(4.0);
 
-    set_area(&s, "Elwynn Forest", "Main Hall", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "Main Hall", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_INDOORS", vec![]);
     assert!(
         !visible(&s, "ZoneTextFrame"),
@@ -187,11 +202,11 @@ fn abbey_interior_shows_the_room_in_the_small_line_alone() {
 fn inn_entry_splashes_the_inn_name_with_territory_line() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    set_area(&s, "Elwynn Forest", "Goldshire", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "Goldshire", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     s.tick(4.0);
 
-    set_area(&s, "Lion's Pride Inn", "", "friendly", "Alliance");
+    set_area(&mut s, "Lion's Pride Inn", "", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_INDOORS", vec![]);
     assert!(visible(&s, "ZoneTextFrame"), "the inn name splashes big");
     assert_eq!(text_of(&s, "ZoneTextString"), "Lion's Pride Inn");
@@ -207,19 +222,19 @@ fn indoor_exit_returns_the_subzone_line_alone() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     set_area(
-        &s,
+        &mut s,
         "Elwynn Forest",
         "Northshire Abbey",
         "friendly",
         "Alliance",
     );
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
-    s.run("__benilla_subzone_name = 'Main Hall'").unwrap();
+    set_area(&mut s, "Elwynn Forest", "Main Hall", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_INDOORS", vec![]);
     s.tick(4.0); // everything faded
 
     set_area(
-        &s,
+        &mut s,
         "Elwynn Forest",
         "Northshire Abbey",
         "friendly",
@@ -238,11 +253,17 @@ fn indoor_exit_returns_the_subzone_line_alone() {
 fn room_to_room_hop_splashes_the_room_name_alone() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    set_area(&s, "Elwynn Forest", "Main Hall", "friendly", "Alliance");
+    set_area(&mut s, "Elwynn Forest", "Main Hall", "friendly", "Alliance");
     s.fire_event("ZONE_CHANGED_INDOORS", vec![]);
     s.tick(4.0);
 
-    set_area(&s, "Elwynn Forest", "Library Wing", "friendly", "Alliance");
+    set_area(
+        &mut s,
+        "Elwynn Forest",
+        "Library Wing",
+        "friendly",
+        "Alliance",
+    );
     s.fire_event("ZONE_CHANGED_INDOORS", vec![]);
     assert!(
         !visible(&s, "ZoneTextFrame"),
@@ -257,15 +278,14 @@ fn room_to_room_hop_splashes_the_room_name_alone() {
 fn arena_pit_shows_the_ffa_line() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
-    set_area(&s, "Stranglethorn Vale", "", "contested", "");
+    set_area(&mut s, "Stranglethorn Vale", "", "contested", "");
     s.fire_event("ZONE_CHANGED_NEW_AREA", vec![]);
     s.tick(4.0);
 
-    s.run(
-        "__benilla_subzone_name = 'Gurubashi Arena'; __benilla_zone_text = 'Gurubashi Arena'; \
-         __benilla_pvp_arena = true",
-    )
-    .unwrap();
+    s.set_zone_texts(ZoneTexts {
+        is_arena: true,
+        ..area("Stranglethorn Vale", "Gurubashi Arena", "contested", "")
+    });
     s.fire_event("ZONE_CHANGED", vec![]);
     assert!(visible(&s, "SubZoneTextFrame"));
     assert_eq!(text_of(&s, "SubZoneTextString"), "Gurubashi Arena");
@@ -278,7 +298,7 @@ fn subzone_seat_hangs_under_the_territory_line_on_new_area() {
     let _data = benilla_formats::wow_data_or_skip!();
     let mut s = harness();
     set_area(
-        &s,
+        &mut s,
         "Stormwind City",
         "Valley of Heroes",
         "friendly",
diff --git a/crates/benilla-app/src/ui_shapeshift.rs b/crates/benilla-app/src/ui_shapeshift.rs
index 40685d54..79dcebe4 100644
--- a/crates/benilla-app/src/ui_shapeshift.rs
+++ b/crates/benilla-app/src/ui_shapeshift.rs
@@ -21,10 +21,9 @@ use benilla_ui::script::{ShapeshiftFormView, UiScript};
 use crate::items::Items;
 use crate::net::{ClientCommand, NetCommands, ObjectStore, Objects, Reputations, SelfPlayer};
 use crate::spell::Cooldowns;
-use crate::spell::{cast_target, usable, CastCommit, CastLadder};
+use crate::spell::{usable, CastCommit};
 use crate::target::Selection;
 use crate::ui_action::{PlayerActions, Spells};
-use crate::ui_script::UiInput;
 use crate::ui_unit::UnitFeed;
 
 /// Keeps a spell off the stance bar; Ghost Wolf 2645 carries it, so a shaman has no bar.
@@ -125,15 +124,12 @@ impl Plugin for UiShapeshiftPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,
-            (
-                // The feed precedes the two event sets whose handlers re-read this list; the
-                // drain follows the input pass, so a click goes out the same frame.
-                feed_shapeshift_bar
-                    .in_set(UnitFeed)
-                    .before(crate::ui_action::CooldownEvents)
-                    .before(crate::ui_aura::AuraEvents),
-                drain_shapeshift_casts.after(UiInput),
-            ),
+            // The feed precedes the two event sets whose handlers re-read this list. A click's
+            // cast is a script call (`cast_form`).
+            feed_shapeshift_bar
+                .in_set(UnitFeed)
+                .before(crate::ui_action::CooldownEvents)
+                .before(crate::ui_aura::AuraEvents),
         );
     }
 }
@@ -242,52 +238,43 @@ fn feed_shapeshift_bar(
     }
 }
 
-/// Drain `CastShapeshiftForm` (`0x4b4810`), forked on the form id like the info call: the active
-/// form cancels unless `SpellShapeshiftForm.dbc` `flags1 & 0x2` makes it a silent no-op
-/// (`0x4b4963`, warrior stances); a force-admitted spell whose aura is up cancels, with no DBC
-/// guard since it has no form id. Anything else casts.
-fn drain_shapeshift_casts(
-    script: Option<NonSendMut<UiScript>>,
-    targeting: cast_target::CastTargeting,
-    self_store: Query<&ObjectStore, With<SelfPlayer>>,
-    mut ladder: CastLadder,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    for spell_id in script.take_shapeshift_casts() {
-        let store = self_store.iter().next();
-        let form_byte = store.map(|s| s.0.unit_shapeshift_form()).unwrap_or(0);
-        let d = ladder.spells.as_ref().and_then(|s| s.catalog.get(spell_id));
-        // The active form's row, for the `0x4b4963` guard (shared with `crate::ui_action::toggle`).
-        let row = ladder
-            .spells
-            .as_ref()
-            .and_then(|s| s.forms.get(&u32::from(form_byte)));
-        // The force-admit arm uses `form_active`'s predicate, so a lit button always cancels.
-        let disposition = d.and_then(|d| {
-            if d.shapeshift_form.unwrap_or(0) == 0 {
-                store
-                    .filter(|s| crate::ui_action::toggle::active_action_toggle(spell_id, d, s))
-                    .map(|_| true)
-            } else {
-                crate::ui_action::toggle::form_recast_disposition(d, form_byte, row)
-            }
-        });
-        match disposition {
-            Some(true) => {
-                debug!("ui_shapeshift: cancel form aura {spell_id}");
-                let _ = ladder
-                    .commands
-                    .0
-                    .send(ClientCommand::CancelAura { spell_id });
-                continue;
-            }
-            Some(false) => continue,
-            None => {}
+/// `CastShapeshiftForm` (`0x4b4810`), forked on the form id like the info call: the active form
+/// cancels unless `SpellShapeshiftForm.dbc` `flags1 & 0x2` makes it a silent no-op (`0x4b4963`,
+/// warrior stances); a force-admitted spell whose aura is up cancels, with no DBC guard since it
+/// has no form id. Anything else casts.
+pub(crate) fn cast_form(cast: &mut crate::spell::ScriptCast, spell_id: u32) {
+    let crate::spell::ScriptCast { targeting, ladder } = cast;
+    let store = targeting.self_store.iter().next();
+    let form_byte = store.map(|s| s.0.unit_shapeshift_form()).unwrap_or(0);
+    let d = ladder.spells.as_ref().and_then(|s| s.catalog.get(spell_id));
+    // The active form's row, for the `0x4b4963` guard (shared with `crate::ui_action::toggle`).
+    let row = ladder
+        .spells
+        .as_ref()
+        .and_then(|s| s.forms.get(&u32::from(form_byte)));
+    // The force-admit arm uses `form_active`'s predicate, so a lit button always cancels.
+    let disposition = d.and_then(|d| {
+        if d.shapeshift_form.unwrap_or(0) == 0 {
+            store
+                .filter(|s| crate::ui_action::toggle::active_action_toggle(spell_id, d, s))
+                .map(|_| true)
+        } else {
+            crate::ui_action::toggle::form_recast_disposition(d, form_byte, row)
+        }
+    });
+    match disposition {
+        Some(true) => {
+            debug!("ui_shapeshift: cancel form aura {spell_id}");
+            let _ = ladder
+                .commands
+                .0
+                .send(ClientCommand::CancelAura { spell_id });
+        }
+        Some(false) => {}
+        None => {
+            debug!("ui_shapeshift: cast form {spell_id}");
+            ladder.send(spell_id, &targeting.context(), CastCommit::Spell);
         }
-        debug!("ui_shapeshift: cast form {spell_id}");
-        ladder.send(spell_id, &targeting.context(), CastCommit::Spell);
     }
 }
 
diff --git a/crates/benilla-app/src/ui_spellbook.rs b/crates/benilla-app/src/ui_spellbook.rs
index 10791e57..767a95cd 100644
--- a/crates/benilla-app/src/ui_spellbook.rs
+++ b/crates/benilla-app/src/ui_spellbook.rs
@@ -21,9 +21,8 @@ use benilla_ui::script::{ScriptValue, SpellBookState, SpellSlotView, SpellTabVie
 use crate::entities::ItemDisplays;
 use crate::items::Items;
 use crate::net::NetCommands;
-use crate::spell::{cast_target, CastCommit, CastLadder};
 use crate::ui_action::{melee_auto_attack_icon, ranged_weapon_icon, PlayerActions, Spells};
-use crate::ui_script::{gate, UiInput};
+use crate::ui_script::gate;
 use crate::ui_unit::UnitFeed;
 use benilla_assets::{AssetSet, LockRecover, WorldAssets};
 
@@ -55,15 +54,11 @@ impl Plugin for UiSpellbookPlugin {
             .add_systems(Startup, load_skill_lines.after(AssetSet::Open))
             .add_systems(
                 Update,
-                (
-                    // The feed precedes `CooldownEvents`, whose `SPELL_UPDATE_COOLDOWN` makes the
-                    // book re-read its cooldowns; the drain follows the input pass, so a click
-                    // casts the same frame.
-                    feed_spellbook
-                        .in_set(UnitFeed)
-                        .before(crate::ui_action::CooldownEvents),
-                    drain_spell_casts.after(UiInput),
-                ),
+                // The feed precedes `CooldownEvents`, whose `SPELL_UPDATE_COOLDOWN` makes the book
+                // re-read its cooldowns. A click's cast is a script call (`cast_spell`).
+                feed_spellbook
+                    .in_set(UnitFeed)
+                    .before(crate::ui_action::CooldownEvents),
             );
     }
 }
@@ -425,56 +420,49 @@ fn leading_number(s: &str) -> u32 {
         .unwrap_or(0)
 }
 
-/// Drain `take_spell_casts` through the cast tail the action bar uses.
-fn drain_spell_casts(
-    script: Option<NonSendMut<UiScript>>,
-    targeting: cast_target::CastTargeting,
-    mut ladder: CastLadder,
-) {
-    let Some(mut script) = script else {
-        return;
-    };
-    for spell_id in script.take_spell_casts() {
-        // `CastSpell`'s two cancel forks (`0x4b3300`), in order: the active-action toggle
-        // (`0x4b36f0`), then the form match (`0x4b348b`), which `UseAction` lacks, with its silent
-        // no-op (`0x4b35cf`).
-        if let (Some(sp), Some(store)) =
-            (ladder.spells.as_ref(), targeting.self_store.iter().next())
-        {
-            if let Some(d) = sp.catalog.get(spell_id) {
-                if crate::ui_action::toggle::active_action_toggle(spell_id, d, store) {
-                    debug!("ui_spellbook: cast {spell_id} re-pressed — aura cancels");
+/// `CastSpell(id, "spell", onSelf)` and `CastSpellByName(name, onSelf)` (`0x4b3300`'s player leg),
+/// through the cast tail the action bar uses, at the selection as the calls before it left it, or
+/// with `onSelf` at the caster.
+pub(crate) fn cast_spell(cast: &mut crate::spell::ScriptCast, spell_id: u32, on_self: bool) {
+    let crate::spell::ScriptCast { targeting, ladder } = cast;
+    // `CastSpell`'s two cancel forks (`0x4b3300`), in order: the active-action toggle
+    // (`0x4b36f0`), then the form match (`0x4b348b`), which `UseAction` lacks, with its silent
+    // no-op (`0x4b35cf`).
+    if let (Some(sp), Some(store)) = (ladder.spells.as_ref(), targeting.self_store.iter().next()) {
+        if let Some(d) = sp.catalog.get(spell_id) {
+            if crate::ui_action::toggle::active_action_toggle(spell_id, d, store) {
+                debug!("ui_spellbook: cast {spell_id} re-pressed — aura cancels");
+                let _ = ladder
+                    .commands
+                    .0
+                    .send(crate::net::ClientCommand::CancelAura { spell_id });
+                return;
+            }
+            let form = store.0.unit_shapeshift_form();
+            let row = sp.forms.get(&u32::from(form));
+            match crate::ui_action::toggle::form_recast_disposition(d, form, row) {
+                Some(true) => {
+                    debug!("ui_spellbook: cast {spell_id} — the active form cancels");
                     let _ = ladder
                         .commands
                         .0
                         .send(crate::net::ClientCommand::CancelAura { spell_id });
-                    continue;
+                    return;
                 }
-                let form = store.0.unit_shapeshift_form();
-                let row = sp.forms.get(&u32::from(form));
-                match crate::ui_action::toggle::form_recast_disposition(d, form, row) {
-                    Some(true) => {
-                        debug!("ui_spellbook: cast {spell_id} — the active form cancels");
-                        let _ = ladder
-                            .commands
-                            .0
-                            .send(crate::net::ClientCommand::CancelAura { spell_id });
-                        continue;
-                    }
-                    Some(false) => {
-                        debug!("ui_spellbook: cast {spell_id} — non-cancelable form, silent no-op");
-                        continue;
-                    }
-                    None => {}
+                Some(false) => {
+                    debug!("ui_spellbook: cast {spell_id} — non-cancelable form, silent no-op");
+                    return;
                 }
+                None => {}
             }
         }
-        debug!(
-            "ui_spellbook: cast {spell_id} (target {:?})",
-            targeting.selection.guid
-        );
-        ladder.send(spell_id, &targeting.context(), CastCommit::Spell);
     }
+    debug!(
+        "ui_spellbook: cast {spell_id} (target {:?}{})",
+        targeting.selection.guid,
+        if on_self { ", on self" } else { "" }
+    );
+    ladder.send_spell(spell_id, &targeting.context().self_bound(on_self), on_self);
 }
 
 #[cfg(test)]
diff --git a/crates/benilla-app/src/ui_text/engine/mod.rs b/crates/benilla-app/src/ui_text/engine/mod.rs
index c32806b4..b3bad4cc 100644
--- a/crates/benilla-app/src/ui_text/engine/mod.rs
+++ b/crates/benilla-app/src/ui_text/engine/mod.rs
@@ -653,6 +653,18 @@ pub(super) fn test_engine(dpi: f32) -> Option<TextEngine> {
 #[cfg(test)]
 pub(super) const TEST_FACES: &[&str] = CLIENT_FONTS;
 
+#[cfg(test)]
+impl UiFontAtlas {
+    /// [`test_engine`] as the app holds it, for a host test that draws text; `None` as there.
+    pub(crate) fn for_test(dpi: f32) -> Option<Self> {
+        Some(UiFontAtlas {
+            engine: Arc::new(Mutex::new(test_engine(dpi)?)),
+            generation: 0,
+            ellipsis: crate::ui_text::EllipsisMemo::default(),
+        })
+    }
+}
+
 #[cfg(test)]
 mod differential_tests {
     use super::*;
@@ -816,7 +828,7 @@ mod ppem_tests {
         assert_eq!(e.ppem(12.0), 12, "an exact size is itself");
         assert_eq!(e.ppem(12.48), 12, "…and a fractional one rounds, not snaps");
         assert_eq!(e.ppem(12.5), 13);
-        // `ERA_WINDOW_SCALE` (0.78), which the Options window and the Game Menu wear.
+        // `BENILLA_ERA_WINDOW_SCALE` (0.78), which the Options window and the Game Menu wear.
         assert_eq!(e.ppem(16.0 * 0.78), 12);
         e.dpi = 2.0;
         assert_eq!(e.ppem(12.0), 24);
diff --git a/crates/benilla-app/src/ui_text/layout/mod.rs b/crates/benilla-app/src/ui_text/layout/mod.rs
index dd269f48..12684773 100644
--- a/crates/benilla-app/src/ui_text/layout/mod.rs
+++ b/crates/benilla-app/src/ui_text/layout/mod.rs
@@ -407,7 +407,7 @@ mod measure_fits_render {
         "Main Menu",
     ];
 
-    /// `ERA_WINDOW_SCALE` of benilla's game menu and options window: fonts land on no whole size.
+    /// `BENILLA_ERA_WINDOW_SCALE` of benilla's game menu and options window: fonts land on no whole size.
     const ERA: f32 = 0.78;
 
     fn spec(h: f32) -> FontSpec<'static> {
diff --git a/crates/benilla-app/src/ui_text/measurer.rs b/crates/benilla-app/src/ui_text/measurer.rs
index b44fb12f..805c9c30 100644
--- a/crates/benilla-app/src/ui_text/measurer.rs
+++ b/crates/benilla-app/src/ui_text/measurer.rs
@@ -6,7 +6,7 @@
 
 use std::sync::{Arc, Mutex};
 
-use benilla_ui::script::{MeasureRequest, TextMeasure};
+use benilla_ui::script::{EditBoxAdvanceRequest, MeasureRequest, TextMeasure};
 
 use super::engine::TextEngine;
 
@@ -41,6 +41,32 @@ pub(crate) fn measure_request(
     (w / rs, h / rs, natural / rs)
 }
 
+/// Answer one EditBox advance table as `(cumulative widths, row starts, row pitch)` in screen UI
+/// units: measured at the drawn size, the seam times the box's scale, and divided by the seam
+/// alone, like the mouse feed. A multi-line box also gets the draw's row starts and pitch. The one
+/// body for the extract's round trip and [`AtlasMeasurer`]'s inline answer.
+pub(crate) fn editbox_advances(
+    e: &mut TextEngine,
+    seam: f32,
+    req: &EditBoxAdvanceRequest,
+) -> (Vec<f32>, Vec<usize>, f32) {
+    let spec = super::FontSpec {
+        path: req.font.as_deref(),
+        height: super::drawn_px(req.height, None, seam * req.scale),
+        outline: req.outline,
+        alpha_gradient: None, // alpha never changes metrics
+    };
+    let cum = super::line_advances(e, &req.text, spec)
+        .iter()
+        .map(|a| a / seam)
+        .collect();
+    let (rows, cell_h) = match req.wrap_width {
+        Some(w) => super::line_rows(e, &req.text, w * seam, spec),
+        None => (vec![0], 0.0),
+    };
+    (cum, rows, cell_h / seam)
+}
+
 /// The measurer installed into the VM: the shared engine and the host's screen seam. It answers
 /// only for the seam it was built under, so the host installs a fresh one when the seam moves
 /// (`ui_script::extract::seat_text_measurer`).
@@ -65,4 +91,64 @@ impl TextMeasure for AtlasMeasurer {
             .unwrap_or_else(std::sync::PoisonError::into_inner);
         measure_request(&mut e, self.seam, req)
     }
+
+    fn editbox_advances(
+        &mut self,
+        req: &EditBoxAdvanceRequest,
+    ) -> Option<(Vec<f32>, Vec<usize>, f32)> {
+        let mut e = self
+            .engine
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner);
+        Some(editbox_advances(&mut e, self.seam, req))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::{Arc, Mutex};
+
+    use benilla_ui::script::UiScript;
+
+    use super::AtlasMeasurer;
+
+    /// A multi-line EditBox is its text's measured height tall (`0x77d4d0` @`0x77d8ad`), one
+    /// line's when empty, and the line law the host measures by (`0x5c2070`) folds a trailing
+    /// break into the line it ends, so the break alone adds no line.
+    #[test]
+    fn a_multi_line_boxs_trailing_newline_adds_no_line() {
+        benilla_formats::wow_data_or_skip!();
+        let engine = super::super::engine::test_engine(1.0).expect("the client faces open");
+        let mut s = UiScript::new().unwrap();
+        s.set_screen_size(1024.0, 768.0);
+        s.set_text_measurer(Box::new(AtlasMeasurer::new(
+            Arc::new(Mutex::new(engine)),
+            1.0,
+        )));
+        s.run(
+            r#"
+            E = CreateFrame("EditBox", "E")
+            E:SetAutoFocus(false); E:SetMultiLine(true)
+            E:SetPoint("TOPLEFT", 100, -100); E:SetWidth(270); E:SetHeight(200)
+            E:SetFont("Fonts\\MORPHEUS.TTF", 15)
+        "#,
+        )
+        .unwrap();
+        s.resolve();
+        let mut height = |text: &str| {
+            s.run(&format!("E:SetText({text:?})")).unwrap();
+            s.tick(0.016);
+            s.resolve();
+            s.eval::<f32>("return E:GetHeight()").unwrap()
+        };
+        let empty = height("");
+        let one = height("abc");
+        assert_eq!(one, empty, "an empty box is one line tall");
+        assert_eq!(height("abc\n"), one, "the break alone");
+        let two = height("abc\nd");
+        assert!(
+            (two - 2.0 * one).abs() < 1e-4,
+            "the first character on the new line: {two} against {one}"
+        );
+    }
 }
diff --git a/crates/benilla-app/src/ui_text/mod.rs b/crates/benilla-app/src/ui_text/mod.rs
index a5c21c9a..ede81d20 100644
--- a/crates/benilla-app/src/ui_text/mod.rs
+++ b/crates/benilla-app/src/ui_text/mod.rs
@@ -24,7 +24,7 @@ pub(crate) use engine::{UiFontAtlas, UiTextPlugin};
 
 use benilla_ui::script::Outline;
 use benilla_ui::widget::RegionHandle;
-pub(crate) use measurer::{measure_request, AtlasMeasurer};
+pub(crate) use measurer::{editbox_advances, measure_request, AtlasMeasurer};
 
 pub(crate) use layout::{
     ellipsize_to_fit, layout_text_quads, layout_text_quads_links, line_advances, line_origin,
diff --git a/crates/benilla-app/src/ui_tooltip/bench.rs b/crates/benilla-app/src/ui_tooltip/bench.rs
new file mode 100644
index 00000000..9845bd98
--- /dev/null
+++ b/crates/benilla-app/src/ui_tooltip/bench.rs
@@ -0,0 +1,215 @@
+//! The feed's cost per invalidation on the real data, run by hand:
+//! `cargo test --release -p benilla-app --lib ui_tooltip::bench -- --ignored --nocapture`.
+//! `BENCH_N` sets how many spells the feed has pushed (2000 by default).
+
+use std::time::{Duration, Instant};
+
+use benilla_protocol::ObjectFields;
+use benilla_ui::script::UiScript;
+use bevy::prelude::*;
+
+use super::feed_spell_tooltips;
+use crate::items::Items;
+use crate::net::{GuidIndex, NetCommands, ObjectStore, SelfPlayer};
+use crate::ui_action::{PlayerActions, Spells};
+
+/// The mage's family in `Spell.dbc`.
+const MAGE: u32 = 3;
+
+fn median(mut v: Vec<Duration>) -> Duration {
+    v.sort();
+    v[v.len() / 2]
+}
+
+#[test]
+#[ignore = "a measurement, not a check"]
+fn feed_cost_per_invalidation() {
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    let spells = Spells {
+        catalog: benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc"),
+        forms: benilla_formats::load_shapeshift_forms(&mut chain).expect("forms"),
+        ranges: benilla_formats::load_spell_ranges(&mut chain).expect("ranges"),
+        cast_times: benilla_formats::load_spell_cast_times(&mut chain).expect("cast times"),
+        durations: benilla_formats::load_spell_durations(&mut chain).expect("durations"),
+        radii: benilla_formats::load_spell_radii(&mut chain).expect("radii"),
+    };
+    let skill_lines = benilla_formats::load_skill_line_catalog(&mut chain).expect("skill lines");
+    let n: usize = std::env::var("BENCH_N")
+        .ok()
+        .and_then(|n| n.parse().ok())
+        .unwrap_or(2000);
+
+    // What a mage has pushed: its own family's spells, then an even sample of every other kind,
+    // as the auras of other units and the trainer's services fill the set.
+    let mut described: Vec<u32> = spells
+        .catalog
+        .iter()
+        .filter(|(_, d)| d.description.is_some() && !d.name.is_empty())
+        .map(|(id, _)| id)
+        .collect();
+    described.sort_unstable();
+    let (mut ids, others): (Vec<u32>, Vec<u32>) = described.into_iter().partition(|&id| {
+        spells
+            .catalog
+            .get(id)
+            .is_some_and(|d| d.spell_family == MAGE)
+    });
+    let class = ids.len().min(n);
+    ids.truncate(class);
+    let stride = (others.len() / n.saturating_sub(class).max(1)).max(1);
+    ids.extend(others.iter().step_by(stride).take(n - class));
+    let mut lines: Vec<u32> = ids
+        .iter()
+        .filter_map(|&id| skill_lines.spell_to_line(id))
+        .collect();
+    lines.sort_unstable();
+    lines.dedup();
+
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    let mut app = App::new();
+    app.insert_resource(spells)
+        .insert_resource(NetCommands(tx))
+        .insert_resource(crate::ui_spellbook::SkillLines {
+            catalog: skill_lines,
+        })
+        .init_resource::<Items>()
+        .init_resource::<GuidIndex>()
+        .init_resource::<crate::spell::SpellModifiers>()
+        .init_resource::<PlayerActions>()
+        .add_systems(Update, feed_spell_tooltips);
+    app.world_mut()
+        .resource_mut::<PlayerActions>()
+        .spells
+        .extend(ids.iter().copied());
+    app.world_mut()
+        .resource_mut::<crate::spell::SpellModifiers>()
+        .set_class_family(MAGE);
+
+    // A level-60 mage: unit fields, the four percentages, the skills of its lines.
+    let player_fields = |crit: f32, dodge: f32, reach: f32, form: u32, head: u32, skill: u32| {
+        let mut pairs: Vec<(u16, u32)> = vec![
+            (22, 3500),
+            (28, 4000),
+            (34, 60),
+            (162, 1373),
+            (130, reach.to_bits()),
+            (138, form << 16),
+            (486, head),
+            (1106, 5.0f32.to_bits()),
+            (1107, dodge.to_bits()),
+            (1108, 4.0f32.to_bits()),
+            (1109, crit.to_bits()),
+        ];
+        for (slot, &line) in lines.iter().take(128).enumerate() {
+            let base = 718 + 3 * slot as u16;
+            pairs.push((base, line));
+            pairs.push((base + 1, if slot == 0 { skill } else { 300 } | 300 << 16));
+        }
+        ObjectStore(ObjectFields::from_pairs(&pairs))
+    };
+    let player = app
+        .world_mut()
+        .spawn((SelfPlayer, player_fields(5.0, 4.0, 1.5, 0, 0, 300)))
+        .id();
+    // An auto-attack target, whose reach a swap moves.
+    const TARGET: u64 = 0xF130_0000_0000_0042;
+    let target_fields =
+        |reach: f32| ObjectStore(ObjectFields::from_pairs(&[(130, reach.to_bits())]));
+    let target = app.world_mut().spawn(target_fields(1.5)).id();
+    app.world_mut()
+        .resource_mut::<GuidIndex>()
+        .0
+        .insert(TARGET, target);
+
+    let script = UiScript::new().expect("VM");
+    crate::ui_script::load_ui_for_test(&script, "Interface\\FrameXML\\GlobalStrings.lua");
+    app.insert_non_send_resource(script);
+
+    let timed = |app: &mut App| {
+        let start = Instant::now();
+        app.update();
+        start.elapsed()
+    };
+    let first = timed(&mut app);
+    let steady = median((0..50).map(|_| timed(&mut app)).collect());
+    println!(
+        "pushed {} spells ({} of them the mage's): first frame {:?}, a quiet frame {:?}",
+        ids.len(),
+        class,
+        first,
+        steady
+    );
+
+    // Each cause moves, alternating between two values, and the frame after it is timed.
+    let run = |name: &str, app: &mut App, step: &mut dyn FnMut(&mut App, bool)| {
+        let times: Vec<Duration> = (0..40)
+            .map(|i| {
+                step(app, i % 2 == 0);
+                timed(app)
+            })
+            .collect();
+        let mean = times.iter().sum::<Duration>() / times.len() as u32;
+        println!(
+            "{name:<28} median {:>9.1?}  mean {:>9.1?}",
+            median(times),
+            mean
+        );
+    };
+    // Engage the target first: the reach cause is the attack target's.
+    let set_player = move |app: &mut App, s: ObjectStore| {
+        app.world_mut().entity_mut(player).insert(s);
+    };
+    run("crit percentage", &mut app, &mut |app, a| {
+        let crit = if a { 5.0 } else { 6.5 };
+        set_player(app, player_fields(crit, 4.0, 1.5, 0, 0, 300));
+    });
+    run("dodge percentage", &mut app, &mut |app, a| {
+        let dodge = if a { 4.0 } else { 5.5 };
+        set_player(app, player_fields(5.0, dodge, 1.5, 0, 0, 300));
+    });
+    run("caster combat reach", &mut app, &mut |app, a| {
+        let reach = if a { 1.5 } else { 2.0 };
+        set_player(app, player_fields(5.0, 4.0, reach, 0, 0, 300));
+    });
+    app.world_mut()
+        .entity_mut(player)
+        .insert(crate::creature_anim::Engaged(TARGET));
+    run("attack target's reach", &mut app, &mut |app, a| {
+        let reach = if a { 1.5 } else { 3.0 };
+        app.world_mut()
+            .entity_mut(target)
+            .insert(target_fields(reach));
+    });
+    run("shapeshift form", &mut app, &mut |app, a| {
+        set_player(app, player_fields(5.0, 4.0, 1.5, u32::from(!a), 0, 300));
+    });
+    run("one worn slot", &mut app, &mut |app, a| {
+        set_player(app, player_fields(5.0, 4.0, 1.5, 0, u32::from(!a), 300));
+    });
+    run("one skill line's value", &mut app, &mut |app, a| {
+        let skill = if a { 300 } else { 299 };
+        set_player(app, player_fields(5.0, 4.0, 1.5, 0, 0, skill));
+    });
+    run("one modifier cell (narrow)", &mut app, &mut |app, a| {
+        let mut mods = app
+            .world_mut()
+            .resource_mut::<crate::spell::SpellModifiers>();
+        mods.set(
+            false,
+            5,
+            crate::spell::OP_CAST_TIME,
+            if a { -10 } else { -20 },
+        );
+    });
+    // A proc that changes the cost of everything the class casts (Clearcasting's shape): one
+    // packet per family-flag bit.
+    run("all modifier bits (proc)", &mut app, &mut |app, a| {
+        let mut mods = app
+            .world_mut()
+            .resource_mut::<crate::spell::SpellModifiers>();
+        for bit in 0..64 {
+            mods.set(false, bit, crate::spell::OP_COST, if a { -100 } else { 0 });
+        }
+    });
+}
diff --git a/crates/benilla-app/src/ui_tooltip/deps_tests.rs b/crates/benilla-app/src/ui_tooltip/deps_tests.rs
new file mode 100644
index 00000000..af17461b
--- /dev/null
+++ b/crates/benilla-app/src/ui_tooltip/deps_tests.rs
@@ -0,0 +1,1468 @@
+//! The feed's dependency classification against the real `Spell.dbc`.
+//!
+//! A pushed view is re-queued when [`Deps::hits`] finds an input it read among the [`Changes`]. A
+//! spell missing a dependency would keep a stale tooltip, so the safety net builds every spell's
+//! view, moves inputs, builds it again, and holds that a view which moved was re-queued. Two kinds
+//! of move: each cause alone, through the real diff ([`Seen::changes_since`], the modifier and
+//! reagent diffs), and, per view, every input the view's recorded reads leave out, all at once,
+//! which must leave it exactly as it was.
+
+use std::collections::BTreeSet;
+
+use benilla_protocol::ObjectFields;
+use benilla_ui::script::SpellTooltipView;
+
+use super::spell_deps::{Changes, Deps, RangeSeen, Reagents, Seen, UnitField};
+use super::spell_feed::{build_view, reagent_state, PetInputs, ViewCaster, ViewCtx};
+use super::tests::{real_spells, TestCtx};
+use crate::items::Items;
+use crate::net::{NetCommands, ObjectStore, Objects};
+use crate::spell::usable::{
+    slot_item_cached, worn_slots_read, SlotItem, EQUIPMENT_MASK, EQUIPMENT_SLOTS,
+};
+use crate::spell::{ModsDiff, SpellModifiers};
+use crate::ui_action::Spells;
+use crate::ui_items::TestObjects;
+use benilla_formats::{RangeUnit, UnitMotion};
+
+/// One side of each input group, so that moving an input is an xor: `false` is the empty side (no
+/// bind point, form 0, no percentages, default reach, no auto-attack target, both units standing,
+/// nothing worn, no skills, zero cells), `true` the populated one.
+#[derive(Clone, Copy, Default, PartialEq, Eq, Hash, Debug)]
+struct Inputs {
+    home: bool,
+    form: bool,
+    /// A `Chance` bit each: block, dodge, parry, crit.
+    avoid: u8,
+    /// The caster's reach and, with a target engaged, its reach.
+    reach: bool,
+    /// An auto-attack target: the melee range cell's second unit.
+    engaged: bool,
+    /// The caster and the auto-attack target run: with a target engaged, the moving bonus.
+    pace: bool,
+    /// The equipment slots holding an item that meets the view's requirement.
+    worn: u32,
+    /// The disarm flag.
+    disarm: bool,
+    /// A [`UnitField`] bit each: level, base mana, base health, ranged attack time.
+    unit: u16,
+    /// Bit `i`: the skill line `lines[i]` at 300.
+    lines: u128,
+    /// The `SpellFamilyFlags` bits whose cells hold a modifier.
+    bits: u64,
+    /// A run of the player's fields, `(first, count)`, all set to [`POKE`], whatever they hold.
+    poke: Option<(u16, u16)>,
+}
+
+/// What a poked field is set to: 2.5 as a float, and a large number as an integer.
+const POKE: u32 = 0x4020_0000;
+
+impl Inputs {
+    const ALL: Inputs = Inputs {
+        home: true,
+        form: true,
+        avoid: 0xf,
+        reach: true,
+        engaged: true,
+        pace: true,
+        worn: EQUIPMENT_MASK,
+        disarm: true,
+        unit: 0xf,
+        lines: u128::MAX,
+        bits: u64::MAX,
+        poke: None,
+    };
+
+    fn xor(self, o: Inputs) -> Inputs {
+        Inputs {
+            home: self.home ^ o.home,
+            form: self.form ^ o.form,
+            avoid: self.avoid ^ o.avoid,
+            reach: self.reach ^ o.reach,
+            engaged: self.engaged ^ o.engaged,
+            pace: self.pace ^ o.pace,
+            worn: self.worn ^ o.worn,
+            disarm: self.disarm ^ o.disarm,
+            unit: self.unit ^ o.unit,
+            lines: self.lines ^ o.lines,
+            bits: self.bits ^ o.bits,
+            poke: self.poke.xor(o.poke),
+        }
+    }
+
+    /// Each input in `self` alone, named: what to move to find which one moved a view.
+    fn parts(self, layout: &Layout) -> Vec<(String, Inputs)> {
+        let alone = Inputs::default();
+        let mut parts = Vec::new();
+        if self.home {
+            parts.push((
+                "the bind point".to_string(),
+                Inputs {
+                    home: true,
+                    ..alone
+                },
+            ));
+        }
+        if self.form {
+            parts.push((
+                "the form".to_string(),
+                Inputs {
+                    form: true,
+                    ..alone
+                },
+            ));
+        }
+        for (i, which) in ["block", "dodge", "parry", "crit"].iter().enumerate() {
+            if self.avoid >> i & 1 == 1 {
+                let only = Inputs {
+                    avoid: 1 << i,
+                    ..alone
+                };
+                parts.push((format!("the {which} percentage"), only));
+            }
+        }
+        if self.reach {
+            parts.push((
+                "a combat reach".to_string(),
+                Inputs {
+                    reach: true,
+                    ..alone
+                },
+            ));
+        }
+        if self.engaged {
+            parts.push((
+                "the auto-attack target".to_string(),
+                Inputs {
+                    engaged: true,
+                    ..alone
+                },
+            ));
+        }
+        if self.pace {
+            parts.push((
+                "the units' run".to_string(),
+                Inputs {
+                    pace: true,
+                    ..alone
+                },
+            ));
+        }
+        for slot in (0..EQUIPMENT_SLOTS).filter(|s| self.worn >> s & 1 == 1) {
+            let only = Inputs {
+                worn: 1 << slot,
+                ..alone
+            };
+            parts.push((format!("worn slot {slot}"), only));
+        }
+        if self.disarm {
+            parts.push((
+                "the disarm flag".to_string(),
+                Inputs {
+                    disarm: true,
+                    ..alone
+                },
+            ));
+        }
+        for (bit, name) in UNIT_NAMES.iter().enumerate() {
+            if self.unit >> bit & 1 == 1 {
+                let only = Inputs {
+                    unit: 1 << bit,
+                    ..alone
+                };
+                parts.push((format!("the player's {name}"), only));
+            }
+        }
+        if let Some((first, count)) = self.poke {
+            for field in first..first + count {
+                let only = Inputs {
+                    poke: Some((field, 1)),
+                    ..alone
+                };
+                parts.push((format!("the player's field {field}"), only));
+            }
+        }
+        for (i, line) in layout.lines.iter().enumerate() {
+            if self.lines >> i & 1 == 1 {
+                parts.push((
+                    format!("skill line {line}"),
+                    Inputs {
+                        lines: 1 << i,
+                        ..alone
+                    },
+                ));
+            }
+        }
+        for bit in (0..64).filter(|b| self.bits >> b & 1 == 1) {
+            let only = Inputs {
+                bits: 1 << bit,
+                ..alone
+            };
+            parts.push((format!("the modifier cells of family-flag bit {bit}"), only));
+        }
+        parts
+    }
+
+    /// The inputs a view's recorded reads leave out.
+    fn outside(deps: &Deps, layout: &Layout) -> Inputs {
+        Inputs {
+            home: !deps.home,
+            form: !deps.form,
+            avoid: !deps.avoidance & 0xf,
+            reach: !deps.range_units,
+            engaged: !deps.range_units,
+            pace: !deps.range_units,
+            worn: EQUIPMENT_MASK & !deps.worn,
+            disarm: !deps.disarm,
+            unit: !deps.unit & 0xf,
+            lines: layout
+                .lines
+                .iter()
+                .enumerate()
+                .filter(|(_, line)| !deps.skill_lines.contains(line))
+                .fold(0, |mask, (i, _)| mask | 1 << i),
+            bits: !deps.mod_bits,
+            poke: None,
+        }
+    }
+}
+
+/// The [`UnitField`] names, by bit.
+const UNIT_NAMES: [&str; 4] = ["level", "base mana", "base health", "ranged attack time"];
+
+/// What a sweep holds fixed for a view: the form the form input puts on, the item kind worn
+/// items are of, and the class family the tables gate on.
+#[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Debug)]
+struct Params {
+    form: u8,
+    kind: usize,
+    family: u32,
+}
+
+/// The fixed shape of the scenarios.
+struct Layout {
+    /// The skill lines any spell belongs to, ascending; bit `i` of [`Inputs::lines`].
+    lines: Vec<u32>,
+    /// The `(class, subclass)` an item is of, per kind: what some spell's equipped-item search
+    /// asks for.
+    kinds: Vec<(u32, u32)>,
+}
+
+impl Layout {
+    /// The item a slot holds in a scenario, one object per kind and slot.
+    fn guid(kind: usize, slot: u32) -> u64 {
+        0x1_0000 + ((kind as u64) << 8) + u64::from(slot)
+    }
+
+    fn entry(kind: usize) -> u32 {
+        90_000 + kind as u32
+    }
+
+    /// The kind that meets `d`'s requirement: the lowest subclass its mask names.
+    fn kind_of(&self, d: &benilla_formats::SpellDisplay) -> usize {
+        let want = (
+            d.equipped_item_class as u32,
+            d.equipped_item_subclass_mask.trailing_zeros(),
+        );
+        self.kinds.iter().position(|&k| k == want).unwrap_or(0)
+    }
+
+    /// The parameters that put each input where it moves `d`'s view the most: the lowest form `d`
+    /// names, the item kind it needs, its own family.
+    fn params_of(&self, d: &benilla_formats::SpellDisplay) -> Params {
+        Params {
+            form: d.stances.trailing_zeros().min(31) as u8 + 1,
+            kind: self.kind_of(d),
+            family: d.spell_family.max(1),
+        }
+    }
+}
+
+/// A scenario made into the inputs a view is built from.
+struct Mat {
+    store: ObjectStore,
+    mods: SpellModifiers,
+    home: Option<&'static str>,
+    /// The caster as the range cell reads it: the store's reach, and running or not.
+    caster: RangeUnit,
+    /// The auto-attack target, when one is engaged.
+    attack_target: Option<RangeUnit>,
+    form: u8,
+}
+
+fn mat(layout: &Layout, inputs: Inputs, p: Params) -> Mat {
+    let unit = |field: UnitField| inputs.unit & field.bit() != 0;
+    // Health, and the unit fields at one value on the empty side and another on the populated one.
+    let mut pairs: Vec<(u16, u32)> = vec![
+        (22, 3500),
+        (34, if unit(UnitField::Level) { 60 } else { 20 }),
+        (
+            162,
+            if unit(UnitField::BaseMana) {
+                2100
+            } else {
+                1000
+            },
+        ),
+        (
+            163,
+            if unit(UnitField::BaseHealth) {
+                1900
+            } else {
+                1689
+            },
+        ),
+        (
+            128,
+            if unit(UnitField::RangedTime) {
+                3000
+            } else {
+                2000
+            },
+        ),
+    ];
+    if inputs.disarm {
+        pairs.push((46, 0x0020_0000));
+    }
+    let form = if inputs.form { p.form } else { 0 };
+    if form != 0 {
+        pairs.push((138, u32::from(form) << 16));
+    }
+    // Block, dodge, parry and crit percent.
+    for (i, pct) in [7.5f32, 6.25, 5.5, 3.75].into_iter().enumerate() {
+        if inputs.avoid >> i & 1 == 1 {
+            pairs.push((1106 + i as u16, pct.to_bits()));
+        }
+    }
+    if inputs.reach {
+        pairs.push((130, 4.0f32.to_bits()));
+    }
+    let motion = if inputs.pace {
+        UnitMotion {
+            flags: 1,
+            speed: 7.0,
+            walk_speed: 2.5,
+        }
+    } else {
+        UnitMotion::default()
+    };
+    let mut slot = 0;
+    for (i, &line) in layout.lines.iter().enumerate() {
+        if inputs.lines >> i & 1 == 1 {
+            let base = 718 + 3 * slot;
+            pairs.push((base, line));
+            pairs.push((base + 1, 300 | 300 << 16));
+            slot += 1;
+        }
+    }
+    for s in (0..EQUIPMENT_SLOTS.into()).filter(|s| inputs.worn >> s & 1 == 1) {
+        let guid = Layout::guid(p.kind, s);
+        pairs.push((486 + 2 * s as u16, guid as u32));
+        pairs.push((487 + 2 * s as u16, (guid >> 32) as u32));
+    }
+    if let Some((first, count)) = inputs.poke {
+        pairs.extend((first..first + count).map(|field| (field, POKE)));
+    }
+    let mut mods = SpellModifiers::default();
+    mods.set_class_family(p.family);
+    for bit in (0..64u8).filter(|b| inputs.bits >> b & 1 == 1) {
+        for op in 0..29 {
+            mods.set(true, bit, op, -7);
+            mods.set(false, bit, op, 35);
+        }
+    }
+    Mat {
+        store: ObjectStore(ObjectFields::from_pairs(&pairs)),
+        mods,
+        home: inputs.home.then_some("Zzz"),
+        // The two reaches move together: the caster's 1.5 to 4.0, and an auto-attack target's 4.0
+        // to 6.0, which needs one engaged to read. The target's start clears the melee row's 5.0
+        // floor beside the caster's 1.5, so its presence moves the range cell.
+        caster: RangeUnit {
+            reach: if inputs.reach { 4.0 } else { 1.5 },
+            motion,
+            ..RangeUnit::still(1.5)
+        },
+        attack_target: inputs.engaged.then_some(RangeUnit {
+            reach: if inputs.reach { 6.0 } else { 4.0 },
+            motion,
+            ..RangeUnit::still(1.5)
+        }),
+        form,
+    }
+}
+
+/// What differs between two scenarios, through the feed's own diffs.
+fn changes(before: &Mat, now: &Mat, objects: &Objects, items: &Items) -> Changes {
+    let seen = |m: &Mat| {
+        let range = RangeSeen::of(&m.caster, m.attack_target.as_ref());
+        Seen::of(Some(&m.store), m.home, range, objects, items)
+    };
+    seen(now)
+        .changes_since(&seen(before))
+        .with_mods(now.mods.diff(&before.mods))
+}
+
+/// The real data and the objects the scenarios put in the world.
+struct Rig {
+    spells: Spells,
+    t: TestCtx,
+    objs: TestObjects,
+    ids: Vec<u32>,
+    layout: Layout,
+    /// The reagent entries any spell lists, ascending.
+    reagents: Vec<u32>,
+    families: Vec<u32>,
+}
+
+impl Rig {
+    fn new() -> Option<Rig> {
+        let spells = real_spells()?;
+        let data = benilla_formats::wow_data_or_skip!(None);
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let skill_lines =
+            benilla_formats::load_skill_line_catalog(&mut chain).expect("skill lines");
+        let mut ids: Vec<u32> = spells.catalog.iter().map(|(id, _)| id).collect();
+        ids.sort_unstable();
+        let displays = || ids.iter().filter_map(|&id| spells.catalog.get(id));
+        let lines: BTreeSet<u32> = ids
+            .iter()
+            .filter_map(|&id| skill_lines.spell_to_line(id))
+            .collect();
+        assert!(
+            lines.len() <= 128,
+            "the player's skill table holds 128 lines"
+        );
+        let mut layout = Layout {
+            lines: lines.into_iter().collect(),
+            kinds: vec![(2, 0)],
+        };
+        for d in displays().filter(|d| worn_slots_read(d) != 0) {
+            let kind = (
+                d.equipped_item_class as u32,
+                d.equipped_item_subclass_mask.trailing_zeros(),
+            );
+            if !layout.kinds.contains(&kind) {
+                layout.kinds.push(kind);
+            }
+        }
+        let reagents: BTreeSet<u32> = displays()
+            .flat_map(|d| d.reagents.iter().map(|&(entry, _)| entry))
+            .filter(|&entry| entry != 0)
+            .collect();
+        let families: BTreeSet<u32> = displays()
+            .map(|d| d.spell_family)
+            .filter(|&f| f != 0)
+            .collect();
+        let mut t = TestCtx::new();
+        t.skill_lines = Some(skill_lines);
+        let mut objs = TestObjects::new();
+        // One worn item per kind and slot, and each kind's template.
+        for (kind, &(class, subclass)) in layout.kinds.iter().enumerate() {
+            t.items.insert_template(
+                Layout::entry(kind),
+                Some(benilla_protocol::messages::ItemInfo {
+                    class,
+                    subclass,
+                    ..crate::items::test_template("Worn")
+                }),
+            );
+            for slot in 0..u32::from(EQUIPMENT_SLOTS) {
+                objs.spawn(
+                    Layout::guid(kind, slot),
+                    ObjectFields::from_pairs(&[(3, Layout::entry(kind))]),
+                );
+            }
+        }
+        // One carried stack of five per reagent entry, for the scenarios that carry it.
+        for (i, &entry) in reagents.iter().enumerate() {
+            objs.spawn(
+                0x2_0000 + i as u64,
+                ObjectFields::from_pairs(&[(3, entry), (14, 5)]),
+            );
+        }
+        Some(Rig {
+            spells,
+            t,
+            objs,
+            ids,
+            layout,
+            reagents: reagents.into_iter().collect(),
+            families: families.into_iter().collect(),
+        })
+    }
+}
+
+fn build(
+    t: &mut TestCtx,
+    objects: &Objects,
+    spells: &Spells,
+    id: u32,
+    m: &Mat,
+) -> Option<(SpellTooltipView, Deps)> {
+    t.spell_mods = m.mods.clone();
+    let mut ctx = t.ctx_for(objects, m.form, None, Some(&m.store));
+    ctx.home_area = m.home;
+    ctx.range_caster = m.caster;
+    ctx.attack_target = m.attack_target;
+    build_view(id, spells, &mut ctx)
+}
+
+/// A spell whose text names another spell's number (`$1234s1`), whose modifiers then answer to
+/// that spell's family.
+fn cross_references(d: &benilla_formats::SpellDisplay) -> bool {
+    [d.description.as_deref(), d.aura_description.as_deref()]
+        .into_iter()
+        .flatten()
+        .flat_map(|text| text.split('$').skip(1))
+        .any(|token| {
+            let after_scale = match token.split_once(';') {
+                Some((scale, rest)) if scale.starts_with(['/', '*']) => rest,
+                _ => token,
+            };
+            after_scale.starts_with(|c: char| c.is_ascii_digit())
+        })
+}
+
+/// What a sweep found.
+#[derive(Default)]
+struct Sweep {
+    /// The views that moved.
+    moved: usize,
+    /// The views the changes re-queue, moved or not.
+    requeued: usize,
+    /// One line per moved view its reads do not cover.
+    misses: Vec<String>,
+}
+
+type Only<'a> = &'a dyn Fn(&benilla_formats::SpellDisplay) -> bool;
+type ParamsOf<'a> = &'a dyn Fn(&Layout, &benilla_formats::SpellDisplay) -> Params;
+type FlipOf<'a> = &'a dyn Fn(&Layout, &Deps) -> Inputs;
+
+/// Build every view `only` names at `base`, move the inputs `flip` names for it, build it again,
+/// and hold that a view which moved is one the changes re-queue.
+fn sweep(rig: &mut Rig, base: Inputs, only: Only, params: ParamsOf, flip: FlipOf) -> Sweep {
+    let Rig {
+        spells,
+        t,
+        objs,
+        ids,
+        layout,
+        ..
+    } = rig;
+    let objects = objs.get();
+    let mut out = Sweep::default();
+    let mut before: Option<(Params, Mat)> = None;
+    let mut after: Option<((Params, Inputs), Mat, Changes)> = None;
+    // Views with the same parameters run together, so a scenario is made once for them.
+    let mut order: Vec<(Params, u32)> = ids
+        .iter()
+        .filter_map(|&id| {
+            let d = spells.catalog.get(id).expect("listed spell");
+            only(d).then(|| (params(layout, d), id))
+        })
+        .collect();
+    order.sort_unstable_by_key(|&(p, id)| (p, id));
+    for (p, id) in order {
+        let d = spells.catalog.get(id).expect("listed spell");
+        if before.as_ref().map(|(k, _)| k) != Some(&p) {
+            before = Some((p, mat(layout, base, p)));
+        }
+        let (_, before) = before.as_ref().expect("set above");
+        let Some((view, deps)) = build(t, &objects, spells, id, before) else {
+            continue;
+        };
+        let moved = flip(layout, &deps);
+        if after.as_ref().map(|(k, ..)| k) != Some(&(p, moved)) {
+            let now = mat(layout, base.xor(moved), p);
+            let c = changes(before, &now, &objects, &t.items);
+            after = Some(((p, moved), now, c));
+        }
+        let (_, now, changes) = after.as_ref().expect("set above");
+        let (moved_view, _) = build(t, &objects, spells, id, now).expect("built before");
+        let hit = deps.hits(changes);
+        out.requeued += usize::from(hit);
+        if moved_view == view {
+            continue;
+        }
+        out.moved += 1;
+        if hit {
+            continue;
+        }
+        // Name what moved it: each input alone.
+        let culprits: Vec<String> = moved
+            .parts(layout)
+            .into_iter()
+            .filter(|(_, part)| {
+                let alone = mat(layout, base.xor(*part), p);
+                build(t, &objects, spells, id, &alone).is_some_and(|(v, _)| v != view)
+            })
+            .map(|(name, _)| name)
+            .collect();
+        out.misses.push(format!(
+            "spell {id} {:?} moved with {}, which its reads {deps:?} do not cover",
+            d.name,
+            if culprits.is_empty() {
+                "these inputs together".to_string()
+            } else {
+                culprits.join(", ")
+            }
+        ));
+    }
+    out
+}
+
+fn assert_covered(what: &str, sweep: &Sweep) {
+    assert!(
+        sweep.misses.is_empty(),
+        "{what}: {} of {} moved views are not re-queued; first:\n{}",
+        sweep.misses.len(),
+        sweep.moved,
+        sweep
+            .misses
+            .iter()
+            .take(8)
+            .cloned()
+            .collect::<Vec<_>>()
+            .join("\n")
+    );
+}
+
+fn any(_: &benilla_formats::SpellDisplay) -> bool {
+    true
+}
+
+fn own(layout: &Layout, d: &benilla_formats::SpellDisplay) -> Params {
+    layout.params_of(d)
+}
+
+/// Every view that moves with an input is one the feed re-queues for that input: each cause alone
+/// against the real spell set, and, per view, everything its reads leave out.
+#[test]
+fn every_view_that_moves_with_an_input_is_requeued_by_that_input() {
+    let Some(mut rig) = Rig::new() else { return };
+    let total = rig.ids.len();
+    let mut report = Vec::new();
+    let mut row = |what: &str, s: &Sweep| {
+        report.push(format!(
+            "{what:<28} moves {:>5}  re-queues {:>5} of {total}",
+            s.moved, s.requeued
+        ));
+    };
+
+    // Each cause alone, from the empty side to the populated one.
+    let empty = Inputs::default();
+    let cause = |inputs: Inputs| move |_: &Layout, _: &Deps| inputs;
+    let s = sweep(
+        &mut rig,
+        empty,
+        &any,
+        &own,
+        &cause(Inputs {
+            home: true,
+            ..empty
+        }),
+    );
+    assert_covered("the bind point", &s);
+    assert!(s.moved >= 1, "no view reads the bind point");
+    row("home bind ($z)", &s);
+    let s = sweep(
+        &mut rig,
+        empty,
+        &any,
+        &own,
+        &cause(Inputs {
+            form: true,
+            ..empty
+        }),
+    );
+    assert_covered("the form", &s);
+    assert!(s.moved >= 100, "only {} views read the form", s.moved);
+    row("form", &s);
+    for (i, name) in ["block", "dodge", "parry", "crit"].into_iter().enumerate() {
+        let inputs = Inputs {
+            avoid: 1 << i,
+            ..empty
+        };
+        let s = sweep(&mut rig, empty, &any, &own, &cause(inputs));
+        assert_covered(name, &s);
+        assert!(s.moved >= 1, "no view reads the {name} percentage");
+        row(name, &s);
+    }
+    let s = sweep(
+        &mut rig,
+        empty,
+        &any,
+        &own,
+        &cause(Inputs {
+            reach: true,
+            ..empty
+        }),
+    );
+    assert_covered("the combat reaches", &s);
+    assert!(s.moved >= 100, "only {} views read a reach", s.moved);
+    row("combat reach", &s);
+    // The melee range cell's second unit, engaged; and, with it engaged, both units running.
+    let engaged = Inputs {
+        engaged: true,
+        ..empty
+    };
+    let s = sweep(&mut rig, empty, &any, &own, &cause(engaged));
+    assert_covered("the auto-attack target", &s);
+    assert!(s.moved >= 100, "only {} views read the target", s.moved);
+    row("auto-attack target", &s);
+    let pace = Inputs {
+        pace: true,
+        ..empty
+    };
+    let s = sweep(&mut rig, engaged, &any, &own, &cause(pace));
+    assert_covered("the units' run", &s);
+    assert!(s.moved >= 100, "only {} views read the run", s.moved);
+    row("both units running", &s);
+    // With no target engaged the melee arm has no unit for the bonus: nothing moves.
+    let s = sweep(&mut rig, empty, &any, &own, &cause(pace));
+    assert_eq!(s.moved, 0, "the moving bonus needs a unit to read");
+    let all_worn = Inputs {
+        worn: EQUIPMENT_MASK,
+        ..empty
+    };
+    let s = sweep(&mut rig, empty, &any, &own, &cause(all_worn));
+    assert_covered("the worn set", &s);
+    assert!(s.moved >= 20, "only {} views read the worn set", s.moved);
+    row("worn set (all slots)", &s);
+    for slot in 0..EQUIPMENT_SLOTS {
+        let inputs = Inputs {
+            worn: 1 << slot,
+            ..empty
+        };
+        let searching = |d: &benilla_formats::SpellDisplay| worn_slots_read(d) != 0;
+        let s = sweep(&mut rig, empty, &searching, &own, &cause(inputs));
+        assert_covered(&format!("worn slot {slot}"), &s);
+    }
+    // The player's unit fields, one at a time, and the disarm flag with weapons in both hands.
+    for (bit, name) in UNIT_NAMES.iter().enumerate() {
+        let inputs = Inputs {
+            unit: 1 << bit,
+            ..empty
+        };
+        let s = sweep(&mut rig, empty, &any, &own, &cause(inputs));
+        assert_covered(&format!("the player's {name}"), &s);
+        assert!(s.moved >= 1, "no view reads the player's {name}");
+        row(name, &s);
+    }
+    let armed = Inputs {
+        worn: EQUIPMENT_MASK,
+        ..empty
+    };
+    let disarm = Inputs {
+        disarm: true,
+        ..empty
+    };
+    let s = sweep(&mut rig, armed, &any, &own, &cause(disarm));
+    assert_covered("the disarm flag", &s);
+    assert!(s.moved >= 20, "only {} views read the disarm flag", s.moved);
+    row("disarm flag (armed)", &s);
+    let all_lines = Inputs {
+        lines: u128::MAX,
+        ..empty
+    };
+    let s = sweep(&mut rig, empty, &any, &own, &cause(all_lines));
+    assert_covered("the skills", &s);
+    assert!(s.moved >= 100, "only {} views read a skill", s.moved);
+    row("skills (all lines)", &s);
+    // The tables, per class family: the family gates which spells they reach.
+    let families = rig.families.clone();
+    let mut mods = Sweep::default();
+    for &family in &families {
+        let params = move |_: &Layout, _: &benilla_formats::SpellDisplay| Params {
+            form: 1,
+            kind: 0,
+            family,
+        };
+        let inputs = Inputs {
+            bits: u64::MAX,
+            ..empty
+        };
+        let s = sweep(&mut rig, empty, &any, &params, &cause(inputs));
+        assert_covered(&format!("the modifiers of family {family}"), &s);
+        mods.moved += s.moved;
+        mods.requeued += s.requeued;
+    }
+    assert!(
+        mods.moved >= 500,
+        "only {} views read the tables",
+        mods.moved
+    );
+    row("modifier tables (all bits)", &mods);
+
+    // Everything a view's reads leave out at once, from either side: it must not move. Moving the
+    // inputs it does read instead moves it, so the moves are not inert.
+    let outside = |layout: &Layout, deps: &Deps| Inputs::outside(deps, layout);
+    let inside = |layout: &Layout, deps: &Deps| Inputs::ALL.xor(Inputs::outside(deps, layout));
+    let s = sweep(&mut rig, empty, &any, &own, &inside);
+    assert_covered("everything a view reads", &s);
+    assert!(
+        s.moved >= 3000,
+        "only {} views moved with what they read",
+        s.moved
+    );
+    row("everything a view reads", &s);
+    for (name, base) in [("from empty", empty), ("from populated", Inputs::ALL)] {
+        let s = sweep(&mut rig, base, &any, &own, &outside);
+        assert_covered(&format!("everything a view does not read, {name}"), &s);
+        // A cross-referenced spell's family owns its modifiers: try every family.
+        for &family in &families {
+            let params = move |layout: &Layout, d: &benilla_formats::SpellDisplay| Params {
+                family,
+                ..layout.params_of(d)
+            };
+            let s = sweep(&mut rig, base, &cross_references, &params, &outside);
+            let what = format!("everything a view does not read, {name}, family {family}");
+            assert_covered(&what, &s);
+        }
+    }
+    eprintln!("{}", report.join("\n"));
+}
+
+/// The reagents line: a name streaming in re-queues every view that lists a reagent, and a count
+/// moving re-queues only the spells that list the entry.
+#[test]
+fn a_reagent_moving_requeues_the_views_that_list_it() {
+    let Some(mut rig) = Rig::new() else { return };
+    let Rig {
+        spells,
+        t,
+        objs,
+        ids,
+        reagents,
+        ..
+    } = &mut rig;
+    let listing: Vec<u32> = ids
+        .iter()
+        .copied()
+        .filter(|&id| {
+            spells
+                .catalog
+                .get(id)
+                .is_some_and(|d| d.reagents.iter().any(|&(entry, _)| entry != 0))
+        })
+        .collect();
+    assert!(
+        listing.len() >= 100,
+        "{} spells list a reagent",
+        listing.len()
+    );
+    let objects = objs.get();
+    let states = |t: &mut TestCtx, store: &ObjectStore| -> Reagents {
+        reagents
+            .iter()
+            .map(|&e| {
+                let state = reagent_state(e, Some(store), &objects, &mut t.items, &t.commands);
+                (e, state)
+            })
+            .collect()
+    };
+    let mods = SpellModifiers::default();
+    let mat_of = |store: ObjectStore| Mat {
+        store,
+        mods: mods.clone(),
+        home: None,
+        caster: RangeUnit::still(1.5),
+        attack_target: None,
+        form: 0,
+    };
+
+    // The names stream in: every reagent line appears, and each view that has one is due.
+    let empty = mat_of(ObjectStore(ObjectFields::from_pairs(&[(22, 100)])));
+    let unnamed = states(t, &empty.store);
+    let before: Vec<_> = listing
+        .iter()
+        .map(|&id| build(t, &objects, spells, id, &empty).expect("built"))
+        .collect();
+    for (i, &entry) in reagents.iter().enumerate() {
+        let template = crate::items::test_template(&format!("Reagent {i}"));
+        t.items.insert_template(entry, Some(template));
+    }
+    let named = states(t, &empty.store);
+    let changes = Changes::default().with_reagents(&unnamed, &named);
+    let mut moved = 0;
+    for (&id, (view, deps)) in listing.iter().zip(&before) {
+        let (now, _) = build(t, &objects, spells, id, &empty).expect("built");
+        if now != *view {
+            moved += 1;
+            assert!(
+                deps.hits(&changes),
+                "spell {id} gained its reagent names unheeded: {deps:?}"
+            );
+        }
+    }
+    assert!(moved >= 100, "only {moved} views showed a reagent name");
+
+    // A stack of each entry moves in, sixteen at a time: only the spells listing one are due.
+    let plain: Vec<_> = listing
+        .iter()
+        .map(|&id| build(t, &objects, spells, id, &empty).expect("built"))
+        .collect();
+    let mut moved = 0;
+    for (group, entries) in reagents.chunks(16).enumerate() {
+        let mut pairs: Vec<(u16, u32)> = vec![(22, 100)];
+        for slot in 0..entries.len() {
+            let guid = 0x2_0000 + (group * 16 + slot) as u64;
+            pairs.push((532 + 2 * slot as u16, guid as u32));
+            pairs.push((533 + 2 * slot as u16, (guid >> 32) as u32));
+        }
+        let carrying = mat_of(ObjectStore(ObjectFields::from_pairs(&pairs)));
+        let changes = Changes::default().with_reagents(&named, &states(t, &carrying.store));
+        assert!(!changes.is_empty());
+        for (&id, (view, deps)) in listing.iter().zip(&plain) {
+            let (now, _) = build(t, &objects, spells, id, &carrying).expect("built");
+            let lists = deps.reagents().iter().any(|e| entries.contains(e));
+            assert_eq!(deps.hits(&changes), lists, "spell {id}: {deps:?}");
+            if now != *view {
+                moved += 1;
+                assert!(lists, "spell {id} moved with a reagent it does not list");
+            }
+        }
+    }
+    assert!(moved >= 100, "only {moved} views showed a carried reagent");
+    // Each view records exactly the entries its spell lists.
+    for (&id, (_, deps)) in listing.iter().zip(&plain) {
+        let d = spells.catalog.get(id).expect("listed");
+        let mut want: Vec<u32> = d.reagents.iter().map(|r| r.0).filter(|&e| e != 0).collect();
+        want.sort_unstable();
+        want.dedup();
+        let mut got = deps.reagents().to_vec();
+        got.sort_unstable();
+        assert_eq!(got, want, "spell {id}");
+    }
+}
+
+/// A pet view reads the player's side only where the builder does: of the unit fields, only the
+/// ranged attack time. Its form, level, cost bases and reaches are the pet's own, and it never
+/// searches the player's equipment.
+#[test]
+fn a_pet_view_reads_no_player_form_equipment_reach_or_unit_field_but_the_ranged_time() {
+    let Some(mut rig) = Rig::new() else { return };
+    let Rig {
+        spells,
+        t,
+        objs,
+        ids,
+        layout,
+        ..
+    } = &mut rig;
+    let objects = objs.get();
+    let pet = ObjectFields::from_pairs(&[(34, 30), (162, 900)]);
+    let m = mat(
+        layout,
+        Inputs::default(),
+        Params {
+            form: 1,
+            kind: 0,
+            family: 1,
+        },
+    );
+    let (mut expands_home, mut ranged) = (0, 0);
+    for &id in ids.iter() {
+        t.spell_mods = m.mods.clone();
+        let mut ctx = t.ctx_for(&objects, 0, None, Some(&m.store));
+        ctx.caster = ViewCaster::Pet(Some(&pet));
+        let Some((_, deps)) = build_view(id, spells, &mut ctx) else {
+            continue;
+        };
+        assert!(
+            !deps.form
+                && !deps.range_units
+                && deps.worn == 0
+                && !deps.disarm
+                && deps.unit & !UnitField::RangedTime.bit() == 0,
+            "the pet view of spell {id} reads the player's side: {deps:?}"
+        );
+        expands_home += usize::from(deps.home);
+        ranged += deps.unit;
+    }
+    assert!(expands_home >= 1, "no pet view expands `$z`");
+    assert!(ranged >= 1, "no pet view reads the ranged attack time");
+}
+
+/// A pet view's cost reads `0x612c50` on the pet (`6e327b`), so the pet's base mana and base health
+/// are pet inputs, and its max health and max pools, which no cost reads, are not.
+#[test]
+fn the_pets_cost_bases_are_its_inputs_and_its_max_pools_are_not() {
+    let unit = RangeUnit::still(1.5);
+    let inputs = |pairs: &[(u16, u32)]| {
+        PetInputs::of(
+            Some(1),
+            Some(&ObjectFields::from_pairs(pairs)),
+            RangeSeen::of(&unit, None),
+        )
+    };
+    let base = inputs(&[(34, 30), (162, 900), (163, 600)]);
+    assert!(
+        inputs(&[(34, 30), (162, 901), (163, 600)]) != base,
+        "base mana"
+    );
+    assert!(
+        inputs(&[(34, 30), (162, 900), (163, 601)]) != base,
+        "base health"
+    );
+    let pools = [
+        (34, 30),
+        (162, 900),
+        (163, 600),
+        (28, 4000),
+        (29, 2000),
+        (32, 100),
+    ];
+    assert!(inputs(&pools) == base, "max health and max pools");
+}
+
+/// Every field of the pet's unit that moves a pet view is one of the pet inputs the feed rebuilds
+/// the pet views on. The fields go 48 at a time; a view that moves without a pet input moving is
+/// then narrowed to the fields that move it.
+#[test]
+fn no_pet_field_moves_a_pet_view_unwatched() {
+    let Some(mut rig) = Rig::new() else { return };
+    let Rig {
+        spells,
+        t,
+        objs,
+        ids,
+        layout,
+        ..
+    } = &mut rig;
+    let objects = objs.get();
+    let player = mat(
+        layout,
+        Inputs::ALL,
+        Params {
+            form: 1,
+            kind: 0,
+            family: 1,
+        },
+    );
+    // Level, reach, base mana, base health.
+    let base_pairs: Vec<(u16, u32)> =
+        vec![(34, 30), (130, 2.0f32.to_bits()), (162, 900), (163, 600)];
+    let pet_with = |poke: std::ops::Range<u16>| {
+        let mut pairs = base_pairs.clone();
+        pairs.extend(poke.map(|field| (field, POKE)));
+        ObjectFields::from_pairs(&pairs)
+    };
+    let build_one = |t: &mut TestCtx, id: u32, pet: &ObjectFields| {
+        t.spell_mods = player.mods.clone();
+        let mut ctx = t.ctx_for(
+            &objects,
+            pet.unit_shapeshift_form(),
+            None,
+            Some(&player.store),
+        );
+        ctx.caster = ViewCaster::Pet(Some(pet));
+        ctx.range_caster = RangeUnit::still(pet.unit_combat_reach());
+        build_view(id, spells, &mut ctx).map(|(view, _)| view)
+    };
+    // The feed reads the pet's reach off its entity's store, which these fields stand in for.
+    let pet_inputs = |pet: &ObjectFields| {
+        let unit = RangeUnit::still(pet.unit_combat_reach());
+        PetInputs::of(None, Some(pet), RangeSeen::of(&unit, None))
+    };
+    let base = pet_with(0..0);
+    let before: Vec<_> = ids.iter().map(|&id| build_one(t, id, &base)).collect();
+    let (mut moved, mut misses) = (0, Vec::new());
+    for first in (0..192u16).step_by(48) {
+        let pet = pet_with(first..first + 48);
+        for (&id, before) in ids.iter().zip(&before) {
+            if *before == build_one(t, id, &pet) {
+                continue;
+            }
+            moved += 1;
+            if pet_inputs(&pet) != pet_inputs(&base) {
+                continue;
+            }
+            let culprits: Vec<u16> = (first..first + 48)
+                .filter(|&field| *before != build_one(t, id, &pet_with(field..field + 1)))
+                .collect();
+            let name = spells.catalog.get(id).map(|d| d.name.as_str());
+            misses.push(format!(
+                "pet view of spell {id} {name:?} moved with its unit field(s) {culprits:?}"
+            ));
+        }
+    }
+    assert!(
+        misses.is_empty(),
+        "{} unwatched:\n{}",
+        misses.len(),
+        misses.join("\n")
+    );
+    assert!(moved >= 100, "only {moved} pet views moved with their unit");
+}
+
+/// Every field of the player's unit and player blocks that moves a view is one the feed watches:
+/// the fields go 64 at a time, from a populated player with and without the disarm flag up, and a
+/// view that moves without a change hitting it is narrowed to the fields that move it.
+#[test]
+fn no_player_field_moves_a_view_unwatched() {
+    let Some(mut rig) = Rig::new() else { return };
+    let mut moved = 0;
+    for base in [
+        Inputs::ALL,
+        Inputs {
+            disarm: false,
+            ..Inputs::ALL
+        },
+    ] {
+        for first in (0..1400u16).step_by(64) {
+            let poke = Some((first, 64.min(1400 - first)));
+            let flip = move |_: &Layout, _: &Deps| Inputs {
+                poke,
+                ..Inputs::default()
+            };
+            let s = sweep(&mut rig, base, &any, &own, &flip);
+            assert_covered(&format!("the player's fields {first}.."), &s);
+            moved += s.moved;
+        }
+    }
+    assert!(
+        moved >= 2000,
+        "only {moved} views moved with a player field"
+    );
+}
+
+/// The equipped-item search's answer is a function of what the feed watches: for spells of each
+/// hand restriction and armor, across every state of the main hand, the off hand and the chest
+/// (empty, a guid with no object, an object with and without a template of each kind, whole,
+/// worn, broken or without durability) and the disarm flag, two configurations that the watched
+/// state does not tell apart give the view the same `item_met`.
+#[test]
+fn the_search_answers_the_same_wherever_the_watched_state_is_the_same() {
+    use std::collections::HashMap;
+
+    // (class, subclass, flags): a sword, a mace's class with a shield's, a sword by another
+    // subclass, a deprecated sword, a shield.
+    const TEMPLATES: [(u32, u32, u32); 5] =
+        [(2, 7, 0), (4, 7, 0), (2, 3, 0), (2, 7, 0x10), (4, 6, 0)];
+    // (durability, max durability): none, whole, worn but not broken, broken, no maximum.
+    const DURABILITY: [Option<(u32, u32)>; 5] = [
+        None,
+        Some((100, 100)),
+        Some((50, 100)),
+        Some((0, 100)),
+        Some((0, 0)),
+    ];
+    #[derive(Clone, Copy, Debug)]
+    enum Held {
+        Empty,
+        GuidOnly,
+        Object {
+            template: Option<usize>,
+            durability: usize,
+        },
+    }
+    let all: Vec<Held> = [Held::Empty, Held::GuidOnly]
+        .into_iter()
+        .chain((0..5).flat_map(|d| {
+            (0..=TEMPLATES.len()).map(move |t| Held::Object {
+                template: t.checked_sub(1),
+                durability: d,
+            })
+        }))
+        .collect();
+    let chest: Vec<Held> = [Held::Empty, Held::GuidOnly]
+        .into_iter()
+        .chain([None, Some(0), Some(3), Some(4)].into_iter().flat_map(|t| {
+            [1, 3].into_iter().map(move |durability| Held::Object {
+                template: t,
+                durability,
+            })
+        }))
+        .collect();
+    let guid = |slot: u64, i: usize| 0x9_0000 + slot * 0x100 + i as u64;
+    let entry = |template: Option<usize>| 1000 + template.map_or(0, |t| 1 + t as u32);
+
+    let mut objs = TestObjects::new();
+    let mut items = Items::default();
+    for (t, &(class, subclass, flags)) in TEMPLATES.iter().enumerate() {
+        items.insert_template(
+            entry(Some(t)),
+            Some(benilla_protocol::messages::ItemInfo {
+                class,
+                subclass,
+                flags,
+                ..crate::items::test_template("Item")
+            }),
+        );
+    }
+    for (slot, states) in [(15u64, &all), (16, &all), (3, &chest)] {
+        for (i, held) in states.iter().enumerate() {
+            if let Held::Object {
+                template,
+                durability,
+            } = *held
+            {
+                let mut pairs = vec![(3u16, entry(template))];
+                if let Some((now, max)) = DURABILITY[durability] {
+                    pairs.extend([(46, now), (47, max)]);
+                }
+                objs.spawn(guid(slot, i), ObjectFields::from_pairs(&pairs));
+            }
+        }
+    }
+    let objects = objs.get();
+
+    let spec = |id: u32, class: i32, mask: u32, ex3: u32| {
+        (
+            id,
+            benilla_formats::SpellDisplay {
+                id,
+                name: format!("Spec {id}"),
+                equipped_item_class: class,
+                equipped_item_subclass_mask: mask,
+                attributes_ex3: ex3,
+                ..Default::default()
+            },
+        )
+    };
+    let ids = [1u32, 2, 3, 4, 5];
+    let specs = [
+        spec(1, 2, 1 << 7, 0),
+        spec(2, 2, 1 << 7, 0x400),
+        spec(3, 2, 1 << 7, 0x0100_0000),
+        spec(4, 4, 1 << 6, 0),
+        spec(5, 2, 1 << 7 | 1 << 3, 0),
+    ];
+    let spells = Spells {
+        catalog: benilla_formats::SpellCatalog::from_displays(specs.into_iter().collect()),
+        ..Spells::empty_for_tests()
+    };
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    let commands = NetCommands(tx);
+    let mods = SpellModifiers::default();
+    let get: &dyn Fn(&str) -> Option<String> = &|_| None;
+
+    // (spell, the watched state of the slots it reads, the disarm flag if it reads it) to its
+    // `item_met`, and the verdicts each spell reached.
+    let mut answers: HashMap<(u32, Vec<SlotItem>, bool), bool> = HashMap::new();
+    let mut verdicts: HashMap<u32, [usize; 2]> = HashMap::new();
+    for (i15, h15) in all.iter().enumerate() {
+        for (i16, h16) in all.iter().enumerate() {
+            for (i3, h3) in chest.iter().enumerate() {
+                for disarmed in [false, true] {
+                    let mut pairs: Vec<(u16, u32)> = Vec::new();
+                    for (slot, i, held) in [(15u64, i15, h15), (16, i16, h16), (3, i3, h3)] {
+                        let g = match held {
+                            Held::Empty => continue,
+                            Held::GuidOnly => 0x8_0000 + slot,
+                            Held::Object { .. } => guid(slot, i),
+                        };
+                        pairs.push((486 + 2 * slot as u16, g as u32));
+                        pairs.push((487 + 2 * slot as u16, (g >> 32) as u32));
+                    }
+                    if disarmed {
+                        pairs.push((46, 0x0020_0000));
+                    }
+                    let store = ObjectStore(ObjectFields::from_pairs(&pairs));
+                    for id in ids {
+                        let mut vctx = ViewCtx {
+                            home_area: None,
+                            form: 0,
+                            store: Some(&store),
+                            caster: ViewCaster::Player,
+                            range_caster: RangeUnit::still(1.5),
+                            attack_target: None,
+                            objects: &objects,
+                            items: &mut items,
+                            commands: &commands,
+                            sub_classes: None,
+                            skill_lines: None,
+                            spell_mods: &mods,
+                            get,
+                        };
+                        let (view, deps) = build_view(id, &spells, &mut vctx).expect("a spec");
+                        assert!(
+                            deps.disarm && deps.worn != 0,
+                            "spec {id} searches: {deps:?}"
+                        );
+                        let slots = (0..EQUIPMENT_SLOTS)
+                            .filter(|&slot| deps.worn >> slot & 1 == 1)
+                            .map(|slot| slot_item_cached(&store, slot, &objects, &items))
+                            .collect();
+                        let key = (id, slots, deps.disarm && crate::items::is_disarmed(&store));
+                        let seen = *answers.entry(key).or_insert(view.item_met);
+                        assert_eq!(
+                            seen, view.item_met,
+                            "spec {id}: main {h15:?}, off {h16:?}, chest {h3:?}, disarmed {disarmed}"
+                        );
+                        verdicts.entry(id).or_default()[usize::from(view.item_met)] += 1;
+                    }
+                }
+            }
+        }
+    }
+    for (id, [without, with]) in verdicts {
+        assert!(
+            without > 100 && with > 100,
+            "spec {id} met {with} times, unmet {without}"
+        );
+    }
+}
+
+/// [`ModsDiff`] names the row of the cell that moved, whichever table and op.
+#[test]
+fn the_modifier_diff_names_the_family_flag_bit_of_a_changed_cell() {
+    let base = SpellModifiers::default();
+    for (bit, op) in [(0u8, 0u8), (5, 14), (33, 28), (63, 28)] {
+        for flat in [true, false] {
+            let mut now = base.clone();
+            now.set(flat, bit, op, 9);
+            assert_eq!(
+                now.diff(&base),
+                ModsDiff {
+                    bits: 1 << bit,
+                    class_family: false
+                },
+                "bit {bit} op {op} flat {flat}"
+            );
+        }
+    }
+    let mut now = base.clone();
+    now.set_class_family(3);
+    assert_eq!(
+        now.diff(&base),
+        ModsDiff {
+            bits: 0,
+            class_family: true
+        }
+    );
+    assert_eq!(base.diff(&base), ModsDiff::default());
+}
+
+/// A percentage's own bit, a worn slot's own bit, a skill line by its id, each unit field by its
+/// own bit and a player appearing, through the diff the feed runs each frame.
+#[test]
+fn the_seen_diff_names_each_input_it_saw_move() {
+    let mut objs = TestObjects::new();
+    let objects = objs.get();
+    let items = Items::default();
+    let player = |pairs: &[(u16, u32)]| ObjectStore(ObjectFields::from_pairs(pairs));
+    // The feed reads the caster's reach off its store, and passes the units it read.
+    let seen_with = |s: &ObjectStore, caster_motion: UnitMotion, attack: Option<&RangeUnit>| {
+        let caster = RangeUnit {
+            motion: caster_motion,
+            ..RangeUnit::still(s.0.unit_combat_reach())
+        };
+        Seen::of(
+            Some(s),
+            None,
+            RangeSeen::of(&caster, attack),
+            &objects,
+            &items,
+        )
+    };
+    let seen = |s: &ObjectStore| seen_with(s, UnitMotion::default(), None);
+    let base = player(&[(22, 100)]);
+    for (i, field) in [1106u16, 1107, 1108, 1109].into_iter().enumerate() {
+        let now = player(&[(22, 100), (field, 4.5f32.to_bits())]);
+        let c = seen(&now).changes_since(&seen(&base));
+        assert_eq!(c.avoidance, 1 << i, "percentage field {field}");
+        assert_eq!(
+            (c.worn, c.form, c.range_units, c.home),
+            (0, false, false, false)
+        );
+        assert_eq!((c.unit, c.disarm), (0, false));
+    }
+    // A guid the object index does not hold is an unresolved item: the slot moved.
+    let now = player(&[(22, 100), (486 + 2 * 15, 7)]);
+    assert_eq!(seen(&now).changes_since(&seen(&base)).worn, 1 << 15);
+    let now = player(&[(22, 100), (486 + 2 * 22, 7)]);
+    assert_eq!(
+        seen(&now).changes_since(&seen(&base)).worn,
+        1 << 22,
+        "a bag"
+    );
+    let now = player(&[(22, 100), (138, 1 << 16)]);
+    assert!(seen(&now).changes_since(&seen(&base)).form);
+    let now = player(&[(22, 100), (130, 3.0f32.to_bits())]);
+    assert!(seen(&now).changes_since(&seen(&base)).range_units);
+    // The auto-attack target: engaged, its reach, then each unit starting to run on its own.
+    let target = RangeUnit::still(2.0);
+    let engaged = seen_with(&base, UnitMotion::default(), Some(&target));
+    assert!(engaged.changes_since(&seen(&base)).range_units);
+    let target_reach = RangeUnit::still(3.0);
+    let wider = seen_with(&base, UnitMotion::default(), Some(&target_reach));
+    assert!(wider.changes_since(&engaged).range_units);
+    let running = UnitMotion {
+        flags: 1,
+        speed: 7.0,
+        walk_speed: 2.5,
+    };
+    let target_runs = RangeUnit {
+        motion: running,
+        ..target
+    };
+    // The moving bonus needs both units running with a target engaged: a run of either one alone
+    // moves nothing a melee row shows.
+    let caster_runs = seen_with(&base, running, Some(&target));
+    assert!(caster_runs.changes_since(&engaged).is_empty());
+    let target_run = seen_with(&base, UnitMotion::default(), Some(&target_runs));
+    assert!(target_run.changes_since(&engaged).is_empty());
+    let both_run = seen_with(&base, running, Some(&target_runs));
+    assert!(
+        both_run.changes_since(&caster_runs).range_units,
+        "the target starts running beside a running caster"
+    );
+    assert!(
+        both_run.changes_since(&target_run).range_units,
+        "the caster starts running beside a running target"
+    );
+    // With no target engaged there is no unit for the bonus.
+    let alone = seen_with(&base, running, None);
+    assert!(alone.changes_since(&seen(&base)).is_empty());
+    // A walk is not a run: the answer a melee row follows does not move.
+    let walking = UnitMotion {
+        flags: 1,
+        speed: 2.5,
+        walk_speed: 2.5,
+    };
+    let caster_walk = seen_with(&base, walking, Some(&target_runs));
+    assert!(caster_walk.changes_since(&target_run).is_empty());
+    assert!(both_run.changes_since(&caster_walk).range_units);
+    let bound = Seen::of(
+        Some(&base),
+        Some("Ironforge"),
+        RangeSeen::default(),
+        &objects,
+        &items,
+    );
+    assert!(bound.changes_since(&seen(&base)).home);
+    let gone = Seen::of(None, None, RangeSeen::default(), &objects, &items);
+    assert_eq!(gone.changes_since(&seen(&base)).worn, EQUIPMENT_MASK);
+    assert!(seen(&base).changes_since(&seen(&base)).is_empty());
+    // The disarm flag, and no other flag.
+    let now = player(&[(22, 100), (46, 0x0020_0000)]);
+    let c = seen(&now).changes_since(&seen(&base));
+    assert!(c.disarm);
+    let now = player(&[(22, 100), (46, 0x0000_0008)]);
+    assert!(seen(&now).changes_since(&seen(&base)).is_empty());
+    // Each unit field on its own bit: level 34, base mana 162, base health 163, ranged attack
+    // time 128; max health 28 and the max pools 29-33 on none, which no cost reads.
+    let unit = [
+        (34u16, UnitField::Level.bit()),
+        (162, UnitField::BaseMana.bit()),
+        (163, UnitField::BaseHealth.bit()),
+        (128, UnitField::RangedTime.bit()),
+        (28, 0),
+        (29, 0),
+        (33, 0),
+    ];
+    for (field, bit) in unit {
+        let now = player(&[(22, 100), (field, 77)]);
+        let c = seen(&now).changes_since(&seen(&base));
+        assert_eq!(c.unit, bit, "unit field {field}");
+    }
+    // A line's value moving names the line.
+    let line = |value: u32| player(&[(22, 100), (718, 43), (719, value | 300 << 16)]);
+    assert_eq!(
+        seen(&line(40)).changes_since(&seen(&line(39))).skill_lines,
+        [43]
+    );
+}
diff --git a/crates/benilla-app/src/ui_tooltip/feed_tests.rs b/crates/benilla-app/src/ui_tooltip/feed_tests.rs
new file mode 100644
index 00000000..113a42b6
--- /dev/null
+++ b/crates/benilla-app/src/ui_tooltip/feed_tests.rs
@@ -0,0 +1,449 @@
+//! The feed re-pushing only the views a change reaches, through [`feed_spell_tooltips`] itself.
+
+use benilla_protocol::ObjectFields;
+use benilla_ui::script::UiScript;
+
+use super::spell_feed::feed_spell_tooltips;
+use crate::items::Items;
+use crate::net::{NetCommands, ObjectStore, SelfPlayer};
+use crate::ui_action::{PlayerActions, Spells};
+use bevy::prelude::*;
+
+/// `SpellRange.dbc` rows 2, the melee row, and 4, an authored 0 to 35.
+fn melee_and_authored_rows() -> benilla_formats::SpellRangeCatalog {
+    let row = |min, max, flags| benilla_formats::SpellRange { min, max, flags };
+    benilla_formats::SpellRangeCatalog::from_rows(
+        [(2, row(0.0, 5.0, 1)), (4, row(0.0, 35.0, 0))].into(),
+    )
+}
+
+/// A creature on a live spline at `speed` yd/s over two seconds: a mover at that speed.
+fn on_spline(speed: f32) -> crate::net::Spline {
+    crate::net::Spline {
+        points: vec![[0.0; 3], [speed * 2.0, 0.0, 0.0]],
+        start: std::time::Instant::now(),
+        duration: std::time::Duration::from_secs(2),
+        id: 1,
+        grounded: true,
+        run_mode: true,
+        deck: None,
+    }
+}
+
+fn walking_and_running_speeds() -> crate::net::UnitSpeeds {
+    crate::net::UnitSpeeds(benilla_protocol::MoveSpeeds {
+        walk: 2.5,
+        run: 7.0,
+        run_back: 4.5,
+        swim: 4.7,
+        swim_back: 2.5,
+        turn_rate: 3.1,
+    })
+}
+
+/// A feed over a bare app: the book holds `make(1)`'s spells, the player is `fields`, and each
+/// description names the generation of the catalog it was built from. The feed re-pushes a view
+/// only when it must, so which generation a tooltip shows says which views were rebuilt.
+struct FeedApp {
+    app: App,
+    player: Entity,
+    ids: Vec<u32>,
+    make: Box<dyn Fn(u32) -> Vec<(u32, benilla_formats::SpellDisplay)>>,
+}
+
+impl FeedApp {
+    fn new(
+        make: impl Fn(u32) -> Vec<(u32, benilla_formats::SpellDisplay)> + 'static,
+        fields: &[(u16, u32)],
+    ) -> Self {
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.insert_resource(NetCommands(tx))
+            .init_resource::<Items>()
+            .init_resource::<crate::net::GuidIndex>()
+            .init_resource::<crate::spell::SpellModifiers>()
+            .init_resource::<PlayerActions>()
+            .add_systems(Update, feed_spell_tooltips);
+        let player = app
+            .world_mut()
+            .spawn((SelfPlayer, ObjectStore(ObjectFields::from_pairs(fields))))
+            .id();
+        let ids: Vec<u32> = make(1).iter().map(|&(id, _)| id).collect();
+        app.world_mut().resource_mut::<PlayerActions>().spells = ids.iter().copied().collect();
+        let mut script = UiScript::new().unwrap();
+        script.set_spellbook(benilla_ui::script::SpellBookState {
+            tabs: Vec::new(),
+            slots: ids
+                .iter()
+                .map(|&id| benilla_ui::script::SpellSlotView {
+                    spell_id: id,
+                    name: format!("Spell {id}"),
+                    ..Default::default()
+                })
+                .collect(),
+        });
+        script
+            .run(
+                r#"
+                local a = CreateFrame("Button", "B"); a:SetPoint("CENTER", 0, 0)
+                a:SetWidth(10); a:SetHeight(10)
+                CreateFrame("GameTooltip", "TT")
+                function TEXT(i)
+                    TT:SetOwner(B, "ANCHOR_RIGHT"); TT:SetSpell(i, "spell")
+                    local t = {}
+                    for k = 1, TT:NumLines() do t[k] = getglobal("TTTextLeft" .. k):GetText() end
+                    return table.concat(t, " | ")
+                end
+                "#,
+            )
+            .unwrap();
+        app.insert_non_send_resource(script);
+        let mut feed = FeedApp {
+            app,
+            player,
+            ids,
+            make: Box::new(make),
+        };
+        feed.catalog(1);
+        feed.app.update();
+        feed
+    }
+
+    /// The catalog as generation `generation`.
+    fn catalog(&mut self, generation: u32) {
+        let catalog = (self.make)(generation).into_iter().collect();
+        self.app.insert_resource(Spells {
+            catalog: benilla_formats::SpellCatalog::from_displays(catalog),
+            ranges: melee_and_authored_rows(),
+            ..Spells::empty_for_tests()
+        });
+    }
+
+    /// Set the player's fields.
+    fn set_player(&mut self, fields: &[(u16, u32)]) {
+        self.app
+            .world_mut()
+            .entity_mut(self.player)
+            .insert(ObjectStore(ObjectFields::from_pairs(fields)));
+    }
+
+    /// The generation each spell's tooltip shows, in book order.
+    fn generations(&mut self) -> Vec<u32> {
+        let script = self.app.world().non_send_resource::<UiScript>();
+        (1..=self.ids.len())
+            .map(|i| {
+                let text: String = script.eval(&format!("return TEXT({i})")).unwrap();
+                text.split(" | ")
+                    .find_map(|line| line.strip_prefix("gen"))
+                    .and_then(|g| g.parse().ok())
+                    .unwrap_or_else(|| panic!("no generation in {text:?}"))
+            })
+            .collect()
+    }
+}
+
+/// A dodge percentage moving rebuilds the dodge spell's view and no other: the parry and crit
+/// spells read other percentages, the plain spell none. A change no view read rebuilds nothing.
+#[test]
+fn a_dodge_change_rebuilds_only_the_dodge_chance_view() {
+    let spell = |effect: u32, passive: bool, generation: u32| benilla_formats::SpellDisplay {
+        name: "Spell".into(),
+        effects: [effect, 0, 0],
+        passive,
+        description: Some(format!("gen{generation}")),
+        ..Default::default()
+    };
+    let spells = move |g: u32| {
+        vec![
+            (1, spell(20, true, g)),  // chance to dodge
+            (2, spell(22, true, g)),  // chance to parry
+            (3, spell(78, false, g)), // chance to crit
+            (4, spell(0, false, g)),  // no chance line
+            (5, spell(20, false, g)), // the dodge effect without the passive gate: no line
+        ]
+    };
+    let player = |dodge: f32, health: u32| {
+        [
+            (22, health),
+            (1107, dodge.to_bits()),
+            (1108, 6.0f32.to_bits()),
+            (1109, 7.0f32.to_bits()),
+        ]
+    };
+    let mut feed = FeedApp::new(spells, &player(5.0, 100));
+    assert_eq!(feed.generations(), [1, 1, 1, 1, 1], "every view is pushed");
+
+    feed.catalog(2);
+    feed.set_player(&player(9.5, 100));
+    feed.app.update();
+    assert_eq!(
+        feed.generations(),
+        [2, 1, 1, 1, 1],
+        "only the dodge view read the dodge percentage"
+    );
+
+    // Health is nothing a view reads.
+    feed.catalog(3);
+    feed.set_player(&player(9.5, 60));
+    feed.app.update();
+    assert_eq!(feed.generations(), [2, 1, 1, 1, 1], "nothing was rebuilt");
+
+    // The other two percentages, one frame each.
+    feed.set_player(&[
+        (22, 60),
+        (1107, 9.5f32.to_bits()),
+        (1108, 8.0f32.to_bits()),
+        (1109, 7.0f32.to_bits()),
+    ]);
+    feed.app.update();
+    assert_eq!(feed.generations(), [2, 3, 1, 1, 1], "parry");
+    feed.catalog(4);
+    feed.set_player(&[
+        (22, 60),
+        (1107, 9.5f32.to_bits()),
+        (1108, 8.0f32.to_bits()),
+        (1109, 1.0f32.to_bits()),
+    ]);
+    feed.app.update();
+    assert_eq!(feed.generations(), [2, 3, 4, 1, 1], "crit");
+}
+
+/// A modifier packet rebuilds the views of the spells whose family bit it names, for the class the
+/// tables gate on, and no other; a new class family rebuilds them all.
+#[test]
+fn a_modifier_change_rebuilds_only_the_matching_familys_views() {
+    let spell = |family: u32, bits: &[u32], generation: u32| benilla_formats::SpellDisplay {
+        name: "Spell".into(),
+        spell_family: family,
+        spell_family_flags: bits.iter().fold(0u64, |mask, b| mask | 1 << b),
+        description: Some(format!("gen{generation}")),
+        ..Default::default()
+    };
+    let spells = move |g: u32| {
+        vec![
+            (10, spell(3, &[5], g)),    // a mage spell on bit 5
+            (11, spell(3, &[6], g)),    // a mage spell on bit 6
+            (12, spell(8, &[5], g)),    // a rogue spell on the same bit
+            (13, spell(0, &[5], g)),    // no family: never modified
+            (14, spell(3, &[5, 6], g)), // a mage spell on both
+        ]
+    };
+    let mut feed = FeedApp::new(spells, &[(22, 100)]);
+    let mods = |feed: &mut FeedApp, f: &dyn Fn(&mut crate::spell::SpellModifiers)| {
+        f(&mut feed
+            .app
+            .world_mut()
+            .resource_mut::<crate::spell::SpellModifiers>());
+        feed.app.update();
+    };
+    // The class family arrives after the first push.
+    feed.catalog(2);
+    mods(&mut feed, &|m| m.set_class_family(3));
+    assert_eq!(
+        feed.generations(),
+        [2, 2, 2, 2, 2],
+        "a new class family rebuilds every view"
+    );
+
+    feed.catalog(3);
+    mods(&mut feed, &|m| m.set(true, 5, crate::spell::OP_COST, -10));
+    assert_eq!(
+        feed.generations(),
+        [3, 2, 2, 2, 3],
+        "the mage spells with bit 5"
+    );
+
+    // The other table, another op, the other bit.
+    feed.catalog(4);
+    mods(&mut feed, &|m| {
+        m.set(false, 6, crate::spell::OP_CAST_TIME, 20)
+    });
+    assert_eq!(feed.generations(), [3, 4, 2, 2, 4], "bit 6");
+
+    // A bit no spell carries, and a packet that restates a cell, rebuild nothing.
+    feed.catalog(5);
+    mods(&mut feed, &|m| m.set(true, 40, crate::spell::OP_COST, 5));
+    mods(&mut feed, &|m| m.set(true, 5, crate::spell::OP_COST, -10));
+    assert_eq!(
+        feed.generations(),
+        [3, 4, 2, 2, 4],
+        "the mage spells with bit 40"
+    );
+}
+
+/// The melee range cell reads the two units' motion (`0x6e3648`-`0x6e36a2`): the caster and its
+/// auto-attack target both running at run speed, or ceasing to, rebuilds the views on the melee
+/// row and no other, and a change that leaves the bonus where it was rebuilds nothing.
+#[test]
+fn a_units_run_rebuilds_only_the_melee_range_views() {
+    use crate::creature_anim::{move_flags, Engaged};
+    use crate::net::Embodied;
+
+    const MOB: u64 = 0xF130_0000_0000_0009;
+    let spell = |range_index: u32, generation: u32| benilla_formats::SpellDisplay {
+        name: "Spell".into(),
+        range_index,
+        description: Some(format!("gen{generation}")),
+        ..Default::default()
+    };
+    let spells = move |g: u32| {
+        vec![
+            (30, spell(2, g)), // the melee row
+            (31, spell(4, g)), // an authored row, which reads no unit
+            (32, spell(0, g)), // no row at all
+        ]
+    };
+    let mut feed = FeedApp::new(spells, &[(22, 100)]);
+    let speeds = walking_and_running_speeds();
+    let mob = feed
+        .app
+        .world_mut()
+        .spawn((speeds, ObjectStore(ObjectFields::from_pairs(&[(22, 100)]))))
+        .id();
+    feed.app
+        .world_mut()
+        .resource_mut::<crate::net::GuidIndex>()
+        .0
+        .insert(MOB, mob);
+    let player = feed.player;
+    feed.app
+        .world_mut()
+        .entity_mut(player)
+        .insert((Embodied, speeds, Engaged(MOB)));
+    let flags = |feed: &mut FeedApp, flags: u32| {
+        feed.app
+            .insert_resource(crate::player::Player::with_move_flags(flags));
+        feed.app.update();
+    };
+    flags(&mut feed, 0);
+    assert_eq!(feed.generations(), [1, 1, 1]);
+
+    // The bonus needs both units running: the caster alone changes nothing a view shows.
+    feed.catalog(2);
+    flags(&mut feed, move_flags::FORWARD);
+    assert_eq!(feed.generations(), [1, 1, 1], "the caster starts to run");
+
+    feed.catalog(3);
+    feed.app.world_mut().entity_mut(mob).insert(on_spline(8.0));
+    feed.app.update();
+    assert_eq!(
+        feed.generations(),
+        [3, 1, 1],
+        "its target starts to run: the moving bonus"
+    );
+
+    // Still running, by another flag: each unit's answer is where it was.
+    feed.catalog(4);
+    flags(&mut feed, move_flags::FORWARD | move_flags::STRAFE_LEFT);
+    assert_eq!(feed.generations(), [3, 1, 1], "nothing was rebuilt");
+
+    // A walk is no run.
+    feed.catalog(5);
+    flags(&mut feed, move_flags::FORWARD | move_flags::WALK_MODE);
+    assert_eq!(feed.generations(), [5, 1, 1], "the caster walks");
+}
+
+/// The pet's melee views read the pet's and its own auto-attack target's motion: a pet chasing a
+/// running mob reads the moving bonus in its range cell, and stops when either halts.
+#[test]
+fn a_pet_view_reads_the_pets_and_its_targets_run() {
+    use crate::creature_anim::Engaged;
+    use benilla_ui::script::{PetBookState, SpellSlotView};
+
+    const ME: u64 = 0x10;
+    const IMP: u64 = 0xF140_0000_0000_0077;
+    const MOB: u64 = 0xF130_0000_0000_0009;
+    let claw = benilla_formats::SpellDisplay {
+        id: 1082,
+        name: "Claw".into(),
+        range_index: 2,
+        ..Default::default()
+    };
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    let mut app = App::new();
+    app.insert_resource(Spells {
+        catalog: benilla_formats::SpellCatalog::from_displays([(1082, claw)].into()),
+        ranges: melee_and_authored_rows(),
+        ..Spells::empty_for_tests()
+    })
+    .insert_resource(NetCommands(tx))
+    .init_resource::<Items>()
+    .init_resource::<crate::net::GuidIndex>()
+    .init_resource::<crate::spell::SpellModifiers>()
+    .add_systems(Update, feed_spell_tooltips);
+    let speeds = walking_and_running_speeds();
+    let store = |pairs: &[(u16, u32)]| ObjectStore(ObjectFields::from_pairs(pairs));
+    let me = app
+        .world_mut()
+        .spawn((
+            SelfPlayer,
+            store(&[(8, IMP as u32), (9, (IMP >> 32) as u32), (34, 60)]),
+        ))
+        .id();
+    let imp = app
+        .world_mut()
+        .spawn((speeds, Engaged(MOB), store(&[(34, 14)])))
+        .id();
+    let mob = app.world_mut().spawn((speeds, store(&[(22, 100)]))).id();
+    let mut index = app.world_mut().resource_mut::<crate::net::GuidIndex>();
+    index.0.insert(ME, me);
+    index.0.insert(IMP, imp);
+    index.0.insert(MOB, mob);
+
+    let mut script = UiScript::new().unwrap();
+    script.set_pet_book(PetBookState {
+        token: Some("CAT".into()),
+        slots: vec![SpellSlotView {
+            spell_id: 1082,
+            name: "Claw".into(),
+            ..Default::default()
+        }],
+    });
+    script
+        .run(
+            r#"
+            SPELL_RANGE = "%s yd range"
+            local a = CreateFrame("Button", "B"); a:SetPoint("CENTER", 0, 0)
+            a:SetWidth(10); a:SetHeight(10)
+            CreateFrame("GameTooltip", "TT")
+            function RANGE()
+                TT:SetOwner(B, "ANCHOR_RIGHT"); TT:SetSpell(1, "pet")
+                for k = 1, TT:NumLines() do
+                    for _, side in ipairs({"TTTextLeft", "TTTextRight"}) do
+                        local t = getglobal(side .. k):GetText()
+                        if t and string.find(t, "yd range") then return t end
+                    end
+                end
+            end
+            "#,
+        )
+        .unwrap();
+    app.insert_non_send_resource(script);
+    let range = |app: &mut App| {
+        app.update();
+        let script = app.world().non_send_resource::<UiScript>();
+        script.eval::<Option<String>>("return RANGE()").unwrap()
+    };
+    let _ = range(&mut app);
+    assert_eq!(range(&mut app).as_deref(), Some("5 yd range"), "both stand");
+    app.world_mut().entity_mut(imp).insert(on_spline(8.0));
+    assert_eq!(
+        range(&mut app).as_deref(),
+        Some("5 yd range"),
+        "the pet runs, its target stands"
+    );
+    app.world_mut().entity_mut(mob).insert(on_spline(8.0));
+    assert_eq!(
+        range(&mut app).as_deref(),
+        Some("8 yd range"),
+        "both run: 5.0 + 2.6667"
+    );
+    app.world_mut()
+        .entity_mut(mob)
+        .remove::<crate::net::Spline>();
+    assert_eq!(
+        range(&mut app).as_deref(),
+        Some("5 yd range"),
+        "the target halts"
+    );
+}
diff --git a/crates/benilla-app/src/ui_tooltip/mod.rs b/crates/benilla-app/src/ui_tooltip/mod.rs
index f6122ccf..1293341c 100644
--- a/crates/benilla-app/src/ui_tooltip/mod.rs
+++ b/crates/benilla-app/src/ui_tooltip/mod.rs
@@ -1,22 +1,24 @@
 //! The world-mouseover tooltip and the spell tooltip views. The world tooltip rebuilds once per
 //! hover-target change and a lost hover arms a fade; the pick is [`Hovered`] or
-//! [`HoveredObject`], arbitrated by [`go_is_nearest`] as the click router does.
+//! [`HoveredObject`], arbitrated by [`go_is_nearest`] as the click router does. The spell views
+//! are built and pushed ahead of a hover by [`spell_feed`].
 
-use crate::ui_items::{count_of, InventoryScope};
 use bevy::prelude::*;
 use bevy::window::PrimaryWindow;
 
 use benilla_ui::script::{TooltipTint, UiScript, UnitState};
 use benilla_ui::strings::Arg;
 
-use crate::items::Items;
 use crate::names::NameCache;
-use crate::net::{NetCommands, ObjectStore, Objects, SelfPlayer};
+use crate::net::{NetCommands, ObjectStore, SelfPlayer};
 use crate::target::{go_is_nearest, Hovered, HoveredObject, GO_FLAG_LOCKED, GO_TYPE_GENERIC};
-use crate::ui_action::{PlayerActions, Spells};
 use crate::ui_script::UiFeed;
-use crate::ui_trainer::{TrainerFeed, TrainerTooltipSubjects};
-use crate::ui_unit::{enrich_unit, snapshot, unit_reaction, UnitFeed};
+use crate::ui_trainer::TrainerFeed;
+use crate::ui_unit::{enrich_unit, snapshot, unit_reaction, SnapshotTables, UnitFeed};
+
+mod spell_deps;
+mod spell_feed;
+use spell_feed::feed_spell_tooltips;
 
 pub struct UiTooltipPlugin;
 
@@ -26,522 +28,25 @@ impl Plugin for UiTooltipPlugin {
             Update,
             (
                 drive_mouseover_tooltip.in_set(UnitFeed),
-                // After the trainer feed, so a list that lands this frame is hoverable in its tick;
-                // outside `UnitFeed`, which the trainer feed follows, so it takes that set's gate.
+                // After the trainer and quest feeds, so a list that lands this frame is hoverable
+                // in its tick; outside `UnitFeed`, which the trainer feed follows, so it takes that
+                // set's gate.
                 feed_spell_tooltips
                     .in_set(UiFeed)
                     .after(TrainerFeed)
+                    .after(crate::ui_quest::feed_quest)
                     .run_if(crate::ui_script::ingame_ui_up),
             ),
         );
     }
 }
 
-/// The player-dependent inputs of a spell view: the worn set (`0x5f0c50`), the bags, the form and
-/// the bind point `$z` names.
-struct ViewCtx<'a, 'w, 's> {
-    home_area: Option<&'a str>,
-    form: u8,
-    store: Option<&'a ObjectStore>,
-    /// The caster's `UNIT_FIELD_COMBATREACH`; 1.5 is the descriptor default.
-    combat_reach: f32,
-    /// The auto-attack target's reach, which `0x6e3480` reads itself (`[caster+0xc48]`); with
-    /// none, the caster's reach counts twice.
-    attack_target_reach: Option<f32>,
-    /// The object index the worn-item search and each reagent's carried count resolve through.
-    objects: &'a Objects<'w, 's>,
-    items: &'a mut Items,
-    commands: &'a NetCommands,
-    sub_classes: Option<&'a benilla_formats::ItemSubClassCatalog>,
-    /// The talent spell-modifier tables: the cost cell shows the modified cost (`power_cost`).
-    spell_mods: &'a crate::spell::SpellModifiers,
-    /// The VM's `GlobalStrings.lua`, where the keyed cells resolve; `text` is the `%d`-filling form
-    /// the `$` tokens take.
-    get: &'a dyn Fn(&str) -> Option<String>,
-    text: &'a dyn Fn(&str, &[i64]) -> Option<String>,
-}
-
 /// Fill a key's template from the VM's `GlobalStrings.lua`; no string shows nothing.
 fn keyed(get: &dyn Fn(&str) -> Option<String>, key: &str, args: &[Arg<'_>]) -> Option<String> {
     let text = benilla_ui::strings::fill(&get(key)?, args);
     (!text.is_empty()).then_some(text)
 }
 
-/// Build one spell's tooltip view, every cell resolved here where the catalogs live. The range,
-/// cast, cooldown, form and item cells fill their `GlobalStrings.lua` keys; the cost, reagents and
-/// chance cells are composed in English, where the reference fills `MANA_COST` and its kin,
-/// `SPELL_REAGENTS` and `CHANCE_TO_*`.
-fn spell_tooltip_view(
-    spell_id: u32,
-    spells: &Spells,
-    vctx: &mut ViewCtx,
-) -> Option<benilla_ui::script::SpellTooltipView> {
-    let d = spells.catalog.get(spell_id)?;
-    let home_area = vctx.home_area;
-    let form = vctx.form;
-    let ctx = benilla_formats::TokenContext {
-        durations: &spells.durations,
-        radii: &spells.radii,
-        lookup: &|id| spells.catalog.get(id),
-        home_area,
-        text: vctx.text,
-    };
-    // The cost cell (`0x52e8ad`): the resolved `power_cost`, named by power type (keys at
-    // `0x85416c`) and Health for a type outside 0..=4 (`0x52e8fc`: Bloodrage's -2), never a
-    // percentage. Rage shows wire ÷ 10, a per-second column adds `_PER_TIME`, and no cost at all
-    // leaves the cell empty.
-    let resolved_cost = vctx.store.map_or(d.mana_cost, |s| {
-        crate::spell::usable::power_cost(d, s, vctx.spell_mods)
-    });
-    let cost = {
-        // The shared per-type divisor (`0x6e7130`), never a local `power_type == 1` test.
-        let div = benilla_protocol::messages::power_display_scale(d.power_type);
-        let unit = match d.power_type {
-            0 => "Mana",
-            1 => "Rage",
-            2 => "Focus",
-            3 => "Energy",
-            4 => "Happiness",
-            _ => "Health",
-        };
-        if resolved_cost == 0 && d.mana_per_second == 0 {
-            None
-        } else if d.mana_per_second > 0 {
-            Some(format!(
-                "{} {unit}, plus {} per sec",
-                resolved_cost / div,
-                d.mana_per_second / div
-            ))
-        } else {
-            Some(format!("{} {unit}", resolved_cost / div))
-        }
-    };
-    // The range cell: two attribute gates, `GetMinMaxRange` (`0x6e3480`, `0x52e9c2`), then
-    // `max <= 0`. There is no melee wording: the melee row (flags bit 0, row 2 only) resolves to
-    // `max(reach + casterReach + 1.3333334, 5.0)` and prints like any other, usually "5 yd range".
-    let range = (!d.tooltip_omits_range_line())
-        .then(|| {
-            let (min, max) = benilla_formats::min_max_range(
-                d,
-                spells.ranges.get(d.range_index),
-                vctx.combat_reach,
-                vctx.attack_target_reach,
-            )?;
-            if max <= 0.0 {
-                return None;
-            }
-            // `SPELL_RANGE`'s hole is a string: the number is composed first, `"%d"` or `"%d-%d"`
-            // (`0x854fb4`, Charge's 8-25), each a `fistp` conversion that rounds to nearest.
-            let yd = |v: f32| f64::from(v).round_ties_even() as i64;
-            let yards = if min > 0.0 {
-                format!("{}-{}", yd(min), yd(max))
-            } else {
-                format!("{}", yd(max))
-            };
-            keyed(vctx.get, "SPELL_RANGE", &[Arg::S(&yards)])
-        })
-        .flatten();
-    // The cast line: gate `0x52eb15` also omits it for a TRADE_SKILL or ATTACK `Effect[0]`; then
-    // the ladder `0x52eb45`-`0x52ec90`, where a negative base is "Instant cast" (`0x52ebce`) and a
-    // zero one is "Instant cast" only for a mana spell with a cost (`0x52ec4b`).
-    let cast_time = if d.tooltip_omits_cast_line() {
-        None
-    } else {
-        let base = spells
-            .cast_times
-            .get(d.casting_time_index)
-            .map(|c| c.base_ms as i32)
-            .unwrap_or(0);
-        // `%.3g` templates: the seconds go over as a real.
-        if base > 0 {
-            let (key, v) = if base >= 60_000 {
-                ("SPELL_CAST_TIME_MIN", f64::from(base) / 60_000.0)
-            } else {
-                ("SPELL_CAST_TIME_SEC", f64::from(base) / 1000.0)
-            };
-            keyed(vctx.get, key, &[Arg::F(v)])
-        } else {
-            let key = if base < 0 {
-                "SPELL_CAST_TIME_INSTANT"
-            } else if d.on_next_swing() {
-                "SPELL_ON_NEXT_SWING"
-            } else if d.tooltip_on_next_ranged() {
-                "SPELL_ON_NEXT_RANGED"
-            } else if d.tooltip_channeled() {
-                "SPELL_CAST_CHANNELED"
-            } else if d.power_type == 0 && resolved_cost > 0 {
-                "SPELL_CAST_TIME_INSTANT"
-            } else {
-                "SPELL_CAST_TIME_INSTANT_NO_MANA"
-            };
-            keyed(vctx.get, key, &[])
-        }
-    };
-    // The larger recovery column (`0x52eada`): Charge's 15 s is its category recovery.
-    let recovery_ms = d.recovery_ms.max(d.category_recovery_ms);
-    let cooldown = (recovery_ms > 0)
-        .then(|| {
-            let secs = f64::from(recovery_ms) / 1000.0;
-            let (key, v) = if secs >= 60.0 {
-                ("SPELL_RECAST_TIME_MIN", secs / 60.0)
-            } else {
-                ("SPELL_RECAST_TIME_SEC", secs)
-            };
-            keyed(vctx.get, key, &[Arg::F(v)])
-        })
-        .flatten();
-    // The required-form line (`0x52f10a`-`0x52f2ae`). With `AttributesEx2` bit 19 set the mask is
-    // permissive (Inner Fire in Shadowform), and the line is skipped (`0x52f115`).
-    let requires_form = (d.stances != 0 && !d.form_mask_is_permissive())
-        .then(|| {
-            let names: Vec<&str> = (0..32u32)
-                .filter(|b| d.stances & (1 << b) != 0)
-                .filter_map(|b| spells.forms.get(&(b + 1)).map(|f| f.name.as_str()))
-                .filter(|n| !n.is_empty())
-                .collect();
-            (!names.is_empty())
-                .then(|| {
-                    keyed(
-                        vctx.get,
-                        "SPELL_REQUIRED_FORM",
-                        &[Arg::S(&names.join(", "))],
-                    )
-                })
-                .flatten()
-        })
-        .flatten();
-    let form_met = form != 0 && d.stances & (1u32 << (u32::from(form) - 1)) != 0;
-    // The required-item line (`0x52eea7`-`0x52f10a`): a mask is named whole by
-    // `ItemSubClassMask.dbc` before its subclasses are joined; an empty mask or class < 0 skips it.
-    let requires_item = (d.targets & TARGET_ITEM == 0 && d.equipped_item_class >= 0)
-        .then(|| {
-            vctx.sub_classes?
-                .requirement_name(d.equipped_item_class as u32, d.equipped_item_subclass_mask)
-        })
-        .flatten()
-        .and_then(|name| keyed(vctx.get, "SPELL_EQUIPPED_ITEM", &[Arg::S(&name)]));
-    let chance = chance_line(d, vctx.store);
-    let item_met = vctx.store.is_none_or(|s| {
-        crate::spell::usable::equipped_item_fits(d, s, vctx.objects, vctx.items, vctx.commands)
-    });
-    // Reagents (`SPELL_REAGENTS`, `0x854e54`), red when short; one whose template has not
-    // streamed is absent until `feed_spell_tooltips` re-pushes on its arrival.
-    let reagents = {
-        let mut parts: Vec<String> = Vec::new();
-        for (entry, count) in d.reagents.iter().copied().filter(|&(e, _)| e != 0) {
-            let Some(name) = vctx
-                .items
-                .template(entry, 0, vctx.commands)
-                .map(|t| t.name.clone())
-            else {
-                continue;
-            };
-            let text = if count > 1 {
-                format!("{name} ({count})")
-            } else {
-                name
-            };
-            let short = vctx.store.is_some_and(|s| {
-                count_of(&s.0, vctx.objects, entry, InventoryScope::CARRIED) < count
-            });
-            parts.push(if short {
-                format!("|cffff2020{text}|r")
-            } else {
-                text
-            });
-        }
-        (!parts.is_empty()).then(|| format!("Reagents: {}", parts.join(", ")))
-    };
-    Some(benilla_ui::script::SpellTooltipView {
-        name: d.name.clone(),
-        rank: d.rank.clone(),
-        // The aura variant's right column (`0x52f8e5`), gated on `SpellDispelType.dbc` `[+0x28]`.
-        dispel_type: spells.catalog.dispel_name(d).map(str::to_string),
-        cost,
-        range,
-        cast_time,
-        cooldown,
-        requires_item,
-        item_met,
-        requires_form,
-        form_met,
-        chance,
-        reagents,
-        description: d
-            .description
-            .as_deref()
-            .map(|t| benilla_formats::substitute(t, d, &ctx))
-            .unwrap_or_default(),
-        aura_description: d
-            .aura_description
-            .as_deref()
-            .map(|t| benilla_formats::substitute(t, d, &ctx))
-            .unwrap_or_default(),
-    })
-}
-
-/// `Targets` bit `0x10` (name inferred): set, the required-item line is skipped (`0x52eeaa`).
-const TARGET_ITEM: u32 = 0x10;
-
-/// The four `Effect[0]` values that select a chance-to-X line (jump table `0x52f7c4`).
-const EFFECT_DODGE: u32 = 20;
-const EFFECT_PARRY: u32 = 22;
-const EFFECT_BLOCK: u32 = 23;
-const EFFECT_ATTACK: u32 = 78;
-
-/// The chance-to-X line (`0x52f5b1`-`0x52f697`): ATTACK skips the passive gate that dodge, parry
-/// and block need. The wire's values are already percents.
-fn chance_line(d: &benilla_formats::SpellDisplay, store: Option<&ObjectStore>) -> Option<String> {
-    let (label, percentage) = match d.effects[0] {
-        EFFECT_ATTACK => ("crit", store?.0.player_crit_percentage()?),
-        EFFECT_DODGE if d.passive => ("dodge", store?.0.player_dodge_percentage()?),
-        EFFECT_PARRY if d.passive => ("parry", store?.0.player_parry_percentage()?),
-        EFFECT_BLOCK if d.passive => ("block", store?.0.player_block_percentage()?),
-        _ => return None,
-    };
-    // The enUS text of the reference's `CHANCE_TO_*` keys (`%.2f%% chance to crit`).
-    Some(format!("{percentage:.2}% chance to {label}"))
-}
-
-/// What a pushed view snapshots at build time; a change to any of it re-pushes every view. The
-/// reference rebuilds on every hover and keeps no such snapshot.
-#[derive(Default)]
-struct SpellFeedMemory {
-    pushed: std::collections::HashSet<u32>,
-    /// The bind point `$z` names.
-    home: Option<String>,
-    /// The form the required-form line's colour follows (`0x52f1e3`).
-    form: Option<u8>,
-    /// The 19 worn-slot guids the required-item line's colour follows (`0x5f0c50`).
-    worn: Option<[u64; 19]>,
-    /// The block, dodge, parry and crit percentages as bit patterns (`0x52f5b1`).
-    avoidance: Option<[u32; 4]>,
-    /// The caster's and its auto-attack target's reach as bit patterns.
-    combat_reach: Option<(Option<u32>, Option<u32>)>,
-    /// Per reagent on show, `(owned count, name resolved)` (the inline red, `0x854120`).
-    reagents: std::collections::BTreeMap<u32, (u32, bool)>,
-}
-
-/// The hoverable spell sources [`feed_spell_tooltips`] reads, one parameter under Bevy's 16.
-#[derive(bevy::ecs::system::SystemParam)]
-struct SpellTooltipSources<'w> {
-    spells: Option<Res<'w, Spells>>,
-    trainer_subjects: Option<Res<'w, TrainerTooltipSubjects>>,
-    talents: Option<Res<'w, crate::ui_talent::Talents>>,
-}
-
-/// Push a view for every spell the UI can hover (the book, the class's talent ranks, the open
-/// trainer's services, the auras) before it is hovered, as the reference reads them all locally;
-/// an ask for any other id too.
-fn feed_spell_tooltips(
-    script: Option<NonSendMut<UiScript>>,
-    actions: Option<Res<PlayerActions>>,
-    spell_sources: SpellTooltipSources,
-    auras: Option<Res<crate::ui_aura::PlayerAuraCache>>,
-    selection: Res<crate::target::Selection>,
-    stores: Query<&ObjectStore>,
-    self_q: Query<&ObjectStore, With<SelfPlayer>>,
-    // The auto-attack target, the melee range cell's second reach.
-    engaged_q: Query<&crate::creature_anim::Engaged, With<SelfPlayer>>,
-    objects: Objects,
-    home_bind: Option<Res<crate::net::HomeBind>>,
-    area_names: Option<Res<crate::ui_quest_log::QuestHeaderNamesRes>>,
-    mut items: ResMut<Items>,
-    // One tuple param, under Bevy's 16-param ceiling.
-    lookups: (
-        Option<Res<crate::ui_items::ItemSubClasses>>,
-        Res<crate::spell::SpellModifiers>,
-    ),
-    commands: Res<NetCommands>,
-    mut memory: Local<crate::ui_script::VmMemo<SpellFeedMemory>>,
-) {
-    let (sub_classes, spell_mods) = &lookups;
-    let SpellTooltipSources {
-        spells,
-        trainer_subjects,
-        talents,
-    } = spell_sources;
-    let Some(mut script) = script else {
-        return;
-    };
-    let memory = memory.get(&script);
-    let Some(spells) = spells.as_deref() else {
-        return;
-    };
-    let mut wanted: Vec<u32> = script.take_spell_tooltip_asks();
-    if let Some(actions) = actions.as_deref() {
-        wanted.extend(
-            actions
-                .spells
-                .iter()
-                .copied()
-                .filter(|s| !memory.pushed.contains(s)),
-        );
-    }
-    // The open trainer's services, which the detail icon's `SetTrainerService` renders.
-    if let Some(trainer) = trainer_subjects.as_deref() {
-        wanted.extend(
-            trainer
-                .0
-                .iter()
-                .copied()
-                .filter(|s| !memory.pushed.contains(s)),
-        );
-    }
-    // Every rank of the class's talents: a talent tooltip reads the current and the next rank.
-    if let (Some(talents), Ok(store)) = (talents.as_deref(), self_q.single()) {
-        let race = store.0.unit_race().unwrap_or(0);
-        let class = store.0.unit_class().unwrap_or(0);
-        for tab in talents.catalog.tabs_for_class(race, class) {
-            for t in talents.catalog.talents_in_tab(tab.id) {
-                wanted.extend(
-                    t.ranks
-                        .iter()
-                        .copied()
-                        .filter(|s| *s != 0 && !memory.pushed.contains(s)),
-                );
-            }
-        }
-    }
-    if let Some(auras) = auras.as_deref() {
-        wanted.extend(auras.spell_ids().filter(|s| !memory.pushed.contains(s)));
-    }
-    // `SetTrackingSpell`: the display cache leaves the tracking aura out, so read the raw auras.
-    if let Ok(store) = self_q.single() {
-        wanted.extend(
-            store
-                .0
-                .unit_auras()
-                .map(|a| a.spell_id)
-                .filter(|s| !memory.pushed.contains(s)),
-        );
-    }
-    if let Some(store) = selection.target.and_then(|e| stores.get(e).ok()) {
-        wanted.extend(
-            store
-                .0
-                .unit_auras()
-                .map(|a| a.spell_id)
-                .filter(|s| !memory.pushed.contains(s)),
-        );
-    }
-    let home_area: Option<String> = home_bind
-        .as_deref()
-        .and_then(|b| b.0)
-        .and_then(|id| area_names.as_deref()?.0.resolve(id as i32))
-        .map(str::to_string);
-    // A bind-point change re-substitutes every view's `$z` (Astral Recall).
-    if memory.home != home_area {
-        memory.home = home_area.clone();
-        wanted.extend(memory.pushed.drain());
-    }
-    // So does a form change: the required-form line's colour follows the form (`0x52f1e3`).
-    let form = self_q
-        .single()
-        .map(|s| s.0.unit_shapeshift_form())
-        .unwrap_or(0);
-    if memory.form != Some(form) {
-        memory.form = Some(form);
-        wanted.extend(memory.pushed.drain());
-    }
-    let self_store = self_q.single().ok();
-    // So do the worn set and, below, the reagents on show.
-    let worn =
-        self_store.map(|s| std::array::from_fn(|i| s.0.player_inv_slot(i as u8).unwrap_or(0)));
-    if memory.worn != worn {
-        memory.worn = worn;
-        wanted.extend(memory.pushed.drain());
-    }
-    let avoidance = self_store.map(|s| {
-        [
-            s.0.player_block_percentage(),
-            s.0.player_dodge_percentage(),
-            s.0.player_parry_percentage(),
-            s.0.player_crit_percentage(),
-        ]
-        .map(|v| v.unwrap_or(0.0).to_bits())
-    });
-    if memory.avoidance != avoidance {
-        memory.avoidance = avoidance;
-        wanted.extend(memory.pushed.drain());
-    }
-    let attack_target_reach = engaged_q
-        .single()
-        .ok()
-        .and_then(|e| objects.object(e.0))
-        .map(|f| f.unit_combat_reach());
-    let reaches = (
-        self_store.map(|s| s.0.unit_combat_reach().to_bits()),
-        attack_target_reach.map(f32::to_bits),
-    );
-    if memory.combat_reach != Some(reaches) {
-        memory.combat_reach = Some(reaches);
-        wanted.extend(memory.pushed.drain());
-    }
-    // So does a spell-modifier change: the cost cell resolves through the talent tables.
-    if spell_mods.is_changed() {
-        wanted.extend(memory.pushed.drain());
-    }
-    let watched: Vec<u32> = memory.reagents.keys().copied().collect();
-    let reagent_state: std::collections::BTreeMap<u32, (u32, bool)> = watched
-        .into_iter()
-        .map(|entry| {
-            let named = items.template(entry, 0, &commands).is_some();
-            let owned = self_store.map_or(0, |s| {
-                count_of(&s.0, &objects, entry, InventoryScope::CARRIED)
-            });
-            (entry, (owned, named))
-        })
-        .collect();
-    if memory.reagents != reagent_state {
-        memory.reagents = reagent_state;
-        wanted.extend(memory.pushed.drain());
-    }
-    // Build, then push: the build's borrow of the VM's strings ends before the store is written.
-    let mut built: Vec<(u32, benilla_ui::script::SpellTooltipView)> = Vec::new();
-    {
-        let get = |key: &str| benilla_ui::strings::global(script.lua(), key);
-        let text = crate::ui_script::token_text(&script);
-        let mut vctx = ViewCtx {
-            home_area: home_area.as_deref(),
-            form,
-            store: self_store,
-            combat_reach: self_store.map_or(1.5, |s| s.0.unit_combat_reach()),
-            attack_target_reach,
-            objects: &objects,
-            items: &mut items,
-            commands: &commands,
-            sub_classes: sub_classes.as_deref().map(|c| &c.0),
-            spell_mods,
-            get: &get,
-            text: &text,
-        };
-        for id in wanted {
-            if let Some(view) = spell_tooltip_view(id, spells, &mut vctx) {
-                // Watch this spell's reagents, seeded with the state the view was built against.
-                if let Some(d) = spells.catalog.get(id) {
-                    for (entry, _) in d.reagents.iter().copied().filter(|&(e, _)| e != 0) {
-                        if let std::collections::btree_map::Entry::Vacant(slot) =
-                            memory.reagents.entry(entry)
-                        {
-                            let named = vctx.items.template(entry, 0, vctx.commands).is_some();
-                            let owned = vctx.store.map_or(0, |s| {
-                                count_of(&s.0, vctx.objects, entry, InventoryScope::CARRIED)
-                            });
-                            slot.insert((owned, named));
-                        }
-                    }
-                }
-                built.push((id, view));
-                memory.pushed.insert(id);
-            }
-        }
-    }
-    for (id, view) in built {
-        script.set_spell_tooltip(id, view);
-    }
-}
-
 /// What the world tooltip was last built for; the reference rebuilds once per hover-target change.
 #[derive(Default, PartialEq, Clone, Copy)]
 enum LastHover {
@@ -565,6 +70,8 @@ pub(crate) struct HoverMemo<'s> {
     last_lines: Local<'s, crate::ui_script::VmMemo<Option<UnitState>>>,
     /// The hover probe's last trace line, so a stationary probe logs it once.
     trace: Local<'s, String>,
+    /// Whether the VM holds a `"mouseover"` unit, so the clear is pushed once.
+    published: Local<'s, crate::ui_script::VmMemo<bool>>,
 }
 
 fn lines_view(s: &UnitState) -> UnitState {
@@ -610,8 +117,9 @@ fn drive_mouseover_tooltip(
     // The cursor seat crosses the VM seam: the anchor below is UI units, not px.
     ui_scale: Res<crate::ui_script::UiScaleCvar>,
     mut memo: HoverMemo,
-    // `ChrClasses.dbc` field 16, `UnitHasRelicSlot`'s input; without it no class has a relic slot.
-    classes: Option<Res<crate::chr_classes::ChrClassTable>>,
+    // `ChrClasses.dbc` field 16, `UnitHasRelicSlot`'s input, and the form table the creature type
+    // reads.
+    tables: SnapshotTables,
 ) {
     let Some(mut script) = script else {
         return;
@@ -619,16 +127,20 @@ fn drive_mouseover_tooltip(
     let (last, last_lines, trace) = (&mut memo.last, &mut memo.last_lines, &mut *memo.trace);
     let last = last.get(&script);
     let last_lines = last_lines.get(&script);
+    let published = memo.published.get(&script);
     let self_store = self_q.iter().next();
-    let chr = classes.as_deref().map(|t| &t.0);
+    let chr = tables.classes();
+    let types = tables.types(&names);
 
-    let unit = hovered.target.zip(hovered.guid).and_then(|(entity, guid)| {
+    let unit = hovered.mouseover(&hovered_go).and_then(|(entity, guid)| {
         let store = stores.get(entity).ok()?;
         let name = names
             .resolve_unit(guid, Some(store), &commands)
             .map(str::to_string);
         let reaction = unit_reaction(rx.factions.as_deref(), &rx.reputations, store, self_store);
-        let mut s = snapshot(store, name, reaction, chr);
+        // The hovered guid, the pair `0x492890` writes to `0xb4e2c8`/`0xb4e2cc` and the token
+        // resolver `0x515970` reads for `"mouseover"`, so `UnitIsUnit` can match it.
+        let mut s = snapshot(store, guid, name, reaction, chr, types);
         enrich_unit(
             &mut s,
             guid,
@@ -646,11 +158,12 @@ fn drive_mouseover_tooltip(
         (unit.is_none() && hovered.corpse.is_none()) || go_is_nearest(&hovered, &hovered_go)
     });
 
-    if let Some((guid, state)) = unit.filter(|_| go.is_none()) {
+    if let Some((guid, state)) = unit {
         // Push first: the builder reads the token. Rebuild on a new target or a late name or
         // creature answer; health and power stay out of the key, since the watcher drives the bar.
         let key = lines_view(&state);
         script.set_unit("mouseover", Some(state));
+        *published = true;
         if *last != LastHover::Unit(guid) || last_lines.as_ref() != Some(&key) {
             script.world_tooltip_unit("mouseover");
             *last = LastHover::Unit(guid);
@@ -658,6 +171,14 @@ fn drive_mouseover_tooltip(
         }
         return;
     }
+    // No unit won the pick: the publisher's teardown zeroes the mouseover pair (`0x4928e8`,
+    // `0x4928f2`) and writes a null, corpse or GameObject guid, none of which resolves as a unit,
+    // so `"mouseover"` names nobody from this frame. A fading plate keeps its lines and its bar,
+    // which follows the unit's guid, not the token; the null publish fires no event (the sole
+    // `UPDATE_MOUSEOVER_UNIT` is the unit arm's, `0x4929b3`).
+    if std::mem::take(published) {
+        script.set_unit("mouseover", None);
+    }
     // The corpse plate, "Corpse of <owner>" (`0x52aef0`): a name and nothing else, corner-seated.
     // The publisher fires no event for a corpse, so `UnitName("mouseover")` on one stays nil.
     if let Some((entity, guid)) = hovered
@@ -828,11 +349,17 @@ fn drive_mouseover_tooltip(
         return;
     }
     if !matches!(*last, LastHover::None) {
-        // Hover lost: arm the fade. The `mouseover` state stays, so the fading plate keeps it.
+        // Hover lost: arm the fade (`0x492909` → `0x530ae0`).
         script.world_tooltip_fade();
         *last = LastHover::None;
     }
 }
 
+#[cfg(test)]
+mod bench;
+#[cfg(test)]
+mod deps_tests;
+#[cfg(test)]
+mod feed_tests;
 #[cfg(test)]
 mod tests;
diff --git a/crates/benilla-app/src/ui_tooltip/spell_deps.rs b/crates/benilla-app/src/ui_tooltip/spell_deps.rs
new file mode 100644
index 00000000..9be2e67b
--- /dev/null
+++ b/crates/benilla-app/src/ui_tooltip/spell_deps.rs
@@ -0,0 +1,351 @@
+//! What each pushed spell view read, and which changes of the player's state move it. The
+//! reference builds a spell tooltip at the hover and keeps nothing; the feed pushes views ahead of
+//! it, so it must know, per view, the inputs it was built from. A view records them as it is built
+//! ([`Deps`]), the feed diffs the player-side inputs frame to frame ([`Seen`], the modifier
+//! tables, the watched reagents) into what moved ([`Changes`]), and only the views that read what
+//! moved are built again.
+
+use std::collections::BTreeMap;
+
+use benilla_formats::RangeUnit;
+use benilla_protocol::ObjectFields;
+
+use crate::items::Items;
+use crate::net::{ObjectStore, Objects};
+use crate::spell::usable::{slot_item_cached, SlotItem, EQUIPMENT_MASK, EQUIPMENT_SLOTS};
+use crate::spell::{ModsDiff, SkillSnapshot};
+
+/// The four percentages a chance-to-X line reads (`0x52f5b1`), in the order [`Seen`] keeps them.
+#[derive(Clone, Copy)]
+pub(super) enum Chance {
+    Block,
+    Dodge,
+    Parry,
+    Crit,
+}
+
+impl Chance {
+    pub(super) const ALL: [Chance; 4] = [Chance::Block, Chance::Dodge, Chance::Parry, Chance::Crit];
+
+    /// The player's live percentage, already a percent on the wire.
+    pub(super) fn read(self, player: &ObjectFields) -> Option<f32> {
+        match self {
+            Chance::Block => player.player_block_percentage(),
+            Chance::Dodge => player.player_dodge_percentage(),
+            Chance::Parry => player.player_parry_percentage(),
+            Chance::Crit => player.player_crit_percentage(),
+        }
+    }
+
+    /// The bit a [`Deps::avoidance`] or [`Changes::avoidance`] mask holds it at.
+    fn bit(self) -> u8 {
+        1 << self as u8
+    }
+}
+
+/// One of the player's unit fields a cost, cast or cooldown cell reads, a bit of [`Deps::unit`].
+#[derive(Clone, Copy)]
+pub(super) enum UnitField {
+    Level,
+    BaseMana,
+    BaseHealth,
+    RangedTime,
+}
+
+impl UnitField {
+    pub(super) fn bit(self) -> u16 {
+        match self {
+            UnitField::Level => 1,
+            UnitField::BaseMana => 1 << 1,
+            UnitField::BaseHealth => 1 << 2,
+            UnitField::RangedTime => 1 << 3,
+        }
+    }
+}
+
+/// The player's unit fields those cells read, as the values they read them at (an absent field
+/// reads 0).
+#[derive(Clone, Copy, Default, PartialEq)]
+struct UnitFields {
+    level: u32,
+    base_mana: u32,
+    base_health: u32,
+    ranged_time: u32,
+}
+
+impl UnitFields {
+    fn of(player: Option<&ObjectStore>) -> Self {
+        let Some(p) = player.map(|s| &s.0) else {
+            return Self::default();
+        };
+        Self {
+            level: p.unit_level().unwrap_or(0),
+            base_mana: p.unit_base_mana().unwrap_or(0),
+            base_health: p.unit_base_health().unwrap_or(0),
+            ranged_time: p.unit_ranged_attack_time().unwrap_or(0),
+        }
+    }
+
+    /// The [`UnitField`] bits that differ.
+    fn diff(&self, prev: &Self) -> u16 {
+        let moved = |field: UnitField, now: u32, before: u32| {
+            if now != before {
+                field.bit()
+            } else {
+                0
+            }
+        };
+        moved(UnitField::Level, self.level, prev.level)
+            | moved(UnitField::BaseMana, self.base_mana, prev.base_mana)
+            | moved(UnitField::BaseHealth, self.base_health, prev.base_health)
+            | moved(UnitField::RangedTime, self.ranged_time, prev.ranged_time)
+    }
+}
+
+/// What one built view read of the player-side inputs the feed watches; the pet's own inputs
+/// ([`super::spell_feed::PetInputs`]) rebuild every pet view and are not recorded. Written where
+/// the builder reads, so a read cannot be added without saying what it depends on.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub(super) struct Deps {
+    /// A `$z` expanded: the bind point.
+    pub(super) home: bool,
+    /// The required-form test read the shapeshift form.
+    pub(super) form: bool,
+    /// The range cell's melee arm read the caster's and the auto-attack target's combat reach and
+    /// motion; the ranged arm, given no target, reads neither.
+    pub(super) range_units: bool,
+    /// The chance line read these percentages, a [`Chance`] bit each.
+    pub(super) avoidance: u8,
+    /// The equipped-item search read these equipment slots, a bit each.
+    pub(super) worn: u32,
+    /// The equipped-item search asked whether the disarm flag hides a hand.
+    pub(super) disarm: bool,
+    /// The player's unit fields the cost, cast and cooldown cells read, a [`UnitField`] bit each.
+    /// A pet view's cost and cast cells read the pet's own fields, which are pet inputs, so of
+    /// the unit fields only the ranged attack time (read off the player) is recorded for one.
+    pub(super) unit: u16,
+    /// The modifier cells read: the `SpellFamilyFlags` bits of the view's spell and of each spell
+    /// its text cross-references, for the ones the caster's class family owns.
+    pub(super) mod_bits: u64,
+    /// The skill lines read, through the view's own spell and each one its text cross-references.
+    pub(super) skill_lines: Vec<u32>,
+    /// The reagent entries the reagents line lists.
+    reagents: Vec<u32>,
+}
+
+impl Deps {
+    pub(super) fn chance(&mut self, which: Chance) {
+        self.avoidance |= which.bit();
+    }
+
+    pub(super) fn unit(&mut self, field: UnitField) {
+        self.unit |= field.bit();
+    }
+
+    /// The equipped-item search ran over the equipment slots in `slots`.
+    pub(super) fn item_search(&mut self, slots: u32) {
+        self.worn |= slots;
+        self.disarm |= slots != 0;
+    }
+
+    pub(super) fn skill_line(&mut self, line: u32) {
+        if !self.skill_lines.contains(&line) {
+            self.skill_lines.push(line);
+        }
+    }
+
+    pub(super) fn reagent(&mut self, entry: u32) {
+        if !self.reagents.contains(&entry) {
+            self.reagents.push(entry);
+        }
+    }
+
+    /// The reagent entries the view lists.
+    pub(super) fn reagents(&self) -> &[u32] {
+        &self.reagents
+    }
+
+    /// Whether `changes` moved an input this view read.
+    pub(super) fn hits(&self, changes: &Changes) -> bool {
+        changes.everything
+            || (changes.home && self.home)
+            || (changes.form && self.form)
+            || (changes.range_units && self.range_units)
+            || changes.avoidance & self.avoidance != 0
+            || changes.worn & self.worn != 0
+            || (changes.disarm && self.disarm)
+            || changes.unit & self.unit != 0
+            || changes.mod_bits & self.mod_bits != 0
+            || self
+                .skill_lines
+                .iter()
+                .any(|line| changes.skill_lines.contains(line))
+            || self
+                .reagents
+                .iter()
+                .any(|entry| changes.reagents.contains(entry))
+    }
+}
+
+/// What moved since the frame before, in the terms of [`Deps`].
+#[derive(Debug, Default)]
+pub(super) struct Changes {
+    /// An input no view can be ruled out of: every view is due.
+    pub(super) everything: bool,
+    pub(super) home: bool,
+    pub(super) form: bool,
+    pub(super) range_units: bool,
+    /// A [`Chance`] bit each.
+    pub(super) avoidance: u8,
+    /// The equipment slots whose item moved in a way the search can tell, a bit each.
+    pub(super) worn: u32,
+    pub(super) disarm: bool,
+    /// A [`UnitField`] bit each.
+    pub(super) unit: u16,
+    /// The `SpellFamilyFlags` bits with a changed modifier cell.
+    pub(super) mod_bits: u64,
+    pub(super) skill_lines: Vec<u32>,
+    pub(super) reagents: Vec<u32>,
+}
+
+impl Changes {
+    pub(super) fn is_empty(&self) -> bool {
+        !self.everything
+            && !self.home
+            && !self.form
+            && !self.range_units
+            && self.avoidance == 0
+            && self.worn == 0
+            && !self.disarm
+            && self.unit == 0
+            && self.mod_bits == 0
+            && self.skill_lines.is_empty()
+            && self.reagents.is_empty()
+    }
+
+    /// The modifier tables' change. A new class family changes which spells the tables reach at
+    /// all, so it is everything.
+    pub(super) fn with_mods(mut self, diff: ModsDiff) -> Self {
+        self.mod_bits = diff.bits;
+        self.everything |= diff.class_family;
+        self
+    }
+
+    /// The watched reagents whose count or resolved name moved.
+    pub(super) fn with_reagents(mut self, prev: &Reagents, now: &Reagents) -> Self {
+        self.reagents = now
+            .iter()
+            .filter(|(entry, state)| prev.get(entry) != Some(state))
+            .map(|(&entry, _)| entry)
+            .collect();
+        self
+    }
+}
+
+/// Per reagent on show, `(owned count, name resolved)`: what the reagents line renders (the
+/// inline red, `0x854120`).
+pub(super) type Reagents = BTreeMap<u32, (u32, bool)>;
+
+/// What the range cell's melee arm reads of two units: the caster's combat reach and its
+/// auto-attack target's, as bit patterns (`None` with none engaged, where the arm reads the
+/// caster's reach twice), and whether the moving bonus applies, the one fact of the units' motion
+/// the cell's number follows: both move at run speed
+/// ([`benilla_formats::UnitMotion::moves_at_run_speed`]) with a target engaged to read.
+#[derive(Clone, Copy, Default, PartialEq)]
+pub(super) struct RangeSeen {
+    caster_reach: u32,
+    attack_target_reach: Option<u32>,
+    bonus: bool,
+}
+
+impl RangeSeen {
+    pub(super) fn of(caster: &RangeUnit, attack_target: Option<&RangeUnit>) -> Self {
+        Self {
+            caster_reach: caster.reach.to_bits(),
+            attack_target_reach: attack_target.map(|u| u.reach.to_bits()),
+            bonus: caster.motion.moves_at_run_speed()
+                && attack_target.is_some_and(|u| u.motion.moves_at_run_speed()),
+        }
+    }
+}
+
+/// The player-side inputs one frame saw, which the pushed views were built against.
+#[derive(Clone, PartialEq)]
+pub(super) struct Seen {
+    /// The bind point `$z` names.
+    home: Option<String>,
+    /// The form the required-form line's colour follows (`0x52f1e3`).
+    form: u8,
+    /// The skills the descriptions' per-level terms scale by ([`crate::spell::skill_snapshot`]).
+    skills: SkillSnapshot,
+    /// What the equipped-item search learns of each of the 23 equipment slots (`0x5f0c50`); `None`
+    /// without a player.
+    worn: Option<[SlotItem; EQUIPMENT_SLOTS as usize]>,
+    /// The disarm flag, which hides a hand from that search.
+    disarmed: bool,
+    /// The [`Chance`] percentages as bit patterns.
+    avoidance: [Option<u32>; 4],
+    /// The caster's and its auto-attack target's reach, and whether the moving bonus applies.
+    range_units: RangeSeen,
+    /// The unit fields the cost, cast and cooldown cells read.
+    unit: UnitFields,
+}
+
+impl Seen {
+    pub(super) fn of(
+        player: Option<&ObjectStore>,
+        home: Option<&str>,
+        range_units: RangeSeen,
+        objects: &Objects,
+        items: &Items,
+    ) -> Self {
+        Seen {
+            home: home.map(str::to_string),
+            form: player.map_or(0, |s| s.0.unit_shapeshift_form()),
+            skills: crate::spell::skill_snapshot(player),
+            worn: player
+                .map(|s| std::array::from_fn(|i| slot_item_cached(s, i as u8, objects, items))),
+            disarmed: player.is_some_and(crate::items::is_disarmed),
+            avoidance: Chance::ALL
+                .map(|which| player.and_then(|s| which.read(&s.0)).map(f32::to_bits)),
+            range_units,
+            unit: UnitFields::of(player),
+        }
+    }
+
+    /// What differs from the frame `prev` saw, the modifiers and reagents apart.
+    pub(super) fn changes_since(&self, prev: &Seen) -> Changes {
+        let mut changes = Changes {
+            home: self.home != prev.home,
+            form: self.form != prev.form,
+            range_units: self.range_units != prev.range_units,
+            disarm: self.disarmed != prev.disarmed,
+            unit: self.unit.diff(&prev.unit),
+            ..Changes::default()
+        };
+        for (which, (now, before)) in Chance::ALL
+            .iter()
+            .zip(self.avoidance.iter().zip(&prev.avoidance))
+        {
+            if now != before {
+                changes.avoidance |= which.bit();
+            }
+        }
+        changes.worn = match (&self.worn, &prev.worn) {
+            (Some(now), Some(before)) => now
+                .iter()
+                .zip(before)
+                .enumerate()
+                .fold(0, |mask, (slot, (now, before))| {
+                    mask | u32::from(now != before) << slot
+                }),
+            (None, None) => 0,
+            // A player appearing or going: every slot's item is new.
+            _ => EQUIPMENT_MASK,
+        };
+        if self.skills != prev.skills {
+            changes.skill_lines = crate::spell::changed_skill_lines(&prev.skills, &self.skills);
+        }
+        changes
+    }
+}
diff --git a/crates/benilla-app/src/ui_tooltip/spell_feed.rs b/crates/benilla-app/src/ui_tooltip/spell_feed.rs
new file mode 100644
index 00000000..d84579b0
--- /dev/null
+++ b/crates/benilla-app/src/ui_tooltip/spell_feed.rs
@@ -0,0 +1,758 @@
+//! The spell tooltip views: the builder `0x52e610`'s cells resolved here where the catalogs live,
+//! and the feed that pushes a view for every spell the UI can hover before it is hovered. The
+//! reference builds at the hover and keeps nothing; the feed keeps what each pushed view read
+//! ([`super::spell_deps`]) and builds again only the views a change of the player's state reaches.
+
+use std::cell::RefCell;
+use std::collections::HashMap;
+
+use bevy::prelude::*;
+
+use benilla_ui::script::UiScript;
+use benilla_ui::strings::Arg;
+
+use super::keyed;
+use super::spell_deps::{Chance, Changes, Deps, RangeSeen, Reagents, Seen, UnitField};
+use crate::items::Items;
+use crate::net::{NetCommands, ObjectStore, Objects, SelfPlayer};
+use crate::spell::usable::{self, CostBasis};
+use crate::ui_action::{PlayerActions, Spells};
+use crate::ui_items::{count_of, InventoryScope};
+use crate::ui_trainer::TrainerTooltipSubjects;
+
+/// The unit a view's caster cells are computed against, the spell builder `0x52e610`'s fourth
+/// argument: the level the `$`-tokens, the cost and the cast time scale by, and the cost's basis.
+#[derive(Clone, Copy)]
+pub(super) enum ViewCaster<'a> {
+    /// The active player ([`ViewCtx::store`]), selector 0.
+    Player,
+    /// Selector 1: the player's charm, else its summon (`0x6e3159`-`0x6e317f`, `0x6e31fe`-
+    /// `0x6e3228`), `None` when neither is streamed.
+    Pet(Option<&'a benilla_protocol::ObjectFields>),
+}
+
+impl ViewCaster<'_> {
+    /// The pet's `[vtbl+0xa8]`, `CGUnit`'s `0x60cd80`: `UNIT_FIELD_LEVEL × 5`, which
+    /// [`benilla_formats::SpellDisplay::skill_level`] caps at `maxLevel × 5` and divides by 5 as
+    /// `0x60cdb2`-`0x60cdb9` and `0x6e3195` do. No unit reads 0 (`0x6e31a4`).
+    fn pet_skill_value(pet: Option<&benilla_protocol::ObjectFields>) -> u32 {
+        pet.and_then(|p| p.unit_level())
+            .unwrap_or(0)
+            .saturating_mul(5)
+    }
+}
+
+/// The caster-dependent inputs of a spell view: the worn set (`0x5f0c50`), the bags, the form and
+/// the bind point `$z` names.
+pub(super) struct ViewCtx<'a, 'w, 's> {
+    pub(super) home_area: Option<&'a str>,
+    /// The caster's shapeshift form, which the required-form line's colour reads (`0x52f1f2`).
+    pub(super) form: u8,
+    /// The active player.
+    pub(super) store: Option<&'a ObjectStore>,
+    /// Whom the level terms and the cost read: the player or its pet. The form and the reaches
+    /// are that same unit's.
+    pub(super) caster: ViewCaster<'a>,
+    /// The caster as `0x6e3480` reads it: its `UNIT_FIELD_COMBATREACH` (1.5 is the descriptor
+    /// default) and its motion.
+    pub(super) range_caster: benilla_formats::RangeUnit,
+    /// The caster's auto-attack target, which `0x6e3480` looks up itself (`[caster+0xc48]`) for
+    /// its melee arm alone, reading its reach and motion; with none, the caster's reach counts
+    /// twice and there is no moving bonus.
+    pub(super) attack_target: Option<benilla_formats::RangeUnit>,
+    /// The object index the worn-item search and each reagent's carried count resolve through.
+    pub(super) objects: &'a Objects<'w, 's>,
+    pub(super) items: &'a mut Items,
+    pub(super) commands: &'a NetCommands,
+    pub(super) sub_classes: Option<&'a benilla_formats::ItemSubClassCatalog>,
+    /// The spell-to-line hop the `$`-tokens' skill level reads ([`crate::spell::spell_skill_value`]).
+    pub(super) skill_lines: Option<&'a benilla_formats::SkillLineCatalog>,
+    /// The talent spell-modifier tables: the cost cell shows the modified cost (`power_cost`).
+    pub(super) spell_mods: &'a crate::spell::SpellModifiers,
+    /// The VM's `GlobalStrings.lua`, where the keyed cells and the `$` tokens' templates resolve.
+    pub(super) get: &'a dyn Fn(&str) -> Option<String>,
+}
+
+/// Build one spell's tooltip view, every cell resolved here where the catalogs live, and what it
+/// read ([`Deps`]). The range, cast, cooldown, form and item cells fill their `GlobalStrings.lua`
+/// keys; the cost, reagents and chance cells are composed in English, where the reference fills
+/// `MANA_COST` and its kin, `SPELL_REAGENTS` and `CHANCE_TO_*`.
+pub(super) fn build_view(
+    spell_id: u32,
+    spells: &Spells,
+    vctx: &mut ViewCtx,
+) -> Option<(benilla_ui::script::SpellTooltipView, Deps)> {
+    let d = spells.catalog.get(spell_id)?;
+    let deps = RefCell::new(Deps::default());
+    // The cost, cast, cooldown and range cells and the description's tokens all modify through
+    // the spell's own family mask.
+    deps.borrow_mut().mod_bits |= vctx.spell_mods.read_bits(d);
+    let form = vctx.form;
+    let caster = vctx.caster;
+    // The `$`-tokens' level (`0x5075f0` hands the selector to `0x6e3130`, `507645`-`50764a`).
+    let skill = |id| match caster {
+        ViewCaster::Player => {
+            let line = vctx.skill_lines.and_then(|c| c.spell_to_line(id));
+            if let Some(line) = line {
+                deps.borrow_mut().skill_line(line);
+            }
+            line.map_or(0, |line| crate::spell::skill_line_value(vctx.store, line))
+        }
+        // The pet's level is one of the pet's own inputs.
+        ViewCaster::Pet(pet) => ViewCaster::pet_skill_value(pet),
+    };
+    // A cross-referenced spell's own family mask decides its modifiers.
+    let lookup = |id| {
+        let t = spells.catalog.get(id)?;
+        deps.borrow_mut().mod_bits |= vctx.spell_mods.read_bits(t);
+        Some(t)
+    };
+    let home = vctx.home_area;
+    let home_area = || {
+        deps.borrow_mut().home = true;
+        home
+    };
+    // `0x6e3130` for this spell: the level the cost's and the cast time's per-level terms read.
+    let pet_level = |pet| d.skill_level(ViewCaster::pet_skill_value(pet));
+    let ctx = benilla_formats::TokenContext {
+        durations: &spells.durations,
+        radii: &spells.radii,
+        ranges: Some(&spells.ranges),
+        skill: &skill,
+        lookup: &lookup,
+        mods: Some(vctx.spell_mods),
+        unmodified_points: false,
+        home_area: &home_area,
+        global: vctx.get,
+        printf: &crate::ui_script::token_printf,
+    };
+    // The aura tooltip `0x52f880` expands the aura text with the points' modifiers off (`52f940`).
+    let aura_ctx = benilla_formats::TokenContext {
+        unmodified_points: true,
+        ..ctx
+    };
+    // The cost cell (`0x52e8ad`): the resolved `power_cost`, named by power type (keys at
+    // `0x85416c`) and Health for a type outside 0..=4 (`0x52e8fc`: Bloodrage's -2), never a
+    // percentage. Rage shows wire ÷ 10, a per-second column adds `_PER_TIME`, and no cost at all
+    // leaves the cell empty. A pet with no unit costs -1 (`0x6e3233`), which shows as none.
+    let resolved_cost = match caster {
+        ViewCaster::Player => vctx
+            .store
+            .map_or(d.mana_cost, |s| usable::power_cost(d, s, vctx.spell_mods)),
+        ViewCaster::Pet(pet) => pet.map_or(0, |p| {
+            usable::power_cost_at(d, p, pet_level(Some(p)), vctx.spell_mods)
+        }),
+    };
+    // The player's cost reads its level, and the field a percentage scales by; the pet's reads the
+    // pet's own, which are pet inputs.
+    if matches!(caster, ViewCaster::Player) {
+        let mut deps = deps.borrow_mut();
+        if usable::cost_reads_level(d) {
+            deps.unit(UnitField::Level);
+        }
+        match usable::cost_basis(d) {
+            CostBasis::None | CostBasis::Fixed(_) => {}
+            CostBasis::BaseMana => deps.unit(UnitField::BaseMana),
+            CostBasis::BaseHealth => deps.unit(UnitField::BaseHealth),
+        }
+    }
+    let cost = {
+        // The shared per-type divisor (`0x6e7130`), never a local `power_type == 1` test.
+        let div = benilla_protocol::messages::power_display_scale(d.power_type);
+        let unit = match d.power_type {
+            0 => "Mana",
+            1 => "Rage",
+            2 => "Focus",
+            3 => "Energy",
+            4 => "Happiness",
+            _ => "Health",
+        };
+        if resolved_cost == 0 && d.mana_per_second == 0 {
+            None
+        } else if d.mana_per_second > 0 {
+            Some(format!(
+                "{} {unit}, plus {} per sec",
+                resolved_cost / div,
+                d.mana_per_second / div
+            ))
+        } else {
+            Some(format!("{} {unit}", resolved_cost / div))
+        }
+    };
+    // The range cell: two attribute gates, `GetMinMaxRange` (`0x6e3480`, `0x52e9c2`), then
+    // `max <= 0`. There is no melee wording: the melee row (flags bit 0, row 2 only) resolves to
+    // `max(reach + casterReach + 1.3333334, 5.0)` and prints like any other, usually "5 yd range".
+    let range = (!d.tooltip_omits_range_line())
+        .then(|| {
+            let row = spells.ranges.get(d.range_index);
+            // The pet views read the pet's reaches, which are among the pet's own inputs.
+            if matches!(caster, ViewCaster::Player)
+                && benilla_formats::min_max_range_reads_units(d, row)
+            {
+                deps.borrow_mut().range_units = true;
+            }
+            // The call passes a null target (`0x52e9c2`): the auto-attack target is the melee arm's
+            // own lookup, and the ranged arm, with no target, pads nothing.
+            let targets = benilla_formats::RangeTargets {
+                target: None,
+                attack_target: vctx.attack_target,
+            };
+            let (min, max) = vctx
+                .spell_mods
+                .min_max_range(d, row, vctx.range_caster, targets)?;
+            if max <= 0.0 {
+                return None;
+            }
+            // `SPELL_RANGE`'s hole is a string: the number is composed first, `"%d"` or `"%d-%d"`
+            // (`0x854fb4`, Charge's 8-25), each a `fistp` conversion that rounds to nearest.
+            let yd = |v: f32| f64::from(v).round_ties_even() as i64;
+            let yards = if min > 0.0 {
+                format!("{}-{}", yd(min), yd(max))
+            } else {
+                format!("{}", yd(max))
+            };
+            keyed(vctx.get, "SPELL_RANGE", &[Arg::S(&yards)])
+        })
+        .flatten();
+    // The cast line: gate `0x52eb15` also omits it for a TRADE_SKILL or ATTACK `Effect[0]`; then
+    // the ladder `0x52eb45`-`0x52ec90` over `GetCastTime(1)` (`52eb4d`), unclamped, where a
+    // negative time is "Instant cast" (`0x52ebce`) and a zero one is "Instant cast" only for a
+    // mana spell with a cost (`0x52ec4b`).
+    let cast_time = if d.tooltip_omits_cast_line() {
+        None
+    } else {
+        // `GetCastTime` takes the selector too (`52eb45`), and its level term is `0x6e3130`'s. The
+        // player's is its level only where the row scales by one.
+        if matches!(caster, ViewCaster::Player)
+            && spells
+                .cast_times
+                .get(d.casting_time_index)
+                .is_some_and(|row| row.reads_caster_level())
+        {
+            deps.borrow_mut().unit(UnitField::Level);
+        }
+        let level = match caster {
+            ViewCaster::Player => vctx.store.and_then(|s| s.0.unit_level()).unwrap_or(0),
+            ViewCaster::Pet(pet) => pet_level(pet),
+        };
+        let base = spells.cast_time_unclamped_ms(d, level, vctx.spell_mods);
+        // `%.3g` templates: the seconds go over as a real.
+        if base > 0 {
+            let (key, v) = if base >= 60_000 {
+                ("SPELL_CAST_TIME_MIN", f64::from(base) / 60_000.0)
+            } else {
+                ("SPELL_CAST_TIME_SEC", f64::from(base) / 1000.0)
+            };
+            keyed(vctx.get, key, &[Arg::F(v)])
+        } else {
+            let key = if base < 0 {
+                "SPELL_CAST_TIME_INSTANT"
+            } else if d.on_next_swing() {
+                "SPELL_ON_NEXT_SWING"
+            } else if d.tooltip_on_next_ranged() {
+                "SPELL_ON_NEXT_RANGED"
+            } else if d.tooltip_channeled() {
+                "SPELL_CAST_CHANNELED"
+            } else if d.power_type == 0 && resolved_cost > 0 {
+                "SPELL_CAST_TIME_INSTANT"
+            } else {
+                "SPELL_CAST_TIME_INSTANT_NO_MANA"
+            };
+            keyed(vctx.get, key, &[])
+        }
+    };
+    // The larger recovery column (`0x52eada`): op 11 follows the ranged-speed category pad. The
+    // ranged attack time is the player's, a pet view's too.
+    let ranged_ms = if d.ranged_speed_cooldown() {
+        deps.borrow_mut().unit(UnitField::RangedTime);
+        vctx.store
+            .and_then(|s| s.0.unit_ranged_attack_time())
+            .unwrap_or(0)
+    } else {
+        0
+    };
+    let (own_recovery, category_recovery) = vctx.spell_mods.spell_cooldowns(d, ranged_ms);
+    let recovery_ms = own_recovery.max(category_recovery);
+    let cooldown = (recovery_ms > 0)
+        .then(|| {
+            let secs = f64::from(recovery_ms) / 1000.0;
+            let (key, v) = if secs >= 60.0 {
+                ("SPELL_RECAST_TIME_MIN", secs / 60.0)
+            } else {
+                ("SPELL_RECAST_TIME_SEC", secs)
+            };
+            keyed(vctx.get, key, &[Arg::F(v)])
+        })
+        .flatten();
+    // The required-form line (`0x52f10a`-`0x52f2ae`). With `AttributesEx2` bit 19 set the mask is
+    // permissive (Inner Fire in Shadowform), and the line is skipped (`0x52f115`).
+    let requires_form = (d.stances != 0 && !d.form_mask_is_permissive())
+        .then(|| {
+            let names: Vec<&str> = (0..32u32)
+                .filter(|b| d.stances & (1 << b) != 0)
+                .filter_map(|b| spells.forms.get(&(b + 1)).map(|f| f.name.as_str()))
+                .filter(|n| !n.is_empty())
+                .collect();
+            (!names.is_empty())
+                .then(|| {
+                    keyed(
+                        vctx.get,
+                        "SPELL_REQUIRED_FORM",
+                        &[Arg::S(&names.join(", "))],
+                    )
+                })
+                .flatten()
+        })
+        .flatten();
+    // No caster unit passes the form test (`0x52f1e8`). A spell with no stance mask fails it for
+    // every form, so only a stance mask reads the player's form; a pet's is its own input.
+    if matches!(caster, ViewCaster::Player) && d.stances != 0 {
+        deps.borrow_mut().form = true;
+    }
+    let form_met = matches!(caster, ViewCaster::Pet(None))
+        || (form != 0 && d.stances & (1u32 << (u32::from(form) - 1)) != 0);
+    // The required-item line (`0x52eea7`-`0x52f10a`): a mask is named whole by
+    // `ItemSubClassMask.dbc` before its subclasses are joined; an empty mask or class < 0 skips it.
+    let requires_item = (d.targets & TARGET_ITEM == 0 && d.equipped_item_class >= 0)
+        .then(|| {
+            vctx.sub_classes?
+                .requirement_name(d.equipped_item_class as u32, d.equipped_item_subclass_mask)
+        })
+        .flatten()
+        .and_then(|name| keyed(vctx.get, "SPELL_EQUIPPED_ITEM", &[Arg::S(&name)]));
+    let chance = chance_line(d, vctx.store, &mut deps.borrow_mut());
+    // The unit selector passes the item test outright (`0x52f07f`).
+    if matches!(caster, ViewCaster::Player) {
+        deps.borrow_mut().item_search(usable::worn_slots_read(d));
+    }
+    let item_met = matches!(caster, ViewCaster::Pet(_))
+        || vctx.store.is_none_or(|s| {
+            usable::equipped_item_fits(d, s, vctx.objects, vctx.items, vctx.commands)
+        });
+    // Reagents (`SPELL_REAGENTS`, `0x854e54`), red when short; one whose template has not
+    // streamed is absent until `feed_spell_tooltips` re-pushes on its arrival.
+    let reagents = {
+        let mut parts: Vec<String> = Vec::new();
+        for (entry, count) in d.reagents.iter().copied().filter(|&(e, _)| e != 0) {
+            deps.borrow_mut().reagent(entry);
+            let Some(name) = vctx
+                .items
+                .template(entry, 0, vctx.commands)
+                .map(|t| t.name.clone())
+            else {
+                continue;
+            };
+            let text = if count > 1 {
+                format!("{name} ({count})")
+            } else {
+                name
+            };
+            let short = vctx.store.is_some_and(|s| {
+                count_of(&s.0, vctx.objects, entry, InventoryScope::CARRIED) < count
+            });
+            parts.push(if short {
+                format!("|cffff2020{text}|r")
+            } else {
+                text
+            });
+        }
+        (!parts.is_empty()).then(|| format!("Reagents: {}", parts.join(", ")))
+    };
+    let view = benilla_ui::script::SpellTooltipView {
+        name: d.name.clone(),
+        rank: d.rank.clone(),
+        // The aura variant's right column (`0x52f8e5`), gated on `SpellDispelType.dbc` `[+0x28]`.
+        dispel_type: spells.catalog.dispel_name(d).map(str::to_string),
+        cost,
+        range,
+        cast_time,
+        cooldown,
+        requires_item,
+        item_met,
+        requires_form,
+        form_met,
+        chance,
+        reagents,
+        description: d
+            .description
+            .as_deref()
+            .map(|t| benilla_formats::substitute(t, d, &ctx))
+            .unwrap_or_default(),
+        aura_description: d
+            .aura_description
+            .as_deref()
+            .map(|t| benilla_formats::substitute(t, d, &aura_ctx))
+            .unwrap_or_default(),
+    };
+    Some((view, deps.into_inner()))
+}
+
+/// `Targets` bit `0x10` (name inferred): set, the required-item line is skipped (`0x52eeaa`).
+const TARGET_ITEM: u32 = 0x10;
+
+/// The four `Effect[0]` values that select a chance-to-X line (jump table `0x52f7c4`).
+const EFFECT_DODGE: u32 = 20;
+const EFFECT_PARRY: u32 = 22;
+const EFFECT_BLOCK: u32 = 23;
+const EFFECT_ATTACK: u32 = 78;
+
+/// The chance-to-X line (`0x52f5b1`-`0x52f697`): ATTACK skips the passive gate that dodge, parry
+/// and block need. The wire's values are already percents.
+fn chance_line(
+    d: &benilla_formats::SpellDisplay,
+    store: Option<&ObjectStore>,
+    deps: &mut Deps,
+) -> Option<String> {
+    let (which, label) = match d.effects[0] {
+        EFFECT_ATTACK => (Chance::Crit, "crit"),
+        EFFECT_DODGE if d.passive => (Chance::Dodge, "dodge"),
+        EFFECT_PARRY if d.passive => (Chance::Parry, "parry"),
+        EFFECT_BLOCK if d.passive => (Chance::Block, "block"),
+        _ => return None,
+    };
+    deps.chance(which);
+    // The enUS text of the reference's `CHANCE_TO_*` keys (`%.2f%% chance to crit`).
+    Some(format!("{:.2}% chance to {label}", which.read(&store?.0)?))
+}
+
+/// What the feed knows of the views it has pushed: what each was built from and what the inputs
+/// were when the last frame looked. The reference rebuilds on every hover and keeps no such
+/// snapshot.
+#[derive(Default)]
+pub(super) struct SpellFeedMemory {
+    /// The views built against the player, by spell, with what each read.
+    pub(super) pushed: HashMap<u32, Deps>,
+    /// The spells whose view built against the pet is in the VM's pet store, and what each read
+    /// of the player's side (the pet's own inputs are [`Self::pet`]).
+    pub(super) pet_pushed: HashMap<u32, Deps>,
+    /// What the pet views read off the pet unit.
+    pet: Option<PetInputs>,
+    /// The player-side inputs the pushed views were checked against last frame.
+    pub(super) seen: Option<Seen>,
+    /// The talent modifier tables as last frame's check found them.
+    pub(super) mods: Option<crate::spell::SpellModifiers>,
+    /// Per reagent on show, the state its views were built against.
+    pub(super) reagents: Reagents,
+}
+
+impl SpellFeedMemory {
+    /// Queue for a rebuild the pushed views, the player's and the pet's, that read what
+    /// `changes` moved.
+    pub(super) fn requeue(
+        &mut self,
+        changes: &Changes,
+        wanted: &mut Vec<u32>,
+        wanted_pet: &mut Vec<u32>,
+    ) {
+        if changes.is_empty() {
+            return;
+        }
+        for (pushed, queue) in [
+            (&mut self.pushed, wanted),
+            (&mut self.pet_pushed, wanted_pet),
+        ] {
+            pushed.retain(|&id, deps| {
+                let hit = deps.hits(changes);
+                if hit {
+                    queue.push(id);
+                }
+                !hit
+            });
+        }
+    }
+}
+
+/// What a reagent's line renders for `entry`: the carried count and whether its name has streamed.
+pub(super) fn reagent_state(
+    entry: u32,
+    store: Option<&ObjectStore>,
+    objects: &Objects,
+    items: &mut Items,
+    commands: &NetCommands,
+) -> (u32, bool) {
+    let named = items.template(entry, 0, commands).is_some();
+    let owned = store.map_or(0, |s| {
+        count_of(&s.0, objects, entry, InventoryScope::CARRIED)
+    });
+    (owned, named)
+}
+
+/// The pet unit's fields a pet view reads (`0x52e610` with the unit selector set): its level, the
+/// cost bases `0x612c50` reads, its form, and its and its melee target's reach and motion.
+#[derive(Clone, Copy, PartialEq, Default)]
+pub(super) struct PetInputs {
+    guid: Option<u64>,
+    level: u32,
+    base_mana: u32,
+    base_health: u32,
+    form: u8,
+    range_units: RangeSeen,
+}
+
+impl PetInputs {
+    pub(super) fn of(
+        guid: Option<u64>,
+        pet: Option<&benilla_protocol::ObjectFields>,
+        range_units: RangeSeen,
+    ) -> Self {
+        let Some(p) = pet else {
+            return Self {
+                guid,
+                ..Self::default()
+            };
+        };
+        Self {
+            guid,
+            level: p.unit_level().unwrap_or(0),
+            base_mana: p.unit_base_mana().unwrap_or(0),
+            base_health: p.unit_base_health().unwrap_or(0),
+            form: p.unit_shapeshift_form(),
+            range_units,
+        }
+    }
+}
+
+/// The hoverable spell sources [`feed_spell_tooltips`] reads, one parameter under Bevy's 16.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(super) struct SpellTooltipSources<'w> {
+    spells: Option<Res<'w, Spells>>,
+    trainer_subjects: Option<Res<'w, TrainerTooltipSubjects>>,
+    talents: Option<Res<'w, crate::ui_talent::Talents>>,
+}
+
+/// Push a view for every spell the UI can hover (the book, the class's talent ranks, the open
+/// trainer's services, and what the VM holds: the pet's spells, the quest rewards, the craft's
+/// subjects, every unit's auras and the tracking spell) before it is hovered, as the reference
+/// reads them all locally; an ask for any other id too.
+pub(super) fn feed_spell_tooltips(
+    script: Option<NonSendMut<UiScript>>,
+    actions: Option<Res<PlayerActions>>,
+    spell_sources: SpellTooltipSources,
+    self_q: Query<&ObjectStore, With<SelfPlayer>>,
+    // The caster's and the pet's reach and motion and each one's auto-attack target, which the
+    // melee range cell reads.
+    range_units: crate::spell::RangeUnits,
+    objects: Objects,
+    home_bind: Option<Res<crate::net::HomeBind>>,
+    area_names: Option<Res<crate::ui_quest_log::QuestHeaderNamesRes>>,
+    mut items: ResMut<Items>,
+    // One tuple param, under Bevy's 16-param ceiling.
+    lookups: (
+        Option<Res<crate::ui_items::ItemSubClasses>>,
+        Res<crate::spell::SpellModifiers>,
+        Option<Res<crate::ui_spellbook::SkillLines>>,
+    ),
+    commands: Res<NetCommands>,
+    mut memory: Local<crate::ui_script::VmMemo<SpellFeedMemory>>,
+) {
+    let (sub_classes, spell_mods, skill_lines) = &lookups;
+    let SpellTooltipSources {
+        spells,
+        trainer_subjects,
+        talents,
+    } = spell_sources;
+    let Some(mut script) = script else {
+        return;
+    };
+    let memory = memory.get(&script);
+    let Some(spells) = spells.as_deref() else {
+        return;
+    };
+    let mut wanted: Vec<u32> = script.take_spell_tooltip_asks();
+    // What the VM holds for a hover: pet spells, quest rewards, craft subjects, auras, tracking.
+    wanted.extend(
+        script
+            .spell_tooltip_subjects()
+            .into_iter()
+            .filter(|s| !memory.pushed.contains_key(s)),
+    );
+    if let Some(actions) = actions.as_deref() {
+        wanted.extend(
+            actions
+                .spells
+                .iter()
+                .copied()
+                .filter(|s| !memory.pushed.contains_key(s)),
+        );
+    }
+    // The pet views: the pet's bar and book, and what their setters asked for.
+    let mut wanted_pet: Vec<u32> = script.take_pet_spell_tooltip_asks();
+    wanted_pet.extend(
+        script
+            .pet_spell_tooltip_subjects()
+            .into_iter()
+            .filter(|s| !memory.pet_pushed.contains_key(s)),
+    );
+    // The open trainer's services, which the detail icon's `SetTrainerService` renders, a
+    // pet-learn service's against the pet.
+    if let Some(trainer) = trainer_subjects.as_deref() {
+        wanted.extend(
+            trainer
+                .player
+                .iter()
+                .copied()
+                .filter(|s| !memory.pushed.contains_key(s)),
+        );
+        wanted_pet.extend(
+            trainer
+                .pet
+                .iter()
+                .copied()
+                .filter(|s| !memory.pet_pushed.contains_key(s)),
+        );
+    }
+    // Every rank of the class's talents: a talent tooltip reads the current and the next rank.
+    if let (Some(talents), Ok(store)) = (talents.as_deref(), self_q.single()) {
+        let race = store.0.unit_race().unwrap_or(0);
+        let class = store.0.unit_class().unwrap_or(0);
+        for tab in talents.catalog.tabs_for_class(race, class) {
+            for t in talents.catalog.talents_in_tab(tab.id) {
+                wanted.extend(
+                    t.ranks
+                        .iter()
+                        .copied()
+                        .filter(|s| *s != 0 && !memory.pushed.contains_key(s)),
+                );
+            }
+        }
+    }
+    let home_area: Option<String> = home_bind
+        .as_deref()
+        .and_then(|b| b.0)
+        .and_then(|id| area_names.as_deref()?.0.resolve(id as i32))
+        .map(str::to_string);
+    let self_store = self_q.single().ok();
+    let caster_unit = range_units.caster();
+    let attack_target = range_units.caster_attack_target();
+    // What moved since the last frame, which each pushed view is checked against: the bind
+    // point (Astral Recall's `$z`), the form, the skills, what the equipped-item search learns of
+    // each equipment slot and the disarm flag, the level, cost bases and ranged attack time, the
+    // block, dodge, parry and crit percentages, and the two units the melee range cell reads.
+    let seen = Seen::of(
+        self_store,
+        home_area.as_deref(),
+        RangeSeen::of(&caster_unit, attack_target.as_ref()),
+        &objects,
+        &items,
+    );
+    let mut changes = memory
+        .seen
+        .as_ref()
+        .map(|prev| seen.changes_since(prev))
+        .unwrap_or_default();
+    memory.seen = Some(seen);
+    // The talent tables: the cost, cast, cooldown and range cells and the description's tokens
+    // resolve through them.
+    if let Some(prev) = memory.mods.as_ref().filter(|_| spell_mods.is_changed()) {
+        changes = changes.with_mods(spell_mods.diff(prev));
+    }
+    if memory.mods.is_none() || spell_mods.is_changed() {
+        memory.mods = Some((**spell_mods).clone());
+    }
+    // And the reagents on show: their counts and whether their names have streamed.
+    let reagent_state: Reagents = memory
+        .reagents
+        .keys()
+        .map(|&entry| {
+            (
+                entry,
+                reagent_state(entry, self_store, &objects, &mut items, &commands),
+            )
+        })
+        .collect();
+    changes = changes.with_reagents(&memory.reagents, &reagent_state);
+    memory.reagents = reagent_state;
+    memory.requeue(&changes, &mut wanted, &mut wanted_pet);
+    // The pet's inputs: a new pet, or its level, bases, form, reach or motion moving, rebuilds the
+    // pet views alone.
+    let pet_guid = self_store.and_then(|s| s.0.unit_pet_guid());
+    let pet = pet_guid.and_then(|g| objects.object(g));
+    let pet_entity = pet_guid.and_then(|g| objects.entity(g));
+    let pet_unit =
+        pet_entity
+            .and_then(|e| range_units.unit(e))
+            .unwrap_or(benilla_formats::RangeUnit::still(
+                crate::spell::DEFAULT_REACH,
+            ));
+    let pet_target = pet_entity.and_then(|e| range_units.attack_target(e));
+    let pet_inputs = PetInputs::of(pet_guid, pet, RangeSeen::of(&pet_unit, pet_target.as_ref()));
+    if memory.pet != Some(pet_inputs) {
+        memory.pet = Some(pet_inputs);
+        wanted_pet.extend(memory.pet_pushed.drain().map(|(id, _)| id));
+    }
+    // The sources overlap (a self-buff is in the book and on the player): build each id once.
+    wanted.sort_unstable();
+    wanted.dedup();
+    wanted_pet.sort_unstable();
+    wanted_pet.dedup();
+    // Build, then push: the build's borrow of the VM's strings ends before the store is written.
+    let (built, built_pet) = {
+        let get = |key: &str| benilla_ui::strings::global(script.lua(), key);
+        let mut vctx = ViewCtx {
+            home_area: home_area.as_deref(),
+            form: self_store.map_or(0, |s| s.0.unit_shapeshift_form()),
+            store: self_store,
+            caster: ViewCaster::Player,
+            range_caster: caster_unit,
+            attack_target,
+            objects: &objects,
+            items: &mut items,
+            commands: &commands,
+            sub_classes: sub_classes.as_deref().map(|c| &c.0),
+            skill_lines: skill_lines.as_deref().map(|s| &s.catalog),
+            spell_mods,
+            get: &get,
+        };
+        let built = build_views(wanted, spells, &mut vctx, memory, false);
+        // The pet views read the pet's form and reach where the player's read the player's.
+        vctx.caster = ViewCaster::Pet(pet);
+        vctx.form = pet.map_or(0, |p| p.unit_shapeshift_form());
+        vctx.range_caster = pet_unit;
+        vctx.attack_target = pet_target;
+        let built_pet = build_views(wanted_pet, spells, &mut vctx, memory, true);
+        (built, built_pet)
+    };
+    for (id, view) in built {
+        script.set_spell_tooltip(id, view);
+    }
+    for (id, view) in built_pet {
+        script.set_pet_spell_tooltip(id, view);
+    }
+}
+
+/// Build the views of `ids` against `vctx`'s caster, recording each with what it read in the
+/// pushed set `pet` names and watching its reagents, seeded with the state the view was built
+/// against.
+fn build_views(
+    ids: Vec<u32>,
+    spells: &Spells,
+    vctx: &mut ViewCtx,
+    memory: &mut SpellFeedMemory,
+    pet: bool,
+) -> Vec<(u32, benilla_ui::script::SpellTooltipView)> {
+    let mut built = Vec::new();
+    for id in ids {
+        let Some((view, deps)) = build_view(id, spells, vctx) else {
+            continue;
+        };
+        for &entry in deps.reagents() {
+            if let std::collections::btree_map::Entry::Vacant(slot) = memory.reagents.entry(entry) {
+                slot.insert(reagent_state(
+                    entry,
+                    vctx.store,
+                    vctx.objects,
+                    vctx.items,
+                    vctx.commands,
+                ));
+            }
+        }
+        built.push((id, view));
+        let pushed = if pet {
+            &mut memory.pet_pushed
+        } else {
+            &mut memory.pushed
+        };
+        pushed.insert(id, deps);
+    }
+    built
+}
diff --git a/crates/benilla-app/src/ui_tooltip/tests.rs b/crates/benilla-app/src/ui_tooltip/tests.rs
index ada69261..d33e6829 100644
--- a/crates/benilla-app/src/ui_tooltip/tests.rs
+++ b/crates/benilla-app/src/ui_tooltip/tests.rs
@@ -1,44 +1,48 @@
 //! The spell-view cell tests, against the real 5875 data, and the feed's place in the schedule.
 
+use super::spell_feed::{build_view, feed_spell_tooltips, ViewCaster, ViewCtx};
 use super::*;
-use crate::ui_action::Spells;
+use crate::items::Items;
+use crate::net::{NetCommands, ObjectStore, Objects, SelfPlayer};
+use crate::ui_action::{PlayerActions, Spells};
+
+/// The view alone, for the cell tests; the feed keeps what it read beside it.
+fn spell_tooltip_view(
+    spell_id: u32,
+    spells: &Spells,
+    vctx: &mut ViewCtx,
+) -> Option<benilla_ui::script::SpellTooltipView> {
+    build_view(spell_id, spells, vctx).map(|(view, _)| view)
+}
 
 /// A view context with no player state, the DBC-only half of the builder.
-struct TestCtx {
-    items: Items,
-    commands: NetCommands,
+pub(super) struct TestCtx {
+    pub(super) items: Items,
+    pub(super) commands: NetCommands,
     _rx: crossbeam_channel::Receiver<crate::net::ClientCommand>,
-    /// The builder's two lookups, over the shipped `GlobalStrings.lua`: a stub would pass on
-    /// wording the client never shows.
+    /// The builder's lookup over the shipped `GlobalStrings.lua`: a stub would pass on wording
+    /// the client never shows.
     get: Box<Getter>,
-    text: Box<Filler>,
-    /// Empty: every cell here is graded as an untalented character.
-    spell_mods: crate::spell::SpellModifiers,
+    /// Empty by default; modifier tests populate it explicitly.
+    pub(super) spell_mods: crate::spell::SpellModifiers,
+    /// Absent by default: every spell's skill level reads 0.
+    pub(super) skill_lines: Option<benilla_formats::SkillLineCatalog>,
 }
 
 type Getter = dyn Fn(&str) -> Option<String>;
-type Filler = dyn Fn(&str, &[i64]) -> Option<String>;
 
 impl TestCtx {
-    fn new() -> Self {
+    pub(super) fn new() -> Self {
         let (tx, rx) = crossbeam_channel::unbounded();
-        let vm = std::rc::Rc::new(benilla_ui::script::UiScript::new().expect("VM"));
+        let vm = benilla_ui::script::UiScript::new().expect("VM");
         crate::ui_script::load_ui_for_test(&vm, "Interface\\FrameXML\\GlobalStrings.lua");
-        let (for_get, for_text) = (vm.clone(), vm);
         Self {
             items: Items::default(),
             commands: NetCommands(tx),
             _rx: rx,
-            get: Box::new(move |key| benilla_ui::strings::global(for_get.lua(), key)),
+            get: Box::new(move |key| benilla_ui::strings::global(vm.lua(), key)),
             spell_mods: crate::spell::SpellModifiers::default(),
-            text: Box::new(move |key, args: &[i64]| {
-                let template = benilla_ui::strings::global(for_text.lua(), key)?;
-                let args: Vec<_> = args
-                    .iter()
-                    .map(|n| benilla_ui::strings::Arg::D(*n))
-                    .collect();
-                Some(benilla_ui::strings::fill(&template, &args))
-            }),
+            skill_lines: None,
         }
     }
 
@@ -58,11 +62,11 @@ impl TestCtx {
         target_reach: f32,
     ) -> ViewCtx<'a, 'w, 's> {
         let mut ctx = self.ctx_for(objects, 0, None, store);
-        ctx.attack_target_reach = Some(target_reach);
+        ctx.attack_target = Some(benilla_formats::RangeUnit::still(target_reach));
         ctx
     }
 
-    fn ctx_for<'a, 'w, 's>(
+    pub(super) fn ctx_for<'a, 'w, 's>(
         &'a mut self,
         objects: &'a Objects<'w, 's>,
         form: u8,
@@ -73,17 +77,147 @@ impl TestCtx {
             home_area: None,
             form,
             store,
-            combat_reach: store.map_or(1.5, |s| s.0.unit_combat_reach()),
-            attack_target_reach: None,
+            caster: ViewCaster::Player,
+            range_caster: benilla_formats::RangeUnit::still(
+                store.map_or(1.5, |s| s.0.unit_combat_reach()),
+            ),
+            attack_target: None,
             objects,
             items: &mut self.items,
             commands: &self.commands,
             sub_classes,
+            skill_lines: self.skill_lines.as_ref(),
             spell_mods: &self.spell_mods,
             get: self.get.as_ref(),
-            text: self.text.as_ref(),
         }
     }
+
+    /// The pet view's context: the player `store`, and `pet` the unit the selector reads.
+    fn pet_ctx<'a, 'w, 's>(
+        &'a mut self,
+        objects: &'a Objects<'w, 's>,
+        store: Option<&'a ObjectStore>,
+        pet: Option<&'a benilla_protocol::ObjectFields>,
+    ) -> ViewCtx<'a, 'w, 's> {
+        let mut ctx = self.ctx_for(objects, 0, None, store);
+        ctx.caster = ViewCaster::Pet(pet);
+        ctx
+    }
+}
+
+/// The 5875 spell data the view builder reads; `None` skips where the install is absent.
+pub(super) fn real_spells() -> Option<Spells> {
+    let data = benilla_formats::wow_data_or_skip!(None);
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    Some(Spells {
+        catalog: benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc"),
+        forms: benilla_formats::load_shapeshift_forms(&mut chain).expect("forms"),
+        ranges: benilla_formats::load_spell_ranges(&mut chain).expect("ranges"),
+        cast_times: benilla_formats::load_spell_cast_times(&mut chain).expect("cast times"),
+        durations: benilla_formats::load_spell_durations(&mut chain).expect("durations"),
+        radii: benilla_formats::load_spell_radii(&mut chain).expect("radii"),
+    })
+}
+
+/// A unit's fields: level (34) and base mana (162).
+fn unit(level: u32, base_mana: u32) -> benilla_protocol::ObjectFields {
+    benilla_protocol::ObjectFields::from_pairs(&[(22u16, 100u32), (34, level), (162, base_mana)])
+}
+
+/// The pet bar's views scale by the pet's level (`0x6e3130` with the selector: the charm or
+/// summon's `[vtbl+0xa8]`, `0x60cd80`, level × 5 capped at `maxLevel × 5`): Voidwalker Sacrifice
+/// rank 1 (7812: 305, 2.3 a level from 16, cap 22) reads 318 at 22 and at 30, and the player's own
+/// view of it, in no line of the player's, reads the floor.
+#[test]
+fn a_pet_view_scales_sacrifice_by_the_pets_level() {
+    let Some(spells) = real_spells() else { return };
+    let mut t = TestCtx::new();
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let player = ObjectStore(unit(60, 1373));
+    let absorb = |v: benilla_ui::script::SpellTooltipView, n: u32| {
+        assert!(
+            v.description.contains(&format!("absorb {n} damage")),
+            "{n}: {}",
+            v.description
+        );
+    };
+    for (level, n) in [(16, 305), (22, 318), (30, 318)] {
+        let pet = unit(level, 0);
+        let v = spell_tooltip_view(
+            7812,
+            &spells,
+            &mut t.pet_ctx(&objects, Some(&player), Some(&pet)),
+        )
+        .expect("Sacrifice view");
+        absorb(v, n);
+    }
+    let v = spell_tooltip_view(
+        7812,
+        &spells,
+        &mut t.ctx_for(&objects, 0, None, Some(&player)),
+    )
+    .expect("Sacrifice view");
+    absorb(v, 305);
+    // No pet unit reads level 0 (`0x6e31a4`), which floors at the rank's base.
+    let v = spell_tooltip_view(7812, &spells, &mut t.pet_ctx(&objects, Some(&player), None))
+        .expect("Sacrifice view");
+    absorb(v, 305);
+}
+
+/// Imp Blood Pact rank 1 (6307: 0.1 a level from 4, cap 14) reads 3 on a level-14 imp's bar.
+#[test]
+fn a_pet_view_scales_blood_pact_by_the_pets_level() {
+    let Some(spells) = real_spells() else { return };
+    let mut t = TestCtx::new();
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let player = ObjectStore(unit(60, 1373));
+    let pet = unit(14, 0);
+    let v = spell_tooltip_view(
+        6307,
+        &spells,
+        &mut t.pet_ctx(&objects, Some(&player), Some(&pet)),
+    )
+    .expect("Blood Pact view");
+    assert!(v.description.contains("Stamina by 3."), "{}", v.description);
+    let v = spell_tooltip_view(
+        6307,
+        &spells,
+        &mut t.ctx_for(&objects, 0, None, Some(&player)),
+    )
+    .expect("Blood Pact view");
+    assert!(v.description.contains("Stamina by 2."), "{}", v.description);
+}
+
+/// Seduction (6358, 24% of base mana) on the pet bar costs 24% of the succubus's
+/// `UNIT_FIELD_BASE_MANA`, as `0x6e31b0` calls `0x612c50` on the pet (`6e327d`): 449 of 1874, not
+/// 329 of the warlock's 1373. No pet unit is `GetPowerCost`'s -1 (`0x6e3233`), no cost cell.
+#[test]
+fn a_pet_view_costs_seduction_from_the_pets_base_mana() {
+    let Some(spells) = real_spells() else { return };
+    let mut t = TestCtx::new();
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let player = ObjectStore(unit(60, 1373));
+    let pet = unit(60, 1874);
+    let v = spell_tooltip_view(
+        6358,
+        &spells,
+        &mut t.pet_ctx(&objects, Some(&player), Some(&pet)),
+    )
+    .expect("Seduction view");
+    assert_eq!(v.cost.as_deref(), Some("449 Mana"));
+    let v = spell_tooltip_view(
+        6358,
+        &spells,
+        &mut t.ctx_for(&objects, 0, None, Some(&player)),
+    )
+    .expect("Seduction view");
+    assert_eq!(v.cost.as_deref(), Some("329 Mana"), "the player's own view");
+    let v = spell_tooltip_view(6358, &spells, &mut t.pet_ctx(&objects, Some(&player), None))
+        .expect("Seduction view");
+    assert_eq!(v.cost, None);
 }
 
 /// An object index with nothing streamed: no worn item, and every reagent count 0.
@@ -97,6 +231,51 @@ fn empty_player() -> ObjectStore {
     )]))
 }
 
+/// Battle Shout rank 1's `$s1` (14 + 1d1, 0.5 a level from 1, cap 11) scales by the player's
+/// skill in its line over 5 (`0x6e3130`), not the character level: a class line sits at level
+/// × 5 (vmangos `Player::UpdateSkillsForLevel`), so levels 1, 11 and 60 read 15, 20 and 20.
+#[test]
+fn battle_shout_description_scales_by_the_skill_level() {
+    use benilla_protocol::messages::FIELD_PLAYER_SKILL_INFO_1_1;
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    let spells = Spells {
+        catalog: benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc"),
+        forms: benilla_formats::load_shapeshift_forms(&mut chain).expect("forms"),
+        ranges: benilla_formats::load_spell_ranges(&mut chain).expect("ranges"),
+        cast_times: benilla_formats::load_spell_cast_times(&mut chain).expect("cast times"),
+        durations: benilla_formats::load_spell_durations(&mut chain).expect("durations"),
+        radii: benilla_formats::load_spell_radii(&mut chain).expect("radii"),
+    };
+    let skill_lines = benilla_formats::load_skill_line_catalog(&mut chain).expect("skill lines");
+    let line = skill_lines
+        .spell_to_line(6673)
+        .expect("Battle Shout's line");
+    let mut t = TestCtx::new();
+    t.skill_lines = Some(skill_lines);
+    let mut objs = no_objects();
+    let objects = objs.get();
+    // (character level, skill value, attack power); the last is a level 60 at skill 5.
+    for (level, skill, ap) in [(1, 5, 15), (11, 55, 20), (60, 300, 20), (60, 5, 15)] {
+        let store = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
+            (34, level),
+            (FIELD_PLAYER_SKILL_INFO_1_1, line),
+            (FIELD_PLAYER_SKILL_INFO_1_1 + 1, skill | 300 << 16),
+        ]));
+        let view = spell_tooltip_view(
+            6673,
+            &spells,
+            &mut t.ctx_for(&objects, 0, None, Some(&store)),
+        )
+        .expect("Battle Shout view");
+        assert!(
+            view.description.contains(&format!("by {ap}.")),
+            "level {level}, skill {skill}: {}",
+            view.description
+        );
+    }
+}
+
 /// Fireball rank 1 (133) end to end: description 138, cast index 18 (1500 ms), duration 30.
 #[test]
 fn fireball_view_on_real_data() {
@@ -177,6 +356,104 @@ fn fireball_view_on_real_data() {
     }
 }
 
+/// Improved Devotion Aura's +25% on op 8 reaches the spell's description, 55 armor to 68; the
+/// aura text expands as the aura tooltip `0x52f880` expands it, with the points' modifiers off
+/// (`52f940`), so it keeps 55.
+#[test]
+fn improved_devotion_aura_updates_the_description_but_not_the_aura_text() {
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    let mut spells = Spells::empty_for_tests();
+    spells.catalog = benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc");
+    spells.ranges = benilla_formats::load_spell_ranges(&mut chain).expect("SpellRange.dbc");
+    spells.durations =
+        benilla_formats::load_spell_durations(&mut chain).expect("SpellDuration.dbc");
+    spells.radii = benilla_formats::load_spell_radii(&mut chain).expect("SpellRadius.dbc");
+    let devotion = spells.catalog.get(465).expect("Devotion Aura rank 1");
+    let bit = devotion.spell_family_flags.trailing_zeros() as u8;
+    let mut t = TestCtx::new();
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let base = spell_tooltip_view(465, &spells, &mut t.ctx(&objects, 0, None)).unwrap();
+    assert!(base.description.contains("55 additional armor"));
+    assert!(base.aura_description.contains("55"));
+
+    t.spell_mods.set_class_family(devotion.spell_family);
+    t.spell_mods.set(false, bit, 8, 25);
+    let improved = spell_tooltip_view(465, &spells, &mut t.ctx(&objects, 0, None)).unwrap();
+    assert!(improved.description.contains("68 additional armor"));
+    assert_eq!(improved.aura_description, base.aura_description);
+}
+
+/// Fire Blast rank 1's 8 s is its category recovery, its own recovery 0; Improved Fire Blast's
+/// flat op 11 shortens the category value, and the cell shows the larger column (`0x52eada`).
+#[test]
+fn improved_fire_blast_shortens_the_cooldown_cell() {
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+    let mut spells = Spells::empty_for_tests();
+    spells.catalog = benilla_formats::load_spell_catalog(&mut chain).expect("Spell.dbc");
+    let fire_blast = spells.catalog.get(2136).expect("Fire Blast rank 1");
+    assert_eq!(
+        (fire_blast.recovery_ms, fire_blast.category_recovery_ms),
+        (0, 8_000)
+    );
+    let bit = fire_blast.spell_family_flags.trailing_zeros() as u8;
+    let mut t = TestCtx::new();
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let base = spell_tooltip_view(2136, &spells, &mut t.ctx(&objects, 0, None)).unwrap();
+    assert_eq!(base.cooldown.as_deref(), Some("8 sec cooldown"));
+
+    t.spell_mods.set_class_family(fire_blast.spell_family);
+    t.spell_mods
+        .set(true, bit, crate::spell::OP_COOLDOWN, -1_500);
+    let improved = spell_tooltip_view(2136, &spells, &mut t.ctx(&objects, 0, None)).unwrap();
+    assert_eq!(improved.cooldown.as_deref(), Some("6.5 sec cooldown"));
+}
+
+/// The cast cell reads `GetCastTime(1)` (`52eb4b`): op 10 applies and nothing clamps, so a
+/// modifier past the whole cast time reaches the negative "Instant cast" arm (`0x52ebce`), where
+/// a clamped zero would take the no-mana "Instant" (`0x52ec4b`).
+#[test]
+fn the_cast_cell_takes_op_10_unclamped() {
+    // The cells fill the install's `GlobalStrings.lua`.
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut spells = Spells::empty_for_tests();
+    let rage_cast = benilla_formats::SpellDisplay {
+        name: "Rage Cast".into(),
+        casting_time_index: 5,
+        power_type: 1,
+        spell_family: 4,
+        spell_family_flags: 1,
+        ..Default::default()
+    };
+    spells.catalog =
+        benilla_formats::SpellCatalog::from_displays([(900_001, rage_cast)].into_iter().collect());
+    spells.cast_times = benilla_formats::SpellCastTimeCatalog::from_rows([(
+        5,
+        benilla_formats::SpellCastTime {
+            base_ms: 1500,
+            per_level_ms: 0,
+            minimum_ms: 1500,
+        },
+    )]);
+    let mut objs = no_objects();
+    let objects = objs.get();
+    let cell = |flat: i32| {
+        let mut t = TestCtx::new();
+        t.spell_mods.set_class_family(4);
+        t.spell_mods.set(true, 0, crate::spell::OP_CAST_TIME, flat);
+        spell_tooltip_view(900_001, &spells, &mut t.ctx(&objects, 0, None))
+            .unwrap()
+            .cast_time
+    };
+    assert_eq!(cell(0).as_deref(), Some("1.5 sec cast"));
+    assert_eq!(cell(-500).as_deref(), Some("1 sec cast"));
+    assert_eq!(cell(-1500).as_deref(), Some("Instant"), "exactly zero");
+    assert_eq!(cell(-2000).as_deref(), Some("Instant cast"), "below zero");
+}
+
 #[test]
 fn cost_and_cast_cells_on_real_data() {
     let data = benilla_formats::wow_data_or_skip!();
@@ -192,24 +469,24 @@ fn cost_and_cast_cells_on_real_data() {
     let mut t = TestCtx::new();
     let mut objs = no_objects();
     let objects = objs.get();
-    // A level-60 store: max health 4000, base mana 1000 (fields: health 22, max health 28,
-    // level 34, base mana 162).
+    // A level-60 store: max health 4000, base mana 1000 and base health 1689 (fields: health 22,
+    // max health 28, level 34, base mana 162, base health 163).
     let store = ObjectStore(benilla_protocol::ObjectFields::from_pairs(&[
         (22u16, 3500u32),
         (28, 4000),
         (34, 60),
         (162, 1000),
+        (163, 1689),
     ]));
 
-    // Bloodrage (2687): 20% of max health, a flat number through the health fallback; bare
-    // "Instant" on a non-mana type.
+    // Bloodrage (2687): 20% of base health; bare "Instant" on a non-mana type.
     let v = spell_tooltip_view(
         2687,
         &spells,
         &mut t.ctx_for(&objects, 0, None, Some(&store)),
     )
     .expect("Bloodrage view");
-    assert_eq!(v.cost.as_deref(), Some("800 Health"), "20% of 4000");
+    assert_eq!(v.cost.as_deref(), Some("337 Health"), "20% of 1689");
     assert_eq!(v.cast_time.as_deref(), Some("Instant"));
 
     // Life Tap (1454): the 5875 data has no cost columns for any rank, so the cell is empty.
@@ -337,6 +614,33 @@ fn range_cell_on_real_data() {
     .expect("Sinister Strike view");
     assert_eq!(v.range.as_deref(), Some("7 yd range"));
 
+    // Both units running: the moving bonus goes on the floor, 5.0 + 2.6667 = 7.667, rounded to 8.
+    let running = benilla_formats::UnitMotion {
+        flags: 1,
+        speed: 7.0,
+        walk_speed: 2.5,
+    };
+    let runner = benilla_formats::RangeUnit {
+        motion: running,
+        ..benilla_formats::RangeUnit::still(1.5)
+    };
+    let mut ctx = t.ctx_for(&objects, 0, None, Some(&store));
+    ctx.range_caster = runner;
+    ctx.attack_target = Some(runner);
+    let v = spell_tooltip_view(1752, &spells, &mut ctx).expect("Sinister Strike view");
+    assert_eq!(v.range.as_deref(), Some("8 yd range"));
+    // One of them standing, or no auto-attack target to read: the floor.
+    ctx.attack_target = Some(benilla_formats::RangeUnit::still(1.5));
+    let v = spell_tooltip_view(1752, &spells, &mut ctx).expect("Sinister Strike view");
+    assert_eq!(v.range.as_deref(), Some("5 yd range"));
+    ctx.attack_target = None;
+    let v = spell_tooltip_view(1752, &spells, &mut ctx).expect("Sinister Strike view");
+    assert_eq!(v.range.as_deref(), Some("5 yd range"));
+    // The ranged arm passes no target, so the bonus never reaches an authored row: Fireball's 35.
+    ctx.attack_target = Some(runner);
+    let v = spell_tooltip_view(133, &spells, &mut ctx).expect("Fireball view");
+    assert_eq!(v.range.as_deref(), Some("35 yd range"));
+
     // An authored row: Fireball's 0-35.
     let v = spell_tooltip_view(
         133,
@@ -346,6 +650,23 @@ fn range_cell_on_real_data() {
     .expect("Fireball view");
     assert_eq!(v.range.as_deref(), Some("35 yd range"));
 
+    // The tooltip passes a null target (`0x52e9c2`), so the auto-attack target pads no ranged row:
+    // Fireball still reads its 35 while you swing at a 1.5-reach unit, and Charge its 8-25.
+    let v = spell_tooltip_view(
+        133,
+        &spells,
+        &mut t.ctx_engaged(&objects, Some(&store), 1.5),
+    )
+    .expect("Fireball view");
+    assert_eq!(v.range.as_deref(), Some("35 yd range"));
+    let v = spell_tooltip_view(
+        100,
+        &spells,
+        &mut t.ctx_engaged(&objects, Some(&store), 1.5),
+    )
+    .expect("Charge view");
+    assert_eq!(v.range.as_deref(), Some("8-25 yd range"));
+
     // An authored pair, `"%d-%d"`: Charge's 8-25, which the reach does not change.
     let v = spell_tooltip_view(100, &spells, &mut t.ctx_for(&objects, 0, None, Some(&big)))
         .expect("Charge view");
@@ -517,3 +838,458 @@ fn the_spell_feed_runs_after_the_trainer_feed() {
         feed_spell_tooltips
     ));
 }
+
+const ME: u64 = 0x77;
+const WOLF: u64 = 0xF130_0000_4500_0001;
+const BOAR: u64 = 0xF130_0000_4600_0002;
+
+/// The world-hover driver over a bare VM holding `"player"` (us) and `"target"` (the wolf), each
+/// with its guid, as the unit feed pushes them; returns the app, the wolf and the boar.
+fn mouseover_app() -> (App, Entity, Entity) {
+    use benilla_protocol::ObjectFields;
+
+    let mut app = App::new();
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    app.insert_resource(NetCommands(tx))
+        .insert_resource(crate::ui_script::UiScaleCvar(1.0))
+        .init_resource::<Hovered>()
+        .init_resource::<HoveredObject>()
+        .init_resource::<NameCache>()
+        .init_resource::<crate::net::Reputations>()
+        .init_resource::<crate::net::GuidIndex>()
+        .init_resource::<crate::go_templates::GameObjectTemplates>()
+        .init_resource::<Items>()
+        .init_resource::<PlayerActions>()
+        .add_systems(Update, drive_mouseover_tooltip);
+    app.world_mut()
+        .spawn((SelfPlayer, ObjectStore(ObjectFields::default())));
+    let mut unit = || {
+        app.world_mut()
+            .spawn(ObjectStore(ObjectFields::default()))
+            .id()
+    };
+    let (wolf, boar) = (unit(), unit());
+
+    let mut script = UiScript::new().unwrap();
+    for (token, guid) in [("player", ME), ("target", WOLF)] {
+        script.set_unit(
+            token,
+            Some(UnitState {
+                exists: true,
+                has_object: true,
+                guid,
+                ..Default::default()
+            }),
+        );
+    }
+    app.insert_non_send_resource(script);
+    (app, wolf, boar)
+}
+
+/// Set this frame's pick and run the driver.
+fn hover(app: &mut App, pick: Hovered, object: HoveredObject) {
+    *app.world_mut().resource_mut::<Hovered>() = pick;
+    *app.world_mut().resource_mut::<HoveredObject>() = object;
+    app.update();
+}
+
+fn hover_unit(app: &mut App, entity: Entity, guid: u64) {
+    let pick = Hovered {
+        target: Some(entity),
+        guid: Some(guid),
+        distance: 10.0,
+        ..Default::default()
+    };
+    hover(app, pick, HoveredObject::default());
+}
+
+fn eval(app: &mut App, lua: &str) -> Option<i64> {
+    app.world_mut()
+        .non_send_resource_mut::<UiScript>()
+        .eval::<Option<i64>>(lua)
+        .unwrap()
+}
+
+/// The hover pushes `"mouseover"` with the hovered guid, the pair `0x492890` writes to
+/// `0xb4e2c8`/`0xb4e2cc`: `UnitIsUnit` (`0x516070`) resolves both tokens through `0x515970` and
+/// compares guids, so hovering the target answers 1 and hovering anyone else nil.
+#[test]
+fn the_mouseover_token_carries_the_hovered_guid() {
+    let (mut app, wolf, boar) = mouseover_app();
+    let is_unit = |app: &mut App, other: &str| {
+        eval(
+            app,
+            &format!(r#"return UnitIsUnit("mouseover", "{other}")"#),
+        )
+    };
+
+    hover_unit(&mut app, wolf, WOLF);
+    assert_eq!(is_unit(&mut app, "target"), Some(1), "hovering the target");
+    assert_eq!(is_unit(&mut app, "player"), None, "the target is not us");
+
+    hover_unit(&mut app, boar, BOAR);
+    assert_eq!(
+        is_unit(&mut app, "target"),
+        None,
+        "another unit is not the target"
+    );
+    assert_eq!(
+        is_unit(&mut app, "mouseover"),
+        Some(1),
+        "the token is itself"
+    );
+}
+
+/// `UnitCreatureType("mouseover")` goes through the resolver `0x605570` for a hovered player as
+/// for a creature: a druid in Cat Form is a Beast, and out of form a Humanoid by race. The plate
+/// itself is built for a player from its race and class, whatever type the snapshot carries.
+#[test]
+fn the_mouseover_token_names_the_hovered_units_creature_type() {
+    use benilla_protocol::ObjectFields;
+
+    /// `UNIT_FIELD_BYTES_0` and `UNIT_FIELD_BYTES_1`, absolute descriptor indices.
+    const BYTES_0: u16 = 36;
+    const BYTES_1: u16 = 138;
+    const NIGHT_ELF: u32 = 4;
+    const CAT_FORM: u32 = 1;
+    const DRUID: u64 = 0x99;
+
+    let (mut app, _, _) = mouseover_app();
+    let mut spells = crate::ui_action::Spells::empty_for_tests();
+    spells.forms.insert(
+        CAT_FORM,
+        benilla_formats::ShapeshiftForm {
+            creature_type: 1,
+            ..Default::default()
+        },
+    );
+    app.insert_resource(spells);
+    let druid = app
+        .world_mut()
+        .spawn(ObjectStore(ObjectFields::from_pairs(&[
+            (BYTES_0, NIGHT_ELF),
+            (BYTES_1, CAT_FORM << 16),
+        ])))
+        .id();
+    let creature_type = |app: &mut App| {
+        app.world_mut()
+            .non_send_resource_mut::<UiScript>()
+            .eval::<Option<String>>(r#"return UnitCreatureType("mouseover")"#)
+            .unwrap()
+    };
+
+    hover_unit(&mut app, druid, DRUID);
+    assert_eq!(creature_type(&mut app).as_deref(), Some("Beast"));
+    app.world_mut()
+        .entity_mut(druid)
+        .get_mut::<ObjectStore>()
+        .unwrap()
+        .0
+        .merge(ObjectFields::from_pairs(&[(BYTES_1, 0)]));
+    hover_unit(&mut app, druid, DRUID);
+    assert_eq!(creature_type(&mut app).as_deref(), Some("Humanoid"));
+}
+
+/// Once no unit wins the pick, `"mouseover"` names nobody: the publisher `0x492890` zeroes the pair
+/// (`0x4928e8`, `0x4928f2`) and writes a null, corpse or GameObject guid, which the resolver
+/// rejects as a unit (`0x515bca mov ecx,8`, `0x515bd9 je`). Empty ground, a corpse and a nearer
+/// GameObject each clear it, in the frame the hover leaves the unit.
+#[test]
+fn the_mouseover_token_clears_when_no_unit_is_hovered() {
+    use benilla_protocol::ObjectFields;
+
+    let (mut app, wolf, _) = mouseover_app();
+    let corpse = app
+        .world_mut()
+        .spawn(ObjectStore(ObjectFields::default()))
+        .id();
+    let chest = app
+        .world_mut()
+        .spawn(ObjectStore(ObjectFields::default()))
+        .id();
+    let named = |app: &mut App| {
+        (
+            eval(app, r#"return UnitExists("mouseover")"#),
+            eval(app, r#"return UnitIsUnit("mouseover", "target")"#),
+        )
+    };
+    let empty = Hovered::default();
+    let on_corpse = Hovered {
+        corpse: Some(corpse),
+        corpse_guid: Some(0xF100_0000_0000_0003),
+        distance: 10.0,
+        ..Default::default()
+    };
+    let under_chest = Hovered {
+        target: Some(wolf),
+        guid: Some(WOLF),
+        distance: 10.0,
+        ..Default::default()
+    };
+    let chest_nearer = HoveredObject {
+        target: Some(chest),
+        guid: Some(0xF110_0000_0000_0004),
+        distance: 5.0,
+    };
+    for (leave, object, what) in [
+        (empty, HoveredObject::default(), "empty ground"),
+        (on_corpse, HoveredObject::default(), "a corpse"),
+        (under_chest, chest_nearer, "a nearer GameObject"),
+    ] {
+        hover_unit(&mut app, wolf, WOLF);
+        assert_eq!(
+            named(&mut app),
+            (Some(1), Some(1)),
+            "over the wolf, before {what}"
+        );
+        hover(&mut app, leave, object);
+        assert_eq!(named(&mut app), (None, None), "after {what}");
+    }
+}
+
+/// A quest panel that opens this frame is hoverable in its tick.
+#[test]
+fn the_spell_feed_runs_after_the_quest_feed() {
+    let mut app = crate::game_plugins::schedule_tests::headless_client();
+    assert!(crate::test_support::runs_before(
+        &mut app,
+        crate::ui_quest::feed_quest,
+        feed_spell_tooltips
+    ));
+}
+
+/// The pet bar, Beast Training and target-of-target hovers are whole on the first hover.
+#[test]
+fn the_feed_pushes_the_spells_the_vm_holds_before_a_hover() {
+    use benilla_ui::script::{
+        AuraState, CraftRecipe, CraftState, CraftTooltip, PetActionView, TradeSkillDifficulty,
+    };
+    let spell = |name: &str, description: &str| benilla_formats::SpellDisplay {
+        name: name.into(),
+        description: Some(description.into()),
+        ..Default::default()
+    };
+    let catalog = std::collections::HashMap::from([
+        (3110, spell("Firebolt", "Deals Fire damage.")),
+        (17253, spell("Bite", "Bite the enemy.")),
+        (589, spell("Shadow Word: Pain", "Shadow damage over time.")),
+    ]);
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    let mut app = App::new();
+    app.insert_resource(Spells {
+        catalog: benilla_formats::SpellCatalog::from_displays(catalog),
+        ..Spells::empty_for_tests()
+    })
+    .insert_resource(NetCommands(tx))
+    .init_resource::<Items>()
+    .init_resource::<crate::net::GuidIndex>()
+    .init_resource::<crate::spell::SpellModifiers>()
+    .add_systems(Update, feed_spell_tooltips);
+
+    let mut script = UiScript::new().unwrap();
+    script.set_pet_actions(
+        true,
+        true,
+        true,
+        vec![PetActionView {
+            name: Some("Firebolt".into()),
+            spell_id: Some(3110),
+            ..Default::default()
+        }],
+    );
+    script.set_craft(Some(CraftState {
+        name: "Beast Training".into(),
+        rank: 0,
+        max_rank: 0,
+        craft_type: 1,
+        recipes: vec![CraftRecipe {
+            spell_id: 24599,
+            tooltip: CraftTooltip::Spell(17253),
+            name: "Bite".into(),
+            sub_name: String::new(),
+            difficulty: TradeSkillDifficulty::Optimal,
+            num_available: 1,
+            icon: None,
+            description: None,
+            needs_item_target: false,
+            reagents: vec![],
+            tools: vec![],
+            spell_level: 0,
+        }],
+    }));
+    // We target a mob that targets party1, whose list the VM holds by guid.
+    const ME: u64 = 0x10;
+    const MOB: u64 = 0xF130_0000_0000_0001;
+    const TOT: u64 = 0x21;
+    script.set_unit_guids(&benilla_ui::script::UnitGuids {
+        player: ME,
+        target: MOB,
+        party: [TOT, 0, 0, 0],
+        held: std::collections::HashMap::from([(ME, MOB), (MOB, TOT), (TOT, 0)]),
+        ..Default::default()
+    });
+    script.set_unit_auras(
+        TOT,
+        Some(vec![AuraState {
+            spell_id: 589,
+            name: Some("Shadow Word: Pain".into()),
+            ..Default::default()
+        }]),
+    );
+    app.insert_non_send_resource(script);
+    app.update();
+
+    let script = app.world().non_send_resource::<UiScript>();
+    script
+        .run(
+            r#"
+            local a = CreateFrame("Button", "B"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+            CreateFrame("GameTooltip", "TT")
+            local function lines()
+                local t = {}
+                for i = 1, TT:NumLines() do t[i] = getglobal("TTTextLeft" .. i):GetText() end
+                return table.concat(t, " | ")
+            end
+            TT:SetOwner(B, "ANCHOR_RIGHT"); TT:SetPetAction(1); PET = lines()
+            TT:SetOwner(B, "ANCHOR_RIGHT"); TT:SetCraftSpell(1); CRAFT = lines()
+            TT:SetOwner(B, "ANCHOR_RIGHT"); TT:SetUnitDebuff("targettarget", 1); TOT = lines()
+            "#,
+        )
+        .unwrap();
+    assert_eq!(
+        script.eval::<String>("return PET").unwrap(),
+        "Firebolt | Deals Fire damage."
+    );
+    assert_eq!(
+        script.eval::<String>("return CRAFT").unwrap(),
+        "Bite | Bite the enemy."
+    );
+    assert_eq!(
+        script.eval::<String>("return TOT").unwrap(),
+        "Shadow Word: Pain | Shadow damage over time."
+    );
+}
+
+/// The feed builds the pet's bar and book against the pet (the charm, else the summon), keeps the
+/// player's book on the player, and rebuilds only the pet views when the pet's level moves.
+#[test]
+fn the_feed_builds_the_pet_views_against_the_pet_and_rebuilds_them_on_its_level() {
+    use benilla_protocol::ObjectFields;
+    use benilla_ui::script::{PetActionView, PetBookState, SpellBookState, SpellSlotView};
+    const ME: u64 = 0x10;
+    const IMP: u64 = 0xF140_0000_0000_0077;
+    // `$s1` is 10 plus 1 a level, uncapped: the player, in no line of its own, reads 10.
+    let pact = benilla_formats::SpellDisplay {
+        id: 6307,
+        name: "Blood Pact".into(),
+        description: Some("Stamina by $s1.".into()),
+        effect_base_points: [9, 0, 0],
+        effect_base_dice: [1, 0, 0],
+        effect_die_sides: [1, 0, 0],
+        effect_real_points_per_level: [1.0, 0.0, 0.0],
+        ..Default::default()
+    };
+    let (tx, _rx) = crossbeam_channel::unbounded();
+    let mut app = App::new();
+    app.insert_resource(Spells {
+        catalog: benilla_formats::SpellCatalog::from_displays([(6307, pact)].into()),
+        ..Spells::empty_for_tests()
+    })
+    .insert_resource(NetCommands(tx))
+    .init_resource::<Items>()
+    .init_resource::<crate::net::GuidIndex>()
+    .init_resource::<crate::spell::SpellModifiers>()
+    .add_systems(Update, feed_spell_tooltips);
+    // The player summons the imp (`UNIT_FIELD_SUMMON`, 8-9).
+    let me = app
+        .world_mut()
+        .spawn((
+            SelfPlayer,
+            ObjectStore(ObjectFields::from_pairs(&[
+                (8, IMP as u32),
+                (9, (IMP >> 32) as u32),
+                (34, 60),
+            ])),
+        ))
+        .id();
+    let imp = app
+        .world_mut()
+        .spawn(ObjectStore(ObjectFields::from_pairs(&[(34, 14)])))
+        .id();
+    let mut index = app.world_mut().resource_mut::<crate::net::GuidIndex>();
+    index.0.insert(ME, me);
+    index.0.insert(IMP, imp);
+
+    let mut script = UiScript::new().unwrap();
+    script.set_pet_actions(
+        true,
+        true,
+        true,
+        vec![PetActionView {
+            name: Some("Blood Pact".into()),
+            spell_id: Some(6307),
+            ..Default::default()
+        }],
+    );
+    let slot = SpellSlotView {
+        spell_id: 6307,
+        name: "Blood Pact".into(),
+        ..Default::default()
+    };
+    script.set_pet_book(PetBookState {
+        token: Some("DEMON".into()),
+        slots: vec![slot.clone()],
+    });
+    script.set_spellbook(SpellBookState {
+        tabs: Vec::new(),
+        slots: vec![slot],
+    });
+    script
+        .run(
+            r#"
+            local a = CreateFrame("Button", "B"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+            CreateFrame("GameTooltip", "TT")
+            function DESC(set) TT:SetOwner(B, "ANCHOR_RIGHT"); set(); return TTTextLeft2:GetText() end
+            "#,
+        )
+        .unwrap();
+    app.insert_non_send_resource(script);
+    // The feed runs over the pet bar and book; the player's book's view is an ask on its hover.
+    app.update();
+    let descs = |app: &mut App| {
+        let mut script = app.world_mut().non_send_resource_mut::<UiScript>();
+        let d = script
+            .eval::<(String, String, Option<String>)>(
+                r#"return DESC(function() TT:SetPetAction(1) end),
+                    DESC(function() TT:SetSpell(1, "pet") end),
+                    DESC(function() TT:SetSpell(1, "spell") end)"#,
+            )
+            .unwrap();
+        assert!(script.take_errors().is_empty());
+        d
+    };
+    let _ = descs(&mut app);
+    app.update();
+    assert_eq!(
+        descs(&mut app),
+        (
+            "Stamina by 24.".to_string(),
+            "Stamina by 24.".to_string(),
+            Some("Stamina by 10.".to_string())
+        ),
+        "a level-14 imp's bar and book, and the player's own book"
+    );
+    // The imp dings: its views rebuild; the player's does not move.
+    app.world_mut()
+        .entity_mut(imp)
+        .insert(ObjectStore(ObjectFields::from_pairs(&[(34, 15)])));
+    app.update();
+    assert_eq!(
+        descs(&mut app),
+        (
+            "Stamina by 25.".to_string(),
+            "Stamina by 25.".to_string(),
+            Some("Stamina by 10.".to_string())
+        )
+    );
+}
diff --git a/crates/benilla-app/src/ui_trade/mod.rs b/crates/benilla-app/src/ui_trade/mod.rs
index 3950e8e0..5b6df981 100644
--- a/crates/benilla-app/src/ui_trade/mod.rs
+++ b/crates/benilla-app/src/ui_trade/mod.rs
@@ -525,7 +525,6 @@ fn snapshot(
     trade: &TradeSession,
     items: &Items,
     icons: Option<&ItemDisplays>,
-    names: &NameCache,
     commands: &NetCommands,
 ) -> Option<TradeState> {
     if !trade.open {
@@ -534,9 +533,6 @@ fn snapshot(
     Some(TradeState {
         player: resolve_side(&trade.our, items, icons, commands),
         target: resolve_side(&trade.their, items, icons, commands),
-        partner_name: trade
-            .partner
-            .and_then(|g| names.resolve(g, commands).map(str::to_string)),
     })
 }
 
@@ -568,7 +564,7 @@ fn feed_trade(
     let last_player_gold = last_player_gold.get(&script);
     let last_their_gold = last_their_gold.get(&script);
 
-    let fresh = snapshot(&trade, &items, icons.as_deref(), &names, &commands);
+    let fresh = snapshot(&trade, &items, icons.as_deref(), &commands);
     let opened = !*last_open && trade.is_open();
     let closed = *last_open && !trade.is_open();
     let changed = fresh != *last;
@@ -999,6 +995,7 @@ mod tests {
             .insert_resource(Selection {
                 target: None,
                 guid: Some(0x7), // high 16 bits 0: a player guid
+                ..Default::default()
             });
         app.insert_non_send_resource(UiScript::new().unwrap());
 
diff --git a/crates/benilla-app/src/ui_trainer/mod.rs b/crates/benilla-app/src/ui_trainer/mod.rs
index 9dba70c7..011fc598 100644
--- a/crates/benilla-app/src/ui_trainer/mod.rs
+++ b/crates/benilla-app/src/ui_trainer/mod.rs
@@ -99,9 +99,13 @@ impl TrainerOpen {
 #[derive(Resource, Default)]
 pub(crate) struct TrainerErrors(pub Vec<u32>);
 
-/// The spells the open trainer's services show as tooltips, which the spell-tooltip feed pushes.
-#[derive(Resource, Default)]
-pub(crate) struct TrainerTooltipSubjects(pub(crate) Vec<u32>);
+/// The spells the open trainer's services show as tooltips, which the spell-tooltip feed pushes:
+/// a pet-learn service's view is built against the pet (the builder's unit selector, `0x533a7f`).
+#[derive(Resource, Default, PartialEq)]
+pub(crate) struct TrainerTooltipSubjects {
+    pub(crate) player: Vec<u32>,
+    pub(crate) pet: Vec<u32>,
+}
 
 /// The trainer feed, which the spell-tooltip feed runs after.
 #[derive(SystemSet, Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -430,18 +434,30 @@ pub(crate) fn feed_trainer(
         },
     );
     // A spell subject's view must be in the store before the detail icon is hovered.
-    let mut fresh_tooltip_subjects: Vec<u32> = fresh
-        .iter()
-        .flat_map(|state| &state.services)
-        .filter_map(|service| match &service.tooltip {
-            TrainerTooltip::Spell { spell_id, .. } => Some(*spell_id),
-            TrainerTooltip::Item(_) => None,
-        })
-        .collect();
-    fresh_tooltip_subjects.sort_unstable();
-    fresh_tooltip_subjects.dedup();
-    if tooltip_subjects.0 != fresh_tooltip_subjects {
-        tooltip_subjects.0 = fresh_tooltip_subjects;
+    let mut fresh_tooltip_subjects = TrainerTooltipSubjects::default();
+    for service in fresh.iter().flat_map(|state| &state.services) {
+        if let TrainerTooltip::Spell {
+            spell_id,
+            alt_caster,
+        } = service.tooltip
+        {
+            let subjects = if alt_caster {
+                &mut fresh_tooltip_subjects.pet
+            } else {
+                &mut fresh_tooltip_subjects.player
+            };
+            subjects.push(spell_id);
+        }
+    }
+    for subjects in [
+        &mut fresh_tooltip_subjects.player,
+        &mut fresh_tooltip_subjects.pet,
+    ] {
+        subjects.sort_unstable();
+        subjects.dedup();
+    }
+    if *tooltip_subjects != fresh_tooltip_subjects {
+        *tooltip_subjects = fresh_tooltip_subjects;
     }
     // A name-only change re-fires `TRAINER_UPDATE`, so the title's `UnitName("npc")` repaints.
     // The name rides as arg1, which the 1.12 trainer events do not carry.
diff --git a/crates/benilla-app/src/ui_unit.rs b/crates/benilla-app/src/ui_unit.rs
index fa844a85..4fdaf27c 100644
--- a/crates/benilla-app/src/ui_unit.rs
+++ b/crates/benilla-app/src/ui_unit.rs
@@ -8,8 +8,12 @@ use bevy::prelude::*;
 
 use benilla_formats::ChrClasses;
 use benilla_protocol::messages::ObjectType;
-use benilla_ui::script::{power_token, ScriptValue, UiScript, UnitState, WornDisplay};
+use benilla_ui::script::{
+    parse_unit_token, power_token, ScriptValue, UiScript, UnitBase, UnitState, UnitTokenParse,
+    WornDisplay,
+};
 
+use crate::creature_type::CreatureTypeSources;
 use crate::names::NameCache;
 use crate::net::{
     FieldChanged, FieldEdges, Guid, NetCommands, ObjectStore, Reputations, SelfPlayer,
@@ -17,6 +21,8 @@ use crate::net::{
 use crate::target::{ring_reaction, Factions, Selection};
 use crate::ui_script::{gate, UiInput};
 
+mod held;
+
 /// The unit-feed pass, gated so none of its login one-shots or per-VM memos runs before the in-game
 /// interface exists; the demo override orders itself after it.
 #[derive(SystemSet, Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -146,7 +152,10 @@ impl Plugin for UiUnitPlugin {
                 // raises for the same port.
                 fire_leaving_world_on_worldport,
                 feed_units,
-                feed_unit_reach,
+                // After the aura feed, whose resolver inputs it measures.
+                feed_unit_reach.after(crate::ui_aura::AuraEvents),
+                // After the same feed, whose guids it covers.
+                held::feed_chain_units.after(crate::ui_aura::AuraEvents),
                 feed_player_control,
                 feed_farsight_focus,
                 melee_unit_combat,
@@ -310,6 +319,21 @@ pub(crate) fn seed_default_language(world: &mut World, script: &mut UiScript) {
     script.set_default_language(langs.0.name(u32::from(row.race), 0).map(str::to_string));
 }
 
+/// Seed a new VM with `Languages.dbc`, the static table `SendChatMessage` resolves its language
+/// name against (`0x49f8a0`); locale column 0, as [`feed_default_language`] reads.
+pub(crate) fn seed_language_table(world: &World, script: &mut UiScript) {
+    let Some(langs) = world.get_resource::<LanguagesRes>() else {
+        return;
+    };
+    script.set_language_table(
+        langs
+            .0
+            .names(0)
+            .map(|(id, name)| (id, name.to_string()))
+            .collect(),
+    );
+}
+
 /// Push `GetDefaultLanguage()`'s string on a change of race; `None` is the reference's zero value.
 /// Locale column 0 (the client's slot is `[0xc0e080]`): only enUS is populated in the 1.12 data.
 fn feed_default_language(
@@ -559,14 +583,15 @@ pub(crate) fn player_token_guid(
 
 /// The one unit-token resolver, the reference's `0x515970`: case-insensitive compares, then the
 /// object manager; a caller wanting a type tests the resolved unit. [`Selection`] is a parameter
-/// because [`crate::target::SelectCommit`] holds it as `ResMut`. `partypetN`, `raidpetN` and `npc`
-/// are recognised but unresolved here, a quiet nil.
+/// because [`crate::target::SelectCommit`] holds it as `ResMut`. `npc` is recognised but
+/// unresolved here, a quiet nil.
 #[derive(bevy::ecs::system::SystemParam)]
 pub(crate) struct UnitTokens<'w, 's> {
     /// `Option`, like the two below: a UI-only harness lacks their plugins; a bare `Res` panics.
     index: Option<Res<'w, crate::net::GuidIndex>>,
     pet: Option<Res<'w, crate::ui_pet::PetBar>>,
     hovered: Option<Res<'w, crate::target::Hovered>>,
+    hovered_go: Option<Res<'w, crate::target::HoveredObject>>,
     group: Res<'w, crate::ui_party::GroupState>,
     pub(crate) stores: Query<'w, 's, &'static ObjectStore>,
     me: Query<'w, 's, (Entity, &'static Guid), With<SelfPlayer>>,
@@ -582,53 +607,84 @@ impl UnitTokens<'_, '_> {
         Some((*self.index.as_ref()?.0.get(&guid)?, guid))
     }
 
-    /// Resolve `token` case-insensitively (`_strnicmp`); the first matching prefix wins.
+    /// Resolve `token` as `0x515970` does: its base, then a hop for each `target` after it. The
+    /// text is read by [`parse_unit_token`], which the VM's resolver shares, so both take the same
+    /// tokens; a token that names nobody, or a base or hop the object manager does not hold, is
+    /// `None`.
     pub(crate) fn resolve(&self, token: &str, selection: &Selection) -> Option<(Entity, u64)> {
-        let token = token.to_ascii_lowercase();
-        match token.as_str() {
-            "player" => self.me(),
-            "target" => selection.target.zip(selection.guid),
-            // One hop off the target's `UNIT_FIELD_TARGET`, the read `/assist` runs.
-            "targettarget" => selection
-                .target
-                .and_then(|e| self.stores.get(e).ok())
-                .and_then(|s| s.0.unit_target())
-                .filter(|g| *g != 0)
-                .and_then(|g| self.held(g)),
-            // The same `Hovered` pick `ui_tooltip` pushes `"mouseover"` from.
-            "mouseover" => {
-                let h = self.hovered.as_ref()?;
-                h.target.zip(h.guid)
-            }
+        let UnitTokenParse::Unit { base, hops } = parse_unit_token(token) else {
+            return None;
+        };
+        let mut unit = self.base(base, selection)?;
+        for _ in 0..hops {
+            unit = self.target_of(unit.0)?;
+        }
+        Some(unit)
+    }
+
+    /// The held unit a token's base names, before any `target` hop.
+    fn base(&self, base: UnitBase, selection: &Selection) -> Option<(Entity, u64)> {
+        match base {
+            UnitBase::Player => self.me(),
+            UnitBase::Target => selection.target.zip(selection.guid),
+            // The same pick `ui_tooltip` pushes `"mouseover"` from.
+            UnitBase::Mouseover => self
+                .hovered
+                .as_ref()?
+                .mouseover(&self.hovered_go.as_deref().copied().unwrap_or_default()),
             // Off the pet bar's cached guid, as the `"pet"` snapshot reads it.
-            "pet" => {
+            UnitBase::Pet => {
                 let guid = self.pet.as_ref()?.spells.pet_guid;
                 (guid != 0).then(|| self.held(guid)).flatten()
             }
-            t if t.starts_with("raid") => t
-                .strip_prefix("raid")
-                .and_then(|n| n.parse::<usize>().ok())
-                .filter(|n| (1..=40).contains(n))
-                .and_then(|n| {
-                    crate::ui_party::raid_row_guid(&self.group, self.me().map(|(_, g)| g), n)
-                })
-                .and_then(|g| self.held(g)),
-            t => t
-                .strip_prefix("party")
-                .and_then(|n| n.parse::<usize>().ok())
-                .filter(|n| (1..=4).contains(n))
-                .and_then(|n| self.group.party_slots().nth(n - 1).map(|m| m.guid))
-                .and_then(|g| self.held(g)),
+            UnitBase::PartyPet(row) => self
+                .party_member(row)
+                .and_then(|member| self.pet_of(member, false)),
+            UnitBase::RaidPet(row) => self
+                .raid_member(row)
+                .and_then(|member| self.pet_of(member, true)),
+            UnitBase::Raid(row) => self.raid_member(row).and_then(|guid| self.held(guid)),
+            UnitBase::Party(row) => self.party_member(row).and_then(|guid| self.held(guid)),
+            // The interaction NPC is unresolved here, a quiet nil.
+            UnitBase::Npc => None,
         }
     }
-}
 
-/// Every token [`UnitTokens`] resolves, `"player"` included (the reference answers d² = 0).
-pub(crate) fn reach_tokens() -> impl Iterator<Item = &'static str> {
-    ["player", "target", "targettarget", "mouseover", "pet"]
-        .into_iter()
-        .chain(crate::ui_party::PARTY_TOKENS)
-        .chain(crate::ui_party::RAID_TOKENS)
+    /// One `target` hop (`0x515a0f`-`0x515a25`): the held unit's `UNIT_FIELD_TARGET`, held in turn.
+    /// The lookup takes the unit typemask, so a hop off any other object, or off a unit with no
+    /// target, is nobody.
+    fn target_of(&self, unit: Entity) -> Option<(Entity, u64)> {
+        let store = self.stores.get(unit).ok().filter(|s| s.is_unit())?;
+        self.held(store.0.unit_target()?)
+    }
+
+    /// The guid in 0-based party slot `row`, the one `partyN` and `partypetN` share.
+    fn party_member(&self, row: u32) -> Option<u64> {
+        let slot = usize::try_from(row).ok()?;
+        self.group.party_slots().nth(slot).map(|m| m.guid)
+    }
+
+    /// The guid on 0-based raid row `row`, the one `raidN` and `GetRaidRosterInfo` share.
+    fn raid_member(&self, row: u32) -> Option<u64> {
+        let index = usize::try_from(row).ok()?.checked_add(1)?;
+        crate::ui_party::raid_row_guid(&self.group, self.me().map(|(_, g)| g), index)
+    }
+
+    /// A group member's pet, held: `CHARM`, else `SUMMON`, off the member's descriptor while it is
+    /// held, else off the roster record's pet guid (`partypetN` `0x4e81d0`, `raidpetN` `0x491960`).
+    /// A pet the object manager does not hold names no unit here, as any unheld unit.
+    fn pet_of(&self, member: u64, raid: bool) -> Option<(Entity, u64)> {
+        let live = self
+            .held(member)
+            .and_then(|(entity, _)| self.stores.get(entity).ok())
+            .map(|store| &store.0);
+        let pet = if raid {
+            self.group.raid_pet_guid(member, live)
+        } else {
+            self.group.party_pet_guid(member, live)
+        };
+        self.held(pet?)
+    }
 }
 
 /// Squared distance as the reference sums it: `f32` widened to `f64`, `(dz² + dx²) + dy²`
@@ -686,14 +742,16 @@ fn feed_farsight_focus(
     }
 }
 
-/// Feed the unit reach map: per token naming a live unit, its squared distance and whether it
+/// Feed the unit reach map: per held unit a token can name, its squared distance and whether it
 /// passes inspect's two other refusals, a non-player and an attackable one (vmangos
 /// `MiscHandler.cpp:945-956`; that the client checks them is inferred, `0x48a1b0` being partly
-/// undecoded). Ungated: distances move every frame, and no event keys off the map.
+/// undecoded). The guids are the resolver's own inputs, which the aura feed pushes each frame
+/// ([`UiScript::held_unit_guids`], so this runs after it): the bases and each unit a `target`
+/// chain reaches, and the VM resolves a verb's token to one of them or to a guid with no entry. Ungated: distances move every
+/// frame, and no event keys off the map.
 fn feed_unit_reach(
     script: Option<NonSendMut<UiScript>>,
     tokens: UnitTokens,
-    selection: Res<Selection>,
     self_q: Query<(&Transform, &ObjectStore), With<SelfPlayer>>,
     transforms: Query<&Transform>,
     factions: Option<Res<Factions>>,
@@ -704,8 +762,8 @@ fn feed_unit_reach(
     };
     let mut reach = HashMap::new();
     if let Some((self_tf, self_store)) = self_q.iter().next() {
-        for token in reach_tokens() {
-            let Some((entity, guid)) = tokens.resolve(token, &selection) else {
+        for guid in script.held_unit_guids() {
+            let Some((entity, _)) = tokens.held(guid) else {
                 continue;
             };
             let Ok(tf) = transforms.get(entity) else {
@@ -720,7 +778,7 @@ fn feed_unit_reach(
                     Some(self_store),
                 );
             reach.insert(
-                token.to_string(),
+                guid,
                 benilla_ui::script::UnitReach {
                     dist_sq: dist_sq(tf.translation, self_tf.translation),
                     inspectable,
@@ -743,6 +801,27 @@ pub(crate) struct UnitStores<'w, 's> {
     edges: MessageReader<'w, 's, FieldChanged>,
 }
 
+/// The client tables [`snapshot`] reads beside a descriptor, as one parameter for the feeders that
+/// sit at Bevy's 16-parameter limit: `ChrClasses.dbc` for the relic slot, and the form table
+/// the creature-type resolver's first stage reads. Each is absent without game data.
+#[derive(bevy::ecs::system::SystemParam)]
+pub(crate) struct SnapshotTables<'w> {
+    classes: Option<Res<'w, crate::chr_classes::ChrClassTable>>,
+    spells: Option<Res<'w, crate::ui_action::Spells>>,
+}
+
+impl SnapshotTables<'_> {
+    /// `ChrClasses.dbc`; without it no class has a relic slot, the reference's bounds leg.
+    pub(crate) fn classes(&self) -> Option<&ChrClasses> {
+        self.classes.as_deref().map(|t| &t.0)
+    }
+
+    /// The creature-type resolver's sources: the name cache and the form table.
+    pub(crate) fn types<'a>(&'a self, names: &'a NameCache) -> CreatureTypeSources<'a> {
+        CreatureTypeSources::of_resources(names, self.spells.as_deref())
+    }
+}
+
 /// `UnitReaction(unit, "player")` (`0x5167e0`): [`ring_reaction`] plus one (`0x51683e`), so
 /// `1..=7`, Hated to Revered, and Exalted reads 7 too (`0x606439`). Stock `UnitReactionColor`
 /// has seven entries (`TargetFrame.lua:6-14`), one per value.
@@ -755,13 +834,16 @@ pub(crate) fn unit_reaction(
     ring_reaction(factions, reputations, Some(store), self_store) + 1
 }
 
-/// Build a unit snapshot from a streamed descriptor, its cached name and its `UnitReaction`
-/// (`1..=7`, or `0` where none is resolved, as for `"player"`); `classes` feeds the relic column.
+/// Build a unit snapshot from a streamed descriptor, its guid, its cached name and its
+/// `UnitReaction` (`1..=7`, or `0` where none is resolved, as for `"player"`); `classes` feeds the
+/// relic column and `types` the creature type, which every unit carries, players included.
 pub(crate) fn snapshot(
     store: &ObjectStore,
+    guid: u64,
     name: Option<String>,
     reaction: u8,
     classes: Option<&ChrClasses>,
+    types: CreatureTypeSources<'_>,
 ) -> UnitState {
     let power_type = store.0.unit_power_type();
     let race = store.0.unit_race().and_then(race_names);
@@ -771,6 +853,11 @@ pub(crate) fn snapshot(
         exists: true,
         // A live descriptor is `0x468460` having succeeded, all of `UnitIsVisible` (`0x516030`).
         has_object: true,
+        // `UnitIsConnected` (`0x517d50`) answers 1 for any unit the object manager holds
+        // (`0x517daf`); only an unheld member reads the roster record's online bit.
+        is_connected: true,
+        // What the token resolver `0x515970` yields, and `UnitIsUnit` (`0x516070`) compares.
+        guid,
         name,
         // The UI getters: `UNIT_DYNFLAG_DEAD` (feign death) zeroes `UnitHealth` (`0x5174d0`) and
         // `UnitMana` (`0x517670`) but not the maxima, so its edge fires the reference's pair
@@ -795,6 +882,9 @@ pub(crate) fn snapshot(
         // The raw dword `PLAYER_FLAGS_CHANGED` fires on; 0 on a creature, as in the reference.
         player_flags: store.0.player_flags(),
         reaction,
+        // The one resolver `0x605570` behind `UnitCreatureType` (`0x51a2bc`) and the tooltip's
+        // type slot (`0x52a2e5`): the form's type, else the template's, else the race's.
+        creature_type_name: creature_type_word(types.of(store)).map(str::to_string),
         race: race.map(|(n, _)| n.to_string()),
         race_file: race.map(|(_, f)| f.to_string()),
         class: class.map(|(n, _)| n.to_string()),
@@ -803,6 +893,11 @@ pub(crate) fn snapshot(
         // byte against `ChrClasses.dbc` field 16; without the player test a class-2 NPC answers 1.
         has_relic_slot: matches!(store.0.object_type(), Some(ObjectType::Player))
             && class_id.is_some_and(|c| classes.is_some_and(|t| t.has_relic_slot(u32::from(c)))),
+        // `GetDamageBonusStat` (`0x48b520`): the class byte against `ChrClasses.dbc` field 2,
+        // read for the active player only (TYPEMASK_PLAYER, `0x48b538`).
+        damage_bonus_stat: matches!(store.0.object_type(), Some(ObjectType::Player))
+            .then(|| class_id.and_then(|c| classes.and_then(|t| t.damage_bonus_stat(u32::from(c)))))
+            .flatten(),
         // Gender byte 0 male, 1 female, on `UnitSex`'s scale: 2 male, 3 female, 0 unknown (nil).
         sex: match store.0.unit_gender() {
             Some(0) => 2,
@@ -838,8 +933,8 @@ pub(crate) fn snapshot(
     }
 }
 
-/// Fill the guid-keyed tooltip fields: `is_player`, or a creature's record fields (the type word
-/// from `CreatureType.dbc`'s enUS names) and its faction-name line.
+/// Fill the guid-keyed tooltip fields: `is_player`, or a creature's record fields and its
+/// faction-name line.
 pub(crate) fn enrich_unit(
     state: &mut UnitState,
     guid: u64,
@@ -861,7 +956,6 @@ pub(crate) fn enrich_unit(
     let rec = names.creature_record(entry);
     if let Some(rec) = rec {
         state.subtitle = rec.subname.clone();
-        state.creature_type_name = creature_type_word(rec.creature_type).map(str::to_string);
         // The client's one rank getter, never `rec.rank`: an enslaved elite reads rank 0.
         state.rank = crate::names::gated_rank(Some(rec), Some(store));
         state.civilian = rec.civilian;
@@ -1085,8 +1179,7 @@ pub(crate) fn fire_transitions(
 
 fn feed_units(
     script: Option<NonSendMut<UiScript>>,
-    // Absent when the data failed to load: no class has a relic slot, the reference's bounds leg.
-    classes: Option<Res<crate::chr_classes::ChrClassTable>>,
+    tables: SnapshotTables,
 
     self_q: Query<(&ObjectStore, &Guid), With<SelfPlayer>>,
     selection: Res<Selection>,
@@ -1117,7 +1210,8 @@ fn feed_units(
     {
         script.set_billing_time_rested(entered);
     }
-    let chr = classes.as_deref().map(|t| &t.0);
+    let chr = tables.classes();
+    let types = tables.types(&names);
     // One reborrow, so the memo and `warned_sideless` borrow disjointly rather than alias.
     let feed = &mut *feed;
     let (memo, vm_reset) = feed.vm.get_reset(&script);
@@ -1172,12 +1266,8 @@ fn feed_units(
         let name = names
             .resolve_unit(guid.0, Some(store), &commands)
             .map(str::to_string);
-        let mut s = snapshot(store, name, 0, chr);
+        let mut s = snapshot(store, guid.0, name, 0, chr, types);
         s.is_player = true;
-        // Every token pushed here is streamed, so connected; real link-death rides only the group
-        // roster's status byte, which the party feed reads for its own tokens.
-        s.is_connected = true;
-        s.guid = guid.0;
         s.raid_target = group.raid_target_index(guid.0);
         s.faction_group = faction_group(store, factions.as_deref());
         s.faction_group_localized = faction_group_localized(store, factions.as_deref());
@@ -1200,39 +1290,21 @@ fn feed_units(
         }
         feed.warned_sideless = sideless;
     }
+    // What the three snapshots below (target, target-of-target, NPC) read besides a descriptor.
+    let held = held::HeldUnits {
+        names: &names,
+        commands: &commands,
+        factions: factions.as_deref(),
+        reputations: &reputations,
+        group: &group,
+        self_store: self_pair.map(|(s, _)| s),
+        classes: chr,
+        types,
+    };
     let target = selection.target.zip(selection.guid).and_then(|(e, guid)| {
         let store = stores.all.get(e).ok()?;
-        let name = names
-            .resolve_unit(guid, Some(store), &commands)
-            .map(str::to_string);
-        let reaction = unit_reaction(
-            factions.as_deref(),
-            &reputations,
-            store,
-            self_pair.map(|(s, _)| s),
-        );
-        let mut s = snapshot(store, name, reaction, chr);
-        s.guid = guid;
-        s.is_connected = true;
-        s.raid_target = group.raid_target_index(guid);
-        s.faction_group = faction_group(store, factions.as_deref());
-        s.faction_group_localized = faction_group_localized(store, factions.as_deref());
-        // `CanAttack` (`0x606980`); `UnitCanAttack` gates the target frame's level colour.
-        s.can_attack = crate::target::can_attack(
-            Some(store),
-            factions.as_deref(),
-            &reputations,
-            self_pair.map(|(s, _)| s),
-        );
+        let mut s = held.state(store, guid);
         s.guild = crate::ui_guild::unit_guild(&store.0, &mut guild, &commands);
-        enrich_unit(
-            &mut s,
-            guid,
-            &names,
-            store,
-            factions.as_deref(),
-            self_pair.map(|(s, _)| s),
-        );
         Some(s)
     });
 
@@ -1244,39 +1316,7 @@ fn feed_units(
         .and_then(|s| s.0.unit_target())
         .filter(|guid| *guid != 0)
         .and_then(|guid| Some((*index.as_ref()?.0.get(&guid)?, guid)))
-        .and_then(|(entity, guid)| {
-            let store = stores.all.get(entity).ok()?;
-            let name = names
-                .resolve_unit(guid, Some(store), &commands)
-                .map(str::to_string);
-            let reaction = unit_reaction(
-                factions.as_deref(),
-                &reputations,
-                store,
-                self_pair.map(|(s, _)| s),
-            );
-            let mut s = snapshot(store, name, reaction, chr);
-            s.guid = guid;
-            s.is_connected = true;
-            s.raid_target = group.raid_target_index(guid);
-            s.faction_group = faction_group(store, factions.as_deref());
-            s.faction_group_localized = faction_group_localized(store, factions.as_deref());
-            s.can_attack = crate::target::can_attack(
-                Some(store),
-                factions.as_deref(),
-                &reputations,
-                self_pair.map(|(s, _)| s),
-            );
-            enrich_unit(
-                &mut s,
-                guid,
-                &names,
-                store,
-                factions.as_deref(),
-                self_pair.map(|(s, _)| s),
-            );
-            Some(s)
-        });
+        .and_then(|(entity, guid)| Some(held.state(stores.all.get(entity).ok()?, guid)));
 
     // `"player"` is pushed only while its descriptor exists: the roster seat stands in before
     // arrival, and `PLAYER_LOGOUT` handlers still read `UnitName("player")`, as the reference's do.
@@ -1312,39 +1352,7 @@ fn feed_units(
     let npc = interact
         .as_deref()
         .and_then(|i| Some((i.0?, i.1?)))
-        .and_then(|(entity, guid)| {
-            let store = stores.all.get(entity).ok()?;
-            let name = names
-                .resolve_unit(guid, Some(store), &commands)
-                .map(str::to_string);
-            let reaction = unit_reaction(
-                factions.as_deref(),
-                &reputations,
-                store,
-                self_pair.map(|(s, _)| s),
-            );
-            let mut s = snapshot(store, name, reaction, chr);
-            s.guid = guid;
-            s.is_connected = true;
-            s.raid_target = group.raid_target_index(guid);
-            s.faction_group = faction_group(store, factions.as_deref());
-            s.faction_group_localized = faction_group_localized(store, factions.as_deref());
-            s.can_attack = crate::target::can_attack(
-                Some(store),
-                factions.as_deref(),
-                &reputations,
-                self_pair.map(|(s, _)| s),
-            );
-            enrich_unit(
-                &mut s,
-                guid,
-                &names,
-                store,
-                factions.as_deref(),
-                self_pair.map(|(s, _)| s),
-            );
-            Some(s)
-        });
+        .and_then(|(entity, guid)| Some(held.state(stores.all.get(entity).ok()?, guid)));
     // Closing the window must clear the token, so the memo is written here, not only read. No
     // `fire_transitions`: nothing draws `"npc"` as a unit frame.
     let npc_dirty = match (&npc, memo.last.get("npc")) {
@@ -1610,10 +1618,806 @@ fn combo_edge(last: Option<(u8, u64)>, now: (u8, u64)) -> Option<bool> {
     (last != Some(now)).then(|| last.map(|(count, _)| count) != Some(now.0))
 }
 
+/// The bare unit feed, for a test driving the stock unit frames off engine state.
+#[cfg(test)]
+pub(crate) fn add_unit_feed(app: &mut App) {
+    app.init_resource::<UnitFeedState>()
+        .add_message::<crate::net::FieldChanged>()
+        .add_systems(Update, feed_units);
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    /// `"mouseover"` resolves through the pick the tooltip publishes: the hovered unit, until a
+    /// nearer GameObject wins it and the resolver rejects the GameObject's guid (`0x515bd9 je`).
+    #[test]
+    fn the_mouseover_token_resolves_nobody_behind_a_nearer_gameobject() {
+        use crate::target::{Hovered, HoveredObject};
+        use bevy::ecs::system::RunSystemOnce;
+        const WOLF: u64 = 0xF130_0000_4500_0001;
+
+        let mut app = App::new();
+        app.init_resource::<crate::ui_party::GroupState>()
+            .init_resource::<HoveredObject>();
+        let wolf = app.world_mut().spawn_empty().id();
+        app.insert_resource(Hovered {
+            target: Some(wolf),
+            guid: Some(WOLF),
+            distance: 10.0,
+            ..Default::default()
+        });
+        let resolve = |app: &mut App| {
+            app.world_mut()
+                .run_system_once(|tokens: UnitTokens| {
+                    tokens.resolve("mouseover", &Selection::default())
+                })
+                .unwrap()
+        };
+        assert_eq!(resolve(&mut app), Some((wolf, WOLF)), "the hovered unit");
+        let chest = app.world_mut().spawn_empty().id();
+        app.insert_resource(HoveredObject {
+            target: Some(chest),
+            guid: Some(0xF110_0000_0000_0004),
+            distance: 5.0,
+        });
+        assert_eq!(resolve(&mut app), None, "a nearer GameObject names nobody");
+    }
+
+    /// `partypetN` and `raidpetN` through the one resolver (`0x515970`): the pet the member's
+    /// descriptor names while it is held, else the roster record's, and a pet the object manager
+    /// does not hold names no unit.
+    mod group_pet_tokens {
+        use super::*;
+        use crate::net::GuidIndex;
+        use crate::ui_party::{GroupState, GROUPTYPE_RAID};
+        use benilla_protocol::messages::{member_status, GroupMemberEntry, PartyMemberStatsInfo};
+        use benilla_protocol::ObjectFields;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 0x10;
+        const MY_PET: u64 = 0xF140_0000_0000_0010;
+        /// `UNIT_FIELD_CHARM` and `UNIT_FIELD_SUMMON`, each a two-field guid.
+        const CHARM: u16 = 6;
+        const SUMMON: u16 = 8;
+
+        /// The `i`-th party member (1-based), `0x1000 + i`, and its pet.
+        fn member(i: u64) -> u64 {
+            0x1000 + i
+        }
+        fn pet(i: u64) -> u64 {
+            0xF140_0000_0000_0000 + i
+        }
+
+        fn guid_field(field: u16, guid: u64) -> [(u16, u32); 2] {
+            [(field, guid as u32), (field + 1, (guid >> 32) as u32)]
+        }
+
+        fn store(pairs: &[(u16, u32)]) -> ObjectStore {
+            ObjectStore(ObjectFields::from_pairs(pairs))
+        }
+
+        /// Hold `guid` in the object manager with these fields.
+        fn stream(app: &mut App, guid: u64, pairs: &[(u16, u32)]) -> Entity {
+            let e = app.world_mut().spawn((Guid(guid), store(pairs))).id();
+            app.world_mut()
+                .resource_mut::<GuidIndex>()
+                .0
+                .insert(guid, e);
+            e
+        }
+
+        fn entry(guid: u64, flags: u8) -> GroupMemberEntry {
+            GroupMemberEntry {
+                name: format!("M{guid:x}"),
+                guid,
+                status: member_status::ONLINE,
+                flags,
+            }
+        }
+
+        /// Us, held, and an empty group.
+        fn app() -> (App, Entity) {
+            let mut app = App::new();
+            app.init_resource::<GuidIndex>()
+                .init_resource::<GroupState>();
+            let me = app
+                .world_mut()
+                .spawn((SelfPlayer, Guid(ME), store(&[])))
+                .id();
+            app.world_mut().resource_mut::<GuidIndex>().0.insert(ME, me);
+            (app, me)
+        }
+
+        /// A party of `n` with each member's record naming its pet as `online`; `pets` holds the
+        /// pets, `members` the members, a member's descriptor naming its pet by `SUMMON`.
+        fn party(n: u64, members: bool, pets: bool) -> App {
+            let (mut app, _) = app();
+            let list = (1..=n).map(|i| entry(member(i), 0)).collect();
+            app.world_mut()
+                .resource_mut::<GroupState>()
+                .apply_list(0, 0, list, ME, None, Some(ME));
+            for i in 1..=n {
+                let record = PartyMemberStatsInfo {
+                    status: Some(member_status::ONLINE),
+                    pet_guid: Some(pet(i)),
+                    ..Default::default()
+                };
+                app.world_mut()
+                    .resource_mut::<GroupState>()
+                    .apply_stats(member(i), true, record);
+                if pets {
+                    stream(&mut app, pet(i), &[]);
+                }
+                if members {
+                    stream(&mut app, member(i), &guid_field(SUMMON, pet(i)));
+                }
+            }
+            app
+        }
+
+        fn resolve(app: &mut App, token: &str) -> Option<(Entity, u64)> {
+            let token = token.to_string();
+            app.world_mut()
+                .run_system_once(move |tokens: UnitTokens| {
+                    tokens.resolve(&token, &Selection::default())
+                })
+                .unwrap()
+        }
+
+        fn guid_of(app: &mut App, token: &str) -> Option<u64> {
+            resolve(app, token).map(|(_, guid)| guid)
+        }
+
+        /// `partypetN` is the Nth party slot's pet, and `partyN` is still the slot's member: the
+        /// pet arms sit ahead of `party`, whose prefix they share.
+        #[test]
+        fn partypet_names_the_pet_of_the_slot_and_party_the_member() {
+            let mut app = party(4, true, true);
+            for i in 1..=4 {
+                assert_eq!(guid_of(&mut app, &format!("partypet{i}")), Some(pet(i)));
+                assert_eq!(guid_of(&mut app, &format!("party{i}")), Some(member(i)));
+            }
+            let entity = resolve(&mut app, "partypet2").unwrap().0;
+            assert_eq!(
+                app.world().get::<Guid>(entity).map(|g| g.0),
+                Some(pet(2)),
+                "the entity is the pet's"
+            );
+        }
+
+        /// The compares fold ASCII case (`_strnicmp`, `0x5159b4`).
+        #[test]
+        fn the_pet_tokens_fold_case() {
+            let mut app = party(1, true, true);
+            for token in ["PartyPet1", "PARTYPET1", "partyPET1"] {
+                assert_eq!(guid_of(&mut app, token), Some(pet(1)), "{token}");
+            }
+        }
+
+        /// The number is 1-based and read as digits: `0`, a missing number, a letter, a sign and
+        /// a number past the four slots each name no slot. The reference's `partypetN` has no bound
+        /// and reads past its table; here it is nobody, as `partyN`.
+        #[test]
+        fn a_partypet_number_outside_one_to_four_names_nobody() {
+            let mut app = party(4, true, true);
+            for token in [
+                "partypet0",
+                "partypet5",
+                "partypet",
+                "partypetX",
+                "partypet+1",
+                "partypet1x",
+                "partypet99999999999999999999",
+            ] {
+                assert_eq!(resolve(&mut app, token), None, "{token}");
+            }
+        }
+
+        /// A held member names `CHARM` before `SUMMON` (`0x4e8204`), and a held member with
+        /// neither is petless whatever its record says (`0x4e8218`).
+        #[test]
+        fn a_held_member_names_its_charm_else_summon_and_never_its_record() {
+            let mut app = party(1, false, true);
+            let charmed = stream(&mut app, 0xF130_0000_0000_0042, &[]);
+            let held = stream(&mut app, member(1), &guid_field(SUMMON, pet(1)));
+            assert_eq!(guid_of(&mut app, "partypet1"), Some(pet(1)), "SUMMON");
+
+            let both: Vec<_> = guid_field(CHARM, 0xF130_0000_0000_0042)
+                .into_iter()
+                .chain(guid_field(SUMMON, pet(1)))
+                .collect();
+            app.world_mut().entity_mut(held).insert(store(&both));
+            assert_eq!(
+                resolve(&mut app, "partypet1"),
+                Some((charmed, 0xF130_0000_0000_0042)),
+                "CHARM first"
+            );
+
+            app.world_mut().entity_mut(held).insert(store(&[]));
+            assert_eq!(
+                resolve(&mut app, "partypet1"),
+                None,
+                "the record names a held pet, but the member's own descriptor is asked first"
+            );
+        }
+
+        /// A member the object manager does not hold answers from its record's pet guid, which
+        /// `partypetN` reads only while the record reads online (`0x4e8227`).
+        #[test]
+        fn an_unheld_member_names_its_records_pet_while_online() {
+            let mut app = party(1, false, false);
+            assert_eq!(resolve(&mut app, "partypet1"), None, "the pet is not held");
+
+            let held = stream(&mut app, pet(1), &[]);
+            assert_eq!(resolve(&mut app, "partypet1"), Some((held, pet(1))));
+
+            let offline = PartyMemberStatsInfo {
+                status: Some(member_status::OFFLINE),
+                ..Default::default()
+            };
+            app.world_mut()
+                .resource_mut::<GroupState>()
+                .apply_stats(member(1), false, offline);
+            assert_eq!(resolve(&mut app, "partypet1"), None, "an offline record");
+        }
+
+        /// A raid of five: us (row 1), then the wire's members, the last in another subgroup.
+        fn raid() -> App {
+            let (mut app, _) = app();
+            let list = vec![
+                entry(member(1), 0),
+                entry(member(2), 1),
+                entry(member(3), 1),
+                entry(member(4), 2),
+            ];
+            app.world_mut().resource_mut::<GroupState>().apply_list(
+                GROUPTYPE_RAID,
+                0,
+                list,
+                ME,
+                None,
+                Some(ME),
+            );
+            app
+        }
+
+        /// `raidpetN` is the pet of `GetRaidRosterInfo` row N, the row `raidN` names.
+        #[test]
+        fn raidpet_names_the_pet_of_the_row_raid_names() {
+            let mut app = raid();
+            // Row 3 is `member(2)`, held with a pet; row 1 is us.
+            let held_pet = stream(&mut app, pet(2), &[]);
+            stream(&mut app, member(2), &guid_field(SUMMON, pet(2)));
+            let mine = stream(&mut app, MY_PET, &[]);
+            let me = app.world().resource::<GuidIndex>().0[&ME];
+            app.world_mut()
+                .entity_mut(me)
+                .insert(store(&guid_field(SUMMON, MY_PET)));
+
+            assert_eq!(resolve(&mut app, "raidpet3"), Some((held_pet, pet(2))));
+            assert_eq!(
+                resolve(&mut app, "raidpet1"),
+                Some((mine, MY_PET)),
+                "our own row"
+            );
+            assert_eq!(
+                guid_of(&mut app, "raid3"),
+                Some(member(2)),
+                "raidN is unchanged"
+            );
+            assert_eq!(guid_of(&mut app, "raid1"), Some(ME));
+            assert_eq!(resolve(&mut app, "raidpet2"), None, "row 2 has no pet");
+            for token in ["raidpet0", "raidpet6", "raidpet", "raidpetX", "raidpet+3"] {
+                assert_eq!(resolve(&mut app, token), None, "{token}");
+            }
+            assert_eq!(guid_of(&mut app, "RaidPet3"), Some(pet(2)), "case folds");
+        }
+
+        /// `raidpetN`'s record leg has no online test (`0x4919ae`), where `partypetN`'s has one.
+        #[test]
+        fn a_raid_pet_reads_the_record_of_an_offline_member_a_party_pet_does_not() {
+            let mut app = raid();
+            let record = PartyMemberStatsInfo {
+                status: Some(member_status::OFFLINE),
+                pet_guid: Some(pet(1)),
+                ..Default::default()
+            };
+            app.world_mut()
+                .resource_mut::<GroupState>()
+                .apply_stats(member(1), true, record);
+            let held = stream(&mut app, pet(1), &[]);
+            // Row 2 and party slot 1 are the same member.
+            assert_eq!(resolve(&mut app, "raidpet2"), Some((held, pet(1))));
+            assert_eq!(resolve(&mut app, "partypet1"), None);
+        }
+
+        /// A party pet in view gets a distance, so the range verbs answer for it: the feed measures
+        /// the held units the resolver's inputs list, and the VM resolves the token to one of them.
+        #[test]
+        fn the_reach_feed_measures_a_party_pet() {
+            let mut app = party(1, true, false);
+            let me = app.world().resource::<GuidIndex>().0[&ME];
+            app.world_mut()
+                .entity_mut(me)
+                .insert(Transform::from_xyz(0.0, 0.0, 0.0));
+            let held = stream(&mut app, pet(1), &[]);
+            // Along one axis, so d² is exactly yards².
+            app.world_mut()
+                .entity_mut(held)
+                .insert(Transform::from_xyz(15.0, 0.0, 0.0));
+            app.init_resource::<Reputations>();
+            app.insert_resource(Selection::default());
+            app.insert_non_send_resource(UiScript::new().unwrap());
+            app.world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .set_unit_guids(&benilla_ui::script::UnitGuids {
+                    player: ME,
+                    party: [member(1), 0, 0, 0],
+                    party_pets: [pet(1), 0, 0, 0],
+                    held: HashMap::from([(ME, 0), (pet(1), 0)]),
+                    ..Default::default()
+                });
+            app.world_mut().run_system_once(feed_unit_reach).unwrap();
+            let answer = |app: &App, expr: &str| {
+                app.world()
+                    .non_send_resource::<UiScript>()
+                    .eval::<bool>(expr)
+                    .unwrap()
+            };
+            assert!(answer(
+                &app,
+                r#"return CheckInteractDistance("partypet1", 4) ~= nil"#
+            ));
+            assert!(
+                answer(
+                    &app,
+                    r#"return CheckInteractDistance("partypet1", 1) == nil"#
+                ),
+                "15 yards is outside the 10-yard row"
+            );
+            assert!(
+                answer(
+                    &app,
+                    r#"return CheckInteractDistance("partypet2", 4) == nil"#
+                ),
+                "no second member"
+            );
+        }
+    }
+
+    /// The `target` chain through the one resolver (`0x5159d3`-`0x515a2c`): a base, then a hop off
+    /// each held unit's `UNIT_FIELD_TARGET`, so `party1target`, `pettarget` and `raid3target` name
+    /// the unit at the end of the chain and any break in it names nobody.
+    mod target_chain_tokens {
+        use super::*;
+        use crate::net::GuidIndex;
+        use crate::target::{Hovered, HoveredObject};
+        use crate::ui_party::{GroupState, GROUPTYPE_RAID};
+        use benilla_protocol::messages::{member_status, GroupMemberEntry};
+        use benilla_protocol::ObjectFields;
+        use bevy::ecs::system::RunSystemOnce;
+
+        const ME: u64 = 0x10;
+        /// party1 and raid2, party2 and raid3, party3 and raid4.
+        const A: u64 = 0x1001;
+        const B: u64 = 0x1002;
+        const C: u64 = 0x1003;
+        const MOB: u64 = 0xF130_0000_0000_0001;
+        /// A unit with no target, the mouseover.
+        const LONELY: u64 = 0xF130_0000_0000_0002;
+        const MY_PET: u64 = 0xF140_0000_0000_0010;
+        const A_PET: u64 = 0xF140_0000_0000_1001;
+        /// A game object that still carries a value where a unit keeps its target.
+        const CHEST: u64 = 0xF110_0000_0000_0003;
+        /// Named by `C`'s target and held by no one.
+        const GONE: u64 = 0xF130_0000_0000_0099;
+
+        /// `OBJECT_FIELD_TYPE`, and the masks the object manager's typemask test reads.
+        const OBJECT_TYPE: u16 = 2;
+        const PLAYER: u32 = 0x19;
+        const UNIT: u32 = 0x09;
+        const GAME_OBJECT: u32 = 0x21;
+        /// `UNIT_FIELD_SUMMON` and `UNIT_FIELD_TARGET`, each a two-field guid.
+        const SUMMON: u16 = 8;
+        const TARGET: u16 = 16;
+
+        fn fields(kind: u32, summon: u64, target: u64) -> ObjectStore {
+            let mut pairs = vec![(OBJECT_TYPE, kind)];
+            for (field, guid) in [(SUMMON, summon), (TARGET, target)] {
+                pairs.push((field, guid as u32));
+                pairs.push((field + 1, (guid >> 32) as u32));
+            }
+            ObjectStore(ObjectFields::from_pairs(&pairs))
+        }
+
+        fn entry(guid: u64) -> GroupMemberEntry {
+            GroupMemberEntry {
+                name: format!("M{guid:x}"),
+                guid,
+                status: member_status::ONLINE,
+                flags: 0,
+            }
+        }
+
+        /// The world's targets: we target the mob and so does `A`, the mob targets `B`, `B` targets
+        /// `A`, our pet targets the mob and `A`'s targets `B`, `C` targets a unit nobody holds, and
+        /// `LONELY` targets nobody. We select the mob and hover `LONELY`. The group is a raid of
+        /// us, `A`, `B` and `C`, all in our subgroup, so the three are also party slots 1 to 3.
+        fn app() -> App {
+            let mut app = App::new();
+            app.init_resource::<GuidIndex>()
+                .init_resource::<GroupState>()
+                .init_resource::<HoveredObject>();
+            let spawn = |app: &mut App, guid: u64, store: ObjectStore| {
+                let e = app.world_mut().spawn((Guid(guid), store)).id();
+                app.world_mut()
+                    .resource_mut::<GuidIndex>()
+                    .0
+                    .insert(guid, e);
+                e
+            };
+            let me = spawn(&mut app, ME, fields(PLAYER, MY_PET, MOB));
+            app.world_mut().entity_mut(me).insert(SelfPlayer);
+            spawn(&mut app, A, fields(PLAYER, A_PET, MOB));
+            spawn(&mut app, B, fields(PLAYER, 0, A));
+            spawn(&mut app, C, fields(PLAYER, 0, GONE));
+            let mob = spawn(&mut app, MOB, fields(UNIT, 0, B));
+            let lonely = spawn(&mut app, LONELY, fields(UNIT, 0, 0));
+            spawn(&mut app, MY_PET, fields(UNIT, 0, MOB));
+            spawn(&mut app, A_PET, fields(UNIT, 0, B));
+            app.world_mut().resource_mut::<GroupState>().apply_list(
+                GROUPTYPE_RAID,
+                0,
+                vec![entry(A), entry(B), entry(C)],
+                ME,
+                None,
+                Some(ME),
+            );
+            app.insert_resource(Selection {
+                target: Some(mob),
+                guid: Some(MOB),
+                ..Default::default()
+            });
+            app.insert_resource(Hovered {
+                target: Some(lonely),
+                guid: Some(LONELY),
+                distance: 5.0,
+                ..Default::default()
+            });
+            let mut bar = crate::ui_pet::PetBar::default();
+            bar.spells.pet_guid = MY_PET;
+            app.insert_resource(bar);
+            app
+        }
+
+        fn resolve(app: &mut App, token: &str) -> Option<(Entity, u64)> {
+            let token = token.to_string();
+            app.world_mut()
+                .run_system_once(move |tokens: UnitTokens, selection: Res<Selection>| {
+                    tokens.resolve(&token, &selection)
+                })
+                .unwrap()
+        }
+
+        fn guid_of(app: &mut App, token: &str) -> Option<u64> {
+            resolve(app, token).map(|(_, guid)| guid)
+        }
+
+        /// Every base takes hops, and each hop reads the current unit's own target, so the answer
+        /// is the unit the chain ends on, its entity the one the object manager holds.
+        #[test]
+        fn a_target_suffix_names_the_unit_at_the_end_of_the_chain() {
+            let mut app = app();
+            for (token, want) in [
+                ("party1target", MOB),
+                ("party2target", A),
+                ("party1targettarget", B),
+                ("party1targettargettarget", A),
+                ("playertarget", MOB),
+                ("playertargettarget", B),
+                ("partypet1target", B),
+                ("pettarget", MOB),
+                ("pettargettarget", B),
+                ("target", MOB),
+                ("targettarget", B),
+                ("targettargettarget", A),
+                ("raid1target", MOB),
+                ("raid2target", MOB),
+                ("raid3target", A),
+                ("raid2targettarget", B),
+                ("raidpet1target", MOB),
+                ("raidpet2target", B),
+                ("mouseover", LONELY),
+            ] {
+                assert_eq!(guid_of(&mut app, token), Some(want), "{token}");
+            }
+            let (entity, guid) = resolve(&mut app, "party2targettarget").unwrap();
+            assert_eq!(guid, MOB);
+            assert_eq!(
+                app.world().get::<Guid>(entity).map(|g| g.0),
+                Some(MOB),
+                "the entity is the mob's"
+            );
+        }
+
+        /// A unit with no target ends the chain (`0x515a2e`), as does a target the object manager
+        /// does not hold (`0x515a16`), a hop off anything but a unit (`0x515a0f`, typemask 8) and
+        /// a base that names no one.
+        #[test]
+        fn a_chain_that_breaks_names_nobody() {
+            let mut app = app();
+            for token in [
+                // The mouseover targets nobody, and so nothing follows it.
+                "mouseovertarget",
+                "mouseovertargettarget",
+                // `C` targets a guid nobody holds.
+                "party3target",
+                "raid4target",
+                // Nor does a further hop go past the break.
+                "party3targettarget",
+                // A base no one holds: party4 is nobody, raid5 is past the roster, a missing or
+                // zero number names no row, and `B` has no pet.
+                "party4target",
+                "raid5target",
+                "raid0target",
+                "partytarget",
+                "partypet2target",
+                "raidpet3target",
+            ] {
+                assert_eq!(resolve(&mut app, token), None, "{token}");
+            }
+
+            // A hop off a game object is nobody, whatever its descriptor holds where a unit
+            // keeps its target.
+            let chest = app
+                .world_mut()
+                .spawn((Guid(CHEST), fields(GAME_OBJECT, 0, A)))
+                .id();
+            app.world_mut()
+                .resource_mut::<GuidIndex>()
+                .0
+                .insert(CHEST, chest);
+            app.insert_resource(Selection {
+                target: Some(chest),
+                guid: Some(CHEST),
+                ..Default::default()
+            });
+            assert_eq!(guid_of(&mut app, "target"), Some(CHEST), "the base is held");
+            assert_eq!(resolve(&mut app, "targettarget"), None);
+        }
+
+        /// Text after the base, or after a hop, that is not `target` names nobody, and `npc` is
+        /// an exact compare with no chain.
+        #[test]
+        fn text_that_is_not_a_target_hop_names_nobody() {
+            let mut app = app();
+            for token in [
+                "party1foo",
+                "party1targetfoo",
+                "party1targettarge",
+                "party1 target",
+                "playerfoo",
+                "playertargets",
+                "pettarge",
+                "targetfoo",
+                "mouseoverx",
+                "raid3targettargetfoo",
+                "npc",
+                "npctarget",
+                "bogus",
+                "",
+            ] {
+                assert_eq!(resolve(&mut app, token), None, "{token}");
+            }
+            // The control: the same tokens without the tail resolve.
+            assert_eq!(guid_of(&mut app, "party1"), Some(A));
+            assert_eq!(guid_of(&mut app, "player"), Some(ME));
+        }
+
+        /// The compares fold ASCII case, the hops' included (`_strnicmp`, `0x5159f1`), and the
+        /// chain has no depth limit: three hops round `A`, the mob and `B` come back to `A`.
+        #[test]
+        fn a_chain_folds_case_and_has_no_depth_limit() {
+            let mut app = app();
+            for token in [
+                "PARTY1TARGET",
+                "Party1Target",
+                "party1TARGET",
+                "PartY1tArGeT",
+            ] {
+                assert_eq!(guid_of(&mut app, token), Some(MOB), "{token}");
+            }
+            assert_eq!(guid_of(&mut app, "PlayerTarget"), Some(MOB));
+            assert_eq!(guid_of(&mut app, "TargetTargetTarget"), Some(A));
+            assert_eq!(guid_of(&mut app, "RaidPet1Target"), Some(MOB));
+            for hops in [3, 30, 3000] {
+                let token = format!("party1{}", "target".repeat(hops));
+                assert_eq!(guid_of(&mut app, &token), Some(A), "{hops} hops round A");
+            }
+            let token = format!("party1{}", "target".repeat(3001));
+            assert_eq!(guid_of(&mut app, &token), Some(MOB));
+        }
+
+        /// A number wraps in 32 bits as the reference's inline parse does (`0x515af4`): 2^32 + 1
+        /// is row 1, and digits stop at the first letter.
+        #[test]
+        fn a_row_number_wraps_as_the_reference_parse_does() {
+            let mut app = app();
+            assert_eq!(guid_of(&mut app, "party4294967297target"), Some(MOB));
+            assert_eq!(guid_of(&mut app, "party01target"), Some(MOB));
+            assert_eq!(guid_of(&mut app, "party1x"), None);
+        }
+    }
+
+    /// The range verbs end to end, with the aura feed that pushes the resolver's inputs and the
+    /// reach feed that measures the units they hold: `CheckInteractDistance` and `CanInspect`
+    /// answer for a `target` chain (`0x48ba00` and `0x48a1b0` resolve their token through
+    /// `0x515970`), on the unit the chain names and not on the base.
+    #[test]
+    fn the_range_verbs_answer_for_a_target_chain() {
+        use benilla_protocol::messages::{member_status, GroupMemberEntry, ObjectFields};
+
+        const ME: u64 = 0x10;
+        const A: u64 = 0x1001;
+        const B: u64 = 0x1002;
+        const MOB: u64 = 0xF130_0000_0000_0001;
+        const A_PET: u64 = 0xF140_0000_0000_1001;
+        /// `OBJECT_FIELD_TYPE`, `UNIT_FIELD_SUMMON`, `UNIT_FIELD_TARGET` and `UNIT_FIELD_FLAGS`.
+        const OBJECT_TYPE: u16 = 2;
+        const SUMMON: u16 = 8;
+        const TARGET: u16 = 16;
+        const FLAGS: u16 = 46;
+        /// `UNIT_FIELD_FLAGS` bit 1 (NON_ATTACKABLE), which `can_attack` refuses.
+        const NON_ATTACKABLE: u32 = 1 << 1;
+
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin))
+            .insert_state(crate::char_select::ClientState::InWorld)
+            .init_resource::<Selection>()
+            .init_resource::<crate::ui_pet::PetBar>()
+            .init_resource::<crate::net::GuidIndex>()
+            .init_resource::<Reputations>()
+            .init_resource::<crate::ui_party::GroupState>()
+            .insert_resource(NetCommands(tx))
+            .add_plugins(crate::ui_aura::UiAuraPlugin)
+            .add_systems(Update, feed_unit_reach.after(crate::ui_aura::AuraEvents));
+        app.insert_non_send_resource(UiScript::new().unwrap());
+
+        // We at the origin, party1 (`A`) 5 yards off with a pet 15 yards off, the mob 20 yards
+        // off, and `B` 3 yards off. We and `A` target the mob, the mob targets `B`, the pet
+        // targets `B`, and `B` targets nobody. The players are not attackable, so inspectable.
+        let mut spawn = |guid: u64, kind: u32, summon: u64, target: u64, yards: f32| {
+            let mut pairs = vec![(OBJECT_TYPE, kind), (FLAGS, NON_ATTACKABLE)];
+            for (field, guid) in [(SUMMON, summon), (TARGET, target)] {
+                pairs.push((field, guid as u32));
+                pairs.push((field + 1, (guid >> 32) as u32));
+            }
+            let e = app
+                .world_mut()
+                .spawn((
+                    Guid(guid),
+                    ObjectStore(ObjectFields::from_pairs(&pairs)),
+                    // Along one axis, so d² is exactly yards².
+                    Transform::from_xyz(yards, 0.0, 0.0),
+                ))
+                .id();
+            app.world_mut()
+                .resource_mut::<crate::net::GuidIndex>()
+                .0
+                .insert(guid, e);
+            e
+        };
+        let me = spawn(ME, 0x19, 0, MOB, 0.0);
+        spawn(A, 0x19, A_PET, MOB, 5.0);
+        spawn(A_PET, 0x09, 0, B, 15.0);
+        let mob = spawn(MOB, 0x09, 0, B, 20.0);
+        spawn(B, 0x19, 0, 0, 3.0);
+        app.world_mut().entity_mut(me).insert(SelfPlayer);
+        app.world_mut()
+            .resource_mut::<crate::ui_party::GroupState>()
+            .apply_list(
+                0,
+                0,
+                vec![GroupMemberEntry {
+                    name: "Brisca".into(),
+                    guid: A,
+                    status: member_status::ONLINE,
+                    flags: 0,
+                }],
+                ME,
+                None,
+                Some(ME),
+            );
+        app.insert_resource(Selection {
+            target: Some(mob),
+            guid: Some(MOB),
+            ..Default::default()
+        });
+        app.update();
+
+        let answers = |app: &App, expr: &str| {
+            app.world()
+                .non_send_resource::<UiScript>()
+                .eval::<bool>(&format!("return {expr} ~= nil"))
+                .unwrap()
+        };
+        // The base and each hop, at their own distances: the 10-yard row is `1`, the 30-yard `4`.
+        for (token, kind, want) in [
+            ("player", 1, true),
+            ("target", 1, false),
+            ("target", 4, true),
+            ("playertarget", 1, false),
+            ("playertarget", 4, true),
+            ("party1target", 1, false),
+            ("party1target", 4, true),
+            ("PARTY1TARGET", 4, true),
+            ("party1targettarget", 1, true),
+            ("targettarget", 1, true),
+            ("partypet1", 1, false),
+            ("partypet1", 4, true),
+            ("partypet1target", 1, true),
+            // `B` targets nobody, so the chain ends there.
+            ("party1targettargettarget", 4, false),
+            ("party2target", 4, false),
+            ("party1foo", 4, false),
+            ("npctarget", 4, false),
+        ] {
+            assert_eq!(
+                answers(
+                    &app,
+                    &format!(r#"CheckInteractDistance("{token}", {kind})"#)
+                ),
+                want,
+                "CheckInteractDistance({token}, {kind})"
+            );
+        }
+        // `CanInspect`: a player within 10 yards, so `B` and not the mob 20 yards off.
+        for (token, want) in [
+            ("party1targettarget", true),
+            ("targettarget", true),
+            ("party1", true),
+            ("party1target", false),
+            ("target", false),
+            ("party1targettargettarget", false),
+        ] {
+            assert_eq!(
+                answers(&app, &format!(r#"CanInspect("{token}")"#)),
+                want,
+                "CanInspect({token})"
+            );
+        }
+    }
+
+    /// The reach feed measures the guids the aura feed pushes, so a frame's feeds must run in that
+    /// order: read off the declared graph, the aura feed's set comes before the reach feed.
+    #[test]
+    fn the_reach_feed_runs_after_the_aura_feed_it_reads() {
+        use crate::game_plugins::schedule_tests::{census, headless_client, SyncPoints};
+
+        let mut app = headless_client();
+        let c = census(&mut app, Update, SyncPoints::Declared);
+        if !c.systems.values().any(|s| s.name.contains("benilla_app::")) {
+            eprintln!("skipped: this build carries no type names");
+            return;
+        }
+        let one = |suffix: &str| {
+            let mut hits = c.systems.iter().filter(|(_, s)| s.name.ends_with(suffix));
+            match (hits.next(), hits.next()) {
+                (Some((k, _)), None) => *k,
+                _ => panic!("exactly one system named `…{suffix}` in Update"),
+            }
+        };
+        let aura = one("::ui_aura::feed_auras");
+        let reach = one("::ui_unit::feed_unit_reach");
+        assert!(
+            c.dependencies.contains(&(aura, reach)),
+            "feed_unit_reach is declared after feed_auras"
+        );
+    }
+
     /// The team digit comes off the race byte, whatever template sits beside it (a GM's 35).
     #[test]
     fn the_team_digit_comes_off_the_race_byte_not_the_faction_template() {
@@ -1627,9 +2431,11 @@ mod tests {
         let team = |fields: &[(u16, u32)]| {
             snapshot(
                 &ObjectStore(ObjectFields::from_pairs(fields)),
+                0,
                 None,
                 0,
                 None,
+                Default::default(),
             )
             .pvp_team
         };
@@ -1657,6 +2463,42 @@ mod tests {
         );
     }
 
+    /// A new VM is seeded with the shipped `Languages.dbc`, so each race's own tongue resolves by
+    /// name to the id vmangos keys `KnowsLanguage` on (`SharedDefines.h:253-269`).
+    #[test]
+    fn a_new_vm_resolves_every_racial_language_by_name() {
+        let data = benilla_formats::wow_data_or_skip!();
+        let mut chain = benilla_formats::open_chain(&data).expect("open chain");
+        let mut world = World::new();
+        world.insert_resource(LanguagesRes(
+            benilla_formats::load_languages(&mut chain).expect("Languages.dbc"),
+        ));
+        let mut script = UiScript::new().expect("VM");
+        seed_language_table(&world, &mut script);
+        let want = [
+            ("Orcish", 1),
+            ("Darnassian", 2),
+            ("Taurahe", 3),
+            ("Dwarvish", 6),
+            ("Common", 7),
+            ("Gnomish", 13),
+            ("Troll", 14),
+            ("Gutterspeak", 33),
+        ];
+        for (name, _) in want {
+            script
+                .run(&format!(r#"SendChatMessage("hi", "SAY", "{name}")"#))
+                .unwrap_or_else(|e| panic!("{name}: {e}"));
+        }
+        let got: Vec<Option<u32>> = script
+            .take_chat_sends()
+            .iter()
+            .map(|c| c.language)
+            .collect();
+        let ids: Vec<Option<u32>> = want.iter().map(|&(_, id)| Some(id)).collect();
+        assert_eq!(got, ids);
+    }
+
     /// [`race_pvp_team`] against the shipped DBCs, walked as `0x5efe00` walks them.
     #[test]
     fn race_pvp_team_matches_the_shipped_tables() {
@@ -2144,7 +2986,17 @@ mod tests {
             app.insert_resource(Selection {
                 target: Some(target),
                 guid: Some(guid),
+                ..Default::default()
             });
+            // The resolver's inputs the aura feed would push: us and the target, both held.
+            app.world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .set_unit_guids(&benilla_ui::script::UnitGuids {
+                    player: ME,
+                    target: guid,
+                    held: HashMap::from([(ME, 0), (guid, 0)]),
+                    ..Default::default()
+                });
 
             app.world_mut().run_system_once(feed_unit_reach).unwrap();
             app.world_mut()
@@ -2255,9 +3107,11 @@ mod tests {
         ];
         let alive = snapshot(
             &ObjectStore(ObjectFields::from_pairs(&vitals)),
+            0,
             Some("Hunter".into()),
             0,
             None,
+            Default::default(),
         );
         assert_eq!((alive.health, alive.max_health), (1200, 1500));
         assert_eq!((alive.power, alive.max_power), (300, 900));
@@ -2267,9 +3121,11 @@ mod tests {
             &ObjectStore(ObjectFields::from_pairs(
                 &[vitals.as_slice(), &[(DYNFLAGS, 0x20)]].concat(),
             )),
+            0,
             Some("Hunter".into()),
             0,
             None,
+            Default::default(),
         );
         assert_eq!(
             (feigning.health, feigning.max_health),
@@ -2582,6 +3438,155 @@ mod tests {
         );
     }
 
+    /// `UnitCreatureType` through the real feed (`0x51a280`, resolver `0x605570`): a shapeshifted
+    /// player answers the form's type before the race's, an unshifted one the race's, a form of
+    /// type -1 falls through to the race, and a creature keeps its template's unless a form
+    /// outranks it.
+    #[test]
+    fn unit_creature_type_names_the_form_before_the_race_and_a_creature_its_template() {
+        use crate::names::CreatureRecord;
+        use benilla_formats::ShapeshiftForm;
+        use benilla_protocol::messages::ObjectType;
+        use benilla_protocol::ObjectFields;
+
+        /// `UNIT_FIELD_BYTES_0` and `UNIT_FIELD_BYTES_1`, absolute descriptor indices, and
+        /// `OBJECT_FIELD_ENTRY`.
+        const BYTES_0: u16 = 36;
+        const BYTES_1: u16 = 138;
+        const OBJECT_FIELD_ENTRY: u16 = 3;
+        const NIGHT_ELF: u32 = 4;
+        const CAT_FORM: u32 = 1;
+        /// A row whose type is -1 in the shipped table.
+        const NO_TYPE_FORM: u32 = 2;
+        /// `HIGHGUID_UNIT` guids of entries 69 (a wolf, a Beast) and 70 (a druid, a Humanoid).
+        const WOLF: u64 = 0xF130_0000_4500_0001;
+        const DRUID: u64 = 0xF130_0000_4600_0001;
+
+        let record = |name: &str, creature_type| CreatureRecord {
+            name: name.into(),
+            subname: None,
+            creature_type,
+            pet_family: 0,
+            rank: 0,
+            type_flags: 0,
+            civilian: false,
+            racial_leader: false,
+            display_id: 0,
+        };
+        let mut app = App::new();
+        app.init_resource::<UnitFeedState>()
+            .init_resource::<Selection>()
+            .init_resource::<Reputations>()
+            .init_resource::<crate::ui_party::GroupState>()
+            .init_resource::<crate::ui_chat::ChatLog>()
+            .init_resource::<crate::sound::MessageSounds>()
+            .init_resource::<crate::ui_guild::GuildState>();
+        app.add_message::<FieldChanged>();
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        app.insert_resource(NetCommands(tx));
+        app.insert_non_send_resource(UiScript::new().unwrap());
+        let mut names = NameCache::default();
+        names.insert_creature(69, Some(record("Wolf", 1)));
+        names.insert_creature(70, Some(record("Druid", 7)));
+        app.insert_resource(names);
+        let mut spells = crate::ui_action::Spells::empty_for_tests();
+        let form = |creature_type| ShapeshiftForm {
+            creature_type,
+            ..Default::default()
+        };
+        spells.forms.insert(CAT_FORM, form(1));
+        spells.forms.insert(NO_TYPE_FORM, form(-1));
+        app.insert_resource(spells);
+        app.add_systems(Update, feed_units);
+
+        let me = app
+            .world_mut()
+            .spawn((
+                SelfPlayer,
+                Guid(0x77),
+                ObjectStore(
+                    ObjectFields::from_pairs(&[(BYTES_0, NIGHT_ELF)])
+                        .into_created(ObjectType::Player),
+                ),
+            ))
+            .id();
+        let mut creature = |entry: u32| {
+            app.world_mut()
+                .spawn(ObjectStore(ObjectFields::from_pairs(&[(
+                    OBJECT_FIELD_ENTRY,
+                    entry,
+                )])))
+                .id()
+        };
+        let wolf = creature(69);
+        let druid = creature(70);
+        let creature_type = |app: &mut App, token: &str| -> Option<String> {
+            app.world_mut()
+                .non_send_resource_mut::<UiScript>()
+                .eval::<Option<String>>(&format!(r#"return UnitCreatureType("{token}")"#))
+                .unwrap()
+        };
+        let shift = |app: &mut App, unit: Entity, form: u32| {
+            app.world_mut()
+                .entity_mut(unit)
+                .get_mut::<ObjectStore>()
+                .unwrap()
+                .0
+                .merge(ObjectFields::from_pairs(&[(BYTES_1, form << 16)]));
+            app.update();
+        };
+        let select = |app: &mut App, unit: Entity, guid: u64| {
+            let mut selection = app.world_mut().resource_mut::<Selection>();
+            selection.target = Some(unit);
+            selection.guid = Some(guid);
+            app.update();
+        };
+
+        app.update();
+        assert_eq!(
+            creature_type(&mut app, "player").as_deref(),
+            Some("Humanoid"),
+            "no form: the race's type"
+        );
+        shift(&mut app, me, CAT_FORM);
+        assert_eq!(
+            creature_type(&mut app, "player").as_deref(),
+            Some("Beast"),
+            "Cat Form: the form's type, before the race's"
+        );
+        shift(&mut app, me, NO_TYPE_FORM);
+        assert_eq!(
+            creature_type(&mut app, "player").as_deref(),
+            Some("Humanoid"),
+            "a form of type -1 falls through to the race"
+        );
+        shift(&mut app, me, 0);
+        assert_eq!(
+            creature_type(&mut app, "player").as_deref(),
+            Some("Humanoid"),
+            "out of form again"
+        );
+
+        select(&mut app, wolf, WOLF);
+        assert_eq!(
+            creature_type(&mut app, "target").as_deref(),
+            Some("Beast"),
+            "a creature's template type"
+        );
+        select(&mut app, druid, DRUID);
+        assert_eq!(
+            creature_type(&mut app, "target").as_deref(),
+            Some("Humanoid"),
+            "a Humanoid template"
+        );
+        shift(&mut app, druid, CAT_FORM);
+        assert_eq!(
+            creature_type(&mut app, "target").as_deref(),
+            Some("Beast"),
+            "a form outranks the template, on a creature as on a player"
+        );
+    }
+
     /// Event `0x111` fires from the local player's destructor, which a same-map teleport never
     /// reaches, and the initial-login map needs no ack.
     #[test]
diff --git a/crates/benilla-app/src/ui_unit/held.rs b/crates/benilla-app/src/ui_unit/held.rs
new file mode 100644
index 00000000..5242357f
--- /dev/null
+++ b/crates/benilla-app/src/ui_unit/held.rs
@@ -0,0 +1,491 @@
+//! The snapshot of a held unit that a token names other than the player, and the per-guid feed of
+//! the units a `target` chain ends on.
+//!
+//! The reference resolves a token to a guid (`0x515970`) and reads that guid's object, so a unit it
+//! holds answers a `Unit*` getter however the token spelled it. The app pushes a snapshot
+//! for each base token by name ([`UiScript::set_unit`]); a chain such as `party1target` names a
+//! unit no base does, so the VM resolves it to a guid and reads that guid's snapshot, which
+//! [`feed_chain_units`] pushes for the guids [`UiScript::chain_end_guids`] lists.
+
+use std::collections::HashMap;
+
+use bevy::prelude::*;
+
+use benilla_formats::ChrClasses;
+use benilla_ui::script::{UiScript, UnitState};
+
+use super::{enrich_unit, faction_group, faction_group_localized, snapshot, unit_reaction};
+use crate::creature_type::CreatureTypeSources;
+use crate::names::NameCache;
+use crate::net::{Guid, NetCommands, ObjectStore, Reputations, SelfPlayer};
+use crate::target::Factions;
+use crate::ui_script::{gate, VmMemo};
+
+/// What a held unit's snapshot reads beside its descriptor.
+pub(super) struct HeldUnits<'a> {
+    pub(super) names: &'a NameCache,
+    pub(super) commands: &'a NetCommands,
+    pub(super) factions: Option<&'a Factions>,
+    pub(super) reputations: &'a Reputations,
+    pub(super) group: &'a crate::ui_party::GroupState,
+    /// Our own descriptor, which reaction, attackability and the faction line read.
+    pub(super) self_store: Option<&'a ObjectStore>,
+    pub(super) classes: Option<&'a ChrClasses>,
+    pub(super) types: CreatureTypeSources<'a>,
+}
+
+impl HeldUnits<'_> {
+    /// The snapshot of the held unit `guid`, whose descriptor is `store`, as a token naming a unit
+    /// other than the player carries it. It has no guild leg, so `GetGuildInfo` on a chain answers
+    /// nothing, where the reference resolves the token and reads the object's guild (`0x4c9330`).
+    pub(super) fn state(&self, store: &ObjectStore, guid: u64) -> UnitState {
+        let name = self
+            .names
+            .resolve_unit(guid, Some(store), self.commands)
+            .map(str::to_string);
+        let reaction = unit_reaction(self.factions, self.reputations, store, self.self_store);
+        let mut s = snapshot(store, guid, name, reaction, self.classes, self.types);
+        s.raid_target = self.group.raid_target_index(guid);
+        s.faction_group = faction_group(store, self.factions);
+        s.faction_group_localized = faction_group_localized(store, self.factions);
+        // `CanAttack` (`0x606980`); `UnitCanAttack` gates the target frame's level colour.
+        s.can_attack = crate::target::can_attack(
+            Some(store),
+            self.factions,
+            self.reputations,
+            self.self_store,
+        );
+        enrich_unit(
+            &mut s,
+            guid,
+            self.names,
+            store,
+            self.factions,
+            self.self_store,
+        );
+        s
+    }
+}
+
+/// [`feed_chain_units`]' per-VM memory.
+#[derive(Default)]
+pub(super) struct ChainMemo {
+    names_generation: gate::Watch,
+    /// The guids the last build covered, sorted.
+    ends: Vec<u64>,
+    /// What each was last pushed as.
+    pushed: HashMap<u64, UnitState>,
+}
+
+/// Push the snapshot of each held unit a `target` chain can end on, by guid, so `UnitName`,
+/// `UnitHealth` and the other getters answer for `party1target`, `raid3target` and `pettarget`
+/// (`0x515970` resolves the token, then each getter reads the guid's object, `0x468460`). The
+/// guids are the resolver's own inputs ([`UiScript::chain_end_guids`]), which the aura feed pushes
+/// each frame, so this runs after it. A guid the object manager does not hold, or holds as
+/// anything but a unit, gets no snapshot. The reference still answers such a guid: `UnitExists`
+/// from the roster (`0x491900`), `UnitHealth` from the roster or pet record (`0x496400`,
+/// `0x496420`), and `UnitName` from the pet record or the name cache, else `UNKNOWNOBJECT`
+/// (`0x5171da`-`0x517216`); those legs are not built for a chain's end. A token without a hop reads its own push, not these.
+pub(super) fn feed_chain_units(
+    script: Option<NonSendMut<UiScript>>,
+    tables: super::SnapshotTables,
+    // The object manager's lookup (`0x468460`) on its own, not through [`super::UnitTokens`],
+    // whose pet-bar read would order this feed against the pet feed it does not depend on.
+    index: Option<Res<crate::net::GuidIndex>>,
+    stores: Query<&ObjectStore>,
+    names: Res<NameCache>,
+    commands: Res<NetCommands>,
+    factions: Option<Res<Factions>>,
+    reputations: Res<Reputations>,
+    group: Res<crate::ui_party::GroupState>,
+    self_q: Query<&ObjectStore, With<SelfPlayer>>,
+    changed: Query<(), (Changed<ObjectStore>, Without<crate::items::ItemObject>)>,
+    mut removed: RemovedComponents<Guid>,
+    mut memo: Local<VmMemo<ChainMemo>>,
+) {
+    let Some(mut script) = script else {
+        return;
+    };
+    let (memo, vm_reset) = memo.get_reset(&script);
+    let ends = script.chain_end_guids();
+
+    // The gate: every input read below, despawns included (invisible to `Changed`), and the
+    // guids themselves, which move with the selection, the hover, the group and every held
+    // unit's target.
+    let names_moved = memo.names_generation.moved(names.generation());
+    let ends_moved = memo.ends != ends;
+    let stores_changed = !changed.is_empty();
+    let stores_removed = !removed.is_empty();
+    let group_changed = group.is_changed();
+    let reps_changed = reputations.is_changed();
+    let factions_changed = factions.as_ref().is_some_and(|r| r.is_changed());
+    removed.clear();
+    let gate = gate::Gate::new(
+        vm_reset
+            || names_moved
+            || ends_moved
+            || stores_changed
+            || stores_removed
+            || group_changed
+            || reps_changed
+            || factions_changed,
+    );
+    if gate.skip() {
+        return;
+    }
+
+    let held = HeldUnits {
+        names: &names,
+        commands: &commands,
+        factions: factions.as_deref(),
+        reputations: &reputations,
+        group: &group,
+        self_store: self_q.iter().next(),
+        classes: tables.classes(),
+        types: tables.types(&names),
+    };
+    let built: HashMap<u64, UnitState> = ends
+        .iter()
+        .filter_map(|&guid| {
+            let entity = *index.as_ref()?.0.get(&guid)?;
+            let store = stores.get(entity).ok().filter(|s| s.is_unit())?;
+            Some((guid, held.state(store, guid)))
+        })
+        .collect();
+
+    memo.pushed.retain(|guid, _| {
+        let keep = built.contains_key(guid);
+        if !keep {
+            gate.audit("feed_chain_units", "a chain end's clear");
+            script.set_unit_by_guid(*guid, None);
+        }
+        keep
+    });
+    for (guid, state) in built {
+        if memo.pushed.get(&guid) != Some(&state) {
+            gate.audit("feed_chain_units", "a chain end's snapshot");
+            script.set_unit_by_guid(guid, Some(state.clone()));
+            memo.pushed.insert(guid, state);
+        }
+    }
+    memo.ends = ends;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::names::CreatureRecord;
+    use crate::net::GuidIndex;
+    use crate::target::Selection;
+    use crate::ui_party::{GroupState, GROUPTYPE_RAID};
+    use benilla_protocol::messages::{member_status, GroupMemberEntry};
+    use benilla_protocol::ObjectFields;
+
+    const ME: u64 = 0x10;
+    /// party1 and raid2, party2 and raid3, party3 and raid4.
+    const A: u64 = 0x1001;
+    const B: u64 = 0x1002;
+    const C: u64 = 0x1003;
+    /// Our target, which targets party1.
+    const MOB: u64 = 0xF130_0000_4500_0001;
+    /// What party1 targets.
+    const BOSS: u64 = 0xF130_0000_4600_0001;
+    /// What raid3 targets, and a unit that targets nobody.
+    const ADD: u64 = 0xF130_0000_4700_0001;
+    const MY_PET: u64 = 0xF140_0000_0000_0010;
+    /// What our pet targets.
+    const FOE: u64 = 0xF130_0000_4800_0001;
+    /// What `BOSS` targets, and nobody holds.
+    const GONE: u64 = 0xF130_0000_4900_0001;
+    /// Held from the start, and named by no token until it is selected.
+    const LONER: u64 = 0xF130_0000_4A00_0001;
+    /// What `LONER` targets.
+    const EXTRA: u64 = 0xF130_0000_4B00_0001;
+
+    /// `OBJECT_FIELD_TYPE`, `UNIT_FIELD_TARGET`, `_HEALTH`, `_MAXHEALTH` and `_LEVEL`.
+    const OBJECT_TYPE: u16 = 2;
+    const TARGET: u16 = 16;
+    const HEALTH: u16 = 22;
+    const MAXHEALTH: u16 = 28;
+    const LEVEL: u16 = 34;
+
+    fn unit(kind: u32, target: u64, health: u32) -> ObjectStore {
+        ObjectStore(ObjectFields::from_pairs(&[
+            (OBJECT_TYPE, kind),
+            (TARGET, target as u32),
+            (TARGET + 1, (target >> 32) as u32),
+            (HEALTH, health),
+            (MAXHEALTH, 5000),
+            (LEVEL, 60),
+        ]))
+    }
+
+    fn player(target: u64, health: u32) -> ObjectStore {
+        unit(0x19, target, health)
+    }
+
+    fn creature(target: u64, health: u32) -> ObjectStore {
+        unit(0x09, target, health)
+    }
+
+    fn spawn(app: &mut App, guid: u64, store: ObjectStore) -> Entity {
+        let e = app.world_mut().spawn((Guid(guid), store)).id();
+        app.world_mut()
+            .resource_mut::<GuidIndex>()
+            .0
+            .insert(guid, e);
+        e
+    }
+
+    fn group_entry(guid: u64) -> GroupMemberEntry {
+        GroupMemberEntry {
+            name: format!("M{guid:x}"),
+            guid,
+            status: member_status::ONLINE,
+            flags: 0,
+        }
+    }
+
+    /// The world: we target `MOB`, which targets party1 (`A`), who targets `BOSS`, which targets
+    /// `GONE`; raid3 (`B`) targets `ADD`, our pet `FOE`, and `C` nobody. `LONER` is held and
+    /// targets `EXTRA`. The group is a raid of us, `A`, `B` and `C`, all in our subgroup, so the
+    /// three are also party slots 1 to 3. The aura feed, whose resolver inputs the chain feed
+    /// reads, and the chain feed run.
+    fn app() -> App {
+        let (tx, _rx) = crossbeam_channel::unbounded();
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, bevy::state::app::StatesPlugin))
+            .insert_state(crate::char_select::ClientState::InWorld)
+            .init_resource::<Selection>()
+            .init_resource::<GuidIndex>()
+            .init_resource::<Reputations>()
+            .init_resource::<NameCache>()
+            .init_resource::<GroupState>()
+            .insert_resource(NetCommands(tx))
+            .add_plugins(crate::ui_aura::UiAuraPlugin)
+            .add_systems(Update, feed_chain_units.after(crate::ui_aura::AuraEvents));
+        app.insert_non_send_resource(UiScript::new().unwrap());
+        {
+            let mut names = app.world_mut().resource_mut::<NameCache>();
+            for (guid, name) in [(ME, "Meg"), (A, "Alia"), (B, "Bram"), (C, "Cole")] {
+                names.insert_player(guid, name.to_string(), None);
+            }
+            for (guid, name) in [
+                (MOB, "Mob"),
+                (BOSS, "Boss"),
+                (ADD, "Add"),
+                (FOE, "Foe"),
+                (LONER, "Loner"),
+                (EXTRA, "Extra"),
+            ] {
+                names.insert_creature(
+                    benilla_protocol::guid::entry(guid).unwrap(),
+                    Some(CreatureRecord {
+                        name: name.to_string(),
+                        subname: None,
+                        creature_type: 0,
+                        pet_family: 0,
+                        rank: 0,
+                        type_flags: 0,
+                        civilian: false,
+                        racial_leader: false,
+                        display_id: 0,
+                    }),
+                );
+            }
+        }
+        let me = spawn(&mut app, ME, player(MOB, 900));
+        app.world_mut().entity_mut(me).insert(SelfPlayer);
+        spawn(&mut app, A, player(BOSS, 800));
+        spawn(&mut app, B, player(ADD, 700));
+        spawn(&mut app, C, player(0, 600));
+        let mob = spawn(&mut app, MOB, creature(A, 5000));
+        spawn(&mut app, BOSS, creature(GONE, 4000));
+        spawn(&mut app, ADD, creature(0, 250));
+        spawn(&mut app, MY_PET, creature(FOE, 300));
+        spawn(&mut app, FOE, creature(0, 120));
+        spawn(&mut app, LONER, creature(EXTRA, 90));
+        spawn(&mut app, EXTRA, creature(0, 45));
+        app.world_mut().resource_mut::<GroupState>().apply_list(
+            GROUPTYPE_RAID,
+            0,
+            vec![group_entry(A), group_entry(B), group_entry(C)],
+            ME,
+            None,
+            Some(ME),
+        );
+        app.insert_resource(Selection {
+            target: Some(mob),
+            guid: Some(MOB),
+            ..Default::default()
+        });
+        let mut bar = crate::ui_pet::PetBar::default();
+        bar.spells.pet_guid = MY_PET;
+        app.insert_resource(bar);
+        app
+    }
+
+    fn script(app: &App) -> &UiScript {
+        app.world().non_send_resource::<UiScript>()
+    }
+
+    fn name(app: &App, token: &str) -> Option<String> {
+        script(app)
+            .eval(&format!("return UnitName({token:?})"))
+            .unwrap()
+    }
+
+    fn number(app: &App, call: &str, token: &str) -> i64 {
+        script(app)
+            .eval(&format!("return {call}({token:?})"))
+            .unwrap()
+    }
+
+    fn health(app: &App, token: &str) -> i64 {
+        number(app, "UnitHealth", token)
+    }
+
+    /// Whether the Lua expression holds.
+    fn holds(app: &App, expr: &str) -> bool {
+        script(app).eval(&format!("return {expr}")).unwrap()
+    }
+
+    /// The getters answer for a chain through the feeds that run in the client: the aura feed's
+    /// resolver inputs name the guid, and this feed's snapshot of it answers, so `party1target`,
+    /// `raid3target` and `pettarget` read the unit at the end of the chain and any break in the
+    /// chain reads nobody. No token names `ADD` or `FOE` but a chain.
+    #[test]
+    fn the_getters_answer_for_the_unit_a_chain_ends_on() {
+        let mut app = app();
+        app.update();
+        for (token, want, hp) in [
+            ("party1target", "Boss", 4000),
+            ("raid2target", "Boss", 4000),
+            ("PARTY1TARGET", "Boss", 4000),
+            ("raid3target", "Add", 250),
+            ("pettarget", "Foe", 120),
+            ("playertarget", "Mob", 5000),
+            ("targettarget", "Alia", 800),
+            ("targettargettarget", "Boss", 4000),
+        ] {
+            assert_eq!(
+                name(&app, token).as_deref(),
+                Some(want),
+                "UnitName({token})"
+            );
+            assert_eq!(health(&app, token), hp, "UnitHealth({token})");
+            assert_eq!(number(&app, "UnitHealthMax", token), 5000, "{token}");
+            assert_eq!(number(&app, "UnitLevel", token), 60, "{token}");
+            assert!(
+                holds(&app, &format!("UnitExists({token:?}) == 1")),
+                "UnitExists({token})"
+            );
+        }
+        assert!(holds(
+            &app,
+            r#"UnitIsUnit("raid2target", "party1target") == 1"#
+        ));
+        assert!(holds(
+            &app,
+            r#"UnitIsUnit("raid2target", "raid3target") == nil"#
+        ));
+        // `BOSS` targets `GONE`, which nobody holds: 0 and nil, and a name the unbuilt name-cache leg
+        // would give (`0x5171eb`), so it is not asserted.
+        assert_eq!(health(&app, "party1targettarget"), 0);
+        assert!(holds(&app, r#"UnitExists("party1targettarget") == nil"#));
+        // `C` targets nobody; party4 is nobody.
+        for token in ["raid4target", "party4target", "raid9target"] {
+            assert_eq!(name(&app, token), None, "UnitName({token})");
+            assert_eq!(health(&app, token), 0, "UnitHealth({token})");
+            assert!(
+                holds(&app, &format!("UnitExists({token:?}) == nil")),
+                "UnitExists({token})"
+            );
+        }
+        // The plain tokens read their own push and nothing else: this world pushes none, so
+        // `raid2` answers nil though a chain ends on it, and a token pushed by name wins.
+        assert_eq!(name(&app, "raid2"), None);
+        assert_eq!(name(&app, "target"), None);
+        app.world_mut()
+            .non_send_resource_mut::<UiScript>()
+            .set_unit(
+                "target",
+                Some(UnitState {
+                    exists: true,
+                    name: Some("Pushed".into()),
+                    ..Default::default()
+                }),
+            );
+        assert_eq!(name(&app, "target").as_deref(), Some("Pushed"));
+    }
+
+    /// Each input of the feed's gate reaches the getters: a descriptor that moves, a chain that
+    /// gains an end with no descriptor moving, and a unit that leaves the object manager.
+    #[test]
+    fn the_feed_follows_the_world() {
+        let mut app = app();
+        app.update();
+        assert_eq!(health(&app, "party1target"), 4000);
+
+        // A descriptor moves.
+        let boss = app.world().resource::<GuidIndex>().0[&BOSS];
+        app.world_mut()
+            .entity_mut(boss)
+            .insert(creature(GONE, 1000));
+        app.update();
+        assert_eq!(health(&app, "party1target"), 1000);
+
+        // Selecting `LONER` gives `targettarget` a unit that no chain ended on, and moves no
+        // descriptor and no name.
+        assert_eq!(name(&app, "targettarget").as_deref(), Some("Alia"));
+        let loner = app.world().resource::<GuidIndex>().0[&LONER];
+        app.insert_resource(Selection {
+            target: Some(loner),
+            guid: Some(LONER),
+            ..Default::default()
+        });
+        app.update();
+        assert_eq!(name(&app, "targettarget").as_deref(), Some("Extra"));
+        assert_eq!(health(&app, "targettarget"), 45);
+
+        // `ADD` leaves the object manager, and `raid3target` with it. The chain is still
+        // `raid3`'s target, so the resolver's guid holds; the snapshot is what goes.
+        assert_eq!(name(&app, "raid3target").as_deref(), Some("Add"));
+        let add = app.world_mut().resource_mut::<GuidIndex>().0.remove(&ADD);
+        app.world_mut().despawn(add.unwrap());
+        app.update();
+        // The name would be the name cache's (`0x5171eb`), which a chain's end does not read yet.
+        assert_eq!(health(&app, "raid3target"), 0);
+    }
+
+    /// The chain feed reads the resolver inputs the aura feed pushes in the same frame, so the
+    /// declared order puts the feed after it: read off the schedule graph.
+    #[test]
+    fn the_chain_feed_runs_after_the_aura_feed_it_reads() {
+        use crate::game_plugins::schedule_tests::{census, headless_client, SyncPoints};
+
+        let mut app = headless_client();
+        let c = census(&mut app, Update, SyncPoints::Declared);
+        if !c.systems.values().any(|s| s.name.contains("benilla_app::")) {
+            eprintln!("skipped: this build carries no type names");
+            return;
+        }
+        let one = |suffix: &str| {
+            let mut hits = c.systems.iter().filter(|(_, s)| s.name.ends_with(suffix));
+            match (hits.next(), hits.next()) {
+                (Some((k, _)), None) => *k,
+                _ => panic!("exactly one system named `…{suffix}` in Update"),
+            }
+        };
+        let aura = one("::ui_aura::feed_auras");
+        for feed in [
+            "::ui_unit::held::feed_chain_units",
+            "::targeting::feed_targeting_to_vm",
+        ] {
+            assert!(
+                c.dependencies.contains(&(aura, one(feed))),
+                "{feed} is declared after feed_auras"
+            );
+        }
+    }
+}
diff --git a/crates/benilla-app/src/ui_world_map.rs b/crates/benilla-app/src/ui_world_map.rs
index 5271b324..e2ff9ce4 100644
--- a/crates/benilla-app/src/ui_world_map.rs
+++ b/crates/benilla-app/src/ui_world_map.rs
@@ -29,7 +29,7 @@ use benilla_world::world_map::CurrentMap;
 
 /// The app's copy of the pushed catalog's projection data (rects, world-sheet constants), in the
 /// engine's order: the indices must agree.
-#[derive(Resource)]
+#[derive(Resource, Clone)]
 pub(crate) struct WorldMapUiData {
     continents: Vec<ContinentEntry>,
     /// The instance maps no continent owns, `0x4a5d00`'s third array in `WorldMapArea.dbc` file
@@ -37,6 +37,7 @@ pub(crate) struct WorldMapUiData {
     direct: Vec<DirectAreaEntry>,
 }
 
+#[derive(Clone)]
 pub(crate) struct ContinentEntry {
     map_id: u32,
     proj: Option<WorldProj>,
@@ -44,6 +45,7 @@ pub(crate) struct ContinentEntry {
     zones: Vec<ZoneEntry>,
 }
 
+#[derive(Clone)]
 struct ZoneEntry {
     area_id: u32,
     rect: ZoneRect,
@@ -51,6 +53,7 @@ struct ZoneEntry {
 
 /// One instance map, selected directly rather than through a continent and zone; 1.12 ships
 /// three, the battlegrounds.
+#[derive(Clone)]
 struct DirectAreaEntry {
     /// The `WorldMapArea` row id, which the third selection cell `[0x845074]` holds (`0x4a6717`);
     /// never a list index.
@@ -527,6 +530,14 @@ pub(crate) fn project_on_displayed(
     }
 }
 
+/// Hand the engine `GetWorldLocMapPosition`'s projection (`0x4a7360`) over a copy of the catalog.
+fn install_world_loc_projector(script: &mut UiScript, data: &WorldMapUiData) {
+    let copy = data.clone();
+    script.set_world_loc_projector(Box::new(move |selection, map, x, y| {
+        project_on_displayed(&copy, selection, map, x, y)
+    }));
+}
+
 /// [`feed_world_map`]'s memos under one [`crate::ui_script::VmMemo`], so a new VM resets them all.
 #[derive(Default)]
 struct FeedMemos {
@@ -534,6 +545,8 @@ struct FeedMemos {
     landmarks: Option<LandmarkKey>,
     /// The world-enter sync has run: the reference's `old == 0` gate.
     map_synced: bool,
+    /// `GetWorldLocMapPosition`'s projection is installed over the current catalog.
+    projector: bool,
 }
 
 fn feed_world_map(
@@ -593,6 +606,16 @@ fn feed_world_map(
         }
     }
 
+    // `GetWorldLocMapPosition` projects synchronously with the engine's own selection, so the
+    // engine holds the projection over its own copy of the catalog.
+    {
+        let memo = memo.get(&script);
+        if !memo.projector || data.is_changed() {
+            memo.projector = true;
+            install_world_loc_projector(&mut script, &data);
+        }
+    }
+
     let selection = script.world_map_selection();
     let project =
         |pos_map: u32, px: f32, py: f32| project_on_displayed(&data, selection, pos_map, px, py);
@@ -778,6 +801,7 @@ fn dev_map_jump(
         kind: crate::net::ChatKind::Say,
         target: None,
         text,
+        language: None,
     });
 }
 
@@ -1163,6 +1187,29 @@ mod player_zone_tests {
         );
     }
 
+    /// The engine's `GetWorldLocMapPosition` answers what the feed's own projection answers, on
+    /// the engine's selection.
+    #[test]
+    fn world_loc_map_position_projects_on_the_displayed_map() {
+        let mut script = UiScript::new().unwrap();
+        install_world_loc_projector(&mut script, &data());
+        script.sync_world_map_to_player_zone(0, 0, Some(443));
+        assert_eq!(script.world_map_selection(), (0, 0, Some(443)));
+        assert_eq!(
+            script
+                .eval::<(f64, f64)>("return GetWorldLocMapPosition(489, 0, 0)")
+                .unwrap(),
+            (0.5, 0.5)
+        );
+        assert_eq!(
+            script
+                .eval::<(f64, f64)>("return GetWorldLocMapPosition(0, 0, 0)")
+                .unwrap(),
+            (0.0, 0.0),
+            "a position on another map is off this one"
+        );
+    }
+
     #[test]
     fn a_battleground_takes_the_orphan_leg_and_projects_on_its_own_rect() {
         let d = data();
diff --git a/crates/benilla-app/src/video.rs b/crates/benilla-app/src/video.rs
index fc7ecdd3..49cbe549 100644
--- a/crates/benilla-app/src/video.rs
+++ b/crates/benilla-app/src/video.rs
@@ -86,11 +86,20 @@ pub(crate) fn parse_resolution(value: &str) -> Option<UVec2> {
     (size.x > 0 && size.y > 0).then_some(size)
 }
 
-/// The `WindowMode` a display mode means, on a given monitor.
-pub(crate) fn window_mode(display: DisplayMode, monitor: MonitorSelection) -> WindowMode {
-    match display {
-        DisplayMode::Fullscreen => WindowMode::BorderlessFullscreen(monitor),
-        DisplayMode::Windowed => WindowMode::Windowed,
+/// The `WindowMode` a display mode means, on a given monitor. `maximize` is `gxMaximize`, which
+/// counts only while windowed: the reference's window rebuild (`0x58cf10`) gives a windowed,
+/// maximized window the popup style `0x90000000`, no caption and no border, sized to the screen
+/// (`GetSystemMetrics` 0 and 1) at its origin, which is a borderless window over the monitor.
+pub(crate) fn window_mode(
+    display: DisplayMode,
+    maximize: bool,
+    monitor: MonitorSelection,
+) -> WindowMode {
+    match (display, maximize) {
+        (DisplayMode::Fullscreen, _) | (DisplayMode::Windowed, true) => {
+            WindowMode::BorderlessFullscreen(monitor)
+        }
+        (DisplayMode::Windowed, false) => WindowMode::Windowed,
     }
 }
 
@@ -98,14 +107,17 @@ pub(crate) fn window_mode(display: DisplayMode, monitor: MonitorSelection) -> Wi
 /// does not flash windowed until `Startup`. `MonitorSelection::Primary`, since `Current` has no
 /// answer before the window exists (`bevy_winit::select_monitor`).
 pub(crate) fn boot_window_mode() -> WindowMode {
-    let display = if windowed_env() {
-        DisplayMode::Windowed
+    let flag = |name| crate::cvars::boot_cvar(name).and_then(|v| v.parse::<f32>().ok());
+    // A run that sizes its own window owns both rows for the session.
+    let (display, maximize) = if windowed_env() {
+        (DisplayMode::Windowed, false)
     } else {
-        crate::cvars::boot_cvar("gxWindow")
-            .and_then(|v| v.parse::<f32>().ok())
-            .map_or_else(DisplayMode::default, display_from_flag)
+        (
+            flag("gxWindow").map_or_else(DisplayMode::default, display_from_flag),
+            flag("gxMaximize").is_some_and(|v| v != 0.0),
+        )
     };
-    window_mode(display, MonitorSelection::Primary)
+    window_mode(display, maximize, MonitorSelection::Primary)
 }
 
 /// The windowed size the primary window is born at, `gxResolution`, read as [`boot_window_mode`]
@@ -342,6 +354,8 @@ pub(crate) struct VideoConfig {
     /// belongs to authored wall torches too.
     pub(crate) fire_flicker: f32,
     pub(crate) display: DisplayMode,
+    /// `gxMaximize`: a windowed window fills the monitor, borderless ([`window_mode`]).
+    pub(crate) maximize: bool,
     /// The windowed size, `gxResolution`. Kept while fullscreen so leaving it can restore it.
     pub(crate) windowed: UVec2,
 }
@@ -424,6 +438,7 @@ impl Default for VideoConfig {
             } else {
                 DisplayMode::default()
             },
+            maximize: false,
             windowed: DEFAULT_WINDOWED,
         }
     }
@@ -452,6 +467,10 @@ pub(crate) fn on_cvar(
     mut tex_filter: ResMut<benilla_assets::TexFilterSetting>,
     mut clutter: ResMut<benilla_world::clutter::ClutterConfig>,
     mut weather: ResMut<benilla_world::weather::WeatherState>,
+    particles: Option<ResMut<benilla_world::particles::ParticleTuning>>,
+    mut spell_effect_level: ResMut<SpellEffectLevel>,
+    mut ffx: ResMut<benilla_world::ffx_glow::FfxSwitches>,
+    mut console: Option<ResMut<crate::console::ConsoleEcho>>,
     mut cvars: ResMut<crate::cvars::Cvars>,
 ) {
     use benilla_world::view::{FARCLIP_RANGE, MSAA_RANGE};
@@ -603,6 +622,19 @@ pub(crate) fn on_cvar(
         // over-drive for judging the shape. Clamped at the edge like every knob here.
         "fireflicker" => cfg.fire_flicker = v.clamp(0.0, 2.0),
         // ── end MONKEY (lighting) ─────────────────────────────────────────────────────────────
+        // Latched like `gxWindow`: the commit is `RestartGx`, which rebuilds the window
+        // (`0x58cf10` reads `+0x09`); `apply_window_mode` is that rebuild.
+        "gxmaximize" => cfg.maximize = ev.flag(),
+        // The FFX pass's three switches, read every frame by the reference (`0x6cd8a6`, `0x6cc5a8`,
+        // `0x6cdf10`), so a write shows on the next frame.
+        "ffx" | "ffxglow" | "ffxdeath" => {
+            match ev.key().as_str() {
+                "ffx" => ffx.master = ev.flag(),
+                "ffxglow" => ffx.glow = ev.flag(),
+                _ => ffx.death = ev.flag(),
+            }
+            info!("video: full-screen effects {:?}", *ffx);
+        }
         "farclip" => view.farclip = v.clamp(*FARCLIP_RANGE.start(), *FARCLIP_RANGE.end()),
         // Clamped, where the reference refuses an out-of-range write and keeps the value
         // (`0x688d90` echoes "NearClip must be in range 0.01 - 0.33" and returns 0).
@@ -636,6 +668,12 @@ pub(crate) fn on_cvar(
                 benilla_ui::script::CVAR_FRILL_DENSITY,
                 &clutter.frill_density().to_string(),
             );
+            // The stop's other half, as `SetWorldDetail` writes it, so a stop set as a CVar keeps
+            // `SmallCull` in step too.
+            cvars.mirror(
+                benilla_ui::script::CVAR_SMALL_CULL,
+                &benilla_ui::script::small_cull_text(v.clamp(0.0, 2.0) as usize),
+            );
         }
         // The same knob in the reference's cells per chunk, clamped to `[1, 256]`
         // (`ClutterConfig::set_frill_density`); the loaded tiles re-scatter off the change.
@@ -650,10 +688,48 @@ pub(crate) fn on_cvar(
         // quality cells {0.1, 0.33, 0.66, 1.0} at `[0x8680ec]`. Its off-grid handling is
         // untraced; this clamps.
         "weatherdensity" => weather.weather_density = v.trunc().clamp(0.0, 3.0) as u8,
+        // Spell Detail (`0x689510`): `SStrToInt`, clamped to [0, 2] in the handler's own copy,
+        // echoed, then the emission scalar 0.33, 0.66 or 1.0 through `0x7adfb0`, shared with
+        // `particleDensity`. The reference runs it on every write, an unchanged one included; an
+        // observer fires only on a change.
+        "spelleffectlevel" => {
+            spell_effect_level.0 = benilla_ui::script::sstr_to_int(&ev.new);
+            let level = spell_effect_level.0.clamp(0, 2);
+            if let Some(console) = console.as_mut() {
+                console.print(format!("Spell effect level set to {level}."));
+            }
+            if let Some(mut particles) = particles {
+                particles.set_density(spell_effect_scale(level));
+            }
+        }
         _ => {}
     }
 }
 
+/// The `spellEffectLevel` record's integer (`rec+0x28`, `SStrToInt` of the value), unclamped: what
+/// the dynamic-object shard emitter reads at spawn (`0x6eb967`), where the handler clamps only its
+/// own copy.
+#[derive(Resource)]
+pub(crate) struct SpellEffectLevel(pub(crate) i32);
+
+impl Default for SpellEffectLevel {
+    /// The registered "2".
+    fn default() -> Self {
+        Self(2)
+    }
+}
+
+/// The `spellEffectLevel` emission factor, 0.33, 0.66 or 1.0: the handler's f32 immediates
+/// (`0x68956a` `0x3ea8f5c3`, `0x689588` `0x3f28f5c3`, `0x689561` `0x3f800000`) and the shard
+/// emitter's `.rdata` pair (`0x808300`, `0x81199c`) are the same three. Any level but 0 or 1 is 1.0.
+pub(crate) fn spell_effect_scale(level: i32) -> f32 {
+    match level {
+        0 => 0.33,
+        1 => 0.66,
+        _ => 1.0,
+    }
+}
+
 /// `/console detailDoodadAlpha [0..255]`, the reference's console command (`0x6739a0`, registered
 /// by `0x63f9e0` as a command, not a CVar, so it never persists): the ground-clutter cutout that
 /// `texel.a x distance_ramp` is tested against, so at the default 128 grass ends ~61 yd out of
@@ -683,6 +759,7 @@ fn detail_doodad_alpha(world: &mut World, args: &str) -> Vec<String> {
 impl Plugin for VideoPlugin {
     fn build(&self, app: &mut App) {
         use crate::console::ConsoleCommandApp;
+        app.init_resource::<SpellEffectLevel>();
         app.add_observer(on_cvar);
         app.console_command(
             "detailDoodadAlpha",
@@ -970,7 +1047,7 @@ fn apply_window_mode(
     let Ok(mut window) = windows.single_mut() else {
         return;
     };
-    let want = window_mode(cfg.display, MonitorSelection::Current);
+    let want = window_mode(cfg.display, cfg.maximize, MonitorSelection::Current);
     let already = matches!(
         (&window.mode, &want),
         (WindowMode::Windowed, WindowMode::Windowed)
@@ -985,13 +1062,21 @@ fn apply_window_mode(
     // Leaving fullscreen hands the size back: entering it overwrote `window.resolution` with the
     // monitor's (`bevy_window`'s documented behaviour). Both writes land in one frame, as
     // `bevy_winit::changed_windows` applies `mode` before `resolution`.
-    if cfg.display == DisplayMode::Windowed {
+    if want == WindowMode::Windowed {
         window
             .resolution
             .set(cfg.windowed.x as f32, cfg.windowed.y as f32);
     }
     window.mode = want;
-    info!("video: display mode {:?} ({want:?})", cfg.display);
+    info!(
+        "video: display mode {:?}{} ({want:?})",
+        cfg.display,
+        if cfg.maximize && cfg.display == DisplayMode::Windowed {
+            ", maximized"
+        } else {
+            ""
+        }
+    );
 }
 
 #[cfg(test)]
@@ -1017,11 +1102,11 @@ mod tests {
     fn the_default_is_borderless_fullscreen_not_exclusive() {
         assert_eq!(DisplayMode::default(), DisplayMode::Fullscreen);
         assert!(matches!(
-            window_mode(DisplayMode::Fullscreen, MonitorSelection::Primary),
+            window_mode(DisplayMode::Fullscreen, false, MonitorSelection::Primary),
             WindowMode::BorderlessFullscreen(_)
         ));
         assert_eq!(
-            window_mode(DisplayMode::Windowed, MonitorSelection::Primary),
+            window_mode(DisplayMode::Windowed, false, MonitorSelection::Primary),
             WindowMode::Windowed
         );
     }
@@ -1044,6 +1129,7 @@ mod tests {
             character_shadows: false,
             shadow_distance: 80.0,
             display: DisplayMode::Fullscreen,
+            maximize: false,
             windowed: UVec2::new(1024, 768),
             // MONKEY (review fixes): this window test inherits unrelated lighting defaults.
             ..Default::default()
@@ -1060,7 +1146,7 @@ mod tests {
             .entity_mut(win)
             .get_mut::<Window>()
             .unwrap()
-            .mode = window_mode(DisplayMode::Fullscreen, MonitorSelection::Primary);
+            .mode = window_mode(DisplayMode::Fullscreen, false, MonitorSelection::Primary);
 
         app.update();
         assert!(
@@ -1097,6 +1183,75 @@ mod tests {
         ));
     }
 
+    /// `gxMaximize` counts only while windowed, and there it is the reference's popup over the
+    /// whole screen (`0x58cf10`: style `0x90000000`, `GetSystemMetrics` 0 and 1).
+    #[test]
+    fn a_maximized_window_is_borderless_over_the_monitor() {
+        let m = MonitorSelection::Current;
+        assert_eq!(
+            window_mode(DisplayMode::Windowed, true, m),
+            WindowMode::BorderlessFullscreen(m)
+        );
+        assert_eq!(
+            window_mode(DisplayMode::Windowed, false, m),
+            WindowMode::Windowed
+        );
+        assert_eq!(
+            window_mode(DisplayMode::Fullscreen, true, m),
+            WindowMode::BorderlessFullscreen(m),
+            "fullscreen ignores it"
+        );
+    }
+
+    /// The `RestartGx` rebuild applies a committed `gxMaximize`, and un-maximizing hands the
+    /// windowed size back.
+    #[test]
+    fn the_restart_rebuild_applies_a_committed_maximize() {
+        let mut app = App::new();
+        app.insert_resource(VideoConfig {
+            vsync: true,
+            display: DisplayMode::Windowed,
+            maximize: false,
+            windowed: UVec2::new(1024, 768),
+            // MONKEY (merge): this window test inherits unrelated lighting defaults.
+            ..Default::default()
+        })
+        .init_resource::<GxRestarts>()
+        .add_systems(Update, apply_window_mode);
+        let win = app
+            .world_mut()
+            .spawn((Window::default(), PrimaryWindow))
+            .id();
+        app.update();
+        assert_eq!(
+            app.world().entity(win).get::<Window>().unwrap().mode,
+            WindowMode::Windowed
+        );
+        // The commit's observer write, then the restart the stock Okay asks for.
+        app.world_mut().resource_mut::<VideoConfig>().maximize = true;
+        app.world_mut().resource_mut::<GxRestarts>().0 += 1;
+        app.update();
+        assert!(matches!(
+            app.world().entity(win).get::<Window>().unwrap().mode,
+            WindowMode::BorderlessFullscreen(MonitorSelection::Current)
+        ));
+        app.world_mut()
+            .entity_mut(win)
+            .get_mut::<Window>()
+            .unwrap()
+            .resolution
+            .set(2560.0, 1440.0);
+        app.world_mut().resource_mut::<VideoConfig>().maximize = false;
+        app.world_mut().resource_mut::<GxRestarts>().0 += 1;
+        app.update();
+        let w = app.world().entity(win).get::<Window>().unwrap();
+        assert_eq!(w.mode, WindowMode::Windowed);
+        assert_eq!(
+            (w.resolution.width(), w.resolution.height()),
+            (1024.0, 768.0)
+        );
+    }
+
     #[test]
     fn gxresolution_parses_the_reference_spelling() {
         assert_eq!(parse_resolution("1280x800"), Some(UVec2::new(1280, 800)));
diff --git a/crates/benilla-app/src/vplates.rs b/crates/benilla-app/src/vplates.rs
index 7bd4cabd..7608acca 100644
--- a/crates/benilla-app/src/vplates.rs
+++ b/crates/benilla-app/src/vplates.rs
@@ -23,7 +23,9 @@ use bevy::ecs::system::SystemParam;
 use bevy::prelude::*;
 
 use benilla_protocol::EntityKind;
-use benilla_ui::script::{unit_is_grey, PlateGeometry, PlateState};
+use benilla_ui::script::{
+    unit_is_grey, PlateGeometry, PlateState, PLATE_BIT_ENEMY, PLATE_BIT_FRIEND,
+};
 
 use crate::entities::{overhead_anchor, BoneAttach, OverheadFallback};
 use crate::names::NameCache;
@@ -34,19 +36,30 @@ use benilla_world::view::WorldCamera;
 /// The plate border, sharp-resampled so its 128x32 art stays crisp when magnified.
 pub(crate) mod border;
 
-/// The `[0xc4da34]` master bitmask: bit 0 enemy plates, bit 3 friendly, both clear at boot as in
-/// the reference (`UIOptionsFrame.lua:180-183` sets the saved globals nil). The gate reads this
-/// resource; [`CVAR_ENEMIES`] and [`CVAR_FRIENDS`] persist it. 1.12 registers no nameplate CVar,
-/// so those names are not 1.12's.
-#[derive(Resource, Default, Clone, Copy)]
+/// The two script bits of `[0xc4da34]`, bit `0x1` enemy plates and bit `0x8` friendly: engine
+/// state, written only by the four plate verbs ([`apply_plate_verbs`]) and cleared at every world
+/// entry ([`clear_at_world_entry`]). Nothing persists it: FrameXML replays its own
+/// `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` saved variables through the verbs
+/// (`UIOptionsFrame.lua:768-780`, `UIParent.lua:234`, `:367`).
+#[derive(Resource, Default, Clone, Copy, PartialEq, Eq, Debug)]
 pub(crate) struct VPlateMode {
     pub(crate) enemies: bool,
     pub(crate) friends: bool,
 }
 
-/// The persisted names of the two toggles.
-pub(crate) const CVAR_ENEMIES: &str = benilla_ui::script::CVAR_NAMEPLATE_ENEMIES;
-pub(crate) const CVAR_FRIENDS: &str = benilla_ui::script::CVAR_NAMEPLATE_FRIENDS;
+impl VPlateMode {
+    fn bits(self) -> u8 {
+        let bit = |on: bool, b: u8| if on { b } else { 0 };
+        bit(self.enemies, PLATE_BIT_ENEMY) | bit(self.friends, PLATE_BIT_FRIEND)
+    }
+
+    fn from_bits(bits: u8) -> Self {
+        Self {
+            enemies: bits & PLATE_BIT_ENEMY != 0,
+            friends: bits & PLATE_BIT_FRIEND != 0,
+        }
+    }
+}
 
 /// The units carrying a live plate this frame; the overhead-name driver draws no name for them
 /// (the reference's ShouldShowName).
@@ -176,78 +189,80 @@ pub(crate) fn text_px(h: f32, basis: f32) -> f32 {
     (h * basis).round().min(32.0)
 }
 
-/// Push the mode into FrameXML's `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON`. `UpdateNameplates`
-/// (`UIOptionsFrame.lua:768`) replays these globals into the engine on `VARIABLES_LOADED` and
-/// every `PLAYER_ENTERING_WORLD` (`UIParent.lua:234`, `:367`), so they must match the mode or
-/// the replay turns plates off and overwrites the persisted CVar.
-pub(crate) fn push_plate_globals(script: &benilla_ui::script::UiScript, mode: VPlateMode) {
-    // The number 1 or nil, never 0: a Lua 0 is truthy.
-    let on = |b: bool| b.then_some(1i64);
-    let g = script.lua().globals();
-    if let Err(e) = g
-        .set("NAMEPLATES_ON", on(mode.enemies))
-        .and_then(|()| g.set("FRIENDNAMEPLATES_ON", on(mode.friends)))
-    {
-        warn!("nameplates: FrameXML globals: {e}");
-    }
-}
-
-/// Keep the globals in step with the mode, memoised per VM; the world-entry load seeds them
-/// before `VARIABLES_LOADED`, which no `Update` system can reach.
-fn feed_plate_globals(
+/// Every frame: fold the plate verbs' writes into the bits, in the order the VM made them.
+pub(crate) fn apply_plate_verbs(
     script: Option<NonSendMut<benilla_ui::script::UiScript>>,
-    mode: Res<VPlateMode>,
-    mut told: Local<crate::ui_script::VmMemo<Option<(bool, bool)>>>,
+    mut mode: ResMut<VPlateMode>,
 ) {
-    let Some(script) = script else {
+    let Some(mut script) = script else {
         return;
     };
-    let now = (mode.enemies, mode.friends);
-    let told = told.get(&script);
-    if *told != Some(now) {
-        *told = Some(now);
-        push_plate_globals(&script, *mode);
+    let writes = script.take_nameplate_bit_writes();
+    if writes.is_empty() {
+        return;
+    }
+    let now = VPlateMode::from_bits(writes.apply(mode.bits()));
+    if *mode != now {
+        info!(
+            "nameplates: enemy {}, friendly {}",
+            if now.enemies { "ON" } else { "OFF" },
+            if now.friends { "ON" } else { "OFF" }
+        );
+        *mode = now;
     }
 }
 
-/// The NAMEPLATES, FRIENDNAMEPLATES and ALLNAMEPLATES bindings; ALLNAMEPLATES is 1.12's body,
-/// both on unless both already on. A press also writes the CVar, which persists it.
-///
-/// Deviation: V and Shift-V toggle their own bit independently, where 1.12's bodies
-/// (`Bindings.xml:516-537`) turn the other kind off.
-fn toggle_vplates(
-    binds: Res<crate::bindings::BindingsState>,
-    mut mode: ResMut<VPlateMode>,
-    mut cvars: ResMut<crate::cvars::Cvars>,
+/// The world-entry clear of both script bits (`0x60394b`, `0x603952`, in `0x6033c0`), which the
+/// entry setup `0x401570` runs at `0x401639`, after the UI load at `0x401602` (`InitializeGame`,
+/// whose `UI_Init` fires `VARIABLES_LOADED` at `0x4900b2`): the load's replay is cleared, and
+/// the one at `PLAYER_ENTERING_WORLD` decides. A `ReloadUI()` never reaches it.
+pub(crate) fn clear_at_world_entry(world: &mut World) {
+    if let Some(mut script) = world.get_non_send_resource_mut::<benilla_ui::script::UiScript>() {
+        let _ = script.take_nameplate_bit_writes();
+    }
+    if let Some(mut mode) = world.get_resource_mut::<VPlateMode>() {
+        *mode = VPlateMode::default();
+    }
+}
+
+/// The `config.toml` names benilla once kept the two bits under, with the FrameXML global each
+/// carries over to. 1.12 has no nameplate CVar; the setting is FrameXML's saved variables.
+const LEGACY_CVARS: [(&str, &str); 2] = [
+    ("nameplateShowEnemies", "NAMEPLATES_ON"),
+    ("nameplateShowFriends", "FRIENDNAMEPLATES_ON"),
+];
+
+/// A plate setting still in `config.toml` from before it moved to FrameXML's saved variables:
+/// each global and whether it was on.
+#[derive(Default)]
+pub(crate) struct LegacyPlateSettings(Vec<(&'static str, bool)>);
+
+/// Take the legacy plate settings out of `config.toml`, once: the next save drops them, and from
+/// then on the saved-variables file carries them.
+pub(crate) fn take_legacy_settings(cvars: &mut crate::cvars::Cvars) -> LegacyPlateSettings {
+    LegacyPlateSettings(
+        LEGACY_CVARS
+            .iter()
+            .filter_map(|&(cvar, global)| {
+                let value = cvars.retire_file_entry(cvar)?;
+                Some((global, value.trim() == "1"))
+            })
+            .collect(),
+    )
+}
+
+/// Seat the legacy settings over the saved-variables chunk's values, before `VARIABLES_LOADED`,
+/// as the number 1 or nil (a Lua 0 is truthy). Until now the setting was the CVar, which
+/// outranked the file.
+pub(crate) fn seat_legacy_settings(
+    script: &benilla_ui::script::UiScript,
+    legacy: &LegacyPlateSettings,
 ) {
-    use crate::bindings::cmd;
-    let (was_enemies, was_friends) = (mode.enemies, mode.friends);
-    if binds.fired(cmd::NAMEPLATES) {
-        mode.enemies = !mode.enemies;
-        info!(
-            "nameplates: enemy {}",
-            if mode.enemies { "ON" } else { "OFF" }
-        );
-    }
-    if binds.fired(cmd::FRIEND_NAMEPLATES) {
-        mode.friends = !mode.friends;
-        info!(
-            "nameplates: friendly {}",
-            if mode.friends { "ON" } else { "OFF" }
-        );
-    }
-    if binds.fired(cmd::ALL_NAMEPLATES) {
-        let both = mode.enemies && mode.friends;
-        mode.enemies = !both;
-        mode.friends = !both;
-        info!("nameplates: all {}", if !both { "ON" } else { "OFF" });
-    }
-    let flag = |b: bool| if b { "1" } else { "0" };
-    if mode.enemies != was_enemies {
-        cvars.set(CVAR_ENEMIES, flag(mode.enemies));
-    }
-    if mode.friends != was_friends {
-        cvars.set(CVAR_FRIENDS, flag(mode.friends));
+    let g = script.lua().globals();
+    for &(global, on) in &legacy.0 {
+        if let Err(e) = g.set(global, on.then_some(1i64)) {
+            warn!("nameplates: carrying {global} over: {e}");
+        }
     }
 }
 
@@ -619,18 +634,8 @@ pub(crate) struct VPlateSet;
 /// V-key nameplates: the toggles and the per-frame gate and draw.
 pub(crate) struct VPlatesPlugin;
 
-/// Apply a change to either toggle CVar to the bitmask.
-pub(crate) fn on_cvar(ev: On<crate::cvars::CvarChanged>, mut mode: ResMut<VPlateMode>) {
-    if ev.is(CVAR_ENEMIES) {
-        mode.enemies = ev.flag();
-    } else if ev.is(CVAR_FRIENDS) {
-        mode.friends = ev.flag();
-    }
-}
-
 impl Plugin for VPlatesPlugin {
     fn build(&self, app: &mut App) {
-        app.add_observer(on_cvar);
         app.init_resource::<VPlateMode>()
             .init_resource::<VPlates>()
             .init_resource::<PlateHover>()
@@ -638,7 +643,8 @@ impl Plugin for VPlatesPlugin {
             .add_systems(
                 Update,
                 (
-                    toggle_vplates,
+                    // A drain of the verbs the tick ran (a binding body, `UpdateNameplates`).
+                    apply_plate_verbs.after(crate::ui_script::UiInput),
                     // After the targeting chain, itself after `WorldStage::Input`, so this projects
                     // through this frame's camera; `ui_script::extract::paint_script` runs after
                     // it, so the plates paint the same frame.
@@ -646,11 +652,7 @@ impl Plugin for VPlatesPlugin {
                 )
                     .chain()
                     .in_set(VPlateSet),
-            )
-            // Outside `VPlateSet`, which runs after the targeting chain: it only needs to precede
-            // the script tick, and a frame's lag is harmless since the globals are read only at
-            // world entry.
-            .add_systems(Update, feed_plate_globals.in_set(crate::ui_script::UiFeed));
+            );
     }
 }
 
@@ -711,103 +713,202 @@ mod tests {
         assert_eq!(text_px(NAME_H, 10_000.0), 32.0, "atlas-cell cap, raw law");
     }
 
-    /// Without the CVar write, a key-toggled plate would revert at every launch.
-    #[test]
-    fn the_v_key_mirrors_into_the_cvar_table() {
-        use crate::bindings::{cmd, BindingsState};
-        use crate::cvars::Cvars;
+    /// An app with the drain and a bare VM: the four verbs are all it needs.
+    fn verb_app() -> App {
         let mut app = App::new();
-        app.add_systems(Update, toggle_vplates)
-            .init_resource::<VPlateMode>()
-            .init_resource::<Cvars>()
-            .insert_resource(BindingsState::test_fired(&[cmd::NAMEPLATES]));
-        app.update();
-        assert!(app.world().resource::<VPlateMode>().enemies, "V turns on");
-        let moved = |app: &mut App| {
-            app.world_mut()
-                .resource_mut::<Cvars>()
-                .take_events()
-                .into_iter()
-                .map(|e| (e.name, e.new))
-                .collect::<Vec<_>>()
-        };
-        assert_eq!(
-            moved(&mut app),
-            vec![(CVAR_ENEMIES.to_string(), "1".to_string())],
-            "the write is an accepted move, so the config dirties and the mirror learns it"
-        );
-        assert_eq!(
-            app.world().resource::<Cvars>().get(CVAR_FRIENDS),
-            Some("0"),
-            "untouched"
-        );
-
-        app.world_mut()
-            .insert_resource(BindingsState::test_fired(&[cmd::NAMEPLATES]));
-        app.update();
-        assert!(!app.world().resource::<VPlateMode>().enemies, "V turns off");
-        assert_eq!(
-            moved(&mut app),
-            vec![(CVAR_ENEMIES.to_string(), "0".to_string())]
-        );
-
-        // Shift-V moves only the other bit.
-        app.world_mut()
-            .insert_resource(BindingsState::test_fired(&[cmd::FRIEND_NAMEPLATES]));
-        app.update();
-        assert!(app.world().resource::<VPlateMode>().friends);
-        assert_eq!(
-            moved(&mut app),
-            vec![(CVAR_FRIENDS.to_string(), "1".to_string())]
-        );
-
-        app.world_mut().insert_resource(BindingsState::default());
-        app.update();
-        assert!(moved(&mut app).is_empty());
-    }
-
-    #[test]
-    fn the_plate_globals_follow_the_mode_and_survive_a_rebuilt_vm() {
-        let read = |app: &mut App| {
-            let s = app
-                .world_mut()
-                .non_send_resource_mut::<benilla_ui::script::UiScript>();
-            (
-                s.lua().globals().get::<Option<i64>>("NAMEPLATES_ON").ok(),
-                s.lua()
-                    .globals()
-                    .get::<Option<i64>>("FRIENDNAMEPLATES_ON")
-                    .ok(),
-            )
-        };
-        let mut app = App::new();
-        app.add_systems(Update, feed_plate_globals)
+        app.add_systems(Update, apply_plate_verbs)
             .init_resource::<VPlateMode>()
             .insert_non_send_resource(benilla_ui::script::UiScript::new().unwrap());
+        app
+    }
 
+    fn run(app: &mut App, lua: &str) {
+        app.world()
+            .non_send_resource::<benilla_ui::script::UiScript>()
+            .run(lua)
+            .unwrap();
         app.update();
-        assert_eq!(read(&mut app), (Some(None), Some(None)), "both off ⇒ nil");
+    }
 
-        app.world_mut().resource_mut::<VPlateMode>().enemies = true;
+    fn mode(app: &App) -> (bool, bool) {
+        let m = app.world().resource::<VPlateMode>();
+        (m.enemies, m.friends)
+    }
+
+    fn global(app: &App, name: &str) -> Option<i64> {
+        app.world()
+            .non_send_resource::<benilla_ui::script::UiScript>()
+            .lua()
+            .globals()
+            .get::<Option<i64>>(name)
+            .unwrap()
+    }
+
+    /// Both bits start clear: a fresh 1.12 client draws no plates until something shows them.
+    #[test]
+    fn the_verbs_move_the_bits_in_call_order() {
+        let mut app = verb_app();
         app.update();
+        assert_eq!(mode(&app), (false, false), "boot: both clear");
+        run(&mut app, "ShowNameplates()");
+        assert_eq!(mode(&app), (true, false));
+        run(&mut app, "ShowFriendNameplates() HideNameplates()");
+        assert_eq!(mode(&app), (false, true), "each verb its own bit");
+        run(
+            &mut app,
+            "ShowNameplates() HideNameplates() HideFriendNameplates() ShowFriendNameplates()",
+        );
+        assert_eq!(mode(&app), (false, true), "the last write per bit stands");
+    }
+
+    /// The entry clears the bits after the UI load (`0x401639` after `0x401602`), so the
+    /// `VARIABLES_LOADED` replay does not survive it and `PLAYER_ENTERING_WORLD`'s decides.
+    #[test]
+    fn world_entry_clears_both_bits_and_the_loads_replay_with_them() {
+        let mut app = verb_app();
+        run(&mut app, "ShowNameplates() ShowFriendNameplates()");
+        assert_eq!(mode(&app), (true, true));
+        // The load's replay, not yet drained when the entry clears.
+        app.world()
+            .non_send_resource::<benilla_ui::script::UiScript>()
+            .run("ShowNameplates()")
+            .unwrap();
+        clear_at_world_entry(app.world_mut());
+        app.update();
+        assert_eq!(mode(&app), (false, false), "both clear after the entry");
+        run(&mut app, "ShowFriendNameplates()");
         assert_eq!(
-            read(&mut app),
-            (Some(Some(1)), Some(None)),
-            "the reference's own truthiness: the NUMBER 1, never a truthy `0`"
+            mode(&app),
+            (false, true),
+            "and the next verb moves them again"
+        );
+    }
+
+    /// The V, Shift-V and Ctrl-V commands run the stock bodies (`Bindings.xml:516-550`): V and
+    /// Shift-V each show their own kind and hide the other, and turn their own kind off only
+    /// when it is the one showing; Ctrl-V shows both unless both show. Each flips the verb and
+    /// FrameXML's global together, so the saved variable carries what the key did, and none
+    /// writes a CVar.
+    #[test]
+    fn the_v_keys_run_the_stock_bodies() {
+        benilla_formats::wow_data_or_skip!();
+        let mut app = verb_app();
+        crate::ui_script::load_stock_bindings(
+            &mut app
+                .world_mut()
+                .non_send_resource_mut::<benilla_ui::script::UiScript>(),
+        );
+        let key = |app: &mut App, command: &str| {
+            assert!(app
+                .world()
+                .non_send_resource::<benilla_ui::script::UiScript>()
+                .execute_binding(command, true)
+                .unwrap());
+            app.update();
+        };
+        let state = |app: &App| {
+            (
+                mode(app),
+                global(app, "NAMEPLATES_ON"),
+                global(app, "FRIENDNAMEPLATES_ON"),
+            )
+        };
+
+        key(&mut app, "NAMEPLATES");
+        assert_eq!(state(&app), ((true, false), Some(1), None), "V: enemies on");
+        key(&mut app, "FRIENDNAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((false, true), None, Some(1)),
+            "Shift-V: friends on, enemies off"
+        );
+        key(&mut app, "NAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((true, false), Some(1), None),
+            "V with friends showing: enemies on, friends off"
+        );
+        key(&mut app, "NAMEPLATES");
+        assert_eq!(state(&app), ((false, false), None, None), "V again: off");
+        key(&mut app, "ALLNAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((true, true), Some(1), Some(1)),
+            "Ctrl-V: both on"
+        );
+        key(&mut app, "NAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((true, false), Some(1), None),
+            "V with both on turns friends off"
+        );
+        key(&mut app, "ALLNAMEPLATES");
+        key(&mut app, "FRIENDNAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((false, true), None, Some(1)),
+            "Shift-V with both on turns enemies off"
+        );
+        key(&mut app, "ALLNAMEPLATES");
+        key(&mut app, "ALLNAMEPLATES");
+        assert_eq!(
+            state(&app),
+            ((false, false), None, None),
+            "Ctrl-V with both on: both off"
+        );
+        assert!(
+            app.world_mut()
+                .non_send_resource_mut::<benilla_ui::script::UiScript>()
+                .take_cvar_changes()
+                .is_empty(),
+            "no CVar: nothing reaches config.toml"
+        );
+    }
+
+    /// A player's plate setting from `config.toml` is carried into the saved-variables globals
+    /// once, over what the file said, and leaves `config.toml`.
+    #[test]
+    fn a_legacy_config_setting_carries_over_once() {
+        use crate::cvars::Cvars;
+        let mut cvars = Cvars::with_value("nameplateShowFriends", "1");
+        let legacy = take_legacy_settings(&mut cvars);
+        assert_eq!(legacy.0, vec![("FRIENDNAMEPLATES_ON", true)]);
+        assert!(
+            take_legacy_settings(&mut cvars).0.is_empty(),
+            "taken once: the file no longer holds it"
+        );
+        assert!(
+            !cvars
+                .orphans()
+                .iter()
+                .any(|(k, _)| k == "nameplateShowFriends"),
+            "and the next save drops it"
         );
 
-        // `ReloadUI()`: a fresh VM with the mode unchanged is told again.
-        app.insert_non_send_resource(benilla_ui::script::UiScript::new().unwrap());
+        let s = benilla_ui::script::UiScript::new().unwrap();
+        // The saved-variables chunk said off; the CVar was the store, so it wins.
+        s.run("FRIENDNAMEPLATES_ON = nil NAMEPLATES_ON = 1")
+            .unwrap();
+        seat_legacy_settings(&s, &legacy);
         assert_eq!(
-            read(&mut app),
-            (Some(None), Some(None)),
-            "a fresh VM knows nothing"
+            s.eval::<Option<i64>>("return FRIENDNAMEPLATES_ON").unwrap(),
+            Some(1),
+            "the number 1, never a truthy `0`"
         );
-        app.update();
         assert_eq!(
-            read(&mut app),
-            (Some(Some(1)), Some(None)),
-            "…and is handed the mode again"
+            s.eval::<Option<i64>>("return NAMEPLATES_ON").unwrap(),
+            Some(1),
+            "a global with no legacy entry is left as the file set it"
+        );
+
+        let mut off = Cvars::with_value("NamePlateShowEnemies", "0");
+        let legacy = take_legacy_settings(&mut off);
+        s.run("NAMEPLATES_ON = 1").unwrap();
+        seat_legacy_settings(&s, &legacy);
+        assert_eq!(
+            s.eval::<Option<i64>>("return NAMEPLATES_ON").unwrap(),
+            None,
+            "an entry of 0 is off, whatever its spelling"
         );
     }
 
diff --git a/crates/benilla-app/tests/auction_frame.rs b/crates/benilla-app/tests/auction_frame.rs
index 7198b73c..c99ab5ec 100644
--- a/crates/benilla-app/tests/auction_frame.rs
+++ b/crates/benilla-app/tests/auction_frame.rs
@@ -2,39 +2,39 @@
 //! `AuctionState` and the app's own show and list events, and asserts what it paints and queues.
 
 use benilla_ui::script::{
-    AuctionCategory, AuctionItemRow, AuctionListState, AuctionState, AuctionSubCategory, UiScript,
-    UnitState, BIDDER, LIST, OWNER,
+    AuctionCategory, AuctionHighBidder, AuctionItemRow, AuctionListState, AuctionState,
+    AuctionSubCategory, UiScript, UnitState, BIDDER, LIST, OWNER,
 };
 
 mod common;
 
-/// The auction window's load prefix, in the app's order (`assets/ui/benilla.toc`): UIParent for
+/// The auction window's load prefix, in the production order: UIParent for
 /// `ShowUIPanel`, UIPanelTemplates for the tab kit and widget templates, StaticPopup for the
 /// dialogs, MoneyFrame for `SmallMoneyFrameTemplate` and `MoneyTypeInfo`, MoneyInputFrame for
 /// the price entry, UIDropDownMenu for the rarity menu, ScrollTemplates for the faux lists.
 const FILES: &[&str] = &[
+    "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
+    "Interface\\FrameXML\\BasicControls.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
     // `MoneyInputFrameTemplate` and the `MoneyInputFrame_*` verbs.
     r"Interface\FrameXML\MoneyInputFrame.lua",
     r"Interface\FrameXML\MoneyInputFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
     // UIParent declares `ITEM_QUALITY_COLORS` (`UIParent.lua:65`), which colours each row name.
     "Interface\\FrameXML\\GameTooltip.xml",
     "Interface\\FrameXML\\UIDropDownMenu.xml",
-    "ScrollTemplates.xml",
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
     // `AuctionTabTemplate` inherits `CharacterFrameTabButtonTemplate`; `inherits=` resolves at
     // load, so it comes first.
     r"Interface\FrameXML\CharacterFrameTemplates.xml",
-    "Interface\\FrameXML\\GlobalStrings.lua",
-    "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
     "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     // The dress-up pane's OnLoad calls `DressUpTexturePath` (`DressUpFrame.lua`).
     "Interface\\FrameXML\\DressUpFrame.xml",
+    "ScrollTemplates.xml",
     // The addon in its toc order, loaded as chain files: a test has no addon registry.
     "Interface\\AddOns\\Blizzard_AuctionUI\\Blizzard_AuctionUI.xml",
     "Interface\\AddOns\\Blizzard_AuctionUI\\Blizzard_AuctionDressUp.xml",
@@ -78,7 +78,7 @@ fn row(name: &str, min_bid: u32, buyout: u32, bid: u32, owner: &str) -> AuctionI
         min_increment: if bid > 0 { 100 } else { 0 },
         buyout_price: buyout,
         bid_amount: bid,
-        high_bidder: false,
+        high_bidder: AuctionHighBidder::Nil,
         owner: Some(owner.to_string()),
         time_left: 4,
         link: Some("|cffffffff|Hitem:2589:0:0:0|h[Linen Cloth]|h|r".into()),
@@ -279,6 +279,49 @@ fn the_auctions_tab_cannot_repaint_before_it_has_been_shown() {
     );
 }
 
+/// The Auctions tab's High Bidder column prints `GetAuctionItemInfo`'s eleventh value, and
+/// `NO_BIDS` in red only for nil (`AuctionFrameAuctions_Update`): a bid-on auction names its
+/// bidder, as the reference answers on the owner list (`0x4cf144`–`0x4cf174`).
+#[test]
+fn the_auctions_tab_names_the_high_bidder() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = UiScript::new().unwrap();
+    load_ui_with_classes(&mut s);
+    seat_player(&mut s, 500_000);
+    let mut bid_on = row("Linen Cloth", 1000, 5000, 2500, "Buyer");
+    bid_on.auction_id = 1;
+    bid_on.high_bidder = AuctionHighBidder::Name("Bidder".into());
+    let mut unbid = row("Wool Cloth", 1000, 0, 0, "Buyer");
+    unbid.auction_id = 2;
+    let mut snapshot = state(Vec::new());
+    snapshot.lists[OWNER] = AuctionListState {
+        rows: vec![bid_on, unbid],
+        total: 2,
+        sort: Vec::new(),
+    };
+    s.set_auction(Some(snapshot));
+
+    s.fire_event("AUCTION_HOUSE_SHOW", vec![]);
+    s.run("AuctionFrameTab_OnClick(3)").unwrap();
+    s.fire_event("AUCTION_OWNED_LIST_UPDATE", vec![]);
+
+    assert_eq!(
+        s.eval::<String>("return AuctionsButton1HighBidder:GetText()")
+            .unwrap(),
+        "Bidder",
+        "a bid-on auction names its bidder, not No Bids"
+    );
+    assert!(
+        s.eval::<bool>(
+            "return AuctionsButton2HighBidder:GetText() \
+             == RED_FONT_COLOR_CODE..NO_BIDS..FONT_COLOR_CODE_CLOSE"
+        )
+        .unwrap(),
+        "an unbid auction reads No Bids in red"
+    );
+    assert!(s.errors().is_empty(), "clean repaint: {:?}", s.errors());
+}
+
 /// Each pane assigns `page` only in its `OnShow`. `AuctionFrameBid` alone is declared
 /// `hidden="false"` (`Blizzard_AuctionUI.xml:960`), so it shows with the window on the first
 /// `AUCTION_HOUSE_SHOW` before tab 1 hides it; the Auctions pane has no `page` until tab 3.
diff --git a/crates/benilla-app/tests/building_on_top.rs b/crates/benilla-app/tests/building_on_top.rs
new file mode 100644
index 00000000..41f91458
--- /dev/null
+++ b/crates/benilla-app/tests/building_on_top.rs
@@ -0,0 +1,40 @@
+//! The seam `docs/CONTRIBUTING.md` ("Building on top") opens to a crate: read the streamed objects
+//! through [`benilla_app::Objects`] and interact with one through [`benilla_app::Interact`], from
+//! outside the crate. It fails to build if either goes private, with no feature needed.
+
+use benilla_app::{Interact, Objects};
+use bevy::prelude::*;
+
+/// What such a crate writes: an object it found, interacted with.
+fn interact_with_the_nearest(objects: Objects, mut interact: MessageWriter<Interact>) {
+    if let Some((_, entity, _)) = objects.iter().next() {
+        interact.write(Interact(entity));
+    }
+}
+
+/// A key press such a crate answers: the guid it picked, interacted with.
+fn interact_with_guid(guid: u64, objects: &Objects, interact: &mut MessageWriter<Interact>) {
+    if let Some(entity) = objects.entity(guid) {
+        interact.write(Interact(entity));
+    }
+}
+
+fn is_a_system<M>(_: impl IntoSystem<(), (), M>) {}
+
+#[test]
+fn a_crate_on_top_reads_objects_and_writes_interact() {
+    is_a_system(interact_with_the_nearest);
+    let _ = interact_with_guid;
+
+    let mut app = App::new();
+    app.add_message::<Interact>();
+    let entity = app.world_mut().spawn_empty().id();
+    app.world_mut().write_message(Interact(entity));
+    let sent: Vec<Interact> = app
+        .world()
+        .resource::<Messages<Interact>>()
+        .iter_current_update_messages()
+        .copied()
+        .collect();
+    assert_eq!(sent, [Interact(entity)]);
+}
diff --git a/crates/benilla-app/tests/character_stats.rs b/crates/benilla-app/tests/character_stats.rs
index 68a742f5..5b72f972 100644
--- a/crates/benilla-app/tests/character_stats.rs
+++ b/crates/benilla-app/tests/character_stats.rs
@@ -7,7 +7,7 @@ mod common;
 
 use benilla_ui::script::{UiScript, UnitCombatStats, UnitState};
 
-/// The paper doll's load prefix, in `assets/ui/benilla.toc` order. `CharacterFrame.xml` is left
+/// The paper doll's load prefix, in the production order. `CharacterFrame.xml` is left
 /// out: the rows are repainted directly and the window never opens. Every row formats a global
 /// string: `SPELL_STAT<n>_NAME` (`PaperDollFrame.lua:140`), `RESISTANCE<n>_NAME` and
 /// `RESISTANCE_TOOLTIP_SUBTEXT` (`:187`/`:226`), `ARMOR` and `ARMOR_TOOLTIP` (`:244`/`:249`).
@@ -15,18 +15,18 @@ const FILES: &[&str] = &[
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
     "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\ItemButtonTemplate.xml",
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
     // `Model_OnLoad` (`UIParent.lua:1421`), which the model pane's `<OnLoad>` calls at load.
     r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
+    "Interface\\FrameXML\\GameTooltip.xml",
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
     "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
-    "Interface\\FrameXML\\GameTooltip.xml",
     // Each slot button's OnLoad calls `CooldownFrame_SetTimer` (`PaperDollFrame.lua:692`).
     "Interface\\FrameXML\\Cooldown.xml",
+    "Interface\\FrameXML\\ItemButtonTemplate.xml",
     "Interface\\FrameXML\\PaperDollFrame.xml",
 ];
 
diff --git a/crates/benilla-app/tests/common/mod.rs b/crates/benilla-app/tests/common/mod.rs
index 4cfa350b..355a8f1c 100644
--- a/crates/benilla-app/tests/common/mod.rs
+++ b/crates/benilla-app/tests/common/mod.rs
@@ -2,13 +2,15 @@
 //! `ui_script::test_ui::load_ui`, which is `#[cfg(test)]`. A bare filename is a file we ship
 //! under `assets/ui`, a path is the reference's own off the installed chain, and `<Script file>`
 //! includes resolve through the same provider. A test that names a chain entry opens with
-//! `benilla_formats::wow_data_or_skip!()`.
+//! `benilla_formats::wow_data_or_skip!()`. A kit loads in the production order, `FrameXML.toc`'s
+//! then `layer.toc`'s, which every load checks ([`follow_production_order`]).
 
 use benilla_ui::script::UiScript;
 
 /// Load one manifest entry into `script`, panicking on any loader error. A `.lua` entry runs as a
 /// chunk of raw bytes, as `GlobalStrings.lua` does in the real manifest; only XML is decoded.
 pub fn load_ui(script: &UiScript, entry: &str) {
+    follow_production_order(script, entry);
     let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui");
     let chain = |req: &str| -> Option<Vec<u8>> {
         let data = benilla_formats::wow_data()?;
@@ -42,13 +44,107 @@ pub fn load_ui(script: &UiScript, entry: &str) {
             .run(MICRO_BUTTON_STAND_INS)
             .expect("the micro-button stand-ins");
     }
-    if leaf.eq_ignore_ascii_case("UIParent.xml") && entry.contains('\\') {
+    // The stock GameMenuFrame.xml sources UIParent.lua again, which drops the stand-ins' wrappers.
+    if (leaf.eq_ignore_ascii_case("UIParent.xml") || leaf.eq_ignore_ascii_case("GameMenuFrame.xml"))
+        && entry.contains('\\')
+    {
         script
             .run(UIPARENT_STAND_INS)
             .expect("the UIParent stand-ins");
     }
 }
 
+/// Where `entry` falls in the production load: a `FrameXML.toc` row at its row, a file a row pulls
+/// in (`<Include>` or `<Script file=>`, at any depth) just above the first row that does, a layer
+/// file after every row, and `None` for anything else; the copy of
+/// `ui_script::test_ui::production_rank`.
+fn production_rank(entry: &str) -> Option<usize> {
+    static RANKS: std::sync::OnceLock<std::collections::HashMap<String, usize>> =
+        std::sync::OnceLock::new();
+    let ranks = RANKS.get_or_init(|| {
+        let key = |path: &str| path.replace('/', "\\").to_ascii_lowercase();
+        let mut ranks = std::collections::HashMap::new();
+        let Some(chain) =
+            benilla_formats::wow_data().and_then(|data| benilla_formats::open_chain(&data).ok())
+        else {
+            return ranks;
+        };
+        let read = |path: &str| chain.read(path).ok();
+        let toc = read(r"Interface\FrameXML\FrameXML.toc").unwrap_or_default();
+        let rows: Vec<String> = benilla_ui::toc::Toc::parse(&benilla_ui::source::decode(&toc))
+            .files
+            .iter()
+            .map(|f| format!(r"Interface\FrameXML\{f}"))
+            .collect();
+        for (i, row) in rows.iter().enumerate() {
+            ranks.insert(key(row), 2 * i + 1);
+        }
+        for (i, row) in rows.iter().enumerate() {
+            let mut queue = vec![row.clone()];
+            while let Some(file) = queue.pop() {
+                let Some(bytes) = read(&file) else { continue };
+                let text = String::from_utf8_lossy(&bytes);
+                for chunk in text.split('<').skip(1) {
+                    let tag = chunk.split('>').next().unwrap_or("").trim_start();
+                    if !tag.starts_with("Include") && !tag.starts_with("Script") {
+                        continue;
+                    }
+                    let Some(name) = tag
+                        .split("file=\"")
+                        .nth(1)
+                        .and_then(|r| r.split('"').next())
+                    else {
+                        continue;
+                    };
+                    let path = format!(r"Interface\FrameXML\{name}");
+                    if let std::collections::hash_map::Entry::Vacant(slot) = ranks.entry(key(&path))
+                    {
+                        slot.insert(2 * i);
+                        queue.push(path);
+                    }
+                }
+            }
+        }
+        let layer = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("assets/ui/layer.toc");
+        let layer = std::fs::read_to_string(layer).unwrap_or_default();
+        let after = 2 * rows.len() + 2;
+        for (j, file) in benilla_ui::toc::Toc::parse(&layer).files.iter().enumerate() {
+            ranks.insert(key(file), after + j);
+        }
+        ranks
+    });
+    ranks
+        .get(&entry.replace('/', "\\").to_ascii_lowercase())
+        .copied()
+}
+
+thread_local! {
+    /// Per VM session, the furthest [`production_rank`] a kit has loaded and the file at it.
+    static KIT_AT: std::cell::RefCell<std::collections::HashMap<u64, (usize, String)>> =
+        std::cell::RefCell::new(std::collections::HashMap::new());
+}
+
+/// Panics when `entry` loads after a file the production load runs after it.
+fn follow_production_order(script: &UiScript, entry: &str) {
+    let Some(rank) = production_rank(entry) else {
+        return;
+    };
+    KIT_AT.with(|at| {
+        let mut at = at.borrow_mut();
+        if let Some((furthest, file)) = at.get(&script.session()) {
+            assert!(
+                rank >= *furthest,
+                "{entry} loads after {file}, but the production load runs it first: a kit \
+                 follows FrameXML.toc's order, then layer.toc's"
+            );
+            if rank == *furthest {
+                return;
+            }
+        }
+        at.insert(script.session(), (rank, entry.to_string()));
+    });
+}
+
 /// The stock `UIParent.xml`'s unguarded callees, stood in for at load; the copy of
 /// `ui_script::test_ui::UIPARENT_STAND_INS`.
 const UIPARENT_STAND_INS: &str = r#"
@@ -123,7 +219,7 @@ const UIPARENT_STAND_INS: &str = r#"
     -- names are real, and all three options windows are the REFERENCE's own files,
     -- loaded hidden — including `OptionsFrame`, the video window, which used to be our own
     -- window's name. Ours is `BenillaOptionsFrame` now and is not in this list: it is not a name
-    -- the reference indexes, and the wrappers in `GameMenuFrame.xml` are what tell these two
+    -- the reference indexes, and the wrappers in `GameMenuAdapters.xml` are what tell these two
     -- functions about it. A KIT is a prefix of the manifest and may load none of the four, which
     -- is what these stand-ins are for.
     local function benilla_seat_options()
diff --git a/crates/benilla-app/tests/cover_input_wall.rs b/crates/benilla-app/tests/cover_input_wall.rs
index abfbebb4..ffb4a1e1 100644
--- a/crates/benilla-app/tests/cover_input_wall.rs
+++ b/crates/benilla-app/tests/cover_input_wall.rs
@@ -20,8 +20,8 @@ enum Verdict {
 }
 use Verdict::{Open, Plumbing, Swallowed};
 
-/// Every `bevy::input::…` / `bevy::window::…` leaf the workspace names, plus the prelude input
-/// items, each with its verdict.
+/// Every `bevy::input::…` / `bevy::window::…` / `bevy::winit::…` leaf the workspace names, plus
+/// the prelude input items, each with its verdict.
 const VERDICTS: &[(&str, Verdict)] = &[
     // ── The channels the cover takes ────────────────────────────────────────────────────────
     ("ButtonInput", Swallowed),
@@ -44,6 +44,13 @@ const VERDICTS: &[(&str, Verdict)] = &[
         "WindowFocused",
         Open("alt-tab bookkeeping; `cursor.rs` re-asserts the hardware cursor on the focus edge"),
     ),
+    (
+        "KeyboardFocusLost",
+        Open(
+            "the window deactivate, not player input: `bindings.rs` clears the held direction \
+             bits on it, the reference's `0x514490`, which a load must not hide",
+        ),
+    ),
     (
         "WindowOccluded",
         Open("the present-mode throttle: a load behind another window must still throttle"),
@@ -52,6 +59,14 @@ const VERDICTS: &[(&str, Verdict)] = &[
         "CursorOptions",
         Open("an OUTPUT (grab/visible), not a channel — the cover has nothing to take from it"),
     ),
+    (
+        "RawWinitWindowEvent",
+        Open(
+            "read only to learn what the layout names each key (`bindings/layout.rs`), which acts \
+             on nothing: a press under the cover still never reaches a binding or a box, and the \
+             name it refreshes must be current when the cover lifts",
+        ),
+    ),
     (
         "CursorLeft",
         Open(
@@ -69,6 +84,7 @@ const VERDICTS: &[(&str, Verdict)] = &[
     ("CustomCursor", Plumbing),
     ("CustomCursorImage", Plumbing),
     ("InputPlugin", Plumbing),
+    ("WinitPlugin", Plumbing),
     ("InputSystems", Plumbing),
     ("Key", Plumbing),
     ("KeyCode", Plumbing),
@@ -167,11 +183,11 @@ fn every_input_channel_the_client_reads_has_a_verdict_under_the_cover() {
     );
 }
 
-/// Every input identifier `text` names: the leaf of any `bevy::input::…`/`bevy::window::…` path
-/// (grouped `use` braces expanded), plus the prelude names.
+/// Every input identifier `text` names: the leaf of any `bevy::input::…`/`bevy::window::…`/
+/// `bevy::winit::…` path (grouped `use` braces expanded), plus the prelude names.
 fn input_names(text: &str) -> BTreeSet<String> {
     let mut out = BTreeSet::new();
-    for prefix in ["bevy::input::", "bevy::window::"] {
+    for prefix in ["bevy::input::", "bevy::window::", "bevy::winit::"] {
         let mut rest = text;
         while let Some(at) = rest.find(prefix) {
             rest = &rest[at + prefix.len()..];
diff --git a/crates/benilla-app/tests/create_frame_template.rs b/crates/benilla-app/tests/create_frame_template.rs
index 27bfd1fc..42ca828e 100644
--- a/crates/benilla-app/tests/create_frame_template.rs
+++ b/crates/benilla-app/tests/create_frame_template.rs
@@ -6,23 +6,23 @@ mod common;
 
 use benilla_ui::script::UiScript;
 
-/// The prefix of `benilla.toc`'s load order these templates need. `FauxScrollFrameTemplate` and
+/// The prefix of the production load these templates need. `FauxScrollFrameTemplate` and
 /// `TabButtonTemplate` are the stock ones, from `UIPanelTemplates.xml` on the player's chain.
 const FILES: &[&str] = &[
+    "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
+    "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which StaticPopup.lua reads at file scope
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     // A guard, not a dependency: its whole body is `<Script file="FadingFrame.lua"/>`, which loads
     // only if resolved against the document's own directory. It has no `inherits=` and its Lua
     // has no file-scope statements, so it needs nothing before it.
     "Interface\\FrameXML\\FadingFrame.xml",
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\GlobalStrings.lua",
-    "Interface\\FrameXML\\BasicControls.xml", // `TEXT`, which StaticPopup.lua reads at file scope
-    "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     "ScrollTemplates.xml",
 ];
 
diff --git a/crates/benilla-app/tests/item_text_frame.rs b/crates/benilla-app/tests/item_text_frame.rs
index 6ff6661b..43915a93 100644
--- a/crates/benilla-app/tests/item_text_frame.rs
+++ b/crates/benilla-app/tests/item_text_frame.rs
@@ -9,24 +9,24 @@ mod common;
 
 const UI_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/assets/ui");
 
-/// The reader's dependency prefix, in the manifest's order; the page's scroll frame inherits
+/// The reader's dependency prefix, in the production order; the page's scroll frame inherits
 /// `UIPanelScrollFrameTemplate` (`UIPanelTemplates.xml`).
 const FILES: &[&str] = &[
     // `ITEM_TEXT_FROM`, concatenated into the creator tail (`ItemTextFrame.lua:41`); nil, it
     // kills the handler before `ShowUIPanel`.
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
-    // `GetMaterialTextColors` (`UIParent.lua:1880`), which picks the page and title ink.
-    r"Interface\FrameXML\UIParent.xml",
-    "ScrollTemplates.xml",
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
     "Interface\\FrameXML\\BasicControls.xml",
     "Interface\\FrameXML\\LocaleProperties.lua",
+    // `GetMaterialTextColors` (`UIParent.lua:1880`), which picks the page and title ink.
+    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
     "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     "Interface\\FrameXML\\ItemTextFrame.xml",
+    "ScrollTemplates.xml",
 ];
 
 /// Loads `FILES`: a bare filename from `assets/ui`, a path off the player's chain. The provider
diff --git a/crates/benilla-app/tests/launcher_shape.rs b/crates/benilla-app/tests/launcher_shape.rs
new file mode 100644
index 00000000..d51fb07c
--- /dev/null
+++ b/crates/benilla-app/tests/launcher_shape.rs
@@ -0,0 +1,94 @@
+//! The launcher `examples/extended_launcher.rs` documents for a crate on top of benilla stays in
+//! step with the workspace: cargo reads `[patch]` and `[profile]` from the root manifest only, so
+//! the header repeats the root's, a missing patch builds a client that is silently not benilla's,
+//! and a bevy other than the workspace's is a second bevy. The rest mirrors the `benilla` launcher.
+
+use std::path::Path;
+
+/// A manifest by its path from this crate's root.
+fn manifest(rel: &str) -> toml::Table {
+    let path = Path::new(env!("CARGO_MANIFEST_DIR")).join(rel);
+    std::fs::read_to_string(&path)
+        .unwrap_or_else(|e| panic!("{}: {e}", path.display()))
+        .parse()
+        .unwrap_or_else(|e| panic!("{}: {e}", path.display()))
+}
+
+/// The example header's ```toml block, parsed.
+fn documented() -> toml::Table {
+    let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("examples/extended_launcher.rs");
+    let text = std::fs::read_to_string(&path).unwrap();
+    let block: Vec<&str> = text
+        .lines()
+        .map(|l| {
+            l.strip_prefix("//!")
+                .map(|l| l.strip_prefix(' ').unwrap_or(l))
+        })
+        .skip_while(|l| *l != Some("```toml"))
+        .skip(1)
+        .take_while(|l| *l != Some("```"))
+        .map(|l| l.expect("the ```toml block ends inside the header"))
+        .collect();
+    assert!(!block.is_empty(), "no ```toml block in {}", path.display());
+    block
+        .join("\n")
+        .parse()
+        .expect("the documented manifest parses")
+}
+
+/// `t[k1][k2]…`, or a panic naming the path.
+fn at<'a>(t: &'a toml::Table, keys: &[&str]) -> &'a toml::Value {
+    let (first, rest) = keys.split_first().unwrap();
+    let mut v = t.get(*first).unwrap_or_else(|| panic!("no `{first}`"));
+    for k in rest {
+        v = v
+            .get(*k)
+            .unwrap_or_else(|| panic!("no `{}`", keys.join(".")));
+    }
+    v
+}
+
+#[test]
+fn the_documented_launcher_repeats_the_root_patches_profile_and_bevy() {
+    let doc = documented();
+    let root = manifest("../../Cargo.toml");
+    let patched = |t: &toml::Table| -> Vec<String> {
+        let table = at(t, &["patch", "crates-io"]).as_table().unwrap();
+        table.keys().cloned().collect()
+    };
+    assert_eq!(patched(&doc), patched(&root), "[patch.crates-io]");
+    for keys in [
+        &["profile", "dev", "opt-level"][..],
+        &["profile", "dev", "package", "*", "opt-level"],
+    ] {
+        assert_eq!(at(&doc, keys), at(&root, keys), "{}", keys.join("."));
+    }
+    assert_eq!(
+        at(&doc, &["dependencies", "bevy", "version"]),
+        at(&root, &["workspace", "dependencies", "bevy", "version"]),
+        "bevy's version"
+    );
+    assert_eq!(
+        at(&doc, &["dependencies", "bevy", "default-features"]).as_bool(),
+        Some(false),
+        "bevy adds no features"
+    );
+}
+
+#[test]
+fn the_documented_launcher_takes_benilla_app_as_the_benilla_launcher_does() {
+    let doc = documented();
+    let shim = manifest("../benilla/Cargo.toml");
+    for keys in [
+        &["features", "dev"][..],
+        &["dependencies", "benilla-app", "default-features"],
+    ] {
+        assert_eq!(at(&doc, keys), at(&shim, keys), "{}", keys.join("."));
+    }
+    assert!(
+        at(&doc, &["build-dependencies"])
+            .get("benilla-buildstamp")
+            .is_some(),
+        "the build script's stamp"
+    );
+}
diff --git a/crates/benilla-app/tests/mail_frame.rs b/crates/benilla-app/tests/mail_frame.rs
index 9d8312e0..bdc692ad 100644
--- a/crates/benilla-app/tests/mail_frame.rs
+++ b/crates/benilla-app/tests/mail_frame.rs
@@ -3,32 +3,35 @@
 
 mod common;
 
-use benilla_ui::script::{MailInboxRow, MailInvoice, MailState, UiScript};
+use benilla_ui::script::{
+    EditAction, EditBoxAdvanceRequest, EditUnit, MailInboxRow, MailInvoice, MailState,
+    MeasureRequest, TextMeasure, UiScript,
+};
 
 /// The mail window's load prefix, in the app's order.
 const FILES: &[&str] = &[
+    "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
+    "Interface\\FrameXML\\BasicControls.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
     // The send tab's money entry: `MoneyInputFrameTemplate` and the `MoneyInputFrame_*` verbs.
     r"Interface\FrameXML\MoneyInputFrame.lua",
     r"Interface\FrameXML\MoneyInputFrame.xml",
-    "Interface\\FrameXML\\GlobalStrings.lua",
-    r"Interface\FrameXML\UIParent.xml",
-    "ScrollTemplates.xml", // our scroll kit + the placeholder icon
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     "Interface\\FrameXML\\GameTooltip.xml",
-    r"Interface\FrameXML\ItemButtonTemplate.xml", // the send tab's attachment slot inherits it
     // The tabs inherit `FriendsFrameTabTemplate` and `inherits=` resolves at load, so the social
     // window and its kit come first, as in the stock toc.
     "Interface\\FrameXML\\UIDropDownMenu.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
     "Interface\\FrameXML\\CharacterFrameTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
+    r"Interface\FrameXML\ItemButtonTemplate.xml", // the send tab's attachment slot inherits it
     "Interface\\FrameXML\\FriendsFrame.xml",
     "Interface\\FrameXML\\MailFrame.xml",
+    "ScrollTemplates.xml", // our scroll kit + the placeholder icon
 ];
 
 fn load_ui(script: &UiScript) {
@@ -815,3 +818,165 @@ fn the_compose_reset_clears_the_subject_and_the_attachment_together() {
         "and the attachment is gone with it"
     );
 }
+
+/// A stand-in font engine: each byte 7 wide, each line 14 tall, a multi-line box's rows starting
+/// after each newline, a trailing one opening an empty row as the reference's break routine does
+/// (`0x5c250b`–`0x5c2522`); the texts here never wrap.
+struct Mono;
+
+impl TextMeasure for Mono {
+    fn measure(&mut self, req: &MeasureRequest) -> (f32, f32, f32) {
+        let text = req.text.strip_suffix('\n').unwrap_or(&req.text);
+        let natural = text.split('\n').map(str::len).max().unwrap_or(0) as f32 * 7.0;
+        (natural, text.split('\n').count() as f32 * 14.0, natural)
+    }
+
+    fn editbox_advances(
+        &mut self,
+        req: &EditBoxAdvanceRequest,
+    ) -> Option<(Vec<f32>, Vec<usize>, f32)> {
+        let cum = (0..=req.text.len()).map(|i| i as f32 * 7.0).collect();
+        if req.wrap_width.is_none() {
+            return Some((cum, vec![0], 0.0));
+        }
+        let breaks = req.text.match_indices('\n').map(|(i, _)| i + 1);
+        let rows = std::iter::once(0).chain(breaks).collect();
+        Some((cum, rows, 14.0))
+    }
+}
+
+/// The send tab, open, its boxes measured by [`Mono`].
+fn send_tab() -> UiScript {
+    let mut s = UiScript::new().unwrap();
+    s.set_screen_size(1024.0, 768.0);
+    s.set_text_measurer(Box::new(Mono));
+    load_ui(&s);
+    s.fire_event("MAIL_SHOW", vec![]);
+    s.run("MailFrameTab_OnClick(2)").unwrap();
+    s.resolve();
+    s
+}
+
+fn frames(s: &mut UiScript, n: usize) {
+    for _ in 0..n {
+        s.tick(0.016);
+        s.resolve();
+    }
+}
+
+fn mv(s: &mut UiScript, unit: EditUnit, back: bool) {
+    assert!(s.editbox_action(EditAction::Move {
+        unit,
+        back,
+        extend: false,
+    }));
+}
+
+/// The letter body is multi-line: UP and DOWN move a row at the caret's letter column (`0x77cb20`),
+/// HOME and END stop at the line's newline (`0x77c980`, `0x77c9f0`), and Ctrl+HOME and Ctrl+END
+/// go to the letter's ends (`0x77ca60`, `0x77cac0`).
+#[test]
+fn the_letter_body_moves_its_caret_by_rows_and_lines() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = send_tab();
+    s.run(
+        "SendMailBodyEditBox:SetText('Dear Thrall,\\nthe ore\\nis late.') \
+         SendMailBodyEditBox:SetFocus()",
+    )
+    .unwrap();
+    frames(&mut s, 1);
+    let body = |s: &UiScript| {
+        s.eval::<String>("return SendMailBodyEditBox:GetText()")
+            .unwrap()
+    };
+    // From the end, column 8: past "the ore", so it holds before that line's newline.
+    mv(&mut s, EditUnit::Row, true);
+    s.char_input("!");
+    assert_eq!(body(&s), "Dear Thrall,\nthe ore!\nis late.");
+    mv(&mut s, EditUnit::Line, true);
+    s.char_input("-");
+    assert_eq!(
+        body(&s),
+        "Dear Thrall,\n-the ore!\nis late.",
+        "HOME: this line's start"
+    );
+    mv(&mut s, EditUnit::Line, false);
+    mv(&mut s, EditUnit::Row, false);
+    s.char_input("?");
+    assert_eq!(
+        body(&s),
+        "Dear Thrall,\n-the ore!\nis late.?",
+        "END, then DOWN at column 9: past the last line's letters, to the text's end"
+    );
+    mv(&mut s, EditUnit::Edge, true);
+    s.char_input(">");
+    assert_eq!(body(&s), ">Dear Thrall,\n-the ore!\nis late.?", "Ctrl+HOME");
+    assert!(s.take_errors().is_empty(), "and nothing raised on the way");
+}
+
+/// Ctrl+A is `HighlightText(0, -1)` (`0x77b239`), which leaves the caret (`0x77cca0`): no
+/// `OnCursorChanged` reaches `ScrollingEdit_OnCursorChanged`, so a long letter scrolled to its top
+/// stays there.
+#[test]
+fn select_all_in_a_long_letter_keeps_its_scroll() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = send_tab();
+    s.run(
+        "SendMailBodyEditBox:SetText(string.rep('line\\n', 29) .. 'end') \
+         SendMailBodyEditBox:SetFocus()",
+    )
+    .unwrap();
+    frames(&mut s, 4);
+    let scroll = |s: &UiScript| {
+        s.eval::<f64>("return SendMailScrollFrame:GetVerticalScroll()")
+            .unwrap()
+    };
+    assert!(
+        scroll(&s) > 0.0,
+        "the caret at the end scrolled the letter down"
+    );
+    mv(&mut s, EditUnit::Edge, true);
+    frames(&mut s, 4);
+    assert_eq!(scroll(&s), 0.0, "Ctrl+HOME scrolled it back to the top");
+    assert!(s.editbox_action(EditAction::SelectAll));
+    frames(&mut s, 4);
+    assert_eq!(
+        scroll(&s),
+        0.0,
+        "Ctrl+A left the caret, and the view, at the top"
+    );
+    s.char_input("x");
+    assert_eq!(
+        s.eval::<String>("return SendMailBodyEditBox:GetText()")
+            .unwrap(),
+        "x",
+        "with all of it selected"
+    );
+    assert!(s.take_errors().is_empty(), "and nothing raised on the way");
+}
+
+/// The money boxes select all on focus (`MoneyInputFrame.xml`, `HighlightText()`), and `Insert`
+/// deletes a selection before its `numeric` test refuses a letter (`0x77bf13`, `0x77bf41`): a
+/// letter typed into the gold box clears the amount.
+#[test]
+fn a_letter_typed_over_the_selected_gold_clears_it() {
+    let _data = benilla_formats::wow_data_or_skip!();
+    let mut s = send_tab();
+    s.run("SendMailMoneyGold:SetText('12') SendMailMoneyGold:SetFocus()")
+        .unwrap();
+    frames(&mut s, 1);
+    assert!(s.char_input("g"), "the focused box consumes");
+    assert_eq!(
+        s.eval::<String>("return SendMailMoneyGold:GetText()")
+            .unwrap(),
+        ""
+    );
+    frames(&mut s, 1);
+    assert_eq!(
+        s.eval::<f64>("return MoneyInputFrame_GetCopper(SendMailMoney)")
+            .unwrap(),
+        0.0,
+        "OnTextChanged told the money frame"
+    );
+    assert!(s.take_errors().is_empty(), "and nothing raised on the way");
+}
diff --git a/crates/benilla-app/tests/talent_frame.rs b/crates/benilla-app/tests/talent_frame.rs
index 095b20a0..0735c205 100644
--- a/crates/benilla-app/tests/talent_frame.rs
+++ b/crates/benilla-app/tests/talent_frame.rs
@@ -9,32 +9,32 @@ use benilla_ui::script::{
     UiScript, UnitState,
 };
 
-/// The talent window's load prefix, in `assets/ui/benilla.toc` order.
+/// The talent window's load prefix, in the production order.
 const FILES: &[&str] = &[
     // `PLAYER_LEVEL` and the other strings the stock file formats.
     "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
     // `TEXT`.
     "Interface\\FrameXML\\BasicControls.xml",
-    // `SetItemButtonDesaturated`, which the talent buttons grey through.
-    "Interface\\FrameXML\\ItemButtonTemplate.xml",
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
     // `ToggleTalentFrame` (`UIParent.lua:205`).
     r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
     "Interface\\FrameXML\\GameTooltip.xml",
     // `UIPanelScrollFrameTemplate`: the scroll bar and the `<OnMouseWheel>`. A missing template
     // is only a loader warning, so the window would build without them.
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     // `TalentTabTemplate` inherits `CharacterFrameTabButtonTemplate`; `inherits=` resolves at load.
     r"Interface\FrameXML\CharacterFrameTemplates.xml",
-    "ScrollTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
     // `TalentFrame_OnShow` pulses `TalentMicroButton` and calls `UpdateMicroButtons()`
     // (`Blizzard_TalentUI.lua:97-100`); a nil button throws before `TalentFrame_Update()`.
     r"Interface\FrameXML\MainMenuBarMicroButtons.xml",
+    // `SetItemButtonDesaturated`, which the talent buttons grey through.
+    "Interface\\FrameXML\\ItemButtonTemplate.xml",
+    "ScrollTemplates.xml",
     // Sources its own `.lua` and `<Include>`s the templates file.
     "Interface\\AddOns\\Blizzard_TalentUI\\Blizzard_TalentUI.xml",
 ];
diff --git a/crates/benilla-app/tests/trade_frame.rs b/crates/benilla-app/tests/trade_frame.rs
index 89daa910..2b7a3492 100644
--- a/crates/benilla-app/tests/trade_frame.rs
+++ b/crates/benilla-app/tests/trade_frame.rs
@@ -6,22 +6,22 @@ mod common;
 
 use benilla_ui::script::{ScriptValue, TradeSideState, TradeSlotItem, TradeState, UiScript};
 
-/// The trade window's load prefix, in `assets/ui/benilla.toc` order.
+/// The trade window's load prefix, in the production order.
 const FILES: &[&str] = &[
+    "Interface\\FrameXML\\GlobalStrings.lua",
     "Interface\\FrameXML\\Fonts.xml",
+    "Interface\\FrameXML\\BasicControls.xml",
+    "Interface\\FrameXML\\LocaleProperties.lua",
+    r"Interface\FrameXML\UIParent.xml",
     r"Interface\FrameXML\MoneyFrame.lua",
     r"Interface\FrameXML\MoneyFrame.xml",
     // `MoneyInputFrameTemplate` and the `MoneyInputFrame_*` functions the window calls.
     r"Interface\FrameXML\MoneyInputFrame.lua",
     r"Interface\FrameXML\MoneyInputFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
+    "Interface\\FrameXML\\GameTooltip.xml",
     r"Interface\FrameXML\UIPanelTemplates.lua",
     r"Interface\FrameXML\UIPanelTemplates.xml",
-    "Interface\\FrameXML\\GlobalStrings.lua",
-    "Interface\\FrameXML\\BasicControls.xml",
-    "Interface\\FrameXML\\LocaleProperties.lua",
     "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
-    "Interface\\FrameXML\\GameTooltip.xml",
     // The slot updates go through `ItemButtonTemplate.lua`'s `SetItemButton*` helpers.
     r"Interface\FrameXML\ItemButtonTemplate.xml",
     "Interface\\FrameXML\\TradeFrame.xml",
@@ -57,11 +57,7 @@ fn state() -> TradeState {
         ..Default::default()
     };
     target.slots[0] = Some(item(4306, "Silk Cloth", 1, 2));
-    TradeState {
-        player,
-        target,
-        partner_name: Some("Thrall".into()),
-    }
+    TradeState { player, target }
 }
 
 #[test]
diff --git a/crates/benilla-app/tests/tradeskill_frame.rs b/crates/benilla-app/tests/tradeskill_frame.rs
index c13dee1a..6feb1c08 100644
--- a/crates/benilla-app/tests/tradeskill_frame.rs
+++ b/crates/benilla-app/tests/tradeskill_frame.rs
@@ -11,28 +11,28 @@ mod common;
 
 /// The load prefix of both windows, in the app's order.
 const FILES: &[&str] = &[
-    "Interface\\FrameXML\\Fonts.xml",
-    r"Interface\FrameXML\MoneyFrame.lua",
-    r"Interface\FrameXML\MoneyFrame.xml",
-    r"Interface\FrameXML\UIParent.xml",
-    r"Interface\FrameXML\UIPanelTemplates.lua",
-    r"Interface\FrameXML\UIPanelTemplates.xml",
     "Interface\\FrameXML\\GlobalStrings.lua",
+    "Interface\\FrameXML\\Fonts.xml",
     "Interface\\FrameXML\\BasicControls.xml",
     "Interface\\FrameXML\\LocaleProperties.lua",
-    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
+    r"Interface\FrameXML\UIParent.xml",
+    r"Interface\FrameXML\MoneyFrame.lua",
+    r"Interface\FrameXML\MoneyFrame.xml",
     "Interface\\FrameXML\\GameTooltip.xml",
     "Interface\\FrameXML\\UIDropDownMenu.xml",
-    "ScrollTemplates.xml",
+    r"Interface\FrameXML\UIPanelTemplates.lua",
+    r"Interface\FrameXML\UIPanelTemplates.xml",
+    "Interface\\FrameXML\\StaticPopup.xml", // the dialog engine
+    // The reagent slots inherit `QuestItemTemplate` and are painted with `SetItemButtonTexture`
+    // and `SetItemButtonCount` (`ItemButtonTemplate.lua`).
+    r"Interface\FrameXML\ItemButtonTemplate.xml",
+    r"Interface\FrameXML\QuestFrameTemplates.xml",
     // Both windows open from UIParent's TRADE_SKILL_SHOW / CRAFT_SHOW arms (`*_LoadUI`, then
     // `*_Show`). With no addon registry the addons load as chain files, and `*_LoadUI` reports
     // ADDON_LOAD_FAILED through `message`, a shown frame, not an error.
     // Both addons inherit the trainer window's list and detail templates.
     r"Interface\FrameXML\ClassTrainerFrameTemplates.xml",
-    // The reagent slots inherit `QuestItemTemplate` and are painted with `SetItemButtonTexture`
-    // and `SetItemButtonCount` (`ItemButtonTemplate.lua`).
-    r"Interface\FrameXML\ItemButtonTemplate.xml",
-    r"Interface\FrameXML\QuestFrameTemplates.xml",
+    "ScrollTemplates.xml",
     r"Interface\AddOns\Blizzard_TradeSkillUI\Blizzard_TradeSkillUI.xml",
     r"Interface\AddOns\Blizzard_CraftUI\Blizzard_CraftUI.xml",
 ];
diff --git a/crates/benilla-app/tests/world_api_wall.rs b/crates/benilla-app/tests/world_api_wall.rs
index 93df715b..db5b9588 100644
--- a/crates/benilla-app/tests/world_api_wall.rs
+++ b/crates/benilla-app/tests/world_api_wall.rs
@@ -104,6 +104,7 @@ const PUBLISHED: &[(&str, &str)] = &[
     ("doodad_anim::spawn_anim_host", "record"),
     ("ffx_glow::FfxBackdrop", "record"),
     ("ffx_glow::FfxGlow", "record"),
+    ("ffx_glow::FfxSwitches", "record"),
     ("ffx_glow::GlueFfx", "record"),
     ("final_pass::FinalPassTarget", "record"),
     ("instance_tint::InstanceTintMirrors", "record"),
@@ -133,6 +134,7 @@ const PUBLISHED: &[(&str, &str)] = &[
     ("model_render::ModelPart", "record"),
     ("model_render::lazy::realize", "record"),
     ("modkeys::SyntheticHold", "wall"),
+    ("particles::ParticleTuning", "record"),
     ("particles::ViewThrottled", "record"),
     ("particles::render::EFFECT_DRAW_STATS", "record"),
     ("particles::spawn_emitter", "record"),
diff --git a/crates/benilla-buildstamp/src/lib.rs b/crates/benilla-buildstamp/src/lib.rs
index a6bebeac..9ce0f46c 100644
--- a/crates/benilla-buildstamp/src/lib.rs
+++ b/crates/benilla-buildstamp/src/lib.rs
@@ -6,7 +6,7 @@
 use std::path::Path;
 use std::process::Command;
 
-/// Stamp the commit this binary was built from into the calling package as five `rustc-env`
+/// Stamp the commit this binary was built from into the calling package as six `rustc-env`
 /// vars, which its `main.rs` reads back with `env!` into a `BuildId`, beside its own
 /// `CARGO_PKG_VERSION`:
 ///
@@ -17,6 +17,9 @@ use std::process::Command;
 ///   (`v0.2.0-12-gb17be27`), which says how far past its release the commit is.
 /// - `BENILLA_PROFILE`: the profile directory's name, which tells `ship` from `release` where
 ///   cargo's `PROFILE` does not.
+/// - `BENILLA_PROJECT_DIR`: the folder a dev build keeps its `WoW` link, `benilla-config/` and
+///   `.probe-identity` in, the calling package's workspace root ([`workspace_root`]); empty unless
+///   the package's own `dev` feature is on, so a player binary carries no source path.
 ///
 /// The git vars are empty when git cannot answer (no `.git`, no `git` on `PATH`, no tag in
 /// reach), which the runtime reports as an unknown commit or the bare version. The rerun
@@ -84,4 +87,65 @@ pub fn emit() {
         .map(str::to_owned)
         .unwrap_or_else(|| std::env::var("PROFILE").unwrap_or_default());
     println!("cargo::rustc-env=BENILLA_PROFILE={profile}");
+
+    let project = if std::env::var_os("CARGO_FEATURE_DEV").is_some() {
+        workspace_root(Path::new(&dir)).display().to_string()
+    } else {
+        String::new()
+    };
+    println!("cargo::rustc-env=BENILLA_PROJECT_DIR={project}");
+}
+
+/// The workspace root of the package at `manifest_dir`: the nearest folder up from it holding
+/// `Cargo.lock`, which cargo writes at the root before any build script runs, else the package's
+/// own folder. For a launcher inside benilla's checkout that is the checkout.
+fn workspace_root(manifest_dir: &Path) -> &Path {
+    manifest_dir
+        .ancestors()
+        .find(|d| d.join("Cargo.lock").is_file())
+        .unwrap_or(manifest_dir)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn the_workspace_root_is_the_nearest_folder_holding_the_lockfile() {
+        let tmp = std::env::temp_dir().join(format!("benilla-stamp-{}", std::process::id()));
+        let member = tmp.join("ws/crates/launcher");
+        std::fs::create_dir_all(&member).unwrap();
+        // A lockfile further up belongs to some other tree and must not win over the nearer one.
+        std::fs::write(tmp.join("Cargo.lock"), "").unwrap();
+        std::fs::write(tmp.join("ws/Cargo.lock"), "").unwrap();
+        assert_eq!(workspace_root(&member), tmp.join("ws"));
+        // A package that is its own workspace keeps its lockfile beside its manifest.
+        std::fs::write(member.join("Cargo.lock"), "").unwrap();
+        assert_eq!(workspace_root(&member), member);
+        std::fs::remove_dir_all(&tmp).ok();
+
+        let bare = std::env::temp_dir().join(format!("benilla-stamp-bare-{}", std::process::id()));
+        std::fs::create_dir_all(&bare).unwrap();
+        let root = workspace_root(&bare);
+        assert!(
+            root == bare || root.join("Cargo.lock").is_file(),
+            "no lockfile anywhere up means the package's own folder: {}",
+            root.display()
+        );
+        std::fs::remove_dir_all(&bare).ok();
+    }
+
+    /// benilla's own launchers stamp the checkout, the folder a dev build always used.
+    #[test]
+    fn a_launcher_in_this_checkout_stamps_the_checkout() {
+        let shim = Path::new(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
+            .join("benilla");
+        let checkout = Path::new(env!("CARGO_MANIFEST_DIR"))
+            .ancestors()
+            .nth(2)
+            .unwrap();
+        assert_eq!(workspace_root(&shim), checkout);
+    }
 }
diff --git a/crates/benilla-formats/Cargo.toml b/crates/benilla-formats/Cargo.toml
index e9495141..fe96d643 100644
--- a/crates/benilla-formats/Cargo.toml
+++ b/crates/benilla-formats/Cargo.toml
@@ -9,8 +9,8 @@ description = "WoW 1.12.1 asset-format adapters (MPQ/BLP/DBC/ADT/WDT) and the be
 workspace = true
 
 [features]
-# `dev` gates one thing, `install::candidates`' project-folder probe, which bakes this source
-# tree's path into the binary. Every dependent takes this crate without default features and
+# `dev` gates one thing, the project folder (`install::project_folder`), whose fallback bakes this
+# source tree's path into the binary. Every dependent takes this crate without default features and
 # forwards `dev`, or unification puts the path back into a player build.
 default = ["dev"]
 dev = []
diff --git a/crates/benilla-formats/src/bin/benilla-extract/charatlas.rs b/crates/benilla-formats/src/bin/benilla-extract/charatlas.rs
index 8ff0b1e2..d13584ef 100644
--- a/crates/benilla-formats/src/bin/benilla-extract/charatlas.rs
+++ b/crates/benilla-formats/src/bin/benilla-extract/charatlas.rs
@@ -218,7 +218,7 @@ pub fn charatlas(chain: &mut Chain, look: &Look, out: Option<&std::path::Path>)
     // The shirt-cuff geoset's gate is the ArmLower tile's occupancy, read off the same plan.
     eq.forearm_dressed = forearm_dressed(&equipment);
     let ids = geosets.visible_geosets(look.race, look.sex, look.hair_style, look.facial_hair, &eq);
-    println!("\nvisible geosets: {ids:?}");
+    println!("\nvisible geosets: {ids:?} + all IDs above 1700");
 
     if let Some(path) = out {
         let img =
diff --git a/crates/benilla-formats/src/chain.rs b/crates/benilla-formats/src/chain.rs
index 980900b1..a84b26f3 100644
--- a/crates/benilla-formats/src/chain.rs
+++ b/crates/benilla-formats/src/chain.rs
@@ -115,6 +115,15 @@ impl Chain {
 
     /// Read a file by internal path (`/` or `\`) from its winning archive.
     pub fn read(&self, name: &str) -> Result<Vec<u8>> {
+        let archive = self.archive_for(name)?;
+        archive
+            .read_file(name)
+            .with_context(|| format!("reading {name} from {}", archive.path().display()))
+    }
+
+    /// The archive `name` reads from, as a cheap handle: a caller holding the chain behind a lock
+    /// looks the file up under it and reads (`Archive::open_file`) after releasing it. No I/O.
+    pub fn archive_for(&self, name: &str) -> Result<Archive> {
         let archive = self
             .resolve(name)
             .ok_or_else(|| anyhow!("file not in patch chain: {name}"))?;
@@ -125,9 +134,7 @@ impl Chain {
                 archive.path().display()
             );
         }
-        archive
-            .read_file(name)
-            .with_context(|| format!("reading {name} from {}", archive.path().display()))
+        Ok(archive.clone())
     }
 
     /// `&mut` alias of [`Chain::read`] for call sites that thread a `&mut Chain`.
diff --git a/crates/benilla-formats/src/characters/customization.rs b/crates/benilla-formats/src/characters/customization.rs
index f420ef5b..7311eae4 100644
--- a/crates/benilla-formats/src/characters/customization.rs
+++ b/crates/benilla-formats/src/characters/customization.rs
@@ -43,8 +43,9 @@ const KNOWN_FILES: [(u8, &str); 8] = [
     (8, "Troll"),
 ];
 
-/// The shipped `CharBaseInfo` rows by race, the load-time guard on the 2-byte parse; not the
-/// playable set, as it holds the dead Dwarf-Mage row ([`UNUSED_COMBOS`]).
+/// The shipped `CharBaseInfo` rows by race, the load-time guard on the 2-byte parse: each must be
+/// present, and a patch may add more, as the class-list builder `0x4706b0` lists every row for the
+/// race. Not the playable set, as it holds the dead Dwarf-Mage row ([`UNUSED_COMBOS`]).
 const KNOWN_COMBOS: [(u8, &[u8]); 8] = [
     (1, &[1, 2, 4, 5, 8, 9]), // Human
     (2, &[1, 3, 4, 7, 9]),    // Orc
@@ -60,6 +61,24 @@ const KNOWN_COMBOS: [(u8, &[u8]); 8] = [
 /// literal `race == 3 && class == 8` (Dwarf-Mage), though the row and its outfit are populated.
 const UNUSED_COMBOS: [(u8, u8); 1] = [(3, 8)];
 
+/// The `CharBaseInfo` misparse guard: every shipped pair is present; a patch's extra pairs pass.
+fn shipped_combos_present(combos: &HashSet<(u8, u8)>) -> Result<()> {
+    for (race, classes) in KNOWN_COMBOS {
+        let missing: Vec<u8> = classes
+            .iter()
+            .copied()
+            .filter(|&c| !combos.contains(&(race, c)))
+            .collect();
+        if !missing.is_empty() {
+            bail!(
+                "CharBaseInfo misparse: race {race} lacks shipped classes {missing:?} \
+                 (check the 2-byte race/class layout)"
+            );
+        }
+    }
+    Ok(())
+}
+
 /// One worn item of a CharStartOutfit row: its ItemDisplayInfo id and its InventoryType.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct StartOutfitItem {
@@ -183,15 +202,7 @@ impl CharCreateCatalog {
     }
 
     fn self_check(&self) -> Result<()> {
-        for (race, classes) in KNOWN_COMBOS {
-            let got = self.classes_for_race(race);
-            if got != classes {
-                bail!(
-                    "CharBaseInfo misparse: race {race} classes {got:?} != known {classes:?} \
-                     (check the 2-byte race/class layout)"
-                );
-            }
-        }
+        shipped_combos_present(&self.combos)?;
         for (race, file) in KNOWN_FILES {
             if self.race_file(race) != Some(file) {
                 bail!(
@@ -518,6 +529,21 @@ mod tests {
             .is_some_and(|vs| vs.contains(&facial_hair))
     }
 
+    #[test]
+    fn a_patched_combo_passes_the_guard_and_a_lost_one_does_not() {
+        let mut combos: HashSet<(u8, u8)> = KNOWN_COMBOS
+            .iter()
+            .flat_map(|&(r, cs)| cs.iter().map(move |&c| (r, c)))
+            .collect();
+        assert!(shipped_combos_present(&combos).is_ok());
+        // A patch that adds Human Hunter: 1.12.1's builder lists it, so the load must go on.
+        combos.insert((1, 3));
+        assert!(shipped_combos_present(&combos).is_ok());
+        // A misparse that drops a shipped pair still refuses.
+        combos.remove(&(2, 7));
+        assert!(shipped_combos_present(&combos).is_err());
+    }
+
     #[test]
     fn char_create_catalog_matches_the_5875_dbcs() {
         let data = crate::wow_data_or_skip!();
diff --git a/crates/benilla-formats/src/characters/geosets.rs b/crates/benilla-formats/src/characters/geosets.rs
index 7a35f523..e34804fb 100644
--- a/crates/benilla-formats/src/characters/geosets.rs
+++ b/crates/benilla-formats/src/characters/geosets.rs
@@ -17,6 +17,21 @@ const REGION_BASES: [u16; 16] = [
     1, 101, 201, 301, 401, 501, 601, 702, 801, 901, 1001, 1101, 1201, 1301, 1401, 1501,
 ];
 
+/// The geosets a character shows: the selector's picks, plus every ID above 1700. `0x477520` first
+/// disables only 0..=1700 (`0x6a4`, through `0x7110d0`) and then enables its picks, and a model's
+/// submeshes start visible (`0x70ebd0` fills their flags with 1), so a higher ID stays shown.
+#[derive(Debug)]
+pub struct VisibleGeosets {
+    selected: Vec<u16>,
+}
+
+impl VisibleGeosets {
+    /// Whether a model submesh survives the character compositor's geoset selection.
+    pub fn contains(&self, geoset_id: &u16) -> bool {
+        *geoset_id > 1700 || self.selected.contains(geoset_id)
+    }
+}
+
 /// The customization → geoset tables, resolving an appearance to the set of visible geosets.
 pub struct CharacterGeosets {
     /// (race, sex, hairStyle) → hair `GeosetID` (group 0).
@@ -47,7 +62,8 @@ pub struct EquipGeosets {
 
 impl CharacterGeosets {
     /// The geosets (`skinSectionId`s) this appearance draws, sorted and deduplicated: the naked
-    /// set, then the eight equipment branches B1–B8 of `0x477520`.
+    /// set, then the eight equipment branches B1–B8 of `0x477520`. Use
+    /// [`VisibleGeosets::contains`] to retain unmanaged IDs above 1700.
     pub fn visible_geosets(
         &self,
         race: u8,
@@ -55,7 +71,7 @@ impl CharacterGeosets {
         hair_style: u8,
         facial_hair: u8,
         equip: &EquipGeosets,
-    ) -> Vec<u16> {
+    ) -> VisibleGeosets {
         // The naked set: the region bases and geoset 0, the body.
         let mut set = REGION_BASES.to_vec();
         set.push(0);
@@ -158,7 +174,7 @@ impl CharacterGeosets {
         // The client sets a flag per submesh (`0x7110d0`), so a repeated enable is a no-op there.
         set.sort_unstable();
         set.dedup();
-        set
+        VisibleGeosets { selected: set }
     }
 
     /// Load the customization DBCs from the patch chain. A repeated `(race, sex, variation)` key
@@ -287,6 +303,71 @@ pub(crate) fn char_facial_hair_schema() -> Schema {
 mod tests {
     use super::*;
 
+    #[test]
+    fn geoset_visibility_preserves_unmanaged_ids() {
+        let cg = CharacterGeosets {
+            hair: HashMap::new(),
+            facial: HashMap::new(),
+            helmet_vis: HashMap::new(),
+        };
+        let mut boots = EquipGeosets::default();
+        boots.bodyslots[4] = Some([2, 0, 0]);
+        for equip in [EquipGeosets::default(), boots] {
+            let visible = cg.visible_geosets(4, 1, 0, 0, &equip);
+            assert!(
+                visible.contains(&0),
+                "stock eye glow stays on the body geoset"
+            );
+            for id in [2, 302, 1600, 1699, 1700] {
+                assert!(!visible.contains(&id), "unselected managed geoset {id}");
+            }
+            for id in [1701, 1702, 2001, u16::MAX] {
+                assert!(visible.contains(&id), "unmanaged geoset {id} stays visible");
+            }
+        }
+        let visible = cg.visible_geosets(4, 1, 0, 0, &boots);
+        assert!(!visible.contains(&501), "boots still hide the bare ankle");
+        assert!(
+            visible.contains(&503),
+            "the equipped boot variant is visible"
+        );
+    }
+
+    /// Both Night Elf sexes carry two eye-glow cards (on geoset 0 in the stock data; an asset pack
+    /// may put them above 1700), and both survive the selection, bare and robed.
+    #[test]
+    fn geoset_visibility_keeps_night_elf_eye_glow() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let cg = CharacterGeosets::load(&mut chain).expect("load customization tables");
+        for (sex, name) in [(0, "Male"), (1, "Female")] {
+            let path = format!("Character\\NightElf\\{name}\\NightElf{name}.m2");
+            let parts = crate::load_m2_mesh(&mut chain, &path).expect("Night Elf model");
+            let eyes: Vec<_> = parts
+                .iter()
+                .filter(|p| {
+                    p.texture
+                        .as_ref()
+                        .is_some_and(|t| t.to_ascii_lowercase().ends_with("eyeglow.blp"))
+                })
+                .collect();
+            assert_eq!(eyes.len(), 2, "{name} has two eye-glow cards");
+            assert!(eyes.iter().all(|p| p.billboard.is_some() && p.additive));
+            let mut robe = EquipGeosets::default();
+            robe.bodyslots[1] = Some([0, 0, 1]);
+            for equip in [EquipGeosets::default(), robe] {
+                let visible = cg.visible_geosets(4, sex, 0, 0, &equip);
+                assert_eq!(
+                    eyes.iter()
+                        .filter(|p| visible.contains(&p.geoset_id))
+                        .count(),
+                    2,
+                    "{name}: both eye-glow cards must survive the character filter"
+                );
+            }
+        }
+    }
+
     /// Gloves, boots, a robe and a cloak replace their groups; a robe hides the tabard flap.
     #[test]
     fn equipment_geoset_branches() {
diff --git a/crates/benilla-formats/src/characters/mod.rs b/crates/benilla-formats/src/characters/mod.rs
index 4f5ee29c..bfded93f 100644
--- a/crates/benilla-formats/src/characters/mod.rs
+++ b/crates/benilla-formats/src/characters/mod.rs
@@ -5,16 +5,18 @@
 //!
 //! DBC layouts follow the client's record readers: CharSections `0x575540`, the geoset tables
 //! `0x5753b0`/`0x575a80`.
+//! The compositor disables geosets 0..=1700; higher IDs keep their model visibility through
+//! [`VisibleGeosets::contains`].
 
 mod customization;
 mod geosets;
 mod sections;
 
 pub use customization::{CharCreateCatalog, DialRanges, StartOutfitItem};
-pub use geosets::{CharacterGeosets, EquipGeosets};
+pub use geosets::{CharacterGeosets, EquipGeosets, VisibleGeosets};
 pub use sections::{
     equip_blits, equip_column, equip_region_candidates, equip_tex_dir, equip_tile, forearm_dressed,
-    BlitSource, CharSections, EmblemLayer, EquipBlit, GuildEmblem,
+    BlitSource, CharSections, CompositePlan, EmblemLayer, EquipBlit, GuildEmblem,
 };
 
 // The loaders' own schemas, for the `benilla-extract dbc` CSV dump (`crate::schema_for`).
diff --git a/crates/benilla-formats/src/characters/sections.rs b/crates/benilla-formats/src/characters/sections.rs
index 83fee743..1df8c8f8 100644
--- a/crates/benilla-formats/src/characters/sections.rs
+++ b/crates/benilla-formats/src/characters/sections.rs
@@ -142,12 +142,8 @@ impl CharSections {
             .filter(|s| !s.is_empty())
     }
 
-    /// The body-skin atlas as one mip pyramid: the 256² base skin, the head overlays, the
-    /// underwear, the equipment by bodyslot − 2 and the guild emblem ([`equip_blits`]), each at its
-    /// tile per authored mip level (`0x475c50`, `0x4770f0`); `Ok(None)` without a base skin row.
-    ///
-    /// Deviation: blends in 8-bit RGBA, not the client's RGB565 with 2-bit coverage, because that
-    /// format only saves texture memory and loses precision.
+    /// The body-skin atlas as one mip pyramid, read off `chain` on this thread:
+    /// [`Self::composite_plan`] run by [`CompositePlan::run`]; `Ok(None)` without a base skin row.
     pub fn composite_body(
         &self,
         chain: &mut Chain,
@@ -162,11 +158,43 @@ impl CharSections {
         emblem: Option<GuildEmblem>,
         tabard_preview: bool,
     ) -> Result<Option<BlpMipChain>> {
-        let Some(base_path) = self.skin_texture(race, sex, skin) else {
+        let Some(plan) = self.composite_plan(
+            race,
+            sex,
+            skin,
+            face,
+            facial_hair,
+            hair_style,
+            hair_color,
+            equipment,
+            emblem,
+            tabard_preview,
+        ) else {
             return Ok(None);
         };
-        let mut atlas = read_texture_mip_chain(chain, base_path)
-            .with_context(|| format!("reading base skin '{base_path}'"))?;
+        plan.run(|path| read_texture_mip_chain(chain, path))
+            .map(Some)
+    }
+
+    /// What a body composite reads and where each file lands, from the tables alone: the 256²
+    /// base skin, the head overlays, the underwear, the equipment by bodyslot − 2 and the guild
+    /// emblem ([`equip_blits`]), in blit order; `None` without a base skin row. It owns its paths,
+    /// so [`CompositePlan::run`] can read and blit on any thread.
+    pub fn composite_plan(
+        &self,
+        race: u8,
+        sex: u8,
+        skin: u8,
+        face: u8,
+        facial_hair: u8,
+        hair_style: u8,
+        hair_color: u8,
+        equipment: [Option<&ItemDisplay>; 8],
+        emblem: Option<GuildEmblem>,
+        tabard_preview: bool,
+    ) -> Option<CompositePlan> {
+        let base = self.skin_texture(race, sex, skin)?.to_owned();
+        let mut layers = Vec::new();
         // The head overlays `(sectionType, variation, color, column, tile)` of `0x4782e0`, in order
         // face, facial hair, hair; face and facial hair use columns 0/1, hair 1/2.
         let overlays: [(u8, u8, u8, usize, Tile); 6] = [
@@ -178,11 +206,8 @@ impl CharSections {
             (SECTION_HAIR, hair_style, hair_color, 2, TILE_G8),
         ];
         for (ty, var, color, col, tile) in overlays {
-            let Some(path) = self.tex(race, sex, ty, var, color, col) else {
-                continue;
-            };
-            if let Ok(overlay) = read_texture_mip_chain(chain, path) {
-                blit_over(&mut atlas, &overlay, tile);
+            if let Some(path) = self.tex(race, sex, ty, var, color, col) {
+                layers.push((vec![path.to_owned()], tile));
             }
         }
         // One plan gates the underwear and drives the equipment blits.
@@ -193,24 +218,15 @@ impl CharSections {
             if plan.iter().any(|s| s.layer == layer && s.column < tested) {
                 continue;
             }
-            let Some(path) = self.tex(race, sex, SECTION_UNDERWEAR, 0, skin, col) else {
-                continue;
-            };
-            if let Ok(overlay) = read_texture_mip_chain(chain, path) {
-                blit_over(&mut atlas, &overlay, EQUIP_TILES[layer]);
+            if let Some(path) = self.tex(race, sex, SECTION_UNDERWEAR, 0, skin, col) {
+                layers.push((vec![path.to_owned()], EQUIP_TILES[layer]));
             }
         }
         // The equipment and emblem layers in plan order, each from its first decodable candidate.
         for step in &plan {
-            if let Some(overlay) = step
-                .candidates(sex)
-                .iter()
-                .find_map(|path| read_texture_mip_chain(chain, path).ok())
-            {
-                blit_over(&mut atlas, &overlay, EQUIP_TILES[step.layer]);
-            }
+            layers.push((step.candidates(sex), EQUIP_TILES[step.layer]));
         }
-        Ok(Some(atlas))
+        Some(CompositePlan { base, layers })
     }
 
     /// Load CharSections.dbc from the patch chain.
@@ -249,6 +265,32 @@ impl CharSections {
     }
 }
 
+/// One body composite's reads in blit order ([`CharSections::composite_plan`]): the base skin, then
+/// each overlay's candidate paths, the first that decodes winning, with its atlas tile.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct CompositePlan {
+    base: String,
+    layers: Vec<(Vec<String>, Tile)>,
+}
+
+impl CompositePlan {
+    /// Read, decode and blit: each overlay at its tile per authored mip level (`0x475c50`,
+    /// `0x4770f0`). An overlay that reads nowhere is skipped; a base skin that does not read fails.
+    ///
+    /// Deviation: blends in 8-bit RGBA, not the client's RGB565 with 2-bit coverage, because that
+    /// format only saves texture memory and loses precision.
+    pub fn run(&self, mut read: impl FnMut(&str) -> Result<BlpMipChain>) -> Result<BlpMipChain> {
+        let mut atlas =
+            read(&self.base).with_context(|| format!("reading base skin '{}'", self.base))?;
+        for (candidates, tile) in &self.layers {
+            if let Some(overlay) = candidates.iter().find_map(|path| read(path).ok()) {
+                blit_over(&mut atlas, &overlay, *tile);
+            }
+        }
+        Ok(atlas)
+    }
+}
+
 /// One step of the equipment plan [`CharSections::composite_body`] runs, public so
 /// `benilla-extract charatlas` reports the same plan.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/crates/benilla-formats/src/chr_classes.rs b/crates/benilla-formats/src/chr_classes.rs
index 15c6399b..153b4a0e 100644
--- a/crates/benilla-formats/src/chr_classes.rs
+++ b/crates/benilla-formats/src/chr_classes.rs
@@ -1,6 +1,10 @@
 //! `ChrClasses.dbc`, the per-class table, narrowed to the three columns the reference reads off
 //! its class-indexed record table (`0xc0def4`, max id `0xc0def8`, loader `0x542360`).
 //!
+//! Field 2, the damage bonus stat: `GetDamageBonusStat` (`0x48b520`) reads it at `rec + 8` for the
+//! active player's class byte and answers it plus one, a 1-based `UnitStat` index. Strength (0)
+//! for every row but the Hunter's and the Rogue's Agility (1).
+//!
 //! Field 4, the pet name token: the second return of `HasPetSpells` (`0x4b4410`), `"PET"` on every
 //! row but the Warlock's `"DEMON"`. FrameXML resolves it with `getglobal("PET_TYPE_"..token)`
 //! (`SpellBookFrame.lua:173`), so the token is a key, never display text, and is not localized.
@@ -30,6 +34,9 @@ const CHR_CLASSES: &str = "DBFilesClient\\ChrClasses.dbc";
 /// never read one column short.
 const CHR_CLASSES_FIELDS: usize = 17;
 
+/// Field 2, read at `rec + 8` by `GetDamageBonusStat` (`0x48b569`).
+const DAMAGE_BONUS_STAT_FIELD: usize = 0x8 / 4;
+
 /// Field 4, read at `rec + 0x10` by `HasPetSpells` (`0x4b447c`).
 const PET_NAME_TOKEN_FIELD: usize = 0x10 / 4;
 
@@ -45,6 +52,7 @@ pub const PET_NAME_TOKEN_FALLBACK: &str = "PET";
 
 #[derive(Debug, Clone)]
 struct ChrClass {
+    damage_bonus_stat: u32,
     pet_name_token: Option<String>,
     has_relic_slot: bool,
     spell_family: u32,
@@ -64,6 +72,12 @@ impl ChrClasses {
             .unwrap_or(PET_NAME_TOKEN_FALLBACK)
     }
 
+    /// The class's damage bonus stat, 0-based (Strength 0, Agility 1); `None` for a class with
+    /// no row, where `GetDamageBonusStat` answers 0 (`0x48b58a`).
+    pub fn damage_bonus_stat(&self, class: u32) -> Option<u32> {
+        self.0.get(&class).map(|c| c.damage_bonus_stat)
+    }
+
     /// Whether the class's INVSLOT 17 is a relic slot, `UnitHasRelicSlot` whole. A class with no
     /// row answers false, as the reference's bound check against `0xc0def8` falls to its nil leg.
     pub fn has_relic_slot(&self, class: u32) -> bool {
@@ -110,6 +124,7 @@ pub fn load_chr_classes(chain: &mut Chain) -> Result<ChrClasses> {
         by_id.insert(
             id,
             ChrClass {
+                damage_bonus_stat: u32_at(r, DAMAGE_BONUS_STAT_FIELD).unwrap_or(0),
                 pet_name_token: str_at(&rs, r, PET_NAME_TOKEN_FIELD),
                 has_relic_slot: u32_at(r, RELIC_SLOT_FIELD).is_some_and(|v| v != 0),
                 spell_family: u32_at(r, SPELL_FAMILY_FIELD).unwrap_or(0),
@@ -165,6 +180,28 @@ mod tests {
         assert!(!t.has_relic_slot(0));
     }
 
+    /// Hunters and Rogues scale their damage off Agility, everyone else off Strength.
+    #[test]
+    fn hunters_and_rogues_take_their_damage_bonus_from_agility() {
+        let Some(mut chain) = chain() else { return };
+        let t = load_chr_classes(&mut chain).expect("load ChrClasses.dbc");
+        for (class, who) in [(3, "Hunter"), (4, "Rogue")] {
+            assert_eq!(t.damage_bonus_stat(class), Some(1), "{who}");
+        }
+        for (class, who) in [
+            (1, "Warrior"),
+            (2, "Paladin"),
+            (5, "Priest"),
+            (7, "Shaman"),
+            (8, "Mage"),
+            (9, "Warlock"),
+            (11, "Druid"),
+        ] {
+            assert_eq!(t.damage_bonus_stat(class), Some(0), "{who}");
+        }
+        assert_eq!(t.damage_bonus_stat(6), None);
+    }
+
     /// The whole column pins field 15: nine distinct values matching vmangos `SpellFamilyNames`
     /// are a shape no neighbour has (field 14 is the class's file name, field 16 the relic flag).
     #[test]
diff --git a/crates/benilla-formats/src/creatures.rs b/crates/benilla-formats/src/creatures.rs
index 5f242e5c..9237d989 100644
--- a/crates/benilla-formats/src/creatures.rs
+++ b/crates/benilla-formats/src/creatures.rs
@@ -248,6 +248,14 @@ impl CreatureCatalog {
         })
     }
 
+    /// The `(race, sex)` of a display's `CreatureDisplayInfoExtra` row, the unit's display
+    /// override (`[unit+0xb38]`, `0x60afb0`); `None` for a display with no extra row.
+    pub fn display_race_sex(&self, display_id: u32) -> Option<(u8, u8)> {
+        let extra = self.display.get(&display_id)?.extended_id;
+        let row = (extra != 0).then(|| self.extra.get(&extra)).flatten()?;
+        Some((row.race, row.sex))
+    }
+
     /// Number of display entries (for logging/diagnostics).
     pub fn len(&self) -> usize {
         self.display.len()
diff --git a/crates/benilla-formats/src/emotes.rs b/crates/benilla-formats/src/emotes.rs
index 06455408..a7a06f3b 100644
--- a/crates/benilla-formats/src/emotes.rs
+++ b/crates/benilla-formats/src/emotes.rs
@@ -11,7 +11,13 @@ use benilla_dbc::{FieldType, Schema, SchemaField};
 
 use crate::dbc::{parse, str_at, u32_at};
 
+/// The `EmoteFlags` bit `0x2000`: a state emote that yields to an interaction. The state
+/// resolver (`0x5fd7fa`) passes over it for the current interact NPC, and the facing chain
+/// (`0x600d98`) lets the unit turn toward the interactor while it is set.
+pub const EMOTE_FLAG_INTERACTION: u32 = 0x2000;
+
 /// The joined emote tables.
+#[derive(Default)]
 pub struct EmoteSoundCatalog {
     /// Uppercased `EmotesText.Name` ("WAVE") to text-emote id.
     by_name: HashMap<String, u32>,
@@ -62,6 +68,22 @@ impl EmoteSoundCatalog {
         self.anim.get(&emote_id).copied().filter(|&a| a != 0)
     }
 
+    /// A catalog holding one `Emotes.dbc` row's `AnimID` and `EmoteFlags`, for tests of what
+    /// reads them.
+    #[doc(hidden)]
+    pub fn with_row(mut self, emote_id: u32, anim_id: u32, flags: u32) -> Self {
+        self.anim.insert(emote_id, anim_id);
+        self.emote_flags.insert(emote_id, flags);
+        self
+    }
+
+    /// The raw `AnimID` of an `Emotes.dbc` row, `0` (Stand) included: the state resolver
+    /// (`0x5fd770`) claims the base with whatever the row holds (`0x5fd816`, `row+8`), and a
+    /// missing row claims nothing.
+    pub fn state_anim(&self, emote_id: u32) -> Option<u32> {
+        self.anim.get(&emote_id).copied()
+    }
+
     /// The `Emotes.dbc` id in gesture `slot`, the `code` the client's gesture dispatcher
     /// `0x60bb30` takes; a slot no shipped row fills plays no gesture, as in the client.
     pub fn gesture(&self, slot: usize) -> Option<u32> {
@@ -230,6 +252,14 @@ mod tests {
         let cat = load_emote_sound_catalog(&mut chain).expect("load emote catalog");
         assert_eq!(cat.text_id("wave"), Some(101), "case-insensitive by name");
         assert_eq!(cat.text_emote(101), Some(3), "WAVE plays anim emote 3");
+        // A chat-only text emote has `EmoteID` 0, which `DoEmote` (`0x5ef591`) reads as row 0.
+        assert_eq!(
+            cat.text_emote(cat.text_id("smile").unwrap()),
+            None,
+            "SMILE is chat-only"
+        );
+        assert_eq!(cat.emote_flags(0), Some(0), "row 0 exists with no flags");
+        assert_eq!(cat.spec_proc(0), Some(0), "row 0 is no posture emote");
         assert_eq!(cat.anim(2), Some(66), "ONESHOT_BOW (id 2) plays AnimID 66");
         // The posture-gate rows (`0x47db40`), ids from vmangos `SharedDefines.h`'s `Emote` enum.
         assert_eq!(cat.emote_flags(2), Some(0x4801), "ONESHOT_BOW EmoteFlags");
diff --git a/crates/benilla-formats/src/install.rs b/crates/benilla-formats/src/install.rs
index 5d4117ff..cab28469 100644
--- a/crates/benilla-formats/src/install.rs
+++ b/crates/benilla-formats/src/install.rs
@@ -3,7 +3,7 @@
 //!
 //! 1. `$WOW_DATA`. Set and empty (`WOW_DATA=`) means no install and ends the search, so the
 //!    no-install path runs on a machine that has one.
-//! 2. `<project folder>/WoW/Data`, `dev` builds only, from this crate's `CARGO_MANIFEST_DIR`.
+//! 2. `<project folder>/WoW/Data`, `dev` builds only ([`project_folder`]).
 //! 3. `<exe dir>/Data`, then `<exe dir>/WoW/Data`, the release layouts.
 //!
 //! `dev` is a default feature here, so every dependent declares `default-features = false` and
@@ -12,6 +12,44 @@
 //! catch it.
 
 use std::path::{Path, PathBuf};
+use std::sync::OnceLock;
+
+/// The launcher's project folder, handed in by its entry point ([`set_project_folder`]).
+static LAUNCHER_FOLDER: OnceLock<PathBuf> = OnceLock::new();
+
+/// Record the launcher's project folder, as its build stamp names it (`BuildId::project_dir`); an
+/// empty stamp, a player build's, records nothing. The entry point calls this once, before
+/// anything resolves from the folder, and a later call changes nothing.
+pub fn set_project_folder(dir: &str) {
+    if !dir.is_empty() {
+        let _ = LAUNCHER_FOLDER.set(PathBuf::from(dir));
+    }
+}
+
+/// The folder a dev build keeps its `WoW` link, `benilla-config/` and `.probe-identity` in: the
+/// launcher's, when its entry point recorded one, else benilla's own checkout, so a crate built on
+/// top of benilla resolves from its folder and not from cargo's checkout of benilla. `None` in a
+/// player build, which looks in no source tree.
+pub fn project_folder() -> Option<&'static Path> {
+    #[cfg(feature = "dev")]
+    {
+        LAUNCHER_FOLDER
+            .get()
+            .map(PathBuf::as_path)
+            .or_else(benilla_checkout)
+    }
+    #[cfg(not(feature = "dev"))]
+    {
+        None
+    }
+}
+
+/// benilla's own checkout: this crate's manifest dir, two levels up. The addon corpus always
+/// resolves here, since its tests are benilla's.
+#[cfg(feature = "dev")]
+fn benilla_checkout() -> Option<&'static Path> {
+    Path::new(env!("CARGO_MANIFEST_DIR")).ancestors().nth(2)
+}
 
 /// The vanilla `Data` directory, or `None` when there is no install. Uncached, so a `$WOW_DATA`
 /// change is seen.
@@ -23,6 +61,7 @@ pub fn wow_data() -> Option<PathBuf> {
 pub fn candidates() -> Vec<PathBuf> {
     candidates_from(
         std::env::var_os("WOW_DATA").map(PathBuf::from),
+        project_folder(),
         std::env::current_exe()
             .ok()
             .and_then(|e| e.parent().map(Path::to_path_buf)),
@@ -31,7 +70,11 @@ pub fn candidates() -> Vec<PathBuf> {
 
 /// [`candidates`] with the environment passed in: a test that set `$WOW_DATA` would change the
 /// answer for every test running beside it. `tests/wow_data_env.rs` covers the real read.
-fn candidates_from(override_dir: Option<PathBuf>, exe_dir: Option<PathBuf>) -> Vec<PathBuf> {
+fn candidates_from(
+    override_dir: Option<PathBuf>,
+    project: Option<&Path>,
+    exe_dir: Option<PathBuf>,
+) -> Vec<PathBuf> {
     let mut out = Vec::with_capacity(4);
 
     // 1. The override; set and empty is no install at all, even in a dev build
@@ -43,10 +86,8 @@ fn candidates_from(override_dir: Option<PathBuf>, exe_dir: Option<PathBuf>) -> V
         out.push(over);
     }
 
-    // 2. The project folder, dev builds only: this crate's manifest dir, two levels up, is the
-    // workspace root for every caller.
-    #[cfg(feature = "dev")]
-    if let Some(root) = Path::new(env!("CARGO_MANIFEST_DIR")).ancestors().nth(2) {
+    // 2. The project folder, dev builds only.
+    if let Some(root) = project {
         out.push(root.join("WoW/Data"));
     }
 
@@ -113,8 +154,9 @@ fn skipped_under(required: bool, what: &str, looked_in: &[PathBuf]) {
 }
 
 /// The third-party addon corpus the UI engine's real-addon tests run against, or `None`:
-/// `$BENILLA_ADDON_CORPUS`, then `<project folder>/wow-addons-vanilla` (`dev` only), a gitignored
-/// link beside `WoW`. Never a folder beside the checkout, which depends on where the checkout sits.
+/// `$BENILLA_ADDON_CORPUS`, then `<benilla's checkout>/wow-addons-vanilla` (`dev` only), a
+/// gitignored link beside `WoW`. Never a folder beside the checkout, which depends on where the
+/// checkout sits.
 pub fn addon_corpus() -> Option<PathBuf> {
     addon_corpus_candidates().into_iter().find(|c| c.is_dir())
 }
@@ -130,9 +172,9 @@ fn addon_corpus_candidates_from(override_dir: Option<PathBuf>) -> Vec<PathBuf> {
     if let Some(over) = override_dir {
         out.push(over);
     }
-    // The project folder, dev builds only, as the install's rung 2.
+    // benilla's checkout, dev builds only, whoever the launcher is: the corpus tests are benilla's.
     #[cfg(feature = "dev")]
-    if let Some(root) = Path::new(env!("CARGO_MANIFEST_DIR")).ancestors().nth(2) {
+    if let Some(root) = benilla_checkout() {
         out.push(root.join("wow-addons-vanilla"));
     }
     out
@@ -162,9 +204,14 @@ macro_rules! addon_corpus_or_skip {
 mod tests {
     use super::*;
 
-    /// No test here touches the process environment (see [`candidates_from`]).
+    /// No test here touches the process environment (see [`candidates_from`]), or records a
+    /// launcher's folder, which is process-wide (`tests/project_folder.rs` has a process of its own).
     fn probe(over: Option<&str>, exe: Option<&str>) -> Vec<PathBuf> {
-        candidates_from(over.map(PathBuf::from), exe.map(PathBuf::from))
+        candidates_from(
+            over.map(PathBuf::from),
+            project_folder(),
+            exe.map(PathBuf::from),
+        )
     }
 
     #[test]
@@ -195,7 +242,7 @@ mod tests {
 
         // The winner depends on the build (dev puts the project folder first), so assert only
         // that it is not the ghost and exists.
-        let chosen = candidates_from(Some(ghost.clone()), Some(tmp.clone()))
+        let chosen = candidates_from(Some(ghost.clone()), project_folder(), Some(tmp.clone()))
             .into_iter()
             .find(|c| c.is_dir());
         assert_ne!(
@@ -224,6 +271,11 @@ mod tests {
     #[cfg(not(feature = "dev"))]
     #[test]
     fn a_player_build_carries_no_source_tree_path() {
+        assert_eq!(
+            project_folder(),
+            None,
+            "a player build has no project folder, whatever its launcher stamped"
+        );
         let root = env!("CARGO_MANIFEST_DIR");
         for c in probe(None, Some("/games/benilla")) {
             assert!(
@@ -234,6 +286,8 @@ mod tests {
         }
     }
 
+    /// With no launcher folder recorded (a test, an example, a tool) the rung is benilla's own
+    /// checkout; with one, it is that folder's, and benilla's checkout is not looked in.
     #[cfg(feature = "dev")]
     #[test]
     fn a_dev_build_looks_in_the_project_folder() {
@@ -241,17 +295,34 @@ mod tests {
             .ancestors()
             .nth(2)
             .unwrap();
+        assert_eq!(
+            project_folder(),
+            Some(root),
+            "nothing recorded: the checkout"
+        );
         let c = probe(None, Some("/games/benilla"));
         assert!(
             c.contains(&root.join("WoW/Data")),
             "the dev build lost its project-folder candidate ({}): {c:?}",
             root.display()
         );
+
+        let launcher = Path::new("/home/player/hello-mod");
+        let c = candidates_from(None, Some(launcher), Some(PathBuf::from("/games/benilla")));
+        assert_eq!(
+            c,
+            vec![
+                launcher.join("WoW/Data"),
+                PathBuf::from("/games/benilla/Data"),
+                PathBuf::from("/games/benilla/WoW/Data"),
+            ],
+            "a launcher's folder takes the rung, and nothing else looks in benilla's checkout"
+        );
     }
 
     #[cfg(feature = "dev")]
     #[test]
-    fn the_corpus_ladder_is_override_then_the_project_folder_and_nothing_outside_it() {
+    fn the_corpus_ladder_is_override_then_benillas_checkout_and_nothing_outside_it() {
         let root = Path::new(env!("CARGO_MANIFEST_DIR"))
             .ancestors()
             .nth(2)
diff --git a/crates/benilla-formats/src/lib.rs b/crates/benilla-formats/src/lib.rs
index 489ca44a..be6dfa62 100644
--- a/crates/benilla-formats/src/lib.rs
+++ b/crates/benilla-formats/src/lib.rs
@@ -18,12 +18,15 @@ mod tga;
 pub use tga::tga_to_rgba;
 /// Where the WoW install is; [`Chain`] opens it.
 mod install;
-pub use install::{addon_corpus, addon_corpus_candidates, candidates, skipped, wow_data};
+pub use install::{
+    addon_corpus, addon_corpus_candidates, candidates, project_folder, set_project_folder, skipped,
+    wow_data,
+};
 mod characters;
 pub use characters::{
     equip_blits, equip_column, equip_region_candidates, equip_tex_dir, equip_tile, forearm_dressed,
-    BlitSource, CharCreateCatalog, CharSections, CharacterGeosets, DialRanges, EmblemLayer,
-    EquipBlit, EquipGeosets, GuildEmblem, StartOutfitItem,
+    BlitSource, CharCreateCatalog, CharSections, CharacterGeosets, CompositePlan, DialRanges,
+    EmblemLayer, EquipBlit, EquipGeosets, GuildEmblem, StartOutfitItem, VisibleGeosets,
 };
 mod camera_shakes;
 mod cinematics;
@@ -97,6 +100,8 @@ mod stable_slot_prices;
 pub use stable_slot_prices::{load_stable_slot_prices, StableSlotPrices};
 mod page_text_material;
 pub use page_text_material::{load_page_text_material_catalog, PageTextMaterialCatalog};
+mod packages;
+pub use packages::{load_packages, PackageRow};
 mod stationery;
 pub use stationery::{
     load_stationery_catalog, StationeryCatalog, StationeryRow, STATIONERY_DEFAULT,
@@ -169,7 +174,7 @@ pub use creature_sound::{load_creature_voice_catalog, CreatureVoice, CreatureVoi
 mod npc_greeting;
 pub use npc_greeting::{load_npc_greeting_catalog, NpcGreeting, NpcGreetingCatalog};
 mod emotes;
-pub use emotes::{load_emote_sound_catalog, EmoteSoundCatalog};
+pub use emotes::{load_emote_sound_catalog, EmoteSoundCatalog, EMOTE_FLAG_INTERACTION};
 mod emote_text;
 pub use emote_text::{load_emote_text_catalog, EmoteLine, EmoteTextCatalog};
 mod environmental_damage;
@@ -204,15 +209,16 @@ mod spells;
 pub use spells::{
     cc_exemption, grants_immunity, load_shapeshift_forms, load_spell_cast_times,
     load_spell_catalog, load_spell_dispel_types, load_spell_durations, load_spell_radii,
-    load_spell_ranges, min_max_range, substitute, CcExemption, FormRefusal, LearnAnnouncement,
-    LearnEffect, OpenLock, ShapeshiftForm, SpellCastTime, SpellCastTimeCatalog, SpellCatalog,
-    SpellDispelTypes, SpellDisplay, SpellDuration, SpellDurationCatalog, SpellRadius,
-    SpellRadiusCatalog, SpellRange, SpellRangeCatalog, TokenContext, ATTR_CASTABLE_WHILE_DEAD,
+    load_spell_ranges, min_max_range, min_max_range_reads_units, soft_modify, substitute,
+    CcExemption, FormRefusal, LearnAnnouncement, LearnEffect, OpenLock, RangeTargets, RangeUnit,
+    ShapeshiftForm, SpellCastTime, SpellCastTimeCatalog, SpellCatalog, SpellDispelTypes,
+    SpellDisplay, SpellDuration, SpellDurationCatalog, SpellMods, SpellRadius, SpellRadiusCatalog,
+    SpellRange, SpellRangeCatalog, TokenContext, TokenNumber, UnitMotion, ATTR_CASTABLE_WHILE_DEAD,
     ATTR_NOT_IN_COMBAT, ATTR_ONLY_STEALTHED, COMBAT_REACH_ADD, MELEE_RANGE_FLOOR,
-    ON_NEXT_SWING_RANGE, SPELL_ATTR_IS_TRADESKILL, SPELL_EFFECT_CREATE_ITEM,
-    SPELL_EFFECT_ENCHANT_ITEM, SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY, SPELL_EFFECT_LEARN_PET_SPELL,
-    SPELL_EFFECT_LEARN_SPELL, SPELL_EFFECT_PROSPECTING, SPELL_EFFECT_SKILL_STEP,
-    SPELL_EFFECT_SKINNING, SPELL_EFFECT_TRADE_SKILL,
+    MOVING_BONUS_FLAGS, MOVING_RANGE_BONUS, ON_NEXT_SWING_RANGE, SPELL_ATTR_IS_TRADESKILL,
+    SPELL_EFFECT_CREATE_ITEM, SPELL_EFFECT_ENCHANT_ITEM, SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY,
+    SPELL_EFFECT_LEARN_PET_SPELL, SPELL_EFFECT_LEARN_SPELL, SPELL_EFFECT_PROSPECTING,
+    SPELL_EFFECT_SKILL_STEP, SPELL_EFFECT_SKINNING, SPELL_EFFECT_TRADE_SKILL,
 };
 mod skill_lines;
 pub use skill_lines::{
@@ -339,6 +345,8 @@ pub use text_filter_lists::{load_chat_profanity, load_spam_messages, FilterPatte
 mod race_sound;
 pub use race_sound::{load_exploration_sound_catalog, ExplorationSoundCatalog};
 
+mod race_creature_type;
+pub use race_creature_type::load_race_creature_types;
 mod race_pvp_team;
 pub use race_pvp_team::load_race_pvp_teams;
 mod zone_map;
diff --git a/crates/benilla-formats/src/light.rs b/crates/benilla-formats/src/light.rs
index b07c4be6..e154df98 100644
--- a/crates/benilla-formats/src/light.rs
+++ b/crates/benilla-formats/src/light.rs
@@ -91,7 +91,7 @@ impl Submersion {
         self != Submersion::Dry
     }
 
-    /// A water kind (water, ocean, rapids), for the `UnderWaterLoop` bed and the underwater reverb;
+    /// A water kind (water, ocean, rapids), for the underwater ambience bed and the reverb;
     /// whether the reference swaps those for magma and slime too is untraced.
     pub fn is_water(self) -> bool {
         matches!(self, Submersion::Water | Submersion::Ocean)
diff --git a/crates/benilla-formats/src/light/tables.rs b/crates/benilla-formats/src/light/tables.rs
index a963e9b3..581d27bb 100644
--- a/crates/benilla-formats/src/light/tables.rs
+++ b/crates/benilla-formats/src/light/tables.rs
@@ -12,7 +12,7 @@ use crate::Chain;
 /// Half-minutes in a game day (band time axis); `1440` = noon.
 pub(super) const DAY: u32 = 2880;
 
-/// One band row: parallel (time, value) pairs across the day, ascending in `times`.
+/// One band row: parallel (time, value) pairs across the day, in file order (not always ascending).
 pub(super) struct Band<T> {
     times: Vec<u32>,
     values: Vec<T>,
@@ -51,32 +51,32 @@ fn decode_color(v: u32) -> [f32; 3] {
     ]
 }
 
-/// The `(i0, i1, frac)` segment bracketing `t`, wrapping from the last key to the first; `times`
-/// must be non-empty and ascending.
+/// The `(i0, i1, frac)` segment bracketing `t`, walking `times` as a cycle in file order; `times`
+/// must be non-empty.
 fn segment(times: &[u32], t: u32) -> (usize, usize, f32) {
     let n = times.len();
     if n == 1 {
         return (0, 0, 0.0);
     }
-    // Before the first key or after the last, interpolate last to first across midnight.
-    if t < times[0] || t >= times[n - 1] {
-        let span = times[0] + DAY - times[n - 1];
-        if span == 0 {
-            return (n - 1, 0, 0.0);
-        }
-        let into = if t < times[0] { t + DAY } else { t } - times[n - 1];
-        return (n - 1, 0, into as f32 / span as f32);
-    }
-    for i in 0..n - 1 {
-        if t <= times[i + 1] {
-            let span = times[i + 1] - times[i];
-            let f = if span == 0 {
-                0.0
-            } else {
-                (t - times[i]) as f32 / span as f32
-            };
-            return (i, i + 1, f);
-        }
+    // 0x6d63e0: walk the keys as a cycle in file order; the first pair bracketing `t` wins, and
+    // a pair that does not ascend wraps through midnight.
+    let day = i64::from(DAY);
+    let t = i64::from(t);
+    for i in 0..n {
+        let j = (i + 1) % n;
+        let (a, b) = (i64::from(times[i]), i64::from(times[j]));
+        let (b, t) = if b > a {
+            if !(a <= t && t <= b) {
+                continue;
+            }
+            (b, t)
+        } else {
+            if !(t >= a || t <= b) {
+                continue;
+            }
+            (b + day, if t < a { t + day } else { t })
+        };
+        return (i, j, (t - a) as f32 / (b - a) as f32);
     }
     (n - 1, n - 1, 0.0)
 }
@@ -150,6 +150,18 @@ pub(super) fn load_float_bands(
 mod tests {
     use super::*;
 
+    #[test]
+    fn segment_walks_unordered_keys_as_a_cycle() {
+        // LightParams 8's rows store [720, 1440, 0]: 09:00 sits between 06:00 and noon.
+        assert_eq!(segment(&[720, 1440, 0], 1080), (0, 1, 0.5));
+        // 18:00 lies on the noon-to-midnight pair.
+        assert_eq!(segment(&[720, 1440, 0], 2160), (1, 2, 0.5));
+        // [2640, 2520, 0, 1440]: the first pair wraps across most of the day and wins.
+        let (i0, i1, f) = segment(&[2640, 2520, 0, 1440], 1440);
+        assert_eq!((i0, i1), (0, 1));
+        assert!((f - (1440.0 + 2880.0 - 2640.0) / 2760.0).abs() < 1e-6);
+    }
+
     #[test]
     fn segment_wraps_across_midnight() {
         // Keys at 06:00 and 18:00 in half-minutes: 03:00 wraps from the last key, not clamps.
diff --git a/crates/benilla-formats/src/packages.rs b/crates/benilla-formats/src/packages.rs
new file mode 100644
index 00000000..eeb55f84
--- /dev/null
+++ b/crates/benilla-formats/src/packages.rs
@@ -0,0 +1,76 @@
+//! `Package.dbc`: the send tab's gift packages, 12 columns of `0x30` bytes (the loader's checks,
+//! `0x54b4ae` and `0x54b4e6`). The reference keeps the rows in file order (`[0xc0da28]`, count
+//! `[0xc0da2c]`) and indexes them by position: `GetPackageInfo` reads the icon at `+4`, the cost at
+//! `+8` and the localized name at `+0xc`, `SelectPackage` stores the id at `+0`. 1.12 ships one
+//! row, "Test Package".
+
+use anyhow::{Context, Result};
+use benilla_dbc::{FieldType, Schema, SchemaField};
+
+use crate::chain::Chain;
+use crate::dbc::{parse, str_at, u32_at};
+
+const PACKAGE: &str = "DBFilesClient\\Package.dbc";
+
+/// The column count the loader requires.
+const PACKAGE_FIELDS: usize = 12;
+
+/// One `Package.dbc` row.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PackageRow {
+    pub id: u32,
+    /// The icon's basename, which the reference prefixes with `Interface\Icons\`.
+    pub icon: String,
+    /// Copper, read as a signed dword (`0x4ae50d` `fild`).
+    pub cost: i32,
+    /// The enUS name.
+    pub name: String,
+}
+
+/// Load `Package.dbc`'s rows, in file order.
+pub fn load_packages(chain: &mut Chain) -> Result<Vec<PackageRow>> {
+    let bytes = chain.read_file(PACKAGE).context("reading Package.dbc")?;
+    let mut schema = Schema::new("Package");
+    for i in 0..PACKAGE_FIELDS {
+        let ty = if i == 1 || i == 3 {
+            FieldType::String
+        } else {
+            FieldType::UInt32
+        };
+        schema.add_field(SchemaField::new(format!("F{i}"), ty));
+    }
+    let set = parse(&bytes, schema, "Package.dbc")?;
+    Ok(set
+        .records()
+        .iter()
+        .filter_map(|r| {
+            Some(PackageRow {
+                id: u32_at(r, 0)?,
+                icon: str_at(&set, r, 1).unwrap_or_default(),
+                cost: u32_at(r, 2)? as i32,
+                name: str_at(&set, r, 3).unwrap_or_default(),
+            })
+        })
+        .collect())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn the_one_shipped_package_is_the_test_package() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let rows = load_packages(&mut chain).expect("load Package.dbc");
+        assert_eq!(
+            rows,
+            [PackageRow {
+                id: 2,
+                icon: "INV_BOX_04".into(),
+                cost: 10,
+                name: "Test Package".into(),
+            }]
+        );
+    }
+}
diff --git a/crates/benilla-formats/src/race_creature_type.rs b/crates/benilla-formats/src/race_creature_type.rs
new file mode 100644
index 00000000..328ed745
--- /dev/null
+++ b/crates/benilla-formats/src/race_creature_type.rs
@@ -0,0 +1,55 @@
+//! `ChrRaces.dbc` column 9: the creature type a player's race reads as, the last stage of the
+//! creature-type resolver (`0x605570`: race byte → row `[0xc0dee0][race]`, offset `0x24`, at
+//! `0x6055ca`). The runtime uses a frozen copy, `spell::unit_type::race_creature_type`; this
+//! loader backs the test that pins it.
+
+use std::collections::HashMap;
+
+use crate::Chain;
+use anyhow::{Context, Result};
+use benilla_dbc::{FieldType, Schema, SchemaField};
+
+use crate::dbc::{parse, u32_at};
+
+const CHR_RACES: &str = "DBFilesClient\\ChrRaces.dbc";
+
+/// Each `ChrRaces.dbc` row's creature type by race id; a race without a row is absent.
+pub fn load_race_creature_types(chain: &mut Chain) -> Result<HashMap<u8, u32>> {
+    let bytes = chain
+        .read_file(CHR_RACES)
+        .with_context(|| format!("reading {CHR_RACES}"))?;
+    let mut schema = Schema::new("ChrRaces");
+    for i in 0..29 {
+        let ty = match i {
+            15 | 26 | 27 | 28 => FieldType::String,
+            _ => FieldType::UInt32,
+        };
+        schema.add_field(SchemaField::new(format!("f{i}"), ty));
+    }
+    let rs = parse(&bytes, schema, "ChrRaces")?;
+    Ok(rs
+        .records()
+        .iter()
+        .filter_map(|r| Some((u8::try_from(u32_at(r, 0)?).ok()?, u32_at(r, 9)?)))
+        .collect())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Nine rows, every one Humanoid (7), the rows `race_creature_type` freezes.
+    #[test]
+    fn every_shipped_race_reads_humanoid() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let rows = load_race_creature_types(&mut chain).expect("load ChrRaces");
+        assert_eq!(rows.len(), 9, "ChrRaces.dbc row count");
+        for race in 1..=9u8 {
+            assert_eq!(rows.get(&race), Some(&7), "race {race}");
+        }
+        for race in [0u8, 10, 255] {
+            assert!(!rows.contains_key(&race), "race {race} has no row");
+        }
+    }
+}
diff --git a/crates/benilla-formats/src/sound_entries.rs b/crates/benilla-formats/src/sound_entries.rs
index df1a691b..45aa737e 100644
--- a/crates/benilla-formats/src/sound_entries.rs
+++ b/crates/benilla-formats/src/sound_entries.rs
@@ -50,11 +50,17 @@ pub struct SoundKit {
     pub eax_def: u32,
 }
 
+/// The names `0x4609b0` finds the two forced ambience beds by (`0x836444`, `0x836428`).
+const GHOST_BED_NAME: &str = "Ghost (DONOTRENAME)";
+const UNDERWATER_BED_NAME: &str = "Underwater (DONOTRENAME)";
+
 /// All kits, resolvable by id or, ignoring case, by name.
 pub struct SoundKitCatalog {
     kits: HashMap<u32, SoundKit>,
     /// Lowercased `Name` to id: the reference's name hash ignores case.
     by_name: HashMap<String, u32>,
+    ghost_bed: Option<u32>,
+    underwater_bed: Option<u32>,
 }
 
 impl SoundKitCatalog {
@@ -69,6 +75,16 @@ impl SoundKitCatalog {
             .and_then(|id| self.kits.get(id))
     }
 
+    /// The ambience bed a ghost hears, the row named `"Ghost (DONOTRENAME)"`: `[0xb06d48]`.
+    pub fn ghost_bed(&self) -> Option<u32> {
+        self.ghost_bed
+    }
+
+    /// The ambience bed under water, the row named `"Underwater (DONOTRENAME)"`: `[0xb06d4c]`.
+    pub fn underwater_bed(&self) -> Option<u32> {
+        self.underwater_bed
+    }
+
     pub fn len(&self) -> usize {
         self.kits.len()
     }
@@ -79,13 +95,69 @@ impl SoundKitCatalog {
 
     /// An empty catalog for consumers' unit tests.
     pub fn empty_for_tests() -> Self {
+        Self::from_kits(Vec::new())
+    }
+
+    /// A catalog of file-less kits, `(id, name)` in row order, for consumers' unit tests.
+    pub fn named_for_tests(rows: &[(u32, &str)]) -> Self {
+        Self::from_kits(
+            rows.iter()
+                .map(|&(id, name)| SoundKit {
+                    id,
+                    sound_type: 0,
+                    name: name.to_owned(),
+                    files: Vec::new(),
+                    volume: 1.0,
+                    flags: 0,
+                    min_distance: 0.0,
+                    distance_cutoff: 0.0,
+                    eax_def: 0,
+                })
+                .collect(),
+        )
+    }
+
+    /// The catalog of `rows` in file order, with the two forced beds resolved once, as the
+    /// reference does at init.
+    fn from_kits(rows: Vec<SoundKit>) -> Self {
+        let (ghost_bed, underwater_bed) = resolve_forced_beds(&rows);
+        let mut kits = HashMap::with_capacity(rows.len());
+        let mut by_name = HashMap::with_capacity(rows.len());
+        for kit in rows {
+            if !kit.name.is_empty() {
+                by_name.insert(kit.name.to_ascii_lowercase(), kit.id);
+            }
+            kits.insert(kit.id, kit);
+        }
         Self {
-            kits: HashMap::new(),
-            by_name: HashMap::new(),
+            kits,
+            by_name,
+            ghost_bed,
+            underwater_bed,
         }
     }
 }
 
+/// `0x4609b0`: the ghost and underwater ambience rows, `(ghost, underwater)`. It walks the table
+/// from the last row down, comparing each name with `0x64a480` at length `0x7fffffff`, which is
+/// `strncmp` (`0x40de80`): exact, case-sensitive, the whole string with its terminator, so neither
+/// a case variant nor a prefix matches (the ignore-case `0x64a4c0` is not used here). A match
+/// stores the row's id, later rows down overwriting, and the walk ends when both are set.
+fn resolve_forced_beds(rows: &[SoundKit]) -> (Option<u32>, Option<u32>) {
+    let (mut ghost, mut underwater) = (None, None);
+    for kit in rows.iter().rev() {
+        if ghost.is_some() && underwater.is_some() {
+            break;
+        }
+        if kit.name == GHOST_BED_NAME {
+            ghost = Some(kit.id);
+        } else if kit.name == UNDERWATER_BED_NAME {
+            underwater = Some(kit.id);
+        }
+    }
+    (ghost, underwater)
+}
+
 fn sound_entries_schema() -> Schema {
     let mut s = Schema::new("SoundEntries");
     s.add_field(SchemaField::new("ID", FieldType::UInt32));
@@ -129,8 +201,7 @@ pub fn load_sound_kit_catalog(chain: &mut Chain) -> Result<SoundKitCatalog> {
         .read_file(SOUND_ENTRIES)
         .with_context(|| format!("reading {SOUND_ENTRIES}"))?;
     let rs = parse(&bytes, sound_entries_schema(), "SoundEntries")?;
-    let mut kits = HashMap::with_capacity(rs.records().len());
-    let mut by_name = HashMap::with_capacity(rs.records().len());
+    let mut rows = Vec::with_capacity(rs.records().len());
     for r in rs.records() {
         let Some(id) = u32_at(r, 0) else { continue };
         let name = str_at(&rs, r, 2).unwrap_or_default();
@@ -144,25 +215,19 @@ pub fn load_sound_kit_catalog(chain: &mut Chain) -> Result<SoundKitCatalog> {
             let path = join_variation(&dir, &file);
             files.push((path, weight));
         }
-        if !name.is_empty() {
-            by_name.insert(name.to_ascii_lowercase(), id);
-        }
-        kits.insert(
+        rows.push(SoundKit {
             id,
-            SoundKit {
-                id,
-                sound_type: u32_at(r, 1).unwrap_or(0),
-                name,
-                files,
-                volume: f32_at(r, 24).unwrap_or(1.0),
-                flags: u32_at(r, 25).unwrap_or(0),
-                min_distance: f32_at(r, 26).unwrap_or(0.0),
-                distance_cutoff: f32_at(r, 27).unwrap_or(0.0),
-                eax_def: u32_at(r, 28).unwrap_or(0),
-            },
-        );
+            sound_type: u32_at(r, 1).unwrap_or(0),
+            name,
+            files,
+            volume: f32_at(r, 24).unwrap_or(1.0),
+            flags: u32_at(r, 25).unwrap_or(0),
+            min_distance: f32_at(r, 26).unwrap_or(0.0),
+            distance_cutoff: f32_at(r, 27).unwrap_or(0.0),
+            eax_def: u32_at(r, 28).unwrap_or(0),
+        });
     }
-    Ok(SoundKitCatalog { kits, by_name })
+    Ok(SoundKitCatalog::from_kits(rows))
 }
 
 #[cfg(test)]
@@ -210,6 +275,87 @@ mod tests {
         );
     }
 
+    /// The two forced ambience rows, by the exact names `0x4609b0` compares: row 4160 and row 4209,
+    /// where no row is named plain `Ghost` and 4123 `UnderWaterLoop` is a different row of the
+    /// same file.
+    #[test]
+    fn real_sound_entries_resolve_the_forced_ambience_beds() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let cat = load_sound_kit_catalog(&mut chain).expect("load sound kits");
+
+        assert_eq!(cat.ghost_bed(), Some(4160));
+        assert_eq!(cat.underwater_bed(), Some(4209));
+        let file = |id: u32| cat.get(id).expect("row").files[0].0.clone();
+        assert!(file(4160).ends_with("GhostState.wav"));
+        assert!(file(4209).ends_with("UndwaterLoop.wav"));
+        assert_eq!(cat.get(4123).expect("row").name, "UnderWaterLoop");
+        assert_eq!(file(4123), file(4209), "the same file, its own row");
+
+        // One row of each name, and none named plain `Ghost`.
+        let count = |name: &str| cat.kits.values().filter(|k| k.name == name).count();
+        assert_eq!(count("Ghost (DONOTRENAME)"), 1);
+        assert_eq!(count("Underwater (DONOTRENAME)"), 1);
+        assert!(cat.by_name("Ghost").is_none());
+    }
+
+    /// `0x64a480` at length `0x7fffffff` is `strncmp` over the whole string: a case variant, a
+    /// prefix or an extension of the name is another row, and the ignore-case name registry does
+    /// not decide it.
+    #[test]
+    fn the_forced_beds_match_the_exact_name_only() {
+        let cat = SoundKitCatalog::named_for_tests(&[
+            (1, "ghost (donotrename)"),
+            (2, "Ghost (DONOTRENAME) "),
+            (3, "Ghost"),
+            (4, "Ghost (DONOTRENAM"),
+            (5, "UNDERWATER (DONOTRENAME)"),
+            (6, "Underwater (DONOTRENAME)x"),
+            (7, ""),
+        ]);
+        assert_eq!((cat.ghost_bed(), cat.underwater_bed()), (None, None));
+        assert_eq!(
+            cat.by_name("GHOST").map(|k| k.id),
+            Some(3),
+            "PlaySoundByName folds case"
+        );
+
+        let cat = SoundKitCatalog::named_for_tests(&[
+            (1, "ghost (donotrename)"),
+            (9, "Ghost (DONOTRENAME)"),
+            (10, "Underwater (DONOTRENAME)"),
+        ]);
+        assert_eq!((cat.ghost_bed(), cat.underwater_bed()), (Some(9), Some(10)));
+    }
+
+    /// The walk runs from the last row down and stops once both are set: a duplicate name is
+    /// overwritten by earlier rows only while the other bed is still unfound.
+    #[test]
+    fn the_forced_bed_walk_runs_from_the_last_row_down() {
+        let cat = SoundKitCatalog::named_for_tests(&[
+            (1, "Ghost (DONOTRENAME)"),
+            (2, "Underwater (DONOTRENAME)"),
+            (3, "Ghost (DONOTRENAME)"),
+            (4, "Underwater (DONOTRENAME)"),
+        ]);
+        assert_eq!(
+            (cat.ghost_bed(), cat.underwater_bed()),
+            (Some(3), Some(4)),
+            "both set at rows 4 and 3, the walk ends"
+        );
+
+        let cat = SoundKitCatalog::named_for_tests(&[
+            (1, "Underwater (DONOTRENAME)"),
+            (2, "Ghost (DONOTRENAME)"),
+            (3, "Ghost (DONOTRENAME)"),
+        ]);
+        assert_eq!(
+            (cat.ghost_bed(), cat.underwater_bed()),
+            (Some(2), Some(1)),
+            "row 2 overwrites row 3 while the underwater bed is still unfound"
+        );
+    }
+
     /// The `EAXDef` census the reverb send is gated on: 0 is the reference's null slot, a channel
     /// that never gets reverb.
     #[test]
diff --git a/crates/benilla-formats/src/spells/cast_times.rs b/crates/benilla-formats/src/spells/cast_times.rs
index ccbc15da..055ca2b7 100644
--- a/crates/benilla-formats/src/spells/cast_times.rs
+++ b/crates/benilla-formats/src/spells/cast_times.rs
@@ -11,26 +11,37 @@ use benilla_dbc::{FieldType, Schema, SchemaField};
 
 use crate::dbc::{i32_at, parse, u32_at};
 
-/// One `SpellCastTimes.dbc` row, in ms.
+/// One `SpellCastTimes.dbc` row, in ms. All three columns are signed: row 18, the hunter shots',
+/// is `{-1000000, 0, -1000000}`.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct SpellCastTime {
-    /// The cast time a level-independent tooltip shows; 0 is instant.
-    pub base_ms: u32,
+    /// The cast time at the spell's `BaseLevel`; 0 is instant.
+    pub base_ms: i32,
     /// Added per caster level above the spell's `BaseLevel`; negative on a few rows (row 10).
     pub per_level_ms: i32,
-    /// The floor the level-scaled cast time clamps to.
-    pub minimum_ms: u32,
+    /// The floor the level-scaled cast time is raised to.
+    pub minimum_ms: i32,
 }
 
 impl SpellCastTime {
-    /// The level-scaled cast time (`0x6e3340`): `base + perLevel·(casterLevel − baseLevel)`,
-    /// floored to the row minimum and to zero. `base_level` is the DBC's `baseLevel`
-    /// ([`crate::spells::SpellDisplay::base_level`]), not `spellLevel`. Spell-mod op `0xa` is not
-    /// applied.
-    pub fn resolved_ms(&self, caster_level: u32, base_level: u32) -> u32 {
-        let delta = i64::from(caster_level.saturating_sub(base_level));
-        let scaled = i64::from(self.base_ms) + i64::from(self.per_level_ms) * delta;
-        scaled.max(i64::from(self.minimum_ms)).max(0) as u32
+    /// The level-scaled cast time (`0x6e3395`-`0x6e33b4`): `base + perLevel·(casterLevel −
+    /// baseLevel)`, the level delta signed, raised to the row minimum and nothing else, so row 18
+    /// stays negative. `base_level` is the DBC's `baseLevel`
+    /// ([`crate::spells::SpellDisplay::base_level`]), not `spellLevel`. Spell-mod op `0xa` and the
+    /// clamp at zero are the caller's.
+    pub fn resolved_ms(&self, caster_level: u32, base_level: u32) -> i32 {
+        let delta = (caster_level as i32).wrapping_sub(base_level as i32);
+        let scaled = self
+            .base_ms
+            .wrapping_add(self.per_level_ms.wrapping_mul(delta));
+        scaled.max(self.minimum_ms)
+    }
+}
+
+impl SpellCastTime {
+    /// Whether the caster's level moves [`Self::resolved_ms`]: only through the per-level column.
+    pub fn reads_caster_level(&self) -> bool {
+        self.per_level_ms != 0
     }
 }
 
@@ -41,6 +52,13 @@ pub struct SpellCastTimeCatalog {
 }
 
 impl SpellCastTimeCatalog {
+    /// A catalog of the given rows, for callers' tests.
+    pub fn from_rows(rows: impl IntoIterator<Item = (u32, SpellCastTime)>) -> Self {
+        SpellCastTimeCatalog {
+            times: rows.into_iter().collect(),
+        }
+    }
+
     pub fn get(&self, index: u32) -> Option<&SpellCastTime> {
         self.times.get(&index)
     }
@@ -76,9 +94,9 @@ pub fn load_spell_cast_times(chain: &mut Chain) -> Result<SpellCastTimeCatalog>
         times.insert(
             id,
             SpellCastTime {
-                base_ms: u32_at(r, 1).unwrap_or(0),
+                base_ms: i32_at(r, 1).unwrap_or(0),
                 per_level_ms: i32_at(r, 2).unwrap_or(0),
-                minimum_ms: u32_at(r, 3).unwrap_or(0),
+                minimum_ms: i32_at(r, 3).unwrap_or(0),
             },
         );
     }
@@ -89,6 +107,50 @@ pub fn load_spell_cast_times(chain: &mut Chain) -> Result<SpellCastTimeCatalog>
 mod tests {
     use super::*;
 
+    /// A row reads the caster's level when some level changes its answer, which the per-level
+    /// column decides for every row shape the data has.
+    #[test]
+    fn a_row_reads_the_caster_level_only_through_its_per_level_column() {
+        for row in [
+            SpellCastTime {
+                base_ms: 0,
+                per_level_ms: 0,
+                minimum_ms: 0,
+            },
+            SpellCastTime {
+                base_ms: 1500,
+                per_level_ms: 0,
+                minimum_ms: 1500,
+            },
+            SpellCastTime {
+                base_ms: -1_000_000,
+                per_level_ms: 0,
+                minimum_ms: -1_000_000,
+            },
+            SpellCastTime {
+                base_ms: 1000,
+                per_level_ms: -100,
+                minimum_ms: 500,
+            },
+            SpellCastTime {
+                base_ms: 1000,
+                per_level_ms: 50,
+                minimum_ms: 0,
+            },
+        ] {
+            for base_level in [0, 10] {
+                let moves = (0..=60).any(|level| {
+                    row.resolved_ms(level, base_level) != row.resolved_ms(level + 1, base_level)
+                });
+                assert_eq!(
+                    row.reads_caster_level(),
+                    moves,
+                    "{row:?} at base {base_level}"
+                );
+            }
+        }
+    }
+
     #[test]
     fn resolved_ms_scales_and_floors() {
         let instant = SpellCastTime {
@@ -115,13 +177,16 @@ mod tests {
         assert_eq!(scaling.resolved_ms(13, 10), 700);
         assert_eq!(scaling.resolved_ms(60, 10), 500, "the minimum floor");
 
-        // A hypothetical floor-less shrink clamps at zero rather than going negative.
-        let floorless = SpellCastTime {
-            base_ms: 100,
-            per_level_ms: -100,
-            minimum_ms: 0,
+        // Below the spell's level the delta goes negative and the cast lengthens.
+        assert_eq!(scaling.resolved_ms(8, 10), 1200);
+
+        // Row 18: a negative base under a negative minimum stays negative.
+        let shots = SpellCastTime {
+            base_ms: -1_000_000,
+            per_level_ms: 0,
+            minimum_ms: -1_000_000,
         };
-        assert_eq!(floorless.resolved_ms(60, 1), 0);
+        assert_eq!(shots.resolved_ms(60, 1), -1_000_000);
     }
 
     #[test]
diff --git a/crates/benilla-formats/src/spells/catalog_tests.rs b/crates/benilla-formats/src/spells/catalog_tests.rs
index 111a473c..dd6ae59c 100644
--- a/crates/benilla-formats/src/spells/catalog_tests.rs
+++ b/crates/benilla-formats/src/spells/catalog_tests.rs
@@ -593,6 +593,11 @@ fn real_spell_catalog_reads_tooltip_columns() {
     assert_eq!(durations.get(30).unwrap().base_ms, 1_800_000, "30 minutes");
     assert_eq!(frost_armor.casting_time_index, 1);
     assert_eq!(cast_times.get(1).unwrap().base_ms, 0, "instant");
+    assert_eq!(
+        cast_times.get(18).unwrap().resolved_ms(60, 1),
+        -1_000_000,
+        "the hunter shots' row reads signed and stays negative"
+    );
     assert_eq!(
         frost_armor.effect_apply_aura[0], 22,
         "SPELL_AURA_MOD_RESISTANCE"
@@ -617,9 +622,35 @@ fn real_spell_catalog_reads_tooltip_columns() {
     );
 }
 
+/// The WDBC schema must decode the new float arrays before `f32_at` can pass them to token
+/// expansion. An integer schema silently turns Chain Heal's 0.5 into the loader's 0.0 fallback.
+#[test]
+fn spell_schema_decodes_token_float_columns() {
+    let mut raw = Vec::new();
+    raw.extend_from_slice(b"WDBC");
+    for n in [1u32, SPELL_FIELDS as u32, (SPELL_FIELDS * 4) as u32, 1] {
+        raw.extend_from_slice(&n.to_le_bytes());
+    }
+    let mut row = vec![0u8; SPELL_FIELDS * 4];
+    row[COL_DAMAGE_MULTIPLIER_1 * 4..COL_DAMAGE_MULTIPLIER_1 * 4 + 4]
+        .copy_from_slice(&0.5f32.to_le_bytes());
+    row[COL_EFFECT_POINTS_PER_COMBO_POINT_1 * 4..COL_EFFECT_POINTS_PER_COMBO_POINT_1 * 4 + 4]
+        .copy_from_slice(&20.0f32.to_le_bytes());
+    raw.extend_from_slice(&row);
+    raw.push(0);
+    let set = parse(&raw, spell_schema(), "Spell.dbc").expect("synthetic Spell.dbc");
+    let spell = set.records().first().unwrap();
+    assert_eq!(f32_at(spell, COL_DAMAGE_MULTIPLIER_1), Some(0.5));
+    assert_eq!(
+        f32_at(spell, COL_EFFECT_POINTS_PER_COMBO_POINT_1),
+        Some(20.0)
+    );
+}
+
 /// The attack-start masks, rows from vmangos: [`SpellDisplay::on_next_swing`] (`0x404`),
 /// [`SpellDisplay::initiates_auto_attack`] (adding `AttributesEx & 0x200`) and
-/// [`SpellDisplay::initiates_auto_attack_at_go`] (`AttributesEx2 & 0x100000`).
+/// [`SpellDisplay::initiates_auto_attack_at_go`] (`AttributesEx2 & 0x100000`), whose union is
+/// [`SpellDisplay::initiates_combat`] (`0x6e5200`).
 #[test]
 fn real_spell_catalog_classifies_combat_initiation() {
     let data = crate::wow_data_or_skip!();
@@ -634,6 +665,7 @@ fn real_spell_catalog_classifies_combat_initiation() {
         (772, "Rend", false, true, false),           // Ex 0x8000200
         (7386, "Sunder Armor", false, true, false),  // Ex 0x8000200
         (1464, "Slam", false, true, false),          // Ex 0x8000200
+        (1752, "Sinister Strike", false, true, false), // Ex 0x8000200
         (100, "Charge", false, false, false),        // Ex 0x400: neither bit, bit 20 clear
         (6673, "Battle Shout", false, false, false), // Ex 0x0
         (6603, "Attack", false, false, false),       // the auto-attack pseudo-spell itself
@@ -677,6 +709,14 @@ fn real_spell_catalog_classifies_combat_initiation() {
             "{name} ({id}) initiates_auto_attack_at_go (Ex2 {:#x})",
             d.attributes_ex2
         );
+        assert_eq!(
+            d.initiates_combat(),
+            next_swing || initiates || at_go,
+            "{name} ({id}) initiates_combat (Attributes {:#x}, Ex {:#x}, Ex2 {:#x})",
+            d.attributes,
+            d.attributes_ex,
+            d.attributes_ex2
+        );
         // Bit 20 suppresses the send-time start, so no spell starts the attack twice.
         assert!(
             !(d.initiates_auto_attack() && d.initiates_auto_attack_at_go()),
@@ -717,6 +757,42 @@ fn real_spell_catalog_classifies_combat_initiation() {
     );
 }
 
+/// TryCast's attack pick (`0x6e4edf`) is built for a spell press alone, so no form, recipe
+/// (`SPELL_EFFECT_CREATE_ITEM` 24, `SPELL_EFFECT_ENCHANT_ITEM` 53) or `modalNextSpell` chain may
+/// carry predicate `0x6e5200`. No item's use spell does either (vmangos `item_template`).
+#[test]
+fn real_spell_catalog_keeps_the_attack_pick_to_spell_presses() {
+    let data = crate::wow_data_or_skip!();
+    let mut chain = crate::open_chain(&data).expect("open chain");
+    let cat = load_spell_catalog(&mut chain).expect("load Spell/SpellIcon");
+    let (mut checked, mut chained) = (0, 0);
+    for (id, d) in cat.iter() {
+        let recipe = d.effects.iter().any(|&e| e == 24 || e == 53);
+        if d.shapeshift_form.is_some() || recipe {
+            checked += 1;
+            assert!(
+                !d.initiates_combat(),
+                "{} ({id}) is a form or a recipe of predicate 0x6e5200",
+                d.name
+            );
+        }
+        if d.modal_next_spell != 0 {
+            chained += 1;
+            let next = cat.get(d.modal_next_spell);
+            assert!(
+                !next.is_some_and(|n| n.initiates_combat()),
+                "{} ({id}) chains {} of predicate 0x6e5200",
+                d.name,
+                d.modal_next_spell
+            );
+        }
+    }
+    assert!(
+        checked > 0 && chained > 0,
+        "the forms, recipes and Auto Shot's chain are read"
+    );
+}
+
 /// `modalNextSpell`, column 38, which `0x6e7447` reads to start Auto Shot after a hunter shot:
 /// nonzero on 57 of 22357 rows, 52 of them naming spell 75.
 #[test]
@@ -1397,3 +1473,116 @@ fn real_spell_family_columns_carry_the_modifier_gate() {
         assert_eq!(set, bits, "{id} {:?} family bits", d.name);
     }
 }
+
+/// The pet bar's GCD starts from the pressed spell's `StartRecoveryCategory`/`StartRecoveryTime`
+/// pair (`0x6e2de0`), which every learnable pet ability carries as category 133, and its press
+/// route branches on `AttributesEx4 & 0x20` (`0x4bd355`), the dword at `+0x28`, column 10.
+#[test]
+fn real_pet_spells_carry_the_gcd_pair_and_ex4_reads_column_10() {
+    let data = crate::wow_data_or_skip!();
+    let mut chain = crate::open_chain(&data).expect("open chain");
+    let cat = load_spell_catalog(&mut chain).expect("load Spell/SpellIcon");
+
+    // (id, name, startRecoveryCategory, startRecoveryTime): the ranks a pet learns, one per
+    // ability, with Claw's first rank and every Firebolt rank on 1 s and the rest on 1.5 s.
+    for (id, name, gcd_category, gcd_ms) in [
+        (1082u32, "Claw", 133u32, 1000u32),
+        (3010, "Claw", 133, 1500),
+        (17258, "Bite", 133, 1500),
+        (3110, "Firebolt", 133, 1000),
+        (11763, "Firebolt", 133, 1000),
+        (7814, "Lash of Pain", 133, 1500),
+        (3716, "Torment", 133, 1500),
+        (17735, "Suffering", 133, 1500),
+    ] {
+        let d = cat.get(id).unwrap_or_else(|| panic!("{name} {id}"));
+        assert_eq!(d.name, name);
+        assert_eq!(
+            (d.start_recovery_category, d.start_recovery_ms),
+            (gcd_category, gcd_ms),
+            "{name} {id}"
+        );
+        assert!(
+            !d.allows_client_targeting(),
+            "{name} {id} is an ordinary press"
+        );
+    }
+    // Bite's own timer is its category's, beside the GCD.
+    let bite = cat.get(17258).expect("Bite");
+    assert_eq!((bite.category, bite.category_recovery_ms), (19, 10_000));
+
+    // The rows with the bit are Flamestrike and Rain of Fire, the ground-targeted casts.
+    for id in [11829u32, 19474] {
+        let d = cat.get(id).expect("a ground-targeted row");
+        assert_eq!(d.attributes_ex4, 0x20, "{} {id}", d.name);
+        assert!(d.allows_client_targeting());
+    }
+}
+
+/// `TargetCreatureType` (column 14), read as the bind gate does: bit `type - 1` of the mask.
+/// Beast is type 1, Dragonkin 2, Demon 3, Elemental 4, Undead 6, Humanoid 7.
+#[test]
+fn real_spell_catalog_reads_the_bind_gate_columns() {
+    let data = crate::wow_data_or_skip!();
+    let mut chain = crate::open_chain(&data).expect("open chain");
+    let cat = load_spell_catalog(&mut chain).expect("load Spell/SpellIcon");
+
+    for (id, mask, admits, refuses) in [
+        // Hibernate: Beast and Dragonkin.
+        (2637u32, 0x3u32, [1u32, 2], [7u32, 6]),
+        // Banish: Demon and Elemental.
+        (710, 0xc, [3, 4], [1, 7]),
+        // Turn Undead: Undead alone.
+        (2878, 0x20, [6, 6], [7, 1]),
+        // Mind Control: Humanoid alone, so a player (Humanoid) is a candidate.
+        (605, 0x40, [7, 7], [1, 6]),
+    ] {
+        let d = cat.get(id).expect("spell row");
+        assert_eq!(d.target_creature_type, mask, "{} ({id})", d.name);
+        for t in admits {
+            assert!(d.admits_creature_type(t), "{} admits type {t}", d.name);
+        }
+        for t in refuses {
+            assert!(!d.admits_creature_type(t), "{} refuses type {t}", d.name);
+        }
+    }
+    // Fireball has no mask: any type, and a unit with none too.
+    let fireball = cat.get(133).expect("Fireball");
+    assert_eq!(fireball.target_creature_type, 0);
+    assert!(fireball.admits_creature_type(0));
+
+    // Bloodlust (24185, a frenzy that never takes its own caster) and Revive (24341, which
+    // `AttributesEx2 & 1` lets reach a corpse): `AttributesEx` bit 19 and `AttributesEx2` bit 0.
+    assert!(cat.get(24185).expect("Bloodlust").excludes_caster());
+    assert!(!fireball.excludes_caster());
+    assert!(cat.get(24341).expect("Revive").allows_dead_target());
+    assert!(!fireball.allows_dead_target());
+}
+
+/// The mask rule alone: no mask admits everything, a masked spell refuses a unit of type 0, and
+/// the bit is `type - 1`, wrapping at 32 like the hardware's shift.
+#[test]
+fn creature_type_mask_rule() {
+    let masked = |mask| SpellDisplay {
+        target_creature_type: mask,
+        ..Default::default()
+    };
+    let open = masked(0);
+    for t in [0u32, 1, 7, 32, 33, u32::MAX] {
+        assert!(open.admits_creature_type(t), "no mask admits type {t}");
+    }
+    let beast = masked(1);
+    assert!(beast.admits_creature_type(1));
+    assert!(
+        !beast.admits_creature_type(0),
+        "type 0 is refused under a mask"
+    );
+    assert!(!beast.admits_creature_type(2));
+    let top = masked(1 << 31);
+    assert!(top.admits_creature_type(32), "type 32 is bit 31");
+    assert!(
+        !top.admits_creature_type(1),
+        "type 1 is bit 0, not the wrapped bit 32"
+    );
+    assert!(masked(1).admits_creature_type(33), "bit 32 wraps to bit 0");
+}
diff --git a/crates/benilla-formats/src/spells/dispel_types.rs b/crates/benilla-formats/src/spells/dispel_types.rs
index 6338cd1e..9818fc79 100644
--- a/crates/benilla-formats/src/spells/dispel_types.rs
+++ b/crates/benilla-formats/src/spells/dispel_types.rs
@@ -1,5 +1,5 @@
 //! `SpellDispelType.dbc`: the dispel class name the aura tooltip (`0x52f880`) shows and
-//! `UnitAura`/`UnitDebuff` return as `debuffType`, which FrameXML's `DebuffTypeColor` keys the
+//! `UnitDebuff` returns as its `dispelType`, which FrameXML's `DebuffTypeColor` keys the
 //! debuff border on. A row is named only when column 10 (`+0x28`) is nonzero (`0x52f906`): on 5875
 //! that is ids 1-4, so Stealth and Invisibility carry names that never print. Column 11 repeats
 //! the name on those four rows; the tooltip does not read it.
diff --git a/crates/benilla-formats/src/spells/display.rs b/crates/benilla-formats/src/spells/display.rs
index d99413e6..3d911c74 100644
--- a/crates/benilla-formats/src/spells/display.rs
+++ b/crates/benilla-formats/src/spells/display.rs
@@ -13,6 +13,9 @@ pub struct OpenLock {
 
 /// One spell's `Spell.dbc` row, as the display, tooltip and cast gates read it.
 pub struct SpellDisplay {
+    /// `ID` (column 0): the row's own id, which `GetEffectPoints` hands the level lookup
+    /// `0x6e3130` (`0x6e384b`).
+    pub id: u32,
     pub name: String,
     /// `SpellNameSubtext` enUS (column 129): "Rank N", even "Rank 1", or a word such as "Racial".
     pub rank: Option<String>,
@@ -35,6 +38,8 @@ pub struct SpellDisplay {
     /// `AttributesEx3` (column 9). Bits `0x400` and `0x1000000` limit the equipped-item search to
     /// the main or the off hand (`0x5f0c50`).
     pub attributes_ex3: u32,
+    /// `AttributesEx4` (column 10, `+0x28`).
+    pub attributes_ex4: u32,
     /// `SpellFamilyName` (column 160): `GetSpellModifiers` (`0x6e6b30`) applies nothing unless it
     /// is nonzero and equals the local player's class family (`[0xcecaac]`, `0x6e6b46`).
     pub spell_family: u32,
@@ -101,6 +106,9 @@ pub struct SpellDisplay {
     pub range_index: u32,
     /// `Targets` (column 13): the `TARGET_FLAG_*` seed of the cast arm's targeting word.
     pub targets: u32,
+    /// `TargetCreatureType` (column 14): the creature types the spell may target, bit `type - 1`
+    /// each; 0 is any. Hibernate takes Beast and Dragonkin, Banish Demon and Elemental.
+    pub target_creature_type: u32,
     /// `EffectImplicitTargetA[0]` (column 82): the cast arm's switch adjusts the targeting word
     /// by it, and the usable walk's target-aura-state leg forks on it (6 enemy, 21 friend).
     pub implicit_target_a1: u32,
@@ -147,8 +155,19 @@ pub struct SpellDisplay {
     pub duration_index: u32,
     /// `CastingTimeIndex` (column 18): the `SpellCastTimes.dbc` row; row 1 is instant.
     pub casting_time_index: u32,
+    /// `ProcFlags` (column 24, `SpellRec+0x60`): bit 0 makes the description's `$t` a fixed five
+    /// seconds.
+    pub proc_flags: u32,
     /// `ProcChance` (column 25): percent; vmangos reads 101 as always, with no roll.
     pub proc_chance: u32,
+    /// `ProcCharges` (column 26): the description expander's `$n` value before op 4.
+    pub proc_charges: u32,
+    /// `StackAmount` (column 39): the description expander's `$u` (`507ef1`).
+    pub stack_amount: u32,
+    /// `MaxTargetLevel` (column 159): the description expander's `$v` (`507f4f`).
+    pub max_target_level: u32,
+    /// `MaxAffectedTargets` (column 163): the description expander's `$i` (`507fc3`).
+    pub max_affected_targets: u32,
     /// `EffectBasePoints[3]` (columns 76-78, signed): each roll's floor; -1 on weapon damage.
     pub effect_base_points: [i32; 3],
     /// `EffectDieSides[3]` (columns 64-66, signed): with n dice, the value runs base + n to
@@ -169,6 +188,10 @@ pub struct SpellDisplay {
     pub effect_chain_targets: [u32; 3],
     /// `EffectMultipleValue[3]` (columns 97-99, float): the chain or multi-target falloff.
     pub effect_multiple_value: [f32; 3],
+    /// `DmgMultiplier[3]` (columns 167-169, float): `$f`/`$F` print it scaled (`507ff7`, `508025`).
+    pub damage_multiplier: [f32; 3],
+    /// `EffectPointsPerComboPoint[3]` (columns 112-114, float): `$b` prints it chopped (`507ed4`).
+    pub effect_points_per_combo_point: [f32; 3],
     /// `EffectTriggerSpell[3]` (columns 109-111): each effect's triggered spell, 0 for none.
     pub effect_trigger_spell: [u32; 3],
     /// `EffectItemType[3]` (columns 103-105): the item a `SPELL_EFFECT_CREATE_ITEM` effect makes.
@@ -187,6 +210,7 @@ pub struct SpellDisplay {
 impl Default for SpellDisplay {
     fn default() -> Self {
         SpellDisplay {
+            id: 0,
             name: String::new(),
             rank: None,
             icon: None,
@@ -199,6 +223,7 @@ impl Default for SpellDisplay {
             attributes_ex2: 0,
             modal_next_spell: 0,
             attributes_ex3: 0,
+            attributes_ex4: 0,
             spell_family: 0,
             spell_family_flags: 0,
             prevention_type: 0,
@@ -226,6 +251,7 @@ impl Default for SpellDisplay {
             mana_per_second: 0,
             range_index: 0,
             targets: 0,
+            target_creature_type: 0,
             implicit_target_a1: 0,
             stances: 0,
             stances_not: 0,
@@ -245,7 +271,12 @@ impl Default for SpellDisplay {
             aura_description: None,
             duration_index: 0,
             casting_time_index: 0,
+            proc_flags: 0,
             proc_chance: 0,
+            proc_charges: 0,
+            stack_amount: 0,
+            max_target_level: 0,
+            max_affected_targets: 0,
             effect_base_points: [0; 3],
             effect_die_sides: [0; 3],
             effect_base_dice: [0; 3],
@@ -259,6 +290,8 @@ impl Default for SpellDisplay {
             effect_radius_index: [0; 3],
             effect_chain_targets: [0; 3],
             effect_multiple_value: [0.0; 3],
+            damage_multiplier: [0.0; 3],
+            effect_points_per_combo_point: [0.0; 3],
             effect_trigger_spell: [0; 3],
             effect_item_type: [0; 3],
             effect_misc_value: [0; 3],
@@ -267,6 +300,18 @@ impl Default for SpellDisplay {
 }
 
 impl SpellDisplay {
+    /// The level the effect values, cast time, cost and duration scale by for a caster whose
+    /// skill in this spell's line is `skill_value` (`0x6e3130`): the skill capped at
+    /// `maxLevel × 5` unless `maxLevel` is 0 (`0x5ea6dc`-`0x5ea6ea`), over 5 (`0x6e3195`).
+    pub fn skill_level(&self, skill_value: u32) -> u32 {
+        let capped = if self.max_level > 0 {
+            skill_value.min(self.max_level.saturating_mul(5))
+        } else {
+            skill_value
+        };
+        capped / 5
+    }
+
     /// The `LockType` this spell opens, if any.
     pub fn open_lock_type(&self) -> Option<u32> {
         self.open_lock.map(|o| o.lock_type)
@@ -278,14 +323,10 @@ impl SpellDisplay {
     /// the flat terms.
     pub fn open_lock_skill(&self, skill_value: u32) -> Option<i32> {
         let e = self.open_lock?.effect;
-        // The skill capped at maxLevel·5, 0 uncapped (`0x5ea6e3`), integer /5 (`0x6e3195`), less
-        // baseLevel floored at 0 (read at `0x6e3854`, subtracted at `0x6e385b`-`0x6e385f`).
-        let capped = if self.max_level > 0 {
-            skill_value.min(self.max_level * 5)
-        } else {
-            skill_value
-        };
-        let delta = (capped / 5).saturating_sub(self.base_level) as f32;
+        // Less baseLevel floored at 0 (read at `0x6e3854`, subtracted at `0x6e385b`-`0x6e385f`).
+        let delta = self
+            .skill_level(skill_value)
+            .saturating_sub(self.base_level) as f32;
         let v = self.effect_base_points[e] as f32
             + self.effect_base_dice[e] as f32
             + self.effect_dice_per_level[e] as f32 * delta
@@ -336,6 +377,12 @@ impl SpellDisplay {
         self.attributes_ex2 & ATTR_EX2_AUTO_REPEAT != 0
     }
 
+    /// `AttributesEx4 & 0x20` (`0x4bd355`): a pet-bar spell press takes the generic cast entry
+    /// `0x6e4b60` and returns, sending no pet action and starting no GCD of its own.
+    pub fn allows_client_targeting(&self) -> bool {
+        self.attributes_ex4 & ATTR_EX4_ALLOW_CLIENT_TARGETING != 0
+    }
+
     /// `AttributesEx3 & 0x400000`: a running auto-repeat with this bit ends when any new cast
     /// begins (`0x60959e`). Only wand Shoot 5019 has it; Auto Shot survives, so hunters weave.
     pub fn casting_cancels_autorepeat(&self) -> bool {
@@ -366,12 +413,28 @@ impl SpellDisplay {
         self.attributes_ex3 & ATTR_EX3_NO_CHANNEL_BAR != 0
     }
 
-    /// `AttributesEx & 0x80000`: the targeting cursor never takes the caster, neither the world
-    /// pick (`0x6e61a0` at `6e61cf`) nor `SpellCanTargetUnit`'s unit leg (`0x6e6460` at `6e6507`).
+    /// `AttributesEx & 0x80000`: the caster is never a bind candidate, not in `BindTarget`
+    /// (`0x6e5b40` at `6e5bf7`), not for `SpellCanTargetUnit`'s unit leg (`0x6e6460` at `6e6507`)
+    /// and not for the world pick (`0x6e61a0` at `6e61cf`).
     pub fn excludes_caster(&self) -> bool {
         self.attributes_ex & ATTR_EX_EXCLUDE_CASTER != 0
     }
 
+    /// `AttributesEx2 & 0x1` (vmangos `SPELL_ATTR_EX2_ALLOW_DEAD_TARGET`, `SpellDefines.h:868`):
+    /// a dead unit stays a bind candidate (`BindTarget` at `6e5c85`).
+    pub fn allows_dead_target(&self) -> bool {
+        self.attributes_ex2 & ATTR_EX2_ALLOW_DEAD_TARGET != 0
+    }
+
+    /// The `TargetCreatureType` gate of `BindTarget` (`6e5c23`-`6e5c53`) and its mirror
+    /// (`6e6544`-`6e656c`): no mask admits any unit, else a unit of type 0 is refused and type `t`
+    /// needs bit `t - 1`. The shift wraps at 32 as the hardware's does.
+    pub fn admits_creature_type(&self, creature_type: u32) -> bool {
+        self.target_creature_type == 0
+            || (creature_type != 0
+                && self.target_creature_type & 1u32.wrapping_shl(creature_type - 1) != 0)
+    }
+
     /// `AttributesEx & 0x2000_0000` (`0x6e759a`): the channel bar shows the spell's own name
     /// (`0x6e75a9`), else `CHANNELING` (`0x6e75bc`); nine channels set it, Fishing among them.
     pub fn channel_bar_own_name(&self) -> bool {
@@ -459,13 +522,20 @@ impl SpellDisplay {
         self.attributes_ex & ATTR_EX_CHANNELED != 0
     }
 
+    /// Predicate `0x6e5200`: an on-next-swing, `INITIATES_COMBAT` or `INITIATE_COMBAT_POST_CAST`
+    /// spell. TryCast runs the attack validator's target pick for it (`0x6e4edf`), so a press
+    /// with no hostile selection acquires one, as the Attack button does.
+    pub fn initiates_combat(&self) -> bool {
+        self.attributes & ATTR_ON_NEXT_SWING != 0
+            || self.attributes_ex & ATTR_EX_INITIATES_COMBAT != 0
+            || self.attributes_ex2 & ATTR_EX2_INITIATE_COMBAT_POST_CAST != 0
+    }
+
     /// Casting this starts melee auto-attack at the send unless one runs (`TryCast` tail
     /// `0x6e51b5`): predicate `0x6e5200` with `AttributesEx2` bit 20 clear, so an on-next-swing
     /// or `INITIATES_COMBAT` spell. Every cast path shares the tail; there is no macro opt-out.
     pub fn initiates_auto_attack(&self) -> bool {
-        (self.attributes & ATTR_ON_NEXT_SWING != 0
-            || self.attributes_ex & ATTR_EX_INITIATES_COMBAT != 0)
-            && self.attributes_ex2 & ATTR_EX2_INITIATE_COMBAT_POST_CAST == 0
+        self.initiates_combat() && !self.initiates_auto_attack_at_go()
     }
 
     /// This spell's own `SMSG_SPELL_GO` starts melee auto-attack (`0x6131a0`) at its first hit
diff --git a/crates/benilla-formats/src/spells/duration.rs b/crates/benilla-formats/src/spells/duration.rs
index d0d78cbe..f83e8359 100644
--- a/crates/benilla-formats/src/spells/duration.rs
+++ b/crates/benilla-formats/src/spells/duration.rs
@@ -1,7 +1,7 @@
 //! `SpellDuration.dbc`: the duration a spell's `DurationIndex`
 //! ([`crate::spells::SpellDisplay::duration_index`]) resolves to in `Spell_C::GetSpellDuration`
 //! (`0x6ea000`), before spell-mod op 1 (`SPELLMOD_DURATION`). All three columns are signed: a few
-//! rows (427) pair a negative base with a per-level term this crate does not evaluate.
+//! rows (427, Resurrection Sickness's) pair a negative base with a per-level term.
 
 use std::collections::HashMap;
 
@@ -16,7 +16,8 @@ use crate::dbc::{i32_at, parse, u32_at};
 pub struct SpellDuration {
     /// The duration a level-independent tooltip shows; -1 is permanent.
     pub base_ms: i32,
-    /// Added per caster level above the spell's `BaseLevel`; 0 for most rows.
+    /// Added per level of the spell's skill level (`0x6e3130`) above its `baseLevel`, below it
+    /// taken off (`0x6ea049`); 0 for most rows.
     pub per_level_ms: i32,
     /// The ceiling the level-scaled duration clamps to.
     pub max_ms: i32,
@@ -50,6 +51,12 @@ impl SpellDurationCatalog {
         );
     }
 
+    /// Test-only seeding of a whole row.
+    #[cfg(test)]
+    pub(crate) fn insert_row_for_tests(&mut self, index: u32, row: SpellDuration) {
+        self.durations.insert(index, row);
+    }
+
     pub fn get(&self, index: u32) -> Option<&SpellDuration> {
         self.durations.get(&index)
     }
diff --git a/crates/benilla-formats/src/spells/forms.rs b/crates/benilla-formats/src/spells/forms.rs
index 9e14f06a..b67ab095 100644
--- a/crates/benilla-formats/src/spells/forms.rs
+++ b/crates/benilla-formats/src/spells/forms.rs
@@ -23,7 +23,7 @@ pub struct ShapeshiftForm {
     pub flags: u32,
     /// `creatureType` (column 12): the form's creature-type override, which the resolver
     /// (`0x605570`) reads before the creature template or race, so a cat-form druid tracks as a
-    /// Beast; `<= 0` falls back to Humanoid.
+    /// Beast; `<= 0` is no override, and the template or race answers.
     pub creature_type: i32,
     /// `AttackIconID` (column 13) through `SpellIcon.dbc`: the Attack action shows the current
     /// form's icon before the main-hand weapon's (`0x4e6870`); `None` falls through to the weapon.
diff --git a/crates/benilla-formats/src/spells/mod.rs b/crates/benilla-formats/src/spells/mod.rs
index b127fd33..21a84945 100644
--- a/crates/benilla-formats/src/spells/mod.rs
+++ b/crates/benilla-formats/src/spells/mod.rs
@@ -20,6 +20,7 @@ mod duration;
 mod forms;
 mod radius;
 mod ranges;
+mod soft_float;
 mod tokens;
 
 pub use cast_times::{load_spell_cast_times, SpellCastTime, SpellCastTimeCatalog};
@@ -31,10 +32,12 @@ mod immunity;
 pub use immunity::{cc_exemption, grants_immunity, CcExemption};
 pub use radius::{load_spell_radii, SpellRadius, SpellRadiusCatalog};
 pub use ranges::{
-    load_spell_ranges, min_max_range, SpellRange, SpellRangeCatalog, COMBAT_REACH_ADD,
-    MELEE_RANGE_FLOOR, ON_NEXT_SWING_RANGE,
+    load_spell_ranges, min_max_range, min_max_range_reads_units, RangeTargets, RangeUnit,
+    SpellRange, SpellRangeCatalog, UnitMotion, COMBAT_REACH_ADD, MELEE_RANGE_FLOOR,
+    MOVING_BONUS_FLAGS, MOVING_RANGE_BONUS, ON_NEXT_SWING_RANGE,
 };
-pub use tokens::{substitute, TokenContext};
+pub use soft_float::modify as soft_modify;
+pub use tokens::{substitute, SpellMods, TokenContext, TokenNumber};
 
 use std::collections::HashMap;
 
@@ -77,6 +80,9 @@ const COL_SPELL_FAMILY_NAME: usize = 160;
 const COL_SPELL_FAMILY_FLAGS_LOW: usize = 161;
 /// `Targets` (`+0x34`): the seed the cast arm loads into its targeting word (`0x6e525a`).
 const COL_TARGETS: usize = 13;
+/// `TargetCreatureType` (`+0x38`): the creature-type mask `BindTarget` (`0x6e5c26`) and
+/// `SpellCanTargetUnit`'s mirror (`0x6e6544`) test the unit's type against, bit `type - 1`.
+const COL_TARGET_CREATURE_TYPE: usize = 14;
 /// `EffectImplicitTargetA[0]` (`+0x148`), the key of the cast arm's 62-case switch (`0x6e5484`).
 const COL_IMPLICIT_TARGET_A1: usize = 82;
 /// `EffectImplicitTargetB[0]` (`+0x154`), walked beside A by the classifier `0x6ea280`.
@@ -102,6 +108,9 @@ const COL_ATTRIBUTES: usize = 6;
 const COL_ATTRIBUTES_EX: usize = 7;
 const COL_ATTRIBUTES_EX2: usize = 8;
 const COL_ATTRIBUTES_EX3: usize = 9;
+/// `AttributesEx4` (`+0x28`), the dword after `AttributesEx3`: the pet-bar spell arm tests its
+/// `0x20` at `0x4bd355`.
+const COL_ATTRIBUTES_EX4: usize = 10;
 const COL_SPEED: usize = 37;
 const COL_EFFECT_1: usize = 61;
 /// `EffectMiscValue[0]`, `61 + 15 × 3`: the 16th `[3]` array from `Effect`.
@@ -156,7 +165,14 @@ const COL_AURA_DESCRIPTION_ENUS: usize = 147;
 const COL_DURATION_INDEX: usize = 30;
 /// `CastingTimeIndex` (`+0x48`): `Spell_C::GetCastTime` (`0x6e3340`) looks it up at `0xc0d878`.
 const COL_CASTING_TIME_INDEX: usize = 18;
+const COL_PROC_FLAGS: usize = 24;
 const COL_PROC_CHANCE: usize = 25;
+const COL_PROC_CHARGES: usize = 26;
+const COL_STACK_AMOUNT: usize = 39;
+const COL_MAX_TARGET_LEVEL: usize = 159;
+const COL_MAX_AFFECTED_TARGETS: usize = 163;
+const COL_DAMAGE_MULTIPLIER_1: usize = 167;
+const COL_EFFECT_POINTS_PER_COMBO_POINT_1: usize = 112;
 
 /// The per-effect `[3]` arrays, each constant slot 0; die sides and base points are signed.
 const COL_EFFECT_DIE_SIDES_1: usize = 64;
@@ -172,6 +188,10 @@ const COL_EFFECT_ITEM_TYPE_1: usize = 103;
 
 /// `SPELL_ATTR3_NORMAL_RANGED_ATTACK`: damage floats melee white (`0x6128b0`).
 const ATTR_EX3_NORMAL_RANGED_ATTACK: u32 = 0x8000;
+/// `SPELL_ATTR_EX4_ALLOW_CLIENT_TARGETING` (vmangos `SpellDefines.h:953`): a pet-bar press casts
+/// through the generic entry `0x6e4b60` (`0x4bd355`, `0x4bd378`) instead of sending the pet
+/// action.
+const ATTR_EX4_ALLOW_CLIENT_TARGETING: u32 = 0x20;
 /// `SPELL_ATTR_EX3_NO_CASTING_BAR_TEXT` (vmangos `SpellDefines.h:907`).
 const ATTR_EX3_NO_CASTING_BAR_TEXT: u32 = 0x4;
 /// `AttributesEx3` bit 13: `0x6e7595` tests it as `0x20` in the word's second byte.
@@ -185,6 +205,9 @@ const ATTR_RANGED: u32 = 0x2;
 const ATTR_TARGET_MAIN_HAND_ITEM: u32 = 0x200;
 /// `SPELL_ATTR_EX2_AUTO_REPEAT`: Auto Shot and wand Shoot.
 const ATTR_EX2_AUTO_REPEAT: u32 = 0x20;
+/// `SPELL_ATTR_EX2_ALLOW_DEAD_TARGET` (vmangos `SpellDefines.h:868`): the bind's dead-unit gate
+/// tests it at `0x6e5c85`.
+const ATTR_EX2_ALLOW_DEAD_TARGET: u32 = 0x1;
 const ATTR_EX2_DO_NOT_RESET_COMBAT_TIMERS: u32 = 0x20000;
 /// `SPELL_ATTR_PASSIVE`: the spellbook grays the spell (`SpellBookFrame.lua:379-390`).
 const ATTR_PASSIVE: u32 = 0x40;
@@ -344,8 +367,8 @@ impl SpellCatalog {
     }
 }
 
-/// 173 fields, `u32` but for the floats (`Speed`, the two float effect arrays) and the four enUS
-/// string heads; the signed columns stay `u32`, as [`i32_at`] reads the same bits.
+/// 173 fields, `u32` but for `Speed`, the four float effect arrays and the four enUS string heads;
+/// the signed columns stay `u32`, as [`i32_at`] reads the same bits.
 fn spell_schema() -> Schema {
     let mut s = Schema::new("Spell");
     for i in 0..SPELL_FIELDS {
@@ -374,6 +397,21 @@ fn spell_schema() -> Schema {
                 format!("EffectMultipleValue{}", i - COL_EFFECT_MULTIPLE_VALUE_1),
                 FieldType::Float32,
             ));
+        } else if (COL_EFFECT_POINTS_PER_COMBO_POINT_1..COL_EFFECT_POINTS_PER_COMBO_POINT_1 + 3)
+            .contains(&i)
+        {
+            s.add_field(SchemaField::new(
+                format!(
+                    "EffectPointsPerComboPoint{}",
+                    i - COL_EFFECT_POINTS_PER_COMBO_POINT_1
+                ),
+                FieldType::Float32,
+            ));
+        } else if (COL_DAMAGE_MULTIPLIER_1..COL_DAMAGE_MULTIPLIER_1 + 3).contains(&i) {
+            s.add_field(SchemaField::new(
+                format!("DmgMultiplier{}", i - COL_DAMAGE_MULTIPLIER_1),
+                FieldType::Float32,
+            ));
         } else {
             s.add_field(SchemaField::new(format!("F{i}"), FieldType::UInt32));
         }
@@ -471,6 +509,7 @@ pub fn load_spell_catalog(chain: &mut Chain) -> Result<SpellCatalog> {
         spells.insert(
             id,
             SpellDisplay {
+                id,
                 name,
                 rank,
                 icon,
@@ -480,6 +519,7 @@ pub fn load_spell_catalog(chain: &mut Chain) -> Result<SpellCatalog> {
                 attributes_ex: u32_at(r, COL_ATTRIBUTES_EX).unwrap_or(0),
                 attributes_ex2: u32_at(r, COL_ATTRIBUTES_EX2).unwrap_or(0),
                 attributes_ex3: u32_at(r, COL_ATTRIBUTES_EX3).unwrap_or(0),
+                attributes_ex4: u32_at(r, COL_ATTRIBUTES_EX4).unwrap_or(0),
                 school: u32_at(r, COL_SCHOOL).unwrap_or(0),
                 mechanic: u32_at(r, COL_MECHANIC).unwrap_or(0),
                 effect_mechanic: std::array::from_fn(|i| {
@@ -523,6 +563,7 @@ pub fn load_spell_catalog(chain: &mut Chain) -> Result<SpellCatalog> {
                 range_index: u32_at(r, COL_RANGE_INDEX).unwrap_or(0),
                 modal_next_spell: u32_at(r, COL_MODAL_NEXT_SPELL).unwrap_or(0),
                 targets: u32_at(r, COL_TARGETS).unwrap_or(0),
+                target_creature_type: u32_at(r, COL_TARGET_CREATURE_TYPE).unwrap_or(0),
                 implicit_target_a1: u32_at(r, COL_IMPLICIT_TARGET_A1).unwrap_or(0),
                 effect_implicit_target_a: std::array::from_fn(|i| {
                     u32_at(r, COL_IMPLICIT_TARGET_A1 + i).unwrap_or(0)
@@ -561,7 +602,12 @@ pub fn load_spell_catalog(chain: &mut Chain) -> Result<SpellCatalog> {
                 aura_description: str_at(&spells_set, r, COL_AURA_DESCRIPTION_ENUS),
                 duration_index: u32_at(r, COL_DURATION_INDEX).unwrap_or(0),
                 casting_time_index: u32_at(r, COL_CASTING_TIME_INDEX).unwrap_or(0),
+                proc_flags: u32_at(r, COL_PROC_FLAGS).unwrap_or(0),
                 proc_chance: u32_at(r, COL_PROC_CHANCE).unwrap_or(0),
+                proc_charges: u32_at(r, COL_PROC_CHARGES).unwrap_or(0),
+                stack_amount: u32_at(r, COL_STACK_AMOUNT).unwrap_or(0),
+                max_target_level: u32_at(r, COL_MAX_TARGET_LEVEL).unwrap_or(0),
+                max_affected_targets: u32_at(r, COL_MAX_AFFECTED_TARGETS).unwrap_or(0),
                 effect_base_points: std::array::from_fn(|i| {
                     i32_at(r, COL_EFFECT_BASE_POINTS_1 + i).unwrap_or(0)
                 }),
@@ -590,6 +636,12 @@ pub fn load_spell_catalog(chain: &mut Chain) -> Result<SpellCatalog> {
                 effect_multiple_value: std::array::from_fn(|i| {
                     f32_at(r, COL_EFFECT_MULTIPLE_VALUE_1 + i).unwrap_or(0.0)
                 }),
+                damage_multiplier: std::array::from_fn(|i| {
+                    f32_at(r, COL_DAMAGE_MULTIPLIER_1 + i).unwrap_or(0.0)
+                }),
+                effect_points_per_combo_point: std::array::from_fn(|i| {
+                    f32_at(r, COL_EFFECT_POINTS_PER_COMBO_POINT_1 + i).unwrap_or(0.0)
+                }),
                 effect_trigger_spell,
                 effect_item_type: std::array::from_fn(|i| {
                     u32_at(r, COL_EFFECT_ITEM_TYPE_1 + i).unwrap_or(0)
diff --git a/crates/benilla-formats/src/spells/ranges.rs b/crates/benilla-formats/src/spells/ranges.rs
index d8eec939..ec7502da 100644
--- a/crates/benilla-formats/src/spells/ranges.rs
+++ b/crates/benilla-formats/src/spells/ranges.rs
@@ -33,52 +33,157 @@ pub const MELEE_RANGE_FLOOR: f32 = 5.0;
 /// The on-next-swing short-circuit's max, `[0x8118d4]` (`0x6e3504`).
 pub const ON_NEXT_SWING_RANGE: f32 = 100.0;
 
+/// The movement-flag bits the moving bonus tests of each unit, `0x200d` (`0x6e3658`): forward,
+/// either strafe, and jumping. Backward, turning and swimming are not among them.
+pub const MOVING_BONUS_FLAGS: u32 = 0x200d;
+/// The moving bonus, `[0x811914]` (`0x6e369c`), 2.6667: added to the max after both arms.
+pub const MOVING_RANGE_BONUS: f32 = f32::from_bits(0x402a_aaab);
+
+/// One unit's motion as the moving bonus reads it.
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct UnitMotion {
+    /// The movement flags word, `[[unit+0x118]+0x40]` (`0x6e364f`-`0x6e3655`, `0x6e3661`).
+    pub flags: u32,
+    /// The current speed, `0x7c4c90` on `[unit+0x9a8]` (`0x5fc35c`-`0x5fc365`): 0 with no
+    /// direction bit, else the unit's spline speed, or the swim, walk, run or run-back speed the
+    /// flags pick.
+    pub speed: f32,
+    /// The walk speed, `[unit+0xa30]` (`0x5fc354`).
+    pub walk_speed: f32,
+}
+
+impl UnitMotion {
+    /// `0x5fc350` answering 0: the current speed is above twice the walk speed. The reference
+    /// doubles the walk speed (`fadd st, st`), compares it with the speed (`fcompp`) and tests
+    /// C0 (`test ah, 1`, `0x5fc373`-`0x5fc376`), which is set by a doubled walk speed below the
+    /// speed and by an unordered pair, so a NaN reads as running and an equal pair as walking.
+    pub fn is_running(&self) -> bool {
+        let doubled = 2.0 * self.walk_speed;
+        self.speed > doubled || self.speed.is_nan() || doubled.is_nan()
+    }
+
+    /// One unit's half of the bonus test: a movement flag in [`MOVING_BONUS_FLAGS`]
+    /// (`0x6e364c`-`0x6e366a`) and [`Self::is_running`] (`0x6e366c`-`0x6e3681`).
+    pub fn moves_at_run_speed(&self) -> bool {
+        self.flags & MOVING_BONUS_FLAGS != 0 && self.is_running()
+    }
+}
+
+/// A unit as `GetMinMaxRange` (`0x6e3480`) reads it: its combat reach, whether it is a player, and
+/// its motion.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct RangeUnit {
+    /// `UNIT_FIELD_COMBATREACH`, `[[unit+0x110]+0x1f0]`.
+    pub reach: f32,
+    /// `OBJECT_FIELD_TYPE` bit 4 (`0x6e3689`-`0x6e3695`). Only a unit target's read counts: the
+    /// ranged arm's bonus asks it of the target, and the melee arm's never does. The caster's
+    /// own is the gate of the `Attributes & 2` scale (`0x6e36b4`-`0x6e36bf`), which is not applied.
+    pub player: bool,
+    pub motion: UnitMotion,
+}
+
+impl RangeUnit {
+    /// A unit that stands still: no motion, so it never earns the moving bonus.
+    pub fn still(reach: f32) -> Self {
+        Self {
+            reach,
+            player: false,
+            motion: UnitMotion::default(),
+        }
+    }
+}
+
+/// The units `GetMinMaxRange` (`0x6e3480`) reads besides the caster, `None` where that unit is
+/// absent. The two are different inputs: only the first is an argument of the call.
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct RangeTargets {
+    /// The call's `target` argument (`[ebx+0x10]`), when it is a unit (typemask bit 3,
+    /// `0x6e34e1`-`0x6e34f9`): a null target, and one that is no unit, read `None`. Both arms
+    /// read its reach, and the ranged arm pads only for a target passed in (`0x6e35d8`).
+    pub target: Option<RangeUnit>,
+    /// The caster's auto-attack target, `[caster+0xc48]`, which the function looks up itself
+    /// (`0x47bf60`, `0x6e356a`). Only the melee arm reads it, and only with no unit target passed
+    /// (`0x6e3552`-`0x6e3584`). A caller that has no such unit to hand passes `None`.
+    pub attack_target: Option<RangeUnit>,
+}
+
 /// `GetMinMaxRange` (`0x6e3480`): a spell's `{min, max}` cast range, summed in `f64` because the
 /// client keeps the reach sums on the x87 stack and stores `f32` only at the end. On-next-swing
 /// spells (`Attributes & 0x404`, `0x6e34fb`) short-circuit to `(0, 100)`. The melee arm sums the
-/// target's reach, else the caster's own a second time, and reads the auto-attack target itself
-/// (`attack_target_guid`, `0x6e356a`), so a caller with no explicit target passes that unit's
-/// reach. Given a target, the ranged arm pads the max, and the min only when nonzero (the
-/// `fcomp`-vs-0.0 guard), so a min-0 spell never refuses `TOO_CLOSE`. `None`: no row, or the self
-/// row (id 1, `{0, 0}`).
+/// reach of the unit target, else the auto-attack target, else the caster's own, with the
+/// caster's. The ranged arm pads only for a unit target passed in, the auto-attack target never
+/// pads it: the max always, and the min only when nonzero (the `fcomp`-vs-0.0 guard), so a min-0
+/// spell never refuses `TOO_CLOSE`. `None`: no row, or the self row (id 1, `{0, 0}`).
 ///
-/// Not applied: the PvP `max += 2.6667` (`0x6e3648`, gated by `0x5fc350`), and for a player the
-/// `Attributes & 2` scale (`0x6e36aa`), `max *= RangedModRange · 0.01` of the ranged-slot item,
-/// which a relic (range mod 0, InventoryType 28, admitted by `0x809200`) would zero, though no
-/// spell a relic class learns carries the bit.
+/// After both arms the max takes the moving bonus ([`MOVING_RANGE_BONUS`], `0x6e3648`-`0x6e36a2`)
+/// when there is a unit (the target, or on the melee arm the auto-attack target), the caster and
+/// that unit each [`UnitMotion::moves_at_run_speed`], and the row is the melee row or the unit a
+/// player. It comes after the melee floor and before the range modifier (op 5, `0x6e3746`), and
+/// the min never takes it. The on-next-swing short-circuit skips it.
+///
+/// Not applied: for a player the `Attributes & 2` scale (`0x6e36aa`), `max *= RangedModRange ·
+/// 0.01` of the ranged-slot item, which a relic (range mod 0, InventoryType 28, admitted by
+/// `0x809200`) would zero, though no spell a relic class learns carries the bit.
 pub fn min_max_range(
     spell: &crate::spells::SpellDisplay,
     row: Option<&SpellRange>,
-    caster_reach: f32,
-    target_reach: Option<f32>,
+    caster: RangeUnit,
+    targets: RangeTargets,
 ) -> Option<(f32, f32)> {
     if spell.on_next_swing() {
         return Some((0.0, ON_NEXT_SWING_RANGE));
     }
     let row = row?;
-    let reach = target_reach.unwrap_or(caster_reach);
-    if row.is_melee() {
-        let sum = f64::from(reach) + f64::from(caster_reach) + f64::from(COMBAT_REACH_ADD);
+    // The `esi` both arms leave (`0x6e3648`): the unit the bonus reads, if any.
+    let (min, max, unit) = if row.is_melee() {
+        let unit = targets.target.or(targets.attack_target);
+        let reach = unit.map_or(caster.reach, |u| u.reach);
+        let sum = f64::from(reach) + f64::from(caster.reach) + f64::from(COMBAT_REACH_ADD);
         let max = if sum > f64::from(MELEE_RANGE_FLOOR) {
             sum as f32
         } else {
             MELEE_RANGE_FLOOR
         };
-        return Some((0.0, max));
-    }
-    if row.min == 0.0 && row.max == 0.0 {
-        return None;
-    }
-    let Some(target_reach) = target_reach else {
-        return Some((row.min, row.max));
-    };
-    let pad = f64::from(caster_reach) + f64::from(target_reach);
-    let min = if row.min == 0.0 {
-        0.0
+        (0.0, max, unit)
     } else {
-        (pad + f64::from(row.min)) as f32
+        if row.min == 0.0 && row.max == 0.0 {
+            return None;
+        }
+        let Some(target) = targets.target else {
+            return Some((row.min, row.max));
+        };
+        let pad = f64::from(caster.reach) + f64::from(target.reach);
+        let min = if row.min == 0.0 {
+            0.0
+        } else {
+            (pad + f64::from(row.min)) as f32
+        };
+        (min, (f64::from(row.max) + pad) as f32, Some(target))
     };
-    Some((min, (f64::from(row.max) + pad) as f32))
+    let earns_bonus = |unit: &RangeUnit| {
+        caster.motion.moves_at_run_speed()
+            && unit.motion.moves_at_run_speed()
+            && (row.is_melee() || unit.player)
+    };
+    let max = if unit.as_ref().is_some_and(earns_bonus) {
+        (f64::from(max) + f64::from(MOVING_RANGE_BONUS)) as f32
+    } else {
+        max
+    };
+    Some((min, max))
+}
+
+/// Whether [`min_max_range`] reads the units it is not handed for this spell and row when it is
+/// passed no unit target, as the spell tooltip calls it (`push 0`, `0x52e9c2`): only the melee
+/// arm, which sums the auto-attack target's reach, else the caster's own, with the caster's, and
+/// asks both units' motion for the moving bonus. The ranged arm pads only for a target passed in,
+/// so a tooltip prints its row as it is; the on-next-swing short-circuit, the missing row and the
+/// self row read none. With a unit target the ranged arm reads both units too.
+pub fn min_max_range_reads_units(
+    spell: &crate::spells::SpellDisplay,
+    row: Option<&SpellRange>,
+) -> bool {
+    !spell.on_next_swing() && row.is_some_and(SpellRange::is_melee)
 }
 
 /// `SpellRange.dbc`, by row id ([`crate::spells::SpellDisplay::range_index`]).
@@ -142,60 +247,129 @@ pub fn load_spell_ranges(chain: &mut Chain) -> Result<SpellRangeCatalog> {
 mod tests {
     use super::*;
 
-    #[test]
-    fn min_max_range_follows_the_byte_law() {
-        let spell = |range_index: u32, attributes: u32| crate::spells::SpellDisplay {
+    /// The two inputs, as a call passes them: `target` the unit argument, `attack` the caster's
+    /// auto-attack target that the melee arm looks up itself.
+    fn reaches(target: Option<f32>, attack: Option<f32>) -> RangeTargets {
+        RangeTargets {
+            target: target.map(RangeUnit::still),
+            attack_target: attack.map(RangeUnit::still),
+        }
+    }
+
+    const FORWARD: u32 = 0x1;
+    const BACKWARD: u32 = 0x2;
+    /// A unit running forward: the speed `0x7c4c90` answers for it is the run speed, above twice
+    /// the walk speed.
+    const RUNNING: UnitMotion = UnitMotion {
+        flags: FORWARD,
+        speed: 7.0,
+        walk_speed: 2.5,
+    };
+
+    fn runner(reach: f32) -> RangeUnit {
+        RangeUnit {
+            motion: RUNNING,
+            ..RangeUnit::still(reach)
+        }
+    }
+
+    fn spell(range_index: u32, attributes: u32) -> crate::spells::SpellDisplay {
+        crate::spells::SpellDisplay {
             range_index,
             attributes,
             ..Default::default()
-        };
-        let melee = SpellRange {
-            min: 0.0,
-            max: 5.0,
-            flags: 1,
-        };
+        }
+    }
+
+    const MELEE: SpellRange = SpellRange {
+        min: 0.0,
+        max: 5.0,
+        flags: 1,
+    };
+    const CHARGE: SpellRange = SpellRange {
+        min: 8.0,
+        max: 25.0,
+        flags: 0,
+    };
+    const FIREBALL: SpellRange = SpellRange {
+        min: 0.0,
+        max: 35.0,
+        flags: 0,
+    };
+
+    #[test]
+    fn min_max_range_follows_the_byte_law() {
         // Two 1.5-reach units (4.333) floor at 5.0,
         let d = spell(2, 0);
         assert_eq!(
-            min_max_range(&d, Some(&melee), 1.5, Some(1.5)),
+            min_max_range(
+                &d,
+                Some(&MELEE),
+                RangeUnit::still(1.5),
+                reaches(Some(1.5), None)
+            ),
             Some((0.0, MELEE_RANGE_FLOOR))
         );
         // a 4.0 pair (9.333) clears it.
-        let (_, max) = min_max_range(&d, Some(&melee), 4.0, Some(4.0)).unwrap();
+        let (_, max) = min_max_range(
+            &d,
+            Some(&MELEE),
+            RangeUnit::still(4.0),
+            reaches(Some(4.0), None),
+        )
+        .unwrap();
         assert!((max - 9.3333).abs() < 1e-3);
         // With no target the caster's reach counts twice, as in the client: 9.333 alone too.
-        let (_, max) = min_max_range(&d, Some(&melee), 4.0, None).unwrap();
+        let (_, max) = min_max_range(
+            &d,
+            Some(&MELEE),
+            RangeUnit::still(4.0),
+            RangeTargets::default(),
+        )
+        .unwrap();
         assert!((max - 9.3333).abs() < 1e-3);
 
         // Charge's 8-25 row pads both bounds by the bare reach sum; the 1.3333 is melee-only.
-        let charge_row = SpellRange {
-            min: 8.0,
-            max: 25.0,
-            flags: 0,
-        };
-        let (min, max) = min_max_range(&d, Some(&charge_row), 1.5, Some(1.5)).unwrap();
+        let (min, max) = min_max_range(
+            &d,
+            Some(&CHARGE),
+            RangeUnit::still(1.5),
+            reaches(Some(1.5), None),
+        )
+        .unwrap();
         assert!((min - (8.0 + 3.0)).abs() < 1e-3);
         assert!((max - (25.0 + 3.0)).abs() < 1e-3);
 
         // Fireball's 0-35 row pads the max only: the fcomp-vs-0.0 guard keeps the min at zero.
-        let fireball_row = SpellRange {
-            min: 0.0,
-            max: 35.0,
-            flags: 0,
-        };
-        let (min, max) = min_max_range(&d, Some(&fireball_row), 1.5, Some(1.5)).unwrap();
+        let (min, max) = min_max_range(
+            &d,
+            Some(&FIREBALL),
+            RangeUnit::still(1.5),
+            reaches(Some(1.5), None),
+        )
+        .unwrap();
         assert_eq!(min, 0.0);
         assert!((max - 38.0).abs() < 1e-3);
 
         // No target, as the tooltip calls it (`target = NULL`, `0x52e9c2`): the raw bounds.
         assert_eq!(
-            min_max_range(&d, Some(&charge_row), 1.5, None),
+            min_max_range(
+                &d,
+                Some(&CHARGE),
+                RangeUnit::still(1.5),
+                RangeTargets::default()
+            ),
             Some((8.0, 25.0))
         );
 
         // The on-next-swing attribute short-circuits to 100 without reading the row.
         assert_eq!(
-            min_max_range(&spell(1, 0x400), None, 1.5, None),
+            min_max_range(
+                &spell(1, 0x400),
+                None,
+                RangeUnit::still(1.5),
+                RangeTargets::default()
+            ),
             Some((0.0, ON_NEXT_SWING_RANGE))
         );
 
@@ -204,7 +378,371 @@ mod tests {
             max: 0.0,
             flags: 0,
         };
-        assert_eq!(min_max_range(&d, Some(&self_row), 1.5, None), None);
+        assert_eq!(
+            min_max_range(
+                &d,
+                Some(&self_row),
+                RangeUnit::still(1.5),
+                RangeTargets::default()
+            ),
+            None
+        );
+    }
+
+    /// The ranged arm pads only for the target passed in (`0x6e35d8 test ecx,ecx`, `0x6e35ec je`),
+    /// never for the caster's auto-attack target, which the ranged arm does not read.
+    #[test]
+    fn the_ranged_arm_pads_only_for_the_explicit_target() {
+        let d = spell(4, 0);
+        // Fireball's 35 with no target passed but an auto-attack target of reach 1.5: 35, not 38.
+        assert_eq!(
+            min_max_range(
+                &d,
+                Some(&FIREBALL),
+                RangeUnit::still(1.5),
+                reaches(None, Some(1.5))
+            ),
+            Some((0.0, 35.0))
+        );
+        // The same row with the target passed, and the caster's reach 1.5: 35 + 1.5 + 1.5.
+        assert_eq!(
+            min_max_range(
+                &d,
+                Some(&FIREBALL),
+                RangeUnit::still(1.5),
+                reaches(Some(1.5), None)
+            ),
+            Some((0.0, 38.0))
+        );
+        // An auto-attack target beside it pads nothing: the target passed is the pad's second reach.
+        assert_eq!(
+            min_max_range(
+                &d,
+                Some(&FIREBALL),
+                RangeUnit::still(1.5),
+                reaches(Some(1.5), Some(4.0))
+            ),
+            Some((0.0, 38.0))
+        );
+        // A bounded row's min stays unpadded without a target too: Charge's 8-25.
+        assert_eq!(
+            min_max_range(
+                &d,
+                Some(&CHARGE),
+                RangeUnit::still(1.5),
+                reaches(None, Some(1.5))
+            ),
+            Some((8.0, 25.0))
+        );
+    }
+
+    /// The melee arm takes the unit target's reach, else the auto-attack target's, else the
+    /// caster's own (`0x6e3552`-`0x6e3584`, `0x6e3594`), and adds the caster's.
+    #[test]
+    fn the_melee_arm_falls_back_from_the_target_to_the_attack_target_to_the_caster() {
+        let d = spell(2, 0);
+        let max = |target, attack| {
+            min_max_range(
+                &d,
+                Some(&MELEE),
+                RangeUnit::still(4.0),
+                reaches(target, attack),
+            )
+            .unwrap()
+            .1
+        };
+        let sum = |reach: f32| reach + 4.0 + COMBAT_REACH_ADD;
+        // With no target passed the auto-attack target's 6.0 counts: 6 + 4 + 1.3333.
+        assert!((max(None, Some(6.0)) - sum(6.0)).abs() < 1e-3);
+        // A target passed wins over it.
+        assert!((max(Some(2.0), Some(6.0)) - sum(2.0)).abs() < 1e-3);
+        // With neither, the caster's reach counts twice.
+        assert!((max(None, None) - sum(4.0)).abs() < 1e-3);
+    }
+
+    /// The predicate is exact for the tooltip's call (`0x52e9c2`, no unit target passed): it is
+    /// true for a spell and row exactly when some change of the caster's reach or motion, or of the
+    /// auto-attack target's reach, motion or presence, moves [`min_max_range`]'s answer.
+    #[test]
+    fn the_units_predicate_matches_what_min_max_range_reads_with_no_target() {
+        let row = |min, max, flags| Some(SpellRange { min, max, flags });
+        let rows = [
+            None,
+            row(0.0, 0.0, 0),
+            row(0.0, 0.0, 1),
+            row(0.0, 35.0, 0),
+            row(8.0, 25.0, 0),
+            row(0.0, 5.0, 1),
+        ];
+        let still = RangeUnit::still;
+        let runner = |reach| RangeUnit {
+            motion: RUNNING,
+            ..still(reach)
+        };
+        // (caster, auto-attack target) before and after.
+        let moves = [
+            ((still(1.5), None), (still(4.0), None)),
+            (
+                (still(1.5), Some(still(1.5))),
+                (still(1.5), Some(still(4.0))),
+            ),
+            (
+                (still(1.5), Some(still(1.5))),
+                (still(4.0), Some(still(1.5))),
+            ),
+            ((still(1.5), None), (still(1.5), Some(still(4.0)))),
+            ((still(1.5), Some(still(1.5))), (still(1.5), None)),
+            // Motion alone: the caster's, then the auto-attack target's.
+            (
+                (still(1.5), Some(runner(1.5))),
+                (runner(1.5), Some(runner(1.5))),
+            ),
+            (
+                (runner(1.5), Some(still(1.5))),
+                (runner(1.5), Some(runner(1.5))),
+            ),
+        ];
+        for attributes in [0, 0x4, 0x400, 0x404] {
+            let spell = crate::spells::SpellDisplay {
+                attributes,
+                ..Default::default()
+            };
+            for row in &rows {
+                let answer = |caster, attack_target| {
+                    let targets = RangeTargets {
+                        target: None,
+                        attack_target,
+                    };
+                    min_max_range(&spell, row.as_ref(), caster, targets)
+                };
+                let moved = moves.iter().any(|&((a, a_attack), (b, b_attack))| {
+                    answer(a, a_attack) != answer(b, b_attack)
+                });
+                assert_eq!(
+                    min_max_range_reads_units(&spell, row.as_ref()),
+                    moved,
+                    "attributes {attributes:#x}, row {row:?}"
+                );
+            }
+        }
+    }
+
+    /// `0x5fc350` answers 0 for a current speed above twice the walk speed (`fcompp`, then C0),
+    /// and 1 for an equal pair; an unordered pair sets C0 too.
+    #[test]
+    fn running_is_a_speed_above_twice_the_walk_speed() {
+        let at = |speed, walk_speed| UnitMotion {
+            flags: FORWARD,
+            speed,
+            walk_speed,
+        };
+        assert!(at(7.0, 2.5).is_running(), "a run");
+        assert!(!at(2.5, 2.5).is_running(), "a walk");
+        assert!(
+            !at(5.0, 2.5).is_running(),
+            "equal to twice the walk speed is walking"
+        );
+        assert!(at(5.001, 2.5).is_running());
+        assert!(!at(0.0, 2.5).is_running(), "no direction bit reads speed 0");
+        assert!(at(f32::NAN, 2.5).is_running(), "unordered sets C0");
+        assert!(at(7.0, f32::NAN).is_running());
+        // A unit whose speeds never streamed (all zero) is not running.
+        assert!(!UnitMotion::default().is_running());
+    }
+
+    /// The moving bonus (`0x6e3648`-`0x6e36a2`) on the melee row: two running units of reach 1.5
+    /// sum 4.333, which the melee floor raises to 5.0 first, so the bonus makes 7.667.
+    #[test]
+    fn two_running_units_earn_the_moving_bonus_on_the_melee_row_after_the_floor() {
+        let d = spell(2, 0);
+        let max = |caster: RangeUnit, target: RangeUnit| {
+            min_max_range(
+                &d,
+                Some(&MELEE),
+                caster,
+                RangeTargets {
+                    target: Some(target),
+                    attack_target: None,
+                },
+            )
+            .unwrap()
+        };
+        let running = runner(1.5);
+        let (min, both) = max(running, running);
+        assert_eq!(min, 0.0, "the min never takes the bonus");
+        assert!((both - (MELEE_RANGE_FLOOR + MOVING_RANGE_BONUS)).abs() < 1e-6);
+        assert!((both - 7.6667).abs() < 1e-3);
+        // The bonus is added after the floor, not folded into the reach sum: a 4.0 pair
+        // (9.333) takes it on top.
+        let (_, wide) = max(runner(4.0), runner(4.0));
+        assert!((wide - (9.3333 + 2.6667)).abs() < 1e-3);
+        // One unit walking, or standing, or running backward: none.
+        let walking = UnitMotion {
+            flags: FORWARD,
+            speed: 2.5,
+            walk_speed: 2.5,
+        };
+        let backward = UnitMotion {
+            flags: BACKWARD,
+            ..RUNNING
+        };
+        for (name, motion) in [
+            ("walking", walking),
+            ("standing", UnitMotion::default()),
+            ("backward", backward),
+            (
+                "turning",
+                UnitMotion {
+                    flags: 0x10,
+                    ..RUNNING
+                },
+            ),
+            (
+                "swimming",
+                UnitMotion {
+                    flags: 0x20_0000,
+                    ..RUNNING
+                },
+            ),
+        ] {
+            let slow = RangeUnit {
+                motion,
+                ..runner(1.5)
+            };
+            assert_eq!(max(running, slow).1, MELEE_RANGE_FLOOR, "the target {name}");
+            assert_eq!(max(slow, running).1, MELEE_RANGE_FLOOR, "the caster {name}");
+        }
+    }
+
+    /// The flag test is `0x200d`: forward, either strafe, or jumping, each alone.
+    #[test]
+    fn the_moving_test_takes_forward_either_strafe_and_jumping() {
+        for (name, flags, bonus) in [
+            ("forward", FORWARD, true),
+            ("strafe left", 0x4, true),
+            ("strafe right", 0x8, true),
+            ("jumping", 0x2000, true),
+            ("forward and jumping", FORWARD | 0x2000, true),
+            ("backward", BACKWARD, false),
+            ("root", 0x1000, false),
+            ("falling far", 0x4000, false),
+            ("still", 0, false),
+        ] {
+            let unit = RangeUnit {
+                motion: UnitMotion { flags, ..RUNNING },
+                ..RangeUnit::still(1.5)
+            };
+            let got = min_max_range(
+                &spell(2, 0),
+                Some(&MELEE),
+                unit,
+                RangeTargets {
+                    target: Some(unit),
+                    attack_target: None,
+                },
+            )
+            .unwrap()
+            .1;
+            let want = if bonus {
+                MELEE_RANGE_FLOOR + MOVING_RANGE_BONUS
+            } else {
+                MELEE_RANGE_FLOOR
+            };
+            assert!((got - want).abs() < 1e-6, "{name}: {got}");
+        }
+    }
+
+    /// The bonus reads the unit `esi` holds after both arms: the melee arm's auto-attack target
+    /// when no target is passed (`0x6e3580`), never that target beside one passed in.
+    #[test]
+    fn the_melee_bonus_reads_the_attack_target_when_no_target_is_passed() {
+        let d = spell(2, 0);
+        let bonus = MELEE_RANGE_FLOOR + MOVING_RANGE_BONUS;
+        let call = |target: Option<RangeUnit>, attack_target: Option<RangeUnit>| {
+            min_max_range(
+                &d,
+                Some(&MELEE),
+                runner(1.5),
+                RangeTargets {
+                    target,
+                    attack_target,
+                },
+            )
+            .unwrap()
+            .1
+        };
+        let still = RangeUnit::still(1.5);
+        assert!((call(None, Some(runner(1.5))) - bonus).abs() < 1e-6);
+        assert_eq!(call(None, Some(still)), MELEE_RANGE_FLOOR);
+        // No unit at all: the caster's own reach twice, and no unit to move.
+        assert_eq!(call(None, None), MELEE_RANGE_FLOOR);
+        // A target passed in takes the place of the auto-attack target for the bonus too.
+        assert_eq!(call(Some(still), Some(runner(1.5))), MELEE_RANGE_FLOOR);
+        assert!((call(Some(runner(1.5)), Some(still)) - bonus).abs() < 1e-6);
+    }
+
+    /// On a ranged row the bonus needs a target unit passed in, and a player: a creature target
+    /// earns none (`0x6e3683`-`0x6e3695`), nor does the auto-attack target, which that arm never
+    /// reads.
+    #[test]
+    fn the_ranged_bonus_needs_a_player_target_passed_in() {
+        let d = spell(4, 0);
+        let player = RangeUnit {
+            player: true,
+            ..runner(1.5)
+        };
+        let creature = runner(1.5);
+        let ranged = |row: &SpellRange, target: Option<RangeUnit>, attack_target| {
+            min_max_range(
+                &d,
+                Some(row),
+                runner(1.5),
+                RangeTargets {
+                    target,
+                    attack_target,
+                },
+            )
+            .unwrap()
+        };
+        // Fireball's 35 with the 1.5 + 1.5 pad, and the bonus for a running player only.
+        let (min, max) = ranged(&FIREBALL, Some(player), None);
+        assert_eq!(min, 0.0);
+        assert!((max - (38.0 + MOVING_RANGE_BONUS)).abs() < 1e-4);
+        assert_eq!(ranged(&FIREBALL, Some(creature), None), (0.0, 38.0));
+        // Charge's min pads and takes no bonus; its max does.
+        let (min, max) = ranged(&CHARGE, Some(player), None);
+        assert!((min - 11.0).abs() < 1e-4);
+        assert!((max - (28.0 + MOVING_RANGE_BONUS)).abs() < 1e-4);
+        // A standing player target, or a running player as the auto-attack target alone: none.
+        let standing_player = RangeUnit {
+            player: true,
+            ..RangeUnit::still(1.5)
+        };
+        assert_eq!(ranged(&FIREBALL, Some(standing_player), None), (0.0, 38.0));
+        assert_eq!(ranged(&FIREBALL, None, Some(player)), (0.0, 35.0));
+        // The caster must run too.
+        let caster = RangeUnit::still(1.5);
+        let targets = RangeTargets {
+            target: Some(player),
+            attack_target: None,
+        };
+        assert_eq!(
+            min_max_range(&d, Some(&FIREBALL), caster, targets),
+            Some((0.0, 38.0))
+        );
+    }
+
+    /// The on-next-swing short-circuit returns before the bonus (`0x6e350f`).
+    #[test]
+    fn the_on_next_swing_range_takes_no_bonus() {
+        let targets = RangeTargets {
+            target: Some(runner(1.5)),
+            attack_target: None,
+        };
+        assert_eq!(
+            min_max_range(&spell(2, 0x400), Some(&MELEE), runner(1.5), targets),
+            Some((0.0, ON_NEXT_SWING_RANGE))
+        );
     }
 
     /// Row 2 is the melee family, 114 Auto Shot's 8-35, 95 Charge's 8-25.
diff --git a/crates/benilla-formats/src/spells/soft_float.rs b/crates/benilla-formats/src/spells/soft_float.rs
new file mode 100644
index 00000000..c6640715
--- /dev/null
+++ b/crates/benilla-formats/src/spells/soft_float.rs
@@ -0,0 +1,213 @@
+//! The reference's software single-precision arithmetic, which `GetEffectPoints 0x6e3800` and its
+//! modifier applier `0x6e6c30` run on instead of the FPU: an int-to-float (`0x761260`), an add
+//! (`0x760e20`) and a multiply (`0x760be0`) that truncate where IEEE rounds, and a floor
+//! (`0x760fb0`) and ceil (`0x761040`). Values are `f32` bit patterns throughout.
+
+/// `0x761260`: an integer's float; exact below 2^24, the low bits shifted out above it.
+fn from_int(v: i32) -> u32 {
+    if v == 0 {
+        return 0;
+    }
+    let sign = if v < 0 { 0x8000_0000 } else { 0 };
+    let a = v.unsigned_abs();
+    let lz = a.leading_zeros() as i32;
+    let shift = lz - 8;
+    let mant = if shift >= 0 { a << shift } else { a >> -shift };
+    let exp = (31 - lz + 0x7f) as u32;
+    sign | exp << 23 | mant & 0x7f_ffff
+}
+
+/// `0x760be0`: multiply the 24-bit significands and keep the high word, truncating. A power of
+/// two on either side (a zero fraction) adds exponents and keeps the other fraction exactly; a
+/// zero exponent on either side, or an exponent sum at or below zero, is 0.
+fn mul(a: u32, b: u32) -> u32 {
+    let sign = (a ^ b) & 0x8000_0000;
+    let (ae, be) = (a & 0x7f80_0000, b & 0x7f80_0000);
+    let (af, bf) = (a & 0x7f_ffff, b & 0x7f_ffff);
+    let exp = be.wrapping_add(ae).wrapping_sub(0x3f80_0000);
+    let underflow = (exp.wrapping_add(0xff80_0000) as i32) < 0;
+    if af == 0 || bf == 0 {
+        if ae == 0 || be == 0 || underflow {
+            return 0;
+        }
+        return exp | bf | af | sign;
+    }
+    let product = u64::from((af | 0x80_0000) << 8) * u64::from((bf | 0x80_0000) << 8);
+    let mut hi = (product >> 32) as u32;
+    let carry = hi >> 31;
+    hi >>= carry;
+    if underflow {
+        return 0;
+    }
+    (hi >> 7) & 0x7f_ffff | (carry << 23).wrapping_add(exp) | sign
+}
+
+/// `0x760e20`: align the two-guard-bit significands by an arithmetic shift, add, renormalise by
+/// shifting out, truncating. A zero exponent returns the other operand; an exponent gap of 23 or
+/// more returns the larger.
+fn add(a: u32, b: u32) -> u32 {
+    let ae = a & 0x7f80_0000;
+    if ae == 0 {
+        return b;
+    }
+    let be = b & 0x7f80_0000;
+    if be == 0 {
+        return a;
+    }
+    let significand = |x: u32| {
+        let m = ((x & 0x7f_ffff | 0x80_0000) << 1) as i32;
+        if x & 0x8000_0000 != 0 {
+            -m
+        } else {
+            m
+        }
+    };
+    let (mut sa, mut sb) = (significand(a), significand(b));
+    let gap = be.wrapping_sub(ae) as i32;
+    let exp = if gap > 0 {
+        if gap >= 0xb80_0000 {
+            return b;
+        }
+        sa >>= gap >> 23;
+        be
+    } else {
+        if gap <= -0xb80_0000 {
+            return a;
+        }
+        sb >>= (ae - be) >> 23;
+        ae
+    };
+    let sum = sa.wrapping_add(sb);
+    if sum == 0 {
+        return 0;
+    }
+    let sign = sum as u32 & 0x8000_0000;
+    let mag = sum.unsigned_abs();
+    let shift = 31 - mag.leading_zeros() as i32 - 23;
+    let mant = if shift >= 0 {
+        mag >> shift
+    } else {
+        mag << -shift
+    };
+    (((shift - 1) << 23) as u32).wrapping_add(exp) | sign | mant & 0x7f_ffff
+}
+
+/// `0x760fb0`: floor; under one in magnitude a negative nonzero value is -1.0 and anything else
+/// +0.0.
+fn floor(x: u32) -> u32 {
+    let v = f32::from_bits(x);
+    if v.abs() < 1.0 {
+        return if v < 0.0 { (-1.0f32).to_bits() } else { 0 };
+    }
+    v.floor().to_bits()
+}
+
+/// `0x761040`: ceil; under one in magnitude a negative nonzero value is +0.0 and anything else
+/// 1.0, zero included (`76105d`: the sign mask of a zero tests clear).
+fn ceil(x: u32) -> u32 {
+    let v = f32::from_bits(x);
+    if v.abs() < 1.0 {
+        return if v < 0.0 { 0 } else { 1.0f32.to_bits() };
+    }
+    v.ceil().to_bits()
+}
+
+/// The applier `0x6e6c30`: `((value + flat) × pct) × 0.01`, each step in the soft arithmetic,
+/// the 0.01 the single-precision constant `0xcf0b0c` (`0x3c23d70a`).
+pub fn modify(value: f32, flat: i32, pct: i32) -> f32 {
+    let sum = add(value.to_bits(), from_int(flat));
+    f32::from_bits(mul(mul(sum, from_int(pct)), 0x3c23_d70a))
+}
+
+/// An integer's float as `0x761260` builds it.
+pub(crate) fn int_to_float(v: i32) -> f32 {
+    f32::from_bits(from_int(v))
+}
+
+/// `0x760e20` over floats.
+pub(crate) fn add_f32(a: f32, b: f32) -> f32 {
+    f32::from_bits(add(a.to_bits(), b.to_bits()))
+}
+
+/// `0x760be0` over floats.
+pub(crate) fn mul_f32(a: f32, b: f32) -> f32 {
+    f32::from_bits(mul(a.to_bits(), b.to_bits()))
+}
+
+/// `GetEffectPoints`' tail (`6e39ee`-`6e3a65`): to the nearest 1/128, as `floor(x·128 + 0.5) /
+/// 128` with the ×128 and ÷128 done on the exponent field and the add and floor in the soft
+/// arithmetic (`0x761160`, its 0.5 at `0xcf0b2c`).
+pub(crate) fn quantize(x: f32) -> f32 {
+    let bits = x.to_bits();
+    let scaled = if bits & 0x7f80_0000 != 0 {
+        bits.wrapping_add(0x380_0000)
+    } else {
+        bits
+    };
+    let rounded = floor(add(scaled, 0.5f32.to_bits()));
+    // A zero, either sign, flushes to +0.0; otherwise the exponent drops by 7.
+    let shrunk = rounded.wrapping_add(0xfc80_0000);
+    let flips = ((rounded.wrapping_sub(0x400_0000) ^ rounded) as i32) < 0;
+    f32::from_bits(if flips { 0 } else { shrunk })
+}
+
+/// The integral bounds `GetEffectPoints` hands a rounding effect (`6e3a71`-`6e3a89`).
+pub(crate) fn floor_ceil(min: f32, max: f32) -> (f32, f32) {
+    (
+        f32::from_bits(floor(min.to_bits())),
+        f32::from_bits(ceil(max.to_bits())),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Vectors from a bit-level transcription of the routines: the soft results sit one unit in
+    /// the last place under the FPU's where the FPU rounds up.
+    #[test]
+    fn the_applier_truncates_where_the_fpu_rounds() {
+        for (value, flat, pct, bits) in [
+            (55.0, 0, 125, 0x4289_7fff),
+            (93.0, 0, 102, 0x42bd_b851),
+            (1000.0, -5, 90, 0x445f_dfff),
+            (3.0, 0, 100, 0x403f_ffff),
+            (0.0, 5, 110, 0x40af_ffff),
+            (-31.0, 0, 125, 0xc21a_ffff),
+            (325.0, 0, 115, 0x43ba_dfff),
+        ] {
+            assert_eq!(
+                modify(value, flat, pct).to_bits(),
+                bits,
+                "({value} + {flat}) × {pct}%"
+            );
+        }
+        let chained = modify(modify(93.0, 0, 102), 0, 101);
+        assert_eq!(chained.to_bits(), 0x42bf_9dfe);
+        assert_eq!(quantize(chained), 12_263.0 / 128.0);
+    }
+
+    #[test]
+    fn the_quantizer_rounds_to_128ths_and_flushes_zero() {
+        assert_eq!(quantize(f32::from_bits(0x4289_7fff)), 68.75);
+        assert_eq!(quantize(0.3), 0.296_875);
+        assert_eq!(quantize(-2.3), -2.296_875);
+        assert_eq!(quantize(0.0).to_bits(), 0);
+        assert_eq!(quantize(-0.0).to_bits(), 0);
+        assert_eq!(quantize(0.001), 0.0);
+        assert_eq!(quantize(55.0), 55.0);
+        assert_eq!(
+            f32::from_bits(add((-31.0f32).to_bits(), 0.3f32.to_bits())),
+            -30.7
+        );
+    }
+
+    #[test]
+    fn floor_and_ceil_keep_the_reference_quirks() {
+        assert_eq!(floor_ceil(4.2, 4.2), (4.0, 5.0));
+        assert_eq!(floor_ceil(-0.5, -0.5), (-1.0, 0.0));
+        assert_eq!(floor_ceil(0.0, 0.0), (0.0, 1.0), "ceil(+0.0) is 1.0");
+        assert_eq!(floor_ceil(7.0, 7.0), (7.0, 7.0));
+        assert_eq!(int_to_float(-1_000_000), -1_000_000.0);
+    }
+}
diff --git a/crates/benilla-formats/src/spells/tokens.rs b/crates/benilla-formats/src/spells/tokens.rs
index 86f620e8..a86b4945 100644
--- a/crates/benilla-formats/src/spells/tokens.rs
+++ b/crates/benilla-formats/src/spells/tokens.rs
@@ -1,169 +1,455 @@
 //! The spell-description `$`-token engine the 1.12 client runs over `Spell.dbc` description and
-//! aura text (`0x5075f0` → `0x507710`), effect values from `0x6e3800`. Values are the flat term:
-//! the reference's per-level terms (`DicePerLevel·max(0, casterLevel − baseLevel)` on the dice,
-//! and `RealPointsPerLevel`) are not applied. Values print unsigned, as the client's do, and an
-//! `EffectAmplitude` of 0 is the reference's 5000 ms period (`$t`, `$o`). `$g` always takes the
-//! first form, as there is no gender input, and `$r`, `$u` and any unknown or unresolved token
-//! stay raw.
+//! aura text (`0x5075f0` → `0x507710`), effect values from `GetEffectPoints 0x6e3800`. Effect
+//! point values print unsigned, as the client's do. `$g` takes the first form without gender
+//! input. `$c` and `$p` (`507dde`, `507ded`), which no shipped text uses, and unknown or
+//! unresolved tokens stay raw.
 
-use super::{SpellDisplay, SpellDurationCatalog, SpellRadiusCatalog};
+use super::soft_float;
+use super::{SpellDisplay, SpellDurationCatalog, SpellRadiusCatalog, SpellRangeCatalog};
+
+/// The caster's spell-modifier appliers over its tables (`GetSpellModifiers 0x6e6b30`): the
+/// integer `0x6e6af0`, the FPU float `0x6e6bf0` and the software float `0x6e6c30`
+/// ([`super::soft_modify`]), each returning `value` unchanged when no modifier matches.
+pub trait SpellMods {
+    fn apply_int(&self, d: &SpellDisplay, op: u8, value: i32) -> i32;
+    fn apply_float(&self, d: &SpellDisplay, op: u8, value: f32) -> f32;
+    fn apply_soft(&self, d: &SpellDisplay, op: u8, value: f32) -> f32;
+}
+
+/// A value supplied to a `%` hole.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum TokenNumber {
+    Int(i64),
+    Float(f64),
+}
 
 /// The inputs one substitution runs over. `lookup` resolves cross-spell references (`$1234s1`).
 pub struct TokenContext<'a> {
     pub durations: &'a SpellDurationCatalog,
     pub radii: &'a SpellRadiusCatalog,
+    pub ranges: Option<&'a SpellRangeCatalog>,
+    /// `0x5ea520` behind `0x6de040`: the active player's skill in a spell's `SkillLineAbility`
+    /// line, bonuses included, by spell id; 0 without a player or a line. Every per-level term
+    /// scales by the level derived from it ([`SpellDisplay::skill_level`]), not the character
+    /// level.
+    pub skill: &'a dyn Fn(u32) -> u32,
     pub lookup: &'a dyn Fn(u32) -> Option<&'a SpellDisplay>,
+    /// The caster's live spell-modifier tables; absent for contexts without a caster.
+    pub mods: Option<&'a dyn SpellMods>,
+    /// `0x5075f0`'s last argument, set only by the aura tooltip `0x52f880` (`52f940`): the effect
+    /// points skip their modifiers (`6e3925`), and so does the duration of `$d` and `$o`
+    /// (`0x6ea000`'s flag, pushed at `507ccd` and `507917`).
+    pub unmodified_points: bool,
     /// The `$z` token: the home-bind area's name, from `SMSG_BINDPOINTUPDATE`'s area id through
-    /// `AreaTable.dbc`; `None` leaves the token raw.
-    pub home_area: Option<&'a str>,
-    /// Resolves a `GlobalStrings` key and fills its `%d` holes; the caller owns the string table.
-    /// Integer holes only: the keys that take numbers are `INT_SPELL_*` ones, whose float twins
-    /// would print "14.0 to 22.0" for "14 to 22". `None` leaves the token raw.
-    pub text: &'a dyn Fn(&str, &[i64]) -> Option<String>,
+    /// `AreaTable.dbc`; `None` leaves the token raw. Asked only where a `$z` expands, so a caller
+    /// can tell which texts read the bind point.
+    pub home_area: &'a dyn Fn() -> Option<&'a str>,
+    /// `GetText 0x703bf0`: a `GlobalStrings` template by key. `None` leaves the token raw.
+    pub global: &'a dyn Fn(&str) -> Option<String>,
+    /// `SStrPrintf 0x64a7f0`: a template's `%` holes filled, as the CRT formats them.
+    pub printf: &'a dyn Fn(&str, &[TokenNumber]) -> String,
 }
 
-/// The effect's `(min, max)`, flat term only (`0x6e3800`).
-fn effect_bounds(d: &SpellDisplay, slot: usize) -> (i64, i64) {
-    let base = i64::from(*d.effect_base_points.get(slot).unwrap_or(&0));
-    let dice = i64::from(*d.effect_base_dice.get(slot).unwrap_or(&0));
-    let sides = i64::from(*d.effect_die_sides.get(slot).unwrap_or(&0));
-    (base + dice, base + sides * dice)
+/// A `GlobalStrings` template, filled.
+fn keyed(ctx: &TokenContext, key: &str, args: &[TokenNumber]) -> Option<String> {
+    Some((ctx.printf)(&(ctx.global)(key)?, args))
 }
 
-/// A spell's duration in ms, flat term only; -1 is permanent.
-fn duration_ms(d: &SpellDisplay, ctx: &TokenContext) -> Option<i64> {
-    let row = ctx.durations.get(d.duration_index)?;
-    Some(i64::from(row.base_ms))
+/// `"%.1f"` (`0x84f398`).
+fn tenths(ctx: &TokenContext, v: impl Into<f64>) -> String {
+    (ctx.printf)("%.1f", &[TokenNumber::Float(v.into())])
 }
 
-/// The duration in the largest whole `INT_SPELL_DURATION_*` unit, the ladder `0x52fa50` walks,
-/// or `SPELL_DURATION_UNTIL_CANCELLED` when permanent. The plural pick is `GetText`'s, the `_P1`
-/// twin unless exactly one; only HOURS ships one, so the others fall back to the bare key.
-fn duration_text(ms: i64, ctx: &TokenContext) -> Option<String> {
-    if ms < 0 {
-        return (ctx.text)("SPELL_DURATION_UNTIL_CANCELLED", &[]);
+/// `0x6e3130` for the active player (`0x6e318d`: `CGPlayer`'s `[vtbl+0xa8]`, `0x5ea690`).
+fn skill_level(ctx: &TokenContext, d: &SpellDisplay) -> u32 {
+    d.skill_level((ctx.skill)(d.id))
+}
+
+/// `0x6e3b80`'s verdict on an effect: whether its points round to whole numbers (its out-byte)
+/// and whether it takes a damage op (its return).
+fn classify(effect: u32, aura: u32) -> (bool, bool) {
+    match effect {
+        2 | 9 | 17 | 31 | 58 | 121 => (true, true),
+        6 | 27 | 35 | 119 | 128 | 129 => match aura {
+            3 | 15 | 43 | 53 | 89 => (true, true),
+            8 | 20 | 21 | 24 | 62 | 63 | 64 | 162 => (true, false),
+            _ => (false, false),
+        },
+        8 | 10 | 30 | 62 | 67 | 75 => (true, false),
+        _ => (false, false),
     }
-    let secs = ms / 1000;
-    let (unit, n) = if secs < 60 {
-        ("SEC", secs)
-    } else if secs < 3_600 {
-        ("MIN", secs / 60)
-    } else if secs < 86_400 {
-        ("HOURS", secs / 3_600)
+}
+
+/// `GetEffectPoints 0x6e3800`: the effect's `(min, max)` as the soft floats it returns. A `level`
+/// of 0 takes the spell's own ([`skill_level`], `6e3841`-`6e3852`); `Δ` is it less `baseLevel`
+/// when that is positive, floored at 0 (`6e3854`-`6e3861`). With `n` the dice, the integer
+/// `BaseDice + DicePerLevel·Δ`, the bounds start as `BasePoints + n` and `BasePoints +
+/// DieSides·n` (`6e3863`, `6e38bb`), each made a soft float plus `RealPointsPerLevel × Δ`
+/// through `0x760be0` and `0x760e20`. Unless the context is the aura tooltip's, op 8, then a
+/// damage effect's op (22 for aura 3, else 0), then the aura's ([`aura_op`]) apply to each bound
+/// through `0x6e6c30`. The tail quantizes both to 1/128, and a rounding effect floors the minimum
+/// and ceils the maximum (`6e3a67`).
+fn effect_points(d: &SpellDisplay, slot: usize, ctx: &TokenContext, level: u32) -> (f32, f32) {
+    let level = if level == 0 {
+        skill_level(ctx, d)
     } else {
-        ("DAYS", secs / 86_400)
+        level
+    } as i32;
+    let base_level = d.base_level as i32;
+    let delta = if base_level > 0 {
+        level.wrapping_sub(base_level)
+    } else {
+        level
+    }
+    .max(0);
+    let base = d.effect_base_points[slot];
+    let dice =
+        d.effect_base_dice[slot].wrapping_add(d.effect_dice_per_level[slot].wrapping_mul(delta));
+    let sides = d.effect_die_sides[slot];
+    let real = soft_float::mul_f32(
+        d.effect_real_points_per_level[slot],
+        soft_float::int_to_float(delta),
+    );
+    let mut min = soft_float::add_f32(soft_float::int_to_float(base.wrapping_add(dice)), real);
+    let mut max = soft_float::add_f32(
+        soft_float::int_to_float(base.wrapping_add(sides.wrapping_mul(dice))),
+        real,
+    );
+    let aura = d.effect_apply_aura[slot];
+    let (rounds, damage) = classify(d.effects[slot], aura);
+    if let Some(mods) = ctx.mods.filter(|_| !ctx.unmodified_points) {
+        let damage_op = damage.then_some(if aura == 3 { 22 } else { 0 });
+        for op in [Some(8), damage_op, aura_op(d, slot)].into_iter().flatten() {
+            min = mods.apply_soft(d, op, min);
+            max = mods.apply_soft(d, op, max);
+        }
+    }
+    let (min, max) = (soft_float::quantize(min), soft_float::quantize(max));
+    if rounds {
+        soft_float::floor_ceil(min, max)
+    } else {
+        (min, max)
+    }
+}
+
+/// The aura's own op (`0x6e397e`, jump table `0x6e3ab8` over the byte table `0x6e3ad0`, indexed
+/// by `aura − 10`): 10/103/183 op 2 (`6e3996`), the speed auras op 12 (`6e39a6`), 138 op 23
+/// (`6e39b6`), 65 op 24 (`6e39c6`), 99 op 3 (`6e39d6`).
+fn aura_op(d: &SpellDisplay, slot: usize) -> Option<u8> {
+    match d.effect_apply_aura[slot] {
+        10 | 103 | 183 => Some(2),
+        31 | 32 | 33 | 58 | 129 | 130 | 171 | 172 => Some(12),
+        138 => Some(23),
+        65 => Some(24),
+        99 => Some(3),
+        _ => None,
+    }
+}
+
+fn modify_int(ctx: &TokenContext, d: &SpellDisplay, op: u8, value: i32) -> i32 {
+    ctx.mods.map_or(value, |m| m.apply_int(d, op, value))
+}
+
+fn modify_float(ctx: &TokenContext, d: &SpellDisplay, op: u8, value: f32) -> f32 {
+    ctx.mods.map_or(value, |m| m.apply_float(d, op, value))
+}
+
+/// A spell's duration in ms, `GetSpellDuration 0x6ea000`, which `$d` and `$o` both call: 0 with
+/// no row (`6ea032`), else the row's base plus its per-level term times the spell's own level ([`skill_level`], `6ea041`)
+/// less `baseLevel`, subtracted and multiplied unfloored (`6ea046`-`6ea053`), capped at the row's
+/// maximum (`6ea055`), then op 1 unless its flag says not to (`6ea064`).
+fn duration_ms(d: &SpellDisplay, ctx: &TokenContext) -> i64 {
+    let Some(row) = ctx.durations.get(d.duration_index) else {
+        return 0;
     };
+    let levels = (skill_level(ctx, d) as i32).wrapping_sub(d.base_level as i32);
+    let resolved = row
+        .base_ms
+        .wrapping_add(levels.wrapping_mul(row.per_level_ms))
+        .min(row.max_ms);
+    i64::from(if ctx.unmodified_points {
+        resolved
+    } else {
+        modify_int(ctx, d, 1, resolved)
+    })
+}
+
+/// The `$d` text: no positive duration is `SPELL_DURATION_UNTIL_CANCELLED` (`507cda`); else the
+/// formatter at `0x52f980` selects the integer ladder (`0x52fa50`) for whole units and the
+/// floating ladder (`0x52fbd0`) for fractional units. Both use the largest unit.
+fn duration_text(ms: i64, ctx: &TokenContext) -> Option<String> {
+    if ms <= 0 {
+        return keyed(ctx, "SPELL_DURATION_UNTIL_CANCELLED", &[]);
+    }
+    let (unit, unit_ms) = if ms < 60_000 {
+        ("SEC", 1_000)
+    } else if ms < 3_600_000 {
+        ("MIN", 60_000)
+    } else if ms < 86_400_000 {
+        ("HOURS", 3_600_000)
+    } else {
+        ("DAYS", 86_400_000)
+    };
+    let amount = ms as f64 / unit_ms as f64;
+    if (amount - amount.trunc()).abs() >= 0.01 {
+        return keyed(
+            ctx,
+            &format!("SPELL_DURATION_{unit}"),
+            &[TokenNumber::Float(amount)],
+        );
+    }
+    let n = ms / unit_ms;
     let key = format!("INT_SPELL_DURATION_{unit}");
     (n != 1)
-        .then(|| (ctx.text)(&format!("{key}_P1"), &[n]))
+        .then(|| keyed(ctx, &format!("{key}_P1"), &[TokenNumber::Int(n)]))
         .flatten()
-        .or_else(|| (ctx.text)(&key, &[n]))
+        .or_else(|| keyed(ctx, &key, &[TokenNumber::Int(n)]))
 }
 
-/// `INT_SPELL_POINTS_SPREAD_TEMPLATE` ("%d to %d"), not the float `SPELL_POINTS_SPREAD_TEMPLATE`,
-/// which would print "14.0 to 22.0" where Fireball rank 1 says "14 to 22".
-fn spread_text(min: i64, max: i64, ctx: &TokenContext) -> Option<String> {
-    (ctx.text)("INT_SPELL_POINTS_SPREAD_TEMPLATE", &[min, max])
-}
-
-/// Trim a float to the client's terse style (no trailing zeros: 2.5 → "2.5", 3.0 → "3").
-fn trim_float(v: f64) -> String {
-    if (v - v.round()).abs() < 1e-9 {
-        format!("{}", v.round() as i64)
+/// The expander's integer read of a scaled bound (`5079cc`-`507b04`): the bound truncated, and
+/// whether it counts as whole, within 0.001 (`[0x801360]`) of its floor or its ceiling. A bound
+/// just under its ceiling reads as the ceiling.
+fn whole(v: f32) -> (i32, bool) {
+    let x = f64::from(v);
+    let eps = f64::from(0.001f32);
+    let truncated = x.floor() as i32;
+    let near_ceil = x.ceil() - x < eps;
+    if x - x.floor() < eps || near_ceil {
+        let up = near_ceil && truncated != x.ceil() as i32;
+        (truncated + i32::from(up), true)
     } else {
-        format!("{v:.1}")
+        (truncated, false)
     }
 }
 
+/// The `$s $S $m $M $o $O` arm (`0x5078b4`): the effect points, spread over the duration for `$o`
+/// (`507926`: duration × points / period, 0 without a positive period or duration, a period of
+/// 0 read as 5000), then made positive and scaled (`507952`) and printed by the letter's rule
+/// (`507b1a`-`507c4a`). The text and the integer the `$l` plural picker keys on (`[0xbe0b84]`).
+fn points_text(
+    letter: char,
+    slot: usize,
+    d: &SpellDisplay,
+    ctx: &TokenContext,
+    scale: f32,
+    level: u32,
+) -> Option<(String, f64)> {
+    // The expander multiplies both by its integer argument here (`5078d1`), which is 1 but in
+    // the aura tooltip's stack count; no caller passes a count.
+    let (mut min, mut max) = effect_points(d, slot, ctx, level);
+    if letter.eq_ignore_ascii_case(&'o') {
+        let amplitude = d.effect_amplitude[slot] as i32;
+        let period = if amplitude == 0 { 5000 } else { amplitude };
+        let duration = if period > 0 { duration_ms(d, ctx) } else { 0 };
+        (min, max) = if duration > 0 {
+            let over = |v: f32| (duration as f64 * f64::from(v) / f64::from(period)) as f32;
+            (over(min), over(max))
+        } else {
+            (0.0, 0.0)
+        };
+    }
+    let scaled = |v: f32| (f64::from(v.abs()) * f64::from(scale)) as f32;
+    let (lo, hi) = (scaled(min), scaled(max));
+    let ((lo_int, lo_whole), (hi_int, hi_whole)) = (whole(lo), whole(hi));
+    let plural = match letter {
+        'm' if lo_whole => lo_int,
+        'm' => 2,
+        _ if hi_whole => hi_int,
+        _ => 2,
+    };
+    let int = |n: i32| TokenNumber::Int(i64::from(n));
+    let text = match letter {
+        'm' if lo_whole => lo_int.to_string(),
+        'm' => tenths(ctx, lo),
+        'M' if hi_whole => hi_int.to_string(),
+        'M' => tenths(ctx, hi),
+        // Equal bounds print one number, `%d` unless `$S` holds a fraction (`507ba3`).
+        _ if min == max && (lo_whole || letter != 'S') => lo_int.to_string(),
+        _ if min == max => tenths(ctx, lo),
+        _ if lo_whole && hi_whole => keyed(
+            ctx,
+            "INT_SPELL_POINTS_SPREAD_TEMPLATE",
+            &[int(lo_int), int(hi_int)],
+        )?,
+        'S' => keyed(
+            ctx,
+            "SPELL_POINTS_SPREAD_TEMPLATE",
+            &[
+                TokenNumber::Float(f64::from(lo)),
+                TokenNumber::Float(f64::from(hi)),
+            ],
+        )?,
+        // A fractional spread under `s`/`o`/`O`: the minimum truncated, a fractional maximum
+        // truncated plus one (`507c2a`-`507c4a`).
+        _ => {
+            let top = if hi_whole { hi_int } else { hi as i32 + 1 };
+            keyed(
+                ctx,
+                "INT_SPELL_POINTS_SPREAD_TEMPLATE",
+                &[int(lo as i32), int(top)],
+            )?
+        }
+    };
+    Some((text, f64::from(plural)))
+}
+
 /// One token's text and the numeric value the `$l` plural picker keys on.
 fn token_value(
     letter: char,
     slot: usize,
     d: &SpellDisplay,
     ctx: &TokenContext,
-    scale: f64,
+    scale: f32,
+    level: u32,
 ) -> Option<(String, f64)> {
-    let scaled = |v: i64| -> i64 {
-        if scale == 1.0 {
-            v
-        } else {
-            (v as f64 * scale).round() as i64
-        }
-    };
     match letter.to_ascii_lowercase() {
-        's' => {
-            let (min, max) = effect_bounds(d, slot);
-            let (min, max) = (scaled(min.abs()), scaled(max.abs()));
-            Some(if min == max {
-                (min.to_string(), min as f64)
+        's' | 'm' | 'o' => points_text(letter, slot, d, ctx, scale, level),
+        'b' => {
+            // `507ed4`: `EffectPointsPerComboPoint`, truncated toward zero by `0x40a2b0`.
+            let v = d.effect_points_per_combo_point[slot].trunc() as i32;
+            Some((v.to_string(), f64::from(v)))
+        }
+        'f' => {
+            // `507ff7` / `508025`: the scale times `DmgMultiplier`, exact at the x87's PC_53.
+            let v = f64::from(scale) * f64::from(d.damage_multiplier[slot]);
+            if letter == 'F' {
+                // ±0.5 by the sign, then chopped by `0x40a2b0` (`50802f`-`50804a`).
+                let n = v.round() as i32;
+                Some((n.to_string(), f64::from(n)))
             } else {
-                (spread_text(min, max, ctx)?, max as f64)
-            })
+                Some((tenths(ctx, v), v))
+            }
         }
-        'm' if letter == 'm' => {
-            let (min, _) = effect_bounds(d, slot);
-            let v = scaled(min.abs());
-            Some((v.to_string(), v as f64))
+        'i' => {
+            // `507fc3`: `MaxAffectedTargets` through `"%d"`.
+            let v = d.max_affected_targets as i32;
+            Some((v.to_string(), f64::from(v)))
         }
-        'm' => {
-            // 'M'
-            let (_, max) = effect_bounds(d, slot);
-            let v = scaled(max.abs());
-            Some((v.to_string(), v as f64))
+        'q' => {
+            // `50806e`: the slot's `EffectMiscValue` through `"%d"`.
+            let v = d.effect_misc_value[slot];
+            Some((v.to_string(), f64::from(v)))
         }
-        'o' => {
-            let (min, max) = effect_bounds(d, slot);
-            let period = i64::from(*d.effect_amplitude.get(slot).unwrap_or(&0)).max(0);
-            let period = if period == 0 { 5000 } else { period };
-            let dur = duration_ms(d, ctx).unwrap_or(0).max(0);
-            let total = |v: i64| scaled((v.abs() * dur / period).max(0));
-            let (tmin, tmax) = (total(min), total(max));
-            Some(if tmin == tmax {
-                (tmin.to_string(), tmin as f64)
-            } else {
-                (spread_text(tmin, tmax, ctx)?, tmax as f64)
-            })
+        'u' => {
+            // `507ef1`: `StackAmount` through `"%d"`.
+            let v = d.stack_amount as i32;
+            Some((v.to_string(), f64::from(v)))
+        }
+        'v' => {
+            // `507f4f`: `MaxTargetLevel` through `"%d"`.
+            let v = d.max_target_level as i32;
+            Some((v.to_string(), f64::from(v)))
         }
         'd' => {
-            let ms = duration_ms(d, ctx)?;
+            let ms = duration_ms(d, ctx);
             let v = if ms < 0 { 0.0 } else { ms as f64 / 1000.0 };
             Some((duration_text(ms, ctx)?, v))
         }
         't' => {
-            let period = i64::from(*d.effect_amplitude.get(slot).unwrap_or(&0));
-            let period = if period == 0 { 5000 } else { period };
-            let v = period as f64 / 1000.0;
-            Some((trim_float(v), v))
+            // `507e3c`: ProcFlags bit 0 is five seconds unmodified, else the amplitude through
+            // op 19, zero included (`507e5c`); whole seconds, truncated (`507e61`).
+            let ms = if d.proc_flags & 1 != 0 {
+                5000
+            } else {
+                modify_int(ctx, d, 19, d.effect_amplitude[slot] as i32)
+            };
+            let secs = ms / 1000;
+            Some((secs.to_string(), f64::from(secs)))
         }
         'a' => {
-            let idx = *d.effect_radius_index.get(slot).unwrap_or(&0);
-            let r = ctx.radii.get(idx)?;
-            Some((trim_float(f64::from(r.radius)), f64::from(r.radius)))
+            // `507c74`: the SpellRadius row's radius truncated, then op 6; no row is 0.
+            let r = ctx.radii.get(d.effect_radius_index[slot]);
+            let v = r.map_or(0, |r| modify_int(ctx, d, 6, r.radius as i32));
+            Some((v.to_string(), f64::from(v)))
+        }
+        'h' => {
+            let v = modify_int(ctx, d, 18, d.proc_chance as i32);
+            Some((v.to_string(), f64::from(v)))
         }
-        'h' => Some((d.proc_chance.to_string(), f64::from(d.proc_chance))),
         'x' => {
             let v = *d.effect_chain_targets.get(slot).unwrap_or(&0);
+            let v = modify_int(ctx, d, 17, v as i32);
             Some((v.to_string(), f64::from(v)))
         }
         'e' => {
-            let v = f64::from(*d.effect_multiple_value.get(slot).unwrap_or(&0.0));
-            Some((trim_float(v), v))
+            // `507f83`: EffectMultipleValue through op 27, always one decimal.
+            let v = modify_float(ctx, d, 27, d.effect_multiple_value[slot]);
+            Some((tenths(ctx, v), f64::from(v)))
+        }
+        'n' => {
+            let v = modify_int(ctx, d, 4, d.proc_charges as i32);
+            Some((v.to_string(), f64::from(v)))
         }
         'z' => {
             // Player state, not spell data: the home-bind area name.
-            let name = ctx.home_area?;
+            let name = (ctx.home_area)()?;
             Some((name.to_string(), 0.0))
         }
         'r' => {
-            // Left raw: the display carries only the range index.
-            None
+            // `507d5b`: RangeIndex at or below 1 reads row 1, its maximum through op 5; no row is
+            // 0.0. One decimal, and the plural keys on the ceiling (`507dbd`).
+            let row = ctx.ranges?.get(d.range_index.max(1));
+            let v = row.map_or(0.0, |r| modify_float(ctx, d, 5, r.max));
+            Some((tenths(ctx, v), f64::from(v).ceil()))
         }
         _ => None,
     }
 }
 
+/// `$/N;` or `$*N;` just after the `$` (`507738`-`507790`): the text up to the `;` (at most seven
+/// characters) read by `atoi` (`0x64ac60`), the scale its value or, for `/`, its reciprocal in
+/// single precision (`507784`); a zero leaves 1.0 (`507774`). Returns the scale and the index past
+/// the `;`, or `None` without a `;`, where the reference consumes nothing.
+fn scale_prefix(text: &str, at: usize) -> Option<(f32, usize)> {
+    let op = *text.as_bytes().get(at)?;
+    if op != b'/' && op != b'*' {
+        return None;
+    }
+    let semi = at + text[at..].find(';')?;
+    let digits = &text.as_bytes()[at + 1..semi.min(at + 8)];
+    let n = atoi(digits);
+    let scale = match (n, op) {
+        (0, _) => 1.0,
+        (n, b'/') => (1.0 / f64::from(n)) as f32,
+        (n, _) => n as f32,
+    };
+    Some((scale, semi + 1))
+}
+
+/// The CRT's `atoi`: leading whitespace, an optional sign, then decimal digits up to the first
+/// other character; nothing parsed is 0.
+fn atoi(bytes: &[u8]) -> i32 {
+    let mut rest = bytes
+        .iter()
+        .copied()
+        .skip_while(u8::is_ascii_whitespace)
+        .peekable();
+    let negative = match rest.peek() {
+        Some(b'-') => {
+            rest.next();
+            true
+        }
+        Some(b'+') => {
+            rest.next();
+            false
+        }
+        _ => false,
+    };
+    let n = rest.take_while(u8::is_ascii_digit).fold(0i32, |n, b| {
+        n.wrapping_mul(10).wrapping_add(i32::from(b - b'0'))
+    });
+    if negative {
+        n.wrapping_neg()
+    } else {
+        n
+    }
+}
+
 /// Substitute every `$`-token in `text` against `spell`.
 pub fn substitute(text: &str, spell: &SpellDisplay, ctx: &TokenContext) -> String {
+    // `0x5075f0`'s level: its caller's, which only the player-buff tooltip passes (the aura's
+    // `AURALEVELS` byte, `0x532bc3`, not built), else the expanded spell's own (`50764a`).
+    let level = skill_level(ctx, spell);
     let bytes = text.as_bytes();
     let mut out = String::with_capacity(text.len());
     let mut i = 0;
@@ -177,22 +463,10 @@ pub fn substitute(text: &str, spell: &SpellDisplay, ctx: &TokenContext) -> Strin
         }
         let start = i;
         i += 1;
-        // `$/N;` or `$*N;` scales the next token.
-        let mut scale = 1.0f64;
-        if i < bytes.len() && (bytes[i] == b'/' || bytes[i] == b'*') {
-            let op = bytes[i];
-            let mut j = i + 1;
-            let num_start = j;
-            while j < bytes.len() && (bytes[j].is_ascii_digit() || bytes[j] == b'.') {
-                j += 1;
-            }
-            if let Ok(n) = text[num_start..j].parse::<f64>() {
-                if j < bytes.len() && bytes[j] == b';' {
-                    j += 1;
-                }
-                scale = if op == b'/' { 1.0 / n } else { n };
-                i = j;
-            }
+        let mut scale = 1.0f32;
+        if let Some((s, next)) = scale_prefix(text, i) {
+            scale = s;
+            i = next;
         }
         // Optional cross-spell id digits.
         let id_start = i;
@@ -250,18 +524,25 @@ pub fn substitute(text: &str, spell: &SpellDisplay, ctx: &TokenContext) -> Strin
         } else {
             0
         };
-        let target: &SpellDisplay = match ref_spell {
+        // A cross-spell token caps the level at its row's positive `maxLevel` (`507805`-`507817`).
+        let (target, level): (&SpellDisplay, u32) = match ref_spell {
             Some(id) => match (ctx.lookup)(id) {
-                Some(s) => s,
+                Some(s) if s.max_level > 0 => (s, level.min(s.max_level)),
+                Some(s) => (s, level),
                 None => {
                     out.push_str(&text[start..i]);
                     continue;
                 }
             },
-            None => spell,
+            None => (spell, level),
         };
-        match token_value(letter, slot, target, ctx, scale) {
+        match token_value(letter, slot, target, ctx, scale, level) {
             Some((sub, val)) => {
+                // Deviation: every token keys the `$l` plural. The reference's `$a`, `$d`, `$t`,
+                // `$e`, `$c`, `$p`, `$f`, `$F` and `$z` arms never write `[0xbe0b84]`, so its `$l`
+                // keys on the number before them, and Blizzard's "$s1 … every $t1
+                // $lsecond:seconds;" reads "every 1 seconds" in 1.12.1. We print the grammar the
+                // text means.
                 last_value = val;
                 out.push_str(&sub);
             }
@@ -286,31 +567,136 @@ mod tests {
     use crate::spells::SpellDisplay;
 
     /// Deliberately unlike the shipped wording, so a wrong key cannot pass by reading the same.
-    fn text(key: &str, args: &[i64]) -> Option<String> {
-        let n = |i: usize| args.get(i).copied().unwrap_or_default();
-        Some(match key {
-            "SPELL_DURATION_UNTIL_CANCELLED" => "<forever>".into(),
-            "INT_SPELL_DURATION_SEC" => format!("<{}sec>", n(0)),
-            "INT_SPELL_DURATION_MIN" => format!("<{}min>", n(0)),
-            "INT_SPELL_DURATION_HOURS" => format!("<{}hour>", n(0)),
-            "INT_SPELL_DURATION_HOURS_P1" => format!("<{}hrs>", n(0)),
-            "INT_SPELL_DURATION_DAYS" => format!("<{}days>", n(0)),
-            "INT_SPELL_POINTS_SPREAD_TEMPLATE" => format!("<{}..{}>", n(0), n(1)),
-            _ => return None,
+    fn global(key: &str) -> Option<String> {
+        Some(
+            match key {
+                "SPELL_DURATION_UNTIL_CANCELLED" => "<forever>",
+                "INT_SPELL_DURATION_SEC" => "<%dsec>",
+                "INT_SPELL_DURATION_MIN" => "<%dmin>",
+                "INT_SPELL_DURATION_HOURS" => "<%dhour>",
+                "INT_SPELL_DURATION_HOURS_P1" => "<%dhrs>",
+                "INT_SPELL_DURATION_DAYS" => "<%ddays>",
+                "SPELL_DURATION_MIN" => "<%.2fmin>",
+                "INT_SPELL_POINTS_SPREAD_TEMPLATE" => "<%d..%d>",
+                "SPELL_POINTS_SPREAD_TEMPLATE" => "<%.1f to %.1f>",
+                _ => return None,
+            }
+            .into(),
+        )
+    }
+
+    /// Every spell-data formatter key needed by a corpus walk; individual formatter tests above
+    /// pin the reference's unit and spread choices separately.
+    fn corpus_global(key: &str) -> Option<String> {
+        global(key).or_else(|| {
+            if key.starts_with("INT_SPELL_DURATION_") {
+                Some("%d".into())
+            } else if key.starts_with("SPELL_DURATION_") {
+                Some("%.1f".into())
+            } else {
+                None
+            }
         })
     }
 
+    /// `%d`, `%.Nf` and `%%` in order; the tests keep clear of the CRT's rounding ties.
+    fn printf(template: &str, args: &[TokenNumber]) -> String {
+        let mut out = String::new();
+        let mut args = args.iter();
+        let mut chars = template.chars().peekable();
+        while let Some(c) = chars.next() {
+            if c != '%' {
+                out.push(c);
+                continue;
+            }
+            let mut spec = String::new();
+            while let Some(&n) = chars.peek() {
+                chars.next();
+                spec.push(n);
+                if n.is_ascii_alphabetic() || n == '%' {
+                    break;
+                }
+            }
+            match (spec.as_str(), args.next()) {
+                ("d", Some(TokenNumber::Int(n))) => out.push_str(&n.to_string()),
+                (f, Some(TokenNumber::Float(x))) if f.starts_with('.') => {
+                    let p: usize = f[1..f.len() - 1].parse().unwrap();
+                    out.push_str(&format!("{x:.p$}"));
+                }
+                (s, a) => panic!("printf: %{s} with {a:?}"),
+            }
+        }
+        out
+    }
+
+    /// A caster's table: `(op, flat, pct)` rows through the three appliers' arithmetic.
+    struct Mods(Vec<(u8, i32, i32)>);
+
+    impl Mods {
+        fn find(&self, op: u8) -> Option<(i32, i32)> {
+            self.0
+                .iter()
+                .find(|m| m.0 == op)
+                .map(|&(_, flat, pct)| (flat, pct))
+        }
+    }
+
+    impl SpellMods for Mods {
+        fn apply_int(&self, _: &SpellDisplay, op: u8, value: i32) -> i32 {
+            self.find(op)
+                .map_or(value, |(flat, pct)| (value + flat) * pct / 100)
+        }
+        fn apply_float(&self, _: &SpellDisplay, op: u8, value: f32) -> f32 {
+            self.find(op).map_or(value, |(flat, pct)| {
+                ((f64::from(value) + f64::from(flat)) * f64::from(pct) * f64::from(0.01f32)) as f32
+            })
+        }
+        fn apply_soft(&self, _: &SpellDisplay, op: u8, value: f32) -> f32 {
+            self.find(op)
+                .map_or(value, |(flat, pct)| crate::soft_modify(value, flat, pct))
+        }
+    }
+
     fn ctx<'a>(
         durations: &'a SpellDurationCatalog,
         radii: &'a SpellRadiusCatalog,
         lookup: &'a dyn Fn(u32) -> Option<&'a SpellDisplay>,
     ) -> TokenContext<'a> {
         TokenContext {
-            home_area: None,
+            home_area: &|| None,
             durations,
             radii,
+            ranges: None,
+            skill: &|_| 0,
             lookup,
-            text: &text,
+            mods: None,
+            unmodified_points: false,
+            global: &global,
+            printf: &printf,
+        }
+    }
+
+    fn none_lookup<'a>(_: u32) -> Option<&'a SpellDisplay> {
+        None
+    }
+
+    /// A flat effect of `points` in slot 0 (base `points − 1`, one one-sided die).
+    fn points(points: i32) -> SpellDisplay {
+        SpellDisplay {
+            effect_base_points: [points - 1, 0, 0],
+            effect_base_dice: [1, 0, 0],
+            effect_die_sides: [1, 0, 0],
+            ..Default::default()
+        }
+    }
+
+    /// An effect rolling `min..=max` in slot 0.
+    fn spread(min: i32, max: i32) -> SpellDisplay {
+        SpellDisplay {
+            effect_base_points: [min - 1, 0, 0],
+            effect_base_dice: [1, 0, 0],
+            effect_die_sides: [max - min + 1, 0, 0],
+            ..Default::default()
         }
     }
 
@@ -325,6 +711,7 @@ mod tests {
             (4, 7_200_000),
             (5, 172_800_000),
             (6, -1),
+            (7, 0),
         ] {
             durations.insert_for_tests(idx, ms);
         }
@@ -345,10 +732,76 @@ mod tests {
         assert_eq!(d(4), "<2hrs>", "but two take the _P1 twin");
         assert_eq!(d(5), "<2days>", "the days arm the ladder used to lack");
         assert_eq!(d(6), "<forever>");
+        // No positive duration, and no row, which `0x6ea000` reads as 0 (`507cda`).
+        assert_eq!(d(7), "<forever>");
+        assert_eq!(d(8), "<forever>");
     }
 
-    fn none_lookup<'a>(_: u32) -> Option<&'a SpellDisplay> {
-        None
+    #[test]
+    fn duration_modifier_updates_description_and_overtime_total() {
+        let mut durations = SpellDurationCatalog::default();
+        durations.insert_for_tests(1, 120_000);
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(1, 0, 150)]);
+        let c = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let d = SpellDisplay {
+            duration_index: 1,
+            effect_amplitude: [3_000, 0, 0],
+            ..points(3)
+        };
+        assert_eq!(
+            substitute("Lasts $d; deals $o1 total.", &d, &c),
+            "Lasts <3min>; deals 180 total."
+        );
+    }
+
+    #[test]
+    fn battle_shout_description_uses_modified_duration_from_real_data() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let spells = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = crate::load_spell_durations(&mut chain).expect("SpellDuration.dbc");
+        let radii = SpellRadiusCatalog::default();
+        let d = spells.get(6673).expect("Battle Shout rank 1");
+        let description = d.description.as_deref().expect("description");
+        let lookup = |id| spells.get(id);
+        let base = ctx(&durations, &radii, &lookup);
+        assert!(substitute(description, d, &base).contains("<2min>"));
+        let mods = Mods(vec![(1, 0, 150)]);
+        let modified = TokenContext {
+            mods: Some(&mods),
+            ..base
+        };
+        assert!(substitute(description, d, &modified).contains("<3min>"));
+    }
+
+    #[test]
+    fn booming_voice_ranks_preserve_fractional_minutes() {
+        let mut durations = SpellDurationCatalog::default();
+        durations.insert_for_tests(1, 120_000);
+        let radii = SpellRadiusCatalog::default();
+        let spell = SpellDisplay {
+            duration_index: 1,
+            ..Default::default()
+        };
+        for (rank, expected) in [
+            (0, "<2min>"),
+            (1, "<2.20min>"),
+            (2, "<2.40min>"),
+            (3, "<2.60min>"),
+            (4, "<2.80min>"),
+            (5, "<3min>"),
+        ] {
+            let mods = Mods(vec![(1, 0, 100 + rank * 10)]);
+            let ctx = TokenContext {
+                mods: Some(&mods),
+                ..ctx(&durations, &radii, &none_lookup)
+            };
+            assert_eq!(substitute("$d", &spell, &ctx), expected, "rank {rank}");
+        }
     }
 
     /// Base 13 and one 9-sided die give "14 to 22", Fireball rank 1's shape; a diceless effect
@@ -378,6 +831,422 @@ mod tests {
         );
     }
 
+    #[test]
+    fn scaled_effect_points_keep_fractional_seconds() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        for (n, expected) in [(100, "0.1"), (200, "0.2"), (500, "0.5")] {
+            let d = points(n);
+            assert_eq!(
+                substitute("$/1000;S1 sec.", &d, &c),
+                format!("{expected} sec.")
+            );
+            assert_eq!(
+                substitute("$/1000;m1 sec.", &d, &c),
+                format!("{expected} sec.")
+            );
+        }
+        // A whole scaled value prints `%d` under any letter.
+        assert_eq!(substitute("$/1000;S1", &points(1000), &c), "1");
+    }
+
+    /// Flametongue Weapon's shape (`$/77;8026m1 to $/25;8026M1` over 326): `m`/`M` print a
+    /// fraction at one decimal. The scale is `atoi`'s, so a decimal `$*` reads its integer part
+    /// and `$*0.04;` is no scale at all.
+    #[test]
+    fn scaled_m_tokens_print_tenths_and_the_scale_is_an_integer() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        let d = points(326);
+        assert_eq!(
+            substitute("$/77;m1 to $/25;M1 additional Fire damage", &d, &c),
+            "4.2 to 13.0 additional Fire damage"
+        );
+        assert_eq!(substitute("$*0.04;M1", &d, &c), "326");
+        assert_eq!(substitute("$*2;M1", &d, &c), "652");
+        assert_eq!(substitute("$/0;M1", &d, &c), "326", "atoi 0 leaves 1.0");
+        assert_eq!(
+            substitute("$/2 x;M1", &d, &c),
+            "163",
+            "atoi stops at the space"
+        );
+        assert_eq!(substitute("$/2 M1", &d, &c), "$/2 M1", "no `;`, no token");
+    }
+
+    /// `$/2;s1` of 3 truncates to 1 (`507b28`), where `$/2;S1` keeps its fraction.
+    #[test]
+    fn a_fractional_single_value_truncates_under_s_and_keeps_tenths_under_capital_s() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        let d = points(3);
+        assert_eq!(substitute("$/2;s1", &d, &c), "1");
+        assert_eq!(
+            substitute("$/2;o1", &d, &c),
+            "0",
+            "no duration spreads nothing"
+        );
+        assert_eq!(substitute("$/2;S1", &d, &c), "1.5");
+        assert_eq!(substitute("$/2;m1 $/2;M1", &d, &c), "1.5 1.5");
+    }
+
+    /// The spread arms (`507bc2`-`507c4a`): both whole takes the integer template; else `$S`
+    /// takes the float one, and `s` the integer one over the truncated minimum and a fractional
+    /// maximum truncated plus one.
+    #[test]
+    fn a_spread_picks_its_template_by_letter_and_wholeness() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        assert_eq!(substitute("$/2;s1", &spread(4, 6), &c), "<2..3>");
+        assert_eq!(substitute("$/2;s1", &spread(3, 5), &c), "<1..3>");
+        assert_eq!(substitute("$/2;S1", &spread(3, 5), &c), "<1.5 to 2.5>");
+        assert_eq!(substitute("$/2;s1", &spread(4, 5), &c), "<2..3>");
+        assert_eq!(substitute("$/2;S1", &spread(4, 5), &c), "<2.0 to 2.5>");
+        assert_eq!(substitute("$/2;O1", &spread(4, 5), &c), "0");
+    }
+
+    /// The plural value `[0xbe0b84]`: `m` keys on its whole minimum, the others on the whole
+    /// maximum, and a fraction keys as 2 (`507aa2`-`507b10`).
+    #[test]
+    fn the_plural_keys_on_the_whole_bound_or_two() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        let plural = |text: &str, d: &SpellDisplay| substitute(text, d, &c);
+        assert_eq!(plural("$m1 $lpoint:points;", &spread(1, 3)), "1 point");
+        assert_eq!(
+            plural("$s1 $lpoint:points;", &spread(1, 3)),
+            "<1..3> points"
+        );
+        assert_eq!(plural("$M1 $lpoint:points;", &points(1)), "1 point");
+        assert_eq!(plural("$/2;m1 $lpoint:points;", &points(2)), "1 point");
+        assert_eq!(plural("$/4;S1 $lpoint:points;", &points(2)), "0.5 points");
+    }
+
+    /// `0x6e3b80`'s rounding set: School Damage floors the minimum and ceils the maximum after
+    /// its modifiers, where an unrounded effect keeps the quantized fraction; a zero maximum
+    /// ceils to 1 (`0x761040`).
+    #[test]
+    fn a_rounding_effect_floors_and_ceils_its_modified_bounds() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(0, 0, 110)]);
+        let c = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let school = SpellDisplay {
+            effects: [2, 0, 0],
+            ..spread(14, 22)
+        };
+        assert_eq!(substitute("$s1", &school, &c), "<15..25>");
+        assert_eq!(substitute("$m1 $M1", &school, &c), "15 25");
+        let zero = SpellDisplay {
+            effects: [2, 0, 0],
+            ..points(0)
+        };
+        assert_eq!(
+            substitute("$s1", &zero, &ctx(&durations, &radii, &none_lookup)),
+            "<0..1>"
+        );
+        // A dummy effect is not in the set: op 0 does not reach it, and nothing rounds.
+        let dummy = SpellDisplay {
+            effects: [3, 0, 0],
+            ..spread(14, 22)
+        };
+        assert_eq!(substitute("$s1", &dummy, &c), "<14..22>");
+    }
+
+    /// The damage op is 22 for aura 3 and 0 for the other damage auras (`6e394a`).
+    #[test]
+    fn a_periodic_damage_aura_takes_op_22() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(22, 0, 200)]);
+        let c = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let aura = |aura| SpellDisplay {
+            effects: [6, 0, 0],
+            effect_apply_aura: [aura, 0, 0],
+            ..points(10)
+        };
+        assert_eq!(substitute("$s1", &aura(3), &c), "20");
+        assert_eq!(substitute("$s1", &aura(15), &c), "10");
+    }
+
+    /// `GetEffectPoints` modifies through the software-float applier `0x6e6c30`, whose truncating
+    /// steps land 269 × 1.01 × 1.33 on 361.34375 after the 1/128 quantizer, where the FPU applier
+    /// would reach 361.3515625 and print "361.4".
+    #[test]
+    fn effect_points_take_the_software_float_applier() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(8, 0, 101), (2, 0, 133)]);
+        let c = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let d = SpellDisplay {
+            effects: [6, 0, 0],
+            effect_apply_aura: [10, 0, 0],
+            ..points(269)
+        };
+        assert_eq!(substitute("$M1", &d, &c), "361.3");
+    }
+
+    /// The aura tooltip's context skips the effect points' modifiers and `$d`'s op 1, and keeps
+    /// the other tokens' ops.
+    #[test]
+    fn the_aura_tooltip_context_leaves_points_and_duration_unmodified() {
+        let mut durations = SpellDurationCatalog::default();
+        durations.insert_for_tests(1, 60_000);
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(8, 0, 125), (1, 0, 200), (18, 10, 100)]);
+        let modified = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let aura = TokenContext {
+            unmodified_points: true,
+            ..modified
+        };
+        let d = SpellDisplay {
+            duration_index: 1,
+            proc_chance: 5,
+            ..points(40)
+        };
+        assert_eq!(substitute("$s1 $d $h", &d, &modified), "50 <2min> 15");
+        assert_eq!(substitute("$s1 $d $h", &d, &aura), "40 <1min> 15");
+    }
+
+    #[test]
+    fn scaled_damage_tokens_from_real_spell_data() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let spells = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = crate::load_spell_durations(&mut chain).expect("SpellDuration.dbc");
+        let radii = SpellRadiusCatalog::default();
+        let lookup = |id| spells.get(id);
+        let c = ctx(&durations, &radii, &lookup);
+        for (id, expected) in [
+            (8024, "4.2 to 13.0 additional Fire damage"),
+            (20154, "an additional 1 to 4 Holy damage"),
+            // `$/1000;s1` of 1500 and of 600: lowercase `s` truncates a fraction (`507b28`).
+            (21854, "Enslave Demon spell by 1 sec."),
+            (24271, "Raptor Strike by 0 sec."),
+        ] {
+            let d = spells.get(id).expect("spell");
+            let description = substitute(d.description.as_deref().unwrap(), d, &c);
+            assert!(description.contains(expected), "{id}: {description}");
+        }
+    }
+
+    #[test]
+    fn improved_frostbolt_ranks_display_tenths_from_real_spell_data() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let catalog = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let lookup = |id| catalog.get(id);
+        let c = ctx(&durations, &radii, &lookup);
+        for (id, expected) in [
+            (11070, "0.1"),
+            (12473, "0.2"),
+            (16763, "0.3"),
+            (16765, "0.4"),
+            (16766, "0.5"),
+        ] {
+            let d = catalog.get(id).expect("Improved Frostbolt rank");
+            assert!(d.name == "Improved Frostbolt");
+            let description = substitute(d.description.as_deref().unwrap(), d, &c);
+            assert!(
+                description.contains(&format!("by {expected} sec.")),
+                "{description}"
+            );
+        }
+    }
+
+    /// The per-level terms scale by the skill level (`0x6e3130`): the skill capped at
+    /// `maxLevel × 5`, over 5 in integers, less `baseLevel` floored at 0. Battle Shout rank 1
+    /// (14 + 1d1, 0.5 a level from 1, cap 11), Power Word: Shield rank 1 (43 + 1d1, 0.8 from 6,
+    /// cap 11), Fireball rank 1 (13 + 1d9, 0.6 from 1, cap 5, a rounding effect).
+    #[test]
+    fn per_level_terms_scale_by_the_skill_level_from_real_spells() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let spells = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let lookup = |id| spells.get(id);
+        let skill = std::cell::Cell::new(0);
+        let skill_of = |_| skill.get();
+        let c = TokenContext {
+            skill: &skill_of,
+            ..ctx(&durations, &radii, &lookup)
+        };
+        let at = |value: u32, id: u32| {
+            skill.set(value);
+            substitute("$s1", spells.get(id).unwrap(), &c)
+        };
+        // Levels 1, 11 and 60 at a class line's level × 5, and the cap at 11.
+        for (skill, expected) in [(0, "15"), (5, "15"), (55, "20"), (300, "20")] {
+            assert_eq!(at(skill, 6673), expected, "Battle Shout at skill {skill}");
+        }
+        assert_eq!(at(300, 17), "48");
+        // Level 3 is under baseLevel 6: no negative term.
+        assert_eq!(at(15, 17), "44");
+        assert_eq!(at(0, 133), "<14..22>");
+        // Skill 24 is level 4, not 4.8: 14 + 1.8 floored, 22 + 1.8 ceiled.
+        assert_eq!(at(24, 133), "<15..24>");
+        // 14 + 2.4 floored, 22 + 2.4 ceiled (`6e3a67`).
+        assert_eq!(at(300, 133), "<16..25>");
+    }
+
+    /// A `baseLevel` at or below 0 is not subtracted (`6e3859`): the level itself is Δ.
+    #[test]
+    fn a_base_level_at_or_below_zero_is_not_subtracted() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let d = SpellDisplay {
+            base_level: -1i32 as u32,
+            effect_real_points_per_level: [1.0, 0.0, 0.0],
+            ..points(10)
+        };
+        let c = TokenContext {
+            skill: &|_| 50,
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        assert_eq!(substitute("$s1", &d, &c), "20");
+    }
+
+    /// A cross-spell token takes the expanded spell's level capped at its own row's `maxLevel`
+    /// (`507805`); only a level of 0 falls through to the referenced spell's own (`6e3841`).
+    #[test]
+    fn a_cross_spell_token_caps_the_outer_level() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let per_level = |id: u32, max_level: u32| SpellDisplay {
+            id,
+            base_level: 1,
+            max_level,
+            effect_real_points_per_level: [1.0, 0.0, 0.0],
+            ..points(10)
+        };
+        let (capped, uncapped) = (per_level(2, 10), per_level(3, 0));
+        let lookup = |id: u32| match id {
+            2 => Some(&capped),
+            3 => Some(&uncapped),
+            _ => None,
+        };
+        let outer = SpellDisplay {
+            id: 1,
+            ..Default::default()
+        };
+        // The outer spell at level 30; the referenced ones in no line of the player's.
+        let c = TokenContext {
+            skill: &|id| if id == 1 { 150 } else { 0 },
+            ..ctx(&durations, &radii, &lookup)
+        };
+        assert_eq!(substitute("$2s1 $3s1", &outer, &c), "19 39");
+        // The outer spell at level 0: each takes its own, 100 capped at 10 × 5.
+        let c = TokenContext {
+            skill: &|id| if id == 1 { 0 } else { 100 },
+            ..ctx(&durations, &radii, &lookup)
+        };
+        assert_eq!(substitute("$2s1 $3s1", &outer, &c), "19 29");
+    }
+
+    /// Resurrection Sickness (15007) is the one shipped spell on a per-level duration row: 427,
+    /// -600000 ms plus 60000 a level, capped at 600000. In no line of the player's its level is 0,
+    /// and a duration at or below 0 reads as until cancelled.
+    #[test]
+    fn the_duration_takes_its_per_level_term_from_real_data() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let spells = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = crate::load_spell_durations(&mut chain).expect("SpellDuration.dbc");
+        let radii = SpellRadiusCatalog::default();
+        let lookup = |id| spells.get(id);
+        let sickness = spells.get(15007).expect("Resurrection Sickness");
+        assert_eq!(sickness.duration_index, 427);
+        let skill = std::cell::Cell::new(0);
+        let skill_of = |_| skill.get();
+        let c = TokenContext {
+            skill: &skill_of,
+            ..ctx(&durations, &radii, &lookup)
+        };
+        for (value, expected) in [
+            (0, "<forever>"),
+            (50, "<forever>"),
+            (55, "<1min>"),
+            (150, "<10min>"),
+        ] {
+            skill.set(value);
+            assert_eq!(substitute("$d", sickness, &c), expected, "skill {value}");
+        }
+    }
+
+    /// Below `baseLevel` the duration's per-level term goes negative: no floor (`6ea046`).
+    #[test]
+    fn the_duration_level_term_is_not_floored() {
+        let mut durations = SpellDurationCatalog::default();
+        durations.insert_row_for_tests(
+            1,
+            crate::SpellDuration {
+                base_ms: 20_000,
+                per_level_ms: 1_000,
+                max_ms: 30_000,
+            },
+        );
+        let radii = SpellRadiusCatalog::default();
+        let d = SpellDisplay {
+            base_level: 10,
+            duration_index: 1,
+            ..Default::default()
+        };
+        let skill = std::cell::Cell::new(0);
+        let skill_of = |_| skill.get();
+        let c = TokenContext {
+            skill: &skill_of,
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        // Level 5, five under: 20 s less 5 s. Level 20: 30 s, the cap.
+        skill.set(25);
+        assert_eq!(substitute("$d", &d, &c), "<15sec>");
+        skill.set(100);
+        assert_eq!(substitute("$d", &d, &c), "<30sec>");
+    }
+
+    #[test]
+    fn dice_per_level_reaches_spread_and_overtime_tokens() {
+        let mut durations = SpellDurationCatalog::default();
+        durations.insert_for_tests(1, 9_000);
+        let radii = SpellRadiusCatalog::default();
+        let spell = SpellDisplay {
+            base_level: 1,
+            max_level: 3,
+            duration_index: 1,
+            effect_base_points: [10, 0, 0],
+            effect_base_dice: [1, 0, 0],
+            effect_die_sides: [3, 0, 0],
+            effect_dice_per_level: [1, 0, 0],
+            effect_amplitude: [3_000, 0, 0],
+            ..Default::default()
+        };
+        // Level 20, capped at 3: two more dice.
+        let c = TokenContext {
+            skill: &|_| 100,
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        assert_eq!(substitute("$s1; $o1", &spell, &c), "<13..19>; <39..57>");
+    }
+
     #[test]
     fn overtime_duration_period_scale_plural() {
         let mut durations = SpellDurationCatalog::default();
@@ -385,11 +1254,8 @@ mod tests {
         let radii = SpellRadiusCatalog::default();
         let d = SpellDisplay {
             duration_index: 1,
-            effect_base_points: [2, 0, 0],
-            effect_base_dice: [1, 0, 0],
-            effect_die_sides: [1, 0, 0],
             effect_amplitude: [3000, 0, 0],
-            ..Default::default()
+            ..points(3)
         };
         let c = ctx(&durations, &radii, &none_lookup);
         assert_eq!(
@@ -397,9 +1263,9 @@ mod tests {
             "Deals 18 damage over <18sec>, every 3 sec."
         );
         assert_eq!(
-            substitute("Restores $/2;s1 health: $l point:points;.", &d, &c),
-            // 3 halved is 1.5, which rounds to 2; the plural picks "points"
-            "Restores 2 health: points.".to_string()
+            substitute("Restores $/2;S1 health: $l point:points;.", &d, &c),
+            // Uppercase S keeps 3/2 fractional; the plural picks "points".
+            "Restores 1.5 health: points.".to_string()
         );
     }
 
@@ -407,43 +1273,381 @@ mod tests {
     fn cross_spell_and_unknown_tokens() {
         let durations = SpellDurationCatalog::default();
         let radii = SpellRadiusCatalog::default();
-        let other = SpellDisplay {
-            effect_base_points: [99, 0, 0],
-            effect_base_dice: [1, 0, 0],
-            effect_die_sides: [1, 0, 0],
-            ..Default::default()
-        };
+        let other = points(100);
         let lookup = |id: u32| -> Option<&SpellDisplay> { (id == 1234).then_some(&other) };
         let d = SpellDisplay::default();
         let c = TokenContext {
-            home_area: Some("Goldshire"),
-            durations: &durations,
-            radii: &radii,
-            lookup: &lookup,
-            text: &text,
+            home_area: &|| Some("Goldshire"),
+            ..ctx(&durations, &radii, &lookup)
         };
         assert_eq!(
             substitute("as strong as $1234s1 hits", &d, &c),
             "as strong as 100 hits"
         );
-        assert_eq!(substitute("stacks $u times", &d, &c), "stacks $u times");
+        assert_eq!(substitute("stacks $u times", &d, &c), "stacks 0 times");
+        assert_eq!(substitute("unknown $j", &d, &c), "unknown $j");
         assert_eq!(
             substitute("Returns you to $z.", &d, &c),
             "Returns you to Goldshire."
         );
-        let unbound = TokenContext {
-            home_area: None,
-            durations: &durations,
-            radii: &radii,
-            lookup: &lookup,
-            text: &text,
-        };
+        let unbound = ctx(&durations, &radii, &lookup);
         assert_eq!(
             substitute("Returns you to $z.", &d, &unbound),
             "Returns you to $z."
         );
     }
 
+    /// Devotion Aura rank 1's shape: 55 armor, and Improved Devotion Aura's +25% on op 8 through
+    /// the soft applier and the 1/128 quantizer is 68.75, which `$s1` truncates and `$M1` prints
+    /// at one decimal.
+    #[test]
+    fn effect_value_tokens_take_the_all_effects_modifier() {
+        let d = SpellDisplay {
+            effects: [35, 0, 0],
+            effect_apply_aura: [22, 0, 0],
+            ..points(55)
+        };
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(8, 0, 125)]);
+        let ctx = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        assert_eq!(substitute("Gives $s1 armor.", &d, &ctx), "Gives 68 armor.");
+        assert_eq!(
+            substitute("Increases armor by $M1.", &d, &ctx),
+            "Increases armor by 68.8."
+        );
+    }
+
+    /// Every aura `0x6e3ab8`'s table covers (10..=183), and none outside it.
+    #[test]
+    fn each_aura_takes_the_op_of_its_jump_table_arm() {
+        for aura in 0..=255u32 {
+            let expected = match aura {
+                10 | 103 | 183 => Some(2),
+                31 | 32 | 33 | 58 | 129 | 130 | 171 | 172 => Some(12),
+                138 => Some(23),
+                65 => Some(24),
+                99 => Some(3),
+                _ => None,
+            };
+            let d = SpellDisplay {
+                effect_apply_aura: [aura, 0, 0],
+                ..Default::default()
+            };
+            assert_eq!(aura_op(&d, 0), expected, "aura {aura}");
+        }
+    }
+
+    /// `$t` (`507e3c`): ProcFlags bit 0 is five seconds whatever the amplitude; else the
+    /// amplitude through op 19, zero included, in whole seconds.
+    #[test]
+    fn t_is_whole_seconds_of_the_modified_amplitude() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let mods = Mods(vec![(19, -1000, 100)]);
+        let c = TokenContext {
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let tick = |amplitude, proc_flags| SpellDisplay {
+            effect_amplitude: [amplitude, 0, 0],
+            proc_flags,
+            ..Default::default()
+        };
+        let bare = ctx(&durations, &radii, &none_lookup);
+        assert_eq!(substitute("$t1", &tick(1500, 0), &bare), "1");
+        assert_eq!(substitute("$t1", &tick(0, 0), &bare), "0");
+        assert_eq!(substitute("$t1", &tick(3000, 0), &c), "2");
+        assert_eq!(substitute("$t1", &tick(3000, 1), &c), "5");
+    }
+
+    /// The `$l` deviation in [`substitute`]: Blizzard's wording keys its plural on the `$t` just
+    /// before it, "every 1 second", where 1.12.1 keys on the damage and reads "every 1 seconds".
+    #[test]
+    fn the_plural_keys_on_the_nearest_token_a_deviation() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        let blizzard = SpellDisplay {
+            effect_base_points: [24, 0, 0],
+            effect_base_dice: [1, 0, 0],
+            effect_die_sides: [1, 0, 0],
+            effect_amplitude: [1000, 0, 0],
+            ..Default::default()
+        };
+        assert_eq!(
+            substitute(
+                "$s1 Frost damage every $t1 $lsecond:seconds;",
+                &blizzard,
+                &c
+            ),
+            "25 Frost damage every 1 second"
+        );
+        // `$f` and `$F` key it too, though their arms (`507ff7`, `508025`) leave it alone.
+        let multiplier = SpellDisplay {
+            effect_base_points: [24, 0, 0],
+            effect_base_dice: [1, 1, 0],
+            effect_die_sides: [1, 1, 0],
+            damage_multiplier: [1.0, 1.5, 0.0],
+            ..Default::default()
+        };
+        assert_eq!(
+            substitute("$s1 then $F1 $lpoint:points;", &multiplier, &c),
+            "25 then 1 point"
+        );
+        assert_eq!(
+            substitute("$s2 then $f2 $lpoint:points;", &multiplier, &c),
+            "1 then 1.5 points"
+        );
+    }
+
+    /// The field arms read the referenced row, `$b`, `$q`, `$f` and `$F` at the slot digit; `$b`,
+    /// `$u`, `$v`, `$i` and `$q` print `"%d"` and key the `$l` plural (`507ee0`, `507ef7`,
+    /// `507f55`, `507fc9`, `508075`).
+    #[test]
+    fn field_tokens_read_their_columns_and_plural_counts() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let rows = [
+            SpellDisplay {
+                id: 42,
+                effect_points_per_combo_point: [0.0, -2.9, 0.0],
+                damage_multiplier: [0.5, 1.3, -0.25],
+                effect_misc_value: [135, -1, 0],
+                max_affected_targets: 4,
+                stack_amount: 5,
+                max_target_level: 40,
+                ..Default::default()
+            },
+            SpellDisplay {
+                id: 43,
+                effect_points_per_combo_point: [1.9, 0.0, 0.0],
+                effect_misc_value: [0, 0, 1],
+                max_affected_targets: 1,
+                stack_amount: 1,
+                max_target_level: 1,
+                ..Default::default()
+            },
+            SpellDisplay {
+                id: 44,
+                max_affected_targets: 0x8000_0000,
+                stack_amount: u32::MAX,
+                max_target_level: u32::MAX - 1,
+                ..Default::default()
+            },
+        ];
+        let lookup = |id| rows.iter().find(|r| r.id == id);
+        let c = ctx(&durations, &radii, &lookup);
+        let empty = SpellDisplay::default();
+        assert_eq!(substitute("$42b2", &empty, &c), "-2");
+        assert_eq!(substitute("$42q1 $42Q2", &empty, &c), "135 -1");
+        assert_eq!(substitute("$42i $42u $42v", &empty, &c), "4 5 40");
+        assert_eq!(substitute("$42I $42U $42V", &empty, &c), "4 5 40");
+        assert_eq!(substitute("$*100;42F1", &empty, &c), "50");
+        assert_eq!(substitute("$42f2", &empty, &c), "1.3");
+        assert_eq!(substitute("$*10;42F3", &empty, &c), "-3");
+        assert_eq!(
+            substitute("$44i $44u $44v", &empty, &c),
+            "-2147483648 -1 -2"
+        );
+        for token in ["$43b1", "$43q3", "$43i", "$43u", "$43v"] {
+            assert_eq!(
+                substitute(&format!("{token} $lone:many;"), &empty, &c),
+                "1 one",
+                "{token}"
+            );
+        }
+    }
+
+    /// `$f` and `$F` (`507ff7`, `508025`) multiply on the x87 at PC_53, so the product of the two
+    /// floats is exact: rounded to a float first, these would read 1.1 and 3.
+    #[test]
+    fn the_multiplier_tokens_multiply_in_double() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::default();
+        let c = ctx(&durations, &radii, &none_lookup);
+        let d = SpellDisplay {
+            damage_multiplier: [0.23, 0.833_333_3, 0.0],
+            ..Default::default()
+        };
+        assert_eq!(substitute("$*5;f1", &d, &c), "1.2");
+        assert_eq!(substitute("$*3;F2", &d, &c), "2");
+    }
+
+    #[test]
+    fn shipped_spell_data_tokens_resolve() {
+        let data = crate::wow_data_or_skip!();
+        let mut chain = crate::open_chain(&data).expect("open chain");
+        let spells = crate::load_spell_catalog(&mut chain).expect("Spell.dbc");
+        let durations = crate::load_spell_durations(&mut chain).expect("SpellDuration.dbc");
+        let radii = crate::load_spell_radii(&mut chain).expect("SpellRadius.dbc");
+        let ranges = crate::load_spell_ranges(&mut chain).expect("SpellRange.dbc");
+        let lookup = |id| spells.get(id);
+        let c = TokenContext {
+            ranges: Some(&ranges),
+            global: &corpus_global,
+            ..ctx(&durations, &radii, &lookup)
+        };
+        for (id, text, want) in [
+            (1064, "$*100;F1", "50"),
+            (10622, "$*100;F1", "50"),
+            (10623, "$*100;F1", "50"),
+            (22568, "$f1", "1.0"),
+            (2006, "$q1", "135"),
+            (1680, "$i", "4"),
+            (22959, "$u", "5"),
+            (453, "$v", "40"),
+            (14179, "$b1", "20"),
+        ] {
+            assert_eq!(
+                substitute(text, spells.get(id).unwrap(), &c),
+                want,
+                "spell {id}"
+            );
+        }
+        for id in [1064, 10622, 10623] {
+            let spell = spells.get(id).unwrap();
+            assert_eq!(spell.damage_multiplier[0], 0.5, "Chain Heal {id}");
+            let description = spell.description.as_deref().unwrap();
+            assert!(
+                description.contains("$*100;F1"),
+                "Chain Heal {id}: {description}"
+            );
+            assert!(
+                substitute(description, spell, &c).contains("50%"),
+                "Chain Heal {id} must show 50%"
+            );
+        }
+
+        // Walk every shipped spell-data token, including other ranks, effect slots, scale
+        // prefixes and cross-spell references. `$z` needs the player's home area, not Spell.dbc.
+        let mut seen = [0usize; 26];
+        for (id, spell) in spells.iter() {
+            for description in [
+                spell.description.as_deref(),
+                spell.aura_description.as_deref(),
+            ]
+            .into_iter()
+            .flatten()
+            {
+                for (arm, token) in spell_data_tokens_in(description) {
+                    let expanded = substitute(token, spell, &c);
+                    assert_ne!(expanded, token, "spell {id} leaves {token} raw");
+                    seen[arm] += 1;
+                }
+            }
+        }
+        for &arm in b"bfiquv" {
+            assert!(
+                seen[usize::from(arm - b'a')] > 0,
+                "missing ${} in {seen:?}",
+                arm as char
+            );
+        }
+        assert!(
+            seen.iter().sum::<usize>() >= 50,
+            "too few shipped spell-data tokens: {seen:?}"
+        );
+    }
+
+    /// Isolate spell-data tokens, including a scale prefix, cross-spell id and one slot digit,
+    /// bounded as `substitute` bounds them. `$l`, `$g` and `$z` need other context.
+    fn spell_data_tokens_in(text: &str) -> Vec<(usize, &str)> {
+        let bytes = text.as_bytes();
+        let mut found = Vec::new();
+        for start in 0..bytes.len() {
+            if bytes[start] != b'$' {
+                continue;
+            }
+            let mut end = start + 1;
+            if matches!(bytes.get(end), Some(b'*' | b'/')) {
+                let Some(semi) = bytes[end..].iter().position(|&b| b == b';') else {
+                    continue;
+                };
+                end += semi + 1;
+            }
+            while bytes.get(end).is_some_and(u8::is_ascii_digit) {
+                end += 1;
+            }
+            let Some(letter) = bytes.get(end).copied().map(|b| b.to_ascii_lowercase()) else {
+                continue;
+            };
+            if !b"abdefhimnoqrstuvx".contains(&letter) {
+                continue;
+            }
+            end += 1;
+            if bytes.get(end).is_some_and(u8::is_ascii_digit) {
+                end += 1;
+            }
+            found.push((usize::from(letter - b'a'), &text[start..end]));
+        }
+        found
+    }
+
+    #[test]
+    fn spell_data_token_scan_keeps_scale_reference_and_slot() {
+        assert_eq!(
+            spell_data_tokens_in("Each jump is $*100;F1%, stacks $22959u times; $s1 is separate."),
+            vec![(5, "$*100;F1"), (20, "$22959u"), (18, "$s1")]
+        );
+    }
+
+    /// `$r` (`507d5b`) reads row 1 for an index at or below 1 and prints one decimal through
+    /// op 5; `$e` (`507f83`) prints one decimal through op 27; `$a` (`507c74`) truncates the
+    /// radius, applies op 6 and prints an integer, 0 without a row.
+    #[test]
+    fn r_e_and_a_follow_their_arms() {
+        let durations = SpellDurationCatalog::default();
+        let radii = SpellRadiusCatalog::from_rows(
+            [(
+                7,
+                crate::SpellRadius {
+                    radius: 8.5,
+                    per_level: 0.0,
+                    max: 8.5,
+                },
+            )]
+            .into(),
+        );
+        let range = |max| crate::SpellRange {
+            min: 0.0,
+            max,
+            flags: 0,
+        };
+        let ranges = SpellRangeCatalog::from_rows([(1, range(5.0)), (4, range(30.0))].into());
+        let mods = Mods(vec![(5, 0, 110), (27, 0, 150), (6, 2, 100)]);
+        let c = TokenContext {
+            ranges: Some(&ranges),
+            mods: Some(&mods),
+            ..ctx(&durations, &radii, &none_lookup)
+        };
+        let d = |range_index, radius| SpellDisplay {
+            range_index,
+            effect_radius_index: [radius, 0, 0],
+            effect_multiple_value: [2.0, 0.0, 0.0],
+            ..Default::default()
+        };
+        assert_eq!(substitute("$r", &d(4, 0), &c), "33.0");
+        assert_eq!(substitute("$r", &d(0, 0), &c), "5.5", "index 0 reads row 1");
+        assert_eq!(substitute("$r", &d(9, 0), &c), "0.0", "no row");
+        assert_eq!(substitute("$e1", &d(4, 0), &c), "3.0");
+        assert_eq!(substitute("$a1", &d(4, 7), &c), "10");
+        assert_eq!(substitute("$a1", &d(4, 3), &c), "0", "no row");
+    }
+
+    /// Whole within 0.001 of either neighbour, a near-ceiling value reading as the ceiling.
+    #[test]
+    fn a_bound_is_whole_within_a_thousandth() {
+        assert_eq!(whole(3.0), (3, true));
+        assert_eq!(whole(2.9995), (3, true));
+        assert_eq!(whole(3.0005), (3, true));
+        assert_eq!(whole(2.5), (2, false));
+        assert_eq!(whole(0.0), (0, true));
+    }
+
     #[test]
     fn a_dollar_before_a_multibyte_char_passes_through_on_the_char_boundary() {
         let durations = SpellDurationCatalog::default();
diff --git a/crates/benilla-formats/tests/composite_cost.rs b/crates/benilla-formats/tests/composite_cost.rs
new file mode 100644
index 00000000..545e56f0
--- /dev/null
+++ b/crates/benilla-formats/tests/composite_cost.rs
@@ -0,0 +1,129 @@
+//! What one body composite costs, on the real install: the naked body and a crowd of distinct
+//! tier-2 looks, each read, decoded and blitted in full, as a cache miss does, and what planning
+//! the same crowd costs.
+
+use std::time::{Duration, Instant};
+
+use benilla_formats::{load_item_display_catalog, open_chain, CharSections, ItemDisplay};
+
+/// Worn display ids by bodyslot − 2 (shirt, chest, belt, pants, boots, wrist, gloves, tabard):
+/// the tier-2 sets at their 1.12 displays, a linen shirt under the first.
+const SETS: [[u32; 8]; 9] = [
+    [10840, 33983, 33990, 33986, 33989, 33982, 33984, 0],
+    [0, 33650, 31110, 31115, 31111, 31127, 33651, 0],
+    [0, 33667, 33665, 33672, 34269, 33666, 33668, 0],
+    [0, 34081, 34078, 34084, 34083, 34079, 34082, 0],
+    [0, 33635, 33633, 33637, 33639, 33634, 33636, 0],
+    [0, 34014, 34011, 29857, 34015, 34012, 34013, 0],
+    [0, 34038, 34046, 34039, 34044, 34045, 34041, 0],
+    [0, 34047, 34053, 34049, 34055, 34052, 34051, 0],
+    [0, 30536, 30541, 30540, 30542, 30548, 34016, 0],
+];
+
+fn median(mut v: Vec<Duration>) -> Duration {
+    v.sort_unstable();
+    v[v.len() / 2]
+}
+
+#[test]
+#[ignore = "instrument: run by hand — cargo test --release -p benilla-formats --test composite_cost -- --ignored --nocapture"]
+fn one_composite_costs() {
+    let data = benilla_formats::wow_data_or_skip!();
+    let mut chain = open_chain(&data).expect("open chain");
+    let cs = CharSections::load(&mut chain).expect("CharSections");
+    let items = load_item_display_catalog(&mut chain).expect("ItemDisplayInfo");
+    let worn = |set: &[u32; 8]| -> [Option<&ItemDisplay>; 8] {
+        std::array::from_fn(|i| (set[i] != 0).then(|| items.get(set[i])).flatten())
+    };
+
+    // One look, over and over: the body's whole read-decode-blit, the OS file cache warm.
+    let naked = (0..20)
+        .map(|_| {
+            let t = Instant::now();
+            let atlas = cs
+                .composite_body(&mut chain, 1, 0, 0, 0, 0, 0, 0, [None; 8], None, false)
+                .expect("composite")
+                .expect("base row");
+            std::hint::black_box(atlas);
+            t.elapsed()
+        })
+        .collect::<Vec<_>>();
+    let geared = (0..20)
+        .map(|_| {
+            let t = Instant::now();
+            let atlas = cs
+                .composite_body(&mut chain, 1, 0, 0, 0, 0, 0, 0, worn(&SETS[0]), None, false)
+                .expect("composite")
+                .expect("base row");
+            std::hint::black_box(atlas);
+            t.elapsed()
+        })
+        .collect::<Vec<_>>();
+    println!(
+        "COMPOSITE naked human male: median {:.2} ms",
+        median(naked).as_secs_f64() * 1e3
+    );
+    println!(
+        "COMPOSITE tier-2 human male: median {:.2} ms",
+        median(geared).as_secs_f64() * 1e3
+    );
+
+    // A crowd of 40 distinct looks arriving together: eight races, both sexes, the nine sets.
+    let races = [1u8, 2, 3, 4, 5, 6, 7, 8];
+    let t = Instant::now();
+    let mut built = 0;
+    for i in 0..40usize {
+        let (race, sex) = (races[i % races.len()], (i / races.len() % 2) as u8);
+        let set = &SETS[i % SETS.len()];
+        if let Ok(Some(atlas)) = cs.composite_body(
+            &mut chain,
+            race,
+            sex,
+            0,
+            (i % 3) as u8,
+            0,
+            (i % 4) as u8,
+            0,
+            worn(set),
+            None,
+            false,
+        ) {
+            std::hint::black_box(atlas);
+            built += 1;
+        }
+    }
+    let crowd = t.elapsed();
+    println!(
+        "COMPOSITE crowd: {built} distinct geared looks in {:.1} ms ({:.2} ms each)",
+        crowd.as_secs_f64() * 1e3,
+        crowd.as_secs_f64() * 1e3 / built.max(1) as f64
+    );
+
+    // The same crowd's plans alone: the table lookups a body's first frame does before its
+    // composite leaves the thread.
+    let t = Instant::now();
+    let mut planned = 0;
+    for i in 0..40usize {
+        let (race, sex) = (races[i % races.len()], (i / races.len() % 2) as u8);
+        let set = &SETS[i % SETS.len()];
+        if let Some(plan) = cs.composite_plan(
+            race,
+            sex,
+            0,
+            (i % 3) as u8,
+            0,
+            (i % 4) as u8,
+            0,
+            worn(set),
+            None,
+            false,
+        ) {
+            std::hint::black_box(plan);
+            planned += 1;
+        }
+    }
+    println!(
+        "COMPOSITE crowd plans: {planned} in {:.3} ms",
+        t.elapsed().as_secs_f64() * 1e3
+    );
+}
diff --git a/crates/benilla-formats/tests/project_folder.rs b/crates/benilla-formats/tests/project_folder.rs
new file mode 100644
index 00000000..f3327cdf
--- /dev/null
+++ b/crates/benilla-formats/tests/project_folder.rs
@@ -0,0 +1,45 @@
+//! A launcher's recorded project folder is where a dev build looks for the install, in place of
+//! benilla's checkout, while the addon corpus stays benilla's. Recording is process-wide and every
+//! test resolves through it, so this one test has a file, and so a process, of its own.
+
+use std::path::Path;
+
+#[test]
+fn a_recorded_launcher_folder_is_where_a_dev_build_looks() {
+    let tmp = std::env::temp_dir().join(format!("benilla-project-{}", std::process::id()));
+    std::fs::create_dir_all(&tmp).unwrap();
+    // This process's own environment: `WOW_DATA=` would empty the ladder, and an override would
+    // move the corpus.
+    std::env::remove_var("WOW_DATA");
+    std::env::remove_var("BENILLA_ADDON_CORPUS");
+    let checkout = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .ancestors()
+        .nth(2)
+        .unwrap();
+
+    // A player build's stamp is empty and records nothing.
+    benilla_formats::set_project_folder("");
+    if cfg!(feature = "dev") {
+        assert_eq!(benilla_formats::project_folder(), Some(checkout));
+    }
+
+    benilla_formats::set_project_folder(tmp.to_str().unwrap());
+    benilla_formats::set_project_folder("/a/later/call/changes/nothing");
+    if cfg!(feature = "dev") {
+        assert_eq!(benilla_formats::project_folder(), Some(tmp.as_path()));
+        let c = benilla_formats::candidates();
+        assert_eq!(c.first(), Some(&tmp.join("WoW/Data")), "{c:?}");
+        assert!(
+            !c.contains(&checkout.join("WoW/Data")),
+            "benilla's checkout is still looked in for the install: {c:?}"
+        );
+        assert_eq!(
+            benilla_formats::addon_corpus_candidates(),
+            vec![checkout.join("wow-addons-vanilla")],
+            "the corpus is benilla's whoever the launcher is"
+        );
+    } else {
+        assert_eq!(benilla_formats::project_folder(), None);
+    }
+    std::fs::remove_dir_all(&tmp).ok();
+}
diff --git a/crates/benilla-mpq/src/lib.rs b/crates/benilla-mpq/src/lib.rs
index 3dbbb41f..90e03181 100644
--- a/crates/benilla-mpq/src/lib.rs
+++ b/crates/benilla-mpq/src/lib.rs
@@ -1,5 +1,6 @@
-//! A read-only MPQ reader for the 1.12.1 `Data/` chain: format V1/V2, every file `COMPRESS`-flagged
-//! and sectored, no encrypted or single-unit files, no PTCH patches. Anything else is a hard error.
+//! A read-only MPQ reader for the 1.12.1 `Data/` chain: format V1/V2, every file stored whole or
+//! `COMPRESS`-flagged and sectored, no encrypted or single-unit files, no PTCH patches. Anything
+//! else is a hard error.
 //!
 //! The patch archives carry delete markers (flag `0x02000000`, size 0): the path is deleted from
 //! the composite chain. [`Archive::contains`] reports one present and [`Archive::read_file`]
@@ -7,6 +8,7 @@
 //! stops there.
 //!
 //! [`Archive`] is a cheap `Arc` handle; each read opens its own file handle, so reads need no lock.
+//! [`Archive::open_file`] reads one file in place, a sector at a time, for a stream.
 //! Every allocation sized from a header count or a sector length is capped by the file's size, so
 //! a lying header fails with [`Error::Corrupt`].
 
@@ -197,6 +199,14 @@ impl Archive {
 
     /// Read and decompress a file by its internal path (`/` or `\`, case-insensitive).
     pub fn read_file(&self, name: &str) -> Result<Vec<u8>> {
+        self.open_file(name)?.read_all()
+    }
+
+    /// Open a file for reading in place: its own OS handle, its sectors decompressed one at a
+    /// time as they are read, so a long sound streams without the whole file read first, as the
+    /// reference's FMOD streams read the archive through the file callbacks it registers
+    /// (`FSOUND_File_SetCallbacks` at `0x7a45e4`).
+    pub fn open_file(&self, name: &str) -> Result<ArchiveFile> {
         let idx = &self.index;
         let block = idx.find(name).ok_or_else(|| Error::NotFound(name.into()))?;
 
@@ -215,7 +225,7 @@ impl Archive {
             return Err(Error::Unsupported(format!("single-unit file {name}")));
         }
 
-        let mut file = File::open(&idx.path)?;
+        let file = File::open(&idx.path)?;
         let file_pos = idx.archive_offset + block.file_pos as u64;
         let file_size = block.file_size as usize;
         let compressed = block.flags & (FLAG_COMPRESS | FLAG_IMPLODE) != 0;
@@ -224,6 +234,18 @@ impl Archive {
         let file_len = file.metadata()?.len();
         let avail = avail_from(file_len, file_pos);
 
+        let mut open = ArchiveFile {
+            file,
+            name: name.to_owned(),
+            base: file_pos,
+            size: file_size,
+            sector_size: idx.sector_size,
+            offsets: None,
+            implode_only,
+            avail,
+            pos: 0,
+            sector: None,
+        };
         if !compressed {
             // Stored: exactly `file_size` raw bytes, refused up front if the file cannot hold them.
             if capped(file_size, 1, avail) < file_size {
@@ -231,10 +253,7 @@ impl Archive {
                     "{name}: stored size ({file_size}) larger than the archive"
                 )));
             }
-            file.seek(SeekFrom::Start(file_pos))?;
-            let mut out = vec![0u8; file_size]; // proven <= avail above
-            file.read_exact(&mut out)?;
-            return Ok(out);
+            return Ok(open);
         }
 
         // Sectored: `sector_count + 1` offsets at `file_pos`, measured from it, so the patch
@@ -249,10 +268,10 @@ impl Archive {
                 "{name}: sector offset table ({otab_len} entries) larger than the archive"
             )));
         }
-        file.seek(SeekFrom::Start(file_pos))?;
+        open.file.seek(SeekFrom::Start(file_pos))?;
         let mut otab = vec![0u8; otab_cap * 4]; // == otab_len * 4, proven <= avail above
-        file.read_exact(&mut otab)?;
-        let offsets: Vec<u32> = otab
+        open.file.read_exact(&mut otab)?;
+        let offsets = otab
             .as_chunks::<4>()
             .0
             .iter()
@@ -261,46 +280,171 @@ impl Archive {
                     .ok_or_else(|| Error::Corrupt(format!("{name}: corrupt sector offset table")))
             })
             .collect::<Result<Vec<u32>>>()?;
+        open.offsets = Some(offsets);
+        Ok(open)
+    }
+}
 
-        let mut out = Vec::with_capacity(capped(file_size, 1, avail));
+/// A file opened in an archive ([`Archive::open_file`]): `Read + Seek` over its uncompressed
+/// bytes, holding the one decompressed sector under the read position.
+pub struct ArchiveFile {
+    file: File,
+    name: String,
+    /// The file's first byte in the archive file.
+    base: u64,
+    /// The uncompressed size, from the block table.
+    size: usize,
+    sector_size: usize,
+    /// The sector offset table, relative to `base`; `None` for a stored file.
+    offsets: Option<Vec<u32>>,
+    implode_only: bool,
+    /// Bytes from `base` to the archive's end: the cap on every length read from a header.
+    avail: usize,
+    /// The read position in the uncompressed file.
+    pos: u64,
+    /// The decompressed sector under `pos`, by index.
+    sector: Option<(usize, Vec<u8>)>,
+}
+
+impl ArchiveFile {
+    /// The uncompressed size.
+    pub fn size(&self) -> u64 {
+        self.size as u64
+    }
+
+    /// The whole file from its start, sector by sector.
+    fn read_all(mut self) -> Result<Vec<u8>> {
+        if self.offsets.is_none() {
+            self.file.seek(SeekFrom::Start(self.base))?;
+            let mut out = vec![0u8; self.size]; // proven <= avail by `open_file`
+            self.file.read_exact(&mut out)?;
+            return Ok(out);
+        }
+        let sector_count = self.size.div_ceil(self.sector_size);
+        let mut out = Vec::with_capacity(capped(self.size, 1, self.avail));
         for i in 0..sector_count {
-            let start = offsets[i] as u64;
-            let end = offsets[i + 1] as u64;
-            let comp_len = end
-                .checked_sub(start)
-                .ok_or_else(|| Error::Decompress(format!("{name}: sector {i} offsets reversed")))?
-                as usize;
-            let comp_cap = capped(comp_len, 1, avail);
-            if comp_cap < comp_len {
-                return Err(Error::Corrupt(format!(
-                    "{name}: sector {i} length ({comp_len}) larger than the archive"
-                )));
-            }
-            // Each earlier sector yielded at most its own `want` (`decompress` is bounded), so
-            // `out.len() <= file_size` and this cannot wrap.
-            let want = (file_size - out.len()).min(idx.sector_size); // last sector may be short
-            if comp_len == 0 {
-                return Err(Error::Corrupt(format!("{name}: sector {i} is empty")));
-            }
-
-            file.seek(SeekFrom::Start(file_pos + start))?;
-            let mut raw = vec![0u8; comp_len]; // proven <= avail above
-            file.read_exact(&mut raw)?;
-
-            if comp_len >= want {
-                // A sector that would not shrink is stored verbatim.
-                out.extend_from_slice(&raw[..want]);
-            } else if implode_only {
-                // IMPLODE sectors carry no method byte; 1.12.1 data has none.
-                out.extend_from_slice(&decompress(0x08, &raw, want, name)?);
-            } else {
-                // COMPRESS: the leading byte is the codec mask, the rest the payload.
-                let method = raw[0]; // non-empty: refused above
-                out.extend_from_slice(&decompress(method, &raw[1..], want, name)?);
-            }
+            out.extend_from_slice(&self.decode_sector(i)?);
         }
         Ok(out)
     }
+
+    /// Sector `i` of a sectored file, read and decompressed to exactly its share of the file:
+    /// the sector size, or the remainder for the last. One that inflates short is refused, since
+    /// every later byte would shift into the gap.
+    fn decode_sector(&mut self, i: usize) -> Result<Vec<u8>> {
+        let want = (self.size - i * self.sector_size).min(self.sector_size);
+        let name = &self.name;
+        let offsets = self.offsets.as_deref().unwrap_or_default();
+        let (Some(&start), Some(&end)) = (offsets.get(i), offsets.get(i + 1)) else {
+            return Err(Error::Corrupt(format!(
+                "{name}: sector {i} past the offset table"
+            )));
+        };
+        let comp_len = u64::from(end)
+            .checked_sub(u64::from(start))
+            .ok_or_else(|| Error::Decompress(format!("{name}: sector {i} offsets reversed")))?
+            as usize;
+        let comp_cap = capped(comp_len, 1, self.avail);
+        if comp_cap < comp_len {
+            return Err(Error::Corrupt(format!(
+                "{name}: sector {i} length ({comp_len}) larger than the archive"
+            )));
+        }
+        if comp_len == 0 {
+            return Err(Error::Corrupt(format!("{name}: sector {i} is empty")));
+        }
+
+        self.file
+            .seek(SeekFrom::Start(self.base + u64::from(start)))?;
+        let mut raw = vec![0u8; comp_len]; // proven <= avail above
+        self.file.read_exact(&mut raw)?;
+
+        let out = if comp_len >= want {
+            // A sector that would not shrink is stored verbatim.
+            raw.truncate(want);
+            raw
+        } else if self.implode_only {
+            // IMPLODE sectors carry no method byte; 1.12.1 data has none.
+            decompress(0x08, &raw, want, name)?
+        } else {
+            // COMPRESS: the leading byte is the codec mask, the rest the payload.
+            let method = raw[0]; // non-empty: refused above
+            decompress(method, &raw[1..], want, name)?
+        };
+        // `decompress` stops at `want`, so only a short sector is left to refuse.
+        if out.len() != want {
+            return Err(Error::Decompress(format!(
+                "{name}: sector {i} inflates to {} bytes, not {want}",
+                out.len()
+            )));
+        }
+        Ok(out)
+    }
+
+    /// Stored bytes at `pos` into `buf`, straight from the archive file.
+    fn read_stored(&mut self, buf: &mut [u8]) -> Result<usize> {
+        let n = buf.len().min(self.size - self.pos as usize);
+        self.file.seek(SeekFrom::Start(self.base + self.pos))?;
+        self.file.read_exact(&mut buf[..n])?;
+        Ok(n)
+    }
+
+    /// Sectored bytes at `pos` into `buf`, from the sector under it, decompressed on first touch.
+    fn read_sectored(&mut self, buf: &mut [u8]) -> Result<usize> {
+        let i = self.pos as usize / self.sector_size;
+        if self.sector.as_ref().is_none_or(|(at, _)| *at != i) {
+            let bytes = self.decode_sector(i)?;
+            self.sector = Some((i, bytes));
+        }
+        let sector = self
+            .sector
+            .as_ref()
+            .map(|(_, b)| b.as_slice())
+            .unwrap_or_default();
+        let off = self.pos as usize - i * self.sector_size;
+        let n = buf.len().min(sector.len() - off);
+        buf[..n].copy_from_slice(&sector[off..off + n]);
+        Ok(n)
+    }
+}
+
+impl Read for ArchiveFile {
+    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
+        if buf.is_empty() || self.pos >= self.size as u64 {
+            return Ok(0);
+        }
+        let n = if self.offsets.is_some() {
+            self.read_sectored(buf)
+        } else {
+            self.read_stored(buf)
+        }
+        .map_err(|e| match e {
+            Error::Io(e) => e,
+            other => io::Error::other(other),
+        })?;
+        self.pos += n as u64;
+        Ok(n)
+    }
+}
+
+impl Seek for ArchiveFile {
+    /// Moves the read position only; the sector under it is read by the next `read`. A position
+    /// past the end reads as EOF.
+    fn seek(&mut self, to: SeekFrom) -> io::Result<u64> {
+        let pos = match to {
+            SeekFrom::Start(p) => Some(p),
+            SeekFrom::End(d) => (self.size as u64).checked_add_signed(d),
+            SeekFrom::Current(d) => self.pos.checked_add_signed(d),
+        }
+        .ok_or_else(|| {
+            io::Error::new(
+                io::ErrorKind::InvalidInput,
+                format!("{}: seek before the start", self.name),
+            )
+        })?;
+        self.pos = pos;
+        Ok(pos)
+    }
 }
 
 impl Index {
@@ -668,4 +812,179 @@ mod tests {
         }
         let _ = std::fs::remove_file(&path);
     }
+
+    /// A sectored COMPRESS file as stored, 512-byte sectors (shift 0): a zlib sector where it
+    /// shrinks, the raw bytes where it would not, as the archive writer leaves them.
+    fn sectored(plain: &[u8]) -> Vec<u8> {
+        use flate2::{write::ZlibEncoder, Compression};
+        use std::io::Write;
+        let sectors: Vec<Vec<u8>> = plain
+            .chunks(512)
+            .map(|raw| {
+                let mut e = ZlibEncoder::new(vec![0x02u8], Compression::default());
+                e.write_all(raw).unwrap();
+                let z = e.finish().unwrap();
+                if z.len() < raw.len() {
+                    z
+                } else {
+                    raw.to_vec()
+                }
+            })
+            .collect();
+        let mut at = (sectors.len() as u32 + 1) * 4;
+        let mut out = at.to_le_bytes().to_vec();
+        for s in &sectors {
+            at += s.len() as u32;
+            out.extend_from_slice(&at.to_le_bytes());
+        }
+        for s in &sectors {
+            out.extend_from_slice(s);
+        }
+        out
+    }
+
+    /// Three sectors: a compressible run, an incompressible one stored verbatim, and a short tail.
+    fn three_sector_plain() -> Vec<u8> {
+        let mut rng = 0x1234_5678u32;
+        (0..1300u32)
+            .map(|i| match i {
+                0..512 => (i / 7) as u8,
+                512..1024 => {
+                    rng ^= rng << 13;
+                    rng ^= rng >> 17;
+                    rng ^= rng << 5;
+                    rng as u8
+                }
+                _ => (i % 3) as u8,
+            })
+            .collect()
+    }
+
+    #[test]
+    fn an_open_file_reads_what_read_file_reads_from_any_position() {
+        let plain = three_sector_plain();
+        let stored = sectored(&plain);
+        let (arc, path) = open_temp_kept(
+            "open_file",
+            &archive_with_one_block(
+                "Sound\\bed.wav",
+                FLAG_EXISTS | FLAG_COMPRESS,
+                &stored,
+                plain.len() as u32,
+            ),
+        );
+        assert_eq!(arc.read_file("Sound\\bed.wav").unwrap(), plain);
+
+        let mut f = arc.open_file("Sound\\bed.wav").unwrap();
+        assert_eq!(f.size(), plain.len() as u64);
+        let mut all = Vec::new();
+        f.read_to_end(&mut all).unwrap();
+        assert_eq!(all, plain, "a sequential read is the whole file");
+
+        // Reads straddling each sector boundary, backwards and forwards.
+        for (at, len) in [
+            (1000, 100),
+            (500, 30),
+            (0, 1300),
+            (1290, 64),
+            (511, 2),
+            (1023, 1),
+        ] {
+            f.seek(SeekFrom::Start(at)).unwrap();
+            let mut got = vec![0u8; len];
+            let n = {
+                let mut n = 0;
+                while n < len {
+                    match f.read(&mut got[n..]).unwrap() {
+                        0 => break,
+                        k => n += k,
+                    }
+                }
+                n
+            };
+            let end = (at as usize + len).min(plain.len());
+            assert_eq!(&got[..n], &plain[at as usize..end], "read {len} at {at}");
+        }
+
+        assert_eq!(f.seek(SeekFrom::End(-4)).unwrap(), 1296);
+        assert_eq!(f.seek(SeekFrom::Current(10)).unwrap(), 1306);
+        assert_eq!(
+            f.read(&mut [0u8; 8]).unwrap(),
+            0,
+            "past the end reads as EOF"
+        );
+        assert!(
+            f.seek(SeekFrom::Current(-2000)).is_err(),
+            "before the start"
+        );
+        let _ = std::fs::remove_file(&path);
+    }
+
+    #[test]
+    fn an_open_stored_file_reads_in_place() {
+        let (arc, path) = open_temp_kept(
+            "open_stored",
+            &archive_with_one_entry("a.txt", FLAG_EXISTS, b"hello world"),
+        );
+        let mut f = arc.open_file("a.txt").unwrap();
+        f.seek(SeekFrom::Start(6)).unwrap();
+        let mut got = String::new();
+        f.read_to_string(&mut got).unwrap();
+        assert_eq!(got, "world");
+        let _ = std::fs::remove_file(&path);
+    }
+
+    /// A sector that inflates short would shift every later byte into the gap: a whole read and
+    /// a stream both refuse it.
+    #[test]
+    fn a_sector_that_inflates_short_is_refused() {
+        let plain = three_sector_plain();
+        // Sector 0 claims 512 bytes but its stream holds 500.
+        let mut short = plain.clone();
+        short.drain(500..512);
+        let mut stored = sectored(&short[..500]);
+        let tail = sectored(&plain[512..]);
+        // Splice: sector 0 from the short build, sectors 1 and 2 from the full one.
+        let (s0_start, s0_end) = (u32_at(&stored, 0), u32_at(&stored, 4));
+        let s0 = stored[s0_start as usize..s0_end as usize].to_vec();
+        let (t0, t1, t2) = (u32_at(&tail, 0), u32_at(&tail, 4), u32_at(&tail, 8));
+        stored = Vec::new();
+        let base = 16u32;
+        for off in [
+            base,
+            base + s0.len() as u32,
+            base + s0.len() as u32 + (t1 - t0),
+            base + s0.len() as u32 + (t2 - t0),
+        ] {
+            stored.extend_from_slice(&off.to_le_bytes());
+        }
+        stored.extend_from_slice(&s0);
+        stored.extend_from_slice(&tail[t0 as usize..]);
+        let (arc, path) = open_temp_kept(
+            "short_sector",
+            &archive_with_one_block(
+                "a.bin",
+                FLAG_EXISTS | FLAG_COMPRESS,
+                &stored,
+                plain.len() as u32,
+            ),
+        );
+        match arc.read_file("a.bin") {
+            Err(Error::Decompress(e)) => {
+                assert!(e.contains("sector 0 inflates to 500 bytes, not 512"), "{e}")
+            }
+            other => panic!("expected Error::Decompress for a short sector, got {other:?}"),
+        }
+        let mut f = arc.open_file("a.bin").unwrap();
+        let err = f.read(&mut [0u8; 16]).unwrap_err().to_string();
+        assert!(
+            err.contains("sector 0 inflates to 500 bytes, not 512"),
+            "{err}"
+        );
+        let _ = std::fs::remove_file(&path);
+    }
+
+    fn u32_at(b: &[u8], at: usize) -> u32 {
+        u32::from_le_bytes([b[at], b[at + 1], b[at + 2], b[at + 3]])
+    }
 }
diff --git a/crates/benilla-protocol/src/messages/group.rs b/crates/benilla-protocol/src/messages/group.rs
index e0ef1756..9a20c57f 100644
--- a/crates/benilla-protocol/src/messages/group.rs
+++ b/crates/benilla-protocol/src/messages/group.rs
@@ -57,6 +57,16 @@ pub struct GroupMemberEntry {
     pub flags: u8,
 }
 
+impl GroupMemberEntry {
+    /// Whether the row's status byte marks the member online for the record write: a non-zero byte,
+    /// the client's own test for a party slot (`0x5e6c3b`) and a raid row (`0x4ba951`), where bit 0
+    /// alone is not asked. vmangos sends 0 for an absent member and a byte with bit 0 set for a
+    /// present one (`Group/Group.cpp:45-63`), so the two tests agree on its lists.
+    pub fn listed_online(&self) -> bool {
+        self.status != 0
+    }
+}
+
 /// The loot tail `SMSG_GROUP_LIST` carries only when it lists members (`Group.cpp:170-179`);
 /// `threshold` is an item quality, 2 to 4 in practice.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -164,10 +174,12 @@ pub struct PartyMemberStatsInfo {
     pub zone: Option<u16>,
     /// Raw WoW x and y, truncated to `i16` by the server (`GroupHandler.cpp:625`).
     pub position: Option<(i16, i16)>,
-    /// Active buff spell ids in slot order; the wire's `u32` slot mask is not kept.
-    pub auras: Option<Vec<u16>>,
-    /// Active debuff spell ids, likewise, from a `u16` slot mask.
-    pub auras_negative: Option<Vec<u16>>,
+    /// Buff slots 0..31 as `(slot, spell id)`, one per set bit of the wire's `u32` slot mask, in
+    /// slot order. A delta's mask names the slots that changed, a 0 id clearing one
+    /// (`Player::GetAuraUpdateMask`), so the record is patched slot by slot ([`patch_auras`]).
+    pub auras: Option<Vec<(u8, u16)>>,
+    /// Debuff slots, likewise, from a `u16` mask; the slot is absolute, 32..47.
+    pub auras_negative: Option<Vec<(u8, u16)>>,
     pub pet_guid: Option<u64>,
     pub pet_name: Option<String>,
     pub pet_model_id: Option<u16>,
@@ -176,8 +188,26 @@ pub struct PartyMemberStatsInfo {
     pub pet_power_type: Option<u8>,
     pub pet_cur_power: Option<u16>,
     pub pet_max_power: Option<u16>,
-    pub pet_auras: Option<Vec<u16>>,
-    pub pet_auras_negative: Option<Vec<u16>>,
+    /// The pet's buff and debuff slots, as [`Self::auras`] and [`Self::auras_negative`].
+    pub pet_auras: Option<Vec<(u8, u16)>>,
+    pub pet_auras_negative: Option<Vec<(u8, u16)>>,
+}
+
+/// Apply one aura-block field to a record's (`0x5e52d0`-`0x5e52f8`): each named slot takes its
+/// id, the other slots keep theirs, and a 0 empties the slot. The record keeps the occupied slots
+/// in ascending order, the order `UnitBuff`'s roster walk reads them in (`0x519780`).
+pub fn patch_auras(record: &mut Option<Vec<(u8, u16)>>, patch: &[(u8, u16)]) {
+    let slots = record.get_or_insert_with(Vec::new);
+    for &(slot, spell) in patch {
+        match slots.binary_search_by_key(&slot, |&(s, _)| s) {
+            Ok(i) if spell == 0 => {
+                slots.remove(i);
+            }
+            Ok(i) => slots[i].1 = spell,
+            Err(i) if spell != 0 => slots.insert(i, (slot, spell)),
+            Err(_) => {}
+        }
+    }
 }
 
 impl PartyMemberStatsInfo {
@@ -194,13 +224,44 @@ impl PartyMemberStatsInfo {
         }
     }
 
+    /// The record's online bit (`[rec+8] & 1`), the bit the readers test (`0x4e8227`, `0x4e816b`,
+    /// `0x4e8884`, `0x519741`, `UnitIsConnected`'s `0x517dd3`). A record with no status yet reads
+    /// as the zeroed byte of a fresh one, offline.
+    pub fn is_online(&self) -> bool {
+        self.status.unwrap_or(0) & member_status::ONLINE != 0
+    }
+
+    /// Set or clear the record's online bit (`[rec+8] & 1`), the other bits of its status byte as
+    /// they were: the write `SMSG_GROUP_LIST` makes to a member it lists, from that row's status
+    /// (`0x4e8361`-`0x4e837b`, raid `0x4ba947`-`0x4ba960`). A record with no status yet reads as
+    /// the zeroed byte of a fresh one.
+    pub fn set_online(&mut self, online: bool) {
+        let status = self.status.unwrap_or(0);
+        self.status = Some(if online {
+            status | member_status::ONLINE
+        } else {
+            status & !member_status::ONLINE
+        });
+    }
+
     /// Snapshot a member's live descriptor as the 1.12 client does (`0x5f0880`) when the member's
     /// object leaves view, just before the stats request, so the frame never reads 0/0. Values are
     /// raw; [`Self::shown_power`] divides at the read. AFK and DND are cleared, as in the client.
+    /// `pet` is the object of the member's pet guid ([`ObjectFields::unit_pet_guid`]) when held:
+    /// its block is copied, and without one the pet block is emptied (`0x5f0a1f`-`0x5f0b72`).
+    /// `pet_name` is that pet's cached name (`0x609210`, copied into `+0x88` at `0x5f0a70`); a
+    /// pet whose name the cache does not hold yet keeps the name the record had.
     ///
     /// Deviation: zone and position are kept, not set to the viewer's zone and the object's
-    /// position, and the aura and pet blocks are not copied, because nothing in benilla reads them.
-    pub fn snapshot_descriptor(&mut self, fields: &crate::messages::update_object::ObjectFields) {
+    /// position, because nothing in benilla reads them.
+    ///
+    /// [`ObjectFields::unit_pet_guid`]: crate::messages::update_object::ObjectFields::unit_pet_guid
+    pub fn snapshot_descriptor(
+        &mut self,
+        fields: &crate::messages::update_object::ObjectFields,
+        pet: Option<&crate::messages::update_object::ObjectFields>,
+        pet_name: Option<&str>,
+    ) {
         let mut status = member_status::ONLINE;
         if fields.player_is_ghost() {
             status |= member_status::GHOST;
@@ -226,6 +287,42 @@ impl PartyMemberStatsInfo {
         self.cur_power = Some(fields.unit_power(power_type).unwrap_or(0) as u16);
         self.max_power = Some(fields.unit_max_power(power_type).unwrap_or(0) as u16);
         self.level = Some(fields.unit_level().unwrap_or(0) as u16);
+        let (buffs, debuffs) = snapshot_aura_block(fields);
+        self.auras = Some(buffs);
+        self.auras_negative = Some(debuffs);
+
+        let pet_guid = fields.unit_pet_guid();
+        match pet_guid.zip(pet) {
+            Some((guid, pet)) => {
+                let power_type = pet.unit_power_type();
+                self.pet_guid = Some(guid);
+                if let Some(name) = pet_name {
+                    self.pet_name = Some(name.to_string());
+                }
+                self.pet_model_id = Some(pet.unit_displayid().unwrap_or(0) as u16);
+                self.pet_cur_hp = Some(pet.unit_health().unwrap_or(0) as u16);
+                self.pet_max_hp = Some(pet.unit_max_health().unwrap_or(0) as u16);
+                self.pet_power_type = Some(power_type);
+                self.pet_cur_power = Some(pet.unit_power(power_type).unwrap_or(0) as u16);
+                self.pet_max_power = Some(pet.unit_max_power(power_type).unwrap_or(0) as u16);
+                let (buffs, debuffs) = snapshot_aura_block(pet);
+                self.pet_auras = Some(buffs);
+                self.pet_auras_negative = Some(debuffs);
+            }
+            // No pet object: the block is zero-filled (`0x5f0a0f`), its guid included.
+            None => {
+                self.pet_guid = None;
+                self.pet_name = None;
+                self.pet_model_id = None;
+                self.pet_cur_hp = None;
+                self.pet_max_hp = None;
+                self.pet_power_type = None;
+                self.pet_cur_power = None;
+                self.pet_max_power = None;
+                self.pet_auras = None;
+                self.pet_auras_negative = None;
+            }
+        }
     }
 
     /// `UnitPowerType` from the record, 0 when it has none (the binding's miss value).
@@ -245,17 +342,60 @@ impl PartyMemberStatsInfo {
         u32::from(self.max_power.unwrap_or(0))
             / power_display_scale(u32::from(self.shown_power_type()))
     }
+
+    /// `UnitPowerType` from the pet block (`+0xd8`, `0x5179d2`'s pet leg), 0 when it has none.
+    pub fn shown_pet_power_type(&self) -> u8 {
+        self.pet_power_type.unwrap_or(0)
+    }
+
+    /// `UnitMana` from the pet block (`+0xe0`): the stored power divided by
+    /// [`power_display_scale`] of the pet's own power type, as for a live unit.
+    pub fn shown_pet_power(&self) -> u32 {
+        u32::from(self.pet_cur_power.unwrap_or(0))
+            / power_display_scale(u32::from(self.shown_pet_power_type()))
+    }
+
+    /// `UnitManaMax` from the pet block (`+0xe2`), the same divide.
+    pub fn shown_pet_max_power(&self) -> u32 {
+        u32::from(self.pet_max_power.unwrap_or(0))
+            / power_display_scale(u32::from(self.shown_pet_power_type()))
+    }
 }
 
-/// One `u16` spell id per set bit of `mask`, in bit order (`GroupHandler.cpp:627-648`).
-fn read_aura_spells(r: &mut impl Read, mask: u32, bits: u32) -> io::Result<Vec<u16>> {
-    let mut spells = Vec::new();
+/// `(slot, spell id)` pairs of one aura block, as [`PartyMemberStatsInfo::auras`] holds them.
+type AuraSlots = Vec<(u8, u16)>;
+
+/// A live descriptor's aura block as the snapshot copies it (`0x5f098d`-`0x5f09f2`): a slot is
+/// kept when its id is set and its `AURAFLAGS` nibble has an effect bit (`test al,0xe`), the test
+/// [`ObjectFields::unit_auras`] makes; the record holds each id's low word.
+///
+/// [`ObjectFields::unit_auras`]: crate::messages::update_object::ObjectFields::unit_auras
+fn snapshot_aura_block(
+    fields: &crate::messages::update_object::ObjectFields,
+) -> (AuraSlots, AuraSlots) {
+    use crate::messages::update_object::UNIT_AURA_POSITIVE_SLOTS;
+    fields
+        .unit_auras()
+        .map(|a| (a.slot, a.spell_id as u16))
+        .filter(|&(_, id)| id != 0)
+        .partition(|&(slot, _)| slot < UNIT_AURA_POSITIVE_SLOTS)
+}
+
+/// One `(slot, spell id)` per set bit of `mask`, in bit order, the slot counted from `first`
+/// (`GroupHandler.cpp:627-648`; the client's reads, `0x5e52d0`-`0x5e52f8`).
+fn read_aura_slots(
+    r: &mut impl Read,
+    mask: u32,
+    first: u8,
+    bits: u8,
+) -> io::Result<Vec<(u8, u16)>> {
+    let mut slots = Vec::new();
     for bit in 0..bits {
         if mask & (1 << bit) != 0 {
-            spells.push(read_u16_le(r)?);
+            slots.push((first + bit, read_u16_le(r)?));
         }
     }
-    Ok(spells)
+    Ok(slots)
 }
 
 /// Read `SMSG_PARTY_MEMBER_STATS` or `_FULL`; the guid is packed (`GroupHandler.cpp:593`).
@@ -297,11 +437,11 @@ pub(super) fn read_party_member_stats(
     }
     if mask & party_member_mask::AURAS != 0 {
         let pos_mask = read_u32_le(r)?;
-        info.auras = Some(read_aura_spells(r, pos_mask, 32)?);
+        info.auras = Some(read_aura_slots(r, pos_mask, 0, 32)?);
     }
     if mask & party_member_mask::AURAS_NEGATIVE != 0 {
         let neg_mask = u32::from(read_u16_le(r)?);
-        info.auras_negative = Some(read_aura_spells(r, neg_mask, 16)?);
+        info.auras_negative = Some(read_aura_slots(r, neg_mask, 32, 16)?);
     }
     if mask & party_member_mask::PET_GUID != 0 {
         info.pet_guid = Some(read_u64_le(r)?);
@@ -329,11 +469,11 @@ pub(super) fn read_party_member_stats(
     }
     if mask & party_member_mask::PET_AURAS != 0 {
         let pos_mask = read_u32_le(r)?;
-        info.pet_auras = Some(read_aura_spells(r, pos_mask, 32)?);
+        info.pet_auras = Some(read_aura_slots(r, pos_mask, 0, 32)?);
     }
     if mask & party_member_mask::PET_AURAS_NEGATIVE != 0 {
         let neg_mask = u32::from(read_u16_le(r)?);
-        info.pet_auras_negative = Some(read_aura_spells(r, neg_mask, 16)?);
+        info.pet_auras_negative = Some(read_aura_slots(r, neg_mask, 32, 16)?);
     }
     Ok((guid, info))
 }
diff --git a/crates/benilla-protocol/src/messages/mod.rs b/crates/benilla-protocol/src/messages/mod.rs
index e0814a6a..b10ed6d4 100644
--- a/crates/benilla-protocol/src/messages/mod.rs
+++ b/crates/benilla-protocol/src/messages/mod.rs
@@ -124,10 +124,10 @@ pub use group::{
     group_accept, group_assistant_leader, group_change_sub_group, group_decline, group_disband,
     group_invite, group_raid_convert, group_set_leader, group_swap_sub_group, group_uninvite,
     group_uninvite_guid, loot_method, member_status, minimap_ping, party_member_mask,
-    party_operation, party_result, raid_target_request, raid_target_set, ready_check_answer,
-    ready_check_start, request_party_member_stats, request_raid_info, GroupLootInfo,
-    GroupMemberEntry, PartyMemberStatsInfo, RaidInstanceEntry, RaidTargetUpdate, ReadyCheck,
-    GROUP_MEMBER_ASSISTANT,
+    party_operation, party_result, patch_auras, raid_target_request, raid_target_set,
+    ready_check_answer, ready_check_start, request_party_member_stats, request_raid_info,
+    GroupLootInfo, GroupMemberEntry, PartyMemberStatsInfo, RaidInstanceEntry, RaidTargetUpdate,
+    ReadyCheck, GROUP_MEMBER_ASSISTANT,
 };
 pub use guild::{
     guild_accept, guild_add_rank, guild_command, guild_command_error, guild_create, guild_decline,
diff --git a/crates/benilla-protocol/src/messages/opcode.rs b/crates/benilla-protocol/src/messages/opcode.rs
index 70e42f78..e5245d52 100644
--- a/crates/benilla-protocol/src/messages/opcode.rs
+++ b/crates/benilla-protocol/src/messages/opcode.rs
@@ -40,6 +40,8 @@ pub const SMSG_UPDATE_OBJECT: u16 = 0x00A9;
 pub const SMSG_DESTROY_OBJECT: u16 = 0x00AA;
 // Cinematics: a first login's race intro, or a type-13 GameObject camera. Until the COMPLETE ack,
 // vmangos sees from the camera and despawns all around the body (`Player::UpdateCinematic`).
+/// Lua's `OpeningCinematic()` (`0x48c8c0`); empty body. vmangos does not handle it.
+pub const CMSG_OPENING_CINEMATIC: u16 = 0x00F9;
 pub const SMSG_TRIGGER_CINEMATIC: u16 = 0x00FA;
 /// The next camera of a multi-camera `CinematicSequences` row began; empty body (`0x48efe0`).
 pub const CMSG_NEXT_CINEMATIC_CAMERA: u16 = 0x00FB;
diff --git a/crates/benilla-protocol/src/messages/update_object/fields/mod.rs b/crates/benilla-protocol/src/messages/update_object/fields/mod.rs
index a9d5a74c..79d4fa67 100644
--- a/crates/benilla-protocol/src/messages/update_object/fields/mod.rs
+++ b/crates/benilla-protocol/src/messages/update_object/fields/mod.rs
@@ -33,6 +33,8 @@ pub const FIELD_CORPSE_DYNAMIC_FLAGS: u16 = 36;
 // bytes 0xa0, 0x1f0, 0x224 and 0x234.
 /// The unit's target; the client turns an idle unit to face it, and no packet carries that facing.
 const FIELD_UNIT_TARGET: u16 = 16;
+/// The unit this one charms (`UpdateFields_1_12_1.h:41`), descriptor byte 0.
+const FIELD_UNIT_CHARM: u16 = 6;
 /// The unit this one summoned (`UpdateFields_1_12_1.h:42`); on us, the `"pet"` unit. The pet bar
 /// reads its guid off `SMSG_PET_SPELLS`, so the two can disagree briefly around a summon.
 const FIELD_UNIT_SUMMON: u16 = 8;
@@ -71,6 +73,7 @@ const FIELD_UNIT_AURASTATE: u16 = 125;
 const FIELD_UNIT_BOUNDINGRADIUS: u16 = 129;
 const FIELD_UNIT_COMBATREACH: u16 = 130;
 const FIELD_UNIT_BASE_MANA: u16 = 162;
+const FIELD_UNIT_BASE_HEALTH: u16 = 163;
 const FIELD_UNIT_DISPLAYID: u16 = 131;
 /// The unshifted appearance, untouched by forms, morphs and polymorph (`UpdateFields_1_12_1.h:77`).
 /// The client sizes the mover collision box from it (`0x60b270`), so a shapeshift keeps the box.
diff --git a/crates/benilla-protocol/src/messages/update_object/fields/tests.rs b/crates/benilla-protocol/src/messages/update_object/fields/tests.rs
index 74984735..0b3cd3f1 100644
--- a/crates/benilla-protocol/src/messages/update_object/fields/tests.rs
+++ b/crates/benilla-protocol/src/messages/update_object/fields/tests.rs
@@ -889,3 +889,12 @@ fn rage_and_happiness_divide_for_display_but_not_for_the_raw_readers() {
     assert_eq!(feigning_warrior.unit_shown_power(RAGE), Some(0));
     assert_eq!(feigning_warrior.unit_shown_max_power(RAGE), Some(100));
 }
+
+/// `UNIT_FIELD_BASE_MANA` and `UNIT_FIELD_BASE_HEALTH` are fields 162 and 163
+/// (`UpdateFields_1_12_1.h:101-102`), the unit block's `+0x270` and `+0x274` `0x612c50` reads.
+#[test]
+fn base_mana_and_base_health_read_fields_162_and_163() {
+    let unit = ObjectFields::from_pairs(&[(162, 1500), (163, 1689)]);
+    assert_eq!(unit.unit_base_mana(), Some(1500));
+    assert_eq!(unit.unit_base_health(), Some(1689));
+}
diff --git a/crates/benilla-protocol/src/messages/update_object/fields/unit.rs b/crates/benilla-protocol/src/messages/update_object/fields/unit.rs
index 1ce69315..d1a772ca 100644
--- a/crates/benilla-protocol/src/messages/update_object/fields/unit.rs
+++ b/crates/benilla-protocol/src/messages/update_object/fields/unit.rs
@@ -67,6 +67,15 @@ impl ObjectFields {
     pub fn unit_summon(&self) -> Option<u64> {
         self.get_guid(FIELD_UNIT_SUMMON).filter(|&g| g != 0)
     }
+    /// `UNIT_FIELD_CHARM`: the unit this one charms.
+    pub fn unit_charm(&self) -> Option<u64> {
+        self.get_guid(FIELD_UNIT_CHARM).filter(|&g| g != 0)
+    }
+    /// A player's pet as the client reads it off the descriptor: `CHARM` if set, else `SUMMON`
+    /// (`partypetN`'s `0x4e8204`-`0x4e821a`, the party snapshot's `0x5f0a25`-`0x5f0a39`).
+    pub fn unit_pet_guid(&self) -> Option<u64> {
+        self.unit_charm().or_else(|| self.unit_summon())
+    }
     /// `UNIT_FIELD_SUMMONEDBY`: the summoner of a pet, guardian or totem.
     pub fn unit_summoned_by(&self) -> Option<u64> {
         self.get_guid(FIELD_UNIT_SUMMONEDBY).filter(|&g| g != 0)
@@ -259,6 +268,10 @@ impl ObjectFields {
     pub fn unit_base_mana(&self) -> Option<u32> {
         self.get_u32(FIELD_UNIT_BASE_MANA)
     }
+    /// `UNIT_FIELD_BASE_HEALTH` (field 163, owner only): the basis for percentage health costs.
+    pub fn unit_base_health(&self) -> Option<u32> {
+        self.get_u32(FIELD_UNIT_BASE_HEALTH)
+    }
     /// `UNIT_FIELD_FACTIONTEMPLATE` (public, `+0x74`): the `FactionTemplate.dbc` row reactions use.
     pub fn unit_faction_template(&self) -> Option<u32> {
         self.get_u32(FIELD_UNIT_FACTIONTEMPLATE)
diff --git a/crates/benilla-protocol/src/world/writer/chat.rs b/crates/benilla-protocol/src/world/writer/chat.rs
index d059e147..ac101d82 100644
--- a/crates/benilla-protocol/src/world/writer/chat.rs
+++ b/crates/benilla-protocol/src/world/writer/chat.rs
@@ -1,5 +1,6 @@
-//! The chat sends. Chat speaks [`WorldWriter::chat_language`]: vmangos drops `Universal` from
-//! clients and any tongue the character does not know.
+//! The chat sends. A line speaks the language `SendChatMessage` named, else
+//! [`WorldWriter::chat_language`]: vmangos drops `Universal` outside AFK and DND
+//! (`ChatHandler.cpp:105`) and any tongue the character does not know (`:175`).
 
 use anyhow::Result;
 
@@ -16,120 +17,18 @@ impl WorldWriter {
         )
     }
 
-    /// Send a `/yell` line (`CHAT_MSG_YELL`, `SharedDefines.h:1199`).
-    pub fn send_yell(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_YELL, self.chat_language, message),
-        )
-    }
-
-    /// Send a custom `/emote` line (`CHAT_MSG_EMOTE`), shown verbatim as `"PlayerName <text>"`.
-    pub fn send_emote_chat(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_EMOTE, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/whisper` line; the body carries the name before the message (`Chat.cpp:3-12`).
-    pub fn send_whisper(&mut self, target: &str, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat_whisper(self.chat_language, target, message),
-        )
-    }
-
-    /// Send a `/p` party line, dropped silently when ungrouped (`ChatHandler.cpp:472-493`).
-    pub fn send_party(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_PARTY, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/ra` raid line (`CHAT_MSG_RAID`); needs a raid (`ChatHandler.cpp:514-536`).
-    pub fn send_raid(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_RAID, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/g` guild line (`CHAT_MSG_GUILD`); needs a guild (`ChatHandler.cpp:494-503`).
-    pub fn send_guild(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_GUILD, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/o` officer line (`CHAT_MSG_OFFICER`); needs a guild (`ChatHandler.cpp:504-513`).
-    pub fn send_officer(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_OFFICER, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/rl` raid-leader line, leader only (`ChatHandler.cpp:538-559`).
-    pub fn send_raid_leader(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_RAID_LEADER, self.chat_language, message),
-        )
-    }
-
-    /// Send a `/rw` raid warning, leader or assistant only (`ChatHandler.cpp:561-576`).
-    pub fn send_raid_warning(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(
-                messages::CHAT_TYPE_RAID_WARNING,
-                self.chat_language,
-                message,
-            ),
-        )
-    }
-
-    /// Send a battleground line; needs a battleground group (`ChatHandler.cpp:579-593`).
-    pub fn send_battleground(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(
-                messages::CHAT_TYPE_BATTLEGROUND,
-                self.chat_language,
-                message,
-            ),
-        )
-    }
-
-    /// Send a battleground-leader line, leader only (`ChatHandler.cpp:595-609`).
-    pub fn send_battleground_leader(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(
-                messages::CHAT_TYPE_BATTLEGROUND_LEADER,
-                self.chat_language,
-                message,
-            ),
-        )
-    }
-
-    /// Toggle AFK, `message` the auto-reply if any; it clears DND (`ChatHandler.cpp:611-630`).
-    pub fn send_afk(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_AFK, self.chat_language, message),
-        )
-    }
-
-    /// Toggle DND (`CHAT_MSG_DND`), which clears AFK (`ChatHandler.cpp:632-648`).
-    pub fn send_dnd(&mut self, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat(messages::CHAT_TYPE_DND, self.chat_language, message),
-        )
+    /// Send a chat line of any `ChatMsg` type, as the reference's generic builder writes it
+    /// (`0x49f6c3`-`0x49f72a`). `language` is the `Languages.dbc` id `SendChatMessage` resolved;
+    /// `None` is the character's own tongue, [`WorldWriter::chat_language`].
+    pub fn send_message_chat(
+        &mut self,
+        chat_type: u32,
+        language: Option<u32>,
+        target: Option<&str>,
+        message: &str,
+    ) -> Result<()> {
+        let body = message_chat_body(self.chat_language, chat_type, language, target, message);
+        self.send(opcode::CMSG_MESSAGECHAT, &body)
     }
 
     /// Send an addon message (`SendAddonMessage`): `text` is the caller's composed `prefix` TAB
@@ -143,14 +42,6 @@ impl WorldWriter {
         )
     }
 
-    /// Send a channel line by name, dropped unless we are on it (`ChatHandler.cpp:255-327`).
-    pub fn send_channel(&mut self, channel: &str, message: &str) -> Result<()> {
-        self.send(
-            opcode::CMSG_MESSAGECHAT,
-            &messages::messagechat_channel(self.chat_language, channel, message),
-        )
-    }
-
     /// Tell the server we ignore `guid`; that player gets a `CHAT_MSG_IGNORED` notice.
     pub fn chat_ignored(&mut self, guid: u64) -> Result<()> {
         self.send(opcode::CMSG_CHAT_IGNORED, &messages::full_guid(guid))
@@ -174,3 +65,58 @@ impl WorldWriter {
         )
     }
 }
+
+/// The `CMSG_MESSAGECHAT` body: type, language (`0x49f6f9`), the target cstring only for a whisper
+/// or a channel (`0x49f701`-`0x49f712`, types `6` and `0xe`), then the text. `speaker` is the
+/// language a send that names none carries.
+fn message_chat_body(
+    speaker: u32,
+    chat_type: u32,
+    language: Option<u32>,
+    target: Option<&str>,
+    message: &str,
+) -> Vec<u8> {
+    let target = matches!(
+        chat_type,
+        messages::CHAT_TYPE_WHISPER | messages::CHAT_TYPE_CHANNEL
+    )
+    .then(|| target.unwrap_or_default());
+    messages::messagechat_kind(chat_type, language.unwrap_or(speaker), target, message)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn a_named_language_lands_in_the_body() {
+        // A Night Elf's `SendChatMessage("hi", "SAY", "Darnassian")`: type 0, language 2.
+        assert_eq!(
+            message_chat_body(7, messages::CHAT_TYPE_SAY, Some(2), None, "hi"),
+            [0, 0, 0, 0, 2, 0, 0, 0, b'h', b'i', 0]
+        );
+        // No language named: the speaker's Common (7).
+        assert_eq!(
+            message_chat_body(7, messages::CHAT_TYPE_YELL, None, None, "hi"),
+            [5, 0, 0, 0, 7, 0, 0, 0, b'h', b'i', 0]
+        );
+        // A Tauren's Taur-ahe (3) whisper: the name before the text.
+        assert_eq!(
+            message_chat_body(1, messages::CHAT_TYPE_WHISPER, Some(3), Some("Bo"), "yo"),
+            [6, 0, 0, 0, 3, 0, 0, 0, b'B', b'o', 0, b'y', b'o', 0]
+        );
+    }
+
+    #[test]
+    fn only_a_whisper_or_a_channel_carries_a_target() {
+        assert_eq!(
+            message_chat_body(1, messages::CHAT_TYPE_PARTY, None, Some("Bo"), "x"),
+            [1, 0, 0, 0, 1, 0, 0, 0, b'x', 0]
+        );
+        assert_eq!(
+            message_chat_body(1, messages::CHAT_TYPE_CHANNEL, Some(14), None, "x"),
+            [0xe, 0, 0, 0, 14, 0, 0, 0, 0, b'x', 0],
+            "a channel with no name still writes the empty cstring"
+        );
+    }
+}
diff --git a/crates/benilla-protocol/src/world/writer/lifecycle.rs b/crates/benilla-protocol/src/world/writer/lifecycle.rs
index 94d38a2f..fbd72d98 100644
--- a/crates/benilla-protocol/src/world/writer/lifecycle.rs
+++ b/crates/benilla-protocol/src/world/writer/lifecycle.rs
@@ -37,6 +37,12 @@ impl WorldWriter {
         self.send(opcode::CMSG_QUERY_TIME, &messages::query_time())
     }
 
+    /// `CMSG_OPENING_CINEMATIC`, empty: Lua's `OpeningCinematic()` (`0x48c8c0`, opcode `0xf9` put
+    /// at `0x48c8c9`, sent through `0x5ab630`).
+    pub fn opening_cinematic(&mut self) -> Result<()> {
+        self.send(opcode::CMSG_OPENING_CINEMATIC, &[])
+    }
+
     /// `CMSG_COMPLETE_CINEMATIC`, empty: sent when a cinematic ends or is escaped, and owed for
     /// every `SMSG_TRIGGER_CINEMATIC`; until then vmangos anchors visibility to the cinematic
     /// camera and the world around the body despawns.
diff --git a/crates/benilla-protocol/src/world/writer/mod.rs b/crates/benilla-protocol/src/world/writer/mod.rs
index de0fa1d1..7b86b8d7 100644
--- a/crates/benilla-protocol/src/world/writer/mod.rs
+++ b/crates/benilla-protocol/src/world/writer/mod.rs
@@ -63,8 +63,9 @@ pub struct WorldWriter {
     /// Every packet that reached the socket since the last drain, as `(opcode, body length)`;
     /// `None` until [`Self::watch_sends`]. Pushed only after a successful write.
     pub(super) sent: Option<Vec<(u16, usize)>>,
-    /// The character's faction language, set at login from its race; every chat send carries it.
-    /// vmangos drops the whole message, dot-commands included, when the character does not know it.
+    /// The character's faction language, set at login from its race, which a chat send naming no
+    /// language carries. vmangos drops the whole message, dot-commands included, when the
+    /// character does not know the language.
     pub(super) chat_language: u32,
 }
 
diff --git a/crates/benilla-protocol/tests/group.rs b/crates/benilla-protocol/tests/group.rs
index cddbd584..312ece28 100644
--- a/crates/benilla-protocol/tests/group.rs
+++ b/crates/benilla-protocol/tests/group.rs
@@ -5,8 +5,8 @@ mod common;
 
 use benilla_protocol::events::{decode, SessionEvent};
 use benilla_protocol::messages::{
-    self, member_status, opcode, party_member_mask, party_operation, party_result, GroupLootInfo,
-    GroupMemberEntry, PartyMemberStatsInfo, GROUP_MEMBER_ASSISTANT,
+    self, member_status, opcode, party_member_mask, party_operation, party_result, patch_auras,
+    GroupLootInfo, GroupMemberEntry, PartyMemberStatsInfo, GROUP_MEMBER_ASSISTANT,
 };
 use benilla_protocol::ServerPacket;
 use common::hx;
@@ -518,8 +518,9 @@ fn party_member_stats_full_position_auras_and_pet_block() {
             assert_eq!(*guid, 0x7F);
             assert!(*full);
             assert_eq!(info.position, Some((1234, -5678)));
-            assert_eq!(info.auras, Some(vec![133, 116]));
-            assert_eq!(info.auras_negative, Some(vec![8050]));
+            assert_eq!(info.auras, Some(vec![(0, 133), (5, 116)]));
+            // The debuff slot is absolute: mask bit 2 is slot 34.
+            assert_eq!(info.auras_negative, Some(vec![(34, 8050)]));
             assert_eq!(info.pet_guid, Some(0x1122_3344_5566_7788));
             assert_eq!(info.pet_name.as_deref(), Some("Fido"));
             assert_eq!(info.pet_model_id, Some(618));
@@ -528,8 +529,8 @@ fn party_member_stats_full_position_auras_and_pet_block() {
             assert_eq!(info.pet_power_type, Some(0));
             assert_eq!(info.pet_cur_power, Some(80));
             assert_eq!(info.pet_max_power, Some(100));
-            assert_eq!(info.pet_auras, Some(vec![1126]));
-            assert_eq!(info.pet_auras_negative, Some(vec![770]));
+            assert_eq!(info.pet_auras, Some(vec![(3, 1126)]));
+            assert_eq!(info.pet_auras_negative, Some(vec![(33, 770)]));
             assert_eq!(info.status, None);
             assert_eq!(info.level, None);
         }
@@ -546,6 +547,38 @@ fn party_member_stats_full_position_auras_and_pet_block() {
     }
 }
 
+/// A delta's aura mask names the slots that changed, a 0 id among them for an aura that fell off
+/// (`Player::GetAuraUpdateMask`, `GroupHandler.cpp:627-633`), and the record takes each named slot
+/// and keeps the rest (`0x5e52d0`-`0x5e52f8`).
+#[test]
+fn a_delta_aura_mask_patches_the_named_slots_and_a_zero_clears_one() {
+    // Slots 0 and 5 changed: slot 0 lost its aura, slot 5 took 116.
+    let body = hx(concat!(
+        "017f",     // packed guid 0x7F
+        "00020000", // mask: AURAS
+        "21000000", // slot mask: bits 0 and 5
+        "0000",     // slot 0: cleared
+        "7400",     // slot 5: 116
+    ));
+    let p = messages::parse_server(opcode::SMSG_PARTY_MEMBER_STATS, &body).unwrap();
+    let ServerPacket::PartyMemberStats { info, full, .. } = &p else {
+        panic!("expected PartyMemberStats, got {}", p.name());
+    };
+    assert!(!*full);
+    assert_eq!(info.auras, Some(vec![(0, 0), (5, 116)]));
+
+    let mut record = Some(vec![(0, 133), (3, 1126), (5, 10)]);
+    patch_auras(&mut record, info.auras.as_deref().unwrap());
+    assert_eq!(
+        record,
+        Some(vec![(3, 1126), (5, 116)]),
+        "slot 0 emptied, slot 3 untouched, slot 5 overwritten"
+    );
+    // A new slot goes in slot order, and clearing an empty slot is a no-op.
+    patch_auras(&mut record, &[(1, 774), (9, 0)]);
+    assert_eq!(record, Some(vec![(1, 774), (3, 1126), (5, 116)]));
+}
+
 /// The reply for a member not in our group (`Handlers/GroupHandler.cpp:773-789`):
 /// `SMSG_PARTY_MEMBER_STATS_FULL` with only `STATUS`, set to offline (0).
 #[test]
diff --git a/crates/benilla-ui/src/bindings_xml.rs b/crates/benilla-ui/src/bindings_xml.rs
index 895c9d3e..827dac36 100644
--- a/crates/benilla-ui/src/bindings_xml.rs
+++ b/crates/benilla-ui/src/bindings_xml.rs
@@ -1,21 +1,24 @@
-//! An addon's `Bindings.xml`, its key-binding declarations. The reference loads one per addon in
-//! `AddOn_Load 0x51f240`, after the addon's `.toc` files (`0x51f3fa`) and before its saved
-//! variables (`0x51f400` to `0x51f4b5`). The stock file has 228 live bindings (94 `runOnUp`, 13
-//! `header`, 12 `hidden`, 9 `debug`, 5 `platform`); the six `MOVEVIEW*` ones sit in an XML comment.
+//! A `Bindings.xml`, its key-binding declarations, as the one loader both uses (`0x4b6f70`) reads
+//! it: the core's `Interface\FrameXML\Bindings.xml` off the player's chain, which `UI_Init`
+//! (`0x48fbf0`) loads at `0x490018` after the `FrameXML.toc` walk (`0x48ffed`), and each addon's,
+//! which `AddOn_Load` (`0x51f240`) loads at `0x51f443` after the addon's `.toc` files and before
+//! its saved variables. The stock file has 219 commands (94 `runOnUp`, 13 `header`, 3 `hidden`, 5
+//! `platform`) once its nine `debug` rows are skipped; the six `MOVEVIEW*` ones sit in an XML
+//! comment.
 //!
 //! A body is one Lua chunk; with `runOnUp="true"` it runs on press and again on release, the
 //! global `keystate` set to `"down"` or `"up"`. `header="X"` opens the section
 //! `BINDING_HEADER_X` that following header-less bindings join, in a flat list with `HEADER`
 //! pseudo-entries (`Blizzard_BindingUI.lua:87`). `hidden="true"` keeps a binding bindable but out
-//! of the Key Bindings window. `platform="mac"` marks the `ITUNES_REMOTE` rows; the reference
-//! skips another platform's row at load (`0x4b70c3`–`0x4b70e5`), benilla at registration.
+//! of the Key Bindings window. `platform="mac"` marks the `ITUNES_REMOTE` rows; the loader skips
+//! another platform's row (`0x4b70c3`-`0x4b70e5`), here at registration.
 
 use std::fmt;
 
 /// One `<Binding>` element as the file states it; the section carry-forward and the
-/// `BINDING_HEADER_` prefix are applied by [`crate::script::UiScript::register_addon_bindings`].
+/// `BINDING_HEADER_` prefix are applied at registration ([`crate::script::UiScript::register_bindings`]).
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct AddonBinding {
+pub struct Binding {
     /// The command name `SetBinding` and `GetBindingKey` speak in.
     pub name: String,
     /// The raw `header` suffix (`MOVEMENT` of `BINDING_HEADER_MOVEMENT`), opening a section.
@@ -53,11 +56,13 @@ impl std::error::Error for Error {
     }
 }
 
-/// Parse `Bindings.xml` text into its bindings, in document order: every `<Binding>` at any
-/// depth, the tag matched case-insensitively (`0x64a4c0`), skipping one with no `name`. The
-/// reference reads only the root's children (`0x4b701f`) and also skips a row with an empty body
-/// (`0x4b7093`–`0x4b709e`) or `debug="true"` (`0x4b70a4`–`0x4b70bd`), which this keeps.
-pub fn parse(text: &str) -> Result<Vec<AddonBinding>, Error> {
+/// Parse `Bindings.xml` text into its bindings, in document order, with the loader's own skips.
+/// It walks the root's children only (`0x4b701f`, then the sibling link at `0x4b745b`), so a
+/// nested `<Binding>` is never read; a child that is not a `<Binding>` (the tag matched
+/// case-insensitively, `0x64a4c0`) is skipped (`0x4b704c`). A row with no `name`
+/// (`0x4b7084`-`0x4b708d`), an empty body (`0x4b7093`-`0x4b709e`) or `debug="true"`
+/// (`0x4b70a4`-`0x4b70bd`) is skipped too, so the stock file's nine debug rows are not commands.
+pub fn parse(text: &str) -> Result<Vec<Binding>, Error> {
     // The reference's expat has no namespace processing, so an undeclared prefix is bound and the
     // text re-read rather than costing the file, as in `framexml::parse`.
     let repaired;
@@ -70,14 +75,18 @@ pub fn parse(text: &str) -> Result<Vec<AddonBinding>, Error> {
         Err(e) => return Err(Error::Xml(e)),
     };
     let mut out = Vec::new();
-    for node in doc.root_element().descendants() {
+    for node in doc.root_element().children() {
         if !node.is_element() || !node.tag_name().name().eq_ignore_ascii_case("Binding") {
             continue;
         }
         let Some(name) = attr_ci(node, "name").filter(|n| !n.is_empty()) else {
             continue;
         };
-        out.push(AddonBinding {
+        let body = direct_text(node);
+        if body.is_empty() || attr_bool(node, "debug") {
+            continue;
+        }
+        out.push(Binding {
             name,
             header: attr_ci(node, "header").filter(|h| !h.is_empty()),
             run_on_up: attr_bool(node, "runOnUp"),
@@ -85,7 +94,7 @@ pub fn parse(text: &str) -> Result<Vec<AddonBinding>, Error> {
             platform: attr_ci(node, "platform")
                 .filter(|p| !p.is_empty())
                 .map(|p| p.to_ascii_lowercase()),
-            body: direct_text(node),
+            body,
         });
     }
     Ok(out)
@@ -132,8 +141,8 @@ mod tests {
     <Binding name="JUMP">
         Jump();
     </Binding>
-    <Binding name="TOGGLESTATS" hidden="true" debug="true">
-        ToggleStats();
+    <Binding name="PROBEHIDDEN" hidden="true">
+        Probe();
     </Binding>
     <Binding name="PROBECOMPARE" RUNONUP="TRUE">
         if ( a &lt; b ) then Probe(); end
@@ -196,21 +205,45 @@ mod tests {
     }
 
     /// Registered under `""`, a nameless binding would shadow `GetBindingAction`'s empty answer
-    /// for an unbound key.
+    /// for an unbound key; the loader skips it (`0x4b7084`-`0x4b708d`).
     #[test]
-    fn nameless_bindings_are_skipped_and_nesting_is_tolerated() {
+    fn nameless_bindings_are_skipped() {
         let binds = parse(
             r#"<Ui>
     <Binding>Orphan();</Binding>
     <Binding name="">AlsoOrphan();</Binding>
-    <Bindings>
-        <Binding name="PROBEWRAPPED">Probe();</Binding>
-    </Bindings>
+    <Binding name="PROBENAMED">Probe();</Binding>
 </Ui>"#,
         )
         .expect("well-formed");
         assert_eq!(binds.len(), 1);
-        assert_eq!(binds[0].name, "PROBEWRAPPED");
+        assert_eq!(binds[0].name, "PROBENAMED");
+    }
+
+    /// The loader's three skips beyond a missing name: a `<Binding>` below the root's children is
+    /// never walked (`0x4b701f`, the sibling link `0x4b745b`), an empty body is refused
+    /// (`0x4b7093`-`0x4b709e`), and a truthy `debug` skips the row (`0x4b70a4`-`0x4b70bd`), as
+    /// the stock file's nine debug rows are skipped. A whitespace body is not empty.
+    #[test]
+    fn nested_empty_and_debug_rows_are_not_bindings() {
+        let binds = parse(
+            r#"<Bindings>
+    <Binding name="PROBEKEPT">Probe();</Binding>
+    <Bindings>
+        <Binding name="PROBENESTED">Probe();</Binding>
+    </Bindings>
+    <Frame><Binding name="PROBEINFRAME">Probe();</Binding></Frame>
+    <Binding name="PROBEEMPTY"></Binding>
+    <Binding name="PROBESELFCLOSED"/>
+    <Binding name="PROBEDEBUG" hidden="true" debug="true">ToggleStats();</Binding>
+    <Binding name="PROBEDEBUGCASE" DEBUG="TRUE">Probe();</Binding>
+    <Binding name="PROBENOTDEBUG" debug="1">Probe();</Binding>
+    <Binding name="PROBEBLANK">  </Binding>
+</Bindings>"#,
+        )
+        .expect("well-formed");
+        let names: Vec<&str> = binds.iter().map(|b| b.name.as_str()).collect();
+        assert_eq!(names, ["PROBEKEPT", "PROBENOTDEBUG", "PROBEBLANK"]);
     }
 
     #[test]
diff --git a/crates/benilla-ui/src/civil.rs b/crates/benilla-ui/src/civil.rs
index a919a1a7..60476560 100644
--- a/crates/benilla-ui/src/civil.rs
+++ b/crates/benilla-ui/src/civil.rs
@@ -1,5 +1,5 @@
 //! Broken-down UTC time from an epoch second, the calendar behind `date()` and screenshot names.
-//! Deviation: UTC where the reference's callers use local time, because the workspace has no
+//! Deviation: UTC where the reference's callers use local time, because this crate has no
 //! timezone source.
 
 /// Broken-down UTC time.
diff --git a/crates/benilla-ui/src/lib.rs b/crates/benilla-ui/src/lib.rs
index 4af31f01..5145c9ad 100644
--- a/crates/benilla-ui/src/lib.rs
+++ b/crates/benilla-ui/src/lib.rs
@@ -12,6 +12,7 @@ pub mod messages;
 pub mod order;
 pub mod script;
 pub mod source;
+pub mod status;
 pub mod strings;
 pub mod toc;
 pub mod widget;
diff --git a/crates/benilla-ui/src/loader/mod.rs b/crates/benilla-ui/src/loader/mod.rs
index d576c165..1084f84f 100644
--- a/crates/benilla-ui/src/loader/mod.rs
+++ b/crates/benilla-ui/src/loader/mod.rs
@@ -14,6 +14,7 @@ use mlua::{Function, ObjectLike, Table, Value};
 
 use crate::framexml::{self, Element, ParsedDocument, ScriptRef, TopLevel};
 use crate::script::{FontObject, JustifyH, JustifyV, Outline, UiScript};
+use crate::status;
 
 mod backdrop;
 mod geometry;
@@ -39,6 +40,11 @@ pub struct LoadReport {
     /// Trace lines, only while `FrameXML_Debug` is on: the reference's flag (`[0xceea30]`) boots 0
     /// and its loader traces gate on `flag > 0` (`0x6ee298`). A trace is severity 0, not a warning.
     pub traces: Vec<String>,
+    /// The document's own load status, the lines `0x6ede10` reports into its record for
+    /// `Logs\FrameXML.log`: the traces, each `<Include>` or `<Script file=>` that did not open or
+    /// parse, and each included document's own record under its banner. The caller closes it
+    /// under the document's banner ([`crate::status::Status::close_into`]).
+    pub status: crate::status::Status,
 }
 
 /// Materialize a parsed FrameXML document into live frames in `script`, in document order
@@ -68,11 +74,24 @@ pub fn load_into(
     doc: &ParsedDocument,
     path: &str,
     files: &dyn Fn(&str) -> Option<Vec<u8>>,
+) -> LoadReport {
+    load_into_under(lua, doc, path, files, "")
+}
+
+/// [`load_into`] for a provider whose path space sits under `status_root` in the install's, so
+/// the status lines name the install path (`LoadAddOn` reads under `Interface\AddOns\`).
+pub fn load_into_under(
+    lua: &mlua::Lua,
+    doc: &ParsedDocument,
+    path: &str,
+    files: &dyn Fn(&str) -> Option<Vec<u8>>,
+    status_root: &str,
 ) -> LoadReport {
     let mut loader = Loader {
         lua,
         files,
         path: path.to_string(),
+        status_root,
         report: LoadReport::default(),
         warned: HashSet::new(),
         deferred_anchors: Vec::new(),
@@ -98,6 +117,7 @@ pub fn apply_template(lua: &mlua::Lua, wrapper: &Table, kind: &str, template: &s
         lua,
         files: &no_files,
         path: String::new(),
+        status_root: "",
         report: LoadReport::default(),
         warned: HashSet::new(),
         deferred_anchors: Vec::new(),
@@ -196,11 +216,16 @@ pub(super) fn model_kind_tag(tag: &str) -> bool {
         .any(|k| k.eq_ignore_ascii_case(tag))
 }
 
-/// The `.lua` test `0x6ede10` opens with: the last `.` anywhere in the resolved path, not the
-/// basename's (`strrchr`), compared case-insensitively to `".lua"` (`0x8710c8`, via `0x64a4c0`).
-fn has_lua_suffix(path: &str) -> bool {
-    path.rsplit_once('.')
-        .is_some_and(|(_, ext)| ext.eq_ignore_ascii_case("lua"))
+impl Loader<'_> {
+    /// A provider path as a status line names it: under [`Loader::status_root`], `\`-separated.
+    fn status_path(&self, path: &str) -> String {
+        status::install_path(&format!("{}{path}", self.status_root))
+    }
+
+    /// `FrameXML_Debug` above 0, read where the reference reads it, at each close.
+    fn debug(&self) -> bool {
+        self.model().framexml_debug.get() > 0
+    }
 }
 
 /// The directory part of a provider path, `""` for a bare name.
@@ -219,6 +244,8 @@ struct Loader<'a> {
     /// The current document's path: its directory resolves relative references, the whole path
     /// names inline `<Script>` chunks. Swapped for each nested include and restored after.
     pub(super) path: String,
+    /// What the provider's path space sits under in the install's, for the status lines.
+    pub(super) status_root: &'a str,
     // The template and font registries live on the `Model` and persist across loads: the
     // reference's template table is global (`0x6ee500`), so `MerchantFrame.xml` inherits a template
     // `CharacterFrameTemplates.xml` registered. Fonts are their own namespace, stored flattened.
@@ -329,10 +356,15 @@ impl Loader<'_> {
                                     .push(format!("<Script file=\"{path}\">: {e}"));
                             }
                         }
-                        None => self.report.missing_files.push(format!(
-                            "<Script file=\"{path}\">: no provider hit for \"{joined}\"; \
-                             every handler in it is missing"
-                        )),
+                        None => {
+                            // The chunk arm (`0x704bc0`), whatever the extension.
+                            let line = status::missing(&self.status_path(&joined), true);
+                            self.report.status.report(status::FAILURE, line);
+                            self.report.missing_files.push(format!(
+                                "<Script file=\"{path}\">: no provider hit for \"{joined}\"; \
+                                 every handler in it is missing"
+                            ))
+                        }
                     }
                 }
                 TopLevel::Script(ScriptRef::Inline { body, line }) => {
@@ -370,6 +402,9 @@ impl Loader<'_> {
     pub(super) fn do_include(&mut self, path: &str) {
         let joined = join_ref(self.base(), path);
         let Some(bytes) = (self.files)(&joined) else {
+            // Reported into this document's record, before the included one has its own.
+            let line = status::missing(&self.status_path(&joined), status::runs_as_lua(&joined));
+            self.report.status.report(status::FAILURE, line);
             self.report.missing_files.push(format!(
                 "<Include file=\"{path}\">: no provider hit for \"{joined}\"; the whole \
                  document it names is missing"
@@ -380,7 +415,7 @@ impl Loader<'_> {
         // which dispatches on the resolved path's extension, never its content: a `.lua` suffix
         // (`0x6edee6`-`0x6edf0f`) runs the file as a chunk (`0x704bc0`), anything else parses as
         // XML. A `.toc` line goes through the same routine.
-        if has_lua_suffix(&joined) {
+        if status::runs_as_lua(&joined) {
             if let Err(e) = self.run(crate::source::chunk(&bytes), &joined) {
                 self.report
                     .errors
@@ -392,15 +427,24 @@ impl Loader<'_> {
         match framexml::parse(&crate::source::decode(&bytes)) {
             Ok(sub) => {
                 self.report.warnings.extend(sub.warnings.iter().cloned());
-                // The included document resolves and names against its own path until it is done.
+                // The included document resolves and names against its own path until it is done,
+                // and reports into a record of its own, closed under its banner (`0x6ee21c`).
                 let outer = std::mem::replace(&mut self.path, joined.clone());
+                let outer_status = std::mem::take(&mut self.report.status);
                 self.load_doc(&sub);
                 self.path = outer;
+                let own = std::mem::replace(&mut self.report.status, outer_status);
+                let banner = status::file_banner(&self.status_path(&joined));
+                let debug = self.debug();
+                own.close_into(&mut self.report.status, debug, banner);
+            }
+            Err(e) => {
+                let line = status::unparsed(&self.status_path(&joined));
+                self.report.status.report(status::FAILURE, line);
+                self.report
+                    .errors
+                    .push(format!("<Include file=\"{path}\">: {e}"))
             }
-            Err(e) => self
-                .report
-                .errors
-                .push(format!("<Include file=\"{path}\">: {e}")),
         }
     }
 
@@ -584,10 +628,10 @@ impl Loader<'_> {
 
         // One of the reference's five loader traces: `Instantiate 0x6ee280`'s `"-- Creating %s
         // named %s"` (`0x871154`), gated `flag > 0` at `0x6ee298`; the first `%s` is the tag.
-        if self.model().framexml_debug.get() > 0 {
-            self.report
-                .traces
-                .push(format!("-- Creating {} named {dbg_name}", el.tag));
+        if self.debug() {
+            let trace = format!("-- Creating {} named {dbg_name}", el.tag);
+            self.report.status.report(status::TRACE, trace.clone());
+            self.report.traces.push(trace);
         }
 
         // `$parent` for its contents; a nameless frame passes its nearest named ancestor on.
diff --git a/crates/benilla-ui/src/loader/scripts.rs b/crates/benilla-ui/src/loader/scripts.rs
index 8ddabecc..4a4a5f45 100644
--- a/crates/benilla-ui/src/loader/scripts.rs
+++ b/crates/benilla-ui/src/loader/scripts.rs
@@ -1,4 +1,4 @@
-use mlua::{Function, ObjectLike, Table, Value};
+use mlua::{Function, ObjectLike, Table};
 
 use crate::framexml::Element;
 
@@ -28,7 +28,7 @@ impl Loader<'_> {
                 // function: `SetScript` (`0x7025c0`) tests only NULL and the first byte
                 // (`0x7025f8`), and nothing trims the body (`0x6f29d0`). The stock blanks
                 // (`BuffFrame.xml:101`) are whitespace, so their `GetScript` answers a function.
-                let cleared = handler.body.is_empty() && handler.attr("function").is_none();
+                let cleared = handler.body.is_empty();
                 let func = if cleared {
                     None
                 } else {
@@ -77,11 +77,9 @@ impl Loader<'_> {
         onload
     }
 
-    /// Compile a handler body, or resolve its `function=` global: not 1.12, whose loader never
-    /// reads the attribute. A 1.12 body takes no arguments and reads its frame from `this`; the
-    /// `self` parameter is not 1.12 either (our `assets/ui` bodies use it) and falls back to `this`
-    /// for a hook that calls a captured handler bare. The prologue shares the body's first line,
-    /// so line numbers match the reference, which loads the raw body as the chunk (`0x704c70`).
+    /// Compile a handler body as the chunk itself, as the reference loads it (`0x704c70`): it takes
+    /// no arguments and reads its frame from `this`, so a `self` in it is an ordinary global. The
+    /// loader reads no other attribute of the element (no `function=`).
     pub(super) fn compile_handler(
         &mut self,
         handler: &Element,
@@ -91,41 +89,24 @@ impl Loader<'_> {
     ) -> Option<Function> {
         // The raw body, never trimmed: a whitespace body is a real empty chunk (`apply_scripts`).
         let body = handler.body.as_str();
-        if !body.is_empty() {
-            let src = format!(
-                "return function(self, ...) if self == nil then self = this end {body}\nend"
-            );
-            match self
-                .lua()
-                .load(&src)
-                .set_name(format!("{owner}:{name}"))
-                .set_mode(mlua::ChunkMode::Text)
-                .eval::<Function>()
-            {
-                Ok(f) => return Some(f),
-                Err(e) => {
-                    self.report
-                        .errors
-                        .push(format!("{dbg}: compiling <{name}>: {e}"));
-                    return None;
-                }
+        if body.is_empty() {
+            return None;
+        }
+        match self
+            .lua()
+            .load(body)
+            .set_name(format!("{owner}:{name}"))
+            .set_mode(mlua::ChunkMode::Text)
+            .into_function()
+        {
+            Ok(f) => Some(f),
+            Err(e) => {
+                self.report
+                    .errors
+                    .push(format!("{dbg}: compiling <{name}>: {e}"));
+                None
             }
         }
-        if let Some(global) = handler.attr("function") {
-            match self.lua().globals().get::<Value>(global) {
-                Ok(Value::Function(f)) => return Some(f),
-                _ => {
-                    self.warn_once(
-                        &format!("fn:{global}"),
-                        format!(
-                            "{dbg}: <{name} function=\"{global}\">: no such global function (yet)"
-                        ),
-                    );
-                    return None;
-                }
-            }
-        }
-        None
     }
 
     /// Fire a captured `OnLoad` under the event path's convention, `this` set and restored
diff --git a/crates/benilla-ui/src/loader/tests.rs b/crates/benilla-ui/src/loader/tests.rs
index dd5bcd1c..a8923c88 100644
--- a/crates/benilla-ui/src/loader/tests.rs
+++ b/crates/benilla-ui/src/loader/tests.rs
@@ -311,7 +311,7 @@ mod loader_tests {
                     <Frames>
                         <Frame name="$parentChild">
                             <Scripts>
-                                <OnLoad>table.insert(loadorder, "child"); ChildLoaded = self:GetName()</OnLoad>
+                                <OnLoad>table.insert(loadorder, "child"); ChildLoaded = this:GetName()</OnLoad>
                             </Scripts>
                         </Frame>
                     </Frames>
@@ -330,7 +330,7 @@ mod loader_tests {
         assert!(s.eval::<bool>("return MyFrameChild ~= nil").unwrap());
         assert!(s.eval::<bool>("return MyFrameTex ~= nil").unwrap());
 
-        // The child's handler uses `self`, the parent's `this`; both work.
+        // Both handlers read their frame from `this`.
         assert_eq!(
             s.eval::<String>("return ChildLoaded").unwrap(),
             "MyFrameChild"
@@ -2409,16 +2409,17 @@ mod chunk_name_tests {
         );
     }
 
-    /// The 1.12 hook idiom: an addon captures a handler with `GetScript` and calls it with no
-    /// arguments, the frame passed only as `this`; `Loader::compile_handler` falls back to `this`.
+    /// A handler body is the chunk itself (`0x704c70`): it takes no arguments and reads its frame
+    /// from `this`, so `self` in it is an ordinary global, and the 1.12 hook idiom (an addon
+    /// captures a handler with `GetScript` and calls it bare) reaches the same frame.
     #[test]
-    fn a_script_captured_and_called_with_no_arguments_still_sees_its_frame() {
+    fn a_handler_body_is_the_chunk_and_self_is_a_global() {
         let s = UiScript::new().unwrap();
         let doc = parse(
             r#"<Ui>
                 <Frame name="Hooked" hidden="true">
                     <Scripts>
-                        <OnShow>SEEN = self:GetName()</OnShow>
+                        <OnShow>SEEN = this:GetName() SELF_SEEN = self</OnShow>
                     </Scripts>
                 </Frame>
             </Ui>"#,
@@ -2426,11 +2427,15 @@ mod chunk_name_tests {
         let report = load_in(&s, &doc, "Test.xml", &no_files);
         assert!(report.errors.is_empty(), "{:?}", report.errors);
 
-        // The engine's call passes `self` and sets `this`.
-        s.run("SEEN = nil Hooked:Show()").unwrap();
+        s.run("self = 'the global' SEEN = nil Hooked:Show()")
+            .unwrap();
         assert_eq!(s.eval::<String>("return SEEN").unwrap(), "Hooked");
+        assert_eq!(
+            s.eval::<String>("return SELF_SEEN").unwrap(),
+            "the global",
+            "`self` is no parameter of the body"
+        );
 
-        // The addon's: the captured script called bare, with only `this` set.
         s.run(
             "SEEN = nil \
              local original = Hooked:GetScript(\"OnShow\") \
@@ -2439,11 +2444,29 @@ mod chunk_name_tests {
              this = nil",
         )
         .unwrap();
-        assert_eq!(
-            s.eval::<String>("return SEEN").unwrap(),
-            "Hooked",
-            "the reference's own no-argument contract must reach the same frame"
+        assert_eq!(s.eval::<String>("return SEEN").unwrap(), "Hooked");
+    }
+
+    /// The loader reads no `function=` attribute: a handler element with no body clears the
+    /// handler, whatever global the attribute names.
+    #[test]
+    fn a_function_attribute_binds_nothing() {
+        let s = UiScript::new().unwrap();
+        s.run("function NamedHandler() RAN = true end").unwrap();
+        let doc = parse(
+            r#"<Ui>
+                <Frame name="Named" hidden="true">
+                    <Scripts><OnShow function="NamedHandler"/></Scripts>
+                </Frame>
+            </Ui>"#,
         );
+        let report = load_in(&s, &doc, "Test.xml", &no_files);
+        assert!(report.errors.is_empty(), "{:?}", report.errors);
+        s.run("Named:Show()").unwrap();
+        assert!(s.eval::<bool>("return RAN == nil").unwrap());
+        assert!(s
+            .eval::<bool>("return Named:GetScript(\"OnShow\") == nil")
+            .unwrap());
     }
 }
 
diff --git a/crates/benilla-ui/src/loader/widgets.rs b/crates/benilla-ui/src/loader/widgets.rs
index 34c39519..a0c5e5fd 100644
--- a/crates/benilla-ui/src/loader/widgets.rs
+++ b/crates/benilla-ui/src/loader/widgets.rs
@@ -83,18 +83,19 @@ impl Loader<'_> {
                 // form (`UIPanelButtonUpTexture`); it expands like a `<Layers>` region.
                 let expanded = this.expand_region(raw);
                 let t = &expanded;
-                if let Some(file) = t.attr("file") {
-                    this.call(wrapper, method, file.to_string(), dbg);
-                } else if let Some(c) = children_named(t, "Color").next().map(color_of) {
-                    this.call(wrapper, method, (c[0], c[1], c[2], c[3]), dbg);
-                } else {
-                    // No art: the element alone creates the region, as the reference sends all four
-                    // state textures through the `<Layers>` texture adder (`0x6f26f0`, from
-                    // `0x778903`); `""` creates the slot without painting it.
-                    this.call(wrapper, method, String::new(), dbg);
+                // The reference sends all four state textures through the `<Layers>` texture adder
+                // (`0x6f26f0`, from `0x778903`), so a `<Color>` is the region's own colour fill; the
+                // Lua setter has no colour form (`0x781970`). `""` creates the slot unpainted.
+                let color = children_named(t, "Color").next().map(color_of);
+                match t.attr("file") {
+                    Some(file) => this.call(wrapper, method, file.to_string(), dbg),
+                    None => this.call(wrapper, method, String::new(), dbg),
                 }
                 let getter = method.replacen("Set", "Get", 1);
                 if let Ok(region) = wrapper.call_method::<Table>(getter.as_str(), ()) {
+                    if let (None, Some(c)) = (t.attr("file"), color) {
+                        this.call_region(&region, "SetTexture", (c[0], c[1], c[2], c[3]), dbg);
+                    }
                     if let Some(mode) = t.attr("alphaMode") {
                         this.call_region(&region, "SetBlendMode", mode.to_string(), dbg);
                     }
diff --git a/crates/benilla-ui/src/order.rs b/crates/benilla-ui/src/order.rs
index db089796..ac29e455 100644
--- a/crates/benilla-ui/src/order.rs
+++ b/crates/benilla-ui/src/order.rs
@@ -37,13 +37,11 @@ pub enum Strata {
     Fullscreen = 6,
     FullscreenDialog = 7,
     Tooltip = 8,
-    /// A later client's stratum above `Tooltip`, not a 1.12 one.
-    Blizzard = 9,
 }
 
 impl Strata {
     /// Every stratum in draw order.
-    pub const ALL: [Strata; 10] = [
+    pub const ALL: [Strata; 9] = [
         Strata::World,
         Strata::Background,
         Strata::Low,
@@ -53,7 +51,6 @@ impl Strata {
         Strata::Fullscreen,
         Strata::FullscreenDialog,
         Strata::Tooltip,
-        Strata::Blizzard,
     ];
 
     /// The client bucket id.
@@ -114,8 +111,9 @@ impl Default for DrawLayer {
 // plus 1 (`SetParent` `0x76ab10`, at `0x76ab65`), `MirrorTimer.xml:62` lowers the bar by 1 to tie
 // its parent, and the tie lets the bar's ARTWORK fill draw under the parent's OVERLAY border.
 //
-// The sub-level is a later client's ordering within a layer, not 1.12's, which has none
-// (`0x76a860` takes only region and layer and inserts at the head); stock content never sets it.
+// The sub-level is the engine's own ordering within a layer, set only for the EditBox caret: 1.12
+// gives Lua and XML none (`0x76a860` takes only region and layer and inserts at the head, and
+// `SetDrawLayer` `0x79a780` reads the layer alone).
 
 const STRATUM_SHIFT: u32 = 60;
 const LEVEL_SHIFT: u32 = 44;
@@ -415,8 +413,6 @@ mod tests {
         let lo = ZKey::frame(Strata::World, u16::MAX, 0);
         let hi = ZKey::frame(Strata::Tooltip, 0, 0);
         assert!(hi > lo);
-        // BLIZZARD is above TOOLTIP.
-        assert!(ZKey::frame(Strata::Blizzard, 0, 0) > ZKey::frame(Strata::Tooltip, u16::MAX, 0));
     }
 
     #[test]
diff --git a/crates/benilla-ui/src/script/action.rs b/crates/benilla-ui/src/script/action.rs
index 28ece326..8e08e734 100644
--- a/crates/benilla-ui/src/script/action.rs
+++ b/crates/benilla-ui/src/script/action.rs
@@ -116,9 +116,12 @@ impl super::UiScript {
         self.model_mut().bonus_bar_offset = offset;
     }
 
-    /// Drain the presses queued by `UseAction` since the last call.
+    /// Take the `UseAction` presses out of the call stream.
     pub fn take_action_uses(&mut self) -> Vec<ActionUse> {
-        std::mem::take(&mut self.model_mut().action_uses)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::UseAction(press) => Some(*press),
+            _ => None,
+        })
     }
 
     /// Drain the `(lua action id, packed)` pairs `PickupAction`/`PlaceAction` queued; the app
@@ -157,6 +160,48 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
+    // GetActionAutocast(slot) (`0x4e6f90`) → autoCastAllowed, autoCastEnabled: 1 or nil each,
+    // always two values. Only a pet spell has them: the slot resolver (`0x4e5a50`) writes its
+    // book flag 0 for a spell or an item and a macro's `[rec+0x568]`, and only a set flag looks the
+    // spell up in the pet's words (`0x4bd160`, low 16 bits), reading bits 31 and 30. An empty,
+    // out-of-range or missing-macro slot leaves the flag unwritten, and the stale non-zero local
+    // looks up spell 0, which no pet word carries. A non-number raises.
+    g.set(
+        "GetActionAutocast",
+        lua.create_function(|lua, slot: Value| {
+            let slot = super::binding_abi::number_arg(lua, slot, "Usage: GetActionAutocast(slot)")?;
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            // `(spell, pet_book)` as the resolver leaves them.
+            let resolved = u32::try_from(slot)
+                .ok()
+                .filter(|s| (1..=120).contains(s))
+                .and_then(|s| model.actions.get(&s))
+                .and_then(|a| match a.kind & 0xf0 {
+                    ACTION_KIND_MACRO => model.macros.get(a.action as usize).map(|_| {
+                        let b = model
+                            .macro_bindings
+                            .get(&a.action)
+                            .copied()
+                            .unwrap_or_default();
+                        (b.spell as u32, b.pet_book)
+                    }),
+                    _ => Some((a.action, false)),
+                })
+                .unwrap_or((0, true));
+            let autocast = match resolved {
+                (spell, true) => model
+                    .pet_book
+                    .slots
+                    .iter()
+                    .find(|s| s.spell_id & 0xffff == spell)
+                    .and_then(|s| s.autocast),
+                (_, false) => None,
+            };
+            let (allowed, enabled) = autocast.unwrap_or((false, false));
+            Ok((flag(allowed), flag(enabled)))
+        })?,
+    )?;
+
     g.set(
         "GetActionTexture",
         lua.create_function(|lua, action: u32| {
@@ -214,7 +259,9 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             if check_cursor && model.cursor.is_some() {
                 super::cursor::place_action(&mut model, action);
             } else {
-                model.action_uses.push(ActionUse { action, on_self });
+                model
+                    .script_calls
+                    .push(super::ScriptCall::UseAction(ActionUse { action, on_self }));
             }
             Ok(())
         })?,
@@ -327,7 +374,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     g.set(
         "GetActionCooldown",
         lua.create_function(|lua, action: u32| {
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             let model = lua.app_data_ref::<Model>().expect("model app_data");
             Ok(
                 match model.action_states.get(&action).and_then(|s| s.cooldown) {
@@ -348,6 +395,85 @@ mod tests {
     use super::ActionSlot;
     use crate::script::UiScript;
 
+    /// `GetActionAutocast` answers a pet spell's two bits only for a macro bound out of the pet's
+    /// book (`0x4e6fcb`), never for a spell slot of the same id, and always two values.
+    #[test]
+    fn action_autocast_reads_a_pet_book_macro_only() {
+        use crate::script::{MacroBinding, MacroState, MacroView, PetBookState, SpellSlotView};
+        let mut s = UiScript::new().unwrap();
+        s.set_pet_book(PetBookState {
+            token: Some("PET".into()),
+            slots: vec![SpellSlotView {
+                spell_id: 3009, // Claw
+                autocast: Some((true, false)),
+                ..Default::default()
+            }],
+        });
+        s.set_macros(MacroState {
+            account: vec![
+                MacroView {
+                    name: "claw".into(),
+                    body: "/cast Claw".into(),
+                    ..Default::default()
+                },
+                MacroView {
+                    name: "fb".into(),
+                    body: "/cast Fireball".into(),
+                    ..Default::default()
+                },
+            ],
+            character: Vec::new(),
+        });
+        s.set_macro_bindings(std::collections::HashMap::from([
+            (
+                1,
+                MacroBinding {
+                    spell: 3009,
+                    pet_book: true,
+                },
+            ),
+            (
+                2,
+                MacroBinding {
+                    spell: 133,
+                    pet_book: false,
+                },
+            ),
+        ]));
+        let slot = |kind, action| ActionSlot {
+            kind,
+            action,
+            ..Default::default()
+        };
+        s.set_action(1, Some(slot(super::ACTION_KIND_MACRO, 1)));
+        s.set_action(2, Some(slot(super::ACTION_KIND_MACRO, 2)));
+        s.set_action(3, Some(slot(super::ACTION_KIND_SPELL, 3009)));
+        s.set_action(4, Some(slot(super::ACTION_KIND_MACRO, 9)));
+
+        let ask = |s: &UiScript, n: u32| {
+            s.eval::<(i64, Option<i64>, Option<i64>)>(&format!(
+                "local f = function(...) return arg.n, arg[1], arg[2] end \
+                 return f(GetActionAutocast({n}))"
+            ))
+            .unwrap()
+        };
+        assert_eq!(ask(&s, 1), (2, Some(1), None), "the pet-book macro");
+        for n in [2, 3, 4, 5, 0, 121] {
+            assert_eq!(ask(&s, n), (2, None, None), "slot {n}");
+        }
+        s.set_pet_book(PetBookState {
+            token: Some("PET".into()),
+            slots: vec![SpellSlotView {
+                spell_id: 3009,
+                autocast: Some((true, true)),
+                ..Default::default()
+            }],
+        });
+        assert_eq!(ask(&s, 1), (2, Some(1), Some(1)), "autocasting");
+        let err = s.run("GetActionAutocast()").unwrap_err().to_string();
+        assert!(err.contains("Usage: GetActionAutocast(slot)"), "{err}");
+    }
+
     fn uses(s: &mut UiScript) -> Vec<(u32, bool)> {
         s.take_action_uses()
             .into_iter()
diff --git a/crates/benilla-ui/src/script/addon.rs b/crates/benilla-ui/src/script/addon.rs
index 31185a6a..61c855f6 100644
--- a/crates/benilla-ui/src/script/addon.rs
+++ b/crates/benilla-ui/src/script/addon.rs
@@ -11,6 +11,7 @@ use mlua::{Lua, MultiValue, Value};
 use super::addon_gate::{can_load, GateRow, Verdict};
 use super::binding_abi::flag;
 use super::Model;
+use crate::status::Status;
 
 /// Reads a chain-sourced addon's file by its path inside the patch chain.
 pub type AddonChainReader = Box<dyn Fn(&str) -> Option<Vec<u8>>>;
@@ -141,6 +142,15 @@ fn row_of(model: &Model, key: &AddonKey) -> Option<usize> {
     }
 }
 
+/// The enable setter (`0x51ea20`), the one write every enable verb makes, for the current
+/// character's row: the registry bit the gate reads, and the character's enable hash, which the
+/// setter dirties only when the row changes or is new.
+fn set_enabled(model: &mut Model, i: usize, on: bool) {
+    model.addons[i].enabled = on;
+    let name = model.addons[i].name.clone();
+    model.addon_enable.set(&name, on);
+}
+
 /// The registry as [`super::addon_gate`] rows, the one input every verb's verdict reads.
 fn gate_rows(model: &Model) -> Vec<GateRow<'_>> {
     model
@@ -322,29 +332,33 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                 let mut model = lua.app_data_mut::<Model>().expect("model");
                 let key = addon_key(lua, &model, &key, usage)?;
                 if let Some(i) = row_of(&model, &key) {
-                    model.addons[i].enabled = on;
+                    set_enabled(&mut model, i, on);
                 }
                 Ok(())
             })?,
         )?;
     }
 
-    // No arguments read (`0x48e720`, `0x48e7f0`).
+    // No arguments read (`0x48e720`, `0x48e7f0`). The loop runs over the Lua index array, not the
+    // registry: bound `0x51def0`, each name from `0x51df00`, into the setter `0x51ea20`. The array
+    // leaves out what `SMSG_ADDON_INFO` hid (`0x51dc4f`), which is every `Blizzard_*` addon on a
+    // server that hides them (vmangos `AddonHandler.cpp:129`), so their state is never touched.
     for (name, on) in [("EnableAllAddOns", true), ("DisableAllAddOns", false)] {
         g.set(
             name,
             lua.create_function(move |lua, _: MultiValue| {
                 let mut model = lua.app_data_mut::<Model>().expect("model");
-                for a in &mut model.addons {
-                    a.enabled = on;
+                for k in 0..model.addon_index.len() {
+                    let i = model.addon_index[k];
+                    set_enabled(&mut model, i, on);
                 }
                 Ok(())
             })?,
         )?;
     }
 
-    // `0x48e830` reloads the enable state from `AddOns.txt`, which is unchanged until the shutdown
-    // write, so reverting to the state as registered is the same thing.
+    // `0x48e830` reloads the enable hash from `AddOns.txt`, clean (`0x51ec59`), and the file is
+    // unchanged until the shutdown write, so reverting to the state as registered is the same.
     g.set(
         "ResetDisabledAddOns",
         lua.create_function(|lua, ()| {
@@ -352,6 +366,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             for a in &mut model.addons {
                 a.enabled = a.saved_enabled;
             }
+            model.addon_enable = model.addon_enable_saved.clone();
             Ok(())
         })?,
     )?;
@@ -370,7 +385,23 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                     lua_str(lua, "MISSING")?,
                 ]));
             };
-            match load_addon(lua, i) {
+            // One record for the call and the calls inside it (`ds:0xb4e3e0` counts them,
+            // `0x48ea85`/`0x48ea9d`), drained when the outermost returns (`0x48eab4`).
+            lua.app_data_mut::<Model>()
+                .expect("model")
+                .load_log
+                .demand_depth += 1;
+            let result = load_addon(lua, i);
+            {
+                let mut model = lua.app_data_mut::<Model>().expect("model");
+                let log = &mut model.load_log;
+                log.demand_depth -= 1;
+                if log.demand_depth == 0 && !log.demand.is_empty() {
+                    let lines = log.demand.take_lines();
+                    log.writes.push(crate::status::LogWrite::Append(lines));
+                }
+            }
+            match result {
                 Ok(()) => Ok(MultiValue::from_vec(vec![Value::Integer(1), Value::Nil])),
                 Err(reason) => Ok(MultiValue::from_vec(vec![
                     Value::Nil,
@@ -463,7 +494,18 @@ fn load_addon(lua: &Lua, i: usize) -> Result<(), String> {
         }
     }
 
-    run_files(lua, &name, &read, &files);
+    let mut toc = crate::status::Status::default();
+    run_files(lua, &name, &read, &files, &mut toc);
+    // The toc's record under its banner, then the add-on's (`0x6eddc8`, `0x51f464`).
+    let debug = framexml_debug(lua);
+    let mut own = crate::status::Status::default();
+    let toc_path = crate::status::addon_toc_path(&name);
+    toc.close_into(&mut own, debug, crate::status::toc_banner(&toc_path));
+    {
+        let mut model = lua.app_data_mut::<Model>().expect("model");
+        let banner = crate::status::addon_banner(&name);
+        own.close_into(&mut model.load_log.demand, debug, banner);
+    }
     // `Bindings.xml` loads between the files and the saved variables.
     load_bindings(lua, &name, &read);
     load_saved_variables(lua, i);
@@ -541,22 +583,38 @@ fn load_saved_variables(lua: &Lua, i: usize) {
 /// player's addon, the patch chain for a Blizzard LoadOnDemand one.
 type Reader = Box<dyn Fn(&str) -> Option<Vec<u8>>>;
 
+/// `FrameXML_Debug` above 0, which puts every banner in the load log.
+fn framexml_debug(lua: &Lua) -> bool {
+    lua.app_data_ref::<Model>()
+        .expect("model")
+        .framexml_debug
+        .get()
+        > 0
+}
+
+/// Where the reader's paths sit in the install's, for the load log's lines.
+const ADDONS_ROOT: &str = "Interface/AddOns/";
+
 /// Run the addon's `.toc` files in order, by the startup walk's rules: `.lua` is a chunk,
-/// anything else FrameXML, each path resolved against the including file's directory.
-fn run_files(lua: &Lua, name: &str, read: &Reader, files: &[String]) {
+/// anything else FrameXML, each path resolved against the including file's directory. `toc` is
+/// the `.toc`'s load record (`0x6edb90`).
+fn run_files(lua: &Lua, name: &str, read: &Reader, files: &[String], toc: &mut Status) {
     let provider = |req: &str| -> Option<Vec<u8>> { read(req) };
     for file in files {
         let path = crate::loader::join_ref(name, file);
+        let install = format!("{ADDONS_ROOT}{path}");
+        let lua_file = crate::status::runs_as_lua(&path);
         let Some(bytes) = read(&path) else {
             // The reference logs `Couldn't open %s` and carries on, so the addon still loads and
             // `IsAddOnLoaded` answers 1; the miss is warned, never a script error.
+            toc.report(
+                crate::status::FAILURE,
+                crate::status::missing(&install, lua_file),
+            );
             load_miss(lua, name, file);
             continue;
         };
-        if std::path::Path::new(file)
-            .extension()
-            .is_some_and(|e| e.eq_ignore_ascii_case("lua"))
-        {
+        if lua_file {
             if let Err(e) = run_chunk(lua, &bytes, &crate::script::addon_chunk_name(name, file)) {
                 log_error(lua, &format!("{name}/{file}: {e}"));
             }
@@ -567,11 +625,14 @@ fn run_files(lua: &Lua, name: &str, read: &Reader, files: &[String]) {
             Err(e) => {
                 // A document that will not parse is a load failure, not a raise: the reference
                 // logs `Couldn't parse XML in %s` (`0x846fd8`) to `FrameXML.log` and goes on.
+                toc.report(crate::status::FAILURE, crate::status::unparsed(&install));
                 load_failure(lua, &format!("{name}/{file}: {e}"));
                 continue;
             }
         };
-        let report = crate::loader::load_into(lua, &doc, &path, &provider);
+        let report = crate::loader::load_into_under(lua, &doc, &path, &provider, ADDONS_ROOT);
+        let banner = crate::status::file_banner(&install);
+        report.status.close_into(toc, framexml_debug(lua), banner);
         // Warnings take the `<Addon>/<file>` prefix; a bare loader warning names no document.
         for w in report.warnings {
             crate::script::diagnostics::record_warning(lua, &format!("{name}/{file}: {w}"));
@@ -712,12 +773,17 @@ impl super::UiScript {
         }
     }
 
-    /// `(name, enabled)` per registered addon, in order: what the host writes to `AddOns.txt`.
-    pub fn addon_enable_states(&self) -> Vec<(String, bool)> {
-        self.model_ref()
-            .addons
-            .iter()
-            .map(|a| (a.name.clone(), a.enabled))
-            .collect()
+    /// Seat the current character's enable hash as the loader read it from `AddOns.txt`
+    /// (`0x51ebe0`, re-read at every UI boot, `0x48ff2a`).
+    pub fn set_addon_enable_hash(&mut self, hash: super::EnableHash) {
+        let mut model = self.model_mut();
+        model.addon_enable_saved = hash.clone();
+        model.addon_enable = hash;
+    }
+
+    /// The shutdown writer's rows (`0x490c88` into `0x51ef20`): the current character's whole
+    /// enable hash when a verb changed it this session, else `None`, and nothing is written.
+    pub fn take_addon_enable_rows(&self) -> Option<Vec<(String, bool)>> {
+        self.model_mut().addon_enable.take_dirty()
     }
 }
diff --git a/crates/benilla-ui/src/script/addon_enable.rs b/crates/benilla-ui/src/script/addon_enable.rs
new file mode 100644
index 00000000..7833a996
--- /dev/null
+++ b/crates/benilla-ui/src/script/addon_enable.rs
@@ -0,0 +1,135 @@
+//! One character's addon enable hash, the table an `ADDONSTATELIST` node (`0xbe1bd0`) holds at
+//! `+0x10`, with the node's dirty byte (`+0xc`). Both the glue AddOns screen and the in-game verbs
+//! write through its setter, and the writer `0x51ef20` saves a node only while it is dirty, one
+//! line per entry, so a character that toggled nothing writes nothing and one that never set an
+//! addon keeps inheriting what the realm's other characters chose (`0x51e470`).
+
+use std::collections::HashMap;
+
+/// A character's explicit enable rows: those `AddOnList_LoadCharacter 0x51ebe0` read from its
+/// `AddOns.txt`, whether or not that addon is installed now, plus those the setter `0x51ea20` put
+/// there since. An addon with no row here is not the character's choice, and the query answers it
+/// from the other characters.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct EnableHash {
+    /// In insertion order, each name in the spelling that first put it here.
+    rows: Vec<(String, bool)>,
+    /// Lowercased name to its row: every compare in the reference is `SStrCmpI` (`0x64a4c0`).
+    index: HashMap<String, usize>,
+    /// The node's `+0xc`: set when a setter call changes the hash (`0x51ebbc`), cleared by a
+    /// reload (`0x51ec59`) and by the writer as it saves (`0x51ef68`).
+    dirty: bool,
+}
+
+impl EnableHash {
+    /// The loader's hash, clean. A name on two lines keeps its first spelling and takes the last
+    /// value, as the reload looks each one up and overwrites its byte (`0x51ee31`, `0x51eeef`).
+    pub fn from_rows(rows: impl IntoIterator<Item = (String, bool)>) -> Self {
+        let mut hash = Self::default();
+        for (name, on) in rows {
+            hash.put(name, on);
+        }
+        hash
+    }
+
+    /// The row for `name`, if this character has one.
+    pub fn get(&self, name: &str) -> Option<bool> {
+        self.index
+            .get(&name.to_ascii_lowercase())
+            .map(|&i| self.rows[i].1)
+    }
+
+    /// The setter `0x51ea20` on this node: a row with the same value is left alone
+    /// (`0x51ebab`-`0x51ebb1`); a changed row is stored and a missing one inserted, and either
+    /// dirties the node (`0x51ebb3`-`0x51ebbc`, `0x51eb62`).
+    pub fn set(&mut self, name: &str, on: bool) {
+        if self.get(name) == Some(on) {
+            return;
+        }
+        self.put(name.to_string(), on);
+        self.dirty = true;
+    }
+
+    /// Whether the writer would save this node.
+    pub fn is_dirty(&self) -> bool {
+        self.dirty
+    }
+
+    /// Every row, in order.
+    pub fn rows(&self) -> &[(String, bool)] {
+        &self.rows
+    }
+
+    /// The writer's view of the node (`0x51ef59`-`0x51ef68`): every row when dirty, clearing the
+    /// flag; `None` when clean, which writes nothing.
+    pub fn take_dirty(&mut self) -> Option<Vec<(String, bool)>> {
+        std::mem::take(&mut self.dirty).then(|| self.rows.clone())
+    }
+
+    fn put(&mut self, name: String, on: bool) {
+        match self.index.get(&name.to_ascii_lowercase()) {
+            Some(&i) => self.rows[i].1 = on,
+            None => {
+                self.index
+                    .insert(name.to_ascii_lowercase(), self.rows.len());
+                self.rows.push((name, on));
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::EnableHash;
+
+    fn loaded() -> EnableHash {
+        EnableHash::from_rows([("Kept".to_string(), true), ("Off".to_string(), false)])
+    }
+
+    #[test]
+    fn a_loaded_hash_is_clean_and_keeps_the_first_spelling_with_the_last_value() {
+        let h = EnableHash::from_rows([
+            ("MyAddon".to_string(), true),
+            ("myaddon".to_string(), false),
+        ]);
+        assert!(!h.is_dirty());
+        assert_eq!(h.rows(), &[("MyAddon".to_string(), false)]);
+        assert_eq!(h.get("MYADDON"), Some(false));
+    }
+
+    #[test]
+    fn setting_a_row_to_its_own_value_does_not_dirty() {
+        let mut h = loaded();
+        h.set("kept", true);
+        h.set("OFF", false);
+        assert!(!h.is_dirty());
+        assert_eq!(h.clone().take_dirty(), None, "a clean node writes nothing");
+    }
+
+    #[test]
+    fn a_changed_row_dirties_and_the_writer_takes_every_row_once() {
+        let mut h = loaded();
+        h.set("Kept", false);
+        assert!(h.is_dirty());
+        assert_eq!(
+            h.take_dirty(),
+            Some(vec![
+                ("Kept".to_string(), false),
+                ("Off".to_string(), false)
+            ])
+        );
+        assert!(!h.is_dirty(), "the writer clears the flag (`0x51ef68`)");
+        assert_eq!(h.take_dirty(), None);
+    }
+
+    /// A miss inserts even when the value matches what the character inherited: the setter has
+    /// no view of the aggregate, only of this node's table.
+    #[test]
+    fn a_missing_row_is_inserted_and_dirties() {
+        let mut h = loaded();
+        h.set("New", true);
+        assert!(h.is_dirty());
+        assert_eq!(h.get("new"), Some(true));
+        assert_eq!(h.rows().len(), 3);
+    }
+}
diff --git a/crates/benilla-ui/src/script/auction.rs b/crates/benilla-ui/src/script/auction.rs
index 5c466cdb..6ef25f1a 100644
--- a/crates/benilla-ui/src/script/auction.rs
+++ b/crates/benilla-ui/src/script/auction.rs
@@ -59,8 +59,8 @@ pub struct AuctionItemRow {
     pub buyout_price: u32,
     /// The current high bid; 0 before any bid.
     pub bid_amount: u32,
-    /// Whether the player holds the high bid: a flag, not a name.
-    pub high_bidder: bool,
+    /// `GetAuctionItemInfo`'s eleventh value, which the app picks per list and row.
+    pub high_bidder: AuctionHighBidder,
     /// The seller's name; `None` while the name query is in flight.
     pub owner: Option<String>,
     /// The time-left bucket, `1..=4` (Short, Medium, Long, Very Long); 0 when not known yet.
@@ -69,6 +69,20 @@ pub struct AuctionItemRow {
     pub link: Option<String>,
 }
 
+/// `GetAuctionItemInfo`'s `highBidder` (`0x4cf12a`–`0x4cf1a0`): on an `"owner"` row the player
+/// owns, the bidder's name from the name cache; on any other row, `1` when the player holds the
+/// bid. Nil otherwise, which the stock Auctions tab prints as `NO_BIDS`.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub enum AuctionHighBidder {
+    /// No bid, another player's bid on a row the player does not own, or a name not arrived.
+    #[default]
+    Nil,
+    /// The player holds the bid on a row it does not own: `1`.
+    Player,
+    /// The bidder on the player's own auction, by name.
+    Name(String),
+}
+
 /// One of the three lists: the batch the server sent, the pre-cap match count and its sort stack.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct AuctionListState {
@@ -303,7 +317,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // GetAuctionItemInfo(type, index) → twelve values; `highBidder` is a flag, not the seller.
+    // GetAuctionItemInfo(type, index) → twelve values; `highBidder` is a name, `1` or nil.
     g.set(
         "GetAuctionItemInfo",
         lua.create_function(|lua, (kind, index): (String, usize)| {
@@ -354,7 +368,11 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                 Value::Integer(i64::from(r.min_increment)),
                 Value::Integer(i64::from(r.buyout_price)),
                 Value::Integer(i64::from(r.bid_amount)),
-                flag(r.high_bidder),
+                match &r.high_bidder {
+                    AuctionHighBidder::Nil => Value::Nil,
+                    AuctionHighBidder::Player => flag(true),
+                    AuctionHighBidder::Name(n) => Value::String(lua.create_string(n)?),
+                },
                 opt_str(&r.owner)?,
             ]))
         })?,
@@ -918,6 +936,30 @@ mod tests {
         assert_eq!(n, 0, "zero values, not one nil");
     }
 
+    /// The eleventh value is the name, `1` or nil as the app picked it (`0x4cf12a`–`0x4cf1a0`).
+    #[test]
+    fn high_bidder_answers_a_name_a_one_or_nil() {
+        let mut s = UiScript::new().unwrap();
+        let mut state = page(&[1, 2, 3]);
+        state.lists[LIST].rows[0].high_bidder = AuctionHighBidder::Name("Bidder".into());
+        state.lists[LIST].rows[1].high_bidder = AuctionHighBidder::Player;
+        s.set_auction(Some(state));
+        let eleventh = |i: usize| {
+            s.eval::<Value>(&format!(
+                r#"local _,_,_,_,_,_,_,_,_,_,h = GetAuctionItemInfo("list", {i}) return h"#
+            ))
+            .unwrap()
+        };
+        assert_eq!(
+            eleventh(1)
+                .as_string()
+                .map(|v| v.to_str().unwrap().to_string()),
+            Some("Bidder".into())
+        );
+        assert_eq!(eleventh(2), Value::Integer(1));
+        assert_eq!(eleventh(3), Value::Nil);
+    }
+
     /// A 9-copper stack at 5% over 24 h deposits 0 here, where vmangos charges 5.
     #[test]
     fn the_deposit_is_the_clients_arithmetic_truncation_and_all() {
diff --git a/crates/benilla-ui/src/script/aura/mod.rs b/crates/benilla-ui/src/script/aura/mod.rs
index db930c69..31760129 100644
--- a/crates/benilla-ui/src/script/aura/mod.rs
+++ b/crates/benilla-ui/src/script/aura/mod.rs
@@ -1,10 +1,12 @@
-//! The aura bindings, over the per-token lists the app pushes through [`UiScript::set_auras`] in
-//! display order: the player's in the reference's insertion-ordered cache (`0xbc6040`), kept by
-//! `benilla::ui_aura`, any other unit's by ascending aura slot. The player's list keeps cache order
-//! under every token, where the reference's `UnitBuff("player", i)` reads by slot.
+//! The aura bindings, over the lists the app pushes in display order: the player's in the
+//! reference's insertion-ordered cache (`0xbc6040`), kept by `benilla::ui_aura`, every other unit's
+//! by guid, in ascending aura slot. A token resolves to its guid as the reference's resolver
+//! `0x515970` does ([`super::UnitGuids`]), so `"mouseover"`, `"party1target"` and `"PLAYER"` read
+//! the list of the unit they name, and a token naming the player reads the player's list in cache
+//! order, where the reference's `UnitBuff("player", i)` reads by slot.
 //!
-//! `UnitAura`, `UnitBuff`, `UnitDebuff` and `CancelUnitBuff` take a token and a 1-based index into
-//! the sign-filtered list; the getters answer nil past the end. The 1.12 `GetPlayerBuff`
+//! `UnitBuff` and `UnitDebuff` take a token and a 1-based index into the sign-filtered list and
+//! answer nothing past the end. The 1.12 `GetPlayerBuff`
 //! ([`player_buff`]) takes a 0-based index and returns a cache position, the same number under
 //! every filter, which its siblings and `GameTooltip:SetPlayerBuff` take in place of the counter.
 //!
@@ -17,10 +19,11 @@ use super::Model;
 
 mod player_buff;
 
-/// One aura on one unit, as the app's [`crate::script::UiScript::set_auras`] feed pushes it.
+/// One aura on one unit, as the app's feed pushes it ([`crate::script::UiScript::set_unit_auras`],
+/// [`crate::script::UiScript::set_player_auras`]).
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct AuraState {
-    /// `Spell.dbc` id, `UnitAura`'s `spellId`.
+    /// `Spell.dbc` id, what `CMSG_CANCEL_AURA` names and the app's icon lookup keys on.
     pub spell_id: u32,
     /// The spell's name; `None` when the catalog lacks the id.
     pub name: Option<String>,
@@ -61,43 +64,16 @@ pub struct TrackingState {
     pub cancelable: bool,
 }
 
-/// `UnitAura`'s `filter`: `|`-separated tokens, the sign defaulting to `HELPFUL` as in the Era API.
-struct Filter {
-    helpful: bool,
-    cancelable: Option<bool>,
-}
-
-impl Filter {
-    fn parse(spec: Option<&str>) -> Self {
-        let spec = spec.unwrap_or("");
-        let has = |t: &str| spec.split('|').any(|s| s.trim().eq_ignore_ascii_case(t));
-        Self {
-            helpful: !has("HARMFUL"),
-            cancelable: match (has("CANCELABLE"), has("NOT_CANCELABLE")) {
-                (true, false) => Some(true),
-                (false, true) => Some(false),
-                // Both or neither: no constraint; the reference never passes both.
-                _ => None,
-            },
-        }
-    }
-
-    fn matches(&self, a: &AuraState) -> bool {
-        a.helpful == self.helpful && self.cancelable.is_none_or(|c| a.cancelable == c)
-    }
-}
-
-/// The cancel gate of `CancelUnitBuff` and `CancelPlayerBuff` (`0x4e49a0`, `0x4e49fb`-`0x4e4a14`):
+/// The cancel gate of `CancelPlayerBuff` (`0x4e49a0`, `0x4e49fb`-`0x4e4a14`):
 /// a helpful aura with `AFLAG_CANCELABLE` (vmangos: unless `SPELL_ATTR_NO_AURA_CANCEL`), or any
 /// aura of a channeled spell, the only negative aura that cancels (breaking a channel on you).
 pub(super) fn cancel_authorized(a: &AuraState) -> bool {
     (a.helpful && a.cancelable) || a.channeled
 }
 
-/// The 1.12 tuple, not a prefix of the Era one: `UnitBuff` returns `(texture, applications)`
-/// (`0x519500`) and `UnitDebuff` adds `dispelType` (`0x5198f0`), as stock `TargetFrame.lua:287-290`
-/// reads them.
-fn returns_1121(lua: &Lua, a: &AuraState, with_dispel_type: bool) -> mlua::Result<MultiValue> {
+/// The 1.12 tuple: `UnitBuff` returns `(texture, applications)` (`0x519500`) and `UnitDebuff` adds
+/// `dispelType` (`0x5198f0`), as stock `TargetFrame.lua:287-290` reads them.
+fn returns(lua: &Lua, a: &AuraState, with_dispel_type: bool) -> mlua::Result<MultiValue> {
     let icon = match &a.icon {
         Some(t) => Value::String(lua.create_string(t)?),
         None => Value::Nil,
@@ -112,92 +88,107 @@ fn returns_1121(lua: &Lua, a: &AuraState, with_dispel_type: bool) -> mlua::Resul
     Ok(MultiValue::from_vec(out))
 }
 
-/// Which return tuple a getter pushes.
-#[derive(Clone, Copy)]
-enum Shape {
-    /// `UnitAura`'s ten values, the Era signature.
-    Era,
-    /// `UnitBuff`'s two.
-    Buff,
-    /// `UnitDebuff`'s three.
-    Debuff,
+/// The list of the unit `token` names, through the resolver (`0x515970`, which `UnitBuff` calls at
+/// `0x519542`): the player's cache list for the player, else that guid's; `None` for nobody or a
+/// unit with no list. A token the resolver does not recognise raises `Unknown unit name`.
+pub(crate) fn auras_of<'m>(model: &'m Model, token: &str) -> mlua::Result<Option<&'m [AuraState]>> {
+    let guids = &model.unit_guids;
+    Ok(guids.guid_of(token)?.and_then(|g| {
+        if g == guids.player {
+            Some(model.player_auras.as_slice())
+        } else {
+            model.unit_auras.get(&g).map(Vec::as_slice)
+        }
+    }))
 }
 
-fn returns(lua: &Lua, a: &AuraState) -> mlua::Result<MultiValue> {
-    let s = |v: &Option<String>| -> mlua::Result<Value> {
-        Ok(match v {
-            Some(t) => Value::String(lua.create_string(t)?),
-            None => Value::Nil,
-        })
-    };
-    Ok(MultiValue::from_vec(vec![
-        s(&a.name)?,
-        s(&a.icon)?,
-        Value::Integer(i64::from(a.count)),
-        s(&a.debuff_type)?,
-        Value::Number(a.duration),
-        Value::Number(a.expiration_time),
-        Value::Nil, // source: the 1.12 wire carries no aura caster
-        Value::Nil, // isStealable: Spellsteal is TBC
-        Value::Nil, // nameplateShowPersonal
-        Value::Integer(i64::from(a.spell_id)),
-    ]))
-}
-
-/// The `index`-th (1-based) aura of `token` passing `filter`, in pushed order; out of range is a
-/// bare nil, the loop terminator.
+/// The `index`-th (1-based) buff (`helpful`) or debuff of `token`, in pushed order; out of range
+/// answers nothing, the loop terminator.
 fn nth_aura(
     lua: &Lua,
     token: &Option<String>,
     index: i64,
-    filter: &Filter,
-    shape: Shape,
+    helpful: bool,
 ) -> mlua::Result<MultiValue> {
-    if index < 1 {
-        return Ok(MultiValue::new());
-    }
+    // The token resolves before the index is read (`0x519542`, then `0x51957a`), so a bad token
+    // raises at any index.
     let hit = {
         let model = lua.app_data_ref::<Model>().expect("model app_data");
-        token
-            .as_ref()
-            .and_then(|t| model.auras.get(t))
-            .and_then(|list| {
-                list.iter()
-                    .filter(|a| filter.matches(a))
-                    .nth((index - 1) as usize)
-                    .cloned()
-            })
+        match token {
+            Some(t) => auras_of(&model, t)?
+                .filter(|_| index >= 1)
+                .and_then(|list| {
+                    list.iter()
+                        .filter(|a| a.helpful == helpful)
+                        .nth((index - 1) as usize)
+                        .cloned()
+                }),
+            None => None,
+        }
     };
     match hit {
-        Some(a) => match shape {
-            Shape::Era => returns(lua, &a),
-            Shape::Buff => returns_1121(lua, &a, false),
-            Shape::Debuff => returns_1121(lua, &a, true),
-        },
+        Some(a) => returns(lua, &a, !helpful),
         None => Ok(MultiValue::new()),
     }
 }
 
 impl super::UiScript {
-    /// Push or clear a token's aura list, in display order: cache order for the player, ascending
-    /// aura slot for anyone else.
-    pub fn set_auras(&mut self, token: &str, auras: Option<Vec<AuraState>>) {
+    /// Push the player's aura list in the cache's order (`0xbc6040`), durations joined.
+    pub fn set_player_auras(&mut self, auras: Vec<AuraState>) {
+        self.model_mut().player_auras = auras;
+    }
+
+    /// Push or clear a unit's aura list by guid, in ascending aura slot; any token naming the unit
+    /// reads it. The player's is [`Self::set_player_auras`].
+    pub fn set_unit_auras(&mut self, guid: u64, auras: Option<Vec<AuraState>>) {
         let mut model = self.model_mut();
         match auras {
             Some(a) => {
-                model.auras.insert(token.to_string(), a);
+                model.unit_auras.insert(guid, a);
             }
             None => {
-                model.auras.remove(token);
+                model.unit_auras.remove(&guid);
             }
         }
     }
 
+    /// Drop every aura list, the player's with the rest: the session's end.
+    pub fn clear_auras(&mut self) {
+        let mut model = self.model_mut();
+        model.player_auras.clear();
+        model.unit_auras.clear();
+    }
+
+    /// Push the unit-token resolver's inputs, copied only when they moved.
+    pub fn set_unit_guids(&mut self, guids: &super::UnitGuids) {
+        let mut model = self.model_mut();
+        if model.unit_guids != *guids {
+            model.unit_guids.clone_from(guids);
+        }
+    }
+
     /// Push or clear the player's active [`TrackingState`].
     pub fn set_tracking(&mut self, tracking: Option<TrackingState>) {
         self.model_mut().tracking = tracking;
     }
 
+    /// The spell ids of the buffs (`helpful`) or debuffs of the unit `token` names, in the order
+    /// `UnitBuff`/`UnitDebuff` enumerate them; empty for nobody and for a token the resolver
+    /// refuses. No 1.12 verb answers an aura's spell id, so this is the host's read.
+    pub fn aura_spell_ids(&self, token: &str, helpful: bool) -> Vec<u32> {
+        let model = self.model_ref();
+        auras_of(&model, token)
+            .ok()
+            .flatten()
+            .map(|list| {
+                list.iter()
+                    .filter(|a| a.helpful == helpful)
+                    .map(|a| a.spell_id)
+                    .collect()
+            })
+            .unwrap_or_default()
+    }
+
     /// Drain the queued cancels, one `CMSG_CANCEL_AURA` per spell id: the server cancels by spell,
     /// never by slot.
     pub fn take_cancel_aura_requests(&mut self) -> Vec<u32> {
@@ -209,23 +200,6 @@ impl super::UiScript {
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     let g = lua.globals();
 
-    // UnitAura(unit, index [, filter]), filter defaulting to HELPFUL, with the Era tuple: not a
-    // 1.12 verb.
-    g.set(
-        "UnitAura",
-        lua.create_function(
-            |lua, (token, index, filter): (Option<String>, i64, Option<String>)| {
-                nth_aura(
-                    lua,
-                    &token,
-                    index,
-                    &Filter::parse(filter.as_deref()),
-                    Shape::Era,
-                )
-            },
-        )?,
-    )?;
-
     // UnitBuff(unit, index [, raidFilter]) and UnitDebuff: the verb fixes the sign, `0x519500`
     // reading aura slots 0..31 and `0x5198f0` slots 32..47. A non-zero `raidFilter` keeps only
     // buffs the player can cast (`0x4b3870`) or debuffs they can dispel (`0x4b3920`); it is
@@ -235,13 +209,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "UnitBuff",
         lua.create_function(
             |lua, (token, index, _raid_filter): (Option<String>, i64, Option<Value>)| {
-                nth_aura(
-                    lua,
-                    &token,
-                    index,
-                    &Filter::parse(Some("HELPFUL")),
-                    Shape::Buff,
-                )
+                nth_aura(lua, &token, index, true)
             },
         )?,
     )?;
@@ -249,47 +217,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "UnitDebuff",
         lua.create_function(
             |lua, (token, index, _raid_filter): (Option<String>, i64, Option<Value>)| {
-                nth_aura(
-                    lua,
-                    &token,
-                    index,
-                    &Filter::parse(Some("HARMFUL")),
-                    Shape::Debuff,
-                )
-            },
-        )?,
-    )?;
-
-    // CancelUnitBuff(unit, index [, filter]): not a 1.12 verb, the Era name for the reference's
-    // `CancelPlayerBuff`. It queues the aura's spell id, what `CMSG_CANCEL_AURA` carries; an aura
-    // the gate refuses is a silent no-op, as in the reference.
-    g.set(
-        "CancelUnitBuff",
-        lua.create_function(
-            |lua, (token, index, filter): (Option<String>, i64, Option<String>)| {
-                let spec = match filter {
-                    Some(f) => format!("HELPFUL|{f}"),
-                    None => "HELPFUL".to_string(),
-                };
-                let f = Filter::parse(Some(&spec));
-                let hit = {
-                    let model = lua.app_data_ref::<Model>().expect("model app_data");
-                    token
-                        .as_ref()
-                        .filter(|_| index >= 1)
-                        .and_then(|t| model.auras.get(t))
-                        .and_then(|list| {
-                            list.iter()
-                                .filter(|a| f.matches(a))
-                                .nth((index - 1) as usize)
-                                .cloned()
-                        })
-                };
-                if let Some(a) = hit.filter(cancel_authorized) {
-                    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-                    model.cancel_aura_requests.push(a.spell_id);
-                }
-                Ok(())
+                nth_aura(lua, &token, index, false)
             },
         )?,
     )?;
@@ -325,7 +253,21 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
 #[cfg(test)]
 mod tests {
-    use crate::script::{AuraState, TrackingState, UiScript};
+    use crate::script::{AuraState, TrackingState, UiScript, UnitGuids};
+
+    const ME: u64 = 0x10;
+    const TARGET: u64 = 0xF130_0000_0000_0001;
+
+    /// A VM whose resolver names us as `player` and `TARGET` as `target`.
+    fn script() -> UiScript {
+        let mut s = UiScript::new().unwrap();
+        s.set_unit_guids(&UnitGuids {
+            player: ME,
+            target: TARGET,
+            ..Default::default()
+        });
+        s
+    }
 
     fn aura(spell_id: u32, name: &str, helpful: bool, cancelable: bool) -> AuraState {
         AuraState {
@@ -344,20 +286,17 @@ mod tests {
     }
 
     #[test]
-    fn unit_aura_enumerates_the_pushed_order_not_the_spell_id_order() {
-        let mut s = UiScript::new().unwrap();
-        s.set_auras(
-            "player",
-            Some(vec![
-                aura(2457, "Battle Stance", true, true),
-                aura(1126, "Mark of the Wild", true, true),
-                aura(589, "Shadow Word: Pain", false, false),
-            ]),
-        );
+    fn unit_buff_enumerates_the_pushed_order_not_the_spell_id_order() {
+        let mut s = script();
+        s.set_player_auras(vec![
+            aura(2457, "Battle Stance", true, true),
+            aura(1126, "Mark of the Wild", true, true),
+            aura(589, "Shadow Word: Pain", false, false),
+        ]);
         assert_eq!(
-            s.eval::<String>(r#"return (UnitAura("player", 1))"#)
+            s.eval::<String>(r#"return (UnitBuff("player", 1))"#)
                 .unwrap(),
-            "Battle Stance"
+            "Interface\\Icons\\Spell_2457"
         );
         // `UnitBuff` and `UnitDebuff` return the icon first, the 1.12 shape.
         assert_eq!(
@@ -378,88 +317,24 @@ mod tests {
             .eval::<bool>(r#"return UnitDebuff("player", 2) == nil"#)
             .unwrap());
         assert!(s
-            .eval::<bool>(r#"return UnitAura("target", 1) == nil"#)
+            .eval::<bool>(r#"return UnitBuff("target", 1) == nil"#)
             .unwrap());
-        assert!(s
-            .eval::<bool>(r#"return UnitAura("player", 0) == nil"#)
-            .unwrap());
-    }
-
-    #[test]
-    fn unit_aura_defaults_to_helpful_and_honours_the_cancelable_tokens() {
-        let mut s = UiScript::new().unwrap();
-        s.set_auras(
-            "player",
-            Some(vec![
-                aura(2457, "Battle Stance", true, true),
-                aura(9999, "Sealed", true, false), // helpful, not cancelable
-                aura(589, "Pain", false, false),
-            ]),
-        );
-        // No filter means HELPFUL.
         assert_eq!(
-            s.eval::<i64>(
-                r#"local n = 0 for i=1,10 do if UnitAura("player", i) then n = n + 1 end end return n"#
-            )
-            .unwrap(),
-            2
-        );
-        assert_eq!(
-            s.eval::<String>(r#"return (UnitAura("player", 1, "HARMFUL"))"#)
-                .unwrap(),
-            "Pain"
-        );
-        assert_eq!(
-            s.eval::<String>(r#"return (UnitAura("player", 1, "HELPFUL|CANCELABLE"))"#)
-                .unwrap(),
-            "Battle Stance"
-        );
-        assert_eq!(
-            s.eval::<String>(r#"return (UnitAura("player", 1, "HELPFUL|NOT_CANCELABLE"))"#)
-                .unwrap(),
-            "Sealed"
-        );
-        // A bare CANCELABLE keeps the helpful default.
-        assert_eq!(
-            s.eval::<String>(r#"return (UnitAura("player", 1, "CANCELABLE"))"#)
-                .unwrap(),
-            "Battle Stance"
+            s.arity(r#"UnitBuff("player", 0)"#).unwrap(),
+            0,
+            "a miss answers nothing"
         );
     }
 
     #[test]
-    fn unit_aura_returns_the_era_tuple_with_the_unknowable_fields_nil() {
-        let mut s = UiScript::new().unwrap();
-        let mut a = aura(589, "Shadow Word: Pain", false, false);
-        a.count = 3;
-        a.debuff_type = Some("Magic".into());
-        a.duration = 18.0;
-        a.expiration_time = 1042.5;
-        s.set_auras("target", Some(vec![a]));
-
-        let (name, icon, count, dtype, dur, expiry, spell) = s
-            .eval::<(String, String, i64, String, f64, f64, i64)>(
-                r#"local n, i, c, d, du, e, src, st, np, sid = UnitAura("target", 1, "HARMFUL")
-                   assert(src == nil and st == nil and np == nil, "unknowable fields must be nil")
-                   return n, i, c, d, du, e, sid"#,
-            )
-            .unwrap();
-        assert_eq!(name, "Shadow Word: Pain");
-        assert_eq!(icon, "Interface\\Icons\\Spell_589");
-        assert_eq!((count, dtype.as_str()), (3, "Magic"));
-        assert_eq!((dur, expiry), (18.0, 1042.5));
-        assert_eq!(spell, 589);
-    }
-
-    #[test]
-    fn unit_buff_and_unit_debuff_return_the_1121_tuple_not_the_era_one() {
-        let mut s = UiScript::new().unwrap();
+    fn unit_buff_and_unit_debuff_return_the_1121_tuple() {
+        let mut s = script();
         let mut buff = aura(1126, "Mark of the Wild", true, true);
         buff.count = 1;
         let mut debuff = aura(589, "Shadow Word: Pain", false, false);
         debuff.count = 3;
         debuff.debuff_type = Some("Magic".into());
-        s.set_auras("target", Some(vec![buff, debuff]));
+        s.set_unit_auras(TARGET, Some(vec![buff, debuff]));
 
         let (icon, count, third) = s
             .eval::<(String, i64, Option<String>)>(
@@ -498,30 +373,9 @@ mod tests {
         );
     }
 
-    #[test]
-    fn cancel_unit_buff_queues_the_spell_id_and_refuses_a_non_cancelable_aura() {
-        let mut s = UiScript::new().unwrap();
-        s.set_auras(
-            "player",
-            Some(vec![
-                aura(2457, "Battle Stance", true, true),
-                aura(9999, "Sealed", true, false),
-                aura(589, "Pain", false, false),
-            ]),
-        );
-        assert!(s.take_cancel_aura_requests().is_empty());
-
-        // Only the cancelable buff queues, by spell id; the others are silent no-ops.
-        s.eval::<()>(r#"CancelUnitBuff("player", 1)"#).unwrap();
-        s.eval::<()>(r#"CancelUnitBuff("player", 2)"#).unwrap();
-        s.eval::<()>(r#"CancelUnitBuff("player", 9)"#).unwrap();
-        assert_eq!(s.take_cancel_aura_requests(), vec![2457]);
-        assert!(s.take_cancel_aura_requests().is_empty());
-    }
-
     #[test]
     fn tracking_bindings_read_the_pushed_state_and_cancel_by_spell_id() {
-        let mut s = UiScript::new().unwrap();
+        let mut s = script();
         assert!(s
             .eval::<bool>("return GetTrackingTexture() == nil")
             .unwrap());
@@ -556,15 +410,179 @@ mod tests {
     }
 
     #[test]
-    fn set_auras_none_clears_the_token() {
-        let mut s = UiScript::new().unwrap();
-        s.set_auras("player", Some(vec![aura(2457, "Stance", true, true)]));
+    fn an_emptied_player_list_answers_nil() {
+        let mut s = script();
+        s.set_player_auras(vec![aura(2457, "Stance", true, true)]);
         assert!(s
-            .eval::<bool>(r#"return UnitAura("player", 1) ~= nil"#)
+            .eval::<bool>(r#"return UnitBuff("player", 1) ~= nil"#)
             .unwrap());
-        s.set_auras("player", None);
+        s.set_player_auras(Vec::new());
         assert!(s
-            .eval::<bool>(r#"return UnitAura("player", 1) == nil"#)
+            .eval::<bool>(r#"return UnitBuff("player", 1) == nil"#)
             .unwrap());
     }
+
+    const MOB: u64 = 0xF130_0000_0000_0002;
+    const P1: u64 = 0x21;
+    const P1_TARGET: u64 = 0xF130_0000_0000_0003;
+
+    /// We target `TARGET`, which targets party1, who targets `P1_TARGET`, which targets us; the mouse
+    /// is over `MOB`. Each unit's list holds a buff and a debuff whose spell ids, and so icons, are
+    /// its own: `base + 1` and `base + 2`.
+    fn group_script() -> UiScript {
+        let mut s = UiScript::new().unwrap();
+        s.set_unit_guids(&UnitGuids {
+            player: ME,
+            target: TARGET,
+            mouseover: MOB,
+            party: [P1, 0, 0, 0],
+            held: [
+                (ME, TARGET),
+                (TARGET, P1),
+                (P1, P1_TARGET),
+                (MOB, 0),
+                (P1_TARGET, ME),
+            ]
+            .into_iter()
+            .collect(),
+            ..Default::default()
+        });
+        s.set_player_auras(vec![
+            aura(2457, "Battle Stance", true, true),
+            aura(1126, "Mark of the Wild", true, true),
+            aura(11976, "Strike", false, false),
+        ]);
+        for (guid, base, name) in [
+            (TARGET, 100, "on the target"),
+            (MOB, 200, "on the mouseover"),
+            (P1, 300, "on party1"),
+            (P1_TARGET, 400, "on party1's target"),
+        ] {
+            s.set_unit_auras(
+                guid,
+                Some(vec![
+                    aura(base + 1, name, true, true),
+                    aura(base + 2, name, false, false),
+                ]),
+            );
+        }
+        s
+    }
+
+    /// The icon a read answers, the list's identity.
+    fn icon_of(s: &UiScript, call: &str) -> Option<String> {
+        s.eval::<Option<String>>(&format!("return ({call})"))
+            .unwrap()
+    }
+
+    /// Every token reads the list of the unit the resolver names (`0x515970` at `0x519542`): the
+    /// mouseover, a group member's target and any depth of `target` chain.
+    #[test]
+    fn a_token_reads_the_list_of_the_unit_it_names() {
+        let s = group_script();
+        for (token, base) in [
+            ("mouseover", 200),
+            ("party1target", 400),
+            ("targettarget", 300),
+            ("TargetTarget", 300),
+            ("targettargettarget", 400),
+            ("party1", 300),
+            ("PARTY1", 300),
+        ] {
+            assert_eq!(
+                icon_of(&s, &format!(r#"UnitBuff("{token}", 1)"#)),
+                Some(format!("Interface\\Icons\\Spell_{}", base + 1)),
+                "{token}"
+            );
+            assert_eq!(
+                icon_of(&s, &format!(r#"UnitDebuff("{token}", 1)"#)),
+                Some(format!("Interface\\Icons\\Spell_{}", base + 2)),
+                "{token}"
+            );
+        }
+        assert!(s
+            .eval::<bool>(r#"return UnitBuff("party1target", 2) == nil"#)
+            .unwrap());
+    }
+
+    /// A token naming the player, in any case or down a chain, reads the player's list in cache
+    /// order, as `"player"` does.
+    #[test]
+    fn a_token_naming_the_player_reads_the_player_list() {
+        let s = group_script();
+        for token in [
+            "player",
+            "PLAYER",
+            "Player",
+            "targettargettargettarget",
+            "party1TARGETtarget",
+        ] {
+            assert_eq!(
+                icon_of(&s, &format!(r#"UnitBuff("{token}", 2)"#)).as_deref(),
+                Some("Interface\\Icons\\Spell_1126"),
+                "{token}"
+            );
+        }
+        assert!(s
+            .eval::<bool>(
+                r#"local a, n = UnitBuff("PLAYER", 1)
+                   local b, m = UnitBuff("player", 1)
+                   local c = UnitDebuff("targettargettargettarget", 1)
+                   return a == b and n == m and a == "Interface\\Icons\\Spell_2457"
+                       and c == "Interface\\Icons\\Spell_11976""#
+            )
+            .unwrap());
+    }
+
+    /// A recognised token naming nobody is nil; a token none of the resolver's nine compares match
+    /// raises `Unknown unit name: %s` (`0x515c14`), at any index, as the resolver runs first.
+    #[test]
+    fn an_unknown_token_raises_and_a_recognised_empty_one_is_nil() {
+        let s = group_script();
+        for call in [
+            r#"UnitBuff("party2", 1)"#,
+            r#"UnitDebuff("raid1target", 1)"#,
+            r#"UnitBuff("mouseovertargettarget", 1)"#,
+            r#"UnitBuff("playerfoo", 1)"#,
+            r#"UnitBuff("pet", 1)"#,
+            r#"UnitBuff("", 1)"#,
+        ] {
+            assert!(
+                s.eval::<bool>(&format!("return {call} == nil")).unwrap(),
+                "{call}"
+            );
+        }
+        for call in [
+            r#"UnitBuff("bogus", 1)"#,
+            r#"UnitDebuff("focus", 1)"#,
+            r#"UnitDebuff("npctarget", 1)"#,
+            r#"UnitBuff("bogus", 0)"#,
+        ] {
+            let err = s.eval::<()>(call).unwrap_err().to_string();
+            assert!(err.contains("Unknown unit name: "), "{call}: {err}");
+        }
+    }
+
+    /// `GameTooltip:SetUnitBuff` resolves as `UnitBuff` does (`0x534b8b`).
+    #[test]
+    fn set_unit_buff_resolves_the_token() {
+        let s = group_script();
+        s.run(
+            r#"local a = CreateFrame("Button", "TF1")
+               a:SetPoint("CENTER", 0, 0) a:SetWidth(10) a:SetHeight(10)
+               TT = CreateFrame("GameTooltip", "TT")
+               TT:SetOwner(a, "ANCHOR_BOTTOMRIGHT")
+               TT:SetUnitDebuff("MouseOver", 1)"#,
+        )
+        .unwrap();
+        assert_eq!(
+            s.eval::<String>("return TTTextLeft1:GetText()").unwrap(),
+            "on the mouseover"
+        );
+        let err = s
+            .run(r#"TT:SetUnitBuff("bogus", 1)"#)
+            .unwrap_err()
+            .to_string();
+        assert!(err.contains("Unknown unit name: bogus"), "{err}");
+    }
 }
diff --git a/crates/benilla-ui/src/script/aura/player_buff.rs b/crates/benilla-ui/src/script/aura/player_buff.rs
index d41eaa73..93581a16 100644
--- a/crates/benilla-ui/src/script/aura/player_buff.rs
+++ b/crates/benilla-ui/src/script/aura/player_buff.rs
@@ -6,7 +6,7 @@ use mlua::{Lua, MultiValue, Value};
 
 use super::{cancel_authorized, AuraState, Model};
 
-/// `GetPlayerBuff`'s filter mask, not `UnitAura`'s parser: no filter argument means
+/// `GetPlayerBuff`'s filter mask: no filter argument means
 /// `HELPFUL|HARMFUL` (`0x4e4618`), and a filter string starts the mask at zero (`0x4e4639`), so a
 /// bare `"CANCELABLE"` matches nothing.
 #[derive(Clone, Copy)]
@@ -73,7 +73,7 @@ fn buff_index_arg(lua: &Lua, v: Value, usage: &'static str) -> mlua::Result<i64>
 fn player_buff_record(lua: &Lua, pos: i64) -> Option<AuraState> {
     let pos = usize::try_from(pos).ok()?;
     let model = lua.app_data_ref::<Model>().expect("model app_data");
-    model.auras.get("player")?.get(pos).cloned()
+    model.player_auras.get(pos).cloned()
 }
 
 /// The enumerator (`0x4e43b0`): the `index`-th record passing `filter`, by ascending position,
@@ -88,8 +88,7 @@ fn enumerate_player_buff(
     }
     let model = lua.app_data_ref::<Model>().expect("model app_data");
     model
-        .auras
-        .get("player")?
+        .player_auras
         .iter()
         .enumerate()
         .filter(|(_, a)| filter.matches(a))
@@ -165,7 +164,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "GetPlayerBuffTimeLeft",
         lua.create_function(|lua, index: Value| {
             let pos = buff_index_arg(lua, index, "Usage: GetPlayerBuffTimeLeft(buffIndex)")?;
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             // `max(0, …)` covers both zero cases: an expired aura, and a permanent one, expiry 0.
             Ok(player_buff_record(lua, pos).map_or(0.0, |a| (a.expiration_time - now).max(0.0)))
         })?,
@@ -173,7 +172,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
     // CancelPlayerBuff(buffIndex) (`0x4e49a0`): no return values on any path. It queues the spell
     // id, the one `u32` of `CMSG_CANCEL_AURA` (0x136, `Spell_C::CancelAura` `0x6e7040`), on the
-    // queue `CancelUnitBuff` uses; a refused or absent aura is a silent no-op.
+    // queue `CancelTrackingBuff` uses; a refused or absent aura is a silent no-op.
     g.set(
         "CancelPlayerBuff",
         lua.create_function(|lua, index: Value| {
@@ -226,7 +225,7 @@ mod tests {
 
     fn with_player_cache() -> UiScript {
         let mut s = UiScript::new().unwrap();
-        s.set_auras("player", Some(player_cache()));
+        s.set_player_auras(player_cache());
         s
     }
 
@@ -239,7 +238,7 @@ mod tests {
             s.arity("GetPlayerBuff(0)").unwrap(),
             2,
             "1.12 pushes exactly two values (`mov eax,0x2` at 0x4e471e) — a hit must not be a tuple \
-             of aura fields, which is the modern UnitAura shape"
+             of aura fields, which is a later client's aura shape"
         );
         assert_eq!(
             s.arity("GetPlayerBuff(99)").unwrap(),
@@ -271,7 +270,7 @@ mod tests {
         assert!(s
             .eval::<bool>("local _, uc = GetPlayerBuff(0) return uc == 0")
             .unwrap());
-        s.set_auras("player", None);
+        s.set_player_auras(Vec::new());
         assert_eq!(
             s.eval::<(i64, i64)>("return GetPlayerBuff(0)").unwrap(),
             (-1, 0)
@@ -310,7 +309,7 @@ mod tests {
             "Interface\\Icons\\Spell_1126;Interface\\Icons\\Spell_2457;Interface\\Icons\\Spell_589;"
         );
 
-        s.set_auras("player", Some(vec![]));
+        s.set_player_auras(vec![]);
         assert_eq!(
             s.eval::<i64>(
                 r#"local c = 0
@@ -523,7 +522,7 @@ mod tests {
     }
 
     #[test]
-    fn cancel_player_buff_shares_the_gate_and_the_queue_with_cancel_unit_buff() {
+    fn cancel_player_buff_gates_on_the_aura_and_queues_its_spell_id() {
         let mut s = with_player_cache();
         assert!(s.take_cancel_aura_requests().is_empty());
 
@@ -537,15 +536,10 @@ mod tests {
         }
         assert!(s.take_cancel_aura_requests().is_empty());
 
-        // Both names reach one queue: the first helpful aura is cache position 0.
-        s.eval::<()>(r#"CancelUnitBuff("player", 1)"#).unwrap();
-        s.eval::<()>("CancelPlayerBuff(0)").unwrap();
-        assert_eq!(s.take_cancel_aura_requests(), vec![1126, 1126]);
-
         // The channeled arm (`AttributesEx & 0x4`, `0x4e4a10`) cancels a negative aura.
         let mut channeled = aura(689, "Drain Life", false, false);
         channeled.channeled = true;
-        s.set_auras("player", Some(vec![channeled]));
+        s.set_player_auras(vec![channeled]);
         s.eval::<()>("CancelPlayerBuff(0)").unwrap();
         assert_eq!(s.take_cancel_aura_requests(), vec![689]);
     }
diff --git a/crates/benilla-ui/src/script/bank.rs b/crates/benilla-ui/src/script/bank.rs
index 0e757aeb..b21ae9f5 100644
--- a/crates/benilla-ui/src/script/bank.rs
+++ b/crates/benilla-ui/src/script/bank.rs
@@ -186,8 +186,11 @@ mod tests {
             "Interface\\Icons\\INV_Misc_Bag_08"
         );
         assert_eq!(
-            s.eval::<i64>("return GetInventoryItemID(\"player\", 64)")
-                .unwrap(),
+            s.eval::<i64>(
+                "local _, _, id = string.find(GetInventoryItemLink(\"player\", 64), \"item:(%d+)\") \
+                 return tonumber(id)"
+            )
+            .unwrap(),
             4500
         );
         // Slot 65 is empty and 70 is past the band; neither falls through to the doll.
@@ -255,8 +258,11 @@ mod tests {
             7
         );
         assert_eq!(
-            s.eval::<i64>("return GetInventoryItemID(\"player\", 42)")
-                .unwrap(),
+            s.eval::<i64>(
+                "local _, _, id = string.find(GetInventoryItemLink(\"player\", 42), \"item:(%d+)\") \
+                 return tonumber(id)"
+            )
+            .unwrap(),
             4496
         );
         // An empty vault slot answers nil rather than falling through to `inventory_slots`.
diff --git a/crates/benilla-ui/src/script/battlefield_queue.rs b/crates/benilla-ui/src/script/battlefield_queue.rs
index 2fbf1fac..f4ce7364 100644
--- a/crates/benilla-ui/src/script/battlefield_queue.rs
+++ b/crates/benilla-ui/src/script/battlefield_queue.rs
@@ -13,7 +13,8 @@ use super::Model;
 pub struct BattlefieldQueueSlot {
     /// `+0x00`, the Map.dbc row id; 0 is a cleared slot, its name looked up like any other.
     pub map_id: u32,
-    /// The localized map name, or `None` when the id has no row (a real `nil`).
+    /// The localized map name, or `None` when the id has no row (a real `nil`). The VM holds no
+    /// Map.dbc, so a slot not yet pushed answers `nil` where the reference names row 0.
     pub map_name: Option<String>,
     /// `+0x04`: `0` none, `1` queued, `2` confirm, `3` active; anything else answers `"error"`.
     pub status: u32,
@@ -102,7 +103,7 @@ impl super::UiScript {
     /// clock getters move.
     pub fn set_battlefield_queue(
         &mut self,
-        slots: Vec<BattlefieldQueueSlot>,
+        slots: [BattlefieldQueueSlot; 3],
         instance_expiration_ms: u32,
     ) {
         let mut model = self.model_mut();
@@ -498,7 +499,7 @@ mod tests {
     #[test]
     fn get_battlefield_status_answers_five_values_on_every_leg() {
         let mut s = UiScript::new().unwrap();
-        s.set_battlefield_queue(vec![slot(489, 1, 5), slot(0, 0, 0), slot(529, 9, 2)], 0);
+        s.set_battlefield_queue([slot(489, 1, 5), slot(0, 0, 0), slot(529, 9, 2)], 0);
         let n = |s: &mut UiScript, i: &str| s.arity(&format!("GetBattlefieldStatus({i})")).unwrap();
         assert_eq!(n(&mut s, "1"), 5);
         assert_eq!(n(&mut s, "0"), 5);
@@ -532,7 +533,7 @@ mod tests {
         assert!(err.contains("Usage: GetBattlefieldStatus(index)"), "{err}");
         let mut empty = slot(0, 0, 0);
         empty.map_name = None;
-        s.set_battlefield_queue(vec![empty], 0);
+        s.set_battlefield_queue([empty, Default::default(), Default::default()], 0);
         assert!(
             s.eval::<bool>("local _, name = GetBattlefieldStatus(1) return name == nil")
                 .unwrap(),
@@ -540,10 +541,26 @@ mod tests {
         );
     }
 
+    #[test]
+    fn every_slot_answers_none_before_the_first_push() {
+        let s = UiScript::new().unwrap();
+        for i in 1..=3 {
+            assert_eq!(
+                s.eval::<String>(&format!("return (GetBattlefieldStatus({i}))"))
+                    .unwrap(),
+                "none",
+                "slot {i}"
+            );
+        }
+    }
+
     #[test]
     fn the_time_getters_read_the_pushed_milliseconds() {
         let mut s = UiScript::new().unwrap();
-        s.set_battlefield_queue(vec![slot(489, 1, 5)], 120_000);
+        s.set_battlefield_queue(
+            [slot(489, 1, 5), Default::default(), Default::default()],
+            120_000,
+        );
         assert_eq!(
             s.eval::<i64>("return GetBattlefieldPortExpiration(1)")
                 .unwrap(),
@@ -594,7 +611,7 @@ mod tests {
     #[test]
     fn show_battlefield_list_gates_on_a_queued_slot() {
         let mut s = UiScript::new().unwrap();
-        s.set_battlefield_queue(vec![slot(489, 1, 5), slot(529, 2, 1), slot(0, 1, 0)], 0);
+        s.set_battlefield_queue([slot(489, 1, 5), slot(529, 2, 1), slot(0, 1, 0)], 0);
         s.run("ShowBattlefieldList(1) ShowBattlefieldList(2) ShowBattlefieldList(3) ShowBattlefieldList(4)")
             .unwrap();
         assert_eq!(s.take_battlefield_list_requests(), vec![489]);
diff --git a/crates/benilla-ui/src/script/button.rs b/crates/benilla-ui/src/script/button.rs
index 59188c70..55c7703a 100644
--- a/crates/benilla-ui/src/script/button.rs
+++ b/crates/benilla-ui/src/script/button.rs
@@ -349,9 +349,16 @@ fn free_outgoing(lua: &Lua, outgoing: Option<RegionHandle>, incoming: RegionHand
 
 /// `Set<State>Texture(texture | "path" | nil)`, forked on the argument's type (`0x781970`). The
 /// object and nil legs never touch the slot's own region, so they run before [`ensure_slot`]
-/// would create one. The `(r, g, b [, a])` form is not 1.12's, which reads a number as a path
-/// (`0x781b23`).
-fn set_slot_texture(lua: &Lua, this: &Table, slot: Slot, args: &MultiValue) -> mlua::Result<()> {
+/// would create one. There is no colour form: a number takes the path leg through `lua_isstring`
+/// (`0x781b23`) and loads as its own decimal name, so `(1, 1, 1, 0)` is the file `"1"`; anything
+/// else, no argument included, raises `Usage: <name>:<usage>` (`0x87a1b4`).
+fn set_slot_texture(
+    lua: &Lua,
+    this: &Table,
+    slot: Slot,
+    usage: &str,
+    args: &MultiValue,
+) -> mlua::Result<()> {
     match args.front() {
         // A Texture object is itself installed into the slot (`0x781b0b` → `0x778fd0`).
         Some(Value::Table(t)) => {
@@ -386,33 +393,32 @@ fn set_slot_texture(lua: &Lua, this: &Table, slot: Slot, args: &MultiValue) -> m
         _ => {}
     }
 
+    // `lua_tostring` (`0x781b33`): a number converts as `%.14g`, as the stack's coercion does.
+    let path = match args.front() {
+        Some(v @ (Value::String(_) | Value::Number(_) | Value::Integer(_))) => {
+            lua.coerce_string(v.clone())?.map(|s| s.to_string_lossy())
+        }
+        _ => None,
+    };
+    let Some(path) = path else {
+        let who = {
+            let h = frame_handle_of(lua, this)?;
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            model
+                .arena
+                .frame(h)
+                .and_then(|f| f.name.clone())
+                .unwrap_or_else(|| "<unnamed>".to_string())
+        };
+        return Err(mlua::Error::runtime(format!("Usage: {who}:{usage}")));
+    };
     let id = ensure_slot(lua, this, slot)?;
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
     let rh = *model.id_to_region.get(&id).expect("slot region id");
     let data = model.region_data.entry(rh).or_default();
-    match args.front() {
-        // `""` clears the texture, which `QuestLogFrame.lua:165` relies on.
-        Some(Value::String(s)) if s.to_str()?.is_empty() => {
-            data.texture = None;
-            data.fill = None;
-        }
-        Some(Value::String(s)) => {
-            data.texture = Some(s.to_str()?.to_string());
-            data.fill = None;
-        }
-        // The colour form is a solid texture, not a tint: it and the path clear each other.
-        Some(v @ (Value::Number(_) | Value::Integer(_))) => {
-            let arg = |i: usize| args.get(i).map(as_f32);
-            data.fill = Some([
-                as_f32(v),
-                arg(1).unwrap_or(0.0),
-                arg(2).unwrap_or(0.0),
-                arg(3).unwrap_or(1.0),
-            ]);
-            data.texture = None;
-        }
-        _ => {}
-    }
+    // `""` clears the texture, which `QuestLogFrame.lua:165` relies on.
+    data.texture = (!path.is_empty()).then_some(path);
+    data.fill = None;
     Ok(())
 }
 
@@ -431,10 +437,18 @@ fn get_slot_texture(lua: &Lua, this: &Table, slot: Slot) -> mlua::Result<Value>
 
 /// Register one `Set<X>Texture`/`Get<X>Texture` pair on `m`.
 fn texture_pair(lua: &Lua, m: &Table, name: &str, slot: Slot) -> mlua::Result<()> {
+    let method = format!("Set{name}Texture");
+    // The highlight setter's own line names its blend argument (`0x87a240`), unclosed as in the
+    // reference; the others share `0x87a1b4`.
+    let usage = if slot == Slot::Highlight {
+        format!("{method}(texture or \"texture\" or nil [, \"blendmode\")")
+    } else {
+        format!("{method}(texture or \"texture\" or nil)")
+    };
     m.set(
-        format!("Set{name}Texture"),
+        method.as_str(),
         lua.create_function(move |lua, (this, args): (Table, MultiValue)| {
-            set_slot_texture(lua, &this, slot, &args)
+            set_slot_texture(lua, &this, slot, &usage, &args)
         })?,
     )?;
     m.set(
@@ -922,11 +936,11 @@ pub(super) fn wants_press_visual(model: &Model, h: FrameHandle, button: &str) ->
 }
 
 /// The click shared by the input path and `Click()`: a disabled Button fires nothing, a CheckButton
-/// toggles before `OnClick` runs (`0x785550`), then `OnClick` gets the button name and `down`, true
-/// only for a click a `…ButtonDown` registration fired. The second argument is not 1.12's, whose
-/// `OnClick` gets the name alone (`0x779540`). `scripted` marks a Lua `Click()` (`0x7826c0` passes
-/// 1, the mouse `0x779280`/`0x7793a4` pass 0): a LootButton then does nothing at all, not even its
-/// `OnClick` (`0x4c182b`); every other kind ignores it.
+/// toggles before `OnClick` runs (`0x785550`), then `OnClick` gets the button name alone as `arg1`
+/// (`0x779540` fires it with the format `"%s"`); `down`, true only for a click a `…ButtonDown`
+/// registration fired, reaches the nameplate's select alone. `scripted` marks a Lua `Click()`
+/// (`0x7826c0` passes 1, the mouse `0x779280`/`0x7793a4` pass 0): a LootButton then does nothing at
+/// all, not even its `OnClick` (`0x4c182b`); every other kind ignores it.
 pub(super) fn click_button(lua: &Lua, id: u32, button: &str, down: bool, scripted: bool) {
     let mut take_loot = None;
     let fire = {
@@ -981,8 +995,7 @@ pub(super) fn click_button(lua: &Lua, id: u32, button: &str, down: bool, scripte
         Ok(s) => Value::String(s),
         Err(_) => return,
     };
-    if let Err(e) = event::fire_widget_handler(lua, id, "OnClick", vec![btn, Value::Boolean(down)])
-    {
+    if let Err(e) = event::fire_widget_handler(lua, id, "OnClick", vec![btn]) {
         lua.app_data_mut::<Model>()
             .expect("model app_data")
             .record_script_error(e.to_string());
diff --git a/crates/benilla-ui/src/script/calls.rs b/crates/benilla-ui/src/script/calls.rs
new file mode 100644
index 00000000..c08af75f
--- /dev/null
+++ b/crates/benilla-ui/src/script/calls.rs
@@ -0,0 +1,99 @@
+//! The script calls whose effects touch the selection, the player's cast or the targeting cursor,
+//! held in one queue in the order the script made them. In the reference each such call is done
+//! when it returns: the macro runner `0x4f14e0` fires every line in one pass, `TargetUnit`
+//! (`0x4899d0`), `TargetByName` (`0x489d60`) and `ClearTarget` (`0x489ff0`) commit through
+//! `SetSelection 0x493540` before returning, and `CastSpellByName` (`0x4b4ab0`) casts at the
+//! selection as it stands then. So `/target Bob` then `/cast Flash Heal` heals Bob, and the app
+//! applies this queue front to back at one point in the frame.
+
+use super::{ActionUse, SelectionRequest, UiScript};
+
+/// One queued call, in the reference's terms.
+#[derive(Clone, Debug, PartialEq)]
+pub enum ScriptCall {
+    /// `TargetUnit`, `AssistUnit`, `AssistByName` and `TargetLastEnemy`.
+    Select(SelectionRequest),
+    /// `TargetByName(name, exactMatch)` (`0x489d60`), the stock `/target`.
+    TargetByName { name: String, exact: bool },
+    /// `TargetNearestEnemy`, `TargetNearestFriend`, `TargetNearestPartyMember` and
+    /// `TargetNearestRaidMember` (`0x489a80`/`0x489aa0`/`0x489ac0`/`0x489ae0`): one TAB cycle,
+    /// `0x493f60(reverse, mode)`.
+    TargetNearest { mode: NearestMode, reverse: bool },
+    /// `TargetLastTarget()` (`0x489b00`): re-select the last-target pair, or deselect when it is
+    /// empty.
+    TargetLastTarget,
+    /// `ClearTarget()` (`0x489ff0` → `0x493540(0,0)`), a no-op when nothing is selected by then.
+    ClearTarget,
+    /// `AttackTarget()` (`0x489b50` → `0x6131a0(0,0)`): the attack validator's pick from the
+    /// selection as it stands then, which may move it to the nearest enemy, then the toggle.
+    AttackTarget,
+    /// `SpellTargetUnit(unit)` (`0x6e6d90`), made while the cursor was up.
+    SpellTargetUnit(String),
+    /// `SpellStopTargeting()` (`0x6e6e30`), made while the cursor was up.
+    SpellStopTargeting,
+    /// `SpellStopCasting()` (`0x6e6e80`), made with something to stop.
+    SpellStopCasting,
+    /// `CastSpell(id, "spell", onSelf)` and `CastSpellByName(name, onSelf)`, through `0x4b3300`'s
+    /// player leg; `onSelf` swaps the target guid for the active player's (`0x4b4afa`, `0x4b4345`).
+    CastSpell { spell_id: u32, on_self: bool },
+    /// `CastSpell(id, "pet", onSelf)`, `0x4b3300`'s `CMSG_PET_ACTION` fork (`0x4b34ce`), with the
+    /// same guid swap.
+    CastPetSpell { spell_id: u32, on_self: bool },
+    /// `CastShapeshiftForm(index)` (`0x4b4810`), as the form's spell.
+    CastShapeshiftForm(u32),
+    /// `UseAction(slot, …)` (`0x4e7140` → `0x4e5ee0`); a macro slot runs its lines inside it.
+    UseAction(ActionUse),
+    /// `UseContainerItem(bag, slot)` outside repair mode.
+    UseContainerItem { bag: i64, slot: u32 },
+    /// `UseInventoryItem(id)` outside repair mode.
+    UseInventoryItem(u32),
+    /// `CastPetAction(slot)`, a 1-based pet bar slot.
+    PetAction(u32),
+    /// `PetAttack` and the other one-shot orders, as their bar slot's packed word.
+    PetOrder(u32),
+}
+
+/// The mode the four `TargetNearest*` shims hand the TAB cycler `0x493f60`, the only byte that
+/// differs between them; it reaches only the per-candidate filter `0x493e40`.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum NearestMode {
+    /// Mode 1, `TargetNearestEnemy`.
+    Enemy,
+    /// Mode 2, `TargetNearestFriend`.
+    Friend,
+    /// Mode 3, `TargetNearestPartyMember`: a party member other than us.
+    PartyMember,
+    /// Mode 4, `TargetNearestRaidMember`: a party or raid member other than us.
+    RaidMember,
+}
+
+impl UiScript {
+    /// Take every queued call, in call order.
+    pub fn take_script_calls(&mut self) -> Vec<ScriptCall> {
+        std::mem::take(&mut self.model_mut().script_calls)
+    }
+
+    /// Put calls back at the front of the queue, ahead of any queued since.
+    pub fn requeue_script_calls(&mut self, calls: Vec<ScriptCall>) {
+        let mut model = self.model_mut();
+        let later = std::mem::replace(&mut model.script_calls, calls);
+        model.script_calls.extend(later);
+    }
+
+    /// Take the queued calls `pick` answers for, in call order, leaving the rest queued.
+    pub(crate) fn take_calls_where<T>(
+        &mut self,
+        mut pick: impl FnMut(&ScriptCall) -> Option<T>,
+    ) -> Vec<T> {
+        let mut model = self.model_mut();
+        let mut taken = Vec::new();
+        model.script_calls.retain(|call| match pick(call) {
+            Some(t) => {
+                taken.push(t);
+                false
+            }
+            None => true,
+        });
+        taken
+    }
+}
diff --git a/crates/benilla-ui/src/script/char_stats.rs b/crates/benilla-ui/src/script/char_stats.rs
index b4c9d708..cf7bb10c 100644
--- a/crates/benilla-ui/src/script/char_stats.rs
+++ b/crates/benilla-ui/src/script/char_stats.rs
@@ -164,7 +164,7 @@ impl Default for UnitCombatStats {
 /// [`super::container::ContainerSlot`].
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct InvSlotView {
-    /// The item's template entry (`GetInventoryItemID`).
+    /// The item's template entry, the id inside `GetInventoryItemLink`'s link.
     pub item_id: u32,
     /// Whether the item may go on an action bar, by the same filter as a bag slot's.
     pub bar_placeable: bool,
@@ -312,15 +312,8 @@ impl super::UiScript {
     pub fn set_inventory_slots(&mut self, slots: InventorySlots) {
         {
             let mut model = self.model_mut();
-            let alerts: [u8; 12] = std::array::from_fn(|i| {
-                if i == 11 {
-                    ammo_alert_status(&slots[ALERT_SLOTS[i]])
-                } else {
-                    alert_status(&slots[ALERT_SLOTS[i]])
-                }
-            });
             model.inventory_slots = slots;
-            model.inventory_alerts = alerts;
+            recompute_inventory_alerts(&mut model);
         }
         // Every recompute fires it, never diffed against the last (`0x4c7ee0`); the app pushes
         // only on a real change.
@@ -333,10 +326,13 @@ impl super::UiScript {
         self.model_mut().bank_bag_slots = slots;
     }
 
-    /// Drain the slot ids `UseInventoryItem` queued; the app sends each as `CMSG_USE_ITEM`, bag
-    /// 255 and the 0-based slot.
+    /// Take the `UseInventoryItem` calls out of the call stream; the app sends each as
+    /// `CMSG_USE_ITEM`, bag 255 and the 0-based slot.
     pub fn take_inventory_uses(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().inventory_uses)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::UseInventoryItem(id) => Some(*id),
+            _ => None,
+        })
     }
 
     /// Drain equipped slots clicked in repair mode, for `CMSG_REPAIR_ITEM`.
@@ -345,6 +341,19 @@ impl super::UiScript {
     }
 }
 
+/// The 12 alert statuses off the doll snapshot (`0x4c7ee0`'s recompute), without the event.
+pub(super) fn recompute_inventory_alerts(model: &mut Model) {
+    let slots = &model.inventory_slots;
+    let alerts: [u8; 12] = std::array::from_fn(|i| {
+        if i == 11 {
+            ammo_alert_status(&slots[ALERT_SLOTS[i]])
+        } else {
+            alert_status(&slots[ALERT_SLOTS[i]])
+        }
+    });
+    model.inventory_alerts = alerts;
+}
+
 fn with_unit_stats<T>(
     lua: &Lua,
     token: &Option<String>,
@@ -391,15 +400,29 @@ const BANK_BAG_INV_SLOTS: std::ops::RangeInclusive<usize> = 64..=69;
 /// The vault's container id; must match `ui_items::BANK_CONTAINER` in the app.
 const BANK_CONTAINER: i64 = -1;
 
+/// The keyring's live-API ids: `KeyRingButtonIDToInvSlotID` adds `0x51` to a 1-based button id
+/// (`0x4c818b`), and the slot reader takes 0-based 81..=112 (`0x4c8567`).
+pub(super) const KEYRING_INV_SLOTS: std::ops::RangeInclusive<usize> = 82..=113;
+
+/// The keyring's container id (`KEYRING_CONTAINER`, `MainMenuBarBagButtons.lua:1`); must match
+/// `ui_items::KEYRING_CONTAINER` in the app, which feeds the keys as that container.
+const KEYRING_CONTAINER: i64 = -2;
+
 impl Model {
     /// The item `token` exposes at live-API id `slot`, the one routing the `GetInventoryItem*`
     /// getters and `GameTooltip:SetInventoryItem` share. Stock paints the bank through this API
-    /// (`BankFrame.lua:35`), so the bank band is answered from the container snapshot.
+    /// (`BankFrame.lua:35`) and hovers a key through it (`ContainerFrame.lua:616-619`), so the
+    /// bank and keyring bands are answered from the container snapshots.
     pub(super) fn inv_slot(&self, token: &str, slot: usize) -> Option<InvSlotView> {
         if token.eq_ignore_ascii_case("player") {
             if let Some(view) = self.bank_inv_slot(slot) {
                 return Some(view);
             }
+            if KEYRING_INV_SLOTS.contains(&slot) {
+                let n = (slot - KEYRING_INV_SLOTS.start() + 1) as u32;
+                let keyring = self.containers.get(&KEYRING_CONTAINER)?;
+                return keyring.slots.get(&n).map(InvSlotView::from_container_slot);
+            }
             return self.inventory_slots.get(slot)?.clone();
         }
         self.inspect
@@ -410,6 +433,24 @@ impl Model {
             .clone()
     }
 
+    /// The player's repair cost at live id `slot`, the vault and keyring bands by their container
+    /// slots.
+    pub(super) fn inv_repair_cost(&self, slot: usize) -> u32 {
+        let costs = &self.repair_costs;
+        let cost = if BANK_INV_SLOTS.contains(&slot) {
+            let n = (slot - BANK_INV_SLOTS.start() + 1) as u32;
+            costs.bags.get(&(BANK_CONTAINER, n))
+        } else if KEYRING_INV_SLOTS.contains(&slot) {
+            let n = (slot - KEYRING_INV_SLOTS.start() + 1) as u32;
+            costs.bags.get(&(KEYRING_CONTAINER, n))
+        } else {
+            u32::try_from(slot)
+                .ok()
+                .and_then(|s| costs.equipped.get(&s))
+        };
+        cost.copied().unwrap_or(0)
+    }
+
     fn bank_inv_slot(&self, slot: usize) -> Option<InvSlotView> {
         if BANK_INV_SLOTS.contains(&slot) {
             let vault = self.containers.get(&BANK_CONTAINER)?;
@@ -429,7 +470,7 @@ impl Model {
 /// The inventory-slot reader's whitelist (`0x4c8520`) on its 0-based slot (`0x4c8546`); outside
 /// it the binding raises "Invalid inventory slot in …". The backpack's item slots (23..=38) and
 /// buyback (69..=80) are container-API slots, not in it.
-fn inventory_slot_reader_accepts(slot0: i32) -> bool {
+pub(super) fn inventory_slot_reader_accepts(slot0: i32) -> bool {
     slot0 == -1                            // Lua 0      the ammo leg
         || (0x00..=0x16).contains(&slot0)  // Lua 1..=23   the doll + the four equipped bags
         || (0x27..=0x3e).contains(&slot0)  // Lua 40..=63  the bank vault
@@ -728,17 +769,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // GetInventoryItemID(unit, slot) → itemId or nil.
-    g.set(
-        "GetInventoryItemID",
-        lua.create_function(|lua, (token, slot): (Option<String>, i64)| {
-            match player_inv_slot(lua, &token, slot) {
-                Some(v) if v.item_id != 0 => Ok(Value::Integer(i64::from(v.item_id))),
-                _ => Ok(Value::Nil),
-            }
-        })?,
-    )?;
-
     // GetInventoryItemTexture(unit, slot) → icon path, or nil until the item's template arrives.
     g.set(
         "GetInventoryItemTexture",
@@ -1541,6 +1571,14 @@ mod tests {
         );
     }
 
+    /// The item id in `GetInventoryItemLink("player", slot)`'s link, 1.12's only road to it.
+    fn link_id(slot: &str) -> String {
+        format!(
+            r#"local _, _, id = string.find(GetInventoryItemLink("player", {slot}), "item:(%d+)")
+               return tonumber(id)"#
+        )
+    }
+
     #[test]
     fn inventory_item_bindings_serve_occupied_empty_and_absent_shapes() {
         let mut s = UiScript::new().unwrap();
@@ -1552,6 +1590,7 @@ mod tests {
             count: 1,
             quality: 2,
             name: Some("Brawler's Harness".into()),
+            link: Some("|cff1eff00|Hitem:2263:0:0:0|h[Brawler's Harness]|h|r".into()),
             ..Default::default()
         });
         slots[0] = Some(InvSlotView {
@@ -1560,15 +1599,12 @@ mod tests {
             count: 200,
             quality: 1,
             name: Some("Rough Arrow".into()),
+            link: Some("|cffffffff|Hitem:2512:0:0:0|h[Rough Arrow]|h|r".into()),
             ..Default::default()
         });
         s.set_inventory_slots(slots);
 
-        assert_eq!(
-            s.eval::<i64>(r#"return GetInventoryItemID("player", 1)"#)
-                .unwrap(),
-            2263
-        );
+        assert_eq!(s.eval::<i64>(&link_id("1")).unwrap(), 2263);
         assert_eq!(
             s.eval::<String>(r#"return GetInventoryItemTexture("player", 1)"#)
                 .unwrap(),
@@ -1585,11 +1621,7 @@ mod tests {
             2
         );
         // The ammo slot (0) reads through the same family.
-        assert_eq!(
-            s.eval::<i64>(r#"return GetInventoryItemID("player", 0)"#)
-                .unwrap(),
-            2512
-        );
+        assert_eq!(s.eval::<i64>(&link_id("0")).unwrap(), 2512);
         assert_eq!(
             s.eval::<i64>(r#"return GetInventoryItemCount("player", 0)"#)
                 .unwrap(),
@@ -1597,7 +1629,7 @@ mod tests {
         );
         // An empty slot: nil id, texture and quality, and count 1 (`0x4c8797`).
         assert!(s
-            .eval::<bool>(r#"return GetInventoryItemID("player", 5) == nil"#)
+            .eval::<bool>(r#"return GetInventoryItemLink("player", 5) == nil"#)
             .unwrap());
         assert!(s
             .eval::<bool>(r#"return GetInventoryItemTexture("player", 5) == nil"#)
@@ -1612,7 +1644,7 @@ mod tests {
             .unwrap());
         // A token with no items behind it: the empty shape.
         assert!(s
-            .eval::<bool>(r#"return GetInventoryItemID("target", 1) == nil"#)
+            .eval::<bool>(r#"return GetInventoryItemLink("target", 1) == nil"#)
             .unwrap());
         assert_eq!(
             s.eval::<i64>(r#"return GetInventoryItemCount("target", 1)"#)
@@ -1622,10 +1654,10 @@ mod tests {
         );
         // Out-of-range slots: the empty shape, no error.
         assert!(s
-            .eval::<bool>(r#"return GetInventoryItemID("player", 25) == nil"#)
+            .eval::<bool>(r#"return GetInventoryItemLink("player", 25) == nil"#)
             .unwrap());
         assert!(s
-            .eval::<bool>(r#"return GetInventoryItemID("player", -1) == nil"#)
+            .eval::<bool>(r#"return GetInventoryItemLink("player", -1) == nil"#)
             .unwrap());
     }
 
diff --git a/crates/benilla-ui/src/script/chat_misc.rs b/crates/benilla-ui/src/script/chat_misc.rs
index 52b9e29b..e54dc116 100644
--- a/crates/benilla-ui/src/script/chat_misc.rs
+++ b/crates/benilla-ui/src/script/chat_misc.rs
@@ -8,7 +8,8 @@ use mlua::{Lua, MultiValue, Value};
 use super::Model;
 
 /// `DoEmote(token [, target])`: the `EmotesText.dbc` name token (`"WAVE"`, not `/wave`) and an
-/// optional target name.
+/// optional target string (`0x49fd30` reads arg 2 with `lua_tostring`): a player name, or a `%`
+/// word for the selection. A non-string, non-number second argument reads as none.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct EmoteRequest {
     pub token: String,
@@ -79,14 +80,20 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
     g.set(
         "DoEmote",
-        lua.create_function(|lua, (token, target): (Option<String>, Option<String>)| {
+        lua.create_function(|lua, (token, target): (Option<String>, Value)| {
             let Some(token) = token.filter(|t| !t.is_empty()) else {
                 return Ok(());
             };
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             model.emote_requests.push(EmoteRequest {
                 token: token.to_ascii_uppercase(),
-                target: target.filter(|t| !t.trim().is_empty()),
+                target: match target {
+                    Value::String(s) => Some(s.to_string_lossy()),
+                    Value::Integer(i) => Some(i.to_string()),
+                    Value::Number(n) => Some(n.to_string()),
+                    _ => None,
+                }
+                .filter(|t| !t.is_empty()),
             });
             Ok(())
         })?,
@@ -109,9 +116,9 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                 return Ok(());
             };
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model
-                .selection_requests
-                .push(super::SelectionRequest::AssistByName(name));
+            model.script_calls.push(super::ScriptCall::Select(
+                super::SelectionRequest::AssistByName(name),
+            ));
             Ok(())
         })?,
     )?;
@@ -143,7 +150,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             let is_cvar = model.cvars.contains_key(&name.to_ascii_lowercase());
             if is_cvar && !value.is_empty() {
-                super::cvars::write_cvar(&mut model, name, value.to_string(), None);
+                super::cvars::write_cvar(&mut model, name, value.to_string());
             } else {
                 model.console_lines.push(line.clone());
             }
@@ -208,6 +215,24 @@ mod tests {
         assert!(s.take_emote_requests().is_empty(), "drained");
     }
 
+    /// The second argument is a string, never a unit token: `"target"` is a name like any other,
+    /// and `%t` reaches the app's selection arm untouched (`0x49fdb1`).
+    #[test]
+    fn do_emote_second_argument_is_passed_as_a_string() {
+        let mut s = UiScript::new().unwrap();
+        s.run("DoEmote('WAVE', 'target') DoEmote('WAVE', '%t') DoEmote('WAVE', {})")
+            .unwrap();
+        let targets: Vec<_> = s
+            .take_emote_requests()
+            .into_iter()
+            .map(|e| e.target)
+            .collect();
+        assert_eq!(
+            targets,
+            vec![Some("target".into()), Some("%t".into()), None]
+        );
+    }
+
     #[test]
     fn random_roll_coerces_the_strings_the_stock_handler_passes() {
         let mut s = UiScript::new().unwrap();
diff --git a/crates/benilla-ui/src/script/chat_send.rs b/crates/benilla-ui/src/script/chat_send.rs
index 9e1316b8..e004c413 100644
--- a/crates/benilla-ui/src/script/chat_send.rs
+++ b/crates/benilla-ui/src/script/chat_send.rs
@@ -6,8 +6,11 @@
 //! grammar: an addon's `SendChatMessage("/dance")` says the characters. The reference splits the
 //! same way, `ChatEdit_SendText` parsing and `SendChatMessage` not.
 //!
-//! `language` is accepted and dropped, so every line goes in the speaker's default tongue: the
-//! app's chat command has no language field. The reference sends the named language.
+//! `language` starts as the speaker's race base language (`0x5ec890`, at `0x49f2aa`). A string or
+//! number third argument is matched by name, case-insensitively, against every `Languages.dbc`
+//! row (`0x49f8a0`), known to the character or not, and a miss raises `Unknown language`
+//! (`0x844afc`, at `0x49f2e1`): a number is its text, so `7` raises. Refusing a tongue the
+//! character never learned is the server's (vmangos `ChatHandler.cpp:175`).
 //!
 //! Deviation: no truncation at 255 characters (`0x49f604`), because vmangos refuses a longer line
 //! itself (`Chat.cpp:2177`): it is dropped where the reference sends its first 255. The server
@@ -37,6 +40,39 @@ pub struct ChatSend {
     /// The fourth argument as `lua_tostring` gives it (`0x49f306`): the whisper target, or the
     /// channel number the app resolves to a joined channel's name.
     pub target: Option<String>,
+    /// The `Languages.dbc` id the third argument named; `None` is the speaker's default.
+    pub language: Option<u32>,
+}
+
+impl ChatSend {
+    /// The empty-line gate (`0x49f28d`-`0x49f2a1`): a line whose first byte is NUL ends the call,
+    /// before the language is read or anything is sent, unless its type is AFK (`0x14`) or DND
+    /// (`0x15`). The chat-type lookup and its "Unknown chat type" (`0x49f27f`) come first.
+    pub fn ends_at_empty_line(&self) -> bool {
+        ends_at_empty_line(&self.text, &self.chat_type)
+    }
+}
+
+/// [`ChatSend::ends_at_empty_line`] on the binding's arguments, before the line is built.
+fn ends_at_empty_line(text: &str, chat_type: &str) -> bool {
+    text.bytes().next().unwrap_or(0) == 0 && !matches!(chat_type, "AFK" | "DND")
+}
+
+impl super::UiScript {
+    /// Push `Languages.dbc` as `(ID, Name_lang)` rows in file order, the table `SendChatMessage`
+    /// matches its language name against (`[0xc0db40]`, count `[0xc0db44]`).
+    pub fn set_language_table(&mut self, rows: Vec<(u32, String)>) {
+        self.model_mut().language_table = rows;
+    }
+}
+
+/// `0x49f8a0`: the first row, in file order, whose name equals `name` ignoring case (`SStrCmpI`
+/// `0x64a4c0`, unbounded length), checked against every row, not only the known languages.
+fn language_id(table: &[(u32, String)], name: &str) -> Option<u32> {
+    table
+        .iter()
+        .find(|(_, row)| row.eq_ignore_ascii_case(name))
+        .map(|&(id, _)| id)
 }
 
 impl super::UiScript {
@@ -105,10 +141,24 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     lua.globals().set(
         "SendChatMessage",
         lua.create_function(
-            |lua, (text, chat_type, _language, target): (String, Option<String>, Value, Value)| {
+            |lua, (text, chat_type, language, target): (String, Option<String>, Value, Value)| {
                 let chat_type = chat_type
                     .unwrap_or_else(|| "SAY".into())
                     .to_ascii_uppercase();
+                // The language is read only past the empty-line gate. The line is queued
+                // anyway: the type check that precedes the gate is the app's, and the drain
+                // applies the gate after it.
+                let reads_language = !ends_at_empty_line(&text, &chat_type);
+                let language = match super::binding_abi::optional_string(lua, &language) {
+                    Some(name) if reads_language => {
+                        let model = lua.app_data_ref::<Model>().expect("model app_data");
+                        let id = language_id(&model.language_table, &name);
+                        Some(
+                            id.ok_or_else(|| mlua::Error::RuntimeError("Unknown language".into()))?,
+                        )
+                    }
+                    _ => None,
+                };
                 // `lua_isstring` then `lua_tostring` (`0x49f2f6`, `0x49f306`): a number is its
                 // text, so `2.7` reaches the channel's `SStrToInt` as "2.7", which reads 2.
                 let target = super::binding_abi::optional_string(lua, &target);
@@ -119,6 +169,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                         text,
                         chat_type,
                         target,
+                        language,
                     });
                 Ok(())
             },
@@ -151,11 +202,13 @@ mod tests {
                     text: "hello".into(),
                     chat_type: "SAY".into(),
                     target: None,
+                    language: None,
                 },
                 ChatSend {
                     text: "/dance".into(),
                     chat_type: "SAY".into(),
                     target: None,
+                    language: None,
                 },
             ]
         );
@@ -188,12 +241,67 @@ mod tests {
         assert_eq!(sent[1].chat_type, "CHANNEL");
     }
 
+    /// Three `Languages.dbc` rows, in the shipped file's order.
+    fn with_languages(s: &mut UiScript) {
+        s.set_language_table(vec![
+            (1, "Orcish".into()),
+            (2, "Darnassian".into()),
+            (7, "Common".into()),
+        ]);
+    }
+
     #[test]
-    fn the_language_argument_is_accepted_and_ignored() {
+    fn a_language_name_sends_its_languages_dbc_id() {
         let mut s = UiScript::new().unwrap();
-        s.run(r#"SendChatMessage("hi", "SAY", 7)"#).unwrap();
-        assert_eq!(s.take_chat_sends().len(), 1);
-        assert!(s.errors().is_empty(), "{:?}", s.errors());
+        with_languages(&mut s);
+        s.run(r#"SendChatMessage("hi", "SAY", "Darnassian")"#)
+            .unwrap();
+        s.run(r#"SendChatMessage("hi", "YELL", "dARNASSIAN")"#)
+            .unwrap();
+        s.run(r#"SendChatMessage("hi", "WHISPER", "orcish", "Bob")"#)
+            .unwrap();
+        let sent = s.take_chat_sends();
+        assert_eq!(sent[0].language, Some(2), "Darnassian's row ID");
+        assert_eq!(sent[1].language, Some(2), "SStrCmpI ignores case");
+        assert_eq!(
+            sent[2].language,
+            Some(1),
+            "a language the character may not know is sent: the server refuses it"
+        );
+        assert_eq!(sent[2].target.as_deref(), Some("Bob"));
+    }
+
+    #[test]
+    fn no_language_argument_speaks_the_default() {
+        let mut s = UiScript::new().unwrap();
+        with_languages(&mut s);
+        s.run(r#"SendChatMessage("hi")"#).unwrap();
+        s.run(r#"SendChatMessage("hi", "SAY", nil)"#).unwrap();
+        s.run(r#"SendChatMessage("hi", "SAY", {})"#).unwrap();
+        s.run(r#"SendChatMessage("hi", "SAY", true)"#).unwrap();
+        let sent = s.take_chat_sends();
+        assert_eq!(sent.len(), 4);
+        assert!(
+            sent.iter().all(|c| c.language.is_none()),
+            "not a string, so `lua_isstring` keeps the default: {sent:?}"
+        );
+    }
+
+    #[test]
+    fn an_unknown_language_raises_and_sends_nothing() {
+        let mut s = UiScript::new().unwrap();
+        with_languages(&mut s);
+        for arg in [r#""Klingon""#, r#""""#, "7", r#""Darnassian ""#] {
+            let err = s
+                .run(&format!(r#"SendChatMessage("hi", "SAY", {arg})"#))
+                .expect_err(&format!("{arg} names no row"));
+            assert!(err.to_string().contains("Unknown language"), "{arg}: {err}");
+        }
+        assert!(s.take_chat_sends().is_empty());
+        // AFK and DND pass the empty-line gate, so their language is read.
+        assert!(s.run(r#"SendChatMessage("", "AFK", "Klingon")"#).is_err());
+        // An empty line of any other type ends before the language is read.
+        s.run(r#"SendChatMessage("", "SAY", "Klingon")"#).unwrap();
     }
 
     /// The count matters: an addon passes the result straight to `SendChatMessage` as `language`.
diff --git a/crates/benilla-ui/src/script/client.rs b/crates/benilla-ui/src/script/client.rs
index 9d85cfcc..c242e4d0 100644
--- a/crates/benilla-ui/src/script/client.rs
+++ b/crates/benilla-ui/src/script/client.rs
@@ -22,6 +22,53 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, ()| lua.create_string("enUS"))?,
     )?;
     g.set("IsMacClient", lua.create_function(|_, ()| Ok(Value::Nil))?)?;
+    // The PC build's other two platform answers: `IsWindowsClient()` (`0x48c960`) pushes the
+    // number 1 and `IsLinuxClient()` (`0x48c990`) one nil. Arguments are ignored.
+    g.set(
+        "IsWindowsClient",
+        lua.create_function(|_, _: MultiValue| Ok(1.0))?,
+    )?;
+    g.set(
+        "IsLinuxClient",
+        lua.create_function(|_, _: MultiValue| Ok(Value::Nil))?,
+    )?;
+
+    // `GetDebugStats()` (`0x488af0`, `xor eax,eax; ret`): zero values, which `StatsFrame.lua:20`
+    // hands straight to `SetText`.
+    g.set(
+        "GetDebugStats",
+        lua.create_function(|_, _: MultiValue| Ok(MultiValue::new()))?,
+    )?;
+
+    // `OpeningCinematic()` (`0x48c8c0`): sends an empty `CMSG_OPENING_CINEMATIC` (`0xf9`,
+    // `0x48c8c9` into `0x5ab630`) and returns nothing; the server may answer with
+    // `SMSG_TRIGGER_CINEMATIC`. Arguments are ignored.
+    g.set(
+        "OpeningCinematic",
+        lua.create_function(|lua, _: MultiValue| {
+            lua.app_data_mut::<Model>()
+                .expect("model app_data")
+                .opening_cinematic_asks += 1;
+            Ok(())
+        })?,
+    )?;
+
+    // Three setters whose state has no reader here, so each takes its argument as the reference
+    // does, never raising, and stores nothing; all return zero values.
+    // - `SetEuropeanNumbers(flag)` (`0x48dec0`): `GetBoolOrDefault(1, true)` into `[0xcf4d24]`,
+    //   which turns on `FontString:SetText`'s digit-group pass (`0x771daa` into `0x771c50`).
+    //   benilla's `SetText` has no such pass.
+    // - `SetLayoutMode(mode)` (`0x488540`): a number truncates into the UI root's `+0xcf8`, anything
+    //   else stores 1; read by the root's mouse handler (`0x766301`) for a frame-dragging mode
+    //   benilla does not build.
+    // - `SetConsoleKey(key)` (`0x488640`): a one-character or named key becomes the console's
+    //   toggle key (`0x63cb00`), a non-string the default `0x30e`. benilla has no console screen.
+    for name in ["SetEuropeanNumbers", "SetLayoutMode", "SetConsoleKey"] {
+        g.set(
+            name,
+            lua.create_function(|_, _: MultiValue| Ok(MultiValue::new()))?,
+        )?;
+    }
 
     // `FrameXML_Debug([v])` (`0x488440`): get-or-set of the XML loader's trace flag `[0xceea30]`,
     // which gates `crate::loader::LoadReport::traces`. A Lua-truthy argument sets it, truncated
@@ -146,6 +193,11 @@ impl super::UiScript {
         std::mem::take(&mut self.model_mut().played_time_asks)
     }
 
+    /// Drain the `OpeningCinematic()` calls, each an empty `CMSG_OPENING_CINEMATIC`.
+    pub fn take_opening_cinematic_asks(&mut self) -> u32 {
+        std::mem::take(&mut self.model_mut().opening_cinematic_asks)
+    }
+
     /// Push the bind location's name, resolved from `SMSG_BINDPOINTUPDATE`'s AreaTable id through
     /// the catalog the hearthstone's `$z` uses, so the two agree; empty until the packet lands.
     pub fn set_bind_location(&mut self, area_name: &str) {
@@ -281,4 +333,45 @@ mod tests {
             "nil is the PC arm, which is the arm this client wants"
         );
     }
+
+    /// `IsWindowsClient` (`0x48c960`) pushes 1 and `IsLinuxClient` (`0x48c990`) nil, one value
+    /// each; `GetDebugStats` (`0x488af0`) pushes none.
+    #[test]
+    fn the_platform_queries_and_debug_stats_answer_the_pc_build() {
+        let s = UiScript::new().unwrap();
+        assert_eq!(s.arity("IsWindowsClient()").unwrap(), 1);
+        assert_eq!(s.eval::<f64>("return IsWindowsClient(0)").unwrap(), 1.0);
+        assert_eq!(s.arity("IsLinuxClient()").unwrap(), 1);
+        assert!(s.eval::<bool>("return IsLinuxClient() == nil").unwrap());
+        assert_eq!(s.arity("GetDebugStats()").unwrap(), 0);
+    }
+
+    /// Each `OpeningCinematic()` queues one send and returns nothing.
+    #[test]
+    fn opening_cinematic_queues_one_send_per_call() {
+        let mut s = UiScript::new().unwrap();
+        assert_eq!(s.arity("OpeningCinematic()").unwrap(), 0);
+        s.run("OpeningCinematic(1)").unwrap();
+        assert_eq!(s.take_opening_cinematic_asks(), 2);
+        assert_eq!(
+            s.take_opening_cinematic_asks(),
+            0,
+            "the drain empties the queue"
+        );
+    }
+
+    /// The three setters never raise, whatever they are handed, and return zero values.
+    #[test]
+    fn the_stateless_setters_take_any_argument() {
+        let s = UiScript::new().unwrap();
+        for name in ["SetEuropeanNumbers", "SetLayoutMode", "SetConsoleKey"] {
+            for arg in ["", "nil", "1", "\"x\"", "{}", "\"ESCAPE\""] {
+                assert_eq!(
+                    s.arity(&format!("{name}({arg})")).unwrap(),
+                    0,
+                    "{name}({arg})"
+                );
+            }
+        }
+    }
 }
diff --git a/crates/benilla-ui/src/script/clock.rs b/crates/benilla-ui/src/script/clock.rs
new file mode 100644
index 00000000..20e3176f
--- /dev/null
+++ b/crates/benilla-ui/src/script/clock.rs
@@ -0,0 +1,58 @@
+//! The two clocks Lua reads: `GetTime()`, the session seconds [`UiScript::tick`] advances, and
+//! `GetGameTime()`, the game clock the host pushes. Both live in the [`Model`], out of an addon's
+//! reach, as the reference's live in the client.
+//!
+//! [`UiScript::tick`]: super::UiScript::tick
+
+use mlua::Lua;
+
+use super::Model;
+
+impl super::UiScript {
+    /// The current `GetTime()` value in seconds; the app stamps absolute expiries with it, such as
+    /// an aura's `expirationTime`.
+    pub fn now(&self) -> f64 {
+        self.model_ref().now
+    }
+
+    /// Start this VM's `GetTime()` clock at `secs`, so a rebuilt VM (a relog, a `ReloadUI`) keeps
+    /// the process's clock. The reference's `GetTime` (`0x515ea0`, through `0x42c010` and
+    /// `0x42b790`) is `GetTickCount` scaled by 0.001, an OS clock that never restarts, which stock
+    /// `Cooldown.lua` relies on (`start > 0`). Set once, at construction; after that only
+    /// [`Self::tick`] moves it.
+    pub fn set_now(&mut self, secs: f64) {
+        self.model_mut().now = secs;
+    }
+
+    /// Push the game clock `GetGameTime()` answers, `(hour, minute)`; 0:00 until the first push.
+    pub fn set_game_time(&mut self, hour: u32, minute: u32) {
+        self.model_mut().game_time = (hour, minute);
+    }
+}
+
+/// `GetTime()`'s clock, for a caller holding no model borrow; one that holds it reads `model.now`.
+pub(crate) fn now(lua: &Lua) -> f64 {
+    lua.app_data_ref::<Model>().expect("model app_data").now
+}
+
+/// Register `GetTime` and `GetGameTime`.
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+    // GetTime() (`0x515ea0`): one number, `GetTickCount` times the f64 0.001 at `0x801608`. Ours is
+    // the session clock the tick advances, so `GetTime()` deltas and the `elapsed` handed to
+    // OnUpdate agree; reference FrameXML (CastingBarFrame and kin) anchors cast windows on it.
+    g.set("GetTime", lua.create_function(|lua, ()| Ok(now(lua)))?)?;
+    // GetGameTime() (`0x515ee0`): two numbers, the hour `[0xce853c]` then the minute `[0xce8538]`,
+    // the clock `SMSG_LOGIN_SETTIMESPEED` seeds; minute resolution, no seconds.
+    g.set(
+        "GetGameTime",
+        lua.create_function(|lua, ()| {
+            let (hour, minute) = lua
+                .app_data_ref::<Model>()
+                .expect("model app_data")
+                .game_time;
+            Ok((f64::from(hour), f64::from(minute)))
+        })?,
+    )?;
+    Ok(())
+}
diff --git a/crates/benilla-ui/src/script/container.rs b/crates/benilla-ui/src/script/container.rs
index 31e13582..944e07ba 100644
--- a/crates/benilla-ui/src/script/container.rs
+++ b/crates/benilla-ui/src/script/container.rs
@@ -162,9 +162,12 @@ impl super::UiScript {
         self.model_mut().has_key = has_key;
     }
 
-    /// Drain the `(bag, slot)` pairs queued by `UseContainerItem` since the last call.
+    /// Take the `UseContainerItem` calls out of the call stream, as `(bag, slot)`.
     pub fn take_container_uses(&mut self) -> Vec<(i64, u32)> {
-        std::mem::take(&mut self.model_mut().container_uses)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::UseContainerItem { bag, slot } => Some((*bag, *slot)),
+            _ => None,
+        })
     }
 
     /// Drain the pick/place/swap moves queued by `PickupContainerItem` since the last call.
@@ -261,9 +264,7 @@ pub enum UiCursorMode {
 ///   displaced item in the source slot, never on the cursor (no `SetCursorItem`, `0x5e0c40`);
 /// - a split carry places onto an empty or same-item slot, and stays held over another item;
 /// - a spell or action payload stays held.
-///
-/// Returns whether the caller should repaint.
-fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool {
+fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) {
     // An armed gift wrap completes here, before the cursor is read. `PickupContainerItem` is the
     // only caller of the wrap sender `0x5edfc0`, so an equipped item cannot be wrapped.
     if let Some(wrap) = model.pending_wrap {
@@ -274,7 +275,7 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
             .and_then(|c| c.slots.get(&slot))
             .is_some_and(|s| s.item_id != 0)
         {
-            return false;
+            return;
         }
         // A vanished paper also bails, the wrap armed and the paper locked (`0x5edfef`).
         if !model
@@ -283,7 +284,7 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
             .and_then(|c| c.slots.get(&wrap.slot))
             .is_some_and(|s| s.item_id != 0)
         {
-            return false;
+            return;
         }
         // No eligibility test: the server refuses with an `ERR_CANT_WRAP_*` reason
         // (`SMSG_INVENTORY_CHANGE_FAILURE` 43-48), and a local gate would eat that error line.
@@ -294,7 +295,7 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
         cursor::queue_lock_changed(model, wrap.bag, wrap.slot);
         model.ui_cursor = None;
         model.ui_cursor_dirty = true;
-        return true;
+        return;
     }
     // Only a held item (`0x4f9c38`) or vendor row (`0x4f9c43`) takes the click first. Past them
     // an empty slot does nothing (`0x4f9c4e`), an armed item-targeting spell binds the item
@@ -315,7 +316,7 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
         } else if occupied {
             model.container_repairs.push((bag, slot));
         }
-        return false;
+        return;
     }
     match model.cursor.take() {
         None => {
@@ -335,20 +336,15 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
                     bar_placeable: s.bar_placeable,
                     equip_slots: s.equip_slots.clone(),
                 });
-            match picked {
-                Some(item) => {
-                    model.cursor = Some(CursorPayload::Item(item));
-                    cursor::queue_cursor_update(model);
-                    cursor::queue_lock_changed(model, bag, slot);
-                    true
-                }
-                None => false,
+            if let Some(item) = picked {
+                model.cursor = Some(CursorPayload::Item(item));
+                cursor::queue_cursor_update(model);
+                cursor::queue_lock_changed(model, bag, slot);
             }
         }
         Some(CursorPayload::Item(held)) if held.bag == bag && held.slot == slot => {
             cursor::queue_cursor_update(model);
             cursor::queue_lock_changed(model, held.bag, held.slot);
-            true
         }
         Some(CursorPayload::Item(held)) => {
             // Cloned so the moves below can borrow `model`; an unresolved slot reads as empty.
@@ -362,7 +358,6 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
                 // A split carry cannot swap with a different item: it stays held.
                 (Some(_), Some(d)) if d.item_id != held.item_id => {
                     model.cursor = Some(CursorPayload::Item(held));
-                    false
                 }
                 // Anything else queues the move and clears: a split, a merge the server tops up,
                 // or a swap that lands the displaced item in the source slot.
@@ -370,7 +365,6 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
                     queue_move(model, &held, bag, slot, count);
                     cursor::queue_cursor_update(model);
                     cursor::queue_lock_changed(model, held.bag, held.slot);
-                    true
                 }
             }
         }
@@ -389,7 +383,6 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
                 model.merchant_slot_buys.push((bag, slot, entry));
             }
             cursor::queue_cursor_update(model);
-            true
         }
         Some(
             other @ (CursorPayload::Spell(_)
@@ -402,7 +395,6 @@ fn pickup_container_item(model: &mut super::Model, bag: i64, slot: u32) -> bool
             | CursorPayload::Money(_)),
         ) => {
             model.cursor = Some(other);
-            false
         }
     }
 }
@@ -514,7 +506,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     lua.globals().set(
         "GetContainerItemCooldown",
         lua.create_function(|lua, (bag, slot): (i64, u32)| {
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             let model = lua.app_data_ref::<Model>().expect("model app_data");
             Ok(match model.container_cooldowns.get(&(bag, slot)) {
                 Some(&(start, duration, enabled)) if start + duration > now || !enabled => {
@@ -590,23 +582,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // BenillaGetContainerItemID(bag, slot): the item id behind a slot. Not a 1.12 verb, where the
-    // id is parsed from `GetContainerItemLink`; the `Benilla` prefix keeps it off the 1.12 surface.
-    lua.globals().set(
-        "BenillaGetContainerItemID",
-        lua.create_function(|lua, (bag, slot): (i64, u32)| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            // nil, not 0, while the template is in flight: a caller would index a table with 0.
-            Ok(model
-                .containers
-                .get(&bag)
-                .and_then(|c| c.slots.get(&slot))
-                .map(|s| s.item_id)
-                .filter(|&id| id != 0)
-                .map(i64::from))
-        })?,
-    )?;
-
     lua.globals().set(
         "UseContainerItem",
         lua.create_function(|lua, (bag, slot, _rest): (i64, u32, mlua::MultiValue)| {
@@ -625,19 +600,22 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                     model.container_repairs.push((bag, slot));
                 }
             } else {
-                model.container_uses.push((bag, slot));
+                model
+                    .script_calls
+                    .push(super::ScriptCall::UseContainerItem { bag, slot });
             }
             Ok(())
         })?,
     )?;
 
-    // PickupContainerItem(bag, slot) (`0x4f9b30`): pick up, or place and swap. Its boolean return,
-    // whether to repaint, is not 1.12's, whose binding returns nothing.
+    // PickupContainerItem(bag, slot) (`0x4f9b30`): pick up, or place and swap; no return value on
+    // any path.
     lua.globals().set(
         "PickupContainerItem",
         lua.create_function(|lua, (bag, slot): (i64, u32)| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            Ok(pickup_container_item(&mut model, bag, slot))
+            pickup_container_item(&mut model, bag, slot);
+            Ok(())
         })?,
     )?;
 
@@ -848,13 +826,13 @@ mod tests {
         assert_eq!(icon, "Interface\\Icons\\INV_Misc_Food_16");
         assert_eq!((count, quality), (5, 1));
         assert_eq!(
-            s.eval::<i64>("return BenillaGetContainerItemID(0, 1)")
-                .unwrap(),
+            s.eval::<i64>(
+                "local _, _, id = string.find(GetContainerItemLink(0, 1), 'item:(%d+)') \
+                 return tonumber(id)"
+            )
+            .unwrap(),
             117
         );
-        assert!(s
-            .eval::<bool>("return GetContainerItemLink(0, 1) ~= nil")
-            .unwrap());
         // readable: the letter in 4, not the jerky in 1.
         assert!(!s
             .eval::<bool>("local _, _, _, _, readable = GetContainerItemInfo(0, 1) return readable")
@@ -871,7 +849,7 @@ mod tests {
             )
             .unwrap());
         assert!(s
-            .eval::<bool>("return BenillaGetContainerItemID(0, 3) == nil")
+            .eval::<bool>("return GetContainerItemLink(0, 3) == nil")
             .unwrap());
         assert!(s
             .eval::<bool>("return GetContainerItemInfo(0, 2) == nil")
@@ -928,7 +906,7 @@ mod tests {
         assert!(s.cursor_item().is_none());
         assert!(!s.eval::<bool>("return CursorHasItem()").unwrap());
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         let held = s.cursor_item().expect("cursor holds the picked item");
         assert_eq!((held.bag, held.slot, held.item_id), (0, 1, 117));
         assert_eq!(
@@ -941,12 +919,9 @@ mod tests {
             .unwrap());
         assert!(s.take_container_moves().is_empty());
 
-        let (kind, id) = s
-            .eval::<(String, i64)>("local k, id = GetCursorInfo() return k, id")
-            .unwrap();
-        assert_eq!((kind.as_str(), id), ("item", 117));
+        assert_eq!(s.cursor_item().map(|c| c.item_id), Some(117));
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 5)").unwrap());
+        s.run("PickupContainerItem(0, 5)").unwrap();
         assert!(s.cursor_item().is_none());
         assert!(!s.eval::<bool>("return CursorHasItem()").unwrap());
         assert_eq!(
@@ -993,10 +968,10 @@ mod tests {
         );
         s.set_container(0, Some(state));
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert_eq!(s.cursor_item().unwrap().item_id, 117);
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 5)").unwrap());
+        s.run("PickupContainerItem(0, 5)").unwrap();
         assert!(
             s.cursor_item().is_none(),
             "a swap clears the cursor — the displaced item never hops on"
@@ -1033,7 +1008,7 @@ mod tests {
         s.set_container(0, Some(state));
 
         s.run("PickupContainerItem(0, 1)").unwrap();
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 5)").unwrap());
+        s.run("PickupContainerItem(0, 5)").unwrap();
         assert!(
             s.cursor_item().is_none(),
             "same-item merge clears the cursor"
@@ -1057,7 +1032,7 @@ mod tests {
         state.slots.get_mut(&1).unwrap().locked = true;
         s.set_container(0, Some(state));
 
-        assert!(!s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert!(s.cursor_item().is_none());
     }
 
@@ -1094,7 +1069,7 @@ mod tests {
             (0, 1, 117, Some(3))
         );
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 2)").unwrap());
+        s.run("PickupContainerItem(0, 2)").unwrap();
         assert!(s.cursor_item().is_none());
         assert_eq!(
             s.take_container_moves(),
@@ -1108,12 +1083,12 @@ mod tests {
         );
 
         s.run("SplitContainerItem(0, 1, 3)").unwrap();
-        assert!(!s.eval::<bool>("return PickupContainerItem(0, 9)").unwrap());
+        s.run("PickupContainerItem(0, 9)").unwrap();
         let held = s.cursor_item().expect("kept — can't swap a partial stack");
         assert_eq!(held.count, Some(3));
         assert!(s.take_container_moves().is_empty());
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 7)").unwrap());
+        s.run("PickupContainerItem(0, 7)").unwrap();
         assert!(s.cursor_item().is_none());
         assert_eq!(
             s.take_container_moves(),
@@ -1147,9 +1122,9 @@ mod tests {
     fn pickup_same_slot_cancels_no_move() {
         let mut s = UiScript::new().unwrap();
         s.set_container(0, Some(backpack()));
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert!(s.cursor_item().is_some());
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert!(s.cursor_item().is_none());
         assert!(s.take_container_moves().is_empty());
     }
@@ -1159,9 +1134,9 @@ mod tests {
         let mut s = UiScript::new().unwrap();
         s.set_container(0, Some(backpack()));
         // Slot 2 is empty and slot 3 unresolved: neither can be picked up.
-        assert!(!s.eval::<bool>("return PickupContainerItem(0, 2)").unwrap());
+        s.run("PickupContainerItem(0, 2)").unwrap();
         assert!(s.cursor_item().is_none());
-        assert!(!s.eval::<bool>("return PickupContainerItem(0, 3)").unwrap());
+        s.run("PickupContainerItem(0, 3)").unwrap();
         assert!(s.cursor_item().is_none());
     }
 
diff --git a/crates/benilla-ui/src/script/cursor.rs b/crates/benilla-ui/src/script/cursor.rs
index 281e3cab..e11b6194 100644
--- a/crates/benilla-ui/src/script/cursor.rs
+++ b/crates/benilla-ui/src/script/cursor.rs
@@ -3,7 +3,7 @@
 //! and the spellbook all transition it through [`queue_cursor_update`] and [`queue_lock_changed`],
 //! so sounds, `CURSOR_UPDATE`, grid events and lock display fire from one place.
 
-use mlua::{Lua, Value};
+use mlua::Lua;
 
 use super::{Model, ScriptValue};
 
@@ -403,10 +403,11 @@ impl super::UiScript {
         self.model_mut().item_pick_armed = armed;
     }
 
-    /// Push the unit tokens for which the armed word's unit checks all pass.
-    pub fn set_spell_targetable_units<'a>(&mut self, tokens: impl IntoIterator<Item = &'a str>) {
-        self.model_mut().spell_targetable_units =
-            tokens.into_iter().map(str::to_ascii_lowercase).collect();
+    /// Push the guids of the units for which the armed word's unit checks all pass.
+    /// `SpellCanTargetUnit` resolves its token to a guid, as `0x515970` does, and asks this set,
+    /// so a chain such as `"party1target"` reads the unit it ends on.
+    pub fn set_spell_targetable_units(&mut self, guids: impl IntoIterator<Item = u64>) {
+        self.model_mut().spell_targetable_units = guids.into_iter().collect();
     }
 
     /// Drain the `(bag, slot)` picks since the last call; a paper-doll pick reports as
@@ -455,64 +456,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         )?;
     }
 
-    // `GetCursorInfo()` is not a 1.12 verb. It answers ("item", id, link), ("spell", book slot,
-    // book, spell id), ("action", slot), ("macro", index) or ("petaction", slot), padded with nil
-    // to four values; any other payload, or none, is four nils.
-    g.set(
-        "GetCursorInfo",
-        lua.create_function(|lua, ()| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            let str_or_nil = |lua: &Lua, s: &Option<String>| -> mlua::Result<Value> {
-                match s {
-                    Some(s) => Ok(Value::String(lua.create_string(s)?)),
-                    None => Ok(Value::Nil),
-                }
-            };
-            match &model.cursor {
-                Some(CursorPayload::Item(c)) => Ok((
-                    Value::String(lua.create_string("item")?),
-                    Value::Integer(i64::from(c.item_id)),
-                    str_or_nil(lua, &c.link)?,
-                    Value::Nil,
-                )),
-                Some(CursorPayload::Spell(s)) => Ok((
-                    Value::String(lua.create_string("spell")?),
-                    Value::Integer(i64::from(s.book_slot)),
-                    Value::String(lua.create_string(&s.book_type)?),
-                    Value::Integer(i64::from(s.spell_id)),
-                )),
-                Some(CursorPayload::Action(a)) => Ok((
-                    Value::String(lua.create_string("action")?),
-                    Value::Integer(i64::from(a.src_slot)),
-                    Value::Nil,
-                    Value::Nil,
-                )),
-                Some(CursorPayload::Macro(m)) => Ok((
-                    Value::String(lua.create_string("macro")?),
-                    Value::Integer(i64::from(m.index)),
-                    Value::Nil,
-                    Value::Nil,
-                )),
-                Some(CursorPayload::PetAction(p)) => Ok((
-                    Value::String(lua.create_string("petaction")?),
-                    Value::Integer(i64::from(p.src_slot)),
-                    Value::Nil,
-                    Value::Nil,
-                )),
-                Some(CursorPayload::StablePet(_)) => {
-                    Ok((Value::Nil, Value::Nil, Value::Nil, Value::Nil))
-                }
-                Some(CursorPayload::Money(_)) => {
-                    Ok((Value::Nil, Value::Nil, Value::Nil, Value::Nil))
-                }
-                Some(CursorPayload::Merchant(_)) => {
-                    Ok((Value::Nil, Value::Nil, Value::Nil, Value::Nil))
-                }
-                None => Ok((Value::Nil, Value::Nil, Value::Nil, Value::Nil)),
-            }
-        })?,
-    )?;
-
     g.set(
         "CursorHasItem",
         lua.create_function(|lua, ()| {
@@ -652,12 +595,9 @@ mod tests {
     }
 
     #[test]
-    fn get_cursor_info_and_has_checks_per_arm() {
+    fn the_has_checks_answer_per_arm() {
         let mut s = UiScript::new().unwrap();
 
-        assert!(s
-            .eval::<bool>("local k = GetCursorInfo() return k == nil")
-            .unwrap());
         assert!(!s.eval::<bool>("return CursorHasItem()").unwrap());
         assert!(!s.eval::<bool>("return CursorHasSpell()").unwrap());
 
@@ -672,13 +612,6 @@ mod tests {
             quality: Some(3),
             equip_slots: Vec::new(),
         }));
-        let (kind, id, link) = s
-            .eval::<(String, i64, String)>("local k, id, link = GetCursorInfo() return k, id, link")
-            .unwrap();
-        assert_eq!(
-            (kind.as_str(), id, link.as_str()),
-            ("item", 117, "|Hitem:117|h[Tough Jerky]|h")
-        );
         assert!(s.eval::<bool>("return CursorHasItem()").unwrap());
         assert!(!s.eval::<bool>("return CursorHasSpell()").unwrap());
 
@@ -689,15 +622,6 @@ mod tests {
             spell_id: 133,
             texture: None,
         }));
-        let (kind, slot, book, spell_id) = s
-            .eval::<(String, i64, String, i64)>(
-                "local k, slot, book, id = GetCursorInfo() return k, slot, book, id",
-            )
-            .unwrap();
-        assert_eq!(
-            (kind.as_str(), slot, book.as_str(), spell_id),
-            ("spell", 3, "spell", 133)
-        );
         assert!(!s.eval::<bool>("return CursorHasItem()").unwrap());
         assert!(s.eval::<bool>("return CursorHasSpell()").unwrap());
 
@@ -707,10 +631,6 @@ mod tests {
             action: 133,
             texture: None,
         }));
-        let (kind, slot) = s
-            .eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-            .unwrap();
-        assert_eq!((kind.as_str(), slot), ("action", 12));
         assert!(!s.eval::<bool>("return CursorHasItem()").unwrap());
         assert!(!s.eval::<bool>("return CursorHasSpell()").unwrap());
     }
diff --git a/crates/benilla-ui/src/script/cursor/bar.rs b/crates/benilla-ui/src/script/cursor/bar.rs
index 38f1a16f..e2b37ebc 100644
--- a/crates/benilla-ui/src/script/cursor/bar.rs
+++ b/crates/benilla-ui/src/script/cursor/bar.rs
@@ -149,10 +149,11 @@ mod tests {
             !s.eval::<bool>("return HasAction(1)").unwrap(),
             "removed from the engine's optimistic mirror"
         );
-        let (kind, id) = s
-            .eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-            .unwrap();
-        assert_eq!((kind.as_str(), id), ("action", 1));
+        assert!(
+            matches!(s.cursor_payload(), Some(CursorPayload::Action(c)) if c.src_slot == 1),
+            "{:?}",
+            s.cursor_payload()
+        );
         assert_eq!(s.take_action_sets(), vec![(1, 0)]);
     }
 
@@ -199,10 +200,6 @@ mod tests {
             s.eval::<String>("return GetActionTexture(2)").unwrap(),
             "Interface\\Icons\\Spell_A"
         );
-        let (kind, src) = s
-            .eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-            .unwrap();
-        assert_eq!((kind.as_str(), src), ("action", 2));
         assert_eq!(
             s.cursor_payload(),
             Some(CursorPayload::Action(CursorAction {
diff --git a/crates/benilla-ui/src/script/cursor/doll.rs b/crates/benilla-ui/src/script/cursor/doll.rs
index d9af7591..a95e54cb 100644
--- a/crates/benilla-ui/src/script/cursor/doll.rs
+++ b/crates/benilla-ui/src/script/cursor/doll.rs
@@ -162,7 +162,9 @@ pub(super) fn auto_equip_cursor_item(model: &mut Model) -> bool {
 pub(super) fn use_inventory_item(model: &mut Model, id: u32) {
     super::clear_cursor(model);
     if !model.repair_mode {
-        model.inventory_uses.push(id);
+        model
+            .script_calls
+            .push(crate::script::ScriptCall::UseInventoryItem(id));
         return;
     }
     if (1..=19).contains(&id)
@@ -367,7 +369,7 @@ mod tests {
         s.set_inventory_slots(doll_slots());
         s.set_container(0, Some(one_fitting_bag_item()));
 
-        assert!(s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert_eq!(s.cursor_item().unwrap().equip_slots, vec![1]);
 
         assert!(s.eval::<bool>("return PickupInventoryItem(1)").unwrap());
@@ -760,7 +762,7 @@ mod tests {
         s.run("ClearCursor()").unwrap();
         assert!(s.cursor_item().is_none());
         assert!(!s.eval::<bool>("return PickupInventoryItem(1)").unwrap());
-        assert!(!s.eval::<bool>("return PickupContainerItem(0, 1)").unwrap());
+        s.run("PickupContainerItem(0, 1)").unwrap();
         assert_eq!(
             s.take_item_picks(),
             vec![(EQUIPMENT_BAG, 1), (0, 1)],
diff --git a/crates/benilla-ui/src/script/cursor/drag.rs b/crates/benilla-ui/src/script/cursor/drag.rs
index de883c71..caf3cfc2 100644
--- a/crates/benilla-ui/src/script/cursor/drag.rs
+++ b/crates/benilla-ui/src/script/cursor/drag.rs
@@ -108,13 +108,13 @@ mod tests {
             local a = CreateFrame("Frame", "A")
             a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(400); a:SetHeight(600); a:EnableMouse(true)
             a:RegisterForDrag("LeftButton")
-            a:SetScript("OnDragStart", function(self, button) drag_starts = drag_starts + 1; drag_button = button end)
-            a:SetScript("OnDragStop", function(self) drag_stops = drag_stops + 1 end)
-            a:SetScript("OnClick", function(self) click_a = click_a + 1 end)
+            a:SetScript("OnDragStart", function() local self, button = this, arg1 drag_starts = drag_starts + 1; drag_button = button end)
+            a:SetScript("OnDragStop", function() local self = this drag_stops = drag_stops + 1 end)
+            a:SetScript("OnClick", function() local self = this click_a = click_a + 1 end)
             local b = CreateFrame("Frame", "B")
             b:SetPoint("BOTTOMLEFT", 400, 0); b:SetWidth(400); b:SetHeight(600); b:EnableMouse(true)
-            b:SetScript("OnReceiveDrag", function(self) receives = receives + 1 end)
-            b:SetScript("OnClick", function(self) click_b = click_b + 1 end)
+            b:SetScript("OnReceiveDrag", function() local self = this receives = receives + 1 end)
+            b:SetScript("OnClick", function() local self = this click_b = click_b + 1 end)
             "#,
         )
         .unwrap();
@@ -170,7 +170,7 @@ mod tests {
             local a = CreateFrame("Frame", "A")
             a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(400); a:SetHeight(600); a:EnableMouse(true)
             a:RegisterForDrag("LeftButton")
-            a:SetScript("OnClick", function(self) clicks = clicks + 1 end)
+            a:SetScript("OnClick", function() local self = this clicks = clicks + 1 end)
             "#,
         )
         .unwrap();
@@ -192,7 +192,7 @@ mod tests {
             local a = CreateFrame("Frame", "A")
             a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(400); a:SetHeight(600); a:EnableMouse(true)
             a:RegisterForDrag("LeftButton")
-            a:SetScript("OnClick", function(self) clicks = clicks + 1 end)
+            a:SetScript("OnClick", function() local self = this clicks = clicks + 1 end)
             "#,
         )
         .unwrap();
@@ -271,7 +271,7 @@ mod tests {
             heard, name, quality = 0, nil, nil
             local f = CreateFrame("Frame", "Listener")
             f:RegisterEvent("DELETE_ITEM_CONFIRM")
-            f:SetScript("OnEvent", function(self, event, n, q) heard = heard + 1; name = n; quality = q end)
+            f:SetScript("OnEvent", function() local self, event, n, q = this, event, arg1, arg2 heard = heard + 1; name = n; quality = q end)
             "#,
         )
         .unwrap();
diff --git a/crates/benilla-ui/src/script/cursor/money.rs b/crates/benilla-ui/src/script/cursor/money.rs
index e70fbf63..ea759745 100644
--- a/crates/benilla-ui/src/script/cursor/money.rs
+++ b/crates/benilla-ui/src/script/cursor/money.rs
@@ -276,10 +276,7 @@ mod tests {
     fn the_trade_pair_moves_coins_between_the_cursor_and_the_offer() {
         let mut s = UiScript::new().unwrap();
         s.set_money(1_000);
-        s.set_trade(Some(crate::script::TradeState {
-            partner_name: Some("Bob".into()),
-            ..Default::default()
-        }));
+        s.set_trade(Some(crate::script::TradeState::default()));
         s.run("PickupPlayerMoney(300) AddTradeMoney()").unwrap();
         assert_eq!(
             s.take_trade_money(),
diff --git a/crates/benilla-ui/src/script/cursor/pet.rs b/crates/benilla-ui/src/script/cursor/pet.rs
index 96216381..51c42565 100644
--- a/crates/benilla-ui/src/script/cursor/pet.rs
+++ b/crates/benilla-ui/src/script/cursor/pet.rs
@@ -3,6 +3,9 @@
 //! payload, a word carried verbatim (`0x4bce00`), so a drag only rearranges the bar the server
 //! sent. A drop clears the cursor before deciding (`0x495190`) and only a write that relocated
 //! nothing refills it (`0x4bce38`), so a refused drop loses the payload, as in the reference.
+//! Both bar writes, the drop's (`0x4bce33`) and the pickup's blank (`0x4be27f`), ask the pet's
+//! usability predicate first (`0x4bc9d0`): on an unusable pet the drop writes nothing and refills
+//! nothing, and the pickup holds its action with the slot left as it was.
 
 use mlua::Lua;
 
@@ -89,8 +92,9 @@ fn assign(slots: &mut [u32], target: usize, source: u32, passive: bool) -> Optio
     })
 }
 
-/// `PickupPetAction(slot)` (`0x4be180`), 1-based. `UNIT_FLAG_POSSESSED` blocks both ends, its
-/// gate sitting above the cursor fork (`0x4be20a`). Another payload stays held here, where the
+/// `PickupPetAction(slot)` (`0x4be180`), 1-based. A pet whose object does not resolve
+/// (`0x4be1f7`) or is `UNIT_FLAG_POSSESSED` (`0x4be20a`) blocks both ends, the gate sitting above
+/// the cursor fork, so the cursor is left as it was. Another payload stays held here, where the
 /// reference clears it (`0x4be220`) and picks the slot up. A pickup blanks only a spell slot
 /// (`0x4be268`), so a dragged token is copied, not moved.
 pub(super) fn pickup_pet_action(model: &mut Model, slot: u32) -> bool {
@@ -166,8 +170,14 @@ fn slot_index(model: &Model, slot: u32) -> Option<usize> {
 }
 
 /// Run [`assign`] on the engine's optimistic mirror of the ten words and queue the send; the
-/// pickup's blank goes through it too, as in the reference (`0x4be268`).
+/// pickup's blank goes through it too, as in the reference (`0x4be268`). `0x4bc9a0` takes its
+/// send flag from both callers as 1, which makes it ask `0x4bcf70` before anything else
+/// (`0x4bc9c7`-`0x4bc9d7`); the app's answer, the one the bar's `GetPetActionsUsable` reads, is
+/// `PetBarState::actions_usable`.
 fn write_slot(model: &mut Model, target: usize, source: u32, passive: bool) -> Option<Assigned> {
+    if !model.pet_bar.actions_usable {
+        return None;
+    }
     let mut words: Vec<u32> = model.pet_bar.slots.iter().map(|s| s.view.packed).collect();
     let assigned = assign(&mut words, target, source, passive)?;
 
@@ -331,10 +341,10 @@ mod tests {
     fn picking_up_a_spell_blanks_its_slot_and_sends() {
         let mut s = bar_script();
         assert!(s.eval::<bool>("return PickupPetAction(4)").unwrap());
-        assert_eq!(
-            s.eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-                .unwrap(),
-            ("petaction".to_string(), 4)
+        assert!(
+            matches!(s.cursor_payload(), Some(crate::script::CursorPayload::PetAction(c)) if c.src_slot == 4),
+            "{:?}",
+            s.cursor_payload()
         );
         assert_eq!(
             s.take_pet_set_actions(),
@@ -369,6 +379,64 @@ mod tests {
         assert_eq!(p.texture, None);
     }
 
+    /// `0x4bc9d0`: the write asks the pet's usability predicate first, and the app's answer is the
+    /// one the bar last pushed. The pickup still lifts its action (`0x4be25d`), but its blank
+    /// (`0x4be27f`) is refused, so the slot keeps the word and nothing is sent; the drop clears the
+    /// cursor before it decides (`0x4be220`), and its refused write refills nothing (`0x4bce38`).
+    #[test]
+    fn an_unusable_bar_writes_nothing_at_either_end() {
+        let mut s = UiScript::new().unwrap();
+        s.set_pet_actions(true, false, true, hunter_bar());
+
+        assert!(s.eval::<bool>("return PickupPetAction(4)").unwrap());
+        assert!(
+            matches!(s.cursor_payload(), Some(crate::script::CursorPayload::PetAction(c))
+                if c.src_slot == 4 && c.packed == CLAW),
+            "the pickup lifted Claw: {:?}",
+            s.cursor_payload()
+        );
+        assert!(
+            s.take_pet_set_actions().is_empty(),
+            "but its blank was refused, so nothing is sent"
+        );
+
+        s.run("PickupPetAction(5)").unwrap();
+        assert!(
+            s.cursor_payload().is_none(),
+            "the drop cleared the cursor and nothing refilled it"
+        );
+        assert!(s.take_pet_set_actions().is_empty(), "and wrote nothing");
+
+        // Slot 4 was never blanked: a second pickup lifts the whole word, autocast bits and all,
+        // where a blanked slot would give the type with id 0.
+        s.run("PickupPetAction(4)").unwrap();
+        assert!(
+            matches!(s.cursor_payload(), Some(crate::script::CursorPayload::PetAction(c))
+                if c.packed == CLAW),
+            "{:?}",
+            s.cursor_payload()
+        );
+        // Growl kept its slot too: the refused drop never displaced it.
+        s.run("ClearCursor() PickupPetAction(5)").unwrap();
+        assert!(matches!(
+            s.cursor_payload(),
+            Some(crate::script::CursorPayload::PetAction(c)) if c.packed == GROWL
+        ));
+        assert!(s.take_pet_set_actions().is_empty());
+    }
+
+    /// The same bar made usable takes the same two writes, which is what the test above stops.
+    #[test]
+    fn a_usable_bar_takes_both_writes() {
+        let mut s = bar_script();
+        s.run("PickupPetAction(4) PickupPetAction(5)").unwrap();
+        assert_eq!(
+            s.take_pet_set_actions().len(),
+            2,
+            "the pickup's blank and the drop"
+        );
+    }
+
     #[test]
     fn picking_up_a_token_leaves_the_slot_alone() {
         let mut s = bar_script();
@@ -387,11 +455,10 @@ mod tests {
             s.take_pet_set_actions(),
             vec![vec![(3, CLAW & 0xFFFF_0000)], vec![(4, CLAW)]]
         );
-        assert_eq!(
-            s.eval::<(String, i64)>("local k, slot = GetCursorInfo() return k, slot")
-                .unwrap(),
-            ("petaction".to_string(), 5),
-            "Growl was displaced and is now held, addressed as the slot it came from"
+        assert!(
+            matches!(s.cursor_payload(), Some(crate::script::CursorPayload::PetAction(c)) if c.src_slot == 5),
+            "Growl was displaced and is now held, addressed as the slot it came from: {:?}",
+            s.cursor_payload()
         );
     }
 
@@ -409,7 +476,7 @@ mod tests {
             "the relocation pair FIRST, then the write — the binary's own order. And the slot the \
              spell was just picked OUT of is the first candidate, so Attack lands there."
         );
-        assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+        assert!(s.cursor_payload().is_none());
     }
 
     /// The reachable refusal is a passive spell, which the pickup does not gate; its blank
@@ -431,7 +498,7 @@ mod tests {
             "the pickup's own blank went through; the drop wrote and sent nothing"
         );
         assert!(
-            s.eval::<bool>("return GetCursorInfo() == nil").unwrap(),
+            s.cursor_payload().is_none(),
             "and the cursor is empty — the reference cleared it before it ever decided"
         );
     }
@@ -442,10 +509,10 @@ mod tests {
         assert!(!s.eval::<bool>("return PickupPetAction(11)").unwrap());
         assert!(!s.eval::<bool>("return PickupPetAction(0)").unwrap());
         assert!(s.take_pet_set_actions().is_empty());
-        assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+        assert!(s.cursor_payload().is_none());
     }
 
-    /// The third flag, `pickup_allowed`, is false under `UNIT_FLAG_POSSESSED`.
+    /// The third flag, `pickup_allowed`, is false for a pet that is out of view or possessed.
     #[test]
     fn a_possessed_bar_takes_no_drag_at_all() {
         let mut s = UiScript::new().unwrap();
@@ -492,9 +559,10 @@ mod tests {
         );
         // PlaceAction refuses it outright and leaves it held.
         assert!(!s.eval::<bool>("return PlaceAction(1)").unwrap());
-        assert!(s
-            .eval::<bool>("local k = GetCursorInfo() return k == 'petaction'")
-            .unwrap());
+        assert!(matches!(
+            s.cursor_payload(),
+            Some(crate::script::CursorPayload::PetAction(_))
+        ));
         assert!(
             s.take_action_sets().is_empty(),
             "and writes nothing to the action bar"
diff --git a/crates/benilla-ui/src/script/cvars.rs b/crates/benilla-ui/src/script/cvars.rs
index 5a976354..433117a8 100644
--- a/crates/benilla-ui/src/script/cvars.rs
+++ b/crates/benilla-ui/src/script/cvars.rs
@@ -9,6 +9,7 @@
 
 use mlua::{Lua, Value};
 
+use super::binding_abi::lua_number_text;
 use super::{Model, ScriptValue};
 
 /// One registered CVar.
@@ -202,6 +203,20 @@ impl super::UiScript {
         std::mem::take(&mut self.model_mut().cvar_registrations)
     }
 
+    /// Flag a CVar read-only to Lua, or clear it: `CVar::SetReadOnly` (`0x63e030`). A flagged name
+    /// makes `SetCVar` raise `"%s" is read-only` (`0x488c67`-`0x488c78`); host and engine writes,
+    /// and `ConsoleExec`, still land, as the reference's `CVar::Set` (`0x63df50`) never tests the
+    /// flag. The name need not be registered yet.
+    pub fn set_cvar_read_only(&mut self, name: &str, read_only: bool) {
+        let key = name.to_ascii_lowercase();
+        let mut model = self.model_mut();
+        if read_only {
+            model.cvars_read_only.insert(key);
+        } else {
+            model.cvars_read_only.remove(&key);
+        }
+    }
+
     /// A native widget's write (the glue AddOns screen's "Load out of date AddOns" checkbox): sets
     /// the value and queues the change like a Lua `SetCVar`, so the config file is dirtied.
     pub fn set_cvar_engine(&mut self, name: &str, value: &str) {
@@ -282,27 +297,15 @@ fn store(model: &mut Model, key: &str, value: String) -> Option<String> {
     Some(registered)
 }
 
-/// The `SetCVar` write, shared with `ConsoleExec`: the change is queued only when the value
-/// moved, and `CVAR_UPDATE` fires only when a token was passed. `false` for an unknown name.
-pub(super) fn write_cvar(
-    model: &mut Model,
-    name: &str,
-    value: String,
-    token: Option<String>,
-) -> bool {
+/// A by-name write from a binding (`SetCVar`, `ConsoleExec`, `SetGamma`, `SetWorldDetail`): the
+/// change is queued only when the value moved. `false`, with a warning, for an unknown name.
+pub(super) fn write_cvar(model: &mut Model, name: &str, value: String) -> bool {
     let key = name.to_ascii_lowercase();
     if !model.cvars.contains_key(&key) {
         warn_unknown(model, name);
         return false;
     }
-    if store(model, &key, value.clone()).is_some() {
-        if let Some(token) = token {
-            model.pending_events.push((
-                "CVAR_UPDATE".to_string(),
-                vec![ScriptValue::Str(token), ScriptValue::Str(value)],
-            ));
-        }
-    }
+    store(model, &key, value);
     true
 }
 
@@ -315,35 +318,80 @@ fn warn_unknown(model: &mut Model, name: &str) {
     }
 }
 
-/// Coerce a Lua argument to the stored string; the client takes a number too
-/// (`SetCVar("MusicVolume", 0.4)` is the common call). A boolean becomes "1" or "0", where the
-/// reference's `SetCVar` and `RegisterCVar` store "0" for anything but a string or a number
-/// (`0x488c98`, `0x488b6f`).
-fn value_to_string(v: &Value) -> Option<String> {
-    match v {
-        Value::String(s) => s.to_str().ok().map(|s| s.to_owned()),
-        Value::Integer(i) => Some(i.to_string()),
-        Value::Number(n) => Some(n.to_string()),
-        Value::Boolean(b) => Some(if *b { "1".into() } else { "0".into() }),
+/// An argument as the CVar bindings read it, `lua_tostring` (`0x6f3690`): a string as it is, a
+/// number as Lua's `%.14g` text (`luaV_tostring` `0x6f7c80`), so the stock Sound slider's
+/// single-precision 0.4 stores `"0.40000000596046"`. `None` for anything `lua_isstring`
+/// (`0x6f3510`) refuses: nil, an absent argument, a boolean, a table or a function.
+fn cvar_arg(v: Option<&Value>) -> Option<String> {
+    match v? {
+        // Lossy: the reference takes bytes, and invalid UTF-8 must not read as absent.
+        Value::String(s) => Some(s.to_string_lossy()),
+        Value::Integer(i) => Some(lua_number_text(*i as f64)),
+        Value::Number(n) => Some(lua_number_text(*n)),
         _ => None,
     }
 }
 
-/// The enemy-plate toggle's CVar, which the app reads rather than re-spelling. Deviation: 1.12
-/// registers no nameplate CVar; the toggles persist under the later clients' names rather than
-/// invented ones.
-pub const CVAR_NAMEPLATE_ENEMIES: &str = "nameplateShowEnemies";
-/// The friendly-plate half of [`CVAR_NAMEPLATE_ENEMIES`].
-pub const CVAR_NAMEPLATE_FRIENDS: &str = "nameplateShowFriends";
+/// A value as the video setters print it, `SStrPrintf(buf, 0x10, "%f", v)` (`0x64a7f0` with the
+/// format at `0x835160`): six decimals in a 16-byte buffer, so the stored string is cut at 15
+/// characters.
+pub(super) fn format_f(v: f64) -> String {
+    let mut written = format!("{v:.6}");
+    written.truncate(15);
+    written
+}
+
+/// Storm's `SStrToInt` (`0x64ac60`), how a CVar record's integer (`rec+0x28`) is parsed from its
+/// value and how a change callback reads it: an optional `-`, then decimal digits up to the first
+/// other byte, with no whitespace skip, no `+` and no overflow check (`10·n + d` wraps); no digit
+/// is 0.
+pub fn sstr_to_int(s: &str) -> i32 {
+    let (neg, digits) = match s.strip_prefix('-') {
+        Some(rest) => (true, rest),
+        None => (false, s),
+    };
+    let n = digits
+        .bytes()
+        .take_while(u8::is_ascii_digit)
+        .fold(0i32, |n, d| {
+            n.wrapping_mul(10).wrapping_add(i32::from(d - b'0'))
+        });
+    if neg {
+        n.wrapping_neg()
+    } else {
+        n
+    }
+}
+
+/// What `SetCVar` and `RegisterCVar` store for a value with no string form (`0x82e570`, loaded
+/// at `0x488c98` and `0x488b6f`).
+const NO_STRING_FORM: &str = "0";
+
+/// `0x84235c`, verbatim, the unbalanced parenthesis included.
+const USAGE_SET_CVAR: &str = "Usage: SetCVar(\"cvar\", value [, \"scriptCvar\")";
+
+/// `0x8422e8`, verbatim.
+const USAGE_REGISTER_CVAR: &str = "Usage: RegisterCVar(\"cvar\" [, default])";
+
+/// The CVars `CGGameUI::InitializeGame` flags read-only for the whole world session, the table
+/// at `0x83de4c` walked by `0x48f566`-`0x48f584`; `ShutdownGame` clears them again
+/// (`0x491240`-`0x49125d`). The host flags them on each in-game VM before its UI loads, as
+/// `InitializeGame` does before `UI_Init`.
+pub const IN_WORLD_READ_ONLY_CVARS: [&str; 3] = ["realmList", "realmName", "scriptMemory"];
 
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
-    // `RegisterCVar(name, value)` declares a CVar the client does not ship, which is how an addon
-    // persists a setting. Re-declaring a live name is a no-op: the reference never resets a live
-    // value on re-registration.
+    // `RegisterCVar(name, value)` (`0x488b00`) declares a CVar the client does not ship, which is
+    // how an addon persists a setting. Re-declaring a live name is a no-op: the reference never
+    // resets a live value on re-registration (`0x488b7d`).
     lua.globals().set(
         "RegisterCVar",
-        lua.create_function(|lua, (name, value): (String, Option<Value>)| {
-            let value = value.as_ref().and_then(value_to_string).unwrap_or_default();
+        lua.create_function(|lua, args: mlua::MultiValue| {
+            // `lua_isstring(1)` (`0x488b09`): a string or a number names it.
+            let Some(name) = cvar_arg(args.front()) else {
+                return Err(mlua::Error::runtime(USAGE_REGISTER_CVAR));
+            };
+            // The default only when `lua_isstring(2)` passes (`0x488b56`), else "0".
+            let value = cvar_arg(args.get(1)).unwrap_or_else(|| NO_STRING_FORM.to_string());
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             let key = name.to_ascii_lowercase();
             // A saved value outranks the declared one, which stays the default for the saver.
@@ -463,30 +511,46 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
     install_video_verbs(lua)?;
 
+    // `SetCVar(name, value [, token])` (`0x488c10`).
     lua.globals().set(
         "SetCVar",
         lua.create_function(|lua, args: mlua::MultiValue| {
-            let mut it = args.iter();
-            let (Some(Value::String(name)), Some(v)) = (it.next(), it.next()) else {
-                return Err(mlua::Error::runtime("Usage: SetCVar(\"name\", value)"));
+            // `lua_isstring(1)` (`0x488c1a`): a string or a number names it.
+            let Some(name) = cvar_arg(args.front()) else {
+                return Err(mlua::Error::runtime(USAGE_SET_CVAR));
             };
-            let name = name.to_str()?.to_owned();
-            let Some(value) = value_to_string(v) else {
-                return Err(mlua::Error::runtime("Usage: SetCVar(\"name\", value)"));
-            };
-            // The third argument is the `CVAR_UPDATE` token, passed through as arg1; without one
-            // nothing fires. The 1.12 options panels pass their CheckButtons key, such as
-            // "STATUS_BAR_TEXT" (`UIOptionsFrame.lua` l.335, `OptionsFrame.lua` l.192), which is
-            // how `UIOptionsFrame_OnEvent` finds its row.
-            let token = it.next().and_then(value_to_string);
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            write_cvar(&mut model, &name, value, token);
+            // A value with no string form stores "0" (`0x488c8d`-`0x488c98`): an unchecked
+            // CheckButton's `GetChecked()` is nil, and `SoundOptionsCheckButton_OnClick` writes
+            // it as is.
+            let value = cvar_arg(args.get(1)).unwrap_or_else(|| NO_STRING_FORM.to_string());
+            {
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                // Flag bit2 (`0x488c67`), tested before anything is written.
+                if model.cvars_read_only.contains(&name.to_ascii_lowercase()) {
+                    return Err(mlua::Error::runtime(format!("\"{name}\" is read-only")));
+                }
+                if !write_cvar(&mut model, &name, value.clone()) {
+                    return Ok(());
+                }
+            }
+            // A third argument that passes `lua_isstring` is the `CVAR_UPDATE` token, arg1, with
+            // the value as arg2 (`0x488cad`-`0x488cd5`), fired on every such call, changed or not,
+            // and inside it: `SignalEvent2` (`0x703f50`) walks the listeners in place. The 1.12
+            // options panels pass their CheckButtons key, such as "STATUS_BAR_TEXT"
+            // (`UIOptionsFrame.lua` l.335), which is how `UIOptionsFrame_OnEvent` finds its row.
+            if let Some(token) = cvar_arg(args.get(2)) {
+                super::tick::fire_event_into(
+                    lua,
+                    "CVAR_UPDATE",
+                    vec![ScriptValue::Str(token), ScriptValue::Str(value)],
+                );
+            }
             Ok(())
         })?,
     )?;
 
-    install_nameplate_verbs(lua)?;
-    install_world_detail_verbs(lua)
+    install_world_detail_verbs(lua)?;
+    super::video_pairs::install(lua)
 }
 
 /// What `RestoreVideoDefaults` puts back: the CVars among the reference verb's writes that benilla
@@ -505,10 +569,15 @@ pub const VIDEO_DEFAULT_CVARS: &[&str] = &[
     "gxColorBits",
     "gxDepthBits",
     "gxMultisample",
-    // Of the sixteen further graphics CVars (`0x639a60`), the three benilla registers.
+    // Of the sixteen further graphics CVars (`0x639a60`), the seven benilla registers, in the
+    // pass's order.
     "farclip",
+    "shadowLevel",
     "frillDensity",
+    "doodadAnim",
     "trilinear",
+    CVAR_SMALL_CULL,
+    "baseMip",
     // Ours, restored with `frillDensity` so the pair keeps describing one detail level.
     "WorldDetail",
 ];
@@ -520,7 +589,8 @@ pub const VIDEO_DEFAULT_CVARS: &[&str] = &[
 /// Ten names must stay nil so their slider rows fall back to `GetCVar`/`SetCVar`
 /// (`OptionsFrame_Load:110` tries `getglobal("Get"..value.func)`): `Getuiscale`, `Getfarclip`,
 /// `Getanisotropic`, `GetspellEffectLevel`, `GetweatherDensity` and their setters.
-/// `GetFarclip`/`SetFarclip` do exist (`0x488f00`/`0x488f30`); `getglobal` is case-sensitive.
+/// `GetFarclip`/`SetFarclip` (`0x488f00`/`0x488f30`, in [`super::video_pairs`]) do exist;
+/// `getglobal` is case-sensitive.
 fn install_video_verbs(lua: &Lua) -> mlua::Result<()> {
     // ── GetScreenResolutions ─────────────────────────────────────────────────────────────────
     // A vararg of `"WxH"` strings, the spelling `ScreenResolution` pins.
@@ -704,12 +774,8 @@ fn install_video_verbs(lua: &Lua) -> mlua::Result<()> {
                 }
                 _ => return Err(mlua::Error::runtime(USAGE_SET_GAMMA)),
             };
-            // `SStrPrintf(buf, 0x10, "%f", 1.0 - v)`: a 16-byte buffer, so the stored string, and
-            // what `GetCVar("gamma")` answers, is cut at 15 characters.
-            let mut written = format!("{:.6}", 1.0 - v);
-            written.truncate(15);
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            write_cvar(&mut model, CVAR_GAMMA, written, None);
+            write_cvar(&mut model, CVAR_GAMMA, format_f(1.0 - v));
             // Zero return values, not nil (`eax = 0` at every `ret`).
             Ok(mlua::MultiValue::new())
         })?,
@@ -731,18 +797,32 @@ pub const CVAR_WORLD_DETAIL: &str = "WorldDetail";
 /// The reference's Environment Detail CVar: cells visited per chunk by the detail-doodad scatter.
 pub const CVAR_FRILL_DENSITY: &str = "frillDensity";
 
+/// The reference's object-size cull (`0x68854a`, name `0x8696f8`), the other half of each
+/// Environment Detail stop. `SetWorldDetail` looks it up as `smallCull` (`0x8423ac`), the same
+/// record under the table's case-folding hash.
+pub const CVAR_SMALL_CULL: &str = "SmallCull";
+
 /// `SetWorldDetail`'s `frillDensity` per stop, the three dwords at `0x804518`.
 pub const WORLD_DETAIL_STOPS: [u32; 3] = [16, 32, 48];
 
+/// `SetWorldDetail`'s `smallCull` per stop, the three f32s at `0x804524`.
+const SMALL_CULL_STOPS: [f32; 3] = [0.07, 0.04, 0.01];
+
+/// The `SmallCull` text `SetWorldDetail` writes for a stop (clamped to 2): the f32 as "%f".
+pub fn small_cull_text(stop: usize) -> String {
+    format_f(f64::from(SMALL_CULL_STOPS[stop.min(2)]))
+}
+
 /// The Environment Detail pair, `SetWorldDetail 0x488dd0` and `GetWorldDetail 0x488d70`, which
 /// `OptionsFrame.lua` row 3 (`func = "WorldDetail"`) drives in place of `SetCVar`/`GetCVar`. The
 /// setter truncates toward zero (`0x40a2b0`), raises outside 0..=2, and writes `frillDensity` from
 /// [`WORLD_DETAIL_STOPS`] and `smallCull` from `{0.07, 0.04, 0.01}` (`0x804524`).
 ///
-/// Deviation: the getter reads [`CVAR_WORLD_DETAIL`] and `smallCull` is not registered, because
-/// the reference's getter is `smallCull`'s only reader (`[0x868620]` is never read). A fresh
-/// reference client reads stop 1 (`frillDensity 16` with `smallCull 0.04`), hence
-/// `WorldDetail`'s `"1"`; only a bare `frillDensity` write moves ours and not the reference's.
+/// Deviation: the getter reads [`CVAR_WORLD_DETAIL`], where the reference's reads only `smallCull`
+/// (`0x488d77`), because benilla's stop follows the knob that draws: a console `frillDensity`
+/// write moves the ground clutter and `WorldDetail` with it, and no renderer reads `smallCull`
+/// (its callback's `[0x868620]` has no reader). A fresh reference client reads stop 1
+/// (`smallCull 0.04`), hence `WorldDetail`'s `"1"`.
 fn install_world_detail_verbs(lua: &Lua) -> mlua::Result<()> {
     let g = lua.globals();
     g.set(
@@ -771,15 +851,16 @@ fn install_world_detail_verbs(lua: &Lua) -> mlua::Result<()> {
             }
             let stop = stop as usize;
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            // Two CVars per stop, as `0x488dd0` writes two: `frillDensity` and, here, the stop.
-            // Writing only one would leave `GetWorldDetail` stale until the host drains the queue.
+            // The reference's two writes, `frillDensity` as "%d" (`0x488e26`) and `smallCull` as
+            // "%f" of the f32 (`0x488e63`), then ours, the stop: writing it here keeps
+            // `GetWorldDetail` current before the host drains the queue.
             write_cvar(
                 &mut model,
                 CVAR_FRILL_DENSITY,
                 WORLD_DETAIL_STOPS[stop].to_string(),
-                None,
             );
-            write_cvar(&mut model, CVAR_WORLD_DETAIL, stop.to_string(), None);
+            write_cvar(&mut model, CVAR_SMALL_CULL, small_cull_text(stop));
+            write_cvar(&mut model, CVAR_WORLD_DETAIL, stop.to_string());
             // Zero return values, not nil (`eax = 0` at every `ret`).
             Ok(mlua::MultiValue::new())
         })?,
@@ -809,44 +890,6 @@ const USAGE_SET_WORLD_DETAIL: &str = "Usage: SetWorldDetail(value)";
 /// `0x8423b8`, verbatim: the lowercase `v` and the odd comma are the reference's.
 const RANGE_SET_WORLD_DETAIL: &str = "value must be in the range 0, 2";
 
-/// The four nameplate verbs: `ShowNameplates 0x489450`, `HideNameplates 0x489460`,
-/// `ShowFriendNameplates 0x489470`, `HideFriendNameplates 0x489480`. Each ignores its arguments
-/// (`ShowNameplates(false)` still shows) and returns zero values, and there is no getter; the
-/// state is bits `0x1` (enemy) and `0x8` (friend) of `[0xc4da34]`.
-///
-/// Deviation: the state lives in two CVars, so a player's plates survive a zone-in; the reference
-/// registers no nameplate CVar (none of `0x63db90`'s sites), clears both bits on every
-/// `EnterWorld`, and FrameXML replays its `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` saved variables.
-fn install_nameplate_verbs(lua: &Lua) -> mlua::Result<()> {
-    let g = lua.globals();
-    for (name, cvar, on) in [
-        ("ShowNameplates", CVAR_NAMEPLATE_ENEMIES, true),
-        ("HideNameplates", CVAR_NAMEPLATE_ENEMIES, false),
-        ("ShowFriendNameplates", CVAR_NAMEPLATE_FRIENDS, true),
-        ("HideFriendNameplates", CVAR_NAMEPLATE_FRIENDS, false),
-    ] {
-        g.set(
-            name,
-            // Any arguments are ignored, as the reference reads none; the empty `MultiValue`
-            // returns zero values, which is not nil.
-            lua.create_function(move |lua, _: mlua::MultiValue| {
-                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-                let key = cvar.to_ascii_lowercase();
-                if let Some(slot) = model.cvars.get_mut(&key) {
-                    let value = if on { "1" } else { "0" };
-                    if slot.value != value {
-                        slot.value = value.to_string();
-                        let reg_name = slot.name.clone();
-                        model.cvar_changes.push((reg_name, value.to_string()));
-                    }
-                }
-                Ok(mlua::MultiValue::new())
-            })?,
-        )?;
-    }
-    Ok(())
-}
-
 #[cfg(test)]
 mod tests {
     use super::{MultisampleFormat, SeededCvar};
@@ -978,37 +1021,6 @@ mod tests {
         assert_eq!(s.take_console_lines(), vec!["MusicVolume".to_string()]);
     }
 
-    #[test]
-    fn the_third_argument_is_the_cvar_update_token() {
-        let mut s = script_with_volume();
-        s.run(
-            "SEEN = {} \
-             f = CreateFrame(\"Frame\") \
-             f:RegisterEvent(\"CVAR_UPDATE\") \
-             f:SetScript(\"OnEvent\", function() table.insert(SEEN, arg1 .. \"=\" .. arg2) end)",
-        )
-        .unwrap();
-
-        s.run(r#"SetCVar("MusicVolume", "0.5")"#).unwrap();
-        s.tick(0.0);
-        assert_eq!(s.eval::<f64>("return getn(SEEN)").unwrap(), 0.0);
-
-        // With one: arg1 is the token verbatim, not the CVar's name, and arg2 the new value.
-        s.run(r#"SetCVar("MusicVolume", "0.6", "MUSIC_VOLUME")"#)
-            .unwrap();
-        s.tick(0.0);
-        assert_eq!(
-            s.eval::<String>("return SEEN[1]").unwrap(),
-            "MUSIC_VOLUME=0.6"
-        );
-
-        s.run(r#"SetCVar("MusicVolume", "0.6", "MUSIC_VOLUME")"#)
-            .unwrap();
-        s.tick(0.0);
-        assert_eq!(s.eval::<f64>("return getn(SEEN)").unwrap(), 1.0);
-        assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
-    }
-
     #[test]
     fn host_writes_do_not_echo_and_snapshots_carry_defaults() {
         let mut s = script_with_volume();
diff --git a/crates/benilla-ui/src/script/diagnostics.rs b/crates/benilla-ui/src/script/diagnostics.rs
index 5ce47a31..2dfe4d55 100644
--- a/crates/benilla-ui/src/script/diagnostics.rs
+++ b/crates/benilla-ui/src/script/diagnostics.rs
@@ -1,7 +1,7 @@
-//! The script error log: this session's script errors, addon load failures and warnings, kept
-//! for the player to read. The reference has no such log: its `_ERRORMESSAGE` shows only the first
-//! message of a burst, and a load failure that never raises reaches no screen. Dispatch and
-//! `_ERRORMESSAGE` are unchanged by it.
+//! The engine's record of this session's script errors, addon load failures and warnings, for the
+//! host (the world-entry load-failure lines, the addon harness) and dev instruments; no Lua global
+//! reads it. The layer's `/errors` window keeps its own log off the Lua error handler, as a 1.12
+//! addon does. Dispatch and `_ERRORMESSAGE` are unchanged by it.
 //!
 //! A repeat bumps its row's count and keeps its place, rows are oldest first, and past
 //! [`DIAGNOSTIC_LOG_CAP`] distinct messages the oldest is evicted; `seq` is never reused, so an
@@ -10,7 +10,7 @@
 
 use std::collections::VecDeque;
 
-use mlua::{IntoLua, Lua, MultiValue, Value};
+use mlua::Lua;
 
 use super::Model;
 
@@ -91,19 +91,16 @@ impl DiagnosticLog {
     }
 
     /// Retained rows.
+    #[cfg(test)]
     pub(crate) fn len(&self) -> usize {
         self.rows.len()
     }
 
-    /// Distinct failures recorded this session, evicted and cleared rows included.
+    /// Distinct failures recorded this session, evicted rows included.
+    #[cfg(test)]
     pub(crate) fn total(&self) -> u64 {
         self.seq
     }
-
-    /// Forget the rows but not the numbering, so no `#N` ever names two failures.
-    pub(crate) fn clear(&mut self) {
-        self.rows.clear();
-    }
 }
 
 impl super::UiScript {
@@ -112,17 +109,6 @@ impl super::UiScript {
         self.model_ref().diagnostics.rows().cloned().collect()
     }
 
-    /// `(retained rows, distinct failures ever recorded)`.
-    pub fn diagnostic_counts(&self) -> (usize, u64) {
-        let m = self.model_ref();
-        (m.diagnostics.len(), m.diagnostics.total())
-    }
-
-    /// Forget the retained rows; the numbering carries on.
-    pub fn clear_diagnostics(&self) {
-        self.model_mut().diagnostics.clear();
-    }
-
     /// Retain an addon load failure that never raised (a missing file, an unparseable document, a
     /// dependency cycle or missing dependency, a broken `Bindings.xml`). It is not dispatched to
     /// `geterrorhandler()`: the reference logs such a failure and shows nothing. The caller still
@@ -131,6 +117,32 @@ impl super::UiScript {
         record_load_failure(&self.lua, msg);
     }
 
+    /// Whether `FrameXML_Debug` is above 0, which puts every banner in the load log.
+    pub fn framexml_debug(&self) -> bool {
+        self.model_ref().framexml_debug.get() > 0
+    }
+
+    /// Merge one closed level of a UI load (the core's `.toc`, an add-on) into the load's record.
+    pub fn report_load_status(&self, status: crate::status::Status) {
+        self.model_mut().load_log.ui.merge(status);
+    }
+
+    /// The UI load is over: its record is drained (`0x490187`), after any `LoadAddOn` block it
+    /// ran.
+    pub fn finish_ui_load_log(&self) {
+        let mut model = self.model_mut();
+        let lines = model.load_log.ui.take_lines();
+        model
+            .load_log
+            .writes
+            .push(crate::status::LogWrite::Rewrite(lines));
+    }
+
+    /// The drains made since the last call, in order, for the host to write.
+    pub fn take_load_log_writes(&mut self) -> Vec<crate::status::LogWrite> {
+        std::mem::take(&mut self.model_mut().load_log.writes)
+    }
+
     /// Retain a warning the host has already logged (a loader warning with its `<Addon>/<file>`
     /// prefix). Queuing it on `Model::warnings` too would log it twice; an engine-raised warning
     /// goes through `Model::record_warning`, which does both.
@@ -159,50 +171,6 @@ pub(crate) fn record_warning(lua: &Lua, msg: &str) {
         .record(DiagnosticKind::Warning, msg);
 }
 
-/// Register the error-log reads `BenillaScriptLogFrame` polls, `Benilla`-prefixed as they are not
-/// 1.12 API (`tests::reference_surface` enforces the prefix).
-pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
-    // BenillaGetNumScriptErrors() → retained, totalEverRecorded
-    lua.globals().set(
-        "BenillaGetNumScriptErrors",
-        lua.create_function(|lua, ()| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            Ok((model.diagnostics.len(), model.diagnostics.total()))
-        })?,
-    )?;
-    // BenillaGetScriptErrorInfo(index) → seq, kind, message, count; 1-based, oldest first, and
-    // nothing for an out-of-range index, so a row gone mid-repaint reads as gone.
-    lua.globals().set(
-        "BenillaGetScriptErrorInfo",
-        lua.create_function(|lua, index: i64| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            let Some(row) = usize::try_from(index)
-                .ok()
-                .and_then(|i| i.checked_sub(1))
-                .and_then(|i| model.diagnostics.rows().nth(i))
-            else {
-                return Ok(MultiValue::new());
-            };
-            Ok(MultiValue::from_vec(vec![
-                Value::Integer(row.seq as i64),
-                lua.create_string(row.kind.tag())?.into_lua(lua)?,
-                lua.create_string(&row.message)?.into_lua(lua)?,
-                Value::Integer(i64::from(row.count)),
-            ]))
-        })?,
-    )?;
-    lua.globals().set(
-        "BenillaClearScriptErrors",
-        lua.create_function(|lua, ()| {
-            lua.app_data_mut::<Model>()
-                .expect("model app_data")
-                .diagnostics
-                .clear();
-            Ok(())
-        })?,
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -308,19 +276,4 @@ mod tests {
         );
         assert_eq!(log.total() as usize, DIAGNOSTIC_LOG_CAP + 10);
     }
-
-    #[test]
-    fn clear_forgets_rows_but_not_the_numbering() {
-        let mut log = DiagnosticLog::default();
-        log.record(DiagnosticKind::Error, "a");
-        log.record(DiagnosticKind::Error, "b");
-        log.clear();
-        assert_eq!(log.len(), 0);
-        log.record(DiagnosticKind::Error, "c");
-        assert_eq!(
-            log.rows().next().unwrap().seq,
-            3,
-            "a number never names two different failures"
-        );
-    }
 }
diff --git a/crates/benilla-ui/src/script/editbox.rs b/crates/benilla-ui/src/script/editbox.rs
index 857e136d..8ce2847a 100644
--- a/crates/benilla-ui/src/script/editbox.rs
+++ b/crates/benilla-ui/src/script/editbox.rs
@@ -8,8 +8,12 @@
 //! - Routing: a focused box consumes every key and char and fires only its specialized scripts
 //!   (Enter, Escape, Space, Tab, TextChanged, TextSet, focus), never a generic `OnKeyDown`; an
 //!   unfocused box that is not `autoFocus` ignores input.
-//! - Editing: an insert replaces the selection; `numeric` aborts a whole insert on any non-digit;
-//!   caps trim from the end (`maxBytes`, then `maxLetters`).
+//! - Editing: an insert deletes the selection, then `numeric` aborts a whole insert on any
+//!   non-digit; caps trim from the end (`maxBytes`, then `maxLetters`).
+//! - Events: an edit, a caret move, a focus change or a re-seat of the text only raises the box's
+//!   dirty bits (`[E+0x31c]`); the box's flush, run after its own `OnUpdate` in the tick's walk
+//!   ([`update`]) and before a key or click acts on it, fires `OnCursorChanged` and then
+//!   `OnTextChanged`.
 //!
 //! Mouse, selection and caret (click to index `0x77d0d0`, drag `0x77a860`) live in [`interact`]
 //! and [`seam`]; the OS clipboard is host-side, [`paste`] in and `UiScript::editbox_copy` or
@@ -18,12 +22,11 @@
 //! Deviation: word and edge deletes (`Delete{Word,Edge}`), which 1.12 does not have, exist because
 //! the host's OS-native chords (Option/Cmd+Backspace, Ctrl+Backspace/Delete) expect them.
 
-use mlua::{Lua, Table, Value};
+use mlua::{Lua, Table};
 
 use super::object::frame_handle_of;
 use super::types::{EditAction, EditUnit};
 use super::{event, Model, RegionData};
-use crate::layout::{Anchor, Point};
 use crate::order::{self, DrawLayer, ZTarget};
 use crate::widget::{EditBoxState, FrameHandle, FrameKind, KindState, RegionHandle, RegionKind};
 
@@ -40,6 +43,8 @@ pub(super) fn char_input(lua: &Lua, text: &str) -> bool {
     let Some(h) = route(lua) else {
         return false;
     };
+    // The char's own key-down came first, and `OnKeyDown` flushes (`0x77b1e2`).
+    flush::flush(lua, h);
     if text == "\u{1}" {
         // Ctrl+A selects all (the client's keydown case 0x41/0x61).
         highlight_text(lua, h, 0, -1);
@@ -57,9 +62,9 @@ pub(super) fn paste(lua: &Lua, text: &str) -> bool {
     let Some(h) = route(lua) else {
         return false;
     };
+    flush::flush(lua, h); // Ctrl+V is a key-down (`0x77b1e2`)
     if with_eb(lua, h, |eb| eb.paste(text)).is_some_and(|o| o.text_changed) {
         sync_text_region(lua, h);
-        mark_text_changed(lua, h);
     }
     true
 }
@@ -69,6 +74,9 @@ pub(super) fn key_input(lua: &Lua, key: &str) -> bool {
     let Some(h) = route(lua) else {
         return false;
     };
+    // `OnKeyDown` flushes the box before it handles the key (`0x77b1e2`), so the events of the
+    // edits ahead of the key fire first, and per key.
+    flush::flush(lua, h);
     let id = frame_id_of(lua, h);
     match key.to_ascii_uppercase().as_str() {
         // multiLine: Enter inserts a newline (no OnSpacePressed); else fire OnEnterPressed.
@@ -92,6 +100,7 @@ pub(super) fn action(lua: &Lua, a: EditAction) -> bool {
     let Some(h) = route(lua) else {
         return false;
     };
+    flush::flush(lua, h); // a key-down (`0x77b1e2`)
     match a {
         EditAction::Move { unit, back, extend } => match unit {
             // The alt-arrow gate lives in the host (`editbox_alt_arrow_mode`), which declines the
@@ -99,33 +108,46 @@ pub(super) fn action(lua: &Lua, a: EditAction) -> bool {
             EditUnit::Char => move_horizontal(lua, h, !back, extend),
             // Ctrl (Option on macOS) moves by word (the client's Ctrl check, `0x41f8f0(1)`).
             EditUnit::Word => interact::move_word(lua, h, !back, extend),
+            EditUnit::Line => {
+                with_eb(lua, h, |eb| eb.move_to_line_edge(!back, extend));
+            }
             EditUnit::Edge => move_to_edge(lua, h, !back, extend),
+            // UP/DOWN fork on `multiLine` (`0x77b64e`, `0x77b675`): a row in a multi-line box,
+            // else history recall (`0x77d030`, `0x77cfd0`; benilla's is shell-style, see
+            // `EditBoxState::history_step`). On an alt-arrow box, as the stock chat box is, that is
+            // Alt+Up/Down.
+            EditUnit::Row => {
+                if with_eb(lua, h, |eb| eb.multi_line).unwrap_or(false) {
+                    // The rows the move reads, measured now when an engine is installed.
+                    seam::advances_current(lua, h);
+                    with_eb(lua, h, |eb| eb.move_by_row(!back, extend));
+                } else {
+                    history_step_key(lua, h, back);
+                }
+            }
         },
         EditAction::Delete { unit, back } => match unit {
             EditUnit::Char => delete_dir(lua, h, !back),
             EditUnit::Word => delete_span(lua, h, |eb| eb.word_boundary(!back)),
             EditUnit::Edge => delete_span(lua, h, |eb| if back { 0 } else { eb.text.len() }),
+            // No keymap deletes by line or row.
+            EditUnit::Line | EditUnit::Row => {}
         },
         EditAction::SelectAll => highlight_text(lua, h, 0, -1),
-        // History recall (`historyLines`): older, newer, then back to the live draft. A multiLine
-        // box consumes it inert (it has no vertical caret movement). On an alt-arrow box, as the
-        // stock chat box is, recall is Alt+Up/Down; the reference's history controller is untraced.
-        EditAction::HistoryPrev | EditAction::HistoryNext => {
-            if !with_eb(lua, h, |eb| eb.multi_line).unwrap_or(false) {
-                history_step_key(lua, h, a == EditAction::HistoryPrev);
-            }
-        }
     }
     true
 }
 
-// Mouse, selection, clipboard and blink (`interact`); the host's advance round trip and text
-// geometry (`seam`).
+// Mouse, selection and clipboard (`interact`); the host's advance round trip and text geometry
+// (`seam`); the text region's rect and a multi-line box's height (`relayout`); the per-frame
+// update and its flush (`flush`).
+mod flush;
 mod interact;
+mod relayout;
 mod seam;
-pub(super) use interact::{
-    click, copy_selection, cut_selection, drag_end, drag_update, tick_blink,
-};
+pub(in crate::script) use flush::update;
+pub(super) use interact::{click, copy_selection, cut_selection, drag_end, drag_update};
+pub(in crate::script) use relayout::reseat_resized;
 
 // ─────────────────────────────────────────────────────────────────────────────────────────────
 // Focus model
@@ -181,6 +203,10 @@ fn set_focus_handle(lua: &Lua, h: FrameHandle) {
         }
         let old = model.focused_editbox;
         model.focused_editbox = Some(h);
+        if let Some(o) = old {
+            raise_cursor(&mut model, o);
+        }
+        raise_cursor(&mut model, h);
         // A focus gain ends history browsing (`SetText` keeps it for the chat parser's rewrite).
         if let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) {
             eb.end_history_browse();
@@ -193,6 +219,14 @@ fn set_focus_handle(lua: &Lua, h: FrameHandle) {
     fire_script(lua, new_id, "OnEditFocusGained");
 }
 
+/// The focus transition's caret write (`0x77afa8`, `or 4`), on the box that gains the keyboard
+/// and on the one that loses it, whose next flush places or hides the caret.
+fn raise_cursor(model: &mut Model, h: FrameHandle) {
+    if let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) {
+        eb.dirty |= EditBoxState::DIRTY_CURSOR;
+    }
+}
+
 /// The EditBox's OnShow/OnHide vtable overrides (`0x81c910` slots +0x30/+0x34), run after the
 /// frame's Lua handler, since both call the base notify first. Show (`0x77a750`) focuses an
 /// `autoFocus` box when nothing holds the focus, first come first served; hide (`0x77a780`)
@@ -226,6 +260,7 @@ fn clear_focus_handle(lua: &Lua, h: FrameHandle) {
             return;
         }
         model.focused_editbox = None;
+        raise_cursor(&mut model, h);
         model.frame_id(h)
     };
     fire_script(lua, id, "OnEditFocusLost");
@@ -235,19 +270,24 @@ fn clear_focus_handle(lua: &Lua, h: FrameHandle) {
 // Editing primitives: mutate under one borrow, then sync and fire
 // ─────────────────────────────────────────────────────────────────────────────────────────────
 
-/// `Insert` (`0x77bee0`): replace the selection, abort on a non-digit when `numeric`, splice,
-/// enforce caps, mark `OnTextChanged`, and with `fire_space` fire one `OnSpacePressed` per space.
+/// `Insert` (`0x77bee0`): delete the selection, abort on a non-digit when `numeric`, splice,
+/// enforce caps, raise the dirty bits for the flush, and with `fire_space` fire one
+/// `OnSpacePressed` per space.
 fn insert(lua: &Lua, h: FrameHandle, ins: &str, fire_space: bool) {
     let Some(out) = with_eb(lua, h, |eb| eb.insert(ins)) else {
         return; // not an EditBox
     };
-    if !out.text_changed {
-        return; // numeric-aborted
+    if out.text_changed {
+        sync_text_region(lua, h);
+    }
+    if !out.inserted {
+        // Refused: a numeric abort leaves at most the selection's deletion, whose text bit fires
+        // `OnTextChanged` at the flush, and returns before `OnChar` (`0x77bf6d` → `0x77c1b8`).
+        return;
     }
-    sync_text_region(lua, h);
     let id = frame_id_of(lua, h);
     // Insert fires the generic `OnChar` with the spliced string as `arg1` (`0x77c13c`, through the
-    // varargs firer `0x7026f0`), before the deferred `OnTextChanged`; `SetText` does not.
+    // varargs firer `0x7026f0`), ahead of the flush's `OnTextChanged`; `SetText` does not.
     let on_char = lua
         .create_string(ins)
         .and_then(|s| event::fire_widget_handler(lua, id, "OnChar", vec![mlua::Value::String(s)]));
@@ -256,7 +296,6 @@ fn insert(lua: &Lua, h: FrameHandle, ins: &str, fire_space: bool) {
             .expect("model app_data")
             .record_script_error(e.to_string());
     }
-    mark_text_changed(lua, h);
     if fire_space {
         for _ in 0..out.spaces {
             fire_script(lua, id, "OnSpacePressed");
@@ -265,14 +304,13 @@ fn insert(lua: &Lua, h: FrameHandle, ins: &str, fire_space: bool) {
 }
 
 /// `SetText` (`0x77be00`): nothing when unchanged; else clear the selection, replace, cursor to
-/// the end, enforce caps, fire `OnTextSet` and mark `OnTextChanged`.
+/// the end, enforce caps, raise the dirty bits for the flush and fire `OnTextSet`.
 fn set_text(lua: &Lua, h: FrameHandle, s: &str) {
     let changed = with_eb(lua, h, |eb| eb.set_text(s));
     if changed == Some(true) {
         sync_text_region(lua, h);
         let id = frame_id_of(lua, h);
         fire_script(lua, id, "OnTextSet");
-        mark_text_changed(lua, h);
     }
 }
 
@@ -285,7 +323,6 @@ fn delete_span(lua: &Lua, h: FrameHandle, target_of: impl FnOnce(&EditBoxState)
     });
     if changed == Some(true) {
         sync_text_region(lua, h);
-        mark_text_changed(lua, h);
     }
 }
 
@@ -294,7 +331,6 @@ fn delete_dir(lua: &Lua, h: FrameHandle, forward: bool) {
     let changed = with_eb(lua, h, |eb| eb.delete_dir(forward));
     if changed == Some(true) {
         sync_text_region(lua, h);
-        mark_text_changed(lua, h);
     }
 }
 
@@ -307,12 +343,12 @@ fn history_step_key(lua: &Lua, h: FrameHandle, older: bool) {
     }
 }
 
-/// Left/Right: `shift` extends from the anchor, else collapse the selection or move one char.
+/// Left/Right: `shift` extends the selection, else collapse it or move one char.
 fn move_horizontal(lua: &Lua, h: FrameHandle, right: bool, shift: bool) {
     with_eb(lua, h, |eb| eb.move_by_char(right, shift));
 }
 
-/// Home/End; `shift` extends from the anchor.
+/// Ctrl+Home/End and Cmd+Up/Down, to the text's edge; `shift` extends the selection.
 fn move_to_edge(lua: &Lua, h: FrameHandle, end: bool, shift: bool) {
     with_eb(lua, h, |eb| eb.move_to_edge(end, shift));
 }
@@ -345,37 +381,22 @@ fn sync_text_region(lua: &Lua, h: FrameHandle) {
     }
 }
 
-/// `SetTextInsets(l, r, t, b)`: store the insets and re-anchor the text region by them.
+/// `SetTextInsets(l, r, t, b)` (`0x77a6e0`): store the insets and re-seat the text region by
+/// them (`0x77a707` → `0x77b8c0`).
 fn set_text_insets(lua: &Lua, h: FrameHandle, l: f32, r: f32, t: f32, b: f32) {
     if with_eb(lua, h, |eb| eb.text_insets = [l, r, t, b]).is_none() {
         return;
     }
-    let Some(rh) = ensure_text_region(lua, h) else {
-        return;
-    };
-    write_inset_anchors(lua, h, rh, [l, r, t, b]);
+    reseat_text_region(lua, h);
 }
 
-/// Pin the text region's corners inside the box by the insets (y-up: the top inset moves its top
-/// down, the bottom inset its bottom up).
-fn write_inset_anchors(lua: &Lua, h: FrameHandle, rh: RegionHandle, [l, r, t, b]: [f32; 4]) {
-    let owner = frame_id_of(lua, h);
-    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-    let pair = [
-        Anchor::new(Point::TopLeft, owner, Point::TopLeft, l, -t),
-        Anchor::new(Point::BottomRight, owner, Point::BottomRight, -r, b),
-    ];
-    let data = model.region_data.entry(rh).or_default();
-    let same = data.anchors.len() == 2
-        && data
-            .anchors
-            .iter()
-            .zip(&pair)
-            .all(|(a, b)| super::object::anchor_bits_eq(a, b));
-    if !same {
-        data.anchors = pair.to_vec();
-        model.touch_layout();
+/// Run `0x77b8c0` on the box's text region, creating the region's data if nothing has yet.
+fn reseat_text_region(lua: &Lua, h: FrameHandle) {
+    if ensure_text_region(lua, h).is_none() {
+        return;
     }
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    relayout::seat_text_region(&mut model, h);
 }
 
 /// The wrapper for an EditBox's embedded text FontString, built by its ctor (`0x779bee`). The
@@ -396,15 +417,15 @@ pub(crate) fn editbox_text_region_wrapper(lua: &Lua, frame: &Table) -> Option<Ta
 pub(crate) fn adopt_text_region(lua: &Lua, frame: &Table, region: &Table) -> mlua::Result<()> {
     let h = frame_handle_of(lua, frame)?;
     let rh = super::region::region_handle_of(lua, region)?;
-    let Some((insets, multi_line)) = with_eb(lua, h, |eb| {
+    let Some(multi_line) = with_eb(lua, h, |eb| {
         eb.text_region = Some(rh);
-        (eb.text_insets, eb.multi_line)
+        eb.multi_line
     }) else {
         return Ok(()); // not an EditBox
     };
-    write_inset_anchors(lua, h, rh, insets);
-    // Always `Some` text: an empty box still emits its Text quad for the host's caret.
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    relayout::seat_text_region(&mut model, h);
+    // Always `Some` text: an empty box still emits its Text quad for the host's caret.
     let data = model.region_data.entry(rh).or_default();
     data.text.get_or_insert_with(String::new);
     apply_text_region_justify(data, multi_line);
@@ -414,6 +435,11 @@ pub(crate) fn adopt_text_region(lua: &Lua, frame: &Table, region: &Table) -> mlu
 /// Get or create the box's text FontString; an XML-declared one is wired by [`adopt_text_region`].
 pub(super) fn ensure_text_region(lua: &Lua, h: FrameHandle) -> Option<RegionHandle> {
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    ensure_text_region_in(&mut model, h)
+}
+
+/// [`ensure_text_region`] on a borrowed model.
+fn ensure_text_region_in(model: &mut Model, h: FrameHandle) -> Option<RegionHandle> {
     let (existing, multi_line) = match model.arena.frame(h).map(|f| &f.kind_state) {
         Some(KindState::EditBox(eb)) => (eb.text_region, eb.multi_line),
         _ => return None,
@@ -443,9 +469,10 @@ pub(super) fn ensure_text_region(lua: &Lua, h: FrameHandle) -> Option<RegionHand
     Some(rh)
 }
 
-/// Re-apply the text region's justify for the current `multiLine` flag: LoadXML adopts the
-/// `<FontString>` before it applies the box's flags.
-pub(super) fn refresh_text_region_justify(lua: &Lua, this: &Table) -> mlua::Result<()> {
+/// Re-apply the text region's justify and rect for the current `multiLine` flag, as
+/// `SetMultiLine` re-seats it (`0x77a63f` → `0x77b8c0`): LoadXML adopts the `<FontString>` before
+/// it applies the box's flags.
+pub(super) fn refresh_text_region(lua: &Lua, this: &Table) -> mlua::Result<()> {
     let h = frame_handle_of(lua, this)?;
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
     let Some(KindState::EditBox(eb)) = model.arena.frame(h).map(|f| &f.kind_state) else {
@@ -455,6 +482,7 @@ pub(super) fn refresh_text_region_justify(lua: &Lua, this: &Table) -> mlua::Resu
         return Ok(());
     };
     apply_text_region_justify(model.region_data.entry(rh).or_default(), multi_line);
+    relayout::seat_text_region(&mut model, h);
     Ok(())
 }
 
@@ -495,111 +523,17 @@ fn fire_script(lua: &Lua, id: u32, name: &str) {
     }
 }
 
-/// `OnCursorChanged(x, y, w, h)` from the caret flush (`0x77da80`, in UI units via `0x77dd5f`): `x`
-/// is the caret's advance along its line, `y` minus the row index times the row pitch, `w` the
-/// constant 4.0 and `h` the line height. It fires only when the caret moved: the flush's one
-/// caller, `0x77d475`, is gated on dirty bit 2.
-///
-/// Deviation: `h` is the row pitch, which is taller than the line height only for a font with
-/// extra spacing (none in the stock UI), because the host's advance answer carries one measure.
-///
-/// Deviation: only the focused box fires, where the reference flushes any dirty box, because only
-/// the focused box gets an advance table from the host.
-pub(in crate::script) fn drain_cursor_changed(lua: &Lua) {
-    let fire = {
-        let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-        let Some(h) = model.focused_editbox else {
-            return;
-        };
-        if !model.arena.frame(h).is_some_and(|f| f.effective_visible) {
-            return;
-        }
-        let id = model.frame_id(h);
-        let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state)
-        else {
-            return;
-        };
-        // No advance table yet: the tick after the host answers reports it.
-        let display = eb.display();
-        if eb.advances.len() != display.len() + 1 {
-            return;
-        }
-        let cursor_d = eb.text_to_display(eb.cursor).min(display.len());
-        let (row, x) = if eb.multi_line {
-            eb.caret_row_x(cursor_d)
-        } else {
-            (0, eb.advances[cursor_d])
-        };
-        if eb.cursor_fired == Some((row, x)) {
-            return;
-        }
-        eb.cursor_fired = Some((row, x));
-        let pitch = eb.cell_h;
-        (id, x, -(row as f32) * pitch, pitch)
-    };
-    let (id, x, y, h) = fire;
-    if let Err(e) = event::fire_widget_handler(
-        lua,
-        id,
-        "OnCursorChanged",
-        vec![
-            Value::Number(f64::from(x)),
-            Value::Number(f64::from(y)),
-            Value::Number(f64::from(CARET_WIDTH)),
-            Value::Number(f64::from(h)),
-        ],
-    ) {
-        lua.app_data_mut::<Model>()
-            .expect("model app_data")
-            .record_script_error(e.to_string());
-    }
-}
-
-/// The caret width `OnCursorChanged` reports, a constant in the reference.
+/// The caret width `OnCursorChanged` reports: 4.0 UI units on every raster (`0x77b8c0` sets it,
+/// `0x77ba67`).
 const CARET_WIDTH: f32 = 4.0;
 
 // The EditBox Lua methods, consulted before the shared frame table for EditBox frames.
 mod methods;
 pub(super) use methods::install;
 
+#[cfg(test)]
+mod flush_tests;
+#[cfg(test)]
+mod relayout_tests;
 #[cfg(test)]
 mod tests;
-
-/// Raise the `textChanged` dirty bit (`[E+0x31c]` bit 0): the reference's edits only mark it, and
-/// its one fire site (`0x77d498`) is in the drain `0x77d3e0`, so a Lua caller gets control back
-/// before the handler runs and repeated changes coalesce into one fire with the final text.
-pub(super) fn mark_text_changed(lua: &Lua, h: FrameHandle) {
-    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-    if !model.dirty_editboxes.contains(&h) {
-        model.dirty_editboxes.push(h);
-    }
-}
-
-/// The dirty-word drain (`0x77d3e0`): fire the pending `OnTextChanged`s from the frame tick, as the
-/// box's `OnUpdate` (`0x77a790`) does. A hidden box stays pending until shown: `Hide` unlinks it
-/// from the update chain (that it then gets no `OnUpdate` is inferred). The list is taken before
-/// any Lua runs, so a box a handler re-marks fires on the next drain, as the reference clears its
-/// bit before the fire.
-///
-/// Deviation: not drained from `OnKeyDown` (`0x77b160`) or `OnMouseDown` (`0x77b800`), because
-/// those only bring the fire sooner within a frame and our key and mouse paths reach the tick.
-pub(in crate::script) fn drain_text_changed(lua: &Lua) {
-    let pending = {
-        let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-        if model.dirty_editboxes.is_empty() {
-            return;
-        }
-        let (ready, waiting): (Vec<_>, Vec<_>) = std::mem::take(&mut model.dirty_editboxes)
-            .into_iter()
-            .partition(|&h| model.arena.frame(h).is_some_and(|f| f.effective_visible));
-        // A frame that has been destroyed drops out of both halves.
-        model.dirty_editboxes = waiting
-            .into_iter()
-            .filter(|&h| model.arena.frame(h).is_some())
-            .collect();
-        ready
-    };
-    for h in pending {
-        fire_script(lua, frame_id_of(lua, h), "OnTextChanged");
-    }
-}
diff --git a/crates/benilla-ui/src/script/editbox/flush.rs b/crates/benilla-ui/src/script/editbox/flush.rs
new file mode 100644
index 00000000..06427294
--- /dev/null
+++ b/crates/benilla-ui/src/script/editbox/flush.rs
@@ -0,0 +1,148 @@
+//! The box's own per-frame update (`0x77a790`, vtable `0x81c910` slot `+0x38`), which the tick's
+//! walk runs in the box's place, and its flush (`0x77d3e0`), which drains the dirty word.
+
+use mlua::{Lua, Value};
+
+use super::{event, fire_script, frame_id_of, relayout, with_eb, Model, CARET_WIDTH};
+use crate::widget::{EditBoxState, FrameHandle};
+
+/// The box's update after its Lua `OnUpdate` (`0x77a79a`): the flush (`0x77a7a1`), then the caret
+/// blink (`0x77a7a6`). The walk runs it for every shown box, with an `OnUpdate` or without.
+pub(in crate::script) fn update(lua: &Lua, h: FrameHandle, dt: f32) {
+    flush(lua, h);
+    blink(lua, h, dt);
+}
+
+/// The flush `0x77d3e0`. It samples bit 0 at entry (`0x77d3f2`); on bit 0 the relayout runs
+/// (`0x77d447`) and the bit clears (`0x77d44c`); on bit 2 the caret leg runs (`0x77d475`), with
+/// the blink and `OnCursorChanged`, and only then does the bit clear (`0x77d47a`); last,
+/// `OnTextChanged` fires if bit 0 was set at entry (`0x77d481`–`0x77d498`). So a handler's edit
+/// raises bits for the next flush, a frame later, and never loops inside one: an `OnTextChanged`
+/// that sets its own text fires once more, next frame, and a caret moved by `OnCursorChanged` is
+/// cleared with the bit.
+/// Besides the walk, the box's `OnKeyDown` (`0x77b1e2`) and `OnMouseDown` (`0x77b819`) run it
+/// before the key or click acts.
+///
+/// Deviation: the flush's promotion of bit 2 to bit 0 when the caret has left the display window
+/// (`0x77d3f5`–`0x77d436`), with its IME legs (`0x77d417`–`0x77d431`), and the IME writer's
+/// `or 6` (`0x77acde`, in `0x77ac60`) are not modelled: the promotion only relayouts, which
+/// re-windows a single-line box whose window benilla keeps host-side, and fires nothing, since
+/// bit 0 is sampled before it; benilla has no IME composition.
+pub(super) fn flush(lua: &Lua, h: FrameHandle) {
+    let Some((entry, owed)) = with_eb(lua, h, |eb| (eb.dirty, eb.relayout_owed)) else {
+        return;
+    };
+    let text_changed = entry & EditBoxState::DIRTY_TEXT != 0;
+    if text_changed || owed {
+        let done = relayout::relayout(lua, h);
+        with_eb(lua, h, |eb| {
+            eb.dirty &= !EditBoxState::DIRTY_TEXT;
+            eb.relayout_owed = !done;
+        });
+    }
+    if entry & EditBoxState::DIRTY_CURSOR != 0 && caret(lua, h) {
+        with_eb(lua, h, |eb| eb.dirty &= !EditBoxState::DIRTY_CURSOR);
+    }
+    if text_changed {
+        fire_script(lua, frame_id_of(lua, h), "OnTextChanged");
+    }
+}
+
+/// The caret leg `0x77da80`: it restarts the blink (`0x77dd68`), fires `OnCursorChanged`, then
+/// shows the caret in the focused box (`0x77de35`) and hides it elsewhere (`0x77de51`). So a box
+/// that takes the keyboard, whose focus change raises bit 2 (`0x77afa8`), starts its caret solid.
+/// `false` while the advance table is pending, for the next flush to retry.
+fn caret(lua: &Lua, h: FrameHandle) -> bool {
+    with_eb(lua, h, |eb| eb.blink_accum = 0.0);
+    let placed = cursor_changed(lua, h);
+    let focused = lua
+        .app_data_ref::<Model>()
+        .expect("model app_data")
+        .focused_editbox
+        == Some(h);
+    with_eb(lua, h, |eb| eb.caret_shown = focused);
+    placed
+}
+
+/// `OnCursorChanged(x, y, w, h)` (`0x77de1b`, in UI units via `0x77dd5f`), `x` the caret's advance
+/// along its line, `y` minus the row index times the row pitch, `w` the constant 4.0 and `h` the
+/// line height. The arguments are computed only for a box with the script (`0x77dd8c`), from the
+/// box's advance table, which the installed font engine measures here when the text or font
+/// moved. `false` while that table is pending, with no engine installed: the host answers the
+/// focused box's a tick later.
+///
+/// Deviation: `h` is the row pitch the advance answer carries, where the reference passes the line
+/// height (`0x7727b0`): 0 for a single-line box, whose answer has no pitch, and for a multi-line
+/// box taller than the line height only for a font with extra spacing (none in the stock UI).
+fn cursor_changed(lua: &Lua, h: FrameHandle) -> bool {
+    let id = frame_id_of(lua, h);
+    if !event::has_widget_handler(lua, id, "OnCursorChanged") {
+        return true;
+    }
+    if !super::seam::advances_current(lua, h) {
+        return false;
+    }
+    let args = with_eb(lua, h, |eb| {
+        let display = eb.display();
+        if eb.advances.len() != display.len() + 1 {
+            return None;
+        }
+        let cursor_d = eb.text_to_display(eb.cursor).min(display.len());
+        let (row, x) = if eb.multi_line {
+            eb.caret_row_x(cursor_d)
+        } else {
+            (0, eb.advances[cursor_d])
+        };
+        let pitch = eb.cell_h;
+        // `y` starts at 0 and loses one pitch per row above the caret (`0x77dae1`, `0x77db31`),
+        // so row 0 reports +0, never the -0 that Lua prints as "-0".
+        let y = 0.0 - row as f32 * pitch;
+        Some((x, y, pitch))
+    })
+    .flatten();
+    let Some((x, y, pitch)) = args else {
+        return false;
+    };
+    if let Err(e) = event::fire_widget_handler(
+        lua,
+        id,
+        "OnCursorChanged",
+        vec![
+            Value::Number(f64::from(x)),
+            Value::Number(f64::from(y)),
+            Value::Number(f64::from(CARET_WIDTH)),
+            Value::Number(f64::from(pitch)),
+        ],
+    ) {
+        lua.app_data_mut::<Model>()
+            .expect("model app_data")
+            .record_script_error(e.to_string());
+    }
+    true
+}
+
+/// The caret blink (`0x77a7a6`–`0x77a84c`): past the period (0.5 s by default) the focused box's
+/// caret toggles and the accumulator resets; only a period of exactly 0.0 keeps the caret solid
+/// (`0x77a7b4`).
+///
+/// Deviation: not gated on the cursor lying inside the scroll window (`0x77a7bd`–`0x77a7d7`),
+/// which benilla's host keeps around the caret.
+fn blink(lua: &Lua, h: FrameHandle, dt: f32) {
+    let focused = lua
+        .app_data_ref::<Model>()
+        .expect("model app_data")
+        .focused_editbox
+        == Some(h);
+    if !focused {
+        return;
+    }
+    with_eb(lua, h, |eb| {
+        if eb.blink_period != 0.0 {
+            eb.blink_accum += dt;
+            if eb.blink_accum > eb.blink_period {
+                eb.caret_shown = !eb.caret_shown;
+                eb.blink_accum = 0.0;
+            }
+        }
+    });
+}
diff --git a/crates/benilla-ui/src/script/editbox/flush_tests.rs b/crates/benilla-ui/src/script/editbox/flush_tests.rs
new file mode 100644
index 00000000..268c7ac7
--- /dev/null
+++ b/crates/benilla-ui/src/script/editbox/flush_tests.rs
@@ -0,0 +1,511 @@
+//! The box's flush (`0x77d3e0`) in its place in the tick's walk: after the box's own `OnUpdate`
+//! (`0x77a790`), `OnCursorChanged` then `OnTextChanged`, on the dirty word `[E+0x31c]`.
+
+use crate::script::{
+    EditAction, EditBoxAdvanceRequest, EditUnit, MeasureRequest, TextMeasure, UiScript,
+};
+
+/// A stand-in font engine: each byte 7 wide and each line 14 tall, answering the advance table
+/// inline as the host's engine does. A multi-line box's rows start after each newline, a trailing
+/// one opening an empty row, as the reference's break routine adds one (`0x5c250b`–`0x5c2522`).
+struct Mono;
+
+impl TextMeasure for Mono {
+    fn measure(&mut self, req: &MeasureRequest) -> (f32, f32, f32) {
+        let w = req.text.len() as f32 * 7.0;
+        (w, 14.0, w)
+    }
+
+    fn editbox_advances(
+        &mut self,
+        req: &EditBoxAdvanceRequest,
+    ) -> Option<(Vec<f32>, Vec<usize>, f32)> {
+        let cum = (0..=req.text.len()).map(|i| i as f32 * 7.0).collect();
+        let Some(_) = req.wrap_width else {
+            return Some((cum, vec![0], 0.0));
+        };
+        let breaks = req.text.match_indices('\n').map(|(i, _)| i + 1);
+        let rows = std::iter::once(0).chain(breaks).collect();
+        Some((cum, rows, 14.0))
+    }
+}
+
+fn script() -> UiScript {
+    let mut s = UiScript::new().expect("construct UiScript");
+    s.set_screen_size(800.0, 600.0);
+    s.set_text_measurer(Box::new(Mono));
+    s
+}
+
+/// The `LOG` entries since the last call, joined by spaces.
+fn take_log(s: &UiScript) -> String {
+    s.eval::<String>("local l = table.concat(LOG, ' ') LOG = {} return l")
+        .unwrap()
+}
+
+/// A 200×32 box `E` at `(100, 50)` with nothing focused, logging its `OnUpdate`, `OnCursorChanged`
+/// (with `x`) and `OnTextChanged` (with the text) into `LOG`, between a frame made before it and
+/// one made after, whose `OnUpdate`s log too; its first-show fires are drained.
+fn logged_box(s: &mut UiScript) {
+    s.run(
+        r#"
+        LOG = {}
+        EARLY = CreateFrame("Frame", "Early")
+        EARLY:SetScript("OnUpdate", function() table.insert(LOG, "early") end)
+        E = CreateFrame("EditBox", "E")
+        E:SetAutoFocus(false)
+        E:SetPoint("BOTTOMLEFT", 100, 50)
+        E:SetWidth(200); E:SetHeight(32)
+        E:SetScript("OnUpdate", function() table.insert(LOG, "update") end)
+        E:SetScript("OnCursorChanged", function() table.insert(LOG, "cursor@" .. arg1) end)
+        E:SetScript("OnTextChanged", function() table.insert(LOG, "text:" .. this:GetText()) end)
+        LATE = CreateFrame("Frame", "Late")
+        LATE:SetScript("OnUpdate", function() table.insert(LOG, "late") end)
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+    s.tick(0.016);
+    s.resolve();
+    take_log(s);
+}
+
+/// The box's update fires its own `OnUpdate`, then the flush (`0x77a79a`, then `0x77a7a1`), whose
+/// caret leg fires `OnCursorChanged` (`0x77d475` → `0x77de1b`) before `OnTextChanged` fires
+/// (`0x77d498`); a frame walked after the box updates after all three.
+#[test]
+fn the_flush_follows_the_boxs_own_on_update_cursor_then_text() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(r#"E:SetText("abc")"#).unwrap();
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update cursor@21 text:abc late",
+        "one tick, each box flushing in its place in the walk"
+    );
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update late",
+        "a quiet tick fires nothing"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// An edit a box makes in its own `OnUpdate` is flushed by the same update, so its events fire in
+/// the same tick.
+#[test]
+fn an_edit_in_the_boxs_own_on_update_fires_its_events_the_same_tick() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnUpdate", function()
+            table.insert(LOG, "update")
+            if not EDITED then EDITED = true this:SetText("hello") end
+        end)
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update cursor@35 text:hello late");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The ctor raises dirty bit 0 (`0x779a34`), so a new box fires `OnTextChanged` once at its first
+/// flush, with its text unchanged; a hidden box is not walked, so its bit waits for the show.
+#[test]
+fn a_new_box_fires_on_text_changed_once_at_its_first_flush_once_shown() {
+    let mut s = script();
+    s.run(
+        r#"
+        SHOWN, HIDDEN = 0, 0
+        local a = CreateFrame("EditBox", "A")
+        a:SetAutoFocus(false)
+        a:SetScript("OnTextChanged", function() SHOWN = SHOWN + 1 end)
+        local b = CreateFrame("EditBox", "B")
+        b:SetAutoFocus(false)
+        b:Hide()
+        b:SetScript("OnTextChanged", function() HIDDEN = HIDDEN + 1 end)
+    "#,
+    )
+    .unwrap();
+    let counts = |s: &UiScript| s.eval::<(i64, i64)>("return SHOWN, HIDDEN").unwrap();
+    s.tick(0.016);
+    assert_eq!(counts(&s), (1, 0), "the shown box's first flush");
+    s.tick(0.016);
+    assert_eq!(counts(&s), (1, 0), "once");
+    s.run("B:Show()").unwrap();
+    s.tick(0.016);
+    assert_eq!(
+        counts(&s),
+        (1, 1),
+        "the hidden box's bit waited for the show"
+    );
+    s.tick(0.016);
+    assert_eq!(counts(&s), (1, 1));
+    assert_eq!(s.eval::<String>("return B:GetText()").unwrap(), "");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// Every run of the text seat `0x77b8c0` on a box with a rect ends in `or eax,7` (`0x77ba7f`), so
+/// its next flush fires `OnTextChanged` once, with the text unchanged: from a resize (the
+/// `OnSizeChanged` override, `0x77a8e7`), `SetTextInsets` (`0x77a707`), `GetTextInsets`
+/// (`0x77a73f`), `SetMultiLine` (`0x77a63f`) and a font change (`0x77e2b5`).
+#[test]
+fn each_re_seat_of_the_text_fires_one_on_text_changed_at_the_next_flush() {
+    let mut s = script();
+    s.run(
+        r#"
+        N = 0
+        E = CreateFrame("EditBox", "E")
+        E:SetAutoFocus(false)
+        E:SetPoint("BOTTOMLEFT", 100, 50)
+        E:SetWidth(200); E:SetHeight(32)
+        E:SetText("same")
+        E:SetScript("OnTextChanged", function() N = N + 1 end)
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+    s.tick(0.016);
+    let mut fires = Vec::new();
+    for (what, lua, resolve) in [
+        ("a resize", "E:SetWidth(250)", true),
+        ("SetTextInsets", "E:SetTextInsets(4, 4, 2, 2)", false),
+        ("GetTextInsets", "E:GetTextInsets()", false),
+        (
+            "a font change",
+            r#"E:SetFont("Fonts\\FRIZQT__.TTF", 14)"#,
+            false,
+        ),
+        ("SetMultiLine", "E:SetMultiLine(true)", false),
+    ] {
+        s.run(&format!("N = 0 {lua}")).unwrap();
+        if resolve {
+            s.resolve();
+        }
+        s.tick(0.016);
+        fires.push((what, s.eval::<i64>("return N").unwrap()));
+    }
+    assert_eq!(
+        fires,
+        [
+            ("a resize", 1),
+            ("SetTextInsets", 1),
+            ("GetTextInsets", 1),
+            ("a font change", 1),
+            ("SetMultiLine", 1),
+        ]
+    );
+    assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "same");
+
+    // A box with no rect yet returns before the seat (`0x77b8c7`) and raises nothing.
+    s.run(
+        r#"
+        M = 0
+        F = CreateFrame("EditBox", "F")
+        F:SetAutoFocus(false)
+        F:SetScript("OnTextChanged", function() M = M + 1 end)
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    s.run("F:SetTextInsets(4, 4, 2, 2)").unwrap();
+    s.tick(0.016);
+    assert_eq!(
+        s.eval::<i64>("return M").unwrap(),
+        1,
+        "the ctor's fire alone"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// A handler's edit raises the bits the flush has already cleared (`0x77d44c`, `0x77d47a`), so an
+/// `OnTextChanged` that sets its own text fires once more, at the next frame's flush, and never
+/// loops inside one; `SetText` of an equal text raises nothing (`0x77be4b`), which ends it.
+#[test]
+fn an_on_text_changed_that_sets_its_own_text_fires_once_more_next_frame() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnTextChanged", function()
+            table.insert(LOG, "text:" .. this:GetText())
+            this:SetText(strupper(this:GetText()))
+        end)
+        E:SetText("abc")
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update cursor@21 text:abc late");
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update cursor@21 text:ABC late");
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update late");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// Bit 2 clears after the caret leg (`0x77d47a`), so a caret an `OnCursorChanged` handler moves is
+/// not reported again; the text it inserts keeps bit 0 for the next frame.
+#[test]
+fn a_caret_moved_by_on_cursor_changed_is_cleared_with_the_bit() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnCursorChanged", function()
+            table.insert(LOG, "cursor@" .. arg1)
+            if not EDITED then EDITED = true this:Insert("!") end
+        end)
+        E:SetText("ab")
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update cursor@14 text:ab! late");
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update text:ab! late",
+        "the insert's text bit, without its caret bit"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The focus transition raises bit 2 on both boxes (`0x77af50`, `0x77afa8`): each fires
+/// `OnCursorChanged` at its next flush, the one that lost the keyboard included.
+#[test]
+fn a_focus_change_runs_the_caret_leg_of_both_boxes() {
+    let mut s = script();
+    s.run(
+        r#"
+        LOG = {}
+        for _, name in ipairs({ "A", "B" }) do
+            local f = CreateFrame("EditBox", name)
+            f:SetAutoFocus(false)
+            f:SetScript("OnCursorChanged", function() table.insert(LOG, this:GetName()) end)
+        end
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    take_log(&s);
+    s.run("A:SetFocus()").unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "A");
+    s.run("B:SetFocus()").unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "A B");
+    s.run("B:ClearFocus()").unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "B");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The move helpers step the caret only while it can (`0x77c750` `cursor < len`, `0x77c870`
+/// `cursor > 0`), and only the step raises bit 2 (`0x77c73b`): Right at the end and Home at 0 fire
+/// nothing.
+#[test]
+fn a_caret_move_that_goes_nowhere_raises_nothing() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(r#"E:SetText("ab") E:SetFocus()"#).unwrap();
+    s.tick(0.016);
+    take_log(&s);
+    let mut logs = Vec::new();
+    for (what, unit, back) in [
+        ("Right at the end", EditUnit::Char, false),
+        ("Home from the end", EditUnit::Edge, true),
+        ("Home at 0", EditUnit::Edge, true),
+    ] {
+        assert!(s.editbox_action(EditAction::Move {
+            unit,
+            back,
+            extend: false,
+        }));
+        s.tick(0.016);
+        logs.push((what, take_log(&s)));
+    }
+    assert_eq!(
+        logs,
+        [
+            ("Right at the end", "early update late".to_string()),
+            (
+                "Home from the end",
+                "early update cursor@0 late".to_string()
+            ),
+            ("Home at 0", "early update late".to_string()),
+        ]
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// `OnKeyDown` flushes the box before it handles the key (`0x77b1e2`), and a char's key-down comes
+/// before it: keys typed within one frame fire their events per key, ahead of the next key's own
+/// script, so `OnEnterPressed` sees the `OnTextChanged` of the text it ends.
+#[test]
+fn a_key_flushes_the_box_before_it_acts() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnEnterPressed", function() table.insert(LOG, "enter") end)
+        E:SetFocus()
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    take_log(&s);
+    assert!(s.char_input("a"));
+    assert!(s.char_input("b"));
+    assert!(s.key_input("ENTER"));
+    assert_eq!(
+        take_log(&s),
+        "cursor@7 text:a cursor@14 text:ab enter",
+        "one frame, no tick between the keys"
+    );
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update late",
+        "nothing left for the walk"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// `HighlightText` writes only the selection (`0x77cca0`), and Ctrl+A is that call (`0x77b239`):
+/// the caret bit stays down, so no `OnCursorChanged` fires at the flush.
+#[test]
+fn highlight_text_and_ctrl_a_fire_no_on_cursor_changed() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(r#"E:SetText("hello") E:SetFocus()"#).unwrap();
+    s.tick(0.016);
+    take_log(&s);
+    assert!(s.editbox_action(EditAction::Move {
+        unit: EditUnit::Edge,
+        back: true,
+        extend: false,
+    }));
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update cursor@0 late");
+    s.run("E:HighlightText()").unwrap();
+    s.tick(0.016);
+    assert!(s.editbox_action(EditAction::SelectAll));
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update late early update late",
+        "the caret stayed at 0"
+    );
+    s.char_input("X");
+    assert_eq!(
+        s.eval::<String>("return E:GetText()").unwrap(),
+        "X",
+        "and the selection is all of it"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// A focus change raises bit 2 (`0x77afa8`), and the caret leg restarts the blink (`0x77dd68`)
+/// and shows the caret in the focused box (`0x77de35`): a box that takes the keyboard back starts
+/// solid, whatever phase it lost it in.
+#[test]
+fn taking_the_keyboard_restarts_the_caret_blink() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(r#"E:SetText("ab") E:SetFocus()"#).unwrap();
+    s.tick(0.016);
+    s.tick(0.6);
+    s.resolve();
+    assert!(
+        !s.focused_editbox_text_ui().unwrap().caret_on,
+        "past the half-period: off"
+    );
+    s.run("E:ClearFocus()").unwrap();
+    s.tick(0.3);
+    s.run("E:SetFocus()").unwrap();
+    s.tick(0.016);
+    assert!(
+        s.focused_editbox_text_ui().unwrap().caret_on,
+        "the focus's flush shows it"
+    );
+    s.tick(0.45);
+    assert!(
+        s.focused_editbox_text_ui().unwrap().caret_on,
+        "with a whole half-period ahead"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// UP and DOWN in a multi-line box move a row (`0x77cb20`), and `OnCursorChanged` reports it a
+/// row pitch down (`0x77db31`); a single-line box would recall history instead.
+#[test]
+fn up_and_down_move_a_multi_line_boxs_caret_by_rows() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnCursorChanged", function()
+            table.insert(LOG, format("cursor@%d,%d", arg1, arg2))
+        end)
+        E:SetMultiLine(true)
+        E:SetText("abc\ndefg")
+        E:SetFocus()
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    take_log(&s);
+    let row = |back| EditAction::Move {
+        unit: EditUnit::Row,
+        back,
+        extend: false,
+    };
+    assert!(s.editbox_action(row(true)));
+    s.tick(0.016);
+    assert!(s.editbox_action(row(false)));
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update cursor@21,0 late early update cursor@21,-14 late",
+        "column 4 holds before the newline above, then comes back down to column 3"
+    );
+    s.char_input("|");
+    assert_eq!(
+        s.eval::<String>("return E:GetText()").unwrap(),
+        "abc\ndef||g"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// `OnCursorChanged`'s `y` starts at 0 and loses one row pitch per row above the caret
+/// (`0x77dae1`, `0x77db31`): a single-line box, and a multi-line box's first row, report +0, which
+/// Lua prints as "0", never "-0".
+#[test]
+fn on_cursor_changed_reports_the_first_row_at_plus_zero() {
+    let mut s = script();
+    logged_box(&mut s);
+    s.run(
+        r#"
+        E:SetScript("OnCursorChanged", function() table.insert(LOG, tostring(arg2)) end)
+        E:SetText("ab")
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    assert_eq!(take_log(&s), "early update 0 text:ab late", "single-line");
+    s.run(r#"E:SetMultiLine(true) E:SetText("a\nb")"#).unwrap();
+    s.tick(0.016);
+    s.run(r#"E:SetText("c")"#).unwrap();
+    s.tick(0.016);
+    assert_eq!(
+        take_log(&s),
+        "early update -14 text:a\nb late early update 0 text:c late",
+        "multi-line, the second row and then the first"
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
diff --git a/crates/benilla-ui/src/script/editbox/interact.rs b/crates/benilla-ui/src/script/editbox/interact.rs
index c1b4b093..fe9122cd 100644
--- a/crates/benilla-ui/src/script/editbox/interact.rs
+++ b/crates/benilla-ui/src/script/editbox/interact.rs
@@ -1,4 +1,4 @@
-//! EditBox mouse and clipboard interaction: click, drag-select, copy, cut and the caret blink.
+//! EditBox mouse and clipboard interaction: click, drag-select, copy and cut.
 
 use mlua::Lua;
 
@@ -33,20 +33,24 @@ fn index_at_screen_pos(lua: &Lua, h: FrameHandle, x: f32, y: f32) -> usize {
     .unwrap_or(0)
 }
 
-/// A LeftButton press on EditBox `id` (`0x77b800`) places the cursor at the clicked char,
-/// collapsing the selection, starts a drag and takes focus unconditionally; no shift+click branch.
+/// A LeftButton press on EditBox `id` (`0x77b800`) flushes the box first (`0x77b819`), then
+/// places the cursor at the clicked char, collapsing the selection, starts a drag and takes focus
+/// unconditionally; no shift+click branch.
 pub(in crate::script) fn click(lua: &Lua, id: u32, x: f32, y: f32) {
     let Some(h) = editbox_of(lua, id) else { return };
+    super::flush::flush(lua, h);
     let idx = index_at_screen_pos(lua, h, x, y);
     with_eb(lua, h, |eb| {
         eb.move_caret_to(idx, false);
+        // The setter raises bit 2 whether or not the caret moved (`0x77b868` → `0x77e380`).
+        eb.dirty |= crate::widget::EditBoxState::DIRTY_CURSOR;
         eb.drag_active = true;
     });
     set_focus_handle(lua, h);
 }
 
 /// Mouse move with the button held (`0x77a860`): a dragging focused box extends its selection to
-/// the hovered index through the Shift+arrow helper (`0x77cd10`).
+/// the hovered index ([`crate::widget::EditBoxState::move_caret_to`]).
 pub(in crate::script) fn drag_update(lua: &Lua, x: f32, y: f32) {
     let Some(h) = focused(lua) else { return };
     if with_eb(lua, h, |eb| eb.drag_active) != Some(true) {
@@ -68,7 +72,7 @@ pub(in crate::script) fn drag_end(lua: &Lua) {
 }
 
 /// Ctrl+Left/Right, the word move: the client walks its per-byte class array (`0x41f8f0(1)`),
-/// benilla stops at alphanumeric runs. `shift` extends the selection from its anchor.
+/// benilla stops at alphanumeric runs. `shift` extends the selection.
 pub(in crate::script) fn move_word(lua: &Lua, h: FrameHandle, right: bool, shift: bool) {
     with_eb(lua, h, |eb| eb.move_by_word(right, shift));
 }
@@ -85,26 +89,9 @@ pub(in crate::script) fn cut_selection(lua: &Lua) -> Option<String> {
     let h = focused(lua)?;
     let copied = with_eb(lua, h, |eb| eb.cut_selection()).flatten()?;
     sync_text_region(lua, h);
-    super::mark_text_changed(lua, h);
     Some(copied)
 }
 
-/// The caret blink (`0x77a790`), each frame: past the period (0.5 s by default) the focused box's
-/// caret toggles and the accumulator resets; a non-positive period keeps the caret solid.
-pub(in crate::script) fn tick_blink(lua: &Lua, dt: f32) {
-    if let Some(h) = focused(lua) {
-        with_eb(lua, h, |eb| {
-            if eb.blink_period > 0.0 {
-                eb.blink_accum += dt;
-                if eb.blink_accum > eb.blink_period {
-                    eb.caret_shown = !eb.caret_shown;
-                    eb.blink_accum = 0.0;
-                }
-            }
-        });
-    }
-}
-
 fn focused(lua: &Lua) -> Option<FrameHandle> {
     lua.app_data_ref::<Model>()
         .expect("model app_data")
diff --git a/crates/benilla-ui/src/script/editbox/methods.rs b/crates/benilla-ui/src/script/editbox/methods.rs
index 056a492f..bd5d1bfb 100644
--- a/crates/benilla-ui/src/script/editbox/methods.rs
+++ b/crates/benilla-ui/src/script/editbox/methods.rs
@@ -7,8 +7,8 @@ use crate::script::object::frame_handle_of;
 use crate::widget::EditBoxState;
 
 use super::{
-    clear_focus_handle, highlight_text, insert, set_focus_handle, set_text, set_text_insets,
-    with_eb, REG_EDITBOX_METHODS,
+    clear_focus_handle, highlight_text, insert, reseat_text_region, set_focus_handle, set_text,
+    set_text_insets, with_eb, REG_EDITBOX_METHODS,
 };
 
 fn with_editbox<T>(
@@ -243,10 +243,13 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             },
         )?,
     )?;
+    // GetTextInsets (`0x798c30` → `0x77a710`) copies the four out, then re-seats the text region
+    // (`0x77a73f` → `0x77b8c0`), so the getter puts a script-moved region back.
     m.set(
         "GetTextInsets",
         lua.create_function(|lua, this: Table| {
             let ins = with_editbox(lua, &this, |eb| eb.text_insets)?;
+            reseat_text_region(lua, frame_handle_of(lua, &this)?);
             Ok((ins[0], ins[1], ins[2], ins[3]))
         })?,
     )?;
@@ -287,16 +290,17 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
     )?;
 
     for (name, set) in flag_setters() {
-        let refresh_justify = name == "SetMultiLine";
+        let refresh_text = name == "SetMultiLine";
         m.set(
             name,
             lua.create_function(move |lua, (this, v): (Table, Value)| {
                 let on = !matches!(v, Value::Nil | Value::Boolean(false));
                 with_editbox(lua, &this, |eb| set(eb, on))?;
-                if refresh_justify {
-                    // A multi-line box anchors its text TOP, else MIDDLE, and the loader wires the
+                if refresh_text {
+                    // A multi-line box seats its text TOP and as tall as the text, a single-line
+                    // one MIDDLE between the inset corners, and the loader wires the
                     // `<FontString>` before the flags, so re-seat it.
-                    super::refresh_text_region_justify(lua, &this)?;
+                    super::refresh_text_region(lua, &this)?;
                 }
                 Ok(())
             })?,
@@ -325,6 +329,12 @@ fn install_font_block(lua: &Lua, m: &Table) -> mlua::Result<()> {
             super::ensure_text_region(lua, h).ok_or_else(|| mlua::Error::runtime("not an EditBox"))
         },
         "EditBox",
+        // The box listens on its font (vtable `0x81c8dc` slot 0, `0x77e2a0`): a change of face or
+        // spacing (mask `0x11`) re-seats its text region (`0x77e2b5` → `0x77b8c0`).
+        Some(|lua, this| {
+            reseat_text_region(lua, frame_handle_of(lua, this)?);
+            Ok(())
+        }),
     )?;
 
     // SetJustifyH/SetJustifyV return nothing. An unknown token raises `Usage:` (`0x87c77c`); a
diff --git a/crates/benilla-ui/src/script/editbox/relayout.rs b/crates/benilla-ui/src/script/editbox/relayout.rs
new file mode 100644
index 00000000..50474074
--- /dev/null
+++ b/crates/benilla-ui/src/script/editbox/relayout.rs
@@ -0,0 +1,222 @@
+//! The text region's rect and a multi-line box's own height: `0x77b8c0` seats the FontString by
+//! the insets, and the flush's relayout `0x77d4d0` sizes a multi-line box to its text.
+
+use mlua::Lua;
+
+use crate::layout::{Anchor, Point, Rect};
+use crate::script::{MeasureRequest, Model};
+use crate::widget::{EditBoxState, FrameHandle, KindState, RegionHandle};
+
+/// `0x77b8c0`, the text FontString's rect. The reference writes nothing while the box's rect is
+/// unresolved (`0x77b8c7`); then it clears the points (`0x77b8da`), sets the width
+/// `boxW − (right + left)` for either kind (`0x77b905`), the height 0 multi-line (`0x77b91e`) or
+/// `boxH − (top + bottom)` single-line (`0x77b940`), and one `TOPLEFT` point at `(left, −top)`
+/// (`0x77b96b`), and raises dirty bits 0-2 (`0x77ba7f or eax,7`): the box's next flush fires
+/// `OnTextChanged` again, with the text unchanged.
+///
+/// Multi-line, benilla writes that shape, the width once the box has a rect: until then only the
+/// point is written, and the size is kept.
+///
+/// Single-line, benilla pins `TOPLEFT` and `BOTTOMRIGHT` at the inset corners and keeps no
+/// explicit size. That is a gap: it covers the same rect, but an explicit width here would be a
+/// wrap width, since benilla's single-line region holds the whole text where the reference's holds
+/// only the window's substring (`0x77d858`). A script sees the difference: `GetPoint` on the
+/// region answers two points where the reference answers one, and `GetWidth`/`GetHeight` answer
+/// the text's measure where the reference answers the explicit size.
+pub(super) fn seat_text_region(model: &mut Model, h: FrameHandle) {
+    let resolved = model.resolved.contains_key(&h);
+    let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) else {
+        return;
+    };
+    if resolved {
+        eb.dirty |= EditBoxState::DIRTY_TEXT | EditBoxState::DIRTY_CURSOR;
+    }
+    let (Some(rh), [l, r, t, b], multi_line) = (eb.text_region, eb.text_insets, eb.multi_line)
+    else {
+        return;
+    };
+    let owner = model.frame_id(h);
+    let top_left = Anchor::new(Point::TopLeft, owner, Point::TopLeft, l, -t);
+    let (anchors, size) = if multi_line {
+        let width = multi_line_text_width(model, h, [l, r]);
+        (vec![top_left], width.map(|w| Some((w, 0.0))))
+    } else {
+        let bottom_right = Anchor::new(Point::BottomRight, owner, Point::BottomRight, -r, b);
+        (vec![top_left, bottom_right], Some(None))
+    };
+    let data = model.region_data.entry(rh).or_default();
+    let same_anchors = data.anchors.len() == anchors.len()
+        && data
+            .anchors
+            .iter()
+            .zip(&anchors)
+            .all(|(a, b)| crate::script::object::anchor_bits_eq(a, b));
+    // `None` keeps the size: a multi-line box with no rect yet.
+    let size = size.unwrap_or(data.size);
+    let size_moved = !crate::script::region::size_bits_eq(data.size, size);
+    if !same_anchors {
+        data.anchors = anchors;
+    }
+    data.size = size;
+    if !same_anchors {
+        model.touch_layout();
+    } else if size_moved {
+        model.touch_layout_region(rh);
+    }
+    if size_moved {
+        // The width is the wrap width, which keys the measure.
+        model.touch_measure(rh);
+    }
+}
+
+/// The EditBox's `OnSizeChanged` override (`0x77a8d0`, vtable `0x81c910` slot `+0x48`): after the
+/// base script fire (`0x77a8e0`), `0x77a8e7` re-seats the text region (`0x77b8c0`) on every resize
+/// of any box. `ApplyRect` (`0x76b580`) calls it when the width or height moved by the resize
+/// epsilon, the first resolve included, against the ctor's zero rect. `true` when a re-seat moved
+/// a layout input, for the caller to resolve it in the same pass, as the reference's drain does.
+pub(in crate::script) fn reseat_resized(model: &mut Model) -> bool {
+    let epoch = model.layout_epoch;
+    for i in 0..model.arena.editbox_kinds().len() {
+        let h = model.arena.editbox_kinds()[i];
+        let Some(&now) = model.resolved.get(&h) else {
+            continue; // no rect, no `ApplyRect`
+        };
+        let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state)
+        else {
+            continue;
+        };
+        let before = eb
+            .notified_rect
+            .replace(now)
+            .unwrap_or(Rect::new(0.0, 0.0, 0.0, 0.0));
+        if !crate::layout::size_changed(before, now) {
+            continue;
+        }
+        // The ctor built the text region; its data is seeded here if nothing has touched it.
+        if super::ensure_text_region_in(model, h).is_some() {
+            seat_text_region(model, h);
+        }
+    }
+    model.layout_epoch != epoch
+}
+
+/// A multi-line box's text width in its own units, `boxW − (right + left)`, from the rect the
+/// last resolve gave it; `None` before it has one.
+fn multi_line_text_width(model: &Model, h: FrameHandle, [l, r]: [f32; 2]) -> Option<f32> {
+    let rect = model.resolved.get(&h)?;
+    Some(rect.width() / crate::script::object::eff_scale(model, h) - (r + l))
+}
+
+/// The flush's relayout tail (`0x77d4d0` @`0x77d863`–`0x77d8ad`), run on dirty bit 0 by the
+/// box's flush ([`super::flush`]): a multi-line box's own height becomes
+/// `(insetTop + insetBottom) + h`, `h` its text's measured wrapped height (`0x7729b0`), or one
+/// line's (`0x7727b0(fs, 1)`) when that is exactly 0, as for empty text. It reads neither the
+/// authored height nor the rect, so the box grows and shrinks with its text and a `SetHeight`
+/// lasts until the flush after its resize re-seats the text; a single-line box is never sized
+/// (`0x77d86a`). The text region's width is the one [`seat_text_region`] last wrote.
+///
+/// `false` when the text's measure is pending, for the flush to retry.
+pub(super) fn relayout(lua: &Lua, h: FrameHandle) -> bool {
+    let multi_line = {
+        let model = lua.app_data_ref::<Model>().expect("model app_data");
+        matches!(
+            model.arena.frame(h).map(|f| &f.kind_state),
+            Some(KindState::EditBox(eb)) if eb.multi_line
+        )
+    };
+    if !multi_line {
+        return true;
+    }
+    let Some(rh) = super::ensure_text_region(lua, h) else {
+        return true;
+    };
+    // `0x7729b0` measures in the call; with no engine installed the measure lands a tick later.
+    crate::script::measure::ensure_measured(lua, rh);
+    let Some(text_h) = text_height(lua, h, rh) else {
+        return false;
+    };
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    let [_, _, top, bottom] = match model.arena.frame(h).map(|f| &f.kind_state) {
+        Some(KindState::EditBox(eb)) => eb.text_insets,
+        _ => return true,
+    };
+    // `fld top; fadd bottom; fadd st, st(1)`.
+    let height = (top + bottom) + text_h;
+    let input = model.layout_inputs.entry(h).or_default();
+    if input.height.to_bits() != height.to_bits() {
+        input.height = height;
+        model.touch_layout_frame(h);
+    }
+    true
+}
+
+/// The text's height for the box: its measure under the current key, or one line's when that is
+/// exactly 0.0 (`0x77d877` `fcom 0.0` → `0x77d88e`), as it is for empty text, which is never
+/// measured (`0x7729ff`). `None` while either measure is pending.
+fn text_height(lua: &Lua, h: FrameHandle, rh: RegionHandle) -> Option<f32> {
+    let measured = {
+        let model = lua.app_data_ref::<Model>().expect("model app_data");
+        let d = model.region_data.get(&rh)?;
+        if d.text.as_deref().is_none_or(str::is_empty) {
+            0.0
+        } else {
+            let key = d.measure_key(owner_scale(&model, h));
+            d.measured.filter(|m| m.key == key)?.h
+        }
+    };
+    if measured == 0.0 {
+        line_height(lua, h, rh)
+    } else {
+        Some(measured)
+    }
+}
+
+/// Any text that lays out as one line: its measured height is one line's.
+const ONE_LINE: &str = "0";
+
+/// `0x7727b0(fs, 1)`, one line's height in the text region's font: the installed engine's measure
+/// of one line, the same measure a line of text takes, cached on the box under its key. `None`
+/// with no engine installed.
+fn line_height(lua: &Lua, h: FrameHandle, rh: RegionHandle) -> Option<f32> {
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    let scale = owner_scale(&model, h);
+    let req = {
+        let d = model.region_data.get(&rh)?;
+        let key = d.measure_key_of(ONE_LINE, scale);
+        if let Some(KindState::EditBox(eb)) = model.arena.frame(h).map(|f| &f.kind_state) {
+            if let Some((k, lh)) = eb.line_height {
+                if k == key {
+                    return Some(lh);
+                }
+            }
+        }
+        MeasureRequest {
+            id: model.region_to_id.get(&rh).copied().unwrap_or(0),
+            font: d.font_path.clone(),
+            height: d.font_height,
+            text_height: d.text_height,
+            wrap_width: None,
+            outline: d.outline,
+            scale,
+            text: ONE_LINE.to_string(),
+            key,
+        }
+    };
+    // Taken out and put back, as `ensure_measured` does: the engine cannot re-enter the VM.
+    let mut engine = model.measurer.take()?;
+    let (_, lh, _) = engine.measure(&req);
+    model.measurer = Some(engine);
+    if let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) {
+        eb.line_height = Some((req.key, lh));
+    }
+    Some(lh)
+}
+
+/// The scale a measure is keyed under, the owner's effective scale, as the measure loop reads it.
+fn owner_scale(model: &Model, h: FrameHandle) -> f32 {
+    model
+        .arena
+        .frame(h)
+        .map(|f| f.effective_scale)
+        .unwrap_or(1.0)
+}
diff --git a/crates/benilla-ui/src/script/editbox/relayout_tests.rs b/crates/benilla-ui/src/script/editbox/relayout_tests.rs
new file mode 100644
index 00000000..3a1f1316
--- /dev/null
+++ b/crates/benilla-ui/src/script/editbox/relayout_tests.rs
@@ -0,0 +1,484 @@
+//! The text region's rect (`0x77b8c0`, re-seated on every resize by `0x77a8d0`) and a multi-line
+//! box's own height (`0x77d4d0` @`0x77d8ad`), driven through the Lua methods and the tick.
+
+use crate::script::{MeasureRequest, QuadContent, TextMeasure, UiScript};
+
+/// A stand-in font engine: each character [`CW`] wide and each line `.0` tall. Hard breaks split
+/// lines, a trailing one opening none as in the host's line law, and each line wraps by
+/// characters at the request's wrap width.
+struct Lines(f32);
+
+const CW: f32 = 7.0;
+const LH: f32 = 14.0;
+
+impl TextMeasure for Lines {
+    fn measure(&mut self, req: &MeasureRequest) -> (f32, f32, f32) {
+        let mut lines: Vec<&str> = req.text.split('\n').collect();
+        if lines.len() > 1 && lines.last() == Some(&"") {
+            lines.pop();
+        }
+        let width = |l: &str| l.chars().count() as f32 * CW;
+        let natural = lines.iter().map(|l| width(l)).fold(0.0, f32::max);
+        let wrap = req.wrap_width.filter(|w| *w > 0.0);
+        let rows: f32 = lines
+            .iter()
+            .map(|l| match wrap {
+                Some(w) if width(l) > w => (width(l) / w).ceil(),
+                _ => 1.0,
+            })
+            .sum();
+        (
+            wrap.map_or(natural, |w| natural.min(w)),
+            rows * self.0,
+            natural,
+        )
+    }
+}
+
+fn script() -> UiScript {
+    let mut s = UiScript::new().expect("construct UiScript");
+    s.set_screen_size(800.0, 600.0);
+    s.set_text_measurer(Box::new(Lines(LH)));
+    s
+}
+
+/// One frame of the host loop: the tick (where the flush relayouts), then the resolve.
+fn frame(s: &mut UiScript) {
+    s.tick(0.016);
+    s.resolve();
+}
+
+fn height(s: &UiScript, name: &str) -> f64 {
+    s.eval(&format!("return {name}:GetHeight()")).unwrap()
+}
+
+/// A 200-wide multi-line box with insets (left 15, right 13, top 2, bottom 3), authored 200 tall.
+fn inset_box(s: &mut UiScript) {
+    s.run(
+        r#"
+        E = CreateFrame("EditBox", "E")
+        E:SetAutoFocus(false)
+        E:SetPoint("BOTTOMLEFT", 100, 50)
+        E:SetWidth(200); E:SetHeight(200)
+        E:SetTextInsets(15, 13, 2, 3)
+        E:SetMultiLine(true)
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+}
+
+/// The box is `(top + bottom) + h` tall, `h` the text's wrapped height, one line's when empty; it
+/// grows and shrinks with its text, and the authored 200 lasts only until the first flush.
+#[test]
+fn a_multi_line_box_is_as_tall_as_its_text_and_its_insets() {
+    let mut s = script();
+    inset_box(&mut s);
+    assert_eq!(
+        height(&s, "E"),
+        200.0,
+        "the authored height, before any flush"
+    );
+
+    frame(&mut s);
+    assert_eq!(
+        height(&s, "E"),
+        f64::from(5.0 + LH),
+        "an empty box is one line tall: the first flush replaces the authored 200"
+    );
+
+    s.run(r#"E:SetText("one\ntwo\nthree")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + 3.0 * LH), "three lines");
+
+    // 30 characters are 210 wide against the 172 between the side insets: two rows.
+    s.run(r#"E:SetText(string.rep("x", 30))"#).unwrap();
+    frame(&mut s);
+    assert_eq!(
+        height(&s, "E"),
+        f64::from(5.0 + 2.0 * LH),
+        "a line wraps at the box's width less its side insets"
+    );
+
+    s.run(r#"E:SetText("")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + LH), "it shrinks back");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The relayout runs ahead of the `OnTextChanged` fire (`0x77d447` before `0x77d498`), so the
+/// handler reads the new height.
+#[test]
+fn on_text_changed_sees_the_height_the_flush_just_set() {
+    let mut s = script();
+    inset_box(&mut s);
+    s.run(r#"E:SetScript("OnTextChanged", function() SEEN = this:GetHeight() end)"#)
+        .unwrap();
+    frame(&mut s);
+    s.run(r#"E:SetText("a\nb\nc\nd")"#).unwrap();
+    s.tick(0.016);
+    assert_eq!(
+        s.eval::<f64>("return SEEN").unwrap(),
+        f64::from(5.0 + 4.0 * LH)
+    );
+}
+
+/// A new raster re-measures the empty box's line: the host's `invalidate_text_measures` drops the
+/// cached line height with every other measure.
+#[test]
+fn a_new_raster_re_measures_the_empty_boxs_line() {
+    let mut s = script();
+    inset_box(&mut s);
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + LH));
+    s.set_text_measurer(Box::new(Lines(2.0 * LH)));
+    s.invalidate_text_measures();
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + 2.0 * LH));
+}
+
+/// A `SetHeight` lasts until the next flush, which writes the text's height back over it.
+#[test]
+fn a_scripted_height_is_written_over_at_the_next_flush() {
+    let mut s = script();
+    inset_box(&mut s);
+    s.run(r#"E:SetText("a\nb")"#).unwrap();
+    frame(&mut s);
+    s.run("E:SetHeight(300)").unwrap();
+    assert_eq!(
+        height(&s, "E"),
+        300.0,
+        "the script's height, until the flush"
+    );
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + 2.0 * LH));
+}
+
+/// A trailing newline opens no line: the text's measure folds it into the line it ends, and the
+/// box takes that measure as it is.
+#[test]
+fn a_trailing_newline_alone_adds_no_line() {
+    let mut s = script();
+    inset_box(&mut s);
+    s.run(r#"E:SetText("abc")"#).unwrap();
+    frame(&mut s);
+    let one = height(&s, "E");
+    s.run(r#"E:SetText("abc\n")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), one, "the break alone");
+    s.run(r#"E:SetText("abc\nd")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(
+        height(&s, "E"),
+        one + f64::from(LH),
+        "the first character on the new line"
+    );
+}
+
+/// Only a multi-line box is sized (`0x77d86a je` skips the write).
+#[test]
+fn a_single_line_box_keeps_its_height() {
+    let mut s = script();
+    s.run(
+        r#"
+        E = CreateFrame("EditBox", "E")
+        E:SetAutoFocus(false)
+        E:SetPoint("BOTTOMLEFT", 100, 50)
+        E:SetWidth(200); E:SetHeight(32)
+        E:SetText("a\nb\nc")
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+    frame(&mut s);
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), 32.0);
+}
+
+/// The multi-line text region sits `TOPLEFT` at `(left, −top)`, as wide as the box less its side
+/// insets and as tall as its text, inside the box.
+#[test]
+fn the_text_region_is_pinned_top_left_as_wide_as_the_box_and_as_tall_as_its_text() {
+    let mut s = script();
+    inset_box(&mut s);
+    s.run(r#"E:SetText("hello")"#).unwrap();
+    frame(&mut s);
+    frame(&mut s);
+    let rect = s
+        .extract()
+        .into_iter()
+        .find_map(|q| match (&q.content, q.rect) {
+            (QuadContent::Text { text: Some(t), .. }, Some(r)) if t == "hello" => Some(r),
+            _ => None,
+        })
+        .expect("the text draws");
+    // The box is 5 + 14 tall from y 50: its top is 69.
+    assert_eq!(
+        (rect.left, rect.right, rect.top, rect.bottom),
+        (115.0, 287.0, 67.0, 53.0)
+    );
+}
+
+/// The height's move fires the box's `OnSizeChanged(width, height)`, and a flush that keeps it
+/// fires nothing.
+#[test]
+fn on_size_changed_fires_when_the_text_moves_the_height() {
+    let mut s = script();
+    inset_box(&mut s);
+    s.run(
+        r#"
+        fires = {}
+        E:SetScript("OnSizeChanged", function() table.insert(fires, { w = arg1, h = arg2 }) end)
+    "#,
+    )
+    .unwrap();
+    frame(&mut s);
+    let fires = |s: &UiScript| s.eval::<i64>("return table.getn(fires)").unwrap();
+    let last = |s: &UiScript| {
+        s.eval::<(f64, f64)>("local f = fires[table.getn(fires)] return f.w, f.h")
+            .unwrap()
+    };
+    assert_eq!(fires(&s), 1, "the first flush replaces the authored height");
+    assert_eq!(last(&s), (200.0, f64::from(5.0 + LH)));
+
+    s.run(r#"E:SetText("a\nb\nc")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(fires(&s), 2);
+    assert_eq!(last(&s), (200.0, f64::from(5.0 + 3.0 * LH)));
+
+    frame(&mut s);
+    s.run(r#"E:SetText("x\ny\nz")"#).unwrap();
+    frame(&mut s);
+    assert_eq!(fires(&s), 2, "same line count, same height: no fire");
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The stock mail shape (`MailFrame.xml`): `SendMailBodyEditBox`, 270×200 at `TOPLEFT (20, −10)`
+/// in the 300×255 scroll child of the 296×257 `SendMailScrollFrame`, whose `OnTextChanged` is
+/// `ScrollingEdit_OnTextChanged`. The box's height carries the text into the range union, so 30
+/// lines give `max(255, 10 + 30·L) − 257`.
+#[test]
+fn a_scroll_frame_ranges_over_the_whole_text_of_a_multi_line_box() {
+    let mut s = script();
+    s.run(
+        r#"
+        local sf = CreateFrame("ScrollFrame", "MailScroll", UIParent)
+        sf:SetPoint("TOPLEFT", 21, -97); sf:SetWidth(296); sf:SetHeight(257)
+        local child = CreateFrame("Frame", "MailScrollChild", sf)
+        child:SetWidth(300); child:SetHeight(255)
+        child:SetPoint("TOPLEFT", 0, 0)
+        sf:SetScrollChild(child)
+        local body = CreateFrame("EditBox", "MailBody", child)
+        body:SetMultiLine(true); body:SetAutoFocus(false)
+        body:SetWidth(270); body:SetHeight(200)
+        body:SetPoint("TOPLEFT", 20, -10)
+        body:SetScript("OnTextChanged", function() ScrollingEdit_OnTextChanged(MailScroll) end)
+        sf:SetScript("OnScrollRangeChanged", function() RANGE = arg2 end)
+        function ScrollingEdit_OnTextChanged(scrollFrame) scrollFrame:UpdateScrollChildRect() end
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+    frame(&mut s);
+    assert_eq!(
+        s.eval::<f64>("return MailScroll:GetVerticalScrollRange()")
+            .unwrap(),
+        0.0,
+        "an empty body is one line: the 255-tall child fits the 257-tall frame"
+    );
+
+    s.run(
+        r#"
+        local lines = {}
+        for i = 1, 30 do lines[i] = "line " .. i end
+        MailBody:SetText(table.concat(lines, "\n"))
+    "#,
+    )
+    .unwrap();
+    frame(&mut s);
+    assert_eq!(
+        height(&s, "MailBody"),
+        f64::from(30.0 * LH),
+        "the box itself spans the text, not only its text region"
+    );
+    let want = f64::from((10.0 + 30.0 * LH).max(255.0) - 257.0);
+    assert_eq!(
+        s.eval::<f64>("return RANGE").unwrap(),
+        want,
+        "the range ScrollingEdit_OnTextChanged's recompute reports"
+    );
+    assert_eq!(
+        s.eval::<f64>("return MailScroll:GetVerticalScrollRange()")
+            .unwrap(),
+        want
+    );
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
+}
+
+/// The text quad's rect as `(left, right, top, bottom)`, `None` when it draws nowhere.
+fn text_rect(s: &UiScript, text: &str) -> Option<(f32, f32, f32, f32)> {
+    s.extract().into_iter().find_map(|q| match &q.content {
+        QuadContent::Text { text: Some(t), .. } if t == text => {
+            q.rect.map(|r| (r.left, r.right, r.top, r.bottom))
+        }
+        _ => None,
+    })
+}
+
+/// A box built in Lua, with no `<FontString>` and no `SetTextInsets`, has its text seated at its
+/// first resolve: `ApplyRect` (`0x76b580`) sees it resized from the ctor's zero rect and the
+/// override `0x77a8d0` runs `0x77b8c0` (`0x77a8e7`).
+#[test]
+fn a_lua_box_with_a_font_seats_its_text_at_its_first_resolve() {
+    let mut s = script();
+    s.run(
+        r#"
+        E = CreateFrame("EditBox", "E")
+        E:SetAutoFocus(false)
+        E:SetPoint("BOTTOMLEFT", 100, 50)
+        E:SetWidth(200); E:SetHeight(32)
+        E:SetFont("Fonts\\FRIZQT__.TTF", 14)
+        E:SetText("hello")
+    "#,
+    )
+    .unwrap();
+    s.resolve();
+    assert_eq!(text_rect(&s, "hello"), Some((100.0, 300.0, 82.0, 50.0)));
+}
+
+/// A later resize re-seats the text of any box: a multi-line box re-wraps at its new width, and a
+/// single-line box's moved text region is put back between its insets.
+#[test]
+fn a_resized_box_re_seats_its_text() {
+    let mut s = script();
+    inset_box(&mut s);
+    // 30 characters are 210 wide: two rows in 200 less the side insets, one row in 300 less them.
+    s.run(r#"E:SetText(string.rep("x", 30))"#).unwrap();
+    frame(&mut s);
+    frame(&mut s);
+    assert_eq!(height(&s, "E"), f64::from(5.0 + 2.0 * LH));
+    s.run("E:SetWidth(300)").unwrap();
+    frame(&mut s);
+    frame(&mut s);
+    assert_eq!(
+        text_rect(&s, &"x".repeat(30)).map(|r| (r.0, r.1)),
+        Some((115.0, 387.0)),
+        "the text region takes the new width less the side insets"
+    );
+    assert_eq!(
+        height(&s, "E"),
+        f64::from(5.0 + LH),
+        "and the text re-wraps in it"
+    );
+
+    s.run(
+        r#"
+        S = CreateFrame("EditBox", "S")
+        S:SetAutoFocus(false)
+        S:SetPoint("BOTTOMLEFT", 100, 200)
+        S:SetWidth(200); S:SetHeight(32)
+        S:SetText("single")
+    "#,
+    )
+    .unwrap();
+    frame(&mut s);
+    s.run(
+        r#"
+        local text = S:GetRegions()
+        text:ClearAllPoints(); text:SetPoint("TOPLEFT", S, "TOPLEFT", 40, 40)
+    "#,
+    )
+    .unwrap();
+    frame(&mut s);
+    assert_ne!(
+        text_rect(&s, "single").map(|r| r.0),
+        Some(100.0),
+        "the script moved the text region"
+    );
+    s.run("S:SetWidth(250)").unwrap();
+    frame(&mut s);
+    assert_eq!(text_rect(&s, "single"), Some((100.0, 350.0, 232.0, 200.0)));
+}
+
+/// A single-line box at `(100, 200)`, 200×32 with insets (10, 20, 3, 5), whose text region a
+/// script has moved to `TOPLEFT (40, 40)`; `SEATED` is where `0x77b8c0` puts it.
+fn moved_text_region(s: &mut UiScript) {
+    s.run(
+        r#"
+        S = CreateFrame("EditBox", "S")
+        S:SetAutoFocus(false)
+        S:SetPoint("BOTTOMLEFT", 100, 200)
+        S:SetWidth(200); S:SetHeight(32)
+        S:SetTextInsets(10, 20, 3, 5)
+        S:SetText("single")
+    "#,
+    )
+    .unwrap();
+    frame(s);
+    assert_eq!(text_rect(s, "single"), Some(SEATED));
+    move_text_region(s);
+}
+
+const SEATED: (f32, f32, f32, f32) = (110.0, 280.0, 229.0, 205.0);
+
+fn move_text_region(s: &mut UiScript) {
+    s.run(
+        r#"
+        local text = S:GetRegions()
+        text:ClearAllPoints(); text:SetPoint("TOPLEFT", S, "TOPLEFT", 40, 40)
+    "#,
+    )
+    .unwrap();
+    frame(s);
+    assert_eq!(
+        text_rect(s, "single").map(|r| r.0),
+        Some(140.0),
+        "the script moved the text region"
+    );
+}
+
+/// `GetTextInsets` (`0x77a710`) copies the insets out, then re-seats (`0x77a73f` → `0x77b8c0`).
+#[test]
+fn get_text_insets_puts_a_moved_text_region_back() {
+    let mut s = script();
+    moved_text_region(&mut s);
+    let insets = s
+        .eval::<(f32, f32, f32, f32)>("return S:GetTextInsets()")
+        .unwrap();
+    assert_eq!(insets, (10.0, 20.0, 3.0, 5.0));
+    frame(&mut s);
+    assert_eq!(text_rect(&s, "single"), Some(SEATED));
+}
+
+/// A new face or size notifies the box (`0x79f342` → `0x77e2a0`), which re-seats its text
+/// (`0x77e2b5`); the same font again sets no change bit (`0x79f2ef`), so it does not.
+#[test]
+fn set_font_puts_a_moved_text_region_back_when_the_font_changes() {
+    let mut s = script();
+    moved_text_region(&mut s);
+    s.run(r#"S:SetFont("Fonts\\FRIZQT__.TTF", 14)"#).unwrap();
+    frame(&mut s);
+    assert_eq!(text_rect(&s, "single"), Some(SEATED));
+
+    move_text_region(&mut s);
+    s.run(r#"S:SetFont("Fonts\\FRIZQT__.TTF", 14)"#).unwrap();
+    frame(&mut s);
+    assert_eq!(
+        text_rect(&s, "single").map(|r| r.0),
+        Some(140.0),
+        "the same font changes nothing"
+    );
+}
+
+/// Linking another font object propagates into the box's font (`0x770c60` → `0x77e4b0`), whose
+/// notify re-seats the text (`0x77e4d7` → `0x77e2a0`).
+#[test]
+fn set_font_object_puts_a_moved_text_region_back() {
+    let mut s = script();
+    s.run(r#"F = CreateFont("ScratchFont") F:SetFont("Fonts\\FRIZQT__.TTF", 12)"#)
+        .unwrap();
+    moved_text_region(&mut s);
+    s.run("S:SetFontObject(F)").unwrap();
+    frame(&mut s);
+    assert_eq!(text_rect(&s, "single"), Some(SEATED));
+}
diff --git a/crates/benilla-ui/src/script/editbox/seam.rs b/crates/benilla-ui/src/script/editbox/seam.rs
index c9147761..b68f257b 100644
--- a/crates/benilla-ui/src/script/editbox/seam.rs
+++ b/crates/benilla-ui/src/script/editbox/seam.rs
@@ -1,76 +1,20 @@
 //! The EditBox seam the host drives each frame: the advance-table round trip, the caret,
 //! selection and scroll geometry derived from it, and the clipboard pair.
 
-use crate::script::{types, UiScript};
-use crate::widget::KindState;
+use mlua::Lua;
+
+use crate::script::{types, Model, UiScript};
+use crate::widget::{EditBoxState, FrameHandle, KindState, RegionHandle};
 
 impl UiScript {
     /// The focused EditBox's request to measure its display string's per-byte cumulative widths,
     /// when its text, font, scale or wrap width changed; an empty display needs no trip. Answer it
     /// with [`Self::set_editbox_advances`] before [`Self::focused_editbox_text_ui`].
     pub fn editbox_advances_request(&mut self) -> Option<types::EditBoxAdvanceRequest> {
-        use std::hash::{Hash, Hasher};
         let h = self.model_mut().focused_editbox?;
         // The lazy text region first: its font keys the table, and a new box has none until now.
         let rh = super::ensure_text_region(self.lua(), h)?;
-        let mut model = self.model_mut();
-        let (display, multi_line) = match model.arena.frame(h).map(|f| &f.kind_state) {
-            Some(KindState::EditBox(eb)) => (eb.display(), eb.multi_line),
-            _ => return None,
-        };
-        let d = model.region_data.get(&rh);
-        let font = d.and_then(|d| d.font_path.clone());
-        let height = d.and_then(|d| d.font_height);
-        let outline = d.map(|d| d.outline).unwrap_or_default();
-        // The host measures at the drawn raster size, so the advances land on the drawn glyphs.
-        let scale = model
-            .arena
-            .frame(h)
-            .map(|f| f.effective_scale)
-            .unwrap_or(1.0);
-        // A multi-line box wraps at the text region's width, as the draw does; a resize re-keys.
-        let wrap_width = multi_line
-            .then(|| {
-                model
-                    .region_resolved
-                    .get(&rh)
-                    .or_else(|| model.resolved.get(&h))
-                    .map(|r| r.right - r.left)
-            })
-            .flatten()
-            .filter(|w| *w > 0.0);
-        let mut hasher = std::collections::hash_map::DefaultHasher::new();
-        display.hash(&mut hasher);
-        font.hash(&mut hasher);
-        height.map(f32::to_bits).hash(&mut hasher);
-        (outline as u8).hash(&mut hasher);
-        wrap_width.map(f32::to_bits).hash(&mut hasher);
-        scale.to_bits().hash(&mut hasher);
-        let key = hasher.finish();
-        let id = model.frame_id(h);
-        let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state)
-        else {
-            return None;
-        };
-        if eb.advances_key == key && eb.advances.len() == display.len() + 1 {
-            return None; // cache warm
-        }
-        if display.is_empty() {
-            eb.advances = vec![0.0];
-            eb.rows = vec![0];
-            eb.advances_key = key;
-            return None;
-        }
-        Some(types::EditBoxAdvanceRequest {
-            id,
-            font,
-            height,
-            outline,
-            scale,
-            text: display,
-            wrap_width,
-            key,
-        })
+        stale_advances(&mut self.model_mut(), h, rh)
     }
 
     /// Answer an [`Self::editbox_advances_request`]: the cumulative widths (len+1 entries from 0),
@@ -88,10 +32,7 @@ impl UiScript {
             return;
         };
         if let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) {
-            eb.advances = cum;
-            eb.rows = if rows.is_empty() { vec![0] } else { rows };
-            eb.cell_h = cell_h;
-            eb.advances_key = key;
+            store_advances(eb, key, cum, rows, cell_h);
         }
     }
 
@@ -206,3 +147,102 @@ impl UiScript {
         super::with_eb(lua, h, |eb| eb.add_history_line(line)).is_some()
     }
 }
+
+/// Box `h`'s advance-table request, `None` when its table is current for the display string,
+/// font, raster scale and, multi-line, wrap width; an empty display needs no trip and is settled
+/// here.
+fn stale_advances(
+    model: &mut Model,
+    h: FrameHandle,
+    rh: RegionHandle,
+) -> Option<types::EditBoxAdvanceRequest> {
+    use std::hash::{Hash, Hasher};
+    let (display, multi_line) = match model.arena.frame(h).map(|f| &f.kind_state) {
+        Some(KindState::EditBox(eb)) => (eb.display(), eb.multi_line),
+        _ => return None,
+    };
+    let d = model.region_data.get(&rh);
+    let font = d.and_then(|d| d.font_path.clone());
+    let height = d.and_then(|d| d.font_height);
+    let outline = d.map(|d| d.outline).unwrap_or_default();
+    // The host measures at the drawn raster size, so the advances land on the drawn glyphs.
+    let scale = model
+        .arena
+        .frame(h)
+        .map(|f| f.effective_scale)
+        .unwrap_or(1.0);
+    // A multi-line box wraps at the text region's width, as the draw does; a resize re-keys.
+    let wrap_width = multi_line
+        .then(|| {
+            model
+                .region_resolved
+                .get(&rh)
+                .or_else(|| model.resolved.get(&h))
+                .map(|r| r.right - r.left)
+        })
+        .flatten()
+        .filter(|w| *w > 0.0);
+    let mut hasher = std::collections::hash_map::DefaultHasher::new();
+    display.hash(&mut hasher);
+    font.hash(&mut hasher);
+    height.map(f32::to_bits).hash(&mut hasher);
+    (outline as u8).hash(&mut hasher);
+    wrap_width.map(f32::to_bits).hash(&mut hasher);
+    scale.to_bits().hash(&mut hasher);
+    let key = hasher.finish();
+    let id = model.frame_id(h);
+    let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) else {
+        return None;
+    };
+    if eb.advances_key == key && eb.advances.len() == display.len() + 1 {
+        return None; // cache warm
+    }
+    if display.is_empty() {
+        let cell_h = eb.cell_h;
+        store_advances(eb, key, vec![0.0], vec![0], cell_h);
+        return None;
+    }
+    Some(types::EditBoxAdvanceRequest {
+        id,
+        font,
+        height,
+        outline,
+        scale,
+        text: display,
+        wrap_width,
+        key,
+    })
+}
+
+fn store_advances(eb: &mut EditBoxState, key: u64, cum: Vec<f32>, rows: Vec<usize>, cell_h: f32) {
+    eb.advances = cum;
+    eb.rows = if rows.is_empty() { vec![0] } else { rows };
+    eb.cell_h = cell_h;
+    eb.advances_key = key;
+}
+
+/// Whether box `h`'s advance table is current, measured here by the installed font engine when
+/// its text or font moved, as the caret leg measures in the call (`0x772ae0`). `false` with no
+/// engine, or one that leaves the table to the host's round trip.
+pub(super) fn advances_current(lua: &Lua, h: FrameHandle) -> bool {
+    let Some(rh) = super::ensure_text_region(lua, h) else {
+        return false;
+    };
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    let Some(req) = stale_advances(&mut model, h, rh) else {
+        return true;
+    };
+    // Taken out and put back, as `ensure_measured` does: the engine cannot re-enter the VM.
+    let Some(mut engine) = model.measurer.take() else {
+        return false;
+    };
+    let answer = engine.editbox_advances(&req);
+    model.measurer = Some(engine);
+    let Some((cum, rows, cell_h)) = answer else {
+        return false;
+    };
+    if let Some(KindState::EditBox(eb)) = model.arena.frame_mut(h).map(|f| &mut f.kind_state) {
+        store_advances(eb, req.key, cum, rows, cell_h);
+    }
+    true
+}
diff --git a/crates/benilla-ui/src/script/editbox/tests.rs b/crates/benilla-ui/src/script/editbox/tests.rs
index 8aedec31..a49078b0 100644
--- a/crates/benilla-ui/src/script/editbox/tests.rs
+++ b/crates/benilla-ui/src/script/editbox/tests.rs
@@ -6,6 +6,18 @@ fn script() -> UiScript {
     UiScript::new().expect("construct UiScript")
 }
 
+/// UP and DOWN, which recall history in a single-line box.
+const UP: EditAction = EditAction::Move {
+    unit: EditUnit::Row,
+    back: true,
+    extend: false,
+};
+const DOWN: EditAction = EditAction::Move {
+    unit: EditUnit::Row,
+    back: false,
+    extend: false,
+};
+
 fn text_quad(s: &UiScript) -> Option<String> {
     s.extract().into_iter().find_map(|q| match q.content {
         QuadContent::Text { text, .. } => text,
@@ -208,29 +220,34 @@ fn click_focuses_regardless_of_autofocus_and_transition_order_is_lost_then_gaine
 
 // ── text buffer + editing + OnTextChanged/OnTextSet ─────────────────────────────────────────
 
-/// An edit only raises the box's `textChanged` bit; `OnTextChanged` fires once, at the drain its
-/// OnUpdate runs (`0x77d3e0`).
+/// An edit only raises the box's `textChanged` bit; `OnTextChanged` fires once, at the flush its
+/// update runs after its `OnUpdate` (`0x77d3e0`), so edits between two flushes coalesce. (A typed
+/// key flushes the box before it acts, `0x77b1e2`, so keys fire per key.)
 #[test]
-fn typing_coalesces_into_one_deferred_ontextchanged() {
+fn edits_between_two_flushes_coalesce_into_one_ontextchanged() {
     let mut s = script();
     s.run(
         r#"
         changed = 0
         E = CreateFrame("EditBox", "E")
         seen = ""
-        E:SetScript("OnTextChanged", function() changed = changed + 1 seen = E:GetText() end)
         E:SetFocus()
     "#,
     )
     .unwrap();
-    assert!(s.char_input("a"));
-    assert!(s.char_input("b"));
-    assert!(s.char_input("c"));
+    s.tick(0.0);
+    s.run(
+        r#"
+        E:SetScript("OnTextChanged", function() changed = changed + 1 seen = E:GetText() end)
+        E:Insert("a") E:Insert("b") E:Insert("c")
+    "#,
+    )
+    .unwrap();
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "abc");
     assert_eq!(
         s.eval::<i64>("return changed").unwrap(),
         0,
-        "the text is already there, but nothing has drained yet"
+        "the text is already there, but nothing has flushed yet"
     );
 
     s.tick(0.0);
@@ -286,6 +303,41 @@ fn numeric_aborts_a_mixed_insert_wholesale() {
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "12");
 }
 
+/// `Insert` deletes the selection before its `numeric` test (`0x77bf13`, then `0x77bf41`): a
+/// letter typed over a numeric box's selection empties it, so `OnTextChanged` fires at the flush,
+/// while the abort comes before `OnChar` (`0x77c13c`).
+#[test]
+fn a_non_digit_typed_over_a_numeric_selection_deletes_it() {
+    let mut s = script();
+    s.run(
+        r#"
+        CHARS, CHANGES = 0, 0
+        E = CreateFrame("EditBox", "E")
+        E:SetNumeric(true)
+        E:SetText("125")
+        E:SetScript("OnChar", function() CHARS = CHARS + 1 end)
+        E:SetScript("OnTextChanged", function() CHANGES = CHANGES + 1 end)
+        E:SetFocus()
+        E:HighlightText()
+    "#,
+    )
+    .unwrap();
+    s.tick(0.016);
+    s.run("CHANGES = 0").unwrap();
+    assert!(s.char_input("g"), "focused: consumed");
+    assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "");
+    s.tick(0.016);
+    assert_eq!(
+        s.eval::<(i64, i64)>("return CHARS, CHANGES").unwrap(),
+        (0, 1)
+    );
+    assert_eq!(
+        text_quad(&s).as_deref(),
+        Some(""),
+        "the text region follows"
+    );
+}
+
 #[test]
 fn max_letters_trims_from_the_end() {
     let s = script();
@@ -329,20 +381,22 @@ fn paste_inserts_at_the_cursor_and_replaces_the_selection() {
         E:SetScript("OnTextChanged", function() changed = changed + 1 end)
         E:SetText("ab")
         E:SetFocus()
-        changed = 0   -- ignore the setup SetText's fire; count only the pastes below
     "#,
     )
     .unwrap();
-    // SetText leaves the cursor at the end, so the paste appends.
+    s.tick(0.0);
+    s.run("changed = 0").unwrap(); // count only the pastes below
+                                   // SetText leaves the cursor at the end, so the paste appends.
     assert!(s.paste("CD"), "focused box consumes the paste");
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "abCD");
     s.run("E:HighlightText(0, -1)").unwrap();
+    // Ctrl+V is a key-down, which flushes the box before it pastes (`0x77b1e2`): the first
+    // paste's change fires at the second, the second's at the walk.
     assert!(s.paste("xyz"));
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "xyz");
-    // Both pastes marked the one box, so the drain fires once.
-    assert_eq!(s.eval::<i64>("return changed").unwrap(), 0);
-    s.tick(0.0);
     assert_eq!(s.eval::<i64>("return changed").unwrap(), 1);
+    s.tick(0.0);
+    assert_eq!(s.eval::<i64>("return changed").unwrap(), 2);
 }
 
 #[test]
@@ -680,19 +734,19 @@ fn history_recall_walks_up_and_down_and_restores_the_draft() {
     )
     .unwrap();
     // UP recalls newest-first; a second UP walks older; at the oldest it holds.
-    assert!(s.editbox_action(EditAction::HistoryPrev));
+    assert!(s.editbox_action(UP));
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/g two");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/say one");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/say one");
     // DOWN walks newer; past the newest the stashed live draft comes back.
-    s.editbox_action(EditAction::HistoryNext);
+    s.editbox_action(DOWN);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/g two");
-    s.editbox_action(EditAction::HistoryNext);
+    s.editbox_action(DOWN);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "draft");
     // Not browsing: DOWN does nothing.
-    s.editbox_action(EditAction::HistoryNext);
+    s.editbox_action(DOWN);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "draft");
 }
 
@@ -709,15 +763,15 @@ fn typing_ends_the_history_browse() {
     "#,
     )
     .unwrap();
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "newer");
     // A typed char turns the recalled line into a draft: the next UP starts a fresh browse from
     // the newest entry, stashing the edited line as the draft.
     s.char_input("!");
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "newer!");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "newer");
-    s.editbox_action(EditAction::HistoryNext);
+    s.editbox_action(DOWN);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "newer!");
 }
 
@@ -736,14 +790,14 @@ fn programmatic_set_text_keeps_the_browse_and_focus_gain_resets_it() {
     .unwrap();
     // Rewrite the recalled line as the chat parser does ("/g two" → Guild + "two"); the next UP
     // must reach the older entry, not the newest again.
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/g two");
     s.run(r#"E:SetText("two")"#).unwrap();
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/say one");
     // Refocusing starts a fresh session: the stale walk drops, UP recalls the newest again.
     s.run(r#"E:ClearFocus() E:SetFocus()"#).unwrap();
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "/g two");
 }
 
@@ -763,11 +817,11 @@ fn history_caps_at_history_lines_drop_oldest() {
     .unwrap();
     assert_eq!(s.eval::<i64>("return E:GetHistoryLines()").unwrap(), 2);
     // Only b/c survive: two UPs land on 'b', a third holds there.
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "c");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "b");
-    s.editbox_action(EditAction::HistoryPrev);
+    s.editbox_action(UP);
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "b");
 }
 
@@ -779,7 +833,7 @@ fn history_off_by_default_and_up_is_still_consumed() {
     // No historyLines: AddHistoryLine does nothing, and UP is consumed but inert, since a focused
     // box eats every key (both handlers return 1, `0x77a900`/`0x77b160`).
     s.run(r#"E:AddHistoryLine("x")"#).unwrap();
-    assert!(s.editbox_action(EditAction::HistoryPrev));
+    assert!(s.editbox_action(UP));
     assert_eq!(s.eval::<String>("return E:GetText()").unwrap(), "t");
 }
 
@@ -1084,10 +1138,14 @@ fn word_and_edge_deletes() {
     // Inert at the boundary: nothing to delete consumes without firing OnTextChanged.
     s.run("n = 0; E:SetScript('OnTextChanged', function() n = n + 1 end)")
         .unwrap();
+    s.tick(0.0);
+    s.run("n = 0").unwrap(); // the edits above fire at that tick
+    assert!(s.errors().is_empty(), "{:?}", s.errors());
     assert!(s.editbox_action(EditAction::Delete {
         unit: EditUnit::Edge,
         back: true
     }));
+    s.tick(0.0);
     assert_eq!(s.eval::<i64>("return n").unwrap(), 0);
 }
 
@@ -1231,9 +1289,17 @@ fn shift_arrow_selects_the_whole_link_and_typing_replaces_it() {
 
 #[test]
 fn typing_strictly_inside_a_link_is_refused() {
-    // Only the mouse can put the caret there, so place it the way a click would.
-    let mut s = box_with_link("");
-    s.run("E:HighlightText(35, 35)").unwrap(); // mid-"Ironfoe"
+    // Only the mouse can put the caret there: a click, which stops on each visible character.
+    let mut s = script();
+    seam_rig(&mut s, "");
+    s.run(&format!("E:SetWidth(400) E:Insert(\"{LINK}\")"))
+        .unwrap();
+    s.resolve();
+    answer_advances(&mut s);
+    // Byte 35, mid-"Ironfoe", at 7 px per byte from the box's left edge at 100.
+    assert!(s.mouse_button(100.0 + 35.0 * 7.0, 60.0, "LeftButton", true));
+    s.mouse_button(100.0 + 35.0 * 7.0, 60.0, "LeftButton", false);
+    assert_eq!(s.focused_editbox_text_ui().unwrap().caret_x, 245.0);
     s.char_input("x");
     assert_eq!(
         text_of(&s),
@@ -1241,7 +1307,11 @@ fn typing_strictly_inside_a_link_is_refused() {
         "the client swallows it rather than splitting the link"
     );
     // At the link's leading edge the keystroke lands: the guard also tests the previous token.
-    s.run("E:HighlightText(0, 0)").unwrap();
+    s.editbox_action(EditAction::Move {
+        unit: EditUnit::Edge,
+        back: true,
+        extend: false,
+    });
     s.char_input("x");
     assert_eq!(text_of(&s), format!("x{LINK}"));
 }
diff --git a/crates/benilla-ui/src/script/event.rs b/crates/benilla-ui/src/script/event.rs
index 854788fd..75bc1a47 100644
--- a/crates/benilla-ui/src/script/event.rs
+++ b/crates/benilla-ui/src/script/event.rs
@@ -6,7 +6,7 @@
 
 use std::borrow::Cow;
 
-use mlua::{Function, Lua, MultiValue, Table, Value};
+use mlua::{Function, Lua, Table, Value};
 
 use super::{Model, ScriptValue, REG_SCRIPTS};
 use crate::script::object::frame_wrapper;
@@ -230,8 +230,8 @@ fn arg_name(i: usize) -> Cow<'static, str> {
 }
 
 /// The calling convention, shared by [`fire`] and the loader's `OnLoad`: sets `this`, `event` and
-/// `arg1..argN`, passes `(self[, event], extra...)`, and restores the globals after the call, even
-/// on error, so nested fires are safe.
+/// `arg1..argN` and calls the handler with no arguments, as `0x705199` calls `lua_pcall` with
+/// zero; the globals are restored after the call, even on error, so nested fires are safe.
 pub(crate) fn invoke_with_globals(
     lua: &Lua,
     wrapper: Table,
@@ -257,15 +257,8 @@ pub(crate) fn invoke_with_globals(
         g.set(arg_name(i + 1).as_ref(), v.clone())?;
     }
 
-    let mut modern: Vec<Value> = Vec::with_capacity(2 + n);
-    modern.push(Value::Table(wrapper));
-    if let Some(ev) = event_name {
-        modern.push(Value::String(lua.create_string(ev)?));
-    }
-    modern.extend(extra.iter().cloned());
-
     // A protected call; the globals are restored before its outcome returns.
-    let outcome = func.call::<()>(MultiValue::from_vec(modern));
+    let outcome = func.call::<()>(());
 
     g.set("this", saved_this)?;
     g.set("event", saved_event)?;
diff --git a/crates/benilla-ui/src/script/font_block.rs b/crates/benilla-ui/src/script/font_block.rs
index fd4cb984..d36a937b 100644
--- a/crates/benilla-ui/src/script/font_block.rs
+++ b/crates/benilla-ui/src/script/font_block.rs
@@ -24,6 +24,11 @@ use crate::widget::RegionHandle;
 /// `EditBox` creates its own on demand. An error means the wrong receiver.
 pub(super) type ResolveRegion = fn(&Lua, &Table) -> mlua::Result<RegionHandle>;
 
+/// A widget's listener on its font instance, run after `SetFont` loads a new face or size and
+/// after `SetFontObject` links another object: the notify `[vt+0x14]` that `0x79f342` and
+/// `0x77e4d7` call, which the EditBox answers (`0x77e2a0`).
+pub(super) type FontChanged = fn(&Lua, &Table) -> mlua::Result<()>;
+
 /// `SetFont`'s shared argument gate (`0x79f210`, reached from Font `0x7a0270`, FontString
 /// `0x79d4f0` and EditBox `0x797210`): arg 2 must pass `lua_isstring` and arg 3 `lua_isnumber`,
 /// both coercing, else it raises `Usage: %s:SetFont("font", fontHeight [, flags])` (`0x87c69c`).
@@ -58,6 +63,7 @@ pub(super) fn install(
     m: &Table,
     resolve: ResolveRegion,
     widget: &'static str,
+    on_font_change: Option<FontChanged>,
 ) -> mlua::Result<()> {
     // ── the font object ──
     // SetFontObject(font | "font" | nil) → nothing (`0x79ef10`, usage string `0x87c5cc`). Any
@@ -67,23 +73,37 @@ pub(super) fn install(
         lua.create_function(move |lua, (this, font): (Table, Value)| {
             let name = super::font::resolve("SetFontObject", &font)?;
             let rh = resolve(lua, &this)?;
-            let mut model = lua.app_data_mut::<Model>().expect("model");
-            // nil severs the link and keeps the paint; the reference only nulls the parent.
-            let Some(name) = name else {
-                model.region_data.entry(rh).or_default().font_object = None;
-                return Ok(());
+            let relinked = {
+                let mut model = lua.app_data_mut::<Model>().expect("model");
+                // nil severs the link and keeps the paint; the reference only nulls the parent.
+                let Some(name) = name else {
+                    model.region_data.entry(rh).or_default().font_object = None;
+                    return Ok(());
+                };
+                let Some(fo) = model.font_object(&name).cloned() else {
+                    return Err(mlua::Error::runtime(format!(
+                        "SetFontObject: no font object named '{name}' is registered"
+                    )));
+                };
+                let d = model.region_data.entry(rh).or_default();
+                // The same object again changes nothing (`0x770c6a`).
+                let relinked = d
+                    .font_object
+                    .as_deref()
+                    .is_none_or(|old| !old.eq_ignore_ascii_case(&name));
+                d.font_object = Some(name);
+                // The inherit mask stays: each local setter clears its bit (`FONTINSTANCE+0x2c`)
+                // and nothing restores it, so a property set locally survives a later
+                // `SetFontObject`.
+                super::font::repaint(d, &fo);
+                model.touch_measure(rh);
+                relinked
             };
-            let Some(fo) = model.font_object(&name).cloned() else {
-                return Err(mlua::Error::runtime(format!(
-                    "SetFontObject: no font object named '{name}' is registered"
-                )));
-            };
-            let d = model.region_data.entry(rh).or_default();
-            d.font_object = Some(name);
-            // The inherit mask stays: each local setter clears its bit (`FONTINSTANCE+0x2c`) and
-            // nothing restores it, so a property set locally survives a later `SetFontObject`.
-            super::font::repaint(d, &fo);
-            model.touch_measure(rh);
+            if relinked {
+                if let Some(changed) = on_font_change {
+                    changed(lua, &this)?;
+                }
+            }
             Ok(())
         })?,
     )?;
@@ -118,6 +138,10 @@ pub(super) fn install(
                 let (path, height) = set_font_args(&file, &height, widget)?;
                 let rh = resolve(lua, &this)?;
                 let mut model = lua.app_data_mut::<Model>().expect("model");
+                let before = model
+                    .region_data
+                    .get(&rh)
+                    .map(|d| (d.font_path.clone(), d.font_height, d.outline));
                 // A failed load (`0x5c1ae0` under the `0x44d040` font cache) is the host's probe to
                 // judge, as only the store knows the files; with no probe, a non-empty path loads.
                 let ok =
@@ -137,7 +161,16 @@ pub(super) fn install(
                     d.outline = Outline::flags(&f);
                     d.font_explicit.outline = true;
                 }
+                let after = (d.font_path.clone(), d.font_height, d.outline);
                 model.touch_measure(rh);
+                drop(model);
+                // A loaded face that changed the path, height or flags notifies (`0x79f32f` sets
+                // the change bits, `0x79f342` calls the notify); a failed load does not.
+                if ok && before.as_ref() != Some(&after) {
+                    if let Some(changed) = on_font_change {
+                        changed(lua, &this)?;
+                    }
+                }
                 Ok(if ok { Value::Number(1.0) } else { Value::Nil })
             },
         )?,
diff --git a/crates/benilla-ui/src/script/frame_enum.rs b/crates/benilla-ui/src/script/frame_enum.rs
new file mode 100644
index 00000000..3ce01bb5
--- /dev/null
+++ b/crates/benilla-ui/src/script/frame_enum.rs
@@ -0,0 +1,130 @@
+//! `GetNumFrames` (`0x705f00`) and `EnumerateFrames` (`0x705f60`), registered beside `CreateFrame`
+//! from the frame-script table `0x872e74`: both walk the UI root's list of every live frame
+//! (`root+0xcc4`), which a frame joins at construction and leaves at destruction, hidden or not.
+//! Regions are not frames and are not on it. Here the list is the frame ids in ascending order,
+//! since every creation path mints its frame's id at once ([`Model::frame_id`]).
+
+use mlua::{Lua, MultiValue, Value};
+
+use super::object::{decode_id, frame_wrapper};
+use super::Model;
+
+/// `0x872f08`, verbatim.
+const NO_THIS: &str = "EnumerateFrames: Couldn't find 'this' in current object";
+/// `0x872ecc`, verbatim.
+const NOT_A_FRAME: &str = "EnumerateFrames: Wrong current object type, expected frame";
+
+/// The first live frame with an id above `after`, in creation order.
+fn next_frame(model: &Model, after: u32) -> Option<u32> {
+    (after.saturating_add(1)..model.next_id).find(|id| {
+        model
+            .id_to_frame
+            .get(id)
+            .is_some_and(|h| model.arena.frame(*h).is_some())
+    })
+}
+
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+
+    // `GetNumFrames()`: the list's length as one number; any arguments are ignored.
+    g.set(
+        "GetNumFrames",
+        lua.create_function(|lua, _: MultiValue| {
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            Ok(model.arena.iter_frames().count() as f64)
+        })?,
+    )?;
+
+    // `EnumerateFrames([frame])`: the frame after `frame` on the list, or the first when the
+    // argument is not a table (`lua_type(L, 1) == 5`, `0x705f6e`); nil past the last. A table is
+    // read as an object through its `[0]` (`lua_rawgeti`, `0x705f7c`): none raises `0x872f08`,
+    // and an object that is not a frame, a Texture or FontString, raises `0x872ecc`.
+    g.set(
+        "EnumerateFrames",
+        lua.create_function(|lua, args: MultiValue| {
+            let after = match args.front() {
+                Some(Value::Table(t)) => {
+                    let id = match t.raw_get::<Value>(0)? {
+                        Value::LightUserData(l) if !l.0.is_null() => decode_id(t)?,
+                        _ => return Err(mlua::Error::runtime(NO_THIS)),
+                    };
+                    let model = lua.app_data_ref::<Model>().expect("model app_data");
+                    if !model.id_to_frame.contains_key(&id) {
+                        return Err(mlua::Error::runtime(NOT_A_FRAME));
+                    }
+                    id
+                }
+                _ => 0,
+            };
+            let next = {
+                let model = lua.app_data_ref::<Model>().expect("model app_data");
+                next_frame(&model, after)
+            };
+            match next {
+                Some(id) => Ok(Value::Table(frame_wrapper(lua, id)?)),
+                None => Ok(Value::Nil),
+            }
+        })?,
+    )?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::script::UiScript;
+
+    #[test]
+    fn enumerate_frames_walks_every_live_frame_in_creation_order() {
+        let s = UiScript::new().unwrap();
+        s.run(
+            "A = CreateFrame('Frame', 'EnumA') \
+             A:CreateTexture('EnumATex') \
+             B = CreateFrame('Button', nil, A) B:Hide() \
+             C = CreateFrame('Frame', 'EnumC')",
+        )
+        .unwrap();
+        let (count, walked, tail): (i64, i64, Vec<bool>) = s
+            .eval(
+                "local n, f, seen = 0, EnumerateFrames(), {} \
+                 while f do n = n + 1 table.insert(seen, f) f = EnumerateFrames(f) end \
+                 local k = table.getn(seen) \
+                 return GetNumFrames(), n, { seen[k - 2] == A, seen[k - 1] == B, seen[k] == C }",
+            )
+            .unwrap();
+        assert_eq!(
+            walked, count,
+            "the walk visits exactly GetNumFrames() frames"
+        );
+        assert_eq!(
+            tail,
+            [true, true, true],
+            "the three newest frames close the walk in creation order, the hidden and nameless \
+             one included, and the texture is not a frame"
+        );
+        assert_eq!(s.arity("GetNumFrames()").unwrap(), 1);
+        assert_eq!(s.arity("EnumerateFrames(C)").unwrap(), 1);
+        assert!(s.eval::<bool>("return EnumerateFrames(C) == nil").unwrap());
+        // A non-table argument starts over.
+        assert!(s
+            .eval::<bool>("return EnumerateFrames(5) == EnumerateFrames() and EnumerateFrames('x') == EnumerateFrames()")
+            .unwrap());
+    }
+
+    #[test]
+    fn enumerate_frames_refuses_what_is_not_a_frame() {
+        let s = UiScript::new().unwrap();
+        s.run("F = CreateFrame('Frame', 'EnumF') T = F:CreateTexture('EnumT')")
+            .unwrap();
+        let e = s.run("EnumerateFrames({})").unwrap_err().to_string();
+        assert!(
+            e.contains("EnumerateFrames: Couldn't find 'this' in current object"),
+            "{e}"
+        );
+        let e = s.run("EnumerateFrames(T)").unwrap_err().to_string();
+        assert!(
+            e.contains("EnumerateFrames: Wrong current object type, expected frame"),
+            "{e}"
+        );
+    }
+}
diff --git a/crates/benilla-ui/src/script/gossip.rs b/crates/benilla-ui/src/script/gossip.rs
index 0dddf537..77739e88 100644
--- a/crates/benilla-ui/src/script/gossip.rs
+++ b/crates/benilla-ui/src/script/gossip.rs
@@ -3,8 +3,8 @@
 //!
 //! `GetGossipOptions()` returns flat `(text, type)` pairs, `type` the lowercase icon name the app
 //! maps from the wire `GOSSIP_ICON`. A coded option is not built: the app drops its select, where
-//! the reference opens a password box (`UIParent.lua:563`). `IsGossipOptionCoded(i)` is benilla's
-//! own, not a 1.12 global, and no stock file calls it.
+//! the reference fires `GOSSIP_ENTER_CODE` and the stock popup (`StaticPopup.lua:1383`) calls
+//! `SelectGossipOption(index, code)`.
 //!
 //! A menu is pushed only once its greeting (`SMSG_NPC_TEXT_UPDATE`) has arrived; until then the
 //! VM keeps its last menu, as the reference's frame keeps its last paint: its handler returns on a
@@ -23,8 +23,6 @@ pub struct GossipOptionView {
     /// The lowercase icon type (`"gossip"`, `"vendor"`, `"taxi"`, …); `GossipFrame.lua:123` draws
     /// `Interface\GossipFrame\<Type>GossipIcon`.
     pub icon_type: String,
-    /// A password-gated option, which the app never selects.
-    pub coded: bool,
 }
 
 /// One quest row of `SMSG_GOSSIP_MESSAGE`; a click sends `CMSG_QUESTGIVER_QUERY_QUEST`. `active`,
@@ -110,18 +108,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    g.set(
-        "IsGossipOptionCoded",
-        lua.create_function(|lua, i: usize| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            Ok(model
-                .gossip
-                .as_ref()
-                .and_then(|m| i.checked_sub(1).and_then(|n| m.options.get(n)))
-                .is_some_and(|o| o.coded))
-        })?,
-    )?;
-
     // SelectGossipOption(i [, ...]): queue the 1-based position. Further arguments, a code among
     // them, are ignored: coded options are not built, so no code is ever sent.
     g.set(
@@ -226,12 +212,10 @@ mod tests {
                 GossipOptionView {
                     label: "Let me browse your goods.".into(),
                     icon_type: "vendor".into(),
-                    coded: false,
                 },
                 GossipOptionView {
                     label: "I would like to sign the petition.".into(),
                     icon_type: "gossip".into(),
-                    coded: true,
                 },
             ],
         }
@@ -261,9 +245,6 @@ mod tests {
         );
         assert_eq!(l2, "I would like to sign the petition.");
         assert_eq!(t2, "gossip");
-        assert!(!s.eval::<bool>("return IsGossipOptionCoded(1)").unwrap());
-        assert!(s.eval::<bool>("return IsGossipOptionCoded(2)").unwrap());
-        assert!(!s.eval::<bool>("return IsGossipOptionCoded(9)").unwrap()); // out of range
 
         s.run("SelectGossipOption(1)").unwrap();
         s.run("SelectGossipOption(2, 'unused-code')").unwrap(); // extra arg ignored
diff --git a/crates/benilla-ui/src/script/input_verbs.rs b/crates/benilla-ui/src/script/input_verbs.rs
new file mode 100644
index 00000000..1b767602
--- /dev/null
+++ b/crates/benilla-ui/src/script/input_verbs.rs
@@ -0,0 +1,557 @@
+//! The functions the stock `Bindings.xml` bodies call, from the reference's three registrar
+//! tables: the movement table `0x8500b8` (loop `0x514349`), the camera table `0x84f7a0` (loop
+//! `0x50c089`) and the targeting and posture verbs of the main table `0x83de68` (loop
+//! `0x49027c`). A key and its Lua function share one path: a held command's Start and Stop are the
+//! key's press and release ([`HeldInput`]), a one-shot command fires as its key does
+//! ([`FiredInput`]), and the targeting and attack calls go through the call queue
+//! ([`ScriptCall`]), so a macro's `TargetNearestEnemy()` then `/cast` casts at the new target.
+//!
+//! Every movement function but the mouselook three opens on the hardware-event gate `0x494a50`
+//! with tag 0. Untainted, it passes only inside a real input event, which for a binding body is
+//! `CBindings::ExecuteBinding 0x4b7990` on the stack (`[[0xb71290]+0xd8]`, raised at `0x4b7b02`);
+//! tainted code (a macro, `RunScript`, an addon's own) is refused. So a key's body moves and a
+//! `/script MoveForwardStart()` does not. benilla has no taint model, so here the gate is "a
+//! binding body is running" ([`UiScript::execute_binding`]), which refuses the same callers, silently
+//! where the reference fires `MACRO_ACTION_FORBIDDEN` (431) or `ADDON_ACTION_FORBIDDEN` (432).
+//! The camera table and the main-table verbs have no gate.
+
+use mlua::{Lua, MultiValue, Value};
+
+use super::binding_abi::{bool_or_default, flag};
+use super::calls::{NearestMode, ScriptCall};
+use super::{Model, UiScript};
+
+/// A held movement command: one bit of the reference's `[InputControl+4]` word, set by its Start
+/// and cleared by its Stop through `0x515090`.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum HeldInput {
+    /// `0x10`, `MoveForwardStart`/`Stop` (`0x513e20`/`0x513e50`).
+    MoveForward,
+    /// `0x20`, `MoveBackwardStart`/`Stop` (`0x513e80`/`0x513eb0`).
+    MoveBackward,
+    /// `0x100`, `TurnLeftStart`/`Stop` (`0x513ee0`/`0x513f10`).
+    TurnLeft,
+    /// `0x200`, `TurnRightStart`/`Stop` (`0x513f40`/`0x513f70`).
+    TurnRight,
+    /// `0x40`, `StrafeLeftStart`/`Stop` (`0x513fa0`/`0x513fd0`).
+    StrafeLeft,
+    /// `0x80`, `StrafeRightStart`/`Stop` (`0x514000`/`0x514030`).
+    StrafeRight,
+    /// `0x1`, `TurnOrActionStart`/`Stop` (`0x514120`/`0x514160`), the right mouse button's bit.
+    TurnOrAction,
+    /// `0x2`, `CameraOrSelectOrMoveStart`/`Stop` (`0x514190`/`0x5141d0`), the left button's.
+    CameraOrSelectOrMove,
+}
+
+/// A one-shot command, fired as its key fires it.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum FiredInput {
+    /// `Jump()` (`0x513bd0`).
+    Jump,
+    /// `ToggleRun()` (`0x513d50` → `0x60e080`), the walk toggle.
+    ToggleRun,
+    /// `ToggleAutoRun()` (`0x513de0`), which toggles `0x1000`.
+    ToggleAutoRun,
+    /// `SitOrStand()` (`0x48b920`): sit when standing, else stand (`0x5ed430(1)` or `(0)`).
+    SitOrStand,
+    /// `ToggleSheath()` (`0x48a070` → `0x5eb480`).
+    ToggleSheath,
+    /// `CameraZoomIn([yards])` (`0x50b400` → `0x50fc60`), 1.0 when absent.
+    CameraZoomIn(f32),
+    /// `CameraZoomOut([yards])` (`0x50b450` → `0x50fcd0`), 1.0 when absent.
+    CameraZoomOut(f32),
+}
+
+/// One call for the app's binding state, in call order.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum BindingInput {
+    Start(HeldInput),
+    Stop(HeldInput),
+    Fire(FiredInput),
+}
+
+/// The VM's half of the binding functions.
+#[derive(Default)]
+pub(crate) struct InputState {
+    /// The calls made since the app last drained them.
+    queue: Vec<BindingInput>,
+    /// How many binding bodies are running: the hardware-event gate's `[[0xb71290]+0xd8]`.
+    binding_depth: u32,
+    /// `[InputControl+4] & 1`, the TurnOrAction channel `IsMouselooking` tests (`0x514278`), as
+    /// the app pushed it or a `MouselookStart`/`Stop` since moved it.
+    turn_or_action: bool,
+    /// The `MouselookStart` (`true`) and `MouselookStop` calls since the app last drained them.
+    mouselook: Vec<bool>,
+}
+
+impl UiScript {
+    /// Take the binding calls queued since the last call, in call order.
+    pub fn take_binding_input(&mut self) -> Vec<BindingInput> {
+        std::mem::take(&mut self.model_mut().input.queue)
+    }
+
+    /// Run a binding body as `CBindings::RunCommand` (`0x4b7b50`) does from inside
+    /// `ExecuteBinding`: the movement functions' hardware-event gate passes while it runs.
+    pub fn run_binding(&self, chunk: &str) -> mlua::Result<()> {
+        self.model_mut().input.binding_depth += 1;
+        let result = self.run(chunk);
+        self.model_mut().input.binding_depth -= 1;
+        result
+    }
+
+    /// `CBindings::ExecuteBinding` (`0x4b7990`) once the chord has resolved to `command`: its
+    /// `RunCommand` (`0x4b7b50`) with the hardware-event gate raised (`0x4b7b02`), a press when
+    /// `down`, else the release, which runs only a `runOnUp` body. `Ok(false)` when nothing ran:
+    /// no such command, or a release of one that is not `runOnUp`.
+    pub fn execute_binding(&self, command: &str, down: bool) -> mlua::Result<bool> {
+        self.model_mut().input.binding_depth += 1;
+        let result = super::keybind::run_command(&self.lua, command, down);
+        self.model_mut().input.binding_depth -= 1;
+        result
+    }
+
+    /// Push whether the TurnOrAction channel is held: the world holds the right mouse button, or
+    /// a `MouselookStart` holds it with none.
+    pub fn set_turn_or_action_held(&mut self, held: bool) {
+        self.model_mut().input.turn_or_action = held;
+    }
+
+    /// Take the `MouselookStart` (`true`) and `MouselookStop` calls made since the last call, in
+    /// call order, for the app's look session.
+    pub fn take_mouselook_calls(&mut self) -> Vec<bool> {
+        std::mem::take(&mut self.model_mut().input.mouselook)
+    }
+}
+
+/// The hardware-event gate `0x494a50(0)`: inside a binding body.
+fn in_binding(lua: &Lua) -> bool {
+    let model = lua.app_data_ref::<Model>().expect("model app_data");
+    model.input.binding_depth > 0
+}
+
+fn push(lua: &Lua, input: BindingInput) {
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    model.input.queue.push(input);
+}
+
+fn push_call(lua: &Lua, call: ScriptCall) {
+    let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+    model.script_calls.push(call);
+}
+
+/// A zoom's optional amount: `0x6f34d0` (is-number, a numeric string passes) then `0x6f3620`,
+/// else the stored `1.0f` (`0x50b42d`). A NaN or infinite amount is dropped: what `0x50fc60`'s
+/// tick conversion makes of it is not established.
+fn zoom_amount(lua: &Lua, v: Option<Value>) -> Option<f32> {
+    let n = match v {
+        Some(v) => lua.coerce_number(v).ok().flatten().unwrap_or(1.0),
+        None => 1.0,
+    } as f32;
+    n.is_finite().then_some(n)
+}
+
+/// Register a function that takes any arguments and does nothing: the mechanism behind it is not
+/// built, so the call is answered with the reference's zero results and no effect.
+fn inert(lua: &Lua, names: &[&str]) -> mlua::Result<()> {
+    let g = lua.globals();
+    for name in names {
+        g.set(*name, lua.create_function(|_, _: MultiValue| Ok(()))?)?;
+    }
+    Ok(())
+}
+
+/// Register the 49 functions: the three tables' 48 and `TargetNearestFriend`.
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+
+    // ── The movement table `0x8500b8` ──────────────────────────────────────────────────────
+    // Each Start/Stop is `0x494a50(0)`, then `0x515090(bit, set, time, 0)`; nothing is returned,
+    // and no argument is read but `CameraOrSelectOrMoveStop`'s sticky flag (`0x5141f6`), which
+    // nothing here acts on.
+    let held: [(&str, &str, HeldInput); 8] = [
+        (
+            "MoveForwardStart",
+            "MoveForwardStop",
+            HeldInput::MoveForward,
+        ),
+        (
+            "MoveBackwardStart",
+            "MoveBackwardStop",
+            HeldInput::MoveBackward,
+        ),
+        ("TurnLeftStart", "TurnLeftStop", HeldInput::TurnLeft),
+        ("TurnRightStart", "TurnRightStop", HeldInput::TurnRight),
+        ("StrafeLeftStart", "StrafeLeftStop", HeldInput::StrafeLeft),
+        (
+            "StrafeRightStart",
+            "StrafeRightStop",
+            HeldInput::StrafeRight,
+        ),
+        // The mouse pair also arms the world click (`0x514810`); that, and each bit alone, the
+        // look session reads off the physical buttons. The two held together are the both-button
+        // run, which MOVEANDSTEER's body reaches through them.
+        (
+            "TurnOrActionStart",
+            "TurnOrActionStop",
+            HeldInput::TurnOrAction,
+        ),
+        (
+            "CameraOrSelectOrMoveStart",
+            "CameraOrSelectOrMoveStop",
+            HeldInput::CameraOrSelectOrMove,
+        ),
+    ];
+    for (start, stop, input) in held {
+        g.set(
+            start,
+            lua.create_function(move |lua, _: MultiValue| {
+                if in_binding(lua) {
+                    push(lua, BindingInput::Start(input));
+                }
+                Ok(())
+            })?,
+        )?;
+        g.set(
+            stop,
+            lua.create_function(move |lua, _: MultiValue| {
+                if in_binding(lua) {
+                    push(lua, BindingInput::Stop(input));
+                }
+                Ok(())
+            })?,
+        )?;
+    }
+    // `Jump` (`0x513bd0`), `ToggleRun` (`0x513d50`) and `ToggleAutoRun` (`0x513de0`) open on the
+    // same gate; their further refusals (a dead or rooted player) are the engine's, as for the key.
+    let fired: [(&str, FiredInput); 3] = [
+        ("Jump", FiredInput::Jump),
+        ("ToggleRun", FiredInput::ToggleRun),
+        ("ToggleAutoRun", FiredInput::ToggleAutoRun),
+    ];
+    for (name, input) in fired {
+        g.set(
+            name,
+            lua.create_function(move |lua, _: MultiValue| {
+                if in_binding(lua) {
+                    push(lua, BindingInput::Fire(input));
+                }
+                Ok(())
+            })?,
+        )?;
+    }
+    // `IsMouselooking()` (`0x514270`): `[InputControl+4] & 1`, the TurnOrAction channel, not the
+    // camera's freelook bit; 1 or nil (`0x514280`/`0x514293`).
+    g.set(
+        "IsMouselooking",
+        lua.create_function(|lua, _: MultiValue| {
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            Ok(flag(model.input.turn_or_action))
+        })?,
+    )?;
+    // `MouselookStart`/`MouselookStop` (`0x514210`/`0x514240`) pass no gate: each disarms the
+    // pending world click (`0x514810(0)`) and sets or clears the TurnOrAction channel
+    // (`0x515090(1, set, now, 0)`), the bit the held right button drives. The bit moves at the
+    // call, so `IsMouselooking` answers it at once; the app's look session applies the call.
+    for (name, on) in [("MouselookStart", true), ("MouselookStop", false)] {
+        g.set(
+            name,
+            lua.create_function(move |lua, _: MultiValue| {
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                model.input.turn_or_action = on;
+                model.input.mouselook.push(on);
+                Ok(())
+            })?,
+        )?;
+    }
+    // Not built, so these answer and do nothing: the pitch pair (`0x400`/`0x800`), since the
+    // mover has no keyboard pitch axis, so PITCHUP and PITCHDOWN (INSERT, DELETE) do nothing.
+    inert(
+        lua,
+        &[
+            "PitchUpStart",
+            "PitchUpStop",
+            "PitchDownStart",
+            "PitchDownStop",
+        ],
+    )?;
+
+    // ── The camera table `0x84f7a0` ────────────────────────────────────────────────────────
+    g.set(
+        "CameraZoomIn",
+        lua.create_function(|lua, v: Option<Value>| {
+            if let Some(yards) = zoom_amount(lua, v) {
+                push(lua, BindingInput::Fire(FiredInput::CameraZoomIn(yards)));
+            }
+            Ok(())
+        })?,
+    )?;
+    g.set(
+        "CameraZoomOut",
+        lua.create_function(|lua, v: Option<Value>| {
+            if let Some(yards) = zoom_amount(lua, v) {
+                push(lua, BindingInput::Fire(FiredInput::CameraZoomOut(yards)));
+            }
+            Ok(())
+        })?,
+    )?;
+    // Not built: the `MoveView*` pairs (`0x50b4a0`-`0x50b590`, `0x50fd40(direction, time, 0)` and
+    // `0x50fd90(direction, time)` for In, Out, Right, Left, Up, Down = 0..5), whose effect on the
+    // camera is not established; 1.12's own `MOVEVIEW*` bindings are commented out. And
+    // `ToggleMouseMove` (`0x50b5a0` → `0x50f910`), which toggles freelook with no button held.
+    inert(
+        lua,
+        &[
+            "MoveViewInStart",
+            "MoveViewInStop",
+            "MoveViewOutStart",
+            "MoveViewOutStop",
+            "MoveViewRightStart",
+            "MoveViewRightStop",
+            "MoveViewLeftStart",
+            "MoveViewLeftStop",
+            "MoveViewUpStart",
+            "MoveViewUpStop",
+            "MoveViewDownStart",
+            "MoveViewDownStop",
+            "ToggleMouseMove",
+        ],
+    )?;
+
+    // ── The main table `0x83de68` ──────────────────────────────────────────────────────────
+    // The four `TargetNearest*` shims are byte-identical but for the mode: argument 1 through
+    // `0x6f1c10` with default 0 is the reverse flag, then `0x493f60(reverse, mode)`.
+    let nearest: [(&str, NearestMode); 4] = [
+        ("TargetNearestEnemy", NearestMode::Enemy),
+        ("TargetNearestFriend", NearestMode::Friend),
+        ("TargetNearestPartyMember", NearestMode::PartyMember),
+        ("TargetNearestRaidMember", NearestMode::RaidMember),
+    ];
+    for (name, mode) in nearest {
+        g.set(
+            name,
+            lua.create_function(move |lua, reverse: Option<Value>| {
+                let reverse = bool_or_default(reverse.as_ref(), false);
+                push_call(lua, ScriptCall::TargetNearest { mode, reverse });
+                Ok(())
+            })?,
+        )?;
+    }
+    // `TargetLastTarget()` (`0x489b00`) and `AttackTarget()` (`0x489b50`) read no argument.
+    g.set(
+        "TargetLastTarget",
+        lua.create_function(|lua, _: MultiValue| {
+            push_call(lua, ScriptCall::TargetLastTarget);
+            Ok(())
+        })?,
+    )?;
+    g.set(
+        "AttackTarget",
+        lua.create_function(|lua, _: MultiValue| {
+            push_call(lua, ScriptCall::AttackTarget);
+            Ok(())
+        })?,
+    )?;
+    // `ToggleSheath()` and `SitOrStand()` resolve the active player and act on it, ungated.
+    let posture: [(&str, FiredInput); 2] = [
+        ("ToggleSheath", FiredInput::ToggleSheath),
+        ("SitOrStand", FiredInput::SitOrStand),
+    ];
+    for (name, input) in posture {
+        g.set(
+            name,
+            lua.create_function(move |lua, _: MultiValue| {
+                push(lua, BindingInput::Fire(input));
+                Ok(())
+            })?,
+        )?;
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// The three reference tables' 48 names (`0x8500b8`, `0x84f7a0`, and the main table's seven
+    /// at `0x83de68`), each a callable global that answers without raising.
+    const NAMES: [&str; 48] = [
+        "Jump",
+        "ToggleRun",
+        "ToggleAutoRun",
+        "MoveForwardStart",
+        "MoveForwardStop",
+        "MoveBackwardStart",
+        "MoveBackwardStop",
+        "TurnLeftStart",
+        "TurnLeftStop",
+        "TurnRightStart",
+        "TurnRightStop",
+        "StrafeLeftStart",
+        "StrafeLeftStop",
+        "StrafeRightStart",
+        "StrafeRightStop",
+        "PitchUpStart",
+        "PitchUpStop",
+        "PitchDownStart",
+        "PitchDownStop",
+        "TurnOrActionStart",
+        "TurnOrActionStop",
+        "CameraOrSelectOrMoveStart",
+        "CameraOrSelectOrMoveStop",
+        "MouselookStart",
+        "MouselookStop",
+        "IsMouselooking",
+        "CameraZoomIn",
+        "CameraZoomOut",
+        "MoveViewInStart",
+        "MoveViewInStop",
+        "MoveViewOutStart",
+        "MoveViewOutStop",
+        "MoveViewRightStart",
+        "MoveViewRightStop",
+        "MoveViewLeftStart",
+        "MoveViewLeftStop",
+        "MoveViewUpStart",
+        "MoveViewUpStop",
+        "MoveViewDownStart",
+        "MoveViewDownStop",
+        "ToggleMouseMove",
+        "TargetNearestEnemy",
+        "TargetNearestPartyMember",
+        "TargetNearestRaidMember",
+        "TargetLastTarget",
+        "AttackTarget",
+        "ToggleSheath",
+        "SitOrStand",
+    ];
+
+    #[test]
+    fn every_binding_function_is_a_global_that_answers() {
+        let s = UiScript::new().unwrap();
+        for name in NAMES {
+            let kind: String = s.eval(&format!("return type({name})")).unwrap();
+            assert_eq!(kind, "function", "{name}");
+            s.run(&format!("{name}()"))
+                .unwrap_or_else(|e| panic!("{name}() raised: {e}"));
+            s.run_binding(&format!("{name}(1)"))
+                .unwrap_or_else(|e| panic!("{name}(1) in a binding raised: {e}"));
+        }
+    }
+
+    /// The gate `0x494a50(0)`: a movement call queues only from inside a binding body, while the
+    /// camera and posture verbs, which have no gate, queue from anywhere.
+    #[test]
+    fn the_movement_calls_act_only_inside_a_binding_body() {
+        let mut s = UiScript::new().unwrap();
+        s.run("MoveForwardStart() StrafeLeftStop() Jump() ToggleRun()")
+            .unwrap();
+        assert!(s.take_binding_input().is_empty());
+        s.run_binding("MoveForwardStart() StrafeLeftStop() Jump() ToggleRun()")
+            .unwrap();
+        assert_eq!(
+            s.take_binding_input(),
+            vec![
+                BindingInput::Start(HeldInput::MoveForward),
+                BindingInput::Stop(HeldInput::StrafeLeft),
+                BindingInput::Fire(FiredInput::Jump),
+                BindingInput::Fire(FiredInput::ToggleRun),
+            ]
+        );
+        // The gate closes again after the body, and after a body that raised.
+        assert!(s.run_binding("error('boom')").is_err());
+        s.run("TurnLeftStart()").unwrap();
+        assert!(s.take_binding_input().is_empty());
+        s.run("SitOrStand() ToggleSheath() CameraZoomIn()").unwrap();
+        assert_eq!(
+            s.take_binding_input(),
+            vec![
+                BindingInput::Fire(FiredInput::SitOrStand),
+                BindingInput::Fire(FiredInput::ToggleSheath),
+                BindingInput::Fire(FiredInput::CameraZoomIn(1.0)),
+            ]
+        );
+    }
+
+    /// The zoom's amount: a number or numeric string (`0x6f34d0`), else 1.0 (`0x50b42d`); a
+    /// non-finite amount is dropped.
+    #[test]
+    fn a_zoom_takes_its_yards_or_one() {
+        let mut s = UiScript::new().unwrap();
+        s.run(r#"CameraZoomIn(2.5) CameraZoomOut("4") CameraZoomIn("far") CameraZoomOut(0/0)"#)
+            .unwrap();
+        assert_eq!(
+            s.take_binding_input(),
+            vec![
+                BindingInput::Fire(FiredInput::CameraZoomIn(2.5)),
+                BindingInput::Fire(FiredInput::CameraZoomOut(4.0)),
+                BindingInput::Fire(FiredInput::CameraZoomIn(1.0)),
+            ]
+        );
+    }
+
+    /// `IsMouselooking` answers the pushed TurnOrAction channel as 1 or nil.
+    #[test]
+    fn is_mouselooking_answers_one_or_nil() {
+        let mut s = UiScript::new().unwrap();
+        assert_eq!(s.arity("IsMouselooking()").unwrap(), 1);
+        assert!(s
+            .eval::<Option<i64>>("return IsMouselooking()")
+            .unwrap()
+            .is_none());
+        s.set_turn_or_action_held(true);
+        assert_eq!(
+            s.eval::<Option<i64>>("return IsMouselooking()").unwrap(),
+            Some(1)
+        );
+    }
+
+    /// `MouselookStart`/`Stop` pass no gate (`0x514210`/`0x514240`), queue for the look session in
+    /// call order, and move the channel at the call, so `IsMouselooking` answers them at once.
+    #[test]
+    fn mouselook_start_and_stop_move_the_channel_from_any_caller() {
+        let mut s = UiScript::new().unwrap();
+        assert_eq!(s.arity("MouselookStart()").unwrap(), 0);
+        s.run("MouselookStop()").unwrap();
+        s.take_mouselook_calls();
+        let looking = |s: &UiScript| s.eval::<Option<i64>>("return IsMouselooking()").unwrap();
+        s.run("MouselookStart()").unwrap();
+        assert_eq!(
+            looking(&s),
+            Some(1),
+            "an addon's own call, outside any binding"
+        );
+        s.run("MouselookStop() MouselookStart() MouselookStop()")
+            .unwrap();
+        assert_eq!(looking(&s), None);
+        assert_eq!(s.take_mouselook_calls(), vec![true, false, true, false]);
+        assert!(s.take_mouselook_calls().is_empty(), "drained");
+        assert!(
+            s.take_binding_input().is_empty(),
+            "not a movement-binding call"
+        );
+        // The app's push is the channel's truth from then on: a right release ended it.
+        s.run("MouselookStart()").unwrap();
+        s.set_turn_or_action_held(false);
+        assert_eq!(looking(&s), None);
+    }
+
+    /// `TargetLastTarget` and `AttackTarget` join the call queue, in call order with the rest.
+    #[test]
+    fn the_targeting_calls_join_the_call_queue_in_order() {
+        let mut s = UiScript::new().unwrap();
+        s.run(r#"TargetNearestEnemy(1) TargetLastTarget() AttackTarget() ClearTarget()"#)
+            .unwrap();
+        assert_eq!(
+            s.take_script_calls(),
+            vec![
+                ScriptCall::TargetNearest {
+                    mode: NearestMode::Enemy,
+                    reverse: true
+                },
+                ScriptCall::TargetLastTarget,
+                ScriptCall::AttackTarget,
+                ScriptCall::ClearTarget,
+            ]
+        );
+    }
+}
diff --git a/crates/benilla-ui/src/script/inspect.rs b/crates/benilla-ui/src/script/inspect.rs
index 8bdce4ec..7e34a533 100644
--- a/crates/benilla-ui/src/script/inspect.rs
+++ b/crates/benilla-ui/src/script/inspect.rs
@@ -1,7 +1,7 @@
 //! The inspect bindings: `NotifyInspect` and `ClearInspectPlayer` queue intents, the app pushes
 //! the inspected unit's equipment ([`UiScript::set_inspect`]) for the unit-keyed
-//! `GetInventoryItem*` verbs, and `CanInspect` and `CheckInteractDistance` read a per-token
-//! distance map ([`UiScript::set_unit_reach`]).
+//! `GetInventoryItem*` verbs, and `CanInspect` and `CheckInteractDistance` read a per-guid
+//! distance map ([`UiScript::set_unit_reach`]) through the token resolver ([`super::UnitGuids`]).
 //!
 //! Worn gear is public descriptor state (`PLAYER_VISIBLE_ITEM_<n>_0`), so the window paints from
 //! what the client holds: `SMSG_INSPECT` echoes only the guid, `InspectFrame_Show` calls
@@ -25,10 +25,10 @@ pub const INTERACT_DIST_SQ: [f64; 4] = [100.0, 123.45678, 100.0, 900.0];
 /// `0x48a1b0`); vmangos checks the same 10 yards (`INSPECT_DISTANCE`, `ObjectDefines.h:26`).
 pub const CAN_INSPECT_DIST_SQ: f64 = 100.0;
 
-/// One token's unit this frame, as the two range verbs read it. An entry exists only when the
-/// token resolved to a live unit object: the reference maps the token to a GUID (`0x515940`) and
-/// answers nil when the object manager has no such unit, as for a party member out of the area,
-/// whose GUID comes from the roster (`0x4e81a0`).
+/// One unit this frame, as the two range verbs read it. An entry exists only for a live unit
+/// object: the reference maps the token to a GUID (`0x515940`) and answers nil when the object
+/// manager has no such unit, as for a party member out of the area, whose GUID comes from the
+/// roster (`0x4e81a0`).
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct UnitReach {
     /// Squared distance from the player.
@@ -53,15 +53,23 @@ pub struct InspectView {
 }
 
 impl super::UiScript {
-    /// Push the squared distance of every token that resolved to a live unit this frame, creature
-    /// included; both range verbs read the same d². A token absent from the map answers nil from
-    /// both, the reference's null-object arm (`0x48babe`). It changes every frame, so it stays off
-    /// [`super::UnitState`], whose diffs fire `UNIT_*` events. Keys are lowercase: the token
-    /// resolver folds case (`_strnicmp`).
-    pub fn set_unit_reach(&mut self, reach: HashMap<String, UnitReach>) {
+    /// Push the squared distance of every live unit a token can name this frame, creature
+    /// included; both range verbs read the same d². A verb resolves its token to a guid through
+    /// [`super::UnitGuids`], so `"party1target"` and `"PLAYER"` read the unit they name, and a
+    /// guid absent from the map answers nil from both, the reference's null-object arms
+    /// (`0x48babe` for `CheckInteractDistance`, `0x48a1fa` for `CanInspect`). It changes every frame, so it stays off [`super::UnitState`], whose diffs
+    /// fire `UNIT_*` events.
+    pub fn set_unit_reach(&mut self, reach: HashMap<u64, UnitReach>) {
         self.model_mut().unit_reach = reach;
     }
 
+    /// The guids of the held units the resolver's inputs reach ([`Self::set_unit_guids`]): every
+    /// unit a token can name, the `target` chains included, that the object manager holds. These
+    /// are the guids [`Self::set_unit_reach`] is measured for.
+    pub fn held_unit_guids(&self) -> Vec<u64> {
+        self.model_ref().unit_guids.held.keys().copied().collect()
+    }
+
     /// Push (or clear, with `None`) the inspected unit's equipment. It fires nothing: the app fires
     /// `UNIT_INVENTORY_CHANGED` for the token, which the stock slot buttons listen for.
     pub fn set_inspect(&mut self, view: Option<InspectView>) {
@@ -80,16 +88,14 @@ impl super::UiScript {
     }
 }
 
-/// The reach pushed for `token`, case-folded: both verbs resolve the token through `0x515970`,
-/// whose compares are `_strnicmp`.
+/// The reach of the unit `token` names, through the resolver (`0x515970`, which both verbs call via
+/// `0x515940`): the guid it answers, then that guid's entry. A token the resolver does not
+/// recognise answers nobody here.
 fn reach(lua: &Lua, token: &Option<String>) -> Option<UnitReach> {
     let token = token.as_deref()?;
     let model = lua.app_data_ref::<Model>().expect("model app_data");
-    if token.bytes().any(|b| b.is_ascii_uppercase()) {
-        model.unit_reach.get(&token.to_ascii_lowercase()).copied()
-    } else {
-        model.unit_reach.get(token).copied()
-    }
+    let guid = model.unit_guids.resolve(token).ok().flatten()?;
+    model.unit_reach.get(&guid).copied()
 }
 
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
@@ -169,3 +175,127 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use std::collections::HashMap;
+
+    use super::*;
+    use crate::script::{UiScript, UnitGuids};
+
+    const ME: u64 = 0x10;
+    const MOB: u64 = 0xF130_0000_0000_0001;
+    const P1: u64 = 0x21;
+    const P1_PET: u64 = 0xF140_0000_0000_0021;
+    const OUT: u64 = 0x44;
+
+    fn reach(dist_sq: f64, inspectable: bool) -> UnitReach {
+        UnitReach {
+            dist_sq,
+            inspectable,
+        }
+    }
+
+    /// Us at the origin targeting a mob 20 yards off, which targets party1 5 yards off, who
+    /// targets us; party1's pet targets nobody. `OUT` is a roster member with no object.
+    fn seeded() -> UiScript {
+        let mut s = UiScript::new().unwrap();
+        s.set_unit_guids(&UnitGuids {
+            player: ME,
+            pet: P1_PET,
+            target: MOB,
+            mouseover: MOB,
+            party: [P1, OUT, 0, 0],
+            party_pets: [P1_PET, 0, 0, 0],
+            raid: vec![ME, P1],
+            held: HashMap::from([(ME, MOB), (MOB, P1), (P1, ME), (P1_PET, 0)]),
+            ..Default::default()
+        });
+        s.set_unit_reach(HashMap::from([
+            (ME, reach(0.0, true)),
+            (MOB, reach(400.0, false)),
+            (P1, reach(25.0, true)),
+            (P1_PET, reach(2500.0, false)),
+        ]));
+        s
+    }
+
+    fn answers(s: &UiScript, expr: &str) -> bool {
+        s.eval::<bool>(&format!("return {expr} ~= nil")).unwrap()
+    }
+
+    /// A token reads the reach of the unit it names, the `target` chain included: the verbs
+    /// resolve through [`UnitGuids`], so a chain is asked for no entry of its own.
+    #[test]
+    fn a_target_chain_reads_the_reach_of_the_unit_it_names() {
+        let s = seeded();
+        // The base, then each hop: MOB is 20 yards off, outside the 10-yard row, inside the 30.
+        assert!(!answers(&s, r#"CheckInteractDistance("target", 1)"#));
+        assert!(answers(&s, r#"CheckInteractDistance("target", 4)"#));
+        assert!(!answers(&s, r#"CheckInteractDistance("playertarget", 1)"#));
+        assert!(answers(&s, r#"CheckInteractDistance("playertarget", 4)"#));
+        // party1 is 5 yards off, and so is whom the target targets.
+        assert!(answers(&s, r#"CheckInteractDistance("targettarget", 1)"#));
+        assert!(answers(&s, r#"CheckInteractDistance("party1", 1)"#));
+        // party1 targets us: distance 0, where `party1` itself is 5 yards.
+        assert!(answers(&s, r#"CheckInteractDistance("party1target", 1)"#));
+        assert!(answers(&s, r#"CheckInteractDistance("raid2target", 1)"#));
+        assert!(answers(
+            &s,
+            r#"CheckInteractDistance("targettargettarget", 1)"#
+        ));
+        // The mouseover is the mob, so its target is party1 again.
+        assert!(answers(
+            &s,
+            r#"CheckInteractDistance("mouseovertarget", 1)"#
+        ));
+        // Four hops come back round to the mob.
+        assert!(!answers(
+            &s,
+            r#"CheckInteractDistance("targettargettargettarget", 1)"#
+        ));
+        // The pet is 50 yards off, outside every row.
+        assert!(!answers(&s, r#"CheckInteractDistance("partypet1", 4)"#));
+    }
+
+    /// The other range verb reads the same entry, and its player-only refusal rides in it.
+    #[test]
+    fn can_inspect_reads_the_chain_too() {
+        let s = seeded();
+        // party1 is a player in range, and the mob is a creature, which inspect refuses.
+        assert!(answers(&s, r#"CanInspect("party1")"#));
+        assert!(answers(&s, r#"CanInspect("targettarget")"#));
+        assert!(answers(&s, r#"CanInspect("party1target")"#));
+        assert!(!answers(&s, r#"CanInspect("target")"#));
+        assert!(!answers(&s, r#"CanInspect("party1targettarget")"#));
+    }
+
+    /// A chain that ends at nobody, a unit with no object, text after the chain and a token the
+    /// resolver does not read as a chain each answer nil, and the compares fold case.
+    #[test]
+    fn a_chain_that_names_nobody_answers_nil_and_case_folds() {
+        let s = seeded();
+        for token in [
+            // The pet targets nobody, so a hop off it names nobody.
+            "partypet1target",
+            "pettarget",
+            // A roster member with no object, and a hop off it.
+            "party2",
+            "party2target",
+            "party3target",
+            "party1foo",
+            "party1targetfoo",
+            // `npc` is an exact compare with no chain.
+            "npctarget",
+            "bogus",
+            "",
+        ] {
+            let call = format!(r#"CheckInteractDistance("{token}", 4)"#);
+            assert!(!answers(&s, &call), "{call}");
+            let call = format!(r#"CanInspect("{token}")"#);
+            assert!(!answers(&s, &call), "{call}");
+        }
+        assert!(answers(&s, r#"CheckInteractDistance("PARTY1TARGET", 1)"#));
+        assert!(answers(&s, r#"CanInspect("Party1Target")"#));
+    }
+}
diff --git a/crates/benilla-ui/src/script/inventory_verbs.rs b/crates/benilla-ui/src/script/inventory_verbs.rs
new file mode 100644
index 00000000..1340ce0d
--- /dev/null
+++ b/crates/benilla-ui/src/script/inventory_verbs.rs
@@ -0,0 +1,357 @@
+//! Four verbs of the reference's inventory registrar (`0x8484d0`) beside the paper-doll getters in
+//! [`super::char_stats`]: the keyring's slot map, the doll's sell cursor, the doll portrait setter
+//! and the alert recompute.
+
+use mlua::{Lua, MultiValue, Value};
+
+use super::binding_abi::number_arg;
+use super::char_stats::{inventory_slot_reader_accepts, recompute_inventory_alerts};
+use super::container::UiCursorMode;
+use super::region::{clear_texture, this_texture};
+use super::Model;
+
+/// `0x4c8520`, the registrar's shared slot reader: `is-number`, `tonumber`, the truncating cast,
+/// then `dec` into the 0-based slot and the whitelist; a failure of either raises `message`. The
+/// 0-based slot, `-1` for Lua 0, the ammo leg.
+fn inventory_slot_arg(lua: &Lua, v: Value, message: &'static str) -> mlua::Result<i32> {
+    let slot0 = number_arg(lua, v, message)?.wrapping_sub(1);
+    if !inventory_slot_reader_accepts(slot0) {
+        return Err(mlua::Error::RuntimeError(message.into()));
+    }
+    Ok(slot0)
+}
+
+/// Register the four globals.
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+
+    // KeyRingButtonIDToInvSlotID(buttonID) (`0x4c8150`): the truncated button id plus `0x51`
+    // (`0x4c818b`), so key 1 is live-API slot 82, with no range check; a non-number raises.
+    g.set(
+        "KeyRingButtonIDToInvSlotID",
+        lua.create_function(|lua, id: Value| {
+            let id = number_arg(lua, id, "Usage: KeyRingButtonIDToInvSlotID(buttonID)")?;
+            Ok(i64::from(id.wrapping_add(0x51)))
+        })?,
+    )?;
+
+    // ShowInventorySellCursor(slot) (`0x4c90b0`): the Buy cursor over a worn item. The armed-spell
+    // and base-cursor gates run before the argument is read (`0x4c90b7`, `0x4c90c9`), so under
+    // either a bad slot does not raise; past them a slot outside the reader's whitelist raises,
+    // and the ammo slot, an empty slot or a locked item leave the cursor as it was. Zero returns.
+    // The stock doll's call is commented out (`PaperDollFrame.lua:754-756`).
+    g.set(
+        "ShowInventorySellCursor",
+        lua.create_function(|lua, slot: Value| {
+            {
+                let model = lua.app_data_ref::<Model>().expect("model app_data");
+                // `[0xbe2c4c] == 1`: repair mode (`0x4fbce3`) and the targeting arm move the base.
+                if model.spell_targeting || model.repair_mode {
+                    return Ok(());
+                }
+            }
+            let slot0 = inventory_slot_arg(
+                lua,
+                slot,
+                "Invalid inventory slot in ShowInventorySellCursor",
+            )?;
+            if slot0 == -1 {
+                return Ok(());
+            }
+            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+            let sellable = usize::try_from(slot0 + 1)
+                .ok()
+                .and_then(|slot| model.inv_slot("player", slot))
+                .is_some_and(|v| v.item_id != 0 && !v.locked);
+            if sellable {
+                model.ui_cursor = Some(UiCursorMode::Buy);
+                model.ui_cursor_dirty = true;
+            }
+            Ok(())
+        })?,
+    )?;
+
+    // SetInventoryPortaitTexture(texture, unit, slot) (`0x4c9150`, the reference's spelling):
+    // the texture is cleared (`0x4c91ed`) before arguments 2 and 3 are read, each of which raises
+    // on a bad value. The unit is then read from argument 1 (`0x4c9247`), the texture itself,
+    // which `lua_tostring` answers NULL for, so the token resolves no unit (`0x515940`) and the
+    // item's icon is never painted: the call only blanks the texture. No stock caller.
+    g.set(
+        "SetInventoryPortaitTexture",
+        lua.create_function(|lua, (texture, unit, slot): (Value, Value, Value)| {
+            let rh = this_texture(lua, &texture)?;
+            clear_texture(
+                &mut lua.app_data_mut::<Model>().expect("model app_data"),
+                rh,
+            );
+            if !matches!(
+                unit,
+                Value::String(_) | Value::Number(_) | Value::Integer(_)
+            ) {
+                return Err(mlua::Error::runtime(
+                    "Usage: SetInventoryPortaitTexture(texure, unit, slot)",
+                ));
+            }
+            inventory_slot_arg(
+                lua,
+                slot,
+                "Invalid inventory slot in SetInventoryPortaitTexture",
+            )?;
+            Ok(())
+        })?,
+    )?;
+
+    // UpdateInventoryAlertStatus() (`0x4c9560`): the alert recompute (`0x4c7ee0`), which fires
+    // UPDATE_INVENTORY_ALERTS unconditionally; zero returns. Stock calls it when the durability
+    // figure's enchant timer runs out (`DurabilityFrame.lua:81`).
+    g.set(
+        "UpdateInventoryAlertStatus",
+        lua.create_function(|lua, ()| {
+            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+            recompute_inventory_alerts(&mut model);
+            model
+                .pending_events
+                .push(("UPDATE_INVENTORY_ALERTS".to_string(), Vec::new()));
+            Ok(MultiValue::new())
+        })?,
+    )?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::script::{ContainerSlot, ContainerState, InvSlotView, UiCursorMode, UiScript};
+
+    fn keyring_with_key() -> ContainerState {
+        let mut slots = std::collections::HashMap::new();
+        slots.insert(
+            2,
+            ContainerSlot {
+                item_id: 5396,
+                texture: Some("Interface\\Icons\\INV_Misc_Key_03".into()),
+                count: 1,
+                link: Some("|cffffffff|Hitem:5396:0:0:0|h[Key to Searing Gorge]|h|r".into()),
+                ..Default::default()
+            },
+        );
+        ContainerState {
+            name: None,
+            num_slots: 4,
+            slots,
+        }
+    }
+
+    #[test]
+    fn keyring_button_ids_map_past_the_buyback_band() {
+        let s = UiScript::new().unwrap();
+        assert_eq!(
+            s.eval::<i64>("return KeyRingButtonIDToInvSlotID(1)")
+                .unwrap(),
+            82
+        );
+        assert_eq!(
+            s.eval::<i64>("return KeyRingButtonIDToInvSlotID(32)")
+                .unwrap(),
+            113
+        );
+        // No range check, a truncating cast and a numeric string, as `0x4c8150` reads them.
+        assert_eq!(
+            s.eval::<i64>("return KeyRingButtonIDToInvSlotID(0)")
+                .unwrap(),
+            81
+        );
+        assert_eq!(
+            s.eval::<i64>("return KeyRingButtonIDToInvSlotID(-2.9)")
+                .unwrap(),
+            79
+        );
+        assert_eq!(
+            s.eval::<i64>("return KeyRingButtonIDToInvSlotID('3')")
+                .unwrap(),
+            84
+        );
+        let err = s
+            .run("KeyRingButtonIDToInvSlotID()")
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("Usage: KeyRingButtonIDToInvSlotID(buttonID)"),
+            "{err}"
+        );
+    }
+
+    /// The keyring band answers the inventory API from the keyring container, so the stock hover
+    /// (`ContainerFrame.lua:617`) reads a key through `GetInventoryItem*` and the tooltip.
+    #[test]
+    fn a_key_reads_through_its_inventory_slot() {
+        let mut s = UiScript::new().unwrap();
+        s.set_container(-2, Some(keyring_with_key()));
+        assert_eq!(
+            s.eval::<Option<String>>(
+                "return GetInventoryItemTexture('player', KeyRingButtonIDToInvSlotID(2))"
+            )
+            .unwrap()
+            .as_deref(),
+            Some("Interface\\Icons\\INV_Misc_Key_03")
+        );
+        assert_eq!(
+            s.eval::<Option<String>>("return GetInventoryItemTexture('player', 82)")
+                .unwrap(),
+            None,
+            "key slot 1 is empty"
+        );
+        assert_eq!(
+            s.eval::<i64>("return GetInventoryItemCount('player', 83)")
+                .unwrap(),
+            1
+        );
+    }
+
+    #[test]
+    fn inventory_sell_cursor_buys_over_a_worn_item_only() {
+        let mut s = UiScript::new().unwrap();
+        let mut slots: crate::script::InventorySlots = Default::default();
+        slots[16] = Some(InvSlotView {
+            item_id: 2361,
+            ..Default::default()
+        });
+        slots[17] = Some(InvSlotView {
+            item_id: 2362,
+            locked: true,
+            ..Default::default()
+        });
+        s.set_inventory_slots(slots);
+
+        for quiet in ["0", "1", "17"] {
+            s.run(&format!("ShowInventorySellCursor({quiet})")).unwrap();
+            assert_eq!(s.ui_cursor(), None, "slot {quiet}: ammo, empty or locked");
+        }
+        s.run("ShowInventorySellCursor(16)").unwrap();
+        assert_eq!(s.ui_cursor(), Some(UiCursorMode::Buy));
+        assert_eq!(
+            s.eval::<i64>(
+                "local n = function(...) return arg.n end return n(ShowInventorySellCursor(16))"
+            )
+            .unwrap(),
+            0
+        );
+
+        for bad in ["24", "39", "70", "114", "-1", "'x'"] {
+            let err = s
+                .run(&format!("ShowInventorySellCursor({bad})"))
+                .unwrap_err()
+                .to_string();
+            assert!(
+                err.contains("Invalid inventory slot in ShowInventorySellCursor"),
+                "{bad}: {err}"
+            );
+        }
+    }
+
+    /// The two cursor gates come before the argument read (`0x4c90b7`, `0x4c90c9`).
+    #[test]
+    fn inventory_sell_cursor_under_repair_mode_is_silent() {
+        let mut s = UiScript::new().unwrap();
+        s.set_merchant(Some(crate::script::MerchantState {
+            can_repair: true,
+            ..Default::default()
+        }));
+        s.run("ShowRepairCursor()").unwrap();
+        s.run("ShowInventorySellCursor(999)").unwrap();
+        assert_eq!(s.ui_cursor(), None);
+    }
+
+    #[test]
+    fn inventory_portrait_setter_only_blanks_the_texture() {
+        let s = UiScript::new().unwrap();
+        s.run(
+            r#"local f = CreateFrame("Frame", "PortHost", UIParent)
+               PortTex = f:CreateTexture("PortTex")
+               PortTex:SetTexture("Interface\\Icons\\INV_Misc_Bag_08")
+               PortText = f:CreateFontString("PortText")"#,
+        )
+        .unwrap();
+        s.run("SetInventoryPortaitTexture(PortTex, 'player', 1)")
+            .unwrap();
+        assert_eq!(
+            s.eval::<Option<String>>("return PortTex:GetTexture()")
+                .unwrap(),
+            None
+        );
+        assert_eq!(
+            s.eval::<i64>("local n = function(...) return arg.n end return n(SetInventoryPortaitTexture(PortTex, 'player', 1))")
+                .unwrap(),
+            0
+        );
+
+        // The clear precedes the argument checks (`0x4c91ed`).
+        s.run(r#"PortTex:SetTexture("Interface\\Icons\\INV_Misc_Bag_08")"#)
+            .unwrap();
+        let err = s
+            .run("SetInventoryPortaitTexture(PortTex, nil, 1)")
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("Usage: SetInventoryPortaitTexture(texure, unit, slot)"),
+            "{err}"
+        );
+        assert_eq!(
+            s.eval::<Option<String>>("return PortTex:GetTexture()")
+                .unwrap(),
+            None
+        );
+        let err = s
+            .run("SetInventoryPortaitTexture(PortTex, 'player', 30)")
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("Invalid inventory slot in SetInventoryPortaitTexture"),
+            "{err}"
+        );
+
+        for (call, message) in [
+            (
+                "SetInventoryPortaitTexture(1, 'player', 1)",
+                "non-table object",
+            ),
+            (
+                "SetInventoryPortaitTexture({}, 'player', 1)",
+                "non-framescript object",
+            ),
+            (
+                "SetInventoryPortaitTexture(PortText, 'player', 1)",
+                "Wrong object type for member function",
+            ),
+            (
+                "SetInventoryPortaitTexture(PortHost, 'player', 1)",
+                "Wrong object type for member function",
+            ),
+        ] {
+            let err = s.run(call).unwrap_err().to_string();
+            assert!(err.contains(message), "{call}: {err}");
+        }
+    }
+
+    #[test]
+    fn update_inventory_alert_status_fires_the_recompute_event() {
+        let mut s = UiScript::new().unwrap();
+        s.run(
+            r#"ALERTS = 0
+               local f = CreateFrame("Frame")
+               f:RegisterEvent("UPDATE_INVENTORY_ALERTS")
+               f:SetScript("OnEvent", function() ALERTS = ALERTS + 1 end)"#,
+        )
+        .unwrap();
+        assert_eq!(
+            s.eval::<i64>(
+                "local n = function(...) return arg.n end return n(UpdateInventoryAlertStatus())"
+            )
+            .unwrap(),
+            0
+        );
+        s.run("UpdateInventoryAlertStatus()").unwrap();
+        s.tick(0.0);
+        assert_eq!(s.eval::<i64>("return ALERTS").unwrap(), 2);
+    }
+}
diff --git a/crates/benilla-ui/src/script/keybind.rs b/crates/benilla-ui/src/script/keybind.rs
index d1c4b250..e8059618 100644
--- a/crates/benilla-ui/src/script/keybind.rs
+++ b/crates/benilla-ui/src/script/keybind.rs
@@ -1,48 +1,30 @@
-//! The key-binding table behind `GetBinding`, `SetBinding`, `LoadBindings` and their kin: per
-//! command, a category header and its chords, spelled `[ALT-][CTRL-][SHIFT-]<TOKEN>` and matched by
-//! string equality as the reference does. Host commands carry their 1.12 defaults; an addon's
-//! `Bindings.xml` adds ordinary rows that also carry a Lua body.
+//! The key-binding table behind `GetBinding`, `SetBinding`, `LoadBindings` and their kin, in the
+//! reference's two halves. The commands are what `Bindings.xml` declared (the core's off the
+//! player's chain, then each addon's, through the one loader `0x4b6f70`): a name, its Lua body,
+//! `runOnUp`, and the one flat list `GetBinding` walks, whose section headers are rows of their
+//! own. The keys are a separate table of chord to command name, spelled
+//! `[ALT-][CTRL-][SHIFT-]<TOKEN>` and matched by string equality, which `SetBinding` writes without
+//! reading the command (`0x4b7490`): the live set the dispatcher probes, the stored account and
+//! character sets, and the defaults `WTF\DefaultBindings.wtf` fills (`0x4b62b0`).
 
 use std::collections::HashMap;
 
 use mlua::{Lua, MultiValue, Value};
 
-use crate::bindings_xml::AddonBinding;
+use crate::bindings_xml::Binding;
 
 use super::Model;
 
-/// One host-registered command: the 1.12 name, its category header's global string
-/// (`BINDING_HEADER_MOVEMENT`), whether it also runs on release (`runOnUp`, read only by
-/// `RunCommand` at `0x4b7bf1`, never a bindability rule), and the 1.12 default chords.
-#[derive(Clone, Copy, Debug)]
-pub struct KeybindCommand {
-    pub name: &'static str,
-    pub category: &'static str,
-    pub run_on_up: bool,
-    pub default1: Option<&'static str>,
-    pub default2: Option<&'static str>,
-}
-
-/// An addon binding's runnable half: what the app's dispatch needs to fire it.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct AddonBindingBody {
-    /// The command name as registered, the key of a `keybind_snapshot` row.
-    pub name: String,
-    /// Run the body a second time on the release, with `keystate = "up"` (`runOnUp="true"`).
-    pub run_on_up: bool,
-    /// The `<Binding>` element's Lua chunk, verbatim.
-    pub body: String,
-}
-
 /// A host request queued by Lua. `Save(set)` persists set 1 or 2 under `benilla-config/bindings/`;
 /// `Save(1)` also deletes the character set's file.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum KeybindRequest {
     Save(u32),
-    /// `RunBinding(command)`: the app runs the command's action as if its chord were pressed.
-    Run(String),
 }
 
+/// One key of a set: the chord and the command name it runs, as `SetBinding` stored it.
+pub type KeyBinding = (String, String);
+
 /// `SetBinding`'s only refusal: the alias step of `CBindings::SetBinding` (`0x4b7490`), then
 /// `IsValidBindingKeyString` (`0x4b7890`); no command is consulted. `Some` is the key to store,
 /// upper-cased because the table's hash and compare fold case (`0x64b3f0`, `0x64a4c0`). The alias
@@ -124,129 +106,161 @@ fn is_valid_binding_key(key: &str) -> bool {
     NAMES.contains(&rest)
 }
 
+/// One command a `Bindings.xml` declared.
 #[derive(Clone, Debug)]
 struct Entry {
     name: String,
-    category: String,
+    /// `runOnUp="true"`: the release runs the body again (`0x4b7bf1`).
     run_on_up: bool,
-    defaults: [Option<String>; 2],
-    /// The live chords in bind order; `GetBindingKey` and the window show the first two.
-    keys: Vec<String>,
-    /// An addon's `hidden="true"`: a full binding, left out of `GetNumBindings`/`GetBinding`.
+    /// `hidden="true"`: a full binding, left out of `GetNumBindings`/`GetBinding`.
     hidden: bool,
-    /// An addon binding's Lua chunk; `None` for a host command, whose action is engine-side.
-    body: Option<String>,
+    /// The `<Binding>` element's Lua chunk, verbatim.
+    body: String,
 }
 
-/// The table, the stored sets and the queued host requests; lives in [`Model`].
+/// One row of the list `GetNumBindings`/`GetBinding` walk, in load order.
+#[derive(Clone, Debug)]
+enum Row {
+    /// A section header, `HEADER_<header>`: the reference stores `sprintf("HEADER_%s", header)`
+    /// (`0x846f58`) as a row of its own with a display ordinal and no script (`0x4b72f5`-`0x4b72fa`).
+    Header(String),
+    /// A command, an index into [`KeybindState::entries`].
+    Command(usize),
+}
+
+/// The commands, the key sets and the queued host requests; lives in [`Model`].
 #[derive(Default)]
 pub(crate) struct KeybindState {
     entries: Vec<Entry>,
+    /// The display list, headers and commands in load order.
+    rows: Vec<Row>,
     by_name: HashMap<String, usize>,
-    /// Stored sets in entry order: `[0]` account (set 1), `[1]` character (set 2, if any).
-    stored: [Option<Vec<Vec<String>>>; 2],
-    /// The same sets by uppercased name, for addon commands registered after the seed.
-    stored_by_name: [HashMap<String, Vec<String>>; 2],
+    /// The live keys the dispatcher probes, in bind order: one command per chord, and a command's
+    /// keys in the order `GetBindingKey` answers them.
+    live: Vec<KeyBinding>,
+    /// Set 0, the defaults `LoadBindings(0)` restores, in file order.
+    defaults: Vec<KeyBinding>,
+    /// Stored sets: `[0]` account (set 1), `[1]` character (set 2, if any).
+    stored: [Option<Vec<KeyBinding>>; 2],
     /// The set the live table edits (`GetCurrentBindingSet`): 1 account, 2 character.
     current_set: u32,
-    /// Bumped by every change to the live table: the app's signal to re-derive dispatch.
+    /// Bumped by every change to the live table or the commands: the app's signal to re-derive
+    /// dispatch.
     generation: u64,
     requests: Vec<KeybindRequest>,
-    /// Set by `BenillaBindCapture`: the host swallows raw input and hands the page the chord.
-    capture_armed: bool,
+}
+
+/// `SetBinding(set, key, command)` on one key list: unbind `key` everywhere, then bind it to the
+/// command unless that is empty (`0x4b7490`, where an empty action is the unbind). The key is one
+/// [`normalize_binding_key`] accepted.
+fn bind_key(list: &mut Vec<KeyBinding>, key: String, command: Option<&str>) {
+    list.retain(|(k, _)| k != &key);
+    if let Some(command) = command.filter(|c| !c.is_empty()) {
+        list.push((key, command.to_owned()));
+    }
+}
+
+/// A list of `(key, command)` pairs applied in order through [`bind_key`], a key the validator
+/// refuses dropped: how the `.wtf` loader (`0x4b6140`) fills a set, line by line.
+fn key_list(pairs: impl IntoIterator<Item = KeyBinding>) -> Vec<KeyBinding> {
+    let mut list = Vec::new();
+    for (key, command) in pairs {
+        if let Some(key) = normalize_binding_key(&key) {
+            bind_key(&mut list, key, Some(&command));
+        }
+    }
+    list
+}
+
+/// A `.wtf` bindings file as the reference's reader (`0x4b6140`) takes it: lines split on CR and
+/// LF, a line counted only when it opens with `bind ` in any case (`0x4b61ea`), then the key up to
+/// the next space and the rest of the line as the command (`0x4b620d`), handed to `SetBinding`.
+pub fn parse_bindings_wtf(text: &str) -> Vec<KeyBinding> {
+    text.split(['\r', '\n'])
+        .filter_map(|line| {
+            let rest = line
+                .get(..5)
+                .filter(|p| p.eq_ignore_ascii_case("bind "))
+                .map(|_| &line[5..])?;
+            let (key, command) = rest.split_once(' ').unwrap_or((rest, ""));
+            Some((key.to_owned(), command.to_owned()))
+        })
+        .collect()
 }
 
 impl KeybindState {
-    /// The rows `GetNumBindings`/`GetBinding` enumerate: all but `hidden="true"`, since the stock
-    /// window skips only `HEADER` rows (`Blizzard_BindingUI.lua:87`).
-    fn visible(&self) -> impl Iterator<Item = &Entry> {
-        self.entries.iter().filter(|e| !e.hidden)
+    /// The rows `GetNumBindings`/`GetBinding` enumerate: every header and every command but a
+    /// `hidden="true"` one, which the reference numbers from a second counter, negated
+    /// (`0x4b73da`-`0x4b73e5`), so `GetBinding`'s ordinal walk (`0x4b7c80`) never reaches it and
+    /// `GetNumBindings` (`0x4b7f40`) counts only the first.
+    fn visible(&self) -> impl Iterator<Item = &Row> {
+        self.rows.iter().filter(|r| match r {
+            Row::Header(_) => true,
+            Row::Command(i) => !self.entries[*i].hidden,
+        })
     }
 
-    /// `SetBinding(key[, command])`: unbind `key` everywhere, then append it to the command's
-    /// list. The reference refuses only an invalid key (`0x4b762c`) and never reads the command
-    /// (`0x4b7490`), so the wheel binds to a `runOnUp` command despite the stock window's
-    /// MOUSEWHEEL_ERROR branch.
+    /// The live keys bound to `command`, in bind order; names compare case-insensitively
+    /// (`0x64a4c0`).
+    fn keys_of<'a>(&'a self, command: &'a str) -> impl Iterator<Item = &'a String> + 'a {
+        self.live
+            .iter()
+            .filter(move |(_, c)| c.eq_ignore_ascii_case(command))
+            .map(|(k, _)| k)
+    }
+
+    /// Open a section: a `HEADER_<header>` row, unless one of that name exists, which the reference
+    /// refuses (`0x4b71c9`-`0x4b7258`) and loads the binding under the section already open.
+    fn open_header(&mut self, header: &str) {
+        let name = format!("HEADER_{header}");
+        if !self
+            .rows
+            .iter()
+            .any(|r| matches!(r, Row::Header(h) if h.eq_ignore_ascii_case(&name)))
+        {
+            self.rows.push(Row::Header(name));
+        }
+    }
+
+    /// `SetBinding(key[, command])` on the live set: refused only for a key string the validator
+    /// rejects (`0x4b762c`). The command is never read (`0x4b7490`), so a name no `Bindings.xml`
+    /// declared is stored and answered like any other.
     fn set_binding(&mut self, key: &str, command: Option<&str>) -> bool {
         let Some(key) = normalize_binding_key(key) else {
             return false;
         };
-        // Deviation: an unregistered command answers nil where the reference stores the string
-        // and answers 1, because this table only holds key lists of registered commands.
-        let cmd_idx = match command {
-            Some(name) => match self.by_name.get(&name.to_ascii_uppercase()) {
-                Some(&i) => Some(i),
-                None => return false,
-            },
-            None => None,
-        };
-        for e in &mut self.entries {
-            e.keys.retain(|k| k != &key);
-        }
-        if let Some(i) = cmd_idx {
-            self.entries[i].keys.push(key);
-        }
+        bind_key(&mut self.live, key, command);
         self.generation += 1;
         true
     }
 
-    /// The live key lists in entry order, as a stored set holds them.
-    fn snapshot(&self) -> Vec<Vec<String>> {
-        self.entries.iter().map(|e| e.keys.clone()).collect()
-    }
-
-    /// Replace the live key lists from a snapshot; an entry past the snapshot's end keeps its keys.
-    fn apply(&mut self, snap: &[Vec<String>]) {
-        for (i, e) in self.entries.iter_mut().enumerate() {
-            if let Some(keys) = snap.get(i) {
-                e.keys = keys.clone();
-            }
+    /// `LoadBindings(set)`: 0 defaults, 1 account, 2 character, which falls back to the account
+    /// set (the reference's starts as a copy), each falling back to the defaults. Loading defaults
+    /// keeps the current set, as the window's Reset To Default does.
+    fn load(&mut self, set: u32) {
+        let list = match set {
+            0 => &self.defaults,
+            1 => self.stored[0].as_ref().unwrap_or(&self.defaults),
+            2 => self.stored[1]
+                .as_ref()
+                .or(self.stored[0].as_ref())
+                .unwrap_or(&self.defaults),
+            _ => return,
+        };
+        self.live = list.clone();
+        if set != 0 {
+            self.current_set = set;
         }
         self.generation += 1;
     }
 
-    fn defaults_snapshot(&self) -> Vec<Vec<String>> {
-        self.entries
-            .iter()
-            .map(|e| e.defaults.iter().flatten().cloned().collect())
-            .collect()
-    }
-
-    /// `LoadBindings(set)`: 0 defaults, 1 account, 2 character, which falls back to the account
-    /// set (the reference's starts as a copy). Loading defaults keeps the current set, as the
-    /// window's Reset To Default does.
-    fn load(&mut self, set: u32) {
-        match set {
-            0 => {
-                let d = self.defaults_snapshot();
-                self.apply(&d);
-            }
-            1 => {
-                let s = self.stored[0]
-                    .clone()
-                    .unwrap_or_else(|| self.defaults_snapshot());
-                self.apply(&s);
-                self.current_set = 1;
-            }
-            2 => {
-                let s = self.stored[1]
-                    .clone()
-                    .or_else(|| self.stored[0].clone())
-                    .unwrap_or_else(|| self.defaults_snapshot());
-                self.apply(&s);
-                self.current_set = 2;
-            }
-            _ => {}
-        }
-    }
-
     /// `SaveBindings(which)`: store the live table as set `which` and make it current. Saving the
     /// account set drops the character set, the window's confirmed delete.
     fn save(&mut self, which: u32) {
         if which != 1 && which != 2 {
             return;
         }
-        self.stored[(which - 1) as usize] = Some(self.snapshot());
+        self.stored[(which - 1) as usize] = Some(self.live.clone());
         if which == 1 {
             self.stored[1] = None;
         }
@@ -254,139 +268,82 @@ impl KeybindState {
         self.requests.push(KeybindRequest::Save(which));
     }
 
-    /// Append one addon's parsed `Bindings.xml`, skipping a name already registered, so a host
-    /// command keeps it and no handed-out index moves. A `header` opens a section
-    /// (`BINDING_HEADER_<header>`) until the next one, as in the reference's flat list.
-    /// Deviation: rows before a file's first header take the addon's name as their section, not
-    /// the previous file's, because under a foreign header the player could not find them.
-    fn register_addon(&mut self, addon: &str, bindings: &[AddonBinding]) {
-        let mut section = addon.to_string();
+    /// Append one parsed `Bindings.xml`, as the loader `0x4b6f70` does: a foreign `platform` skips
+    /// the node (`0x4b70c3`-`0x4b70e5`); a name already defined skips it before its header is
+    /// read (`0x4b70f1`-`0x4b717e`), so the first definition keeps it and no handed-out index
+    /// moves; a `header` adds its `HEADER_<header>` row before the binding's own.
+    ///
+    /// `fallback_header` is an addon's name. Deviation: an addon file whose first binding has no
+    /// header opens a `HEADER_<addon>` row, where the reference files those rows under the
+    /// previous file's last header, because under a foreign header the player could not find
+    /// them. The core file passes `None` and is read as the reference reads it.
+    fn register(&mut self, fallback_header: Option<&str>, bindings: &[Binding]) {
+        let mut opened = false;
         for b in bindings {
-            // A foreign `platform` skips the whole node, header included (`0x4b70c3`-`0x4b70e5`).
             if b.platform.as_deref().is_some_and(|p| p != THIS_PLATFORM) {
                 continue;
             }
-            // Before the duplicate skip: a duplicate's header still opens its section.
-            if let Some(h) = &b.header {
-                section = format!("BINDING_HEADER_{h}");
-            }
             let key = b.name.to_ascii_uppercase();
             if self.by_name.contains_key(&key) {
                 continue;
             }
+            match (&b.header, fallback_header) {
+                (Some(h), _) => self.open_header(h),
+                (None, Some(addon)) if !opened => self.open_header(addon),
+                _ => {}
+            }
+            opened = true;
             let idx = self.entries.len();
-            // The stored chord: the current set first, then the account set, as `load` falls back.
-            let stored = {
-                let cur = if self.current_set == 2 { 1 } else { 0 };
-                self.stored_by_name[cur]
-                    .get(&key)
-                    .or_else(|| self.stored_by_name[0].get(&key))
-                    .cloned()
-            };
             self.by_name.insert(key, idx);
             self.entries.push(Entry {
                 name: b.name.clone(),
-                category: section.clone(),
                 run_on_up: b.run_on_up,
-                // 1.12's `<Binding>` carries no default chord.
-                defaults: [None, None],
-                keys: stored.unwrap_or_default(),
                 hidden: b.hidden,
-                body: Some(b.body.clone()),
+                body: b.body.clone(),
             });
+            self.rows.push(Row::Command(idx));
         }
         self.generation += 1;
     }
 }
 
-/// The `platform="…"` value that registers here: the Windows client compares against `"windows"`
-/// (`0x846f98`), the Mac client against `"mac"` (`0x4e28f8`); every other OS takes `"windows"`.
-const THIS_PLATFORM: &str = if cfg!(target_os = "macos") {
-    "mac"
-} else {
-    "windows"
-};
+/// The `platform="…"` value that registers: `"windows"` (`0x846f98`), the PC build's, on every OS,
+/// since benilla answers as the PC build (`IsMacClient` nil, `client.rs`); the Mac build compares
+/// against `"mac"` (`0x4e28f8`) and so has the `ITUNES_*` rows.
+const THIS_PLATFORM: &str = "windows";
 
 impl super::UiScript {
-    /// Register the host's commands at boot, in 1.12 `Bindings.xml` order, keys from the defaults.
-    pub fn register_bindings(&mut self, commands: &[KeybindCommand]) {
-        let mut model = self.model_mut();
-        for c in commands {
-            let key = c.name.to_ascii_uppercase();
-            if model.keybinds.by_name.contains_key(&key) {
-                continue;
-            }
-            let defaults = [c.default1.map(str::to_owned), c.default2.map(str::to_owned)];
-            let idx = model.keybinds.entries.len();
-            model.keybinds.by_name.insert(key, idx);
-            model.keybinds.entries.push(Entry {
-                name: c.name.to_owned(),
-                category: c.category.to_owned(),
-                run_on_up: c.run_on_up,
-                keys: defaults.iter().flatten().cloned().collect(),
-                defaults,
-                hidden: false,
-                body: None,
-            });
-        }
-        model.keybinds.current_set = 1;
-        model.keybinds.generation += 1;
+    /// Register the core's `Interface\FrameXML\Bindings.xml`, at the reference's point in the UI
+    /// load: after the `FrameXML.toc` walk (`0x48ffed`), before the addons (`0x490018`).
+    pub fn register_bindings(&self, bindings: &[Binding]) {
+        self.model_mut().keybinds.register(None, bindings);
     }
 
     /// Register one addon's parsed `Bindings.xml`, at the reference's point in the addon load:
-    /// after its `.toc` files, before its saved variables (`0x51f400`).
-    pub fn register_addon_bindings(&mut self, addon: &str, bindings: &[AddonBinding]) {
-        self.model_mut().keybinds.register_addon(addon, bindings);
+    /// after its `.toc` files, before its saved variables (`0x51f443`).
+    pub fn register_addon_bindings(&mut self, addon: &str, bindings: &[Binding]) {
+        self.model_mut().keybinds.register(Some(addon), bindings);
     }
 
-    /// Every addon binding's runnable half, in registration order; host commands have none.
-    pub fn addon_binding_bodies(&self) -> Vec<AddonBindingBody> {
-        self.model_mut()
-            .keybinds
-            .entries
-            .iter()
-            .filter_map(|e| {
-                e.body.as_ref().map(|body| AddonBindingBody {
-                    name: e.name.clone(),
-                    run_on_up: e.run_on_up,
-                    body: body.clone(),
-                })
-            })
-            .collect()
+    /// Set 0, the defaults, from `WTF\DefaultBindings.wtf` ([`parse_bindings_wtf`]), as
+    /// `0x4b62b0` loads it: each pair through `SetBinding(0, key, command)`.
+    pub fn set_default_bindings(&mut self, pairs: Vec<KeyBinding>) {
+        self.model_mut().keybinds.defaults = key_list(pairs);
+    }
+
+    /// Set 0, the defaults, in file order.
+    pub fn default_bindings(&self) -> Vec<KeyBinding> {
+        self.model_mut().keybinds.defaults.clone()
     }
 
     /// Seed stored set 1 (account) or 2 (character) from `benilla-config/bindings/`; `None` clears
     /// it. The live table is untouched until [`Self::load_binding_set`].
-    pub fn seed_binding_set(&mut self, set: u32, keys: Option<Vec<(String, Vec<String>)>>) {
+    pub fn seed_binding_set(&mut self, set: u32, keys: Option<Vec<KeyBinding>>) {
+        let keys = keys.map(key_list);
         let mut model = self.model_mut();
-        let kb = &mut model.keybinds;
-        // By name as well: an addon command registered later has no position yet.
-        let mut by_name_owned: HashMap<String, Vec<String>> = HashMap::new();
-        let snap = keys.map(|pairs| {
-            let by_name: HashMap<_, _> = pairs.into_iter().collect();
-            by_name_owned = by_name
-                .iter()
-                .map(|(n, k)| (n.to_ascii_uppercase(), k.clone()))
-                .collect();
-            kb.entries
-                .iter()
-                .map(|e| {
-                    by_name
-                        .get(&e.name)
-                        .cloned()
-                        .unwrap_or_else(|| e.keys.clone())
-                })
-                .collect()
-        });
         match set {
-            1 => {
-                kb.stored[0] = snap;
-                kb.stored_by_name[0] = by_name_owned;
-            }
-            2 => {
-                kb.stored[1] = snap;
-                kb.stored_by_name[1] = by_name_owned;
-            }
+            1 => model.keybinds.stored[0] = keys,
+            2 => model.keybinds.stored[1] = keys,
             _ => {}
         }
     }
@@ -396,14 +353,34 @@ impl super::UiScript {
         self.model_mut().keybinds.load(set);
     }
 
-    /// The live table as `(command, chords)` in registration order, for dispatch and the save.
+    /// The live keys as `(chord, command)` in bind order, for dispatch.
+    pub fn binding_keys(&self) -> Vec<KeyBinding> {
+        self.model_mut().keybinds.live.clone()
+    }
+
+    /// The live table as `(command, chords)`: every declared command in registration order, then
+    /// any other name a key is bound to, for the save and the tests.
     pub fn keybind_snapshot(&self) -> Vec<(String, Vec<String>)> {
-        self.model_mut()
-            .keybinds
+        let model = self.model_mut();
+        let kb = &model.keybinds;
+        let mut out: Vec<(String, Vec<String>)> = kb
             .entries
             .iter()
-            .map(|e| (e.name.clone(), e.keys.clone()))
-            .collect()
+            .map(|e| (e.name.clone(), kb.keys_of(&e.name).cloned().collect()))
+            .collect();
+        for (key, command) in &kb.live {
+            if kb.by_name.contains_key(&command.to_ascii_uppercase()) {
+                continue;
+            }
+            match out
+                .iter_mut()
+                .find(|(n, _)| n.eq_ignore_ascii_case(command))
+            {
+                Some((_, keys)) => keys.push(key.clone()),
+                None => out.push((command.clone(), vec![key.clone()])),
+            }
+        }
+        out
     }
 
     /// Bumped by every table change; re-derive dispatch when it moves.
@@ -425,25 +402,50 @@ impl super::UiScript {
     pub fn character_bindings_exist(&self) -> bool {
         self.model_mut().keybinds.stored[1].is_some()
     }
-
-    /// While true, the host swallows raw input and calls `KeyBindings_OnHostKey("<chord>")`.
-    pub fn bind_capture_armed(&self) -> bool {
-        self.model_mut().keybinds.capture_armed
-    }
 }
 
 /// Register one addon's `Bindings.xml` from a bare `&Lua`: `LoadAddOn` runs inside a Lua binding
 /// with no `UiScript` to reach.
-pub(crate) fn register_addon_bindings(lua: &Lua, addon: &str, bindings: &[AddonBinding]) {
+pub(crate) fn register_addon_bindings(lua: &Lua, addon: &str, bindings: &[Binding]) {
     lua.app_data_mut::<Model>()
         .expect("model app_data")
         .keybinds
-        .register_addon(addon, bindings);
+        .register(Some(addon), bindings);
 }
 
-/// The binding globals. `GetBinding` returns command, category, key1, key2, which is not 1.12's
-/// shape: 1.12 returns command, key1, key2, with each header a `HEADER_*` row
-/// (`Blizzard_BindingUI.lua:84`). Only `GetNumBindings` and `GetBinding` skip hidden rows.
+/// `CBindings::RunCommand` (`0x4b7b50`): look the command up by name (`0x4b7b77`); on a release
+/// run nothing unless it is `runOnUp` (`0x4b7bf1`); else set the global `keystate` to `"down"` or
+/// `"up"` (`0x4b7c0f`), run the body, and set `keystate` to nil (`0x4b7c42`-`0x4b7c4e`), since the
+/// 1.12 client's in-world `_G` has none (`reference/1.12-globals.tsv`). `Ok(false)` when nothing
+/// ran.
+pub(crate) fn run_command(lua: &Lua, command: &str, down: bool) -> mlua::Result<bool> {
+    let (name, body) = {
+        let model = lua.app_data_ref::<Model>().expect("model app_data");
+        let kb = &model.keybinds;
+        let Some(&i) = kb.by_name.get(&command.to_ascii_uppercase()) else {
+            return Ok(false);
+        };
+        let e = &kb.entries[i];
+        if !down && !e.run_on_up {
+            return Ok(false);
+        }
+        (e.name.clone(), e.body.clone())
+    };
+    let g = lua.globals();
+    g.set("keystate", if down { "down" } else { "up" })?;
+    let ran = lua
+        .load(body.as_str())
+        .set_name(name)
+        .set_mode(mlua::ChunkMode::Text)
+        .exec();
+    g.set("keystate", Value::Nil)?;
+    ran.map(|()| true)
+}
+
+/// The binding globals. `GetBinding(i)` answers the row's name and then every key bound to it
+/// (`0x4b7f60`: `1 + matches` values), so a `HEADER_*` row answers its name alone, which the stock
+/// window reads as three names (`Blizzard_BindingUI.lua:84`, `:87`). Only `GetNumBindings` and
+/// `GetBinding` skip hidden rows.
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     lua.globals().set(
         "GetNumBindings",
@@ -456,18 +458,20 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "GetBinding",
         lua.create_function(|lua, i: usize| {
             let model = lua.app_data_mut::<Model>().expect("model app_data");
-            let Some(e) = i
-                .checked_sub(1)
-                .and_then(|i| model.keybinds.visible().nth(i))
-            else {
+            let kb = &model.keybinds;
+            let Some(row) = i.checked_sub(1).and_then(|i| kb.visible().nth(i)) else {
                 return Ok(MultiValue::new());
             };
-            let mut out = vec![
-                Value::String(lua.create_string(&e.name)?),
-                Value::String(lua.create_string(&e.category)?),
-            ];
-            for k in e.keys.iter().take(2) {
-                out.push(Value::String(lua.create_string(k)?));
+            let mut out = Vec::new();
+            match row {
+                Row::Header(h) => out.push(Value::String(lua.create_string(h)?)),
+                Row::Command(c) => {
+                    let name = &kb.entries[*c].name;
+                    out.push(Value::String(lua.create_string(name)?));
+                    for k in kb.keys_of(name) {
+                        out.push(Value::String(lua.create_string(k)?));
+                    }
+                }
             }
             Ok(MultiValue::from_iter(out))
         })?,
@@ -480,16 +484,20 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             Ok(if ok { Some(1) } else { None })
         })?,
     )?;
-    // `RunBinding(command)`, as `CinematicFrame.xml:42` passes SCREENSHOT through: a host
-    // command's action is engine-side, so this queues it and the app runs it in the same frame.
+    // `RunBinding(command[, "up"])` (`0x4b8180`): the command's body through `RunCommand`
+    // (`0x4b81e0`), a release when the second argument is `"up"` in any case (`0x4b81c5`), else a
+    // press. Not a hardware event, so the movement functions' gate refuses unless a key's own
+    // body is already running.
     lua.globals().set(
         "RunBinding",
-        lua.create_function(|lua, command: String| {
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            let name = command.to_ascii_uppercase();
-            if model.keybinds.by_name.contains_key(&name) {
-                model.keybinds.requests.push(KeybindRequest::Run(name));
-            }
+        lua.create_function(|lua, (command, state): (Value, Option<Value>)| {
+            let command =
+                super::binding_abi::string_arg(lua, command, "Usage: RunBinding(\"COMMAND\")")?;
+            let up = state
+                .as_ref()
+                .and_then(|v| super::binding_abi::optional_string(lua, v))
+                .is_some_and(|s| s.eq_ignore_ascii_case("up"));
+            run_command(lua, &command, !up)?;
             Ok(())
         })?,
     )?;
@@ -499,10 +507,8 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             let model = lua.app_data_mut::<Model>().expect("model app_data");
             let kb = &model.keybinds;
             let mut out = Vec::new();
-            if let Some(&i) = kb.by_name.get(&command.to_ascii_uppercase()) {
-                for k in kb.entries[i].keys.iter().take(2) {
-                    out.push(Value::String(lua.create_string(k)?));
-                }
+            for k in kb.keys_of(&command).take(2) {
+                out.push(Value::String(lua.create_string(k)?));
             }
             Ok(MultiValue::from_iter(out))
         })?,
@@ -514,10 +520,10 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             let key = key.to_ascii_uppercase();
             let name = model
                 .keybinds
-                .entries
+                .live
                 .iter()
-                .find(|e| e.keys.iter().any(|k| k == &key))
-                .map(|e| e.name.as_str())
+                .find(|(k, _)| k == &key)
+                .map(|(_, c)| c.as_str())
                 .unwrap_or("");
             lua.create_string(name)
         })?,
@@ -545,68 +551,68 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             Ok(model.keybinds.current_set)
         })?,
     )?;
-    lua.globals().set(
-        "BenillaCharacterBindingsExist",
-        lua.create_function(|lua, ()| {
-            let model = lua.app_data_mut::<Model>().expect("model app_data");
-            Ok(model.keybinds.stored[1].is_some())
-        })?,
-    )?;
-    lua.globals().set(
-        "BenillaBindCapture",
-        lua.create_function(|lua, armed: Option<bool>| {
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.keybinds.capture_armed = armed.unwrap_or(false);
-            Ok(())
-        })?,
-    )
+    Ok(())
 }
 
 #[cfg(test)]
 mod tests {
-    use super::KeybindCommand;
-    use crate::script::keybind::KeybindRequest;
+    use super::{parse_bindings_wtf, KeybindRequest};
+    use crate::bindings_xml::parse;
     use crate::script::UiScript;
 
+    /// Three commands in the reference's shape, bodies counting their runs, and their defaults.
+    const CORE: &str = r#"<Bindings>
+        <Binding name="MOVEFORWARD" runOnUp="true" header="MOVEMENT">
+            FWD_LAST = keystate
+        </Binding>
+        <Binding name="JUMP">JUMPS = (JUMPS or 0) + 1</Binding>
+        <Binding name="CAMERAZOOMIN" header="CAMERA">ZOOMS = (ZOOMS or 0) + 1</Binding>
+    </Bindings>"#;
+    const DEFAULTS: &str = "bind W MOVEFORWARD\r\nbind UP MOVEFORWARD\r\nbind SPACE JUMP\r\n\
+                            bind NUMPAD0 JUMP\r\nbind MOUSEWHEELUP CAMERAZOOMIN\r\n";
+
     fn script() -> UiScript {
         let mut s = UiScript::new().unwrap();
-        s.register_bindings(&[
-            KeybindCommand {
-                name: "MOVEFORWARD",
-                category: "BINDING_HEADER_MOVEMENT",
-                run_on_up: true,
-                default1: Some("W"),
-                default2: Some("UP"),
-            },
-            KeybindCommand {
-                name: "JUMP",
-                category: "BINDING_HEADER_MOVEMENT",
-                run_on_up: false,
-                default1: Some("SPACE"),
-                default2: Some("NUMPAD0"),
-            },
-            KeybindCommand {
-                name: "CAMERAZOOMIN",
-                category: "BINDING_HEADER_CAMERA",
-                run_on_up: false,
-                default1: Some("MOUSEWHEELUP"),
-                default2: None,
-            },
-        ]);
+        s.set_default_bindings(parse_bindings_wtf(DEFAULTS));
+        s.load_binding_set(1);
+        s.register_bindings(&parse(CORE).unwrap());
         s
     }
 
+    /// Every row `GetBinding` answers, each as its values in order.
+    fn rows(s: &UiScript) -> Vec<Vec<String>> {
+        s.eval(
+            "local out = {} \
+             for i = 1, GetNumBindings() do out[i] = { GetBinding(i) } end \
+             return out",
+        )
+        .unwrap()
+    }
+
+    fn row(values: &[&str]) -> Vec<String> {
+        values.iter().map(|v| v.to_string()).collect()
+    }
+
     #[test]
-    fn the_table_reads_like_the_reference() {
+    fn the_list_reads_like_the_reference() {
         let s = script();
-        assert_eq!(s.eval::<usize>("return GetNumBindings()").unwrap(), 3);
-        // Command, category, key1, key2 (not 1.12's three values), the defaults seeded live.
+        // A header row answers its name alone; a command, its name and then every key, no
+        // category (`0x4b7f60`).
+        assert_eq!(
+            rows(&s),
+            [
+                row(&["HEADER_MOVEMENT"]),
+                row(&["MOVEFORWARD", "W", "UP"]),
+                row(&["JUMP", "SPACE", "NUMPAD0"]),
+                row(&["HEADER_CAMERA"]),
+                row(&["CAMERAZOOMIN", "MOUSEWHEELUP"]),
+            ]
+        );
+        // Every key, not two.
+        s.run(r#"SetBinding("F", "JUMP")"#).unwrap();
+        assert_eq!(rows(&s)[2], row(&["JUMP", "SPACE", "NUMPAD0", "F"]));
         assert!(s
-            .eval::<bool>(
-                r#"local c, cat, k1, k2 = GetBinding(1)
-                   return c == "MOVEFORWARD" and cat == "BINDING_HEADER_MOVEMENT"
-                      and k1 == "W" and k2 == "UP""#
-            )
+            .eval::<bool>("return GetBinding(0) == nil and GetBinding(6) == nil")
             .unwrap());
         assert_eq!(
             s.eval::<String>(r#"return GetBindingAction("NUMPAD0")"#)
@@ -614,12 +620,23 @@ mod tests {
             "JUMP"
         );
         assert_eq!(
-            s.eval::<String>(r#"return GetBindingAction("F")"#).unwrap(),
+            s.eval::<String>(r#"return GetBindingAction("G")"#).unwrap(),
             "",
             "an unbound key reads as the empty command, like the client"
         );
     }
 
+    /// The core file is read as the reference reads it: a first row with no header files under
+    /// none, where an addon's opens a row of its own name (the deviation on `register`).
+    #[test]
+    fn the_core_file_opens_no_header_of_its_own() {
+        let s = UiScript::new().unwrap();
+        s.register_bindings(
+            &parse(r#"<Bindings><Binding name="A">x()</Binding></Bindings>"#).unwrap(),
+        );
+        assert_eq!(rows(&s), [row(&["A"])]);
+    }
+
     #[test]
     fn set_binding_steals_and_refuses_only_a_key_string_that_is_not_a_key() {
         let s = script();
@@ -643,6 +660,16 @@ mod tests {
                 .unwrap(),
             ""
         );
+        // The command is never read (`0x4b7490`): a name no file declared is stored and
+        // answered.
+        assert!(s
+            .eval::<bool>(r#"return SetBinding("CTRL-Y", "TOGGLESTATS") == 1"#)
+            .unwrap());
+        assert_eq!(
+            s.eval::<String>(r#"return GetBindingAction("CTRL-Y")"#)
+                .unwrap(),
+            "TOGGLESTATS"
+        );
         // The wheel binds to a `runOnUp` command: `0x4b7490` never reads the command.
         assert!(s
             .eval::<bool>(r#"return SetBinding("SHIFT-MOUSEWHEELUP", "MOVEFORWARD") == 1"#)
@@ -713,6 +740,10 @@ mod tests {
             s.eval::<String>(r#"return GetBindingAction("F")"#).unwrap(),
             ""
         );
+        assert_eq!(
+            s.eval::<String>(r#"return GetBindingAction("W")"#).unwrap(),
+            "MOVEFORWARD"
+        );
         assert_eq!(s.current_binding_set(), 2);
         // Cancel reloads the saved character set.
         s.run("LoadBindings(2)").unwrap();
@@ -730,14 +761,14 @@ mod tests {
     #[test]
     fn an_addons_bindings_xml_registers_as_ordinary_rows() {
         let mut s = script();
-        let parsed = crate::bindings_xml::parse(
+        let parsed = parse(
             r#"<Bindings>
                 <Binding name="PROBEHOLD" runOnUp="true" header="PROBE">
-                    if ( keystate == "down" ) then Down(); else Up(); end
+                    PROBE_LAST = keystate
                 </Binding>
-                <Binding name="PROBEEDGE">Edge();</Binding>
+                <Binding name="PROBEEDGE">PROBE_EDGE = 1</Binding>
                 <Binding name="PROBEHIDDEN" hidden="true">Hidden();</Binding>
-                <Binding name="MOVEFORWARD">Hijack();</Binding>
+                <Binding name="MOVEFORWARD">HIJACKED = 1</Binding>
             </Bindings>"#,
         )
         .expect("well-formed");
@@ -748,28 +779,27 @@ mod tests {
             "registration must move the generation — it is the app's re-derive-dispatch signal"
         );
 
-        // Three host rows and two addon rows: the addon's `MOVEFORWARD` is skipped and
+        // Its header row, then two commands: the addon's `MOVEFORWARD` is skipped and
         // `PROBEHIDDEN` is not listed.
-        assert_eq!(s.eval::<usize>("return GetNumBindings()").unwrap(), 5);
-        assert!(s
-            .eval::<bool>(
-                r#"local c, cat, k1 = GetBinding(4)
-                   return c == "PROBEHOLD" and cat == "BINDING_HEADER_PROBE" and k1 == nil"#
-            )
-            .unwrap());
-        assert!(
-            s.eval::<bool>(
-                r#"local c, cat = GetBinding(5)
-                   return c == "PROBEEDGE" and cat == "BINDING_HEADER_PROBE""#
-            )
-            .unwrap(),
-            "a row with no header of its own belongs to the section the last header opened"
+        assert_eq!(s.eval::<usize>("return GetNumBindings()").unwrap(), 8);
+        assert_eq!(
+            rows(&s)[5..],
+            [
+                row(&["HEADER_PROBE"]),
+                row(&["PROBEHOLD"]),
+                row(&["PROBEEDGE"])
+            ]
         );
         assert!(s
             .eval::<bool>(
                 r#"local k1, k2 = GetBindingKey("MOVEFORWARD"); return k1 == "W" and k2 == "UP""#
             )
             .unwrap());
+        assert!(s.execute_binding("MOVEFORWARD", true).unwrap());
+        assert!(
+            s.eval::<bool>("return HIJACKED == nil").unwrap(),
+            "the first definition keeps the name"
+        );
 
         // The hidden row is not enumerated, but binds and is found by key.
         assert!(s
@@ -787,45 +817,45 @@ mod tests {
             s.eval::<String>(r#"return GetBindingAction("H")"#).unwrap(),
             "PROBEHIDDEN"
         );
-        // `runOnUp` never refuses a wheel chord.
-        assert!(s
-            .eval::<bool>(r#"return SetBinding("MOUSEWHEELUP", "PROBEHOLD") == 1"#)
-            .unwrap());
-        assert!(s
-            .eval::<bool>(r#"return SetBinding("MOUSEWHEELDOWN", "PROBEEDGE") == 1"#)
-            .unwrap());
 
-        // A file with no header: its rows' section is the addon's name.
-        let parsed = crate::bindings_xml::parse(
-            r#"<Bindings><Binding name="LIBKEY">Lib();</Binding></Bindings>"#,
+        // A duplicate's header is never read (`0x4b70f1`-`0x4b717e`); a header already in the
+        // list is refused and the row files under the open one (`0x4b71c9`-`0x4b7258`); a hidden
+        // row's header is a row, since the header is written before the hidden test (`0x4b73bc`).
+        let parsed = parse(
+            r#"<Bindings>
+                <Binding name="JUMP" header="DUPLICATE">Dup();</Binding>
+                <Binding name="PROBEAGAIN" header="PROBE">Again();</Binding>
+                <Binding name="PROBEHIDDENHEAD" header="QUIET" hidden="true">Quiet();</Binding>
+            </Bindings>"#,
         )
         .expect("well-formed");
-        s.register_addon_bindings("ProbeLib", &parsed);
-        assert!(s
-            .eval::<bool>(
-                r#"local c, cat = GetBinding(6); return c == "LIBKEY" and cat == "ProbeLib""#
-            )
-            .unwrap());
+        s.register_addon_bindings("ProbeMore", &parsed);
+        assert_eq!(
+            rows(&s)[8..],
+            [row(&["PROBEAGAIN"]), row(&["HEADER_QUIET"])]
+        );
 
-        // Addon rows only, in registration order, hidden included.
-        let bodies = s.addon_binding_bodies();
-        let names: Vec<&str> = bodies.iter().map(|b| b.name.as_str()).collect();
-        assert_eq!(names, ["PROBEHOLD", "PROBEEDGE", "PROBEHIDDEN", "LIBKEY"]);
-        assert!(bodies[0].run_on_up && !bodies[1].run_on_up);
-        assert!(bodies[0].body.contains(r#"keystate == "down""#));
+        // A file with no header opens a row of the addon's name (the deviation on `register`).
+        let parsed = parse(r#"<Bindings><Binding name="LIBKEY">Lib();</Binding></Bindings>"#)
+            .expect("well-formed");
+        s.register_addon_bindings("ProbeLib", &parsed);
+        assert_eq!(
+            rows(&s)[10..],
+            [row(&["HEADER_ProbeLib"]), row(&["LIBKEY"])]
+        );
     }
 
+    /// The PC build's filter on every OS (`0x4b70c3`-`0x4b70e5` against `"windows"`), so the
+    /// stock `platform="mac"` iTunes rows are never commands.
     #[test]
     fn a_binding_for_another_platform_does_not_register() {
         let mut s = script();
-        let parsed = crate::bindings_xml::parse(
+        let parsed = parse(
             r#"<Bindings>
-                <Binding name="PROBEHERE" platform="THIS">Here();</Binding>
-                <Binding name="PROBEELSEWHERE" platform="elsewhere">Elsewhere();</Binding>
+                <Binding name="PROBEHERE" platform="Windows">Here();</Binding>
+                <Binding name="PROBEMAC" platform="mac" header="ITUNES_REMOTE">Mac();</Binding>
                 <Binding name="PROBEANYWHERE">Anywhere();</Binding>
-            </Bindings>"#
-                .replace("THIS", super::THIS_PLATFORM)
-                .as_str(),
+            </Bindings>"#,
         )
         .unwrap();
         s.register_addon_bindings("Probe", &parsed);
@@ -834,48 +864,105 @@ mod tests {
         assert!(names.iter().any(|n| n == "PROBEHERE"), "{names:?}");
         assert!(names.iter().any(|n| n == "PROBEANYWHERE"), "{names:?}");
         assert!(
-            !names.iter().any(|n| n == "PROBEELSEWHERE"),
+            !names.iter().any(|n| n == "PROBEMAC"),
             "a foreign-platform row registered: {names:?}"
         );
-        assert!(!s
-            .addon_binding_bodies()
-            .iter()
-            .any(|b| b.name == "PROBEELSEWHERE"));
+        assert!(
+            !rows(&s).contains(&row(&["HEADER_ITUNES_REMOTE"])),
+            "the skipped node's header is never read"
+        );
     }
 
+    /// A stored set is the whole key table, as the reference's `bindings-cache.wtf` is: loading it
+    /// replaces the live keys, and a key it lacks is unbound.
     #[test]
-    fn host_seeding_feeds_load_and_the_capture_arm_reads_back() {
+    fn host_seeding_feeds_load() {
         let mut s = script();
-        s.seed_binding_set(1, Some(vec![("JUMP".into(), vec!["F".into()])]));
+        s.seed_binding_set(1, Some(vec![("F".into(), "JUMP".into())]));
         s.load_binding_set(1);
         assert_eq!(
             s.eval::<String>(r#"return GetBindingAction("F")"#).unwrap(),
             "JUMP"
         );
-        // A command the seed lacks keeps its live keys.
         assert_eq!(
             s.eval::<String>(r#"return GetBindingAction("W")"#).unwrap(),
-            "MOVEFORWARD"
+            ""
         );
-        assert!(!s.bind_capture_armed());
-        s.run("BenillaBindCapture(true)").unwrap();
-        assert!(s.bind_capture_armed());
-        s.run("BenillaBindCapture(false)").unwrap();
-        assert!(!s.bind_capture_armed());
         let snap = s.keybind_snapshot();
-        assert_eq!(snap[1].0, "JUMP");
-        assert_eq!(snap[1].1, vec!["F".to_string()]);
+        assert_eq!(snap[1], ("JUMP".to_string(), vec!["F".to_string()]));
+    }
+
+    /// The `.wtf` reader (`0x4b6140`): CR or LF ends a line, `bind ` opens one in any case, the key
+    /// runs to the next space and the command is the rest; `SetBinding` then refuses a bad key and
+    /// a later line steals an earlier one's key.
+    #[test]
+    fn a_bindings_wtf_reads_as_the_reference_reads_it() {
+        let pairs = parse_bindings_wtf(
+            "bind W MOVEFORWARD\r\nBIND UP MOVEFORWARD\n# a note\r\nbound X Y\r\n\
+             bind SCROLLLOCK JUMP\r\nbind SPACE JUMP\r\nbind SPACE SITORSTAND\r\n",
+        );
+        assert_eq!(pairs.len(), 5, "{pairs:?}");
+        let mut s = UiScript::new().unwrap();
+        s.set_default_bindings(pairs);
+        assert_eq!(
+            s.default_bindings(),
+            [
+                ("W".to_string(), "MOVEFORWARD".to_string()),
+                ("UP".to_string(), "MOVEFORWARD".to_string()),
+                ("SPACE".to_string(), "SITORSTAND".to_string()),
+            ]
+        );
+    }
+
+    /// `RunBinding(command[, "up"])` runs the body through `RunCommand` in the call
+    /// (`0x4b8180`-`0x4b81e0`): `keystate` set for the run and nil after (`0x4b7c42`), a release
+    /// only for a `runOnUp` command (`0x4b7bf1`), an unknown name a no-op, no name an error.
+    #[test]
+    fn run_binding_runs_the_body_in_the_call() {
+        let s = script();
+        s.run(r#"RunBinding("JUMP") RunBinding("JUMP", "up") RunBinding("NOSUCHCOMMAND")"#)
+            .unwrap();
+        assert_eq!(s.eval::<i64>("return JUMPS").unwrap(), 1);
+        s.run(r#"RunBinding("moveforward")"#).unwrap();
+        assert_eq!(s.eval::<String>("return FWD_LAST").unwrap(), "down");
+        s.run(r#"RunBinding("MOVEFORWARD", "UP")"#).unwrap();
+        assert_eq!(s.eval::<String>("return FWD_LAST").unwrap(), "up");
+        assert!(s.eval::<bool>("return keystate == nil").unwrap());
+        let err = s.run("RunBinding()").unwrap_err().to_string();
+        assert!(err.contains(r#"Usage: RunBinding("COMMAND")"#), "{err}");
+        // Nested, the inner run's nil is what the outer body sees after it: nothing restores.
+        s.register_bindings(
+            &parse(
+                r#"<Bindings><Binding name="OUTER">
+                    RunBinding("JUMP") OUTER_AFTER = tostring(keystate)
+                </Binding></Bindings>"#,
+            )
+            .unwrap(),
+        );
+        assert!(s.execute_binding("OUTER", true).unwrap());
+        assert_eq!(s.eval::<String>("return OUTER_AFTER").unwrap(), "nil");
+    }
+
+    /// `execute_binding` is `ExecuteBinding`'s `RunCommand`: the press runs, the release runs only
+    /// a `runOnUp` body, and nothing ran answers false.
+    #[test]
+    fn execute_binding_answers_whether_a_body_ran() {
+        let s = script();
+        assert!(s.execute_binding("JUMP", true).unwrap());
+        assert!(!s.execute_binding("JUMP", false).unwrap());
+        assert!(s.execute_binding("MOVEFORWARD", false).unwrap());
+        assert!(!s.execute_binding("TOGGLESTATS", true).unwrap());
+        assert_eq!(s.eval::<i64>("return JUMPS").unwrap(), 1);
     }
 }
 
 #[cfg(test)]
 mod addon_persistence_tests {
-    use crate::bindings_xml::AddonBinding;
-    use crate::script::keybind::KeybindCommand;
+    use crate::bindings_xml::Binding;
     use crate::script::UiScript;
 
-    fn binding(name: &str) -> AddonBinding {
-        AddonBinding {
+    fn binding(name: &str) -> Binding {
+        Binding {
             name: name.into(),
             header: None,
             run_on_up: false,
@@ -885,73 +972,48 @@ mod addon_persistence_tests {
         }
     }
 
+    fn keys(s: &UiScript, name: &str) -> Vec<String> {
+        s.keybind_snapshot()
+            .into_iter()
+            .find(|(n, _)| n == name)
+            .map(|(_, k)| k)
+            .unwrap_or_default()
+    }
+
     /// The stored set is seeded at boot, before the addon's `Bindings.xml` registers at world
-    /// entry, so its row has no position to land in.
+    /// entry; the keys are their own table, so the chord is there when the command arrives.
     #[test]
     fn an_addon_binding_restores_its_stored_chord_registered_after_the_seed() {
         let mut s = UiScript::new().unwrap();
-        s.register_bindings(&[KeybindCommand {
-            name: "JUMP",
-            category: "BINDING_HEADER_MOVEMENT",
-            run_on_up: false,
-            default1: Some("SPACE"),
-            default2: None,
-        }]);
         s.seed_binding_set(
             1,
             Some(vec![
-                ("JUMP".into(), vec!["SPACE".into()]),
-                ("MYADDONTOGGLE".into(), vec!["CTRL-X".into()]),
+                ("SPACE".into(), "JUMP".into()),
+                ("CTRL-X".into(), "MYADDONTOGGLE".into()),
             ]),
         );
         s.load_binding_set(1);
-
         s.register_addon_bindings("MyAddon", &[binding("MYADDONTOGGLE")]);
-
-        let bound = s
-            .keybind_snapshot()
-            .into_iter()
-            .find(|(n, _)| n == "MYADDONTOGGLE")
-            .expect("the addon's command is in the table");
-        assert_eq!(
-            bound.1,
-            vec!["CTRL-X".to_string()],
-            "the stored chord came back, though the seed ran before the addon registered"
-        );
+        assert_eq!(keys(&s, "MYADDONTOGGLE"), ["CTRL-X"]);
+        assert!(s.execute_binding("MYADDONTOGGLE", true).unwrap());
     }
 
     #[test]
     fn an_addon_binding_with_no_stored_chord_registers_unbound() {
         let mut s = UiScript::new().unwrap();
-        s.seed_binding_set(1, Some(vec![("SOMETHINGELSE".into(), vec!["Q".into()])]));
+        s.seed_binding_set(1, Some(vec![("Q".into(), "SOMETHINGELSE".into())]));
         s.load_binding_set(1);
         s.register_addon_bindings("MyAddon", &[binding("MYADDONTOGGLE")]);
-        let bound = s
-            .keybind_snapshot()
-            .into_iter()
-            .find(|(n, _)| n == "MYADDONTOGGLE")
-            .expect("registered");
-        assert!(bound.1.is_empty());
+        assert!(keys(&s, "MYADDONTOGGLE").is_empty());
     }
 
     #[test]
     fn the_character_set_wins_for_an_addon_command() {
         let mut s = UiScript::new().unwrap();
-        s.seed_binding_set(
-            1,
-            Some(vec![("MYADDONTOGGLE".into(), vec!["CTRL-X".into()])]),
-        );
-        s.seed_binding_set(
-            2,
-            Some(vec![("MYADDONTOGGLE".into(), vec!["ALT-Z".into()])]),
-        );
+        s.seed_binding_set(1, Some(vec![("CTRL-X".into(), "MYADDONTOGGLE".into())]));
+        s.seed_binding_set(2, Some(vec![("ALT-Z".into(), "MYADDONTOGGLE".into())]));
         s.load_binding_set(2);
         s.register_addon_bindings("MyAddon", &[binding("MYADDONTOGGLE")]);
-        let bound = s
-            .keybind_snapshot()
-            .into_iter()
-            .find(|(n, _)| n == "MYADDONTOGGLE")
-            .expect("registered");
-        assert_eq!(bound.1, vec!["ALT-Z".to_string()]);
+        assert_eq!(keys(&s, "MYADDONTOGGLE"), ["ALT-Z"]);
     }
 }
diff --git a/crates/benilla-ui/src/script/loot.rs b/crates/benilla-ui/src/script/loot.rs
index 89fa132d..31cad993 100644
--- a/crates/benilla-ui/src/script/loot.rs
+++ b/crates/benilla-ui/src/script/loot.rs
@@ -72,8 +72,16 @@ pub struct LootState {
     /// dropdown labels "Group N" (`LootFrame.lua:197-213`). A `None` (an empty slot, or a name not
     /// yet resolved) answers nil.
     pub master_candidates: Vec<Option<String>>,
+    /// The loot source (`[0xb71b48]`) resolves as a unit object (`0x468460`, typemask 8): a
+    /// corpse, not a chest, a bobber or an item. `SetLootPortrait` bakes it under the token
+    /// [`LOOT_PORTRAIT_UNIT`].
+    pub source_unit: bool,
 }
 
+/// The portrait key `SetLootPortrait` binds a texture to, which the app bakes from the loot
+/// source. Upper case, so no `SetPortraitTexture` token, which is lowercased, can name it.
+pub const LOOT_PORTRAIT_UNIT: &str = "LOOT";
+
 impl super::UiScript {
     /// Push (or clear, with `None`) the open loot.
     pub fn set_loot(&mut self, state: Option<LootState>) {
@@ -108,6 +116,28 @@ impl super::UiScript {
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     let g = lua.globals();
 
+    // SetLootPortrait(texture) (`0x4c2b40`): the loot source's 3D portrait, the unit-frame bake
+    // (`0x524f60`), and the number 1; a source that is no unit object, or no loot, clears the
+    // texture (`0x4c2c0d`) and answers nil. A non-Texture raises the member prologue's errors. No
+    // stock caller: `LootFrame.lua` paints its own portrait art.
+    g.set(
+        "SetLootPortrait",
+        lua.create_function(|lua, texture: Value| {
+            let rh = super::region::this_texture(lua, &texture)?;
+            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+            if !model.loot.as_ref().is_some_and(|l| l.source_unit) {
+                super::region::clear_texture(&mut model, rh);
+                return Ok(Value::Nil);
+            }
+            let data = model.region_data.entry(rh).or_default();
+            data.portrait_unit = Some(LOOT_PORTRAIT_UNIT.to_string());
+            data.texture = None;
+            data.fill = None;
+            data.circular = true;
+            Ok(Value::Integer(1))
+        })?,
+    )?;
+
     // GetNumLootItems(): cleared slots included, so it holds still while a window is open.
     g.set(
         "GetNumLootItems",
@@ -245,18 +275,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.set_named_registry_value(REG_LOOTBUTTON_METHODS, m)?;
     }
 
-    // BenillaTakeLootSlot(slot): not a 1.12 verb. It queues the row click's take by 1-based row,
-    // which has no Lua binding in the reference: only `CLootButton::OnClick 0x4c1820` reaches the
-    // dispatcher `0x4c2790` with flag 0.
-    g.set(
-        "BenillaTakeLootSlot",
-        lua.create_function(|lua, slot: u32| {
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.loot_picks.push(slot);
-            Ok(())
-        })?,
-    )?;
-
     // LootSlot(slot): the LOOT_BIND confirmation only (`0x4c2e70`: `luaL_checknumber(1)`,
     // `dec eax`, `0x4c2790(slot, 1)`, whose arm at `0x4c27c0` returns unless the slot is the
     // pending confirm, `cmp edi, [0x847cec]`). On an ordinary row it does nothing.
@@ -318,8 +336,61 @@ mod tests {
     use super::{LootRow, LootState};
     use crate::script::UiScript;
 
+    /// The region data behind a named texture: its portrait key and file.
+    fn portrait_of(s: &UiScript, name: &str) -> (Option<String>, Option<String>) {
+        let model = s.model_ref();
+        let id = model.region_names[name];
+        let rh = *model.id_to_region.get(&id).expect("a region");
+        let data = &model.region_data[&rh];
+        (data.portrait_unit.clone(), data.texture.clone())
+    }
+
+    /// `SetLootPortrait` (`0x4c2b40`): a unit source binds the loot portrait and answers 1;
+    /// anything else clears the texture and answers nil.
+    #[test]
+    fn loot_portrait_binds_a_unit_source_and_clears_otherwise() {
+        let mut s = UiScript::new().unwrap();
+        s.run(
+            r#"local f = CreateFrame("Frame", "LootHost", UIParent)
+               f:CreateTexture("LootTex")
+               LootTex:SetTexture("Interface\TargetingFrame\TargetDead")"#,
+        )
+        .unwrap();
+        assert!(s
+            .eval::<bool>("return SetLootPortrait(LootTex) == nil")
+            .unwrap());
+        assert_eq!(portrait_of(&s, "LootTex"), (None, None), "no loot: cleared");
+
+        s.run(r#"LootTex:SetTexture("Interface\TargetingFrame\TargetDead")"#)
+            .unwrap();
+        s.set_loot(Some(LootState {
+            source_unit: true,
+            ..loot()
+        }));
+        assert_eq!(s.eval::<i64>("return SetLootPortrait(LootTex)").unwrap(), 1);
+        assert_eq!(
+            portrait_of(&s, "LootTex"),
+            (Some(super::LOOT_PORTRAIT_UNIT.to_string()), None)
+        );
+
+        s.set_loot(Some(loot()));
+        assert!(s
+            .eval::<bool>("return SetLootPortrait(LootTex) == nil")
+            .unwrap());
+        assert_eq!(portrait_of(&s, "LootTex"), (None, None), "a chest: cleared");
+
+        let err = s.run("SetLootPortrait(LootHost)").unwrap_err().to_string();
+        assert!(
+            err.contains("Wrong object type for member function"),
+            "{err}"
+        );
+        let err = s.run("SetLootPortrait()").unwrap_err().to_string();
+        assert!(err.contains("non-table object"), "{err}");
+    }
+
     fn loot() -> LootState {
         LootState {
+            source_unit: false,
             master_candidates: Vec::new(),
             rows: vec![
                 Some(LootRow {
@@ -527,16 +598,6 @@ mod tests {
         assert!(s.take_loot_picks().is_empty());
     }
 
-    #[test]
-    fn take_loot_slot_queues_picks() {
-        let mut s = UiScript::new().unwrap();
-        s.set_loot(Some(loot()));
-        s.run("BenillaTakeLootSlot(1)").unwrap(); // coin
-        s.run("BenillaTakeLootSlot(2)").unwrap(); // item
-        assert_eq!(s.take_loot_picks(), vec![1, 2]);
-        assert!(s.take_loot_picks().is_empty(), "drained");
-    }
-
     /// In the pick queue `LootSlot` would loot any row an addon named, which the reference refuses.
     #[test]
     fn loot_slot_queues_confirms_not_picks() {
diff --git a/crates/benilla-ui/src/script/macros.rs b/crates/benilla-ui/src/script/macros.rs
index 9f5d2977..4ecef239 100644
--- a/crates/benilla-ui/src/script/macros.rs
+++ b/crates/benilla-ui/src/script/macros.rs
@@ -36,6 +36,16 @@ pub struct MacroView {
     pub local_only: bool,
 }
 
+/// A macro record's cached cast, the reference's `([rec+0x564], [rec+0x568])` pair (`0x4efe00`):
+/// the bound spell and the book it resolved from, which the app derives.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct MacroBinding {
+    /// The bound spell id; 0 for none, -1 for a `/cast` that did not resolve.
+    pub spell: i32,
+    /// The spell came from the pet's book (`0x4b3b51` writes 1), not the player's.
+    pub pet_book: bool,
+}
+
 /// The macro table: the account and character lists.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct MacroState {
@@ -135,6 +145,11 @@ impl super::UiScript {
         self.model_mut().macros.clone()
     }
 
+    /// Push every macro's cached cast by 1-based index, replacing the last push.
+    pub fn set_macro_bindings(&mut self, bindings: std::collections::HashMap<u32, MacroBinding>) {
+        self.model_mut().macro_bindings = bindings;
+    }
+
     /// Whether a script changed the table since the last call; the app then saves it and fires
     /// `UPDATE_MACROS` (`0x452460`).
     pub fn take_macros_dirty(&mut self) -> bool {
@@ -621,11 +636,6 @@ mod tests {
                 texture: Some("Interface\\Icons\\Ability_Ambush".into()),
             }))
         );
-        assert_eq!(
-            s.eval::<(String, i64)>("local k, i = GetCursorInfo() return k, i")
-                .unwrap(),
-            ("macro".to_string(), 1)
-        );
         assert!(
             !s.eval::<bool>("return PickupMacro(1)").unwrap(),
             "a macro button is a source, never a drop target"
diff --git a/crates/benilla-ui/src/script/mail.rs b/crates/benilla-ui/src/script/mail.rs
index 99adb517..eccf7a43 100644
--- a/crates/benilla-ui/src/script/mail.rs
+++ b/crates/benilla-ui/src/script/mail.rs
@@ -97,6 +97,20 @@ pub struct StationeryView {
     pub texture: String,
 }
 
+/// One `Package.dbc` row, as `GetPackageInfo` answers it.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PackageView {
+    /// The row id, which `SelectPackage` stores and `CMSG_SEND_MAIL` carries.
+    pub id: u32,
+    /// The localized name (field 3 on).
+    pub name: String,
+    /// The icon as a full path: `StringLookups.dbc` row 3's folder, `\` and field 1
+    /// (`0x4ae4ab`-`0x4ae4eb`).
+    pub icon: String,
+    /// Field 2, in copper.
+    pub cost: i32,
+}
+
 /// A drained `SendMail` intent, which the app turns into `CMSG_SEND_MAIL`.
 #[derive(Clone, Debug, PartialEq)]
 pub struct MailSendRequest {
@@ -110,6 +124,27 @@ pub struct MailSendRequest {
     /// The attached item's `(bag, 1-based slot)`; the app resolves its guid when the send fires,
     /// as the reference re-reads the slot then.
     pub item: Option<(i64, u32)>,
+    /// The selected `Package.dbc` id, sent only with an attached item (`0x4ae8f3`).
+    pub package: u32,
+}
+
+/// `0x4acdc0`'s clears: the attachment, whose lock it lifts (`0x495420`, firing
+/// `ITEM_LOCK_CHANGED`), then money, COD, stationery and package. Returns the lock event to fire.
+fn clear_compose(model: &mut Model) -> Option<(String, Vec<super::ScriptValue>)> {
+    let lock = model.mail_send_item.take().map(|item| {
+        (
+            "ITEM_LOCK_CHANGED".to_string(),
+            vec![
+                super::ScriptValue::Int(item.bag),
+                super::ScriptValue::Int(i64::from(item.slot)),
+            ],
+        )
+    });
+    model.mail_send_money = 0;
+    model.mail_send_cod = 0;
+    model.mail_stationery = 0;
+    model.mail_package = 0;
+    lock
 }
 
 impl super::UiScript {
@@ -172,27 +207,37 @@ impl super::UiScript {
             money: model.mail_send_money,
             cod: model.mail_send_cod,
             item,
+            package: model.mail_package,
         })
     }
 
-    /// The reference's compose-tab reset (`0x4acdc0`): clear the attachment, money and COD, then
-    /// fire `SEND_MAIL_MONEY_CHANGED`, `SEND_MAIL_COD_CHANGED` and `MAIL_SEND_SUCCESS` in that
-    /// order. The events must follow the clear, as `SendMailFrame_Reset` re-reads
-    /// `GetSendMailItem`. `MAIL_SEND_SUCCESS` means the form is clean: opening a mailbox fires it.
+    /// The reference's compose-tab reset (`0x4acdc0(1)`), run on mailbox open and a sent mail:
+    /// clear the attachment (its lock lifted), money, COD, stationery and package, then fire
+    /// `SEND_MAIL_MONEY_CHANGED`, `SEND_MAIL_COD_CHANGED` and `MAIL_SEND_SUCCESS` in that order.
+    /// The events must follow the clear, as `SendMailFrame_Reset` re-reads `GetSendMailItem` and
+    /// selects stationery row 1. `MAIL_SEND_SUCCESS` means the form is clean: opening a mailbox
+    /// fires it.
     pub fn reset_compose_tab(&mut self) {
-        {
-            let mut model = self.model_mut();
-            model.mail_send_item = None;
-            model.mail_send_money = 0;
-            model.mail_send_cod = 0;
-        }
+        let lock = clear_compose(&mut self.model_mut());
         // Fired now, not queued: the order against the caller's `MAIL_SHOW`/`MAIL_FAILED` matters.
+        if let Some((event, args)) = lock {
+            self.fire_event(&event, args);
+        }
         // One literal call each, as the event census (`ui_script::reference_ui`) reads them.
         self.fire_event("SEND_MAIL_MONEY_CHANGED", Vec::new()); // 0x4ace14
         self.fire_event("SEND_MAIL_COD_CHANGED", Vec::new()); // 0x4ace1e
         self.fire_event("MAIL_SEND_SUCCESS", Vec::new()); // 0x4ace28
     }
 
+    /// The close core's silent reset (`0x4acdc0(0)`, from `0x4acd50`): the same clears, and only
+    /// the attachment's `ITEM_LOCK_CHANGED`, which `0x495420` fires on either leg.
+    pub fn reset_compose_tab_silently(&mut self) {
+        let lock = clear_compose(&mut self.model_mut());
+        if let Some((event, args)) = lock {
+            self.fire_event(&event, args);
+        }
+    }
+
     /// `SendMail`'s abort when the attached item left its slot (`ERR_ITEM_NOT_FOUND`, no packet,
     /// `MAIL_SEND_INFO_UPDATE` at `0x4ae98d`): drop the attachment, keep the money and COD.
     pub fn drop_send_mail_item(&mut self) {
@@ -209,10 +254,9 @@ impl super::UiScript {
         self.model_mut().mail_stationeries = list;
     }
 
-    /// Clear the stationery selection, as the reference does on mailbox open and close
-    /// (`0x4ace07`).
-    pub fn clear_stationery(&mut self) {
-        self.model_mut().mail_stationery = 0;
+    /// Push `Package.dbc`'s rows, in file order.
+    pub fn set_mail_packages(&mut self, packages: Vec<PackageView>) {
+        self.model_mut().mail_packages = packages;
     }
 
     /// Push `HasNewMail()`'s answer, independent of any open mailbox. The app sets it before each
@@ -689,6 +733,72 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
+    // ClearSendMail() (`0x4adee0`): the compose reset with its events (`0x4acdc0(1)`), queued in
+    // its order; zero returns.
+    g.set(
+        "ClearSendMail",
+        lua.create_function(|lua, ()| {
+            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+            let lock = clear_compose(&mut model);
+            model.pending_events.extend(lock);
+            for event in [
+                "SEND_MAIL_MONEY_CHANGED",
+                "SEND_MAIL_COD_CHANGED",
+                "MAIL_SEND_SUCCESS",
+            ] {
+                model.pending_events.push((event.to_string(), Vec::new()));
+            }
+            Ok(MultiValue::new())
+        })?,
+    )?;
+
+    // GetNumPackages() (`0x4ae430`): `Package.dbc`'s raw row count, unfiltered.
+    g.set(
+        "GetNumPackages",
+        lua.create_function(|lua, ()| {
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            Ok(model.mail_packages.len() as i64)
+        })?,
+    )?;
+
+    // GetPackageInfo(index) (`0x4ae450`) → name, icon, cost for a 1-based row; out of range it
+    // pushes nil, nil, 0 (`0x4ae525`), and a non-number raises.
+    g.set(
+        "GetPackageInfo",
+        lua.create_function(|lua, index: Value| {
+            let index =
+                crate::script::binding_abi::number_arg(lua, index, "Usage: GetPackageInfo(index)")?;
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            let row = usize::try_from(index.wrapping_sub(1))
+                .ok()
+                .and_then(|i| model.mail_packages.get(i));
+            Ok(match row {
+                Some(row) => MultiValue::from_vec(vec![
+                    Value::String(lua.create_string(&row.name)?),
+                    Value::String(lua.create_string(&row.icon)?),
+                    Value::Integer(i64::from(row.cost)),
+                ]),
+                None => MultiValue::from_vec(vec![Value::Nil, Value::Nil, Value::Integer(0)]),
+            })
+        })?,
+    )?;
+
+    // SelectPackage(index) (`0x4ae550`): stores the 1-based row's id, or 0 out of range
+    // (`0x4adc90`); a non-number raises. Zero returns.
+    g.set(
+        "SelectPackage",
+        lua.create_function(|lua, index: Value| {
+            let index =
+                crate::script::binding_abi::number_arg(lua, index, "Usage: SelectPackage(index)")?;
+            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+            model.mail_package = usize::try_from(index.wrapping_sub(1))
+                .ok()
+                .and_then(|i| model.mail_packages.get(i))
+                .map_or(0, |row| row.id);
+            Ok(MultiValue::new())
+        })?,
+    )?;
+
     Ok(())
 }
 
@@ -1077,6 +1187,112 @@ mod tests {
         assert_eq!((req.money, req.cod, req.item), (0, 0, None));
     }
 
+    /// `ClearSendMail()` (`0x4adee0`) is the compose reset with its events, the attachment's lock
+    /// first, then the three in `0x4acdc0`'s order; stationery and package clear with the rest.
+    #[test]
+    fn clear_send_mail_resets_the_form_and_fires_its_events() {
+        use crate::script::cursor::{CursorItem, CursorPayload};
+        let mut s = UiScript::new().unwrap();
+        select_default_stationery(&mut s);
+        s.set_mail_packages(vec![PackageView {
+            id: 2,
+            name: "Test Package".into(),
+            icon: "Interface\\Icons\\INV_BOX_04".into(),
+            cost: 10,
+        }]);
+        s.run("SelectPackage(1)").unwrap();
+        s.model_mut().cursor = Some(CursorPayload::Item(CursorItem {
+            bar_placeable: true,
+            bag: 0,
+            slot: 3,
+            item_id: 1,
+            texture: None,
+            link: None,
+            count: None,
+            quality: None,
+            equip_slots: Vec::new(),
+        }));
+        s.run("ClickSendMailItemButton() SetSendMailMoney(99) SetSendMailCOD(5)")
+            .unwrap();
+        s.tick(0.0);
+        s.run(
+            r#"FIRED = {}
+               local f = CreateFrame("Frame")
+               for _, e in { "ITEM_LOCK_CHANGED", "SEND_MAIL_MONEY_CHANGED",
+                             "SEND_MAIL_COD_CHANGED", "MAIL_SEND_SUCCESS" } do
+                   f:RegisterEvent(e)
+               end
+               f:SetScript("OnEvent", function() table.insert(FIRED, event) end)"#,
+        )
+        .unwrap();
+        assert_eq!(
+            s.eval::<i64>("local n = function(...) return arg.n end return n(ClearSendMail())")
+                .unwrap(),
+            0
+        );
+        s.tick(0.0);
+        assert_eq!(
+            s.eval::<Vec<String>>("return FIRED").unwrap(),
+            [
+                "ITEM_LOCK_CHANGED",
+                "SEND_MAIL_MONEY_CHANGED",
+                "SEND_MAIL_COD_CHANGED",
+                "MAIL_SEND_SUCCESS"
+            ]
+        );
+        assert!(s
+            .eval::<bool>("return GetSendMailItem() == nil and GetSendMailMoney() == 0")
+            .unwrap());
+        s.run("SendMail('x', 'y', 'z')").unwrap();
+        assert!(s.take_mail_send().is_none(), "the stationery cleared too");
+        select_default_stationery(&mut s);
+        s.run("SendMail('x', 'y', 'z')").unwrap();
+        assert_eq!(s.take_mail_send().map(|r| r.package), Some(0));
+    }
+
+    /// `Package.dbc`'s one shipped row, through the three package verbs (`0x4ae430`, `0x4ae450`,
+    /// `0x4ae550`).
+    #[test]
+    fn packages_list_describe_and_select_by_row() {
+        let mut s = UiScript::new().unwrap();
+        assert_eq!(s.eval::<i64>("return GetNumPackages()").unwrap(), 0);
+        s.set_mail_packages(vec![PackageView {
+            id: 2,
+            name: "Test Package".into(),
+            icon: "Interface\\Icons\\INV_BOX_04".into(),
+            cost: 10,
+        }]);
+        assert_eq!(s.eval::<i64>("return GetNumPackages()").unwrap(), 1);
+        let (name, icon, cost): (String, String, i64) = s.eval("return GetPackageInfo(1)").unwrap();
+        assert_eq!(
+            (name.as_str(), icon.as_str(), cost),
+            ("Test Package", "Interface\\Icons\\INV_BOX_04", 10)
+        );
+        for miss in ["0", "2", "-1"] {
+            assert!(
+                s.eval::<bool>(&format!(
+                    "local a, b, c = GetPackageInfo({miss}) return a == nil and b == nil and c == 0"
+                ))
+                .unwrap(),
+                "{miss}"
+            );
+        }
+        for call in ["GetPackageInfo()", "SelectPackage('x')"] {
+            let err = s.run(call).unwrap_err().to_string();
+            assert!(err.contains("Usage: "), "{call}: {err}");
+        }
+
+        select_default_stationery(&mut s);
+        s.run("SelectPackage(1) SendMail('x', 'y', 'z')").unwrap();
+        assert_eq!(s.take_mail_send().map(|r| r.package), Some(2));
+        s.run("SelectPackage(5) SendMail('x', 'y', 'z')").unwrap();
+        assert_eq!(
+            s.take_mail_send().map(|r| r.package),
+            Some(0),
+            "out of range stores 0"
+        );
+    }
+
     #[test]
     fn clearing_the_mail_empties_it() {
         let mut s = UiScript::new().unwrap();
@@ -1184,7 +1400,7 @@ mod stationery_tests {
         s.run("SelectStationery(1) SendMail(\"Bob\", \"hi\", \"body\")")
             .unwrap();
         assert_eq!(s.take_mail_send().map(|r| r.stationery), Some(41));
-        s.clear_stationery();
+        s.reset_compose_tab_silently();
         s.run("SendMail(\"Bob\", \"hi\", \"body\")").unwrap();
         assert!(s.take_mail_send().is_none());
     }
diff --git a/crates/benilla-ui/src/script/measure.rs b/crates/benilla-ui/src/script/measure.rs
index 1662a9a0..41eb46c1 100644
--- a/crates/benilla-ui/src/script/measure.rs
+++ b/crates/benilla-ui/src/script/measure.rs
@@ -16,6 +16,20 @@ pub trait TextMeasure {
     /// unwrapped width, is what `GetStringWidth` reports. It runs with the model mutably borrowed,
     /// so it must not re-enter Lua.
     fn measure(&mut self, req: &MeasureRequest) -> (f32, f32, f32);
+
+    /// An EditBox's advance table, answered inline as
+    /// [`UiScript::set_editbox_advances`](super::UiScript::set_editbox_advances) answers it a
+    /// frame later: the cumulative widths, the wrapped-row starts and the row pitch, as the draw
+    /// measures them. The box's flush reads it for `OnCursorChanged`, whose position the caret
+    /// leg measures in the call (`0x77da80` → `0x772ae0`). `None`, the default, leaves the table
+    /// to the host.
+    fn editbox_advances(
+        &mut self,
+        req: &super::EditBoxAdvanceRequest,
+    ) -> Option<(Vec<f32>, Vec<usize>, f32)> {
+        let _ = req;
+        None
+    }
 }
 
 /// Measure region `rh` now if a measurer is installed and its stored measure is stale; a current
diff --git a/crates/benilla-ui/src/script/merchant.rs b/crates/benilla-ui/src/script/merchant.rs
index 7593f704..c1878992 100644
--- a/crates/benilla-ui/src/script/merchant.rs
+++ b/crates/benilla-ui/src/script/merchant.rs
@@ -9,6 +9,7 @@
 
 use mlua::{Lua, MultiValue, Value};
 
+use super::binding_abi::number_arg;
 use super::container::UiCursorMode;
 use super::cursor::CursorPayload;
 use super::Model;
@@ -33,13 +34,14 @@ pub struct MerchantItem {
     /// `GetMerchantItemLink`'s answer; `None` while in flight and on a buyback row, as 1.12 has no
     /// `GetBuybackItemLink` and the buyback click takes no modifier (`MerchantFrame.lua:358-361`).
     pub link: Option<String>,
-    /// `GetMerchantItemMaxStack`: the template's `stackable`, 1 if it does not stack; `None` while
-    /// in flight.
+    /// The template's `stackable`, `GetMerchantItemMaxStack`'s answer for a row sold singly;
+    /// `None` while in flight and on a buyback row.
     pub max_stack: Option<u32>,
 }
 
-/// An item template's tooltip stat head, resolved per row by the app. The reference's
-/// `GameTooltip:SetMerchantItem` reads these in C++; no 1.12 Lua API carries them.
+/// An item template's tooltip stat head, resolved per row by the app, which `SetMerchantItem` and
+/// `SetBuybackItem` draw while the VM's template is in flight. The reference reads the template in
+/// C++ (`0x534080`); no 1.12 Lua API carries these.
 #[derive(Clone, Copy, Debug, Default, PartialEq)]
 pub struct ItemStatsHead {
     /// 0 poor to 6 artifact; colours the tooltip's name line.
@@ -66,6 +68,15 @@ pub struct ItemStatsHead {
     pub sell_price: u32,
 }
 
+/// Each damaged item's repair cost in copper after the vendor's discount (`0x4faf30`).
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct RepairCosts {
+    /// Equipped items by live inventory id.
+    pub equipped: std::collections::HashMap<u32, u32>,
+    /// Container items by `(bag, slot)`: bags 0-4, the bank vault -1 and bank bags 5-10.
+    pub bags: std::collections::HashMap<(i64, u32), u32>,
+}
+
 /// One open merchant window, pushed whole by the app; `None` means no vendor is open.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct MerchantState {
@@ -94,6 +105,11 @@ impl super::UiScript {
         self.model_mut().repair_all_cost = copper;
     }
 
+    /// Push the repair costs the item tooltip bindings return.
+    pub fn set_repair_costs(&mut self, costs: RepairCosts) {
+        self.model_mut().repair_costs = costs;
+    }
+
     /// Drain the `(row, quantity)` buys `BuyMerchantItem` queued, the row 1-based.
     pub fn take_merchant_buys(&mut self) -> Vec<(u32, u32)> {
         std::mem::take(&mut self.model_mut().merchant_buys)
@@ -226,51 +242,24 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // GetMerchantItemMaxStack(index): nil while in flight or out of range. A right shift-click, or
-    // a left one with the chat box closed, asks it and opens the stack-split spinner only above 1
-    // (`MerchantFrame.lua:313`, `:340`).
+    // GetMerchantItemMaxStack(index) (`0x4fb670`): the template's stack size, or 1 for a row sold
+    // in bundles (`[row+0x18] > 1`) and for every miss: out of range, no vendor, a template in
+    // flight (`0x4fb739`). A right shift-click, or a left one with the chat box closed, asks it and
+    // opens the stack-split spinner only above 1 (`MerchantFrame.lua:313`, `:340`).
     g.set(
         "GetMerchantItemMaxStack",
-        lua.create_function(|lua, index: usize| {
+        lua.create_function(|lua, index: Value| {
+            let index = number_arg(lua, index, "Usage: GetMerchantItemMaxStack(index)")?;
             let model = lua.app_data_ref::<Model>().expect("model app_data");
-            Ok(model
-                .merchant
-                .as_ref()
-                .and_then(|m| index.checked_sub(1).and_then(|n| m.items.get(n)))
+            // Signed, as 1.12.1 reads both.
+            let max_stack = usize::try_from(index)
+                .ok()
+                .and_then(|i| i.checked_sub(1))
+                .and_then(|n| model.merchant.as_ref()?.items.get(n))
+                .filter(|it| it.quantity as i32 <= 1)
                 .and_then(|it| it.max_stack)
-                .map_or(Value::Nil, |n| Value::Integer(i64::from(n))))
-        })?,
-    )?;
-
-    // BenillaGetMerchantItemStats(index) → quality, invType, class, subclass, dmgMin, dmgMax,
-    // dmgType, delayMs, armor, block, or nil. Not a 1.12 verb: the reference's tooltip reads the
-    // template in C++ (`SetMerchantItem 0x534080`).
-    g.set(
-        "BenillaGetMerchantItemStats",
-        lua.create_function(|lua, index: usize| {
-            let stats = {
-                let model = lua.app_data_ref::<Model>().expect("model app_data");
-                model
-                    .merchant
-                    .as_ref()
-                    .and_then(|m| index.checked_sub(1).and_then(|n| m.items.get(n)))
-                    .and_then(|it| it.stats)
-            };
-            let Some(s) = stats else {
-                return Ok(MultiValue::from_vec(vec![Value::Nil]));
-            };
-            Ok(MultiValue::from_vec(vec![
-                Value::Integer(i64::from(s.quality)),
-                Value::Integer(i64::from(s.inventory_type)),
-                Value::Integer(i64::from(s.class)),
-                Value::Integer(i64::from(s.subclass)),
-                Value::Number(f64::from(s.dmg_min)),
-                Value::Number(f64::from(s.dmg_max)),
-                Value::Integer(i64::from(s.dmg_type)),
-                Value::Integer(i64::from(s.delay_ms)),
-                Value::Integer(i64::from(s.armor)),
-                Value::Integer(i64::from(s.block)),
-            ]))
+                .map_or(1, |n| n as i32);
+            Ok(i64::from(max_stack))
         })?,
     )?;
 
@@ -404,36 +393,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // BenillaGetBuybackItemStats(index): the buyback hover's stat head, as above.
-    g.set(
-        "BenillaGetBuybackItemStats",
-        lua.create_function(|lua, index: usize| {
-            let stats = {
-                let model = lua.app_data_ref::<Model>().expect("model app_data");
-                model
-                    .merchant
-                    .as_ref()
-                    .and_then(|m| index.checked_sub(1).and_then(|n| m.buyback.get(n)))
-                    .and_then(|it| it.stats)
-            };
-            let Some(s) = stats else {
-                return Ok(MultiValue::from_vec(vec![Value::Nil]));
-            };
-            Ok(MultiValue::from_vec(vec![
-                Value::Integer(i64::from(s.quality)),
-                Value::Integer(i64::from(s.inventory_type)),
-                Value::Integer(i64::from(s.class)),
-                Value::Integer(i64::from(s.subclass)),
-                Value::Number(f64::from(s.dmg_min)),
-                Value::Number(f64::from(s.dmg_max)),
-                Value::Integer(i64::from(s.dmg_type)),
-                Value::Integer(i64::from(s.delay_ms)),
-                Value::Integer(i64::from(s.armor)),
-                Value::Integer(i64::from(s.block)),
-            ]))
-        })?,
-    )?;
-
     g.set(
         "BuybackItem",
         lua.create_function(|lua, index: u32| {
@@ -478,7 +437,11 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "RepairAllItems",
         lua.create_function(|lua, ()| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.repair_all = true;
+            // `0x4fbff0`: nothing, not even the purse test, unless the open merchant repairs
+            // (`0x4fadb0`, `UNIT_NPC_FLAGS` bit 14).
+            if model.merchant.as_ref().is_some_and(|m| m.can_repair) {
+                model.repair_all = true;
+            }
             Ok(())
         })?,
     )?;
@@ -576,7 +539,7 @@ mod tests {
                     name: Some("Refreshing Spring Water".into()),
                     texture: Some("Interface\\Icons\\INV_Drink_18".into()),
                     price: 25,
-                    quantity: 1,
+                    quantity: 5,
                     num_available: -1, // unlimited
                     item_id: 159,
                     stats: Some(ItemStatsHead {
@@ -618,7 +581,7 @@ mod tests {
             .unwrap();
         assert_eq!(name, "Refreshing Spring Water");
         assert_eq!(texture, "Interface\\Icons\\INV_Drink_18");
-        assert_eq!((price, quantity, num), (25, 1, -1));
+        assert_eq!((price, quantity, num), (25, 5, -1));
         assert_eq!(usable, 1);
 
         // In flight: name and texture nil, and usable (the null-record skip).
@@ -645,17 +608,52 @@ mod tests {
         assert!(s
             .eval::<bool>("return GetMerchantItemLink(9) == nil")
             .unwrap());
+    }
 
-        assert_eq!(
-            s.eval::<i64>("return GetMerchantItemMaxStack(1)").unwrap(),
-            20
-        );
-        assert!(s
-            .eval::<bool>("return GetMerchantItemMaxStack(2) == nil")
-            .unwrap());
-        assert!(s
-            .eval::<bool>("return GetMerchantItemMaxStack(9) == nil")
-            .unwrap());
+    #[test]
+    fn merchant_max_stack_is_one_for_bundles_and_misses() {
+        let mut s = UiScript::new().unwrap();
+        let max = |s: &mut UiScript, arg: &str| {
+            s.eval::<i64>(&format!("return GetMerchantItemMaxStack({arg})"))
+                .unwrap()
+        };
+        assert_eq!(max(&mut s, "1"), 1, "no vendor open");
+
+        let mut state = stock();
+        let single = |quantity: u32, max_stack: u32| MerchantItem {
+            name: Some("Flask of Oil".into()),
+            price: 100,
+            quantity,
+            num_available: -1,
+            item_id: 814,
+            max_stack: Some(max_stack),
+            ..Default::default()
+        };
+        state.items.push(single(1, 20));
+        state.items.push(single(1, 0));
+        state.items.push(single(0x8000_0000, u32::MAX));
+        s.set_merchant(Some(state));
+
+        assert_eq!(max(&mut s, "1"), 1, "a bundle row takes no split");
+        assert_eq!(max(&mut s, "2"), 1, "a template in flight");
+        assert_eq!(max(&mut s, "3"), 20, "a single row answers its stack size");
+        assert_eq!(max(&mut s, "4"), 0, "the stack size is not floored");
+        assert_eq!(max(&mut s, "5"), -1, "both fields read signed");
+        for out_of_range in ["0", "-1", "6", "9"] {
+            assert_eq!(max(&mut s, out_of_range), 1, "index {out_of_range}");
+        }
+        assert_eq!(max(&mut s, "\"3\""), 20);
+        assert_eq!(max(&mut s, "3.9"), 20);
+        for bad in ["", "nil", "\"x\"", "{}"] {
+            let err = s
+                .eval::<i64>(&format!("return GetMerchantItemMaxStack({bad})"))
+                .unwrap_err()
+                .to_string();
+            assert!(
+                err.contains("Usage: GetMerchantItemMaxStack(index)"),
+                "{bad:?}: {err}"
+            );
+        }
     }
 
     #[test]
@@ -722,41 +720,6 @@ mod tests {
             .unwrap());
     }
 
-    #[test]
-    fn merchant_stats_feed_reads_the_tooltip_head() {
-        let mut s = UiScript::new().unwrap();
-        let mut stock = stock();
-        // A sword, so every stat column is distinct.
-        stock.items[0].stats = Some(ItemStatsHead {
-            quality: 2,
-            inventory_type: 21,
-            class: 2,
-            subclass: 7,
-            dmg_min: 5.0,
-            dmg_max: 9.0,
-            dmg_type: 2,
-            delay_ms: 2600,
-            armor: 0,
-            block: 0,
-            sell_price: 0,
-        });
-        s.set_merchant(Some(stock));
-        let (quality, inv, class, sub, dmin, dmax, dtype, delay, armor, block) = s
-            .eval::<(i64, i64, i64, i64, f64, f64, i64, i64, i64, i64)>(
-                "return BenillaGetMerchantItemStats(1)",
-            )
-            .unwrap();
-        assert_eq!((quality, inv, class, sub), (2, 21, 2, 7));
-        assert_eq!((dmin, dmax, dtype, delay), (5.0, 9.0, 2, 2600));
-        assert_eq!((armor, block), (0, 0));
-        assert!(s
-            .eval::<bool>("return BenillaGetMerchantItemStats(2) == nil")
-            .unwrap());
-        assert!(s
-            .eval::<bool>("return BenillaGetMerchantItemStats(9) == nil")
-            .unwrap());
-    }
-
     #[test]
     fn buy_merchant_item_queues_intents() {
         let mut s = UiScript::new().unwrap();
@@ -805,9 +768,6 @@ mod tests {
         let (name, _tex, price): (String, String, i64) =
             s.eval("return GetBuybackItemInfo(1)").unwrap();
         assert_eq!((name.as_str(), price), ("Worn Dagger", 47));
-        assert!(s
-            .eval::<bool>("return BenillaGetBuybackItemStats(1) ~= nil")
-            .unwrap());
 
         s.run("BuybackItem(1)").unwrap();
         assert_eq!(s.take_merchant_buybacks(), vec![1]);
@@ -830,6 +790,19 @@ mod tests {
         );
     }
 
+    /// `RepairAllItems` returns before anything else unless the open merchant repairs
+    /// (`0x4fadb0`, tested at `0x4fbfe9`–`0x4fbff0`): no vendor, or one without the repair flag,
+    /// queues nothing.
+    #[test]
+    fn repair_all_queues_nothing_away_from_a_repairer() {
+        let mut s = UiScript::new().unwrap();
+        s.run("RepairAllItems()").unwrap();
+        assert!(!s.take_repair_all(), "no vendor");
+        s.set_merchant(Some(stock()));
+        s.run("RepairAllItems()").unwrap();
+        assert!(!s.take_repair_all(), "a vendor that does not repair");
+    }
+
     #[test]
     fn repair_reads_intents_and_mode_latch() {
         let mut s = UiScript::new().unwrap();
@@ -998,10 +971,6 @@ mod tests {
             "CursorHasItem is nil for mode 5"
         );
         assert!(s.eval::<bool>("return not CursorHasSpell()").unwrap());
-        assert!(
-            s.eval::<bool>("return GetCursorInfo() == nil").unwrap(),
-            "GetCursorInfo reports nothing — no binding exposes mode 5"
-        );
 
         // Yet it is held: a second call toggles it off (`0x4fb818`), a third re-grabs.
         s.run("PickupMerchantItem(1)").unwrap();
@@ -1022,17 +991,14 @@ mod tests {
             s.run("PickupMerchantItem(1)").unwrap(); // hold something first
             s.run(bad)
                 .unwrap_or_else(|e| panic!("{bad} must not raise: {e}"));
-            assert!(
-                s.eval::<bool>("return GetCursorInfo() == nil").unwrap(),
-                "{bad} cleared the cursor"
-            );
+            assert!(s.cursor_payload().is_none(), "{bad} cleared the cursor");
         }
         // A missing argument is the same silent clear.
         s.run("PickupMerchantItem(1)").unwrap();
         s.run("PickupMerchantItem()").unwrap();
         // `2^32 + 1` narrows to row 0 on a naive cast.
         s.run("PickupMerchantItem(4294967297)").unwrap();
-        assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+        assert!(s.cursor_payload().is_none());
         s.run("PickupContainerItem(0, 3)").unwrap();
         assert!(
             s.take_merchant_slot_buys().is_empty(),
@@ -1041,7 +1007,7 @@ mod tests {
         // A numeric string is accepted, and 1.9 truncates to the held row 1, toggling it off.
         s.run(r#"PickupMerchantItem("1")"#).unwrap();
         s.run("PickupMerchantItem(1.9)").unwrap();
-        assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+        assert!(s.cursor_payload().is_none());
     }
 
     #[test]
@@ -1083,7 +1049,7 @@ mod tests {
             "the row's item entry, aimed at the dropped-on slot"
         );
         assert!(
-            s.eval::<bool>("return GetCursorInfo() == nil").unwrap(),
+            s.cursor_payload().is_none(),
             "the cursor clears on the drop"
         );
     }
@@ -1105,7 +1071,7 @@ mod tests {
             s.take_merchant_slot_buys().is_empty(),
             "no buy goes out for a row that no longer resolves"
         );
-        assert!(s.eval::<bool>("return GetCursorInfo() == nil").unwrap());
+        assert!(s.cursor_payload().is_none());
     }
 
     #[test]
diff --git a/crates/benilla-ui/src/script/messageframe/plain.rs b/crates/benilla-ui/src/script/messageframe/plain.rs
index dac122a5..5eebe5f7 100644
--- a/crates/benilla-ui/src/script/messageframe/plain.rs
+++ b/crates/benilla-ui/src/script/messageframe/plain.rs
@@ -164,6 +164,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                 .ok_or_else(|| mlua::Error::runtime("not a MessageFrame"))
         },
         "MessageFrame",
+        None,
     )?;
 
     lua.set_named_registry_value(REG_MESSAGEFRAME_METHODS, m)?;
diff --git a/crates/benilla-ui/src/script/messageframe/scrolling.rs b/crates/benilla-ui/src/script/messageframe/scrolling.rs
index 6060f4c1..d0b72aa4 100644
--- a/crates/benilla-ui/src/script/messageframe/scrolling.rs
+++ b/crates/benilla-ui/src/script/messageframe/scrolling.rs
@@ -243,30 +243,11 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
                 .ok_or_else(|| mlua::Error::runtime("not a ScrollingMessageFrame"))
         },
         "ScrollingMessageFrame",
+        None,
     )?;
 
     lua.set_named_registry_value(REG_SCROLLINGMESSAGEFRAME_METHODS, m)?;
 
-    // BenillaChatTabPressed(): the chat edit box's OnTabPressed sets a flag for the app's whisper
-    // cycle (`UiScript::take_chat_tab`).
-    lua.globals().set(
-        "BenillaChatTabPressed",
-        lua.create_function(|lua, ()| {
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.chat_tab = true;
-            Ok(())
-        })?,
-    )?;
-    // SubmitChatInput(text): the chat edit box's OnEnterPressed queues the line for the app to
-    // parse as a chat command; an empty line is queued too, and the app takes it as a cancel.
-    lua.globals().set(
-        "SubmitChatInput",
-        lua.create_function(|lua, text: Option<String>| {
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.chat_input.push(text.unwrap_or_default());
-            Ok(())
-        })?,
-    )?;
     Ok(())
 }
 
@@ -699,7 +680,8 @@ mod tests {
              f:SetPoint('BOTTOMLEFT', 0, 0)\n\
              f:SetWidth(430)\n\
              f:SetHeight(120)\n\
-             f:SetScript('OnHyperlinkClick', function(self, link, text, button)\n\
+             f:SetScript('OnHyperlinkClick', function()\n\
+                 local link, text, button = arg1, arg2, arg3\n\
                  CLICKED = link .. '#' .. text .. '#' .. button\n\
              end)",
         )
diff --git a/crates/benilla-ui/src/script/mod.rs b/crates/benilla-ui/src/script/mod.rs
index 49379335..55f204f8 100644
--- a/crates/benilla-ui/src/script/mod.rs
+++ b/crates/benilla-ui/src/script/mod.rs
@@ -30,6 +30,7 @@ mod tutorial;
 mod worldmap_arrow;
 // `camera_view`: the five camera views and `FlipCameraYaw`, the reference's `UIUtil\Camera.cpp`.
 mod button;
+mod calls;
 mod camera_view;
 mod channel;
 mod char_stats;
@@ -48,8 +49,10 @@ mod editbox;
 pub mod instance;
 pub(crate) use editbox::{adopt_text_region, editbox_text_region_wrapper};
 pub(crate) mod addon;
+mod addon_enable;
 pub mod addon_gate;
 mod client;
+mod clock;
 mod cvars;
 mod dressup;
 mod duel;
@@ -58,6 +61,7 @@ mod extract;
 mod follow;
 pub(crate) mod font;
 mod font_block;
+mod frame_enum;
 mod gm_ticket;
 mod gossip;
 mod guild;
@@ -68,7 +72,9 @@ pub use handler_prof::HandlerRow;
 
 mod surface;
 pub use surface::widget_method_census;
+mod input_verbs;
 mod inspect;
+mod inventory_verbs;
 mod item_stats;
 mod item_text;
 pub mod keybind;
@@ -85,7 +91,7 @@ mod merchant;
 mod messageframe;
 mod minimap;
 pub mod nameplate;
-pub use nameplate::{PlateGeometry, PlateState};
+pub use nameplate::{PlateBitWrites, PlateGeometry, PlateState, PLATE_BIT_ENEMY, PLATE_BIT_FRIEND};
 mod model;
 mod modelframe;
 mod net_stats;
@@ -130,17 +136,20 @@ mod tradeskill;
 mod trainer;
 mod types;
 mod unit;
+mod video_pairs;
 mod weapon_enchant;
 mod who_sort;
 mod worldmap;
 mod worldstate;
 mod worn_display;
+mod zone_text;
 
 pub use action::{ActionSlot, ActionState, ActionUse};
 pub use addon::AddOnInfo;
+pub use addon_enable::EnableHash;
 pub use addon_message::{AddonDistribution, AddonSend};
 pub use auction::{
-    AuctionBid, AuctionCategory, AuctionItemRow, AuctionListState, AuctionQuery,
+    AuctionBid, AuctionCategory, AuctionHighBidder, AuctionItemRow, AuctionListState, AuctionQuery,
     AuctionStartRequest, AuctionState, AuctionSubCategory, BIDDER, LIST, OWNER, SORT_KEYS,
 };
 pub use aura::{AuraState, TrackingState};
@@ -150,6 +159,7 @@ pub use battlefield_positions::{BattlefieldFlagView, BattlefieldPositionView};
 pub use battlefield_queue::{BattlefieldListView, BattlefieldMapInfo, BattlefieldQueueSlot};
 pub use battlefield_score::{BattlefieldScoreRow, BattlefieldScores, BattlefieldStatColumn};
 pub use bind_confirm::PendingEquipAnswer;
+pub use calls::{NearestMode, ScriptCall};
 pub use camera_view::{CameraViewRequest, CAMERA_VIEW_COUNT};
 pub use channel::{ChannelCommand, ZoneChannelRow};
 pub use char_stats::{
@@ -170,9 +180,10 @@ pub use cursor::{
     CursorAction, CursorItem, CursorMacro, CursorMerchantItem, CursorMoney, CursorPayload,
     CursorPetAction, CursorSpell, CursorStablePet, EnchantConfirm, WorldPick, EQUIPMENT_BAG,
 };
+pub use cvars::{small_cull_text, sstr_to_int};
 pub use cvars::{
     MultisampleFormat, ScreenResolution, SeededCvar, VideoCaps, CVAR_FRILL_DENSITY, CVAR_GAMMA,
-    CVAR_NAMEPLATE_ENEMIES, CVAR_NAMEPLATE_FRIENDS, CVAR_WORLD_DETAIL, VIDEO_DEFAULT_CVARS,
+    CVAR_SMALL_CULL, CVAR_WORLD_DETAIL, IN_WORLD_READ_ONLY_CVARS, VIDEO_DEFAULT_CVARS,
     WORLD_DETAIL_STOPS,
 };
 pub use death::{DeathAction, DeathUiState};
@@ -185,6 +196,7 @@ pub use guild::{
     GuildMemberInfo, GuildRankEdit, GuildRankInfo, GuildRequest, GuildState, LastOnline, UnitGuild,
     MAX_RANKS, MIN_RANKS, RANK_RIGHT_BITS,
 };
+pub use input_verbs::{BindingInput, FiredInput, HeldInput};
 pub use modelframe::ModelPaneFrame;
 pub use petition::{
     validate_guild_name, PetitionRecordView, PetitionRequest, PetitionState, PETITION_TYPE_CHARTER,
@@ -194,6 +206,7 @@ pub use tabard::{
     emblem_mask_path, TabardHost, TabardIntent, EMBLEM_MASK_TOKEN, TABARD_COUNTS,
     TABARD_CREATION_COST,
 };
+pub use video_pairs::VIDEO_PAIR_CVARS;
 pub use worldmap_arrow::ARROW_MODEL;
 
 pub(crate) use button::{set_label_font_justify_h_lua, LabelFont};
@@ -201,15 +214,17 @@ pub use inspect::{InspectView, UnitReach};
 pub use item_stats::{item_usable, ItemSetView, ItemTemplateView, PlayerReqState};
 pub use item_text::ItemTextState;
 pub use layout_cache::{FrameLayout, LayoutPoint};
-pub use loot::{LootRow, LootState};
+pub use loot::{LootRow, LootState, LOOT_PORTRAIT_UNIT};
 pub use loot_roll::{LootRollEntry, LootRollsState};
-pub use macros::{MacroState, MacroView, MAX_MACROS, MAX_MACRO_BODY, MAX_MACRO_NAME};
-pub use mail::{MailInboxRow, MailInvoice, MailSendRequest, MailState, StationeryView};
+pub use macros::{MacroBinding, MacroState, MacroView, MAX_MACROS, MAX_MACRO_BODY, MAX_MACRO_NAME};
+pub use mail::{
+    MailInboxRow, MailInvoice, MailSendRequest, MailState, PackageView, StationeryView,
+};
 pub use measure::TextMeasure;
-pub use merchant::{ItemStatsHead, MerchantItem, MerchantState};
+pub use merchant::{ItemStatsHead, MerchantItem, MerchantState, RepairCosts};
 pub(crate) use minimap::apply_model_attrs as apply_minimap_model_attrs;
 pub(crate) use model::Model;
-pub use model::{FontProbe, TextureProbe, TextureSizeProbe};
+pub use model::{FontProbe, TextureProbe, TextureSizeProbe, WorldLocProjector};
 pub use party::{PartyMemberInfo, PartyRequest, PartyState, RaidMemberInfo, SavedInstanceInfo};
 pub use pet::{PetActionView, PetStats};
 pub use pvp::{HonorState, InspectHonorData};
@@ -243,14 +258,14 @@ pub use trainer::{
     TrainerState, TrainerTooltip, TRAINER_GROUP_KNOWN,
 };
 pub use types::{
-    BlendMode, EditAction, EditBoxTextUi, EditOutcome, EditUnit, ExtractedQuad, FontObject,
-    FontShadow, Gradient, JustifyH, JustifyV, LineMeasureRequest, MeasureRequest, Outline,
-    QuadContent, ScriptValue, TexCoords,
+    BlendMode, EditAction, EditBoxAdvanceRequest, EditBoxTextUi, EditOutcome, EditUnit,
+    ExtractedQuad, FontObject, FontShadow, Gradient, JustifyH, JustifyV, LineMeasureRequest,
+    MeasureRequest, Outline, QuadContent, ScriptValue, TexCoords,
 };
 pub(crate) use types::{FontExplicit, MeasuredText, RegionData};
 pub use unit::{
-    grey_band, level_reads_unknown, power_token, unit_is_grey, PlayerRecord, SelectionRequest,
-    UnitState,
+    grey_band, level_reads_unknown, parse_unit_token, power_token, unit_is_grey, PlayerRecord,
+    SelectionRequest, UnitBase, UnitGuids, UnitState, UnitTokenParse,
 };
 pub use weapon_enchant::WeaponEnchant;
 pub use who_sort::{WhoSortChain, WhoSortKey};
@@ -260,6 +275,7 @@ pub use worldmap::{
 };
 pub use worldstate::WorldStateUiView;
 pub use worn_display::WornDisplay;
+pub use zone_text::ZoneTexts;
 
 use mlua::Lua;
 
@@ -282,9 +298,9 @@ const REG_TEXTURE_METHODS: &str = "__benilla_texture_methods";
 const REG_TEXTURE_META: &str = "__benilla_texture_meta";
 const REG_FONTSTRING_METHODS: &str = "__benilla_fontstring_methods";
 const REG_FONTSTRING_META: &str = "__benilla_fontstring_meta";
-/// The stdlib's default error handler, kept by identity for
-/// [`UiScript::dispatch_script_errors_to_handler`] to skip; stored at [`stdlib::install`].
-const REG_DEFAULT_ERRORHANDLER: &str = "__benilla_default_errorhandler";
+/// The error handler `seterrorhandler` holds, the reference's registry reference `[0x8722cc]`;
+/// unset until one is given, as the reference's starts at -1.
+const REG_ERRORHANDLER: &str = "__benilla_errorhandler";
 
 /// Names on both region leaves, each leaf registering its own copy (Texture's `SetAlpha`
 /// `0x79b580`, FontString's `0x79cb70`), so they are not on the Region map and must not be hoisted
@@ -406,8 +422,9 @@ const SCRIPT_KINDS: [&str; 39] = [
     "OnTabPressed",
     "OnTextChanged",
     "OnTextSet",
-    // The caret flush's own (`0x77da80`), fired by the tick's `drain_cursor_changed` when the
-    // caret moved: the edge `ScrollingEdit_OnCursorChanged` scrolls a multiline box by.
+    // The caret leg's own (`0x77da80`), fired by the box's flush on dirty bit 2, which a caret
+    // move, an edit, a focus change and a re-seat raise: the edge `ScrollingEdit_OnCursorChanged`
+    // scrolls a multiline box by.
     "OnCursorChanged",
     "OnEditFocusGained",
     "OnEditFocusLost",
@@ -490,6 +507,7 @@ impl UiScript {
         lua50::install(&lua)?;
         stdlib::install(&lua)?;
         object::install(&lua)?;
+        frame_enum::install(&lua)?;
         // After `object`, whose `publish_global` it reuses, and before any FrameXML loads:
         // `Loader::do_font` publishes into the tables this builds.
         font::install(&lua)?;
@@ -506,12 +524,14 @@ impl UiScript {
         duel::install(&lua)?;
         follow::install(&lua)?;
         camera_view::install(&lua)?;
+        input_verbs::install(&lua)?;
         session::install(&lua)?;
         pvp::install(&lua)?;
         worn_display::install(&lua)?;
         death::install(&lua)?;
         aura::install(&lua)?;
         cvars::install(&lua)?;
+        nameplate::install_verbs(&lua)?;
         saved::install(&lua)?;
         keybind::install(&lua)?;
         sound::install(&lua)?;
@@ -551,6 +571,7 @@ impl UiScript {
         skills::install(&lua)?;
         item_stats::install(&lua)?;
         char_stats::install(&lua)?;
+        inventory_verbs::install(&lua)?;
         weapon_enchant::install(&lua)?;
         loot::install(&lua)?;
         loot_roll::install(&lua)?;
@@ -567,7 +588,6 @@ impl UiScript {
         worldmap::install(&lua)?;
         worldstate::install(&lua)?;
         net_stats::install(&lua)?;
-        diagnostics::install(&lua)?;
 
         let s = UiScript {
             lua,
@@ -816,7 +836,8 @@ impl UiScript {
         true
     }
 
-    /// Drain the chat lines `SubmitChatInput` queued since the last call, for the app to parse.
+    /// Drain the chat lines queued since the last call (a probe's, a host `SlashCmdList` row's), for
+    /// the app to parse.
     pub fn take_chat_input(&mut self) -> Vec<String> {
         std::mem::take(&mut self.model_mut().chat_input)
     }
@@ -826,11 +847,6 @@ impl UiScript {
         self.model_mut().chat_input.push(line);
     }
 
-    /// Whether Tab was pressed in the chat edit box since the last call: the whisper cycle's cue.
-    pub fn take_chat_tab(&mut self) -> bool {
-        std::mem::take(&mut self.model_mut().chat_tab)
-    }
-
     /// Replace the hyperlink spans `(frame, y-up rect, link, markup)` the app rasterized this
     /// frame; a release inside one fires `OnHyperlinkClick` on its frame ([`pointer`]).
     pub fn set_link_spans(&mut self, spans: Vec<(FrameHandle, Rect, String, String)>) {
@@ -864,19 +880,30 @@ impl UiScript {
     }
 
     /// Resolve and cache every frame's rect, which `GetWidth`/`GetHeight`/`extract` read, then fire
-    /// `OnSizeChanged` for frames whose size moved ([`event::fire_size_changes`]).
+    /// `OnSizeChanged` for frames whose size moved ([`event::fire_size_changes`]) and re-seat the
+    /// text of every resized EditBox.
     pub fn resolve(&mut self) {
+        self.resolve_and_measure();
+        event::fire_size_changes(&self.lua);
+        // The EditBox's own `OnSizeChanged` (`0x77a8d0`) runs after the script fire and re-seats a
+        // resized box's text, which the reference's drain resolves in the same pass.
+        let reseated = editbox::reseat_resized(&mut self.model_mut());
+        if reseated {
+            self.resolve_and_measure();
+        }
+    }
+
+    /// Resolve, and with a font engine installed ([`Self::set_text_measurer`]) measure what the
+    /// solve revealed and solve again, so a FontString's box is right in the frame its text was set.
+    fn resolve_and_measure(&mut self) {
         {
             let mut model = self.model_mut();
             Self::resolve_layout(&mut model);
         }
-        // With a font engine installed ([`Self::set_text_measurer`]), measure what the solve
-        // revealed and solve again, so a FontString's box is right in the frame its text was set.
         if self.fill_measures() {
             let mut model = self.model_mut();
             Self::resolve_layout(&mut model);
         }
-        event::fire_size_changes(&self.lua);
     }
 
     /// Store host measurements `(id, w, h, natural_w, key)` for [`MeasureRequest`]s; the next
@@ -945,6 +972,10 @@ impl UiScript {
                 }
                 KindState::EditBox(eb) => {
                     eb.advances_key = eb.advances_key.wrapping_add(1);
+                    eb.line_height = None;
+                    // A multi-line box's height is its text's measure: owed again on the new
+                    // raster, which moves no rect here to re-seat it.
+                    eb.relayout_owed = true;
                 }
                 _ => {}
             }
@@ -1027,7 +1058,7 @@ impl UiScript {
     /// Whether the focused EditBox is in alt-arrow mode (XML `ignoreArrows`, Lua
     /// `SetAltArrowKeyMode`, `[editbox+0x318] & 0x10`): without ALT the reference declines the four
     /// arrows (`0x77b1c4`), so they reach the world's bindings and turn the player while chat has
-    /// focus. The gate is on the key, not the [`EditAction`]: HOME and END also move to an edge.
+    /// focus. The gate is on the key, not the [`EditAction`]: HOME and END also move the caret.
     pub fn editbox_alt_arrow_mode(&self) -> bool {
         let model = self.model_ref();
         model.focused_editbox.is_some_and(|h| {
@@ -1170,31 +1201,20 @@ impl UiScript {
             .push(msg.to_string());
     }
 
-    /// Hand each queued script error to the Lua error handler, as the reference invokes the one
-    /// `seterrorhandler`/`geterrorhandler` (`0x702900`/`0x702950`) hold on a caught error;
-    /// FrameXML installs `_ERRORMESSAGE`, the ScriptErrors dialog (`BasicControls.xml:16`). The
-    /// stdlib default is skipped, as it already reported into [`UiScript::errors`]; a handler that
-    /// raises is recorded on the host channel only and stops the batch, so the path cannot recurse.
+    /// Hand each queued script error to the Lua error handler, as the reference's catch closure
+    /// (`0x703b40`) calls the one `seterrorhandler` (`0x702900`) holds, read from its slot and not
+    /// through the `geterrorhandler` global; FrameXML installs `_ERRORMESSAGE`, the ScriptErrors
+    /// dialog (`BasicControls.xml:16`). With none installed the error stays on the host channel,
+    /// [`UiScript::errors`], alone; a handler that raises is recorded there only and stops the
+    /// batch, so the path cannot recurse.
     pub fn dispatch_script_errors_to_handler(&mut self) {
         let pending = std::mem::take(&mut self.model_mut().pending_error_dispatch);
         if pending.is_empty() {
             return;
         }
-        let handler: Option<mlua::Function> = self
-            .lua
-            .globals()
-            .get::<mlua::Function>("geterrorhandler")
-            .ok()
-            .and_then(|g| g.call::<mlua::Function>(()).ok());
-        let Some(handler) = handler else { return };
-        if let Ok(default) = self
-            .lua
-            .named_registry_value::<mlua::Function>(REG_DEFAULT_ERRORHANDLER)
-        {
-            if handler == default {
-                return;
-            }
-        }
+        let Some(handler) = stdlib::error_handler(&self.lua) else {
+            return;
+        };
         for msg in pending {
             if let Err(e) = handler.call::<()>(msg) {
                 self.model_mut()
@@ -1220,16 +1240,6 @@ impl UiScript {
         self.model_ref().font_object(name).cloned()
     }
 
-    /// Every registered [`FontObject`]: the glyph atlas bakes outlined cells for the distinct
-    /// `(font, height, outline)` triples here.
-    pub fn font_objects(&self) -> Vec<FontObject> {
-        self.model_ref()
-            .font_objects_by_lower
-            .values()
-            .cloned()
-            .collect()
-    }
-
     // ── internals ────────────────────────────────────────────────────────────────────────────
 
     fn model_ref(&self) -> mlua::AppDataRef<'_, Model> {
diff --git a/crates/benilla-ui/src/script/model.rs b/crates/benilla-ui/src/script/model.rs
index d1d1db02..49c0d1a3 100644
--- a/crates/benilla-ui/src/script/model.rs
+++ b/crates/benilla-ui/src/script/model.rs
@@ -6,10 +6,10 @@ use crate::widget::{FrameHandle, RegionHandle, WidgetArena};
 use super::{
     auction, backdrop, bank, bind_confirm, camera_view, char_stats, chat_window, colorselect,
     container, craft, cursor, death, duel, follow, gossip, guild, inspect, item_text, loot,
-    loot_roll, macros, mail, merchant, party, petition, pvp, quest, quest_log, reputation, session,
-    simplehtml, skills, slider, social, spellbook, stable, taxi, trade, tradeskill, trainer,
-    weapon_enchant, ActionSlot, AuraState, FontObject, ItemTemplateView, MusicRequest,
-    PlayerReqState, RegionData, ScriptValue, SoundRequest, UnitState,
+    loot_roll, macros, mail, merchant, parse_unit_token, party, petition, pvp, quest, quest_log,
+    reputation, session, simplehtml, skills, slider, social, spellbook, stable, taxi, trade,
+    tradeskill, trainer, weapon_enchant, ActionSlot, AuraState, FontObject, ItemTemplateView,
+    MusicRequest, PlayerReqState, RegionData, ScriptValue, SoundRequest, UnitState, UnitTokenParse,
 };
 
 // ── The Rust-side model ──
@@ -17,6 +17,12 @@ use super::{
 /// The host's answer to whether a texture path resolves to a file.
 pub type TextureProbe = Box<dyn Fn(&str) -> bool>;
 
+/// The host's world-to-map projection (`0x4a7360`): the displayed map's selection as
+/// [`super::UiScript::world_map_selection`] reads it, a map id and a world `(x, y)`, to the map UV,
+/// `None` where the reference's outputs stay at their `(0, 0)`.
+pub type WorldLocProjector =
+    Box<dyn Fn((u32, u32, Option<u32>), u32, f32, f32) -> Option<(f32, f32)>>;
+
 /// The host's answer to a texture path's size in texels.
 pub type TextureSizeProbe = Box<dyn Fn(&str) -> Option<(u32, u32)>>;
 
@@ -62,6 +68,11 @@ pub(crate) struct Model {
     /// Lowercased names `SMSG_ADDON_INFO` marked `status = 2`; `None` until the reply arrives, and
     /// until then `GetNumAddOns()` is 0, as in the reference (`[0xbe1b90]`, reset at `0x51fad1`).
     pub(crate) addon_info_hidden: Option<Vec<String>>,
+    /// The current character's enable hash, which every enable verb writes through and the
+    /// shutdown writer (`0x490c88` into `0x51ef20`) saves only while dirty.
+    pub(crate) addon_enable: super::EnableHash,
+    /// The hash as the host read it from the file, what `ResetDisabledAddOns` reloads (`0x48e830`).
+    pub(crate) addon_enable_saved: super::EnableHash,
     /// The AddOns folder, so `LoadAddOn` can read an addon's files from inside a Lua binding.
     pub(crate) addons_root: Option<std::path::PathBuf>,
     /// The host's reader for chain-sourced addon files; without one such an addon is `MISSING`.
@@ -71,6 +82,8 @@ pub(crate) struct Model {
     /// Whether a texture path resolves (patch chain or loose addon file), so the path form of
     /// `SetTexture` returns the reference's 1 or nil inline (`0x79bb40`). `None` answers nil.
     pub(crate) texture_probe: Option<TextureProbe>,
+    /// `GetWorldLocMapPosition`'s projection; `None` answers `(0, 0)`.
+    pub(crate) world_loc_projector: Option<WorldLocProjector>,
     /// A path's texel size, which an axis authored as 0 takes, one texel per unit, as the client's
     /// `GetWidth` (`0x770720`) and `GetHeight` (`0x770790`) do; `None` leaves it as authored.
     pub(crate) texture_size_probe: Option<TextureSizeProbe>,
@@ -89,6 +102,8 @@ pub(crate) struct Model {
     /// `FrameXML_Debug`'s flag (`0x488440` over `[0xceea30]`, boots 0); the loader's trace lines
     /// print while it is greater than 0 (`0x6ee298`), so it is signed.
     pub(crate) framexml_debug: std::cell::Cell<i32>,
+    /// The loads' records for `Logs\FrameXML.log` and the drains the host has yet to write.
+    pub(crate) load_log: crate::status::LoadLog,
     /// The FrameXML font registry, a namespace apart from templates (a font inherits only a font).
     pub(crate) framexml_fonts:
         std::cell::RefCell<std::collections::HashMap<String, crate::framexml::Element>>,
@@ -138,8 +153,6 @@ pub(crate) struct Model {
     pub(crate) layout_rounds: u64,
     /// Per frame, rasterized links `(y-up rect, link, full |H…|h markup)` for `OnHyperlinkClick`.
     pub(crate) link_spans: HashMap<FrameHandle, Vec<(Rect, String, String)>>,
-    /// Tab was pressed in the chat edit box (`BenillaChatTabPressed`), for the whisper cycle.
-    pub(crate) chat_tab: bool,
     /// Region visuals (texture, colour, text) and layout (anchors, size, justify).
     pub(crate) region_data: HashMap<RegionHandle, RegionData>,
     /// Each frame's backdrop plate (`<Backdrop>` or `SetBackdrop`, the client's `frame+0x1ac`).
@@ -173,10 +186,6 @@ pub(crate) struct Model {
     pub(crate) model_facts: HashMap<String, std::sync::Arc<crate::widget::ModelFileFacts>>,
     /// Model files still waiting for their facts, for the host to load; deduplicated.
     pub(crate) model_facts_wanted: Vec<String>,
-    /// Edit boxes owed `OnTextChanged`: the reference's dirty bit (`[E+0x31c]` bit 0), set by
-    /// `SetText`/`Insert`, cleared only by `0x77d3e0`: one fire per drain, with the final text, as
-    /// `MoneyInputFrame_SetCopper` needs. A hidden box's fire waits for a show, key or mouse-down.
-    pub(crate) dirty_editboxes: Vec<FrameHandle>,
     /// Event name to its frames in registration order, never a set: `SignalEvent` (`0x703e50`)
     /// dispatches in that order across frames. Re-registering keeps a frame's position.
     pub(crate) event_to_frames: HashMap<String, Vec<FrameHandle>>,
@@ -225,26 +234,29 @@ pub(crate) struct Model {
     /// Each unit token's state as pushed this frame, keyed lowercased because 1.12's resolver
     /// (`0x515970`) matches with `SStrCmpI`: read it only through `unit`, where the fold lives.
     pub(crate) units_by_lower: HashMap<String, UnitState>,
-    /// Per unit token, auras in display order: the player's by insertion, the rest by aura slot.
-    pub(crate) auras: HashMap<String, Vec<AuraState>>,
+    /// The snapshot of each unit a `target` chain can end on, by guid, which the app pushes for
+    /// [`super::UnitGuids::chain_ends`]: a token with a hop that no push names reads its
+    /// resolved guid's entry here.
+    pub(crate) units_by_guid: HashMap<u64, UnitState>,
+    /// The player's auras in the reference cache's insertion order (`0xbc6040`), durations joined:
+    /// the `GetPlayerBuff` family's list, and any token naming the player's.
+    pub(crate) player_auras: Vec<AuraState>,
+    /// Every other unit's auras by guid, ascending aura slot: one list per unit, whatever token
+    /// names it.
+    pub(crate) unit_auras: HashMap<u64, Vec<AuraState>>,
+    /// The unit-token resolver's inputs (`0x515970`), which the aura bindings resolve through.
+    pub(crate) unit_guids: super::UnitGuids,
     /// Spell ids the cancel verbs queued (`CancelPlayerBuff`, `CancelTrackingBuff`, …), one
     /// `CMSG_CANCEL_AURA` each.
     pub(crate) cancel_aura_requests: Vec<u32>,
     /// The player's active tracking aura, behind `GetTrackingTexture`.
     pub(crate) tracking: Option<super::aura::TrackingState>,
-    /// `TargetUnit`, `AssistUnit` and `TargetLastEnemy` calls in call order, one queue as the
-    /// reference routes all three through one helper; an unresolvable one is a no-op, as there.
-    pub(crate) selection_requests: Vec<super::SelectionRequest>,
-    /// `TargetNearestFriend` calls, `true` for the reverse cycle.
-    pub(crate) target_nearest_friend_requests: Vec<bool>,
-    /// `TargetByName(name, exactMatch)` calls, for the app's by-name resolver.
-    pub(crate) target_by_name_requests: Vec<(String, bool)>,
-    /// `ClearTarget()` fired with a live target, the last step of `ToggleGameMenu`'s ESC chain.
-    pub(crate) target_clear: bool,
+    /// The calls that touch the selection, the cast or the targeting cursor, in call order.
+    pub(crate) script_calls: Vec<super::calls::ScriptCall>,
+    /// The binding functions' queue, gate depth and mouselook state.
+    pub(crate) input: super::input_verbs::InputState,
     /// `DropItemOnUnit` tokens (`0x48d960`), gated by the app; a refusal silently keeps the item.
     pub(crate) drop_item_on_unit: Vec<String>,
-    /// `SpellTargetUnit` tokens: a unit frame binds the spell currently waiting on the cursor.
-    pub(crate) spell_target_unit: Vec<String>,
 
     /// Channels the server confirmed, in join order: the numbers `GetChannelName` answers.
     pub(crate) joined_channels: Vec<Option<String>>,
@@ -258,6 +270,13 @@ pub(crate) struct Model {
     pub(crate) saved_instances: Vec<party::SavedInstanceInfo>,
     /// `SetRaidRosterSelection`'s raid row index, client-side only.
     pub(crate) raid_selection: i64,
+    /// `GetTime()`'s session seconds, which only the host moves ([`super::UiScript::tick`],
+    /// [`super::UiScript::set_now`]); off `_G`, as the reference's clock is the OS tick count.
+    pub(crate) now: f64,
+    /// `GetGameTime()`'s `(hour, minute)`, pushed by the host as the game clock ticks.
+    pub(crate) game_time: (u32, u32),
+    /// The zone caches the four zone-text getters and `GetZonePVPInfo` read.
+    pub(crate) zone: super::ZoneTexts,
     /// The current map's `Map.dbc` `InstanceType`, all `IsInInstance()` reads; `None` for no row.
     pub(crate) instance_type: Option<u32>,
     /// `CanShowResetInstances()`, the reference's four-term predicate (`0x495c90`), app-computed.
@@ -291,6 +310,8 @@ pub(crate) struct Model {
     pub(crate) chat_colors_changed: bool,
     /// The languages this character knows, in `Languages.dbc` row order.
     pub(crate) known_languages: Vec<String>,
+    /// `Languages.dbc`'s `(ID, Name_lang)` rows in file order, whatever the character knows.
+    pub(crate) language_table: Vec<(u32, String)>,
     pub(crate) zone_channel_catalog: Vec<super::channel::ZoneChannelRow>,
     pub(crate) channel_commands: Vec<super::channel::ChannelCommand>,
     /// The recruitment auto-join latch `[0x843608]`: 0 `STANDARD`, 1 `AUTO` (`0x49ea70` maps any
@@ -373,6 +394,9 @@ pub(crate) struct Model {
     /// `(name, default)` per addon `RegisterCVar` that created a slot.
     pub(crate) cvar_registrations: Vec<(String, String)>,
     pub(crate) cvars_warned: HashSet<String>,
+    /// The lowercased names a Lua `SetCVar` refuses, the reference's flag bit2 (`rec+0x1c & 4`,
+    /// `CVar::SetReadOnly 0x63e030`). Kept beside the rows, so a host re-seed never clears it.
+    pub(crate) cvars_read_only: HashSet<String>,
 
     /// The adapter's multisample formats in dropdown order, the reference's list `[0xb4b444]` of
     /// `{colorBits, depthBits, multisample}` (count `[0xb4b440]`, built by `0x48c3e0`).
@@ -401,7 +425,6 @@ pub(crate) struct Model {
     /// Per action, its usable, range, current and cooldown state; an absent one reads cold.
     pub(crate) action_states: HashMap<u32, super::action::StoredActionState>,
     pub(crate) bonus_bar_offset: u8,
-    pub(crate) action_uses: Vec<super::action::ActionUse>,
     /// `(action id, packed)` per slot `PickupAction`/`PlaceAction` changed, 0 clearing it: one
     /// `CMSG_SET_ACTION_BUTTON` each, so a drag swap is two sends.
     pub(crate) action_sets: Vec<(u32, u32)>,
@@ -418,27 +441,22 @@ pub(crate) struct Model {
     pub(crate) macros_dirty: bool,
     /// Bumped by every seed and change, for readers that must not drain `macros_dirty`.
     pub(crate) macros_generation: u64,
+    /// Each macro's cached cast by 1-based index, from the app; an absent macro reads unbound.
+    pub(crate) macro_bindings: HashMap<u32, macros::MacroBinding>,
     /// The macro icon paths from `SpellIcon.dbc`, behind `GetMacroIconInfo`.
     pub(crate) macro_icons: Vec<String>,
-    /// Spell ids `CastSpell` queued.
-    pub(crate) spell_casts: Vec<u32>,
-    /// `CastSpell(id, "pet")` ids, sent as `CMSG_PET_ACTION` with a type-1 word (`0x4b34ce`).
-    pub(crate) pet_spell_casts: Vec<u32>,
     /// `ToggleSpellAutocast` ids for `CMSG_PET_SPELL_AUTOCAST` (`0x2F3`), which names a spell.
     pub(crate) pet_spell_autocasts: Vec<u32>,
     /// An auto-repeat or cast that `SpellStopCasting()` can stop, not a channel (`0x6e6e80`). Its
     /// 1 or nil matters: the ESC chain (`UIParent.lua:1489`) reaches `CloseAllWindows()` on nil.
     pub(crate) casting: bool,
-    /// `SpellStopCasting()` fired while casting: the ESC cancel.
-    pub(crate) spell_stop: bool,
     /// Spell targeting is on (`SpellIsTargeting`, `0x6e6cd0`); it gates `SpellStopTargeting()`,
     /// whose nil the ESC chain falls through on (`UIParent.lua:1490`).
     pub(crate) spell_targeting: bool,
-    /// Tokens for which `SpellCanTargetUnit`'s armed unit word clears fully, used by stock unit
-    /// frames before they call `SpellTargetUnit`.
-    pub(crate) spell_targetable_units: HashSet<String>,
-    /// `SpellStopTargeting()` fired while targeting: the ESC targeting cancel.
-    pub(crate) spell_stop_targeting: bool,
+    /// The units, by guid, for which `SpellCanTargetUnit`'s armed unit word clears fully, which
+    /// stock unit frames ask before they call `SpellTargetUnit`; a token resolves to its guid
+    /// through [`Self::unit_guids`].
+    pub(crate) spell_targetable_units: HashSet<u64>,
 
     pub(crate) talents: super::talent::TalentUiState,
     /// `LearnTalent(tab, index)` calls queued.
@@ -473,8 +491,10 @@ pub(crate) struct Model {
     pub(crate) battlefield_list: super::battlefield_queue::BattlefieldListView,
     /// The selected instance id (`[0xb6eba0]`), not an index; written by `SetSelectedBattlefield`.
     pub(crate) battlefield_selected: u32,
-    /// The three queue slots, pushed each frame with their clocks reduced to values.
-    pub(crate) battlefield_slots: Vec<super::battlefield_queue::BattlefieldQueueSlot>,
+    /// The three queue slots, pushed each frame with their clocks reduced to values. Zeroed
+    /// until the first push, as the reference's static slots (`0xb6e9d0`) are, so each answers
+    /// "none" from the first frame.
+    pub(crate) battlefield_slots: [super::battlefield_queue::BattlefieldQueueSlot; 3],
     /// `GetBattlefieldInstanceExpiration()`, pushed each frame.
     pub(crate) battlefield_instance_expiration_ms: u32,
     /// `JoinBattlefield` calls, `(instance id, as group)`.
@@ -500,19 +520,13 @@ pub(crate) struct Model {
 
     /// The stance bar's forms, in bar order.
     pub(crate) shapeshift_forms: Vec<super::shapeshift::StoredShapeshiftForm>,
-    /// Form spell ids `CastShapeshiftForm` queued.
-    pub(crate) shapeshift_casts: Vec<u32>,
 
     /// The pet bar's ten slots and two bar-wide bits, replaced whole by every `SMSG_PET_SPELLS`.
     pub(crate) pet_bar: super::pet::PetBarState,
-    /// 1-based slots `CastPetAction` queued.
-    pub(crate) pet_actions_pressed: Vec<u32>,
     /// 1-based slot indices `TogglePetAutocast` queued.
     pub(crate) pet_autocast_toggles: Vec<u32>,
     /// `PetStopAttack()` calls.
     pub(crate) pet_stop_attacks: u32,
-    /// `PetAttack`, `PetFollow`, `PetWait` and mode orders, as the packed word of their bar slot.
-    pub(crate) pet_orders: Vec<u32>,
     /// `HasFullControl`, the reference's `[0xb4b3e4]`: set by `SMSG_CLIENT_CONTROL_UPDATE` for the
     /// player, boots 1, and every cast, item and cursor gate refuses at 0.
     pub(crate) player_control: bool,
@@ -525,9 +539,8 @@ pub(crate) struct Model {
     /// Names `PetRename` queued, from the `PETRENAMECONFIRM` popup.
     pub(crate) pet_renames: Vec<String>,
 
-    /// Bag contents by API bag id (0 is the backpack), and the queued `UseContainerItem` calls.
+    /// Bag contents by API bag id (0 is the backpack).
     pub(crate) containers: HashMap<i64, container::ContainerState>,
-    pub(crate) container_uses: Vec<(i64, u32)>,
     /// Per `(bag, slot)`, `(start, duration, enabled)` in `GetTime` seconds, stamped at push.
     pub(crate) container_cooldowns: HashMap<(i64, u32), (f64, f64, bool)>,
     /// `HasKey()`: a keys-family item in equipment, bags, bank or keyring; gates the keyring UI.
@@ -594,8 +607,10 @@ pub(crate) struct Model {
 
     /// The open vendor's stock, the `BuyMerchantItem` calls and whether `CloseMerchant` ran.
     pub(crate) merchant: Option<merchant::MerchantState>,
-    /// `GetRepairAllCost`'s total, which the app pushes every frame a vendor is open.
+    /// `GetRepairAllCost`'s total; 0 unless a repairer is open.
     pub(crate) repair_all_cost: u32,
+    /// The repair costs `SetInventoryItem` and `SetBagItem` return.
+    pub(crate) repair_costs: merchant::RepairCosts,
     pub(crate) merchant_buys: Vec<(u32, u32)>,
     /// The held `(bag, slot)` when `PickupMerchantItem` sells, sent as `CMSG_SELL_ITEM`.
     pub(crate) merchant_cursor_sells: Vec<(i64, u32)>,
@@ -670,8 +685,8 @@ pub(crate) struct Model {
     pub(crate) bind_on_use_confirms: u32,
 
     /// The open loot, the row clicks and whether `CloseLoot` ran. A click is the reference's take
-    /// `0x4c2790` with flag 0, raising `LOOT_BIND` for a bind-on-pickup row (the C `CLootButton`,
-    /// here `BenillaTakeLootSlot`); `LootSlot` passes 1 (`0x4c2e70`), taking it after the confirm.
+    /// `0x4c2790` with flag 0, raising `LOOT_BIND` for a bind-on-pickup row (a `LootButton`'s own
+    /// click, `0x4c1820`); `LootSlot` passes 1 (`0x4c2e70`), taking it after the confirm.
     pub(crate) loot: Option<loot::LootState>,
     pub(crate) loot_picks: Vec<u32>,
     /// `LootSlot(slot)` rows, 1-based, apart from clicks for the reference's pending-slot gate.
@@ -709,6 +724,10 @@ pub(crate) struct Model {
     pub(crate) mail_stationeries: Vec<mail::StationeryView>,
     /// `SelectStationery`'s `Stationery.dbc` id; 0 is none, which silences `SendMail`.
     pub(crate) mail_stationery: u32,
+    /// `Package.dbc`'s rows in file order, `GetPackageInfo`'s list.
+    pub(crate) mail_packages: Vec<mail::PackageView>,
+    /// `SelectPackage`'s `Package.dbc` id (`[0xb6efb8]`); 0 is none.
+    pub(crate) mail_package: u32,
     /// `HasNewMail()` (`0x4afea0`), from `MSG_QUERY_NEXT_MAIL_TIME` and `SMSG_RECEIVED_MAIL`.
     pub(crate) has_new_mail: bool,
 
@@ -778,6 +797,12 @@ pub(crate) struct Model {
     /// Spell id to its tooltip view, and the misses asked for.
     pub(crate) spell_tooltips: HashMap<u32, super::SpellTooltipView>,
     pub(crate) spell_tooltip_asks: HashSet<u32>,
+    /// The same for the views built against the player's pet, which the spell builder's unit
+    /// selector asks for (`0x52e610`'s fourth argument).
+    pub(crate) pet_spell_tooltips: HashMap<u32, super::SpellTooltipView>,
+    pub(crate) pet_spell_tooltip_asks: HashSet<u32>,
+    /// The tooltips whose spell render missed its view, re-rendered when the app answers.
+    pub(crate) spell_tooltip_waits: HashMap<FrameHandle, super::tooltip_spell::SpellWait>,
     /// `CollapseQuestHeader`/`ExpandQuestHeader` as `(1-based entry, collapse)`, entry 0 for all.
     pub(crate) quest_log_collapses: Vec<(u32, bool)>,
     /// Watched quest ids in watch order, pruned when a quest leaves the log.
@@ -832,8 +857,6 @@ pub(crate) struct Model {
     pub(crate) bank_bag_slots: char_stats::BankBagSlots,
     /// `GetInventoryAlertStatus` in `0x806eb8` order; every push fires `UPDATE_INVENTORY_ALERTS`.
     pub(crate) inventory_alerts: [u8; 12],
-    /// `UseInventoryItem` slot ids, sent as `CMSG_USE_ITEM` on the equipped item.
-    pub(crate) inventory_uses: Vec<u32>,
     /// Equipped slot ids clicked while the merchant repair cursor is armed.
     pub(crate) inventory_repairs: Vec<u32>,
     /// Main- and off-hand temporary enchants in `GetWeaponEnchantInfo`'s order, pushed each frame.
@@ -854,8 +877,8 @@ pub(crate) struct Model {
     pub(crate) tabard_intents: Vec<super::tabard::TabardIntent>,
     /// The `WorldFrame` type's one-shot record: true once the first is made.
     pub(crate) world_frame_made: bool,
-    /// Per lowercased live-unit token, reach for `CanInspect`/`CheckInteractDistance`; absent: nil.
-    pub(crate) unit_reach: HashMap<String, super::UnitReach>,
+    /// Per live-unit guid, reach for `CanInspect`/`CheckInteractDistance`; absent: nil.
+    pub(crate) unit_reach: HashMap<u64, super::UnitReach>,
 
     /// The skills pane's snapshot and the display tree built from it.
     pub(crate) skills: skills::SkillsState,
@@ -878,7 +901,7 @@ pub(crate) struct Model {
     /// Reputation calls queued, applied locally first because none of the three sends is acked.
     pub(crate) reputation_sends: Vec<reputation::ReputationSend>,
 
-    /// Lines the chat box submitted (`SubmitChatInput`), for the app's slash-command parser.
+    /// Lines for the app's slash-command parser: a probe's, or a host `SlashCmdList` row's.
     pub(crate) chat_input: Vec<String>,
 
     /// The world map's pushed catalog and feed, and its selection.
@@ -905,6 +928,8 @@ pub(crate) struct Model {
     pub(crate) addon_sends: Vec<super::addon_message::AddonSend>,
     /// `RequestTimePlayed()` calls, one empty `CMSG_PLAYED_TIME` each.
     pub(crate) played_time_asks: u32,
+    /// `OpeningCinematic()` calls, one empty `CMSG_OPENING_CINEMATIC` each.
+    pub(crate) opening_cinematic_asks: u32,
     /// `Screenshot()` calls, one capture each.
     pub(crate) screenshot_asks: u32,
     /// `GetRealmName()`: `""` until pushed, never nil, since addons index tables with it at load.
@@ -975,9 +1000,16 @@ impl Model {
         self.warnings.push(msg);
     }
 
-    /// A unit token's state, folded as 1.12's resolver `0x515970` folds (`_strnicmp`: `A`..`Z`
-    /// only, never a byte of 0x80 or more), so `to_ascii_lowercase`, never `to_lowercase`.
+    /// The state of the unit `token` names, as the `Unit*` getters read it: the snapshot the app
+    /// pushed under the token, else, for a token with a `target` hop, the chain's end.
     pub(crate) fn unit(&self, token: &str) -> Option<&UnitState> {
+        self.pushed_unit(token).or_else(|| self.chained_unit(token))
+    }
+
+    /// The snapshot pushed under `token` itself, folded as 1.12's resolver `0x515970` folds
+    /// (`_strnicmp`: `A`..`Z` only, never a byte of 0x80 or more), so `to_ascii_lowercase`, never
+    /// `to_lowercase`.
+    pub(crate) fn pushed_unit(&self, token: &str) -> Option<&UnitState> {
         if token.bytes().any(|b| b.is_ascii_uppercase()) {
             self.units_by_lower.get(&token.to_ascii_lowercase())
         } else {
@@ -985,21 +1017,39 @@ impl Model {
         }
     }
 
+    /// The unit a token with a `target` hop and no push of its own names: the resolver's guid
+    /// (`0x515970`, which the getters call before their own object lookup, `0x468460`), then that
+    /// guid's snapshot. A token without a hop is the app's to push, base by base, and reads
+    /// nothing here.
+    fn chained_unit(&self, token: &str) -> Option<&UnitState> {
+        match parse_unit_token(token) {
+            UnitTokenParse::Unit { base, hops } if hops > 0 => {
+                let guid = self.unit_guids.resolve_unit(base, hops)?;
+                self.units_by_guid.get(&guid)
+            }
+            _ => None,
+        }
+    }
+
     pub(crate) fn new() -> Model {
         Model {
             addons: Vec::new(),
             addon_index: Vec::new(),
             addon_info_hidden: None,
+            addon_enable: Default::default(),
+            addon_enable_saved: Default::default(),
             addons_root: None,
             addons_chain_reader: None,
             measurer: None,
             texture_probe: None,
+            world_loc_projector: None,
             texture_size_probe: None,
             font_probe: None,
             addons_saved_account: None,
             addons_saved_character: None,
             framexml_templates: Default::default(),
             framexml_debug: Default::default(),
+            load_log: Default::default(),
             framexml_fonts: Default::default(),
             arena: WidgetArena::new(),
             layout_inputs: HashMap::new(),
@@ -1020,7 +1070,6 @@ impl Model {
             layout_rounds: 0,
             resolved: HashMap::new(),
             link_spans: HashMap::new(),
-            chat_tab: false,
             region_data: HashMap::new(),
             backdrops: HashMap::new(),
             simple_html: simplehtml::SimpleHtmlStates::new(),
@@ -1038,7 +1087,6 @@ impl Model {
             on_update_model_frames: Vec::new(),
             model_facts: HashMap::new(),
             model_facts_wanted: Vec::new(),
-            dirty_editboxes: Vec::new(),
             event_to_frames: HashMap::new(),
             frame_events: HashMap::new(),
             all_event_frames: Vec::new(),
@@ -1056,21 +1104,24 @@ impl Model {
             // 1024x768 until the host calls `set_screen_size`; y-up `[bottom, left, top, right]`.
             screen: Rect::new(0.0, 0.0, 768.0, 1024.0),
             units_by_lower: HashMap::new(),
-            auras: HashMap::new(),
+            units_by_guid: HashMap::new(),
+            player_auras: Vec::new(),
+            unit_auras: HashMap::new(),
+            unit_guids: Default::default(),
             cancel_aura_requests: Vec::new(),
             tracking: None,
-            selection_requests: Vec::new(),
-            target_nearest_friend_requests: Vec::new(),
-            target_by_name_requests: Vec::new(),
+            script_calls: Vec::new(),
+            input: Default::default(),
             drop_item_on_unit: Vec::new(),
-            spell_target_unit: Vec::new(),
-            target_clear: false,
             joined_channels: Vec::new(),
             party: party::PartyState::default(),
             party_requests: Vec::new(),
             ready_check: party::ReadyCheckState::default(),
             saved_instances: Vec::new(),
             raid_selection: 0,
+            now: 0.0,
+            game_time: (0, 0),
+            zone: Default::default(),
             instance_type: None,
             can_reset_instances: false,
             reset_instance_asks: 0,
@@ -1089,6 +1140,7 @@ impl Model {
             chat_colors: super::chat_types::seed(),
             chat_colors_changed: false,
             known_languages: Vec::new(),
+            language_table: Vec::new(),
             zone_channel_catalog: Vec::new(),
             channel_commands: Vec::new(),
             guild_recruitment_mode: 1,
@@ -1125,6 +1177,7 @@ impl Model {
             cvar_changes: Vec::new(),
             cvar_registrations: Vec::new(),
             cvars_warned: HashSet::new(),
+            cvars_read_only: HashSet::new(),
             multisample_formats: Vec::new(),
             screen_resolutions: Vec::new(),
             current_resolution: None,
@@ -1136,7 +1189,6 @@ impl Model {
             actions: HashMap::new(),
             action_states: HashMap::new(),
             bonus_bar_offset: 0,
-            action_uses: Vec::new(),
             action_sets: Vec::new(),
             ui_errors: Vec::new(),
             spellbook: spellbook::SpellBookState::default(),
@@ -1144,15 +1196,12 @@ impl Model {
             macros: macros::MacroState::default(),
             macros_dirty: false,
             macros_generation: 0,
+            macro_bindings: HashMap::new(),
             macro_icons: Vec::new(),
-            spell_casts: Vec::new(),
-            pet_spell_casts: Vec::new(),
             pet_spell_autocasts: Vec::new(),
             casting: false,
-            spell_stop: false,
             spell_targeting: false,
             spell_targetable_units: HashSet::new(),
-            spell_stop_targeting: false,
             talents: super::talent::TalentUiState::default(),
             talent_learns: Vec::new(),
             talent_wipe_confirms: 0,
@@ -1170,7 +1219,7 @@ impl Model {
             battlefield_leave_requests: 0,
             battlefield_list: Default::default(),
             battlefield_selected: 0,
-            battlefield_slots: Vec::new(),
+            battlefield_slots: Default::default(),
             battlefield_instance_expiration_ms: 0,
             battlefield_join_requests: Vec::new(),
             battlefield_list_requests: Vec::new(),
@@ -1186,19 +1235,15 @@ impl Model {
             tutorial_clears: 0,
             tutorial_resets: 0,
             shapeshift_forms: Vec::new(),
-            shapeshift_casts: Vec::new(),
             pet_bar: super::pet::PetBarState::default(),
-            pet_actions_pressed: Vec::new(),
             pet_autocast_toggles: Vec::new(),
             pet_stop_attacks: 0,
-            pet_orders: Vec::new(),
             player_control: true,
             pet_set_actions: Vec::new(),
             pet_abandons: 0,
             pet_dismisses: 0,
             pet_renames: Vec::new(),
             containers: HashMap::new(),
-            container_uses: Vec::new(),
             container_cooldowns: HashMap::new(),
             has_key: false,
             cursor: None,
@@ -1229,6 +1274,7 @@ impl Model {
             gossip_quest_selects: Vec::new(),
             merchant: None,
             repair_all_cost: 0,
+            repair_costs: Default::default(),
             merchant_buys: Vec::new(),
             merchant_cursor_sells: Vec::new(),
             merchant_slot_buys: Vec::new(),
@@ -1292,6 +1338,8 @@ impl Model {
             mail_send_item: None,
             mail_stationeries: Vec::new(),
             mail_stationery: 0,
+            mail_packages: Vec::new(),
+            mail_package: 0,
             has_new_mail: false,
             auction: None,
             auction_item_classes: Vec::new(),
@@ -1335,6 +1383,9 @@ impl Model {
             player_req: PlayerReqState::default(),
             spell_tooltips: HashMap::new(),
             spell_tooltip_asks: HashSet::new(),
+            pet_spell_tooltips: HashMap::new(),
+            pet_spell_tooltip_asks: HashSet::new(),
+            spell_tooltip_waits: HashMap::new(),
             quest_log_collapses: Vec::new(),
             quest_log_watched: Vec::new(),
             server_unix_time: None,
@@ -1348,6 +1399,7 @@ impl Model {
             chat_sends: Vec::new(),
             addon_sends: Vec::new(),
             played_time_asks: 0,
+            opening_cinematic_asks: 0,
             screenshot_asks: 0,
             realm_name: String::new(),
             player_record: super::PlayerRecord::default(),
@@ -1388,7 +1440,6 @@ impl Model {
             inventory_slots: Default::default(),
             bank_bag_slots: Default::default(),
             inventory_alerts: [0; 12],
-            inventory_uses: Vec::new(),
             inventory_repairs: Vec::new(),
             weapon_enchants: [None; 2],
             inspect: None,
diff --git a/crates/benilla-ui/src/script/nameplate.rs b/crates/benilla-ui/src/script/nameplate.rs
index de8eb154..680cc7aa 100644
--- a/crates/benilla-ui/src/script/nameplate.rs
+++ b/crates/benilla-ui/src/script/nameplate.rs
@@ -4,6 +4,11 @@
 //! and read it positionally: six regions in creation order, then one child, the health bar (1.12
 //! has no cast bar). Addons take plates over, so static properties are written once, anchors
 //! when the window changes and state when it moves.
+//!
+//! Also the four verbs that switch plates on and off, which write two bits of the engine's
+//! runtime dword `[0xc4da34]` and nothing else.
+
+use mlua::Lua;
 
 use crate::layout::{Anchor, Point};
 use crate::order::DrawLayer;
@@ -127,6 +132,9 @@ pub(crate) struct NamePlates {
     /// true, where freelook (`0x60f830`) clears the bit.
     hit_test_vetoed: bool,
     geometry: Option<PlateGeometry>,
+    /// The verbs' writes to the two script bits, drained by
+    /// [`UiScript::take_nameplate_bit_writes`].
+    bit_writes: PlateBitWrites,
 }
 
 impl NamePlates {
@@ -154,7 +162,79 @@ struct SyncEffects {
     values: Vec<(FrameHandle, f32)>,
 }
 
+/// Bit `0x1` of `[0xc4da34]`: plates on every unit that is not friendly, set by `ShowNameplates`
+/// and cleared by `HideNameplates` (setter `0x6054f0`).
+pub const PLATE_BIT_ENEMY: u8 = 0x1;
+/// Bit `0x8` of `[0xc4da34]`: plates on friendly units, set by `ShowFriendNameplates` and cleared
+/// by `HideFriendNameplates` (setter `0x605510`).
+pub const PLATE_BIT_FRIEND: u8 = 0x8;
+
+/// The plate verbs' writes since the last drain. Each setter `or`s or `and`s its bit into the live
+/// dword in call order, so per bit the last write wins; bits `0x2` and `0x4` are the frame loop's
+/// own latches and no verb reaches them.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct PlateBitWrites {
+    set: u8,
+    clear: u8,
+}
+
+impl PlateBitWrites {
+    fn write(&mut self, bit: u8, on: bool) {
+        if on {
+            self.set |= bit;
+            self.clear &= !bit;
+        } else {
+            self.clear |= bit;
+            self.set &= !bit;
+        }
+    }
+
+    /// `bits` with these writes applied.
+    pub fn apply(self, bits: u8) -> u8 {
+        (bits | self.set) & !self.clear
+    }
+
+    /// No verb ran since the last drain.
+    pub fn is_empty(self) -> bool {
+        self.set | self.clear == 0
+    }
+}
+
+/// The four nameplate verbs: `ShowNameplates 0x489450`, `HideNameplates 0x489460`,
+/// `ShowFriendNameplates 0x489470`, `HideFriendNameplates 0x489480`. Each reads no argument
+/// (`ShowNameplates(false)` still shows), returns zero values and writes its bit of `[0xc4da34]`,
+/// which the engine clears at every world entry (`0x60394b`, `0x603952`). There is no getter and
+/// no nameplate CVar: FrameXML keeps its own `NAMEPLATES_ON`/`FRIENDNAMEPLATES_ON` and replays
+/// them through these verbs.
+pub(super) fn install_verbs(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+    for (name, bit, on) in [
+        ("ShowNameplates", PLATE_BIT_ENEMY, true),
+        ("HideNameplates", PLATE_BIT_ENEMY, false),
+        ("ShowFriendNameplates", PLATE_BIT_FRIEND, true),
+        ("HideFriendNameplates", PLATE_BIT_FRIEND, false),
+    ] {
+        g.set(
+            name,
+            // The empty `MultiValue` returns zero values, which is not nil.
+            lua.create_function(move |lua, _: mlua::MultiValue| {
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                model.nameplates.bit_writes.write(bit, on);
+                Ok(mlua::MultiValue::new())
+            })?,
+        )?;
+    }
+    Ok(())
+}
+
 impl UiScript {
+    /// Drain the plate verbs' writes for the engine's `[0xc4da34]`, which the app owns.
+    pub fn take_nameplate_bit_writes(&mut self) -> PlateBitWrites {
+        let lua = self.lua();
+        let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+        std::mem::take(&mut model.nameplates.bit_writes)
+    }
+
     /// Drive the pool from the app's per-frame states, one per shown plate; a unit with no state
     /// has its plate retired (hidden, never destroyed). An unchanged `geometry` costs nothing.
     pub fn sync_nameplates(&mut self, geometry: PlateGeometry, states: &[PlateState]) {
diff --git a/crates/benilla-ui/src/script/object.rs b/crates/benilla-ui/src/script/object.rs
index 848cf82b..efe7cf8c 100644
--- a/crates/benilla-ui/src/script/object.rs
+++ b/crates/benilla-ui/src/script/object.rs
@@ -209,9 +209,9 @@ fn enum_token(s: &str) -> String {
     s.trim().to_ascii_uppercase()
 }
 
-/// A strata name. The reference's table (`0x8119f8`) holds the eight `BACKGROUND`..`TOOLTIP`;
-/// `BLIZZARD` is a later client's, not 1.12's. Stratum 0, `WORLD`, has no name: only the
-/// WorldFrame's constructor sets it (`0x481aff`).
+/// A strata name, from the reference's eight-row table (`0x8119f8`), `BACKGROUND`..`TOOLTIP`, walked
+/// by `0x6f17d0`. Stratum 0, `WORLD`, has no name: only the WorldFrame's constructor sets it
+/// (`0x481aff`).
 pub(crate) fn strata_from_str(s: &str) -> Option<Strata> {
     Some(match enum_token(s).as_str() {
         "BACKGROUND" => Strata::Background,
@@ -222,7 +222,6 @@ pub(crate) fn strata_from_str(s: &str) -> Option<Strata> {
         "FULLSCREEN" => Strata::Fullscreen,
         "FULLSCREEN_DIALOG" => Strata::FullscreenDialog,
         "TOOLTIP" => Strata::Tooltip,
-        "BLIZZARD" => Strata::Blizzard,
         _ => return None,
     })
 }
diff --git a/crates/benilla-ui/src/script/object/frame_state.rs b/crates/benilla-ui/src/script/object/frame_state.rs
index 6238f280..c54f5e32 100644
--- a/crates/benilla-ui/src/script/object/frame_state.rs
+++ b/crates/benilla-ui/src/script/object/frame_state.rs
@@ -356,8 +356,20 @@ pub(super) fn install(lua: &Lua, m: &Table) -> mlua::Result<()> {
         "SetFrameStrata",
         lua.create_function(|lua, (this, strata): (Table, String)| {
             let h = frame_handle_of(lua, &this)?;
-            let s = strata_from_str(&strata)
-                .ok_or_else(|| mlua::Error::runtime(format!("unknown frameStrata '{strata}'")))?;
+            // A name off the table raises, naming the frame or `<unnamed>` (`0x774450`), and the
+            // stratum stays.
+            let Some(s) = strata_from_str(&strata) else {
+                let name = lua
+                    .app_data_ref::<Model>()
+                    .expect("model")
+                    .arena
+                    .frame(h)
+                    .and_then(|f| f.name.clone())
+                    .unwrap_or_else(|| "<unnamed>".to_string());
+                return Err(mlua::Error::runtime(format!(
+                    "{name}:SetFrameStrata(): Unknown frame strata: {strata}"
+                )));
+            };
             lua.app_data_mut::<Model>()
                 .expect("model")
                 .arena
@@ -772,7 +784,6 @@ fn strata_name(s: Strata) -> &'static str {
         Strata::Fullscreen => "FULLSCREEN",
         Strata::FullscreenDialog => "FULLSCREEN_DIALOG",
         Strata::Tooltip => "TOOLTIP",
-        Strata::Blizzard => "BLIZZARD",
     }
 }
 
diff --git a/crates/benilla-ui/src/script/party.rs b/crates/benilla-ui/src/script/party.rs
index e346eb23..808bbc57 100644
--- a/crates/benilla-ui/src/script/party.rs
+++ b/crates/benilla-ui/src/script/party.rs
@@ -715,7 +715,7 @@ pub(crate) struct ReadyCheckState {
 
 /// `GetTime()`'s clock, the session seconds `UiScript::tick` advances.
 fn clock(lua: &Lua) -> f64 {
-    lua.globals().get("__benilla_now").unwrap_or(0.0)
+    crate::script::clock::now(lua)
 }
 
 /// The timeout worker `0x4bb310`.
@@ -765,7 +765,7 @@ fn ready_check_force_close(lua: &Lua, model: &mut Model) {
     if model.ready_check.deadline.is_none() {
         return;
     }
-    let now = clock(lua);
+    let now = model.now;
     model.ready_check.deadline = Some(now - 1.0);
     ready_check_tick(lua, model, now);
 }
@@ -1460,21 +1460,24 @@ mod tests {
         let mut s = UiScript::new().unwrap();
         let party = raid_we_lead(&s);
         s.set_party(party);
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         assert_eq!(s.take_party_requests(), vec![PartyRequest::ReadyCheckStart]);
 
-        s.run("__benilla_now = 129.9 CheckReadyCheckTime()")
-            .unwrap();
+        s.set_now(129.9);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert!(
             s.take_ready_check_lines().is_empty(),
             "not before the deadline"
         );
-        s.run("__benilla_now = 130 CheckReadyCheckTime()").unwrap();
+        s.set_now(130.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert_eq!(
             s.take_ready_check_lines(),
             vec!["The following players are AFK: Alice, Bob".to_string()]
         );
-        s.run("__benilla_now = 200 CheckReadyCheckTime()").unwrap();
+        s.set_now(200.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert!(
             s.take_ready_check_lines().is_empty(),
             "disarmed by the summary"
@@ -1487,7 +1490,8 @@ mod tests {
         let mut s = UiScript::new().unwrap();
         let party = raid_we_lead(&s);
         s.set_party(party);
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         s.ready_check_answered(0xA11CE, true);
         assert!(
             s.take_ready_check_lines().is_empty(),
@@ -1499,7 +1503,8 @@ mod tests {
             vec!["No players are AFK".to_string()],
             "nobody left pending ⇒ the summary now, not at 130"
         );
-        s.run("__benilla_now = 130 CheckReadyCheckTime()").unwrap();
+        s.set_now(130.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert!(s.take_ready_check_lines().is_empty());
     }
 
@@ -1511,7 +1516,8 @@ mod tests {
         s.run(r#"RAID_MEMBER_NOT_READY = "%s is not ready""#)
             .unwrap();
         s.set_party(party);
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         s.ready_check_answered(0xDEAD, false);
         assert!(
             s.take_ready_check_lines().is_empty(),
@@ -1522,7 +1528,8 @@ mod tests {
             s.take_ready_check_lines(),
             vec!["Alice is not ready".to_string()]
         );
-        s.run("__benilla_now = 130 CheckReadyCheckTime()").unwrap();
+        s.set_now(130.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert_eq!(
             s.take_ready_check_lines(),
             vec!["The following players are AFK: Bob".to_string()],
@@ -1541,7 +1548,8 @@ mod tests {
             .iter_mut()
             .for_each(|m| m.online = m.guid != 0xB0B); // Bob is offline
         s.set_party(party);
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         s.ready_check_answered(0xA11CE, true);
         assert_eq!(
             s.take_ready_check_lines(),
@@ -1557,9 +1565,10 @@ mod tests {
         s.run(r#"READY_CHECK_NO_AFK = "No players are AFK""#)
             .unwrap();
         s.set_party(two_member_party()); // Alice leads; we are 0x5E1F
-        s.run("__benilla_now = 100").unwrap();
+        s.set_now(100.0);
         s.ready_check_request(false);
-        s.run("__benilla_now = 130 CheckReadyCheckTime()").unwrap();
+        s.set_now(130.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert!(s.take_ready_check_lines().is_empty());
         assert_eq!(s.model_mut().ready_check.deadline, Some(130.0));
     }
@@ -1569,7 +1578,8 @@ mod tests {
         let mut s = UiScript::new().unwrap();
         let party = raid_we_lead(&s);
         s.set_party(party.clone());
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         s.ready_check_answered(0xA11CE, true);
         let mut without_bob = party;
         without_bob.raid.retain(|m| m.guid != 0xB0B);
@@ -1588,7 +1598,8 @@ mod tests {
         let mut party = raid_we_lead(&s);
         party.raid.clear();
         s.set_party(party);
-        s.run("__benilla_now = 100 DoReadyCheck()").unwrap();
+        s.set_now(100.0);
+        s.run("DoReadyCheck()").unwrap();
         s.ready_check_request(true);
         assert_eq!(
             s.take_ready_check_lines(),
@@ -1602,9 +1613,10 @@ mod tests {
         let mut s = UiScript::new().unwrap();
         let party = raid_we_lead(&s);
         s.set_party(party);
-        s.run("RAID_MEMBERS_AFK = nil __benilla_now = 100 DoReadyCheck()")
-            .unwrap();
-        s.run("__benilla_now = 130 CheckReadyCheckTime()").unwrap();
+        s.set_now(100.0);
+        s.run("RAID_MEMBERS_AFK = nil DoReadyCheck()").unwrap();
+        s.set_now(130.0);
+        s.run("CheckReadyCheckTime()").unwrap();
         assert_eq!(s.take_ready_check_lines(), vec![String::new()]);
     }
 }
diff --git a/crates/benilla-ui/src/script/pet.rs b/crates/benilla-ui/src/script/pet.rs
index 3310515c..44279704 100644
--- a/crates/benilla-ui/src/script/pet.rs
+++ b/crates/benilla-ui/src/script/pet.rs
@@ -104,22 +104,28 @@ pub struct PetStats {
 pub(crate) struct PetBarState {
     /// `PetHasActionBar()`: there is a bar, even one of ten empty slots.
     pub(crate) has_bar: bool,
-    /// `GetPetActionsUsable()`: false desaturates the whole bar.
+    /// `GetPetActionsUsable()` (`0x4bcf70`): false desaturates the whole bar, and refuses the
+    /// drag's bar writes with it (`0x4bc9d0`).
     pub(crate) actions_usable: bool,
     pub(crate) slots: Vec<StoredPetAction>,
     /// `HasPetUI`'s first return: a pet with a nonzero `UNIT_FIELD_PETNUMBER` (`0x4be697`). Not
     /// `has_bar`, whose gate is the cached guid alone.
     pub(crate) has_ui: bool,
     pub(crate) stats: PetStats,
-    /// `PickupPetAction`'s gate, `UNIT_FLAG_POSSESSED` clear (`0x4be1c1`), which blocks the drop
-    /// as well as the pick-up. Not `actions_usable`: possession does not grey the bar, and the
-    /// flags that grey it do not block a drag.
+    /// `PickupPetAction`'s gate: the pet's object resolves (`0x4be1f7`) and `UNIT_FLAG_POSSESSED`
+    /// is clear (`0x4be20a`), which blocks the drop as well as the pick-up. Not `actions_usable`:
+    /// possession does not grey the bar, and the pick-up itself does not ask it. The writes at
+    /// both ends do (`0x4bc9d0`), so a greyed bar with its pet in view still lifts an action onto
+    /// the cursor and then writes nothing.
     pub(crate) pickup_allowed: bool,
     /// `PetCanBeAbandoned()`: a kept pet rather than a summon. It forks the pet menu: paperdoll,
     /// rename and abandon show when true, dismiss only when false (`UnitPopup.lua:402-417`).
     pub(crate) can_be_abandoned: bool,
     /// `PetCanBeRenamed()`, ANDed with the above for the rename row; set until the first rename.
     pub(crate) can_be_renamed: bool,
+    /// The charm or possess expiry `[0xb714a8]` on the `GetTime` clock, in seconds: the last
+    /// `SMSG_PET_SPELLS` duration past its arrival, `None` for a packet whose duration is 0.
+    pub(crate) expiry: Option<f64>,
 }
 
 impl super::UiScript {
@@ -160,6 +166,12 @@ impl super::UiScript {
         bar.stats = stats;
     }
 
+    /// Push the pet's expiry on the `GetTime` clock, `None` for none: `SetPet` (`0x4bc7e0`)
+    /// stores `OsTick() + duration` for each `SMSG_PET_SPELLS` whose duration is not 0, else 0.
+    pub fn set_pet_expiry(&mut self, expiry: Option<f64>) {
+        self.model_mut().pet_bar.expiry = expiry;
+    }
+
     /// Push the menu's two predicates, which move with the pet's `UNIT_FIELD_FLAGS`.
     pub fn set_pet_menu(&mut self, can_be_abandoned: bool, can_be_renamed: bool) {
         let bar = &mut self.model_mut().pet_bar;
@@ -167,9 +179,13 @@ impl super::UiScript {
         bar.can_be_renamed = can_be_renamed;
     }
 
-    /// Drain the 1-based slots `CastPetAction` queued; the app decides what each one sends.
+    /// Take the `CastPetAction` calls out of the call stream, as 1-based slots; the app decides
+    /// what each one sends.
     pub fn take_pet_actions(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().pet_actions_pressed)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::PetAction(slot) => Some(*slot),
+            _ => None,
+        })
     }
 
     /// Drain the 1-based slot indices `TogglePetAutocast` queued.
@@ -182,9 +198,13 @@ impl super::UiScript {
         std::mem::replace(&mut self.model_mut().pet_stop_attacks, 0)
     }
 
-    /// Drain the one-shot orders (`PetAttack` and the rest), each a packed slot word.
+    /// Take the one-shot orders (`PetAttack` and the rest) out of the call stream, each a packed
+    /// slot word.
     pub fn take_pet_orders(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().pet_orders)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::PetOrder(packed) => Some(*packed),
+            _ => None,
+        })
     }
 
     /// Set the flag `HasFullControl` answers.
@@ -227,6 +247,28 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
 
     let flag = |b: bool| if b { Value::Integer(1) } else { Value::Nil };
 
+    // GetPetTimeRemaining() (`0x4be600`): nil with no expiry, else the milliseconds to it as an
+    // unsigned 32-bit tick difference (`fild qword` over a zero high dword), so one past its
+    // expiry wraps to about 4.29e9 until the next packet. The stock caller is commented out
+    // (`PetFrame.lua:91-97`).
+    g.set(
+        "GetPetTimeRemaining",
+        lua.create_function(|lua, ()| {
+            let expiry = lua
+                .app_data_ref::<Model>()
+                .expect("model app_data")
+                .pet_bar
+                .expiry;
+            let Some(expiry) = expiry else {
+                return Ok(Value::Nil);
+            };
+            let now = crate::script::clock::now(lua);
+            #[allow(clippy::cast_possible_truncation)] // a tick difference, wrapped as the u32 is
+            let ms = ((expiry - now) * 1000.0).round() as i64 as u32;
+            Ok(Value::Number(f64::from(ms)))
+        })?,
+    )?;
+
     g.set(
         "PetHasActionBar",
         lua.create_function(move |lua, ()| {
@@ -272,7 +314,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     g.set(
         "GetPetActionCooldown",
         lua.create_function(|lua, i: u32| {
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             let model = lua.app_data_ref::<Model>().expect("model app_data");
             Ok(match slot_at(&model, i).and_then(|s| s.cooldown) {
                 Some((start, duration, enabled)) if start + duration > now || !enabled => {
@@ -300,7 +342,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, i: u32| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             if slot_at(&model, i).is_some_and(|s| s.view.name.is_some()) {
-                model.pet_actions_pressed.push(i);
+                model.script_calls.push(super::ScriptCall::PetAction(i));
             }
             Ok(())
         })?,
@@ -461,7 +503,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
             lua.create_function(move |lua, ()| {
                 let mut model = lua.app_data_mut::<Model>().expect("model app_data");
                 if model.pet_bar.has_bar {
-                    model.pet_orders.push(packed);
+                    model.script_calls.push(super::ScriptCall::PetOrder(packed));
                 }
                 Ok(())
             })?,
@@ -538,6 +580,39 @@ mod tests {
     use super::{PetActionView, PetStats};
     use crate::script::UiScript;
 
+    /// A charmed or possessed unit's time left in ms, nil for none, and the unsigned wrap once
+    /// the expiry has passed (`0x4be634`).
+    #[test]
+    fn pet_time_remaining_counts_down_to_the_expiry() {
+        let mut s = UiScript::new().unwrap();
+        assert!(s
+            .eval::<Option<f64>>("return GetPetTimeRemaining()")
+            .unwrap()
+            .is_none());
+        s.tick(10.0);
+        s.set_pet_expiry(Some(12.5));
+        assert_eq!(
+            s.eval::<f64>("return GetPetTimeRemaining()").unwrap(),
+            2500.0
+        );
+        s.tick(2.0);
+        assert_eq!(
+            s.eval::<f64>("return GetPetTimeRemaining()").unwrap(),
+            500.0
+        );
+        s.tick(1.0);
+        assert_eq!(
+            s.eval::<f64>("return GetPetTimeRemaining()").unwrap(),
+            f64::from(u32::MAX - 499),
+            "0.5 s past it"
+        );
+        s.set_pet_expiry(None);
+        assert!(s
+            .eval::<Option<f64>>("return GetPetTimeRemaining()")
+            .unwrap()
+            .is_none());
+    }
+
     /// Attack (a token, attacking), Claw (a spell, autocasting, cooling down), an empty slot.
     fn slots() -> Vec<PetActionView> {
         vec![
diff --git a/crates/benilla-ui/src/script/petition.rs b/crates/benilla-ui/src/script/petition.rs
index 3c918d51..1e80165e 100644
--- a/crates/benilla-ui/src/script/petition.rs
+++ b/crates/benilla-ui/src/script/petition.rs
@@ -66,6 +66,11 @@ pub enum PetitionRequest {
     TurnIn,
     /// `CloseGuildRegistrar()`: sends nothing (`0x4f5010`).
     CloseRegistrar,
+    /// `GetTabardInfo()` (`0x4f5300`), not a getter: with a player, `MSG_TABARDVENDOR_ACTIVATE`
+    /// for the registrar's guid unless the designer is already open on that guid, or the
+    /// `ERR_EMBLEMERROR_NOTABARDGEOSET` refusal while the player's display id is not its native
+    /// one (`0x5e00e0`); then the registrar closes (`0x4f5355` → `0x4f5010`).
+    TabardInfo,
     /// `SignPetition([n])`: a wire byte defaulting to 1, not 0 (`0x4f46d9`); vmangos skips it.
     Sign(i8),
     /// `OfferPetition()`: the app resolves the current target (`CGGameUI`'s selection pair, not its
@@ -222,10 +227,12 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     )?;
 
     // ── The verbs ────────────────────────────────────────────────────────────────────────────
-    // The four that carry and push nothing; none may touch the snapshot, which the server owns.
+    // The five that carry and push nothing; none may touch the snapshot, which the server owns.
+    // `GetTabardInfo`'s stock caller is commented out (`GuildRegistrarFrame.xml:190`).
     for (global, request) in [
         ("TurnInGuildCharter", PetitionRequest::TurnIn),
         ("CloseGuildRegistrar", PetitionRequest::CloseRegistrar),
+        ("GetTabardInfo", PetitionRequest::TabardInfo),
         ("OfferPetition", PetitionRequest::Offer),
         ("ClosePetition", PetitionRequest::ClosePetition),
     ] {
@@ -529,6 +536,21 @@ mod tests {
         }
     }
 
+    /// `GetTabardInfo()` pushes nothing (`0x4f535f`) and queues the designer's opener.
+    #[test]
+    fn get_tabard_info_is_an_intent_with_no_returns() {
+        let mut s = UiScript::new().unwrap();
+        assert_eq!(
+            s.eval::<i64>("local n = function(...) return arg.n end return n(GetTabardInfo())")
+                .unwrap(),
+            0
+        );
+        assert_eq!(
+            s.take_petition_requests(),
+            vec![PetitionRequest::TabardInfo]
+        );
+    }
+
     #[test]
     fn dropping_close_intents_leaves_the_other_verbs_untouched() {
         let mut s = UiScript::new().unwrap();
diff --git a/crates/benilla-ui/src/script/quest.rs b/crates/benilla-ui/src/script/quest.rs
index 456dce4a..36b23d57 100644
--- a/crates/benilla-ui/src/script/quest.rs
+++ b/crates/benilla-ui/src/script/quest.rs
@@ -24,7 +24,8 @@ pub enum QuestPanel {
 /// One choice, reward or required item row; its 1-based index is its place in its list.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct QuestItemView {
-    /// `None`, answered as nil, while the item template is in flight.
+    /// `None` while the item template is in flight: `GetQuestItemInfo` answers an empty name, the
+    /// log getters their miss.
     pub name: Option<String>,
     pub texture: Option<String>,
     pub count: u32,
@@ -32,8 +33,8 @@ pub struct QuestItemView {
     pub quality: u32,
     /// The item id the quest tooltips render by; 0 until the wire row resolves.
     pub item_id: u32,
-    /// Whether the player can use the item; stock tints the row red when not
-    /// (`QuestFrame.lua:393`). The app always sends `true`.
+    /// Whether the player can use the item, `isUsable` as 1 or nil; stock tints the row red when
+    /// not (`QuestFrame.lua:393`). The app always sends `true`.
     pub usable: bool,
     /// The escaped item link `GetQuestItemLink` and `GetQuestLogItemLink` serve; `None` until the
     /// template lands, since it embeds the name and the quality.
@@ -176,6 +177,10 @@ pub(super) fn reward_spell_returns(
     Ok(MultiValue::from_vec(vec![texture, name, tradeskill]))
 }
 
+/// The icon an empty offer row answers: display 0 has no `ItemDisplayInfo` row, so the icon
+/// lookup falls back to the question mark (`0x5d88b0`, `0x847fe4`) under the icon folder.
+const EMPTY_ROW_ICON: &str = "Interface\\Icons\\INV_Misc_QuestionMark";
+
 /// The list `GetQuestItemInfo(type, index)` reads for `type`.
 pub(super) fn item_vec<'a>(state: &'a QuestState, kind: &str) -> Option<&'a Vec<QuestItemView>> {
     match kind {
@@ -260,37 +265,63 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     install_title(lua, "GetActiveTitle", true)?;
     install_title(lua, "GetAvailableTitle", false)?;
 
-    // GetQuestItemInfo(type, index) → name, texture, numItems, quality, isUsable.
+    // GetQuestItemInfo(type, index) → name, texture, numItems, quality, isUsable (`0x501f80`): five
+    // values, `isUsable` 1 or nil. A type other than `"reward"`, `"choice"` or `"required"` (any
+    // case, `0x64a4c0`) or an index outside 1..7 (`0x501719`) raises `0x84edd8`, as does a
+    // non-string type or non-number index. An index inside that range with no item answers the
+    // zeroed row the offer publisher leaves (`0x500ef0`): no name, the question-mark icon of
+    // display 0, count 0, quality 0 and usable. A template in flight answers an empty name.
     g.set(
         "GetQuestItemInfo",
-        lua.create_function(|lua, (kind, index): (String, usize)| {
+        lua.create_function(|lua, (kind, index): (Value, Value)| {
+            let invalid =
+                || mlua::Error::runtime(r#"Invalid quest item in GetQuestItemInfo("type", index)"#);
+            let kind = match &kind {
+                Value::String(_) | Value::Integer(_) | Value::Number(_) => lua
+                    .coerce_string(kind.clone())?
+                    .map(|s| s.to_string_lossy().to_ascii_lowercase()),
+                _ => None,
+            }
+            .ok_or_else(invalid)?;
+            let index = lua.coerce_number(index)?.ok_or_else(invalid)?;
+            // `_ftol` then `dec`, compared unsigned against 6.
+            let row = index.trunc() as i64 - 1;
+            if !(0..=6).contains(&row) {
+                return Err(invalid());
+            }
             let item = {
                 let model = lua.app_data_ref::<Model>().expect("model app_data");
-                model.quest.as_ref().and_then(|q| {
-                    item_vec(q, &kind)
-                        .and_then(|v| index.checked_sub(1).and_then(|n| v.get(n)))
-                        .cloned()
-                })
+                let empty = Vec::new();
+                let list = match model.quest.as_ref() {
+                    Some(q) => item_vec(q, &kind),
+                    None => ["reward", "choice", "required"]
+                        .contains(&kind.as_str())
+                        .then_some(&empty),
+                };
+                let Some(list) = list else {
+                    return Err(invalid());
+                };
+                list.get(row as usize).cloned()
             };
-            let Some(it) = item else {
-                return Ok(MultiValue::from_vec(vec![Value::Nil]));
-            };
-            let name = match &it.name {
-                Some(n) => Value::String(lua.create_string(n)?),
-                None => Value::Nil,
-            };
-            let texture = match &it.texture {
-                Some(t) => Value::String(lua.create_string(t)?),
-                None => Value::Nil,
+            let (name, texture, count, quality, usable) = match item {
+                Some(it) => (
+                    it.name.unwrap_or_default(),
+                    it.texture,
+                    it.count,
+                    it.quality,
+                    it.usable,
+                ),
+                None => (String::new(), Some(EMPTY_ROW_ICON.to_string()), 0, 0, true),
             };
             Ok(MultiValue::from_vec(vec![
-                name,
-                texture,
-                Value::Integer(i64::from(it.count)),
-                Value::Integer(i64::from(it.quality)),
-                Value::Boolean(it.usable),
-                // Not 1.12's: a sixth return, the item id, after its five; nothing reads it.
-                Value::Integer(i64::from(it.item_id)),
+                Value::String(lua.create_string(&name)?),
+                match texture {
+                    Some(t) => Value::String(lua.create_string(&t)?),
+                    None => Value::Nil,
+                },
+                Value::Integer(i64::from(count)),
+                Value::Integer(i64::from(quality)),
+                super::binding_abi::flag(usable),
             ]))
         })?,
     )?;
@@ -530,27 +561,48 @@ mod tests {
         assert_eq!(s.eval::<i64>("return GetNumQuestRewards()").unwrap(), 1);
         assert_eq!(s.eval::<i64>("return GetRewardMoney()").unwrap(), 1234);
 
+        // Five values, `isUsable` 1 or nil (`0x501f80`), the type matched in any case.
+        assert_eq!(s.arity(r#"GetQuestItemInfo("reward", 1)"#).unwrap(), 5);
         let (name, texture, count, quality, usable) = s
-            .eval::<(String, String, i64, i64, bool)>("return GetQuestItemInfo(\"reward\", 1)")
+            .eval::<(String, String, i64, i64, i64)>(r#"return GetQuestItemInfo("REWARD", 1)"#)
             .unwrap();
         assert_eq!(name, "Brdle Leather Boots");
         assert_eq!(texture, "Interface\\Icons\\INV_Boots_01");
-        assert_eq!((count, quality, usable), (1, 2, true));
+        assert_eq!((count, quality, usable), (1, 2, 1));
 
-        // Choice row 2 is in flight: name and texture nil, the rest present.
+        // Choice row 2 is in flight: an empty name, the rest present.
         assert!(s
             .eval::<bool>(
                 "local n, t, c = GetQuestItemInfo(\"choice\", 2)\n\
-                 return n == nil and t == nil and c == 1"
+                 return n == '' and t == nil and c == 1"
             )
             .unwrap());
-        // Out of range, and an unknown type: nil.
-        assert!(s
-            .eval::<bool>("return GetQuestItemInfo(\"reward\", 9) == nil")
-            .unwrap());
-        assert!(s
-            .eval::<bool>("return GetQuestItemInfo(\"bogus\", 1) == nil")
-            .unwrap());
+        // Inside 1..7 with no item: the zeroed row, display 0's question mark.
+        assert_eq!(
+            s.eval::<(String, String, i64, i64, i64)>(r#"return GetQuestItemInfo("reward", 7)"#)
+                .unwrap(),
+            (
+                String::new(),
+                "Interface\\Icons\\INV_Misc_QuestionMark".to_string(),
+                0,
+                0,
+                1
+            )
+        );
+        // Outside 1..7, an unknown type or a missing argument raises `0x84edd8`.
+        for call in [
+            r#"GetQuestItemInfo("reward", 8)"#,
+            r#"GetQuestItemInfo("reward", 0)"#,
+            r#"GetQuestItemInfo("bogus", 1)"#,
+            r#"GetQuestItemInfo("reward")"#,
+            "GetQuestItemInfo()",
+        ] {
+            let e = s.run(call).expect_err(call).to_string();
+            assert!(
+                e.contains(r#"Invalid quest item in GetQuestItemInfo("type", index)"#),
+                "{call}: {e}"
+            );
+        }
 
         // The link is nil for the in-flight row, out of range, and for an unknown type.
         assert_eq!(
diff --git a/crates/benilla-ui/src/script/quest_log.rs b/crates/benilla-ui/src/script/quest_log.rs
index 805bf010..f8c2535a 100644
--- a/crates/benilla-ui/src/script/quest_log.rs
+++ b/crates/benilla-ui/src/script/quest_log.rs
@@ -347,7 +347,10 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     })?;
 
     // `name, texture, numItems, quality, isUsable`, the giver panels' shape, as one stock routine
-    // lays out both (`QuestFrameItems_Update`, `QuestFrame.lua:311`).
+    // lays out both (`QuestFrameItems_Update`, `QuestFrame.lua:311`): five values, `isUsable` 1 or
+    // nil (`0x4e0b00`, `0x4e0cf0`). No selected quest, an index past the list or a template in
+    // flight answers `nil, nil, 1, 0, nil` (`0x4e0ca8`); a non-number index raises the reward
+    // getter's Usage line from both (`0x84b6ac`).
     fn install_detail_item(
         lua: &Lua,
         name: &str,
@@ -355,32 +358,39 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     ) -> mlua::Result<()> {
         lua.globals().set(
             name,
-            lua.create_function(move |lua, i: usize| {
+            lua.create_function(move |lua, index: Value| {
+                let i = lua
+                    .coerce_number(index)?
+                    .ok_or_else(|| mlua::Error::runtime("Usage: GetQuestLogRewardInfo(index)"))?;
+                let row = i.trunc() as i64 - 1;
                 let item = {
                     let model = lua.app_data_ref::<Model>().expect("model app_data");
-                    model
-                        .selected_quest_detail()
-                        .and_then(|d| i.checked_sub(1).and_then(|n| pick(d).get(n)).cloned())
+                    model.selected_quest_detail().and_then(|d| {
+                        usize::try_from(row)
+                            .ok()
+                            .and_then(|n| pick(d).get(n))
+                            .cloned()
+                    })
                 };
-                let Some(it) = item else {
-                    return Ok(MultiValue::from_vec(vec![Value::Nil]));
-                };
-                let name_v = match &it.name {
-                    Some(n) => Value::String(lua.create_string(n)?),
-                    None => Value::Nil,
+                let Some((it, name)) = item.and_then(|it| it.name.clone().map(|n| (it, n))) else {
+                    return Ok(MultiValue::from_vec(vec![
+                        Value::Nil,
+                        Value::Nil,
+                        Value::Integer(1),
+                        Value::Integer(0),
+                        Value::Nil,
+                    ]));
                 };
                 let texture = match &it.texture {
                     Some(t) => Value::String(lua.create_string(t)?),
                     None => Value::Nil,
                 };
                 Ok(MultiValue::from_vec(vec![
-                    name_v,
+                    Value::String(lua.create_string(&name)?),
                     texture,
                     Value::Integer(i64::from(it.count)),
                     Value::Integer(i64::from(it.quality)),
-                    Value::Boolean(it.usable),
-                    // The item id, a sixth return that is not 1.12's.
-                    Value::Integer(i64::from(it.item_id)),
+                    crate::script::binding_abi::flag(it.usable),
                 ]))
             })?,
         )
@@ -1009,15 +1019,38 @@ mod tests {
             40
         );
         assert_eq!(s.eval::<i64>("return GetNumQuestLogRewards()").unwrap(), 1);
+        // Five values, `isUsable` 1 or nil (`0x4e0b00`).
+        assert_eq!(s.arity("GetQuestLogRewardInfo(1)").unwrap(), 5);
         assert!(s
             .eval::<bool>(
                 "local n, _, c, q, u = GetQuestLogRewardInfo(1)\n\
-                 return n == 'Militia Hammer' and c == 1 and q == 1 and u == true"
+                 return n == 'Militia Hammer' and c == 1 and q == 1 and u == 1"
             )
             .unwrap());
-        assert!(s
-            .eval::<bool>("return GetQuestLogChoiceInfo(1) == nil")
-            .unwrap());
+        // No row answers the miss, `nil, nil, 1, 0, nil` (`0x4e0ca8`), from either getter.
+        for call in [
+            "GetQuestLogChoiceInfo(1)",
+            "GetQuestLogRewardInfo(2)",
+            "GetQuestLogRewardInfo(0)",
+        ] {
+            assert_eq!(s.arity(call).unwrap(), 5, "{call}");
+            assert!(
+                s.eval::<bool>(&format!(
+                    "local n, t, c, q, u = {call}\n\
+                     return n == nil and t == nil and c == 1 and q == 0 and u == nil"
+                ))
+                .unwrap(),
+                "{call}"
+            );
+        }
+        // A non-number index raises the reward getter's line from both (`0x84b6ac`).
+        for call in ["GetQuestLogRewardInfo()", "GetQuestLogChoiceInfo({})"] {
+            let e = s.run(call).expect_err(call).to_string();
+            assert!(
+                e.contains("Usage: GetQuestLogRewardInfo(index)"),
+                "{call}: {e}"
+            );
+        }
 
         assert_eq!(
             s.eval::<String>("return GetQuestLogItemLink(\"reward\", 1)")
diff --git a/crates/benilla-ui/src/script/region.rs b/crates/benilla-ui/src/script/region.rs
index db7c064c..0b9b2e3a 100644
--- a/crates/benilla-ui/src/script/region.rs
+++ b/crates/benilla-ui/src/script/region.rs
@@ -26,6 +26,39 @@ pub(super) fn region_handle_of(lua: &Lua, this: &Table) -> mlua::Result<RegionHa
         .ok_or_else(|| mlua::Error::runtime("stale or invalid region handle"))
 }
 
+/// Argument 1 of a global that takes a Texture as its `this` (`SetLootPortrait` `0x4c2b40`,
+/// `SetInventoryPortaitTexture` `0x4c9150`), with the member prologue's three raises: a non-table
+/// (`0x847ef8`), a table with no object at `[0]` (`0x847ec0`), and any object but a Texture, the
+/// `IsA` test against the Texture class token `[0xcf4cdc]` (`0x847e98`).
+pub(super) fn this_texture(lua: &Lua, this: &Value) -> mlua::Result<RegionHandle> {
+    let Value::Table(t) = this else {
+        return Err(mlua::Error::runtime(
+            "Attempt to find 'this' in non-table object (used '.' instead of ':' ?)",
+        ));
+    };
+    if decode_id(t).is_err() {
+        return Err(mlua::Error::runtime(
+            "Attempt to find 'this' in non-framescript object",
+        ));
+    }
+    let wrong = || mlua::Error::runtime("Wrong object type for member function");
+    let rh = region_handle_of(lua, t).map_err(|_| wrong())?;
+    let model = lua.app_data_ref::<Model>().expect("model app_data");
+    if model.arena.region(rh).map(|r| r.kind) != Some(RegionKind::Texture) {
+        return Err(wrong());
+    }
+    Ok(rh)
+}
+
+/// `CSimpleTexture::SetTexture(NULL)` (`0x770300` with 0): the texture slot emptied, a file, a
+/// solid fill and a baked unit portrait alike; the shader slot, and so the desaturation, stays.
+pub(super) fn clear_texture(model: &mut Model, rh: RegionHandle) {
+    let data = model.region_data.entry(rh).or_default();
+    data.texture = None;
+    data.fill = None;
+    data.portrait_unit = None;
+}
+
 /// Apply the font parts an XML element supplies (`font=`, `<FontHeight>`, `outline=`), any of
 /// which may be absent. Not the `SetFont` binding: the reference applies XML fonts in `LoadXML`,
 /// and its `SetFont` requires a path and a height (`0x87c69c`). Each part is an explicit set, so it
@@ -140,22 +173,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // BenillaSetBoothTexture(texture, slotToken): `SetPortraitTexture` without the circular mask;
-    // not a 1.12 global.
-    lua.globals().set(
-        "BenillaSetBoothTexture",
-        lua.create_function(|lua, (region, token): (Table, String)| {
-            let rh = region_handle_of(lua, &region)?;
-            let mut model = lua.app_data_mut::<Model>().expect("model");
-            let data = model.region_data.entry(rh).or_default();
-            data.portrait_unit = Some(token);
-            data.texture = None;
-            data.fill = None;
-            data.circular = false;
-            Ok(())
-        })?,
-    )?;
-
     // `__index` is the method table itself, here and on the leaf metatables, not a function
     // (~9 ns against ~195 ns per method access); sound while nothing replaces these tables.
     let region_meta = lua.create_table()?;
diff --git a/crates/benilla-ui/src/script/region/paint.rs b/crates/benilla-ui/src/script/region/paint.rs
index 6c6691a2..79bfa8e9 100644
--- a/crates/benilla-ui/src/script/region/paint.rs
+++ b/crates/benilla-ui/src/script/region/paint.rs
@@ -349,25 +349,39 @@ pub(super) fn install(lua: &Lua, m: &Table) -> mlua::Result<()> {
         })?,
     )?;
 
+    // SetDrawLayer(layer) (`0x79a780`) reads the layer name alone, against the five-row table at
+    // `0x811a80` (`0x6f18b0`); a further argument is never read, as 1.12 has no sub-level within a
+    // layer. A name off the table, or no name, raises the Usage line naming the region
+    // (`0x87c42c`), and the layer stays.
     m.set(
         "SetDrawLayer",
-        lua.create_function(|lua, (this, layer, sub): (Table, String, Option<i64>)| {
+        lua.create_function(|lua, (this, layer): (Table, Value)| {
             let rh = region_handle_of(lua, &this)?;
-            let dl = draw_layer_from_str(&layer)
-                .ok_or_else(|| mlua::Error::runtime(format!("unknown draw layer '{layer}'")))?;
+            let dl = match &layer {
+                Value::String(s) => draw_layer_from_str(&s.to_str()?),
+                _ => None,
+            };
+            let Some(dl) = dl else {
+                let name = {
+                    let model = lua.app_data_ref::<Model>().expect("model");
+                    crate::script::object::decode_id(&this)
+                        .ok()
+                        .and_then(|id| super::region_name_of(&model, id))
+                };
+                return Err(mlua::Error::runtime(format!(
+                    "Usage: {}:SetDrawLayer(\"layer\")",
+                    name.as_deref().unwrap_or("<unnamed>")
+                )));
+            };
             let mut model = lua.app_data_mut::<Model>().expect("model");
             if let Some(region) = model.arena.region_mut(rh) {
                 region.draw_layer = dl;
-                if let Some(s) = sub {
-                    region.sub_level = s.clamp(i64::from(i8::MIN), i64::from(i8::MAX)) as i8;
-                }
             }
             Ok(())
         })?,
     )?;
 
-    // GetDrawLayer (Texture `0x79a6c0`, FontString `0x79c660`): the layer name alone, since
-    // 1.12's pair is layer-only; the sub-level `SetDrawLayer` accepts is not 1.12's.
+    // GetDrawLayer (Texture `0x79a6c0`, FontString `0x79c660`): the layer name alone.
     m.set(
         "GetDrawLayer",
         lua.create_function(|lua, this: Table| {
diff --git a/crates/benilla-ui/src/script/region/text.rs b/crates/benilla-ui/src/script/region/text.rs
index 0fea2769..fcf553ea 100644
--- a/crates/benilla-ui/src/script/region/text.rs
+++ b/crates/benilla-ui/src/script/region/text.rs
@@ -200,5 +200,5 @@ pub(super) fn install(lua: &Lua, m: &Table) -> mlua::Result<()> {
     //
     // The font object, font, text colour and shadow getters and setters are type-guard shims over
     // one implementation each (`0x79f210` SetFont, `0x79f3b0` GetFont), shared with EditBox.
-    super::super::font_block::install(lua, m, region_handle_of, "FontString")
+    super::super::font_block::install(lua, m, region_handle_of, "FontString", None)
 }
diff --git a/crates/benilla-ui/src/script/shapeshift.rs b/crates/benilla-ui/src/script/shapeshift.rs
index 6a5b2c9c..926fdd7e 100644
--- a/crates/benilla-ui/src/script/shapeshift.rs
+++ b/crates/benilla-ui/src/script/shapeshift.rs
@@ -50,10 +50,13 @@ impl super::UiScript {
             .collect();
     }
 
-    /// Drain the form spells `CastShapeshiftForm` queued; the app casts each, or cancels it when it
-    /// is the active form.
+    /// Take the `CastShapeshiftForm` calls out of the call stream, as form spells; the app casts
+    /// each, or cancels it when it is the active form.
     pub fn take_shapeshift_casts(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().shapeshift_casts)
+        self.take_calls_where(|c| match c {
+            super::ScriptCall::CastShapeshiftForm(id) => Some(*id),
+            _ => None,
+        })
     }
 }
 
@@ -101,7 +104,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     g.set(
         "GetShapeshiftFormCooldown",
         lua.create_function(|lua, i: u32| {
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             let model = lua.app_data_ref::<Model>().expect("model app_data");
             Ok(match form_at(&model, i).and_then(|f| f.cooldown) {
                 Some((start, duration, enabled)) if start + duration > now || !enabled => {
@@ -117,7 +120,9 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, i: u32| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             if let Some(spell_id) = form_at(&model, i).map(|f| f.view.spell_id) {
-                model.shapeshift_casts.push(spell_id);
+                model
+                    .script_calls
+                    .push(super::ScriptCall::CastShapeshiftForm(spell_id));
             }
             Ok(())
         })?,
diff --git a/crates/benilla-ui/src/script/slash.rs b/crates/benilla-ui/src/script/slash.rs
index 46f8d6a0..a97e8265 100644
--- a/crates/benilla-ui/src/script/slash.rs
+++ b/crates/benilla-ui/src/script/slash.rs
@@ -1,6 +1,6 @@
 //! `SlashCmdList` dispatch from the host, for a line that reaches it without passing the stock
 //! `ChatEdit_ParseText` (`ChatFrame.lua`): the same walk, over the table the stock `ChatFrame.lua`
-//! declares, where the stock commands and benilla's own are entries.
+//! declares, where the stock commands, benilla's layer's and an addon's are entries.
 
 use mlua::{Table, Value};
 
@@ -25,6 +25,33 @@ impl super::UiScript {
         self.find_slash_handler(cmd).is_some()
     }
 
+    /// Register a host command as a `SlashCmdList` row, as an addon registers one: `SLASH_<key><n>`
+    /// for each alias (with its `/`) and a handler that queues `"<first alias> <msg>"` on the chat
+    /// input the host drains ([`Self::take_chat_input`]). A no-op before `ChatFrame.lua` has
+    /// declared `SlashCmdList`.
+    pub fn register_host_slash_command(&self, key: &str, aliases: &[&str]) -> mlua::Result<()> {
+        let globals = self.lua.globals();
+        let Ok(list) = globals.get::<Table>("SlashCmdList") else {
+            return Ok(());
+        };
+        let Some(first) = aliases.first() else {
+            return Ok(());
+        };
+        for (n, alias) in aliases.iter().enumerate() {
+            globals.set(format!("SLASH_{key}{}", n + 1), *alias)?;
+        }
+        let first = first.to_string();
+        let handler = self.lua.create_function(move |lua, msg: Option<String>| {
+            let line = format!("{first} {}", msg.unwrap_or_default());
+            lua.app_data_mut::<super::Model>()
+                .expect("model app_data")
+                .chat_input
+                .push(line);
+            Ok(())
+        })?;
+        list.set(key, handler)
+    }
+
     /// The reference's walk: over `SlashCmdList`'s keys, then `SLASH_<key><n>` to the first gap,
     /// case-insensitive.
     fn find_slash_handler(&self, cmd: &str) -> Option<mlua::Function> {
@@ -122,6 +149,24 @@ mod tests {
         );
     }
 
+    /// A host row is an ordinary `SlashCmdList` row that queues its line for the host.
+    #[test]
+    fn a_host_command_queues_its_line() {
+        let mut s = UiScript::new().unwrap();
+        s.register_host_slash_command("HOSTPROBE", &["/hostprobe", "/hp"])
+            .unwrap();
+        assert!(
+            !s.has_slash_command("hostprobe"),
+            "no table yet: nothing registers"
+        );
+        s.run("SlashCmdList = {}").unwrap();
+        s.register_host_slash_command("HOSTPROBE", &["/hostprobe", "/hp"])
+            .unwrap();
+        assert_eq!(s.eval::<String>("return SLASH_HOSTPROBE2").unwrap(), "/hp");
+        assert!(s.run_slash_command("hp", "a b"));
+        assert_eq!(s.take_chat_input(), ["/hostprobe a b"]);
+    }
+
     #[test]
     fn a_non_function_entry_is_not_a_command() {
         let s = UiScript::new().unwrap();
diff --git a/crates/benilla-ui/src/script/sound.rs b/crates/benilla-ui/src/script/sound.rs
index f33ac992..d7cba732 100644
--- a/crates/benilla-ui/src/script/sound.rs
+++ b/crates/benilla-ui/src/script/sound.rs
@@ -1,11 +1,10 @@
 //! The sound bindings: `PlaySound`, `PlaySoundFile`, `PlayMusic` and `StopMusic` each queue a
 //! plain request for the app to drain, since the engine does not touch the app's mixer.
 //!
-//! `PlaySound` takes a kit name, as the reference's binding does (`0x4586d0` reaches only
-//! `PlaySoundByName`, `0x458030`), and also Era's numeric kit id, which 1.12's binding does not
-//! take (the client plays a kit id internally through `0x458850`). Both verbs answer Era's
-//! `willPlay, soundHandle`, true and nil, not 1.12's shapes: the reference's `PlaySound` answers
-//! nothing and its `PlaySoundFile` one value (`reference/1.12-shapes.tsv`).
+//! `PlaySound` takes a kit name (`0x4586d0` reaches only `PlaySoundByName`, `0x458030`); a number
+//! is `lua_tostring`'s decimal name, which no `SoundEntries` row carries, so it plays nothing (the
+//! client plays a kit id internally, through `0x458850`). It answers nothing; `PlaySoundFile`
+//! answers one value (`0x458780`).
 //!
 //! The music pair drives its own slot: the reference gives Lua a stream of its own (`[0xb06ccc]`,
 //! opened in `0x460450` at `0x4604a7`) beside the zone track's (`[0xb06cc4]`), one of the client's
@@ -19,9 +18,7 @@ use super::Model;
 /// One queued sound for the app's kit player.
 #[derive(Clone, Debug, PartialEq)]
 pub enum SoundRequest {
-    /// `PlaySound(id)`: a `SoundEntries` kit id, Era's form.
-    KitId(u32),
-    /// `PlaySound("name")`: a kit name, the 1.12 form.
+    /// `PlaySound("name")`: a kit name, a number's decimal spelling included.
     KitName(String),
     /// `PlaySoundFile("path")`: a file path, no kit.
     File(String),
@@ -61,42 +58,38 @@ impl super::UiScript {
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     lua.globals().set(
         "PlaySoundFile",
+        // `0x458780`: `lua_isstring`, so a number is a file name, else the literal at `0x835f98`.
+        // It answers 1 when the play started and nil when `0x7a5450` refused it. Deviation: the
+        // app plays the queued file after the call, so the refusals (the bus-3 cap, a muted SFX
+        // channel, a missing file) come too late to answer, and a queued file answers 1.
         lua.create_function(|lua, args: mlua::MultiValue| {
-            let Some(Value::String(s)) = args.front() else {
-                return Err(mlua::Error::runtime("Usage: PlaySoundFile(\"filePath\")"));
-            };
-            let path = s.to_str()?.to_owned();
+            let path = super::binding_abi::string_arg(
+                lua,
+                args.front().cloned().unwrap_or(Value::Nil),
+                "Usage: PlaySoundFile(\"soundfile\")",
+            )?;
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             model.sound_queue.push(SoundRequest::File(path));
-            drop(model);
-            Ok((true, Value::Nil))
+            Ok(1)
         })?,
     )?;
     lua.globals().set(
         "PlaySound",
+        // `0x4586d0`: `lua_isstring`, then `lua_tostring`, so a number becomes its decimal name,
+        // else the literal at `0x835f60`; no return value on any path.
         lua.create_function(|lua, args: mlua::MultiValue| {
-            let req = match args.front() {
-                Some(Value::Integer(i)) if *i >= 0 => Some(SoundRequest::KitId(*i as u32)),
-                Some(Value::Number(n)) if *n >= 0.0 => Some(SoundRequest::KitId(*n as u32)),
-                Some(Value::String(s)) => Some(SoundRequest::KitName(s.to_str()?.to_owned())),
-                _ => None,
-            };
-            let Some(req) = req else {
-                // A bad argument raises a usage error, as the reference's does.
-                return Err(mlua::Error::runtime(
-                    "Usage: PlaySound(soundKitID or \"KitName\")",
-                ));
-            };
+            let name = super::binding_abi::string_arg(
+                lua,
+                args.front().cloned().unwrap_or(Value::Nil),
+                "Usage: PlaySound(\"sound\")",
+            )?;
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             // During the UI load a by-name play is dropped before any other gate (`0x458046`,
-            // `0x45804d`), while the binding still answers; the id entry (`0x457fb0`) has no
-            // such gate.
-            let suppressed = matches!(req, SoundRequest::KitName(_)) && model.sound_suppression > 0;
-            if !suppressed {
-                model.sound_queue.push(req);
+            // `0x45804d`).
+            if model.sound_suppression == 0 {
+                model.sound_queue.push(SoundRequest::KitName(name));
             }
-            drop(model);
-            Ok((true, Value::Nil))
+            Ok(())
         })?,
     )?;
     lua.globals().set(
@@ -135,29 +128,47 @@ mod tests {
     use super::{MusicRequest, SoundRequest};
     use crate::script::UiScript;
 
+    /// `PlaySound` names a kit and answers nothing (`0x4586d0`); a number is its decimal name,
+    /// never a `SoundEntries` id. `PlaySoundFile` answers one value, 1 for a play (`0x458780`).
     #[test]
-    fn playsound_queues_by_id_and_name_and_drains() {
+    fn playsound_queues_by_name_and_answers_nothing() {
         let mut s = UiScript::new().unwrap();
-        let (will_play, handle_is_nil): (bool, bool) = s
-            .eval("local w, h = PlaySound(1234) return w, h == nil")
-            .unwrap();
-        assert!(will_play && handle_is_nil);
-        // Era's extra arguments are ignored.
+        assert_eq!(s.arity("PlaySound(1234)").unwrap(), 0);
+        assert_eq!(s.arity(r#"PlaySound("GAMEOBJECT_DOOROPEN")"#).unwrap(), 0);
+        // Further arguments are never read.
         s.run(r#"PlaySound(841, "SFX", true)"#).unwrap();
-        s.run(r#"PlaySound("GAMEOBJECT_DOOROPEN")"#).unwrap();
-        s.run(r#"PlaySoundFile("Sound\\Doodad\\BellTollHorde.wav")"#)
-            .unwrap();
+        assert_eq!(
+            s.eval::<(i64, bool)>(
+                r#"local n = table.getn({PlaySoundFile("Sound\\Doodad\\BellTollHorde.wav")})
+                   return n, PlaySoundFile(12) == 1"#
+            )
+            .unwrap(),
+            (1, true)
+        );
 
         assert_eq!(
             s.take_sounds(),
             vec![
-                SoundRequest::KitId(1234),
-                SoundRequest::KitId(841),
+                SoundRequest::KitName("1234".into()),
                 SoundRequest::KitName("GAMEOBJECT_DOOROPEN".into()),
+                SoundRequest::KitName("841".into()),
                 SoundRequest::File("Sound\\Doodad\\BellTollHorde.wav".into()),
+                SoundRequest::File("12".into()),
             ]
         );
         assert!(s.take_sounds().is_empty());
+
+        for (call, usage) in [
+            ("PlaySound()", r#"Usage: PlaySound("sound")"#),
+            ("PlaySound({})", r#"Usage: PlaySound("sound")"#),
+            ("PlaySound(true)", r#"Usage: PlaySound("sound")"#),
+            ("PlaySoundFile()", r#"Usage: PlaySoundFile("soundfile")"#),
+            ("PlaySoundFile(nil)", r#"Usage: PlaySoundFile("soundfile")"#),
+        ] {
+            let e = s.run(call).expect_err(call).to_string();
+            assert!(e.contains(usage), "{call}: {e}");
+        }
+        assert!(s.take_sounds().is_empty(), "a raise queues nothing");
     }
 
     #[test]
@@ -204,14 +215,4 @@ mod tests {
             vec![MusicRequest::Play("42".into()), MusicRequest::Stop]
         );
     }
-
-    #[test]
-    fn playsound_with_a_bad_argument_is_a_usage_error() {
-        let mut s = UiScript::new().unwrap();
-        assert!(s.run("PlaySound(nil)").is_err());
-        assert!(s.run("PlaySound()").is_err());
-        assert!(s.run("PlaySoundFile()").is_err());
-        assert!(s.run("PlaySoundFile(42)").is_err());
-        assert!(s.take_sounds().is_empty());
-    }
 }
diff --git a/crates/benilla-ui/src/script/spellbook.rs b/crates/benilla-ui/src/script/spellbook.rs
index 58fb14b1..8ce11886 100644
--- a/crates/benilla-ui/src/script/spellbook.rs
+++ b/crates/benilla-ui/src/script/spellbook.rs
@@ -11,9 +11,9 @@
 
 use mlua::{Lua, MultiValue, Value};
 
-use super::binding_abi::flag;
+use super::binding_abi::{bool_or_default, flag};
 use super::cursor::{queue_cursor_update, CursorPayload, CursorSpell};
-use super::Model;
+use super::{Model, ScriptCall};
 
 const BOOKTYPE_SPELL: &str = "spell";
 const BOOKTYPE_PET: &str = "pet";
@@ -94,10 +94,13 @@ impl super::UiScript {
         self.model_mut().pet_book = state;
     }
 
-    /// Drain the pet spell ids `CastSpell(id, "pet")` queued: each is a `CMSG_PET_ACTION` with a
-    /// type-1 word (`0x4b34ce`), not a player cast.
-    pub fn take_pet_spell_casts(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().pet_spell_casts)
+    /// Take the `CastSpell(id, "pet")` calls out of the call stream as `(spell id, onSelf)`: each
+    /// is a `CMSG_PET_ACTION` with a type-1 word (`0x4b34ce`), not a player cast.
+    pub fn take_pet_spell_casts(&mut self) -> Vec<(u32, bool)> {
+        self.take_calls_where(|c| match c {
+            ScriptCall::CastPetSpell { spell_id, on_self } => Some((*spell_id, *on_self)),
+            _ => None,
+        })
     }
 
     /// Drain the spell ids `ToggleSpellAutocast` queued: `CMSG_PET_SPELL_AUTOCAST` (0x2F3, sent by
@@ -112,9 +115,13 @@ impl super::UiScript {
         self.model_mut().spellbook.clone()
     }
 
-    /// Drain the spell ids `CastSpell` and `CastSpellByName` queued.
-    pub fn take_spell_casts(&mut self) -> Vec<u32> {
-        std::mem::take(&mut self.model_mut().spell_casts)
+    /// Take the `CastSpell` and `CastSpellByName` calls out of the call stream as
+    /// `(spell id, onSelf)`.
+    pub fn take_spell_casts(&mut self) -> Vec<(u32, bool)> {
+        self.take_calls_where(|c| match c {
+            ScriptCall::CastSpell { spell_id, on_self } => Some((*spell_id, *on_self)),
+            _ => None,
+        })
     }
 
     /// Whether `SpellStopCasting()` has something to stop: an auto-repeat or an in-flight cast,
@@ -124,10 +131,12 @@ impl super::UiScript {
         self.model_mut().casting = casting;
     }
 
-    /// Drain the `SpellStopCasting()` trigger; the app stops the auto-repeat first, else the
-    /// in-flight cast, the reference's order.
+    /// Take the `SpellStopCasting()` calls out of the call stream: whether there was one. The app
+    /// stops the auto-repeat first, else the in-flight cast, the reference's order.
     pub fn take_spell_stop(&mut self) -> bool {
-        std::mem::take(&mut self.model_mut().spell_stop)
+        !self
+            .take_calls_where(|c| matches!(c, ScriptCall::SpellStopCasting).then_some(()))
+            .is_empty()
     }
 
     /// Whether the spell-targeting cursor is up, for `SpellIsTargeting()` and
@@ -142,16 +151,18 @@ impl super::UiScript {
         }
     }
 
-    /// Drain the `SpellStopTargeting()` trigger, the ESC chain's rung (`UIParent.lua:1490`); the
-    /// app clears its targeting mode.
+    /// Take the `SpellStopTargeting()` calls, the ESC chain's rung (`UIParent.lua:1490`), out of
+    /// the call stream: whether there was one. The app clears its targeting mode.
     pub fn take_stop_targeting(&mut self) -> bool {
-        std::mem::take(&mut self.model_mut().spell_stop_targeting)
+        !self
+            .take_calls_where(|c| matches!(c, ScriptCall::SpellStopTargeting).then_some(()))
+            .is_empty()
     }
 }
 
 /// Whether `bookType` names the pet book: a case-insensitive compare with `"pet"` alone
 /// (`0x4b3f27`), so any other string, `"spell"` included, is the player's book.
-fn is_pet_book(book_type: &str) -> bool {
+pub(super) fn is_pet_book(book_type: &str) -> bool {
     book_type.eq_ignore_ascii_case(BOOKTYPE_PET)
 }
 
@@ -435,7 +446,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         "GetSpellCooldown",
         lua.create_function(|lua, (id, book_type): (Value, Value)| {
             let (id, book_type) = spell_slot_args(id, book_type, "GetSpellCooldown")?;
-            let now: f64 = lua.globals().get("__benilla_now").unwrap_or(0.0);
+            let now = crate::script::clock::now(lua);
             let model = lua.app_data_ref::<Model>().expect("model app_data");
             let cooldown = book_slot(&model, id, &book_type).and_then(|s| s.cooldown);
             Ok(match cooldown {
@@ -464,28 +475,34 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // CastSpell(id, bookType), the plain click, queues the slot's spell unless it is passive. On
-    // the pet book `0x4b3300` forks at `0x4b34c8` (the player's cast is `0x6e5a90`) to send
-    // `CMSG_PET_ACTION` (0x175), `{ u64 [0xb714a0], u32 (spellId & 0xFFFF) | 0x01000000, u64
-    // target }` (`0x4b34ce`), so the pet book casts a spell not on the bar; the target falls back
-    // to the selection (`0x4b34af`), as in `CastPetAction`. The app sends both at the drain.
+    // CastSpell(id, bookType [, onSelf]), the plain click, queues the slot's spell unless it is
+    // passive. The third argument goes through `GetBoolOrDefault(L, 3, 0)` (`0x4b4333`-`0x4b433c`),
+    // and a nonzero one swaps the target guid for the active player's (`0x4b4345`) before the
+    // dispatcher `0x4b3300`. On the pet book that forks at `0x4b34c8` (the player's cast is
+    // `0x6e5a90`) to send `CMSG_PET_ACTION` (0x175), `{ u64 [0xb714a0], u32 (spellId & 0xFFFF) |
+    // 0x01000000, u64 target }` (`0x4b34ce`), so the pet book casts a spell not on the bar; the
+    // target falls back to the selection (`0x4b34af`), as in `CastPetAction`. The app sends both at
+    // the drain.
     g.set(
         "CastSpell",
-        lua.create_function(|lua, (id, book_type): (Value, Value)| {
-            let (id, book_type) = spell_slot_args(id, book_type, "CastSpell")?;
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            if let Some(slot) = book_slot(&model, id, &book_type) {
-                if !slot.passive {
-                    let spell_id = slot.spell_id;
-                    if is_pet_book(&book_type) {
-                        model.pet_spell_casts.push(spell_id);
-                    } else {
-                        model.spell_casts.push(spell_id);
+        lua.create_function(
+            |lua, (id, book_type, on_self): (Value, Value, Option<Value>)| {
+                let (id, book_type) = spell_slot_args(id, book_type, "CastSpell")?;
+                let on_self = bool_or_default(on_self.as_ref(), false);
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                if let Some(slot) = book_slot(&model, id, &book_type) {
+                    if !slot.passive {
+                        let spell_id = slot.spell_id;
+                        model.script_calls.push(if is_pet_book(&book_type) {
+                            ScriptCall::CastPetSpell { spell_id, on_self }
+                        } else {
+                            ScriptCall::CastSpell { spell_id, on_self }
+                        });
                     }
                 }
-            }
-            Ok(())
-        })?,
+                Ok(())
+            },
+        )?,
     )?;
 
     // HasPetSpells() -> numPetSpells, petToken: always two returns (`0x4b4410`), `(nil, nil)` with
@@ -542,15 +559,19 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
     )?;
 
     // CastSpellByName(name [, onSelf]) (`0x4b4ab0`) shares the dispatcher `0x4b3300` with
-    // `CastSpell`, so it queues on the same list; `SlashCmdList["CAST"]` calls it. `onSelf` is
-    // accepted and ignored: self-cast is not built.
+    // `CastSpell`, so it queues the same call; `SlashCmdList["CAST"]` calls it. The target guid
+    // defaults to the selection (`0x4b4adb`), and a nonzero `GetBoolOrDefault(L, 2, 0)`
+    // (`0x4b4aea`-`0x4b4af1`) swaps it for the active player's (`0x4b4afa`).
     g.set(
         "CastSpellByName",
-        lua.create_function(|lua, (name, _on_self): (String, MultiValue)| {
+        lua.create_function(|lua, (name, on_self): (String, Option<Value>)| {
+            let on_self = bool_or_default(on_self.as_ref(), false);
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             if let Some(slot) = resolve_spell_by_name(&model.spellbook, &name) {
                 let spell_id = slot.spell_id;
-                model.spell_casts.push(spell_id);
+                model
+                    .script_calls
+                    .push(ScriptCall::CastSpell { spell_id, on_self });
             }
             Ok(())
         })?,
@@ -575,7 +596,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, ()| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             if model.casting {
-                model.spell_stop = true;
+                model.script_calls.push(ScriptCall::SpellStopCasting);
                 Ok(Value::Integer(1))
             } else {
                 Ok(Value::Nil)
@@ -583,35 +604,33 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // SpellIsTargeting() (`0x6e6cd0`): true while the targeting cursor is up, else nil.
+    // SpellIsTargeting() (`0x6e6cd0`): 1 while the targeting cursor is up, else nil.
     g.set(
         "SpellIsTargeting",
         lua.create_function(|lua, ()| {
             let model = lua.app_data_ref::<Model>().expect("model app_data");
-            if model.spell_targeting {
-                Ok(Value::Boolean(true))
-            } else {
-                Ok(Value::Nil)
-            }
+            Ok(flag(model.spell_targeting))
         })?,
     )?;
 
-    // SpellCanTargetUnit("unit") (`0x6e6d00`) asks `0x6e6460`'s unit leg whether the standing
-    // word clears against that resolved unit.
+    // SpellCanTargetUnit("unit") (`0x6e6d00`): the argument is a string or a number (`0x6e6d0e`,
+    // else `Usage:`), resolved through `0x515970` (`0x6e6d3a`), which raises for a token it does
+    // not know; a token naming nobody answers nil (`0x6e6d43`), and a guid asks `0x6e6460`'s unit
+    // leg whether the standing word clears against it, answering 1 or nil.
     g.set(
         "SpellCanTargetUnit",
-        lua.create_function(|lua, unit: Option<String>| {
+        lua.create_function(|lua, unit: Value| {
+            let token = crate::script::binding_abi::string_arg(
+                lua,
+                unit,
+                r#"Usage: SpellCanTargetUnit("unit")"#,
+            )?;
             let model = lua.app_data_ref::<Model>().expect("model app_data");
-            let can = unit.is_some_and(|unit| {
-                model
-                    .spell_targetable_units
-                    .contains(&unit.to_ascii_lowercase())
-            });
-            if can {
-                Ok(Value::Boolean(true))
-            } else {
-                Ok(Value::Nil)
-            }
+            let can = model
+                .unit_guids
+                .guid_of(&token)?
+                .is_some_and(|guid| model.spell_targetable_units.contains(&guid));
+            Ok(flag(can))
         })?,
     )?;
 
@@ -623,7 +642,7 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, ()| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             if model.spell_targeting {
-                model.spell_stop_targeting = true;
+                model.script_calls.push(ScriptCall::SpellStopTargeting);
                 Ok(Value::Integer(1))
             } else {
                 Ok(Value::Nil)
@@ -640,6 +659,16 @@ mod tests {
     use crate::script::cursor::{CursorAction, CursorPayload};
     use crate::script::UiScript;
 
+    #[test]
+    fn spell_is_targeting_answers_one_or_nil() {
+        let mut s = UiScript::new().unwrap();
+        assert!(s.eval::<bool>("return SpellIsTargeting() == nil").unwrap());
+        s.set_spell_targeting(true);
+        assert!(s.eval::<bool>("return SpellIsTargeting() == 1").unwrap());
+        s.set_spell_targeting(false);
+        assert!(s.eval::<bool>("return SpellIsTargeting() == nil").unwrap());
+    }
+
     /// Two tabs: Fire (Fireball, and Fire Blast marked passive) and Frost (Frost Armor).
     fn book() -> SpellBookState {
         SpellBookState {
@@ -886,14 +915,14 @@ mod tests {
         s.run(r#"picked = PickupSpell(1, BOOKTYPE_SPELL)"#).unwrap();
         assert!(s.eval::<bool>("return picked").unwrap());
         assert!(s.cursor_payload().is_some());
-        let (kind, book_id, book, spell_id) = s
-            .eval::<(String, i64, String, i64)>(
-                "local k, slot, book, id = GetCursorInfo() return k, slot, book, id",
-            )
-            .unwrap();
-        assert_eq!(
-            (kind.as_str(), book_id, book.as_str(), spell_id),
-            ("spell", 1, "spell", 133)
+        assert!(
+            matches!(
+                s.cursor_payload(),
+                Some(crate::script::CursorPayload::Spell(c))
+                    if c.book_slot == 1 && c.book_type == "spell" && c.spell_id == 133
+            ),
+            "{:?}",
+            s.cursor_payload()
         );
 
         // Tick first to flush the first pickup's `CURSOR_UPDATE`, so the count below is the
@@ -916,12 +945,14 @@ mod tests {
             "refused pickup fires no CURSOR_UPDATE"
         );
         // Still holding the first pickup: a refusal never clobbers it.
-        assert_eq!(
-            s.eval::<(String, i64, String, i64)>(
-                "local k, slot, book, id = GetCursorInfo() return k, slot, book, id"
-            )
-            .unwrap(),
-            ("spell".to_string(), 1, "spell".to_string(), 133)
+        assert!(
+            matches!(
+                s.cursor_payload(),
+                Some(crate::script::CursorPayload::Spell(c))
+                    if c.book_slot == 1 && c.book_type == "spell" && c.spell_id == 133
+            ),
+            "{:?}",
+            s.cursor_payload()
         );
     }
 
@@ -940,10 +971,13 @@ mod tests {
             .eval::<bool>(r#"return PickupSpell(1, BOOKTYPE_SPELL)"#)
             .unwrap());
         // The original (action) payload survives untouched.
-        assert_eq!(
-            s.eval::<String>("local k = GetCursorInfo() return k")
-                .unwrap(),
-            "action"
+        assert!(
+            matches!(
+                s.cursor_payload(),
+                Some(crate::script::CursorPayload::Action(_))
+            ),
+            "{:?}",
+            s.cursor_payload()
         );
     }
 
@@ -953,7 +987,7 @@ mod tests {
         s.set_spellbook(book());
 
         s.run(r#"CastSpell(1, BOOKTYPE_SPELL)"#).unwrap(); // Fireball: active
-        assert_eq!(s.take_spell_casts(), vec![133]);
+        assert_eq!(s.take_spell_casts(), vec![(133, false)]);
 
         s.run(r#"CastSpell(2, BOOKTYPE_SPELL)"#).unwrap(); // Fire Blast: passive, refused
         assert!(s.take_spell_casts().is_empty());
@@ -966,6 +1000,75 @@ mod tests {
             .unwrap());
     }
 
+    /// `CastSpellByName`'s second argument goes through `GetBoolOrDefault(L, 2, 0)`
+    /// (`0x4b4aea`-`0x4b4af1`), which is not Lua truthiness: `"0"`, `"false"` and `0.5` are false.
+    #[test]
+    fn cast_spell_by_name_reads_on_self_as_the_reference_coerces_it() {
+        let mut s = UiScript::new().unwrap();
+        s.set_spellbook(book());
+        for (arg, on_self) in [
+            ("", false),
+            (", nil", false),
+            (", false", false),
+            (", 0", false),
+            (", 0.5", false),
+            (r#", "0""#, false),
+            (r#", "false""#, false),
+            (r#", "off""#, false),
+            (", 1", true),
+            (", true", true),
+            (", 1, 0", true),
+            (r#", "1""#, true),
+            (r#", "yes""#, true),
+            (r#", "on""#, true),
+            (r#", "enabled""#, true),
+        ] {
+            s.run(&format!(r#"CastSpellByName("Fireball"{arg})"#))
+                .unwrap();
+            assert_eq!(
+                s.take_spell_casts(),
+                vec![(133, on_self)],
+                "CastSpellByName(\"Fireball\"{arg})"
+            );
+        }
+    }
+
+    /// `CastSpell`'s third argument is `GetBoolOrDefault(L, 3, 0)` (`0x4b4333`-`0x4b433c`), on the
+    /// pet book as well, and a passive is refused whatever it says.
+    #[test]
+    fn cast_spell_reads_on_self_from_its_third_argument() {
+        let mut s = UiScript::new().unwrap();
+        s.set_spellbook(book());
+        s.set_pet_book(pet_book());
+        for (arg, on_self) in [
+            ("", false),
+            (", 0.5", false),
+            (r#", "false""#, false),
+            (", 1", true),
+            (", 1, 0", true),
+            (r#", "yes""#, true),
+            (r#", "on""#, true),
+        ] {
+            s.run(&format!("CastSpell(1, BOOKTYPE_SPELL{arg})"))
+                .unwrap();
+            assert_eq!(
+                s.take_spell_casts(),
+                vec![(133, on_self)],
+                "CastSpell(1, BOOKTYPE_SPELL{arg})"
+            );
+            s.run(&format!("CastSpell(1, BOOKTYPE_PET{arg})")).unwrap();
+            assert_eq!(
+                s.take_pet_spell_casts(),
+                vec![(2649, on_self)],
+                "CastSpell(1, BOOKTYPE_PET{arg})"
+            );
+        }
+        s.run("CastSpell(2, BOOKTYPE_SPELL, 1) CastSpell(3, BOOKTYPE_PET, 1)")
+            .unwrap();
+        assert!(s.take_spell_casts().is_empty(), "a passive is refused");
+        assert!(s.take_pet_spell_casts().is_empty(), "a passive is refused");
+    }
+
     /// With no pet book, as when the reference's count `[0xb71174]` is 0, every pet arm answers
     /// nothing.
     #[test]
@@ -1165,8 +1268,12 @@ mod tests {
                CastSpell(1, BOOKTYPE_SPELL)"#,
         )
         .unwrap();
-        assert_eq!(s.take_pet_spell_casts(), vec![2649], "the passive refused");
-        assert_eq!(s.take_spell_casts(), vec![133]);
+        assert_eq!(
+            s.take_pet_spell_casts(),
+            vec![(2649, false)],
+            "the passive refused"
+        );
+        assert_eq!(s.take_spell_casts(), vec![(133, false)]);
         assert!(s.take_pet_spell_casts().is_empty(), "drain empties");
     }
 
diff --git a/crates/benilla-ui/src/script/stdlib.rs b/crates/benilla-ui/src/script/stdlib.rs
index a2c967fc..f6241407 100644
--- a/crates/benilla-ui/src/script/stdlib.rs
+++ b/crates/benilla-ui/src/script/stdlib.rs
@@ -4,10 +4,10 @@
 //!   `loadfile`, `load`, `module`, `newproxy` and `debug` removed), the reference's `debugstack`,
 //!   and a text-only `loadstring`.
 //! - [`install`]: the 1.12 bare globals (string, table and math aliases, the `debug*` family, the
-//!   error-handler pair, the clock and zone getters), `time` and `date`, and a `string.format`
-//!   that accepts positional `%N$` specs as the 1.12 client's does, rewriting them into a
-//!   sequential format. Mixing positional and sequential specs raises, as in the reference,
-//!   whose single argument cursor a positional spec desyncs.
+//!   error-handler pair), `time` and `date`, the clock and zone getters ([`super::clock`],
+//!   [`super::zone_text`]), and a `string.format` that accepts positional `%N$` specs as the 1.12
+//!   client's does, rewriting them into a sequential format. Mixing positional and sequential
+//!   specs raises, as in the reference, whose single argument cursor a positional spec desyncs.
 
 use mlua::{Lua, Value, Variadic};
 
@@ -91,32 +91,45 @@ pub(super) fn sandbox(lua: &Lua) -> mlua::Result<()> {
 
 /// Install the stdlib layer: the bare globals, `time`/`date` and the positional `format`.
 pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
-    // The default `geterrorhandler()` reports into the host's script-error channel; the
-    // `__benilla_` prefix marks host plumbing, not a 1.12 global.
-    lua.globals().set(
-        "__benilla_script_error",
-        lua.create_function(|lua, msg: mlua::Value| {
-            let text = match &msg {
-                mlua::Value::String(s) => s.to_string_lossy(),
-                other => format!("{other:?}"),
-            };
-            lua.app_data_mut::<super::Model>()
-                .expect("model app_data")
-                .errors
-                .push(text);
-            Ok(())
-        })?,
-    )?;
-
+    install_error_handler(lua)?;
     install_time(lua)?;
+    // Before the Lua layer, whose `debugprofile*` pair keeps its own `GetTime`.
+    super::clock::install(lua)?;
+    super::zone_text::install(lua)?;
     lua.load(WOW_STDLIB)
         .set_name("=[benilla wow stdlib]")
         .set_mode(mlua::ChunkMode::Text)
         .exec()?;
-    // Kept by identity: dispatch skips the default handler, whose channel already has the
-    // message, and fires only one that FrameXML or an addon set.
-    let default: mlua::Function = lua.load("return geterrorhandler()").eval()?;
-    lua.set_named_registry_value(super::REG_DEFAULT_ERRORHANDLER, default)?;
+    Ok(())
+}
+
+/// The handler `seterrorhandler` holds, `None` until one is given.
+pub(super) fn error_handler(lua: &Lua) -> Option<mlua::Function> {
+    lua.named_registry_value::<Option<mlua::Function>>(super::REG_ERRORHANDLER)
+        .ok()
+        .flatten()
+}
+
+/// `seterrorhandler(f)` / `geterrorhandler()`, engine globals in 1.12 (`0x702900`, `0x702950`)
+/// over one registry reference, `[0x8722cc]`. It starts at -1 (`0x7039e0`), so `geterrorhandler()`
+/// answers nil until something is set; in the running client FrameXML sets `_ERRORMESSAGE` first
+/// (`BasicControls.xml:16`), so every addon finds that. `seterrorhandler` takes a function alone
+/// and raises its `Usage:` on anything else, nil included, so the slot can never be cleared.
+fn install_error_handler(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+    g.set(
+        "seterrorhandler",
+        lua.create_function(|lua, f: Value| match f {
+            Value::Function(f) => lua.set_named_registry_value(super::REG_ERRORHANDLER, f),
+            _ => Err(mlua::Error::RuntimeError(
+                "Usage: seterrorhandler(errfunc)".into(),
+            )),
+        })?,
+    )?;
+    g.set(
+        "geterrorhandler",
+        lua.create_function(|lua, ()| Ok(error_handler(lua)))?,
+    )?;
     Ok(())
 }
 
@@ -205,8 +218,10 @@ ldexp = math.ldexp
 -- `debugprofilestart`/`debugprofilestop` are the two that are REAL (RDTSC via `0x4293d0`): start
 -- latches, stop answers the elapsed milliseconds since it. Modelled on `GetTime`'s own clock —
 -- the same monotonic session seconds the tick advances — because benilla has no cycle counter and
--- an addon uses these to time its own work, which milliseconds answer honestly.
+-- an addon uses these to time its own work, which milliseconds answer honestly. The clock is
+-- captured, so an addon that replaces the `GetTime` global cannot bend it.
 do
+    local GetTime = GetTime
     local function noop() end
     debuginfo = noop
     debugload = noop
@@ -220,21 +235,6 @@ do
     function debugprofilestop() return (GetTime() - profileStart) * 1000 end
 end
 
--- ── the error handler ──────────────────────────────────────────────────────────────────────────
--- `seterrorhandler(f)` / `geterrorhandler()` are ENGINE globals in 1.12 (the captured `_G` says
--- so), and `_ERRORMESSAGE` — the default handler they start out holding — is FrameXML's. That
--- split is why the pair lives here and the default is a plain function rather than a Rust binding:
--- our own transcribed UI can replace it exactly as the reference's `UIErrorsFrame` does.
---
--- The idiom this exists for is `geterrorhandler()(msg)` — an addon's pcall wrapper reporting a
--- caught error the way the client would. Without the pair that line is `attempt to call a nil
--- value` INSIDE an error path, which turns a recoverable addon fault into a dead addon.
-do
-    local handler = function(msg) __benilla_script_error(msg) end
-    function seterrorhandler(f) handler = f end
-    function geterrorhandler() return handler end
-end
-
 -- ── _G accessors (getglobal/setglobal: _G[name] get/set) ───────────────────────────────
 function getglobal(name) return _G[name] end
 function setglobal(name, value) _G[name] = value end
@@ -242,50 +242,6 @@ function setglobal(name, value) _G[name] = value end
 -- ── GetLocale: benilla ships/reads enUS data only (the 5875 MPQs + Spell.dbc enUS column) ──────
 function GetLocale() return "enUS" end
 
--- ── GetTime: the FrameXML session clock (seconds, monotonic, arbitrary epoch — like the real
--- client's uptime-based GetTime). `__benilla_now` is advanced by `UiScript::tick` in the same
--- call that fires OnUpdate, so `GetTime()` deltas and accumulated `elapsed` agree. Reference
--- FrameXML (CastingBarFrame & co.) anchors cast windows on it.
-__benilla_now = 0.0
-function GetTime() return __benilla_now end
-
--- ── The zone-text family.
--- The app pushes the host globals on an area change (the same shape as
--- GetTime) and fires MINIMAP_ZONE_CHANGED / the ZONE_CHANGED family; these getters just read the
--- cached slots, like the real bindings (0x48a0a0/c0/e0/100 read BSS caches). GetZoneText = the
--- zone name, replaced by the WMO interior's name indoors; GetRealZoneText = the WMO-immune zone
--- name; GetSubZoneText = the leaf subzone, "" when the leaf IS the zone (and indoors);
--- GetMinimapZoneText = subzone-else-zone. GetZonePVPInfo returns (pvpType or nil, factionName or
--- nil, isArena) — pvpType is friendly/hostile/contested, never "arena".
-__benilla_zone_text = ""
-function GetMinimapZoneText() return __benilla_zone_text end
-__benilla_zone_name = ""
-__benilla_real_zone_name = ""
-__benilla_subzone_name = ""
-__benilla_pvp_type = ""
-__benilla_pvp_faction = ""
-__benilla_pvp_arena = false
-function GetZoneText() return __benilla_zone_name end
-function GetRealZoneText() return __benilla_real_zone_name end
-function GetSubZoneText() return __benilla_subzone_name end
-function GetZonePVPInfo()
-    local t, f = __benilla_pvp_type, __benilla_pvp_faction
-    if t == "" then t = nil end
-    if f == "" then f = nil end
-    -- isArena is 1/nil, never a Lua boolean: the reference's third slot is `(nil) | (number)`
-    -- like every other 1.12 predicate.
-    return t, f, __benilla_pvp_arena and 1 or nil
-end
-
--- ── GetGameTime: the server's in-game clock (hour, minute) — the reference reads the
--- SMSG_LOGIN_SETTIMESPEED-seeded clock the client advances by its timescale. The app pushes the
--- host globals when the game minute ticks (`crate::minimap::feed_game_time` — same shape as the
--- zone-text family); minute resolution is the API's own (the binding returns no seconds).
--- 0:00 until the first time packet lands.
-__benilla_game_hour = 0
-__benilla_game_minute = 0
-function GetGameTime() return __benilla_game_hour, __benilla_game_minute end
-
 -- ── NOT here: wipe / tostringall / strsplit / strjoin / strconcat / strtrim ────────────────────
 -- Six 2.0+ names benilla used to define. 1.12 has none of them (absent from
 -- `reference/1.12-globals.tsv`, from the stock chain, and from every registrar table), and the
diff --git a/crates/benilla-ui/src/script/talent.rs b/crates/benilla-ui/src/script/talent.rs
index 0d3f3038..ba344327 100644
--- a/crates/benilla-ui/src/script/talent.rs
+++ b/crates/benilla-ui/src/script/talent.rs
@@ -8,11 +8,14 @@
 //! `TALENT_BRANCH_ARRAY[tier][column]`. The respec pair answers a class trainer's
 //! `CONFIRM_TALENT_WIPE` and reads no snapshot.
 //!
-//! `GameTooltip:SetTalent` is the spell builder (`0x52e610`) with talent lines: the rank line
-//! (`TOOLTIP_TALENT_RANK`, `0x854a2c`), the red requirement lines after it, and "Click to learn"
-//! (`TOOLTIP_TALENT_LEARN`, `0x8549f8`) in green on a learnable rank. The "Next rank:" block,
-//! `TOOLTIP_TALENT_NEXT_RANK` in white and the next rank's description in gold, is untraced in
-//! the reference.
+//! `GameTooltip:SetTalent` (`0x535170`) builds an exceptional talent with the spell builder
+//! (`0x52e610`) and any other with the talent builder (`0x52b0a0`), which keeps the spell's name
+//! and description and drops the rest of its body. The talent lines are the talent builder's: the
+//! rank line (`TOOLTIP_TALENT_RANK`, `0x854a2c`), the red requirement lines after it, the "Next
+//! rank:" block (`TOOLTIP_TALENT_NEXT_RANK`, `0x854a10`, white, over the next rank's gold
+//! description) and "Click to learn" (`TOOLTIP_TALENT_LEARN`, `0x8549f8`) in green on a learnable
+//! rank. The spell builder writes the same lines around the full body (`0x52f735`); its next-rank
+//! pass, a second full body, never runs, as no 1.12 exceptional talent has a second rank.
 
 use mlua::{Lua, MultiValue, Table, Value};
 
@@ -272,6 +275,7 @@ pub(super) fn install_tooltip_method(lua: &Lua, m: &Table) -> mlua::Result<()> {
                 (
                     t.display_spell,
                     TalentLines {
+                        exceptional: t.exceptional,
                         rank_line,
                         reqs: t.req_lines.clone(),
                         next_spell: t.next_spell,
@@ -289,6 +293,6 @@ pub(super) fn install_tooltip_method(lua: &Lua, m: &Table) -> mlua::Result<()> {
 /// Ask the spell store for the next rank's description; a miss queues it as a primary view's does.
 pub(super) fn ask_next_rank(lua: &Lua, next_spell: u32) {
     if next_spell != 0 {
-        let _ = spell_view_of(lua, next_spell); // a miss records the ask as a side effect
+        let _ = spell_view_of(lua, next_spell, false); // a miss records the ask as a side effect
     }
 }
diff --git a/crates/benilla-ui/src/script/tests/addon_index_space.rs b/crates/benilla-ui/src/script/tests/addon_index_space.rs
index 5e0d39f8..efc4a0e4 100644
--- a/crates/benilla-ui/src/script/tests/addon_index_space.rs
+++ b/crates/benilla-ui/src/script/tests/addon_index_space.rs
@@ -117,3 +117,108 @@ fn a_reply_that_hides_nothing_still_builds_the_array() {
     s.note_addon_info_reply(&[]);
     assert_eq!(s.eval::<i64>("return GetNumAddOns()").ok(), Some(3));
 }
+
+/// A player's addon `Probe` and a hidden chain addon `Blizzard_AuctionUI`, LoadOnDemand, whose one
+/// file sets `AuctionLoaded`; the reply hides the Blizzard one, as a vmangos realm does.
+fn with_hidden_blizzard(blizzard_enabled: bool) -> UiScript {
+    let mut s = UiScript::new().unwrap();
+    s.set_addon_chain_reader(Box::new(|path| {
+        (path == "Interface/AddOns/Blizzard_AuctionUI/Blizzard_AuctionUI.lua")
+            .then(|| b"AuctionLoaded = 1".to_vec())
+    }));
+    s.register_addons(
+        vec![
+            AddOnInfo {
+                name: "Blizzard_AuctionUI".into(),
+                interface: 11200,
+                load_on_demand: true,
+                chain: true,
+                files: vec!["Blizzard_AuctionUI.lua".into()],
+                enabled: blizzard_enabled,
+                ..Default::default()
+            },
+            AddOnInfo {
+                name: "Probe".into(),
+                interface: 11200,
+                enabled: true,
+                ..Default::default()
+            },
+        ],
+        None,
+        None,
+        None,
+    );
+    s.note_addon_info_reply(&["blizzard_auctionui".into()]);
+    s
+}
+
+/// `GetAddOnInfo(name)`'s `enabled` slot, 1 or nil.
+fn enabled(s: &UiScript, name: &str) -> bool {
+    s.eval::<bool>(&format!(
+        "local _, _, _, on = GetAddOnInfo('{name}') return on ~= nil"
+    ))
+    .unwrap()
+}
+
+/// `DisableAllAddOns` (`0x48e7f0`) loops `0x51df00` up to `0x51def0`, the array a hidden record
+/// never enters (`0x51dc4f`), so an addon manager's disable-all leaves the auction house loadable.
+#[test]
+fn disable_all_leaves_a_hidden_addon_enabled_and_loadable() {
+    let s = with_hidden_blizzard(true);
+    s.run("DisableAllAddOns()").unwrap();
+    assert!(!enabled(&s, "Probe"), "the visible addon is disabled");
+    assert!(
+        enabled(&s, "Blizzard_AuctionUI"),
+        "the hidden one is untouched"
+    );
+    assert_eq!(
+        s.eval::<(Option<i64>, Option<String>)>("return LoadAddOn('Blizzard_AuctionUI')")
+            .unwrap(),
+        (Some(1), None)
+    );
+    assert_eq!(s.eval::<i64>("return AuctionLoaded").ok(), Some(1));
+}
+
+/// `EnableAllAddOns` (`0x48e720`) walks the same array, so a hidden addon keeps its own row, and
+/// `AddOn_CanLoad` check 3 (`0x51e81d`) still reads that row: no check of the gate reads
+/// `[rec+0x29]`, so a hidden addon disabled by name stays `DISABLED`.
+#[test]
+fn enable_all_touches_the_visible_addons_only() {
+    let s = with_hidden_blizzard(false);
+    s.run("DisableAddOn('Probe') EnableAllAddOns()").unwrap();
+    assert!(enabled(&s, "Probe"), "the visible addon is enabled again");
+    assert!(
+        !enabled(&s, "Blizzard_AuctionUI"),
+        "the hidden one is untouched"
+    );
+    assert_eq!(
+        s.eval::<(Option<i64>, Option<String>)>("return LoadAddOn('Blizzard_AuctionUI')")
+            .unwrap(),
+        (None, Some("DISABLED".into()))
+    );
+}
+
+/// Before `SMSG_ADDON_INFO` the count `[0xbe1b90]` is 0, so both loops run no iteration.
+#[test]
+fn the_all_verbs_do_nothing_before_the_server_answers() {
+    let s = seeded();
+    s.run("DisableAllAddOns()").unwrap();
+    assert!(enabled(&s, "Alpha") && enabled(&s, "Mike") && enabled(&s, "Zulu"));
+}
+
+/// What a disable-all leaves for the shutdown writer (`0x51ef20`): the setter's one new row per
+/// visible addon, and none for the hidden one, whose row it never set.
+#[test]
+fn disable_all_writes_rows_for_the_visible_addons_only() {
+    let s = with_hidden_blizzard(true);
+    assert_eq!(
+        s.take_addon_enable_rows(),
+        None,
+        "nothing set, nothing to write"
+    );
+    s.run("DisableAllAddOns()").unwrap();
+    assert_eq!(
+        s.take_addon_enable_rows(),
+        Some(vec![("Probe".to_string(), false)])
+    );
+}
diff --git a/crates/benilla-ui/src/script/tests/button.rs b/crates/benilla-ui/src/script/tests/button.rs
index 4ebf3132..686c7139 100644
--- a/crates/benilla-ui/src/script/tests/button.rs
+++ b/crates/benilla-ui/src/script/tests/button.rs
@@ -333,7 +333,7 @@ fn disabled_button_swallows_clicks_checkbutton_toggles_before_onclick() {
         clicks, seen_checked = 0, nil
         local cb = CreateFrame("CheckButton", "Toggler")
         cb:SetPoint("BOTTOMLEFT", 0, 0); cb:SetWidth(100); cb:SetHeight(100)
-        cb:SetScript("OnClick", function(self, button, down)
+        cb:SetScript("OnClick", function() local self, button, down = this, arg1, arg2
             clicks = clicks + 1
             seen_checked = self:GetChecked()
         end)
@@ -376,7 +376,7 @@ fn default_registration_is_left_click_only_right_click_reaches_nothing() {
         clicks = 0
         local btn = CreateFrame("Button", "Vendor")
         btn:SetPoint("BOTTOMLEFT", 0, 0); btn:SetWidth(100); btn:SetHeight(100)
-        btn:SetScript("OnClick", function(self, button, down) clicks = clicks + 1 end)
+        btn:SetScript("OnClick", function() local self, button, down = this, arg1, arg2 clicks = clicks + 1 end)
     "#,
     )
     .unwrap();
@@ -399,7 +399,7 @@ fn register_for_clicks_grows_right_click_and_carries_the_button_name() {
         local btn = CreateFrame("Button", "Vendor")
         btn:SetPoint("BOTTOMLEFT", 0, 0); btn:SetWidth(100); btn:SetHeight(100)
         btn:RegisterForClicks("LeftButtonUp", "RightButtonUp")
-        btn:SetScript("OnClick", function(self, button, down)
+        btn:SetScript("OnClick", function() local self, button, down = this, arg1, arg2
             clicks = clicks + 1
             click_btn = button
             arg1_btn = arg1   -- the 1.12 legacy-global convention, same value
@@ -427,13 +427,14 @@ fn down_registration_fires_on_press_and_toggles_checked_once() {
     s.set_screen_size(800.0, 600.0);
     s.run(
         r#"
-        clicks, seen_down = 0, nil
+        clicks, seen_button, seen_arg2 = 0, nil, "untouched"
+        arg2 = "untouched"
         local cb = CreateFrame("CheckButton", "QuickSell")
         cb:SetPoint("BOTTOMLEFT", 0, 0); cb:SetWidth(100); cb:SetHeight(100)
         cb:RegisterForClicks("LeftButtonDown")
-        cb:SetScript("OnClick", function(self, button, down)
+        cb:SetScript("OnClick", function()
             clicks = clicks + 1
-            seen_down = down
+            seen_button, seen_arg2 = arg1, arg2
         end)
     "#,
     )
@@ -442,7 +443,12 @@ fn down_registration_fires_on_press_and_toggles_checked_once() {
 
     s.mouse_button(50.0, 50.0, "LeftButton", true);
     assert_eq!(s.eval::<i64>("return clicks").unwrap(), 1);
-    assert!(s.eval::<bool>("return seen_down == true").unwrap());
+    // `0x779540` fires `OnClick` with the format `"%s"`: the button name in `arg1` and no `arg2`.
+    assert_eq!(
+        s.eval::<(String, String)>("return seen_button, seen_arg2")
+            .unwrap(),
+        ("LeftButton".to_string(), "untouched".to_string())
+    );
     assert!(s.eval::<bool>("return QuickSell:GetChecked()").unwrap());
 
     // `RegisterForClicks` replaced the set, so "LeftButtonUp" no longer fires.
diff --git a/crates/benilla-ui/src/script/tests/create_frame_template.rs b/crates/benilla-ui/src/script/tests/create_frame_template.rs
index 15b954e4..506a6d99 100644
--- a/crates/benilla-ui/src/script/tests/create_frame_template.rs
+++ b/crates/benilla-ui/src/script/tests/create_frame_template.rs
@@ -36,7 +36,7 @@ fn a_runtime_template_brings_size_anchors_regions_and_a_fired_onload() {
                  </Layer>
                </Layers>
                <Scripts>
-                 <OnLoad>ProbeLoadedAs = self:GetName(); ProbeLoadWidth = self:GetWidth()</OnLoad>
+                 <OnLoad>ProbeLoadedAs = this:GetName(); ProbeLoadWidth = this:GetWidth()</OnLoad>
                </Scripts>
              </Frame>
            </Ui>"#,
diff --git a/crates/benilla-ui/src/script/tests/cvar_bindings.rs b/crates/benilla-ui/src/script/tests/cvar_bindings.rs
new file mode 100644
index 00000000..675e5368
--- /dev/null
+++ b/crates/benilla-ui/src/script/tests/cvar_bindings.rs
@@ -0,0 +1,249 @@
+//! The `SetCVar` (`0x488c10`) and `RegisterCVar` (`0x488b00`) bindings: how each reads its
+//! arguments, the read-only flag, and when `CVAR_UPDATE` fires.
+
+use crate::script::UiScript;
+
+fn script_with(rows: &[(&str, &str)]) -> UiScript {
+    let s = UiScript::new().unwrap();
+    s.register_cvars(rows.iter().copied());
+    s
+}
+
+fn get(s: &UiScript, name: &str) -> String {
+    s.eval::<String>(&format!("return GetCVar({name:?})"))
+        .unwrap()
+}
+
+fn raised(s: &UiScript, chunk: &str) -> String {
+    s.run(chunk)
+        .expect_err(&format!("{chunk} must raise"))
+        .to_string()
+}
+
+/// `lua_tostring` on argument 2 returns NULL for anything but a string or a number, and the
+/// binding stores `"0"` for it (`0x488c8d`-`0x488c98`): an unticked box's `GetChecked()` is nil.
+#[test]
+fn set_cvar_stores_zero_for_a_value_with_no_string_form() {
+    let mut s = script_with(&[("EnableMusic", "1")]);
+    for value in ["nil", "true", "false", "{}", "print"] {
+        s.set_cvar_host("EnableMusic", "1");
+        s.run(&format!("SetCVar(\"EnableMusic\", {value})"))
+            .unwrap_or_else(|e| panic!("SetCVar with {value} raised: {e}"));
+        assert_eq!(get(&s, "EnableMusic"), "0", "SetCVar with {value}");
+        assert_eq!(
+            s.take_cvar_changes(),
+            vec![("EnableMusic".to_string(), "0".to_string())],
+            "SetCVar with {value} is a real write"
+        );
+    }
+    s.set_cvar_host("EnableMusic", "1");
+    s.run("SetCVar(\"EnableMusic\")").unwrap();
+    assert_eq!(get(&s, "EnableMusic"), "0", "an absent value");
+}
+
+/// A number goes through `luaV_tostring` (`0x6f7c80`), MSVC's `%.14g`; a string is kept as is.
+#[test]
+fn set_cvar_stores_a_number_as_lua_text() {
+    let s = script_with(&[("MusicVolume", "1.0")]);
+    for (lua, stored) in [
+        // The stock Sound slider's single-precision 0.4, widened.
+        ("0.4000000059604645", "0.40000000596046"),
+        ("0.7", "0.7"),
+        ("3", "3"),
+        ("-2.5", "-2.5"),
+        ("1e20", "1e+020"),
+        ("0.00001", "1e-005"),
+        ("\"0.4000000059604645\"", "0.4000000059604645"),
+    ] {
+        s.run(&format!("SetCVar(\"MusicVolume\", {lua})")).unwrap();
+        assert_eq!(get(&s, "MusicVolume"), stored, "SetCVar with {lua}");
+    }
+}
+
+/// `lua_isstring(1)` fails (`0x488c1a`) and the binding raises the reference's own usage text
+/// (`0x84235c`); a number passes and names the CVar by its text.
+#[test]
+fn set_cvar_raises_the_reference_usage_without_a_name() {
+    let s = script_with(&[("5", "a")]);
+    for chunk in [
+        "SetCVar()",
+        "SetCVar(nil, 1)",
+        "SetCVar({}, 1)",
+        "SetCVar(true, 1)",
+    ] {
+        assert!(
+            raised(&s, chunk).contains("Usage: SetCVar(\"cvar\", value [, \"scriptCvar\")"),
+            "{chunk}"
+        );
+    }
+    s.run("SetCVar(5, \"b\")").unwrap();
+    assert_eq!(get(&s, "5"), "b");
+}
+
+/// Flag bit2 (`0x488c67`-`0x488c78`): the in-game session flags three rows (`0x48f566`), and
+/// only the Lua binding tests it; before the flag the same write lands.
+#[test]
+fn set_cvar_refuses_a_read_only_row_only_once_flagged() {
+    let mut s = script_with(&[
+        ("realmList", "us.logon.worldofwarcraft.com"),
+        ("realmName", ""),
+        ("scriptMemory", "0"),
+        ("MusicVolume", "1.0"),
+    ]);
+    s.run(
+        "SEEN = 0 \
+         f = CreateFrame(\"Frame\") \
+         f:RegisterEvent(\"CVAR_UPDATE\") \
+         f:SetScript(\"OnEvent\", function() SEEN = SEEN + 1 end)",
+    )
+    .unwrap();
+    for name in crate::script::IN_WORLD_READ_ONLY_CVARS {
+        s.run(&format!("SetCVar({name:?}, \"before\")")).unwrap();
+        assert_eq!(
+            get(&s, name),
+            "before",
+            "{name} is writable before the flag"
+        );
+    }
+    s.take_cvar_changes();
+
+    for name in crate::script::IN_WORLD_READ_ONLY_CVARS {
+        s.set_cvar_read_only(name, true);
+    }
+    for name in crate::script::IN_WORLD_READ_ONLY_CVARS {
+        let upper = name.to_ascii_uppercase();
+        assert_eq!(
+            raised(&s, &format!("SetCVar({upper:?}, \"after\", \"TOKEN\")"))
+                .lines()
+                .next(),
+            Some(format!("runtime error: \"{upper}\" is read-only").as_str()),
+            "the name as passed, any case"
+        );
+        assert_eq!(get(&s, name), "before", "{name} kept its value");
+    }
+    assert!(s.take_cvar_changes().is_empty(), "nothing was written");
+    assert_eq!(
+        s.eval::<f64>("return SEEN").unwrap(),
+        0.0,
+        "a refused write fires nothing"
+    );
+    s.run("SetCVar(\"MusicVolume\", 0.5)").unwrap();
+    assert_eq!(get(&s, "MusicVolume"), "0.5", "other rows stay writable");
+
+    // The host's and the console's writes go through `CVar::Set` (`0x63df50`), which never
+    // tests the flag.
+    s.set_cvar_engine("realmList", "logon.example.org");
+    assert_eq!(get(&s, "realmList"), "logon.example.org");
+    s.run("ConsoleExec(\"realmName Elsewhere\")").unwrap();
+    assert_eq!(get(&s, "realmName"), "Elsewhere");
+
+    // `ShutdownGame`'s clear (`0x491252`).
+    s.set_cvar_read_only("realmList", false);
+    s.run("SetCVar(\"realmList\", \"again\")").unwrap();
+    assert_eq!(get(&s, "realmList"), "again");
+}
+
+/// A re-seed from the host replaces every row, and the flag outlives it, as the reference's
+/// rows keep their flags through every write.
+#[test]
+fn the_read_only_flag_survives_a_host_reseed() {
+    let mut s = script_with(&[("realmName", "")]);
+    s.set_cvar_read_only("realmName", true);
+    s.seed_cvars([crate::script::SeededCvar {
+        name: "realmName".into(),
+        value: "Here".into(),
+        default: String::new(),
+        latched: false,
+    }]);
+    assert!(raised(&s, "SetCVar(\"realmName\", \"x\")").contains("is read-only"));
+}
+
+/// `CVAR_UPDATE` fires whenever argument 3 passes `lua_isstring`, changed or not, with the token
+/// as arg1 and the value text as arg2 (`0x488cad`-`0x488cd5`), inside the call: `SignalEvent2`
+/// (`0x703f50`) walks its listeners in place.
+#[test]
+fn set_cvar_fires_cvar_update_inside_the_call_for_every_token() {
+    let s = script_with(&[("MusicVolume", "1.0")]);
+    s.run(
+        "SEEN = {} \
+         f = CreateFrame(\"Frame\") \
+         f:RegisterEvent(\"CVAR_UPDATE\") \
+         f:SetScript(\"OnEvent\", function() table.insert(SEEN, arg1 .. \"=\" .. arg2) end)",
+    )
+    .unwrap();
+    let seen = |s: &UiScript| -> Vec<String> { s.eval("return SEEN").unwrap() };
+
+    // No token, or one with no string form: nothing fires.
+    for chunk in [
+        "SetCVar(\"MusicVolume\", \"0.5\")",
+        "SetCVar(\"MusicVolume\", \"0.5\", nil)",
+        "SetCVar(\"MusicVolume\", \"0.5\", true)",
+        "SetCVar(\"MusicVolume\", \"0.5\", {})",
+    ] {
+        s.run(chunk).unwrap();
+        assert!(seen(&s).is_empty(), "{chunk} fires nothing");
+    }
+
+    // Seen by the next statement of the same chunk, with no tick between.
+    assert_eq!(
+        s.eval::<f64>("SetCVar(\"MusicVolume\", \"0.6\", \"MUSIC_VOLUME\") return getn(SEEN)")
+            .unwrap(),
+        1.0,
+        "the handler ran before SetCVar returned"
+    );
+    // The same value again still fires.
+    s.run("SetCVar(\"MusicVolume\", \"0.6\", \"MUSIC_VOLUME\")")
+        .unwrap();
+    // A number token is its text; a value with no string form is "0".
+    s.run("SetCVar(\"MusicVolume\", nil, 7)").unwrap();
+    s.run("SetCVar(\"MusicVolume\", 0.25, \"VOL\")").unwrap();
+    assert_eq!(
+        seen(&s),
+        vec!["MUSIC_VOLUME=0.6", "MUSIC_VOLUME=0.6", "7=0", "VOL=0.25"]
+    );
+    assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
+}
+
+/// `RegisterCVar` takes argument 2 as the default only when `lua_isstring` passes (`0x488b56`),
+/// else `"0"` (`0x488b6f`); a number default is `%.14g` text. Without a name it raises its usage
+/// text (`0x8422e8`).
+#[test]
+fn register_cvar_defaults_to_zero_and_reads_numbers_as_lua_text() {
+    let mut s = UiScript::new().unwrap();
+    for (name, arg, stored) in [
+        ("Bare", "", "0"),
+        ("Nil", ", nil", "0"),
+        ("True", ", true", "0"),
+        ("Table", ", {}", "0"),
+        ("Float", ", 0.4000000059604645", "0.40000000596046"),
+        ("Int", ", 3", "3"),
+        ("Text", ", \"on\"", "on"),
+    ] {
+        s.run(&format!("RegisterCVar({name:?}{arg})")).unwrap();
+        assert_eq!(get(&s, name), stored, "RegisterCVar({name:?}{arg})");
+        assert_eq!(
+            s.eval::<String>(&format!("return GetCVarDefault({name:?})"))
+                .unwrap(),
+            stored,
+            "the default too"
+        );
+    }
+    assert!(s
+        .take_cvar_registrations()
+        .contains(&("Bare".to_string(), "0".to_string())));
+    assert!(
+        s.eval::<bool>("return tonumber(GetCVar(\"Bare\")) == 0")
+            .unwrap(),
+        "an addon's tonumber of a bare registration is 0, not nil"
+    );
+    for chunk in [
+        "RegisterCVar()",
+        "RegisterCVar(nil, \"1\")",
+        "RegisterCVar({})",
+    ] {
+        assert!(
+            raised(&s, chunk).contains("Usage: RegisterCVar(\"cvar\" [, default])"),
+            "{chunk}"
+        );
+    }
+}
diff --git a/crates/benilla-ui/src/script/tests/events.rs b/crates/benilla-ui/src/script/tests/events.rs
index 2a244eee..e0fa1247 100644
--- a/crates/benilla-ui/src/script/tests/events.rs
+++ b/crates/benilla-ui/src/script/tests/events.rs
@@ -4,20 +4,21 @@
 use super::common::script;
 use crate::script::*;
 
+/// A handler gets no arguments (`0x705199` calls `lua_pcall` with zero); its inputs are the
+/// `this`, `event` and `argN` globals.
 #[test]
-fn fire_event_both_conventions_in_one_handler() {
+fn an_event_handler_gets_no_arguments_and_reads_the_globals() {
     let mut s = script();
     s.run(
         r#"
         local f = CreateFrame("Frame", "EF")
         f:RegisterEvent("UNIT_HEALTH")
-        f:SetScript("OnEvent", function(self, event, ...)
-            r_this_eq_self = (this == self)         -- legacy `this` global == modern `self`
-            r_event_global = event                  -- modern `event` arg
-            r_event_eq     = (event == _G.event)    -- == legacy `event` global
-            r_arg1_eq      = (arg1 == arg[1])        -- legacy `arg1` global == the vararg table
-            r_arg1         = arg1
-            r_arg2         = arg[2]
+        f:SetScript("OnEvent", function(a, b, c)
+            r_args = (a == nil and b == nil and c == nil)
+            r_this = (this == EF)
+            r_event = event
+            r_arg1 = arg1
+            r_arg2 = arg2
         end)
     "#,
     )
@@ -29,13 +30,12 @@ fn fire_event_both_conventions_in_one_handler() {
     );
     assert!(s.errors().is_empty(), "{:?}", s.errors());
 
-    assert!(s.eval::<bool>("return r_this_eq_self").unwrap());
-    assert_eq!(
-        s.eval::<String>("return r_event_global").unwrap(),
-        "UNIT_HEALTH"
+    assert!(
+        s.eval::<bool>("return r_args").unwrap(),
+        "a declared parameter is nil: no positional argument is passed"
     );
-    assert!(s.eval::<bool>("return r_event_eq").unwrap());
-    assert!(s.eval::<bool>("return r_arg1_eq").unwrap());
+    assert!(s.eval::<bool>("return r_this").unwrap());
+    assert_eq!(s.eval::<String>("return r_event").unwrap(), "UNIT_HEALTH");
     assert_eq!(s.eval::<String>("return r_arg1").unwrap(), "player");
     assert_eq!(s.eval::<i64>("return r_arg2").unwrap(), 42);
 }
diff --git a/crates/benilla-ui/src/script/tests/host_state.rs b/crates/benilla-ui/src/script/tests/host_state.rs
new file mode 100644
index 00000000..34ee8aa2
--- /dev/null
+++ b/crates/benilla-ui/src/script/tests/host_state.rs
@@ -0,0 +1,258 @@
+//! The host's state lives off `_G`: 1.12.1's global table has no name for the clock, the zone
+//! caches, the game clock or the error-handler slot (`reference/1.12-globals.tsv`), and the
+//! getters over them read the client's own state, which Lua cannot reach. So a global an addon
+//! assigns under one of benilla's old host names is a global no getter reads.
+
+use super::common::script;
+use crate::script::{ActionState, AuraState, UiScript};
+
+/// Each old host name, the Lua that writes it, and a probe of every answer it once fed. The probe
+/// is read before and after the write; the two must agree, and the name must be absent from `_G`.
+const HOST_NAMES: &[(&str, &str, &str)] = &[
+    (
+        "__benilla_now",
+        "__benilla_now = 0",
+        "return GetTime() .. ' ' .. GetPlayerBuffTimeLeft(0)",
+    ),
+    (
+        "__benilla_zone_name",
+        "__benilla_zone_name = 'x'",
+        "return GetZoneText()",
+    ),
+    (
+        "__benilla_real_zone_name",
+        "__benilla_real_zone_name = 'x'",
+        "return GetRealZoneText()",
+    ),
+    (
+        "__benilla_subzone_name",
+        "__benilla_subzone_name = 'x'",
+        "return GetSubZoneText()",
+    ),
+    (
+        "__benilla_zone_text",
+        "__benilla_zone_text = 'x'",
+        "return GetMinimapZoneText()",
+    ),
+    (
+        "__benilla_pvp_type",
+        "__benilla_pvp_type = 'hostile'",
+        "return tostring((GetZonePVPInfo()))",
+    ),
+    (
+        "__benilla_pvp_faction",
+        "__benilla_pvp_faction = 'Horde'",
+        "local _, f = GetZonePVPInfo() return tostring(f)",
+    ),
+    (
+        "__benilla_pvp_arena",
+        "__benilla_pvp_arena = true",
+        "local _, _, a = GetZonePVPInfo() return tostring(a)",
+    ),
+    (
+        "__benilla_game_hour",
+        "__benilla_game_hour = 13",
+        "local h, m = GetGameTime() return h .. ':' .. m",
+    ),
+    (
+        "__benilla_game_minute",
+        "__benilla_game_minute = 59",
+        "local h, m = GetGameTime() return h .. ':' .. m",
+    ),
+    (
+        "__benilla_script_error",
+        "__benilla_script_error = function() ErrorSinkHit = 1 end",
+        "local h = geterrorhandler() if h then pcall(h, 'probe') end \
+         return tostring(ErrorSinkHit)",
+    ),
+];
+
+/// A VM a few seconds into its session with one buff ticking, so the clock's probe has a value
+/// worth rewinding.
+fn session() -> UiScript {
+    let mut s = script();
+    s.set_now(500.0);
+    s.tick(0.5);
+    s.set_player_auras(vec![AuraState {
+        spell_id: 1243,
+        count: 1,
+        duration: 1800.0,
+        expiration_time: 1700.0,
+        helpful: true,
+        cancelable: true,
+        ..Default::default()
+    }]);
+    s
+}
+
+/// No old host name is a global, and assigning one changes no answer it once fed.
+#[test]
+fn a_host_name_is_absent_from_g_and_writing_it_changes_nothing() {
+    let mut failures = Vec::new();
+    for &(name, write, probe) in HOST_NAMES {
+        let s = session();
+        if !s
+            .eval::<bool>(&format!("return rawget(getfenv(0), '{name}') == nil"))
+            .unwrap()
+        {
+            failures.push(format!("{name} is a global"));
+        }
+        let before = s.eval::<String>(probe).unwrap();
+        s.run(write).unwrap();
+        let after = s.eval::<String>(probe).unwrap();
+        if before != after {
+            failures.push(format!(
+                "`{write}` moved `{probe}` from {before:?} to {after:?}"
+            ));
+        }
+    }
+    assert!(failures.is_empty(), "{}", failures.join("\n"));
+}
+
+/// The clock an addon cannot rewind: after `__benilla_now = 0`, the next tick advances `GetTime`
+/// from where it was, and every countdown on it (a buff's time left, an action's cooldown) reads
+/// on as before.
+#[test]
+fn rewinding_the_old_clock_name_leaves_the_session_clock_running() {
+    let mut s = session();
+    s.set_action_state(
+        1,
+        Some(ActionState {
+            cooldown: Some((490_000, 30_000, true)),
+            ..Default::default()
+        }),
+    );
+    let read = |s: &UiScript| {
+        s.eval::<(f64, f64, f64)>(
+            "local start, duration = GetActionCooldown(1) \
+             return GetTime(), GetPlayerBuffTimeLeft(0), start + duration",
+        )
+        .unwrap()
+    };
+    let (t0, left0, cd0) = read(&s);
+    assert_eq!((t0, left0, cd0), (500.5, 1199.5, 520.0));
+    s.run("__benilla_now = 0").unwrap();
+    s.tick(0.25);
+    let (t1, left1, cd1) = read(&s);
+    assert_eq!(t1, 500.75, "the tick advances from the session clock");
+    assert_eq!(left1, 1199.25);
+    assert_eq!(cd1, 520.0, "the running cooldown still reads as running");
+    assert_eq!(s.now(), 500.75, "and the host reads the same clock");
+}
+
+/// The getters answer what the host pushed, in the reference's shapes: the four zone texts one
+/// string each, never nil (`0x48a0a0`..`0x48a100`); `GetZonePVPInfo` three values, isArena 1 or
+/// nil (`0x48d540`); `GetGameTime` two numbers (`0x515ee0`); `GetTime` one (`0x515ea0`).
+#[test]
+fn the_getters_answer_the_pushed_state_in_their_1_12_shapes() {
+    let mut s = script();
+    for call in [
+        "GetZoneText()",
+        "GetRealZoneText()",
+        "GetSubZoneText()",
+        "GetMinimapZoneText()",
+        "GetTime()",
+    ] {
+        assert_eq!(s.arity(call).unwrap(), 1, "{call}");
+    }
+    assert_eq!(s.arity("GetZonePVPInfo()").unwrap(), 3);
+    assert_eq!(s.arity("GetGameTime()").unwrap(), 2);
+    assert_eq!(
+        s.eval::<String>(
+            "local t, f, a = GetZonePVPInfo() \
+             return GetZoneText() .. '|' .. GetSubZoneText() .. '|' .. GetMinimapZoneText() .. '|' \
+             .. tostring(t) .. '|' .. tostring(f) .. '|' .. tostring(a)"
+        )
+        .unwrap(),
+        "|||nil|nil|nil",
+        "before the first push: empty strings, never nil, and no PvP info"
+    );
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GetGameTime()").unwrap(),
+        (0.0, 0.0)
+    );
+
+    s.set_zone_texts(crate::script::ZoneTexts {
+        zone: "Stormwind City".into(),
+        real_zone: "Elwynn Forest".into(),
+        subzone: "".into(),
+        minimap: "Stormwind City".into(),
+        pvp_type: Some("friendly".into()),
+        pvp_faction: Some("Alliance".into()),
+        is_arena: true,
+    });
+    s.set_game_time(21, 7);
+    assert_eq!(
+        s.eval::<(String, String, String, String)>(
+            "return GetZoneText(), GetRealZoneText(), GetSubZoneText(), GetMinimapZoneText()"
+        )
+        .unwrap(),
+        (
+            "Stormwind City".into(),
+            "Elwynn Forest".into(),
+            String::new(),
+            "Stormwind City".into()
+        )
+    );
+    assert_eq!(
+        s.eval::<(String, String, f64)>("return GetZonePVPInfo()")
+            .unwrap(),
+        ("friendly".into(), "Alliance".into(), 1.0)
+    );
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GetGameTime()").unwrap(),
+        (21.0, 7.0)
+    );
+}
+
+/// The reference's handler slot starts empty (`[0x8722cc]` = -1 at `0x7039e0`), so
+/// `geterrorhandler()` (`0x702950`) answers one nil until FrameXML sets `_ERRORMESSAGE`.
+/// `seterrorhandler` (`0x702900`) takes a function alone, raising `Usage: seterrorhandler(errfunc)`
+/// (`0x872a30`) on anything else and keeping the slot, and returns nothing.
+#[test]
+fn the_error_handler_slot_starts_empty_and_takes_only_a_function() {
+    let s = script();
+    assert_eq!(s.arity("geterrorhandler()").unwrap(), 1);
+    assert!(s.eval::<bool>("return geterrorhandler() == nil").unwrap());
+
+    s.run("Handler = function() end").unwrap();
+    assert_eq!(s.arity("seterrorhandler(Handler)").unwrap(), 0);
+    assert!(s
+        .eval::<bool>("return geterrorhandler() == Handler")
+        .unwrap());
+    for bad in ["nil", "", "'Handler'", "{}"] {
+        let e = s
+            .run(&format!("seterrorhandler({bad})"))
+            .expect_err(bad)
+            .to_string();
+        assert!(e.contains("Usage: seterrorhandler(errfunc)"), "{bad}: {e}");
+        assert!(
+            s.eval::<bool>("return geterrorhandler() == Handler")
+                .unwrap(),
+            "seterrorhandler({bad}) keeps the slot"
+        );
+    }
+}
+
+/// The engine calls the handler in its slot on a caught error (`0x703b40`), not whatever the
+/// `geterrorhandler` global answers, so an addon replacing that global redirects nothing.
+#[test]
+fn the_engine_reads_the_handler_slot_not_the_geterrorhandler_global() {
+    let mut s = script();
+    s.run(
+        "Heard, Decoy = {}, {} \
+         seterrorhandler(function(m) table.insert(Heard, m) end) \
+         geterrorhandler = function() return function(m) table.insert(Decoy, m) end end \
+         local f = CreateFrame('Frame') \
+         f:RegisterEvent('ERROR_PROBE') \
+         f:SetScript('OnEvent', function() error('slot probe') end)",
+    )
+    .unwrap();
+    s.fire_event("ERROR_PROBE", vec![]);
+    s.dispatch_script_errors_to_handler();
+    assert_eq!(
+        s.eval::<(i64, i64)>("return table.getn(Heard), table.getn(Decoy)")
+            .unwrap(),
+        (1, 0)
+    );
+}
diff --git a/crates/benilla-ui/src/script/tests/input.rs b/crates/benilla-ui/src/script/tests/input.rs
index ba8c1076..8eb98547 100644
--- a/crates/benilla-ui/src/script/tests/input.rs
+++ b/crates/benilla-ui/src/script/tests/input.rs
@@ -13,10 +13,10 @@ fn enable_mouse_gates_hit_testing() {
         -- transparent to hits; the enabled frame behind it (`a`) must capture.
         local a = CreateFrame("Frame", "A")
         a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(800); a:SetHeight(600); a:EnableMouse(true)
-        a:SetScript("OnEnter", function(self) who = self:GetName() end)
+        a:SetScript("OnEnter", function() local self = this who = self:GetName() end)
         local b = CreateFrame("Frame", "B")
         b:SetPoint("BOTTOMLEFT", 0, 0); b:SetWidth(800); b:SetHeight(600); b:EnableMouse(false)
-        b:SetScript("OnEnter", function(self) who = self:GetName() end)
+        b:SetScript("OnEnter", function() local self = this who = self:GetName() end)
         -- 1/nil, not a boolean: this is the exact comparison shape that inverts, so the
         -- test asserts it rather than leaning on truthiness.
         assert(a:IsMouseEnabled() == 1 and b:IsMouseEnabled() == nil)
@@ -49,10 +49,10 @@ fn hit_order_is_strata_then_level_then_the_earlier_linked_frame() {
         who = nil
         local a = CreateFrame("Frame", "A")
         a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(800); a:SetHeight(600); a:EnableMouse(true)
-        a:SetScript("OnEnter", function(self) who = self:GetName() end)
+        a:SetScript("OnEnter", function() local self = this who = self:GetName() end)
         local b = CreateFrame("Frame", "B")
         b:SetPoint("BOTTOMLEFT", 0, 0); b:SetWidth(800); b:SetHeight(600); b:EnableMouse(true)
-        b:SetScript("OnEnter", function(self) who = self:GetName() end)
+        b:SetScript("OnEnter", function() local self = this who = self:GetName() end)
     "#,
     )
     .unwrap();
@@ -91,8 +91,8 @@ fn mouse_move_fires_enter_then_leave_across_a_boundary_with_correct_self() {
         enter_self_ok, leave_self_ok = false, false
         local a = CreateFrame("Frame", "A")   -- left half only
         a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(400); a:SetHeight(600); a:EnableMouse(true)
-        a:SetScript("OnEnter", function(self) enters = enters + 1; enter_self_ok = (self == a) end)
-        a:SetScript("OnLeave", function(self) leaves = leaves + 1; leave_self_ok = (self == a) end)
+        a:SetScript("OnEnter", function() local self = this enters = enters + 1; enter_self_ok = (self == a) end)
+        a:SetScript("OnLeave", function() local self = this leaves = leaves + 1; leave_self_ok = (self == a) end)
     "#,
     )
     .unwrap();
@@ -122,10 +122,10 @@ fn onclick_fires_on_press_release_same_frame_not_when_release_lands_elsewhere()
         clicks_a, clicks_b, click_btn = 0, 0, nil
         local a = CreateFrame("Frame", "A")   -- left half
         a:SetPoint("BOTTOMLEFT", 0, 0); a:SetWidth(400); a:SetHeight(600); a:EnableMouse(true)
-        a:SetScript("OnClick", function(self, button, down) clicks_a = clicks_a + 1; click_btn = button end)
+        a:SetScript("OnClick", function() local self, button, down = this, arg1, arg2 clicks_a = clicks_a + 1; click_btn = button end)
         local b = CreateFrame("Frame", "B")   -- right half
         b:SetPoint("BOTTOMLEFT", 400, 0); b:SetWidth(400); b:SetHeight(600); b:EnableMouse(true)
-        b:SetScript("OnClick", function(self, button, down) clicks_b = clicks_b + 1 end)
+        b:SetScript("OnClick", function() local self, button, down = this, arg1, arg2 clicks_b = clicks_b + 1 end)
     "#,
     )
     .unwrap();
@@ -200,7 +200,7 @@ fn mouse_wheel_passes_delta_to_the_captured_frame() {
         -- XML-load-time only), so a runtime-created frame needs this explicitly, exactly as it
         -- needs EnableMouse. Mouse-enablement alone puts nothing in the wheel index.
         a:EnableMouseWheel(true)
-        a:SetScript("OnMouseWheel", function(self, delta) wheel = delta end)
+        a:SetScript("OnMouseWheel", function() local self, delta = this, arg1 wheel = delta end)
     "#,
     )
     .unwrap();
@@ -344,8 +344,8 @@ fn a_second_fast_click_fires_on_double_click_instead_of_the_second_on_click() {
         clicks, doubles, dblbtn = 0, 0, nil
         local b = CreateFrame("Button", "DblB")
         b:SetPoint("BOTTOMLEFT", 0, 0); b:SetWidth(200); b:SetHeight(200); b:EnableMouse(true)
-        b:SetScript("OnClick", function(self, button) clicks = clicks + 1 end)
-        b:SetScript("OnDoubleClick", function(self, button) doubles = doubles + 1 dblbtn = button end)
+        b:SetScript("OnClick", function() local self, button = this, arg1 clicks = clicks + 1 end)
+        b:SetScript("OnDoubleClick", function() local self, button = this, arg1 doubles = doubles + 1 dblbtn = button end)
     "#,
     )
     .unwrap();
@@ -483,7 +483,7 @@ fn a_multi_registered_button_pairs_a_left_click_with_a_right_one() {
         local b = CreateFrame("Button", "MixDbl")
         b:SetPoint("BOTTOMLEFT", 0, 0); b:SetWidth(200); b:SetHeight(200); b:EnableMouse(true)
         b:RegisterForClicks("LeftButtonUp", "RightButtonUp")
-        b:SetScript("OnDoubleClick", function(self, button) doubles = doubles + 1 dblbtn = button end)
+        b:SetScript("OnDoubleClick", function() local self, button = this, arg1 doubles = doubles + 1 dblbtn = button end)
     "#,
     )
     .unwrap();
@@ -716,8 +716,8 @@ fn two_frames() -> crate::script::UiScript {
         local function mk(name, x)
             local f = CreateFrame("Frame", name)
             f:SetPoint("BOTTOMLEFT", x, 200); f:SetWidth(200); f:SetHeight(200); f:EnableMouse(true)
-            f:SetScript("OnMouseDown", function(self) table.insert(log, self:GetName()..":down") end)
-            f:SetScript("OnMouseUp", function(self) table.insert(log, self:GetName()..":up") end)
+            f:SetScript("OnMouseDown", function() local self = this table.insert(log, self:GetName()..":down") end)
+            f:SetScript("OnMouseUp", function() local self = this table.insert(log, self:GetName()..":up") end)
             return f
         end
         mk("A", 100)
@@ -799,8 +799,8 @@ fn a_disabled_button_takes_the_hover_but_fires_no_enter_or_leave() {
         local function mk(name, x)
             local b = CreateFrame("Button", name)
             b:SetPoint("BOTTOMLEFT", x, 0); b:SetWidth(100); b:SetHeight(100); b:EnableMouse(true)
-            b:SetScript("OnEnter", function(self) table.insert(log, self:GetName()..":enter") end)
-            b:SetScript("OnLeave", function(self) table.insert(log, self:GetName()..":leave") end)
+            b:SetScript("OnEnter", function() local self = this table.insert(log, self:GetName()..":enter") end)
+            b:SetScript("OnLeave", function() local self = this table.insert(log, self:GetName()..":leave") end)
             return b
         end
         Off = mk("Off", 0)
diff --git a/crates/benilla-ui/src/script/tests/mod.rs b/crates/benilla-ui/src/script/tests/mod.rs
index 53850d17..7f97fb8d 100644
--- a/crates/benilla-ui/src/script/tests/mod.rs
+++ b/crates/benilla-ui/src/script/tests/mod.rs
@@ -10,6 +10,7 @@ mod channel;
 mod common;
 mod cooldown;
 mod create_frame_template;
+mod cvar_bindings;
 mod dispatch_bench;
 mod end_to_end;
 mod events;
@@ -18,6 +19,7 @@ mod frame_api;
 mod generic_for;
 mod gm_ticket;
 mod handler_prof;
+mod host_state;
 mod input;
 mod keyboard;
 mod layout_gate;
@@ -155,7 +157,7 @@ fn request_time_played_queues_an_ask_and_the_answer_arrives_as_an_event() {
 
 /// `seterrorhandler`'s contract: an engine-caught script error goes to the chosen handler.
 #[test]
-fn a_chosen_error_handler_hears_engine_caught_errors_and_the_default_does_not_duplicate() {
+fn a_chosen_error_handler_hears_engine_caught_errors_and_none_leaves_the_host_channel_alone() {
     let mut s = crate::script::UiScript::new().unwrap();
     s.set_screen_size(1024.0, 768.0);
     s.run(
@@ -165,14 +167,14 @@ fn a_chosen_error_handler_hears_engine_caught_errors_and_the_default_does_not_du
     )
     .unwrap();
 
-    // With the stdlib default handler, recognised by identity, the dispatch adds nothing.
+    // With no handler set, as before FrameXML sets one, the dispatch adds nothing.
     s.fire_event("ERROR_PROBE", vec![]);
     s.dispatch_script_errors_to_handler();
     let errors = s.take_errors();
     assert_eq!(
         errors.iter().filter(|e| e.contains("boom")).count(),
         1,
-        "one error, once — the default handler must not double-report: {errors:?}"
+        "one error, once: {errors:?}"
     );
 
     // A chosen handler gets the message, and the host channel still records it.
diff --git a/crates/benilla-ui/src/script/tests/reference_surface.rs b/crates/benilla-ui/src/script/tests/reference_surface.rs
index 037183b5..0ce487f0 100644
--- a/crates/benilla-ui/src/script/tests/reference_surface.rs
+++ b/crates/benilla-ui/src/script/tests/reference_surface.rs
@@ -1,13 +1,23 @@
-//! The 1.12 surface as a gate: every global benilla's VM exposes is one the 1.12.1 client has
-//! (`reference/1.12-globals.tsv`) or a listed exception, since addons branch on a global's
-//! presence; what 1.12 has and benilla lacks is `scripts/api-coverage.sh`'s count.
+//! The 1.12 surface as a gate: every global the engine puts in a bare VM is one the 1.12.1 client
+//! has (`reference/1.12-globals.tsv`) or a commented entry on [`BEYOND_1_12`], since addons branch
+//! on a global's presence; no prefix excuses an engine name, as a host seam belongs in Rust. The
+//! production load, core and layer, is `benilla-app`'s `ui_script::surface_gate`; what 1.12 has
+//! and benilla lacks is `scripts/api-coverage.sh`'s count.
 
 use std::collections::HashSet;
 
 use super::common::script;
 
-/// `reference/1.12-globals.tsv`, as `name -> origin`.
-fn reference() -> Vec<(String, String)> {
+/// Globals the engine exposes that 1.12 does not, each with its reason. The list is exact.
+const BEYOND_1_12: &[&str] = &[
+    // Our Lua runtime is 5.1 where 1.12's is 5.0: 1.12's base library does not export `_G` (an
+    // addon reaches the globals with `getfenv(0)`); ours does, as our `getglobal`/`setglobal` are
+    // written over it.
+    "_G",
+];
+
+/// `reference/1.12-globals.tsv`'s names.
+fn reference() -> HashSet<String> {
     let path = concat!(
         env!("CARGO_MANIFEST_DIR"),
         "/../../reference/1.12-globals.tsv"
@@ -15,121 +25,246 @@ fn reference() -> Vec<(String, String)> {
     let text = std::fs::read_to_string(path).unwrap_or_else(|e| {
         panic!("reading {path}: {e} — regenerate with scripts/gen-reference-globals.py")
     });
-    text.lines()
+    let names: HashSet<String> = text
+        .lines()
         .filter(|l| !l.starts_with('#'))
-        .filter_map(|l| {
-            let mut f = l.split('\t');
-            Some((f.next()?.to_string(), f.nth(1)?.to_string()))
-        })
+        .filter_map(|l| l.split('\t').next().map(str::to_string))
+        .collect();
+    assert!(
+        names.len() > 19_000,
+        "the reference table looks truncated ({} names) — regenerate it",
+        names.len()
+    );
+    names
+}
+
+/// The string keys of a bare VM's `_G`.
+fn engine_globals() -> HashSet<String> {
+    script()
+        .eval::<Vec<String>>(
+            "local out = {} \
+             for k in pairs(getfenv(0)) do if type(k) == 'string' then table.insert(out, k) end end \
+             return out",
+        )
+        .expect("dump _G")
+        .into_iter()
         .collect()
 }
 
-/// Globals benilla exposes that 1.12 does not. `Benilla*` (the host bridge our own UI files call)
-/// and `__benilla_*` (the tick's pushed state) pass by prefix.
-fn allowed_beyond_1_12() -> HashSet<&'static str> {
-    [
-        // ── our Lua runtime is 5.1 where 1.12's is 5.0 ──
-        // 1.12's base library does not export `_G` (an addon reaches the globals with
-        // `getfenv(0)`); ours does, as our `getglobal`/`setglobal` are written over it.
-        "_G",
-        // ── WoW API past 1.12 ──
-        // Only `SubmitChatInput` is called from our UI files (`ScriptLogFrame.xml`'s slash
-        // commands); each of the rest awaits its 1.12 equivalent, removal or a reason.
-        "CancelUnitBuff",
-        "GetCursorInfo",
-        "GetInventoryItemID",
-        "GetPlayerFacing",
-        "GetTradePartnerName",
-        "IsGossipOptionCoded",
-        "SubmitChatInput",
-        "UnitAura",
-        "UnitIsAFK",
-        "UnitIsDND",
-    ]
-    .into_iter()
-    .collect()
-}
-
-/// Every global benilla's VM exposes is one 1.12 has, or a listed exception.
+/// Every global the engine exposes is one 1.12 has, or a listed exception.
 #[test]
-fn our_globals_stay_inside_the_1_12_surface() {
-    let reference = reference();
-    let known: HashSet<&str> = reference.iter().map(|(n, _)| n.as_str()).collect();
-    assert!(
-        known.len() > 19_000,
-        "the reference table looks truncated ({} names) — regenerate it",
-        known.len()
-    );
-    let allowed = allowed_beyond_1_12();
-
-    let ours: Vec<String> = script()
-        .eval(
-            "local out = {} \
-             for k in pairs(_G) do if type(k) == 'string' then table.insert(out, k) end end \
-             return out",
-        )
-        .expect("dump _G");
-
-    let mut unlisted: Vec<&str> = ours
-        .iter()
-        .map(String::as_str)
-        .filter(|n| !known.contains(n))
-        .filter(|n| !allowed.contains(n))
-        .filter(|n| !n.starts_with("Benilla") && !n.starts_with("__benilla_"))
+fn the_engine_adds_no_global_past_1_12() {
+    let known = reference();
+    let mut beyond: Vec<String> = engine_globals()
+        .into_iter()
+        .filter(|n| !known.contains(n) && !BEYOND_1_12.contains(&n.as_str()))
         .collect();
-    unlisted.sort_unstable();
-
+    beyond.sort_unstable();
     assert!(
-        unlisted.is_empty(),
-        "benilla exposes {} global(s) the 1.12.1 client does not, and they are not listed as \
-         exceptions:\n    {}\n\n\
-         1.12 is the target. Either give it its 1.12 spelling, or add it to \
-         `allowed_beyond_1_12` in this file WITH the reason it has to stay — an addon that \
+        beyond.is_empty(),
+        "the engine exposes {} global(s) the 1.12.1 client does not:\n    {}\n\n\
+         1.12 is the target. Give it its 1.12 spelling, move a host seam into Rust, or add it to \
+         `BEYOND_1_12` in this file WITH the reason it has to stay — an addon that \
          feature-detects an unexplained superset takes a path we cannot honour.",
-        unlisted.len(),
-        unlisted.join(" ")
+        beyond.len(),
+        beyond.join(" ")
     );
 }
 
 /// The exception list is exact: no entry outlives its global, and none excuses a 1.12 name.
 #[test]
-fn the_exception_list_has_no_dead_entries() {
-    let known: HashSet<String> = reference().into_iter().map(|(n, _)| n).collect();
-    let ours: HashSet<String> = script()
-        .eval::<Vec<String>>(
-            "local out = {} \
-             for k in pairs(_G) do if type(k) == 'string' then table.insert(out, k) end end \
-             return out",
-        )
-        .expect("dump _G")
-        .into_iter()
+fn the_exception_list_is_exact() {
+    let known = reference();
+    let ours = engine_globals();
+    let wrong: Vec<&str> = BEYOND_1_12
+        .iter()
+        .copied()
+        .filter(|n| known.contains(*n) || !ours.contains(*n))
         .collect();
-
-    let mut dead: Vec<&str> = allowed_beyond_1_12()
-        .into_iter()
-        .filter(|n| !ours.contains(*n))
-        .collect();
-    dead.sort_unstable();
-    assert!(
-        dead.is_empty(),
-        "these are excused as beyond-1.12 but benilla no longer exposes them — drop them from \
-         `allowed_beyond_1_12`:\n    {}",
-        dead.join(" ")
-    );
-
-    let mut wrong: Vec<&str> = allowed_beyond_1_12()
-        .into_iter()
-        .filter(|n| known.contains(*n))
-        .collect();
-    wrong.sort_unstable();
     assert!(
         wrong.is_empty(),
-        "these are excused as beyond-1.12 but the 1.12.1 client DOES have them — they need no \
-         excuse:\n    {}",
-        wrong.join(" ")
+        "excused as beyond 1.12, but 1.12 has them or the engine no longer exposes them: {wrong:?}"
     );
 }
 
+/// The globals 1.12.1 does not have, each once benilla's: the Era verbs (the 1.12 way in each
+/// comment) and the host hooks with no caller. An addon that tests for one takes a path 1.12 never
+/// does.
+#[test]
+fn the_era_globals_and_the_uncalled_hooks_are_absent() {
+    let s = script();
+    for (name, instead) in [
+        (
+            "UnitAura",
+            "UnitBuff/UnitDebuff (0x519500, 0x5198f0), GetPlayerBuff (0x4e45d0)",
+        ),
+        ("CancelUnitBuff", "CancelPlayerBuff (0x4e49a0)"),
+        (
+            "GetCursorInfo",
+            "CursorHasItem/CursorHasSpell/CursorHasMoney (0x4895d0..0x489630)",
+        ),
+        (
+            "GetInventoryItemID",
+            "the id inside GetInventoryItemLink (0x4c8c10)",
+        ),
+        ("GetPlayerFacing", "the minimap arrow model's GetFacing"),
+        (
+            "GetTradePartnerName",
+            r#"UnitName("NPC") (TradeFrame.lua:43)"#,
+        ),
+        (
+            "IsGossipOptionCoded",
+            "GOSSIP_ENTER_CODE, then SelectGossipOption(index, code)",
+        ),
+        ("UnitIsAFK", "no unit AFK predicate"),
+        ("UnitIsDND", "no unit DND predicate"),
+        (
+            "BenillaGetContainerItemID",
+            "the id inside GetContainerItemLink",
+        ),
+        ("BenillaGetItemStats", "no caller"),
+        ("BenillaGetMerchantItemStats", "no caller"),
+        ("BenillaGetBuybackItemStats", "no caller"),
+        ("BenillaSetBoothTexture", "no caller; SetPortraitTexture"),
+        ("BenillaTakeLootSlot", "a LootButton's own click (0x4c1820)"),
+    ] {
+        assert!(
+            s.eval::<bool>(&format!("return {name} == nil")).unwrap(),
+            "{name} is a global; 1.12 has {instead}"
+        );
+    }
+}
+
+/// The strata table (`0x8119f8`) has eight rows, `BACKGROUND` to `TOOLTIP`, walked by `0x6f17d0`:
+/// `SetFrameStrata("BLIZZARD")` raises `%s:SetFrameStrata(): Unknown frame strata: %s` naming the
+/// frame or `<unnamed>` (`0x774450`) and leaves the stratum, and the XML attribute warns and skips
+/// (`0x769978`).
+#[test]
+fn blizzard_is_no_frame_strata() {
+    let s = script();
+    s.run(r#"f = CreateFrame("Frame", "StrataProbe") f:SetFrameStrata("HIGH") g = CreateFrame("Frame")"#)
+        .unwrap();
+    for (call, who) in [
+        (r#"f:SetFrameStrata("BLIZZARD")"#, "StrataProbe"),
+        (r#"g:SetFrameStrata("BLIZZARD")"#, "<unnamed>"),
+    ] {
+        let e = s.run(call).expect_err(call).to_string();
+        assert!(
+            e.contains(&format!(
+                "{who}:SetFrameStrata(): Unknown frame strata: BLIZZARD"
+            )),
+            "{call}: {e}"
+        );
+    }
+    assert_eq!(
+        s.eval::<String>("return f:GetFrameStrata()").unwrap(),
+        "HIGH",
+        "the stratum stays"
+    );
+    assert!(crate::script::object::strata_from_str("BLIZZARD").is_none());
+    assert!(crate::script::object::strata_from_str("tooltip").is_some());
+}
+
+/// `SetDrawLayer` (`0x79a780`) reads the layer name alone against the five-row table (`0x811a80`):
+/// a third argument orders nothing, and a name off the table raises the Usage line (`0x87c42c`).
+#[test]
+fn set_draw_layer_reads_the_layer_alone() {
+    let s = script();
+    s.run(
+        r#"
+        f = CreateFrame("Frame", "LayerProbe")
+        a = f:CreateTexture("LayerProbeA", "ARTWORK")
+        b = f:CreateTexture("LayerProbeB", "ARTWORK")
+        a:SetDrawLayer("ARTWORK", 7)
+        b:SetDrawLayer("ARTWORK", -7)
+        "#,
+    )
+    .unwrap();
+    let sub = |name: &str| {
+        let rh = {
+            let t: mlua::Table = s.lua().globals().get(name).unwrap();
+            crate::script::region::region_handle_of(s.lua(), &t).unwrap()
+        };
+        s.model_ref().arena.region(rh).unwrap().sub_level
+    };
+    assert_eq!((sub("LayerProbeA"), sub("LayerProbeB")), (0, 0));
+    assert_eq!(
+        s.eval::<String>("return a:GetDrawLayer()").unwrap(),
+        "ARTWORK"
+    );
+    for (call, who) in [
+        (r#"a:SetDrawLayer("NOPE")"#, "LayerProbeA"),
+        ("a:SetDrawLayer(2)", "LayerProbeA"),
+        ("f:CreateTexture():SetDrawLayer()", "<unnamed>"),
+    ] {
+        let e = s.run(call).expect_err(call).to_string();
+        assert!(
+            e.contains(&format!(r#"Usage: {who}:SetDrawLayer("layer")"#)),
+            "{call}: {e}"
+        );
+    }
+    assert_eq!(
+        s.eval::<String>("return a:GetDrawLayer()").unwrap(),
+        "ARTWORK",
+        "a refused name leaves the layer"
+    );
+}
+
+/// `Set<State>Texture` has no colour form (`0x781970`): a number takes the path leg through
+/// `lua_isstring` (`0x781b23`) and loads as its decimal name, so `SetNormalTexture(1, 1, 1, 0)`
+/// is the file `"1"`; a boolean or no argument raises the Usage line (`0x87a1b4`, the highlight
+/// setter's own at `0x87a240`).
+#[test]
+fn a_state_texture_setter_reads_a_number_as_a_path() {
+    let s = script();
+    s.run(
+        r#"
+        b = CreateFrame("Button", "StateProbe")
+        b:SetNormalTexture(1, 1, 1, 0)
+        c = CreateFrame("CheckButton", "CheckProbe")
+        c:SetCheckedTexture(3)
+        "#,
+    )
+    .unwrap();
+    assert_eq!(
+        s.eval::<String>("return b:GetNormalTexture():GetTexture()")
+            .unwrap(),
+        "1",
+        "the path \"1\", not a solid white fill"
+    );
+    assert_eq!(
+        s.eval::<String>("return c:GetCheckedTexture():GetTexture()")
+            .unwrap(),
+        "3"
+    );
+    for (call, usage) in [
+        (
+            "b:SetPushedTexture(true)",
+            r#"Usage: StateProbe:SetPushedTexture(texture or "texture" or nil)"#,
+        ),
+        (
+            "b:SetDisabledTexture()",
+            r#"Usage: StateProbe:SetDisabledTexture(texture or "texture" or nil)"#,
+        ),
+        (
+            "CreateFrame('Button'):SetHighlightTexture(false)",
+            r#"Usage: <unnamed>:SetHighlightTexture(texture or "texture" or nil [, "blendmode")"#,
+        ),
+    ] {
+        let e = s.run(call).expect_err(call).to_string();
+        assert!(e.contains(usage), "{call}: {e}");
+    }
+}
+
+/// `PickupContainerItem` (`0x4f9b30`) returns nothing on every path.
+#[test]
+fn pickup_container_item_answers_nothing() {
+    let s = script();
+    for call in ["PickupContainerItem(0, 1)", "PickupContainerItem(4, 16)"] {
+        assert_eq!(s.arity(call).unwrap(), 0, "{call}");
+    }
+}
+
 /// `Texture:GetTexture()` (`0x79ba70`/`0x79baf0`/`0x835708`): one value, nil when unset, the path
 /// without its extension, and the literal `"Solid Texture"` for a colour fill.
 #[test]
@@ -761,42 +896,48 @@ fn set_desaturated_reports_shader_support_and_does_not_raise() {
         .unwrap();
 }
 
-/// `UnitCreatureType` (`0x51a280`, stages 2 and 3 of three built): a creature's cached record,
-/// else (`0x605570`) the race's `ChrRaces.dbc` column 9, which is 7, "Humanoid", for every race.
+/// `UnitCreatureType` (`0x51a280`) answers the type the snapshot carries, which the app resolved
+/// as `0x605570` does (form, else template, else race), for a creature and a player alike: nil
+/// for a token that names no unit or a snapshot with no type (`0x51a2b8`, `0x51a2c3`).
 #[test]
-fn unit_creature_type_answers_the_record_then_falls_back_to_humanoid() {
+fn unit_creature_type_answers_the_snapshots_resolved_type() {
     let mut s = script();
-    s.set_unit(
-        "target",
+    let typed = |word: Option<&str>, is_player: bool| {
         Some(crate::script::UnitState {
             exists: true,
-            creature_type_name: Some("Beast".into()),
+            is_player,
+            creature_type_name: word.map(str::to_string),
             ..Default::default()
-        }),
-    );
-    s.set_unit(
-        "player",
-        Some(crate::script::UnitState {
-            exists: true,
-            is_player: true,
-            ..Default::default()
-        }),
-    );
+        })
+    };
+    s.set_unit("target", typed(Some("Beast"), false));
+    // A shapeshifted player carries the form's type, an unshifted one the race's.
+    s.set_unit("player", typed(Some("Beast"), true));
+    s.set_unit("party1", typed(Some("Humanoid"), true));
+    // A player with no descriptor behind the snapshot carries none, and answers nil.
+    s.set_unit("party2", typed(None, true));
 
-    assert_eq!(
-        s.eval::<String>(r#"return UnitCreatureType("target")"#)
-            .unwrap(),
-        "Beast"
-    );
-    assert_eq!(
-        s.eval::<String>(r#"return UnitCreatureType("player")"#)
-            .unwrap(),
-        "Humanoid"
-    );
-    // An unresolved token is nil; a missing argument fails `lua_isstring` and raises.
-    assert!(s
-        .eval::<bool>(r#"return UnitCreatureType("party4") == nil"#)
-        .unwrap());
+    for (token, word) in [
+        ("target", "Beast"),
+        ("player", "Beast"),
+        ("party1", "Humanoid"),
+    ] {
+        assert_eq!(
+            s.eval::<String>(&format!(r#"return UnitCreatureType("{token}")"#))
+                .unwrap(),
+            word,
+            "{token}"
+        );
+    }
+    // An unresolved token and a typeless snapshot are nil; a missing argument fails
+    // `lua_isstring` and raises.
+    for token in ["party2", "party4"] {
+        assert!(
+            s.eval::<bool>(&format!(r#"return UnitCreatureType("{token}") == nil"#))
+                .unwrap(),
+            "{token}"
+        );
+    }
     let err = s
         .run("UnitCreatureType()")
         .expect_err("a missing arg must raise");
@@ -1325,18 +1466,29 @@ fn set_world_detail_writes_the_stop_table_and_validates_like_the_reference() {
     s.register_cvars([
         (crate::script::CVAR_WORLD_DETAIL, "1"),
         (crate::script::CVAR_FRILL_DENSITY, "32"),
+        (crate::script::CVAR_SMALL_CULL, "0.04"),
     ]);
     let frill = |s: &crate::script::UiScript| s.cvar(crate::script::CVAR_FRILL_DENSITY);
     let stop = |s: &crate::script::UiScript| s.cvar(crate::script::CVAR_WORLD_DETAIL);
 
-    // The preset table at `0x804518`, verbatim: {16, 32, 48}.
-    for (n, want) in [(0, "16"), (1, "32"), (2, "48")] {
+    // The preset tables at `0x804518` and `0x804524`, verbatim: {16, 32, 48} and `smallCull`'s
+    // f32 {0.07, 0.04, 0.01} printed "%f".
+    for (n, want, cull) in [
+        (0, "16", "0.070000"),
+        (1, "32", "0.040000"),
+        (2, "48", "0.010000"),
+    ] {
         s.run(&format!("SetWorldDetail({n})")).unwrap();
         assert_eq!(
             frill(&s).as_deref(),
             Some(want),
             "stop {n} writes frillDensity"
         );
+        assert_eq!(
+            s.cvar(crate::script::CVAR_SMALL_CULL).as_deref(),
+            Some(cull),
+            "stop {n} writes smallCull"
+        );
         assert_eq!(
             s.eval::<i64>("return GetWorldDetail()").unwrap(),
             n,
@@ -1450,56 +1602,86 @@ fn the_pfui_hdgraphic_extended_arm_runs() {
 
 /// `ShowNameplates 0x489450`, `HideNameplates 0x489460`, `ShowFriendNameplates 0x489470` and
 /// `HideFriendNameplates 0x489480` read no argument and return nothing: four 10-byte bodies over
-/// two setters, differing only in an `or`/`and` mask.
+/// two setters, differing only in an `or`/`and` mask. They write bits `0x1` and `0x8` of the
+/// runtime dword `[0xc4da34]` and no CVar: 1.12 registers none (no `0x63db90` site names a plate).
 #[test]
-fn the_nameplate_verbs_ignore_their_arguments_and_return_nothing() {
-    let s = script();
-    s.register_cvars([
-        (crate::script::CVAR_NAMEPLATE_ENEMIES, "1"),
-        (crate::script::CVAR_NAMEPLATE_FRIENDS, "0"),
-    ]);
+fn the_nameplate_verbs_write_two_runtime_bits_and_no_cvar() {
+    use crate::script::{PLATE_BIT_ENEMY as ENEMY, PLATE_BIT_FRIEND as FRIEND};
+    let mut s = script();
 
-    let get = |s: &crate::script::UiScript, n: &str| s.cvar(n);
-    assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_ENEMIES).as_deref(),
-        Some("1")
+    s.run("ShowNameplates()").unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(0), ENEMY);
+    assert!(
+        s.take_nameplate_bit_writes().is_empty(),
+        "a drain empties the queue"
     );
 
     s.run("HideNameplates()").unwrap();
     assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_ENEMIES).as_deref(),
-        Some("0")
-    );
-    assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_FRIENDS).as_deref(),
-        Some("0"),
+        s.take_nameplate_bit_writes().apply(ENEMY | FRIEND),
+        FRIEND,
         "the friendly bit is a separate setter — hiding enemies must not touch it"
     );
     s.run("ShowFriendNameplates()").unwrap();
     assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_FRIENDS).as_deref(),
-        Some("1")
-    );
-    assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_ENEMIES).as_deref(),
-        Some("0"),
+        s.take_nameplate_bit_writes().apply(0),
+        FRIEND,
         "...and back the other way"
     );
+    s.run("HideFriendNameplates()").unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(FRIEND), 0);
+
+    // In call order, the last write per bit standing, as the setters `or`/`and` the live dword.
+    s.run("ShowFriendNameplates() HideFriendNameplates() HideNameplates() ShowNameplates()")
+        .unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(FRIEND), ENEMY);
+    // The frame loop's latches, bits `0x2` and `0x4`, are no verb's to touch.
+    s.run("HideNameplates() HideFriendNameplates()").unwrap();
+    assert_eq!(s.take_nameplate_bit_writes().apply(0xff), !(ENEMY | FRIEND));
 
     s.run("ShowNameplates(false)").unwrap();
     assert_eq!(
-        get(&s, crate::script::CVAR_NAMEPLATE_ENEMIES).as_deref(),
-        Some("1"),
+        s.take_nameplate_bit_writes().apply(0),
+        ENEMY,
         "the verb IS the value — a falsy argument does not invert it"
     );
     for call in ["HideNameplates(1, 2, 3)", "ShowFriendNameplates({})"] {
         s.run(call)
             .unwrap_or_else(|e| panic!("{call} must not raise: {e}"));
     }
+    let _ = s.take_nameplate_bit_writes();
 
     assert_eq!(
         s.arity("ShowNameplates()").unwrap(),
         0,
         "zero values — observably different from nil for a caller that counts"
     );
+    assert!(
+        s.take_cvar_changes().is_empty(),
+        "no CVar written: the dword is not a setting"
+    );
+    for name in ["nameplateShowEnemies", "nameplateShowFriends"] {
+        assert_eq!(s.cvar(name), None, "{name}: no plate CVar is registered");
+    }
+}
+
+/// The host seams benilla's own interface used are gone, now that it speaks 1.12 alone: the key
+/// capture, the error-log reads, the chat forwarders and the uncalled binding-set probe.
+#[test]
+fn the_layers_host_seams_are_gone() {
+    let s = script();
+    for name in [
+        "BenillaBindCapture",
+        "BenillaCharacterBindingsExist",
+        "BenillaGetNumScriptErrors",
+        "BenillaGetScriptErrorInfo",
+        "BenillaClearScriptErrors",
+        "SubmitChatInput",
+        "BenillaChatTabPressed",
+    ] {
+        assert!(
+            s.eval::<bool>(&format!("return {name} == nil")).unwrap(),
+            "{name} is still a global"
+        );
+    }
 }
diff --git a/crates/benilla-ui/src/script/tests/regions.rs b/crates/benilla-ui/src/script/tests/regions.rs
index d0fe9e05..7b7f504f 100644
--- a/crates/benilla-ui/src/script/tests/regions.rs
+++ b/crates/benilla-ui/src/script/tests/regions.rs
@@ -281,41 +281,6 @@ fn set_portrait_texture_binds_unit_token_then_settexture_clears_it() {
     assert!(s.errors().is_empty(), "{:?}", s.errors());
 }
 
-/// `BenillaSetBoothTexture`, the paper doll's square booth binding: `SetPortraitTexture`'s
-/// carriage with `circular` false, as the model pane has no ring to mask for.
-#[test]
-fn benilla_set_booth_texture_binds_square() {
-    let mut s = script();
-    s.set_screen_size(800.0, 600.0);
-    s.run(
-        r#"
-        local f = CreateFrame("Frame", "DollFrame")
-        f:SetPoint("TOPLEFT", 0, 0)
-        f:SetWidth(200); f:SetHeight(300)
-        local m = f:CreateTexture("DollFrameModel", "ARTWORK")
-        m:SetAllPoints()
-        BenillaSetBoothTexture(m, "paperdoll")
-    "#,
-    )
-    .unwrap();
-    s.resolve();
-    let bound = s.extract().into_iter().find_map(|q| match q.content {
-        QuadContent::Texture {
-            portrait_unit: Some(u),
-            circular,
-            ..
-        } => Some((u, circular)),
-        _ => None,
-    });
-    let (token, circular) = bound.expect("a booth-bound quad is extracted");
-    assert_eq!(token, "paperdoll");
-    assert!(
-        !circular,
-        "the booth pane draws square — no inscribed-circle mask"
-    );
-    assert!(s.errors().is_empty(), "{:?}", s.errors());
-}
-
 /// The quest log detail pane's shape: a region anchor chain about 15 deep (title, objectives,
 /// description, rewards) with a frame anchored to its tail, which the resolve runs to a fixpoint.
 #[test]
diff --git a/crates/benilla-ui/src/script/tests/scrollframe.rs b/crates/benilla-ui/src/script/tests/scrollframe.rs
index 1e4a912c..689a6cf9 100644
--- a/crates/benilla-ui/src/script/tests/scrollframe.rs
+++ b/crates/benilla-ui/src/script/tests/scrollframe.rs
@@ -288,12 +288,12 @@ fn vertical_scroll_fires_as_given_and_update_rect_fires_range_changed() {
         frame:SetScrollChild(child)
 
         seen_v = nil
-        frame:SetScript("OnVerticalScroll", function(self, offset)
+        frame:SetScript("OnVerticalScroll", function() local self, offset = this, arg1
             seen_v = offset
             assert(self == frame and arg1 == offset, "handler-firing conventions carry the value")
         end)
         seen_lo, seen_hi = nil, nil
-        frame:SetScript("OnScrollRangeChanged", function(self, lo, hi)
+        frame:SetScript("OnScrollRangeChanged", function() local self, lo, hi = this, arg1, arg2
             seen_lo, seen_hi = lo, hi
         end)
     "#,
@@ -336,7 +336,7 @@ fn update_scroll_child_rect_sees_a_same_tick_resize_with_no_intervening_resolve(
     s.run(
         r#"
         seen_hi = nil
-        SF:SetScript("OnScrollRangeChanged", function(self, lo, hi) seen_hi = hi end)
+        SF:SetScript("OnScrollRangeChanged", function() local self, lo, hi = this, arg1, arg2 seen_hi = hi end)
         Child:SetWidth(300); Child:SetHeight(600) -- grows well past the frame — all in this ONE tick
         SF:UpdateScrollChildRect()
     "#,
diff --git a/crates/benilla-ui/src/script/tests/size_changed.rs b/crates/benilla-ui/src/script/tests/size_changed.rs
index cd950a35..58985bf9 100644
--- a/crates/benilla-ui/src/script/tests/size_changed.rs
+++ b/crates/benilla-ui/src/script/tests/size_changed.rs
@@ -16,7 +16,7 @@ fn a_resize_fires_on_size_changed_and_a_move_does_not() {
         Panel = CreateFrame("Frame", "SizedPanel")
         Panel:SetPoint("BOTTOMLEFT", 100, 100)
         Panel:SetWidth(200); Panel:SetHeight(50)
-        Panel:SetScript("OnSizeChanged", function(self, aw, ah)
+        Panel:SetScript("OnSizeChanged", function() local self, aw, ah = this, arg1, arg2
             fires = fires + 1 w = aw h = ah
         end)
     "#,
@@ -62,7 +62,7 @@ fn an_anchor_driven_resize_fires_it_too() {
         Child = CreateFrame("Frame", "SizeChild", Parent)
         Child:SetPoint("BOTTOMLEFT", Parent, "BOTTOMLEFT", 0, 0)
         Child:SetPoint("TOPRIGHT", Parent, "TOPRIGHT", 0, 0)
-        Child:SetScript("OnSizeChanged", function(self, aw, ah) fires = fires + 1 w = aw end)
+        Child:SetScript("OnSizeChanged", function() local self, aw, ah = this, arg1, arg2 fires = fires + 1 w = aw end)
     "#,
     )
     .unwrap();
@@ -94,7 +94,7 @@ fn a_handler_that_resizes_its_own_frame_settles_instead_of_spinning() {
         Sq:SetPoint("BOTTOMLEFT", 0, 0)
         Sq:SetWidth(200); Sq:SetHeight(50)
         -- The idiom: "keep me square". It writes back into the very input that fired it.
-        Sq:SetScript("OnSizeChanged", function(self, aw, ah)
+        Sq:SetScript("OnSizeChanged", function() local self, aw, ah = this, arg1, arg2
             fires = fires + 1
             if ah ~= aw then self:SetHeight(aw) end
         end)
diff --git a/crates/benilla-ui/src/script/tests/slider.rs b/crates/benilla-ui/src/script/tests/slider.rs
index 5549710c..078cad81 100644
--- a/crates/benilla-ui/src/script/tests/slider.rs
+++ b/crates/benilla-ui/src/script/tests/slider.rs
@@ -215,7 +215,7 @@ fn slider_setvalue_fires_onvaluechanged_only_on_change() {
         local sl = CreateFrame("Slider", "SlEvt")
         sl:SetMinMaxValues(0, 10)
         seen = {}
-        sl:SetScript("OnValueChanged", function(self, value)
+        sl:SetScript("OnValueChanged", function() local self, value = this, arg1
             table.insert(seen, value)
             assert(self == sl and arg1 == value, "handler-firing conventions carry the value")
         end)
diff --git a/crates/benilla-ui/src/script/tests/statusbar.rs b/crates/benilla-ui/src/script/tests/statusbar.rs
index 62eb5925..c5418580 100644
--- a/crates/benilla-ui/src/script/tests/statusbar.rs
+++ b/crates/benilla-ui/src/script/tests/statusbar.rs
@@ -50,7 +50,7 @@ fn statusbar_setvalue_fires_onvaluechanged() {
         local b = CreateFrame("StatusBar", "SbEvt")
         b:SetMinMaxValues(0, 10)
         seen = {}
-        b:SetScript("OnValueChanged", function(self, value)
+        b:SetScript("OnValueChanged", function() local self, value = this, arg1
             table.insert(seen, value)
             assert(self == b and arg1 == value, "handler-firing conventions carry the value")
         end)
diff --git a/crates/benilla-ui/src/script/tests/talent.rs b/crates/benilla-ui/src/script/tests/talent.rs
index ab4c63fc..7920b405 100644
--- a/crates/benilla-ui/src/script/tests/talent.rs
+++ b/crates/benilla-ui/src/script/tests/talent.rs
@@ -1,5 +1,5 @@
-//! The talent bindings over a pushed snapshot, the learn queue, and `SetTalent`: the spell tooltip
-//! with the talent lines interleaved.
+//! The talent bindings over a pushed snapshot, the learn queue, and `SetTalent`: the talent builder
+//! for a passive talent, the spell tooltip with the talent lines interleaved for an exceptional one.
 
 use super::common::script;
 use crate::script::*;
@@ -115,29 +115,40 @@ fn seed_talent_strings(s: &mut UiScript) {
     .unwrap();
 }
 
-/// `SetTalent`'s lines: name, `TOOLTIP_TALENT_RANK` (white), cost, gold description,
-/// `TOOLTIP_TALENT_NEXT_RANK` and the next rank's gold description, green `TOOLTIP_TALENT_LEARN`.
+/// A passive talent's full spell view, every body line filled, so a test sees which ones the talent
+/// builder drops.
+fn passive_body(description: &str) -> SpellTooltipView {
+    SpellTooltipView {
+        name: "Improved Fireball".into(),
+        cost: Some("35 Mana".into()),
+        range: Some("30 yd range".into()),
+        cast_time: Some("Instant".into()),
+        cooldown: Some("6 sec cooldown".into()),
+        requires_item: Some("Requires One-Handed Axes".into()),
+        requires_form: Some("Requires Battle Stance".into()),
+        reagents: Some("Reagents: Light Feather".into()),
+        chance: Some("2.62% chance to dodge".into()),
+        description: description.into(),
+        ..Default::default()
+    }
+}
+
+/// `SetTalent` on a passive talent is the talent builder `0x52b0a0`: name, `TOOLTIP_TALENT_RANK`
+/// (white), the gold description, a `" "` spacer, `TOOLTIP_TALENT_NEXT_RANK` and the next rank's
+/// gold description, green `TOOLTIP_TALENT_LEARN`; no cost, range, cast, requirement, reagent or
+/// chance line.
 #[test]
-fn set_talent_renders_the_interleaved_tooltip() {
+fn set_talent_on_a_passive_talent_is_the_talent_builder() {
     let mut s = script();
     seed_talent_strings(&mut s);
     s.set_talents(one_tab_state());
     s.set_spell_tooltip(
         11070,
-        SpellTooltipView {
-            name: "Improved Fireball".into(),
-            cast_time: Some("Instant".into()),
-            description: "Reduces the casting time of your Fireball spell by 0.3 sec.".into(),
-            ..Default::default()
-        },
+        passive_body("Reduces the casting time of your Fireball spell by 0.3 sec."),
     );
     s.set_spell_tooltip(
         11071,
-        SpellTooltipView {
-            name: "Improved Fireball".into(),
-            description: "Reduces the casting time of your Fireball spell by 0.4 sec.".into(),
-            ..Default::default()
-        },
+        passive_body("Reduces the casting time of your Fireball spell by 0.4 sec."),
     );
     s.run(
         r#"
@@ -146,13 +157,18 @@ fn set_talent_renders_the_interleaved_tooltip() {
         tt:SetOwner(a, "ANCHOR_RIGHT")
         tt:SetTalent(1, 1)
         assert(tt:IsShown(), "SetTalent shows")
-        -- name, rank, Instant, desc, next-rank header, next desc, learn hint = 7 lines.
+        -- name, rank, desc, spacer, next-rank header, next desc, learn hint = 7 lines.
         assert(tt:NumLines() == 7, "got " .. tt:NumLines())
         assert(TTTextLeft1:GetText() == "Improved Fireball")
         assert(TTTextLeft2:GetText() == "[RANK 3/5]", "got " .. TTTextLeft2:GetText())
-        assert(TTTextLeft3:GetText() == "Instant")
+        assert(TTTextLeft3:GetText() == "Reduces the casting time of your Fireball spell by 0.3 sec.")
+        assert(TTTextLeft4:GetText() == " ", "the spacer, got " .. tostring(TTTextLeft4:GetText()))
         assert(TTTextLeft5:GetText() == "[NEXT_RANK]")
+        assert(TTTextLeft6:GetText() == "Reduces the casting time of your Fireball spell by 0.4 sec.")
         assert(TTTextLeft7:GetText() == "[LEARN]")
+        for i = 1, 7 do
+            assert(getglobal("TTTextRight" .. i):GetText() == nil, "no right column on line " .. i)
+        end
     "#,
     )
     .unwrap();
@@ -163,6 +179,56 @@ fn set_talent_renders_the_interleaved_tooltip() {
             if t == "[LEARN]" && c[0] < 1e-6 && (c[1] - 1.0).abs() < 1e-6)
     });
     assert!(green, "the learn hint is green");
+    // The spacer is `0x530380`'s gold, not `0x5303b0`'s caller colour.
+    let gold_spacer = quads.iter().any(|q| {
+        matches!(&q.content, QuadContent::Text { text: Some(t), color: Some(c), .. }
+            if t == " " && (c[0] - 1.0).abs() < 1e-6 && (c[1] - 210.0 / 255.0).abs() < 1e-3 && c[2] < 1e-6)
+    });
+    assert!(gold_spacer, "the spacer is gold");
+    assert!(s.take_errors().is_empty());
+}
+
+/// An exceptional talent (`Talent.dbc` Flags bit 0) is the spell builder `0x52e610` instead, whose
+/// cost, cast and required-item lines stay: Holy Shield's "Requires Shields".
+#[test]
+fn set_talent_on_an_exceptional_talent_keeps_the_spell_body() {
+    let mut s = script();
+    seed_talent_strings(&mut s);
+    let mut state = one_tab_state();
+    let holy_shield = &mut state.talents[0][1];
+    holy_shield.name = "Holy Shield".into();
+    holy_shield.exceptional = true;
+    holy_shield.req_lines = vec!["Requires 30 points in Protection Talents".into()];
+    s.set_talents(state);
+    s.set_spell_tooltip(
+        11119,
+        SpellTooltipView {
+            name: "Holy Shield".into(),
+            cost: Some("150 Mana".into()),
+            cast_time: Some("Instant cast".into()),
+            requires_item: Some("Requires Shields".into()),
+            description: "Increases chance to block by 30% for 10 sec.".into(),
+            ..Default::default()
+        },
+    );
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "TB3"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        local tt = CreateFrame("GameTooltip", "TT3")
+        tt:SetOwner(a, "ANCHOR_RIGHT")
+        tt:SetTalent(1, 2)
+        local want = {
+            "Holy Shield", "[RANK 0/5]", "Requires 30 points in Protection Talents", "150 Mana",
+            "Instant cast", "Requires Shields", "Increases chance to block by 30% for 10 sec.",
+        }
+        assert(tt:NumLines() == table.getn(want), "got " .. tt:NumLines())
+        for i, text in ipairs(want) do
+            local got = getglobal("TT3TextLeft" .. i):GetText()
+            assert(got == text, "line " .. i .. ": " .. tostring(got))
+        end
+    "#,
+    )
+    .unwrap();
     assert!(s.take_errors().is_empty());
 }
 
diff --git a/crates/benilla-ui/src/script/tests/tooltip.rs b/crates/benilla-ui/src/script/tests/tooltip.rs
index dcb24950..0696ac5a 100644
--- a/crates/benilla-ui/src/script/tests/tooltip.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip.rs
@@ -145,7 +145,6 @@ fn owner_clear_and_hide_lifecycle() {
         tt:AddLine("first hover")
         tt:Show()
         assert(tt:IsOwned(a) and not tt:IsOwned(b), "owned by a")
-        assert(tt:BenillaGetTooltipOwner() == a, "the owner wrapper reads back")
         tt:SetOwner(b, "ANCHOR_LEFT")
         assert(cleared >= 1, "SetOwner cleared the old content")
         assert(tt:NumLines() == 0, "content cleared on re-own")
@@ -162,6 +161,36 @@ fn owner_clear_and_hide_lifecycle() {
     assert!(s.take_errors().is_empty());
 }
 
+/// The host reads a tooltip's owner by name; Lua has only `IsOwned(frame)`, and no method of ours
+/// answers the owner.
+#[test]
+fn the_host_reads_the_owner_and_lua_cannot() {
+    let s = script();
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "OwnA")
+        local b = CreateFrame("Button", "OwnB")
+        TTO = CreateFrame("GameTooltip", "TTO")
+        TTO:SetOwner(a, "ANCHOR_RIGHT")
+        "#,
+    )
+    .unwrap();
+    assert_eq!(s.tooltip_owner_name("TTO").as_deref(), Some("OwnA"));
+    s.run(r#"TTO:SetOwner(OwnB, "ANCHOR_LEFT")"#).unwrap();
+    assert_eq!(s.tooltip_owner_name("TTO").as_deref(), Some("OwnB"));
+    s.run("TTO:Hide()").unwrap();
+    assert_eq!(s.tooltip_owner_name("TTO"), None, "the hide un-owns");
+    assert_eq!(s.tooltip_owner_name("NoSuchTooltip"), None);
+    assert_eq!(s.tooltip_owner_name("OwnA"), None, "a Button is no tooltip");
+    for method in ["BenillaGetTooltipOwner", "BenillaSetItemById"] {
+        assert!(
+            s.eval::<bool>(&format!("return TTO.{method} == nil"))
+                .unwrap(),
+            "GameTooltip:{method} is reachable"
+        );
+    }
+}
+
 /// `SetText` shows the tooltip and `AddLine` does not. `r, g, b` apply only when the r slot is a
 /// number, so `AddLine(text, "", r, g, b)` draws in the default gold, as the reference's zone
 /// tooltip does.
diff --git a/crates/benilla-ui/src/script/tests/tooltip_item/bindings.rs b/crates/benilla-ui/src/script/tests/tooltip_item/bindings.rs
index 122cf20e..76224607 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_item/bindings.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_item/bindings.rs
@@ -650,3 +650,102 @@ fn set_merchant_compare_item_answers_one_or_nil_per_candidate_slot() {
         "number"
     );
 }
+
+/// Both bindings return the pushed cost, a vault item's through either; no cost, an empty slot
+/// and an inspected unit's item answer 0.
+#[test]
+fn item_bindings_return_the_pushed_repair_cost() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    let mut inv: InventorySlots = Default::default();
+    inv[16] = Some(InvSlotView {
+        item_id: 8200,
+        name: Some("Worn Blade".into()),
+        quality: 2,
+        ..Default::default()
+    });
+    s.set_inventory_slots(inv.clone());
+    s.set_inspect(Some(InspectView {
+        unit: "target".into(),
+        guid: 0x42,
+        slots: inv,
+    }));
+    let mut slots = HashMap::new();
+    for (slot, id, name) in [(1, 8201, "Worn Helm"), (2, 8202, "Whole Helm")] {
+        slots.insert(
+            slot,
+            ContainerSlot {
+                item_id: id,
+                count: 1,
+                quality: Some(2),
+                link: Some(format!("|cff1eff00|Hitem:{id}:0:0:0|h[{name}]|h|r")),
+                ..Default::default()
+            },
+        );
+    }
+    let vault = HashMap::from([(
+        3,
+        ContainerSlot {
+            item_id: 8201,
+            count: 1,
+            quality: Some(2),
+            link: Some("|cff1eff00|Hitem:8201:0:0:0|h[Worn Helm]|h|r".into()),
+            ..Default::default()
+        },
+    )]);
+    for (bag, name, slots) in [(0, "Backpack", slots), (-1, "Bank", vault)] {
+        s.set_container(
+            bag,
+            Some(ContainerState {
+                name: Some(name.into()),
+                num_slots: 24,
+                slots,
+            }),
+        );
+    }
+    for (id, name) in [
+        (8200, "Worn Blade"),
+        (8201, "Worn Helm"),
+        (8202, "Whole Helm"),
+    ] {
+        s.set_item_template(
+            id,
+            ItemTemplateView {
+                name: name.into(),
+                quality: 2,
+                ..Default::default()
+            },
+        );
+    }
+    let mut costs = RepairCosts::default();
+    costs.equipped.insert(16, 1234);
+    costs.bags.insert((0, 1), 567);
+    costs.bags.insert((-1, 3), 89);
+    s.set_repair_costs(costs);
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "Slot"); a:SetPoint("CENTER", 0, 0)
+        a:SetWidth(10); a:SetHeight(10)
+        local tt = CreateFrame("GameTooltip", "TT")
+        tt:SetOwner(a, "ANCHOR_RIGHT")
+        local has, _, cost = tt:SetInventoryItem("player", 16)
+        assert(has == 1 and cost == 1234, "equipped: " .. tostring(cost))
+        local _, _, upper = tt:SetInventoryItem("PLAYER", 16)
+        assert(upper == 1234, "the token matches case-blind: " .. tostring(upper))
+        local _, _, empty = tt:SetInventoryItem("player", 15)
+        assert(empty == 0, "an empty slot still pushes 0")
+        local seen, _, theirs = tt:SetInventoryItem("target", 16)
+        assert(seen == 1 and theirs == 0, "an inspected item: " .. tostring(theirs))
+        local _, _, vault = tt:SetInventoryItem("player", 42)
+        assert(vault == 89, "vault slot 3 by live id 42: " .. tostring(vault))
+        local _, vault_bag = tt:SetBagItem(-1, 3)
+        assert(vault_bag == 89, "vault slot 3 as a bag: " .. tostring(vault_bag))
+        local _, bag = tt:SetBagItem(0, 1)
+        assert(bag == 567, "bag: " .. tostring(bag))
+        local _, whole = tt:SetBagItem(0, 2)
+        assert(whole == 0, "no cost: " .. tostring(whole))
+    "#,
+    )
+    .unwrap();
+    assert!(s.take_errors().is_empty());
+}
diff --git a/crates/benilla-ui/src/script/tests/tooltip_item/law.rs b/crates/benilla-ui/src/script/tests/tooltip_item/law.rs
index 6146deff..4c9f2209 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_item/law.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_item/law.rs
@@ -23,8 +23,8 @@ fn item_line_law_and_red_requirements() {
         local a = CreateFrame("Button", "Slot"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(871)
-        assert(tt:IsShown(), "BenillaSetItemById shows")
+        SetItemByIdForTest(tt, 871)
+        assert(tt:IsShown(), "the id render shows")
     "#,
     )
     .unwrap();
@@ -90,7 +90,7 @@ fn red_lines_track_player_state() {
         local a = CreateFrame("Button", "Slot2"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(871)
+        SetItemByIdForTest(tt, 871)
     "#,
     )
     .unwrap();
@@ -146,7 +146,7 @@ fn verified_families_signable_locked_resists_known() {
         local a = CreateFrame("Button", "Slot5"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(5518)
+        SetItemByIdForTest(tt, 5518)
     "#,
     )
     .unwrap();
@@ -196,7 +196,7 @@ fn verified_families_signable_locked_resists_known() {
     s.run(
         r#"
         TT:SetOwner(Slot5, "ANCHOR_RIGHT")
-        TT:BenillaSetItemById(5519)
+        SetItemByIdForTest(TT, 5519)
         assert(TT:NumLines() == 1, "a lone Holy resist prints no line, got " .. TT:NumLines())
     "#,
     )
@@ -212,7 +212,7 @@ fn verified_families_signable_locked_resists_known() {
             ..Default::default()
         },
     );
-    s.run(r#"TT:SetOwner(Slot5, "ANCHOR_RIGHT"); TT:BenillaSetItemById(5520)"#)
+    s.run(r#"TT:SetOwner(Slot5, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 5520)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     let texts: Vec<&str> = lines.iter().map(|(t, _)| t.as_str()).collect();
@@ -258,7 +258,7 @@ fn proficiency_and_reputation_reds() {
         local a = CreateFrame("Button", "Slot9"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(871)
+        SetItemByIdForTest(tt, 871)
     "#,
     )
     .unwrap();
@@ -292,7 +292,7 @@ fn proficiency_and_reputation_reds() {
     req2.proficiency.insert(2, 1 << 0);
     req2.rep_ranks.insert(72, 4);
     s.set_player_req_state(req2.clone());
-    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(871)"#)
+    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 871)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     assert_eq!(
@@ -310,7 +310,7 @@ fn proficiency_and_reputation_reds() {
     let mut alt = item;
     alt.proficiency_alt = Some(0);
     s.set_item_template(871, alt);
-    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(871)"#)
+    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 871)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     assert_eq!(
@@ -338,7 +338,7 @@ fn proficiency_and_reputation_reds() {
     let mut req3 = req2.clone();
     req3.proficiency.insert(2, 1 << 15);
     s.set_player_req_state(req3.clone());
-    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(872)"#)
+    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 872)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     // Type 22 takes `INVTYPE_WEAPONOFFHAND`, not `INVTYPE_SHIELD`, though both read "Off Hand".
@@ -354,7 +354,7 @@ fn proficiency_and_reputation_reds() {
     );
     req3.can_dual_wield = true;
     s.set_player_req_state(req3);
-    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(872)"#)
+    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 872)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     assert_eq!(
@@ -373,7 +373,7 @@ fn proficiency_and_reputation_reds() {
             ..Default::default()
         },
     );
-    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(118)"#)
+    s.run(r#"TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 118)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     assert_eq!(
@@ -395,7 +395,7 @@ fn proficiency_and_reputation_reds() {
     );
     s.run(
         r#"
-        TT:SetOwner(Slot9, "ANCHOR_RIGHT"); TT:BenillaSetItemById(889)
+        TT:SetOwner(Slot9, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 889)
         assert(TTTextLeft2:GetText() == "[INVTYPE_FINGER]")
         assert(TTTextRight2:GetText() == nil or TTTextRight2:GetText() == "",
                "a ring never prints its Miscellaneous type")
@@ -425,11 +425,11 @@ fn required_level_one_is_hidden() {
         r#"
         local a = CreateFrame("Button", "SlotR"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
-        tt:SetOwner(a, "ANCHOR_RIGHT"); tt:BenillaSetItemById(11)
+        tt:SetOwner(a, "ANCHOR_RIGHT"); SetItemByIdForTest(tt, 11)
         assert(tt:NumLines() == 1, "req 0: name only, got " .. tt:NumLines())
-        tt:SetOwner(a, "ANCHOR_RIGHT"); tt:BenillaSetItemById(12)
+        tt:SetOwner(a, "ANCHOR_RIGHT"); SetItemByIdForTest(tt, 12)
         assert(tt:NumLines() == 1, "req 1 hides like req 0, got " .. tt:NumLines())
-        tt:SetOwner(a, "ANCHOR_RIGHT"); tt:BenillaSetItemById(13)
+        tt:SetOwner(a, "ANCHOR_RIGHT"); SetItemByIdForTest(tt, 13)
         assert(tt:NumLines() == 2, "req 2 prints, got " .. tt:NumLines())
         assert(TTTextLeft2:GetText() == "[MIN_LEVEL 2]")
     "#,
@@ -772,7 +772,7 @@ fn a_runtime_bound_instance_overrides_the_bind_line_to_soulbound() {
     s.run(r#"TT:SetBagItem(0, 2)"#).unwrap();
     assert_eq!(bind_line(&mut s).0, "[ITEM_BIND_ON_EQUIP]");
 
-    s.run(r#"TT:BenillaSetItemById(871)"#).unwrap();
+    s.run(r#"SetItemByIdForTest(TT, 871)"#).unwrap();
     assert_eq!(bind_line(&mut s).0, "[ITEM_BIND_ON_EQUIP]");
 
     // A bound quest item stays `ITEM_BIND_QUEST`, the text 4 and 5 print anyway.
@@ -793,7 +793,7 @@ fn damage_matrix_arms_and_the_first_flag() {
         s.run(&format!(
             r#"local a = CreateFrame("Button", "S{id}"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
                if not TT then CreateFrame("GameTooltip", "TT") end
-               TT:SetOwner(S{id}, "ANCHOR_RIGHT"); TT:BenillaSetItemById({id})"#
+               TT:SetOwner(S{id}, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, {id})"#
         ))
         .unwrap();
         lines_of(s).into_iter().map(|(t, _)| t).collect()
@@ -930,7 +930,7 @@ fn container_slots_line_names_its_subclass() {
         s.run(&format!(
             r#"local a = CreateFrame("Button", "B{id}"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
                if not TT then CreateFrame("GameTooltip", "TT") end
-               TT:SetOwner(B{id}, "ANCHOR_RIGHT"); TT:BenillaSetItemById({id})"#
+               TT:SetOwner(B{id}, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, {id})"#
         ))
         .unwrap();
         lines_of(s).into_iter().map(|(t, _)| t).collect()
diff --git a/crates/benilla-ui/src/script/tests/tooltip_item/mechanics.rs b/crates/benilla-ui/src/script/tests/tooltip_item/mechanics.rs
index e07b04ef..e4133906 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_item/mechanics.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_item/mechanics.rs
@@ -55,7 +55,7 @@ fn bag_item_money_law_and_fallback() {
         money_fired = nil
         local a = CreateFrame("Button", "Slot3"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
-        tt:SetScript("OnTooltipAddMoney", function(self) money_fired = arg1 end)
+        tt:SetScript("OnTooltipAddMoney", function() local self = this money_fired = arg1 end)
         -- No merchant: no money handler fires.
         tt:SetOwner(a, "ANCHOR_RIGHT")
         tt:SetBagItem(0, 1)
@@ -124,7 +124,7 @@ fn wrap_lines_measure_wrapped_in_one_pass_and_survive_the_reenter_loop() {
         local a = CreateFrame("Button", "Slot4"); a:SetPoint("TOPLEFT", 10, -10); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(7)
+        SetItemByIdForTest(tt, 7)
     "#,
     )
     .unwrap();
@@ -164,7 +164,7 @@ fn wrap_lines_measure_wrapped_in_one_pass_and_survive_the_reenter_loop() {
         s.run(
             r#"
             TT:SetOwner(Slot4, "ANCHOR_RIGHT")
-            TT:BenillaSetItemById(7)
+            SetItemByIdForTest(TT, 7)
         "#,
         )
         .unwrap();
@@ -221,7 +221,7 @@ fn item_render_hides_the_unit_health_bar() {
     s.run(
         r#"
         GameTooltip:SetOwner(Slot6, "ANCHOR_RIGHT")
-        GameTooltip:BenillaSetItemById(9)
+        SetItemByIdForTest(GameTooltip, 9)
         assert(not GameTooltipStatusBar:IsShown(), "item content hides the unit bar")
         assert(GameTooltip:IsShown(), "the item tooltip itself shows")
     "#,
@@ -277,7 +277,7 @@ fn real_instance_hover_renders_live_durability() {
         end
         assert(found == "[DURABILITY 30/40]", "live pair on a bag hover, got " .. tostring(found))
         -- The template/link hover of the SAME item keeps the authored full pair.
-        tt:BenillaSetItemById(2264)
+        SetItemByIdForTest(tt, 2264)
         found = nil
         for i = 1, tt:NumLines() do
             local t = getglobal("TTTextLeft" .. i):GetText()
@@ -421,7 +421,7 @@ fn an_enchanted_instance_renders_its_enchant_line_before_durability() {
         "the enchant line is green"
     );
 
-    s.run(r#"TT:BenillaSetItemById(22816)"#).unwrap();
+    s.run(r#"SetItemByIdForTest(TT, 22816)"#).unwrap();
     let lines = super::lines_of(&mut s);
     assert!(
         !lines.iter().any(|(t, _)| t.starts_with("Agility")),
@@ -608,6 +608,7 @@ fn a_looted_roll_shows_its_lines_and_never_the_placeholder() {
         },
     );
     s.set_loot(Some(LootState {
+        source_unit: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
             name: Some("Bloodrazor of the Monkey".into()),
@@ -689,6 +690,7 @@ fn a_looted_item_with_no_roll_shows_neither_line_nor_placeholder() {
         },
     );
     s.set_loot(Some(LootState {
+        source_unit: false,
         master_candidates: Vec::new(),
         rows: vec![Some(LootRow {
             name: Some("Bloodrazor".into()),
@@ -796,7 +798,7 @@ fn random_property_template_hover_shows_the_placeholder() {
         local a = CreateFrame("Button", "Slot"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(Slot, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(8888)
+        SetItemByIdForTest(tt, 8888)
     "#,
     )
     .unwrap();
diff --git a/crates/benilla-ui/src/script/tests/tooltip_item/mod.rs b/crates/benilla-ui/src/script/tests/tooltip_item/mod.rs
index 9c4107a6..93e2a1df 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_item/mod.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_item/mod.rs
@@ -112,10 +112,18 @@ fn seed_item_strings(s: &mut UiScript) {
     .unwrap();
 }
 
-/// The fixture VM, with [`seed_item_strings`] run.
+/// The fixture VM, with [`seed_item_strings`] run and `SetItemByIdForTest(tooltip, itemId)`, the
+/// test VM's door onto the id-keyed render the engine's item hovers call from Rust.
 fn script() -> UiScript {
     let mut s = bare_script();
     seed_item_strings(&mut s);
+    let f = s
+        .lua()
+        .create_function(|lua, (tt, id): (mlua::Table, u32)| {
+            crate::script::tooltip_item::render_by_id(lua, &tt, id, None, None)
+        })
+        .unwrap();
+    s.lua().globals().set("SetItemByIdForTest", f).unwrap();
     s
 }
 
diff --git a/crates/benilla-ui/src/script/tests/tooltip_item/set.rs b/crates/benilla-ui/src/script/tests/tooltip_item/set.rs
index ae351242..b9e7b7f8 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_item/set.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_item/set.rs
@@ -55,7 +55,7 @@ fn item_set_block_counts_and_colors() {
         local a = CreateFrame("Button", "Slot10"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
         local tt = CreateFrame("GameTooltip", "TT")
         tt:SetOwner(a, "ANCHOR_RIGHT")
-        tt:BenillaSetItemById(6303)
+        SetItemByIdForTest(tt, 6303)
         -- The spacer is the reference's own literal `0x854b2c` — a space and a newline, which is
         -- ONE row carrying one space, not the empty string (an empty AddLine adds no line at all
         -- in the reference: `0x530270` bails before its `inc [esi+0x31c]`).
@@ -120,7 +120,7 @@ fn item_set_block_counts_and_colors() {
     s.set_item_set(161, gated);
     s.run(
         r#"
-        TT:SetOwner(Slot10, "ANCHOR_RIGHT"); TT:BenillaSetItemById(6303)
+        TT:SetOwner(Slot10, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 6303)
         assert(TTTextLeft5:GetText() == "[MIN_SKILL Leatherworking 250]",
                "the skill line sits between header and members")
         assert(TTTextLeft6:GetText() == "  Defias Mark")
@@ -141,7 +141,7 @@ fn item_set_block_counts_and_colors() {
     let mut req = PlayerReqState::default();
     req.skills.insert(165, 300);
     s.set_player_req_state(req);
-    s.run(r#"TT:SetOwner(Slot10, "ANCHOR_RIGHT"); TT:BenillaSetItemById(6303)"#)
+    s.run(r#"TT:SetOwner(Slot10, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 6303)"#)
         .unwrap();
     let lines = lines_of(&mut s);
     assert_eq!(
@@ -161,7 +161,7 @@ fn item_set_block_counts_and_colors() {
             ..Default::default()
         },
     );
-    s.run(r#"TT:SetOwner(Slot10, "ANCHOR_RIGHT"); TT:BenillaSetItemById(9999)"#)
+    s.run(r#"TT:SetOwner(Slot10, "ANCHOR_RIGHT"); SetItemByIdForTest(TT, 9999)"#)
         .unwrap();
     assert_eq!(s.take_item_set_asks(), vec![1], "the set ask recorded");
     assert!(s.take_errors().is_empty());
diff --git a/crates/benilla-ui/src/script/tests/tooltip_spell.rs b/crates/benilla-ui/src/script/tests/tooltip_spell.rs
index 123a69f2..600a21bc 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_spell.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_spell.rs
@@ -68,7 +68,8 @@ fn a_pet_book_hover_reads_the_pets_book_not_the_players() {
     let mut s = script();
     s.set_screen_size(800.0, 600.0);
     s.set_spell_tooltip(133, fireball());
-    s.set_spell_tooltip(
+    // The pet book's flag is the builder's unit selector, so its hover reads the pet's view.
+    s.set_pet_spell_tooltip(
         3110,
         SpellTooltipView {
             name: "Firebolt".into(),
@@ -232,17 +233,14 @@ fn player_buff_hover_is_the_aura_variant() {
         },
     );
     s.tick(10.0); // GetTime = 10
-    s.set_auras(
-        "player",
-        Some(vec![AuraState {
-            spell_id: 1459,
-            name: Some("Arcane Intellect".into()),
-            duration: 1800.0,
-            expiration_time: 100.0, // 90 s left at now = 10
-            helpful: true,
-            ..Default::default()
-        }]),
-    );
+    s.set_player_auras(vec![AuraState {
+        spell_id: 1459,
+        name: Some("Arcane Intellect".into()),
+        duration: 1800.0,
+        expiration_time: 100.0, // 90 s left at now = 10
+        helpful: true,
+        ..Default::default()
+    }]);
     s.run(
         r#"
         -- The duration line's wording comes from the VM's GlobalStrings, which the app runs off
@@ -302,15 +300,12 @@ fn player_buff_hover_names_the_dispel_class_in_gold() {
             ..Default::default()
         },
     );
-    s.set_auras(
-        "player",
-        Some(vec![AuraState {
-            spell_id: 168,
-            name: Some("Ice Armor".into()),
-            helpful: true,
-            ..Default::default()
-        }]),
-    );
+    s.set_player_auras(vec![AuraState {
+        spell_id: 168,
+        name: Some("Ice Armor".into()),
+        helpful: true,
+        ..Default::default()
+    }]);
     s.run(
         r#"
         local a = CreateFrame("Button", "BF1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
@@ -420,8 +415,13 @@ fn unit_buff_and_debuff_hover_render_the_aura_variant_without_remaining() {
             ..Default::default()
         },
     );
-    s.set_auras(
-        "target",
+    // The target, guid 7, through the resolver.
+    s.set_unit_guids(&crate::script::UnitGuids {
+        target: 7,
+        ..Default::default()
+    });
+    s.set_unit_auras(
+        7,
         Some(vec![
             AuraState {
                 spell_id: 1126,
@@ -480,29 +480,26 @@ fn player_buff_hover_indexes_the_cache_position_not_a_filtered_ordinal() {
         );
     }
     // The player's cache: two buffs then a debuff, in one insertion-ordered list.
-    s.set_auras(
-        "player",
-        Some(vec![
-            AuraState {
-                spell_id: 1126,
-                name: Some("Mark of the Wild".into()),
-                helpful: true,
-                ..Default::default()
-            },
-            AuraState {
-                spell_id: 2457,
-                name: Some("Battle Stance".into()),
-                helpful: true,
-                ..Default::default()
-            },
-            AuraState {
-                spell_id: 589,
-                name: Some("Shadow Word: Pain".into()),
-                helpful: false,
-                ..Default::default()
-            },
-        ]),
-    );
+    s.set_player_auras(vec![
+        AuraState {
+            spell_id: 1126,
+            name: Some("Mark of the Wild".into()),
+            helpful: true,
+            ..Default::default()
+        },
+        AuraState {
+            spell_id: 2457,
+            name: Some("Battle Stance".into()),
+            helpful: true,
+            ..Default::default()
+        },
+        AuraState {
+            spell_id: 589,
+            name: Some("Shadow Word: Pain".into()),
+            helpful: false,
+            ..Default::default()
+        },
+    ]);
     s.run(
         r#"
         local a = CreateFrame("Button", "BF1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
@@ -671,16 +668,16 @@ fn set_trainer_service_selects_the_builder_and_never_renders_its_own_line() {
             ..Default::default()
         },
     );
-    s.set_spell_tooltip(
-        200,
-        SpellTooltipView {
-            name: "Heroic Strike".into(),
-            cost: Some("15 Rage".into()),
-            reagents: Some("Reagents: Linen Cloth".into()),
-            description: "A strong attack.".into(),
-            ..Default::default()
-        },
-    );
+    let heroic_strike = SpellTooltipView {
+        name: "Heroic Strike".into(),
+        cost: Some("15 Rage".into()),
+        reagents: Some("Reagents: Linen Cloth".into()),
+        description: "A strong attack.".into(),
+        ..Default::default()
+    };
+    s.set_spell_tooltip(200, heroic_strike.clone());
+    // altCaster is the builder's unit selector, which reads the pet's view.
+    s.set_pet_spell_tooltip(200, heroic_strike);
     s.set_trainer(Some(TrainerState {
         services: vec![
             trainer_service(2756, "Copper Shortsword", TrainerTooltip::Item(2847)),
@@ -888,7 +885,7 @@ fn the_remaining_line_is_gated_on_until_cancelled_not_on_the_duration() {
         BENILLA_LAST = BENILLA_LINES == 3 and TT2TextLeft3:GetText() or ""
     "#;
     let mut show = |aura: AuraState| {
-        s.set_auras("player", Some(vec![aura]));
+        s.set_player_auras(vec![aura]);
         s.run(hover).unwrap();
         (
             s.eval::<i64>("return BENILLA_LINES").unwrap(),
@@ -1038,3 +1035,476 @@ fn quest_reward_spell_getters_and_hovers() {
     );
     assert!(s.errors().is_empty(), "script errors: {:?}", s.errors());
 }
+
+/// A craft recipe row whose detail icon hovers `tooltip`.
+fn craft_recipe(spell_id: u32, name: &str, tooltip: CraftTooltip) -> CraftRecipe {
+    CraftRecipe {
+        spell_id,
+        tooltip,
+        name: name.into(),
+        sub_name: String::new(),
+        difficulty: TradeSkillDifficulty::Optimal,
+        num_available: 1,
+        icon: None,
+        description: None,
+        needs_item_target: false,
+        reagents: vec![],
+        tools: vec![],
+        spell_level: 0,
+    }
+}
+
+/// Firebolt (3110) on a pet-bar slot.
+fn firebolt_slot() -> PetActionView {
+    PetActionView {
+        name: Some("Firebolt".into()),
+        spell_id: Some(3110),
+        ..Default::default()
+    }
+}
+
+fn firebolt() -> SpellTooltipView {
+    SpellTooltipView {
+        name: "Firebolt".into(),
+        rank: Some("Rank 1".into()),
+        cost: Some("10 Mana".into()),
+        range: Some("30 yd range".into()),
+        cast_time: Some("1 sec cast".into()),
+        description: "Deals 7 to 10 Fire damage to a target.".into(),
+        ..Default::default()
+    }
+}
+
+/// Pet-bar tokens and craft item subjects name no spell, so they are left out.
+#[test]
+fn the_spell_subjects_are_what_the_setters_read_from_the_vm() {
+    let mut s = script();
+    s.set_pet_actions(
+        true,
+        true,
+        true,
+        vec![
+            PetActionView {
+                name: Some("PET_ACTION_ATTACK".into()),
+                is_token: true,
+                ..Default::default()
+            },
+            firebolt_slot(),
+        ],
+    );
+    s.set_pet_book(PetBookState {
+        token: Some("DEMON".into()),
+        slots: vec![SpellSlotView {
+            spell_id: 6307,
+            name: "Blood Pact".into(),
+            ..Default::default()
+        }],
+    });
+    let reward = |spell_id| {
+        Some(QuestRewardSpell {
+            spell_id,
+            ..Default::default()
+        })
+    };
+    s.set_quest(Some(QuestState {
+        panel: QuestPanel::Reward,
+        reward_spell: reward(133),
+        ..QuestState::default()
+    }));
+    s.set_quest_log(QuestLogState {
+        entries: vec![QuestLogEntryView {
+            quest_id: 7,
+            detail: Some(QuestLogDetail {
+                reward_spell: reward(116),
+                ..Default::default()
+            }),
+            ..Default::default()
+        }],
+        ..Default::default()
+    });
+    s.set_craft(Some(CraftState {
+        name: "Beast Training".into(),
+        rank: 0,
+        max_rank: 0,
+        craft_type: 1,
+        recipes: vec![
+            craft_recipe(24599, "Bite", CraftTooltip::Spell(17253)),
+            craft_recipe(7421, "Runed Copper Rod", CraftTooltip::Item(6218)),
+        ],
+    }));
+    let aura = |spell_id| AuraState {
+        spell_id,
+        ..Default::default()
+    };
+    s.set_player_auras(vec![aura(1459)]);
+    // The pet's, the target-of-target's and party1's lists, by guid.
+    s.set_unit_auras(0xF140_0000_0000_0077, Some(vec![aura(172)]));
+    s.set_unit_auras(0x21, Some(vec![aura(589)]));
+    s.set_unit_auras(0x22, Some(vec![aura(8921)]));
+    s.set_tracking(Some(TrackingState {
+        spell_id: 2580,
+        name: Some("Find Minerals".into()),
+        icon: None,
+        cancelable: true,
+    }));
+
+    let mut subjects = s.spell_tooltip_subjects();
+    subjects.sort_unstable();
+    assert_eq!(subjects, vec![116, 133, 172, 589, 1459, 2580, 8921, 17253]);
+    // The pet's bar and book are read through the builder's unit selector: the pet's views.
+    let mut pet_subjects = s.pet_spell_tooltip_subjects();
+    pet_subjects.sort_unstable();
+    assert_eq!(pet_subjects, vec![3110, 6307]);
+}
+
+/// The builder's unit selector picks the view built against the pet: `SetPetAction` passes it
+/// (`0x532888`, `0x5328d0`), `SetSpell` on the pet book (`0x532e23`) and a pet-learn
+/// `SetTrainerService` (`0x533a7f`); the player's book, a class service and a craft pass 0.
+#[test]
+fn the_unit_selector_setters_read_the_pet_view() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    let view = |description: &str| SpellTooltipView {
+        name: "Sacrifice".into(),
+        description: description.into(),
+        ..Default::default()
+    };
+    s.set_spell_tooltip(7812, view("absorb 305 damage"));
+    s.set_pet_spell_tooltip(7812, view("absorb 318 damage"));
+    s.set_pet_actions(
+        true,
+        true,
+        true,
+        vec![PetActionView {
+            name: Some("Sacrifice".into()),
+            spell_id: Some(7812),
+            ..Default::default()
+        }],
+    );
+    let slot = SpellSlotView {
+        spell_id: 7812,
+        name: "Sacrifice".into(),
+        ..Default::default()
+    };
+    s.set_pet_book(PetBookState {
+        token: Some("DEMON".into()),
+        slots: vec![slot.clone()],
+    });
+    s.set_spellbook(SpellBookState {
+        tabs: Vec::new(),
+        slots: vec![slot],
+    });
+    let service = |alt_caster| {
+        trainer_service(
+            100,
+            "Sacrifice",
+            TrainerTooltip::Spell {
+                spell_id: 7812,
+                alt_caster,
+            },
+        )
+    };
+    s.set_trainer(Some(TrainerState {
+        services: vec![service(true), service(false)],
+        ..Default::default()
+    }));
+    s.set_craft(Some(CraftState {
+        name: "Beast Training".into(),
+        rank: 0,
+        max_rank: 0,
+        craft_type: 1,
+        recipes: vec![craft_recipe(24599, "Sacrifice", CraftTooltip::Spell(7812))],
+    }));
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "TT")
+        local function desc(set)
+            TT:SetOwner(PB1, "ANCHOR_RIGHT"); set(); return TTTextLeft2:GetText()
+        end
+        PET_BAR = desc(function() TT:SetPetAction(1) end)
+        PET_BOOK = desc(function() TT:SetSpell(1, "pet") end)
+        BOOK = desc(function() TT:SetSpell(1, "spell") end)
+        -- Row 1 is the group header.
+        PET_SERVICE = desc(function() TT:SetTrainerService(2) end)
+        SERVICE = desc(function() TT:SetTrainerService(3) end)
+        CRAFT = desc(function() TT:SetCraftSpell(1) end)
+    "#,
+    )
+    .unwrap();
+    let got = |name: &str| s.eval::<String>(&format!("return {name}")).unwrap();
+    assert_eq!(got("PET_BAR"), "absorb 318 damage");
+    assert_eq!(got("PET_BOOK"), "absorb 318 damage");
+    assert_eq!(got("PET_SERVICE"), "absorb 318 damage");
+    assert_eq!(got("BOOK"), "absorb 305 damage");
+    assert_eq!(got("SERVICE"), "absorb 305 damage");
+    assert_eq!(got("CRAFT"), "absorb 305 damage");
+    assert!(s.take_spell_tooltip_asks().is_empty());
+    assert!(s.take_pet_spell_tooltip_asks().is_empty());
+    assert!(s.take_errors().is_empty());
+}
+
+/// A pet view's miss asks the pet's store, and only the pet view's answer re-renders it.
+#[test]
+fn a_pet_view_miss_waits_on_the_pet_store() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_pet_actions(true, true, true, vec![firebolt_slot()]);
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "TT")
+        TT:SetOwner(PB1, "ANCHOR_RIGHT")
+        TT:SetPetAction(1)
+    "#,
+    )
+    .unwrap();
+    assert!(s.take_spell_tooltip_asks().is_empty());
+    assert_eq!(s.take_pet_spell_tooltip_asks(), vec![3110]);
+    // The player's view of the same id is not the one the selector renders.
+    s.set_spell_tooltip(3110, firebolt());
+    assert_eq!(left_lines(&mut s), vec!["Firebolt"]);
+    s.set_pet_spell_tooltip(3110, firebolt());
+    assert_eq!(
+        left_lines(&mut s),
+        vec![
+            "Firebolt",
+            "10 Mana",
+            "1 sec cast",
+            "Deals 7 to 10 Fire damage to a target."
+        ]
+    );
+    assert!(s.take_errors().is_empty());
+}
+
+/// No second hover and no second `OnTooltipCleared`: the reference builds the tooltip at the call.
+#[test]
+fn a_missed_view_re_renders_the_tooltip_when_the_app_answers() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_pet_actions(true, true, true, vec![firebolt_slot()]);
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "TT")
+        TT:SetOwner(PB1, "ANCHOR_RIGHT")
+        CLEARED = 0
+        TT:SetScript("OnTooltipCleared", function() CLEARED = CLEARED + 1 end)
+        TT:SetPetAction(1)
+    "#,
+    )
+    .unwrap();
+    assert_eq!(left_lines(&mut s), vec!["Firebolt"]);
+    assert_eq!(s.take_pet_spell_tooltip_asks(), vec![3110]);
+
+    s.set_pet_spell_tooltip(3110, firebolt());
+    assert_eq!(
+        left_lines(&mut s),
+        vec![
+            "Firebolt",
+            "10 Mana",
+            "1 sec cast",
+            "Deals 7 to 10 Fire damage to a target."
+        ]
+    );
+    assert!(s.eval::<bool>("return TT:IsShown() == 1").unwrap());
+    assert!(
+        s.take_pet_spell_tooltip_asks().is_empty(),
+        "the re-render found the view"
+    );
+    assert_eq!(
+        s.eval::<i64>("return CLEARED").unwrap(),
+        1,
+        "one setter call, one OnTooltipCleared"
+    );
+    assert!(s.take_errors().is_empty());
+}
+
+/// Beast Training's icon has no fallback name, so its miss is a hidden plate.
+#[test]
+fn a_hidden_miss_shows_and_an_enchant_link_fills_when_answered() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_craft(Some(CraftState {
+        name: "Beast Training".into(),
+        rank: 0,
+        max_rank: 0,
+        craft_type: 1,
+        recipes: vec![craft_recipe(24599, "Bite", CraftTooltip::Spell(17253))],
+    }));
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "CI"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "TT")
+        CreateFrame("GameTooltip", "REF")
+        TT:SetOwner(CI, "ANCHOR_RIGHT")
+        TT:SetCraftSpell(1)
+        REF:SetOwner(CI, "ANCHOR_PRESERVE")
+        REF:SetHyperlink("|cffffd000|Henchant:20034|h[Enchant Weapon - Crusader]|h|r")
+    "#,
+    )
+    .unwrap();
+    assert_eq!(s.eval::<i64>("return TT:NumLines()").unwrap(), 0);
+    assert!(!s.eval::<bool>("return TT:IsShown() == 1").unwrap());
+    assert_eq!(
+        s.eval::<String>("return REFTextLeft1:GetText()").unwrap(),
+        "Enchant Weapon - Crusader"
+    );
+    assert_eq!(s.eval::<i64>("return REF:NumLines()").unwrap(), 1);
+
+    s.set_spell_tooltip(
+        17253,
+        SpellTooltipView {
+            name: "Bite".into(),
+            description: "Bite the enemy.".into(),
+            ..Default::default()
+        },
+    );
+    s.set_spell_tooltip(
+        20034,
+        SpellTooltipView {
+            name: "Enchant Weapon - Crusader".into(),
+            cast_time: Some("5 sec cast".into()),
+            description: "Permanently enchant a melee weapon.".into(),
+            ..Default::default()
+        },
+    );
+    assert!(s.eval::<bool>("return TT:IsShown() == 1").unwrap());
+    assert_eq!(
+        s.eval::<(String, String)>("return TTTextLeft1:GetText(), TTTextLeft2:GetText()")
+            .unwrap(),
+        ("Bite".to_string(), "Bite the enemy.".to_string())
+    );
+    assert_eq!(
+        s.eval::<(i64, String)>("return REF:NumLines(), REFTextLeft3:GetText()")
+            .unwrap(),
+        (3, "Permanently enchant a melee weapon.".to_string())
+    );
+    assert!(s.take_errors().is_empty());
+}
+
+/// A new hover, a hide, an added line or a running fade leaves the tooltip as it is.
+#[test]
+fn new_content_or_an_added_line_ends_the_wait() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_pet_actions(true, true, true, vec![firebolt_slot()]);
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "TT")
+        CreateFrame("GameTooltip", "HID")
+        CreateFrame("GameTooltip", "ADD")
+        TT:SetOwner(PB1, "ANCHOR_RIGHT")
+        TT:SetPetAction(1)
+        TT:SetOwner(PB1, "ANCHOR_RIGHT")
+        TT:SetText("Attack")
+        HID:SetOwner(PB1, "ANCHOR_RIGHT")
+        HID:SetPetAction(1)
+        HID:Hide()
+        ADD:SetOwner(PB1, "ANCHOR_RIGHT")
+        ADD:SetPetAction(1)
+        ADD:AddLine("an addon's line")
+        CreateFrame("GameTooltip", "FAD")
+        FAD:SetOwner(PB1, "ANCHOR_RIGHT")
+        FAD:SetPetAction(1)
+        FAD:FadeOut()
+    "#,
+    )
+    .unwrap();
+    s.set_pet_spell_tooltip(3110, firebolt());
+    assert_eq!(left_lines(&mut s), vec!["Attack"]);
+    assert_eq!(s.eval::<i64>("return HID:NumLines()").unwrap(), 0);
+    assert!(!s.eval::<bool>("return HID:IsShown() == 1").unwrap());
+    assert_eq!(
+        s.eval::<(i64, String)>("return ADD:NumLines(), ADDTextLeft2:GetText()")
+            .unwrap(),
+        (2, "an addon's line".to_string())
+    );
+    assert_eq!(s.eval::<i64>("return FAD:NumLines()").unwrap(), 1);
+    assert!(s.take_errors().is_empty());
+}
+
+/// What Lua wrote after the miss is kept: a line rewritten in place, by `AppendText` or a cell's
+/// `SetTextColor`, or new content that reads the same as the miss's line.
+#[test]
+fn a_line_rewritten_in_place_ends_the_wait() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_pet_actions(true, true, true, vec![firebolt_slot()]);
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "APP")
+        CreateFrame("GameTooltip", "COL")
+        APP:SetOwner(PB1, "ANCHOR_RIGHT")
+        APP:SetPetAction(1)
+        APP:AppendText(" (Pet)")
+        COL:SetOwner(PB1, "ANCHOR_RIGHT")
+        COL:SetPetAction(1)
+        COLTextLeft1:SetTextColor(1, 0, 0)
+        CreateFrame("GameTooltip", "SAM")
+        SAM:SetOwner(PB1, "ANCHOR_RIGHT")
+        SAM:SetPetAction(1)
+        SAM:SetOwner(PB1, "ANCHOR_RIGHT")
+        SAM:SetText("Firebolt", 1, 1, 1)
+    "#,
+    )
+    .unwrap();
+    s.set_pet_spell_tooltip(3110, firebolt());
+    assert_eq!(
+        s.eval::<(i64, String)>("return APP:NumLines(), APPTextLeft1:GetText()")
+            .unwrap(),
+        (1, "Firebolt (Pet)".to_string())
+    );
+    assert_eq!(
+        s.eval::<(i64, f32, f32)>(
+            "local r, g = COLTextLeft1:GetTextColor(); return COL:NumLines(), r, g"
+        )
+        .unwrap(),
+        (1, 1.0, 0.0)
+    );
+    assert_eq!(s.eval::<i64>("return SAM:NumLines()").unwrap(), 1);
+    assert!(s.take_errors().is_empty());
+}
+
+/// A re-render's `OnShow` can move another waiting tooltip onto a new spell.
+#[test]
+fn a_wait_replaced_by_an_earlier_re_render_is_not_replayed() {
+    let mut s = script();
+    s.set_screen_size(800.0, 600.0);
+    s.set_craft(Some(CraftState {
+        name: "Beast Training".into(),
+        rank: 0,
+        max_rank: 0,
+        craft_type: 1,
+        recipes: vec![craft_recipe(24599, "Firebolt", CraftTooltip::Spell(3110))],
+    }));
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "PB1"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        CreateFrame("GameTooltip", "A")
+        CreateFrame("GameTooltip", "B")
+        A:SetOwner(PB1, "ANCHOR_RIGHT")
+        A:SetCraftSpell(1)
+        B:SetOwner(PB1, "ANCHOR_RIGHT")
+        B:SetCraftSpell(1)
+        A:SetScript("OnShow", function()
+            B:SetOwner(PB1, "ANCHOR_RIGHT")
+            B:SetHyperlink("|cffffd000|Henchant:20034|h[Enchant Weapon - Crusader]|h|r")
+        end)
+    "#,
+    )
+    .unwrap();
+    s.set_spell_tooltip(3110, firebolt());
+    assert_eq!(
+        s.eval::<(i64, String)>("return B:NumLines(), BTextLeft1:GetText()")
+            .unwrap(),
+        (1, "Enchant Weapon - Crusader".to_string())
+    );
+    assert_eq!(
+        s.eval::<String>("return ATextLeft1:GetText()").unwrap(),
+        "Firebolt"
+    );
+    assert!(s.take_errors().is_empty());
+}
diff --git a/crates/benilla-ui/src/script/tests/tooltip_unit.rs b/crates/benilla-ui/src/script/tests/tooltip_unit.rs
index 195ec01e..cfa1789d 100644
--- a/crates/benilla-ui/src/script/tests/tooltip_unit.rs
+++ b/crates/benilla-ui/src/script/tests/tooltip_unit.rs
@@ -25,6 +25,7 @@ fn seed_level_strings(s: &mut UiScript) {
 fn wolf() -> UnitState {
     UnitState {
         exists: true,
+        guid: 0xF130_0000_4500_0001,
         name: Some("Timber Wolf".into()),
         health: 30,
         max_health: 50,
@@ -390,6 +391,55 @@ fn level_line_variants() {
     assert!(s.take_errors().is_empty());
 }
 
+/// A player's level line reads "Race Class (Player)" whatever creature type the snapshot carries:
+/// the builder tests the player type bit (`0x52a4a6`) and takes the race and class names for a
+/// player (`0x52a4e5`-`0x52a555`), the type row only otherwise (`0x52a4bd`-`0x52a4d4`), so a
+/// shapeshifted player's Beast never reaches the line.
+#[test]
+fn a_players_level_line_ignores_the_snapshots_creature_type() {
+    let mut s = script();
+    seed_level_strings(&mut s);
+    s.set_screen_size(800.0, 600.0);
+    s.set_player_req_state(PlayerReqState {
+        level: 60,
+        ..Default::default()
+    });
+    s.run(
+        r#"
+        local a = CreateFrame("Button", "UF3"); a:SetPoint("CENTER", 0, 0); a:SetWidth(10); a:SetHeight(10)
+        local tt = CreateFrame("GameTooltip", "TT")
+        tt:SetOwner(a, "ANCHOR_RIGHT")
+    "#,
+    )
+    .unwrap();
+    let druid = |reaction: u8, creature_type: Option<&str>| UnitState {
+        exists: true,
+        name: Some("Fenwick".into()),
+        level: 40,
+        reaction,
+        is_player: true,
+        race: Some("Night Elf".into()),
+        class: Some("Druid".into()),
+        creature_type_name: creature_type.map(str::to_string),
+        ..Default::default()
+    };
+    // Hostile, neutral and friendly: the three sides of the reaction gate the creature arm reads.
+    for reaction in [2, 4, 6] {
+        for creature_type in [None, Some("Humanoid"), Some("Beast")] {
+            s.set_unit("target", Some(druid(reaction, creature_type)));
+            s.run(
+                r#"
+                TT:SetOwner(UF3, "ANCHOR_RIGHT"); TT:SetUnit("target")
+                assert(TTTextLeft2:GetText() == "[LEVEL_CLASS_TYPE 40 Night Elf Druid [PLAYER]]",
+                    "got " .. TTTextLeft2:GetText())
+            "#,
+            )
+            .unwrap_or_else(|e| panic!("reaction {reaction}, type {creature_type:?}: {e}"));
+        }
+    }
+    assert!(s.take_errors().is_empty());
+}
+
 /// `world_tooltip_unit` fires the default anchor, renders, then fires `UPDATE_MOUSEOVER_UNIT`.
 #[test]
 fn world_hover_drive_and_health_watcher() {
@@ -454,8 +504,28 @@ fn world_hover_drive_and_health_watcher() {
         r#"assert(GameTooltipStatusBar:GetValue() == 12, "the health watcher tracked the push")"#,
     )
     .unwrap();
+    // Hover lost: the fade arms and `"mouseover"` names nobody (`0x492890` zeroes the pair), yet
+    // the fading plate keeps its bar, whose watcher follows the unit's guid, not the token.
     s.world_tooltip_fade();
-    s.tick(0.6);
+    s.set_unit("mouseover", None);
+    s.tick(0.1);
+    s.run(
+        r#"
+        assert(UnitExists("mouseover") == nil, "the token is cleared")
+        assert(GameTooltip:IsShown(), "still fading")
+        assert(GameTooltipStatusBar:IsShown(), "the fading plate keeps its bar")
+        assert(GameTooltipStatusBar:GetValue() == 12, "and its value")
+        assert(recolored == 1, "the clear fires no UPDATE_MOUSEOVER_UNIT")
+    "#,
+    )
+    .unwrap();
+    // The same unit pushed under another token still drives the bar.
+    let mut as_target = wolf();
+    as_target.health = 8;
+    s.set_unit("target", Some(as_target));
+    s.run(r#"assert(GameTooltipStatusBar:GetValue() == 8, "the watcher follows the guid")"#)
+        .unwrap();
+    s.tick(0.5);
     s.run(r#"assert(not GameTooltip:IsShown(), "faded out after the ramp")"#)
         .unwrap();
     assert!(s.take_errors().is_empty());
diff --git a/crates/benilla-ui/src/script/tests/toplevel.rs b/crates/benilla-ui/src/script/tests/toplevel.rs
index c8c7159d..05b56653 100644
--- a/crates/benilla-ui/src/script/tests/toplevel.rs
+++ b/crates/benilla-ui/src/script/tests/toplevel.rs
@@ -649,13 +649,13 @@ fn a_raise_with_a_hidden_child_keeps_the_windows_own_siblings_level() {
         Close:SetPoint("BOTTOMRIGHT", Win, "BOTTOMRIGHT", -15, 15)
         Close:SetWidth(100); Close:SetHeight(21)
         Close:EnableMouse(true)
-        Close:SetScript("OnEnter", function(self) hovered = self:GetName() end)
-        Close:SetScript("OnClick", function(self) clicked = self:GetName() end)
+        Close:SetScript("OnEnter", function() local self = this hovered = self:GetName() end)
+        Close:SetScript("OnClick", function() local self = this clicked = self:GetName() end)
 
         Body = CreateFrame("Frame", "Body", Win)             -- level 2, covers the whole window
         Body:SetAllPoints(Win)
         Body:EnableMouse(true)
-        Body:SetScript("OnEnter", function(self) hovered = self:GetName() end)
+        Body:SetScript("OnEnter", function() local self = this hovered = self:GetName() end)
         Body:Hide()
 
         Win:Hide()
diff --git a/crates/benilla-ui/src/script/tests/visibility.rs b/crates/benilla-ui/src/script/tests/visibility.rs
index fcb21929..78f97e9f 100644
--- a/crates/benilla-ui/src/script/tests/visibility.rs
+++ b/crates/benilla-ui/src/script/tests/visibility.rs
@@ -47,7 +47,7 @@ fn tick_runs_onupdate_only_when_effectively_visible() {
         r#"
         ticks, last = 0, 0
         local f = CreateFrame("Frame", "UF")
-        f:SetScript("OnUpdate", function(self, elapsed) ticks = ticks + 1; last = elapsed end)
+        f:SetScript("OnUpdate", function() local self, elapsed = this, arg1 ticks = ticks + 1; last = elapsed end)
     "#,
     )
     .unwrap();
diff --git a/crates/benilla-ui/src/script/tests/widget_surface.rs b/crates/benilla-ui/src/script/tests/widget_surface.rs
index 1ddad7a2..2d333637 100644
--- a/crates/benilla-ui/src/script/tests/widget_surface.rs
+++ b/crates/benilla-ui/src/script/tests/widget_surface.rs
@@ -1,4 +1,5 @@
-//! The widget-method surface gate, the widget sibling of [`super::reference_surface`]. The
+//! The widget-method surface gate, the widget sibling of [`super::reference_surface`], with no
+//! prefix that excuses a method: a host seam is a Rust call, never a method an addon reaches. The
 //! reference's 23 widget registrar tables are disjoint, so a class's surface is its own table plus
 //! those it inherits ([`WIDGET_CHAINS`]): `0x87c9b8` is the base `Region` map (the 19
 //! `REGION_MAP_METHODS`), and `LootButton`'s own `0x847ce4` holds only `SetSlot`.
@@ -320,8 +321,6 @@ fn our_widget_methods_stay_inside_the_1_12_surface() {
         let extra: BTreeSet<String> = have
             .iter()
             .filter(|n| !want.contains(*n))
-            // Our host bridge and VM internals are marked by prefix, as `reference_surface` does.
-            .filter(|n| !n.starts_with("Benilla") && !n.starts_with("__benilla_"))
             .filter(|n| !listed.get(*n).is_some_and(|c| c.contains(class)))
             .cloned()
             .collect();
diff --git a/crates/benilla-ui/src/script/tests/worldframe.rs b/crates/benilla-ui/src/script/tests/worldframe.rs
index 52825b82..91dc0e05 100644
--- a/crates/benilla-ui/src/script/tests/worldframe.rs
+++ b/crates/benilla-ui/src/script/tests/worldframe.rs
@@ -63,7 +63,10 @@ fn the_world_frame_is_born_in_stratum_world_with_the_mouse_and_wheel() {
         .run(r#"plain:SetFrameStrata("WORLD")"#)
         .unwrap_err()
         .to_string();
-    assert!(err.contains("unknown frameStrata 'WORLD'"), "{err}");
+    assert!(
+        err.contains("Plain:SetFrameStrata(): Unknown frame strata: WORLD"),
+        "{err}"
+    );
     assert_eq!(
         s.eval::<String>("return plain:GetFrameStrata()").unwrap(),
         "BACKGROUND"
diff --git a/crates/benilla-ui/src/script/tests/worldmap.rs b/crates/benilla-ui/src/script/tests/worldmap.rs
index 651fe6a9..099b6f6c 100644
--- a/crates/benilla-ui/src/script/tests/worldmap.rs
+++ b/crates/benilla-ui/src/script/tests/worldmap.rs
@@ -318,7 +318,7 @@ fn worldmap_navigation_and_map_info() {
 }
 
 /// `SetMapToCurrentZone` lands on the app-fed player zone, and the feed surfaces through
-/// `GetPlayerFacing` and `GetPlayerMapPosition` for the player and `party1..4`. A `raid` token
+/// `GetPlayerMapPosition` for the player and `party1..4`. A `raid` token
 /// answers the off-map sentinel; the reference reads raid positions (`WorldMapFrame.lua:379`).
 #[test]
 fn worldmap_current_zone_and_player_feed() {
@@ -343,7 +343,6 @@ fn worldmap_current_zone_and_player_feed() {
         .eval::<(f64, f64)>(r#"return GetPlayerMapPosition("player")"#)
         .unwrap();
     assert!((x - 0.25).abs() < 1e-6 && (y - 0.75).abs() < 1e-6);
-    assert!((s.eval::<f64>("return GetPlayerFacing()").unwrap() - 1.5).abs() < 1e-6);
     let (px, py) = s
         .eval::<(f64, f64)>(r#"return GetPlayerMapPosition("party1")"#)
         .unwrap();
@@ -624,3 +623,49 @@ fn worldmap_overlays_reveal_by_explored_bits() {
     s.run("SetMapZoom(2)").unwrap();
     assert_eq!(s.eval::<i64>("return GetNumMapOverlays()").unwrap(), 0);
 }
+
+/// `GetWorldLocMapPosition` (`0x4a88f0`) hands the displayed selection, the truncated map id and
+/// the f32 position to the host's projection, answers `(0, 0)` without one, and raises on any
+/// non-number argument.
+#[test]
+fn world_loc_map_position_projects_through_the_host() {
+    let mut s = script();
+    push_catalog(&mut s);
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GetWorldLocMapPosition(0, 100, 200)")
+            .unwrap(),
+        (0.0, 0.0),
+        "no projection: the zeroed outputs"
+    );
+    let seen = std::rc::Rc::new(std::cell::RefCell::new(Vec::new()));
+    let log = seen.clone();
+    s.set_world_loc_projector(Box::new(move |sel, map, x, y| {
+        log.borrow_mut().push((sel, map, x, y));
+        (map == 0).then_some((0.25, 0.75))
+    }));
+    s.run("SetMapZoom(2, 1)").unwrap();
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GetWorldLocMapPosition(0.9, '-8913.2', 554.6)")
+            .unwrap(),
+        (0.25, 0.75)
+    );
+    assert_eq!(
+        s.eval::<(f64, f64)>("return GetWorldLocMapPosition(-1, 0, 0)")
+            .unwrap(),
+        (0.0, 0.0)
+    );
+    let seen = seen.borrow();
+    assert_eq!(seen[0], ((2, 1, None), 0, -8913.2f32, 554.6f32));
+    assert_eq!(seen[1].1, u32::MAX, "a negative map id matches nothing");
+    for call in [
+        "GetWorldLocMapPosition(0, 1)",
+        "GetWorldLocMapPosition('x', 1, 1)",
+        "GetWorldLocMapPosition(0, nil, 1)",
+    ] {
+        let err = s.run(call).unwrap_err().to_string();
+        assert!(
+            err.contains("Usage: GetWorldLocMapPosition(continent, x, y)"),
+            "{call}: {err}"
+        );
+    }
+}
diff --git a/crates/benilla-ui/src/script/tick.rs b/crates/benilla-ui/src/script/tick.rs
index cffc511a..d2e0aebf 100644
--- a/crates/benilla-ui/src/script/tick.rs
+++ b/crates/benilla-ui/src/script/tick.rs
@@ -1,5 +1,5 @@
 //! The host runtime loop: event fan-out ([`UiScript::fire_event`]), the per-frame advance
-//! ([`UiScript::tick`]) and the `GetTime()` clock ([`UiScript::now`]).
+//! ([`UiScript::tick`]), which advances the `GetTime()` clock ([`UiScript::now`]).
 
 use mlua::Lua;
 
@@ -70,57 +70,40 @@ pub(crate) fn fire_event_into(lua: &Lua, event: &str, args: Vec<ScriptValue>) {
 }
 
 impl super::UiScript {
-    /// The current `GetTime()` value in seconds; the app stamps absolute expiries with it, such as
-    /// an aura's `expirationTime`.
-    pub fn now(&self) -> f64 {
-        self.lua.globals().get("__benilla_now").unwrap_or(0.0)
-    }
-
-    /// Start this VM's `GetTime()` clock at `secs`, so a rebuilt VM (a relog, a `ReloadUI`) keeps
-    /// the process's clock. The reference's `GetTime` (`0x515ea0`, through `0x42c010` and
-    /// `0x42b790`) is `GetTickCount` scaled by 0.001, an OS clock that never restarts, which stock
-    /// `Cooldown.lua` relies on (`start > 0`). Set once, at construction; after that only
-    /// [`Self::tick`] moves it.
-    pub fn set_now(&mut self, secs: f64) {
-        if let Err(e) = self.lua.globals().set("__benilla_now", secs) {
-            self.push_error(e);
-        }
-    }
-
-    /// Advance a frame: the `GetTime()` clock, the edit boxes and queued events, then
-    /// `OnUpdate(self, elapsed)` on every visible frame that has one (`0x704f10`), then the
-    /// engine's own fades, model panes and hover.
+    /// Advance a frame: the `GetTime()` clock and queued events, then the walk (`0x765650`),
+    /// each shown frame's update in turn: its `OnUpdate(self, elapsed)` (`0x704f10`), and for an
+    /// EditBox its flush and caret blink after it; then the engine's own fades, model panes and
+    /// hover.
     pub fn tick(&mut self, elapsed: f32) {
-        let clock = {
-            let g = self.lua.globals();
-            let now: f64 = g.get("__benilla_now").unwrap_or(0.0);
-            g.set("__benilla_now", now + f64::from(elapsed))
-        };
-        if let Err(e) = clock {
-            self.push_error(e);
-        }
-        // The focused edit box's caret blink (`0x77a790`, on the client's frame tick).
-        editbox::tick_blink(&self.lua, elapsed);
-        // Then `0x77a790`'s drain of the `OnTextChanged`s an edit only marked (`0x77a7a1`), before
-        // the OnUpdate sweep, as in the reference.
-        editbox::drain_text_changed(&self.lua);
-        // Then the caret flush (`0x77d3e0` → `0x77da80`): `OnCursorChanged` when the caret moved,
-        // which `ScrollingEdit_OnUpdate` scrolls by.
-        editbox::drain_cursor_changed(&self.lua);
+        self.model_mut().now += f64::from(elapsed);
         // Events queued since the last tick fire before this tick's OnUpdate.
         let pending = std::mem::take(&mut self.model_mut().pending_events);
         for (event, args) in pending {
             self.fire_event(&event, args);
         }
-        let ids: Vec<u32> = {
+        // Each entry: the frame's id, whether it has an `OnUpdate`, and the box if an EditBox.
+        let walk: Vec<(u32, bool, Option<FrameHandle>)> = {
             let mut model = self.model_mut();
             // `SetScript` keeps the OnUpdate list; a destroyed frame's handle compacts out here.
-            let frames: Vec<FrameHandle> = model
+            let shown = |h: FrameHandle| model.arena.frame(h).is_some_and(|f| f.effective_visible);
+            let mut frames: Vec<(FrameHandle, bool)> = model
                 .on_update_frames
                 .iter()
                 .copied()
-                .filter(|&h| model.arena.frame(h).is_some_and(|f| f.effective_visible))
+                .filter(|&h| shown(h))
+                .map(|h| (h, false))
                 .collect();
+            // The walk reaches every shown frame, not only those with a script, and an EditBox's
+            // update (`0x77a790`, vtable `+0x38`) flushes it whether or not it has an `OnUpdate`.
+            frames.extend(
+                model
+                    .arena
+                    .editbox_kinds()
+                    .iter()
+                    .copied()
+                    .filter(|&h| shown(h))
+                    .map(|h| (h, true)),
+            );
             if model
                 .on_update_frames
                 .iter()
@@ -135,16 +118,35 @@ impl super::UiScript {
                     .collect();
                 model.on_update_frames = live;
             }
-            let mut ids: Vec<u32> = frames.into_iter().map(|h| model.frame_id(h)).collect();
+            let mut walk: Vec<(u32, bool, Option<FrameHandle>)> = frames
+                .into_iter()
+                .map(|(h, editbox)| (model.frame_id(h), !editbox, editbox.then_some(h)))
+                .collect();
             // Creation order, by frame id: getters settle on demand, so a handler sees what an
             // earlier one did this sweep, and the order must be stable. The reference walks each
-            // strata level's list of shown frames (`0x765650`).
-            ids.sort_unstable();
-            ids
+            // strata level's list of shown frames (`0x765650`). A box with an `OnUpdate` is
+            // listed twice, and the two entries merge.
+            walk.sort_unstable_by_key(|&(id, ..)| id);
+            walk.dedup_by(|later, earlier| {
+                let same = later.0 == earlier.0;
+                if same {
+                    earlier.1 |= later.1;
+                    earlier.2 = earlier.2.or(later.2);
+                }
+                same
+            });
+            walk
         };
-        for id in ids {
-            if let Err(e) = event::fire_update_handler(&self.lua, id, elapsed) {
-                self.push_error(e);
+        for (id, on_update, editbox) in walk {
+            if on_update {
+                if let Err(e) = event::fire_update_handler(&self.lua, id, elapsed) {
+                    self.push_error(e);
+                }
+            }
+            // The box's own update runs its flush after its `OnUpdate` (`0x77a79a`, then
+            // `0x77a7a1`), so the events an edit raised fire in the box's place in the walk.
+            if let Some(h) = editbox {
+                editbox::update(&self.lua, h, elapsed);
             }
         }
         self.tick_model_panes(elapsed);
diff --git a/crates/benilla-ui/src/script/tooltip/mod.rs b/crates/benilla-ui/src/script/tooltip/mod.rs
index 56f421d0..5cdcad93 100644
--- a/crates/benilla-ui/src/script/tooltip/mod.rs
+++ b/crates/benilla-ui/src/script/tooltip/mod.rs
@@ -26,6 +26,21 @@ use crate::widget::{
 /// Registry key of the GameTooltip method table, a named registry root (the MAXCSTACK discipline).
 pub(super) const REG_TOOLTIP_METHODS: &str = "__benilla_tooltip_methods";
 
+impl super::UiScript {
+    /// The name of the frame that owns the GameTooltip named `tooltip`; `None` for no such
+    /// tooltip, no owner or an unnamed one. 1.12 answers only `IsOwned(frame)`, so the host's
+    /// recorders read the owner here.
+    pub fn tooltip_owner_name(&self, tooltip: &str) -> Option<String> {
+        let model = self.model_ref();
+        let h = model.arena.lookup(tooltip)?;
+        let owner = match &model.arena.frame(h)?.kind_state {
+            KindState::Tooltip(t) => t.owner?,
+            _ => return None,
+        };
+        model.arena.frame(owner)?.name.clone()
+    }
+}
+
 /// Runs `f` over a GameTooltip's state under one short write borrow.
 fn with_tip<T>(lua: &Lua, this: &Table, f: impl FnOnce(&mut TooltipState) -> T) -> mlua::Result<T> {
     let h = frame_handle_of(lua, this)?;
@@ -271,9 +286,12 @@ pub(super) fn clear_content(model: &mut Model, h: FrameHandle) {
     if let Ok(t) = tip_mut(model, h) {
         t.num_lines = 0;
         t.min_width = 0.0;
-        t.unit_token = None;
+        // Clear drops the subject and unregisters its health watcher (`0x5300ad`, `0x53007c`).
+        t.unit_guid = None;
         t.world_owned = false;
     }
+    // New content replaces a spell render still waiting on its view.
+    model.spell_tooltip_waits.remove(&h);
     // The `<name>StatusBar` health bar is unit content: it hides with the lines, and the next
     // unit render re-shows it.
     let bar = model
@@ -334,7 +352,7 @@ fn full_alpha(model: &mut Model, h: FrameHandle) {
 
 /// The engine's `GetTime` clock, which [`super::UiScript::tick`] advances.
 fn now(lua: &Lua) -> f64 {
-    lua.globals().get("__benilla_now").unwrap_or(0.0)
+    crate::script::clock::now(lua)
 }
 
 /// Shows or hides through the arena and fires the visibility events.
diff --git a/crates/benilla-ui/src/script/tooltip/verbs.rs b/crates/benilla-ui/src/script/tooltip/verbs.rs
index b83607ea..34cfc9d8 100644
--- a/crates/benilla-ui/src/script/tooltip/verbs.rs
+++ b/crates/benilla-ui/src/script/tooltip/verbs.rs
@@ -4,7 +4,7 @@ use mlua::{Lua, Table, Value, Variadic};
 
 use crate::layout::{Anchor, Point};
 use crate::script::binding_abi::optional_string;
-use crate::script::object::{frame_handle_of, frame_wrapper};
+use crate::script::object::frame_handle_of;
 use crate::script::region::region_handle_of;
 use crate::script::Model;
 use crate::widget::{KindState, TooltipAnchor, TOOLTIP_LINE_GAP, TOOLTIP_PAD};
@@ -121,24 +121,6 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             },
         )?,
     )?;
-    // GameTooltip:BenillaGetTooltipOwner(): not a 1.12 method (1.12 has only `IsOwned`); the dev
-    // hover recorder (`benilla-app/src/hover_log.rs`) reads the owner's name through it.
-    m.set(
-        "BenillaGetTooltipOwner",
-        lua.create_function(|lua, this: Table| {
-            let owner = with_tip(lua, &this, |t| t.owner)?;
-            let id = {
-                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-                owner
-                    .filter(|&h| model.arena.frame(h).is_some())
-                    .map(|h| model.frame_id(h))
-            };
-            match id {
-                Some(id) => Ok(Value::Table(frame_wrapper(lua, id)?)),
-                None => Ok(Value::Nil),
-            }
-        })?,
-    )?;
     // GetAnchorType(): the last SetOwner's mode by name (`0x5313e0`, name table `0x531530`), never
     // nil; a never-owned tooltip answers "ANCHOR_NONE". The reference also answers it after any
     // hide, whose un-own leaves mode 7; this keeps the last mode. Addons compare it with what they
diff --git a/crates/benilla-ui/src/script/tooltip_item/mod.rs b/crates/benilla-ui/src/script/tooltip_item/mod.rs
index bc0614e2..8c874232 100644
--- a/crates/benilla-ui/src/script/tooltip_item/mod.rs
+++ b/crates/benilla-ui/src/script/tooltip_item/mod.rs
@@ -140,8 +140,10 @@ fn hyperlink_item_fields(link: &str) -> Option<(u32, u32, u32)> {
     (item_id != 0).then_some((item_id, enchant_id, random_property_id))
 }
 
-/// The id-keyed render; on a miss, the ask and a name-only line, as `SetBagItem`'s miss path.
-fn render_by_id(
+/// The id-keyed render; on a miss, the ask and a name-only line, as `SetBagItem`'s miss path. The
+/// engine's own item hovers reach it from Rust (the action bar's, `SetTrainerService`,
+/// `SetCraftSpell`): 1.12's `Set*Item` bindings all name a container, so no Lua method takes an id.
+pub(super) fn render_by_id(
     lua: &Lua,
     this: &Table,
     item_id: u32,
@@ -224,19 +226,6 @@ fn equip_slots_for(inventory_type: u32) -> &'static [u32] {
 
 /// Register the item content channels into the GameTooltip kind method table.
 pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
-    // GameTooltip:BenillaSetItemById(itemId [, fallbackName, fallbackQuality]). Not a 1.12 verb,
-    // whose `Set*Item` bindings all name a container: sibling modules' item hovers (the action
-    // bar's, `SetTrainerService`, `SetCraftSpell`) reach `render_by_id` by this name through the
-    // wrapper table, and the prefix keeps it off the 1.12 surface.
-    m.set(
-        "BenillaSetItemById",
-        lua.create_function(
-            |lua, (this, item_id, fb_name, fb_q): (Table, u32, Option<String>, Option<u32>)| {
-                render_by_id(lua, &this, item_id, fb_name, fb_q)
-            },
-        )?,
-    )?;
-
     // GameTooltip:SetQuestItem(type, index) / SetQuestLogItem(type, index) (`0x533610`,
     // `0x533760`; `QuestFrameTemplates.xml:148`, `QuestLogFrame.xml:113`), no returns. `type` is
     // `GetQuestItemInfo`'s; an unknown type or index leaves the tooltip empty, as in the reference.
@@ -338,7 +327,8 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
     // not byte-read as `SetBagItem`'s two is (`0x534985`). Unit-keyed through `Model::inv_slot`:
     // an inspected item (`InspectPaperDollFrame.xml:20`) has no durability or creator, so those
     // lines do not show, as in the reference. An armed shopping tooltip renders the compare
-    // shape; the arm is consumed either way. repairCost is 0, as `SetBagItem`'s is.
+    // shape; the arm is consumed either way. repairCost is the item's cost (`0x5332fb`), 0 for an
+    // inspected unit's.
     m.set(
         "SetInventoryItem",
         lua.create_function(
@@ -348,7 +338,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                 // (`0x533027..0x53304c`); anything else builds the ordinary tooltip, without an
                 // error. Three of the binding's four builder legs pass it on, not `0x533106`.
                 let name_only = super::binding_abi::positive_number_flag(lua, name_only)?;
-                let (item_id, name, quality, inst, currently_equipped) = {
+                let (item_id, name, quality, inst, repair_cost, currently_equipped) = {
                     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
                     let armed = match super::tooltip::tip_mut(&mut model, h) {
                         Ok(t) => std::mem::take(&mut t.equipped_header_armed),
@@ -381,8 +371,13 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                                 },
                             )
                         });
+                    let cost = if unit.eq_ignore_ascii_case("player") {
+                        model.inv_repair_cost(slot)
+                    } else {
+                        0
+                    };
                     match view {
-                        Some((id, name, q, inst)) => (id, name, q, inst, armed),
+                        Some((id, name, q, inst)) => (id, name, q, inst, cost, armed),
                         // An empty slot answers nil and still pushes the other two: callers
                         // destructure all three first, and an addon may add up repairCost.
                         None => {
@@ -434,7 +429,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                     } else {
                         Value::Nil
                     },
-                    Value::Integer(0),
+                    Value::Integer(i64::from(repair_cost)),
                 ]))
             },
         )?,
@@ -443,14 +438,14 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
     // GameTooltip:SetBagItem(bag, slot) -> hasCooldown, repairCost: the real-instance hover and
     // the one money source: with the merchant open and repair off (`0x52e376`), the engine fires
     // `OnTooltipAddMoney(SellPrice × stack)`, or prints ITEM_UNSELLABLE at price 0 (`0x854a74`,
-    // pushed at `0x52e4a3`). repairCost is 0: the per-item repair cost is not fed. The reference
-    // always pushes a number there (`0x534975`), and stock guards on `> 0`.
+    // pushed at `0x52e4a3`). repairCost is the item's cost (`0x534975`), shown in repair mode.
     m.set(
         "SetBagItem",
         lua.create_function(|lua, (this, bag, slot): (Table, i64, u32)| {
             let h = frame_handle_of(lua, &this)?;
-            let (item_id, count, has_cd, link, quality, inst) = {
+            let (item_id, count, has_cd, link, quality, inst, repair_cost) = {
                 let model = lua.app_data_mut::<Model>().expect("model app_data");
+                let cost = model.repair_costs.bags.get(&(bag, slot)).copied();
                 match model
                     .containers
                     .get(&bag)
@@ -485,6 +480,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                                 openable_source: !has_cd,
                                 duration_ms: s.duration_ms,
                             },
+                            cost.unwrap_or(0),
                         )
                     }
                     None => return Ok(MultiValue::from_vec(vec![Value::Nil])),
@@ -529,7 +525,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
             Ok(MultiValue::from_vec(vec![
                 // The builder's `[ebp-0x38]`: a running cooldown or the item's duration line.
                 Value::Boolean(has_cd || inst.duration_ms.is_some()),
-                Value::Integer(0),
+                Value::Integer(i64::from(repair_cost)),
             ]))
         })?,
     )?;
diff --git a/crates/benilla-ui/src/script/tooltip_spell.rs b/crates/benilla-ui/src/script/tooltip_spell.rs
index e4757cd6..8ebee599 100644
--- a/crates/benilla-ui/src/script/tooltip_spell.rs
+++ b/crates/benilla-ui/src/script/tooltip_spell.rs
@@ -5,14 +5,20 @@
 //! Only `SetPlayerBuff` adds the gold time-remaining line.
 //!
 //! The app resolves each spell into a [`SpellTooltipView`] (`$`-tokens, cast, range and duration
-//! text), kept in an ask-once store by spell id: a miss records the id, the app pushes the view and
-//! the next hover repaints.
+//! text), kept in an ask-once store by spell id and pushed ahead of a hover: one store for the
+//! views built against the player and one for those built against its pet, which the builder's
+//! unit selector asks for. A miss records the id; a `set_spell_by_id` miss also waits, and the
+//! app's answer re-renders that tooltip a frame after the hover. That frame is a known difference
+//! from the reference, which builds every spell tooltip at the call (`0x52e610`); a spell no
+//! pushed set names, such as an `enchant:` link's, always meets it. A talent or tracking miss shows
+//! its view on the next hover.
 
 use mlua::{Lua, Table, Value};
 
-use super::object::frame_handle_of;
-use super::tooltip::{append_line, clear_content, fire_cleared};
+use super::object::{frame_handle_of, frame_wrapper};
+use super::tooltip::{append_line, clear_content, fire_cleared, tip_mut};
 use super::{CraftTooltip, Model, TrainerTooltip};
+use crate::widget::FrameHandle;
 
 const WHITE: [f32; 4] = [1.0, 1.0, 1.0, 1.0];
 /// The rank column's gray, `0xff808080`.
@@ -62,25 +68,207 @@ pub struct SpellTooltipView {
 }
 
 impl super::UiScript {
-    /// Store or replace a spell's view, answering its ask.
+    /// Store or replace a spell's view built against the player, answering its ask: a tooltip
+    /// waiting on it re-renders now, a frame after its hover, where the reference builds it whole
+    /// at the call (`0x52e610`).
     pub fn set_spell_tooltip(&mut self, spell_id: u32, view: SpellTooltipView) {
-        let mut model = self.model_mut();
-        model.spell_tooltip_asks.remove(&spell_id);
-        model.spell_tooltips.insert(spell_id, view);
+        self.store_spell_view(false, spell_id, view);
     }
 
-    /// Drain the spell ids the renderers asked for and the store lacked.
+    /// Store or replace a spell's view built against the player's pet, the one the builder's unit
+    /// selector renders (`SetPetAction`, `SetSpell` on the pet book, a pet-learn trainer service).
+    pub fn set_pet_spell_tooltip(&mut self, spell_id: u32, view: SpellTooltipView) {
+        self.store_spell_view(true, spell_id, view);
+    }
+
+    fn store_spell_view(&mut self, alt_caster: bool, spell_id: u32, view: SpellTooltipView) {
+        let waiting: Vec<FrameHandle> = {
+            let mut model = self.model_mut();
+            let (views, asks) = spell_store(&mut model, alt_caster);
+            asks.remove(&spell_id);
+            views.insert(spell_id, view);
+            model
+                .spell_tooltip_waits
+                .iter()
+                .filter(|(_, w)| w.spell_id == spell_id && w.opts.alt_caster == alt_caster)
+                .map(|(h, _)| *h)
+                .collect()
+        };
+        for h in waiting {
+            if let Err(e) = answer_wait(&self.lua, h, spell_id, alt_caster) {
+                self.push_error(e);
+            }
+        }
+    }
+
+    /// Drain the spell ids the renderers asked the player's store for and it lacked.
     pub fn take_spell_tooltip_asks(&mut self) -> Vec<u32> {
         self.model_mut().spell_tooltip_asks.drain().collect()
     }
+
+    /// Drain the spell ids the renderers asked the pet's store for and it lacked.
+    pub fn take_pet_spell_tooltip_asks(&mut self) -> Vec<u32> {
+        self.model_mut().pet_spell_tooltip_asks.drain().collect()
+    }
+
+    /// The spells whose pet view a hover reads from the VM's own state: the pet's bar and book,
+    /// whose setters pass the builder's unit selector (`0x532888`, `0x532e23`). The app pushes
+    /// their views ahead of a hover.
+    pub fn pet_spell_tooltip_subjects(&self) -> Vec<u32> {
+        let model = self.model_ref();
+        let pet_bar = model
+            .pet_bar
+            .slots
+            .iter()
+            .filter(|s| !s.view.is_token)
+            .filter_map(|s| s.view.spell_id);
+        let pet_book = model.pet_book.slots.iter().map(|s| s.spell_id);
+        pet_bar.chain(pet_book).filter(|&id| id != 0).collect()
+    }
+
+    /// The spells whose player view a hover reads from the VM's own state rather than the
+    /// player's book: the open quest's and each log entry's reward spell, the open craft's spell
+    /// subjects, the player's and every other unit's auras, and the tracking spell. The app pushes
+    /// their views ahead of a hover.
+    pub fn spell_tooltip_subjects(&self) -> Vec<u32> {
+        let model = self.model_ref();
+        let rewards = model
+            .quest
+            .iter()
+            .filter_map(|q| q.reward_spell.as_ref())
+            .chain(
+                model
+                    .quest_log
+                    .entries
+                    .iter()
+                    .filter_map(|e| e.detail.as_ref()?.reward_spell.as_ref()),
+            )
+            .map(|s| s.spell_id);
+        let craft = model
+            .craft
+            .iter()
+            .flat_map(|c| &c.recipes)
+            .filter_map(|r| match r.tooltip {
+                CraftTooltip::Spell(id) => Some(id),
+                CraftTooltip::Item(_) => None,
+            });
+        let auras = model
+            .player_auras
+            .iter()
+            .chain(model.unit_auras.values().flatten())
+            .map(|a| a.spell_id);
+        let tracking = model.tracking.iter().map(|t| t.spell_id);
+        rewards
+            .chain(craft)
+            .chain(auras)
+            .chain(tracking)
+            .filter(|&id| id != 0)
+            .collect()
+    }
 }
 
-/// Look up a spell's view; a miss records the ask.
-pub(super) fn spell_view_of(lua: &Lua, spell_id: u32) -> Option<SpellTooltipView> {
+/// A spell render that missed its view, kept to re-run when the view lands. The re-run is skipped
+/// unless the tooltip still shows `drawn`, so a line Lua added or rewrote since is kept.
+#[derive(Clone)]
+pub(crate) struct SpellWait {
+    spell_id: u32,
+    fallback_name: Option<String>,
+    opts: SpellRenderOpts,
+    remaining: Option<String>,
+    drawn: Drawn,
+}
+
+/// Each shown line's left and right cell as `(text, colour)`.
+type Drawn = Vec<(Option<String>, Option<[f32; 4]>)>;
+
+fn drawn_lines(model: &mut Model, h: FrameHandle) -> mlua::Result<Drawn> {
+    let t = tip_mut(model, h)?;
+    let n = t.num_lines;
+    let cells: Vec<_> = t
+        .left_lines
+        .iter()
+        .take(n)
+        .chain(t.right_lines.iter().take(n))
+        .copied()
+        .collect();
+    Ok(cells
+        .into_iter()
+        .map(|rh| {
+            let d = model.region_data.get(&rh);
+            (
+                d.and_then(|d| d.text.clone()),
+                d.and_then(|d| d.vertex_color),
+            )
+        })
+        .collect())
+}
+
+/// Re-run the render `h` still waits with on `spell_id` in the store `alt_caster` names, read
+/// afresh: an earlier re-render's Lua may have replaced it. Lines Lua added or rewrote since, or a
+/// fade under way, keep the tooltip as it is. The clear is silent: Lua made one setter call and saw
+/// its one `OnTooltipCleared`.
+fn answer_wait(lua: &Lua, h: FrameHandle, spell_id: u32, alt_caster: bool) -> mlua::Result<()> {
+    let (id, wait) = {
+        let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+        let Some(wait) = model
+            .spell_tooltip_waits
+            .get(&h)
+            .filter(|w| w.spell_id == spell_id && w.opts.alt_caster == alt_caster)
+            .cloned()
+        else {
+            return Ok(());
+        };
+        let fading = tip_mut(&mut model, h)?.fade_start.is_some();
+        if fading || drawn_lines(&mut model, h)? != wait.drawn {
+            model.spell_tooltip_waits.remove(&h);
+            return Ok(());
+        }
+        clear_content(&mut model, h);
+        (model.frame_id(h), wait)
+    };
+    let this = frame_wrapper(lua, id)?;
+    fill_spell(
+        lua,
+        &this,
+        h,
+        wait.spell_id,
+        wait.fallback_name,
+        wait.opts,
+        wait.remaining,
+    )
+}
+
+/// The view store and its asks for the unit a render is built against: the pet's when the
+/// builder's unit selector is set (`alt_caster`), else the player's.
+fn spell_store(
+    model: &mut Model,
+    alt_caster: bool,
+) -> (
+    &mut std::collections::HashMap<u32, SpellTooltipView>,
+    &mut std::collections::HashSet<u32>,
+) {
+    if alt_caster {
+        (
+            &mut model.pet_spell_tooltips,
+            &mut model.pet_spell_tooltip_asks,
+        )
+    } else {
+        (&mut model.spell_tooltips, &mut model.spell_tooltip_asks)
+    }
+}
+
+/// Look up a spell's view built against the player, or with `alt_caster` against its pet; a miss
+/// records the ask.
+pub(super) fn spell_view_of(
+    lua: &Lua,
+    spell_id: u32,
+    alt_caster: bool,
+) -> Option<SpellTooltipView> {
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-    let v = model.spell_tooltips.get(&spell_id).cloned();
+    let (views, asks) = spell_store(&mut model, alt_caster);
+    let v = views.get(&spell_id).cloned();
     if v.is_none() && spell_id != 0 {
-        model.spell_tooltip_asks.insert(spell_id);
+        asks.insert(spell_id);
     }
     v
 }
@@ -90,6 +278,10 @@ pub(super) fn spell_view_of(lua: &Lua, spell_id: u32) -> Option<SpellTooltipView
 /// while locked, the next-rank block and the green learn hint.
 #[derive(Clone, Debug, Default)]
 pub(super) struct TalentLines {
+    /// `Talent.dbc` Flags bit 0: `SetTalent` hands an exceptional talent to the spell builder
+    /// `0x52e610` (`0x5352ab`) and any other to the talent builder `0x52b0a0`, which writes no
+    /// cost, range, cast, required-item, form, reagent or chance line.
+    pub exceptional: bool,
     /// `TOOLTIP_TALENT_RANK` ("Rank %d/%d") filled from the player's strings; `None` when they
     /// lack the key, and no rank row shows.
     pub rank_line: Option<String>,
@@ -112,8 +304,10 @@ pub(super) struct SpellRenderOpts {
     pub(super) aura: bool,
     /// `param6` showRank, the gray "Rank N" column: `SetSpell` passes 0, `SetAction` 1.
     pub(super) show_rank: bool,
-    /// `param5` altCaster, which drops the totem and reagent lines (`0x52ed43`, `0x52f393`); only
-    /// `SetTrainerService` sets it, for a `LEARN_PET_SPELL` service.
+    /// `param5` altCaster, the unit selector: the view is the one built against the player's
+    /// charm, else its summon (`0x6e3130`, `0x6e31b0`, `0x6e3340`), and the totem and reagent
+    /// lines drop (`0x52ed43`, `0x52f393`). `SetPetAction` sets it (`0x532888`), `SetSpell` on the
+    /// pet book (`0x532e23`) and `SetTrainerService` for a `LEARN_PET_SPELL` service (`0x533a7f`).
     pub(super) alt_caster: bool,
 }
 
@@ -138,6 +332,7 @@ fn render_spell(
         v.rank.clone().filter(|_| show_rank).map(|t| (t, GRAY))
     };
     append_line(lua, this, (v.name.clone(), name_color), right, false)?;
+    let talent_builder = talent.is_some_and(|t| !t.exceptional);
     // The talent head: the white rank line, then the red requirements while locked.
     if let Some(t) = talent {
         if let Some(rank) = &t.rank_line {
@@ -147,7 +342,7 @@ fn render_spell(
             append_line(lua, this, (req.clone(), RED), None, true)?;
         }
     }
-    if !aura {
+    if !aura && !talent_builder {
         match (&v.cost, &v.range) {
             (Some(c), Some(r)) => append_line(
                 lua,
@@ -203,7 +398,16 @@ fn render_spell(
     // `0x52b2cd`) over the next rank's gold description, then the green `TOOLTIP_TALENT_LEARN`
     // hint (`0x52b362`). Both are the player's own strings; without them the line is skipped.
     if let Some(t) = talent {
-        if let Some(next) = &t.next_desc {
+        // The talent builder skips a rank with an empty description, header and all (`0x52b294`).
+        let next = t
+            .next_desc
+            .as_ref()
+            .filter(|n| !talent_builder || !n.is_empty());
+        if let Some(next) = next {
+            // The talent builder's gold `" "` spacer (`0x82ee00`, `0x52b2a8`) after a description.
+            if talent_builder && !desc.is_empty() {
+                append_line(lua, this, (" ".into(), GOLD), None, false)?;
+            }
             if let Some(header) = crate::strings::global(lua, "TOOLTIP_TALENT_NEXT_RANK") {
                 append_line(lua, this, (header, WHITE), None, false)?;
             }
@@ -240,7 +444,7 @@ pub(super) fn set_spell_with_talent(
     if talent.next_desc.is_none() {
         super::talent::ask_next_rank(lua, talent.next_spell);
     }
-    match spell_view_of(lua, spell_id) {
+    match spell_view_of(lua, spell_id, false) {
         Some(v) => render_spell(
             lua,
             this,
@@ -294,12 +498,40 @@ pub(super) fn set_spell_by_id(
         clear_content(&mut model, h);
     }
     fire_cleared(lua, h);
-    match spell_view_of(lua, spell_id) {
+    fill_spell(lua, this, h, spell_id, fallback_name, opts, remaining)
+}
+
+/// Fill a cleared tooltip with the spell's view, or with the fallback name and a wait on the ask.
+fn fill_spell(
+    lua: &Lua,
+    this: &Table,
+    h: FrameHandle,
+    spell_id: u32,
+    fallback_name: Option<String>,
+    opts: SpellRenderOpts,
+    remaining: Option<String>,
+) -> mlua::Result<()> {
+    match spell_view_of(lua, spell_id, opts.alt_caster) {
         Some(v) => render_spell(lua, this, &v, opts, remaining, None)?,
         None => {
-            if let Some(name) = fallback_name {
+            if let Some(name) = fallback_name.clone() {
                 append_line(lua, this, (name, WHITE), None, false)?;
             }
+            // The fallback stands until the app answers the ask; id 0 asks nothing.
+            if spell_id != 0 {
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                let drawn = drawn_lines(&mut model, h)?;
+                model.spell_tooltip_waits.insert(
+                    h,
+                    SpellWait {
+                        spell_id,
+                        fallback_name,
+                        opts,
+                        remaining,
+                        drawn,
+                    },
+                );
+            }
         }
     }
     super::tooltip::show_or_hide_empty(lua, h);
@@ -326,7 +558,12 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                     None => return Ok(()),
                 }
             };
-            set_spell_by_id(lua, &this, spell_id, name, SpellRenderOpts::default(), None)
+            // The pet book's flag is also the builder's unit selector (`0x532e70`).
+            let opts = SpellRenderOpts {
+                alt_caster: super::spellbook::is_pet_book(&book_type),
+                ..Default::default()
+            };
+            set_spell_by_id(lua, &this, spell_id, name, opts, None)
         })?,
     )?;
     // GameTooltip:SetShapeshift(index): the stance-bar hover, the form's spell tooltip.
@@ -343,7 +580,8 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
             set_spell_by_id(lua, &this, spell_id, name, SpellRenderOpts::default(), None)
         })?,
     )?;
-    // GameTooltip:SetPetAction(index): the pet-bar hover for a spell slot; the stock
+    // GameTooltip:SetPetAction(index): the pet-bar hover for a spell slot, built against the pet
+    // (the unit selector, pushed at `0x532888` and `0x5328d0`); the stock
     // `PetActionButton_OnEnter` builds a token's tooltip itself (`PetActionBarFrame.lua:290`). A
     // slot with no spell is a no-op.
     m.set(
@@ -364,7 +602,11 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                     None => return Ok(()),
                 }
             };
-            set_spell_by_id(lua, &this, spell_id, name, SpellRenderOpts::default(), None)
+            let opts = SpellRenderOpts {
+                alt_caster: true,
+                ..Default::default()
+            };
+            set_spell_by_id(lua, &this, spell_id, name, opts, None)
         })?,
     )?;
     // GameTooltip:SetPlayerBuff(buffIndex): the aura variant plus the time-remaining line only
@@ -375,15 +617,12 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
     m.set(
         "SetPlayerBuff",
         lua.create_function(|lua, (this, index): (Table, i64)| {
-            let now = {
-                let g = lua.globals();
-                g.get::<f64>("__benilla_now").unwrap_or(0.0)
-            };
+            let now = crate::script::clock::now(lua);
             let (spell_id, name, remaining_ms) = {
                 let model = lua.app_data_mut::<Model>().expect("model app_data");
                 let hit = usize::try_from(index)
                     .ok()
-                    .and_then(|pos| model.auras.get("player").and_then(|a| a.get(pos)));
+                    .and_then(|pos| model.player_auras.get(pos));
                 match hit {
                     Some(a) => {
                         // The gate is `untilCancelled`, not a known duration: `0x532b00` skips
@@ -442,12 +681,11 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                         .unwrap_or(0),
                     _ => 0,
                 };
+                // The token resolves as `UnitBuff`'s does (`0x515970`, called at `0x534b8b`).
                 let hit = {
-                    let model = lua.app_data_mut::<Model>().expect("model app_data");
+                    let model = lua.app_data_ref::<Model>().expect("model app_data");
                     let idx = usize::try_from(index.max(1) - 1).unwrap_or(0);
-                    model
-                        .auras
-                        .get(&token)
+                    crate::script::aura::auras_of(&model, &token)?
                         .and_then(|a| a.iter().filter(|a| a.helpful == helpful).nth(idx))
                         .map(|a| (a.spell_id, a.name.clone()))
                 };
@@ -488,7 +726,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                 clear_content(&mut model, h);
             }
             fire_cleared(lua, h);
-            match spell_view_of(lua, spell_id) {
+            match spell_view_of(lua, spell_id, false) {
                 Some(v) => {
                     append_line(lua, &this, (v.name.clone(), GOLD), None, false)?;
                     let desc = if !v.aura_description.is_empty() {
@@ -565,10 +803,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                     },
                     None,
                 ),
-                0x80 => {
-                    let f: mlua::Function = this.get("BenillaSetItemById")?;
-                    f.call::<()>((this.clone(), a.action))
-                }
+                0x80 => super::tooltip_item::render_by_id(lua, &this, a.action, None, None),
                 0x40 => {
                     let h = frame_handle_of(lua, &this)?;
                     let name = {
@@ -608,8 +843,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
                 // The item builder (`0x52b650`), with no fallback name: id 0 or a template in
                 // flight renders empty, the builder's own early-out.
                 TrainerTooltip::Item(item_id) => {
-                    let f: mlua::Function = this.get("BenillaSetItemById")?;
-                    f.call::<()>((this.clone(), item_id))
+                    super::tooltip_item::render_by_id(lua, &this, item_id, None, None)
                 }
                 TrainerTooltip::Spell {
                     spell_id,
@@ -647,8 +881,7 @@ pub(super) fn install_methods(lua: &Lua, m: &Table) -> mlua::Result<()> {
             };
             match subject {
                 CraftTooltip::Item(item_id) => {
-                    let f: mlua::Function = this.get("BenillaSetItemById")?;
-                    f.call::<()>((this.clone(), item_id))
+                    super::tooltip_item::render_by_id(lua, &this, item_id, None, None)
                 }
                 CraftTooltip::Spell(spell_id) => {
                     set_spell_by_id(lua, &this, spell_id, None, SpellRenderOpts::default(), None)
diff --git a/crates/benilla-ui/src/script/tooltip_unit.rs b/crates/benilla-ui/src/script/tooltip_unit.rs
index d22b8a78..4786c9b2 100644
--- a/crates/benilla-ui/src/script/tooltip_unit.rs
+++ b/crates/benilla-ui/src/script/tooltip_unit.rs
@@ -113,7 +113,7 @@ fn render_unit(lua: &Lua, this: &Table, token: &str) -> mlua::Result<bool> {
     }
     fire_cleared(lua, h);
     let Some(u) = unit else {
-        set_live_token(lua, h, None);
+        set_subject(lua, h, None);
         show_or_hide_empty(lua, h);
         return Ok(false);
     };
@@ -149,7 +149,8 @@ fn render_unit(lua: &Lua, this: &Table, token: &str) -> mlua::Result<bool> {
     if u.racial_leader && u.pvp {
         append_line(lua, this, ("Leader".into(), WHITE), None, false)?;
     }
-    set_live_token(lua, h, Some(token.to_string()));
+    // An unresolved guid (0) is no subject: nothing can push for it.
+    set_subject(lua, h, Some(u.guid).filter(|&g| g != 0));
     update_bar(lua, h, Some(&u));
     show_or_hide_empty(lua, h);
     Ok(true)
@@ -165,12 +166,12 @@ fn set_world_owned(lua: &Lua, h: FrameHandle) {
     }
 }
 
-/// Remember (or drop) the tooltip's live unit token, the health watcher's key.
-fn set_live_token(lua: &Lua, h: FrameHandle, token: Option<String>) {
+/// Remember (or drop) the guid of the unit the tooltip shows, the health watcher's key.
+fn set_subject(lua: &Lua, h: FrameHandle, guid: Option<u64>) {
     let mut model = lua.app_data_mut::<Model>().expect("model app_data");
     if let Some(f) = model.arena.frame_mut(h) {
         if let KindState::Tooltip(t) = &mut f.kind_state {
-            t.unit_token = token;
+            t.unit_guid = guid;
         }
     }
 }
@@ -227,13 +228,18 @@ fn update_bar(lua: &Lua, h: FrameHandle, unit: Option<&UnitState>) {
     }
 }
 
-/// A `set_unit` push for a tooltip's live token updates its health bar without rebuilding the
-/// lines, as the reference's HEALTH field watcher does.
+/// A `set_unit` push of the unit a tooltip shows updates its health bar without rebuilding the
+/// lines, as the reference's HEALTH field watcher does: it is keyed on the unit's guid (`0x52a0a8`
+/// registers `0x529560` on `+0x368`/`+0x36c`), so a token that stops naming the unit, as
+/// `"mouseover"` does when the hover ends, leaves a fading plate's bar standing.
 pub(super) fn on_unit_push(lua: &Lua, token: &str) {
-    let hits: Vec<FrameHandle> = {
+    let (unit, hits): (UnitState, Vec<FrameHandle>) = {
         let model = lua.app_data_mut::<Model>().expect("model app_data");
+        let Some(unit) = model.pushed_unit(token).filter(|u| u.exists && u.guid != 0) else {
+            return;
+        };
         // Registered frames only, as `update_bar` writes layout.
-        model
+        let hits: Vec<FrameHandle> = model
             .arena
             .tooltip_kinds()
             .iter()
@@ -242,17 +248,17 @@ pub(super) fn on_unit_push(lua: &Lua, token: &str) {
                 model.frame_to_id.contains_key(&h)
                     && matches!(
                         model.arena.frame(h).map(|f| &f.kind_state),
-                        Some(KindState::Tooltip(t)) if t.unit_token.as_deref() == Some(token)
+                        Some(KindState::Tooltip(t)) if t.unit_guid == Some(unit.guid)
                     )
             })
-            .collect()
+            .collect();
+        if hits.is_empty() {
+            return;
+        }
+        (unit.clone(), hits)
     };
     for h in hits {
-        let unit = {
-            let model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.unit(token).cloned().filter(|u| u.exists)
-        };
-        update_bar(lua, h, unit.as_ref());
+        update_bar(lua, h, Some(&unit));
     }
 }
 
diff --git a/crates/benilla-ui/src/script/trade.rs b/crates/benilla-ui/src/script/trade.rs
index fc9f68c2..ba66e706 100644
--- a/crates/benilla-ui/src/script/trade.rs
+++ b/crates/benilla-ui/src/script/trade.rs
@@ -50,8 +50,6 @@ pub struct TradeState {
     pub player: TradeSideState,
     /// The partner's offer, the wire's `their_window` snapshot.
     pub target: TradeSideState,
-    /// The partner's name for `GetTradePartnerName()`, `None` while in flight.
-    pub partner_name: Option<String>,
 }
 
 impl super::UiScript {
@@ -273,21 +271,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // `GetTradePartnerName()` is not a 1.12 global; the stock header reads `UnitName("NPC")`
-    // (`TradeFrame.lua:43`).
-    g.set(
-        "GetTradePartnerName",
-        lua.create_function(|lua, ()| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            Ok(
-                match model.trade.as_ref().and_then(|t| t.partner_name.clone()) {
-                    Some(n) => Value::String(lua.create_string(&n)?),
-                    None => Value::Nil,
-                },
-            )
-        })?,
-    )?;
-
     // InitiateTrade(unit): the unit menu's TRADE row.
     g.set(
         "InitiateTrade",
@@ -423,11 +406,7 @@ mod tests {
         };
         target.slots[0] = Some(item(4306, 1, 2));
         target.slots[6] = Some(item(6217, 1, 1)); // the enchant slot carries an item
-        TradeState {
-            player,
-            target,
-            partner_name: Some("Thrall".into()),
-        }
+        TradeState { player, target }
     }
 
     #[test]
@@ -516,7 +495,7 @@ mod tests {
     }
 
     #[test]
-    fn money_and_partner_name_read_the_pushed_state() {
+    fn money_reads_the_pushed_state() {
         let mut s = UiScript::new().unwrap();
         s.set_trade(Some(state()));
         assert_eq!(
@@ -524,10 +503,6 @@ mod tests {
             12_345
         );
         assert_eq!(s.eval::<i64>("return GetTargetTradeMoney()").unwrap(), 500);
-        assert_eq!(
-            s.eval::<String>("return GetTradePartnerName()").unwrap(),
-            "Thrall"
-        );
     }
 
     #[test]
@@ -539,9 +514,6 @@ mod tests {
             .eval::<bool>("return GetTradePlayerItemInfo(1) == nil")
             .unwrap());
         assert_eq!(s.eval::<i64>("return GetTargetTradeMoney()").unwrap(), 0);
-        assert!(s
-            .eval::<bool>("return GetTradePartnerName() == nil")
-            .unwrap());
     }
 
     #[test]
diff --git a/crates/benilla-ui/src/script/types.rs b/crates/benilla-ui/src/script/types.rs
index 8f38b434..c773370a 100644
--- a/crates/benilla-ui/src/script/types.rs
+++ b/crates/benilla-ui/src/script/types.rs
@@ -104,8 +104,7 @@ pub enum QuadContent {
         additive: bool,
         /// `None` is the full texture.
         tex_coords: Option<TexCoords>,
-        /// A portrait, masked to the inscribed circle; false with a `portrait_unit` is the square
-        /// booth pane (`BenillaSetBoothTexture`).
+        /// A portrait, masked to the inscribed circle.
         circular: bool,
         /// A live unit portrait's unit: the renderer samples the app's bake of it instead of
         /// `path` and `color`.
@@ -362,8 +361,7 @@ pub(crate) struct RegionData {
     /// drawn as `texel × colour` per channel, alpha included: a `<Color 1,1,1,0.2>` tinted
     /// `(0, 0, 0.75, 0.5)` draws at alpha 0.1, as `SkillFrame`'s row trough does.
     pub(crate) vertex_color: Option<[f32; 4]>,
-    /// A portrait (`SetPortraitToTexture`, `SetPortraitTexture`), masked to the inscribed circle;
-    /// false with a `portrait_unit` is the square booth pane (`BenillaSetBoothTexture`).
+    /// A portrait (`SetPortraitToTexture`, `SetPortraitTexture`), masked to the inscribed circle.
     pub(crate) circular: bool,
     /// A live unit portrait's unit, drawn from the app's bake instead of the texture or colour;
     /// cleared by `SetTexture` and `SetPortraitToTexture`.
@@ -472,11 +470,16 @@ impl RegionData {
     /// read treats a measure under another key as absent; the layout keeps the old box until the
     /// new one lands, except for empty text, which is never measured.
     pub(crate) fn measure_key(&self, scale: f32) -> u64 {
-        use std::hash::{Hash, Hasher};
-        let mut hasher = std::collections::hash_map::DefaultHasher::new();
         // By reference: `String` hashes as `str` does, and this runs for every FontString every
         // frame, so a clone would allocate for nothing.
-        self.text.as_deref().unwrap_or("").hash(&mut hasher);
+        self.measure_key_of(self.text.as_deref().unwrap_or(""), scale)
+    }
+
+    /// [`Self::measure_key`] with `text` in place of the region's own.
+    pub(crate) fn measure_key_of(&self, text: &str, scale: f32) -> u64 {
+        use std::hash::{Hash, Hasher};
+        let mut hasher = std::collections::hash_map::DefaultHasher::new();
+        text.hash(&mut hasher);
         self.font_path.hash(&mut hasher);
         self.font_height.map(f32::to_bits).hash(&mut hasher);
         self.text_height.map(f32::to_bits).hash(&mut hasher);
diff --git a/crates/benilla-ui/src/script/unit/bindings.rs b/crates/benilla-ui/src/script/unit/bindings.rs
index 9e4b8ff3..13bf261e 100644
--- a/crates/benilla-ui/src/script/unit/bindings.rs
+++ b/crates/benilla-ui/src/script/unit/bindings.rs
@@ -6,10 +6,12 @@
 use mlua::{Lua, Value};
 
 use super::super::binding_abi::flag;
+use super::super::calls::ScriptCall;
 use super::super::Model;
 use super::{
-    check_unit_token, classification_word, grey_band, level_reads_unknown, pick_unit_token,
-    unit_predicate, unknownobject, with_unit, PlayerRecord, SelectionRequest,
+    check_unit_token, classification_word, grey_band, level_reads_unknown, parse_unit_token,
+    pick_unit_token, unit_predicate, unknownobject, with_unit, PlayerRecord, SelectionRequest,
+    UnitBase, UnitTokenParse,
 };
 
 /// The `"player"` fast path of `UnitName`, `UnitRace`, `UnitClass` and `UnitSex`, never
@@ -522,7 +524,16 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             if !u.exists || !grouped {
                 return Ok(Value::Nil);
             }
-            let hit = (t.starts_with("party") && !t.starts_with("partypet"))
+            // A `partyN` token itself names a member; a chain off one (`party1target`) names
+            // whoever that member targets, which the guid arms below judge.
+            let party_slot = matches!(
+                parse_unit_token(&t),
+                UnitTokenParse::Unit {
+                    base: UnitBase::Party(_),
+                    hops: 0
+                }
+            );
+            let hit = party_slot
                 || t.eq_ignore_ascii_case("player")
                 || (u.guid != 0
                     && (model.unit("player").is_some_and(|p| p.guid == u.guid)
@@ -579,8 +590,7 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // The party frame's status predicates. `UnitIsAFK` and `UnitIsDND` do not exist in the 1.12
-    // client, which has no unit AFK or DND predicate; benilla adds them beyond the 1.12 surface.
+    // The party frame's status predicates; 1.12 has no unit AFK or DND predicate.
     g.set(
         "UnitIsConnected",
         lua.create_function(|lua, token: Value| {
@@ -592,18 +602,6 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             unit_predicate(lua, &token, |u| u.is_connected)
         })?,
     )?;
-    g.set(
-        "UnitIsAFK",
-        lua.create_function(|lua, token: Option<String>| {
-            unit_predicate(lua, &token, |u| u.is_afk)
-        })?,
-    )?;
-    g.set(
-        "UnitIsDND",
-        lua.create_function(|lua, token: Option<String>| {
-            unit_predicate(lua, &token, |u| u.is_dnd)
-        })?,
-    )?;
     g.set(
         "UnitIsPVP",
         lua.create_function(|lua, token: Value| {
@@ -735,6 +733,19 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
+    // GetDamageBonusStat() (`0x48b520`): the active player's `ChrClasses.dbc` field 2 plus one,
+    // the 1-based `UnitStat` index its melee damage scales with; 0 with no player or no class row
+    // (`0x48b58a`). No stock caller.
+    g.set(
+        "GetDamageBonusStat",
+        lua.create_function(|lua, ()| {
+            let stat = with_unit(lua, &Some("player".to_string()), None, |u| {
+                u.damage_bonus_stat
+            })?;
+            Ok(stat.map_or(0, |s| i64::from(s) + 1))
+        })?,
+    )?;
+
     // UnitSex(unit): 2 male, 3 female, or 1 neuter, which no feed sends. A unit that does not
     // resolve answers 2, never nil (`0x517f9f`).
     g.set(
@@ -755,13 +766,13 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // UnitCreatureType(unit) (`0x51a280`): one string, nil for a token naming no unit (`0x51a2b8`).
-    // Its resolver `0x605570` tries the shapeshift form's type (`SpellShapeshiftForm.dbc` column
-    // 12, only above 0, `0x60559a`), the cached creature record, then the race's (`ChrRaces.dbc`
-    // column 9, "Humanoid" for every race). The form stage is not built (no form index here), so an
-    // animal-form druid or a Ghost Wolf shaman answers "Humanoid" where the reference says "Beast".
-    // A missing argument, or one neither string nor number, raises `Usage:` (`0x6f3510`,
-    // `0x6f4940`).
+    // UnitCreatureType(unit) (`0x51a280`): one string, nil for a token naming no unit (`0x51a2b8`)
+    // and for a type of 0 (`0x51a2c3`). The type is the snapshot's, which the app resolved as the
+    // reference's `0x605570` does: the shapeshift form's (`SpellShapeshiftForm.dbc` column 12, only
+    // above 0), else the cached creature record's, else the race's (`ChrRaces.dbc` column 9). A
+    // snapshot with no descriptor behind it carries none, as the reference's token resolver finds
+    // no object for it. A missing argument, or one neither string nor number, raises `Usage:`
+    // (`0x6f3510`, `0x6f4940`).
     g.set(
         "UnitCreatureType",
         lua.create_function(|lua, token: Value| {
@@ -772,12 +783,7 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
                 Value::Number(_) | Value::Integer(_) => Some(String::new()),
                 _ => return Err(mlua::Error::runtime("Usage: UnitCreatureType(\"unit\")")),
             };
-            let word = with_unit(lua, &token, None, |u| {
-                u.creature_type_name
-                    .clone()
-                    // The race stage, collapsed: every player race maps to type 7.
-                    .or_else(|| u.is_player.then(|| "Humanoid".to_string()))
-            })?;
+            let word = with_unit(lua, &token, None, |u| u.creature_type_name.clone())?;
             match word {
                 Some(w) => Ok(Value::String(lua.create_string(&w)?)),
                 None => Ok(Value::Nil),
@@ -986,7 +992,9 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
         lua.create_function(|lua, token: Option<String>| {
             if let Some(token) = token {
                 let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-                model.selection_requests.push(SelectionRequest::Unit(token));
+                model
+                    .script_calls
+                    .push(ScriptCall::Select(SelectionRequest::Unit(token)));
             }
             Ok(())
         })?,
@@ -1003,8 +1011,8 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             if let Some(token) = token {
                 let mut model = lua.app_data_mut::<Model>().expect("model app_data");
                 model
-                    .selection_requests
-                    .push(SelectionRequest::Assist(token));
+                    .script_calls
+                    .push(ScriptCall::Select(SelectionRequest::Assist(token)));
             }
             Ok(())
         })?,
@@ -1016,26 +1024,9 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
         "TargetLastEnemy",
         lua.create_function(|lua, ()| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.selection_requests.push(SelectionRequest::LastEnemy);
-            Ok(())
-        })?,
-    )?;
-
-    // TargetNearestFriend([reverse]) (`0x489aa0`): the Tab cycler `0x493f60` in mode 2 (enemy is
-    // 1), whose filter (`0x493eca`) wants `CanAssist` and health above 0. Argument 1 reverses
-    // (`0x6f1c10`, absent is 0); stock `Bindings.xml` says "1 (or "true")", so a number or a
-    // boolean reverses.
-    g.set(
-        "TargetNearestFriend",
-        lua.create_function(|lua, reverse: Option<Value>| {
-            let reverse = match reverse {
-                None | Some(Value::Nil) | Some(Value::Boolean(false)) => false,
-                Some(Value::Integer(n)) => n != 0,
-                Some(Value::Number(n)) => n != 0.0,
-                Some(_) => true,
-            };
-            let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.target_nearest_friend_requests.push(reverse);
+            model
+                .script_calls
+                .push(ScriptCall::Select(SelectionRequest::LastEnemy));
             Ok(())
         })?,
     )?;
@@ -1061,7 +1052,9 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
                 Some(_) => true,
             };
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.target_by_name_requests.push((name, exact));
+            model
+                .script_calls
+                .push(ScriptCall::TargetByName { name, exact });
             Ok(())
         })?,
     )?;
@@ -1101,21 +1094,21 @@ pub(in crate::script) fn install(lua: &Lua) -> mlua::Result<()> {
             }
             check_unit_token(&Some(token.clone()))?;
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
-            model.spell_target_unit.push(token);
+            model.script_calls.push(ScriptCall::SpellTargetUnit(token));
             Ok(())
         })?,
     )?;
 
-    // ClearTarget(): 1 when it cleared a target, nil when there was none, which `ToggleGameMenu`'s
-    // Escape chain needs to fall through to the menu. The app commits the deselect.
+    // ClearTarget() (`0x489ff0`): 1 when it cleared a target, nil when there was none, which
+    // `ToggleGameMenu`'s Escape chain needs to fall through to the menu. The deselect is queued
+    // either way: it reads the selection as the calls before it leave it (`0x489ff0`-`0x489fff`),
+    // so `TargetUnit("player") ClearTarget()` ends with nothing selected.
     g.set(
         "ClearTarget",
         lua.create_function(|lua, ()| {
             let mut model = lua.app_data_mut::<Model>().expect("model app_data");
             let had = model.unit("target").is_some_and(|u| u.exists);
-            if had {
-                model.target_clear = true;
-            }
+            model.script_calls.push(ScriptCall::ClearTarget);
             Ok(flag(had))
         })?,
     )?;
diff --git a/crates/benilla-ui/src/script/unit/chain_tests.rs b/crates/benilla-ui/src/script/unit/chain_tests.rs
new file mode 100644
index 00000000..409c36c2
--- /dev/null
+++ b/crates/benilla-ui/src/script/unit/chain_tests.rs
@@ -0,0 +1,327 @@
+//! The getters and `SpellCanTargetUnit` over a `target` chain: the token resolves to a guid
+//! through [`UnitGuids`] (`0x515970`), and the guid's snapshot answers.
+
+use std::collections::HashMap;
+
+use crate::script::{UiScript, UnitGuids, UnitState};
+
+const ME: u64 = 0x10;
+const PET: u64 = 0xF140_0000_0000_0077;
+/// Our target.
+const MOB: u64 = 0xF130_0000_0000_0001;
+/// party1 and raid2, who targets `BOSS`.
+const P1: u64 = 0x21;
+/// party2, held by no one.
+const FAR: u64 = 0x22;
+/// raid3, who targets `ADD`.
+const R3: u64 = 0x33;
+/// What party1 targets, and the unit `MOB`'s hop lands on party1 from.
+const BOSS: u64 = 0xF130_0000_0000_00B0;
+/// What raid3 targets: held, and never named by a base token.
+const ADD: u64 = 0xF130_0000_0000_00AD;
+/// What our pet targets.
+const PET_FOE: u64 = 0xF130_0000_0000_00F0;
+/// What `BOSS` targets, and nobody holds.
+const GONE: u64 = 0xF130_0000_0000_0099;
+/// Held, targets nobody, and no snapshot is pushed for it.
+const SILENT: u64 = 0xF130_0000_0000_0055;
+/// raid4, who targets `SILENT`.
+const R4: u64 = 0x44;
+
+fn state(name: &str, guid: u64, health: u32) -> UnitState {
+    UnitState {
+        exists: true,
+        has_object: true,
+        guid,
+        name: Some(name.into()),
+        health,
+        max_health: 1000,
+        level: 60,
+        ..Default::default()
+    }
+}
+
+/// We target the mob, which targets party1, who targets the boss, which targets a unit nobody
+/// holds. raid3 targets the add, raid4 a held unit with no snapshot, our pet its foe, and party2
+/// is out of range. Pushed by name: the bases. Pushed by guid: the units a chain ends on.
+fn world() -> UiScript {
+    let mut s = UiScript::new().unwrap();
+    s.set_unit_guids(&UnitGuids {
+        player: ME,
+        pet: PET,
+        target: MOB,
+        party: [P1, FAR, 0, 0],
+        raid: vec![ME, P1, R3, R4],
+        held: HashMap::from([
+            (ME, MOB),
+            (PET, PET_FOE),
+            (MOB, P1),
+            (P1, BOSS),
+            (BOSS, GONE),
+            (R3, ADD),
+            (R4, SILENT),
+            (ADD, 0),
+            (PET_FOE, 0),
+            (SILENT, 0),
+        ]),
+        ..Default::default()
+    });
+    for (token, unit) in [
+        ("player", state("Me", ME, 900)),
+        ("target", state("Mob", MOB, 500)),
+        ("party1", state("Pia", P1, 800)),
+        ("pet", state("Pet", PET, 300)),
+    ] {
+        s.set_unit(token, Some(unit));
+    }
+    for unit in [
+        state("Boss", BOSS, 4000),
+        state("Add", ADD, 250),
+        state("Foe", PET_FOE, 120),
+        // The hops that land on a unit a base names.
+        state("Mob", MOB, 500),
+        state("Pia", P1, 800),
+    ] {
+        s.set_unit_by_guid(unit.guid, Some(unit));
+    }
+    s
+}
+
+fn eval<T: mlua::FromLuaMulti>(s: &UiScript, chunk: &str) -> T {
+    s.eval(chunk).unwrap_or_else(|e| panic!("{chunk}: {e}"))
+}
+
+/// The getters read the snapshot of the unit the chain ends on, whatever the base is, and however
+/// many hops the token takes.
+#[test]
+fn a_chain_answers_the_snapshot_of_the_unit_it_ends_on() {
+    let s = world();
+    for (chunk, want) in [
+        (r#"return UnitName("party1target")"#, "Boss"),
+        (r#"return UnitName("raid2target")"#, "Boss"),
+        (r#"return UnitName("raid3target")"#, "Add"),
+        (r#"return UnitName("pettarget")"#, "Foe"),
+        (r#"return UnitName("playertarget")"#, "Mob"),
+        (r#"return UnitName("targettarget")"#, "Pia"),
+        (r#"return UnitName("targettargettarget")"#, "Boss"),
+        (r#"return UnitName("playertargettargettarget")"#, "Boss"),
+        // The compares fold case, the hops' too.
+        (r#"return UnitName("PARTY1TARGET")"#, "Boss"),
+        (r#"return UnitName("Raid3Target")"#, "Add"),
+    ] {
+        assert_eq!(eval::<String>(&s, chunk), want, "{chunk}");
+    }
+    assert_eq!(eval::<i64>(&s, r#"return UnitHealth("raid3target")"#), 250);
+    assert_eq!(
+        eval::<i64>(&s, r#"return UnitHealth("party1target")"#),
+        4000
+    );
+    assert_eq!(
+        eval::<i64>(&s, r#"return UnitHealthMax("party1target")"#),
+        1000
+    );
+    assert_eq!(eval::<i64>(&s, r#"return UnitLevel("pettarget")"#), 60);
+    assert!(eval::<bool>(&s, r#"return UnitExists("pettarget") == 1"#));
+    assert!(eval::<bool>(
+        &s,
+        r#"return UnitExists("party1target") == 1"#
+    ));
+    assert!(eval::<bool>(
+        &s,
+        r#"return UnitIsUnit("targettarget", "party1") == 1"#
+    ));
+}
+
+/// A chain that names nobody answers what the getter answers for no unit: nil, 0 and nil. A chain
+/// to a guid nothing holds reads 0 and nil too, but its name is the reference's name-cache leg
+/// (`0x5171eb`, else `UNKNOWNOBJECT` at `0x517216`), which is not built, so it is not asserted.
+#[test]
+fn a_chain_to_a_unit_nobody_holds_answers_nothing() {
+    let s = world();
+    // `BOSS` targets `GONE`, which is not held.
+    for (lua, want) in [
+        (r#"UnitHealth("party1targettarget")"#, "0"),
+        (r#"UnitExists("party1targettarget")"#, "nil"),
+    ] {
+        assert_eq!(
+            eval::<String>(&s, &format!("return tostring({lua})")),
+            want,
+            "{lua}"
+        );
+    }
+    for token in [
+        // `party2` is not held, so a hop off it names nobody.
+        "party2target",
+        // `SILENT` is held, and nothing pushed its snapshot.
+        "raid4target",
+        // A hop off a unit with no target, and a base past the roster.
+        "raid3targettarget",
+        "raid9target",
+        "partypet1target",
+    ] {
+        assert!(
+            eval::<bool>(&s, &format!(r#"return UnitName("{token}") == nil"#)),
+            "{token}: name"
+        );
+        assert_eq!(
+            eval::<i64>(&s, &format!(r#"return UnitHealth("{token}")"#)),
+            0,
+            "{token}: health"
+        );
+        assert!(
+            eval::<bool>(&s, &format!(r#"return UnitExists("{token}") == nil"#)),
+            "{token}: exists"
+        );
+    }
+}
+
+/// The plain tokens read the snapshot the app pushed under them, never a guid's: a base with no
+/// push answers nothing even where its guid has an entry, and `"target"` is not `"party1target"`.
+#[test]
+fn a_token_without_a_hop_still_reads_its_own_push() {
+    let mut s = world();
+    for (chunk, want) in [
+        (r#"return UnitName("player")"#, "Me"),
+        (r#"return UnitName("target")"#, "Mob"),
+        (r#"return UnitName("party1")"#, "Pia"),
+        (r#"return UnitName("pet")"#, "Pet"),
+        (r#"return UnitName("TARGET")"#, "Mob"),
+    ] {
+        assert_eq!(eval::<String>(&s, chunk), want, "{chunk}");
+    }
+    assert_eq!(eval::<i64>(&s, r#"return UnitHealth("target")"#), 500);
+
+    // A guid entry for the unit a plain token resolves to is not that token's snapshot: the
+    // app pushes each base by name.
+    s.set_unit_by_guid(R3, Some(state("Raider", R3, 700)));
+    assert!(eval::<bool>(&s, r#"return UnitName("raid3") == nil"#));
+    assert_eq!(eval::<i64>(&s, r#"return UnitHealth("raid3")"#), 0);
+    // A push under the token wins over a guid entry, which is what `targettarget` is.
+    s.set_unit("targettarget", Some(state("Tot", P1, 1)));
+    assert_eq!(
+        eval::<String>(&s, r#"return UnitName("targettarget")"#),
+        "Tot"
+    );
+    // Cleared, it falls to the chain.
+    s.set_unit("targettarget", None);
+    assert_eq!(
+        eval::<String>(&s, r#"return UnitName("targettarget")"#),
+        "Pia"
+    );
+    // And the entry is dropped with `None`.
+    s.set_unit_by_guid(P1, None);
+    assert!(eval::<bool>(
+        &s,
+        r#"return UnitName("targettarget") == nil"#
+    ));
+}
+
+/// The junk after a hop and an unknown token behave as the resolver does: the first names
+/// nobody, the second raises.
+#[test]
+fn a_malformed_chain_is_nobody_and_an_unknown_token_raises() {
+    let s = world();
+    for token in [
+        "party1targetfoo",
+        "party1 target",
+        "party1targettarge",
+        "targetfoo",
+    ] {
+        assert!(
+            eval::<bool>(&s, &format!(r#"return UnitName("{token}") == nil"#)),
+            "{token}"
+        );
+    }
+    for chunk in [
+        r#"return UnitName("npctarget")"#,
+        r#"return UnitHealth("bogustarget")"#,
+    ] {
+        let err = s.eval::<mlua::Value>(chunk).expect_err(chunk).to_string();
+        assert!(err.contains("Unknown unit name"), "{chunk}: {err}");
+    }
+}
+
+/// `UnitInParty` judges a chain by the unit it ends on, not by the `party` in its text.
+#[test]
+fn unit_in_party_judges_the_unit_a_party_chain_ends_on() {
+    let mut s = world();
+    s.set_party(crate::script::PartyState {
+        members: vec![crate::script::PartyMemberInfo {
+            guid: P1,
+            ..Default::default()
+        }],
+        ..Default::default()
+    });
+    assert!(eval::<bool>(&s, r#"return UnitInParty("party1") == 1"#));
+    // The boss is no member.
+    assert!(eval::<bool>(
+        &s,
+        r#"return UnitInParty("party1target") == nil"#
+    ));
+    // `MOB` targets party1, so the chain ends on a member.
+    assert!(eval::<bool>(
+        &s,
+        r#"return UnitInParty("targettarget") == 1"#
+    ));
+}
+
+/// `SpellCanTargetUnit` resolves its token to a guid and asks the verdicts by guid: a chain reads
+/// the unit it ends on, and two tokens naming one unit answer alike.
+#[test]
+fn spell_can_target_unit_answers_the_verdict_of_the_unit_the_token_names() {
+    let mut s = world();
+    s.set_spell_targetable_units([BOSS, P1]);
+    let can = |s: &UiScript, token: &str| {
+        s.eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == 1"))
+            .unwrap()
+    };
+    let refused = |s: &UiScript, token: &str| {
+        s.eval::<bool>(&format!("return SpellCanTargetUnit({token:?}) == nil"))
+            .unwrap()
+    };
+    assert!(can(&s, "party1target"), "the boss");
+    assert!(can(&s, "raid2target"), "the boss by another base");
+    assert!(can(&s, "PARTY1TARGET"), "case folds");
+    assert!(can(&s, "targettarget"), "party1, by a hop off the target");
+    assert!(can(&s, "party1"), "a base, by its guid");
+    assert!(can(&s, "raid2"), "another token, one unit");
+    assert!(refused(&s, "raid3target"), "the add is not cleared");
+    assert!(refused(&s, "pettarget"));
+    assert!(refused(&s, "target"), "the mob is not cleared");
+    assert!(refused(&s, "party1targettarget"), "a unit nobody holds");
+    assert!(refused(&s, "party2target"), "a hop off a unit not held");
+    assert!(refused(&s, "party1targetfoo"), "junk after a hop");
+    assert!(refused(&s, ""), "no token names nobody");
+
+    // The set moves with the push, and clearing it clears every token.
+    s.set_spell_targetable_units([ADD]);
+    assert!(can(&s, "raid3target"));
+    assert!(refused(&s, "party1target"));
+    s.set_spell_targetable_units([]);
+    assert!(refused(&s, "raid3target"));
+}
+
+/// The reference gates the argument (`0x6e6d0e`) and resolves through `0x515970`, which raises for
+/// a token it does not know.
+#[test]
+fn spell_can_target_unit_raises_as_the_resolver_and_the_gate_do() {
+    let s = world();
+    let err = |chunk: &str| s.eval::<mlua::Value>(chunk).expect_err(chunk).to_string();
+    for chunk in [
+        "return SpellCanTargetUnit()",
+        "return SpellCanTargetUnit(nil)",
+        "return SpellCanTargetUnit({})",
+    ] {
+        assert!(
+            err(chunk).contains(r#"Usage: SpellCanTargetUnit("unit")"#),
+            "{chunk}"
+        );
+    }
+    for chunk in [
+        r#"return SpellCanTargetUnit("bogus")"#,
+        r#"return SpellCanTargetUnit("npctarget")"#,
+        "return SpellCanTargetUnit(5)",
+    ] {
+        assert!(err(chunk).contains("Unknown unit name"), "{chunk}");
+    }
+}
diff --git a/crates/benilla-ui/src/script/unit/mod.rs b/crates/benilla-ui/src/script/unit/mod.rs
index d6989874..40e0d26d 100644
--- a/crates/benilla-ui/src/script/unit/mod.rs
+++ b/crates/benilla-ui/src/script/unit/mod.rs
@@ -1,10 +1,11 @@
 //! The `Unit*` bindings. The app pushes each token's [`UnitState`] every frame through
-//! [`UiScript::set_unit`], and the globals read that plain data, which keeps this crate free of
+//! [`UiScript::set_unit`], and the units a `target` chain ends on by guid through
+//! [`UiScript::set_unit_by_guid`]; the globals read that plain data, which keeps this crate free of
 //! the ECS. Every predicate answers the number `1` or nil, never a Lua boolean.
 
 use mlua::Lua;
 
-use super::Model;
+use super::{Model, NearestMode, ScriptCall};
 
 /// A selection ask from Lua, queued in call order for the app to resolve and commit. The reference
 /// routes `TargetUnit`, `AssistUnit` and `TargetLastEnemy` through one helper (`0x489a40`: commit,
@@ -46,8 +47,9 @@ pub struct PlayerRecord {
     pub sex: u8,
 }
 
-/// One unit token's snapshot, pushed by the app each frame and read by the `Unit*` bindings;
-/// plain data, with no mlua handles or ECS types.
+/// One unit's snapshot, pushed by the app each frame under a token, or under a guid for a unit a
+/// `target` chain ends on, and read by the `Unit*` bindings; plain data, with no mlua handles or
+/// ECS types.
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct UnitState {
     /// `UnitExists`, true for an out-of-range party member through the roster fallback. The
@@ -107,6 +109,9 @@ pub struct UnitState {
     /// `UnitHasRelicSlot` (`0x519e50`): INVSLOT 17 is a relic slot, from `ChrClasses.dbc` field
     /// 16. Players only, true for Paladin, Shaman and Druid.
     pub has_relic_slot: bool,
+    /// `ChrClasses.dbc` field 2 for a player's class, 0-based (Strength 0, Agility 1), which
+    /// `GetDamageBonusStat` (`0x48b520`) reads for the active player; `None` with no class row.
+    pub damage_bonus_stat: Option<u32>,
     /// `UnitSex`'s scale, 2 male and 3 female, from `UNIT_FIELD_BYTES_0` byte 2 (0 male, 1
     /// female). The unfilled 0 answers 2, the reference's unresolved answer (`0x517f9f`).
     pub sex: u8,
@@ -134,7 +139,10 @@ pub struct UnitState {
     pub guild: Option<super::guild::UnitGuild>,
     /// The creature template's subname ("Stable Master"), the tooltip's second line.
     pub subtitle: Option<String>,
-    /// The creature type word ("Beast") from `CreatureType.dbc`, the level line's class slot.
+    /// The word ("Beast") from `CreatureType.dbc` for the type the reference's resolver `0x605570`
+    /// returns for any unit: the shapeshift form's, else the creature template's, else the
+    /// race's. `UnitCreatureType` answers it, and a creature's level line takes it as its class
+    /// slot; a player's reads race and class instead. `None` for type 0 or no descriptor.
     pub creature_type_name: Option<String>,
     /// Creature rank 0..=4 as the reference's getter (`0x605620`) answers it, so already gated:
     /// 0 without a cached creature template or with a pet number. The tooltip's rank word,
@@ -151,14 +159,11 @@ pub struct UnitState {
     /// The faction name ("Stormwind"), the tooltip line after the level line, from `Faction.dbc`
     /// through the faction template with its hiding gates applied; `None` shows no line.
     pub faction_name: Option<String>,
-    /// `UnitIsConnected`; party tokens take the roster status byte's `0x01`. The default `false`
-    /// reads disconnected, which greys a stock mana bar (`UnitFrame.lua:214`), so a synthetic
-    /// live unit must set it.
+    /// `UnitIsConnected`: any unit the object manager holds answers 1 (`0x517daf`); a party token
+    /// with no object takes the roster status byte's `0x01`. The default `false` reads
+    /// disconnected, which greys a stock mana bar (`UnitFrame.lua:214`), so a hand-built live
+    /// unit must set it; the app's `snapshot` does for every held one.
     pub is_connected: bool,
-    /// `UnitIsAFK`, the roster status byte's `0x40`, fed for party tokens.
-    pub is_afk: bool,
-    /// `UnitIsDND`, the roster status byte's `0x80`, fed for party tokens.
-    pub is_dnd: bool,
     /// `UnitIsPVPFreeForAll`: `PLAYER_FLAGS` bit `0x80`, or the roster status byte's `0x10`;
     /// independent of [`Self::pvp`].
     pub is_pvp_ffa: bool,
@@ -187,7 +192,7 @@ pub struct UnitState {
     pub raid_target: u8,
     /// Whether the player can attack the unit, `UnitCanAttack("player", unit)`, which the binding
     /// (`0x516c50`, delegating to `CanAttack` `0x606980`) answers for both argument orders. Fed for
-    /// `target`, `targettarget` and `npc`; other tokens read false.
+    /// `target`, `targettarget`, `npc` and the units a chain ends on; other tokens read false.
     pub can_attack: bool,
     /// `UnitIsCorpse` (`0x5161c0`): the token names a `TYPEID_CORPSE` object, which a dead unit
     /// is not. No feed sets it.
@@ -308,10 +313,36 @@ impl super::UiScript {
                 }
             }
         }
-        // A push for a tooltip's live unit token re-drives its health bar, without a line rebuild.
+        // A push of the unit a tooltip shows re-drives its health bar, without a line rebuild.
         super::tooltip_unit::on_unit_push(&self.lua, token);
     }
 
+    /// Push, or clear with `None`, the snapshot of a unit a `target` chain can end on, by guid. A
+    /// token with a hop that no push names (`"party1target"`, `"raid3targettarget"`) resolves
+    /// through [`UnitGuids`] to a guid and reads that guid's entry, the reference's order
+    /// (`0x515970`, then each getter's object lookup `0x468460`); the guids to cover are
+    /// [`Self::chain_end_guids`]. A token without a hop reads its own push, not this.
+    pub fn set_unit_by_guid(&mut self, guid: u64, state: Option<UnitState>) {
+        let mut model = self.model_mut();
+        match state {
+            Some(s) => {
+                model.units_by_guid.insert(guid, s);
+            }
+            None => {
+                model.units_by_guid.remove(&guid);
+            }
+        }
+    }
+
+    /// The guids the chains a script can spell end on ([`UnitGuids::chain_ends`]), each once: the
+    /// units whose snapshots [`Self::set_unit_by_guid`] serves.
+    pub fn chain_end_guids(&self) -> Vec<u64> {
+        let mut ends: Vec<u64> = self.model_ref().unit_guids.chain_ends().collect();
+        ends.sort_unstable();
+        ends.dedup();
+        ends
+    }
+
     /// Push the player's copper (`PLAYER_FIELD_COINAGE`), read by `GetMoney`.
     pub fn set_money(&mut self, copper: u64) {
         self.model_mut().money = copper;
@@ -386,25 +417,37 @@ impl super::UiScript {
         model.combo_target = target;
     }
 
-    /// Drain the queued [`SelectionRequest`]s, in call order.
+    /// Take the queued [`SelectionRequest`]s out of the call stream, in call order.
     pub fn take_selection_requests(&mut self) -> Vec<SelectionRequest> {
-        std::mem::take(&mut self.model_mut().selection_requests)
+        self.take_calls_where(|c| match c {
+            ScriptCall::Select(r) => Some(r.clone()),
+            _ => None,
+        })
     }
 
-    /// Drain the `TargetNearestFriend([reverse])` calls, `true` for reverse. It names no unit: the
-    /// reference runs the TAB cycler (`0x493f60`, mode 2) straight into `SetSelection`.
-    pub fn take_target_nearest_friend_requests(&mut self) -> Vec<bool> {
-        std::mem::take(&mut self.model_mut().target_nearest_friend_requests)
+    /// Take the `TargetNearest*([reverse])` calls out of the call stream, `true` for reverse.
+    /// They name no unit: the reference runs the TAB cycler (`0x493f60`) straight into
+    /// `SetSelection`.
+    pub fn take_target_nearest_requests(&mut self) -> Vec<(NearestMode, bool)> {
+        self.take_calls_where(|c| match c {
+            ScriptCall::TargetNearest { mode, reverse } => Some((*mode, *reverse)),
+            _ => None,
+        })
     }
 
-    /// Drain the `TargetByName(name, exactMatch)` calls for the app's by-name resolver.
+    /// Take the `TargetByName(name, exactMatch)` calls out of the call stream.
     pub fn take_target_by_name_requests(&mut self) -> Vec<(String, bool)> {
-        std::mem::take(&mut self.model_mut().target_by_name_requests)
+        self.take_calls_where(|c| match c {
+            ScriptCall::TargetByName { name, exact } => Some((name.clone(), *exact)),
+            _ => None,
+        })
     }
 
-    /// Drain `ClearTarget()`: true if it fired with a live target; the app deselects (guid 0).
+    /// Take the `ClearTarget()` calls out of the call stream: whether there was one.
     pub fn take_target_clear(&mut self) -> bool {
-        std::mem::take(&mut self.model_mut().target_clear)
+        !self
+            .take_calls_where(|c| matches!(c, ScriptCall::ClearTarget).then_some(()))
+            .is_empty()
     }
 
     /// Drain `DropItemOnUnit`'s tokens; on the pet the app casts the learned Feed Pet spell at
@@ -413,9 +456,12 @@ impl super::UiScript {
         std::mem::take(&mut self.model_mut().drop_item_on_unit)
     }
 
-    /// Drain `SpellTargetUnit` calls for the host's pending unit-target spell binder.
+    /// Take the `SpellTargetUnit` calls out of the call stream.
     pub fn take_spell_target_unit(&mut self) -> Vec<String> {
-        std::mem::take(&mut self.model_mut().spell_target_unit)
+        self.take_calls_where(|c| match c {
+            ScriptCall::SpellTargetUnit(token) => Some(token.clone()),
+            _ => None,
+        })
     }
 }
 
@@ -429,33 +475,7 @@ fn pick_unit_token(a: &Option<String>, b: &Option<String>) -> Option<String> {
     }
 }
 
-/// The token prefixes the resolver (`0x515970`) tests, in its order (`partypet` before `party`).
-/// Each is a prefix test, so `"playerfoo"` is recognised; `npc`, its one full-string compare, is
-/// tested apart.
-const UNIT_TOKEN_PREFIXES: [&str; 8] = [
-    "player",
-    "pet",
-    "target",
-    "partypet",
-    "party",
-    "raidpet",
-    "raid",
-    "mouseover",
-];
-
-/// Whether the resolver recognises the token, not whether it names a unit: `"party5"` solo is
-/// recognised and answers nil, and only a token none of its nine compares match raises.
-pub(crate) fn token_recognised(token: &str) -> bool {
-    // `npc` full-string, the rest prefixes, all folded as `_strnicmp` folds: ASCII only.
-    token.eq_ignore_ascii_case("npc")
-        || UNIT_TOKEN_PREFIXES
-            .iter()
-            // Bytes, not a `str` slice, which panics mid-character on a multibyte token.
-            .any(|p| {
-                token.len() >= p.len()
-                    && token.as_bytes()[..p.len()].eq_ignore_ascii_case(p.as_bytes())
-            })
-}
+use resolve::token_recognised;
 
 /// The resolver's token check: an unrecognised token raises `Unknown unit name`, as `0x515970`
 /// ends in `luaL_error`; `""`, an absent token and a recognised one naming nothing pass. Whether
@@ -501,6 +521,11 @@ fn unit_predicate(
 /// The `Unit*` and `GetQuestGreenRange` registrations.
 mod bindings;
 #[cfg(test)]
+mod chain_tests;
+mod resolve;
+#[cfg(test)]
 mod tests;
 
+pub use resolve::{parse_unit_token, UnitBase, UnitGuids, UnitTokenParse};
+
 pub(super) use bindings::install;
diff --git a/crates/benilla-ui/src/script/unit/resolve.rs b/crates/benilla-ui/src/script/unit/resolve.rs
new file mode 100644
index 00000000..5d0ad2fe
--- /dev/null
+++ b/crates/benilla-ui/src/script/unit/resolve.rs
@@ -0,0 +1,441 @@
+//! The unit-token resolver `0x515970`, token to guid, over the state it reads, which the app pushes
+//! as [`UnitGuids`]: a base (`player`, `pet`, `target`, `partyN`, `partypetN`, `raidN`,
+//! `raidpetN`, `mouseover`, `npc`), then any number of `target` hops, each off the current unit's
+//! `UNIT_FIELD_TARGET`. Every compare folds ASCII case (`SStrCmpI 0x64a4c0`, first at `0x5159b4`).
+
+use std::collections::HashMap;
+
+/// What the resolver reads: the guid globals, the group tables and, for each unit a token can
+/// reach, whether it is held and whom it targets. A zero guid is nobody.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct UnitGuids {
+    /// The local player's guid; 0 without the player object, when `player` and `pet` answer nil
+    /// (`0x5159c9`, `0x515a58`).
+    pub player: u64,
+    /// The pet: `UNIT_FIELD_CHARM`, else `UNIT_FIELD_SUMMON` (`0x515a64`).
+    pub pet: u64,
+    /// The target global `[0xb4e2d8]`.
+    pub target: u64,
+    /// The mouseover global `[0xb4e2c8]`, read only while it is a held unit (`0x515bd2`).
+    pub mouseover: u64,
+    /// The interaction NPC `[0xb4e2d0]`.
+    pub npc: u64,
+    /// `partyN`'s guid, index N-1 (`0x4e81a0`).
+    pub party: [u64; 4],
+    /// `partypetN`'s guid, index N-1 (`0x4e81d0`).
+    pub party_pets: [u64; 4],
+    /// `raidN`'s guid, one per roster row; a row past the end is nobody (`0x491940`).
+    pub raid: Vec<u64>,
+    /// `raidpetN`'s guid, row for row with [`Self::raid`] (`0x491960`).
+    pub raid_pets: Vec<u64>,
+    /// Each held unit a token can reach, to its `UNIT_FIELD_TARGET` (0 for none): the object
+    /// manager's lookup with the unit typemask (`0x468460`, `ecx = 8`) and the descriptor read a
+    /// `target` hop makes (`0x515a0f`-`0x515a25`). A guid missing here is not held.
+    pub held: HashMap<u64, u64>,
+}
+
+/// A token's base, the resolver's compares in its order (`partypet` before `party`, `raidpet`
+/// before `raid`); `npc` is tested apart, as its one full-string compare.
+#[derive(Clone, Copy)]
+enum Base {
+    Player,
+    Pet,
+    Target,
+    PartyPet,
+    Party,
+    RaidPet,
+    Raid,
+    Mouseover,
+}
+
+/// Each prefix and its base, in the resolver's order; a prefix test compares `strlen(literal)`
+/// bytes, so `"playerfoo"` matches `player`.
+const PREFIXES: [(&str, Base); 8] = [
+    ("player", Base::Player),
+    ("pet", Base::Pet),
+    ("target", Base::Target),
+    ("partypet", Base::PartyPet),
+    ("party", Base::Party),
+    ("raidpet", Base::RaidPet),
+    ("raid", Base::Raid),
+    ("mouseover", Base::Mouseover),
+];
+
+/// The unit a token starts from, before any `target` hop. A numbered base carries its 0-based
+/// row, [`index_of`]'s: a table lookup that fails on the reserved `u32::MAX` of a missing or zero
+/// number names nobody.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum UnitBase {
+    Player,
+    Pet,
+    Target,
+    Mouseover,
+    /// The interaction NPC; an exact compare, so it takes no `target` hop (`0x515bec`).
+    Npc,
+    Party(u32),
+    PartyPet(u32),
+    Raid(u32),
+    RaidPet(u32),
+}
+
+/// What `0x515970` makes of a token's text, before it reads any state.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum UnitTokenParse {
+    /// None of the nine compares match: the reference raises `Unknown unit name` (`0x515c14`).
+    Unknown,
+    /// Recognised, and names nobody whatever the state: the empty token (`0x51599d`), or text
+    /// after the base, and after each hop, that is not `target` (`0x515c2d`).
+    Nobody,
+    /// A base and the `target` hops after it, each off the current unit's `UNIT_FIELD_TARGET`
+    /// (`0x515a1c`-`0x515a25`); the loop has no depth limit.
+    Unit { base: UnitBase, hops: usize },
+}
+
+/// `_strnicmp(s, lit, strlen(lit)) == 0`: ASCII fold only, bytes of 0x80 and up exact.
+fn has_prefix(s: &[u8], lit: &str) -> bool {
+    s.len() >= lit.len() && s[..lit.len()].eq_ignore_ascii_case(lit.as_bytes())
+}
+
+/// The first prefix the token matches, with its length.
+fn base_of(token: &[u8]) -> Option<(Base, usize)> {
+    PREFIXES
+        .iter()
+        .find(|(p, _)| has_prefix(token, p))
+        .map(|&(p, b)| (b, p.len()))
+}
+
+/// Whether the resolver recognises the token, not whether it names a unit: `"party5"` solo is
+/// recognised and answers nil, and only a token none of its nine compares match raises.
+pub(crate) fn token_recognised(token: &str) -> bool {
+    token.eq_ignore_ascii_case("npc") || base_of(token.as_bytes()).is_some()
+}
+
+/// The inline base-10 parse after `party`, `partypet`, `raid` and `raidpet`, then `dec` to a
+/// 0-based index (`0x515ab1`-`0x515acc`): digits accumulate with 32-bit wrap, and a missing
+/// number leaves 0, whose index `0xffffffff` every bound rejects.
+fn index_of(s: &[u8]) -> (u32, usize) {
+    let digits = s.iter().take_while(|b| b.is_ascii_digit()).count();
+    let n = s[..digits].iter().fold(0u32, |acc, &b| {
+        acc.wrapping_mul(10).wrapping_add(u32::from(b - b'0'))
+    });
+    (n.wrapping_sub(1), digits)
+}
+
+/// Read `token`'s text as `0x515970` does, before any state: the base by the compares in their
+/// order, a numbered base's row, then `target` hops to the end of the text. `"party1target"` is
+/// party1 and one hop, `"targettarget"` the target and one, and `"npctarget"` is none of the nine
+/// compares, as `npc` is one full-string compare.
+pub fn parse_unit_token(token: &str) -> UnitTokenParse {
+    let bytes = token.as_bytes();
+    if bytes.is_empty() {
+        return UnitTokenParse::Nobody;
+    }
+    let Some((base, len)) = base_of(bytes) else {
+        return if token.eq_ignore_ascii_case("npc") {
+            UnitTokenParse::Unit {
+                base: UnitBase::Npc,
+                hops: 0,
+            }
+        } else {
+            UnitTokenParse::Unknown
+        };
+    };
+    let mut rest = &bytes[len..];
+    let mut numbered = |make: fn(u32) -> UnitBase| {
+        let (row, digits) = index_of(rest);
+        rest = &rest[digits..];
+        make(row)
+    };
+    let base = match base {
+        Base::Player => UnitBase::Player,
+        Base::Pet => UnitBase::Pet,
+        Base::Target => UnitBase::Target,
+        Base::Mouseover => UnitBase::Mouseover,
+        Base::PartyPet => numbered(UnitBase::PartyPet),
+        Base::Party => numbered(UnitBase::Party),
+        Base::RaidPet => numbered(UnitBase::RaidPet),
+        Base::Raid => numbered(UnitBase::Raid),
+    };
+    let mut hops = 0;
+    while !rest.is_empty() {
+        if !has_prefix(rest, "target") {
+            return UnitTokenParse::Nobody;
+        }
+        rest = &rest[6..];
+        hops += 1;
+    }
+    UnitTokenParse::Unit { base, hops }
+}
+
+impl UnitGuids {
+    /// The guid `token` names, or `None` for nobody; `Err` for a token none of the nine compares
+    /// match, where the reference raises `Unknown unit name: %s` (`0x515c14`). An empty token is
+    /// nobody (`0x51599d`).
+    pub(crate) fn resolve(&self, token: &str) -> Result<Option<u64>, ()> {
+        match parse_unit_token(token) {
+            UnitTokenParse::Unknown => Err(()),
+            UnitTokenParse::Nobody => Ok(None),
+            UnitTokenParse::Unit { base, hops } => Ok(self.resolve_unit(base, hops)),
+        }
+    }
+
+    /// The guid a parsed token names: its base's guid, then each `target` hop. `None` is nobody.
+    pub(crate) fn resolve_unit(&self, base: UnitBase, hops: usize) -> Option<u64> {
+        // The indexed bases: the table's row for the parsed number.
+        let at = |table: &[u64], row: u32| {
+            usize::try_from(row)
+                .ok()
+                .and_then(|row| table.get(row))
+                .copied()
+                .unwrap_or(0)
+        };
+        let guid = match base {
+            UnitBase::Player => self.player,
+            UnitBase::Pet if self.player == 0 => return None,
+            UnitBase::Pet => self.pet,
+            UnitBase::Target => self.target,
+            UnitBase::Npc => self.npc,
+            // Deviation: `0x4e81d0` has no bound and reads past its four-entry table, which is
+            // stale memory, not a mechanism; past it, nobody.
+            UnitBase::PartyPet(row) => at(&self.party_pets, row),
+            // Capped at 4 (`0x4e81b0`).
+            UnitBase::Party(row) => at(&self.party, row),
+            // Capped at the roster count (`0x491940`, `0x491960`).
+            UnitBase::RaidPet(row) => at(&self.raid_pets, row),
+            UnitBase::Raid(row) => at(&self.raid, row),
+            UnitBase::Mouseover if !self.held.contains_key(&self.mouseover) => return None,
+            UnitBase::Mouseover => self.mouseover,
+        };
+        self.follow(guid, hops)
+    }
+
+    /// The guids a `target` hop can end on: each held unit's target, when it names one. `held`
+    /// holds the bases' units and each unit a hop reaches from them, so a token with a hop names
+    /// one of these or nobody, and a per-guid feed over them covers the chains a script can spell.
+    /// A guid repeats when two units share a target, and the last hop's unit need not be held: the
+    /// lookup that finds its object is the reader's.
+    pub(crate) fn chain_ends(&self) -> impl Iterator<Item = u64> + '_ {
+        self.held.values().copied().filter(|&guid| guid != 0)
+    }
+
+    /// [`Self::resolve`] with the raise as the Lua error it is.
+    pub(crate) fn guid_of(&self, token: &str) -> mlua::Result<Option<u64>> {
+        self.resolve(token)
+            .map_err(|()| mlua::Error::runtime(format!("Unknown unit name: {token}")))
+    }
+
+    /// The `target` loop (`0x5159d3`-`0x515a2c`): nobody stays nobody, and each hop goes to the held
+    /// unit's `UNIT_FIELD_TARGET`; a hop off a unit not held is a quiet nobody (`0x515a16`).
+    fn follow(&self, mut guid: u64, hops: usize) -> Option<u64> {
+        for _ in 0..hops {
+            if guid == 0 {
+                return None;
+            }
+            guid = *self.held.get(&guid)?;
+        }
+        Some(guid).filter(|&g| g != 0)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const ME: u64 = 0x10;
+    const PET: u64 = 0xF140_0000_0000_0077;
+    const MOB: u64 = 0xF130_0000_0000_0001;
+    const P1: u64 = 0x21;
+    const P1_PET: u64 = 0xF140_0000_0000_0021;
+    const R3: u64 = 0x33;
+    const FAR: u64 = 0x44;
+
+    /// Us targeting a mob that targets party1, who targets us; party1's pet and raid row 3 held,
+    /// `FAR` a roster member out of range.
+    fn guids() -> UnitGuids {
+        UnitGuids {
+            player: ME,
+            pet: PET,
+            target: MOB,
+            mouseover: MOB,
+            npc: MOB,
+            party: [P1, FAR, 0, 0],
+            party_pets: [P1_PET, 0, 0, 0],
+            raid: vec![ME, P1, R3],
+            raid_pets: vec![PET, P1_PET, 0],
+            held: HashMap::from([
+                (ME, MOB),
+                (PET, 0),
+                (MOB, P1),
+                (P1, ME),
+                (P1_PET, MOB),
+                (R3, 0),
+            ]),
+        }
+    }
+
+    fn at(token: &str) -> Option<u64> {
+        guids().resolve(token).expect("recognised")
+    }
+
+    #[test]
+    fn every_base_resolves_through_its_table() {
+        assert_eq!(at("player"), Some(ME));
+        assert_eq!(at("pet"), Some(PET));
+        assert_eq!(at("target"), Some(MOB));
+        assert_eq!(at("mouseover"), Some(MOB));
+        assert_eq!(at("npc"), Some(MOB));
+        assert_eq!(at("party1"), Some(P1));
+        // Not held, but a roster member: the base needs no object.
+        assert_eq!(at("party2"), Some(FAR));
+        assert_eq!(at("partypet1"), Some(P1_PET));
+        assert_eq!(at("raid3"), Some(R3));
+        assert_eq!(at("raidpet2"), Some(P1_PET));
+    }
+
+    #[test]
+    fn the_compares_fold_ascii_case() {
+        assert_eq!(at("PLAYER"), Some(ME));
+        assert_eq!(at("Player"), Some(ME));
+        assert_eq!(at("PartyPet1"), Some(P1_PET));
+        assert_eq!(at("MouseOver"), Some(MOB));
+        assert_eq!(at("NPC"), Some(MOB));
+        assert_eq!(at("TargetTarget"), Some(P1));
+    }
+
+    #[test]
+    fn target_is_a_loop_on_every_base_but_npc() {
+        assert_eq!(at("targettarget"), Some(P1));
+        assert_eq!(at("targettargettarget"), Some(ME));
+        assert_eq!(at("targettargettargettarget"), Some(MOB));
+        assert_eq!(at("playertarget"), Some(MOB));
+        assert_eq!(at("party1target"), Some(ME));
+        assert_eq!(at("partypet1target"), Some(MOB));
+        assert_eq!(at("raid2target"), Some(ME));
+        assert_eq!(at("raid2targettarget"), Some(MOB));
+        assert_eq!(at("mouseovertarget"), Some(P1));
+        // A hop to nobody ends the chain (`0x515a2e`), as does a hop off a unit not held.
+        assert_eq!(at("pettarget"), None);
+        assert_eq!(at("party2target"), None);
+        assert!(guids().resolve("npctarget").is_err());
+    }
+
+    /// The parse reads the text alone: the base by the resolver's compares, a numbered base's
+    /// 0-based row, then `target` hops to the end, whatever the depth.
+    #[test]
+    fn a_token_parses_to_a_base_and_its_hops() {
+        use UnitBase::*;
+        let unit = |base, hops| UnitTokenParse::Unit { base, hops };
+        for (token, want) in [
+            ("player", unit(Player, 0)),
+            ("pet", unit(Pet, 0)),
+            ("target", unit(Target, 0)),
+            ("mouseover", unit(Mouseover, 0)),
+            ("npc", unit(Npc, 0)),
+            ("party1", unit(Party(0), 0)),
+            ("partypet4", unit(PartyPet(3), 0)),
+            ("raid40", unit(Raid(39), 0)),
+            ("raidpet2", unit(RaidPet(1), 0)),
+            ("targettarget", unit(Target, 1)),
+            ("targettargettargettarget", unit(Target, 3)),
+            ("playertarget", unit(Player, 1)),
+            ("pettarget", unit(Pet, 1)),
+            ("mouseovertarget", unit(Mouseover, 1)),
+            ("party1target", unit(Party(0), 1)),
+            ("partypet1target", unit(PartyPet(0), 1)),
+            ("raid12targettargettarget", unit(Raid(11), 3)),
+            ("raidpet3target", unit(RaidPet(2), 1)),
+            // A missing or zero number is the row every bound rejects.
+            ("party", unit(Party(u32::MAX), 0)),
+            ("raid0target", unit(Raid(u32::MAX), 1)),
+            // The compares fold case, the hops too.
+            ("PARTY1TARGET", unit(Party(0), 1)),
+            ("PartyPet2TargetTarget", unit(PartyPet(1), 2)),
+        ] {
+            assert_eq!(parse_unit_token(token), want, "{token}");
+        }
+        let deep = format!("player{}", "target".repeat(1000));
+        assert_eq!(
+            parse_unit_token(&deep),
+            unit(Player, 1000),
+            "no depth limit"
+        );
+    }
+
+    /// Text after the base, or after any hop, that is not `target` names nobody; a token none of
+    /// the nine compares match is the raise, `npc` being an exact compare with no chain.
+    #[test]
+    fn a_token_that_is_not_base_then_hops_parses_to_nobody_or_the_raise() {
+        for token in [
+            "",
+            "party1foo",
+            "playerfoo",
+            "player1",
+            "pet1",
+            "party1targetfoo",
+            "party1targettarge",
+            "party1 target",
+            "targetfoo",
+            "raid3x",
+        ] {
+            assert_eq!(parse_unit_token(token), UnitTokenParse::Nobody, "{token}");
+        }
+        for token in ["npctarget", "npc1", "bogus", "tar", "focus", "5", "targe"] {
+            assert_eq!(parse_unit_token(token), UnitTokenParse::Unknown, "{token}");
+        }
+    }
+
+    #[test]
+    fn a_recognised_token_naming_nobody_is_quiet() {
+        for t in [
+            "",
+            "party",
+            "party0",
+            "party5",
+            "partyX",
+            "raid0",
+            "raid4",
+            "raidpet3",
+            "playerfoo",
+            "targetfoo",
+            "partypet5",
+        ] {
+            assert_eq!(guids().resolve(t), Ok(None), "{t}");
+        }
+        let solo = UnitGuids {
+            player: 0,
+            pet: PET,
+            ..guids()
+        };
+        assert_eq!(solo.resolve("pet"), Ok(None), "no player object, no pet");
+        let gone = UnitGuids {
+            held: HashMap::new(),
+            ..guids()
+        };
+        assert_eq!(gone.resolve("mouseover"), Ok(None), "a mouseover not held");
+        assert_eq!(
+            gone.resolve("target"),
+            Ok(Some(MOB)),
+            "the target global is not gated"
+        );
+    }
+
+    #[test]
+    fn an_unrecognised_token_is_the_raise() {
+        for t in ["bogus", "focus", "none", "5", "npc1", "tar"] {
+            assert_eq!(guids().resolve(t), Err(()), "{t}");
+        }
+    }
+
+    #[test]
+    fn the_index_parse_wraps_and_stops_at_the_first_non_digit() {
+        assert_eq!(at("party01"), Some(P1));
+        assert_eq!(at("raid03"), Some(R3));
+        assert_eq!(at("raid03target"), None, "raid3 targets nobody");
+        assert_eq!(
+            index_of(b"4294967297"),
+            (0, 10),
+            "2^32 + 1 wraps to 1, index 0"
+        );
+        assert_eq!(index_of(b"x"), (u32::MAX, 0));
+    }
+}
diff --git a/crates/benilla-ui/src/script/unit/tests.rs b/crates/benilla-ui/src/script/unit/tests.rs
index 70ff364e..73908d7f 100644
--- a/crates/benilla-ui/src/script/unit/tests.rs
+++ b/crates/benilla-ui/src/script/unit/tests.rs
@@ -1,6 +1,6 @@
 //! The `Unit*` binding tests.
 
-use crate::script::{PartyState, PlayerRecord, UiScript, UnitState};
+use crate::script::{PartyState, PlayerRecord, UiScript, UnitGuids, UnitState};
 
 fn player() -> UnitState {
     UnitState {
@@ -61,12 +61,18 @@ fn spell_target_unit_checks_in_the_references_order() {
 #[test]
 fn spell_can_target_unit_answers_per_validated_token() {
     let mut s = UiScript::new().unwrap();
-    s.set_spell_targetable_units(["player", "party1"]);
+    s.set_unit_guids(&UnitGuids {
+        player: 0x10,
+        party: [0x21, 0, 0, 0],
+        target: 0x30,
+        ..Default::default()
+    });
+    s.set_spell_targetable_units([0x10, 0x21]);
     assert!(s
-        .eval::<bool>(r#"return SpellCanTargetUnit("player") == true"#)
+        .eval::<bool>(r#"return SpellCanTargetUnit("player") == 1"#)
         .unwrap());
     assert!(s
-        .eval::<bool>(r#"return SpellCanTargetUnit("PARTY1") == true"#)
+        .eval::<bool>(r#"return SpellCanTargetUnit("PARTY1") == 1"#)
         .unwrap());
     assert!(s
         .eval::<bool>(r#"return SpellCanTargetUnit("target") == nil"#)
@@ -349,22 +355,37 @@ fn the_selection_queue_carries_all_three_verbs_in_call_order() {
     assert!(s.take_selection_requests().is_empty());
 }
 
-/// The reverse flag as `0x6f1c10` reads it: absent, nil and 0 are forward, 1 and `true` reverse
-/// (`Bindings.xml:458`).
+/// The reverse flag as `0x6f1c10` reads it (default 0): absent, nil, 0 and `"0"` are forward, 1,
+/// `true` and `"1"` reverse (`Bindings.xml:458`). The four shims differ only in the mode.
 #[test]
-fn target_nearest_friend_queues_its_reverse_flag() {
+fn target_nearest_queues_its_mode_and_reverse_flag() {
+    use crate::script::NearestMode::{Enemy, Friend, PartyMember, RaidMember};
     let mut s = UiScript::new().unwrap();
-    assert!(s.take_target_nearest_friend_requests().is_empty());
+    assert!(s.take_target_nearest_requests().is_empty());
     s.eval::<()>("TargetNearestFriend()").unwrap();
     s.eval::<()>("TargetNearestFriend(1)").unwrap();
     s.eval::<()>("TargetNearestFriend(true)").unwrap();
     s.eval::<()>("TargetNearestFriend(0)").unwrap();
     s.eval::<()>("TargetNearestFriend(nil)").unwrap();
+    s.eval::<()>(r#"TargetNearestFriend("0")"#).unwrap();
+    s.eval::<()>(r#"TargetNearestEnemy("1")"#).unwrap();
+    s.eval::<()>("TargetNearestPartyMember()").unwrap();
+    s.eval::<()>("TargetNearestRaidMember(1)").unwrap();
     assert_eq!(
-        s.take_target_nearest_friend_requests(),
-        vec![false, true, true, false, false]
+        s.take_target_nearest_requests(),
+        vec![
+            (Friend, false),
+            (Friend, true),
+            (Friend, true),
+            (Friend, false),
+            (Friend, false),
+            (Friend, false),
+            (Enemy, true),
+            (PartyMember, false),
+            (RaidMember, true),
+        ]
     );
-    assert!(s.take_target_nearest_friend_requests().is_empty());
+    assert!(s.take_target_nearest_requests().is_empty());
 }
 
 #[test]
@@ -571,8 +592,6 @@ fn party_frame_predicates_report_1_or_nil() {
         Some(UnitState {
             exists: true,
             is_connected: true,
-            is_afk: true,
-            is_dnd: false,
             pvp: true,
             is_pvp_ffa: false,
             ..Default::default()
@@ -583,10 +602,6 @@ fn party_frame_predicates_report_1_or_nil() {
             .unwrap(),
         1
     );
-    assert_eq!(s.eval::<i64>(r#"return UnitIsAFK("party1")"#).unwrap(), 1);
-    assert!(s
-        .eval::<bool>(r#"return UnitIsDND("party1") == nil"#)
-        .unwrap());
     assert_eq!(s.eval::<i64>(r#"return UnitIsPVP("party1")"#).unwrap(), 1);
     assert!(s
         .eval::<bool>(r#"return UnitIsPVPFreeForAll("party1") == nil"#)
@@ -597,8 +612,6 @@ fn party_frame_predicates_report_1_or_nil() {
         Some(UnitState {
             exists: true,
             is_connected: false,
-            is_afk: false,
-            is_dnd: true,
             pvp: false,
             is_pvp_ffa: true,
             ..Default::default()
@@ -607,10 +620,6 @@ fn party_frame_predicates_report_1_or_nil() {
     assert!(s
         .eval::<bool>(r#"return UnitIsConnected("party1") == nil"#)
         .unwrap());
-    assert!(s
-        .eval::<bool>(r#"return UnitIsAFK("party1") == nil"#)
-        .unwrap());
-    assert_eq!(s.eval::<i64>(r#"return UnitIsDND("party1")"#).unwrap(), 1);
     assert!(s
         .eval::<bool>(r#"return UnitIsPVP("party1") == nil"#)
         .unwrap());
@@ -1376,6 +1385,35 @@ fn unit_is_party_leader_ors_two_legs_and_answers_one_when_solo() {
     assert!(s.run(r#"UnitIsPartyLeader("notatoken")"#).is_err());
 }
 
+/// `GetDamageBonusStat()` (`0x48b520`) is the player's class row's field 2 plus one, 0 with no
+/// player or no row; it takes no unit, so another unit's class never answers.
+#[test]
+fn damage_bonus_stat_is_the_player_class_stat_one_based() {
+    let mut s = UiScript::new().unwrap();
+    assert_eq!(s.eval::<i64>("return GetDamageBonusStat()").unwrap(), 0);
+
+    let mut rogue = player();
+    rogue.damage_bonus_stat = Some(1);
+    s.set_unit("target", Some(rogue.clone()));
+    assert_eq!(
+        s.eval::<i64>("return GetDamageBonusStat()").unwrap(),
+        0,
+        "the target is not the player"
+    );
+    s.set_unit("player", Some(rogue));
+    assert_eq!(s.eval::<i64>("return GetDamageBonusStat()").unwrap(), 2);
+
+    let mut warrior = player();
+    warrior.damage_bonus_stat = Some(0);
+    s.set_unit("player", Some(warrior));
+    assert_eq!(s.eval::<i64>("return GetDamageBonusStat()").unwrap(), 1);
+
+    let mut rowless = player();
+    rowless.damage_bonus_stat = None;
+    s.set_unit("player", Some(rowless));
+    assert_eq!(s.eval::<i64>("return GetDamageBonusStat()").unwrap(), 0);
+}
+
 /// Stock calls it unconditionally (`PaperDollFrame.lua:429`, `PaperDollFrame.lua:580`), so the
 /// global must exist for every class.
 #[test]
@@ -1603,24 +1641,6 @@ fn every_unit_predicate_is_one_or_nil_and_never_a_boolean() {
                 ..Default::default()
             },
         ),
-        (
-            "UnitIsAFK",
-            r#"UnitIsAFK("target")"#,
-            UnitState {
-                exists: true,
-                is_afk: true,
-                ..Default::default()
-            },
-        ),
-        (
-            "UnitIsDND",
-            r#"UnitIsDND("target")"#,
-            UnitState {
-                exists: true,
-                is_dnd: true,
-                ..Default::default()
-            },
-        ),
         (
             "UnitIsPVP",
             r#"UnitIsPVP("target")"#,
diff --git a/crates/benilla-ui/src/script/video_pairs.rs b/crates/benilla-ui/src/script/video_pairs.rs
new file mode 100644
index 00000000..69dfc24c
--- /dev/null
+++ b/crates/benilla-ui/src/script/video_pairs.rs
@@ -0,0 +1,302 @@
+//! The Video options getter/setter pairs beside `GetWorldDetail` and `GetGamma` in the main table
+//! `0x83de68` (records `0x83df10`..`0x83df68`): water detail, far clip, terrain mip, doodad
+//! animation, texture LOD bias and base mip. Each getter ignores its arguments and pushes one
+//! number; each setter takes `lua_isnumber(1)` (`0x6f34d0`) or raises its `Usage:` string, writes
+//! one CVar through `CVar::Set` (`0x63df50`) and returns zero values.
+//!
+//! The stock window reaches only `Get/SetTerrainMip` and `Get/SetBaseMip` (`OptionsFrame.lua:28-29`,
+//! `func` spelled as the verb); its far-clip row composes `Getfarclip`, which must stay nil.
+
+use mlua::{Lua, MultiValue, Value};
+
+use super::cvars::{format_f, sstr_to_int, write_cvar};
+use super::Model;
+
+/// The CVars these pairs read and write, which the host must register: a missing row would make a
+/// setter warn and store nothing.
+pub const VIDEO_PAIR_CVARS: [&str; 5] = [
+    "farclip",
+    "shadowLevel",
+    "doodadAnim",
+    "texLodBias",
+    "baseMip",
+];
+
+/// How a getter answers, from the CVar record it looks up by name (`0x63de30`).
+#[derive(Clone, Copy)]
+enum Read {
+    /// A constant, `GetWaterDetail`'s `0.0` (`0x488ec0`).
+    Zero,
+    /// The record's f32 (`fld [rec+0x24]`), widened.
+    Float(&'static str),
+    /// `1.0 − ` the record's integer (`fild [rec+0x28]`, `fsubr [0x8015b8]`).
+    OneMinusInt(&'static str),
+    /// `1.0 − ` the record's f32 (`fld [rec+0x24]`, `fsubr [0x8015b8]`).
+    OneMinusFloat(&'static str),
+}
+
+/// How a setter writes, after the `lua_isnumber` gate and `lua_tonumber` (`0x6f3620`).
+#[derive(Clone, Copy)]
+enum Write {
+    /// `SetWaterDetail` (`0x488ed0`): the gate, then nothing.
+    Nothing,
+    /// The number as "%f" (format `0x835160`).
+    Float(&'static str),
+    /// `1 − trunc(v)` as "%d" (`__ftol`, then `mov ecx,1; sub ecx,eax`, format `0x835154`).
+    OneMinusTrunc(&'static str),
+    /// `trunc(1.0 − v)` as "%d" (`fsubr [0x8015b8]`, then `__ftol`).
+    TruncOneMinus(&'static str),
+}
+
+/// One pair: its two globals, the setter's usage string and the CVar's registered default, which a
+/// bare VM without the host's rows reads as the record's value.
+struct Pair {
+    get: &'static str,
+    set: &'static str,
+    usage: &'static str,
+    read: Read,
+    write: Write,
+    default: &'static str,
+}
+
+const PAIRS: [Pair; 6] = [
+    // `0x488ec0`/`0x488ed0`, usage `0x842408`: no CVar behind either.
+    Pair {
+        get: "GetWaterDetail",
+        set: "SetWaterDetail",
+        usage: "Usage: SetWaterDetail(value)",
+        read: Read::Zero,
+        write: Write::Nothing,
+        default: "0",
+    },
+    // `0x488f00`/`0x488f30` over `farclip` (`0x842428`), usage `0x842430`.
+    Pair {
+        get: "GetFarclip",
+        set: "SetFarclip",
+        usage: "Usage: SetFarclip(value)",
+        read: Read::Float("farclip"),
+        write: Write::Float("farclip"),
+        default: "350",
+    },
+    // `0x488fb0`/`0x488fe0` over `shadowLevel` (`0x84244c`), usage `0x842458`: the slider shows
+    // `1 − shadowLevel`, so High (1) is shadow mip 0.
+    Pair {
+        get: "GetTerrainMip",
+        set: "SetTerrainMip",
+        usage: "Usage: SetTerrainMip(value)",
+        read: Read::OneMinusInt("shadowLevel"),
+        write: Write::OneMinusTrunc("shadowLevel"),
+        default: "1",
+    },
+    // `0x489060`/`0x489090` over `doodadAnim` (`0x842474`), usage `0x842480`.
+    Pair {
+        get: "GetDoodadAnim",
+        set: "SetDoodadAnim",
+        usage: "Usage: SetDoodadAnim(value)",
+        read: Read::Float("doodadAnim"),
+        write: Write::Float("doodadAnim"),
+        default: "1",
+    },
+    // `0x489110`/`0x489140` over `texLodBias` (`0x84249c`), usage `0x8424a8`.
+    Pair {
+        get: "GetTexLodBias",
+        set: "SetTexLodBias",
+        usage: "Usage: SetTexLodBias(value)",
+        read: Read::Float("texLodBias"),
+        write: Write::Float("texLodBias"),
+        default: "0.0",
+    },
+    // `0x489280`/`0x4892b0` over `baseMip` (`0x8424e4`), usage `0x8424ec`: the slider shows
+    // `1 − baseMip`, so High (1) is base mip 0.
+    Pair {
+        get: "GetBaseMip",
+        set: "SetBaseMip",
+        usage: "Usage: SetBaseMip(value)",
+        read: Read::OneMinusFloat("baseMip"),
+        write: Write::TruncOneMinus("baseMip"),
+        default: "0",
+    },
+];
+
+/// `__ftol` (`0x40a2b0`) truncates toward zero into a qword, and the "%d" these setters format
+/// reads its low dword. Out of range or NaN it stores the integer indefinite `0x8000000000000000`,
+/// whose low dword is 0.
+fn ftol_low(v: f64) -> i32 {
+    if v.is_finite() && v.abs() < 2f64.powi(63) {
+        v.trunc() as i64 as i32
+    } else {
+        0
+    }
+}
+
+/// The record's value, or `default` when this VM has no such row.
+fn record_value(model: &Model, name: &str, default: &str) -> String {
+    model
+        .cvars
+        .get(&name.to_ascii_lowercase())
+        .map_or_else(|| default.to_string(), |slot| slot.value.clone())
+}
+
+/// The record's `valueAsFloat` (`rec+0x24`), parsed from the value as an f32. A value that does
+/// not parse reads 0.0; the setters and the host's registry store only numbers.
+fn record_float(value: &str) -> f64 {
+    f64::from(value.parse::<f32>().unwrap_or(0.0))
+}
+
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+    for pair in &PAIRS {
+        let (read, default) = (pair.read, pair.default);
+        g.set(
+            pair.get,
+            // Any arguments are ignored: the getter never calls `lua_gettop`.
+            lua.create_function(move |lua, _: MultiValue| {
+                let model = lua.app_data_ref::<Model>().expect("model app_data");
+                Ok(match read {
+                    Read::Zero => 0.0,
+                    Read::Float(name) => record_float(&record_value(&model, name, default)),
+                    Read::OneMinusInt(name) => {
+                        1.0 - f64::from(sstr_to_int(&record_value(&model, name, default)))
+                    }
+                    Read::OneMinusFloat(name) => {
+                        1.0 - record_float(&record_value(&model, name, default))
+                    }
+                })
+            })?,
+        )?;
+        let (write, usage) = (pair.write, pair.usage);
+        g.set(
+            pair.set,
+            lua.create_function(move |lua, value: Value| {
+                // A number or a numeric string; anything else, or no argument, raises.
+                let Some(v) = lua.coerce_number(value)? else {
+                    return Err(mlua::Error::runtime(usage));
+                };
+                let (name, text) = match write {
+                    Write::Nothing => return Ok(MultiValue::new()),
+                    Write::Float(name) => (name, format_f(v)),
+                    Write::OneMinusTrunc(name) => {
+                        (name, 1i32.wrapping_sub(ftol_low(v)).to_string())
+                    }
+                    Write::TruncOneMinus(name) => (name, ftol_low(1.0 - v).to_string()),
+                };
+                let mut model = lua.app_data_mut::<Model>().expect("model app_data");
+                write_cvar(&mut model, name, text);
+                // Zero return values, not nil (`xor eax,eax` at every `ret`).
+                Ok(MultiValue::new())
+            })?,
+        )?;
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::script::UiScript;
+
+    /// A VM with the host's five rows at their reference defaults.
+    fn script() -> UiScript {
+        let s = UiScript::new().unwrap();
+        s.register_cvars([
+            ("farclip", "350"),
+            ("shadowLevel", "1"),
+            ("doodadAnim", "1"),
+            ("texLodBias", "0.0"),
+            ("baseMip", "0"),
+        ]);
+        s
+    }
+
+    #[test]
+    fn every_pair_has_the_reference_shape() {
+        let s = script();
+        for get in [
+            "GetWaterDetail",
+            "GetFarclip",
+            "GetTerrainMip",
+            "GetDoodadAnim",
+            "GetTexLodBias",
+            "GetBaseMip",
+        ] {
+            assert_eq!(s.arity(&format!("{get}()")).unwrap(), 1, "{get}");
+            assert_eq!(
+                s.eval::<String>(&format!("return type({get}(7, 'x'))"))
+                    .unwrap(),
+                "number",
+                "{get} ignores its arguments and pushes a number"
+            );
+        }
+        for (set, usage) in [
+            ("SetWaterDetail", "Usage: SetWaterDetail(value)"),
+            ("SetFarclip", "Usage: SetFarclip(value)"),
+            ("SetTerrainMip", "Usage: SetTerrainMip(value)"),
+            ("SetDoodadAnim", "Usage: SetDoodadAnim(value)"),
+            ("SetTexLodBias", "Usage: SetTexLodBias(value)"),
+            ("SetBaseMip", "Usage: SetBaseMip(value)"),
+        ] {
+            assert_eq!(s.arity(&format!("{set}(1)")).unwrap(), 0, "{set}");
+            assert_eq!(s.arity(&format!("{set}(\"1\")")).unwrap(), 0, "{set}");
+            for bad in ["", "nil", "\"x\"", "{}", "true"] {
+                let e = s.run(&format!("{set}({bad})")).unwrap_err().to_string();
+                assert!(e.contains(usage), "{set}({bad}) raised {e}");
+            }
+        }
+        // The stock window's lower-case spellings are not bindings.
+        assert!(s
+            .eval::<bool>("return Getfarclip == nil and Setfarclip == nil")
+            .unwrap());
+    }
+
+    #[test]
+    fn the_getters_read_their_records_at_the_reference_defaults() {
+        let s = script();
+        let get = |e: &str| s.eval::<f64>(&format!("return {e}()")).unwrap();
+        assert_eq!(get("GetWaterDetail"), 0.0);
+        assert_eq!(get("GetFarclip"), 350.0);
+        // `shadowLevel` "1" → `1 − 1`; `baseMip` "0" → `1 − 0`: both sliders at High.
+        assert_eq!(get("GetTerrainMip"), 0.0);
+        assert_eq!(get("GetBaseMip"), 1.0);
+        assert_eq!(get("GetDoodadAnim"), 1.0);
+        assert_eq!(get("GetTexLodBias"), 0.0);
+        // A bare VM without the rows answers the registered defaults.
+        let bare = UiScript::new().unwrap();
+        assert_eq!(bare.eval::<f64>("return GetFarclip()").unwrap(), 350.0);
+        assert_eq!(bare.eval::<f64>("return GetTerrainMip()").unwrap(), 0.0);
+    }
+
+    #[test]
+    fn the_setters_write_the_reference_text() {
+        let s = script();
+        let set = |call: &str, cvar: &str| {
+            s.run(call).unwrap();
+            s.cvar(cvar).unwrap()
+        };
+        // "%f" of the number, as `SetGamma` writes.
+        assert_eq!(set("SetFarclip(500)", "farclip"), "500.000000");
+        assert_eq!(s.eval::<f64>("return GetFarclip()").unwrap(), 500.0);
+        assert_eq!(set("SetDoodadAnim(0)", "doodadAnim"), "0.000000");
+        assert_eq!(set("SetTexLodBias(-0.5)", "texLodBias"), "-0.500000");
+        assert_eq!(s.eval::<f64>("return GetTexLodBias()").unwrap(), -0.5);
+        // `SetTerrainMip`: truncate, then `1 − n`.
+        assert_eq!(set("SetTerrainMip(1)", "shadowLevel"), "0");
+        assert_eq!(s.eval::<f64>("return GetTerrainMip()").unwrap(), 1.0);
+        assert_eq!(set("SetTerrainMip(0.9)", "shadowLevel"), "1");
+        // `SetBaseMip`: `1 − v`, then truncate, so 0.5 is `trunc(0.5)` = 0, not `1 − 0`.
+        assert_eq!(set("SetBaseMip(0)", "baseMip"), "1");
+        assert_eq!(s.eval::<f64>("return GetBaseMip()").unwrap(), 0.0);
+        assert_eq!(set("SetBaseMip(0.5)", "baseMip"), "0");
+        assert_eq!(set("SetBaseMip(\"0\")", "baseMip"), "1");
+        // `SetWaterDetail` checks its argument and writes nothing.
+        s.run("SetWaterDetail(3)").unwrap();
+        assert_eq!(s.eval::<f64>("return GetWaterDetail()").unwrap(), 0.0);
+    }
+
+    #[test]
+    fn ftol_keeps_the_low_dword_of_the_truncation() {
+        assert_eq!(super::ftol_low(2.9), 2);
+        assert_eq!(super::ftol_low(-2.9), -2);
+        assert_eq!(super::ftol_low(4_294_967_297.0), 1);
+        assert_eq!(super::ftol_low(f64::NAN), 0);
+        assert_eq!(super::ftol_low(1e300), 0);
+    }
+}
diff --git a/crates/benilla-ui/src/script/who_sort.rs b/crates/benilla-ui/src/script/who_sort.rs
index 7ba19abf..4e3baf6b 100644
--- a/crates/benilla-ui/src/script/who_sort.rs
+++ b/crates/benilla-ui/src/script/who_sort.rs
@@ -151,14 +151,19 @@ fn ascii_ci_cmp(a: &str, b: &str) -> Ordering {
 }
 
 /// The class, race and zone arms (`0x5ada7b`, `0x5adadf`, `0x5adb40`): an id with no DBC row, an
-/// empty name here, ties and passes to the next key (`0x5adbb2`) rather than sorting as `""`. The
-/// empty name is the miss marker: the reference's `GetWhoInfo` (`0x5ad6e0`) shows `UNKNOWN` for
-/// it, benilla's an empty cell, and a row that carried `UNKNOWN` would sort on that word.
+/// empty name here, sorts after every resolved name, not first as `""`. Two misses tie and pass
+/// to the next key (`0x5adbb2`), as there. The empty name is the miss marker: the reference's
+/// `GetWhoInfo` (`0x5ad6e0`) shows `UNKNOWN` for it, benilla's an empty cell, and a row that
+/// carried `UNKNOWN` would sort on that word.
 fn dbc_name_cmp(a: &str, b: &str) -> Ordering {
-    if a.is_empty() || b.is_empty() {
-        return Ordering::Equal;
+    match (a.is_empty(), b.is_empty()) {
+        (true, true) => Ordering::Equal,
+        // Deviation: the reference ties a miss against a hit (`0x5adab6`); no total order can, and
+        // `sort_by` may panic on one that is not, so the miss goes last.
+        (true, false) => Ordering::Greater,
+        (false, true) => Ordering::Less,
+        (false, false) => ascii_ci_cmp(a, b),
     }
-    ascii_ci_cmp(a, b)
 }
 
 #[cfg(test)]
@@ -304,22 +309,101 @@ mod tests {
     }
 
     #[test]
-    fn an_unresolved_dbc_name_ties() {
-        let mut chain = WhoSortChain::default();
-        chain.promote("zone");
+    fn an_unresolved_dbc_name_sorts_after_the_resolved_ones() {
+        // Zone is the seeded front key, so the promote flips it: the default chain already ascends.
+        let chain = WhoSortChain::default();
         let known = row("Bbb", 10, "Mage", "Westfall");
         let unknown = row("Aaa", 10, "Mage", "");
+        assert_eq!(chain.compare(&known, &unknown), Ordering::Less);
+        assert_eq!(chain.compare(&unknown, &known), Ordering::Greater);
+        let other_unknown = row("Ccc", 10, "Mage", "");
         assert_eq!(
-            chain.compare(&known, &unknown),
-            Ordering::Greater,
-            "the zone key ties, so the name decides"
+            chain.compare(&unknown, &other_unknown),
+            Ordering::Less,
+            "two misses tie on zone, so the name decides"
         );
-        assert_eq!(chain.compare(&unknown, &known), Ordering::Less);
 
         // A guild is not a DBC lookup: an empty guild is a real value and sorts first.
         assert_eq!(ascii_ci_cmp("", "Legacy"), Ordering::Less);
     }
 
+    type Setter = fn(&mut WhoInfo, &str);
+
+    /// Each DBC-backed key as a single-key comparator, with the setter for its field.
+    fn dbc_keys() -> [(&'static str, Setter); 3] {
+        [
+            ("class", |r, v| r.class = v.to_string()),
+            ("race", |r, v| r.race = v.to_string()),
+            ("zone", |r, v| r.zone = v.to_string()),
+        ]
+    }
+
+    fn mixed_rows(set: Setter, n: usize) -> Vec<WhoInfo> {
+        let values = [
+            "",
+            "Mage",
+            "Warrior",
+            "",
+            "Elwynn Forest",
+            "Durotar",
+            "Mage",
+        ];
+        (0..n)
+            .map(|i| {
+                let mut r = row(&format!("N{i:03}"), 1 + (i % 7) as u32, "Mage", "Z");
+                set(&mut r, values[(i * 5 + i / 7) % values.len()]);
+                r
+            })
+            .collect()
+    }
+
+    #[test]
+    fn the_dbc_arms_are_a_total_order() {
+        for (key, set) in dbc_keys() {
+            let key = WhoSortKey::from_sort_type(key);
+            let rows = mixed_rows(set, 21);
+            let le = |a: &WhoInfo, b: &WhoInfo| key.order(a, b) != Ordering::Greater;
+            for a in &rows {
+                for b in &rows {
+                    assert_eq!(key.order(a, b), key.order(b, a).reverse(), "{key:?}");
+                    for c in &rows {
+                        if le(a, b) && le(b, c) {
+                            assert!(le(a, c), "{key:?} not transitive");
+                        }
+                        if key.order(a, b) == Ordering::Equal && key.order(b, c) == Ordering::Equal
+                        {
+                            assert_eq!(key.order(a, c), Ordering::Equal, "{key:?} tie");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn sorting_a_mixed_list_puts_misses_last_without_panicking() {
+        for (key, set) in dbc_keys() {
+            let mut chain = WhoSortChain::default();
+            chain.promote("level"); // so the key below is promoted from behind, ascending
+            chain.promote(key);
+            let mut rows = mixed_rows(set, 64);
+            chain.sort(&mut rows);
+            let field = |r: &WhoInfo| match key {
+                "class" => r.class.clone(),
+                "race" => r.race.clone(),
+                _ => r.zone.clone(),
+            };
+            let first_miss = rows.iter().position(|r| field(r).is_empty()).unwrap();
+            assert!(
+                rows[first_miss..].iter().all(|r| field(r).is_empty()),
+                "{key}"
+            );
+            assert!(rows[..first_miss]
+                .windows(2)
+                .all(|w| { ascii_ci_cmp(&field(&w[0]), &field(&w[1])) != Ordering::Greater }));
+        }
+    }
+
     #[test]
     fn the_group_key_displaces_but_orders_nothing() {
         let mut chain = WhoSortChain::default();
diff --git a/crates/benilla-ui/src/script/worldmap.rs b/crates/benilla-ui/src/script/worldmap.rs
index 1e5a10d2..4daaf89b 100644
--- a/crates/benilla-ui/src/script/worldmap.rs
+++ b/crates/benilla-ui/src/script/worldmap.rs
@@ -418,6 +418,11 @@ impl super::UiScript {
         (wm.selection.0, wm.selection.1, wm.direct_area)
     }
 
+    /// Install the host's world-to-map projection behind `GetWorldLocMapPosition`.
+    pub fn set_world_loc_projector(&mut self, projector: super::WorldLocProjector) {
+        self.model_mut().world_loc_projector = Some(projector);
+    }
+
     /// Moves the selection from the engine, as the zone updater `0x494780` calls the setter
     /// `0x4a67a0`: a fresh login shows the player's map before any Lua runs, not the world sheet,
     /// whose `GetPlayerMapPosition` is sheet UV (`0x4a7360`). It takes the resolver's whole
@@ -602,6 +607,36 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
+    // GetWorldLocMapPosition(continent, x, y) (`0x4a88f0`): a world position on the displayed
+    // map, through the projection `GetCorpseMapPosition` uses (`0x4a7360`). The first argument is
+    // the position's map id, however the usage names it (`0x4a7320` matches it against
+    // `WorldMapContinent.dbc`'s map ids); x and y narrow to f32. Each argument must be a number,
+    // else the usage raises; off the displayed map the answer is (0, 0). No stock caller.
+    g.set(
+        "GetWorldLocMapPosition",
+        lua.create_function(|lua, (map, x, y): (Value, Value, Value)| {
+            const USAGE: &str = "Usage: GetWorldLocMapPosition(continent, x, y)";
+            let (Some(map), Some(x), Some(y)) = (
+                lua.coerce_number(map)?,
+                lua.coerce_number(x)?,
+                lua.coerce_number(y)?,
+            ) else {
+                return Err(mlua::Error::RuntimeError(USAGE.into()));
+            };
+            // The truncating cast, then the map id compared as an unsigned dword.
+            let map = map as i64 as i32 as u32;
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            let wm = &model.worldmap;
+            let selection = (wm.selection.0, wm.selection.1, wm.direct_area);
+            let (u, v) = model
+                .world_loc_projector
+                .as_ref()
+                .and_then(|project| project(selection, map, x as f32, y as f32))
+                .unwrap_or((0.0, 0.0));
+            Ok((f64::from(u), f64::from(v)))
+        })?,
+    )?;
+
     // GetCorpseMapPosition() → map UV, or (0, 0), which WorldMapFrame.lua:445 hides.
     g.set(
         "GetCorpseMapPosition",
@@ -635,15 +670,6 @@ pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
         })?,
     )?;
 
-    // GetPlayerFacing() → the facing in radians. Not a 1.12 global.
-    g.set(
-        "GetPlayerFacing",
-        lua.create_function(|lua, ()| {
-            let model = lua.app_data_ref::<Model>().expect("model app_data");
-            Ok(f64::from(model.worldmap.player_facing))
-        })?,
-    )?;
-
     // ProcessMapClick(x, y) (`0x4a7f30`): at world level the first continent whose sheet rect
     // holds the click (`0x4a7100`); otherwise the zone or city under it through the displayed
     // rect (`0x4a6ec0`), which it drills into.
diff --git a/crates/benilla-ui/src/script/zone_text.rs b/crates/benilla-ui/src/script/zone_text.rs
new file mode 100644
index 00000000..11692423
--- /dev/null
+++ b/crates/benilla-ui/src/script/zone_text.rs
@@ -0,0 +1,82 @@
+//! The zone-text family, `GetZoneText`, `GetRealZoneText`, `GetSubZoneText`,
+//! `GetMinimapZoneText` and `GetZonePVPInfo`: readers of the zone caches the host pushes on an
+//! area change, before it fires `MINIMAP_ZONE_CHANGED` or the `ZONE_CHANGED` family. The caches
+//! live in the [`Model`], out of an addon's reach, as the reference's live in the client's BSS.
+
+use mlua::{Lua, MultiValue, Value};
+
+use super::Model;
+
+/// The zone caches, as the host resolves them from the area tables.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct ZoneTexts {
+    /// `GetZoneText`: the zone's name, replaced by the WMO interior's name indoors.
+    pub zone: String,
+    /// `GetRealZoneText`: the zone's name before any WMO override.
+    pub real_zone: String,
+    /// `GetSubZoneText`: the leaf area's name, `""` when the leaf is the zone, and indoors.
+    pub subzone: String,
+    /// `GetMinimapZoneText`: the subzone, else the zone.
+    pub minimap: String,
+    /// `GetZonePVPInfo`'s type, `"friendly"`, `"hostile"` or `"contested"`; `None` when the
+    /// player, the zone or its faction template is missing.
+    pub pvp_type: Option<String>,
+    /// `GetZonePVPInfo`'s faction, `FactionGroup.dbc`'s name for the zone's mask bit; `None` for
+    /// none.
+    pub pvp_faction: Option<String>,
+    /// `GetZonePVPInfo`'s isArena: the leaf area's flag `0x80`, the free-for-all pit.
+    pub is_arena: bool,
+}
+
+impl super::UiScript {
+    /// Push the zone caches; the caller fires the zone events after.
+    pub fn set_zone_texts(&mut self, texts: ZoneTexts) {
+        self.model_mut().zone = texts;
+    }
+}
+
+/// Register the five zone getters.
+pub(super) fn install(lua: &Lua) -> mlua::Result<()> {
+    let g = lua.globals();
+    // The four text getters (`0x48a0a0`, `0x48a0c0`, `0x48a0e0`, `0x48a100`) each push one string,
+    // their cache slot or the shared empty string `0x882748` when the slot is unset, never nil.
+    let text = |pick: fn(&ZoneTexts) -> &str| {
+        move |lua: &Lua, ()| {
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            lua.create_string(pick(&model.zone))
+        }
+    };
+    g.set("GetZoneText", lua.create_function(text(|z| &z.zone))?)?;
+    g.set(
+        "GetRealZoneText",
+        lua.create_function(text(|z| &z.real_zone))?,
+    )?;
+    g.set("GetSubZoneText", lua.create_function(text(|z| &z.subzone))?)?;
+    g.set(
+        "GetMinimapZoneText",
+        lua.create_function(text(|z| &z.minimap))?,
+    )?;
+    // GetZonePVPInfo() (`0x48d540`): always three values, `pvpType, factionName, isArena`; the
+    // type is never `"arena"`, and isArena is 1 or nil, never a boolean.
+    g.set(
+        "GetZonePVPInfo",
+        lua.create_function(|lua, ()| {
+            let model = lua.app_data_ref::<Model>().expect("model app_data");
+            let z = &model.zone;
+            let string = |s: &Option<String>| match s {
+                Some(s) => lua.create_string(s).map(Value::String),
+                None => Ok(Value::Nil),
+            };
+            Ok(MultiValue::from_vec(vec![
+                string(&z.pvp_type)?,
+                string(&z.pvp_faction)?,
+                if z.is_arena {
+                    Value::Number(1.0)
+                } else {
+                    Value::Nil
+                },
+            ]))
+        })?,
+    )?;
+    Ok(())
+}
diff --git a/crates/benilla-ui/src/status.rs b/crates/benilla-ui/src/status.rs
new file mode 100644
index 00000000..8e27bce8
--- /dev/null
+++ b/crates/benilla-ui/src/status.rs
@@ -0,0 +1,179 @@
+//! The reference's load status (`CStatus`, `Status.cpp`, entries `{text, severity}`): each level of
+//! a UI load (the add-on, its `.toc`, each XML document) reports into a record of its own, which is
+//! merged into its caller's when it closes and drained, line by line, to `Logs\FrameXML.log`
+//! (`0x842ecc`) at the load's end.
+
+/// A trace, printed only under `FrameXML_Debug` (`"-- Creating %s named %s"`, `0x6ee2bc`).
+pub const TRACE: u8 = 0;
+/// A file-level failure: a file that did not open or did not parse (`0x6edad4`, `0x704c15`).
+pub const FAILURE: u8 = 2;
+
+/// One level's record: its lines in order and the running maximum severity (`+0x10`, which the
+/// append `0x41a000` and the prepend `0x419ed0` raise, never a count).
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Status {
+    lines: Vec<String>,
+    max: u8,
+}
+
+impl Status {
+    /// Append a line (`0x41a000`).
+    pub fn report(&mut self, severity: u8, text: impl Into<String>) {
+        self.lines.push(text.into());
+        self.max = self.max.max(severity);
+    }
+
+    /// Merge `other` in after this record's own lines, as `0x41a100` re-reports each entry.
+    pub fn merge(&mut self, other: Status) {
+        self.lines.extend(other.lines);
+        self.max = self.max.max(other.max);
+    }
+
+    /// Close one level into its caller: its banner goes first (a prepend at severity 0) when
+    /// `debug` is on or the level reported anything above a trace (`jg` on `FrameXML_Debug`, else
+    /// `jle` on the maximum, `0x6eddb6`/`0x6eddbb`, `0x6ee207`, `0x51f44f`), then the merge.
+    pub fn close_into(mut self, parent: &mut Status, debug: bool, banner: String) {
+        if debug || self.max > TRACE {
+            self.lines.insert(0, banner);
+        }
+        parent.merge(self);
+    }
+
+    /// The lines, in the order the drain writes them.
+    pub fn lines(&self) -> &[String] {
+        &self.lines
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.lines.is_empty()
+    }
+
+    /// The lines, leaving the record empty.
+    pub fn take_lines(&mut self) -> Vec<String> {
+        self.max = TRACE;
+        std::mem::take(&mut self.lines)
+    }
+}
+
+/// A path as the reference reports it: install-relative and `\`-separated.
+pub fn install_path(path: &str) -> String {
+    path.replace('/', "\\")
+}
+
+/// Whether the load-one-file routine (`0x6ede10`) runs `path` as a chunk: the text from its last
+/// `.` equals `.lua` (`0x8710c8`) under `_strnicmp` (`0x6edeea`-`0x6edf05`).
+pub fn runs_as_lua(path: &str) -> bool {
+    path.rfind('.')
+        .is_some_and(|i| path[i..].eq_ignore_ascii_case(".lua"))
+}
+
+/// A file that did not open: `"Error loading %s"` (`0x872e50`) from the chunk arm (`0x704bc0`),
+/// else `"Couldn't open %s"` (`0x846ff4`) from the XML arm (`0x6edaa0`).
+pub fn missing(path: &str, lua: bool) -> String {
+    if lua {
+        format!("Error loading {}", install_path(path))
+    } else {
+        format!("Couldn't open {}", install_path(path))
+    }
+}
+
+/// A document that opened and did not parse (`0x846fd8`, `0x6edb11`).
+pub fn unparsed(path: &str) -> String {
+    format!("Couldn't parse XML in {}", install_path(path))
+}
+
+/// An XML document's banner (`0x87100c`, `0x6ee21c`).
+pub fn file_banner(path: &str) -> String {
+    format!("++ Loading file {}", install_path(path))
+}
+
+/// A `.toc`'s banner (`0x870fec`, `0x6eddc8`).
+pub fn toc_banner(path: &str) -> String {
+    format!("** Loading table of contents {}", install_path(path))
+}
+
+/// An add-on's banner (`0x8539fc`, `0x51f464`).
+pub fn addon_banner(name: &str) -> String {
+    format!("Loading add-on {name}")
+}
+
+/// Where an add-on's `.toc` is, as its banner names it: `Interface\AddOns\<name>\<name>.toc`.
+pub fn addon_toc_path(name: &str) -> String {
+    format!("Interface\\AddOns\\{name}\\{name}.toc")
+}
+
+/// One drain of a load's record into `Logs\FrameXML.log`, in the order the loads ended.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum LogWrite {
+    /// A UI load's drain (`UI_Init`, `0x490187`-`0x4901b6`): the log opens in mode 0 (`0x48ff06`),
+    /// created anew (`CREATE_ALWAYS`, `0x65a1c0`) at its first line (`0x65a930`), so a load that
+    /// reported nothing leaves the file as it was.
+    Rewrite(Vec<String>),
+    /// A runtime `LoadAddOn`'s drain (`0x46aac0`): mode 4 (`0x48ea4e`), opened (`OPEN_ALWAYS`)
+    /// and appended to at its first line.
+    Append(Vec<String>),
+}
+
+/// A VM's two load records and the drains they have made. `LoadAddOn` keeps its own record
+/// (`ds:0xb4e3dc`), refcounted (`ds:0xb4e3e0`) so a nested call writes one block, and drained when
+/// the count returns to zero (`0x48eab4`), even inside a UI load, whose own drain comes last.
+#[derive(Debug, Default)]
+pub(crate) struct LoadLog {
+    pub(crate) ui: Status,
+    pub(crate) demand: Status,
+    pub(crate) demand_depth: u32,
+    pub(crate) writes: Vec<LogWrite>,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// The install's own log shape (the reference's `Logs\FrameXML.log`, `FrameXML_Debug` 0): the
+    /// add-on banner first, then the toc's, then the miss, and a later document with a message
+    /// under its own banner; a clean document says nothing.
+    #[test]
+    fn banners_frame_only_what_reported_something() {
+        let mut root = Status::default();
+        let mut addon = Status::default();
+        let mut toc = Status::default();
+        toc.report(FAILURE, missing("Interface/AddOns/A/Missing.xml", false));
+        let mut clean = Status::default();
+        clean.report(TRACE, "-- Creating Frame named X");
+        clean.close_into(&mut toc, false, file_banner("Interface/AddOns/A/Clean.xml"));
+        let mut broken = Status::default();
+        broken.report(FAILURE, missing("Interface/AddOns/A/b.lua", true));
+        broken.close_into(&mut toc, false, file_banner("Interface/AddOns/A/Core.xml"));
+        toc.close_into(&mut addon, false, toc_banner(&addon_toc_path("A")));
+        addon.close_into(&mut root, false, addon_banner("A"));
+        let mut quiet = Status::default();
+        Status::default().close_into(&mut quiet, false, toc_banner(&addon_toc_path("B")));
+        quiet.close_into(&mut root, false, addon_banner("B"));
+        assert_eq!(
+            root.lines(),
+            [
+                "Loading add-on A",
+                "** Loading table of contents Interface\\AddOns\\A\\A.toc",
+                "Couldn't open Interface\\AddOns\\A\\Missing.xml",
+                "-- Creating Frame named X",
+                "++ Loading file Interface\\AddOns\\A\\Core.xml",
+                "Error loading Interface\\AddOns\\A\\b.lua",
+            ]
+        );
+    }
+
+    /// Under `FrameXML_Debug` every level prints its banner, reported or not.
+    #[test]
+    fn debug_prints_every_banner() {
+        let mut root = Status::default();
+        Status::default().close_into(&mut root, true, file_banner("x.xml"));
+        assert_eq!(root.lines(), ["++ Loading file x.xml"]);
+    }
+
+    #[test]
+    fn the_chunk_arm_is_the_lua_extension_alone() {
+        assert!(runs_as_lua("Interface/AddOns/A/core.LUA"));
+        assert!(!runs_as_lua("Interface/AddOns/A/core.lua.xml"));
+        assert!(!runs_as_lua("Interface/AddOns/A/core"));
+    }
+}
diff --git a/crates/benilla-ui/src/strings.rs b/crates/benilla-ui/src/strings.rs
index 212f9267..9a9bf889 100644
--- a/crates/benilla-ui/src/strings.rs
+++ b/crates/benilla-ui/src/strings.rs
@@ -2,7 +2,8 @@
 //! the client's `SStrPrintf` does: `%s`, `%d`, `%c`, `%f` and `%g` take the next argument left to
 //! right, `%N$s` takes argument N without moving that cursor (`DUEL_WINNER_RETREAT` reorders its
 //! two names), `%%` is `%`, and the precision is the template's. A hole with no argument, or one
-//! this does not know, is copied through literally so a mis-modelled template shows.
+//! this does not know, is copied through literally so a mis-modelled template shows. Reals round
+//! as the MSVC CRT behind `SStrPrintf` does: half up on the decimal digits ([`crt_digits`]).
 
 use std::fmt::Write as _;
 
@@ -84,12 +85,8 @@ impl Arg<'_> {
     fn as_f(&self, prec: Option<usize>, out: &mut String) {
         let p = prec.unwrap_or(6);
         match self {
-            Arg::F(x) => {
-                let _ = write!(out, "{x:.p$}");
-            }
-            Arg::D(n) => {
-                let _ = write!(out, "{:.p$}", *n as f64);
-            }
+            Arg::F(x) => crt_f(*x, p, out),
+            Arg::D(n) => crt_f(*n as f64, p, out),
             Arg::S(s) => out.push_str(s),
         }
     }
@@ -107,21 +104,95 @@ impl Arg<'_> {
             out.push('0');
             return;
         }
-        // Round first, then read the exponent, so 9.999 at P=3 is "10", not "10.0".
-        let sci = format!("{:.*e}", p - 1, x);
-        let (mantissa, exp) = sci.split_once('e').unwrap_or((sci.as_str(), "0"));
-        let exp: i32 = exp.parse().unwrap_or(0);
+        if !x.is_finite() {
+            let _ = write!(out, "{x}");
+            return;
+        }
+        if x.is_sign_negative() {
+            out.push('-');
+        }
+        // Round to P significant digits first, then read the exponent, so 9.999 at P=3 is "10",
+        // not "10.0"; the style's digits are the rounded ones, never rounded twice.
+        let (digits, decpt) = crt_digits(x.abs(), |_| p as i32);
+        let exp = decpt - 1;
         if exp < -4 || exp >= p as i32 {
             // `%e`: C writes at least two exponent digits and always a sign; Rust writes neither.
-            out.push_str(trim_zeros(mantissa));
+            let mantissa = fixed(&digits, 1, p - 1);
+            out.push_str(trim_zeros(&mantissa));
             let _ = write!(out, "e{}{:02}", if exp < 0 { '-' } else { '+' }, exp.abs());
         } else {
             let decimals = (p as i32 - 1 - exp).max(0) as usize;
-            out.push_str(trim_zeros(&format!("{x:.decimals$}")));
+            out.push_str(trim_zeros(&fixed(&digits, decpt, decimals)));
         }
     }
 }
 
+/// `%f` by the CRT: the sign, then [`crt_digits`] rounded at `p` decimals.
+fn crt_f(x: f64, p: usize, out: &mut String) {
+    if !x.is_finite() {
+        let _ = write!(out, "{x:.p$}");
+        return;
+    }
+    if x.is_sign_negative() {
+        out.push('-');
+    }
+    let (digits, decpt) = crt_digits(x.abs(), |decpt| decpt + p as i32);
+    out.push_str(&fixed(&digits, decpt, p));
+}
+
+/// The CRT's decimal digits of a finite `a >= 0` and its point position `decpt` (the value is
+/// `0.d1d2… × 10^decpt`): `_fltout2` takes 17 significant digits, then `_fptostr 0x40fef0` keeps
+/// `keep(decpt)` of them and rounds on the next digit, half up (`40ff3d: cmp byte [ecx],0x35`),
+/// a carry out of the first digit moving the point (`40ff4f`). A negative count keeps nothing
+/// and rounds nothing (`40ff3b`). So 41.25 at one decimal is 41.3, where Rust's `{:.1}` rounds
+/// the tie to even.
+fn crt_digits(a: f64, keep: impl FnOnce(i32) -> i32) -> (Vec<u8>, i32) {
+    let sci = format!("{a:.16e}");
+    let (mantissa, exp) = sci.split_once('e').unwrap_or((sci.as_str(), "0"));
+    let mant: Vec<u8> = mantissa.bytes().filter(u8::is_ascii_digit).collect();
+    let mut decpt = exp.parse::<i32>().unwrap_or(0) + 1;
+    let Ok(n) = usize::try_from(keep(decpt)) else {
+        return (Vec::new(), decpt);
+    };
+    // A leading slot takes the carry.
+    let mut buf = vec![b'0'];
+    buf.extend((0..n).map(|i| mant.get(i).copied().unwrap_or(b'0')));
+    if mant.get(n).is_some_and(|&d| d >= b'5') {
+        let mut i = buf.len() - 1;
+        while buf[i] == b'9' {
+            buf[i] = b'0';
+            i -= 1;
+        }
+        buf[i] += 1;
+    }
+    if buf[0] == b'1' {
+        decpt += 1;
+    } else {
+        buf.remove(0);
+    }
+    (buf, decpt)
+}
+
+/// Lay rounded digits out as `int.frac` with `p` decimals, zero-padded both sides (`_cftof`).
+fn fixed(digits: &[u8], decpt: i32, p: usize) -> String {
+    let digit = |i: i32| -> char {
+        usize::try_from(i)
+            .ok()
+            .and_then(|i| digits.get(i))
+            .map_or('0', |&d| d as char)
+    };
+    let mut s: String = if decpt <= 0 {
+        "0".into()
+    } else {
+        (0..decpt).map(digit).collect()
+    };
+    if p > 0 {
+        s.push('.');
+        s.extend((0..p as i32).map(|k| digit(decpt + k)));
+    }
+    s
+}
+
 /// `%g`'s last step: drop a fraction's trailing zeros, and the point if nothing is left.
 fn trim_zeros(s: &str) -> &str {
     match s.contains('.') {
@@ -287,11 +358,33 @@ mod tests {
     fn f_takes_the_templates_precision() {
         assert_eq!(
             fill("(%.1f damage per second)", &[Arg::F(41.25)]),
-            "(41.2 damage per second)"
+            "(41.3 damage per second)"
         );
         assert_eq!(fill("%.2f", &[Arg::F(41.25)]), "41.25");
     }
 
+    /// The CRT rounds a tie half up on its decimal digits (`_fptostr`'s `>= '5'`), where Rust
+    /// rounds it to even; a value just short of the tie still rounds down.
+    #[test]
+    fn reals_round_ties_up_as_the_crt_does() {
+        let f = |t: &str, v: f64| fill(t, &[Arg::F(v)]);
+        assert_eq!(f("%.1f", 68.25), "68.3");
+        assert_eq!(f("%.1f", 0.25), "0.3");
+        assert_eq!(f("%.1f", 0.05), "0.1", "a carry past the point");
+        assert_eq!(f("%.1f", 99.96), "100.0", "a carry out of the first digit");
+        assert_eq!(f("%.1f", 0.004), "0.0");
+        assert_eq!(
+            f("%.1f", f64::from(0.35f32)),
+            "0.3",
+            "0.3499999940… is not a tie"
+        );
+        assert_eq!(f("%.1f", -2.25), "-2.3");
+        assert_eq!(f("%.2f", 0.125), "0.13");
+        // `%.3g` rounds at its third significant digit the same way: 67.5 s is 1.125 minutes.
+        assert_eq!(f("%.3g min", 1.125), "1.13 min");
+        assert_eq!(f("%.3g", 2.675), "2.67", "2.67499999… is not a tie");
+    }
+
     #[test]
     fn plural_takes_the_twin_for_zero_and_the_bare_token_for_none() {
         let table = |key: &str| -> Option<String> {
diff --git a/crates/benilla-ui/src/widget/kinds/editbox.rs b/crates/benilla-ui/src/widget/kinds/editbox.rs
index 4028ba68..73ec3777 100644
--- a/crates/benilla-ui/src/widget/kinds/editbox.rs
+++ b/crates/benilla-ui/src/widget/kinds/editbox.rs
@@ -7,16 +7,23 @@ pub enum EditUnit {
     Char,
     /// One word run ([`EditBoxState::word_boundary`]): Ctrl/Option+arrow.
     Word,
-    /// Text start going back, text end going forward: Home/End, Cmd+arrow.
+    /// The caret's line, which ends at a newline: HOME/END (`0x77c980`/`0x77c9f0`), and
+    /// Cmd+Left/Right on a Mac.
+    Line,
+    /// Text start going back, text end going forward: Ctrl+HOME/END (`0x77ca60`/`0x77cac0`),
+    /// and Cmd+Up/Down on a Mac.
     Edge,
+    /// One wrapped row up or down: UP/DOWN in a multi-line box (`0x77cb20`). A single-line box
+    /// recalls its history instead (`0x77d030`/`0x77cfd0`), older going back.
+    Row,
 }
 
 /// One semantic editing operation for [`EditBoxState::apply`]: the host's per-OS keymap picks the
 /// action, the reference's edit-box law decides its effect. Clipboard operations stay host-side.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum EditAction {
-    /// Move the caret one `unit`; `extend` (Shift) drags the selection from its fixed anchor. The
-    /// alt-arrow gate (`0x77b18e`) acts upstream, on the key.
+    /// Move the caret one `unit`; `extend` (Shift) drags the selection by the reference's rule
+    /// ([`EditBoxState::extend_to`]). The alt-arrow gate (`0x77b18e`) acts upstream, on the key.
     Move {
         unit: EditUnit,
         back: bool,
@@ -24,12 +31,8 @@ pub enum EditAction {
     },
     /// Delete one `unit` from the caret, or the selection if any; `Edge` back is Cmd+Backspace.
     Delete { unit: EditUnit, back: bool },
-    /// Ctrl+A: select all, caret to the end (`HighlightText(0, -1)`).
+    /// Ctrl+A: select all (`HighlightText(0, -1)`), the caret left where it is.
     SelectAll,
-    /// Recall the next older submitted line (`historyLines`).
-    HistoryPrev,
-    /// Step back toward the newest line; past it, restore the stashed draft.
-    HistoryNext,
 }
 
 /// A `CSimpleEditBox`'s runtime state; `E+` offsets are from its `CScriptObject` `this`. Byte
@@ -38,9 +41,10 @@ pub enum EditAction {
 pub struct EditBoxState {
     /// The real text (`E+0x32c`); `password` masks only the display (`E+0x334`, `0x77d4d0`).
     pub text: String,
-    /// The caret, a byte offset into the text (`E+0x36c`, clamped to `[0, len]`).
+    /// The caret, a byte offset into the text (`E+0x36c`, clamped to `[0, len]`). It can sit
+    /// anywhere against the selection: `HighlightText` writes only the selection.
     pub cursor: usize,
-    /// Selection start (`E+0x35c`); equal to `sel_end` and the cursor when nothing is selected.
+    /// Selection start (`E+0x35c`); equal to `sel_end` when nothing is selected.
     pub sel_start: usize,
     /// Selection end (`E+0x360`); an insert replaces a non-empty selection first (`0x77cd70`).
     pub sel_end: usize,
@@ -69,8 +73,8 @@ pub struct EditBoxState {
     /// The caret texture (`E+0x368`, ctor `0x779c86`), a solid quad above the text. It paints
     /// nothing: the host draws the caret from `caret_shown`.
     pub caret_region: Option<RegionHandle>,
-    /// The submitted lines, oldest first. UP/DOWN recall and the restored draft are inferred: the
-    /// reference's history controller (`0x77b730`) is untraced.
+    /// The submitted lines, oldest first, which UP and DOWN recall in a single-line box
+    /// ([`Self::history_step`]).
     pub history: Vec<String>,
     /// `historyLines`, the most lines kept; 0 (the default) is no history.
     pub history_max: usize,
@@ -79,8 +83,15 @@ pub struct EditBoxState {
     pub history_pos: Option<usize>,
     /// The live line stashed when browsing starts, restored when DOWN walks past the newest entry.
     pub history_draft: Option<String>,
-    /// `SetTextInsets(l, r, t, b)`, applied as the text region's two corner anchors.
+    /// `SetTextInsets(l, r, t, b)` (`+0x3ec`, `+0x3f4`, `+0x3f0`, `+0x3e8`), which seat the text
+    /// region and pad a multi-line box's height.
     pub text_insets: [f32; 4],
+    /// One line's measured height in the text region's font (`0x7727b0(fs, 1)`), the height of an
+    /// empty multi-line box's text, with the measure key it was taken under.
+    pub line_height: Option<(u64, f32)>,
+    /// The box's rect when its resize was last checked, `ApplyRect`'s old rect (`0x76b580`);
+    /// `None` before its first resolve, which compares against the ctor's zero rect.
+    pub notified_rect: Option<crate::layout::Rect>,
     /// The host-measured width of `display[..i]` per byte `i`, a continuation byte repeating its
     /// lead's; hit-testing (`0x77d0d0`) and the scroll window read it. Empty until answered.
     pub advances: Vec<f32>,
@@ -91,9 +102,13 @@ pub struct EditBoxState {
     pub rows: Vec<usize>,
     /// The row pitch in pixels (the snapped font em), answered with the advances; 0 until then.
     pub cell_h: f32,
-    /// The `(row, x)` of the last `OnCursorChanged`, fired per change (`0x77da80`, dirty bit 2 at
-    /// `0x77d475`); `None` lets the first flush after focus fire with the caret at home.
-    pub cursor_fired: Option<(usize, f32)>,
+    /// The dirty word (`[E+0x31c]`) the box's flush (`0x77d3e0`) drains: [`Self::DIRTY_TEXT`] and
+    /// [`Self::DIRTY_CURSOR`]. The ctor sets bit 0 (`0x779a34`), so a box fires `OnTextChanged` at
+    /// its first flush once shown.
+    pub dirty: u8,
+    /// A multi-line relayout that found its text's measure pending, retried at each flush until it
+    /// lands; with no font engine installed the measure arrives from the host a tick later.
+    pub relayout_owed: bool,
     /// The first visible display byte of a single-line box (`E+0x348`), scrolled by whole chars
     /// to keep the caret in view; `0x77da80` hides a caret outside the window.
     pub scroll_start: usize,
@@ -103,7 +118,9 @@ pub struct EditBoxState {
     pub blink_period: f32,
     /// Blink accumulator (`E+0x374`): grows while focused; crossing the period toggles the caret.
     pub blink_accum: f32,
-    /// The caret shows this half-period; every cursor, text or selection change turns it on.
+    /// The caret shows this half-period. The flush's caret leg, which every caret move, edit and
+    /// focus change raises, turns it on in the focused box (`0x77de35`), off in others
+    /// (`0x77de51`).
     pub caret_shown: bool,
     /// The selection tint (`SetHighlightColor`), RGBA 0..1; the ctor default is `0xFF606060`.
     pub highlight_color: [f32; 4],
@@ -119,6 +136,14 @@ impl EditBoxState {
     pub const JUSTIFY_H_MASK: u32 = crate::justify::H_MASK;
     /// The vertical justify bits (3-5).
     pub const JUSTIFY_V_MASK: u32 = crate::justify::V_MASK;
+    /// Dirty bit 0, the text changed: every edit raises it, and the flush relayouts (`0x77d447`)
+    /// and fires `OnTextChanged` (`0x77d498`).
+    pub const DIRTY_TEXT: u8 = 1;
+    /// Dirty bit 2, the caret: the cursor setter (`0x77e380`), a step that moves it (`0x77c73b`),
+    /// an edit, a focus change and a re-seat of the text raise it, and the flush runs the caret
+    /// leg (`0x77d475` → `0x77da80`), which fires `OnCursorChanged`. Bit 1, the
+    /// highlight's (`0x77d950`), has no counterpart: the host paints the selection each frame.
+    pub const DIRTY_CURSOR: u8 = 4;
 
     /// A justify token's bit; `None` makes the caller raise the reference's
     /// `Usage: %s:SetJustifyH("justify")`.
@@ -160,11 +185,14 @@ impl Default for EditBoxState {
             history_pos: None,
             history_draft: None,
             text_insets: [0.0; 4],
+            line_height: None,
+            notified_rect: None,
             advances: Vec::new(),
             advances_key: 0,
             rows: vec![0],
             cell_h: 0.0,
-            cursor_fired: None,
+            dirty: Self::DIRTY_TEXT,
+            relayout_owed: false,
             scroll_start: 0,
             drag_active: false,
             blink_period: 0.5,
@@ -198,6 +226,14 @@ impl EditBoxState {
 
     /// One UP (`older`) or DOWN step, returning the text to show: the first UP stashes the draft,
     /// and DOWN past the newest entry restores it.
+    ///
+    /// Deviation: the history browses as a shell's does, a small everyday gain: the first UP
+    /// stashes the line being typed and DOWN past the newest line brings it back, UP holds at the
+    /// oldest, DOWN does nothing when not browsing, typing or a focus gain ends the browse, and an
+    /// empty line is not kept. The reference's history is a ring of `historyLines` slots that
+    /// keeps any line (`0x77cf40`); UP scans back for the previous filled slot, wrapping
+    /// (`0x77d030`), DOWN forward with `idiv` (`0x77cfd0`), each a `SetText` (`0x77be00`), with no
+    /// draft and no stop at either end.
     pub fn history_step(&mut self, older: bool) -> Option<String> {
         if self.history.is_empty() {
             return None;
@@ -380,7 +416,8 @@ impl EditBoxState {
         }
     }
 
-    /// Show the caret and restart its blink, as the client's dirty flush does on every change.
+    /// Show the caret and restart its blink, as the flush's caret leg does for the focused box
+    /// (`0x77dd68`, `0x77de35`); the glue fields, which have no flush, call it on each change.
     pub fn reset_blink(&mut self) {
         self.caret_shown = true;
         self.blink_accum = 0.0;
@@ -433,16 +470,19 @@ impl EditBoxState {
 pub struct EditOutcome {
     /// The text changed: `OnTextChanged`.
     pub text_changed: bool,
+    /// An insert went in, so `OnChar` fires (`0x77c13c`); a `numeric` abort that only deleted the
+    /// selection did not.
+    pub inserted: bool,
     /// Typed spaces inserted, one `OnSpacePressed` each; a paste reports none.
     pub spaces: usize,
 }
 
 impl EditOutcome {
-    /// An outcome with no typed spaces.
+    /// An outcome with nothing inserted.
     fn changed(text_changed: bool) -> Self {
         EditOutcome {
             text_changed,
-            spaces: 0,
+            ..EditOutcome::default()
         }
     }
 }
@@ -457,7 +497,11 @@ impl EditBoxState {
                     // it becomes an action (`UiScript::editbox_alt_arrow_mode`).
                     EditUnit::Char => self.move_by_char(!back, extend),
                     EditUnit::Word => self.move_by_word(!back, extend),
+                    EditUnit::Line => self.move_to_line_edge(!back, extend),
                     EditUnit::Edge => self.move_to_edge(!back, extend),
+                    EditUnit::Row if self.multi_line => self.move_by_row(!back, extend),
+                    // The caller recalls history through `SetText`, so `OnTextSet` fires.
+                    EditUnit::Row => {}
                 }
                 EditOutcome::default()
             }
@@ -471,36 +515,44 @@ impl EditBoxState {
                     let t = if back { 0 } else { self.text.len() };
                     self.delete_to(t)
                 }
+                // No keymap deletes by line or row.
+                EditUnit::Line | EditUnit::Row => false,
             }),
             EditAction::SelectAll => {
                 self.highlight_text(0, -1);
                 EditOutcome::default()
             }
-            // The caller recalls history through `SetText`, so `OnTextSet` fires.
-            EditAction::HistoryPrev | EditAction::HistoryNext => EditOutcome::default(),
         }
     }
 
-    /// Insert at the cursor (`0x77bee0`), replacing any selection; `numeric` refuses the whole
-    /// insert on any non-digit (`0x77bf41`).
+    /// Insert at the cursor (`0x77bee0`), in its order: the link guard, the selection's deletion
+    /// (`0x77bf13`–`0x77bf23`), then the `numeric` test (`0x77bf41`), which refuses the whole
+    /// insert on any non-digit and leaves the deletion standing.
     pub fn insert(&mut self, ins: &str) -> EditOutcome {
-        if self.numeric && !ins.chars().all(|c| c.is_ascii_digit()) {
-            return EditOutcome::default();
-        }
         // Typing with the caret inside a hyperlink, where only the mouse can put it, is
         // swallowed: the opening guard of `0x77bee0`.
         if !crate::markup::ClassMap::new(&self.text).insert_allowed(self.cursor) {
             return EditOutcome::default();
         }
-        self.end_history_browse();
+        let replaced = self.sel_start != self.sel_end;
         self.delete_selection();
+        if self.numeric && !ins.chars().all(|c| c.is_ascii_digit()) {
+            if replaced {
+                self.end_history_browse();
+                self.reset_blink();
+            }
+            return EditOutcome::changed(replaced);
+        }
+        self.end_history_browse();
         self.text.insert_str(self.cursor, ins);
         self.cursor += ins.len();
         self.collapse();
         self.enforce_caps();
         self.reset_blink();
+        self.dirty |= Self::DIRTY_TEXT | Self::DIRTY_CURSOR; // `0x77c033 or edx,5`
         EditOutcome {
             text_changed: true,
+            inserted: true,
             spaces: ins.matches(' ').count(),
         }
     }
@@ -537,6 +589,7 @@ impl EditBoxState {
         self.collapse();
         self.enforce_caps();
         self.reset_blink();
+        self.dirty |= Self::DIRTY_TEXT | Self::DIRTY_CURSOR;
         true
     }
 
@@ -565,7 +618,9 @@ impl EditBoxState {
         Some(taken)
     }
 
-    /// `HighlightText` (`0x77cca0`) with the client's clamp, so `(0, -1)` selects all.
+    /// `HighlightText` (`0x77cca0`) with the client's clamp, so `(0, -1)` selects all. It writes
+    /// only the selection (`+0x35c`/`+0x360`) and raises bit 1 (`0x77ccc8`): the caret stays put,
+    /// so no `OnCursorChanged` fires and the blink runs on.
     pub fn highlight_text(&mut self, start: i64, end: i64) {
         let len = self.text.len() as i64;
         let s = start.clamp(0, len);
@@ -575,8 +630,6 @@ impl EditBoxState {
         }
         self.sel_start = snap_down(&self.text, s as usize);
         self.sel_end = snap_down(&self.text, e as usize);
-        self.cursor = self.sel_end;
-        self.reset_blink();
     }
 
     /// Backspace (`forward = false`) or Delete: the selection if any, else one step.
@@ -627,58 +680,195 @@ impl EditBoxState {
         did
     }
 
-    /// Left or Right one step, `extend` dragging the selection; without it, a selection collapses
-    /// to its edge instead.
+    /// Left or Right one step, `extend` dragging the selection ([`Self::extend_to`]). Bit 2 and
+    /// the blink's restart come only when the caret moved: the helpers step it only while it can
+    /// (`0x77c750` `cursor < len`, `0x77c870` `cursor > 0`), and the step raises the bit
+    /// (`0x77c73b`), whose flush restarts the blink (`0x77dd68`).
     pub fn move_by_char(&mut self, right: bool, extend: bool) {
+        let from = self.cursor;
         // One token step, links atomic (`0x77bb30`, `atomicLinks = 1` at `0x77c6d2`): a press
         // crosses a whole link, never into an escape, and Shift+arrow selects all of it.
-        let step = |s: &str, i: usize| {
-            crate::markup::ClassMap::new(s).advance(i, if right { 1 } else { -1 }, true)
-        };
+        let target = crate::markup::ClassMap::new(&self.text).advance(
+            self.cursor,
+            if right { 1 } else { -1 },
+            true,
+        );
         if extend {
-            let anchor = self.selection_anchor();
-            self.cursor = step(&self.text, self.cursor);
-            self.set_span(anchor, self.cursor);
+            self.extend_to(target);
         } else if self.sel_start != self.sel_end {
+            // Deviation: a plain Left or Right with a selection collapses it to that edge, as
+            // every OS's own text fields do; the reference clears the selection and steps once
+            // from the caret (`0x77c6b0` from `0x77c70b`).
             self.cursor = if right { self.sel_end } else { self.sel_start };
             self.collapse();
         } else {
-            self.cursor = step(&self.text, self.cursor);
+            self.cursor = target;
             self.collapse();
         }
-        self.reset_blink();
+        if self.cursor != from {
+            self.reset_blink();
+            self.dirty |= Self::DIRTY_CURSOR;
+        }
     }
 
     /// Ctrl/Option+arrow: the caret to the [`word_boundary`](Self::word_boundary) by single atomic
     /// steps (`0x77c8c0`/`0x77c7a0` loop `0x77c6b0`), so it always lands on a reachable stop.
     pub fn move_by_word(&mut self, right: bool, extend: bool) {
         let word = self.word_boundary(right);
-        let mut target = self.cursor;
+        self.walk(right, extend, |_, _, next| {
+            if right {
+                next <= word
+            } else {
+                next >= word
+            }
+        });
+    }
+
+    /// HOME/END: the caret back to its line's start or on to its end, a step at a time while the
+    /// byte before the caret (`0x77c99a`), or at it (`0x77ca0e`), is not a newline. With no
+    /// newline it goes to the text's edge, as in a single-line box whose text was typed: typing
+    /// drops a newline there (`0x77c234`–`0x77c240`), though `SetText` keeps one.
+    pub fn move_to_line_edge(&mut self, end: bool, extend: bool) {
+        self.walk(end, extend, |text, at, _| {
+            let bytes = text.as_bytes();
+            if end {
+                bytes.get(at) != Some(&b'\n')
+            } else {
+                at > 0 && bytes[at - 1] != b'\n'
+            }
+        });
+    }
+
+    /// Ctrl+HOME/END and Cmd+Up/Down: the caret to `0` / `len`, a step at a time (`0x77ca60`,
+    /// `0x77cac0`).
+    pub fn move_to_edge(&mut self, end: bool, extend: bool) {
+        self.walk(end, extend, |_, _, _| true);
+    }
+
+    /// UP/DOWN in a multi-line box (`0x77cb20`, through `0x77cc80`/`0x77cc60`): the caret to the
+    /// same column of the wrapped row above or below. The column is the letters from the row's
+    /// start to the caret (`0x77bc80`), walked out from the target row's start with links not
+    /// atomic (`0x77bb30`, `atomicLinks = 0` pushed at `0x77cba4`). A walk that reaches the next
+    /// row's start steps back one stop (`0x77cbc6`–`0x77cbdd`). On the first or last row the caret
+    /// stays, and without `extend` the selection clears (`0x77cb50`). The rows are the draw's
+    /// ([`Self::rows`]), one while they are unmeasured.
+    ///
+    /// Deviation: on the last row a walk may end at the text's end, because the end starts no row;
+    /// the reference steps back from it as from a row's start (its line table ends with the
+    /// text's length, `0x77d6ef`), so DOWN onto a short last line stops before its last letter.
+    pub fn move_by_row(&mut self, down: bool, extend: bool) {
+        let len = self.text.len();
+        let display_len = self.display().len();
+        let measured = self.advances.len() == display_len + 1
+            && self.rows.first() == Some(&0)
+            && self.rows.windows(2).all(|w| w[0] < w[1])
+            && self.rows.last().is_some_and(|&r| r <= display_len);
+        // Each row's first text byte, then the text's length.
+        let mut starts: Vec<usize> = if measured {
+            self.rows
+                .iter()
+                .map(|&d| snap_down(&self.text, self.display_to_text(d)))
+                .collect()
+        } else {
+            vec![0]
+        };
+        let rows = starts.len();
+        starts.push(len);
+        // The caret's row (`0x77bd50`): a caret on a row's start heads that row.
+        let mut row = 0;
+        while row + 1 < rows && self.cursor >= starts[row + 1] {
+            row += 1;
+        }
+        let target = if down {
+            (row + 1).min(rows - 1)
+        } else {
+            row.saturating_sub(1)
+        };
+        if target == row {
+            if !extend {
+                self.collapse();
+            }
+            return;
+        }
+        let map = crate::markup::ClassMap::new(&self.text);
+        let column = map.letters(starts[row], self.cursor - starts[row]);
+        let (start, next) = (starts[target], starts[target + 1]);
+        let mut to = map.advance(start, column as isize, false);
+        if target + 1 < rows && next > start && to >= next {
+            to = map.advance(next, -1, false);
+        }
+        if extend {
+            self.extend_to(to);
+        } else {
+            self.cursor = to;
+            self.collapse();
+        }
+        self.reset_blink();
+        self.dirty |= Self::DIRTY_CURSOR; // `0x77cc40`
+    }
+
+    /// The loops of single steps behind the word, line and edge moves (`0x77c6b0`, links atomic):
+    /// the caret steps while `take(text, caret, next)` allows the step to `next`, each extending
+    /// step dragging the selection by [`Self::extend_to`]; a plain move collapses it at the end.
+    fn walk(&mut self, right: bool, extend: bool, take: impl Fn(&str, usize, usize) -> bool) {
+        let from = self.cursor;
+        let map = crate::markup::ClassMap::new(&self.text);
         loop {
-            let next = crate::markup::ClassMap::new(&self.text).advance(
-                target,
-                if right { 1 } else { -1 },
-                true,
-            );
-            if next == target || (right && next > word) || (!right && next < word) {
+            let next = map.advance(self.cursor, if right { 1 } else { -1 }, true);
+            if next == self.cursor || !take(&self.text, self.cursor, next) {
                 break;
             }
-            target = next;
-            if target == word {
-                break;
+            if extend {
+                self.extend_to(next);
+            } else {
+                self.cursor = next;
             }
         }
-        self.move_caret_to(target, extend);
+        if !extend {
+            self.collapse();
+        }
+        if self.cursor != from {
+            self.reset_blink();
+            self.dirty |= Self::DIRTY_CURSOR;
+        }
     }
 
-    /// HOME/END (and Cmd+arrow): the caret to `0` / `len`.
-    pub fn move_to_edge(&mut self, end: bool, extend: bool) {
-        let target = if end { self.text.len() } else { 0 };
-        self.move_caret_to(target, extend);
+    /// One extending caret move to `to`, the Shift leg of `0x77c6b0` and `0x77cb20`: an empty
+    /// selection first collapses onto the caret (`0x77ccf0`), then `0x77cd10` moves one edge by
+    /// the move's delta. A move left past `sel_start` moves `sel_start`, any other move left moves
+    /// `sel_end`, and a move right mirrors that, so a caret inside a selection trims it.
+    pub fn extend_to(&mut self, to: usize) {
+        if self.sel_start == self.sel_end {
+            self.collapse();
+        }
+        if to < self.cursor {
+            if to < self.sel_start {
+                self.sel_start = to;
+            } else {
+                self.sel_end = to;
+            }
+        } else if to > self.cursor {
+            if to > self.sel_end {
+                self.sel_end = to;
+            } else {
+                self.sel_start = to;
+            }
+        }
+        self.cursor = to;
     }
 
-    /// Place the caret at `target`, extending the selection from its anchor when `extend`.
+    /// Place the caret at `target`, extending the selection from its anchor when `extend`: the
+    /// click (`0x77b800`) and the drag (`0x77a860`). Bit 2 rises only when the caret moved; a
+    /// click raises it on its own.
+    ///
+    /// Deviation: the drag selects from its anchor, as every OS's own text fields do, where the
+    /// reference's applies `0x77cd10` to each mouse move's whole delta (`0x77a8a1`). The two part
+    /// in two cases. One move that carries the caret across the anchor keeps the far end selected
+    /// too in the reference. And a drag that starts with the caret inside a selection, as after a
+    /// focus that selects all, gives `(0, t)` here dragging right to `t`, where the reference
+    /// gives `(t, len)`.
     pub fn move_caret_to(&mut self, target: usize, extend: bool) {
+        let from = self.cursor;
         let target = snap_down(&self.text, target.min(self.text.len()));
         if extend {
             let anchor = self.selection_anchor();
@@ -689,6 +879,9 @@ impl EditBoxState {
             self.collapse();
         }
         self.reset_blink();
+        if self.cursor != from {
+            self.dirty |= Self::DIRTY_CURSOR;
+        }
     }
 
     fn delete_selection(&mut self) {
@@ -709,6 +902,7 @@ impl EditBoxState {
         self.cursor = span.start;
         self.text.replace_range(span, "");
         self.collapse();
+        self.dirty |= Self::DIRTY_TEXT | Self::DIRTY_CURSOR; // `0x77c683 or ecx,5`
     }
 
     /// Collapse the selection onto the caret (`0x77ccf0`), as every delete does and as a screen
@@ -819,3 +1013,7 @@ mod row_law_tests {
         assert_eq!(eb.index_at_pos(15.0, 500.0), 2);
     }
 }
+
+#[cfg(test)]
+#[path = "editbox_move_tests.rs"]
+mod move_law_tests;
diff --git a/crates/benilla-ui/src/widget/kinds/editbox_move_tests.rs b/crates/benilla-ui/src/widget/kinds/editbox_move_tests.rs
new file mode 100644
index 00000000..5fec7a2a
--- /dev/null
+++ b/crates/benilla-ui/src/widget/kinds/editbox_move_tests.rs
@@ -0,0 +1,261 @@
+//! The caret and selection law of [`EditBoxState`]: the row, line and edge moves, the Shift
+//! extension (`0x77cd10`), `HighlightText` (`0x77cca0`) and the `numeric` insert (`0x77bee0`).
+
+use super::*;
+
+/// A multi-line box holding `text`, measured at 7 px per byte with its rows at `rows`.
+fn multi_line(text: &str, rows: Vec<usize>) -> EditBoxState {
+    EditBoxState {
+        text: text.into(),
+        multi_line: true,
+        advances: (0..=text.len()).map(|i| i as f32 * 7.0).collect(),
+        rows,
+        cell_h: 14.0,
+        ..EditBoxState::default()
+    }
+}
+
+/// A single-line box holding `text` with the caret at `cursor` and nothing selected.
+fn at(text: &str, cursor: usize) -> EditBoxState {
+    let mut eb = EditBoxState {
+        text: text.into(),
+        cursor,
+        ..EditBoxState::default()
+    };
+    eb.collapse();
+    eb
+}
+
+fn mv(eb: &mut EditBoxState, unit: EditUnit, back: bool, extend: bool) {
+    eb.apply(EditAction::Move { unit, back, extend });
+}
+
+/// UP/DOWN keep the caret's letter column across rows (`0x77bc80` then `0x77bb30`), and a walk
+/// that reaches the next row's start steps back one (`0x77cbc6`–`0x77cbdd`), before the newline
+/// that ends a row. On the last row it may end at the text's end (the declared deviation).
+#[test]
+fn up_and_down_keep_the_letter_column_across_rows() {
+    // "abc\n" | "defgh\n" | "ij"
+    let mut eb = multi_line("abc\ndefgh\nij", vec![0, 4, 10]);
+    eb.cursor = 8; // "defg|h"
+    eb.collapse();
+    mv(&mut eb, EditUnit::Row, true, false);
+    assert_eq!(
+        eb.cursor, 3,
+        "column 4 is past \"abc\": held before its newline"
+    );
+    mv(&mut eb, EditUnit::Row, false, false);
+    assert_eq!(eb.cursor, 7, "column 3 on the middle row");
+    mv(&mut eb, EditUnit::Row, false, false);
+    assert_eq!(eb.cursor, 12, "column 3 on \"ij\": the text's end");
+    assert_eq!(
+        eb.dirty & EditBoxState::DIRTY_CURSOR,
+        EditBoxState::DIRTY_CURSOR
+    );
+}
+
+/// A soft-wrapped row is a row: its swallowed space belongs to it, so a column past its letters
+/// holds before that space.
+#[test]
+fn a_wrapped_row_is_a_row() {
+    // "ab " | "cdefgh", wrapped after "ab" with the space swallowed.
+    let mut eb = multi_line("ab cdefgh", vec![0, 3]);
+    eb.cursor = 9;
+    eb.collapse();
+    mv(&mut eb, EditUnit::Row, true, false);
+    assert_eq!(
+        eb.cursor, 2,
+        "column 6 is past \"ab\": held before the space"
+    );
+    mv(&mut eb, EditUnit::Row, false, false);
+    assert_eq!(eb.cursor, 5, "column 2 below");
+    mv(&mut eb, EditUnit::Row, true, false);
+    assert_eq!(eb.cursor, 2);
+}
+
+/// A trailing newline opens a row of its own (`0x5c250b`–`0x5c2522`), empty and starting at the
+/// text's end: DOWN reaches it, and UP leaves it for column 0 above.
+#[test]
+fn a_trailing_newline_is_a_row_of_its_own() {
+    let mut eb = multi_line("ab\n", vec![0, 3]);
+    eb.cursor = 2;
+    eb.collapse();
+    mv(&mut eb, EditUnit::Row, false, false);
+    assert_eq!(eb.cursor, 3);
+    mv(&mut eb, EditUnit::Row, true, false);
+    assert_eq!(eb.cursor, 0);
+}
+
+/// On the first or last row the caret stays, and a plain UP or DOWN clears the selection there
+/// (`0x77cb50`–`0x77cb8f`) without raising the caret bit.
+#[test]
+fn up_on_the_first_row_moves_nothing_and_clears_the_selection() {
+    let mut eb = multi_line("abc\ndef", vec![0, 4]);
+    eb.cursor = 2;
+    eb.highlight_text(0, 3);
+    eb.dirty = 0;
+    mv(&mut eb, EditUnit::Row, true, true);
+    assert_eq!(
+        (eb.cursor, eb.sel_start, eb.sel_end),
+        (2, 0, 3),
+        "Shift keeps it"
+    );
+    mv(&mut eb, EditUnit::Row, true, false);
+    assert_eq!(eb.cursor, 2);
+    assert_eq!(eb.sel_start, eb.sel_end, "the selection cleared");
+    assert_eq!(
+        eb.dirty & EditBoxState::DIRTY_CURSOR,
+        0,
+        "the caret did not move"
+    );
+}
+
+/// Shift+DOWN extends by the row's whole delta through `0x77cd10`.
+#[test]
+fn shift_down_selects_to_the_same_column_below() {
+    let mut eb = multi_line("abc\ndef", vec![0, 4]);
+    eb.cursor = 1;
+    eb.collapse();
+    mv(&mut eb, EditUnit::Row, false, true);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (5, 1, 5));
+    mv(&mut eb, EditUnit::Row, true, true);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (1, 1, 1));
+}
+
+/// A single-line box's UP and DOWN are its history's, which the caller recalls; the caret stays.
+#[test]
+fn a_single_line_box_has_no_rows_to_move_over() {
+    let mut eb = at("abc", 1);
+    mv(&mut eb, EditUnit::Row, false, false);
+    assert_eq!(eb.cursor, 1);
+}
+
+/// HOME and END stop at a newline (`0x77c99a`, `0x77ca0e`); the text's edges are Ctrl+HOME and
+/// Ctrl+END (`0x77ca60`, `0x77cac0`).
+#[test]
+fn home_and_end_stop_at_the_lines_newlines() {
+    let mut eb = multi_line("ab\ncd\nef", vec![0, 3, 6]);
+    eb.cursor = 4; // "c|d"
+    eb.collapse();
+    mv(&mut eb, EditUnit::Line, true, false);
+    assert_eq!(eb.cursor, 3, "HOME: after the newline before it");
+    mv(&mut eb, EditUnit::Line, true, false);
+    assert_eq!(eb.cursor, 3, "HOME again stays");
+    mv(&mut eb, EditUnit::Line, false, true);
+    assert_eq!(
+        (eb.cursor, eb.sel_start, eb.sel_end),
+        (5, 3, 5),
+        "Shift+END"
+    );
+    mv(&mut eb, EditUnit::Edge, true, false);
+    assert_eq!(
+        (eb.cursor, eb.sel_start, eb.sel_end),
+        (0, 0, 0),
+        "Ctrl+HOME"
+    );
+    mv(&mut eb, EditUnit::Edge, false, false);
+    assert_eq!(eb.cursor, 8, "Ctrl+END");
+    // A line is not a wrapped row: with no newline, HOME goes to the text's start.
+    let mut eb = multi_line("the quick brown", vec![0, 10]);
+    eb.cursor = 13;
+    eb.collapse();
+    mv(&mut eb, EditUnit::Line, true, false);
+    assert_eq!(eb.cursor, 0);
+}
+
+/// `HighlightText` writes only the selection (`0x77cca0`): the caret stays put and its bit stays
+/// down, so neither the blink nor `OnCursorChanged` hears of it.
+#[test]
+fn highlight_text_leaves_the_caret_where_it_is() {
+    let mut eb = at("hello world", 3);
+    eb.dirty = 0;
+    eb.caret_shown = false;
+    eb.highlight_text(0, -1);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (3, 0, 11));
+    assert_eq!(eb.dirty & EditBoxState::DIRTY_CURSOR, 0);
+    assert!(!eb.caret_shown, "the blink runs on");
+    eb.apply(EditAction::SelectAll);
+    assert_eq!(eb.cursor, 3, "Ctrl+A is the same call");
+}
+
+/// Shift+arrow moves one selection edge by the step (`0x77cd10`): from a caret inside a select-all,
+/// Shift+Right trims the start up to the caret and Shift+Left trims the end down to it.
+#[test]
+fn shift_arrow_from_inside_a_selection_trims_it_toward_the_caret() {
+    let mut eb = at("hello world", 5);
+    eb.highlight_text(0, -1);
+    mv(&mut eb, EditUnit::Char, false, true);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (6, 6, 11));
+    let mut eb = at("hello world", 5);
+    eb.highlight_text(0, -1);
+    mv(&mut eb, EditUnit::Char, true, true);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (4, 0, 4));
+    // Back at the selection's end, Shift+Right extends it again.
+    mv(&mut eb, EditUnit::Char, false, true);
+    assert_eq!((eb.sel_start, eb.sel_end), (0, 5));
+}
+
+/// The word, line and edge moves are loops of single steps (`0x77c6b0`), each extending through
+/// `0x77cd10`: from inside a selection, Shift+END trims it to nothing at its end, then selects on
+/// from there.
+#[test]
+fn a_multi_step_shift_move_extends_step_by_step() {
+    let mut eb = at("0123456789", 5);
+    eb.highlight_text(2, 8);
+    mv(&mut eb, EditUnit::Line, false, true);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (10, 8, 10));
+}
+
+/// Left at the text's start does not step (`0x77c870` tests `cursor > 0`), so neither the caret
+/// bit nor the blink's restart comes; a real step brings both.
+#[test]
+fn a_char_move_that_goes_nowhere_leaves_the_blink() {
+    let mut eb = at("ab", 0);
+    eb.dirty = 0;
+    eb.caret_shown = false;
+    eb.blink_accum = 0.3;
+    mv(&mut eb, EditUnit::Char, true, false);
+    assert_eq!((eb.cursor, eb.dirty, eb.caret_shown), (0, 0, false));
+    assert_eq!(eb.blink_accum, 0.3);
+    mv(&mut eb, EditUnit::Char, false, false);
+    assert_eq!(eb.cursor, 1);
+    assert_eq!(eb.dirty, EditBoxState::DIRTY_CURSOR);
+    assert!(eb.caret_shown && eb.blink_accum == 0.0);
+}
+
+/// A plain Left or Right with a selection collapses it to that edge (the declared deviation).
+#[test]
+fn a_plain_arrow_collapses_a_selection_to_its_edge() {
+    let mut eb = at("hello world", 5);
+    eb.highlight_text(2, 8);
+    mv(&mut eb, EditUnit::Char, false, false);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (8, 8, 8));
+    let mut eb = at("hello world", 5);
+    eb.highlight_text(2, 8);
+    mv(&mut eb, EditUnit::Char, true, false);
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (2, 2, 2));
+}
+
+/// `Insert` deletes the selection before the `numeric` test refuses a non-digit (`0x77bf13`, then
+/// `0x77bf41`): the text changes, though nothing went in.
+#[test]
+fn a_non_digit_over_a_numeric_selection_deletes_it() {
+    let mut eb = EditBoxState {
+        numeric: true,
+        ..at("1234", 4)
+    };
+    eb.highlight_text(1, 3);
+    eb.dirty = 0;
+    let out = eb.insert("a");
+    assert_eq!(eb.text, "14");
+    assert_eq!((eb.cursor, eb.sel_start, eb.sel_end), (1, 1, 1));
+    assert!(out.text_changed && !out.inserted, "{out:?}");
+    assert_eq!(
+        eb.dirty & EditBoxState::DIRTY_TEXT,
+        EditBoxState::DIRTY_TEXT
+    );
+    // With nothing selected the refusal changes nothing.
+    eb.dirty = 0;
+    assert_eq!(eb.insert("b"), EditOutcome::default());
+    assert_eq!((eb.text.as_str(), eb.dirty), ("14", 0));
+}
diff --git a/crates/benilla-ui/src/widget/kinds/mod.rs b/crates/benilla-ui/src/widget/kinds/mod.rs
index f94deefd..b30fab67 100644
--- a/crates/benilla-ui/src/widget/kinds/mod.rs
+++ b/crates/benilla-ui/src/widget/kinds/mod.rs
@@ -189,8 +189,10 @@ pub struct TooltipState {
     pub min_width: f32,
     /// `FadeOut()`'s start on the `GetTime` clock; any fresh content or `Show` cancels the fade.
     pub fade_start: Option<f64>,
-    /// The unit this tooltip shows; a `set_unit` push for it re-drives the health bar.
-    pub unit_token: Option<String>,
+    /// The guid of the unit this tooltip shows (`+0x368`/`+0x36c`, stored at `0x52a070`), whose
+    /// health watcher (`0x467e70`, registered at `0x52a0a8`) drives the bar; a `set_unit` push of
+    /// that unit, under any token, re-drives it.
+    pub unit_guid: Option<u64>,
     /// Shows world-hover content, which fades when the hover is lost; a window hover never fades.
     pub world_owned: bool,
     /// Armed for a compare render: the next `SetInventoryItem` prepends "Currently Equipped"
diff --git a/crates/benilla-ui/src/widget/mod.rs b/crates/benilla-ui/src/widget/mod.rs
index 3784f93a..a0126481 100644
--- a/crates/benilla-ui/src/widget/mod.rs
+++ b/crates/benilla-ui/src/widget/mod.rs
@@ -218,7 +218,8 @@ pub struct Region {
     pub kind: RegionKind,
     pub owner: FrameHandle,
     pub draw_layer: DrawLayer,
-    /// A later client's `textureSubLevel`; 1.12 has no sub-level (`0x76a860`).
+    /// The engine's own order within a layer, which only the EditBox caret sets, to draw over the
+    /// text; 1.12 gives Lua and XML no sub-level (`0x76a860`, `0x79a780`).
     pub sub_level: i8,
     /// The index within the owner frame, the last within-layer draw tiebreak.
     pub decl_seq: u32,
@@ -248,6 +249,9 @@ pub struct WidgetArena {
     tooltip_kinds: Vec<FrameHandle>,
     /// The live Minimaps, kept the same way, for the containment, zoom and arrow-facing feeds.
     minimap_kinds: Vec<FrameHandle>,
+    /// The live EditBoxes, kept the same way, for the resize re-seat (`reseat_resized`) and the
+    /// tick's walk, which flushes every shown box.
+    editbox_kinds: Vec<FrameHandle>,
 }
 
 impl Default for WidgetArena {
@@ -290,6 +294,7 @@ impl WidgetArena {
             ticked_kinds: Vec::new(),
             tooltip_kinds: Vec::new(),
             minimap_kinds: Vec::new(),
+            editbox_kinds: Vec::new(),
         }
     }
 
@@ -311,6 +316,10 @@ impl WidgetArena {
         &self.minimap_kinds
     }
 
+    pub fn editbox_kinds(&self) -> &[FrameHandle] {
+        &self.editbox_kinds
+    }
+
     // ── Read access ────────────────────────────────────────────────────────────────────────────
 
     pub fn frame(&self, h: FrameHandle) -> Option<&Frame> {
@@ -498,6 +507,7 @@ impl WidgetArena {
             self.names.entry(n).or_insert(handle);
         }
         if matches!(kind, FrameKind::EditBox) {
+            self.editbox_kinds.push(handle);
             self.build_editbox_engine_regions(handle);
         }
         if matches!(kind, FrameKind::Minimap) {
@@ -555,6 +565,7 @@ impl WidgetArena {
         self.ticked_kinds.retain(|&t| t != h);
         self.tooltip_kinds.retain(|&t| t != h);
         self.minimap_kinds.retain(|&t| t != h);
+        self.editbox_kinds.retain(|&t| t != h);
 
         for c in children {
             self.destroy(c);
diff --git a/crates/benilla-world/src/build_id.rs b/crates/benilla-world/src/build_id.rs
index 03857dd4..c9438779 100644
--- a/crates/benilla-world/src/build_id.rs
+++ b/crates/benilla-world/src/build_id.rs
@@ -1,13 +1,15 @@
 //! Which build is running: the release and the commit the binary was built from, stamped at
 //! compile time by the launcher shims' build script (`benilla-buildstamp`) and passed to `run` as
-//! the [`BuildId`] resource. It shows in the startup log line ([`banner`]), in crash reports and in
-//! the debug panel's footer.
+//! the [`BuildId`] resource, and whether a crate on top of benilla extended it. It shows in the
+//! startup log line ([`banner`]), in crash reports and in the debug panel's footer. A dev build's
+//! stamp also names the launcher's project folder, which the entry point hands to
+//! `benilla_formats::set_project_folder`.
 
 use bevy::prelude::*;
 
 /// The launcher shim's compile-time stamp. The git fields are empty when the build had no
 /// checkout or no `git` on `PATH`, which [`BuildId::summary`] reports as an unknown commit.
-#[derive(Resource, Clone, Copy)]
+#[derive(Resource, Clone, Copy, Default)]
 pub struct BuildId {
     /// The workspace version from `Cargo.toml`, which every release bumps.
     pub version: &'static str,
@@ -22,6 +24,12 @@ pub struct BuildId {
     pub date: &'static str,
     /// The cargo profile directory: `debug`, `release` or `ship`.
     pub profile: &'static str,
+    /// The launcher's project folder in a dev build, where its `WoW` link, `benilla-config/` and
+    /// `.probe-identity` live; empty in a player build, which carries no source path.
+    pub project_dir: &'static str,
+    /// Whether a crate on top of benilla added plugins through `benilla_app::run_with`. The entry
+    /// point sets it, so a launcher leaves it to `..Default::default()`.
+    pub extended: bool,
 }
 
 impl BuildId {
@@ -35,9 +43,10 @@ impl BuildId {
         }
     }
 
-    /// The one-line build id: release, short sha, commit date and profile.
+    /// The one-line build id: release, short sha, commit date and profile, then `extended` when a
+    /// crate on top added plugins, so a report from that client reads apart from stock.
     pub fn summary(&self) -> String {
-        if self.short.is_empty() {
+        let stamp = if self.short.is_empty() {
             format!(
                 "{} · unknown commit (built without a git checkout) · {}",
                 self.release(),
@@ -51,6 +60,11 @@ impl BuildId {
                 self.date,
                 self.profile
             )
+        };
+        if self.extended {
+            stamp + " · extended"
+        } else {
+            stamp
         }
     }
 }
@@ -82,6 +96,8 @@ mod tests {
             short,
             date: "2026-09-27",
             profile: "release",
+            project_dir: "",
+            extended: false,
         }
     }
 
@@ -127,4 +143,26 @@ mod tests {
             "0.2.0 · unknown commit (built without a git checkout) · release"
         );
     }
+
+    #[test]
+    fn an_extended_client_says_so_and_stock_reads_as_before() {
+        let stock = build("0.2.0", "v0.2.0-12-gb17be27", "b17be27");
+        assert_eq!(stock.summary(), "0.2.0+12 · b17be27 · 2026-09-27 · release");
+        assert_eq!(
+            BuildId {
+                extended: true,
+                ..stock
+            }
+            .summary(),
+            "0.2.0+12 · b17be27 · 2026-09-27 · release · extended"
+        );
+        assert_eq!(
+            BuildId {
+                extended: true,
+                ..build("0.2.0", "", "")
+            }
+            .summary(),
+            "0.2.0 · unknown commit (built without a git checkout) · release · extended"
+        );
+    }
 }
diff --git a/crates/benilla-world/src/doodad_anim/mod.rs b/crates/benilla-world/src/doodad_anim/mod.rs
index 2a99734c..c90b5ded 100644
--- a/crates/benilla-world/src/doodad_anim/mod.rs
+++ b/crates/benilla-world/src/doodad_anim/mod.rs
@@ -342,6 +342,17 @@ fn gate_doodad_anim(
         !tf.is_changed() && !proj.is_changed() && !local.as_ref().is_some_and(|l| l.is_changed())
     }) && !scene.changed()
         && changed_vis.is_empty();
+    // Fixed at spawn (`EmitterFade`), so a reused verdict never sees the sphere move.
+    let in_frustum = |frustum: &bevy::camera::primitives::Frustum,
+                      fade: &crate::particles::EmitterFade| {
+        frustum.intersects_sphere(
+            &bevy::camera::primitives::Sphere {
+                center: fade.center.into(),
+                radius: fade.radius,
+            },
+            false,
+        )
+    };
     for (entity, mut host, lazy, pose, has_rig, player, drive) in &mut hosts {
         // A host born this frame has no verdict to reuse (`active` starts false).
         let drawn = if verdicts_still && !host.is_added() {
@@ -355,21 +366,21 @@ fn gate_doodad_anim(
                     cam_tf.translation(),
                     Vec3::from(cam_tf.forward()),
                     farclip,
-                    frustum.intersects_sphere(
-                        &bevy::camera::primitives::Sphere {
-                            center: fade.center.into(),
-                            radius: fade.radius,
-                        },
-                        false,
-                    ),
+                    in_frustum(frustum, fade),
                     fade.exterior_admitted(&exterior_gate, camera_instance),
                     scene.room_admits(fade),
                 )
             })
         } else {
+            // Meshed: the fade and cull authorities' `Hidden` carries their verdicts, and the
+            // frustum term is the one Bevy's culling (`ViewVisibility`) never writes here; the
+            // reference animates only the worklist, which passes the 6-plane test (`0x683700`).
             host.meshes
                 .iter()
                 .any(|&e| vis.get(e).is_ok_and(|v| *v != Visibility::Hidden))
+                && world_cam
+                    .as_ref()
+                    .is_none_or(|(_, frustum, _, _)| in_frustum(frustum, &host.fade))
         };
         // The lazy-rig promote, retried every frame the host stays drawn so a full table is only
         // a delay. It needs a second drawn frame (`host.active`): on its first, a spawned part's
@@ -1111,6 +1122,65 @@ mod tests {
         assert!(active(&app), "the snap frame re-judges the host: drawn");
     }
 
+    /// Bevy's frustum culling writes `ViewVisibility` only, so a meshed doodad off-screen keeps an
+    /// `Inherited` part; the gate judges its fade sphere against the frustum like a meshless one.
+    #[test]
+    fn a_meshed_host_outside_the_frustum_is_parked() {
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, AssetPlugin::default()));
+        app.init_resource::<crate::view::ViewDistance>();
+        app.init_resource::<crate::wmo_portal::ExteriorWindows>();
+        app.init_resource::<crate::wmo_portal::CameraInteriorClaim>();
+        app.init_resource::<crate::rig_palette::RigPalettes>();
+        app.init_asset::<SkinnedMeshInverseBindposes>();
+        app.add_systems(Update, gate_doodad_anim);
+
+        // Looking down -Z from the origin.
+        let seat =
+            Transform::from_xyz(0.0, 0.0, 0.0).looking_at(Vec3::new(0.0, 0.0, -20.0), Vec3::Y);
+        let projection = bevy::camera::Projection::from(bevy::camera::PerspectiveProjection {
+            far: 5000.0,
+            ..default()
+        });
+        let frustum = bevy::camera::primitives::Frustum::from_clip_from_world(
+            &(projection.get_clip_from_view() * GlobalTransform::from(seat).affine().inverse()),
+        );
+        app.world_mut().spawn((
+            crate::view::WorldCamera,
+            GlobalTransform::from(seat),
+            seat,
+            frustum,
+            projection,
+        ));
+        let mut meshed = |center: Vec3| {
+            let mesh = app.world_mut().spawn(Visibility::Inherited).id();
+            app.world_mut()
+                .spawn(DoodadAnimHost {
+                    meshes: vec![mesh],
+                    fade: crate::particles::EmitterFade::sphere(2.0, center),
+                    clip: Some((AnimationNodeIndex::new(1), 2.0)),
+                    armed_at: 0.0,
+                    window_hi: f32::INFINITY,
+                    anim_id: Some(0),
+                    active: true,
+                    parked_at: 0.0,
+                })
+                .id()
+        };
+        let behind = meshed(Vec3::new(0.0, 0.0, 30.0));
+        let ahead = meshed(Vec3::new(0.0, 0.0, -30.0));
+        app.update();
+        let world = app.world();
+        assert!(
+            world.entity(behind).contains::<AnimParked>(),
+            "behind the camera ⇒ outside the frustum ⇒ parked, whatever its part's Visibility"
+        );
+        assert!(
+            !world.entity(ahead).contains::<AnimParked>(),
+            "in front of the camera ⇒ drawn"
+        );
+    }
+
     #[test]
     fn arm_clock_wraps_on_the_shared_clock() {
         let mut host = DoodadAnimHost {
diff --git a/crates/benilla-world/src/ffx_glow.rs b/crates/benilla-world/src/ffx_glow.rs
index 9cd244b5..50803870 100644
--- a/crates/benilla-world/src/ffx_glow.rs
+++ b/crates/benilla-world/src/ffx_glow.rs
@@ -109,6 +109,40 @@ pub struct FfxGlowGain(pub f32);
 #[derive(Resource, Clone, Default, ExtractResource)]
 pub struct FfxDeathFade(pub f32);
 
+/// The three switches the reference's FFX pass reads every frame, as the `ffx`, `ffxGlow` and
+/// `ffxDeath` CVars' integers (each registered "1" with the echo stub `0x6cde30`, so nothing is
+/// cached). The begin/end pair (`0x6cd890`/`0x6cda70`) runs the active pass only while `ffx`
+/// (`[0xce8a04]`, `0x6cd8a6`/`0x6cda76`) is on and the pass's own enable (vtable `+4`) says so:
+/// `CFFXGlow` (`0x6cc5a0`) reads `ffxGlow` (`0x6cc5a8`), `CFFXDeath` (`0x6cded0`) reads `ffxDeath`
+/// (`0x6cdf10`). A pass that does not run is not replaced by the other one: the slot holds one.
+#[derive(Resource, Clone, Copy, PartialEq, Eq, Debug, ExtractResource)]
+pub struct FfxSwitches {
+    /// `ffx`, the master.
+    pub master: bool,
+    /// `ffxGlow`: the glow pass, the drunk and underwater haze and the underwater warp with it.
+    pub glow: bool,
+    /// `ffxDeath`: the ghost's death pass.
+    pub death: bool,
+}
+
+impl Default for FfxSwitches {
+    /// Each registers "1".
+    fn default() -> Self {
+        Self {
+            master: true,
+            glow: true,
+            death: true,
+        }
+    }
+}
+
+impl FfxSwitches {
+    /// Whether the pass the slot holds runs: the death pass while a ghost, else the glow pass.
+    fn runs(self, death_pass: bool) -> bool {
+        self.master && if death_pass { self.death } else { self.glow }
+    }
+}
+
 /// The glue screens' FFX state. The select build's tail (`0x472fba`–`0x473007`) forks on the
 /// selected record's `CHARSELECT+0xfc & 0x2000` (`0x472fd9`), installs (`0x6cde60`) the glue
 /// death or glow pass and pins `LightParams.glow` (`[0x6d48b0()+0x110]`) to a constant: both
@@ -254,10 +288,11 @@ fn sync_wave(
 }
 
 /// Whether a view draws the warped combine: the WorldFrame pair (the glue pair reaches the same
-/// render, but the guard's in-world half `0x467d00` never trips there), [`FfxWave::active`], and
-/// no ghost, whose `CFFXDeath::Render` (`0x6cdf20`) has one list and no guard.
-fn wave_armed(state: FfxState, wave: FfxWave, death: f32) -> bool {
-    matches!(state, FfxState::Player) && wave.active && death == 0.0
+/// render, but the guard's in-world half `0x467d00` never trips there), [`FfxWave::active`], no
+/// ghost, whose `CFFXDeath::Render` (`0x6cdf20`) has one list and no guard, and a glow pass that
+/// runs ([`FfxSwitches`]).
+fn wave_armed(state: FfxState, wave: FfxWave, world: FfxPassState) -> bool {
+    matches!(state, FfxState::Player) && wave.active && world.death == 0.0 && world.runs
 }
 
 /// [`FfxGlowGain`]: the zone's `LightParams.glow` in world (its default 0.5 while no lighting
@@ -704,6 +739,8 @@ fn dither_armed(cvar: bool) -> f32 {
 
 /// One view's combine uniform: the zone glow × [`FfxGlow::gain_scale`], the death gate and haze of
 /// its pass pair, the dither arm, then the wave phases, written every frame so the clock runs free.
+/// A pair whose pass is switched off ([`FfxSwitches`]) leaves the scene as it was drawn: no glow,
+/// no haze, no death combine, only the decode.
 fn combine_uniform(
     zone_gain: f32,
     world: FfxPassState,
@@ -716,8 +753,13 @@ fn combine_uniform(
         FfxState::Glue => glue,
         FfxState::None => FfxPassState::INERT,
     };
+    let (gain, feed) = if feed.runs {
+        (zone_gain * glow.gain_scale, feed)
+    } else {
+        (0.0, FfxPassState::INERT)
+    };
     [
-        zone_gain * glow.gain_scale,
+        gain,
         feed.death,
         feed.haze,
         0.0, // MONKEY (p0 skyDither): the dither arm, set by `live_combine` from [`SkyDither`]
@@ -728,28 +770,48 @@ fn combine_uniform(
     ]
 }
 
-/// One pass pair's live death gate and haze mix.
+/// One pass pair's live death gate and haze mix, and whether the pass its slot holds runs.
 #[derive(Clone, Copy)]
 struct FfxPassState {
     death: f32,
     haze: f32,
+    runs: bool,
 }
 
 impl FfxPassState {
     fn world(death: f32, haze: f32) -> Self {
-        Self { death, haze }
+        Self {
+            death,
+            haze,
+            runs: true,
+        }
     }
 
     /// Death only: the reference packs the haze into `primary.z` of the glow combine (`0x6cb020`)
     /// from the in-world player's state, which a glue screen does not have.
     fn glue(death: f32) -> Self {
-        Self { death, haze: 0.0 }
+        Self {
+            death,
+            haze: 0.0,
+            runs: true,
+        }
+    }
+
+    /// The pair under the three switches: the glue pair is built by the same constructors
+    /// (`0x46a723`/`0x46a752`) and reads the same records, and its paint calls the same begin
+    /// (`0x46fad3`).
+    fn switched(self, switches: FfxSwitches) -> Self {
+        Self {
+            runs: switches.runs(self.death > 0.0),
+            ..self
+        }
     }
 
     /// What a view running neither pair reads: a bake.
     const INERT: Self = Self {
         death: 0.0,
         haze: 0.0,
+        runs: true,
     };
 }
 
@@ -799,10 +861,9 @@ impl ViewNode for FfxGlowNode {
         let render_device = render_context.render_device().clone();
         let diagnostics = render_context.diagnostic_recorder();
 
-        // The combines read the blur only through `w` (`x`) and the haze (`z`); with both zero the
-        // filter passes are skipped, and the stale, finite ¼-res target is multiplied by zero.
-        let blur_read = uniform[0] != 0.0 || uniform[2] != 0.0;
-        if blur_read {
+        // With both zero the filter passes are skipped, and the stale, finite ¼-res target is
+        // multiplied by zero.
+        if blur_read(&uniform) {
             let layout_filter = pipeline_cache.get_bind_group_layout(&pipelines.layout_filter);
             // Per frame: a `Write` view flips its main texture per call ([`FfxGlowTextures`]).
             let down_bind = render_device.create_bind_group(
@@ -902,21 +963,32 @@ impl ViewNode for FfxGlowNode {
     }
 }
 
+/// Whether a combine reads the blur: only through `w` (`x`) and the haze (`z`), so with both zero
+/// the three filter passes (Box4, Gauss4 H and V) do not run.
+fn blur_read(uniform: &[f32; 8]) -> bool {
+    uniform[0] != 0.0 || uniform[2] != 0.0
+}
+
 /// One view's combine uniform and whether its underwater entry is armed, for both combine nodes.
 fn live_combine(world: &World, glow: &FfxGlow) -> ([f32; 8], bool) {
-    let death = world.resource::<FfxDeathFade>().0;
+    let switches = *world.resource::<FfxSwitches>();
     let wave = *world.resource::<FfxWave>();
+    let player = FfxPassState::world(
+        world.resource::<FfxDeathFade>().0,
+        world.resource::<FfxHazeMix>().0,
+    )
+    .switched(switches);
     let uniform = combine_uniform(
         world.resource::<FfxGlowGain>().0,
-        FfxPassState::world(death, world.resource::<FfxHazeMix>().0),
-        FfxPassState::glue(world.resource::<GlueFfx>().death()),
+        player,
+        FfxPassState::glue(world.resource::<GlueFfx>().death()).switched(switches),
         glow,
         wave,
     );
     // MONKEY (p0 skyDither): the dither lane, from the cvar (or the old env switch).
     let mut uniform = uniform;
     uniform[3] = dither_armed(world.get_resource::<SkyDither>().is_some_and(|d| d.0));
-    (uniform, wave_armed(glow.state, wave, death))
+    (uniform, wave_armed(glow.state, wave, player))
 }
 
 /// The render-world views an [`FfxBackdrop`] claims this frame; a claimed view has no combine.
@@ -1102,6 +1174,7 @@ impl Plugin for FfxGlowPlugin {
             .init_resource::<FfxWave>()
             // MONKEY (p0 skyDither)
             .init_resource::<SkyDither>()
+            .init_resource::<FfxSwitches>()
             .add_plugins((
                 ExtractComponentPlugin::<FfxGlow>::default(),
                 ExtractComponentPlugin::<FfxBackdrop>::default(),
@@ -1111,6 +1184,7 @@ impl Plugin for FfxGlowPlugin {
                 ExtractResourcePlugin::<FfxHazeMix>::default(),
                 ExtractResourcePlugin::<FfxWave>::default(),
                 ExtractResourcePlugin::<SkyDither>::default(),
+                ExtractResourcePlugin::<FfxSwitches>::default(),
             ))
             .add_systems(
                 Update,
@@ -1165,6 +1239,10 @@ mod tests {
     fn living_glue() -> FfxPassState {
         FfxPassState::glue(0.0)
     }
+    /// The world pair, live: alive, sober and dry.
+    fn alive() -> FfxPassState {
+        FfxPassState::world(0.0, 0.0)
+    }
 
     /// Checked as one table, so a new preset cannot quietly join the wrong side.
     #[test]
@@ -1314,27 +1392,139 @@ mod tests {
         };
         let dry = FfxWave::default();
         assert!(
-            wave_armed(FfxState::Player, wet, 0.0),
+            wave_armed(FfxState::Player, wet, alive()),
             "in-world, submerged, alive — the reference walks its second list"
         );
         assert!(
-            !wave_armed(FfxState::Player, dry, 0.0),
+            !wave_armed(FfxState::Player, dry, alive()),
             "a dry camera keeps the first list"
         );
         assert!(
-            !wave_armed(FfxState::Player, wet, 1.0),
+            !wave_armed(FfxState::Player, wet, ghost_world()),
             "a ghost runs CFFXDeath, which owns one list and no guard"
         );
         assert!(
-            !wave_armed(FfxState::Glue, wet, 0.0),
+            !wave_armed(FfxState::Glue, wet, alive()),
             "the glue pair reaches the same Render, but 0x467d00 gates it out of the swap"
         );
         assert!(
-            !wave_armed(FfxState::None, wet, 0.0),
+            !wave_armed(FfxState::None, wet, alive()),
             "a bake runs neither pair"
         );
     }
 
+    /// The underwater, drunk world the glow pass does the most for.
+    fn wet() -> FfxWave {
+        FfxWave {
+            phase1: 0.0,
+            phase2: 0.0,
+            active: true,
+        }
+    }
+
+    /// `ffxGlow` 0: `CFFXGlow`'s enable (`0x6cc5a8`) fails, so the begin/end pair runs no pass. The
+    /// combine is the scene alone, the three filter passes are skipped, the warp never arms, and
+    /// the death pass, glue pair included, still runs.
+    #[test]
+    fn glow_off_drops_the_glow_pass_and_only_it() {
+        let off = FfxSwitches {
+            glow: false,
+            ..FfxSwitches::default()
+        };
+        let drunk = FfxPassState::world(0.0, 1.0).switched(off);
+        let u = combine_uniform(
+            0.5,
+            drunk,
+            living_glue().switched(off),
+            &FfxGlow::WORLD,
+            wet(),
+        );
+        assert_eq!(
+            u[..3],
+            [0.0, 0.0, 0.0],
+            "no glow add, no haze, no death gate"
+        );
+        assert!(!blur_read(&u), "Box4 and both Gauss4 passes are skipped");
+        assert!(
+            !wave_armed(FfxState::Player, wet(), drunk),
+            "the underwater warp is the glow pass's second list"
+        );
+        let glue = combine_uniform(
+            0.5,
+            drunk,
+            living_glue().switched(off),
+            &FfxGlow::GLUE_SCENE,
+            wet(),
+        );
+        assert_eq!(
+            glue[..3],
+            [0.0, 0.0, 0.0],
+            "the glue glow reads the same record"
+        );
+        let ghost = ghost_world().switched(off);
+        assert_eq!(
+            combine_uniform(0.5, ghost, living_glue(), &FfxGlow::WORLD, wet())[..3],
+            [0.5, 1.0, 0.0],
+            "a ghost's death pass does not read ffxGlow"
+        );
+    }
+
+    /// `ffxDeath` 0: the ghost's slot holds `CFFXDeath`, whose enable (`0x6cdf10`) fails, and the
+    /// glow pass is not put back in its place, so the ghost sees the plain scene.
+    #[test]
+    fn death_off_drops_the_death_pass_without_restoring_the_glow() {
+        let off = FfxSwitches {
+            death: false,
+            ..FfxSwitches::default()
+        };
+        let u = combine_uniform(
+            0.5,
+            ghost_world().switched(off),
+            living_glue().switched(off),
+            &FfxGlow::WORLD,
+            FfxWave::default(),
+        );
+        assert_eq!(u[..3], [0.0, 0.0, 0.0]);
+        assert!(!blur_read(&u));
+        assert_eq!(
+            combine_uniform(
+                0.5,
+                alive().switched(off),
+                living_glue(),
+                &FfxGlow::WORLD,
+                FfxWave::default()
+            )[..3],
+            [0.5, 0.0, 0.0],
+            "the living keep their glow"
+        );
+        let glue_ghost = FfxPassState::glue(1.0).switched(off);
+        assert_eq!(
+            combine_uniform(0.5, alive(), glue_ghost, &FfxGlow::GLUE_SCENE, wet())[..3],
+            [0.0, 0.0, 0.0],
+            "a ghost roster row loses its death combine too"
+        );
+    }
+
+    /// `ffx` 0 (`0x6cd8a6`): neither pass runs, on either pair.
+    #[test]
+    fn the_master_off_drops_both_passes() {
+        let off = FfxSwitches {
+            master: false,
+            ..FfxSwitches::default()
+        };
+        for (feed, what) in [(alive(), "alive"), (ghost_world(), "a ghost")] {
+            let feed = feed.switched(off);
+            let u = combine_uniform(0.5, feed, living_glue(), &FfxGlow::WORLD, wet());
+            assert_eq!(u[..3], [0.0, 0.0, 0.0], "{what}");
+            assert!(!blur_read(&u), "{what}");
+            assert!(!wave_armed(FfxState::Player, wet(), feed), "{what}");
+        }
+        let on = alive().switched(FfxSwitches::default());
+        let u = combine_uniform(0.5, on, living_glue(), &FfxGlow::WORLD, wet());
+        assert!(blur_read(&u), "all three on, the glow pass runs");
+        assert!(wave_armed(FfxState::Player, wet(), on));
+    }
+
     /// Dry, the uniform's first row is the plain combine's and the node binds the dry pipeline.
     #[test]
     fn a_dry_frame_pays_nothing_for_the_warp() {
@@ -1356,7 +1546,7 @@ mod tests {
             "the combine lane is exactly what it was before the wave lane existed"
         );
         assert!(
-            !wave_armed(FfxState::Player, live, 0.0),
+            !wave_armed(FfxState::Player, live, alive()),
             "and the node binds the unwarped pipeline"
         );
     }
diff --git a/crates/benilla-world/src/layout_keys.rs b/crates/benilla-world/src/layout_keys.rs
new file mode 100644
index 00000000..2e1c8894
--- /dev/null
+++ b/crates/benilla-world/src/layout_keys.rs
@@ -0,0 +1,182 @@
+//! The keyboard layout's named keys. The Windows client reads a key as the virtual-key code the
+//! OS layout produced from the scancode (the WndProc's key arm `0x42d21e` hands `wParam` to the
+//! translator `0x42d800`, which never reads the scancode), so a layout that gives a key another
+//! named function (X11's `caps:escape`, `caps:swapescape`, `ctrl:nocaps`, Colemak's Caps Lock as
+//! Backspace) moves that function in 1.12; under Wine the same keysym becomes the same virtual
+//! key. Bevy's `KeyCode` is the physical key, which such a layout does not move: Caps Lock mapped
+//! to Escape arrives as `CapsLock` with the logical key `Escape`.
+//!
+//! Off macOS, each keyboard message whose logical key is a named key other than its physical one
+//! takes that named key's code, before Bevy's input collection, so every reader (the bindings,
+//! the text boxes, the glue screens, `ButtonInput<KeyCode>`) sees the layout's key. The Mac client
+//! reads its non-character keys off a fixed table on the physical keycode (`0x5bf320`), so macOS
+//! keeps them physical. A letter, digit or punctuation key keeps its code too: 1.12 names it by
+//! the virtual key the layout makes it, a digit as itself (`0x42d81c`) and a letter or punctuation
+//! key through `MapVirtualKeyA` (`0x42da39`), which the game's key namer reads, not by a named
+//! key. So do the numpad keys, whose Num Lock navigation meanings are not remaps.
+
+#[cfg(any(not(target_os = "macos"), test))]
+use bevy::input::keyboard::{Key, KeyCode};
+use bevy::prelude::*;
+
+/// Rewrites remapped named keys before Bevy's input collection (all but macOS).
+pub struct LayoutKeysPlugin;
+
+impl Plugin for LayoutKeysPlugin {
+    #[cfg(not(target_os = "macos"))]
+    fn build(&self, app: &mut App) {
+        app.add_systems(PreUpdate, remap.before(bevy::input::InputSystems));
+    }
+
+    #[cfg(target_os = "macos")]
+    fn build(&self, _app: &mut App) {}
+}
+
+/// Gives each new keyboard message the code of the named key its layout made it.
+#[cfg(not(target_os = "macos"))]
+fn remap(mut keys: bevy::ecs::message::MessageMutator<bevy::input::keyboard::KeyboardInput>) {
+    for key in keys.read() {
+        if let Some(code) = layout_code(key.key_code, &key.logical_key) {
+            key.key_code = code;
+        }
+    }
+}
+
+/// The code of the named key `logical` stands for when a layout put it on the physical key
+/// `physical`, or `None` when the key keeps its code: a character, a numpad key, a named key with
+/// no code, or the key already there (either side, for a modifier).
+#[cfg(any(not(target_os = "macos"), test))]
+fn layout_code(physical: KeyCode, logical: &Key) -> Option<KeyCode> {
+    use KeyCode as C;
+    if is_numpad(physical) {
+        return None;
+    }
+    let (code, same_family) = match logical {
+        Key::Shift => (C::ShiftLeft, [C::ShiftLeft, C::ShiftRight]),
+        Key::Control => (C::ControlLeft, [C::ControlLeft, C::ControlRight]),
+        Key::Alt => (C::AltLeft, [C::AltLeft, C::AltRight]),
+        Key::Super => (C::SuperLeft, [C::SuperLeft, C::SuperRight]),
+        _ => {
+            let code = named_code(logical)?;
+            (code, [code, code])
+        }
+    };
+    (!same_family.contains(&physical)).then_some(code)
+}
+
+/// The physical key a non-modifier named key sits on in a plain layout.
+#[cfg(any(not(target_os = "macos"), test))]
+fn named_code(logical: &Key) -> Option<KeyCode> {
+    use KeyCode as C;
+    Some(match logical {
+        Key::Escape => C::Escape,
+        Key::Tab => C::Tab,
+        Key::Enter => C::Enter,
+        Key::Space => C::Space,
+        Key::Backspace => C::Backspace,
+        Key::Delete => C::Delete,
+        Key::Insert => C::Insert,
+        Key::Home => C::Home,
+        Key::End => C::End,
+        Key::PageUp => C::PageUp,
+        Key::PageDown => C::PageDown,
+        Key::ArrowUp => C::ArrowUp,
+        Key::ArrowDown => C::ArrowDown,
+        Key::ArrowLeft => C::ArrowLeft,
+        Key::ArrowRight => C::ArrowRight,
+        Key::CapsLock => C::CapsLock,
+        Key::NumLock => C::NumLock,
+        Key::ScrollLock => C::ScrollLock,
+        Key::Pause => C::Pause,
+        Key::PrintScreen => C::PrintScreen,
+        Key::ContextMenu => C::ContextMenu,
+        Key::F1 => C::F1,
+        Key::F2 => C::F2,
+        Key::F3 => C::F3,
+        Key::F4 => C::F4,
+        Key::F5 => C::F5,
+        Key::F6 => C::F6,
+        Key::F7 => C::F7,
+        Key::F8 => C::F8,
+        Key::F9 => C::F9,
+        Key::F10 => C::F10,
+        Key::F11 => C::F11,
+        Key::F12 => C::F12,
+        _ => return None,
+    })
+}
+
+#[cfg(any(not(target_os = "macos"), test))]
+fn is_numpad(code: KeyCode) -> bool {
+    use KeyCode as C;
+    matches!(
+        code,
+        C::Numpad0
+            | C::Numpad1
+            | C::Numpad2
+            | C::Numpad3
+            | C::Numpad4
+            | C::Numpad5
+            | C::Numpad6
+            | C::Numpad7
+            | C::Numpad8
+            | C::Numpad9
+            | C::NumpadAdd
+            | C::NumpadSubtract
+            | C::NumpadMultiply
+            | C::NumpadDivide
+            | C::NumpadDecimal
+            | C::NumpadComma
+            | C::NumpadEnter
+            | C::NumpadEqual
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn caps_mapped_to_escape_is_escape() {
+        assert_eq!(
+            layout_code(KeyCode::CapsLock, &Key::Escape),
+            Some(KeyCode::Escape)
+        );
+        // `caps:swapescape`: the other half of the swap.
+        assert_eq!(
+            layout_code(KeyCode::Escape, &Key::CapsLock),
+            Some(KeyCode::CapsLock)
+        );
+    }
+
+    #[test]
+    fn a_key_where_the_layout_leaves_it_keeps_its_code() {
+        assert_eq!(layout_code(KeyCode::Escape, &Key::Escape), None);
+        assert_eq!(layout_code(KeyCode::F5, &Key::F5), None);
+        assert_eq!(layout_code(KeyCode::ShiftRight, &Key::Shift), None);
+        assert_eq!(layout_code(KeyCode::ControlRight, &Key::Control), None);
+    }
+
+    #[test]
+    fn a_modifier_moved_by_the_layout_is_that_modifier() {
+        // `ctrl:nocaps`: Caps Lock is a Control key.
+        assert_eq!(
+            layout_code(KeyCode::CapsLock, &Key::Control),
+            Some(KeyCode::ControlLeft)
+        );
+    }
+
+    #[test]
+    fn characters_and_the_numpad_keep_their_codes() {
+        // An azerty A, the key where a qwerty Q sits: named by its character, never moved.
+        assert_eq!(
+            layout_code(KeyCode::KeyQ, &Key::Character("a".into())),
+            None
+        );
+        // Num Lock off: the numpad 7 means Home, and stays NUMPAD7.
+        assert_eq!(layout_code(KeyCode::Numpad7, &Key::Home), None);
+        assert_eq!(layout_code(KeyCode::NumpadEnter, &Key::Enter), None);
+        // AltGr has no code of its own.
+        assert_eq!(layout_code(KeyCode::AltRight, &Key::AltGraph), None);
+    }
+}
diff --git a/crates/benilla-world/src/lib.rs b/crates/benilla-world/src/lib.rs
index 6d9cb0bb..2b4d05df 100644
--- a/crates/benilla-world/src/lib.rs
+++ b/crates/benilla-world/src/lib.rs
@@ -122,6 +122,7 @@ pub mod ground_fx;
 pub mod instance_tint;
 pub mod interact;
 pub mod interior;
+pub mod layout_keys;
 pub mod lighting;
 pub mod liquid;
 pub mod log_ring;
diff --git a/crates/benilla-world/src/model_fade.rs b/crates/benilla-world/src/model_fade.rs
index 292c25c3..5019c6ac 100644
--- a/crates/benilla-world/src/model_fade.rs
+++ b/crates/benilla-world/src/model_fade.rs
@@ -72,7 +72,7 @@ pub fn fade_band(radius: f32) -> Option<(f32, f32)> {
 /// behind ([`DespawnFade`]). The interior classifier keeps the light law through either.
 #[derive(Component, Clone)]
 pub struct RenderFade {
-    /// `Time::elapsed_secs` at arming.
+    /// `Time::elapsed_secs` the ramp runs from: its arming, or an appear ramp's arrival.
     pub started: f32,
     /// Seconds; both reference ramps are 2000 ms (`FadeTo`'s `0x7d0`, the pump's `age > 0x7d0`).
     pub duration: f32,
@@ -278,7 +278,10 @@ mod unit_render_alpha_tests {
     fn a_pending_unit_is_zero_and_a_settled_one_is_opaque() {
         assert_eq!(
             unit_at(10.0, |u| {
-                u.insert(UnitAppearFade::Pending { since: 9.0 });
+                u.insert(UnitAppearFade::Pending {
+                    since: 9.0,
+                    arrived: 9.0,
+                });
             }),
             0.0,
             "pending: not shown yet, so nothing that rides this number may show either"
@@ -494,12 +497,16 @@ pub fn apply_render_fade(
     }
 }
 
-/// An appear fade waiting to arm, the entity hidden meanwhile. The reference arms it on the object
-/// becoming visible (`0x4651a0`), not at stream-in, so it never plays behind a loading screen.
+/// An appear fade waiting to arm, the entity hidden meanwhile. The reference arms it as the
+/// object's create block is processed (`0x4651a0` → `0x465c50` → the type's appear handler →
+/// `0x613af0`), so the ramp runs from the arrival; here it is held while a loading cover is up,
+/// so it never plays behind one.
 #[derive(Component, Clone)]
 pub struct PendingAppearFade {
-    /// `Time::elapsed_secs` at attach, the backstop timeout's origin.
+    /// `Time::elapsed_secs` when the part began waiting, the backstop timeout's origin.
     pub since: f32,
+    /// `Time::elapsed_secs` at the object's arrival, the ramp's origin once the world is shown.
+    pub arrived: f32,
 }
 
 /// Arm a pending fade after this long anyway, so a stuck load cannot leave an entity invisible.
@@ -510,8 +517,9 @@ const PENDING_TIMEOUT_SECS: f32 = 8.0;
 /// the ramp ends, after which a new part spawns steady.
 #[derive(Component, Clone, Copy, Debug, PartialEq)]
 pub enum UnitAppearFade {
-    /// Waiting for the world to be shown.
-    Pending { since: f32 },
+    /// Waiting for the world to be shown: since `since`, the backstop's origin, with the ramp
+    /// running from `arrived`.
+    Pending { since: f32, arrived: f32 },
     /// A joiner copies `started`, which reproduces the same curve.
     Live { started: f32 },
 }
@@ -522,7 +530,7 @@ pub enum JoinedFade {
     /// No unit fade in flight: spawn steady.
     Steady,
     /// Arm with the unit once the world is shown.
-    Pending { since: f32 },
+    Pending { since: f32, arrived: f32 },
     /// Join the running ramp at its current position.
     Live { started: f32 },
 }
@@ -531,7 +539,7 @@ pub enum JoinedFade {
 pub fn join_unit_appear_fade(unit: Option<UnitAppearFade>) -> JoinedFade {
     match unit {
         None => JoinedFade::Steady,
-        Some(UnitAppearFade::Pending { since }) => JoinedFade::Pending { since },
+        Some(UnitAppearFade::Pending { since, arrived }) => JoinedFade::Pending { since, arrived },
         Some(UnitAppearFade::Live { started }) => JoinedFade::Live { started },
     }
 }
@@ -548,9 +556,22 @@ pub(crate) fn arm_appear_fade(
         Has<crate::billboard::BillboardCard>,
     )>,
     mut units: Query<&mut UnitAppearFade>,
+    // When the cover last lifted; `None` while it is up.
+    mut shown_at: Local<Option<f32>>,
 ) {
     let now = time.elapsed_secs();
     let shown = !viewer.world_covered;
+    if shown {
+        shown_at.get_or_insert(now);
+    } else {
+        *shown_at = None;
+    }
+    // The ramp runs from the unit's arrival, whatever its model and composite waited on: the
+    // create block's appear handler stamps it (`0x465c50` → `0x613af0` → `0x614f80`, `obj+0xec`)
+    // and the per-frame ramp is `t³` of the wall time since (`0x614a90`, called at `0x60800c`
+    // whether or not the body draws). Never from behind a cover: an arrival under the loading
+    // screen starts when it lifts, and a backstop arm, which counts from the attach, starts now.
+    let origin = |arrived: f32| shown_at.map_or(now, |lifted| arrived.max(lifted));
     let mut armed = 0usize;
     // Counted apart: a world-root billboard card arms only through its own spawn.
     let mut armed_cards = 0usize;
@@ -562,14 +583,16 @@ pub(crate) fn arm_appear_fade(
             // can land between this query and its commands.
             commands
                 .entity(entity)
-                .try_insert(RenderFade::appear(now))
+                .try_insert(RenderFade::appear(origin(pending.arrived)))
                 .try_remove::<PendingAppearFade>();
         }
     }
     for mut unit_fade in &mut units {
-        if let UnitAppearFade::Pending { since } = *unit_fade {
+        if let UnitAppearFade::Pending { since, arrived } = *unit_fade {
             if shown || now - since > PENDING_TIMEOUT_SECS {
-                *unit_fade = UnitAppearFade::Live { started: now };
+                *unit_fade = UnitAppearFade::Live {
+                    started: origin(arrived),
+                };
             }
         }
     }
@@ -647,7 +670,10 @@ pub struct FadeSet<'a> {
 pub enum PartFade {
     /// No ramp to join, or the batch cannot feather: open opaque.
     Steady,
-    Pending(f32),
+    Pending {
+        since: f32,
+        arrived: f32,
+    },
     Live(f32),
 }
 
@@ -656,7 +682,7 @@ impl PartFade {
     pub fn resolve(joined: JoinedFade, set: &FadeSet<'_>) -> Self {
         match (joined, set.blend) {
             (_, None) | (JoinedFade::Steady, _) => Self::Steady,
-            (JoinedFade::Pending { since }, _) => Self::Pending(since),
+            (JoinedFade::Pending { since, arrived }, _) => Self::Pending { since, arrived },
             (JoinedFade::Live { started }, _) => Self::Live(started),
         }
     }
@@ -666,7 +692,7 @@ impl PartFade {
     pub fn seed(self, set: &FadeSet<'_>, now: f32) -> (Handle<WowModelMaterial>, f32) {
         match self {
             Self::Steady => (set.steady.clone(), 1.0),
-            Self::Pending(_) => (set.blend.cloned().unwrap_or_default(), 0.0),
+            Self::Pending { .. } => (set.blend.cloned().unwrap_or_default(), 0.0),
             Self::Live(started) => (
                 set.blend.cloned().unwrap_or_default(),
                 fade_alpha(0.0, 1.0, (now - started) / APPEAR_FADE_SECS),
@@ -687,8 +713,8 @@ impl PartFade {
         }
         match self {
             Self::Steady => false,
-            Self::Pending(since) => {
-                child.insert(PendingAppearFade { since });
+            Self::Pending { since, arrived } => {
+                child.insert(PendingAppearFade { since, arrived });
                 true
             }
             Self::Live(started) => {
@@ -939,6 +965,73 @@ mod tests {
         assert_eq!(state.get(&world).get(a), 1.0);
     }
 
+    /// The ramp runs from the unit's arrival once the world is shown, so a body that waited on its
+    /// model or composite shows it already advanced, and never from behind the loading cover: an
+    /// arrival under it starts when the cover lifts, even one that arrived long before, as the
+    /// backstop counts from when the fade began waiting.
+    #[test]
+    fn an_appear_ramp_runs_from_arrival_never_from_behind_the_cover() {
+        let mut app = App::new();
+        app.init_resource::<Time>()
+            .init_resource::<crate::view::Viewer>()
+            .add_systems(Update, arm_appear_fade);
+        let frame = |app: &mut App, secs: f32, covered: bool| {
+            app.world_mut()
+                .resource_mut::<Time>()
+                .advance_to(std::time::Duration::from_secs_f32(secs));
+            app.world_mut()
+                .resource_mut::<crate::view::Viewer>()
+                .world_covered = covered;
+            app.update();
+        };
+        let unit = |app: &App, e: Entity| *app.world().get::<UnitAppearFade>(e).unwrap();
+        let pending = |since, arrived| UnitAppearFade::Pending { since, arrived };
+
+        // Arrived at 1 s under the loading cover and built at 1.5 s; the cover lifts at 5 s.
+        let early = app.world_mut().spawn(pending(1.5, 1.0)).id();
+        frame(&mut app, 2.0, true);
+        assert_eq!(unit(&app, early), pending(1.5, 1.0));
+        frame(&mut app, 5.0, false);
+        assert_eq!(unit(&app, early), UnitAppearFade::Live { started: 5.0 });
+
+        // A second cover from 6 s to 16 s: a unit that arrived at 6 s, 10 s before it lifts, and
+        // was built at 15 s.
+        frame(&mut app, 6.0, true);
+        let long_before = app.world_mut().spawn(pending(15.0, 6.0)).id();
+        frame(&mut app, 15.5, true);
+        assert_eq!(
+            unit(&app, long_before),
+            pending(15.0, 6.0),
+            "the backstop counts from the attach, so it still waits under the cover"
+        );
+        frame(&mut app, 16.0, false);
+        assert_eq!(
+            unit(&app, long_before),
+            UnitAppearFade::Live { started: 16.0 },
+            "it fades in after the cover lifts"
+        );
+
+        // Arrived at 17 s in view and built at 17.5 s: its ramp is half a second in.
+        let late = app.world_mut().spawn(pending(17.5, 17.0)).id();
+        let part = app
+            .world_mut()
+            .spawn(PendingAppearFade {
+                since: 17.5,
+                arrived: 17.0,
+            })
+            .id();
+        frame(&mut app, 17.5, false);
+        assert_eq!(unit(&app, late), UnitAppearFade::Live { started: 17.0 });
+        let fade = app.world().get::<RenderFade>(part).expect("the part armed");
+        assert_eq!(fade.started, 17.0, "the part rides the same ramp");
+
+        // A cover that never lifts: the backstop arms 8 s after the attach, starting then.
+        let stuck = app.world_mut().spawn(pending(20.0, 19.0)).id();
+        frame(&mut app, 21.0, true);
+        frame(&mut app, 28.5, true);
+        assert_eq!(unit(&app, stuck), UnitAppearFade::Live { started: 28.5 });
+    }
+
     /// `SystemState::apply` after a manual despawn recreates a wire destroy landing between the
     /// system's query and its commands.
     #[test]
@@ -950,7 +1043,12 @@ mod tests {
         world.init_resource::<Time>();
         // The default viewer covers nothing, so every pending fade arms this frame.
         world.init_resource::<crate::view::Viewer>();
-        let doomed = world.spawn(PendingAppearFade { since: 0.0 }).id();
+        let doomed = world
+            .spawn(PendingAppearFade {
+                since: 0.0,
+                arrived: 0.0,
+            })
+            .id();
 
         let mut state: SystemState<(
             Res<Time>,
@@ -962,9 +1060,10 @@ mod tests {
                 Has<crate::billboard::BillboardCard>,
             )>,
             Query<&mut UnitAppearFade>,
+            Local<Option<f32>>,
         )> = SystemState::new(&mut world);
-        let (time, viewer, commands, q, units) = state.get_mut(&mut world);
-        arm_appear_fade(time, viewer, commands, q, units);
+        let (time, viewer, commands, q, units, shown_at) = state.get_mut(&mut world);
+        arm_appear_fade(time, viewer, commands, q, units, shown_at);
 
         world.despawn(doomed);
         state.apply(&mut world); // would panic without the `try_*` contract
@@ -1127,10 +1226,10 @@ mod tests {
 
     #[test]
     fn pending_unit_joins_at_the_same_since() {
-        let since = 3.25;
+        let (since, arrived) = (3.25, 2.5);
         assert_eq!(
-            join_unit_appear_fade(Some(UnitAppearFade::Pending { since })),
-            JoinedFade::Pending { since }
+            join_unit_appear_fade(Some(UnitAppearFade::Pending { since, arrived })),
+            JoinedFade::Pending { since, arrived }
         );
     }
 
@@ -1166,7 +1265,10 @@ mod tests {
         assert_eq!(
             model_render_alpha(
                 10.0,
-                Some(UnitAppearFade::Pending { since: 9.0 }),
+                Some(UnitAppearFade::Pending {
+                    since: 9.0,
+                    arrived: 9.0,
+                }),
                 None,
                 1.0,
                 1.0
diff --git a/crates/benilla-world/src/particles.rs b/crates/benilla-world/src/particles.rs
index b47622c2..c2921988 100644
--- a/crates/benilla-world/src/particles.rs
+++ b/crates/benilla-world/src/particles.rs
@@ -33,11 +33,13 @@ pub struct ViewThrottled;
 /// A backstop cap on one emitter's live particles; a campfire's steady state is about 30 + 24.
 const MAX_PARTICLES: usize = 1024;
 
-/// Particle settings: the reference's `particleDensity` CVar, set from the debug panel.
+/// The emission scalar `[0x87d5fc]`, which the `particleDensity` handler (`0x688fb0`) and the
+/// `spellEffectLevel` handler (`0x689510`) both write through `0x7adfb0`, the last write winning.
+/// benilla registers only `spellEffectLevel`.
 #[derive(Resource)]
 pub struct ParticleTuning {
-    /// Clamped to [0.25, 1.0] by its handler (`0x688fb0`); it scales emission rate only (its
-    /// getter's two callers are the spawn-count `fmul`s), never size, alpha or draw distance.
+    /// It scales emission rate only (its getter's two callers are the spawn-count `fmul`s), never
+    /// size, alpha or draw distance.
     pub(crate) density: f32,
 }
 
@@ -47,6 +49,17 @@ impl Default for ParticleTuning {
     }
 }
 
+impl ParticleTuning {
+    /// `0x7adfb0`: clamp to [0.0, 1.0] and store.
+    pub fn set_density(&mut self, density: f32) {
+        self.density = density.clamp(0.0, 1.0);
+    }
+
+    pub fn density(&self) -> f32 {
+        self.density
+    }
+}
+
 /// One live particle, in the frame file flag `0x10` picks. Clear (world mode): `pos`/`vel` are
 /// world coordinates, Bevy axes (a transport's deck while riding one); the birth bakes bone pose,
 /// rotation, scale and position through the live emitter matrix (`0x7b8acf`/`0x7b8b0f`) and the
diff --git a/crates/benilla-world/src/terrain_stream/spawn/mod.rs b/crates/benilla-world/src/terrain_stream/spawn/mod.rs
index 8bb1eed3..085d013b 100644
--- a/crates/benilla-world/src/terrain_stream/spawn/mod.rs
+++ b/crates/benilla-world/src/terrain_stream/spawn/mod.rs
@@ -64,6 +64,43 @@ type SpawnTables<'w> = (
     crate::static_gx::TorchShared<'w>,
 );
 
+/// Retires a placement, or a WMO prop, whose model load failed: it spawns nothing and stops
+/// counting as pending, as a missing WDT falls back rather than stalling the world; warned once.
+fn retire_failed_placements(placements: &mut Placements, asset_server: &AssetServer) {
+    let Placements {
+        by_id,
+        pending_spawns,
+        ..
+    } = placements;
+    let failed = |id: bevy::asset::UntypedAssetId| {
+        asset_server.load_state(id).is_failed().then(|| {
+            asset_server
+                .get_path(id)
+                .map_or_else(|| id.to_string(), |p| p.to_string())
+        })
+    };
+    for p in by_id.values_mut() {
+        if !p.spawned {
+            let id = match &p.model {
+                ModelHandle::M2(h) => h.id().untyped(),
+                ModelHandle::Wmo(h) => h.id().untyped(),
+            };
+            if let Some(path) = failed(id) {
+                warn!("placement model {path} failed to load: nothing spawned");
+                p.spawned = true;
+                *pending_spawns -= 1;
+            }
+        }
+        for d in p.doodads.iter_mut().filter(|d| !d.spawned) {
+            if let Some(path) = failed(d.handle.id().untyped()) {
+                warn!("WMO prop model {path} failed to load: nothing spawned");
+                d.spawned = true;
+                *pending_spawns -= 1;
+            }
+        }
+    }
+}
+
 pub(super) fn spawn_loaded_placements(
     mut commands: Commands,
     placements: ResMut<Placements>,
@@ -99,6 +136,8 @@ pub(super) fn spawn_loaded_placements(
     if placements.pending_spawns == 0 {
         return;
     }
+    let placements = placements.into_inner();
+    retire_failed_placements(placements, &asset_server);
     let t0 = Instant::now();
     // The count cap bounds the render-side wave a time budget misses; off until the focus is
     // paced, as the loading cover absorbs the burst and a cap would only lengthen the reveal.
@@ -116,7 +155,7 @@ pub(super) fn spawn_loaded_placements(
         by_id,
         materials: mat_cache,
         pending_spawns,
-    } = placements.into_inner();
+    } = placements;
 
     // At most `SPAWN_BUDGET` per frame, resumed next frame through the `spawned` flags; the check
     // follows the work, so every frame spawns at least one.
@@ -1075,3 +1114,106 @@ pub fn m2_fade(bounds: &Option<M2Bounds>, scale: f32) -> (f32, Vec3) {
         None => (f32::INFINITY, Vec3::ZERO),
     }
 }
+
+#[cfg(test)]
+mod retire_tests {
+    use super::super::Placement;
+    use super::*;
+    use benilla_assets::WmoModel;
+
+    fn app() -> App {
+        let mut app = App::new();
+        app.add_plugins((MinimalPlugins, bevy::asset::AssetPlugin::default()));
+        app.init_asset::<M2Model>().init_asset::<WmoModel>();
+        app.init_resource::<Placements>();
+        app.add_systems(
+            Update,
+            |mut pl: ResMut<Placements>, server: Res<AssetServer>| {
+                retire_failed_placements(&mut pl, &server)
+            },
+        );
+        app
+    }
+
+    fn placement(model: ModelHandle, doodads: Vec<WmoDoodadInst>) -> Placement {
+        Placement {
+            model,
+            transform: Transform::IDENTITY,
+            entities: Vec::new(),
+            spawned: false,
+            doodad_set: 0,
+            name_set: 0,
+            doodads,
+            portal_instance: None,
+            refs: 1,
+            owner: (0, 0),
+        }
+    }
+
+    fn prop(handle: Handle<M2Model>) -> WmoDoodadInst {
+        WmoDoodadInst {
+            handle,
+            transform: Transform::IDENTITY,
+            groups: Arc::from([]),
+            light: PropLight::Exterior,
+            spawned: false,
+        }
+    }
+
+    /// Runs frames until every handle's load has failed (no loader is registered for the path).
+    fn settle(app: &mut App, ids: &[bevy::asset::UntypedAssetId]) {
+        for _ in 0..500 {
+            app.update();
+            let server = app.world().resource::<AssetServer>();
+            if ids.iter().all(|&i| server.load_state(i).is_failed()) {
+                app.update();
+                return;
+            }
+            std::thread::sleep(std::time::Duration::from_millis(2));
+        }
+        panic!("the loads never failed");
+    }
+
+    #[test]
+    fn a_failed_model_load_retires_the_placement() {
+        let mut app = app();
+        let server = app.world().resource::<AssetServer>().clone();
+        let m2: Handle<M2Model> = server.load("mpq://missing/tree.m2");
+        let wmo: Handle<WmoModel> = server.load("mpq://missing/hall.wmo");
+        let loading: Handle<M2Model> = Handle::default();
+        let ids = [m2.id().untyped(), wmo.id().untyped()];
+        {
+            let mut pl = app.world_mut().resource_mut::<Placements>();
+            pl.by_id.insert(1, placement(ModelHandle::M2(m2), vec![]));
+            pl.by_id.insert(2, placement(ModelHandle::Wmo(wmo), vec![]));
+            // A handle that was never loaded is not a failure: it keeps waiting.
+            pl.by_id
+                .insert(3, placement(ModelHandle::M2(loading), vec![]));
+            pl.pending_spawns = 3;
+        }
+        settle(&mut app, &ids);
+        let pl = app.world().resource::<Placements>();
+        assert!(pl.by_id[&1].spawned && pl.by_id[&2].spawned);
+        assert!(!pl.by_id[&3].spawned);
+        assert_eq!(pl.pending_spawns, 1);
+    }
+
+    #[test]
+    fn a_failed_prop_load_retires_the_prop() {
+        let mut app = app();
+        let server = app.world().resource::<AssetServer>().clone();
+        let bad: Handle<M2Model> = server.load("mpq://missing/lamp.m2");
+        let ids = [bad.id().untyped()];
+        {
+            let mut pl = app.world_mut().resource_mut::<Placements>();
+            let mut p = placement(ModelHandle::M2(Handle::default()), vec![prop(bad)]);
+            p.spawned = true; // the WMO root landed; its one prop is pending
+            pl.by_id.insert(1, p);
+            pl.pending_spawns = 1;
+        }
+        settle(&mut app, &ids);
+        let pl = app.world().resource::<Placements>();
+        assert!(pl.by_id[&1].doodads[0].spawned);
+        assert_eq!(pl.pending_spawns, 0);
+    }
+}
diff --git a/crates/benilla-world/src/world_plugins.rs b/crates/benilla-world/src/world_plugins.rs
index 2886de92..0ddd6e9f 100644
--- a/crates/benilla-world/src/world_plugins.rs
+++ b/crates/benilla-world/src/world_plugins.rs
@@ -118,6 +118,8 @@ impl PluginGroup for WorldPlugins {
             // Stuck-modifier reconciliation: macOS system shortcuts (⇧⌘5) swallow modifier
             // releases without a focus loss, wedging every bare-key binding.
             .add(crate::modkeys::ModKeysPlugin)
+            // Off macOS: a named key the keyboard layout moved (`caps:escape`) acts as that key.
+            .add(crate::layout_keys::LayoutKeysPlugin)
             // Terrain streaming (`AdtTile` through the `AssetServer`): tiles with their doodads,
             // WMOs, liquid and clutter.
             .add(crate::terrain_stream::TerrainPlugin)
diff --git a/crates/benilla-world/src/worldview.rs b/crates/benilla-world/src/worldview.rs
index d4af7194..0dc4cc31 100644
--- a/crates/benilla-world/src/worldview.rs
+++ b/crates/benilla-world/src/worldview.rs
@@ -52,6 +52,9 @@ const FOVY: f32 = 1.221_730_5;
 
 /// Builds and runs the world viewer; `build` is the launcher shim's compile-time git stamp.
 pub fn run(build: BuildId) -> AppExit {
+    // The install resolves from the launcher's folder when its stamp names one, as the client's
+    // does; this shim has no `dev` feature, so it stamps none and the viewer keeps benilla's.
+    benilla_formats::set_project_folder(build.project_dir);
     let mut app = App::new();
     app.insert_resource(build);
 
diff --git a/crates/benilla-worldview/src/main.rs b/crates/benilla-worldview/src/main.rs
index 07ef880b..9229ee17 100644
--- a/crates/benilla-worldview/src/main.rs
+++ b/crates/benilla-worldview/src/main.rs
@@ -12,5 +12,7 @@ fn main() -> benilla_world::AppExit {
         short: env!("BENILLA_GIT_SHORT"),
         date: env!("BENILLA_GIT_DATE"),
         profile: env!("BENILLA_PROFILE"),
+        project_dir: env!("BENILLA_PROJECT_DIR"),
+        ..Default::default()
     })
 }
diff --git a/crates/benilla/src/main.rs b/crates/benilla/src/main.rs
index c9631222..266130ac 100644
--- a/crates/benilla/src/main.rs
+++ b/crates/benilla/src/main.rs
@@ -11,5 +11,7 @@ fn main() -> benilla_app::AppExit {
         short: env!("BENILLA_GIT_SHORT"),
         date: env!("BENILLA_GIT_DATE"),
         profile: env!("BENILLA_PROFILE"),
+        project_dir: env!("BENILLA_PROJECT_DIR"),
+        ..Default::default()
     })
 }
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 1b67ea2b..bf071393 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -2,8 +2,8 @@
 
 benilla is a faithful 1.12.1 client. It is the foundation people build on, not the place to get
 creative: a change is accepted when it makes benilla more like 1.12.1 or fixes a bug, with
-evidence from the reference, in one small piece, with the gates green. Everything else is a
-fork, and forks are welcome.
+evidence from the reference, in one small piece, with the gates green. Everything else lives on
+top of benilla, in a crate of its own or a fork, and both are welcome.
 
 ## Where to start
 
@@ -20,16 +20,32 @@ taken.
 - A step closer to 1.12.1: a missing packet, verb, window, effect or behaviour, done the way
   the real client does it.
 - A correction where benilla and the reference disagree, with the reference fact stated.
+- Whatever the stock 1.12.1 client loads from a patch, benilla loads: models, textures or data
+  rows that 1.12.1 shows and benilla does not are a bug.
 
 ## What does not
 
-- Features 1.12.1 does not have, and behaviour changed because it seems better. A deviation
-  from the reference is the maintainer's call and is recorded where it lives; a pull request is
-  not the place to propose one.
-- Anything from a WoW install: art, models, sounds, maps, data. The one exception is interface
-  code (FrameXML and GlueXML), and only through the migration recipe in `docs/METHOD.md`.
+- Features 1.12.1 does not have, including what 1.12 client mods add (a new key binding, a spell
+  queue, new Lua functions, graphics past 1.12's), and behaviour changed because it seems better.
+  They live on top of benilla ("Building on top"), so that what benilla does is what 1.12.1 does,
+  for everyone who builds on it. A deviation from the reference is the maintainer's call and is
+  recorded where it lives; a pull request is not the place to propose one.
+- Anything from a WoW install: art, models, sounds, maps, data, and interface code (FrameXML and
+  GlueXML), which runs off the player's own install (`docs/METHOD.md`).
 - Big or mixed changes. One change per pull request, small enough to read in one sitting.
 
+## Building on top
+
+A feature 1.12.1 does not have lives in a crate of its own that adds its Bevy plugins through
+`benilla_app::run_with`, as `crates/benilla-app/examples/extended_launcher.rs` shows, or in a
+fork. A client started through `run_with` says `extended` in its build line, so its reports read
+apart from stock benilla's. The crate keeps its own settings, never rows in benilla's CVar table,
+which every addon reads.
+
+benilla opens a piece of itself to such a crate only when its own 1.12.1 work creates that piece,
+never for the crate alone, and promises no stable API: a crate pins the benilla revision it
+builds on. What a crate cannot reach stays a fork's.
+
 ## How a change is judged
 
 1. `scripts/gates.sh` is green: fmt, clippy with warnings denied, the workspace tests (once
@@ -95,7 +111,8 @@ out of scope is closed with the reason.
     `series` and `hotspot`.
 - **The loop.** `cargo play` builds and runs the play profile. `scripts/check.sh` verifies a
   round of work; `scripts/gates.sh` is the full chain, and it opens a window for the engine boot
-  checks, so it needs a display. Work on a branch.
+  checks, so it needs a display. `WOW_STOCK_UI=1` boots a dev build on the stock interface
+  alone, without benilla's layer. Work on a branch.
 
 ## Reporting a bug
 
diff --git a/docs/MAP.md b/docs/MAP.md
index 30bbd8d7..29dd626a 100644
--- a/docs/MAP.md
+++ b/docs/MAP.md
@@ -101,17 +101,17 @@
 
 ## Modules (top-level, per crate)
 
-- **benilla-adt** (lib.rs): combined_alpha
-- **benilla-app** (lib.rs): addon_harness area area_poi area_trigger asset_churn aura_visual bindings blob_shadow bowstring camera_shake capture char_create char_select character_shadow chat_bubble chr_classes cinematic combat_log combat_text console crash creature_anim cursor cvars death debug_panel dev doodad_events dynamic_interior entities fishing_line footprints game_plugins game_tip glue glue_strings go_anim go_templates hover_log items loading_screen local_state login minimap monkey_gfx name_persist nameplates names net npc_text opaque2d pending_item_ops perf pipe_warm player poi_marker portrait preflight probe_shield query_cache quest_markers raid_marks ranged_flex realm_select realmlist run_mode screen_fade screenshot shaders shadow_core shutdown smart_rect sound spell swing_refusal target test_support text_filter text_reshape textinput torch_shadow transport tutorial ui_action ui_auction ui_aura ui_bank ui_battlefield ui_battlefield_positions ui_battlefield_score ui_bind_confirm ui_binder ui_cast ui_char ui_chat ui_craft ui_dialog_verbs ui_dressup ui_duel ui_follow ui_gamma ui_gm_ticket ui_gossip ui_guild ui_hide ui_honor ui_inspect ui_instance ui_item_text ui_items ui_layout ui_logout ui_loot ui_loot_roll ui_macro ui_mail ui_merchant ui_mirror ui_models ui_net ui_party ui_pass ui_pet ui_pet_book ui_pet_doll ui_pet_stats ui_petition ui_quest ui_quest_log ui_quest_share ui_reputation ui_saved ui_script ui_session ui_shapeshift ui_social ui_spellbook ui_stable ui_summon ui_tabard ui_talent ui_talent_wipe ui_taxi ui_text ui_tooltip ui_trade ui_tradeskill ui_trainer ui_unit ui_world_map video volumetric_fog vplates weapon_trail world_backdrop world_shadow world_state world_state_ui
-- **benilla-assets** (lib.rs): adt anim_rng blp column_grid coords gpu_blp m2 materials minimap_grid model spatial_cache terrain tex_filter trace water_depth wdt wmo world_assets
-- **benilla-formats** (lib.rs): anim_data area_poi area_sound area_table area_trigger auction_house bank_bag_slot_prices camera_shakes cfg_categories chain characters chat_channels chr_classes cinematics creature_families creature_sound creature_types creatures dbc death_thud durability elevators emit_timing emote_text emotes environmental_damage exhaustion factions fire_light footsteps game_tips gameobjects garble gm_ticket_category ground_effects install item_random_properties item_sounds item_visuals itembagfamily itemclass items itemsets itemsubclass languages light liquid loading_screen lock lock_type macro_icons maps material minimap_translate models npc_greeting page_text_material particles pet_stats quest_headers quest_info race_pvp_team race_sound ribbons room_claim server_messages sheathe skill_lines sound_entries sound_provider sound_water spell_focus spell_mechanic spell_visual spells stable_slot_prices stationery talents taxi taxi_nodes taxi_path terrain text_filter_lists tga transport_period transports unit_blood value_track vocal_ui_sounds wdl weapon_impact weapon_swing wmo_area world_map_area world_map_continent world_map_overlay world_state_ui wow_ini zone_map
-- **benilla-m2** (lib.rs): error model skin tests track
-- **benilla-mpq** (lib.rs): crypto
-- **benilla-protocol** (lib.rs): auth events guid messages wire world
-- **benilla-srp** (lib.rs): vanilla_header
-- **benilla-ui** (lib.rs): bindings_xml civil framexml justify layout loader markup messages order script source strings toc widget
-- **benilla-visual** (lib.rs): relight
-- **benilla-world** (lib.rs): art_scope assets bgwin billboard boot build_id clouds clutter collision decal dev_state doodad_anim entity_shade exterior_cull ffx_glow final_pass frame_pace ground_fx instance_tint interact interior lighting liquid log_ring mac_quit map_proj mat_anim_table mesh_tag model_fade model_forms model_render modkeys particles ribbons ride_frame rig_anim rig_palette rig_rider schedule shaders sky sky_order skybox static_gx static_merge straddle sun surface terrain_stream thread_qos view vis_chain water_fx wdl weather wmo_portal world_census world_map world_plugins world_point world_unit worldview zfill
+- **benilla-adt** (lib.rs): combined_alpha 
+- **benilla-app** (lib.rs): addon_harness area area_poi area_trigger asset_churn aura_visual bindings blob_shadow bowstring camera_shake capture char_create char_select character_shadow chat_bubble chr_classes cinematic combat_log combat_text console crash creature_anim creature_type cursor cvars death debug_panel dev doodad_events dynamic_interior entities fishing_line footprints game_plugins game_tip glue glue_strings go_anim go_templates hover_log items loading_screen local_state login minimap monkey_gfx name_persist nameplates names net npc_text opaque2d pending_item_ops perf pipe_warm player poi_marker portrait post preflight probe_shield query_cache quest_markers raid_marks ranged_flex realm_select realmlist run_mode screen_fade screenshot script_calls shaders shadow_core shutdown sky_quality smart_rect sound spell ssao swing_refusal target test_support text_filter text_reshape textinput torch_shadow transport tutorial ui_action ui_auction ui_aura ui_bank ui_battlefield ui_battlefield_positions ui_battlefield_score ui_bind_confirm ui_binder ui_cast ui_char ui_chat ui_craft ui_dialog_verbs ui_dressup ui_duel ui_follow ui_gamma ui_gm_ticket ui_gossip ui_guild ui_honor ui_inspect ui_instance ui_item_text ui_items ui_layout ui_logout ui_loot ui_loot_roll ui_macro ui_mail ui_merchant ui_mirror ui_models ui_net ui_party ui_pass ui_pet ui_pet_book ui_pet_doll ui_pet_stats ui_petition ui_quest ui_quest_log ui_quest_share ui_reputation ui_saved ui_script ui_session ui_shapeshift ui_social ui_spellbook ui_stable ui_summon ui_tabard ui_talent ui_talent_wipe ui_taxi ui_text ui_tooltip ui_trade ui_tradeskill ui_trainer ui_unit ui_world_map video volumetric_fog volumetric_light vplates weapon_trail world_backdrop world_shadow world_state world_state_ui zone_skybox 
+- **benilla-assets** (lib.rs): adt anim_rng blp column_grid coords gpu_blp m2 materials minimap_grid model spatial_cache terrain tex_filter trace water_depth wdt wmo world_assets 
+- **benilla-formats** (lib.rs): anim_data area_poi area_sound area_table area_trigger auction_house bank_bag_slot_prices camera_shakes cfg_categories chain characters chat_channels chr_classes cinematics creature_families creature_sound creature_types creatures dbc death_thud durability elevators emit_timing emote_text emotes environmental_damage exhaustion factions fire_light footsteps game_tips gameobjects garble gm_ticket_category ground_effects install item_random_properties item_sounds item_visuals itembagfamily itemclass items itemsets itemsubclass languages light liquid loading_screen lock lock_type macro_icons maps material minimap_translate models monkey_zone_grade npc_greeting packages page_text_material particles pet_stats quest_headers quest_info race_creature_type race_pvp_team race_sound ribbons room_claim server_messages sheathe skill_lines sound_entries sound_provider sound_water spell_focus spell_mechanic spell_visual spells stable_slot_prices stationery talents taxi taxi_nodes taxi_path terrain text_filter_lists tga transport_period transports unit_blood value_track vocal_ui_sounds wdl weapon_impact weapon_swing wmo_area world_map_area world_map_continent world_map_overlay world_state_ui wow_ini zone_map 
+- **benilla-m2** (lib.rs): error model skin tests track 
+- **benilla-mpq** (lib.rs): crypto 
+- **benilla-protocol** (lib.rs): auth events guid messages wire world 
+- **benilla-srp** (lib.rs): vanilla_header 
+- **benilla-ui** (lib.rs): bindings_xml civil framexml justify layout loader markup messages order script source status strings toc widget 
+- **benilla-visual** (lib.rs): relight 
+- **benilla-world** (lib.rs): art_scope assets bgwin billboard boot build_id clouds clutter collision decal dev_state doodad_anim entity_shade exterior_cull ffx_glow final_pass frame_pace ground_fx instance_tint interact interior layout_keys lighting liquid log_ring mac_quit map_proj mat_anim_table mesh_tag model_fade model_forms model_render modkeys particles ribbons ride_frame rig_anim rig_palette rig_rider schedule shaders sky sky_fx sky_order skybox skybox_anim static_gx static_merge straddle sun surface terrain_stream thread_qos view vis_chain water_fx wdl weather wind wmo_portal world_census world_map world_plugins world_point world_unit worldview zfill 
 
 ## CLI binaries
 
@@ -125,23 +125,29 @@
 
 - `embedded://benilla_app/shaders/shadow_caster.wgsl`
 - `embedded://benilla_app/shaders/shadow_caster_cutout_prepass.wgsl`
+- `embedded://benilla_app/shaders/ssao.wgsl`
 - `embedded://benilla_app/shaders/ui_add.wgsl`
 - `embedded://benilla_app/shaders/ui_gamma.wgsl`
 - `embedded://benilla_app/shaders/ui_node_gamma.wgsl`
 - `embedded://benilla_app/shaders/ui_quad.wgsl`
 - `embedded://benilla_app/shaders/ui_slice_gamma.wgsl`
+- `embedded://benilla_assets/shaders/emissive_hook.wgsl`
 - `embedded://benilla_assets/shaders/enhanced_water.wgsl`
 - `embedded://benilla_assets/shaders/fog_hook.wgsl`
 - `embedded://benilla_assets/shaders/liquid.wgsl`
 - `embedded://benilla_assets/shaders/monkey_frame.wgsl`
+- `embedded://benilla_assets/shaders/moonlight_hook.wgsl`
 - `embedded://benilla_assets/shaders/shadow_hook.wgsl`
 - `embedded://benilla_assets/shaders/terrain.wgsl`
 - `embedded://benilla_assets/shaders/wdl.wgsl`
+- `embedded://benilla_assets/shaders/wet_hook.wgsl`
+- `embedded://benilla_assets/shaders/wind_hook.wgsl`
 - `embedded://benilla_assets/shaders/wow_model.wgsl`
 - `embedded://benilla_world/shaders/celestial.wgsl`
 - `embedded://benilla_world/shaders/cloud.wgsl`
 - `embedded://benilla_world/shaders/ffx_glow.wgsl`
 - `embedded://benilla_world/shaders/sky.wgsl`
+- `embedded://benilla_world/shaders/sky_fx.wgsl`
 - `embedded://benilla_world/shaders/sky_vertex.wgsl`
 - `embedded://benilla_world/shaders/star.wgsl`
 - `embedded://benilla_world/shaders/static_gx.wgsl`
@@ -162,7 +168,9 @@
 - `WOW_AMBIGUITY_DUMP_POST` — benilla-app/src/game_plugins.rs
 - `WOW_ANIM_COST` — benilla-app/src/creature_anim/driver.rs
 - `WOW_ANIM_PARK_ALL` — benilla-app/src/creature_anim/lod.rs
-- `WOW_ANISO` — benilla-app/src/cvars.rs, benilla-assets/src/tex_filter.rs
+- `WOW_ANISO` — benilla-app/src/cvars/mod.rs, benilla-assets/src/tex_filter.rs
+- `WOW_AO` — benilla-app/src/ssao.rs
+- `WOW_AO_DEBUG` — benilla-app/src/ssao.rs
 - `WOW_API_DUMP` — benilla-app/tests/world_api_wall.rs
 - `WOW_ARCH_CENSUS` — benilla-app/src/perf/mod.rs
 - `WOW_ART_RADIUS` — benilla-world/src/art_scope.rs
@@ -183,16 +191,21 @@
 - `WOW_BUBBLE_TRACE` — benilla-app/src/chat_bubble.rs
 - `WOW_CAM_CHANGED` — benilla-app/src/perf/mod.rs
 - `WOW_CAM_DUMP` — benilla-app/src/player/camera.rs
-- `WOW_CAPTURE` — benilla-app/src/capture/mod.rs, benilla-app/src/capture/scenarios.rs, benilla-app/src/char_select/addons.rs, benilla-app/src/cvars.rs, benilla-app/src/lib.rs, benilla-app/src/local_state.rs, benilla-app/src/login/mod.rs, benilla-app/src/name_persist.rs, benilla-app/src/net.rs, benilla-app/src/player/camera_saved.rs, benilla-app/src/run_mode.rs, benilla-app/src/sound/mod.rs, benilla-app/src/ui_chat/settings.rs, benilla-app/src/ui_chat/tests.rs, benilla-app/src/ui_macro/tests.rs, benilla-app/src/ui_saved.rs, benilla-app/src/ui_script/addons.rs, benilla-app/src/ui_script/mod.rs, benilla-app/src/ui_script/world_entry_tests.rs, benilla-app/src/video.rs, benilla-app/src/volumetric_fog.rs, benilla-world/src/bgwin.rs, benilla-world/src/clouds/mod.rs, benilla-world/src/dev_state.rs, benilla-world/src/liquid/surface.rs
+- `WOW_CAPTURE` — benilla-app/src/capture/mod.rs, benilla-app/src/capture/scenarios.rs, benilla-app/src/char_select/addons.rs, benilla-app/src/cvars/mod.rs, benilla-app/src/dynamic_interior.rs, benilla-app/src/lib.rs, benilla-app/src/local_state.rs, benilla-app/src/login/mod.rs, benilla-app/src/name_persist.rs, benilla-app/src/net.rs, benilla-app/src/player/camera_saved.rs, benilla-app/src/run_mode.rs, benilla-app/src/sound/mod.rs, benilla-app/src/ui_chat/settings.rs, benilla-app/src/ui_chat/tests.rs, benilla-app/src/ui_macro/tests.rs, benilla-app/src/ui_saved.rs, benilla-app/src/ui_script/addons.rs, benilla-app/src/ui_script/layer_tests.rs, benilla-app/src/ui_script/mod.rs, benilla-app/src/ui_script/world_entry_tests.rs, benilla-app/src/video.rs, benilla-app/src/volumetric_fog.rs, benilla-app/src/volumetric_light.rs, benilla-world/src/bgwin.rs, benilla-world/src/clouds/mod.rs, benilla-world/src/dev_state.rs, benilla-world/src/liquid/surface.rs, benilla-world/src/sky_fx.rs, benilla-world/src/terrain_stream/queries.rs, benilla-world/src/wind/mod.rs
 - `WOW_CAPTURE_AGE` — benilla-app/src/capture/mod.rs
+- `WOW_CAPTURE_CVARS` — benilla-app/src/cvars/mod.rs
 - `WOW_CAPTURE_DEADLINE` — benilla-app/src/capture/mod.rs
 - `WOW_CAPTURE_OUT` — benilla-app/src/capture/mod.rs
 - `WOW_CAPTURE_REHOVER` — benilla-app/src/ui_script/mod.rs
+- `WOW_CAPTURE_SKY_T` — benilla-world/src/sky_fx.rs
 - `WOW_CAPTURE_STABLE` — benilla-app/src/capture/mod.rs
 - `WOW_CAPTURE_UI` — benilla-app/src/capture/scenarios.rs, benilla-app/src/ui_script/mod.rs, benilla-app/src/video.rs
 - `WOW_CAPTURE_WATER_T` — benilla-world/src/liquid/surface.rs, benilla-world/src/liquid/waves.rs
+- `WOW_CAPTURE_WIND_T` — benilla-world/src/wind/mod.rs
 - `WOW_CAST_TRACE` — benilla-app/src/net.rs
-- `WOW_CHAR` — benilla-app/src/capture/probe_mail.rs, benilla-app/src/char_select/mod.rs, benilla-app/src/cvars.rs, benilla-app/src/login/mod.rs, benilla-app/src/net.rs, benilla-app/src/realm_select/smoke.rs, benilla-app/src/run_mode.rs
+- `WOW_CENSUS_PLACE` — benilla-world/src/lighting/daylight/census.rs
+- `WOW_CENSUS_WMO` — benilla-world/src/lighting/daylight/census.rs
+- `WOW_CHAR` — benilla-app/src/capture/probe_mail.rs, benilla-app/src/char_select/mod.rs, benilla-app/src/cvars/mod.rs, benilla-app/src/login/mod.rs, benilla-app/src/net.rs, benilla-app/src/realm_select/smoke.rs, benilla-app/src/run_mode.rs
 - `WOW_CHARCREATE_DIALS` — benilla-app/src/char_create/mod.rs
 - `WOW_CHARCREATE_NAME` — benilla-app/src/char_create/mod.rs
 - `WOW_CHARCREATE_PICK` — benilla-app/src/capture/mod.rs, benilla-app/src/char_create/mod.rs
@@ -200,7 +213,7 @@
 - `WOW_CHARCREATE_SHOT_OUT` — benilla-app/src/char_create/mod.rs
 - `WOW_CHARSELECT_ADDONS` — benilla-app/src/char_select/mod.rs
 - `WOW_CHARSELECT_DIALOG` — benilla-app/src/char_select/mod.rs
-- `WOW_CHARSELECT_PICK` — benilla-app/src/char_select/mod.rs, benilla-app/src/cvars.rs
+- `WOW_CHARSELECT_PICK` — benilla-app/src/char_select/mod.rs, benilla-app/src/cvars/mod.rs
 - `WOW_CHARSELECT_SHOT` — benilla-world/src/bgwin.rs
 - `WOW_CHARSELECT_SHOT_AT` — benilla-app/src/char_select/mod.rs
 - `WOW_CHARSELECT_SHOT_OUT` — benilla-app/src/char_select/mod.rs
@@ -212,7 +225,7 @@
 - `WOW_CLOUD_DUMP` — benilla-world/src/clouds/mod.rs
 - `WOW_CLUSTERS` — benilla-app/src/player/setup.rs
 - `WOW_CLUTTER_ALPHA` — benilla-world/src/clutter.rs
-- `WOW_CLUTTER_DENSITY` — benilla-app/src/cvars.rs, benilla-app/src/lib.rs, benilla-world/src/clutter.rs
+- `WOW_CLUTTER_DENSITY` — benilla-app/src/cvars/mod.rs, benilla-app/src/lib.rs, benilla-world/src/clutter.rs
 - `WOW_CLUTTER_FADE` — benilla-world/src/clutter.rs
 - `WOW_COLUMN_COST` — benilla-assets/src/column_grid.rs
 - `WOW_CPU_CENSUS` — benilla-app/src/perf/census.rs
@@ -222,7 +235,7 @@
 - `WOW_CULLDUMP` — benilla-world/src/wmo_portal/mod.rs
 - `WOW_CULL_TRACE` — benilla-world/src/exterior_cull.rs
 - `WOW_CURSOR_TRACE` — benilla-app/src/cursor.rs
-- `WOW_DATA` — benilla-app/src/local_state.rs, benilla-formats/src/install.rs, benilla-formats/tests/wow_data_env.rs, benilla-formats/tests/wow_data_none.rs
+- `WOW_DATA` — benilla-app/src/local_state.rs, benilla-formats/src/install.rs, benilla-formats/tests/project_folder.rs, benilla-formats/tests/wow_data_env.rs, benilla-formats/tests/wow_data_none.rs, benilla-world/src/lighting/daylight/census.rs
 - `WOW_DAYLIGHT` — benilla-world/src/lighting/daylight.rs
 - `WOW_DAYLIGHT_SEAM_EPS` — benilla-world/src/lighting/daylight.rs
 - `WOW_DEMO_BOTTOM_BARS` — benilla-app/src/ui_script/mod.rs
@@ -241,13 +254,14 @@
 - `WOW_EMIT_DUMP` — benilla-world/src/particles/emitdump.rs
 - `WOW_ENTITY_CENSUS` — benilla-app/src/capture/probes/world_census.rs, benilla-app/src/dev.rs
 - `WOW_FADE_NEAR` — benilla-world/src/terrain_stream/spawn/mod.rs
-- `WOW_FARCLIP` — benilla-app/src/cvars.rs, benilla-world/src/view.rs
+- `WOW_FARCLIP` — benilla-app/src/cvars/mod.rs, benilla-world/src/view.rs
 - `WOW_FEED_COST` — benilla-app/src/ui_items/feed.rs
 - `WOW_FEED_GATE_CHECK` — benilla-app/src/ui_script/gate.rs, benilla-world/src/bgwin.rs
 - `WOW_FEED_GATE_TRACE` — benilla-app/src/ui_script/gate.rs, benilla-world/src/bgwin.rs
 - `WOW_FIXED_DT` — benilla-world/src/frame_pace.rs
 - `WOW_FOGMODEL` — benilla-world/src/lighting/fog_model.rs
 - `WOW_FOG_DUMP` — benilla-world/src/lighting/resolve.rs, benilla-world/src/liquid/query.rs
+- `WOW_FOLIAGE_WIND` — benilla-world/src/wind/mod.rs
 - `WOW_FOLLOW_TRACE` — benilla-app/src/player/follow.rs
 - `WOW_FORCE_SUB` — benilla-world/src/liquid/mod.rs
 - `WOW_FPS_` — benilla-world/src/bgwin.rs
@@ -287,17 +301,19 @@
 - `WOW_GX_FADE_TRACE` — benilla-world/src/static_gx/cull.rs
 - `WOW_GX_PERF` — benilla-world/src/static_gx/mod.rs
 - `WOW_HIT_COST` — benilla-app/src/ui_script/input.rs
-- `WOW_HOST` — benilla-app/src/cvars.rs, benilla-app/src/realmlist.rs
+- `WOW_HOST` — benilla-app/src/cvars/mod.rs, benilla-app/src/realmlist.rs
 - `WOW_HOVER_LOG` — benilla-app/src/hover_log.rs
 - `WOW_HOVER_LOG_REPORT` — benilla-app/src/lib.rs
 - `WOW_HOVER_PROBE` — benilla-app/src/target/hover_probe.rs
 - `WOW_INDIRECT` — benilla-world/src/world_plugins.rs
 - `WOW_INTERIOR_COST` — benilla-world/src/interior.rs
+- `WOW_INTERIOR_DAYLIGHT` — benilla-app/src/dynamic_interior.rs
 - `WOW_INTERIOR_LOG` — benilla-world/src/entity_shade.rs, benilla-world/src/interior.rs, benilla-world/src/model_fade.rs
 - `WOW_IO_BUFFER` — benilla-app/src/sound/mixer.rs
 - `WOW_JITTER` — benilla-app/src/capture/probes/jitter.rs, benilla-app/src/dev.rs
 - `WOW_JITTER_RAW` — benilla-app/src/capture/probes/jitter.rs
 - `WOW_LAMPFOG` — benilla-app/src/volumetric_fog.rs
+- `WOW_LAMP_SCAN` — benilla-world/src/lighting/daylight/census.rs
 - `WOW_LAYOUT_DERIVE_TRACE` — benilla-ui/src/script/model.rs
 - `WOW_LAYOUT_PROF` — benilla-ui/src/script/layout.rs
 - `WOW_LAYOUT_TOUCH_TRACE` — benilla-ui/src/script/model.rs
@@ -339,7 +355,7 @@
 - `WOW_MOVE_SPEED` — benilla-app/src/player/setup.rs
 - `WOW_MOVE_TRACE` — benilla-assets/src/trace.rs
 - `WOW_MOVE_TRACE_TAGS` — benilla-assets/src/trace.rs
-- `WOW_MSAA` — benilla-app/src/cvars.rs, benilla-world/src/view.rs
+- `WOW_MSAA` — benilla-app/src/cvars/mod.rs, benilla-world/src/view.rs
 - `WOW_MT_EXTRACT` — benilla-app/src/lib.rs
 - `WOW_MT_POSTUPDATE` — benilla-app/src/lib.rs
 - `WOW_MT_UPDATE` — benilla-app/src/lib.rs
@@ -379,6 +395,7 @@
 - `WOW_PARTICLE_NODEPTH` — benilla-world/src/particles/render.rs
 - `WOW_PART_CHURN` — benilla-app/src/perf/mod.rs
 - `WOW_PASS` — benilla-app/src/login/mod.rs, benilla-app/src/net.rs, benilla-app/src/run_mode.rs, benilla-protocol/examples/login_refusal_probe.rs, benilla-protocol/examples/park_probe.rs
+- `WOW_PERF_CROWD` — benilla-app/src/capture/fixtures.rs
 - `WOW_PERF_HUD` — benilla-app/src/perf/hud.rs
 - `WOW_PHASE` — benilla-app/src/capture/phase_probe.rs, benilla-app/src/dev.rs, benilla-world/src/bgwin.rs
 - `WOW_PHASE_AT` — benilla-app/src/capture/phase_probe.rs
@@ -452,13 +469,14 @@
 - `WOW_PROBE_UNCAP` — benilla-app/src/capture/mod.rs
 - `WOW_PROBE_VENDOR_SWAP` — benilla-app/src/dev.rs
 - `WOW_PROBE_VSYNC` — benilla-app/src/capture/mod.rs
+- `WOW_RAIN_SURFACES` — benilla-world/src/weather/wetness.rs
 - `WOW_REALM` — benilla-app/src/realm_select/mod.rs
 - `WOW_REALM_SMOKE` — benilla-app/src/realm_select/smoke.rs
 - `WOW_REFUSE_LOGIN` — benilla-app/src/net/io.rs
 - `WOW_REMOTE_FLAT` — benilla-app/src/net/motion/remote.rs
 - `WOW_REMOTE_IDLE_GATE` — benilla-app/src/net/motion/remote.rs
 - `WOW_REMOTE_SNAP` — benilla-app/src/net/motion/remote.rs
-- `WOW_RENDER_SCALE` — benilla-app/src/cvars.rs, benilla-app/src/world_backdrop.rs
+- `WOW_RENDER_SCALE` — benilla-app/src/cvars/mod.rs, benilla-app/src/world_backdrop.rs
 - `WOW_RESIZE` — benilla-app/src/capture/mod.rs
 - `WOW_RES_CENSUS` — benilla-app/src/perf/census.rs
 - `WOW_REVEAL` — benilla-app/src/capture/probes/reveal.rs, benilla-app/src/dev.rs
@@ -472,9 +490,12 @@
 - `WOW_SHADOW_TRACE` — benilla-app/src/shadow_core.rs
 - `WOW_SHOT_REQUIRE` — benilla-app/src/capture/live_shot.rs
 - `WOW_SHOT_REQUIRE_DIST` — benilla-app/src/capture/live_shot.rs
+- `WOW_SKYBOX_T` — benilla-world/src/skybox.rs
 - `WOW_SKY_DEPTH` — benilla-assets/src/materials.rs
+- `WOW_SKY_QUALITY` — benilla-world/src/sky_fx.rs
 - `WOW_SOUND_PROBE` — benilla-app/src/sound/probe.rs
 - `WOW_SPELL_LIGHT` — benilla-app/src/entities/spell_fx/lifecycle.rs
+- `WOW_STAGE1` — benilla-assets/src/materials.rs
 - `WOW_STALL` — benilla-app/src/capture/probes/stall.rs, benilla-app/src/dev.rs
 - `WOW_STALL_INJECT` — benilla-app/src/perf/stall.rs
 - `WOW_STALL_SAMPLE` — benilla-app/src/perf/stall.rs
@@ -483,6 +504,7 @@
 - `WOW_STATIC_GX_PROP` — benilla-world/src/static_gx/mod.rs
 - `WOW_STATIC_GX_WMO` — benilla-world/src/static_gx/mod.rs
 - `WOW_STATIC_MERGE` — benilla-world/src/terrain_stream/merge.rs
+- `WOW_STOCK_UI` — benilla-app/src/ui_script/manifest.rs
 - `WOW_STREAM_TRACE` — benilla-app/src/perf/mod.rs
 - `WOW_TABHOVER` — benilla-app/src/capture/fixtures.rs
 - `WOW_TAB_TRACE` — benilla-app/src/target/scan.rs
@@ -493,9 +515,10 @@
 - `WOW_TILE_TRACE` — benilla-app/src/ui_models/mod.rs
 - `WOW_TILE_UNLOAD` — benilla-world/src/assets/mod.rs
 - `WOW_TINT_PROBE` — benilla-app/src/aura_visual.rs
+- `WOW_TORCH_TERRAIN` — benilla-app/src/torch_shadow.rs
 - `WOW_TORCH_TRACE` — benilla-app/src/torch_shadow.rs, benilla-world/src/static_gx/torch_depth.rs
 - `WOW_TRAIL_CENSUS` — benilla-app/src/capture/probes/trail_census.rs, benilla-app/src/dev.rs
-- `WOW_TRILINEAR` — benilla-app/src/cvars.rs, benilla-assets/src/tex_filter.rs
+- `WOW_TRILINEAR` — benilla-app/src/cvars/mod.rs, benilla-assets/src/tex_filter.rs
 - `WOW_TWIST_GAP` — benilla-app/src/player/body_pose.rs
 - `WOW_UISCRIPT_DUMP` — benilla-app/tests/ui_script_wall.rs
 - `WOW_UI_COST` — benilla-app/src/ui_script/extract/mod.rs
@@ -504,15 +527,13 @@
 - `WOW_UI_HANDLERS` — benilla-ui/src/script/handler_prof.rs
 - `WOW_UI_PICK` — benilla-app/src/ui_script/extract/mod.rs
 - `WOW_UI_PROBE` — benilla-app/src/ui_pass.rs
-- `WOW_UI_SCALE` — benilla-app/src/cvars.rs, benilla-app/src/ui_script/mod.rs
+- `WOW_UI_SCALE` — benilla-app/src/cvars/mod.rs, benilla-app/src/ui_script/mod.rs
 - `WOW_UI_SPLICE_VERIFY` — benilla-app/src/ui_script/extract/mod.rs
 - `WOW_UNATTENDED` — benilla-app/src/login/mod.rs, benilla-app/src/net.rs, benilla-app/src/run_mode.rs, benilla-world/src/bgwin.rs
 - `WOW_UNIT_VISUALS` — benilla-app/src/capture/probes/visual_census.rs, benilla-app/src/dev.rs
 - `WOW_UNIT_VISUALS_RADIUS` — benilla-app/src/capture/probes/visual_census.rs
 - `WOW_UPLOAD_BUDGET` — benilla-world/src/world_plugins.rs
 - `WOW_USER` — benilla-app/src/login/mod.rs, benilla-app/src/net.rs, benilla-app/src/run_mode.rs, benilla-protocol/examples/login_refusal_probe.rs, benilla-protocol/examples/park_probe.rs
-- `WOW_VIS_DUMP` — benilla-app/src/capture/probes/live_fps.rs
-- `WOW_VIS_TRACE` — benilla-world/src/model_render/visibility.rs
 - `WOW_VISTA_AT` — benilla-app/src/capture/mod.rs
 - `WOW_VISTA_FACE` — benilla-app/src/capture/mod.rs
 - `WOW_VISTA_MIN` — benilla-app/src/capture/mod.rs
@@ -521,13 +542,21 @@
 - `WOW_VIS_TRACE` — benilla-world/src/model_render/visibility.rs
 - `WOW_VOLFOG` — benilla-app/src/volumetric_fog.rs
 - `WOW_VOLFOG_SHAFT_GAIN` — benilla-app/src/volumetric_fog.rs
+- `WOW_VOLLIGHT` — benilla-app/src/volumetric_light.rs
+- `WOW_VOLLIGHT_DEBUG` — benilla-app/src/volumetric_light.rs
+- `WOW_VOLLIGHT_DENSITY` — benilla-app/src/volumetric_light.rs
+- `WOW_VOLLIGHT_GAIN` — benilla-app/src/volumetric_light.rs
+- `WOW_VOLLIGHT_HEIGHT` — benilla-app/src/volumetric_light.rs
 - `WOW_VPLATE_TRACE` — benilla-app/src/vplates.rs
 - `WOW_WARM_SLICE` — benilla-app/src/pipe_warm/mod.rs
 - `WOW_WATER` — benilla-world/src/liquid/scene_depth.rs
 - `WOW_WATER_CLIP` — benilla-assets/src/materials.rs
+- `WOW_WATER_PROBE` — benilla-world/src/liquid/surface.rs
 - `WOW_WAVE_DUMP` — benilla-world/src/ffx_glow.rs
 - `WOW_WEATHER` — benilla-world/src/weather/mod.rs
 - `WOW_WEATHER_DUMP` — benilla-world/src/weather/mod.rs
+- `WOW_WETNESS` — benilla-world/src/weather/wetness.rs
+- `WOW_WET_T` — benilla-world/src/weather/wetness.rs
 - `WOW_WFX_AGE` — benilla-app/src/capture/mod.rs
 - `WOW_WFX_AT` — benilla-app/src/capture/mod.rs
 - `WOW_WFX_AZ` — benilla-app/src/capture/mod.rs
@@ -545,6 +574,7 @@
 - `WOW_WORLDVIEW_SHOT` — benilla-world/src/worldview.rs
 - `WOW_WORLDVIEW_SHOT_AT` — benilla-world/src/worldview.rs
 - `WOW_WORLDVIEW_SURVEY` — benilla-world/src/worldview.rs
+- `WOW_ZONE_SKYBOXES` — benilla-app/src/zone_skybox.rs
 
 ## Scripts (`scripts/`)
 
diff --git a/docs/METHOD.md b/docs/METHOD.md
index 5019bc2e..5e4ec04e 100644
--- a/docs/METHOD.md
+++ b/docs/METHOD.md
@@ -10,7 +10,9 @@ not build a server or simulate the game. The reference client is the spec: benil
 A change is right when it makes benilla more like 1.12.1 or fixes a bug, with evidence from the
 reference, in one small piece, with the gates green. A deviation from the reference is the
 maintainer's call alone, and each one is written down where it lives: a CVar's `Deviates` row, a
-comment naming the reference fact and why we differ. Anything else is a fork.
+comment naming the reference fact and why we differ. Anything else lives on top of benilla, in a
+crate of its own or a fork, and benilla opens a piece of itself to such a crate only when its own
+1.12.1 work creates that piece (`docs/CONTRIBUTING.md`, "Building on top").
 
 ## The loop
 
@@ -36,19 +38,22 @@ comment naming the reference fact and why we differ. Anything else is a fork.
 ## Hard rules
 
 - **Never commit anything from the install.** Art, models, sounds, maps, data: the install is
-  read at runtime from a gitignored path, and everyone provides their own. The one exception is
-  interface code: FrameXML and GlueXML run off the player's own patch chain, and our own
-  counterparts under `assets/ui` stay until they retire.
+  read at runtime from a gitignored path, and everyone provides their own. Interface code is no
+  exception: FrameXML and GlueXML run off the player's own patch chain, and `assets/ui` holds
+  only benilla's own files.
 - **The install is read-only.** benilla never writes into the WoW folder: no screenshot, log,
   cache or scratch file. `scripts/smoke.sh` fails a run that leaves the install changed.
 - **Local state lives in one folder**, `benilla-config/`, at the repo root in a dev build and
   beside the binary in the player build; every path to it resolves through `crate::local_state`.
   Player settings are CVars persisted as a diff in `benilla-config/config.toml`.
-- **UI is stock-first: a window is migrated, not authored.** The end state is the stock 1.12
-  FrameXML executed off the player's own chain. `assets/ui` does not grow: a test names its
-  files and fails on a new one. A window is built by pointing `benilla.toc` at the stock file,
-  deleting ours and building the engine verbs it calls, never stubbing one to make the file
-  load.
+- **The core UI is the stock UI; benilla's own is one layer on top.** The core loads the stock
+  1.12 FrameXML off the player's own chain, byte for byte, and builds the engine verbs those
+  files call, never stubbing one to make a file load. benilla's own interface (its options
+  window, its game-menu look, its fixes to the stock Lua) is one layer that loads after the
+  stock files and before third-party addons, the way an addon does: written against the 1.12 API
+  alone, listed in no addon list and always on, and offering nothing another addon can build on.
+  Anything that changes what the stock UI does or shows lives in the layer, and the layer does
+  not grow: a test names its files and fails on a new one.
 - **A setting's default is the reference's default.** Every option boots at the stock 1.12
   value. Shipping another value costs an explicit `Deviates` row with the reason, and a test
   fails a row that drifts either way.
diff --git a/reference/README.md b/reference/README.md
index 2f5644cd..61273c26 100644
--- a/reference/README.md
+++ b/reference/README.md
@@ -37,8 +37,12 @@ the reference client's `_G`, which is not in this repo, so it is a manual regene
 stable: it describes a client that shipped in 2006.
 
 Reading it: `scripts/api-coverage.sh` asks a real `UiScript::new()` what benilla exposes and reports
-`have / missing / beyond-1.12`. `crates/benilla-ui/src/script/tests/reference_surface.rs` is the
-gate: it fails if benilla grows a global that 1.12 does not have and nobody wrote down why.
+`have / missing / beyond-1.12`. Two gates hold the line.
+`crates/benilla-ui/src/script/tests/reference_surface.rs` fails if the engine puts a global 1.12
+does not have in a bare VM and nobody wrote down why, with no prefix excusing an engine name.
+`crates/benilla-app/src/ui_script/surface_gate.rs` fails if the production load, the core and
+benilla's layer, adds any global past 1.12 other than the layer's own `Benilla`-prefixed names, or
+any widget method.
 
 ## `1.12-shapes.tsv` and `1.12-events.tsv`
 
diff --git a/scripts/api-coverage.sh b/scripts/api-coverage.sh
index a864bbb6..1cc397a8 100755
--- a/scripts/api-coverage.sh
+++ b/scripts/api-coverage.sh
@@ -50,10 +50,9 @@ awk -F'\t' -v ref="$REF" -v show_missing="$show_missing" -v show_beyond="$show_b
     if (o == "engine" || o == "lua") have++
     else if (o == "framexml") transcribable[$1] = 1
     else {
-      # Categorize the superset. Only the last bucket is an API-target question; the first two are
-      # benilla being benilla, and the third is our Lua runtime being 5.1 where 1.12 is 5.0.
+      # Categorize the superset. Only the last bucket is an API-target question; the first is
+      # benilla being benilla, and the second is our Lua runtime being 5.1 where 1.12 is 5.0.
       if ($1 ~ /^Benilla/)                                    bridge[$1] = 1
-      else if ($1 ~ /^__/)                                    internal[$1] = 1
       else if ($1 ~ /^(_G|_VERSION|coroutine|print|select)$/)  lua51[$1] = 1
       else                                                     api[$1] = 1
     }
@@ -66,7 +65,7 @@ awk -F'\t' -v ref="$REF" -v show_missing="$show_missing" -v show_beyond="$show_b
       n_ref["engine"] + n_ref["framexml"] + n_ref["lua"]
     printf "  engine    %5d functions, %5d other   <- benilla implements these in Rust\n", \
       n_ref_fn["engine"], n_ref["engine"] - n_ref_fn["engine"]
-    printf "  framexml  %5d functions, %5d other   <- benilla transcribes these into assets/ui\n", \
+    printf "  framexml  %5d functions, %5d other   <- the stock FrameXML defines these\n", \
       n_ref_fn["framexml"], n_ref["framexml"] - n_ref_fn["framexml"]
     printf "  lua       %5d functions, %5d other   <- mlua provides these\n", \
       n_ref_fn["lua"], n_ref["lua"] - n_ref_fn["lua"]
@@ -78,7 +77,6 @@ awk -F'\t' -v ref="$REF" -v show_missing="$show_missing" -v show_beyond="$show_b
 
     printf "\nbeyond 1.12, by kind — every one of these is a deliberate exception or a bug:\n"
     printf "  %3d  benilla host bridge      Benilla*, called only by our own FrameXML\n", length(bridge)
-    printf "  %3d  VM internals             __benilla_*, pushed by the tick\n", length(internal)
     printf "  %3d  Lua 5.1 past 1.12'\''s 5.0  ", length(lua51); dump(lua51, "")
     printf "  %3d  WoW API past 1.12        the phase-5 list\n", length(api)
     printf "  %3d  ours in Rust that 1.12 defines in FrameXML\n", length(transcribable)
diff --git a/scripts/check.sh b/scripts/check.sh
index 784f08cd..9cdccfce 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -92,7 +92,7 @@ esac
 pflags=""
 for p in $pkgs; do pflags="$pflags -p $p"; done
 echo "check: scope = $pkgs"
-echo "check:   (changed crates + everything that depends on them; full chain still runs at sync→land)"
+echo "check:   (changed crates + everything that depends on them; the full chain runs once, at land)"
 
 log="$(mktemp "${TMPDIR:-/tmp}/benilla-check.XXXXXX")"
 skips="$(mktemp "${TMPDIR:-/tmp}/benilla-check-skips.XXXXXX")"
@@ -120,4 +120,4 @@ if [ -s "$skips" ]; then
 fi
 
 echo "CHECK GREEN (scoped: $pkgs)"
-echo "  (land still pays the full chain once: scripts/gates.sh — memoized, so an already-gated tree is free)"
+echo "  (the full chain, scripts/gates.sh, runs once on the tree that lands; a run before it repeats it)"
diff --git a/scripts/gates.sh b/scripts/gates.sh
index ca610ffc..b3cb45b4 100755
--- a/scripts/gates.sh
+++ b/scripts/gates.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 # The land gate chain: every gate in order, stopping at the first failure.
 #
-# fmt, clippy, test, test-no-install, doc-links, pass-span-lint, player-build, player-tests,
-# enforcer, enforcer-no-install. A failure prints the gate's log tail and exits nonzero; a green
+# fmt, clippy, test, test-no-install, doc-links, pass-span-lint, player-tests, enforcer,
+# enforcer-no-install. A failure prints the gate's log tail and exits nonzero; a green
 # run stamps the tree, which then re-greens without running. GATES_FORCE=1 runs the chain anyway,
 # WOW_DATA picks the install (set and empty: none) and TMPDIR holds the scratch files; the script
-# sets BENILLA_REQUIRE_DATA, BENILLA_SKIP_LOG and WOW_WORLDVIEW_CHECK for its gates.
+# sets BENILLA_REQUIRE_DATA, BENILLA_ADDON_CORPUS, BENILLA_SKIP_LOG and WOW_WORLDVIEW_CHECK for
+# its gates.
 # `.github/workflows/ci.yml` runs the gates that need neither the install nor a display on a fork's
 # pull request: a gate added here goes there too, if it can run on a bare Linux runner.
 #
@@ -134,15 +135,18 @@ run doc-links scripts/doc-links.py
 # wgpu validation error on Vulkan and a silent no-op on Metal and DX12, which no macOS run sees.
 run pass-span-lint scripts/pass-span-lint.py
 
-# player-build: `benilla` without `dev`, which compiles out the debug panel, perf HUD, inspector,
-# capture harness and probes, so it fails when any other code names one of them.
-run player-build cargo build -p benilla --no-default-features
-
-# player-tests: the unit tests of the `cfg(not(feature = "dev"))` code (the resolver skips the
-# source tree; the state folder sits beside the binary), which no other gate runs. WOW_DATA, which
-# a player build reads too, goes in for the shipped-UI tests that read FrameXML off the install; no
-# BENILLA_REQUIRE_DATA, since without `dev` only $BENILLA_ADDON_CORPUS finds the addon corpus.
-run player-tests env ${wow_data:+WOW_DATA="$wow_data"} BENILLA_SKIP_LOG="$skips" \
+# player-tests: the player build, `benilla-app` without `dev`, which compiles out the debug panel,
+# perf HUD, inspector, capture harness and probes, so it fails when any other code names one of
+# them. Its test build compiles every line of the player graph but the `benilla` launcher, a shim
+# with no `dev` seam, so a `cargo build -p benilla --no-default-features` would add only the shim
+# and a link. It runs the unit tests of the `cfg(not(feature = "dev"))` code (the resolver skips
+# the source tree; the state folder sits beside the binary), which no other gate runs. WOW_DATA, which
+# a player build reads too, goes in for the shipped-UI tests that read FrameXML off the install.
+# Without `dev` only $BENILLA_ADDON_CORPUS finds the addon corpus, so the link goes in by that name,
+# and BENILLA_REQUIRE_DATA refuses a skip here exactly where it does in `test`.
+run player-tests env ${wow_data:+WOW_DATA="$wow_data"} \
+    ${corpus:+BENILLA_ADDON_CORPUS="$root/wow-addons-vanilla"} \
+    ${require_data:+BENILLA_REQUIRE_DATA=1} BENILLA_SKIP_LOG="$skips" \
     cargo test -p benilla-formats -p benilla-app --no-default-features --lib
 report_skips player-tests
 
diff --git a/scripts/smoke.sh b/scripts/smoke.sh
index bda7cab7..f0001573 100755
--- a/scripts/smoke.sh
+++ b/scripts/smoke.sh
@@ -126,24 +126,25 @@ panics="$(printf '%s\n' "$plain" | grep -cE 'panicked at')"
 [ "$errors" -ne 0 ] && fail "$errors ERROR line(s)"
 
 # A marker counts once per edge it fires on. Each world entry builds a world VM beside the
-# character screen's glue VM (the reference's `0x490bd0`/`0x48fbf0` pair), so per-VM markers count
+# character screen's glue VM (the reference's `0x490bd0`/`0x48fbf0` pair), so the VM marker counts
 # twice per login; half that means an entry adopted the glue VM and its spent `VmMemo`s.
 sessions=2            # world entries in this walk
 vms=$((sessions * 2)) # …and the Lua states they cost: a glue VM and a world VM each
-for marker in "Fonts.xml loaded"; do
+for marker in "new VM, session"; do
     n="$(printf '%s\n' "$plain" | grep -cF "$marker")"
     printf '  %-24s %s\n' "$marker" "$n"
     [ "$n" -eq "$vms" ] ||
         fail "'$marker' happened $n time(s), expected $vms — one per VM built, two per login; \
 $sessions would mean the entry adopted the character screen's VM and inherited its spent VmMemos"
 done
-# The in-game UI and the keybinding table (`seed_bindings_for_vm`, run on the world-entry edge)
-# build once per login; one count for two logins means the second reused the first's frame tree.
-for marker in "UIParent.xml loaded" "commands registered"; do
+# The in-game UI, `FrameXML.toc`'s `Fonts.xml` included, and the key-binding commands (the core's
+# `Bindings.xml`, loaded after the toc) build once per login; one count for two logins means the
+# second reused the first's frame tree.
+for marker in "Fonts.xml loaded" "UIParent.xml loaded" "commands registered"; do
     n="$(printf '%s\n' "$plain" | grep -cF "$marker")"
     printf '  %-24s %s\n' "$marker" "$n"
     [ "$n" -eq "$sessions" ] ||
-        fail "'$marker' happened $n time(s), expected $sessions — once per login: the UI rebuilt per login and the keybinding table seeded on the entry edge"
+        fail "'$marker' happened $n time(s), expected $sessions — once per login: the UI and its binding commands rebuilt per login"
 done
 
 # The shutdown tail runs once per session: at the /logout, and at the exit, which closes the window
diff --git a/third_party/kira/BENILLA.md b/third_party/kira/BENILLA.md
index c5b7cb65..244953a8 100644
--- a/third_party/kira/BENILLA.md
+++ b/third_party/kira/BENILLA.md
@@ -1,10 +1,19 @@
 # benilla's `kira` fork — what differs from upstream, and how to check
 
 Upstream: [`tesselode/kira`](https://github.com/tesselode/kira), MIT OR Apache-2.0, version
-`0.12.1` — the version the workspace lock resolves to. Wired in through `[patch.crates-io]` in
+`0.12.4` — the version the workspace lock resolves to. Wired in through `[patch.crates-io]` in
 the workspace root, the way `lua-src` is. The crate is copied from the cargo registry as
 published (`src/`, `Cargo.toml`, `README.md`) plus the two licence files from the repository;
-upstream files are CRLF and are left so, except the one file patched.
+upstream files are CRLF and are left so, except the two files patched, which are LF.
+
+0.12.4 is the first kira on symphonia 0.6, whose WAV reader sizes a PCM frame from the channels
+and sample width. 0.5 took it from the header's `nBlockAlign`, which 98 of the install's stereo
+WAVs store as 2, a mono frame, so it counted them at twice their length and a looping stream of
+one fell silent at the real end. 0.6's MP3 decoder also matches mpg123 within 6e-6 on 199 of the
+install's 200 MP3s and 1.4e-3 on the last, where 0.5's is off by more than 0.01, up to 0.15 of
+full scale, in some frames of 63; 0.6 ends 83 of them one silent MPEG frame (1152 samples)
+sooner than both.
+0.12.5 differs from 0.12.4 only in taking `rtrb` 0.4, which `benilla-app` shares with kira.
 
 ## Why a fork exists at all
 
@@ -18,7 +27,7 @@ frame per spatial track, then two more `powf`s per frame for the volume tween an
 imperceptibly across a 10 ms chunk. FMOD 3 — the mixer the real client delegates to — updates
 pan and attenuation per mixer update, not per sample.
 
-## The one patch — `src/track/sub.rs`
+## Patch 1 — `src/track/sub.rs`
 
 `Track::process` evaluates the spatial gains (attenuation, left/right ear gain, the mono fold)
 and the volume × fade amplitude at the chunk's two ends and interpolates them linearly across
@@ -31,9 +40,19 @@ chunk pans linearly in gain over 10 ms instead of following the dot product per
 volume tween ramps linearly in amplitude across each chunk instead of in decibels. Both are
 below the granularity the reference itself updates at.
 
+## Patch 2 — `src/sound/streaming/decoder/symphonia.rs`
+
+`SymphoniaDecoder::decode` returns an error at the end of the packets, as 0.12.1 did on
+symphonia 0.5, where 0.12.4 returns an empty chunk. `DecodeScheduler::frame_at_index` decodes
+until it holds the frame asked for, so when a stream's reported length runs past its last packet
+it loops on empty chunks forever: the sound never ends and its decode thread spins until the
+process exits, even after the sound is stopped. symphonia 0.6 estimates the length of an MP3
+without a Xing header from its first frames, and over-counts one of the install's tracks,
+`ZulGurubVooDoo.mp3`, by one frame. With the error the sound stops where its packets end.
+
 ## How to check
 
-`git diff --no-index <registry>/kira-0.12.1/src/track/sub.rs third_party/kira/src/track/sub.rs`
-(after `sed 's/\r$//'` on the upstream copy) shows the patch and nothing else; every other file
-is byte-identical to the registry crate. The mixer's own tests (`cargo test -p benilla-app
-sound::`) run against the fork.
+For each patched file, `diff -u <(sed 's/\r$//' <registry>/kira-0.12.4/<file>)
+third_party/kira/<file>` shows the patch and nothing else; every other file is byte-identical to
+the registry crate. The mixer's own tests (`cargo test -p benilla-app sound::`) run against the
+fork, `sound::mixer::tests::a_stream_that_runs_out_before_its_reported_length_stops` on patch 2.
diff --git a/third_party/kira/Cargo.toml b/third_party/kira/Cargo.toml
index 673bcf46..9b7d6d44 100644
--- a/third_party/kira/Cargo.toml
+++ b/third_party/kira/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2024"
 name = "kira"
-version = "0.12.1"
+version = "0.12.4"
 authors = ["Andrew Minnich <aminnich3@gmail.com>"]
 build = false
 autolib = false
@@ -63,8 +63,18 @@ caf = [
     "symphonia",
     "symphonia/caf",
 ]
+cpal-realtime = [
+    "cpal",
+    "cpal/realtime",
+]
+cpal-realtime-dbus = [
+    "cpal",
+    "cpal/realtime-dbus",
+]
 default = [
     "cpal",
+    "cpal-realtime",
+    "cpal-realtime-dbus",
     "mp3",
     "ogg",
     "vorbis",
@@ -159,7 +169,7 @@ features = ["derive"]
 optional = true
 
 [dependencies.symphonia]
-version = "0.5.4"
+version = "0.6.0"
 optional = true
 default-features = false
 
@@ -170,11 +180,11 @@ version = "9.0.0"
 version = "0.5.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.cpal]
-version = "0.17.0"
+version = "0.18.1"
 optional = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.cpal]
-version = "0.17.0"
+version = "0.18.1"
 features = ["wasm-bindgen"]
 optional = true
 
diff --git a/third_party/kira/README.md b/third_party/kira/README.md
index 51e6fc3e..9fcb6e5d 100644
--- a/third_party/kira/README.md
+++ b/third_party/kira/README.md
@@ -125,9 +125,9 @@ Features I'd like to have:
 
 ## Contributing
 
-I'd love for other people to get involved with development! Since the library is
-still in the early stages, I'm open to all kinds of input - bug reports, feature
-requests, design critiques, etc. Feel free to open an issue or pull request!
+I'd love for other people to get involved with development! I'm open to all kinds of
+input - bug reports, feature requests, design critiques, etc. Feel free to open an
+issue or pull request!
 
 ## License
 
diff --git a/third_party/kira/src/backend/cpal.rs b/third_party/kira/src/backend/cpal.rs
index 71aa241c..5f0c6d4f 100644
--- a/third_party/kira/src/backend/cpal.rs
+++ b/third_party/kira/src/backend/cpal.rs
@@ -3,9 +3,12 @@
 #![cfg_attr(docsrs, doc(cfg(feature = "cpal")))]
 
 mod error;
-use cpal::{Device, StreamConfig};
+
+pub use cpal;
 pub use error::*;
 
+use cpal::{Device, StreamConfig};
+
 /// Settings for the cpal backend.
 #[derive(Clone, Default)]
 pub struct CpalBackendSettings {
diff --git a/third_party/kira/src/backend/cpal/desktop.rs b/third_party/kira/src/backend/cpal/desktop.rs
index 77ad57f1..a9e79aac 100644
--- a/third_party/kira/src/backend/cpal/desktop.rs
+++ b/third_party/kira/src/backend/cpal/desktop.rs
@@ -9,7 +9,7 @@ use stream_manager::{StreamManager, StreamManagerController};
 
 use crate::backend::{Backend, Renderer};
 use cpal::{
-	BufferSize, Device, StreamConfig, StreamError,
+	BufferSize, Device, StreamConfig,
 	traits::{DeviceTrait, HostTrait},
 };
 
@@ -60,7 +60,7 @@ impl CpalBackend {
 
 	/// Returns the oldest available stream error in the queue.
 	#[cfg_attr(docsrs, doc(cfg(not(wasm32))))]
-	pub fn pop_error(&mut self) -> Option<StreamError> {
+	pub fn pop_error(&mut self) -> Option<cpal::Error> {
 		if let State::Initialized {
 			stream_manager_controller,
 		} = &mut self.state
diff --git a/third_party/kira/src/backend/cpal/desktop/stream_manager.rs b/third_party/kira/src/backend/cpal/desktop/stream_manager.rs
index 3eae856d..68bac309 100644
--- a/third_party/kira/src/backend/cpal/desktop/stream_manager.rs
+++ b/third_party/kira/src/backend/cpal/desktop/stream_manager.rs
@@ -10,7 +10,7 @@ use std::{
 
 use super::renderer_with_cpu_usage::RendererWithCpuUsage;
 use cpal::{
-	BufferSize, Device, Stream, StreamConfig, StreamError,
+	BufferSize, Device, Stream, StreamConfig,
 	traits::{DeviceTrait, HostTrait, StreamTrait},
 };
 use rtrb::{Consumer, Producer, PushError, RingBuffer};
@@ -35,7 +35,7 @@ enum State {
 pub(super) struct StreamManagerController {
 	should_drop: Arc<AtomicBool>,
 	num_stream_errors_discarded: Arc<AtomicU64>,
-	handled_stream_error_consumer: Mutex<Consumer<StreamError>>,
+	handled_stream_error_consumer: Mutex<Consumer<cpal::Error>>,
 }
 
 impl StreamManagerController {
@@ -48,7 +48,7 @@ impl StreamManagerController {
 		self.num_stream_errors_discarded.load(Ordering::Acquire)
 	}
 
-	pub fn pop_handled_error(&mut self) -> Option<StreamError> {
+	pub fn pop_handled_error(&mut self) -> Option<cpal::Error> {
 		self.handled_stream_error_consumer
 			.get_mut()
 			.unwrap()
@@ -139,15 +139,15 @@ impl StreamManager {
 	/// Restarts the stream if the audio device gets disconnected.
 	fn check_stream(
 		&mut self,
-		unhandled_stream_error_consumer: &mut Consumer<StreamError>,
-		handled_stream_error_producer: &mut Producer<StreamError>,
+		unhandled_stream_error_consumer: &mut Consumer<cpal::Error>,
+		handled_stream_error_producer: &mut Producer<cpal::Error>,
 		num_stream_errors_discarded: &Arc<AtomicU64>,
 	) {
 		if let State::Running { .. } = &self.state {
 			while let Ok(error) = unhandled_stream_error_consumer.pop() {
-				match error {
+				match error.kind() {
 					// check for device disconnection
-					StreamError::DeviceNotAvailable | StreamError::StreamInvalidated => {
+					cpal::ErrorKind::DeviceNotAvailable | cpal::ErrorKind::StreamInvalidated => {
 						self.stop_stream();
 						if let Ok((device, mut config)) = default_device_and_config() {
 							// TODO: gracefully handle errors that occur in this function
@@ -160,7 +160,8 @@ impl StreamManager {
 								.unwrap();
 						}
 					}
-					StreamError::BackendSpecific { err: _ } | StreamError::BufferUnderrun => {}
+					// cpal::ErrorKind::BackendSpecific { err: _ } | StreamError::BufferUnderrun => {}
+					_ => {}
 				}
 				match handled_stream_error_producer.push(error) {
 					Ok(()) => {}
@@ -194,7 +195,7 @@ impl StreamManager {
 		device: &Device,
 		config: &mut StreamConfig,
 		num_stream_errors_discarded: Arc<AtomicU64>,
-	) -> Result<Consumer<StreamError>, Error> {
+	) -> Result<Consumer<cpal::Error>, Error> {
 		let mut renderer =
 			if let State::Idle { renderer } = std::mem::replace(&mut self.state, State::Empty) {
 				renderer
@@ -214,7 +215,7 @@ impl StreamManager {
 			RingBuffer::new(64);
 		let channels = config.channels;
 		let stream = device.build_output_stream(
-			config,
+			*config,
 			move |data: &mut [f32], _| {
 				#[cfg(feature = "assert_no_alloc")]
 				assert_no_alloc::assert_no_alloc(|| {
diff --git a/third_party/kira/src/backend/cpal/error.rs b/third_party/kira/src/backend/cpal/error.rs
index 5acb2ecc..d17bc35f 100644
--- a/third_party/kira/src/backend/cpal/error.rs
+++ b/third_party/kira/src/backend/cpal/error.rs
@@ -1,58 +1,32 @@
 use std::fmt::{Display, Formatter};
-
-use cpal::{BuildStreamError, DefaultStreamConfigError, PlayStreamError};
-
 /// Errors that can occur when using the cpal backend.
 #[derive(Debug)]
 pub enum Error {
 	/// A default audio output device could not be determined.
 	NoDefaultOutputDevice,
-	/// An error occurred when getting the default output configuration.
-	DefaultStreamConfigError(DefaultStreamConfigError),
-	/// An error occurred when building the audio stream.
-	BuildStreamError(BuildStreamError),
-	/// An error occurred when starting the audio stream.
-	PlayStreamError(PlayStreamError),
+	/// An error occurred in the cpal backend.
+	CpalError(cpal::Error),
 }
-
 impl Display for Error {
 	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
 		match self {
 			Error::NoDefaultOutputDevice => {
 				f.write_str("Cannot find the default audio output device")
 			}
-			Error::DefaultStreamConfigError(error) => error.fmt(f),
-			Error::BuildStreamError(error) => error.fmt(f),
-			Error::PlayStreamError(error) => error.fmt(f),
+			Error::CpalError(error) => error.fmt(f),
 		}
 	}
 }
-
 impl std::error::Error for Error {
 	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
 		match self {
-			Error::DefaultStreamConfigError(error) => Some(error),
-			Error::BuildStreamError(error) => Some(error),
-			Error::PlayStreamError(error) => Some(error),
+			Error::CpalError(error) => Some(error),
 			_ => None,
 		}
 	}
 }
-
-impl From<DefaultStreamConfigError> for Error {
-	fn from(v: DefaultStreamConfigError) -> Self {
-		Self::DefaultStreamConfigError(v)
-	}
-}
-
-impl From<BuildStreamError> for Error {
-	fn from(v: BuildStreamError) -> Self {
-		Self::BuildStreamError(v)
-	}
-}
-
-impl From<PlayStreamError> for Error {
-	fn from(v: PlayStreamError) -> Self {
-		Self::PlayStreamError(v)
+impl From<cpal::Error> for Error {
+	fn from(v: cpal::Error) -> Self {
+		Self::CpalError(v)
 	}
 }
diff --git a/third_party/kira/src/backend/cpal/wasm.rs b/third_party/kira/src/backend/cpal/wasm.rs
index b370febf..65ae7ad0 100644
--- a/third_party/kira/src/backend/cpal/wasm.rs
+++ b/third_party/kira/src/backend/cpal/wasm.rs
@@ -60,7 +60,7 @@ impl Backend for CpalBackend {
 		{
 			let channels = config.channels;
 			let stream = device.build_output_stream(
-				&config,
+				config,
 				move |data: &mut [f32], _| {
 					renderer.on_start_processing();
 					renderer.process(data, channels);
diff --git a/third_party/kira/src/lib.rs b/third_party/kira/src/lib.rs
index cd054d39..b0149339 100644
--- a/third_party/kira/src/lib.rs
+++ b/third_party/kira/src/lib.rs
@@ -123,6 +123,9 @@ The Kira crate has the following feature flags:
 - `cpal` (enabled by default) - enables the cpal backend and makes it the default for
   audio managers. This allows Kira to talk to the operating system to output audio. Most
   users should leave this enabled.
+	- `cpal-realtime` and `cpal-realtime-dbus` (enabled by default) - correspond to
+	`cpal`'s `realtime` and `realtime-dbus` features to run the audio thread at a higher priority.
+	See the [cpal readme](https://github.com/RustAudio/cpal#optional-features) for details.
 - `symphonia` (enabled by default) - allows loading and streaming audio from common
   audio formats, like MP3 and WAV.
 	- Audio formats: `aiff`, `caf`, `isomp4`, `mkv`, `ogg`, `wav` - these correspond to the
diff --git a/third_party/kira/src/sound/static_sound/data.rs b/third_party/kira/src/sound/static_sound/data.rs
index f73e5ee3..bcd7cc1f 100644
--- a/third_party/kira/src/sound/static_sound/data.rs
+++ b/third_party/kira/src/sound/static_sound/data.rs
@@ -229,8 +229,8 @@ impl StaticSoundData {
 	}
 
 	/**
-	Sets the panning of the sound, where 0 is hard left
-	and 1 is hard right.
+	Sets the panning of the sound, where -1.0 is hard left
+	and 1.0 is hard right.
 
 	# Examples
 
diff --git a/third_party/kira/src/sound/static_sound/data/from_file.rs b/third_party/kira/src/sound/static_sound/data/from_file.rs
index 9f67951f..b7e960cb 100644
--- a/third_party/kira/src/sound/static_sound/data/from_file.rs
+++ b/third_party/kira/src/sound/static_sound/data/from_file.rs
@@ -1,6 +1,7 @@
 use std::io::Cursor;
 
 use symphonia::core::io::{MediaSource, MediaSourceStream};
+use symphonia::core::{codecs::CodecParameters, formats::TrackType};
 
 use crate::sound::{
 	FromFileError, static_sound::StaticSoundSettings, symphonia::load_frames_from_buffer_ref,
@@ -18,7 +19,7 @@ impl StaticSoundData {
 
 	/// Loads a cursor wrapping audio file data into a [`StaticSoundData`].
 	#[cfg_attr(docsrs, doc(cfg(feature = "symphonia")))]
-	pub fn from_cursor<T: AsRef<[u8]> + Send + Sync + 'static>(
+	pub fn from_cursor<T: AsRef<[u8]> + Send + Sync>(
 		cursor: Cursor<T>,
 	) -> Result<StaticSoundData, FromFileError> {
 		Self::from_media_source(cursor)
@@ -27,51 +28,45 @@ impl StaticSoundData {
 	/// Loads an audio file from a type that implements Symphonia's [`MediaSource`]
 	/// trait.
 	#[cfg_attr(docsrs, doc(cfg(feature = "symphonia")))]
-	pub fn from_media_source(
-		media_source: impl MediaSource + 'static,
-	) -> Result<Self, FromFileError> {
+	pub fn from_media_source(media_source: impl MediaSource) -> Result<Self, FromFileError> {
 		Self::from_boxed_media_source(Box::new(media_source))
 	}
 
-	fn from_boxed_media_source(media_source: Box<dyn MediaSource>) -> Result<Self, FromFileError> {
+	fn from_boxed_media_source(
+		media_source: Box<dyn MediaSource + '_>,
+	) -> Result<Self, FromFileError> {
 		let codecs = symphonia::default::get_codecs();
 		let probe = symphonia::default::get_probe();
 		let mss = MediaSourceStream::new(media_source, Default::default());
-		let mut format_reader = probe
-			.format(
-				&Default::default(),
-				mss,
-				&Default::default(),
-				&Default::default(),
-			)?
-			.format;
+		let mut format_reader = probe.probe(
+			&Default::default(),
+			mss,
+			Default::default(),
+			Default::default(),
+		)?;
 		let default_track = format_reader
-			.default_track()
+			.default_track(TrackType::Audio)
 			.ok_or(FromFileError::NoDefaultTrack)?;
 		let default_track_id = default_track.id;
-		let codec_params = &default_track.codec_params;
-		let sample_rate = codec_params
+		let audio_params = match default_track.codec_params.as_ref() {
+			Some(CodecParameters::Audio(p)) => p,
+			_ => return Err(FromFileError::NoDefaultTrack),
+		};
+		let sample_rate = audio_params
 			.sample_rate
 			.ok_or(FromFileError::UnknownSampleRate)?;
-		let mut decoder = codecs.make(codec_params, &Default::default())?;
+		let mut decoder = codecs.make_audio_decoder(audio_params, &Default::default())?;
 		let mut frames = vec![];
 		loop {
 			match format_reader.next_packet() {
-				Ok(packet) => {
-					if default_track_id == packet.track_id() {
+				Ok(Some(packet)) => {
+					if default_track_id == packet.track_id {
 						let buffer = decoder.decode(&packet)?;
 						frames.append(&mut load_frames_from_buffer_ref(&buffer)?);
 					}
 				}
-				Err(error) => match error {
-					symphonia::core::errors::Error::IoError(error) => {
-						if error.kind() == std::io::ErrorKind::UnexpectedEof {
-							break;
-						}
-						return Err(symphonia::core::errors::Error::IoError(error).into());
-					}
-					error => return Err(error.into()),
-				},
+				Ok(None) => break,
+				Err(error) => return Err(error.into()),
 			}
 		}
 		Ok(Self {
diff --git a/third_party/kira/src/sound/static_sound/settings.rs b/third_party/kira/src/sound/static_sound/settings.rs
index afc998a7..7eb397b5 100644
--- a/third_party/kira/src/sound/static_sound/settings.rs
+++ b/third_party/kira/src/sound/static_sound/settings.rs
@@ -21,8 +21,8 @@ pub struct StaticSoundSettings {
 	/// Changing the playback rate will change both the speed
 	/// and the pitch of the sound.
 	pub playback_rate: Value<PlaybackRate>,
-	/// The panning of the sound, where 0 is hard left
-	/// and 1 is hard right.
+	/// The panning of the sound, where -1.0 is hard left
+	/// and 1.0 is hard right.
 	pub panning: Value<Panning>,
 	/// An optional fade-in from silence.
 	pub fade_in_tween: Option<Tween>,
@@ -101,8 +101,8 @@ impl StaticSoundSettings {
 	}
 
 	/**
-	Sets the panning of the sound, where 0 is hard left
-	and 1 is hard right.
+	Sets the panning of the sound, where -1.0 is hard left
+	and 1.0 is hard right.
 	*/
 	#[must_use = "This method consumes self and returns a modified StaticSoundSettings, so the return value should be used"]
 	pub fn panning(self, panning: impl Into<Value<Panning>>) -> Self {
diff --git a/third_party/kira/src/sound/streaming.rs b/third_party/kira/src/sound/streaming.rs
index f76ee177..d76afab9 100644
--- a/third_party/kira/src/sound/streaming.rs
+++ b/third_party/kira/src/sound/streaming.rs
@@ -51,6 +51,7 @@ pub(crate) struct CommandWriters {
 	stop: CommandWriter<Tween>,
 	seek_by: CommandWriter<f64>,
 	seek_to: CommandWriter<f64>,
+	on_sync: CommandWriter<()>,
 }
 
 pub(crate) struct CommandReaders {
@@ -60,6 +61,7 @@ pub(crate) struct CommandReaders {
 	pause: CommandReader<Tween>,
 	resume: CommandReader<(StartTime, Tween)>,
 	stop: CommandReader<Tween>,
+	on_sync: CommandReader<()>,
 }
 
 #[derive(Debug)]
@@ -84,6 +86,7 @@ fn command_writers_and_readers() -> (
 	let (stop_writer, stop_reader) = command_writer_and_reader();
 	let (seek_by_writer, seek_by_reader) = command_writer_and_reader();
 	let (seek_to_writer, seek_to_reader) = command_writer_and_reader();
+	let (on_sync_writer, on_sync_reader) = command_writer_and_reader();
 	(
 		CommandWriters {
 			set_volume: set_volume_writer,
@@ -95,6 +98,7 @@ fn command_writers_and_readers() -> (
 			stop: stop_writer,
 			seek_by: seek_by_writer,
 			seek_to: seek_to_writer,
+			on_sync: on_sync_writer,
 		},
 		CommandReaders {
 			set_volume: set_volume_reader,
@@ -103,6 +107,7 @@ fn command_writers_and_readers() -> (
 			pause: pause_reader,
 			resume: resume_reader,
 			stop: stop_reader,
+			on_sync: on_sync_reader,
 		},
 		DecodeSchedulerCommandReaders {
 			set_loop_region: set_loop_region_reader,
diff --git a/third_party/kira/src/sound/streaming/data.rs b/third_party/kira/src/sound/streaming/data.rs
index 803aed18..4251f8e0 100644
--- a/third_party/kira/src/sound/streaming/data.rs
+++ b/third_party/kira/src/sound/streaming/data.rs
@@ -211,8 +211,8 @@ impl<Error: Send> StreamingSoundData<Error> {
 	}
 
 	/**
-	Sets the panning of the sound, where 0 is hard left
-	and 1 is hard right.
+	Sets the panning of the sound, where -1.0 is hard left
+	and 1.0 is hard right.
 
 	# Examples
 
diff --git a/third_party/kira/src/sound/streaming/decoder/symphonia.rs b/third_party/kira/src/sound/streaming/decoder/symphonia.rs
index 9350f6f7..fdec9715 100644
--- a/third_party/kira/src/sound/streaming/decoder/symphonia.rs
+++ b/third_party/kira/src/sound/streaming/decoder/symphonia.rs
@@ -1,95 +1,101 @@
-use std::convert::TryInto;
-
-use crate::{
-	frame::Frame,
-	sound::{FromFileError, symphonia::load_frames_from_buffer_ref},
-};
-use symphonia::core::{
-	codecs::Decoder,
-	formats::{FormatReader, SeekMode, SeekTo},
-	io::{MediaSource, MediaSourceStream},
-	probe::Hint,
-};
-
-pub(crate) struct SymphoniaDecoder {
-	format_reader: Box<dyn FormatReader>,
-	decoder: Box<dyn Decoder>,
-	sample_rate: u32,
-	num_frames: usize,
-	track_id: u32,
-}
-
-impl SymphoniaDecoder {
-	pub(crate) fn new(media_source: Box<dyn MediaSource>) -> Result<Self, FromFileError> {
-		let codecs = symphonia::default::get_codecs();
-		let probe = symphonia::default::get_probe();
-		let mss = MediaSourceStream::new(media_source, Default::default());
-		let format_reader = probe
-			.format(
-				&Hint::default(),
-				mss,
-				&Default::default(),
-				&Default::default(),
-			)?
-			.format;
-		let default_track = format_reader
-			.default_track()
-			.ok_or(FromFileError::NoDefaultTrack)?;
-		let sample_rate = default_track
-			.codec_params
-			.sample_rate
-			.ok_or(FromFileError::UnknownSampleRate)?;
-		let num_frames = default_track
-			.codec_params
-			.n_frames
-			.ok_or(FromFileError::UnknownSampleRate)?
-			.try_into()
-			.expect("could not convert u64 into usize");
-		let decoder = codecs.make(&default_track.codec_params, &Default::default())?;
-		let track_id = default_track.id;
-		Ok(Self {
-			format_reader,
-			decoder,
-			sample_rate,
-			num_frames,
-			track_id,
-		})
-	}
-}
-
-impl super::Decoder for SymphoniaDecoder {
-	type Error = FromFileError;
-
-	fn sample_rate(&self) -> u32 {
-		self.sample_rate
-	}
-
-	fn num_frames(&self) -> usize {
-		self.num_frames
-	}
-
-	fn decode(&mut self) -> Result<Vec<Frame>, Self::Error> {
-		let packet = loop {
-			let packet = self.format_reader.next_packet()?;
-			if self.track_id == packet.track_id() {
-				break packet;
-			}
-		};
-		let buffer = self.decoder.decode(&packet)?;
-		load_frames_from_buffer_ref(&buffer)
-	}
-
-	fn seek(&mut self, index: usize) -> Result<usize, Self::Error> {
-		let seeked_to = self.format_reader.seek(
-			SeekMode::Accurate,
-			SeekTo::TimeStamp {
-				ts: index.try_into().expect("could not convert usize into u64"),
-				track_id: self.track_id,
-			},
-		)?;
-		Ok(seeked_to
-			.actual_ts
-			.try_into()
-			.expect("could not convert u64 into usize"))
-	}
-}
+use std::convert::TryInto;
+
+use crate::{
+	frame::Frame,
+	sound::{FromFileError, symphonia::load_frames_from_buffer_ref},
+};
+use symphonia::core::{
+	codecs::{CodecParameters, audio::AudioDecoder},
+	formats::{FormatReader, SeekMode, SeekTo, TrackType, probe::Hint},
+	io::{MediaSource, MediaSourceStream},
+	units::Timestamp,
+};
+
+pub(crate) struct SymphoniaDecoder {
+	format_reader: Box<dyn FormatReader>,
+	decoder: Box<dyn AudioDecoder>,
+	sample_rate: u32,
+	num_frames: usize,
+	track_id: u32,
+}
+
+impl SymphoniaDecoder {
+	pub(crate) fn new(media_source: Box<dyn MediaSource>) -> Result<Self, FromFileError> {
+		let codecs = symphonia::default::get_codecs();
+		let probe = symphonia::default::get_probe();
+		let mss = MediaSourceStream::new(media_source, Default::default());
+		let format_reader = probe.probe(
+			&Hint::default(),
+			mss,
+			Default::default(),
+			Default::default(),
+		)?;
+		let default_track = format_reader
+			.default_track(TrackType::Audio)
+			.ok_or(FromFileError::NoDefaultTrack)?;
+		let audio_params = match default_track.codec_params.as_ref() {
+			Some(CodecParameters::Audio(p)) => p,
+			_ => return Err(FromFileError::NoDefaultTrack),
+		};
+		let sample_rate = audio_params
+			.sample_rate
+			.ok_or(FromFileError::UnknownSampleRate)?;
+		let num_frames = default_track
+			.num_frames
+			.ok_or(FromFileError::UnknownSampleRate)?
+			.try_into()
+			.expect("could not convert u64 into usize");
+		let decoder = codecs.make_audio_decoder(audio_params, &Default::default())?;
+		let track_id = default_track.id;
+		Ok(Self {
+			format_reader,
+			decoder,
+			sample_rate,
+			num_frames,
+			track_id,
+		})
+	}
+}
+
+impl super::Decoder for SymphoniaDecoder {
+	type Error = FromFileError;
+
+	fn sample_rate(&self) -> u32 {
+		self.sample_rate
+	}
+
+	fn num_frames(&self) -> usize {
+		self.num_frames
+	}
+
+	fn decode(&mut self) -> Result<Vec<Frame>, Self::Error> {
+		let packet = loop {
+			match self.format_reader.next_packet()? {
+				Some(packet) if packet.track_id == self.track_id => break packet,
+				Some(_) => continue,
+				// benilla: the end of the packets is an error, as it was on symphonia 0.5, so a
+				// stream whose reported length runs past its last packet stops there. An empty
+				// chunk instead leaves `DecodeScheduler::frame_at_index` looping on it forever.
+				None => return Err(std::io::Error::from(std::io::ErrorKind::UnexpectedEof).into()),
+			}
+		};
+		let buffer = self.decoder.decode(&packet)?;
+		load_frames_from_buffer_ref(&buffer)
+	}
+
+	fn seek(&mut self, index: usize) -> Result<usize, Self::Error> {
+		let seeked_to = self.format_reader.seek(
+			SeekMode::Accurate,
+			SeekTo::Timestamp {
+				ts: Timestamp::new(index as i64),
+				track_id: self.track_id,
+			},
+		)?;
+		let actual = seeked_to.actual_ts.get();
+		Ok(if actual < 0 {
+			0
+		} else {
+			(actual as usize).min(self.num_frames)
+		})
+	}
+}
diff --git a/third_party/kira/src/sound/streaming/handle.rs b/third_party/kira/src/sound/streaming/handle.rs
index 803f34a1..5abf218c 100644
--- a/third_party/kira/src/sound/streaming/handle.rs
+++ b/third_party/kira/src/sound/streaming/handle.rs
@@ -317,12 +317,14 @@ impl<Error> StreamingSoundHandle<Error> {
 
 	/// Sets the playback position to the specified time in seconds.
 	pub fn seek_to(&mut self, position: f64) {
-		self.command_writers.seek_to.write(position)
+		self.command_writers.seek_to.write(position);
+		self.command_writers.on_sync.write(())
 	}
 
 	/// Moves the playback position by the specified amount of time in seconds.
 	pub fn seek_by(&mut self, amount: f64) {
-		self.command_writers.seek_by.write(amount)
+		self.command_writers.seek_by.write(amount);
+		self.command_writers.on_sync.write(())
 	}
 
 	/// Returns an error that occurred while decoding audio, if any.
diff --git a/third_party/kira/src/sound/streaming/settings.rs b/third_party/kira/src/sound/streaming/settings.rs
index b672742e..93c21fab 100644
--- a/third_party/kira/src/sound/streaming/settings.rs
+++ b/third_party/kira/src/sound/streaming/settings.rs
@@ -19,8 +19,8 @@ pub struct StreamingSoundSettings {
 	/// Changing the playback rate will change both the speed
 	/// and the pitch of the sound.
 	pub playback_rate: Value<PlaybackRate>,
-	/// The panning of the sound, where 0 is hard left
-	/// and 1 is hard right.
+	/// The panning of the sound, where -1.0 is hard left
+	/// and 1.0 is hard right.
 	pub panning: Value<Panning>,
 	/// An optional fade-in from silence.
 	pub fade_in_tween: Option<Tween>,
@@ -92,7 +92,7 @@ impl StreamingSoundSettings {
 	}
 
 	/**
-	Sets the panning of the sound, where -1.0 is hard left
+	Sets the panning of the sound, where -1.-1.0 is hard left
 	and 1.0 is hard right.
 	*/
 	#[must_use = "This method consumes self and returns a modified StreamingSoundSettings, so the return value should be used"]
diff --git a/third_party/kira/src/sound/streaming/sound.rs b/third_party/kira/src/sound/streaming/sound.rs
index 6f0423b2..317ffc08 100644
--- a/third_party/kira/src/sound/streaming/sound.rs
+++ b/third_party/kira/src/sound/streaming/sound.rs
@@ -176,6 +176,17 @@ impl StreamingSound {
 		self.update_shared_playback_state();
 	}
 
+	fn discard_buffered_frames(&mut self) {
+		if self.playback_state_manager.playback_state().is_advancing() {
+			return;
+		}
+		// the first frame in the ringbuffer is the previous frame, so we
+		// keep it to avoid consuming the first frame after seek
+		while self.frame_consumer.slots() > 1 {
+			self.frame_consumer.pop().ok();
+		}
+	}
+
 	fn read_commands(&mut self) {
 		read_commands_into_parameters!(self, volume, playback_rate, panning);
 		if let Some(tween) = self.command_readers.pause.read() {
@@ -187,6 +198,9 @@ impl StreamingSound {
 		if let Some(tween) = self.command_readers.stop.read() {
 			self.stop(tween);
 		}
+		if self.command_readers.on_sync.read().is_some() {
+			self.discard_buffered_frames();
+		}
 	}
 }
 
diff --git a/third_party/kira/src/sound/streaming/sound/test.rs b/third_party/kira/src/sound/streaming/sound/test.rs
index 81293fc8..c4fbef13 100644
--- a/third_party/kira/src/sound/streaming/sound/test.rs
+++ b/third_party/kira/src/sound/streaming/sound/test.rs
@@ -860,6 +860,93 @@ fn seek_to() {
 	expect_frame_soon(Frame::from_mono(15.0).panned(Panning::CENTER), &mut sound);
 }
 
+/// Tests that a `StreamingSound` that seeks while paused discards the audio
+/// that was already decoded ahead of the playhead, so that no frames from the
+/// old position are played when the sound resumes.
+#[test]
+fn seek_while_paused_discards_stale_frames() {
+	let data = StreamingSoundData {
+		decoder: Box::new(MockDecoder::new(
+			(0..100).map(|i| Frame::from_mono(i as f32)).collect(),
+		)),
+		settings: StreamingSoundSettings::new(),
+		slice: None,
+	};
+	let (mut sound, mut handle, mut scheduler) = data.split().unwrap();
+
+	// let the scheduler decode a chunk of audio ahead of the playhead
+	for _ in 0..10 {
+		scheduler.run().unwrap();
+	}
+
+	handle.pause(Tween {
+		duration: Duration::ZERO,
+		..Default::default()
+	});
+	sound.on_start_processing();
+	sound.process_one(1.0, &MockInfoBuilder::new().build());
+	assert_eq!(
+		sound.playback_state_manager.playback_state(),
+		PlaybackState::Paused
+	);
+
+	handle.seek_to(50.0);
+	sound.on_start_processing();
+	while matches!(scheduler.run().unwrap(), NextStep::Continue) {}
+	sound.on_start_processing();
+
+	handle.resume(Tween {
+		duration: Duration::ZERO,
+		..Default::default()
+	});
+	sound.on_start_processing();
+
+	// the first frame we hear after resuming should be the one we seeked to,
+	// not audio that was buffered before the seek
+	expect_frame_soon(Frame::from_mono(50.0).panned(Panning::CENTER), &mut sound);
+
+	// and playback should continue on from there
+	for i in 51..60 {
+		assert_eq!(
+			sound.process_one(1.0, &MockInfoBuilder::new().build()),
+			Frame::from_mono(i as f32).panned(Panning::CENTER)
+		);
+	}
+}
+
+/// Tests that a `StreamingSound` that seeks while playing does not discard
+/// buffered audio, since those frames are the audio that's about to be heard.
+#[test]
+fn seek_while_playing_keeps_buffered_frames() {
+	let data = StreamingSoundData {
+		decoder: Box::new(MockDecoder::new(
+			(0..100).map(|i| Frame::from_mono(i as f32)).collect(),
+		)),
+		settings: StreamingSoundSettings::new(),
+		slice: None,
+	};
+	let (mut sound, mut handle, mut scheduler) = data.split().unwrap();
+
+	handle.seek_to(50.0);
+	sound.on_start_processing();
+	while matches!(scheduler.run().unwrap(), NextStep::Continue) {}
+	sound.on_start_processing();
+	expect_frame_soon(Frame::from_mono(50.0).panned(Panning::CENTER), &mut sound);
+
+	// seek again while the sound is still playing. the frames that are already
+	// buffered are the audio that's about to be heard, so they should keep
+	// playing until the sound catches up to the new position.
+	handle.seek_to(20.0);
+	sound.on_start_processing();
+
+	for i in 51..60 {
+		assert_eq!(
+			sound.process_one(1.0, &MockInfoBuilder::new().build()),
+			Frame::from_mono(i as f32).panned(Panning::CENTER)
+		);
+	}
+}
+
 /// Tests that a `StreamingSound` can seek by an amount of time.
 #[test]
 fn seek_by() {
diff --git a/third_party/kira/src/sound/symphonia.rs b/third_party/kira/src/sound/symphonia.rs
index f642a6b0..e4b58d99 100644
--- a/third_party/kira/src/sound/symphonia.rs
+++ b/third_party/kira/src/sound/symphonia.rs
@@ -1,5 +1,5 @@
-use symphonia::core::{
-	audio::{AudioBuffer, AudioBufferRef, Signal},
+use symphonia::core::audio::{
+	Audio, AudioBuffer, GenericAudioBufferRef,
 	conv::{FromSample, IntoSample},
 	sample::Sample,
 };
@@ -8,18 +8,20 @@ use crate::frame::Frame;
 
 use super::FromFileError;
 
-pub fn load_frames_from_buffer_ref(buffer: &AudioBufferRef) -> Result<Vec<Frame>, FromFileError> {
+pub fn load_frames_from_buffer_ref(
+	buffer: &GenericAudioBufferRef,
+) -> Result<Vec<Frame>, FromFileError> {
 	match buffer {
-		AudioBufferRef::U8(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::U16(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::U24(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::U32(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::S8(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::S16(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::S24(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::S32(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::F32(buffer) => load_frames_from_buffer(buffer),
-		AudioBufferRef::F64(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::U8(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::U16(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::U24(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::U32(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::S8(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::S16(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::S24(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::S32(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::F32(buffer) => load_frames_from_buffer(buffer),
+		GenericAudioBufferRef::F64(buffer) => load_frames_from_buffer(buffer),
 	}
 }
 
@@ -29,16 +31,18 @@ pub fn load_frames_from_buffer<S: Sample>(
 where
 	f32: FromSample<S>,
 {
-	match buffer.spec().channels.count() {
+	match buffer.num_planes() {
 		1 => Ok(buffer
-			.chan(0)
+			.plane(0)
+			.unwrap()
 			.iter()
 			.map(|sample| Frame::from_mono((*sample).into_sample()))
 			.collect()),
 		2 => Ok(buffer
-			.chan(0)
+			.plane(0)
+			.unwrap()
 			.iter()
-			.zip(buffer.chan(1).iter())
+			.zip(buffer.plane(1).unwrap().iter())
 			.map(|(left, right)| Frame::new((*left).into_sample(), (*right).into_sample()))
 			.collect()),
 		_ => Err(FromFileError::UnsupportedChannelConfiguration),