@archivist-gg/dnd5e 0.2.0 → 0.3.1

package/dist/background/background.codec.js

@@ -1,8 +1,8 @@
 import {
   backgroundCodec
-} from "../chunk-VTYUBINW.js";
-import "../chunk-DZXSWSBP.js";
-import "../chunk-TUIFSVLI.js";
+} from "../chunk-BIK4DFWK.js";
+import "../chunk-5ZBE4CWV.js";
+import "../chunk-SE7AZDR3.js";
 import "../chunk-3DZ74AKK.js";
 import "../chunk-NXSWH3AE.js";
 import "../chunk-NXR3BD2V.js";

package/dist/background/background.parser.js

@@ -1,7 +1,7 @@
 import {
   parseBackground
-} from "../chunk-DZXSWSBP.js";
-import "../chunk-TUIFSVLI.js";
+} from "../chunk-5ZBE4CWV.js";
+import "../chunk-SE7AZDR3.js";
 import "../chunk-3DZ74AKK.js";
 import "../chunk-NXSWH3AE.js";
 import "../chunk-NXR3BD2V.js";

package/dist/background/background.schema.d.ts

@@ -1,4 +1,12 @@
 import { z } from "zod";
+export declare const langProfSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+    kind: z.ZodLiteral<"fixed">;
+    languages: z.ZodArray<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    kind: z.ZodLiteral<"choice">;
+    count: z.ZodNumber;
+    from: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>;
+}, z.core.$strip>], "kind">;
 export declare const backgroundEntitySchema: z.ZodObject<{
     slug: z.ZodString;
     name: z.ZodString;

package/dist/background/background.schema.js

@@ -1,9 +1,11 @@
 import {
-  backgroundEntitySchema
-} from "../chunk-TUIFSVLI.js";
+  backgroundEntitySchema,
+  langProfSchema
+} from "../chunk-SE7AZDR3.js";
 import "../chunk-3DZ74AKK.js";
 import "../chunk-NXSWH3AE.js";
 import "../chunk-NXR3BD2V.js";
 export {
-  backgroundEntitySchema
+  backgroundEntitySchema,
+  langProfSchema
 };

package/dist/chunk-353WXS6S.js

@@ -0,0 +1,25 @@
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
+
+// src/weapon/weapon.classify.ts
+var PURE_RANGED_THROWN_SLUGS = /* @__PURE__ */ new Set(["dart", "net"]);
+function classifyWeaponRange(weapon) {
+  const has = (p) => weapon.properties.some((x) => x === p);
+  const isCatRanged = /ranged/.test(weapon.category);
+  const pureRanged = isCatRanged && (has("ammunition") || has("loading") || PURE_RANGED_THROWN_SLUGS.has(bareEntitySlug(weapon.slug)));
+  if (pureRanged) {
+    return {
+      melee: null,
+      ranged: weapon.range ? { normal: weapon.range.normal, long: weapon.range.long, thrown: false } : null
+    };
+  }
+  return {
+    melee: { reach: 5 + (has("reach") ? 5 : 0) },
+    ranged: weapon.range ? { normal: weapon.range.normal, long: weapon.range.long, thrown: true } : null
+  };
+}
+
+export {
+  classifyWeaponRange
+};

package/dist/{chunk-DC74TZNA.js → chunk-4LZJXJJS.js}

@@ -1,6 +1,6 @@
 import {
   slugify
-} from "./chunk-3TRGRSCH.js";
+} from "./chunk-LV4SNWZQ.js";
 
 // src/entities/base-item-resolver.ts
 function unwrapWikilink(input) {
@@ -10,6 +10,7 @@ function unwrapWikilink(input) {
   const pipe = inner.indexOf("|");
   return pipe === -1 ? inner : inner.slice(0, pipe);
 }
+var FOLDER_TO_TYPE = { Weapons: "weapon", Armor: "armor" };
 function vaultPathToSlug(target) {
   const segments = target.split("/").map((s) => s.trim()).filter((s) => s.length > 0);
   if (segments.length === 0) return "";
@@ -17,10 +18,13 @@ function vaultPathToSlug(target) {
     return slugify(segments[0]);
   }
   const compendiumName = segments[0];
+  const typeFolder = segments[segments.length - 2];
   const basename = segments[segments.length - 1];
   const prefix = slugify(compendiumName);
   const nameSlug = slugify(basename);
-  return prefix && nameSlug ? `${prefix}_${nameSlug}` : nameSlug;
+  if (!prefix || !nameSlug) return nameSlug;
+  const type = FOLDER_TO_TYPE[typeFolder];
+  return type ? `${prefix}_${type}_${nameSlug}` : `${prefix}_${nameSlug}`;
 }
 function resolveBaseItem(baseItem, registry) {
   var _a, _b;
@@ -41,6 +45,7 @@ function resolveBaseItemOfType(baseItem, entityType, registry) {
 }
 
 export {
+  vaultPathToSlug,
   resolveBaseItem,
   resolveBaseItemOfType
 };

package/dist/{chunk-DZXSWSBP.js → chunk-5ZBE4CWV.js}

@@ -1,6 +1,6 @@
 import {
   backgroundEntitySchema
-} from "./chunk-TUIFSVLI.js";
+} from "./chunk-SE7AZDR3.js";
 
 // src/background/background.parser.ts
 import { parseYaml } from "@archivist-gg/core";

package/dist/{chunk-IXZXFFFW.js → chunk-6IRYTM5V.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-5XUXXAQJ.js";
 import {
   bareSlug
-} from "./chunk-J2RYSZMQ.js";
+} from "./chunk-VTTA2ALZ.js";
 import {
   abilityModifier
 } from "./chunk-NAEPSZAM.js";
@@ -24,6 +24,10 @@ function resolveSpellcasting(rc) {
     table
   };
 }
+function effectiveSpellcastingAbility(classSlug, dataAbility, overrides) {
+  var _a, _b;
+  return (_b = (_a = overrides.spellcasting_ability_by_class) == null ? void 0 : _a[classSlug]) != null ? _b : dataAbility;
+}
 function normalizeKnownSpell(entry) {
   var _a, _b;
   if (typeof entry === "string") {
@@ -263,6 +267,7 @@ function computeSpellLimits(inputs) {
 
 export {
   resolveSpellcasting,
+  effectiveSpellcastingAbility,
   normalizeKnownSpell,
   deriveSpellSlots,
   computeSpellLimits

package/dist/chunk-7TEK5KK7.js

@@ -0,0 +1,49 @@
+// src/types/choice.ts
+var ALL_SKILL_SLUGS = [
+  "acrobatics",
+  "animal-handling",
+  "arcana",
+  "athletics",
+  "deception",
+  "history",
+  "insight",
+  "intimidation",
+  "investigation",
+  "medicine",
+  "nature",
+  "perception",
+  "performance",
+  "persuasion",
+  "religion",
+  "sleight-of-hand",
+  "stealth",
+  "survival"
+];
+var STANDARD_LANGUAGES = [
+  "common",
+  "dwarvish",
+  "elvish",
+  "giant",
+  "gnomish",
+  "goblin",
+  "halfling",
+  "orc"
+];
+var EXOTIC_LANGUAGES = [
+  "abyssal",
+  "celestial",
+  "deep-speech",
+  "draconic",
+  "infernal",
+  "primordial",
+  "sylvan",
+  "undercommon"
+];
+var ALL_LANGUAGES = [...STANDARD_LANGUAGES, ...EXOTIC_LANGUAGES];
+
+export {
+  ALL_SKILL_SLUGS,
+  STANDARD_LANGUAGES,
+  EXOTIC_LANGUAGES,
+  ALL_LANGUAGES
+};

package/dist/{chunk-V6SOFUJW.js → chunk-AIRFC5NQ.js}

@@ -1,6 +1,6 @@
 import {
   bareEntitySlug
-} from "./chunk-R5SQHP2X.js";
+} from "./chunk-LV4SNWZQ.js";
 import {
   ABILITY_KEYS
 } from "./chunk-WP2CX2JO.js";
@@ -10,6 +10,7 @@ function emptyFeatureEffectTotals() {
   return {
     initiative_bonus: 0,
     hp_per_level_bonus: 0,
+    hp_per_level_terms: [],
     speed_walk_bonus: 0,
     speed_walk_set: 0,
     senses: { darkvision: 0, blindsight: 0, tremorsense: 0, truesight: 0 },
@@ -66,6 +67,7 @@ function applyEffect(out, eff, label) {
       break;
     case "hp-per-level-bonus":
       out.hp_per_level_bonus += eff.value;
+      out.hp_per_level_terms.push({ label, value: eff.value });
       break;
     case "speed-bonus":
       if (eff.mode === "walk") {

package/dist/{chunk-VTYUBINW.js → chunk-BIK4DFWK.js}

@@ -1,6 +1,6 @@
 import {
   parseBackground
-} from "./chunk-DZXSWSBP.js";
+} from "./chunk-5ZBE4CWV.js";
 
 // src/background/background.codec.ts
 import yaml from "js-yaml";

package/dist/{chunk-TQZB4OCJ.js → chunk-D3CLOBE3.js}

@@ -1,19 +1,25 @@
 import {
-  bareEntitySlug
-} from "./chunk-R5SQHP2X.js";
+  classifyWeaponRange
+} from "./chunk-353WXS6S.js";
+import {
+  normKey
+} from "./chunk-O5EYMKFH.js";
 import {
   defaultSlotForType,
   effectiveArmor,
   isItemEntity,
   isWeaponEntity,
   resolveEntityForEntry
-} from "./chunk-UC4FE5X3.js";
+} from "./chunk-N6N74K6X.js";
 import {
   readNumericBonus
 } from "./chunk-LWFTHJIE.js";
 import {
   resolveBaseItem
-} from "./chunk-DC74TZNA.js";
+} from "./chunk-4LZJXJJS.js";
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
 
 // src/weapon/weapon-mastery.ts
 var MASTERY = {
@@ -245,7 +251,14 @@ function assignSlots(resolved, registry, warnings) {
     const { entity, entityType } = resolveEntityForEntry(entry.item, registry);
     if (!entity || !entityType) continue;
     const defaultSlot = defaultSlotForType(entityType, entity, registry);
-    if (!defaultSlot) continue;
+    if (!defaultSlot) {
+      if (isItemEntity(entity) && typeof entity.base_item === "string" && entity.base_item.length > 0) {
+        warnings.push(
+          `Magic item "${entity.name}" base_item ${entity.base_item} did not resolve to a base weapon or armor; not slotted (AC/attack not applied).`
+        );
+      }
+      continue;
+    }
     const placed = { index: i, entity, entityType, entry };
     if (defaultSlot === "mainhand") {
       if (!slots.mainhand) slots.mainhand = placed;
@@ -265,12 +278,17 @@ function assignSlots(resolved, registry, warnings) {
   }
   return slots;
 }
-function computeAC(equippedSlots, resolved, mods, registry) {
+function computeAC(equippedSlots, resolved, mods, registry, warnings) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
   const breakdown = [];
   const armorSlot = equippedSlots.armor;
   const armorEntity = (_a = armorSlot == null ? void 0 : armorSlot.entity) != null ? _a : null;
   const armor = effectiveArmor(armorEntity, registry);
+  if (isItemEntity(armorEntity) && typeof armorEntity.base_item === "string" && !armor) {
+    warnings.push(
+      `Magic armor "${armorEntity.name}" base_item ${armorEntity.base_item} did not resolve to a base armor; AC not applied.`
+    );
+  }
   let ac = 10;
   if (armor) {
     const armorBase = armor.ac.base + ((_b = armor.ac.flat) != null ? _b : 0);
@@ -329,8 +347,9 @@ function hasProperty(weapon, prop) {
   return weapon.properties.some((p) => p === prop);
 }
 function attackAbility(weapon, mods, weaponAbilities) {
-  const isRanged = /ranged/.test(weapon.category);
-  if (!isRanged) {
+  const modes = classifyWeaponRange(weapon);
+  const finesse = hasProperty(weapon, "finesse");
+  if (modes.melee) {
     const scoped = weaponAbilities.find((o2) => {
       var _a;
       return (_a = o2.weaponSlugs) == null ? void 0 : _a.includes(bareEntitySlug(weapon.slug));
@@ -338,14 +357,14 @@ function attackAbility(weapon, mods, weaponAbilities) {
     const glob = weaponAbilities.find((o2) => !o2.weaponSlugs);
     const o = scoped != null ? scoped : glob;
     if (o) return o.ability;
+    if (finesse) return mods.dex >= mods.str ? "dex" : "str";
+    return "str";
   }
-  if (isRanged) return "dex";
-  if (hasProperty(weapon, "finesse")) return mods.dex >= mods.str ? "dex" : "str";
-  return "str";
+  return finesse && mods.str > mods.dex ? "str" : "dex";
 }
 function isWeaponSlugProficient(weapon, weaponSlug, profs) {
   const wp = profs.weapons;
-  if (wp.specific.includes(weaponSlug)) return true;
+  if (wp.specific.some((e) => e === weaponSlug || normKey(e) === normKey(weapon.name))) return true;
   const cat = weapon.category;
   if (typeof cat === "string") {
     if (/^simple\b/.test(cat) && wp.categories.includes("simple")) return true;
@@ -420,8 +439,10 @@ function buildAttackRow(args) {
     { source: `${ability.toUpperCase()} modifier`, amount: abilityMod, kind: "ability" },
     { source: magicSource, amount: magic.dmg, kind: "item" }
   ];
-  const isRanged = /ranged/.test(weapon.category);
-  const range = isRanged && weapon.range ? `${weapon.range.normal}/${weapon.range.long}` : "melee";
+  const modes = classifyWeaponRange(weapon);
+  const fmtRanged = (r) => `${r.normal}/${r.long} ft`;
+  const range = modes.melee ? `${modes.melee.reach} ft` : modes.ranged ? fmtRanged(modes.ranged) : void 0;
+  const thrownRange = modes.melee && modes.ranged ? fmtRanged(modes.ranged) : void 0;
   const stringProps = weapon.properties.filter(
     (p) => typeof p === "string"
   );
@@ -429,7 +450,8 @@ function buildAttackRow(args) {
   const row = {
     id,
     name,
-    range,
+    ...range !== void 0 ? { range } : {},
+    ...thrownRange !== void 0 ? { thrownRange } : {},
     toHit,
     damageDice,
     damageType: (_b = magic.damageTypeOverride) != null ? _b : weapon.damage.type,
@@ -446,7 +468,7 @@ function buildAttackRow(args) {
     breakdown: { toHit: toHitBreakdown, damage: damageBreakdown },
     informational: args.magic.informational.length > 0 ? args.magic.informational : void 0,
     slotKey: args.slotKey,
-    subLabel: formatWeaponSubLabel(weapon, finalProps),
+    subLabel: formatWeaponSubLabel(weapon, finalProps, modes),
     actionCost: args.actionCost,
     versatile: args.versatileDice ? { damageDice: formatDice(args.versatileDice) } : void 0
   };
@@ -460,10 +482,16 @@ function buildAttackRow(args) {
   }
   return row;
 }
-function formatWeaponSubLabel(weapon, properties) {
+function humanizeWeaponToken(s) {
+  return s.replace(/[-_]/g, " ").replace(/(^|[\s(])\w/g, (c) => c.toUpperCase());
+}
+function formatWeaponSubLabel(weapon, properties, modes) {
   const parts = [];
-  if (weapon.category) parts.push(weapon.category);
-  if (properties.length > 0) parts.push(properties.join(", "));
+  if (weapon.category) {
+    const cat = modes.melee && /ranged/.test(weapon.category) ? weapon.category.replace("ranged", "melee") : weapon.category;
+    parts.push(humanizeWeaponToken(cat));
+  }
+  if (properties.length > 0) parts.push(properties.map(humanizeWeaponToken).join(", "));
   return parts.join(" \xB7 ");
 }
 function computeAttacks(equippedSlots, mods, profs, registry, warnings, proficiencyBonus, ctx, weaponMasteries, weaponAbilities = []) {
@@ -486,7 +514,7 @@ function computeAttacks(equippedSlots, mods, profs, registry, warnings, proficie
       if (found && found.entityType === "weapon" && isWeaponEntity(found.data)) {
         weapon = found.data;
       } else {
-        warnings.push(`Magic weapon ${entity.name} references missing base_item [[${baseSlug}]].`);
+        warnings.push(`Magic weapon ${entity.name} references missing base_item ${baseSlug}.`);
         continue;
       }
     } else {
@@ -547,7 +575,7 @@ function computeSlotsAndAttacks(resolved, mods, profs, registry, warnings, profi
   var _a, _b, _c;
   const equippedSlots = assignSlots(resolved, registry, warnings);
   const overrides = (_a = resolved.definition.overrides) != null ? _a : {};
-  const acOut = computeAC(equippedSlots, resolved, mods, registry);
+  const acOut = computeAC(equippedSlots, resolved, mods, registry, warnings);
   const ctx = buildConditionContext(resolved, equippedSlots);
   const attacks = computeAttacks(equippedSlots, mods, profs, registry, warnings, proficiencyBonus, ctx, weaponMasteries, weaponAbilities);
   return {

package/dist/{chunk-3TRGRSCH.js → chunk-LV4SNWZQ.js}

@@ -2,7 +2,13 @@
 function slugify(name) {
   return name.toLowerCase().replace(/[^a-z0-9\s-]/g, "").replace(/[\s]+/g, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
 }
+function bareEntitySlug(slug) {
+  if (!slug) return "";
+  const p = slug.split("_");
+  return p.length >= 3 ? p.slice(2).join("_") : p[p.length - 1];
+}
 
 export {
-  slugify
+  slugify,
+  bareEntitySlug
 };

package/dist/{chunk-UC4FE5X3.js → chunk-N6N74K6X.js}

@@ -1,6 +1,6 @@
 import {
   resolveBaseItem
-} from "./chunk-DC74TZNA.js";
+} from "./chunk-4LZJXJJS.js";
 
 // src/pc/pc.slotting.ts
 function isItemEntity(e) {

package/dist/chunk-O5EYMKFH.js

@@ -0,0 +1,6 @@
+// src/pc/pc.proficiency-normalize.ts
+var normKey = (s) => s.toLowerCase().replace(/[^a-z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean).map((w) => w.endsWith("s") ? w.slice(0, -1) : w).sort().join(" ");
+
+export {
+  normKey
+};

package/dist/{chunk-TUIFSVLI.js → chunk-SE7AZDR3.js}

@@ -79,5 +79,6 @@ var backgroundEntitySchema = z.object({
 });
 
 export {
+  langProfSchema,
   backgroundEntitySchema
 };

package/dist/{chunk-5WQD3WNZ.js → chunk-TN6ZLTNU.js}

@@ -94,14 +94,15 @@ var characterOverridesSchema = z.object({
     investigation: z.number().int().optional(),
     insight: z.number().int().optional()
   }).partial().optional(),
-  hp: z.object({ max: z.number().int().positive().optional() }).optional(),
+  hp: z.object({
+    max: z.number().int().positive().optional(),
+    rolled: z.number().int().positive().optional(),
+    modifier: z.number().int().optional()
+  }).optional(),
   ac: z.number().int().optional(),
   speed: z.number().int().optional(),
   initiative: z.number().int().optional(),
-  spellcasting: z.object({
-    saveDC: z.number().int().optional(),
-    attackBonus: z.number().int().optional()
-  }).optional(),
+  spellcasting_ability_by_class: z.record(z.string(), abilityEnum).optional(),
   // Character-level DC-ability fallback for own-ability-less spells (e.g. a Spell
   // Scroll cast by a non-caster). Same ability enum as the per-instance spell_ability.
   spellcasting_ability: abilityEnum.optional(),

package/dist/{chunk-R5SQHP2X.js → chunk-TNUFPIXI.js}

@@ -1,20 +1,25 @@
 import {
+  ALL_LANGUAGES,
   ALL_SKILL_SLUGS
-} from "./chunk-BH6AMZVY.js";
-import {
-  isItemEntity,
-  resolveEntityForEntry
-} from "./chunk-UC4FE5X3.js";
+} from "./chunk-7TEK5KK7.js";
 import {
+  effectiveSpellcastingAbility,
   normalizeKnownSpell,
   resolveSpellcasting
-} from "./chunk-IXZXFFFW.js";
+} from "./chunk-6IRYTM5V.js";
 import {
   readTableColumn
 } from "./chunk-5XUXXAQJ.js";
 import {
   recognizeDecision
 } from "./chunk-JEYQU3JT.js";
+import {
+  isItemEntity,
+  resolveEntityForEntry
+} from "./chunk-N6N74K6X.js";
+import {
+  bareEntitySlug
+} from "./chunk-LV4SNWZQ.js";
 import {
   ABILITY_KEYS
 } from "./chunk-WP2CX2JO.js";
@@ -131,8 +136,9 @@ var PCResolver = class {
       }
     }
     const ownSpellcastingAbility = (_h = classes.map((c) => {
-      var _a2, _b2;
-      return (_b2 = (_a2 = resolveSpellcasting(c)) == null ? void 0 : _a2.ability) != null ? _b2 : null;
+      if (!c.entity) return null;
+      const p = resolveSpellcasting(c);
+      return p ? effectiveSpellcastingAbility(c.entity.slug, p.ability, character.overrides) : null;
     }).find((a) => a != null)) != null ? _h : null;
     spells.push(...collectItemGrantedSpells(character, ownSpellcastingAbility, this.entities, warnings));
     const chosenMasteries = collectChosenWeaponMasteries(character);
@@ -483,11 +489,6 @@ function wikilinkTailSlug(link) {
   const tail = (_a = inner.split("/").pop()) != null ? _a : inner;
   return tail.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
 }
-function bareEntitySlug(slug) {
-  if (!slug) return "";
-  const i = slug.indexOf("_");
-  return i === -1 ? slug : slug.slice(i + 1);
-}
 function matchesFilter(e, where, ownerBare) {
   var _a, _b, _c, _d, _e;
   const d = e.data;
@@ -547,7 +548,7 @@ function enumerateOptions(choice, ctx, ownerBare) {
       return filtered.map((e) => ({ value: e.slug, label: e.name, entity: e }));
     }
     case "select-proficiency": {
-      const pool = (_a = choice.from) != null ? _a : choice.domain === "skill" ? [...ALL_SKILL_SLUGS] : [];
+      const pool = (_a = choice.from) != null ? _a : choice.domain === "skill" ? [...ALL_SKILL_SLUGS] : choice.domain === "language" ? [...ALL_LANGUAGES] : [];
       return pool.map((v) => ({ value: v, label: v.replace(/-/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()) }));
     }
     case "ability-points": {
@@ -650,22 +651,11 @@ function buildSubclassItem(choice, source, level, featureName, c, ctx, ownerBare
     status: selected ? "resolved" : "unresolved"
   };
 }
-function collectChosenProficiencies(resolved) {
+function visitProficiencyChoices(resolved, visit) {
   var _a, _b;
-  const out = { skills: [], expertise: [], languages: [], tools: [] };
-  const apply = (choice, selected) => {
-    if (choice.kind !== "select-proficiency") return;
-    const vals = Array.isArray(selected) ? selected : typeof selected === "string" ? [selected] : [];
-    const pool = choice.from;
-    const valid = pool ? vals.filter((v) => pool.includes(v)) : vals;
-    const bucket = choice.domain === "skill" ? choice.expertise ? out.expertise : out.skills : choice.domain === "language" ? out.languages : choice.domain === "tool" ? out.tools : null;
-    if (bucket) {
-      for (const v of valid) if (!bucket.includes(v)) bucket.push(v);
-    }
-  };
   const walk = (choices, read) => {
     for (const ch of choices != null ? choices : []) {
-      apply(ch, read(ch.id));
+      visit(ch, read(ch.id));
       if (ch.kind === "select-inline") {
         const sel = read(ch.id);
         const branch = typeof sel === "string" ? ch.options.find((o) => o.value === sel) : void 0;
@@ -682,7 +672,7 @@ function collectChosenProficiencies(resolved) {
       return (_a3 = c.choices[lvl]) == null ? void 0 : _a3[id];
     };
     if (i === 0 && ((_b2 = (_a2 = entity.skill_choices) == null ? void 0 : _a2.from) == null ? void 0 : _b2.length)) {
-      apply({
+      visit({
         kind: "select-proficiency",
         id: "skills",
         count: entity.skill_choices.count,
@@ -706,11 +696,39 @@ function collectChosenProficiencies(resolved) {
   if (resolved.background) {
     walk(resolved.background.choices, originRead("background"));
     if (resolved.background.feature) {
-      walk(resolved.background.feature.choices, originRead("background"));
+      const feature = resolved.background.feature;
+      walk(feature.choices, originRead("background"));
     }
   }
+}
+function collectChosenProficiencies(resolved) {
+  const out = { skills: [], expertise: [], languages: [], tools: [] };
+  visitProficiencyChoices(resolved, (choice, selected) => {
+    if (choice.kind !== "select-proficiency") return;
+    const vals = Array.isArray(selected) ? selected : typeof selected === "string" ? [selected] : [];
+    const pool = choice.from;
+    const valid = pool ? vals.filter((v) => pool.includes(v)) : vals;
+    const bucket = choice.domain === "skill" ? choice.expertise ? out.expertise : out.skills : choice.domain === "language" ? out.languages : choice.domain === "tool" ? out.tools : null;
+    if (bucket) {
+      for (const v of valid) if (!bucket.includes(v)) bucket.push(v);
+    }
+  });
   return out;
 }
+function collectLanguageToolChoiceStatus(resolved) {
+  const languages = [];
+  const tools = [];
+  visitProficiencyChoices(resolved, (choice, selected) => {
+    if (choice.kind !== "select-proficiency") return;
+    if (choice.domain !== "language" && choice.domain !== "tool") return;
+    const vals = Array.isArray(selected) ? selected : typeof selected === "string" ? [selected] : [];
+    const pool = choice.from;
+    const valid = pool ? vals.filter((v) => pool.includes(v)) : vals;
+    const status = { id: choice.id, count: choice.count, selected: valid.length };
+    (choice.domain === "language" ? languages : tools).push(status);
+  });
+  return { languages, tools };
+}
 function collectChosenAbilityPoints(resolved) {
   var _a, _b, _c;
   const oc = (_a = resolved.definition.origin_choices) != null ? _a : {};
@@ -1084,9 +1102,9 @@ export {
   collectChosenGrantedFeatures,
   collectResolvedFeatures,
   wikilinkTailSlug,
-  bareEntitySlug,
   __matchesFilterForTest,
   collectChosenProficiencies,
+  collectLanguageToolChoiceStatus,
   collectChosenAbilityPoints,
   buildDecisionLedger
 };

package/dist/{chunk-J2RYSZMQ.js → chunk-VTTA2ALZ.js}

@@ -6,8 +6,8 @@ function bareSlug(ref) {
 }
 function baseClassName(ref) {
   const bare = bareSlug(ref);
-  const sep = bare.indexOf("_");
-  return sep >= 0 ? bare.slice(sep + 1) : bare;
+  const p = bare.split("_");
+  return p.length >= 3 ? p.slice(2).join("_") : p[p.length - 1];
 }
 
 export {

package/dist/class/class.slug.d.ts

@@ -2,10 +2,12 @@ export declare function bareSlug(ref: string): string;
 /**
  * Bare class name for profile / spell-`classes` lookups.
  *
- * Compendium-qualified slugs are `<compendium>_<name>` — e.g. `srd-5e_wizard`,
- * `srd-2024_bard` (compendium slugs are hyphen-cased, so `_` only ever separates
- * the compendium from the entity name). Strip that prefix to get the canonical
- * class key (`wizard`). Hand-written/test slugs without a `_` pass through
- * unchanged (`wizard` → `wizard`).
+ * Compendium-qualified slugs are `<compendium>_<type>_<name>` (3-part, e.g.
+ * `srd-2024_class_wizard`) or the legacy `<compendium>_<name>` (2-part, e.g.
+ * `srd-5e_wizard`); compendium/type segments are hyphen-cased, so `_` only ever
+ * separates the structural parts from the entity name. Strip that prefix to get
+ * the canonical class key (`wizard`). Name-slugs never contain `_`, so a 3-part
+ * slug's name is `parts.slice(2).join("_")`. Hand-written/test slugs without a
+ * `_` pass through unchanged (`wizard` → `wizard`).
  */
 export declare function baseClassName(ref: string): string;

package/dist/class/class.slug.js

@@ -1,7 +1,7 @@
 import {
   bareSlug,
   baseClassName
-} from "../chunk-J2RYSZMQ.js";
+} from "../chunk-VTTA2ALZ.js";
 export {
   bareSlug,
   baseClassName