Repo reorg + load-on-demand settings companion (12.1 lane)

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
           DOMINATED=true
           for f in $(git diff --name-only HEAD~1..HEAD 2>/dev/null); do
             case "$f" in
-              *.md|*.sh|.github/*|.gitignore|.pkgmeta|Changelog.lua) ;;
+              *.md|*.sh|.github/*|.gitignore|.pkgmeta|DandersFrames/Core/Changelog.lua|DandersFrames_Options/Changelog.lua) ;;
               *) DOMINATED=false; break ;;
             esac
           done
@@ -57,8 +57,8 @@ jobs:
           fi
           ./generate_changelog.sh
 
-          VERSION=$(grep '^## Version:' DandersFrames.toc | sed 's/^## Version: //')
-          CHANNEL=$(grep 'DF.RELEASE_CHANNEL' Changelog.lua | sed 's/.*= "\(.*\)"/\1/')
+          VERSION=$(grep '^## Version:' DandersFrames/DandersFrames.toc | sed 's/^## Version: //')
+          CHANNEL=$(grep 'DF.RELEASE_CHANNEL' DandersFrames/Core/Changelog.lua | sed 's/.*= "\(.*\)"/\1/')
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "channel=$CHANNEL" >> $GITHUB_OUTPUT
 

.pkgmeta

@@ -1,13 +1,35 @@
 package-as: DandersFrames
 enable-nolib-creation: no
 
+# The repo root is a container: it holds the addon folders rather than being
+# one. The packager copies the checkout into .release/<package-as>/, so both
+# land a level too deep; move-folders lifts them back out to the zip root.
+#
+# move-folders keys are relative to the working directory and INCLUDE the
+# package name as the root; values are relative to the package root. So
+# "DandersFrames/DandersFrames: DandersFrames" reads as "the DandersFrames
+# folder inside the package dir becomes the top-level DandersFrames" -- it
+# looks like it collides with its own parent and does not. This is the
+# documented shape for a container repo that ships more than one folder;
+# verified against a working example before writing it, after talking myself
+# out of it once on the assumption that it would collide.
+#
+# Everything at the repo root that is not an addon folder is stripped by the
+# ignore list below, so the zip contains only the two addon folders.
+move-folders:
+  DandersFrames/DandersFrames: DandersFrames
+  DandersFrames/DandersFrames_Options: DandersFrames_Options
+
 ignore:
   - CHANGELOG.md
   - README.md
+  - TRANSLATING.md
   - generate_changelog.sh
   - Tools
   - .github
   - .gitignore
+  # Editor/tooling metadata (wow-api.json and friends). Nothing reads it at runtime.
+  - .gitnexus
   # Contributor documentation. Tracked in git so it travels with pull requests,
   # stripped here so it never reaches the packaged addon users download.
   - docs

ClickCasting/Bindings.lua → DandersFrames/ClickCasting/Bindings.lua

@@ -3787,11 +3787,18 @@ SlashCmdList["DFCC"] = function(msg)
             -- user was never shown. Fall through to "unknown" rather than
             -- reporting "dev only": a hidden command must not advertise itself.
             if e[1] == word and (not e[3] or dev) then
+                -- The handlers register when the companion loads. A deliberate
+                -- command -> load it, then retry the lookup. The old branch
+                -- errored with "click-casting module not loaded", which was
+                -- false (only the UI wasn't) and never self-healed.
                 local handler = SlashCmdList[e[2]]
+                if not handler and DF.EnsureOptionsLoaded and DF:EnsureOptionsLoaded() then
+                    handler = SlashCmdList[e[2]]
+                end
                 if handler then
                     handler(rest or "")
                 else
-                    DF:Err("click-casting module not loaded")
+                    DF:Err("click-casting UI unavailable")
                 end
                 return
             end

ClickCasting/Events.lua → DandersFrames/ClickCasting/Events.lua

@@ -66,7 +66,7 @@ function CC:RegisterEvents()
                     CC:ApplyBindings()
                     -- Also refresh UI in case talents changed
                     CC:DeferAfter("uiRefresh", 0.3, function()
-                        CC:RefreshClickCastingUI()
+                        CC:RefreshUIIfLoaded()
                     end)
                 end)
             else
@@ -78,14 +78,16 @@ function CC:RegisterEvents()
             if not InCombatLockdown() then
                 CC:ApplyBindings()
                 CC:DeferAfter("uiRefresh", 0.2, function()
-                    CC:RefreshClickCastingUI()
+                    CC:RefreshUIIfLoaded()
                 end)
             else
                 CC:Defer("bindingRefresh")
             end
         elseif event == "PLAYER_EQUIPMENT_CHANGED" then
-            -- Equipment changed - refresh items tab if visible
-            if CC.activeTab == "items" then
+            -- Equipment changed - refresh items tab if visible. activeTab is only
+            -- ever set by the companion, but guard the method explicitly rather
+            -- than lean on that invariant.
+            if CC.activeTab == "items" and CC.RefreshSpellGrid then
                 CC:RefreshSpellGrid()
             end
         elseif event == "PLAYER_ENTERING_WORLD" then
@@ -360,7 +362,7 @@ function CC:DrainDeferred(onlyJob)
     -- Refresh UI if needed (after a short delay for everything to settle)
     if needsUIRefresh then
         self:DeferAfter("uiRefresh", 0.2, function()
-            CC:RefreshClickCastingUI()
+            CC:RefreshUIIfLoaded()
         end)
     end
 end
@@ -377,6 +379,18 @@ end
 -- DeferAfter keys each timer: scheduling the same key again cancels the
 -- pending one, so there is always at most one run in flight per key.
 
+-- ☠ The click-casting UI lives in the load-on-demand companion; this file is
+-- resident. Every "refresh the panel" reaction to a talent/spec/level event
+-- must go through this guard: with the panel never opened the method is nil,
+-- and DeferAfter runs its callback raw inside a C_Timer, so an unguarded call
+-- is a Lua error on every talent swap. A refresh with no UI is correctly a
+-- no-op -- the panel builds itself from current state when it loads.
+function CC:RefreshUIIfLoaded()
+    if self.RefreshClickCastingUI then
+        self:RefreshClickCastingUI()
+    end
+end
+
 function CC:DeferAfter(key, delay, fn)
     self.timers = self.timers or {}
     local existing = self.timers[key]
@@ -412,7 +426,7 @@ function CC:OnSpecChanged()
         self:ApplyBindings()
         -- Refresh UI after a short delay to ensure spell data is ready
         self:DeferAfter("uiRefresh", 0.3, function()
-            CC:RefreshClickCastingUI()
+            CC:RefreshUIIfLoaded()
         end)
     else
         self:Defer("loadoutCheck")
@@ -629,6 +643,26 @@ function CC:GetNameplateClickableFrame(nameplate, unitToken)
     return nil
 end
 
+-- ============================================================
+-- BOOTSTRAP
+-- ============================================================
+-- ☠ This must stay resident. It used to live in ClickCasting/UI/BindingEditor,
+-- which is now in the load-on-demand companion -- and the trigger below only
+-- fires on the login/reload PLAYER_ENTERING_WORLD. A companion loaded on demand
+-- has already missed it, and the zone-change firings are filtered out by the
+-- flags, so click-casting would never have initialised at all.
+--
+-- CC:Initialize itself is in ClickCasting/Frames.lua and is resident too.
+local initFrame = CreateFrame("Frame")
+initFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
+initFrame:SetScript("OnEvent", function(self, event, isInitialLogin, isReloadingUi)
+    -- Only initialize on first load or reload, not zone changes
+    if isInitialLogin or isReloadingUi then
+        CC:Initialize()
+        self:UnregisterEvent("PLAYER_ENTERING_WORLD")
+    end
+end)
+
 -- Register all currently visible nameplates
 function CC:RegisterAllNameplates()
     if not self.db or not self.db.enabled then return end

ClickCasting/Frames.lua → DandersFrames/ClickCasting/Frames.lua

@@ -348,6 +348,19 @@ function CC:InitializeSecureFrames()
         -- Delay slightly to ensure UI is ready
         C_Timer.After(1.5, function()
             if CC.db.enabled and CC.hasConflictingAddons then
+                -- ☠ Read the opt-out FIRST. The popup lives in the companion and
+                -- this fires at login, so loading it here is the cost -- but
+                -- ShowClickCastConflictPopup's own first line is this same check
+                -- and returns immediately. Without this, a user who ticked "don't
+                -- warn me again" pulled the entire settings addon in at every
+                -- login to reach a function that does nothing. The flag lives in
+                -- DandersFramesClickCastingDB and is fully readable resident.
+                if CC.db.ignoreConflictWarning then return end
+                -- It is a modal the user must act on, so load rather than skip.
+                -- Only users with a conflicting addon installed ever pay.
+                if not CC.ShowClickCastConflictPopup then
+                    if not (DF.EnsureOptionsLoaded and DF:EnsureOptionsLoaded()) then return end
+                end
                 CC:ShowClickCastConflictPopup(CC.conflictingAddons, CC.enableCb)
             end
         end)

ClickCasting/Profiles.lua → DandersFrames/ClickCasting/Profiles.lua

@@ -353,6 +353,15 @@ function CC:SetActiveProfile(profileName)
         if self.hasConflictingAddons and self.conflictingAddons then
             C_Timer.After(0.1, function()
                 if CC.db.enabled and CC.hasConflictingAddons then
+                    -- ☠ Opt-out first — the popup's own first line is this check,
+                    -- so loading the companion to reach it would be pure waste.
+                    if CC.db.ignoreConflictWarning then return end
+                    -- Popup lives in the companion; profile switches are reachable
+                    -- without the panel (slash, permanent movers, loadout
+                    -- auto-switch). Modal warning -> load, don't skip.
+                    if not CC.ShowClickCastConflictPopup then
+                        if not (DF.EnsureOptionsLoaded and DF:EnsureOptionsLoaded()) then return end
+                    end
                     CC:ShowClickCastConflictPopup(CC.conflictingAddons, CC.enableCb)
                 end
             end)
@@ -536,7 +545,7 @@ function CC:CheckLoadoutProfileSwitch()
         -- Profile is assigned (either to this specific loadout or as spec default) - switch to it
         if self:SetActiveProfile(assignedProfile) then
             self:ApplyBindings()
-            self:RefreshClickCastingUI()
+            self:RefreshUIIfLoaded()
             local source = isSpecific and "loadout: " .. loadoutName or "spec default"
             DF:Say("Switched to profile: " .. assignedProfile .. " (" .. source .. ")")
         end
@@ -571,7 +580,7 @@ function CC:CheckLoadoutProfileSwitch()
             -- Switch to it
             if self:SetActiveProfile(newProfileName) then
                 self:ApplyBindings()
-                self:RefreshClickCastingUI()
+                self:RefreshUIIfLoaded()
             end
 
             -- Show notification

Core.lua → DandersFrames/Core.lua

@@ -4942,6 +4942,15 @@ DF._MainEventDispatcher = function(self, event, arg1)
             -- "on"/"off" are the logging toggle, not commands named on/off.
             if dbgWord and dbgWord:lower() ~= "on" and dbgWord:lower() ~= "off" then
                 local dbgKey = DF.DebugSlashBySub[dbgWord:lower()]
+                -- Several debug tools live in the companion and register their
+                -- slashes only when it loads. If the word is unknown and the
+                -- companion is not in yet, load it and retry once -- otherwise
+                -- the first use of /df debug memtest fell through to the final
+                -- else and opened the settings window instead of the tool.
+                if not dbgKey and not DF._optionsAddonLoaded
+                        and DF.EnsureOptionsLoaded and DF:EnsureOptionsLoaded() then
+                    dbgKey = DF.DebugSlashBySub[dbgWord:lower()]
+                end
                 if dbgKey and SlashCmdList[dbgKey] then
                     SlashCmdList[dbgKey](dbgRest or "")
                 else
@@ -5216,6 +5225,10 @@ DF._MainEventDispatcher = function(self, event, arg1)
                 -- is generated and cannot drift instead of duplicating a subset
                 -- of it by hand.
             elseif msg == "test" then
+                -- The test panel lives in the load-on-demand companion.
+                -- Deliberate user command -> load it; the old nil-guard made
+                -- /df test a silent no-op until the settings panel was opened.
+                if DF.EnsureOptionsLoaded and not DF:EnsureOptionsLoaded() then return end
                 if DF.ToggleTestPanel then DF:ToggleTestPanel() end
             elseif msg == "hide" then
                 if DF.HideTestFrames then DF:HideTestFrames() end
@@ -5487,7 +5500,11 @@ DF._MainEventDispatcher = function(self, event, arg1)
                     DF:Err("Header info not available")
                 end
             elseif msg == "attached" then
-                -- List other addons anchored/parented to DF unit frames
+                -- List other addons anchored/parented to DF unit frames.
+                -- Scanner lives in the companion and registers no slash of its
+                -- own, so it never reaches the /df debug load-and-retry — this
+                -- branch has to load it, same as exportaudit two branches down.
+                if DF.EnsureOptionsLoaded and not DF:EnsureOptionsLoaded() then return end
                 if DF.ScanFrameAttachments then
                     DF:ScanFrameAttachments()
                 else
@@ -5503,6 +5520,8 @@ DF._MainEventDispatcher = function(self, event, arg1)
             elseif msg == "exportaudit" then
                 -- Dev: verify every Config default is export-categorised or
                 -- declared local-only (guards against export-list drift).
+                -- Category tables live in the companion.
+                if DF.EnsureOptionsLoaded and not DF:EnsureOptionsLoaded() then return end
                 if DF.AuditExportCategories then
                     DF:AuditExportCategories()
                 end
@@ -5520,6 +5539,9 @@ DF._MainEventDispatcher = function(self, event, arg1)
                 -- can find the current ID (for re-hardcoding after reshuffles).
                 -- Results also land in the SavedVariables root (flushed by the
                 -- next /reload) so they can be read from disk — no chat copy.
+                -- DF.TestData lives in the companion; load it or bail.
+                if DF.EnsureOptionsLoaded and not DF:EnsureOptionsLoaded() then return end
+                if not DF.TestData then DF:Err("test data unavailable") return end
                 local dump = {}
                 local o = DF:Out("Test IDs", "spell-ID audit")
                 for _, poolName in ipairs({ "buffs", "debuffs" }) do