Adv 2.0 D&D layer: Phases 1-8 + Phase 9 SP1+SP2

Combines all uncommitted D&D work into one checkpoint:

Phases 1-8 (per gogobee_dnd_session_summary.md):
- Race/class/stats system, !setup flow, !sheet, !respec
- d20-vs-AC combat with race/class passives, auto-migration
- XP/level-up, skill checks, NPC refund hooks
- Equipment slot mapping, rarity, !rest short/long
- Pre-arm active abilities, resource pools
- Bestiary, !roll/!stats/!level, onboarding DM
- Audit fixes A-I, flavor wiring under internal/flavor/
- Phase 8 weapon dice + armor AC tables (gogobee_equipment_appendix)

Phase 9 SP1 — spell system foundations:
- 79 SpellDefinitions (76 in-scope + 3 reaction-deferred)
- dnd_known_spells, dnd_spell_slots tables
- pending_cast / concentration_* columns on dnd_character
- Slot tables for Mage/Cleric/Ranger, DC + attack-bonus math
- Long-rest refreshes slots; respec wipes spell state
- Auto-grant default known list on !setup confirm and auto-migration

Phase 9 SP2 — !cast / !spells / !prepare commands:
- Out-of-combat HEAL and UTILITY resolve immediately
- Damage/control/buff queue as pending_cast for next combat
- Audit-style save-then-debit, slot refund on save failure
- !cast --drop, concentration supersession, prep-cap enforcement
- Reaction spells refused with Phase 11 note

SP3 (combat-time resolution of pending_cast) and SP4 (full prep/learn
tests) are next. Build clean, full test suite green.

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

internal/plugin/combat_bridge.go

@@ -29,6 +29,27 @@ func (p *AdventurePlugin) runArenaCombat(
 	// Load consumables from inventory and auto-select
 	consumables := p.loadConsumableInventory(userID)
 	enemyStats, _ := DeriveArenaMonsterStats(monster)
+
+	// All combat is D&D. If the player has no sheet yet (or only a draft),
+	// auto-migrate them to a sensible inferred character before fighting.
+	dndChar, freshMigrate, err := ensureDnDCharacterForCombat(userID, char)
+	if err != nil {
+		slog.Error("dnd: ensureDnDCharacterForCombat (arena) failed", "user", userID, "err", err)
+		return CombatResult{}, 0
+	}
+	if freshMigrate {
+		p.maybeSendDnDOnboarding(userID, char, dndChar)
+	}
+	applyDnDPlayerLayer(&playerStats, dndChar)
+	applyDnDEquipmentLayer(&playerStats, dndChar, equip)
+	applyDnDHPScaling(&playerStats, dndChar)
+	applyClassPassives(&playerStats, &playerMods, dndChar)
+	applyRacePassives(&playerStats, &playerMods, dndChar)
+	if firedName, fired := applyArmedAbility(dndChar, &playerMods); fired {
+		slog.Info("dnd: armed ability fired", "user", userID, "ability", firedName)
+	}
+	applyDnDArenaMonsterLayer(&enemyStats, monster.ThreatLevel)
+
 	selected := SelectConsumables(consumables, playerStats, enemyStats, arenaRound, arenaTier)
 	ApplyConsumableMods(&playerStats, &playerMods, selected)
 
@@ -66,6 +87,14 @@ func (p *AdventurePlugin) runArenaCombat(
 
 	p.grantCombatAchievements(userID, result)
 
+	persistDnDHPAfterCombat(userID, result.PlayerStartHP, result.PlayerEndHP)
+
+	if xp := arenaCombatXP(result, monster.ThreatLevel); xp > 0 {
+		if _, err := p.grantDnDXP(userID, xp); err != nil {
+			slog.Error("dnd: grantDnDXP arena", "user", userID, "err", err)
+		}
+	}
+
 	return result, condRepair
 }
 
@@ -124,6 +153,26 @@ func (p *AdventurePlugin) runDungeonCombat(
 	// Load consumables from inventory and auto-select
 	consumables := p.loadConsumableInventory(userID)
 	enemyStats, enemyMods := DeriveDungeonMonsterStats(loc)
+
+	// All combat is D&D. Auto-migrate if needed.
+	dndChar, freshMigrate, err := ensureDnDCharacterForCombat(userID, char)
+	if err != nil {
+		slog.Error("dnd: ensureDnDCharacterForCombat (dungeon) failed", "user", userID, "err", err)
+		return CombatResult{}
+	}
+	if freshMigrate {
+		p.maybeSendDnDOnboarding(userID, char, dndChar)
+	}
+	applyDnDPlayerLayer(&playerStats, dndChar)
+	applyDnDEquipmentLayer(&playerStats, dndChar, equip)
+	applyDnDHPScaling(&playerStats, dndChar)
+	applyClassPassives(&playerStats, &playerMods, dndChar)
+	applyRacePassives(&playerStats, &playerMods, dndChar)
+	if firedName, fired := applyArmedAbility(dndChar, &playerMods); fired {
+		slog.Info("dnd: armed ability fired", "user", userID, "ability", firedName)
+	}
+	applyDnDDungeonMonsterLayer(&enemyStats, loc.Tier)
+
 	selected := SelectConsumables(consumables, playerStats, enemyStats, 0, loc.Tier)
 	ApplyConsumableMods(&playerStats, &playerMods, selected)
 
@@ -163,6 +212,15 @@ func (p *AdventurePlugin) runDungeonCombat(
 
 	p.grantCombatAchievements(userID, result)
 
+	persistDnDHPAfterCombat(userID, result.PlayerStartHP, result.PlayerEndHP)
+
+	if xp := dungeonCombatXP(result, loc.Tier); xp > 0 {
+		if _, err := p.grantDnDXP(userID, xp); err != nil {
+			slog.Error("dnd: grantDnDXP dungeon", "user", userID, "err", err)
+		}
+	}
+	_ = dndChar
+
 	return result
 }